gnome-extra/gnome-utils & friends: moved to gx86; sync -9999 with gx86

20 files changed, 66 insertions, 339 deletions

diff --git a/app-admin/gnome-system-log/Manifest b/app-admin/gnome-system-log/Manifest
index 83aca0cb..bcd9a86a 100644
--- a/app-admin/gnome-system-log/Manifest
+++ b/app-admin/gnome-system-log/Manifest
@@ -1,3 +1 @@
-DIST gnome-system-log-3.4.1.tar.xz 930200 RMD160 7b0b81130ca24c2493e956faa9f0599b9c0a28be SHA1 7affd90613672afb3cead4c5e02482ad5edce527 SHA256 288bb4db72d5e86874198f3a879a89cd0ddec373db9838d8ea772df1c5267736
-EBUILD gnome-system-log-3.4.1.ebuild 927 RMD160 d75c0c97b78ce899ffdaef95da569c43202bc975 SHA1 842b4691e9a4a3e0e100190bb2bb7c5c4ddd5b42 SHA256 10c07907c4c4090ce13bb401fe602025d3880c4b9590b3fa15cdb732d6286482
-EBUILD gnome-system-log-9999.ebuild 927 RMD160 d75c0c97b78ce899ffdaef95da569c43202bc975 SHA1 842b4691e9a4a3e0e100190bb2bb7c5c4ddd5b42 SHA256 10c07907c4c4090ce13bb401fe602025d3880c4b9590b3fa15cdb732d6286482
+EBUILD gnome-system-log-9999.ebuild 988 RMD160 b45b7333ad27fb7086e527c6278a6b2dc3312b98 SHA1 7f5910b60cf4136d9d4d0b297389a6478af3d18e SHA256 3d45abe7335d360ea2b5cd145a7fae020d434d961e8ea187d05511bca87a4b80
diff --git a/app-admin/gnome-system-log/gnome-system-log-3.4.1.ebuild b/app-admin/gnome-system-log/gnome-system-log-3.4.1.ebuild
deleted file mode 100644
index f6ee6aa9..00000000
--- a/app-admin/gnome-system-log/gnome-system-log-3.4.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-DESCRIPTION="System log viewer for GNOME 3"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 FDL-1.1"
-SLOT="0"
-IUSE=""
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-fi
-
-COMMON_DEPEND=">=dev-libs/glib-2.31.0:2
-	>=x11-libs/gtk+-3.0.0:3
-	
-	gnome-base/libgtop:2"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-extra/gnome-utils-3.4"
-# ${PN} was part of gnome-utils before 3.4
-DEPEND="${COMMON_DEPEND}
-	app-text/gnome-doc-utils
-	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.22
-	>=sys-devel/gettext-0.17"
-
-pkg_setup() {
-	DOCS="NEWS TODO"
-	G2CONF="--disable-schemas-compile
-		--enable-zlib"
-}
diff --git a/app-admin/gnome-system-log/gnome-system-log-9999.ebuild b/app-admin/gnome-system-log/gnome-system-log-9999.ebuild
index f6ee6aa9..e0413fd5 100644
--- a/app-admin/gnome-system-log/gnome-system-log-9999.ebuild
+++ b/app-admin/gnome-system-log/gnome-system-log-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 fi
 
 DESCRIPTION="System log viewer for GNOME 3"
-HOMEPAGE="http://www.gnome.org/"
+HOMEPAGE="https://live.gnome.org/GnomeUtils"
 
 LICENSE="GPL-2 FDL-1.1"
 SLOT="0"
@@ -24,20 +24,22 @@ else
 fi
 
 COMMON_DEPEND=">=dev-libs/glib-2.31.0:2
+	sys-libs/zlib
 	>=x11-libs/gtk+-3.0.0:3
-	
-	gnome-base/libgtop:2"
+	x11-libs/pango"
 RDEPEND="${COMMON_DEPEND}
+	gnome-base/gsettings-desktop-schemas
 	!<gnome-extra/gnome-utils-3.4"
 # ${PN} was part of gnome-utils before 3.4
 DEPEND="${COMMON_DEPEND}
 	app-text/gnome-doc-utils
 	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.22
