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.

(Portage version: 2.1.5_rc2, RepoMan options: --force)

4 files changed, 36 insertions, 9 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/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}