Raise gtk+ dependencies version, bug #153969

(Portage version: 2.1.2_rc1-r3)
 (Signed Manifest commit)

3 files changed, 18 insertions, 104 deletions

diff --git a/gnome-base/control-center/Manifest b/gnome-base/control-center/Manifest
index b933ebd10854..898e513ab438 100644
--- a/gnome-base/control-center/Manifest
+++ b/gnome-base/control-center/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX control-center-1.4.0.5-cflags.patch 744 RMD160 ff6037cf0346a87164183c6c8eeb6b7a88539ce1 SHA1 5ece0bd4b5fb59c0fe9f563382f4948e2db5f083 SHA256 fec02a1e8ec40fca0591eeeb1f41bb0d8acf592a56a383f7f2dce9fffe13baa3
 MD5 dbc915ad73576e8f0ae8a948e52fb621 files/control-center-1.4.0.5-cflags.patch 744
 RMD160 ff6037cf0346a87164183c6c8eeb6b7a88539ce1 files/control-center-1.4.0.5-cflags.patch 744
@@ -54,7 +57,6 @@ DIST control-center-1.4.0.5.tar.bz2 3382798 RMD160 e410127108d6990f787ba502daed9
 DIST control-center-2.10.2.tar.bz2 2833639 RMD160 6c73d3c2c00fee3ee774bf0a10994af00af73625 SHA1 96daf4aff313bb9ee0abbb2b23af15cebd92206b SHA256 5b29e60e401dbaa76aa945d17be9b64e0052101610359199c4190dc6f251b7c9
 DIST control-center-2.12.3.tar.bz2 1787009 RMD160 615d843d1050570a7a7ba54abfa8888608c983d9 SHA1 0c28c0f8c3318e315d29735a83cd22f4146408e0 SHA256 c25fd622f737037aa71c44dc9cdc3a1e9248408938e7fdfbbb60eba18c1192d8
 DIST control-center-2.14.2.tar.bz2 1864719 RMD160 7c144f408245cace7c73c13432c900ae66dc190c SHA1 56f9dba38247712af97af6ec27cf6d4c7eca4206 SHA256 c0b428127f0e57921a36aff246f4a1b9d71c727506794afe7a778c2095b740d8
-DIST control-center-2.16.0.tar.bz2 1986964 RMD160 85c8d8de2d9643581c89f468e1714be049c375af SHA1 c73e614c3ba287202ca12f19029f15bab293690b SHA256 370db3afbba4e519f1f3ce8948fbc024067da0cbc75814631052d37374d102a1
 DIST control-center-2.16.1.tar.bz2 1992731 RMD160 13924bd1f0f3bd7c223a63e2479237a6c67b4c53 SHA1 8f2342f904cec38425db3f6089a2aee1dbf319bc SHA256 eb78914d1d783e06c7b2ae04adf738750b6c00d146a47d591497a9a354afbb35
 EBUILD control-center-1.4.0.5-r1.ebuild 1328 RMD160 d876a5c264f381708eec62482fe5560cf1d7404c SHA1 3495deabf47967f0e4ca248d04fb9adaddeae3e8 SHA256 33c1359cb5f668796a6617d915fa6b752f04ceab3a12aaaf2ccd6104ea8d3069
 MD5 c816872cce3a9c6b1abcf320f2eb4c63 control-center-1.4.0.5-r1.ebuild 1328
@@ -80,18 +82,14 @@ EBUILD control-center-2.14.2.ebuild 2444 RMD160 689ba4fe0b7468731183154ff10ae5ac
 MD5 983f7e1a0d21717ee1ced77ae71f38b9 control-center-2.14.2.ebuild 2444
 RMD160 689ba4fe0b7468731183154ff10ae5acbe69bd54 control-center-2.14.2.ebuild 2444
 SHA256 79231146c56b8b159171ed3f860c8d7785e972b89c47a70252b120078c25a1f1 control-center-2.14.2.ebuild 2444
