diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2011-04-06 08:30:54 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2011-04-06 08:30:54 +0000 |
| commit | 2bf740173e994b9bb7d07d9b72fa90671464e7fa (patch) | |
| tree | a0555ff7d68a7197c2d7ec318397f48ca01ddd43 /app-admin | |
| parent | Version bump (diff) | |
| download | gentoo-2-2bf740173e994b9bb7d07d9b72fa90671464e7fa.tar.gz gentoo-2-2bf740173e994b9bb7d07d9b72fa90671464e7fa.tar.bz2 gentoo-2-2bf740173e994b9bb7d07d9b72fa90671464e7fa.zip | |
Fix USE constrain to work when both are disabled. Thanks Zeev Tarantov for reporting.
(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/sudo/ChangeLog | 7 | ||||
| -rw-r--r-- | app-admin/sudo/sudo-1.7.6_rc1.ebuild | 4 | ||||
| -rw-r--r-- | app-admin/sudo/sudo-1.8.1_rc1.ebuild | 4 |
3 files changed, 10 insertions, 5 deletions
diff --git a/app-admin/sudo/ChangeLog b/app-admin/sudo/ChangeLog index 92a0defa92f9..b04e3d2124ed 100644 --- a/app-admin/sudo/ChangeLog +++ b/app-admin/sudo/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-admin/sudo # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.259 2011/04/06 04:14:40 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.260 2011/04/06 08:30:54 flameeyes Exp $ + + 06 Apr 2011; Diego E. Pettenò <flameeyes@gentoo.org> sudo-1.7.6_rc1.ebuild, + sudo-1.8.1_rc1.ebuild: + Fix USE constrain to work when both are disabled. Thanks Zeev Tarantov for + reporting. *sudo-1.8.1_rc1 (06 Apr 2011) *sudo-1.7.6_rc1 (06 Apr 2011) diff --git a/app-admin/sudo/sudo-1.7.6_rc1.ebuild b/app-admin/sudo/sudo-1.7.6_rc1.ebuild index 653bfa01651e..c1889f3b87c0 100644 --- a/app-admin/sudo/sudo-1.7.6_rc1.ebuild +++ b/app-admin/sudo/sudo-1.7.6_rc1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.7.6_rc1.ebuild,v 1.1 2011/04/06 04:14:40 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.7.6_rc1.ebuild,v 1.2 2011/04/06 08:30:54 flameeyes Exp $ EAPI=4 @@ -49,7 +49,7 @@ DEPEND="${DEPEND} S=${WORKDIR}/${MY_P} -REQUIRED_USE="^^ ( pam skey )" +REQUIRED_USE="pam? ( !skey ) skey? ( !pam )" src_unpack() { unpack ${A}; cd "${S}" diff --git a/app-admin/sudo/sudo-1.8.1_rc1.ebuild b/app-admin/sudo/sudo-1.8.1_rc1.ebuild index f98ad4f50427..75bbaed6b9b3 100644 --- a/app-admin/sudo/sudo-1.8.1_rc1.ebuild +++ b/app-admin/sudo/sudo-1.8.1_rc1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.8.1_rc1.ebuild,v 1.1 2011/04/06 04:14:40 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.8.1_rc1.ebuild,v 1.2 2011/04/06 08:30:54 flameeyes Exp $ EAPI=4 @@ -50,7 +50,7 @@ DEPEND="${DEPEND} S=${WORKDIR}/${MY_P} -REQUIRED_USE="^^ ( pam skey )" +REQUIRED_USE="pam? ( !skey ) skey? ( !pam )" src_prepare() { epatch "${FILESDIR}"/${P}-ldflags.patch \ |