Shuffle around useflag behavior on beta ebuilds to prevent non-interactive build failure.

Package-Manager: portage-2.1.1_pre1-r5

4 files changed, 33 insertions, 28 deletions

diff --git a/xfce-base/xfprint/ChangeLog b/xfce-base/xfprint/ChangeLog
index 82fc054d068f..525daf2d70f3 100644
--- a/xfce-base/xfprint/ChangeLog
+++ b/xfce-base/xfprint/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for xfce-base/xfprint
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfprint/ChangeLog,v 1.67 2006/07/13 20:39:15 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfprint/ChangeLog,v 1.68 2006/07/20 07:45:51 dostrow Exp $
+
+  20 Jul 2006; Daniel Ostrow <dostrow@gentoo.org> xfprint-4.3.90.1.ebuild,
+  xfprint-4.3.90.2.ebuild:
+  Shuffle around useflag behavior on beta ebuilds to prevent non-interactive
+  build failure. Thanks to drac on bug #140377 for the catch.
 
   13 Jul 2006; Aron Griffis <agriffis@gentoo.org> xfprint-4.2.3.ebuild:
   Mark 4.2.3 stable on ia64
diff --git a/xfce-base/xfprint/Manifest b/xfce-base/xfprint/Manifest
index e04cfa0b8708..d8d42e40441d 100644
--- a/xfce-base/xfprint/Manifest
+++ b/xfce-base/xfprint/Manifest
@@ -1,7 +1,7 @@
 DIST xfprint-4.2.1.tar.gz 687685
 DIST xfprint-4.2.2.tar.gz 960769
 DIST xfprint-4.2.3.tar.gz 1169874 RMD160 f180d68148b989fcda6252053c9a277dbe78d01b SHA1 c4f0c16904bdc8ca179e221094d0466b03b5fa29 SHA256 f0b815f526ce4a7117217d7b45c4bcf1599df5ed94ff1c1e3974087ca9297398
-DIST xfprint-4.3.90.1.tar.bz2 813274 RMD160 154499904cea3877e0617d8475293cfdae3efa37 SHA256 43d9e48faacdec289dbe0066c61ad72b4b1dfc6babcd537fd877267b8a21b5f0
+DIST xfprint-4.3.90.1.tar.bz2 813274 RMD160 154499904cea3877e0617d8475293cfdae3efa37 SHA1 daed3d41fce8e58bb03c8a3fbc10de4225bee3d5 SHA256 43d9e48faacdec289dbe0066c61ad72b4b1dfc6babcd537fd877267b8a21b5f0
 DIST xfprint-4.3.90.2.tar.bz2 826034 RMD160 b7534f0dfef0e3d457cbeba9afc0e13789fe0e5d SHA1 f20ca6fd0c89b75869e8fbc731eb75716d07bd5e SHA256 f666ff1a8388ce22262a9bde38e9af01544a9bd3e83898918874bff2bb67dbea
 EBUILD xfprint-4.2.1.ebuild 446 RMD160 cb228bbcb873b726e1a660eea262e3f5dd29060f SHA1 e0a49a2f125b6930b0224cdf6b4789c406f6753d SHA256 9ecd96bdb6f3dd18c69dbcb7fcea09206a6f30de6ca44825a8741e20de5ead42
 MD5 6af0235a577815460d6bdaea94110ad2 xfprint-4.2.1.ebuild 446
@@ -19,18 +19,18 @@ EBUILD xfprint-4.2.3.ebuild 526 RMD160 5d914b2ef7789877fe485f63d455a54164efd769
 MD5 0c54f3d4cca61259bc36df9bd4710a39 xfprint-4.2.3.ebuild 526
 RMD160 5d914b2ef7789877fe485f63d455a54164efd769 xfprint-4.2.3.ebuild 526
 SHA256 0ab3d3a157e125eba0472d1d96a8f99b6bda05ecbca09497f7776277f74a8e21 xfprint-4.2.3.ebuild 526
