2.1.1_rc1 release candidate. This fixes bugs #144661 and #144928.

(Portage version: 2.1.1_rc1)
 (Signed Manifest commit)

3 files changed, 15 insertions, 227 deletions

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 951015e3641c..a3db94976d17 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -16,9 +16,9 @@ SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 files/RE
 DIST portage-2.0.51.22.tar.bz2 257823 RMD160 068a6fbc3e41f7357d1ee4d65894e7903c467cfe SHA1 16459ce2b19592c94ec580bcfade5a89750a62fb SHA256 f0dac4366b5234b084645bbbd6b871a5abe05d501cf868046af2777e02a4100c
 DIST portage-2.0.54.tar.bz2 234784 RMD160 26c724df242a7d0c44d7fd06067bfcdbc4e3556b SHA1 0559bf8068976c124f0026ab65f3f4a62ae39d83 SHA256 69075ab4599958c4f7c7a932b95dcd77efa1b3c46ac28acb577284bc48a1db06
 DIST portage-2.1-r2.tar.bz2 280469 RMD160 2507c4e2db3fdf1157e44430b449f618e99f5d57 SHA1 06ec20f96618271c7835ce505d4979b8f7914067 SHA256 854c61dd0232cca50d9bb9a3e9e13f22589b76029ea7eeacab2bc5d4ec7e48cc
-DIST portage-2.1.1_pre5-r1.patch.bz2 1420 RMD160 ba2e191f273bae68f5f24d569a1e520bbecabcb8 SHA1 84e2e87916389373b176fa15ab93f709295b393a SHA256 778683606257c873bed6beb9e43d0165323576450584804ba93c45974b8f127b
 DIST portage-2.1.1_pre5-r3.patch.bz2 7737 RMD160 94a252bb08fe44ebe0c384a0e8c9cbec12ee1fb9 SHA1 e554314857f7383e3e59147880864930d51c2d92 SHA256 fd1e973bae5818361628d9481dde50d3c9c3a373e28052126d417de133e8c170
 DIST portage-2.1.1_pre5.tar.bz2 293281 RMD160 4c34d0cec6411eb463d0ef0109bf703856dc47c8 SHA1 4bda8ade5e989a1f0abf0c6522dc173c8438f915 SHA256 a2734e694f6208f7d79df894560c14816a981dc679e16daabe490ffe05d5a616
+DIST portage-2.1.1_rc1.tar.bz2 295029 RMD160 5c1f8b9bd56843b5248d0be33b702008f9284695 SHA1 8a341d527b160a30e65ce97ea3455f835fa499c0 SHA256 d29a6adcb6684c965bfec91796aedbd7ab0cf2bb05794eb1acb79a5408cef95d
 DIST portage-man-pl-2.1-r1.patch.bz2 2076 RMD160 be3898714b94fb0253c1826909649ea51da205ad SHA1 6ec21b29a3eff4a034ea68b4e6a889c8f95dcc3e SHA256 28176c04290478ba4373c28ea047edbdf3a40d3ff69bf92da55d1cfcb828ea5b
 DIST portage-man-pl-2.1.tar.bz2 52425 RMD160 5fdb898b94b0c6bb23234f0903572675f653ff44 SHA1 9942d024d0c29ccf1bc5d71954ed4668a2aaa424 SHA256 7e01f6c9c567f81d8e81dfdc26cf04b8d1f9f375090641cb80580986f8ac4817
 DIST portage-patches-2.0.54-2.tar.bz2 6722 RMD160 a9fbb40ec45c62db6b94e79b33ebabf5de22b287 SHA1 44f0b24d6c5893e50f2e4315d9ca22a288062ba8 SHA256 6d6055f433411a42d0388b787fc353014cf527dba51dd0faee203e5dda2d1fcc
