diff options
| author |   Aron Griffis <agriffis@gentoo.org> | 2004-06-24 13:43:45 +0000 |
|---|---|---|
| committer | Aron Griffis <agriffis@gentoo.org> | 2004-06-24 13:43:45 +0000 |
| commit | 1fe2c69642de8b338987ae8061b6310c5b0bd044 (patch) | |
| tree | 47d931ecbc05b63efde487111a9fb9786430d3f1 /x11-base | |
| parent | Added sparc stable keyword (Manifest recommit) (diff) | |
| download | gentoo-2-1fe2c69642de8b338987ae8061b6310c5b0bd044.tar.gz gentoo-2-1fe2c69642de8b338987ae8061b6310c5b0bd044.tar.bz2 gentoo-2-1fe2c69642de8b338987ae8061b6310c5b0bd044.zip | |
QA - fix use invocation
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xorg-x11/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild | 8 | ||||
| -rw-r--r-- | x11-base/xorg-x11/xorg-x11-6.7.0.ebuild | 8 |
3 files changed, 13 insertions, 9 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog index 2d404dad50e5..285bb594d110 100644 --- a/x11-base/xorg-x11/ChangeLog +++ b/x11-base/xorg-x11/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-base/xorg-x11 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.63 2004/06/23 19:34:45 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.64 2004/06/24 13:43:45 agriffis Exp $ + + 24 Jun 2004; Aron Griffis <agriffis@gentoo.org> xorg-x11-6.7.0-r1.ebuild, + xorg-x11-6.7.0.ebuild: + QA - fix use invocation 23 Jun 2004; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.7.0-r1.ebuild, xorg-x11-6.7.0.ebuild: diff --git a/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild b/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild index b36150cf2eef..02a10891cbcb 100644 --- a/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild +++ b/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild,v 1.16 2004/06/23 19:34:45 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild,v 1.17 2004/06/24 13:43:45 agriffis Exp $ # Libraries which are now supplied in shared form that were not in the past # include: libFS.so, libGLw.so, libI810XvMC.so, libXRes.so, libXfontcache.so, @@ -199,7 +199,7 @@ pkg_setup() { gcc-getCC # See bug #35468, circular pam-X11 dep - if [ "`use pam`" -a "`best_version x11-base/${PN}`" ] + if use pam && [ "`best_version x11-base/${PN}`" ] then einfo "Enabling PAM features in ${PN}..." else @@ -326,7 +326,7 @@ host_def_setup() { # Remove circular dep between pam and X11, bug #35468 # If pam is in USE and we have X11, then we can enable PAM - if [ "`use pam`" -a "`best_version x11-base/xorg-x11`" ] + if use pam && [ "`best_version x11-base/xorg-x11`" ] then # If you want to have optional pam support, do it properly ... echo "#define HasPam YES" >> config/cf/host.def @@ -523,7 +523,7 @@ patch_setup() { fi # TDFX_RISKY - 16-bit, 1024x768 or higher on low-memory voodoo3's - if [ "`use 3dfx`" -a "${TDFX_RISKY}" = "yes" ] + if use 3dfx && [ "${TDFX_RISKY}" = "yes" ] then patch_exclude 5850 else diff --git a/x11-base/xorg-x11/xorg-x11-6.7.0.ebuild b/x11-base/xorg-x11/xorg-x11-6.7.0.ebuild index 263f0ff080a4..99bcfdf3fccb 100644 --- a/x11-base/xorg-x11/xorg-x11-6.7.0.ebuild +++ b/x11-base/xorg-x11/xorg-x11-6.7.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0.ebuild,v 1.50 2004/06/23 19:34:45 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0.ebuild,v 1.51 2004/06/24 13:43:45 agriffis Exp $ # Libraries which are now supplied in shared form that were not in the past # include: libFS.so, libGLw.so, libI810XvMC.so, libXRes.so, libXfontcache.so, @@ -174,7 +174,7 @@ pkg_setup() { gcc-getCC # See bug #35468, circular pam-X11 dep - if [ "`use pam`" -a "`best_version x11-base/${PN}`" ] + if use pam && [ "`best_version x11-base/${PN}`" ] then einfo "Enabling PAM features in ${PN}..." else @@ -329,7 +329,7 @@ fi fi # TDFX_RISKY - 16-bit, 1024x768 or higher on low-memory voodoo3's - if [ "`use 3dfx`" -a "${TDFX_RISKY}" = "yes" ] + if use 3dfx && [ "${TDFX_RISKY}" = "yes" ] then patch_exclude 5850 else @@ -446,7 +446,7 @@ fi # Remove circular dep between pam and X11, bug #35468 # If pam is in USE and we have X11, then we can enable PAM - if [ "`use pam`" -a "`best_version x11-base/xorg-x11`" ] + if use pam && [ "`best_version x11-base/xorg-x11`" ] then # If you want to have optional pam support, do it properly ... echo "#define HasPam YES" >> config/cf/host.def |