Permalink
Browse files

Portage update.

  • Loading branch information...
1 parent ebaf908 commit 86dac68d213ea5c8349f64203054dcd981f59cd0 @Garrappachc Garrappachc committed Sep 8, 2012
View
@@ -1,10 +1,9 @@
AUX README.RESCUE 137 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0 WHIRLPOOL 713fcc790442999d56e13efaf536fec9954dadeda680b3642d0358311332096ddedf8b55697bd1ca620d84f0dc7d025ff7931e086c74c1f5032be72dca2ff8f5
-DIST portage-2.1.11.9.tar.bz2 844344 SHA256 590ecdae12581e0ead0eca6e4b8e0ca6bc5f1ecaafb98a5d3b684db5b1af7a05 SHA512 64919b833a719f6f1de5bc3ec8a921dd5fca75ea8c4535ce21faa608ff2bf811632ef627845e9b050fcd1ebf56f5792c7bd471925e75c1264d01277979d704a8 WHIRLPOOL d325c2b5ec50cde40f4b2ce127728b3712321febef58897b3141287776424610bd12701c159f15c5cec41f2eb35569e302a5692045406205e833f8e4cfd3d9fd
-DIST portage-2.2.0_alpha111.tar.bz2 836193 SHA256 3187c6915aaab681e444eca0cbe050f8e68f714176b3f7c0cbec0e7e23d5c5df SHA512 b1dfee2c1869cf30ac50c5ecaa603571bd7c71879d5e9fae80b89602b5d7e3016636703ffc7aec384e7d93356c93415200609dcd2f0f9f74a56ca0364144c120 WHIRLPOOL e7a5cea176b66f632388920bf8e1635b2ec8b7ce70f9aedea2289cdc6a7d560e6b0e6f3a7f3636217539d4883857aa84bb85e3b146e749600d57435f613b60a8
-DIST portage-2.2.0_alpha120.patch.bz2 33973 SHA256 24a5447e9af37013e30c3372e3eef799e1de17884f6328f08396e8f50c9527d1 SHA512 397114af03680734ba95de42087ead7b8cb122c4952407fb0b0c86c510c65be487d0578a3e5052f8c03c0ed9487b6f8138a4d6fb54b9025c16bd393800b67b59 WHIRLPOOL 440e5796f53be19b4a3af8dacfba576b8bd3cf7fa01bfe1b5d0f1af8fb15fb9daa8efe5d9d909d37712c7a381c3811a8dc213106f19cb87fad3faec75c4c8e9d
+DIST portage-2.1.11.13.tar.bz2 815127 SHA256 488667f639140c9285e52cc5ffda21fc0109df31fb75cd3f9afd74149fd9e386 SHA512 5c22c77c365ebe6622836884fbdda37ef9a6979490873913673168845a44712c571eca5f240d9e08ef508460f57145087f62edb074a128201ab04e4b63d1891b WHIRLPOOL 5cfba9ac6d95aa7ed9a2e668a0a2c564149245511af35060b66715de5579d65afb550bd8fd943b90f9d5e2fda95c5a92aa2043ed44df20744be52a39ed6bea7b
+DIST portage-2.2.0_alpha124.tar.bz2 814900 SHA256 1734aa790f341eb6a5854caaa7625e3a313715695ff9086dbe258c11b4a2cd59 SHA512 f37d94464232c871e89038a5a4effdf4cc07f48766ccf5f14ee9b7be211e80ed9164819ff8c82d55012a27a28d39f397966845abcdbc898c95f46e0ce8520b86 WHIRLPOOL 4bed04745a6d6489cdb6c7747cbdee63af408069c407e973a9aca6e0af6c81738cd01b2e7b8097e4824aac9afeaa48233c71f3cea1246fccae3d0b90709166d6
DIST portage-man-pl-2.1.2.tar.bz2 53893 SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f SHA512 5f5c8dd1559048546633b1e7291ff8c0f5d637595f1a4c98405424b08c30c089fc9359e0214f78fbe358754f20d327794f4692b9b67639585c29b755975ee853 WHIRLPOOL 756e267b84077501d976f46fa448cda5368cd52aeca6ec43d109c81fe8e2364e0cd0f35630d68a4186c70e3b440b7c870b86ac7ef83cc0afa43e10f9f8e1f422
-DIST portage-patches-2.1.11.9.tar.bz2 22936 SHA256 6a8e2ffd838039e37842f74d3d0c362c6e28d4a7d448f67f098882db58dd980e SHA512 a299bc9d6f3e2f486007726f6df3d48dee8b9e9e18962da7049d2d95661cf42a1ed11ef7e3dab998a5866e4745da8c211c97fd4746d4bf21039e1de7bada9d31 WHIRLPOOL 819089ab894047cbac4093993ef4857e1fb0fc9ac59cc8bfe1a0f9090cc1561555f86e7c8305f46d3ab62d7fc8b30a28c700b3f27d2b59f70c0d5c8952cccf79
-DIST portage-patches-2.2.0_alpha120.tar.bz2 22984 SHA256 3bde50a230440fd68b5be5c6c098faa72571b174ef09875f9920bc5234491039 SHA512 388c887ad17fece85653868f567b84f936491982ecc61dcf4c939429a3a308ad80a60f8a1126737cccc08126d26ee8fdcb756e01d6d9adb84a794f8458f40218 WHIRLPOOL f2005eb82e5a6a5ade330ced8c0eebb4160ebbf9ab221e7b555b7c8b995a5e9cd111828d03fee535eb84a47718dc4ea7aadc80d200683272e20dbc1eca45e069
-EBUILD portage-2.1.11.9.ebuild 10018 SHA256 6d29a994aaec7d6b4ef9210d0eb7abc6ff63f18288a089af4388406a83ff866e SHA512 a592dce1da96af0f829f796ca5e132b724b1d5644facff0cb658c9b0a187a6c816dd65722cc979607b1d9d524bc64d17845fc00e1b51b5d7a018ddb09a805f3f WHIRLPOOL 9bcda449a42f8805b5f759a06b904776b201f8276c8c38bead62ebe2d11f40d9163fcf2880479c5f889d9aa06b48ff9f58431c1680871a9fdf8032a379fce313
-EBUILD portage-2.2.0_alpha120.ebuild 12118 SHA256 6610a3e9446a95af0191371cdef4ad34479932939d8064e9e9f6377144c39aa0 SHA512 c94973329a9ed79241bbb9587a8a83020ed954c78ec9b73a6cd62a751fc878c339b3a52fd6426fd9b321c7389386776e40092908cdec07807776d1d97f4c5206 WHIRLPOOL 9f967497c5932c79b6fd605f29c2635038f069bcdd6e8b41a89554c544f193e1f5e04a412e575d4dabc037b88041e797151a04e05fea40b1867e8293c1639747
+DIST portage-patches-2.1.11.13.tar.bz2 23309 SHA256 daee8b21c68283d8aec124fe1b452af041f90ebb174013309da2cbd5448b5319 SHA512 3e4ff560d2c7bc4bb6cb4c0cc473e161aaa8106dca2fb8fac7a7093db5582e394f77f0b2b9faf57af14f7e430d00f8a89340f9a7f05621dd464ae09eaac747ca WHIRLPOOL 44f9e6cbd5ed257875df07b3bf6743acac6cc9c7e3b25aa0f286cde8c713e67d6011816f26bbefe4432c5bee650ec8962f1dc9bbdc7fd0ee10c4836156b1d0a5
+DIST portage-patches-2.2.0_alpha124.tar.bz2 23316 SHA256 2f2e4208c6569bce474b11dfe20af5bcba53a82109b11a48066512c4852958e3 SHA512 c06019911053f40e0e07754e5ef926cf0064eea0df5e072a3210c175ab0cfdd02b5fcda267fa00a689410f04126bc649dd6be2d4c1d3dd05f1f55c216c12e37b WHIRLPOOL 7d96d0d8e92f17e5cab8fea8a36a22878d841bf0624b551a001b12adac5695947d089cfa30b7e700892216f1a18d5dcdcaeb9a6d4be1bc1593f34ef27513e62d
+EBUILD portage-2.1.11.13.ebuild 9851 SHA256 8fe981b6fbea60e5c3baf67b88616f43d4628dcd1a5a342ceff5368045356b2c SHA512 20b33e801a1cc60a9fee2c0a4e0f2062fa63ea27c5125230bf0f23451a122dcd2fc09a910da79d4638379156145022228390fe0d5a8c7462f106e90f7b43285b WHIRLPOOL d5244f68b07e739853b57ac07df4037dc89be1350375eeba8e62f177e5d3b4909fd0ab6cc670ff043164d0f8f316e183b74af5b7b6e534e65e3000feb414d65f
+EBUILD portage-2.2.0_alpha124.ebuild 11945 SHA256 97dff0a8454fb08be5789032050cec452a04cf5297e37e59c73969e5c350c7c9 SHA512 b0b308fdcce480db4f105e7d58982673f43a4efb7ec70c11bd537a5e46905bfd08283384ad7564df154f97f61adcebd390bb51634d5c245c4e024a182869830e WHIRLPOOL 31726e705bb5d49b17e14deb7c11647dea9969a92360bd17048e9eb7eaefaf55c49c13831b96455c8dded6bb283c44a37f8c8497d7f5f310d17fd729cd372faf
MISC metadata.xml 554 SHA256 907d86a9b21b08b2011fa465bef504b687c2c91bda31496e7536f39296fbb331 SHA512 544d6acc989e7c96010a80f076b95d87a17f23a2bd0b2c3a614bf561fc4826f4bd5270eec27597305d941ffaa7f752b583c6cdb655da42df0855fbedc41cef31 WHIRLPOOL d5b994f49fa6924ce12b40029d2be9ddc52e9d181dff50b9bd89c427516cbad17364787fe561d817e60531fb7850926cac5eee1e62ebba8a50cfa99562b186c8
@@ -1,11 +1,11 @@
# 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.9.ebuild,v 1.1 2012/07/18 22:53:49 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.11.13.ebuild,v 1.1 2012/09/02 23:59:51 zmedico Exp $
# Require EAPI 2 since we now require at least python-2.6 (for python 3
# syntax support) which also requires EAPI 2.
EAPI=2
-inherit eutils multilib python
+inherit eutils python
DESCRIPTION="Portage is the package management and distribution system for Gentoo"
HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
@@ -28,7 +28,7 @@ python_dep="${python_dep//ssl,}"
# The pysqlite blocker is for bug #282760.
DEPEND="${python_dep}
- !build? ( >=sys-apps/sed-4.0.5 )
+ >=sys-apps/sed-4.0.5 sys-devel/patch
doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )"
# Require sandbox-2.2 for bug #288863.
@@ -99,10 +99,6 @@ current_python_has_xattr() {
}
pkg_setup() {
- # Bug #359731 - Die early if get_libdir fails.
- [[ -z $(get_libdir) ]] && \
- die "get_libdir returned an empty string"
-
if use python2 && use python3 ; then
ewarn "Both python2 and python3 USE flags are enabled, but only one"
ewarn "can be in the shebangs. Using python3."
@@ -199,12 +195,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() {
@@ -226,7 +216,6 @@ src_install() {
emake DESTDIR="${D}" \
sysconfdir="/etc" \
prefix="/usr" \
- libdir="/usr/$(get_libdir)" \
install || die
# Use dodoc for compression, since the Makefile doesn't do that.
@@ -236,6 +225,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() {
@@ -262,9 +258,6 @@ pkg_preinst() {
ewarn "to enable RMD160 hash support."
ewarn "See bug #198398 for more information."
fi
- if [[ ! -L "${ROOT}/etc/make.globals" && -f "${ROOT}/etc/make.globals" ]]; then
- rm "${ROOT}/etc/make.globals"
- fi
if [[ -d ${ROOT}var/log/portage && \
$(ls -ld "${ROOT}var/log/portage") != *" portage portage "* ]] && \
@@ -287,9 +280,9 @@ pkg_preinst() {
pkg_postinst() {
# Compile all source files recursively. Any orphans
# will be identified and removed in postrm.
- python_mod_optimize /usr/$(get_libdir)/portage/pym
+ python_mod_optimize /usr/lib/portage/pym
}
pkg_postrm() {
- python_mod_cleanup /usr/$(get_libdir)/portage/pym
+ python_mod_cleanup /usr/lib/portage/pym
}
@@ -1,11 +1,11 @@
# 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_alpha120.ebuild,v 1.1 2012/07/18 22:55:09 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha124.ebuild,v 1.1 2012/09/03 00:02:20 zmedico Exp $
# Require EAPI 2 since we now require at least python-2.6 (for python 3
# syntax support) which also requires EAPI 2.
EAPI=3
-inherit eutils multilib python
+inherit eutils python
DESCRIPTION="Portage is the package management and distribution system for Gentoo"
HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
@@ -28,7 +28,7 @@ python_dep="${python_dep//ssl,}"
# The pysqlite blocker is for bug #282760.
DEPEND="${python_dep}
- !build? ( >=sys-apps/sed-4.0.5 )
+ >=sys-apps/sed-4.0.5 sys-devel/patch
doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )"
# Require sandbox-2.2 for bug #288863.
@@ -72,7 +72,7 @@ prefix_src_archives() {
PV_PL="2.1.2"
PATCHVER_PL=""
-TARBALL_PV=2.2.0_alpha111
+TARBALL_PV=2.2.0_alpha124
SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)
http://downloads.asiotec.org/regen2/distfiles/portage-patches-${PV}.tar.bz2
@@ -99,10 +99,6 @@ current_python_has_xattr() {
}
pkg_setup() {
- # Bug #359731 - Die early if get_libdir fails.
- [[ -z $(get_libdir) ]] && \
- die "get_libdir returned an empty string"
-
if use python2 && use python3 ; then
ewarn "Both python2 and python3 USE flags are enabled, but only one"
ewarn "can be in the shebangs. Using python3."
@@ -230,12 +226,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() {
@@ -259,7 +249,6 @@ src_install() {
emake DESTDIR="${D}" \
sysconfdir="${EPREFIX}/etc" \
prefix="${EPREFIX}/usr" \
- libdir="${EPREFIX}/usr/$(get_libdir)" \
install || die
# Use dodoc for compression, since the Makefile doesn't do that.
@@ -269,6 +258,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() {
@@ -295,10 +291,6 @@ pkg_preinst() {
ewarn "to enable RMD160 hash support."
ewarn "See bug #198398 for more information."
fi
- if [[ ! -L "${EROOT}/etc/make.globals" &&
- -f "${EROOT}/etc/make.globals" ]]; then
- rm "${EROOT}/etc/make.globals"
- fi
has_version "<=${CATEGORY}/${PN}-2.2_pre5" \
&& WORLD_MIGRATION_UPGRADE=true || WORLD_MIGRATION_UPGRADE=false
@@ -314,7 +306,7 @@ pkg_preinst() {
pkg_postinst() {
# Compile all source files recursively. Any orphans
# will be identified and removed in postrm.
- python_mod_optimize /usr/$(get_libdir)/portage/pym
+ python_mod_optimize /usr/lib/portage/pym
if $WORLD_MIGRATION_UPGRADE && \
grep -q "^@" "${EROOT}/var/lib/portage/world"; then
@@ -345,5 +337,5 @@ pkg_postinst() {
}
pkg_postrm() {
- python_mod_cleanup /usr/$(get_libdir)/portage/pym
+ python_mod_cleanup /usr/lib/portage/pym
}

0 comments on commit 86dac68

Please sign in to comment.