@@ -34,18 +34,18 @@ EBUILD portage-2.1-r2.ebuild 7077 RMD160 709488f3f40f375fbd8dc38c0fee414b2075dc4
 MD5 1b28b65bd43e57ce31605f24e54732f1 portage-2.1-r2.ebuild 7077
 RMD160 709488f3f40f375fbd8dc38c0fee414b2075dc4d portage-2.1-r2.ebuild 7077
 SHA256 1a7fd886c4b04bff6cfa34e6d2c11255e87286a0a0ea14da1cac8feeda21a92d portage-2.1-r2.ebuild 7077
-EBUILD portage-2.1.1_pre5-r1.ebuild 5807 RMD160 449d85508920ae34debc204049f2ab251f29843b SHA1 4a43bf7141cca5107373672247445e286d913796 SHA256 244dfd84e83cba272702f41916c165e7b6e26efe009b74f4286579700c58ca2e
-MD5 bcaba80237bff6057f078498e609574c portage-2.1.1_pre5-r1.ebuild 5807
-RMD160 449d85508920ae34debc204049f2ab251f29843b portage-2.1.1_pre5-r1.ebuild 5807
-SHA256 244dfd84e83cba272702f41916c165e7b6e26efe009b74f4286579700c58ca2e portage-2.1.1_pre5-r1.ebuild 5807
 EBUILD portage-2.1.1_pre5-r3.ebuild 5807 RMD160 fcafdfe1611dffedbeda9157f99157e10cea0ba5 SHA1 b37c3c9c64ac75629b4e1896809e883c3dfd5e83 SHA256 818a8fdefc53ec51f51840f3c741fb9b4eaf4c1b2f0a94ea8dd65716ff590439
 MD5 e4cb483e8b2f406a9a92a180d32b97a0 portage-2.1.1_pre5-r3.ebuild 5807
 RMD160 fcafdfe1611dffedbeda9157f99157e10cea0ba5 portage-2.1.1_pre5-r3.ebuild 5807
 SHA256 818a8fdefc53ec51f51840f3c741fb9b4eaf4c1b2f0a94ea8dd65716ff590439 portage-2.1.1_pre5-r3.ebuild 5807
-MISC ChangeLog 21729 RMD160 86e3f9e5d592fba723cad9a7959562ab3e641d1c SHA1 79e2c42411e624cbf042481ea0d4ebf8ed8befc9 SHA256 59e46ea0c586530d8386b7e37ad2f044ba77e2c5aa983587c2edd8422af206dd
-MD5 6f782f7873a7223e395121494655a9af ChangeLog 21729
-RMD160 86e3f9e5d592fba723cad9a7959562ab3e641d1c ChangeLog 21729
-SHA256 59e46ea0c586530d8386b7e37ad2f044ba77e2c5aa983587c2edd8422af206dd ChangeLog 21729
+EBUILD portage-2.1.1_rc1.ebuild 5803 RMD160 f996fdff6d172901d1460f4599cb6d5c4289867d SHA1 759af32f9d982659cc2136cd040d1cab2d3e2b25 SHA256 168b89832090a33cd1345fbb3a9712ce855e471af14771afd5d68bcf279fa3ed
+MD5 158b957483a4ed891f911b1fc1d575be portage-2.1.1_rc1.ebuild 5803
+RMD160 f996fdff6d172901d1460f4599cb6d5c4289867d portage-2.1.1_rc1.ebuild 5803
+SHA256 168b89832090a33cd1345fbb3a9712ce855e471af14771afd5d68bcf279fa3ed portage-2.1.1_rc1.ebuild 5803
+MISC ChangeLog 21907 RMD160 27d0d6726b24b68451f49085724660b33e33f775 SHA1 d405ff9b8f4b17f623984bd93b2d7c33022e84af SHA256 ba3f0ad0e9530a2a8a15d7e40cbdf2b1238f1314ad849f74f17d22709791862e
+MD5 47ed2a8e6a3dd51fbecad87707e56a95 ChangeLog 21907
+RMD160 27d0d6726b24b68451f49085724660b33e33f775 ChangeLog 21907
+SHA256 ba3f0ad0e9530a2a8a15d7e40cbdf2b1238f1314ad849f74f17d22709791862e ChangeLog 21907
 MISC metadata.xml 219 RMD160 613195ece366b33606e71ff1753be048f2507841 SHA1 d162fb909241ef50b95a3539bdfcde95429bdf81 SHA256 cbd3a20e5c89a48a842f7132fe705bf39959f02c1025052efce8aad8a8baa8dc
 MD5 74421bbd5bae342d72a7a30b98a69662 metadata.xml 219
 RMD160 613195ece366b33606e71ff1753be048f2507841 metadata.xml 219
