From 067df085ebf0d8bd36c0e0f694afba602bde11be Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Sat, 1 Apr 2017 22:21:32 +0000 Subject: Finish removal of gal2 --- Mk/Scripts/qa.sh | 1 - Mk/Uses/gnome.mk | 6 +----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/Mk/Scripts/qa.sh b/Mk/Scripts/qa.sh index 82ee000ff691..e9eab07df733 100644 --- a/Mk/Scripts/qa.sh +++ b/Mk/Scripts/qa.sh @@ -379,7 +379,6 @@ proxydeps_suggest_uses() { ${pkg} = "graphics/cairomm" -o \ ${pkg} = "devel/dconf" -o \ ${pkg} = "audio/esound" -o \ - ${pkg} = "x11-toolkits/gal2" -o \ ${pkg} = "devel/gconf2" -o \ ${pkg} = "devel/gconfmm26" -o \ ${pkg} = "devel/glib12" -o \ diff --git a/Mk/Uses/gnome.mk b/Mk/Uses/gnome.mk index c1610773b662..3c7d12fc2804 100644 --- a/Mk/Uses/gnome.mk +++ b/Mk/Uses/gnome.mk @@ -75,7 +75,7 @@ _USE_GNOME_ALL= esound intlhack intltool introspection \ _USE_GNOME_ALL+= gdkpixbuf glib12 gtk12 # GNOME 2 components -_USE_GNOME_ALL+= atk cairo gal2 \ +_USE_GNOME_ALL+= atk cairo \ gdkpixbuf2 gconf2 glib20 \ gnomedocutils gnomesharp20 \ gnomevfs2 gtk-update-icon-cache gtk20 gtkhtml3 \ @@ -354,10 +354,6 @@ nautilus3_USE_GNOME_IMPL=gnomedesktop3 gvfs libxml2 metacity_LIB_DEPENDS= libmetacity-private.so:x11-wm/metacity metacity_DETECT= ${LOCALBASE}/libdata/pkgconfig/libmetacity-private.pc -gal2_LIB_DEPENDS= libgal-2.4.so:x11-toolkits/gal2 -gal2_DETECT= ${LOCALBASE}/libdata/pkgconfig/gal-2.4.pc -gal2_USE_GNOME_IMPL=gnomeui libgnomeprintui - gnomecontrolcenter3_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-keybindings.pc gnomecontrolcenter3_BUILD_DEPENDS= ${gnomecontrolcenter3_DETECT}:sysutils/gnome-control-center gnomecontrolcenter3_RUN_DEPENDS= ${gnomecontrolcenter3_DETECT}:sysutils/gnome-control-center -- cgit v1.2.3