-	>=sys-devel/gettext-0.17"
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig"
 
 pkg_setup() {
 	DOCS="NEWS TODO"
-	G2CONF="--disable-schemas-compile
+	G2CONF="${G2CONF}
+		--disable-schemas-compile
 		--enable-zlib"
 }
diff --git a/app-dicts/gnome-dictionary/Manifest b/app-dicts/gnome-dictionary/Manifest
index ae7f66c6..670acde7 100644
--- a/app-dicts/gnome-dictionary/Manifest
+++ b/app-dicts/gnome-dictionary/Manifest
@@ -1,3 +1 @@
-DIST gnome-dictionary-3.4.0.tar.xz 2155012 RMD160 a562d053cb12d08fad89b4eaa5033801ecfa9ff0 SHA1 4ac5035cf3edbd636ac65dc33f831c8276d4f054 SHA256 70a15987617f5ae39f1fc27f7ed0a039193b4704cef7b89ed3aea30ac38f56af
-EBUILD gnome-dictionary-3.4.0.ebuild 1071 RMD160 72a3791a4c4dd473dc1a9073f02cb17a8f7804f8 SHA1 2347cee084d5f0bbc320529f6f2fa9b9573ea998 SHA256 951bd264de8718a29b94e85c9a655dc7365548e07a5c8457e44c065d9137249b
-EBUILD gnome-dictionary-9999.ebuild 1071 RMD160 72a3791a4c4dd473dc1a9073f02cb17a8f7804f8 SHA1 2347cee084d5f0bbc320529f6f2fa9b9573ea998 SHA256 951bd264de8718a29b94e85c9a655dc7365548e07a5c8457e44c065d9137249b
+EBUILD gnome-dictionary-9999.ebuild 1044 RMD160 c26ecbfadea77634ea17a4eace7b31e6ff4dfeba SHA1 5ec17e4c06d14699654b7a3c19360720ff9b4fe2 SHA256 d23bfdbaffb9e83fb24898dda4c9ca977e5642912da9b38661d2c346edb2c9d4
diff --git a/app-dicts/gnome-dictionary/gnome-dictionary-3.4.0.ebuild b/app-dicts/gnome-dictionary/gnome-dictionary-3.4.0.ebuild
deleted file mode 100644
index 221ec256..00000000
--- a/app-dicts/gnome-dictionary/gnome-dictionary-3.4.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/gnome-utils-2.32.0-r1.ebuild,v 1.1 2010/12/04 18:08:10 pacho Exp $
-
-EAPI="4"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-DESCRIPTION="Dictionary utility for GNOME 3"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2.1 FDL-1.1"
-SLOT="0"
-IUSE="doc ipv6"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-fi
-
-COMMON_DEPEND=">=dev-libs/glib-2.28.0:2
-	>=x11-libs/gtk+-3.0.0:3"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-extra/gnome-utils-3.4"
-# ${PN} was part of gnome-utils before 3.4
-DEPEND="${COMMON_DEPEND}
-	app-text/gnome-doc-utils
-	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.22
-	>=sys-devel/gettext-0.17
-	doc? ( >=dev-util/gtk-doc-1.15 )"
-
-pkg_setup() {
-	DOCS="AUTHORS NEWS README TODO"
-	G2CONF="--disable-schemas-compile
-		$(use_enable ipv6)"
-}
diff --git a/app-dicts/gnome-dictionary/gnome-dictionary-9999.ebuild b/app-dicts/gnome-dictionary/gnome-dictionary-9999.ebuild
index 221ec256..a8956e21 100644
--- a/app-dicts/gnome-dictionary/gnome-dictionary-9999.ebuild
+++ b/app-dicts/gnome-dictionary/gnome-dictionary-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/gnome-utils-2.32.0-r1.ebuild,v 1.1 2010/12/04 18:08:10 pacho Exp $
+# $Header: $
 
 EAPI="4"
 GNOME2_LA_PUNT="yes"
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999 ]]; then
 fi
 
 DESCRIPTION="Dictionary utility for GNOME 3"