@@ -59,16 +59,16 @@ SHA256 e494cfdb2648a2b63f87602043fe2a34432e684159ec53347bdc6395a16cf17e 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 56e6c5e46b09d313e438b3654afdd88a files/digest-portage-2.1.1_pre5-r1 1051
-RMD160 5cb8044c7733077903d07ffa666771d68503d056 files/digest-portage-2.1.1_pre5-r1 1051
-SHA256 de72f6336d2a6162ccebaec44380566b5f6b84ea6c1887086d1c66b5c69f084a files/digest-portage-2.1.1_pre5-r1 1051
 MD5 03316904cedacaa1f14d0a6ccfa0c385 files/digest-portage-2.1.1_pre5-r3 1051
 RMD160 86bac07e88a997d652cfc25fc2a7deeab80ad3c7 files/digest-portage-2.1.1_pre5-r3 1051
 SHA256 cc065cc046b222408fb701c265b2dc8fb21ad06f147ff95c5adce69fa42017de files/digest-portage-2.1.1_pre5-r3 1051
+MD5 dff262de5a8c94cf9791e2d6eef342c6 files/digest-portage-2.1.1_rc1 780
+RMD160 2dd0ae4e13c0dde77c8ebc3a482ff3ff9f709e84 files/digest-portage-2.1.1_rc1 780
+SHA256 a791b6a545148dee0320cf872313ed68eb817c51757ad30c3bf3eb47bf135afc files/digest-portage-2.1.1_rc1 780
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE7JXP/ejvha5XGaMRArOHAKCnYubmX/HD1A9Ar1nTGBFhuN8dgACdGqre
-M4TmXeYBTN1z5LMYNggKYII=
-=bcSN
+iD8DBQFE79ET/ejvha5XGaMRAlB7AKDlydYESxylPR24EVBkM16A5Z3F2wCgz8xt
+2J002U4UDNeB0x8WLavulyA=
+=Nxpv
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/digest-portage-2.1.1_pre5-r1 b/sys-apps/portage/files/digest-portage-2.1.1_pre5-r1
deleted file mode 100644
index 73f35d9f7cbb..000000000000
--- a/sys-apps/portage/files/digest-portage-2.1.1_pre5-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 cb62f4e046a1f23702e5399127e60c46 portage-2.1.1_pre5-r1.patch.bz2 1420
-RMD160 ba2e191f273bae68f5f24d569a1e520bbecabcb8 portage-2.1.1_pre5-r1.patch.bz2 1420
-SHA256 778683606257c873bed6beb9e43d0165323576450584804ba93c45974b8f127b portage-2.1.1_pre5-r1.patch.bz2 1420
-MD5 3d562514e5690ef52cefe4cfe59f53ed portage-2.1.1_pre5.tar.bz2 293281
-RMD160 4c34d0cec6411eb463d0ef0109bf703856dc47c8 portage-2.1.1_pre5.tar.bz2 293281
-SHA256 a2734e694f6208f7d79df894560c14816a981dc679e16daabe490ffe05d5a616 portage-2.1.1_pre5.tar.bz2 293281
-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_pre5-r1.ebuild b/sys-apps/portage/portage-2.1.1_pre5-r1.ebuild
deleted file mode 100644
index b3569a95c563..000000000000
--- a/sys-apps/portage/portage-2.1.1_pre5-r1.ebuild
+++ /dev/null
@@ -1,200 +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_pre5-r1.ebuild,v 1.2 2006/08/23 17:55:13 zmedico Exp $
-
-inherit toolchain-funcs eutils flag-o-matic
-
-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}" != "r0" ] && 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() {
-	append-lfs-flags
-
-	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
-}