2.1.1_pre2-r2 revbump. This fixes bugs #137975, #138837, and #138911.

(Portage version: 2.1.1_pre2-r2)
 (Signed Manifest commit)

4 files changed, 15 insertions, 241 deletions

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 73c713ecf61d..84061a896818 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -13,10 +13,6 @@ AUX README.RESCUE 137 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 SHA1 cfc8f
 MD5 c906e2e6782e197725b70f84cfe112a4 files/README.RESCUE 137
 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 files/README.RESCUE 137
 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 files/README.RESCUE 137
-AUX bug_138793.patch 642 RMD160 eabdccc41ba4a2d75d3fa3b9153c69b4d0f54da2 SHA1 eca81a596fad5692749b8d680c38333e99810eb0 SHA256 e4e3eeb994a5bb8f4c8a8e78cae197593865c6950490baacd4209492dfad51e2
-MD5 b4288dd3d555649ab8469f132f958d6a files/bug_138793.patch 642
-RMD160 eabdccc41ba4a2d75d3fa3b9153c69b4d0f54da2 files/bug_138793.patch 642
-SHA256 e4e3eeb994a5bb8f4c8a8e78cae197593865c6950490baacd4209492dfad51e2 files/bug_138793.patch 642
 AUX bugs_138246_138259.patch 3224 RMD160 a82a7fc3fcbbee64c377c9a99cd76e29dbc7a6a0 SHA1 84d746b9c21369febe7c897b6f83fd00c176601a SHA256 7dd6cc900dbf83e8efd85e1c2fad86e18fb8489d8d3f70b7b0dabbe183b1d664
 MD5 216e8e331f34339920c5eb492e6871b7 files/bugs_138246_138259.patch 3224
 RMD160 a82a7fc3fcbbee64c377c9a99cd76e29dbc7a6a0 files/bugs_138246_138259.patch 3224
@@ -26,6 +22,7 @@ DIST portage-2.0.54.tar.bz2 234784 RMD160 26c724df242a7d0c44d7fd06067bfcdbc4e355
 DIST portage-2.1-r1.patch.bz2 12201 RMD160 ceff46c18d8e28f341cc0c1a0c41150733c2dc98 SHA1 0948e3de6cdd8869c9abbb7c8a3ad54e0aebb937 SHA256 78bdf92a43e8d34d090592bcd92779383dbaca9a9295418e4cc9b39f217fbf80
 DIST portage-2.1.1_pre1-r5.patch.bz2 39728 RMD160 d82b4203462e77c17dc4f3ba87c62a09b53745a7 SHA1 01ffcc7123c7b89109699d043a86ddafb2cbb80b SHA256 abe00224559f2ae45261d46b36cea9b6a1add88aa145093482e1786b5b866bea
 DIST portage-2.1.1_pre1.tar.bz2 277982 RMD160 41fc05479ba8774ad35939b6b5f597e559602f0e SHA1 bd7787676d3db97932867983ab01781cf5f56b78 SHA256 de7d23e15681a6eff9199a505bc9bdf59a5a43d5c51e6223d6296659c1a0cc3e
+DIST portage-2.1.1_pre2-r2.patch.bz2 2627 RMD160 ab221fbc97aae65a81a474ce7dc06f3dfe507389 SHA1 539d31f39541e79111e24db706b11ed9a90f4d00 SHA256 b4ca589e8f1a497942ca4bc7cb8d7660ce0ef6d2705f8bd7192f77d831be3dc2
 DIST portage-2.1.1_pre2.tar.bz2 283920 RMD160 5827bafecf45e4e82f8ecfc5e79b21e323cf130a SHA1 069cc6e1d1d317b1db0000f5b5d9be9557101001 SHA256 e8168565cf496ac09e0dec77c2a997476218f1acdb418a301253569c78b429f4
 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
@@ -48,18 +45,18 @@ EBUILD portage-2.1.1_pre1-r5.ebuild 5692 RMD160 1d0b157a7b3c74cbee5bfd4f67a2631e
 MD5 210a4557c343011fcdf8a5077cdeef3e portage-2.1.1_pre1-r5.ebuild 5692
 RMD160 1d0b157a7b3c74cbee5bfd4f67a2631e8dbbd766 portage-2.1.1_pre1-r5.ebuild 5692
 SHA256 26df65f5f419c00e2c345fb2b8c808dd9c84551c23eb52b528018d5fc6e72c16 portage-2.1.1_pre1-r5.ebuild 5692
