2.1.1_pre4-r3 revbump. This fixes bugs #96368, #136197, #142125, and #142776.

(Portage version: 4152-svn)
 (Signed Manifest commit)

3 files changed, 16 insertions, 225 deletions

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 751d14746d0c..6c9ef82f4a57 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -17,8 +17,8 @@ DIST portage-2.0.51.22.tar.bz2 257823 RMD160 068a6fbc3e41f7357d1ee4d65894e7903c4
 DIST portage-2.0.54.tar.bz2 234784 RMD160 26c724df242a7d0c44d7fd06067bfcdbc4e3556b SHA1 0559bf8068976c124f0026ab65f3f4a62ae39d83 SHA256 69075ab4599958c4f7c7a932b95dcd77efa1b3c46ac28acb577284bc48a1db06
 DIST portage-2.1-r1.patch.bz2 12201 RMD160 ceff46c18d8e28f341cc0c1a0c41150733c2dc98 SHA1 0948e3de6cdd8869c9abbb7c8a3ad54e0aebb937 SHA256 78bdf92a43e8d34d090592bcd92779383dbaca9a9295418e4cc9b39f217fbf80
 DIST portage-2.1-r2.tar.bz2 280469 RMD160 2507c4e2db3fdf1157e44430b449f618e99f5d57 SHA1 06ec20f96618271c7835ce505d4979b8f7914067 SHA256 854c61dd0232cca50d9bb9a3e9e13f22589b76029ea7eeacab2bc5d4ec7e48cc
-DIST portage-2.1.1_pre4-r1.patch.bz2 1734 RMD160 56a85dea0a7630c2a9ce9c292d372c66e450b269 SHA1 def9ebb8e79b334b46e63f09ba851ecaea383572 SHA256 a11b3d5213f72378692cf77bb4ad59f2d54190185ff2c54b7dfe7f80a5746c39
 DIST portage-2.1.1_pre4-r2.patch.bz2 5153 RMD160 a92e3c58b6ec47b5aa3c27dadddc2179bb2721ae SHA1 6d2714e39febd7dc514a550d925b178aa3890f84 SHA256 0c8ec2f12eb4262e3ee4eb3abd9f511b28631949b52af6fca02b3f9a4178ca46
+DIST portage-2.1.1_pre4-r3.patch.bz2 8360 RMD160 a1603f5dd4eacbf181759babc7571a3367b72077 SHA1 cd45d87b505f9968861d1c37ddb5fd22e2d1bcaf SHA256 655b49e98235c5f32e6200c4cf62991d57696a8d4729408ff9d539c4cba24e89
 DIST portage-2.1.1_pre4.tar.bz2 291237 RMD160 b679a01f045c886ab6d4c1929a1c6231f02add75 SHA1 5bd5812619b8db7faf61077858ead14c72794ba7 SHA256 5027efaed47dba5637fd495aa1b23b2deef4654fba06719d306e4ecc0cb1a3a5
 DIST portage-2.1.tar.bz2 277243 RMD160 e8290e18f0de5935cc263d76e7bce15da5c899d2 SHA1 459f59cc332e6b06d439af2cc18de57969f208d1 SHA256 29560a50df1de053c943582b277beb600c364edfe177d42affc74e98db412ef0
 DIST portage-man-pl-2.1-r1.patch.bz2 2076 RMD160 be3898714b94fb0253c1826909649ea51da205ad SHA1 6ec21b29a3eff4a034ea68b4e6a889c8f95dcc3e SHA256 28176c04290478ba4373c28ea047edbdf3a40d3ff69bf92da55d1cfcb828ea5b
@@ -40,18 +40,18 @@ EBUILD portage-2.1-r2.ebuild 7056 RMD160 2f9b84d855262356ffa303e70b0452161557af1
 MD5 47e75ccbe519a8815a0d5d8eb55cca39 portage-2.1-r2.ebuild 7056
 RMD160 2f9b84d855262356ffa303e70b0452161557af11 portage-2.1-r2.ebuild 7056
 SHA256 e7902485531dc960302a9523c3d10ca0ad9d9076aea559faa10ba14e40f730ab portage-2.1-r2.ebuild 7056
