diff options
| author |   Paul Varner <fuzzyray@gentoo.org> | 2012-01-31 17:19:21 +0000 |
|---|---|---|
| committer | Paul Varner <fuzzyray@gentoo.org> | 2012-01-31 17:19:21 +0000 |
| commit | 5320831838fc9b554da2e7393644e741242fb271 (patch) | |
| tree | de77ecf82eed03e6bc488632ddd5111670316d7e /app-portage | |
| parent | Drop HPPA keywording now that this requires an unsupported version of dev-lib... (diff) | |
| download | gentoo-2-5320831838fc9b554da2e7393644e741242fb271.tar.gz gentoo-2-5320831838fc9b554da2e7393644e741242fb271.tar.bz2 gentoo-2-5320831838fc9b554da2e7393644e741242fb271.zip | |
Update dev-lang/python dependencies so that emerge will block if an installed
slot of python is not built with +xml.
(Portage version: 2.1.10.44/cvs/Linux x86_64)
Diffstat (limited to 'app-portage')
| -rw-r--r-- | app-portage/gentoolkit/ChangeLog | 7 | ||||
| -rw-r--r-- | app-portage/gentoolkit/gentoolkit-0.3.0.4-r5.ebuild | 7 | ||||
| -rw-r--r-- | app-portage/gentoolkit/gentoolkit-9999.ebuild | 7 |
3 files changed, 18 insertions, 3 deletions
diff --git a/app-portage/gentoolkit/ChangeLog b/app-portage/gentoolkit/ChangeLog index bbba2831510d..121aa4b831a4 100644 --- a/app-portage/gentoolkit/ChangeLog +++ b/app-portage/gentoolkit/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-portage/gentoolkit # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v 1.247 2012/01/31 17:07:59 fuzzyray Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v 1.248 2012/01/31 17:19:21 fuzzyray Exp $ + + 31 Jan 2012; Paul Varner <fuzzyray@gentoo.org> gentoolkit-0.3.0.4-r5.ebuild, + gentoolkit-9999.ebuild: + Update dev-lang/python dependencies so that emerge will block if an installed + slot of python is not built with +xml. 31 Jan 2012; Paul Varner <fuzzyray@gentoo.org> -gentoolkit-0.3.0.4-r1.ebuild, -gentoolkit-0.3.0.4-r2.ebuild, -gentoolkit-0.3.0.4-r3.ebuild: diff --git a/app-portage/gentoolkit/gentoolkit-0.3.0.4-r5.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.0.4-r5.ebuild index 1b01080ad9fa..680392b2dd62 100644 --- a/app-portage/gentoolkit/gentoolkit-0.3.0.4-r5.ebuild +++ b/app-portage/gentoolkit/gentoolkit-0.3.0.4-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.3.0.4-r5.ebuild,v 1.7 2012/01/06 23:01:07 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.3.0.4-r5.ebuild,v 1.8 2012/01/31 17:19:21 fuzzyray Exp $ EAPI="3" SUPPORT_PYTHON_ABIS="1" @@ -21,8 +21,13 @@ IUSE="" KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" # Note: argparse is provided in python 2.7 and 3.2 (Bug 346005) +# Note: dev-lang/python dependencies are so emerge will print a blocker if any +# installed slot of python is not built with +xml. This is used since +# PYTHON_USE_WITH just dies in the middle of the emerge. See bug 399331. DEPEND="sys-apps/portage" RDEPEND="${DEPEND} + >=dev-lang/python-2.6[xml] + !>=dev-lang/python-2.6[-xml] !<=app-portage/gentoolkit-dev-0.2.7 dev-python/argparse || ( >=sys-apps/coreutils-8.15 app-misc/realpath sys-freebsd/freebsd-bin ) diff --git a/app-portage/gentoolkit/gentoolkit-9999.ebuild b/app-portage/gentoolkit/gentoolkit-9999.ebuild index a5055298e834..a36dcfaad8c7 100644 --- a/app-portage/gentoolkit/gentoolkit-9999.ebuild +++ b/app-portage/gentoolkit/gentoolkit-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-9999.ebuild,v 1.19 2012/01/06 23:01:07 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-9999.ebuild,v 1.20 2012/01/31 17:19:21 fuzzyray Exp $ EAPI="3" SUPPORT_PYTHON_ABIS="1" @@ -25,8 +25,13 @@ IUSE="minimal" KEYWORDS="" +# Note: dev-lang/python dependencies are so emerge will print a blocker if any +# installed slot of python is not built with +xml. This is used since +# PYTHON_USE_WITH just dies in the middle of the emerge. See bug 399331. DEPEND="sys-apps/portage" RDEPEND="${DEPEND} + >=dev-lang/python-2.6[xml] + !>=dev-lang/python-2.6[-xml] !<=app-portage/gentoolkit-dev-0.2.7 dev-python/argparse || ( >=sys-apps/coreutils-8.15 app-misc/realpath sys-freebsd/freebsd-bin ) |