-EBUILD portage-2.1.1_pre2-r1.ebuild 5819 RMD160 67cdddc266461181a1f10bf8194322d937ea5f38 SHA1 1da165a9e6fc929d7ffccdb49e7a22fe4d549f02 SHA256 291e44fa7c044b8c18869043bc999e76786057f56dc9ffef999ac7b37d9f9f06
-MD5 316e3cadd77452a67af99db71f1423ef portage-2.1.1_pre2-r1.ebuild 5819
-RMD160 67cdddc266461181a1f10bf8194322d937ea5f38 portage-2.1.1_pre2-r1.ebuild 5819
-SHA256 291e44fa7c044b8c18869043bc999e76786057f56dc9ffef999ac7b37d9f9f06 portage-2.1.1_pre2-r1.ebuild 5819
+EBUILD portage-2.1.1_pre2-r2.ebuild 5786 RMD160 74d16a113a871eb7a6abbd03149edfeb61608285 SHA1 f343666d3347d45d70cb03cd81697b97ebe205cd SHA256 bae713cf1c65dcef314131d18a4e132c48c8966cf9a49bef9880341258500811
+MD5 fd23c3d9a1c76a61294f33c340ebc6c6 portage-2.1.1_pre2-r2.ebuild 5786
+RMD160 74d16a113a871eb7a6abbd03149edfeb61608285 portage-2.1.1_pre2-r2.ebuild 5786
+SHA256 bae713cf1c65dcef314131d18a4e132c48c8966cf9a49bef9880341258500811 portage-2.1.1_pre2-r2.ebuild 5786
 EBUILD portage-2.1.ebuild 7248 RMD160 e54df351244bb056247dc870e8cae61f9d4d69c2 SHA1 820a21fbe6b7b1d60987a9bda32df12cd85b76e7 SHA256 93eeb65fc06e62c619785c7ac4dbf8aaf2f2a07d547f7e1d2a860ad1cdce2d13
 MD5 34ee3d531b703420790ae14a8dbb5f79 portage-2.1.ebuild 7248
 RMD160 e54df351244bb056247dc870e8cae61f9d4d69c2 portage-2.1.ebuild 7248
 SHA256 93eeb65fc06e62c619785c7ac4dbf8aaf2f2a07d547f7e1d2a860ad1cdce2d13 portage-2.1.ebuild 7248
-MISC ChangeLog 15495 RMD160 713833624330b218a60264343fea02cf1a524e50 SHA1 194ef9d4f499bbc24b0f55f5f8e4eb9b4ba2ba72 SHA256 4caa1aad93979374192799c82ca0e8dd54e245cea874faaa7ea2d938a6d482a4
-MD5 6d2cddfaea2d6e8d375a0eb045d54548 ChangeLog 15495
-RMD160 713833624330b218a60264343fea02cf1a524e50 ChangeLog 15495
-SHA256 4caa1aad93979374192799c82ca0e8dd54e245cea874faaa7ea2d938a6d482a4 ChangeLog 15495
+MISC ChangeLog 15685 RMD160 d6fa51a47d577f68984c93600200be89a10b984f SHA1 a9b7a9a88b2bd8bb6d691a5bad3cb21b0d9593d9 SHA256 6ecccbf2fa8bd170dc43db68ce0ec0d0a2c099ac94d9da8c18f364f9996cf223
+MD5 9686b9dda7d3fdd7c8d70b0adf0f8771 ChangeLog 15685
+RMD160 d6fa51a47d577f68984c93600200be89a10b984f ChangeLog 15685
+SHA256 6ecccbf2fa8bd170dc43db68ce0ec0d0a2c099ac94d9da8c18f364f9996cf223 ChangeLog 15685
 MISC metadata.xml 219 RMD160 613195ece366b33606e71ff1753be048f2507841 SHA1 d162fb909241ef50b95a3539bdfcde95429bdf81 SHA256 cbd3a20e5c89a48a842f7132fe705bf39959f02c1025052efce8aad8a8baa8dc
 MD5 74421bbd5bae342d72a7a30b98a69662 metadata.xml 219
 RMD160 613195ece366b33606e71ff1753be048f2507841 metadata.xml 219