-EBUILD control-center-2.16.0.ebuild 2239 RMD160 16650eff74bb25b7d5ca34c97d7de586de4db4b6 SHA1 a98b94904805b4c52a5fa54d6e5faa87c32101fa SHA256 f1001a5f35215ae9ebe25bc71d3dcb99ec9066a45f01e4c3babc96b3b12066af
-MD5 5426fa0271f62b0df606ffad0019a563 control-center-2.16.0.ebuild 2239
-RMD160 16650eff74bb25b7d5ca34c97d7de586de4db4b6 control-center-2.16.0.ebuild 2239
-SHA256 f1001a5f35215ae9ebe25bc71d3dcb99ec9066a45f01e4c3babc96b3b12066af control-center-2.16.0.ebuild 2239
-EBUILD control-center-2.16.1.ebuild 2211 RMD160 9ee9920f1f66cd8b026e83b8ff9c862032d3780e SHA1 33102b2ec6d5a58ee767af962290c1e883a4d235 SHA256 776c0aa590bc3d49801c43ff636aaf45bf6d8e16cb0ef199ae3adaa4aefee429
-MD5 71789bc134a7e1aae76571a5234ef9f4 control-center-2.16.1.ebuild 2211
-RMD160 9ee9920f1f66cd8b026e83b8ff9c862032d3780e control-center-2.16.1.ebuild 2211
-SHA256 776c0aa590bc3d49801c43ff636aaf45bf6d8e16cb0ef199ae3adaa4aefee429 control-center-2.16.1.ebuild 2211
-MISC ChangeLog 26894 RMD160 dbb6a231266958f992d7931fa5d9383330c3e44a SHA1 877a11d9188ca18d637ba9773d403e50ad4df6da SHA256 fccf9d812c56741d8f9c2cbc8d3ab366fbe39baf5ca81257dcf0002943485598
-MD5 58e8cad5d837d724829f4ba26e19583e ChangeLog 26894
-RMD160 dbb6a231266958f992d7931fa5d9383330c3e44a ChangeLog 26894
-SHA256 fccf9d812c56741d8f9c2cbc8d3ab366fbe39baf5ca81257dcf0002943485598 ChangeLog 26894
+EBUILD control-center-2.16.1.ebuild 2207 RMD160 77d3eddb52331170aaf21b5e19f88cb8959dd204 SHA1 de360c4e8d2e37d66b97004c81975923dedf04ac SHA256 dafe848c101abb189d377e945f8fd63858c759faf86c9bd6ef9e16d1ad5f5fa3
+MD5 dc2914bccab9cacdb1c4a14c4ddf6748 control-center-2.16.1.ebuild 2207
+RMD160 77d3eddb52331170aaf21b5e19f88cb8959dd204 control-center-2.16.1.ebuild 2207
+SHA256 dafe848c101abb189d377e945f8fd63858c759faf86c9bd6ef9e16d1ad5f5fa3 control-center-2.16.1.ebuild 2207
+MISC ChangeLog 27048 RMD160 701aa4d4105c7ee07770301c5116c984a2849f69 SHA1 e80572777759fc66a098d739af85fd99a5ea2ac3 SHA256 d9e8982ebb4cad9dc9896678a00f5cc626b31d23aebc5cea3bc869f72d35a54e
+MD5 8998cfab342027c0cd753107d01830eb ChangeLog 27048
+RMD160 701aa4d4105c7ee07770301c5116c984a2849f69 ChangeLog 27048
+SHA256 d9e8982ebb4cad9dc9896678a00f5cc626b31d23aebc5cea3bc869f72d35a54e ChangeLog 27048
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -114,9 +112,13 @@ SHA256 364fe045ac062bb65a0efa57ceaf2a28a1aa7791f94ab023deb01417fce4a351 files/di
 MD5 38815455f27e1d69dbbf2b2edb35035f files/digest-control-center-2.14.2 271
 RMD160 203deb01d53e54566a3d7a8bc477ad6cdeacca40 files/digest-control-center-2.14.2 271
 SHA256 3bf3043fb1d93928d2672697ddfd129eda99445af22cf40aff730ad11cbe6d14 files/digest-control-center-2.14.2 271