-HOMEPAGE="http://www.gnome.org/"
+HOMEPAGE="https://live.gnome.org/GnomeUtils"
 
 LICENSE="GPL-2 LGPL-2.1 FDL-1.1"
 SLOT="0"
@@ -23,19 +23,23 @@ else
 fi
 
 COMMON_DEPEND=">=dev-libs/glib-2.28.0:2
-	>=x11-libs/gtk+-3.0.0:3"
+	x11-libs/cairo
+	>=x11-libs/gtk+-3.0.0:3
+	x11-libs/pango"
 RDEPEND="${COMMON_DEPEND}
+	gnome-base/gsettings-desktop-schemas
 	!<gnome-extra/gnome-utils-3.4"
 # ${PN} was part of gnome-utils before 3.4
 DEPEND="${COMMON_DEPEND}
 	app-text/gnome-doc-utils
 	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.22
 	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
 	doc? ( >=dev-util/gtk-doc-1.15 )"
 
 pkg_setup() {
 	DOCS="AUTHORS NEWS README TODO"
-	G2CONF="--disable-schemas-compile
+	G2CONF="${G2CONF}
+		--disable-schemas-compile
 		$(use_enable ipv6)"
 }
diff --git a/gnome-extra/gnome-search-tool/Manifest b/gnome-extra/gnome-search-tool/Manifest
index 8125e4f1..1178212c 100644
--- a/gnome-extra/gnome-search-tool/Manifest
+++ b/gnome-extra/gnome-search-tool/Manifest
@@ -1,3 +1 @@
-DIST gnome-search-tool-3.4.0.tar.xz 902664 RMD160 f17bd078f5a9245fc044e5756d59e0848fa95b8e SHA1 56096864e02adf0858af923e81cb5d818b63ba59 SHA256 6c4ed39ab1196d118e5e0d2a7faa07fbbb257831454ee92ff0c6f28c0942e69c
-EBUILD gnome-search-tool-3.4.0.ebuild 998 RMD160 205be64c58e14d76c88ce6e813663815dfcd8d57 SHA1 722add3342028d605befb13f55553eea6ce3f757 SHA256 b502e9b9fb249a9ac7135b20ea2e63e19cf9d5f1d94a2d30d87b137a4faed652
-EBUILD gnome-search-tool-9999.ebuild 998 RMD160 205be64c58e14d76c88ce6e813663815dfcd8d57 SHA1 722add3342028d605befb13f55553eea6ce3f757 SHA256 b502e9b9fb249a9ac7135b20ea2e63e19cf9d5f1d94a2d30d87b137a4faed652
+EBUILD gnome-search-tool-9999.ebuild 1127 RMD160 715e4f4c4f02a1923e854222f86550ab86ca08c7 SHA1 f744a4f3f82cd625169920bc36e4688ff086de5c SHA256 92a54eabef275f343dbf3ef7270d6a027cf69a932ee7180dbbc148620342002a
diff --git a/gnome-extra/gnome-search-tool/gnome-search-tool-3.4.0.ebuild b/gnome-extra/gnome-search-tool/gnome-search-tool-3.4.0.ebuild
deleted file mode 100644
index ae3e57e9..00000000
--- a/gnome-extra/gnome-search-tool/gnome-search-tool-3.4.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-DESCRIPTION="Search tool for GNOME 3"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 FDL-1.1"
-SLOT="0"
-IUSE=""
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-fi
-
-COMMON_DEPEND=">=dev-libs/glib-2.30.0:2
-	>=x11-libs/gtk+-3.0.0:3
-
-	gnome-base/gconf:2
-	gnome-base/libgtop:2
-	sys-apps/grep"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-extra/gnome-utils-3.4"
-# ${PN} was part of gnome-utils before 3.4
-DEPEND="${COMMON_DEPEND}
-	app-text/gnome-doc-utils
-	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.22
-	>=sys-devel/gettext-0.17"
-
-# xml doesn't validate with LINGUAS=ja
-RESTRICT="test"
-
-pkg_setup() {
-	DOCS="AUTHORS NEWS"
-	G2CONF="--disable-schemas-compile"
-}
diff --git a/gnome-extra/gnome-search-tool/gnome-search-tool-9999.ebuild b/gnome-extra/gnome-search-tool/gnome-search-tool-9999.ebuild
index ae3e57e9..b0504336 100644
--- a/gnome-extra/gnome-search-tool/gnome-search-tool-9999.ebuild
+++ b/gnome-extra/gnome-search-tool/gnome-search-tool-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 fi
 
 DESCRIPTION="Search tool for GNOME 3"
