diff options
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/portage/ChangeLog | 14 | ||||
| -rw-r--r-- | sys-apps/portage/portage-2.1.11.12-r2.ebuild (renamed from sys-apps/portage/portage-2.1.11.12-r1.ebuild) | 9 | ||||
| -rw-r--r-- | sys-apps/portage/portage-2.2.0_alpha123-r2.ebuild (renamed from sys-apps/portage/portage-2.2.0_alpha123-r1.ebuild) | 9 | ||||
| -rw-r--r-- | sys-apps/portage/portage-9999.ebuild | 15 |
4 files changed, 37 insertions, 10 deletions
diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog index 27fd9f1f54d0..ae65fd84874c 100644 --- a/sys-apps/portage/ChangeLog +++ b/sys-apps/portage/ChangeLog @@ -1,6 +1,18 @@ # ChangeLog for sys-apps/portage # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1083 2012/09/01 21:10:02 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1084 2012/09/02 17:31:58 zmedico Exp $ + +*portage-2.1.11.12-r2 (02 Sep 2012) +*portage-2.2.0_alpha123-r2 (02 Sep 2012) + + 02 Sep 2012; Zac Medico <zmedico@gentoo.org> +portage-2.1.11.12-r2.ebuild, + +portage-2.2.0_alpha123-r2.ebuild, -portage-2.1.11.12-r1.ebuild, + -portage-2.2.0_alpha123-r1.ebuild, portage-9999.ebuild: + Add /usr/lib/portage/pym to PYTHONPATH via /etc/env.d/05portage, for portage + API consumers. This way we don't have to rely on patched python having the + correct path, since it has been known to incorrectly add + /usr/libx32/portage/pym to sys.path. Also, remove obsolete ebuild-helpers/sed + code from portage-9999.ebuild. *portage-2.1.11.12-r1 (01 Sep 2012) *portage-2.2.0_alpha123-r1 (01 Sep 2012) diff --git a/sys-apps/portage/portage-2.1.11.12-r1.ebuild b/sys-apps/portage/portage-2.1.11.12-r2.ebuild index f1a1462ee12f..e7830cc4561c 100644 --- a/sys-apps/portage/portage-2.1.11.12-r1.ebuild +++ b/sys-apps/portage/portage-2.1.11.12-r2.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/sys-apps/portage/portage-2.1.11.12-r1.ebuild,v 1.1 2012/09/01 21:10:02 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.11.12-r2.ebuild,v 1.1 2012/09/02 17:31:58 zmedico Exp $ # Require EAPI 2 since we now require at least python-2.6 (for python 3 # syntax support) which also requires EAPI 2. @@ -226,6 +226,13 @@ src_install() { doman -i18n=pl "${S_PL}"/man/pl/*.[0-9] || die doman -i18n=pl_PL.UTF-8 "${S_PL}"/man/pl_PL.UTF-8/*.[0-9] || die fi + + # Set PYTHONPATH for portage API consumers. This way we don't have + # to rely on patched python having the correct path, since it has + # been known to incorrectly add /usr/libx32/portage/pym to sys.path. + echo "PYTHONPATH=/usr/lib/portage/pym" > \ + "${T}/05portage" || die + doenvd "${T}/05portage" || die } pkg_preinst() { diff --git a/sys-apps/portage/portage-2.2.0_alpha123-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha123-r2.ebuild index 67a69d878d57..3ab844d6dc60 100644 --- a/sys-apps/portage/portage-2.2.0_alpha123-r1.ebuild +++ b/sys-apps/portage/portage-2.2.0_alpha123-r2.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/sys-apps/portage/portage-2.2.0_alpha123-r1.ebuild,v 1.1 2012/09/01 21:10:02 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha123-r2.ebuild,v 1.1 2012/09/02 17:31:58 zmedico Exp $ # Require EAPI 2 since we now require at least python-2.6 (for python 3 # syntax support) which also requires EAPI 2. @@ -260,6 +260,13 @@ src_install() { doman -i18n=pl "${S_PL}"/man/pl/*.[0-9] || die doman -i18n=pl_PL.UTF-8 "${S_PL}"/man/pl_PL.UTF-8/*.[0-9] || die fi + + # Set PYTHONPATH for portage API consumers. This way we don't have + # to rely on patched python having the correct path, since it has + # been known to incorrectly add /usr/libx32/portage/pym to sys.path. + echo "PYTHONPATH=${EPREFIX}/usr/lib/portage/pym" > \ + "${T}/05portage" || die + doenvd "${T}/05portage" || die } pkg_preinst() { diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild index f632124d9e79..31f80eac92c3 100644 --- a/sys-apps/portage/portage-9999.ebuild +++ b/sys-apps/portage/portage-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/sys-apps/portage/portage-9999.ebuild,v 1.56 2012/09/01 20:15:23 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.57 2012/09/02 17:31:58 zmedico Exp $ EAPI=3 inherit git-2 eutils python @@ -208,12 +208,6 @@ src_prepare() { eerror "Please notify the arch maintainer about this issue. Using generic." eerror "" fi - - # BSD and OSX need a sed wrapper so that find/xargs work properly - if use userland_GNU; then - rm -f "${S}"/bin/ebuild-helpers/sed || \ - die "Failed to remove sed wrapper" - fi } src_compile() { @@ -239,6 +233,13 @@ src_install() { # Use dodoc for compression, since the Makefile doesn't do that. dodoc "${S}"/{ChangeLog,NEWS,RELEASE-NOTES} || die + + # Set PYTHONPATH for portage API consumers. This way we don't have + # to rely on patched python having the correct path, since it has + # been known to incorrectly add /usr/libx32/portage/pym to sys.path. + echo "PYTHONPATH=${EPREFIX}/usr/lib/portage/pym" > \ + "${T}/05portage" || die + doenvd "${T}/05portage" } pkg_preinst() { |