-MD5 f8eb8d248e832cd54f8b73314a6420b4 files/digest-control-center-2.16.0 271
-RMD160 3333d9ec822106a598988f301ab070f2906d836f files/digest-control-center-2.16.0 271
-SHA256 012ed204a12c6b74819030e4a8e2bd531c5e822d094df23f1476bb982e9b5229 files/digest-control-center-2.16.0 271
 MD5 f7ce3794ea17c413976b24b68f9eecf1 files/digest-control-center-2.16.1 271
 RMD160 1398e03c49df4e861133b960d230d1745e9ef081 files/digest-control-center-2.16.1 271
 SHA256 56cf6118a6e83f6082578f4f4d3638e3f93d337566f438454903e643269e8951 files/digest-control-center-2.16.1 271
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFTWqjkeYb6olFHJcRAp0CAJ9OUUEs9S+wo47622aCTZ5yyIQolQCbBJlT
+R4kWCYFFIMKR3IwmIIdPEIY=
+=fIhm
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/control-center/control-center-2.16.0.ebuild b/gnome-base/control-center/control-center-2.16.0.ebuild
deleted file mode 100644
index 7419c196a4b6..000000000000
--- a/gnome-base/control-center/control-center-2.16.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.16.0.ebuild,v 1.5 2006/10/14 21:29:49 vapier Exp $
-
-inherit eutils gnome2 autotools
-
-DESCRIPTION="The gnome2 Desktop configuration tool"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="alsa eds"
-
-RDEPEND=">=gnome-base/gnome-vfs-2.2
-		>=media-libs/fontconfig-1
-		>=virtual/xft-2.1.2
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXdmcp
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXxf86misc
-		x11-libs/libXau
-		>=dev-libs/glib-2.8
-		>=x11-libs/gtk+-2.8.12
-		>=gnome-base/libbonobo-2
-		>=gnome-base/libgnomeui-2.2
-		>=gnome-base/nautilus-2.6
-		>=gnome-base/gconf-2
-		>=gnome-base/libglade-2
-		>=gnome-base/libbonoboui-2.2
-		>=gnome-base/gnome-desktop-2.2
-		>=gnome-base/gnome-menus-2.11.1
-		media-sound/esound
-		>=sys-apps/hal-0.5.6
-		>=sys-apps/dbus-0.60
-		>=x11-wm/metacity-2.8.6-r1
-		>=x11-libs/libxklavier-2.91
-		>=gnome-base/libgnome-2.2
-		media-libs/freetype
-		>=gnome-base/orbit-2.12.4
-		eds? ( >=gnome-extra/evolution-data-server-1.7 )
-		!arm? ( alsa? ( >=media-libs/alsa-lib-0.9 ) )
-		>=media-libs/gst-plugins-base-0.10.2
-		>=media-libs/gstreamer-0.10.2"
-
-DEPEND="${RDEPEND}
-		x11-proto/kbproto
-		x11-proto/xextproto
-		x11-libs/libxkbfile
-		x11-proto/xf86miscproto
-		x11-proto/scrnsaverproto
-		sys-devel/gettext
-		>=dev-util/pkgconfig-0.9
-		>=dev-util/intltool-0.35
-		>=app-text/gnome-doc-utils-0.3.2
-		app-text/scrollkeeper
-		dev-util/desktop-file-utils"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-pkg_setup() {
-	G2CONF="${G2CONF} --disable-schemas-install \
-		--disable-scrollkeeper  \
-		--enable-vfs-methods    \
-		--enable-gstreamer=0.10 \
-		$(use_enable alsa)      \
-		$(use_enable eds aboutme)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Gentoo-specific support for xcursor themes. See bug #103638.
-	epatch ${FILESDIR}/${PN}-2.11-gentoo_xcursor.patch
-
-	# Disable the master pty check, as it causes sandbox violations
-	epatch ${FILESDIR}/${PN}-2.13.5-disable-master-pty.patch
-
-	eautoreconf
-	intltoolize --force || die
-}
diff --git a/gnome-base/control-center/files/digest-control-center-2.16.0 b/gnome-base/control-center/files/digest-control-center-2.16.0
deleted file mode 100644
index fb7a54c86de2..000000000000
--- a/gnome-base/control-center/files/digest-control-center-2.16.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 20535dc3918d896c1a1087eff003ee27 control-center-2.16.0.tar.bz2 1986964
-RMD160 85c8d8de2d9643581c89f468e1714be049c375af control-center-2.16.0.tar.bz2 1986964
-SHA256 370db3afbba4e519f1f3ce8948fbc024067da0cbc75814631052d37374d102a1 control-center-2.16.0.tar.bz2 1986964