2.1.1_pre4-r2 revbump. This fixes bugs #108517 and #142271.

(Portage version: 2.1.1_pre4-r2)
 (Unsigned Manifest commit)

3 files changed, 12 insertions, 217 deletions

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 2fd5d3e15a86..734c884edf8e 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -15,6 +15,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-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.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,14 +41,14 @@ EBUILD portage-2.1.1_pre4-r1.ebuild 5740 RMD160 361257e15ad56e4e91b32a8693f21550
 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.ebuild 5731 RMD160 10e3770f2039c80f5e56f8a21f81c1e26f710d2f SHA1 d612d9b7e4482f99af563ad39e776ede4e83cc86 SHA256 154bb3ebda5c2793dde9870dfeaf9caa663f473945484210f6c7339ea8298243
-MD5 42814ac7d84256eb83fc5fd70cf270b2 portage-2.1.1_pre4.ebuild 5731
-RMD160 10e3770f2039c80f5e56f8a21f81c1e26f710d2f portage-2.1.1_pre4.ebuild 5731
-SHA256 154bb3ebda5c2793dde9870dfeaf9caa663f473945484210f6c7339ea8298243 portage-2.1.1_pre4.ebuild 5731
-MISC ChangeLog 19445 RMD160 4eb486c9aa4a77e8ccce08d4f556adca65403dee SHA1 8f28ddfd9f232bbcf984d6fd4e4fdd80a1b60517 SHA256 7861fec70527098a1ee8980b0e3f369eb87794857251eb358da9877d87b3f857
-MD5 014ee2f602c71af4d9162c43c7d144ed ChangeLog 19445
-RMD160 4eb486c9aa4a77e8ccce08d4f556adca65403dee ChangeLog 19445
-SHA256 7861fec70527098a1ee8980b0e3f369eb87794857251eb358da9877d87b3f857 ChangeLog 19445
+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 19625 RMD160 fa2529b8f0bb352608a92a8913f137dcdc518406 SHA1 da41e24858304ed2f73ed78136bdcd023e8e6454 SHA256 0f799dbe9209965d54795079be2672ad6c0d17d573e5787bee776d57e107f840
+MD5 b04b752a86895335efab82c6b8bc075f ChangeLog 19625
+RMD160 fa2529b8f0bb352608a92a8913f137dcdc518406 ChangeLog 19625
+SHA256 0f799dbe9209965d54795079be2672ad6c0d17d573e5787bee776d57e107f840 ChangeLog 19625
 MISC metadata.xml 219 RMD160 613195ece366b33606e71ff1753be048f2507841 SHA1 d162fb909241ef50b95a3539bdfcde95429bdf81 SHA256 cbd3a20e5c89a48a842f7132fe705bf39959f02c1025052efce8aad8a8baa8dc
 MD5 74421bbd5bae342d72a7a30b98a69662 metadata.xml 219
 RMD160 613195ece366b33606e71ff1753be048f2507841 metadata.xml 219
@@ -64,9 +65,9 @@ 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 8db93e05a7bbea85a4bcb1e58775ac9d files/digest-portage-2.1.1_pre4 783
-RMD160 b2fd4f24b6376e8abded6e3b34ab80ee75b6d0c1 files/digest-portage-2.1.1_pre4 783
-SHA256 d4bcb3de99b3db0599c6ab6a769ac78172552a89fc828e2dd2d730a50a982877 files/digest-portage-2.1.1_pre4 783
 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
diff --git a/sys-apps/portage/files/digest-portage-2.1.1_pre4 b/sys-apps/portage/files/digest-portage-2.1.1_pre4
deleted file mode 100644
index 31a1a7b3c3ea..000000000000
--- a/sys-apps/portage/files/digest-portage-2.1.1_pre4
+++ /dev/null
@@ -1,9 +0,0 @@
-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.ebuild b/sys-apps/portage/portage-2.1.1_pre4.ebuild
deleted file mode 100644
index 9304f8379ed0..000000000000
--- a/sys-apps/portage/portage-2.1.1_pre4.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.ebuild,v 1.1 2006/07/28 18:07:41 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=""
-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
-}