2.1.1_pre2-r1 regression fix revbump for bug #138793.

Package-Manager: portage-2.1.1_pre2-r1

3 files changed, 18 insertions, 217 deletions

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index ae3b307dd04d..1e8ba3bbbe20 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -13,6 +13,10 @@ 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
@@ -44,18 +48,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.ebuild 5736 RMD160 25514373f0cb287f54030cfdb68f7723470b587c SHA1 dd5abd918e20f9bf439b40befbb65ba2d381b5a4 SHA256 60362706621349c2fcb080cb8bbd1ee31b11c6cac65c4616aff9b5aa6074f3c7
-MD5 0478d57ee0f060713995a82455135105 portage-2.1.1_pre2.ebuild 5736
-RMD160 25514373f0cb287f54030cfdb68f7723470b587c portage-2.1.1_pre2.ebuild 5736
-SHA256 60362706621349c2fcb080cb8bbd1ee31b11c6cac65c4616aff9b5aa6074f3c7 portage-2.1.1_pre2.ebuild 5736
+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.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 15322 RMD160 5b73341ecbed6725d63b4986b1b5ee1fe2f882f5 SHA1 cc3f6f22079f955aa2e51cb50ec3bd28b1cba951 SHA256 e0a4a11b467420f0759fe54d5e7f62cb1dd50ddca1b4b4bb6920ac3d380e80f9
-MD5 71062eed7bd0bba3111ceee7ff00d08a ChangeLog 15322
-RMD160 5b73341ecbed6725d63b4986b1b5ee1fe2f882f5 ChangeLog 15322
-SHA256 e0a4a11b467420f0759fe54d5e7f62cb1dd50ddca1b4b4bb6920ac3d380e80f9 ChangeLog 15322
+MISC ChangeLog 15495 RMD160 713833624330b218a60264343fea02cf1a524e50 SHA1 194ef9d4f499bbc24b0f55f5f8e4eb9b4ba2ba72 SHA256 4caa1aad93979374192799c82ca0e8dd54e245cea874faaa7ea2d938a6d482a4
+MD5 6d2cddfaea2d6e8d375a0eb045d54548 ChangeLog 15495
+RMD160 713833624330b218a60264343fea02cf1a524e50 ChangeLog 15495
+SHA256 4caa1aad93979374192799c82ca0e8dd54e245cea874faaa7ea2d938a6d482a4 ChangeLog 15495
 MISC metadata.xml 219 RMD160 613195ece366b33606e71ff1753be048f2507841 SHA1 d162fb909241ef50b95a3539bdfcde95429bdf81 SHA256 cbd3a20e5c89a48a842f7132fe705bf39959f02c1025052efce8aad8a8baa8dc
 MD5 74421bbd5bae342d72a7a30b98a69662 metadata.xml 219
 RMD160 613195ece366b33606e71ff1753be048f2507841 metadata.xml 219
@@ -75,13 +79,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 783
-RMD160 4f8c6f2026a766eb35446c195a116f62634f4c2e files/digest-portage-2.1.1_pre2 783
-SHA256 5c952eac6357a3876939e7516ff155d4bb7e236457e555b88107319e0be67bc1 files/digest-portage-2.1.1_pre2 783
+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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEpv/r/ejvha5XGaMRAvERAJ9j5vSuxffXUHxKXBDFakKz3qvYJwCgwuSK
-MtzKGCI1QLWLvTePqaC/iW0=
-=ZW6N
+iD8DBQFEpyKL/ejvha5XGaMRAjNWAJ9Pg8giOQ82KeqbK+QBGnvNbAX3agCgl0ov
+5WEOOVSsFBagyjM8PjWtGQY=
+=rK+g
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/digest-portage-2.1.1_pre2 b/sys-apps/portage/files/digest-portage-2.1.1_pre2
deleted file mode 100644
index 422d3f0413ba..000000000000
--- a/sys-apps/portage/files/digest-portage-2.1.1_pre2
+++ /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.ebuild b/sys-apps/portage/portage-2.1.1_pre2.ebuild
deleted file mode 100644
index e0ed35871108..000000000000
--- a/sys-apps/portage/portage-2.1.1_pre2.ebuild
+++ /dev/null
@@ -1,194 +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.ebuild,v 1.1 2006/07/01 23:06: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_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 )"
-
-if [ "${PR}" != "r0" ]; then
-	PATCHVER="-${PR}"
-	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}
-	if [ "${PR}" != "r0" ]; then
-		cd "${S}"
-		epatch "${WORKDIR}/${PN}-${PV}${PATCHVER}.patch"
-		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
-}