-EBUILD portage-2.1.1_pre4-r1.ebuild 5740 RMD160 361257e15ad56e4e91b32a8693f21550f7279674 SHA1 53a2343bfbea1ccd22858929cb4f079cf03acc84 SHA256 c621575356e636ebae1373e209cca594d009156f7062a4b22a49009c850fef2d
-MD5 e154697942d33bea4bdfc714b6f36a15 portage-2.1.1_pre4-r1.ebuild 5740
-RMD160 361257e15ad56e4e91b32a8693f21550f7279674 portage-2.1.1_pre4-r1.ebuild 5740
-SHA256 c621575356e636ebae1373e209cca594d009156f7062a4b22a49009c850fef2d portage-2.1.1_pre4-r1.ebuild 5740
 EBUILD portage-2.1.1_pre4-r2.ebuild 5740 RMD160 6403531d3c3b36c142edfccb2c659623df47328e SHA1 f009a6b03037b8b3d08427b1ab4b5c5ac65c59d8 SHA256 26d6742072fb91e9adf1be842c4e0e2f59a5c37c8cff7d956807e93d7b20d21f
 MD5 a3c92f2d5f9f26887aaf7b0f2486efcc portage-2.1.1_pre4-r2.ebuild 5740
 RMD160 6403531d3c3b36c142edfccb2c659623df47328e portage-2.1.1_pre4-r2.ebuild 5740
 SHA256 26d6742072fb91e9adf1be842c4e0e2f59a5c37c8cff7d956807e93d7b20d21f portage-2.1.1_pre4-r2.ebuild 5740
-MISC ChangeLog 19841 RMD160 5de3973c299ab25bbf90528b1fff15ae3b548d7c SHA1 51c54d97fb0124ba538fe0e9bb4d4f967993fba6 SHA256 69b1aff2da684488194f4b3fcfa116f002c2618cd7f8f4ee1799283dd85fa5af
-MD5 c5af3377caae9934ab440feabc3b1a77 ChangeLog 19841
-RMD160 5de3973c299ab25bbf90528b1fff15ae3b548d7c ChangeLog 19841
-SHA256 69b1aff2da684488194f4b3fcfa116f002c2618cd7f8f4ee1799283dd85fa5af ChangeLog 19841
+EBUILD portage-2.1.1_pre4-r3.ebuild 5740 RMD160 7b8b1fa4d1dd08a9a31edc2ecbb280dbc8948936 SHA1 d2b227e23fdda53cdac857baac8c8548bc07935c SHA256 863713f10dec0b3b1ebb7a192ce701da2c1650086f975880644dc4d890e859cf
+MD5 4b5c5fb90953c28a1c2169c3ae24a218 portage-2.1.1_pre4-r3.ebuild 5740
+RMD160 7b8b1fa4d1dd08a9a31edc2ecbb280dbc8948936 portage-2.1.1_pre4-r3.ebuild 5740
+SHA256 863713f10dec0b3b1ebb7a192ce701da2c1650086f975880644dc4d890e859cf portage-2.1.1_pre4-r3.ebuild 5740
+MISC ChangeLog 20040 RMD160 f8c6fdfc742647dcb51a1008f7c686737e39765c SHA1 bb254bd5495b422f4355cdc5953002f6e82c3f84 SHA256 90ba391b8e2972cb367b0e49cad3f4f9bf46eb2e295db6431d35cef2437c102a
+MD5 1eb6082fca4be1ac1de063335a4d422f ChangeLog 20040
+RMD160 f8c6fdfc742647dcb51a1008f7c686737e39765c ChangeLog 20040
+SHA256 90ba391b8e2972cb367b0e49cad3f4f9bf46eb2e295db6431d35cef2437c102a ChangeLog 20040
 MISC metadata.xml 219 RMD160 613195ece366b33606e71ff1753be048f2507841 SHA1 d162fb909241ef50b95a3539bdfcde95429bdf81 SHA256 cbd3a20e5c89a48a842f7132fe705bf39959f02c1025052efce8aad8a8baa8dc
 MD5 74421bbd5bae342d72a7a30b98a69662 metadata.xml 219
 RMD160 613195ece366b33606e71ff1753be048f2507841 metadata.xml 219