@@ -79,13 +76,13 @@ SHA256 9f002b314a87d8dfad176863f83c6963acec51093a45494201b53e9c0cf87cd8 files/di
 MD5 65e33a514b2084c868cb3ee45f7fda32 files/digest-portage-2.1.1_pre1-r5 1054
 RMD160 2c1a5753d848cd1c61d917ec06f346ce838a19bf files/digest-portage-2.1.1_pre1-r5 1054
 SHA256 76b054610dbdad6aa3cb0e21cefa2a8f3a9470494f8b57cf49b99799f6a84573 files/digest-portage-2.1.1_pre1-r5 1054
-MD5 9d8a3ce9bc303047ac7e7e2c493c5960 files/digest-portage-2.1.1_pre2-r1 783
-RMD160 4f8c6f2026a766eb35446c195a116f62634f4c2e files/digest-portage-2.1.1_pre2-r1 783
-SHA256 5c952eac6357a3876939e7516ff155d4bb7e236457e555b88107319e0be67bc1 files/digest-portage-2.1.1_pre2-r1 783
+MD5 e18d610ee65346765e91e141bc432f7c files/digest-portage-2.1.1_pre2-r2 1051
+RMD160 1da3423919fc1215e9df921c72efa9393f207bb4 files/digest-portage-2.1.1_pre2-r2 1051
+SHA256 d6fbc94eed9697210285206f62058cc5487c782efe2336fce3f87bc64a1ff989 files/digest-portage-2.1.1_pre2-r2 1051
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEqC5ramhnQswr0vIRAqxtAJwJJF/1zt6wFTLMlt/eH93Du+tCowCcCn18
-68jIeZvuaup97Ueq9sZkEZc=
-=6Wux
+iD8DBQFEqJF//ejvha5XGaMRAl6vAJ9FklEeP7tNL7WWfyyISwOXd7tPtgCcCWt0
+RNsLyTc9rw7uDWoXpUXVSrA=
+=rL8+
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/bug_138793.patch b/sys-apps/portage/files/bug_138793.patch
deleted file mode 100644
index 1084e504e240..000000000000
--- a/sys-apps/portage/files/bug_138793.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: pym/portage.py
-===================================================================
---- pym/portage.py	(revision 3746)
-+++ pym/portage.py	(revision 3747)
-@@ -6202,7 +6202,9 @@
- 			for v in otherversions:
- 				# only allow versions with same slot to overwrite files
- 				if myslot == self.vartree.dbapi.aux_get("/".join((self.cat, v)), ["SLOT"])[0]:
--					mypkglist.append(dblink(self.cat,v,destroot,self.settings))
-+					mypkglist.append(
-+						dblink(self.cat, v, destroot, self.settings,
-+							vartree=self.vartree))
- 
- 			print green("*")+" checking "+str(len(myfilelist))+" files for package collisions"
- 			for f in myfilelist:
diff --git a/sys-apps/portage/files/digest-portage-2.1.1_pre2-r1 b/sys-apps/portage/files/digest-portage-2.1.1_pre2-r1
deleted file mode 100644
index 422d3f0413ba..000000000000
--- a/sys-apps/portage/files/digest-portage-2.1.1_pre2-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 2f933f22a47e42e284639097e6abaa4a portage-2.1.1_pre2.tar.bz2 283920
-RMD160 5827bafecf45e4e82f8ecfc5e79b21e323cf130a portage-2.1.1_pre2.tar.bz2 283920
-SHA256 e8168565cf496ac09e0dec77c2a997476218f1acdb418a301253569c78b429f4 portage-2.1.1_pre2.tar.bz2 283920
-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_pre2-r1.ebuild b/sys-apps/portage/portage-2.1.1_pre2-r1.ebuild
deleted file mode 100644
index cf9c9fc0191e..000000000000
--- a/sys-apps/portage/portage-2.1.1_pre2-r1.ebuild
+++ /dev/null
@@ -1,199 +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_pre2-r1.ebuild,v 1.1 2006/07/02 01:33:56 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_GNU? ( sys-apps/debianutils )
-		!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=""
-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() {
-	einfo ""
-	einfo "For help with using portage please consult the Gentoo Handbook"
-	einfo "at http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3"
-	einfo ""
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/bug_138793.patch"
-	if [ -n "${PATCHVER}" ]; then
-		cd "${S}"
-		epatch "${WORKDIR}/${PN}-${PV}${PATCHVER}.patch"
-	fi
-	if [ "${PR}" != "r0" ]; then
-		einfo "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
-}