commit: 95bea832acf85cc697689d9afad274c96e164635 Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org> AuthorDate: Thu May 12 23:24:52 2016 +0000 Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> CommitDate: Thu May 12 23:24:52 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95bea832
app-emulation/ganeti: Remove use in global scope (bug #566524) Package-Manager: portage-2.2.28 app-emulation/ganeti/ganeti-2.11.6-r2.ebuild | 5 +++-- app-emulation/ganeti/ganeti-2.12.3-r2.ebuild | 8 +++++--- app-emulation/ganeti/ganeti-2.13.0-r3.ebuild | 6 ++++-- app-emulation/ganeti/ganeti-2.14.1-r2.ebuild | 9 ++++++--- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/app-emulation/ganeti/ganeti-2.11.6-r2.ebuild b/app-emulation/ganeti/ganeti-2.11.6-r2.ebuild index 86677b7..09b4625 100644 --- a/app-emulation/ganeti/ganeti-2.11.6-r2.ebuild +++ b/app-emulation/ganeti/ganeti-2.11.6-r2.ebuild @@ -4,7 +4,7 @@ EAPI=5 PYTHON_COMPAT=(python2_7) -use test && PYTHON_REQ_USE="ipv6" +PYTHON_REQ_USE="ipv6(+)?" inherit eutils confutils autotools bash-completion-r1 python-single-r1 versionator pax-utils @@ -35,7 +35,8 @@ HOMEPAGE="https://code.google.com/p/ganeti/"; LICENSE="GPL-2" SLOT="0" IUSE="drbd haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen" -REQUIRED_USE="|| ( kvm xen lxc )" +REQUIRED_USE="|| ( kvm xen lxc ) + test? ( ipv6 )" USER_PREFIX="${GANETI_USER_PREFIX:-"gnt-"}" GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}" diff --git a/app-emulation/ganeti/ganeti-2.12.3-r2.ebuild b/app-emulation/ganeti/ganeti-2.12.3-r2.ebuild index 7707e09..7c960a5 100644 --- a/app-emulation/ganeti/ganeti-2.12.3-r2.ebuild +++ b/app-emulation/ganeti/ganeti-2.12.3-r2.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 PYTHON_COMPAT=(python2_7) -use test && PYTHON_REQ_USE="ipv6" +PYTHON_REQ_USE="ipv6(+)?" inherit eutils user autotools bash-completion-r1 python-single-r1 versionator @@ -34,7 +34,9 @@ HOMEPAGE="http://www.ganeti.org/"; LICENSE="GPL-2" SLOT="0" IUSE="drbd haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen" -REQUIRED_USE="|| ( kvm xen lxc ) ${PYTHON_REQUIRED_USE}" +REQUIRED_USE="|| ( kvm xen lxc ) + test? ( ipv6 ) + ${PYTHON_REQUIRED_USE}" USER_PREFIX="${GANETI_USER_PREFIX:-"gnt-"}" GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}" diff --git a/app-emulation/ganeti/ganeti-2.13.0-r3.ebuild b/app-emulation/ganeti/ganeti-2.13.0-r3.ebuild index 0eeaec9..c1e02bc 100644 --- a/app-emulation/ganeti/ganeti-2.13.0-r3.ebuild +++ b/app-emulation/ganeti/ganeti-2.13.0-r3.ebuild @@ -4,7 +4,7 @@ EAPI=5 PYTHON_COMPAT=(python2_7) -use test && PYTHON_REQ_USE="ipv6" +PYTHON_REQ_USE="ipv6(+)?" inherit eutils user autotools bash-completion-r1 python-single-r1 versionator @@ -28,7 +28,9 @@ HOMEPAGE="http://www.ganeti.org/"; LICENSE="GPL-2" SLOT="0" IUSE="drbd haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen" -REQUIRED_USE="|| ( kvm xen lxc ) ${PYTHON_REQUIRED_USE}" +REQUIRED_USE="|| ( kvm xen lxc ) + test? ( ipv6 ) + ${PYTHON_REQUIRED_USE}" USER_PREFIX="${GANETI_USER_PREFIX:-"gnt-"}" GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}" diff --git a/app-emulation/ganeti/ganeti-2.14.1-r2.ebuild b/app-emulation/ganeti/ganeti-2.14.1-r2.ebuild index 0e62c0a..bc2ba9e 100644 --- a/app-emulation/ganeti/ganeti-2.14.1-r2.ebuild +++ b/app-emulation/ganeti/ganeti-2.14.1-r2.ebuild @@ -4,7 +4,7 @@ EAPI=5 PYTHON_COMPAT=(python2_7) -use test && PYTHON_REQ_USE="ipv6" +PYTHON_REQ_USE="ipv6(+)?" inherit eutils user autotools bash-completion-r1 python-single-r1 versionator @@ -28,7 +28,9 @@ HOMEPAGE="http://www.ganeti.org/"; LICENSE="GPL-2" SLOT="0" IUSE="drbd haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen" -REQUIRED_USE="|| ( kvm xen lxc ) ${PYTHON_REQUIRED_USE}" +REQUIRED_USE="|| ( kvm xen lxc ) + test? ( ipv6 ) + ${PYTHON_REQUIRED_USE}" USER_PREFIX="${GANETI_USER_PREFIX:-"gnt-"}" GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}" @@ -158,7 +160,8 @@ PATCHES=( "${FILESDIR}/${PN}-2.13-process_unittest.patch" ) -REQUIRED_USE="kvm? ( || ( amd64 x86 ) )" +REQUIRED_USE="kvm? ( || ( amd64 x86 ) ) + test? ( ipv6 )" S="${WORKDIR}/${MY_P}"