-EBUILD xfprint-4.3.90.1.ebuild 894 RMD160 62dd2ea4b410532aca39da75b44efee0244a6583 SHA1 ea5af77cc4f7e4278eaa91d2d651dbba60c6f8f1 SHA256 ca6a47daf77fd4b3004748698ea8dcd3048c6b09f0dca0982f19a57161753090
-MD5 3f818b079e34df7e2ee906dfed2b5d6f xfprint-4.3.90.1.ebuild 894
-RMD160 62dd2ea4b410532aca39da75b44efee0244a6583 xfprint-4.3.90.1.ebuild 894
-SHA256 ca6a47daf77fd4b3004748698ea8dcd3048c6b09f0dca0982f19a57161753090 xfprint-4.3.90.1.ebuild 894
-EBUILD xfprint-4.3.90.2.ebuild 893 RMD160 eeca334263360b88e7a7ca3031c2632dd57aab5c SHA1 956880a5315e8def3e47d90aef64ee97d5df9a61 SHA256 14d337a130b36bce8f3aa2756f8e03ca545f424cc79b977d83fd3ba8d16e7106
-MD5 e9ab9a97373f77da187e52bab20f8312 xfprint-4.3.90.2.ebuild 893
-RMD160 eeca334263360b88e7a7ca3031c2632dd57aab5c xfprint-4.3.90.2.ebuild 893
-SHA256 14d337a130b36bce8f3aa2756f8e03ca545f424cc79b977d83fd3ba8d16e7106 xfprint-4.3.90.2.ebuild 893
-MISC ChangeLog 7860 RMD160 01e7ced1e6632ed828e7fbfda9f8f40b6ed73cd0 SHA1 58f12c4b70edf77c7a1ac8835b0ba8fb2f764594 SHA256 c66b653c5e1f598767db657f28f7afee51b8bfe5e2501199ccd4c25d6a460ca9
-MD5 9c839468180cc393020d792cdda672b4 ChangeLog 7860
-RMD160 01e7ced1e6632ed828e7fbfda9f8f40b6ed73cd0 ChangeLog 7860
-SHA256 c66b653c5e1f598767db657f28f7afee51b8bfe5e2501199ccd4c25d6a460ca9 ChangeLog 7860
+EBUILD xfprint-4.3.90.1.ebuild 890 RMD160 15a3a0c10702e97845e45954fc87f4097a84759c SHA1 4ddc4f320956c9980511d77f5c1c4f0fb8410216 SHA256 cb27ef3134ef61cefe17d0abf6de2f02c8e9889b78183af33182f5e5bdceb589
+MD5 6b72a89df2c29f251ce33e6d60a219ab xfprint-4.3.90.1.ebuild 890
+RMD160 15a3a0c10702e97845e45954fc87f4097a84759c xfprint-4.3.90.1.ebuild 890
+SHA256 cb27ef3134ef61cefe17d0abf6de2f02c8e9889b78183af33182f5e5bdceb589 xfprint-4.3.90.1.ebuild 890
+EBUILD xfprint-4.3.90.2.ebuild 890 RMD160 f9cfcc8057ad445e5345c7be81fd327aa47ce3a8 SHA1 140d7a9e7cd7f2825bf14d841d7e2f8d9f9f0940 SHA256 cb468df22e1ea08572997b3f349f9c1f2cc680088bbb432c0648fb612bfd8b1d
+MD5 9eab70eb7c7270266f7e7ad46b7cf2cf xfprint-4.3.90.2.ebuild 890
+RMD160 f9cfcc8057ad445e5345c7be81fd327aa47ce3a8 xfprint-4.3.90.2.ebuild 890
+SHA256 cb468df22e1ea08572997b3f349f9c1f2cc680088bbb432c0648fb612bfd8b1d xfprint-4.3.90.2.ebuild 890
+MISC ChangeLog 8101 RMD160 649f7ea5456ba75c3652d0aac5c9d96df4a153f6 SHA1 ee7dc76754ca4160432780f7505539bec68afcf9 SHA256 b6698025927422b82d4c1cfbb01ae4d5c64fda15c214d562d5befe920b780e22
+MD5 e4a1329958d6cafc3c8c085d801587eb ChangeLog 8101
+RMD160 649f7ea5456ba75c3652d0aac5c9d96df4a153f6 ChangeLog 8101
+SHA256 b6698025927422b82d4c1cfbb01ae4d5c64fda15c214d562d5befe920b780e22 ChangeLog 8101
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
 MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 metadata.xml 157
