Remove gnome-system-tools 2.14 from RDEPEND to all because it is starting to cause more headache to keep it than to mask it. Supports only s-t-b-1 anyway.

Package-Manager: portage-2.1.5_rc2
RepoMan-Options: --force

5 files changed, 43 insertions, 16 deletions

diff --git a/gnome-base/gnome-applets/ChangeLog b/gnome-base/gnome-applets/ChangeLog
index a0573f368888..0d017babcaef 100644
--- a/gnome-base/gnome-applets/ChangeLog
+++ b/gnome-base/gnome-applets/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gnome-applets
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.257 2008/04/09 22:24:59 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.258 2008/04/12 14:35:49 eva Exp $
+
+  12 Apr 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  gnome-applets-2.20.1.ebuild, gnome-applets-2.22.0.ebuild,
+  gnome-applets-2.22.1.ebuild:
+  Remove gnome-system-tools 2.14 from RDEPEND to all because it is starting
+  to cause more headache to keep it than to mask it. Supports only s-t-b-1
+  anyway.
 
 *gnome-applets-2.22.1 (09 Apr 2008)
 
diff --git a/gnome-base/gnome-applets/Manifest b/gnome-base/gnome-applets/Manifest
index 59f95b24ae83..9349917ce259 100644
--- a/gnome-base/gnome-applets/Manifest
+++ b/gnome-base/gnome-applets/Manifest
@@ -4,15 +4,15 @@ Hash: SHA1
 DIST gnome-applets-2.20.1.tar.bz2 7490737 RMD160 f8e10ebccd43fbb147f580fcb2a949e9e5331063 SHA1 de6258cae42a827dbd4c3f1479d80157838dacc7 SHA256 d9ac9c48c007aa1444a60e947bd95359ac3e4998b074d8613082755aa22c87a8
 DIST gnome-applets-2.22.0.tar.bz2 6923842 RMD160 b177d0e87706e0f99b308f629886f04ab5bb488e SHA1 26d9f74e5f3264cb53893b5b631d95633e073d27 SHA256 d63979ad23873a2ba0f9e36a399c1fedf8311da7f7dd65d4288f5da99e4c150b
 DIST gnome-applets-2.22.1.tar.bz2 7230966 RMD160 ff4cca7274a090bff144202a2292ea99b9781749 SHA1 ffcca6e35328006332b0f5e7f8a94e77e28b14b1 SHA256 9154ba13e85ca5c0b90752f94a39fa976b28791eb1460139af16dd9d9d8bf88b