@@ -68,16 +68,16 @@ SHA256 9f002b314a87d8dfad176863f83c6963acec51093a45494201b53e9c0cf87cd8 files/di
 MD5 de7e755113f65dd715d1660e1fb0da21 files/digest-portage-2.1-r2 771
 RMD160 0579c77c3080d58fc96b4087ab593fb0ea8f24c6 files/digest-portage-2.1-r2 771
 SHA256 96af979679274f1696e26b58a1347812f388963a675147aa03bc7acd65a659b5 files/digest-portage-2.1-r2 771
-MD5 f08105dae2a07d9cc83005f055e9dea0 files/digest-portage-2.1.1_pre4-r1 1051
-RMD160 b82af2ab25c739124045c174b5e74d595b466342 files/digest-portage-2.1.1_pre4-r1 1051
-SHA256 3dd21e31b5707c45dc149016a167efb3dc13835baa4e3473a59bb5ef2828d5b3 files/digest-portage-2.1.1_pre4-r1 1051
 MD5 9d0ca572775bacbd7a3fd972e95f9e90 files/digest-portage-2.1.1_pre4-r2 1051
 RMD160 bc623439ee38efa26c2b0270ae4f5e2e2e20d4a7 files/digest-portage-2.1.1_pre4-r2 1051
 SHA256 ce311b2c3a3d274fe9ca12e3a0ddedb855af15d02d9ab82330a6409f6dc304b6 files/digest-portage-2.1.1_pre4-r2 1051