-HOMEPAGE="http://www.gnome.org/"
+HOMEPAGE="https://live.gnome.org/GnomeUtils"
 
 LICENSE="GPL-2 FDL-1.1"
 SLOT="0"
@@ -23,25 +23,29 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
 fi
 
-COMMON_DEPEND=">=dev-libs/glib-2.30.0:2
-	>=x11-libs/gtk+-3.0.0:3
-
+COMMON_DEPEND="dev-libs/atk
+	>=dev-libs/glib-2.30.0:2
 	gnome-base/gconf:2
-	gnome-base/libgtop:2
-	sys-apps/grep"
+	sys-apps/grep
+	x11-libs/gdk-pixbuf
+	>=x11-libs/gtk+-3.0.0:3
+	x11-libs/libICE
+	x11-libs/libSM"
 RDEPEND="${COMMON_DEPEND}
+	sys-apps/findutils
+	|| ( sys-apps/mlocate sys-freebsd/freebsd-ubin )
 	!<gnome-extra/gnome-utils-3.4"
 # ${PN} was part of gnome-utils before 3.4
 DEPEND="${COMMON_DEPEND}
 	app-text/gnome-doc-utils
 	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.22
-	>=sys-devel/gettext-0.17"
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig"
 
 # xml doesn't validate with LINGUAS=ja
 RESTRICT="test"
 
 pkg_setup() {
 	DOCS="AUTHORS NEWS"
-	G2CONF="--disable-schemas-compile"
+	G2CONF="${G2CONF} --disable-schemas-compile"
 }
