diff options
| author |   Daniel Ostrow <dostrow@gentoo.org> | 2006-07-20 07:45:51 +0000 |
|---|---|---|
| committer | Daniel Ostrow <dostrow@gentoo.org> | 2006-07-20 07:45:51 +0000 |
| commit | a9ab0075f05cdc437cd39e9a57b3f68821b3c239 (patch) | |
| tree | 5ac60405c11b668b0919211b725b2fb7c5a5d1aa /xfce-base | |
| parent | Add dep on fortune-mod. (diff) | |
| download | gentoo-2-a9ab0075f05cdc437cd39e9a57b3f68821b3c239.tar.gz gentoo-2-a9ab0075f05cdc437cd39e9a57b3f68821b3c239.tar.bz2 gentoo-2-a9ab0075f05cdc437cd39e9a57b3f68821b3c239.zip | |
Shuffle around useflag behavior on beta ebuilds to prevent non-interactive build failure.
(Portage version: 2.1.1_pre1-r5)
Diffstat (limited to 'xfce-base')
| -rw-r--r-- | xfce-base/xfprint/ChangeLog | 7 | ||||
| -rw-r--r-- | xfce-base/xfprint/xfprint-4.3.90.1.ebuild | 14 | ||||
| -rw-r--r-- | xfce-base/xfprint/xfprint-4.3.90.2.ebuild | 14 |
3 files changed, 20 insertions, 15 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/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 |