+MD5 e21519d32a5f09638334a951e8dd0558 files/digest-portage-2.1.1_pre4-r3 1051
+RMD160 2b48d7e739b241a8cfcdb2d4ed5e5463a4f4333e files/digest-portage-2.1.1_pre4-r3 1051
+SHA256 d4efba73936baf5055469118b927b550477e8e9cb0e597a73bd79d0ebf84a461 files/digest-portage-2.1.1_pre4-r3 1051
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE0kSwKRy60XGEcJIRAikBAKCeuScy5gGPS7YnocpYqxNiBZnxCgCdGcKN
-fhC6z4Nt9yn0LgalQ6a5zrE=
-=zWbp
+iD8DBQFE07OY/ejvha5XGaMRAjN1AJ4salKRnC61Xo40iwVbNFv2fGVzuQCghKMf
+ztKiOoLFqK4etzjWfTlK0Ms=
+=wtCM
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/digest-portage-2.1.1_pre4-r1 b/sys-apps/portage/files/digest-portage-2.1.1_pre4-r1
deleted file mode 100644
index a3ce926e06ae..000000000000
--- a/sys-apps/portage/files/digest-portage-2.1.1_pre4-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 0ef78340051c9090efb199b1290651fb portage-2.1.1_pre4-r1.patch.bz2 1734
-RMD160 56a85dea0a7630c2a9ce9c292d372c66e450b269 portage-2.1.1_pre4-r1.patch.bz2 1734
-SHA256 a11b3d5213f72378692cf77bb4ad59f2d54190185ff2c54b7dfe7f80a5746c39 portage-2.1.1_pre4-r1.patch.bz2 1734
-MD5 9b9af8d7728ed2ab38361875b744cbcd portage-2.1.1_pre4.tar.bz2 291237
-RMD160 b679a01f045c886ab6d4c1929a1c6231f02add75 portage-2.1.1_pre4.tar.bz2 291237
-SHA256 5027efaed47dba5637fd495aa1b23b2deef4654fba06719d306e4ecc0cb1a3a5 portage-2.1.1_pre4.tar.bz2 291237
-MD5 c6fe647803cc354a5b8ab22660caeb26 portage-man-pl-2.1-r1.patch.bz2 2076
-RMD160 be3898714b94fb0253c1826909649ea51da205ad portage-man-pl-2.1-r1.patch.bz2 2076
-SHA256 28176c04290478ba4373c28ea047edbdf3a40d3ff69bf92da55d1cfcb828ea5b portage-man-pl-2.1-r1.patch.bz2 2076
-MD5 3a1c6f874490e12965812fa0920c539f portage-man-pl-2.1.tar.bz2 52425
-RMD160 5fdb898b94b0c6bb23234f0903572675f653ff44 portage-man-pl-2.1.tar.bz2 52425
-SHA256 7e01f6c9c567f81d8e81dfdc26cf04b8d1f9f375090641cb80580986f8ac4817 portage-man-pl-2.1.tar.bz2 52425
diff --git a/sys-apps/portage/portage-2.1.1_pre4-r1.ebuild b/sys-apps/portage/portage-2.1.1_pre4-r1.ebuild
deleted file mode 100644
index 2dcbeb4bccf4..000000000000
--- a/sys-apps/portage/portage-2.1.1_pre4-r1.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.1_pre4-r1.ebuild,v 1.1 2006/07/30 23:54:15 zmedico Exp $
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="The Portage Package Management System. The primary package management and distribution system for Gentoo."
-HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-PROVIDE="virtual/portage"
-SLOT="0"
-# USE_EXPAND_HIDDEN hides ELIBC and USERLAND expansions from emerge output (see make.conf.5).
-IUSE_ELIBC="elibc_glibc elibc_uclibc elibc_FreeBSD"
-IUSE_USERLAND="userland_Darwin userland_GNU"
-IUSE="build doc selinux linguas_pl ${IUSE_ELIBC} ${IUSE_USERLAND}"
-DEPEND=">=dev-lang/python-2.3
-	!build? ( >=sys-apps/sed-4.0.5 )"
-RDEPEND=">=dev-lang/python-2.3
-	!build? ( >=sys-apps/sed-4.0.5
-		dev-python/python-fchksum
-		!userland_Darwin? ( >=app-shells/bash-3.0 ) )
-	elibc_glibc? ( sys-apps/sandbox )
-	elibc_uclibc? ( sys-apps/sandbox )
-	!userland_Darwin? ( >=app-misc/pax-utils-0.1.13 )
-	selinux? ( >=dev-python/python-selinux-2.16 )
-	doc? ( app-portage/portage-manpages )
-	>=dev-python/pycrypto-2.0.1-r5"
-SRC_ARCHIVES="http://dev.gentoo.org/~zmedico/portage/archives"
-
-PV_PL="2.1"
-PATCHVER_PL="-r1"
-SRC_URI="mirror://gentoo/${PN}-${PV}.tar.bz2
-	${SRC_ARCHIVES}/${PN}-${PV}.tar.bz2
-	linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}.tar.bz2
-	${SRC_ARCHIVES}/${PN}-man-pl-${PV_PL}.tar.bz2 )"
-
-PATCHVER="-${PR}"
-if [ -n "${PATCHVER}" ]; then
-	SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PV}${PATCHVER}.patch.bz2
-	${SRC_ARCHIVES}/${PN}-${PV}${PATCHVER}.patch.bz2"
-fi
-
-if [ -n "${PATCHVER_PL}" ]; then
-	SRC_URI="${SRC_URI} linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}${PATCHVER_PL}.patch.bz2
-	${SRC_ARCHIVES}/${PN}-man-pl-${PV_PL}${PATCHVER_PL}.patch.bz2 )"
-fi
-
-S="${WORKDIR}"/${PN}-${PV}
-S_PL="${WORKDIR}"/${PN}-${PV_PL}
-
-portage_docs() {
-	elog ""
-	elog "For help with using portage please consult the Gentoo Handbook"
-	elog "at http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3"
-	elog ""
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	if [ -n "${PATCHVER}" ]; then
-		cd "${S}"
-		epatch "${WORKDIR}/${PN}-${PV}${PATCHVER}.patch"
-	fi
-	if [ "${PR}" != "r0" ]; then
-		elog "Setting portage.VERSION to ${PVR} ..."
-		sed -i "s/^VERSION=.*/VERSION=\"${PVR}\"/" pym/portage.py || \
-			die "Failed to patch portage.VERSION"
-		eend 0
-	fi
-	if [ -n "${PATCHVER_PL}" ]; then
-		use linguas_pl && \
-			epatch "${WORKDIR}/${PN}-man-pl-${PV_PL}${PATCHVER_PL}.patch"
-	fi
-}
-
-src_compile() {
-	cd "${S}"/src
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o tbz2tool tbz2tool.c || \
-		die "Failed to build tbz2tool"
-
-	if use elibc_FreeBSD; then
-		cd "${S}"/src/bsd-flags
-		chmod +x setup.py
-		./setup.py build || die "Failed to install bsd-chflags module"
-	fi
-}
-
-src_install() {
-	local portage_base="/usr/lib/portage"
-	cd "${S}"/cnf
-	insinto /etc
-	doins etc-update.conf dispatch-conf.conf make.globals
-	if [ -f "make.conf.${ARCH}".diff ]; then
-		patch make.conf "make.conf.${ARCH}".diff || \
-			die "Failed to patch make.conf.example"
-		newins make.conf make.conf.example
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-		newins make.conf make.conf.example
-	fi
-
-	if use elibc_FreeBSD; then
-		cd "${S}"/src/bsd-flags
-		./setup.py install --root "${D}" || \
-			die "Failed to install bsd-chflags module"
-	fi
-
-	dodir ${portage_base}/bin
-	exeinto ${portage_base}/bin
-	# BSD and OSX need a sed wrapper so that find/xargs work properly
-	if use userland_GNU; then
-		rm "${S}"/bin/sed || die "Failed to remove sed wrapper"
-	fi
-	cd "${S}"/bin
-	doexe *
-	doexe "${S}"/src/tbz2tool
-	dosym newins ${portage_base}/bin/donewins
-
-	for mydir in pym pym/cache pym/elog_modules; do
-		dodir ${portage_base}/${mydir}
-		insinto ${portage_base}/${mydir}
-		cd "${S}"/${mydir}
-		doins *.py
-	done
-
-	doman "${S}"/man/*.[0-9]
-	if use linguas_pl; then
-		doman -i18n=pl "${S_PL}"/man/pl/*.[0-9]
-		doman -i18n=pl_PL.UTF-8 "${S_PL}"/man/pl_PL.UTF-8/*.[0-9]
-	fi
-	dodoc "${S}"/ChangeLog
-	dodoc "${S}"/NEWS
-	dodoc "${S}"/RELEASE-NOTES
-
-	dodir /usr/bin
-	for x in ebuild emerge portageq repoman tbz2tool xpak; do
-		dosym ../lib/portage/bin/${x} /usr/bin/${x}
-	done
-
-	dodir /usr/sbin
-	local my_syms="archive-conf
-		dispatch-conf
-		emaint
-		emerge-webrsync
-		env-update
-		etc-update
-		fixpackages
-		quickpkg
-		regenworld"
-	local x
-	for x in ${my_syms}; do
-		dosym ../lib/portage/bin/${x} /usr/sbin/${x}
-	done
-
-	dodir /etc/portage
-	keepdir /etc/portage
-
-	doenvd "${FILESDIR}"/05portage.envd
-}
-
-pkg_preinst() {
-	local portage_base="/usr/lib/portage"
-	if has livecvsportage ${FEATURES} && [ "${ROOT}" = "/" ]; then
-		rm -rf "${IMAGE}"/${portage_base}/pym/*
-		mv "${IMAGE}"/${portage_base}/bin/tbz2tool "${T}"
-		rm -rf "${IMAGE}"/${portage_base}/bin/*
-		mv "${T}"/tbz2tool "${IMAGE}"/${portage_base}/bin/
-	else
-		for mydir in pym pym/cache pym/elog_modules; do
-			rm "${ROOT}"/${portage_base}/${mydir}/*.pyc >& /dev/null
-			rm "${ROOT}"/${portage_base}/${mydir}/*.pyo >& /dev/null
-		done
-	fi
-}
-
-pkg_postinst() {
-	local x
-
-	if [ ! -f "${ROOT}/var/lib/portage/world" ] &&
-	   [ -f "${ROOT}"/var/cache/edb/world ] &&
-	   [ ! -h "${ROOT}"/var/cache/edb/world ]; then
-		mv "${ROOT}"/var/cache/edb/world "${ROOT}"/var/lib/portage/world
-		ln -s ../../lib/portage/world /var/cache/edb/world
-	fi
-
-	for x in "${ROOT}"/etc/._cfg????_make.globals; do
-		# Overwrite the globals file automatically.
-		[ -e "${x}" ] && mv -f "${x}" "${ROOT}etc/make.globals"
-	done
-
-	portage_docs
-}