diff --git a/gnome-extra/gnome-utils/Manifest b/gnome-extra/gnome-utils/Manifest
deleted file mode 100644
index 2855d86d..00000000
--- a/gnome-extra/gnome-utils/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-EBUILD gnome-utils-3.4.0.ebuild 604 RMD160 af18395510d13473621827583c87351b93f7b2ae SHA1 94f236360056a874812433ed5682f0e31ad5daa4 SHA256 ffa27a90cc540e3c696c124629e21bdec589f30091ece9a3e9493b6c6dcd74a1
diff --git a/gnome-extra/gnome-utils/gnome-utils-3.4.0.ebuild b/gnome-extra/gnome-utils/gnome-utils-3.4.0.ebuild
deleted file mode 100644
index 900e0bf3..00000000
--- a/gnome-extra/gnome-utils/gnome-utils-3.4.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-
-DESCRIPTION="Meta package for utilities for the GNOME desktop"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="as-is"
-SLOT="0"
-IUSE=""
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-
-DEPEND=""
-RDEPEND="
-	>=app-admin/gnome-system-log-${PV}
-	>=app-dicts/gnome-dictionary-${PV}
-	>=gnome-extra/gnome-search-tool-${PV}
-	>=media-gfx/gnome-font-viewer-${PV}
-	>=media-gfx/gnome-screenshot-${PV}
-	>=sys-apps/baobab-${PV}
-"
diff --git a/media-gfx/gnome-font-viewer/Manifest b/media-gfx/gnome-font-viewer/Manifest
index 262b9a7c..271d68f3 100644
--- a/media-gfx/gnome-font-viewer/Manifest
+++ b/media-gfx/gnome-font-viewer/Manifest
@@ -1,3 +1 @@
-DIST gnome-font-viewer-3.4.0.tar.xz 288116 RMD160 d37c16bc3a45445ace41cfffc1cca3e4a1e7cda7 SHA1 39616fb8f71083dfb2f8e1b1cfba391fd69fe059 SHA256 6311fc6e390b7ddfde4fbe5954452d0846a0b3991e9e52f179be3969e6033a76
-EBUILD gnome-font-viewer-3.4.0.ebuild 865 RMD160 87a4f8b907ddd6acaffd3e1bed584c83c46e7567 SHA1 bc8c694f7ff9ed7bc58a027bfdf91c35d80b360f SHA256 a360319d981c81c8abb644967da8da98aee1cf718a63b90784658370769ca1ef
-EBUILD gnome-font-viewer-9999.ebuild 865 RMD160 87a4f8b907ddd6acaffd3e1bed584c83c46e7567 SHA1 bc8c694f7ff9ed7bc58a027bfdf91c35d80b360f SHA256 a360319d981c81c8abb644967da8da98aee1cf718a63b90784658370769ca1ef
+EBUILD gnome-font-viewer-9999.ebuild 911 RMD160 358f00e604c801e7215bda7fbf8808fb8e8500ce SHA1 08380bbd32e67683231859775721f314069d7be2 SHA256 e9449decf9ac3b10d3555ac61621b6dbbbf418d1e278afe6c75e7c2969fb973b
diff --git a/media-gfx/gnome-font-viewer/gnome-font-viewer-3.4.0.ebuild b/media-gfx/gnome-font-viewer/gnome-font-viewer-3.4.0.ebuild
deleted file mode 100644
index ba9fc192..00000000
--- a/media-gfx/gnome-font-viewer/gnome-font-viewer-3.4.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-DESCRIPTION="Font viewer for GNOME 3"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-fi
-
-COMMON_DEPEND=">=dev-libs/glib-2.31.0:2
-	>=x11-libs/gtk+-3.0.3:3
-	media-libs/freetype:2"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-extra/gnome-utils-3.4"
-# ${PN} was part of gnome-utils before 3.4
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.22
-	>=sys-devel/gettext-0.17"
-
-pkg_setup() {
-	DOCS="NEWS"
-	G2CONF="--disable-schemas-compile"
-}
diff --git a/media-gfx/gnome-font-viewer/gnome-font-viewer-9999.ebuild b/media-gfx/gnome-font-viewer/gnome-font-viewer-9999.ebuild
index ba9fc192..6923926b 100644
--- a/media-gfx/gnome-font-viewer/gnome-font-viewer-9999.ebuild
+++ b/media-gfx/gnome-font-viewer/gnome-font-viewer-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 fi
 
 DESCRIPTION="Font viewer for GNOME 3"
-HOMEPAGE="http://www.gnome.org/"
+HOMEPAGE="https://live.gnome.org/GnomeUtils"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -24,17 +24,19 @@ else
 fi
 
 COMMON_DEPEND=">=dev-libs/glib-2.31.0:2
+	media-libs/freetype:2
+	x11-libs/cairo
 	>=x11-libs/gtk+-3.0.3:3
-	media-libs/freetype:2"
+	x11-libs/pango"
 RDEPEND="${COMMON_DEPEND}
 	!<gnome-extra/gnome-utils-3.4"
 # ${PN} was part of gnome-utils before 3.4
 DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.22
-	>=sys-devel/gettext-0.17"
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig"
 
 pkg_setup() {
 	DOCS="NEWS"
-	G2CONF="--disable-schemas-compile"
+	G2CONF="${G2CONF} --disable-schemas-compile"
 }