-EBUILD gnome-applets-2.20.1.ebuild 3214 RMD160 349b5d313369b784d6914732439e2c45f82bb1d6 SHA1 0f21523fe0ce7f8ca9f48e4a57a8cb3040693dbd SHA256 5dfcbd06c46b67da852bc55bbb5c9dee6236cb512e7fcf4d22bfe4b656e9fa17
-EBUILD gnome-applets-2.22.0.ebuild 3382 RMD160 795d8f054fa2859d9ceafd1b48c378573afb921b SHA1 5a26c869e95c3d45468262ef95afe202ede403b9 SHA256 8373c9ec8f1c18a6255dc405850dd9f17ede8a71ffd81b6e73d2f1f23bf937c0
-EBUILD gnome-applets-2.22.1.ebuild 3355 RMD160 ff4809dfa27c0fb838e1952e5c597c438b37c8a7 SHA1 6a7c09fffbe958372775513baa1450b0ceb74c32 SHA256 98554c1ec3c692d743995d91105f909b37786b26f3806e69b250b0b9642536ed
-MISC ChangeLog 36537 RMD160 91c588119ff3d684c2b1e2c128570e77eda1077a SHA1 27406c295ec9fd12f00b412031e1995457c1e6a8 SHA256 5f9d3f9c26bae80bd3835ab8060bbdf367417ae23b7d6c7601ccb449961c4b70
+EBUILD gnome-applets-2.20.1.ebuild 3438 RMD160 4e8d55b2efcaf9203019e4e56086e0f013060b65 SHA1 40491a5130575e1087ef178fdea7d7b28eb73f49 SHA256 c7a5208dbe34201c11d4b9282c90aeab3874d2cbd17cce9c759069831e8d382c
+EBUILD gnome-applets-2.22.0.ebuild 3611 RMD160 6099761fb9e625adbff23b176d39382f1ed51409 SHA1 c2231110a038f353e654ed75a158a89c08adda9c SHA256 f89c6cd8d21410f102a824494d37c428cdb8cae8ec434a9c3f9b45c1b627636e
+EBUILD gnome-applets-2.22.1.ebuild 3584 RMD160 2681f62eb30bbec75ddf8aa003950521bf36db76 SHA1 15e358d5e499c2ce3793d19065ae237c4e12bb75 SHA256 a83c8a7d4f89816930bffa995fa895c22845ca1600843af99ded8aa0353bc669
+MISC ChangeLog 36844 RMD160 ebb63a5bf483986c3bdb955968358ef8ccd227b4 SHA1 4324a269fcd79df47fd7392d0d556a1ffd1c479e SHA256 53b7e166369395d3475b7726a0f75b26cfbda95ab245249b612b5e608a25a9b5
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkf9Qk0ACgkQ1fmVwcYIWAaDUACg0e6QKN7F1whr8nOFZ0sD0GoH
-P6cAoK/HwyIQRxP1oGf/m6XYUjsbwfPd
-=Ztpj
+iEYEARECAAYFAkgAyNIACgkQ1fmVwcYIWAbOaQCghvs3R40FHzB6JmuQ5eIXk4ry
+sFsAoImQ2xzgwZfwXmAtLfcg4nroQKaU
+=Fhkj
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-applets/gnome-applets-2.20.1.ebuild b/gnome-base/gnome-applets/gnome-applets-2.20.1.ebuild
index cdba5e680e82..70beb7ccd9f3 100644
--- a/gnome-base/gnome-applets/gnome-applets-2.20.1.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-2.20.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.20.1.ebuild,v 1.9 2008/03/24 18:14:33 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.20.1.ebuild,v 1.10 2008/04/12 14:35:49 eva Exp $
 
 inherit eutils gnome2 autotools python
 
@@ -22,7 +22,6 @@ RDEPEND=">=x11-libs/gtk+-2.11
 		>=gnome-base/gail-1.1
 		>=x11-libs/libxklavier-2.91
 		>=x11-libs/libwnck-2.9.3
-		>=app-admin/system-tools-backends-1.1.3
 		>=gnome-base/gnome-desktop-2.11.1
 		>=x11-libs/libnotify-0.3.2
 		hal? ( >=sys-apps/hal-0.5.3 )
@@ -48,6 +47,11 @@ RDEPEND=">=x11-libs/gtk+-2.11
 						>=media-libs/gst-plugins-base-0.10.2
 					)"
 
+# Remove gnome-system-tools 2.14 from RDEPEND to all because it is starting
+# to cause more headache to keep it than to mask it. Supports only s-t-b-1
+# anyway.
+#	>=app-admin/system-tools-backends-1.1.3
+
 DEPEND="${RDEPEND}
 		>=app-text/scrollkeeper-0.1.4
 		>=app-text/gnome-doc-utils-0.3.2
