Fixing dependency so it matches the terms of configure flags. Bug was occuring where +gtk -gtk2 -gnome was configuring with gdk-pixbuf but not depending on it.

Package-Manager: portage-2.0.51.16

5 files changed, 19 insertions, 14 deletions

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index 91818cce1f3c..31a8b9cc995c 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/xscreensaver
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.72 2005/01/27 00:32:43 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.73 2005/02/24 20:45:34 rizzo Exp $
+
+  24 Feb 2005; Don Seiler <rizzo@gentoo.org> xscreensaver-4.16.ebuild:
+  Fixing dependency so it matches the terms of configure flags. Bug was
+  occuring where +gtk -gtk2 -gnome was configuring with gdk-pixbuf but not
+  depending on it.
 
   26 Jan 2005; Michael Sterrett <mr_bones_@gentoo.org>
   xscreensaver-4.16.ebuild:
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 585abc8282ff..0b1789bd2f87 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,14 +1,14 @@
+MD5 bca90a42b93f03f7348168ab67dad949 ChangeLog 13110
 MD5 0c7e1c065d3ff356793aa700b36c3380 metadata.xml 309
-MD5 f7269e39c856dde9458c35530b56c2cd xscreensaver-4.14-r2.ebuild 4662
-MD5 6383f0e6d255a3ad1e635c8183ea4769 xscreensaver-4.16.ebuild 4825
-MD5 404f5ad50027483afdafbeb94ed65b7d ChangeLog 12876
-MD5 2b170a39f61d52a4571fd5a8d8d1fecf xscreensaver-4.15.ebuild 4508
-MD5 0722c17c948e57fa839a1c5acbdc5f22 files/digest-xscreensaver-4.16 70
+MD5 f934f262880ab5604c675d1b031dd437 xscreensaver-4.14-r2.ebuild 4661
+MD5 0e62ff1b856345ffcc2de00ca43af8eb xscreensaver-4.15.ebuild 4507
+MD5 763f28f501a192b28b5322206bcae0ab xscreensaver-4.16.ebuild 4820
+MD5 a7b4dde4c87b97301e1a02c7ddc2dfc9 files/digest-xscreensaver-4.14-r2 70
 MD5 f6238a0e5ee2c4c61bbec5441e439750 files/digest-xscreensaver-4.15 70
 MD5 dc4579312065187f296cd6fdeba96664 files/xscreensaver-4.10-norpm.patch 1266
 MD5 8bd9730fb1f84b69efac29fab28d0db2 files/xscreensaver-4.14-analogtv_tmp.patch 419
 MD5 23c5d8085eb70d6dc6168857a31cc284 files/xscreensaver-4.14-fortune.patch 348
-MD5 cd227d954dff63ea80266d1db213b15f files/xscreensaver-4.16-nsfw.patch 1586
-MD5 a7b4dde4c87b97301e1a02c7ddc2dfc9 files/digest-xscreensaver-4.14-r2 70
 MD5 18988e2c62fe964e00bc98c251dba3ee files/xscreensaver-4.14-icc.patch 8126
+MD5 0722c17c948e57fa839a1c5acbdc5f22 files/digest-xscreensaver-4.16 70
+MD5 cd227d954dff63ea80266d1db213b15f files/xscreensaver-4.16-nsfw.patch 1586
 MD5 6eb40b28a36f889d0f1919cdbf160ef7 files/pam.d/xscreensaver 79
diff --git a/x11-misc/xscreensaver/xscreensaver-4.14-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-4.14-r2.ebuild
index 98ac9a7606aa..ff1ca62cbfe9 100644
--- a/x11-misc/xscreensaver/xscreensaver-4.14-r2.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-4.14-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.14-r2.ebuild,v 1.8 2005/01/27 10:57:15 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.14-r2.ebuild,v 1.9 2005/02/24 20:45:34 rizzo Exp $
 
 inherit eutils
 
diff --git a/x11-misc/xscreensaver/xscreensaver-4.15.ebuild b/x11-misc/xscreensaver/xscreensaver-4.15.ebuild
index dbbc63a09db5..f82b1ea22636 100644
--- a/x11-misc/xscreensaver/xscreensaver-4.15.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-4.15.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.15.ebuild,v 1.13 2005/01/27 10:57:15 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.15.ebuild,v 1.14 2005/02/24 20:45:34 rizzo Exp $
 
 inherit eutils
 
diff --git a/x11-misc/xscreensaver/xscreensaver-4.16.ebuild b/x11-misc/xscreensaver/xscreensaver-4.16.ebuild
index 95d714208bdc..5fc8fa884215 100644
--- a/x11-misc/xscreensaver/xscreensaver-4.16.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-4.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.16.ebuild,v 1.16 2005/01/27 00:32:43 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.16.ebuild,v 1.17 2005/02/24 20:45:34 rizzo Exp $
 
 inherit eutils flag-o-matic
 
@@ -38,9 +38,9 @@ RDEPEND="virtual/x11
 		!gtk2? (
 			=x11-libs/gtk+-1.2*
 			=gnome-base/libglade-0.17*
+			>=media-libs/gdk-pixbuf-0.18
 			gnome? (
 				=gnome-base/control-center-1.4*
-				>=media-libs/gdk-pixbuf-0.18
 				>=gnome-base/gnome-libs-1.4
 			)
 		)