diff --git a/xfce-base/xfprint/xfprint-4.3.90.1.ebuild b/xfce-base/xfprint/xfprint-4.3.90.1.ebuild
index 69ab9dbb1f89..74e31104f7a7 100644
--- a/xfce-base/xfprint/xfprint-4.3.90.1.ebuild
+++ b/xfce-base/xfprint/xfprint-4.3.90.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfprint/xfprint-4.3.90.1.ebuild,v 1.1 2006/04/20 05:45:26 dostrow Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfprint/xfprint-4.3.90.1.ebuild,v 1.2 2006/07/20 07:45:51 dostrow Exp $
 
 inherit xfce44
 
@@ -10,10 +10,10 @@ DESCRIPTION="Xfce 4 print manager panel plugin"
 LICENSE="BSD"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
-IUSE="lpr cups"
+IUSE="lpr"
 
-RDEPEND="cups? ( net-print/cups )
-	!cups? ( lpr? ( net-print/lprng ) )
+RDEPEND="!lpr? ( net-print/cups )
+	lpr? ( net-print/lprng )
 	>=dev-libs/glib-2.2
 	>=x11-libs/gtk+-2.2
 	~xfce-base/libxfce4mcs-${PV}
@@ -27,10 +27,10 @@ RDEPEND="cups? ( net-print/cups )
 DEPEND="${RDEPEND}
 	~xfce-base/xfce-mcs-manager-${PV}"
 
-XFCE_CONFIG="$(use_enable cups)"
-
-if ! use cups; then
+if use lpr; then
 	XFCE_CONFIG="${XFCE_CONFIG} $(use_enable lpr bsdlpr)"
+else
+	XFCE_CONFIG="${XFCE_CONFIG} --enable-cups"
 fi
 
 xfce44_core_package
diff --git a/xfce-base/xfprint/xfprint-4.3.90.2.ebuild b/xfce-base/xfprint/xfprint-4.3.90.2.ebuild
index bfb81296b2bc..ae4b13cde1a2 100644
--- a/xfce-base/xfprint/xfprint-4.3.90.2.ebuild
+++ b/xfce-base/xfprint/xfprint-4.3.90.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfprint/xfprint-4.3.90.2.ebuild,v 1.1 2006/07/10 18:23:13 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfprint/xfprint-4.3.90.2.ebuild,v 1.2 2006/07/20 07:45:51 dostrow Exp $
 
 inherit xfce44
 
@@ -10,10 +10,10 @@ DESCRIPTION="Xfce 4 print manager panel plugin"
 LICENSE="BSD"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
-IUSE="lpr cups"
+IUSE="lpr"
 
-RDEPEND="cups? ( net-print/cups )
-	!cups? ( lpr? ( net-print/lprng ) )
+RDEPEND="!lpr? ( net-print/cups )
+	lpr? ( net-print/lprng )
 	>=dev-libs/glib-2.2
 	>=x11-libs/gtk+-2.2
 	~xfce-base/libxfce4mcs-${PV}
@@ -27,10 +27,10 @@ RDEPEND="cups? ( net-print/cups )
 DEPEND="${RDEPEND}
 	~xfce-base/xfce-mcs-manager-${PV}"
 
-XFCE_CONFIG="$(use_enable cups)"
-
-if ! use cups; then
+if use lpr; then
 	XFCE_CONFIG="${XFCE_CONFIG} $(use_enable lpr bsdlpr)"
+else
+	XFCE_CONFIG="${XFCE_CONFIG} --enable-cups"
 fi
 
 xfce44_core_package