diff --git a/media-gfx/gnome-screenshot/Manifest b/media-gfx/gnome-screenshot/Manifest
index a70ec1e4..3d37da06 100644
--- a/media-gfx/gnome-screenshot/Manifest
+++ b/media-gfx/gnome-screenshot/Manifest
@@ -1,3 +1 @@
-DIST gnome-screenshot-3.4.1.tar.xz 264236 RMD160 f2d00639c990f0c40920f0de36ac3797cec26a42 SHA1 f91ee2830c783659d30ddfd6be93c15477c06ab9 SHA256 47c227e43404d6cc101cf473d8f48f7572064b2b10724f2660066f9a4718d488
-EBUILD gnome-screenshot-3.4.1.ebuild 1090 RMD160 99b8ffdb3522d7fde62580c3ddb7b09cca338a5b SHA1 4a6ae9715d3fd7df65929e756a848d7a646e8733 SHA256 8473e7da2b301be386888511a1de57a5968262cb603102e49e58522f3ee12512
-EBUILD gnome-screenshot-9999.ebuild 1090 RMD160 99b8ffdb3522d7fde62580c3ddb7b09cca338a5b SHA1 4a6ae9715d3fd7df65929e756a848d7a646e8733 SHA256 8473e7da2b301be386888511a1de57a5968262cb603102e49e58522f3ee12512
+EBUILD gnome-screenshot-9999.ebuild 1067 RMD160 0925c7bca40086d0032fa2f7a917d97a1374bb69 SHA1 e3e00375d81d37a1127cc75223e9bdacebc7f47e SHA256 d9131b2097307efcbd3153d02f619b7ff655777e08420831f97d360aafe42dab
diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-3.4.1.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-3.4.1.ebuild
deleted file mode 100644
index 542d8d22..00000000
--- a/media-gfx/gnome-screenshot/gnome-screenshot-3.4.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/gnome-utils-2.32.0-r1.ebuild,v 1.1 2010/12/04 18:08:10 pacho Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-DESCRIPTION="Screenshot utility for GNOME 3"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-fi
-
-# libcanberra 0.26-r2 is needed for gtk+:3 fixes
-COMMON_DEPEND=">=dev-libs/glib-2.31.0:2
-	>=x11-libs/gtk+-3.0.3:3
-	>=gnome-base/gsettings-desktop-schemas-0.1.0
-	>=media-libs/libcanberra-0.26-r2[gtk3]
-	x11-libs/libXext
-	x11-libs/libX11"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-extra/gnome-utils-3.4"
-# ${PN} was part of gnome-utils before 3.4
-DEPEND="${COMMON_DEPEND}
-	x11-proto/xextproto
-	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.9"
-
-pkg_setup() {
-	DOCS="NEWS"
-}
diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-9999.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-9999.ebuild
index 542d8d22..3992cd3d 100644
--- a/media-gfx/gnome-screenshot/gnome-screenshot-9999.ebuild
+++ b/media-gfx/gnome-screenshot/gnome-screenshot-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/gnome-utils-2.32.0-r1.ebuild,v 1.1 2010/12/04 18:08:10 pacho Exp $
+# $Header: $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 fi
 
 DESCRIPTION="Screenshot utility for GNOME 3"
-HOMEPAGE="http://www.gnome.org/"
+HOMEPAGE="https://live.gnome.org/GnomeUtils"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -25,19 +25,23 @@ fi
 
 # libcanberra 0.26-r2 is needed for gtk+:3 fixes
 COMMON_DEPEND=">=dev-libs/glib-2.31.0:2
-	>=x11-libs/gtk+-3.0.3:3
-	>=gnome-base/gsettings-desktop-schemas-0.1.0
 	>=media-libs/libcanberra-0.26-r2[gtk3]
-	x11-libs/libXext
-	x11-libs/libX11"
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	>=x11-libs/gtk+-3.0.3:3
+	x11-libs/libX11
+	x11-libs/libXext"
 RDEPEND="${COMMON_DEPEND}
+	>=gnome-base/gsettings-desktop-schemas-0.1.0
 	!<gnome-extra/gnome-utils-3.4"
 # ${PN} was part of gnome-utils before 3.4
 DEPEND="${COMMON_DEPEND}
 	x11-proto/xextproto
 	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.9"
+	virtual/pkgconfig"
 
 pkg_setup() {
 	DOCS="NEWS"
+	G2CONF="${G2CONF}
+		--disable-schemas-compile"
 }
