nasty hack for GRP, until control-center can depend on xscreensaver with gtk2 set (coming soon from carpaski)

2 files changed, 19 insertions, 10 deletions

diff --git a/gnome-base/gnome/Manifest b/gnome-base/gnome/Manifest
index 2fdd4bd6f27b..cca3fdcef885 100644
--- a/gnome-base/gnome/Manifest
+++ b/gnome-base/gnome/Manifest
@@ -1,16 +1,16 @@
-MD5 2ee7ea06ba8aef3778690ed30cfe8099 ChangeLog 11577
-MD5 62587f12a4bf9171c69dda499286c525 gnome-1.4-r3.ebuild 546
+MD5 a3100cffb675906c74de356954b56e7d gnome-2.4_rc1.ebuild 4863
+MD5 2aa5dc093b8939d139e6efda4e6df880 gnome-2.2.2-r1.ebuild 3351
 MD5 829e58075181f24871af3529b98fd377 gnome-2.2.2.ebuild 2823
+MD5 62587f12a4bf9171c69dda499286c525 gnome-1.4-r3.ebuild 546
 MD5 6c88b8de6fd0ddc5e9e2ed0dcc5a1042 gnome-2.0.2-r1.ebuild 2508
 MD5 8f82155cd8e32aa46906ea912c14b021 gnome-2.2-r2.ebuild 3250
 MD5 cf259f67a6df17377ef98537d600d199 gnome-2.2.1.ebuild 3223
+MD5 2ee7ea06ba8aef3778690ed30cfe8099 ChangeLog 11577
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 f1731fe7612dd67ca57c9d8462c627aa gnome-2.2.2-r1.ebuild 2866
-MD5 a3100cffb675906c74de356954b56e7d gnome-2.4_rc1.ebuild 4863
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-1.4-r3 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.2.1 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.2.2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.4_rc1 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.0.2-r1 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.2-r2 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.2.1 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.2.2-r1 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.4_rc1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-1.4-r3 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.2-r2 0
diff --git a/gnome-base/gnome/gnome-2.2.2-r1.ebuild b/gnome-base/gnome/gnome-2.2.2-r1.ebuild
index dc40bff6ca60..e35c89d61b8e 100644
--- a/gnome-base/gnome/gnome-2.2.2-r1.ebuild
+++ b/gnome-base/gnome/gnome-2.2.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.2.2-r1.ebuild,v 1.5 2003/09/06 23:51:37 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.2.2-r1.ebuild,v 1.6 2003/09/11 03:32:43 drobbins Exp $
 
 S=${WORKDIR}
 DESCRIPTION="Meta package for the GNOME desktop."
@@ -19,6 +19,13 @@ KEYWORDS="x86 ~ppc ~alpha ~sparc ~hppa ~amd64"
 #  dependencies pull in what you remove.
 #  With "emerge gnome" a user expects the full "standard" distribution of Gnome and should be provided with that, consider only installing the parts needed for smaller installations.
 
+#drobbins, 10 Sep 2003; xscreensaver added to deps with a bindist? conditional
+#this is a hack to get GRP working right (to get xscreensaver installed) until
+#we can get control-center to RDEPEND on xscreensaver with gtk2 in USE. Carpaski
+#will be adding this soon; when this happens, the xscreensaver should be removed
+#from here and something like this should be added to RDEPEND (not DEPEND) in
+#control-center: "x11-misc/xscreensaver[gtk2]"
+
 RDEPEND="!gnome-base/gnome-core
 
 	>=dev-util/intltool-0.26
@@ -75,7 +82,9 @@ RDEPEND="!gnome-base/gnome-core
 	>=app-arch/file-roller-2.2.5
 	>=gnome-extra/acme-2.0.6
 	>=app-text/ggv-2.0.1
-
+	
+	bindist? ( x11-misc/xscreensaver )
+	
 	!hppa? ( !alpha? (
 		>=gnome-extra/gnome-media-2.2.2
 		>=gnome-extra/nautilus-media-0.2.2