@@ -97,7 +101,9 @@ src_install() {
 
 	APPLETS="accessx-status battstat charpick cpufreq drivemount geyes \
 			 gkb-new gswitchit gweather invest-applet mini-commander \
-			 mixer modemlights multiload null_applet stickynotes trashapplet"
+			 mixer multiload null_applet stickynotes trashapplet"
+
+	# modemlights is out because it needs system-tools-backends-1
 
 	for applet in ${APPLETS} ; do
 		docinto ${applet}
@@ -119,7 +125,7 @@ pkg_postinst() {
 
 	# check for new python modules on bumps
 	python_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/invest
+	python_mod_optimize "${ROOT}"/usr/$(get_libdir)/python${PYVER}/site-packages/invest
 }
 
 pkg_postrm() {
diff --git a/gnome-base/gnome-applets/gnome-applets-2.22.0.ebuild b/gnome-base/gnome-applets/gnome-applets-2.22.0.ebuild
index be18faa06789..291658ce666c 100644
--- a/gnome-base/gnome-applets/gnome-applets-2.22.0.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-2.22.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.22.0.ebuild,v 1.1 2008/03/24 18:14:33 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.22.0.ebuild,v 1.2 2008/04/12 14:35:49 eva Exp $
 
 inherit eutils gnome2 autotools python
 
@@ -25,7 +25,6 @@ RDEPEND=">=x11-libs/gtk+-2.11
 		>=gnome-base/gail-1.1
 		>=x11-libs/libxklavier-2.91
 		>=x11-libs/libwnck-2.9.3
-		>=app-admin/system-tools-backends-1.1.3
 		>=gnome-base/gnome-desktop-2.11.1
 		>=x11-libs/libnotify-0.3.2
 		hal? ( >=sys-apps/hal-0.5.3 )
@@ -51,6 +50,12 @@ RDEPEND=">=x11-libs/gtk+-2.11
 						>=media-libs/gstreamer-0.10.2
 						>=media-libs/gst-plugins-base-0.10.14
 					)"
+
+# Remove gnome-system-tools 2.14 from RDEPEND to all because it is starting
+# to cause more headache to keep it than to mask it. Supports only s-t-b-1
+# anyway.
+#   >=app-admin/system-tools-backends-1.1.3
+
 DEPEND="${RDEPEND}
 		>=app-text/scrollkeeper-0.1.4
 		>=app-text/gnome-doc-utils-0.3.2
@@ -99,6 +104,8 @@ src_install() {
 			 gkb-new gswitchit gweather invest-applet mini-commander \
 			 mixer modemlights multiload null_applet stickynotes trashapplet"
 
+	# modemlights is out because it needs system-tools-backends-1
+
 	for applet in ${APPLETS} ; do
 		docinto ${applet}
 
diff --git a/gnome-base/gnome-applets/gnome-applets-2.22.1.ebuild b/gnome-base/gnome-applets/gnome-applets-2.22.1.ebuild
index 88aa7deefd98..b1dff8742aff 100644
--- a/gnome-base/gnome-applets/gnome-applets-2.22.1.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-2.22.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.22.1.ebuild,v 1.1 2008/04/09 22:24:59 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.22.1.ebuild,v 1.2 2008/04/12 14:35:49 eva Exp $
 
 inherit eutils gnome2 autotools python
 
@@ -25,7 +25,6 @@ RDEPEND=">=x11-libs/gtk+-2.11
 		>=gnome-base/gail-1.1
 		>=x11-libs/libxklavier-2.91
 		>=x11-libs/libwnck-2.9.3
-		>=app-admin/system-tools-backends-1.1.3
 		>=gnome-base/gnome-desktop-2.11.1
 		>=x11-libs/libnotify-0.3.2
 		hal? ( >=sys-apps/hal-0.5.3 )
@@ -50,6 +49,12 @@ RDEPEND=">=x11-libs/gtk+-2.11
 						>=media-libs/gstreamer-0.10.2
 						>=media-libs/gst-plugins-base-0.10.14
 					)"
+
+# Remove gnome-system-tools 2.14 from RDEPEND to all because it is starting
+# to cause more headache to keep it than to mask it. Supports only s-t-b-1
+# anyway.
+#   >=app-admin/system-tools-backends-1.1.3
+
 DEPEND="${RDEPEND}
 		>=app-text/scrollkeeper-0.1.4
 		>=app-text/gnome-doc-utils-0.3.2
@@ -98,6 +103,8 @@ src_install() {
 			 gkb-new gswitchit gweather invest-applet mini-commander \
 			 mixer modemlights multiload null_applet stickynotes trashapplet"
 
+	# modemlights is out because it needs system-tools-backends-1
+
 	for applet in ${APPLETS} ; do
 		docinto ${applet}