diff --git a/sys-apps/baobab/Manifest b/sys-apps/baobab/Manifest
index 3dcc8142..9b212259 100644
--- a/sys-apps/baobab/Manifest
+++ b/sys-apps/baobab/Manifest
@@ -1,3 +1 @@
-DIST baobab-3.4.1.tar.xz 826356 RMD160 e59697e7ec642042045aa1f5bd73360d29405626 SHA1 f89ef33c855451818adcac962150d5587386b58e SHA256 0c9743caf8cdc6dd69d694453cd57816c1ca0514cf51111022846088021949f7
-EBUILD baobab-3.4.1.ebuild 950 RMD160 87d5475cfb3b2f1db64814aff614eb7c7d0c2d80 SHA1 c8c82d4e184c4ad2f28ae5867eb06f4da68bdba7 SHA256 75cd05051b2c01e076fe305b0019f3b15de3c7f73b19dc64cb91dc937c9e296c
-EBUILD baobab-9999.ebuild 950 RMD160 87d5475cfb3b2f1db64814aff614eb7c7d0c2d80 SHA1 c8c82d4e184c4ad2f28ae5867eb06f4da68bdba7 SHA256 75cd05051b2c01e076fe305b0019f3b15de3c7f73b19dc64cb91dc937c9e296c
+EBUILD baobab-9999.ebuild 1055 RMD160 16d3edd38d8928e72ae42a41e5b37d715894ff5c SHA1 f5b2e0875b3356bb92a2910898212836de9f2015 SHA256 5395c2fa9a1d9e0463d05814569fc0d644abf853998d9204b5ef241fe2ca6610
diff --git a/sys-apps/baobab/baobab-3.4.1.ebuild b/sys-apps/baobab/baobab-3.4.1.ebuild
deleted file mode 100644
index dcf256de..00000000
--- a/sys-apps/baobab/baobab-3.4.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-DESCRIPTION="Disk usage browser for GNOME 3"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 FDL-1.1"
-SLOT="0"
-IUSE=""
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-fi
-
-COMMON_DEPEND=">=dev-libs/glib-2.30.0:2
-	>=x11-libs/gtk+-3.3.18:3
-	
-	gnome-base/libgtop:2"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-extra/gnome-utils-3.4"
-# ${PN} was part of gnome-utils before 3.4
-DEPEND="${COMMON_DEPEND}
-	dev-util/itstool
-	dev-libs/libxml2:2
-	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.22
-	>=sys-devel/gettext-0.17"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-	G2CONF="--disable-schemas-compile"
-}
diff --git a/sys-apps/baobab/baobab-9999.ebuild b/sys-apps/baobab/baobab-9999.ebuild
index dcf256de..2ee18780 100644
--- a/sys-apps/baobab/baobab-9999.ebuild
+++ b/sys-apps/baobab/baobab-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 fi
 
 DESCRIPTION="Disk usage browser for GNOME 3"
-HOMEPAGE="http://www.gnome.org/"
+HOMEPAGE="https://live.gnome.org/GnomeUtils"
 
 LICENSE="GPL-2 FDL-1.1"
 SLOT="0"
@@ -24,20 +24,24 @@ else
 fi
 
 COMMON_DEPEND=">=dev-libs/glib-2.30.0:2
+	gnome-base/libgtop:2
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
 	>=x11-libs/gtk+-3.3.18:3
-	
-	gnome-base/libgtop:2"
+	x11-libs/pango"
 RDEPEND="${COMMON_DEPEND}
+	gnome-base/gsettings-desktop-schemas
 	!<gnome-extra/gnome-utils-3.4"
 # ${PN} was part of gnome-utils before 3.4
 DEPEND="${COMMON_DEPEND}
 	dev-util/itstool
 	dev-libs/libxml2:2
 	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.22
-	>=sys-devel/gettext-0.17"
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig"
 
 pkg_setup() {
 	DOCS="AUTHORS ChangeLog NEWS README TODO"
-	G2CONF="--disable-schemas-compile"
+	G2CONF="${G2CONF}
+		--disable-schemas-compile"
 }