2.1.2_pre1-r4 revbump. This fixes bugs #147766 and #149208.

Package-Manager: portage-2.1.2_pre1-r4

3 files changed, 22 insertions, 224 deletions

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 17d317e98111..5502591a299b 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 05portage.envd 34 RMD160 014194a1786a0983a8ba91c3924b798f353c330d SHA1 2af2c9a7ce535c36749dfe81b6555426225620e2 SHA256 dbe8db19d03b39ad2b7f9f6dfcd24c615a14886b3fe6d5ce4dd88bac27c0e225
 MD5 d5d5b818347fd87b290ecb0b17516b34 files/05portage.envd 34
 RMD160 014194a1786a0983a8ba91c3924b798f353c330d files/05portage.envd 34
@@ -15,7 +18,7 @@ DIST portage-2.1-r2.tar.bz2 280469 RMD160 2507c4e2db3fdf1157e44430b449f618e99f5d
 DIST portage-2.1.1-r1.patch.bz2 4200 RMD160 e8c003983b1711e296774025f12f01463ed5e4d9 SHA1 9471d5412ef205e452dac985da3871346800c1cc SHA256 eee5bcc98558ca5300fa1f8dc37135c6ff73f4cd52b985218a30846176ad53f1
 DIST portage-2.1.1.tar.bz2 297006 RMD160 489e6c3e82527917f5308fdbff1c9add1a03f254 SHA1 6fdcb9897cef7f48d98829ab96caf37e31bd14a2 SHA256 3a5da4bb41ca8495f2673178f120622d8d923d8117b8744921418af5843c0389
 DIST portage-2.1.2_pre1-r1.patch.bz2 12950 RMD160 0474040b06afa9d86d9d74d46c13c1dee0b82b99 SHA1 1810e54f8a97e8e5dce25c2eeffe57f08a4e0e1e SHA256 54c073e4aa17c024b21cfa4bca48dcb16007a950b90b3f6dbaa5579f607edc68
-DIST portage-2.1.2_pre1-r3.patch.bz2 20134 RMD160 e042ad862fc0adeb89401ab31dbd5adc269fb1a9 SHA1 e353645c3879f70669ffe021e9b5b3944560f652 SHA256 05916c0487f63abba2b2db07dc0508553ef5fe61bf560389b788de28b790f475
+DIST portage-2.1.2_pre1-r4.patch.bz2 20797 RMD160 fdbf1a1f4fb7c99e76f7ee2f7c09fed352585ad3 SHA1 0c15171303dfba7d01324422e8eadb7689a973f1 SHA256 6a44f7516bdf1a4d5974c8bfddc75105b090e950a1040d61cd5243c16fdc25e1
 DIST portage-2.1.2_pre1.tar.bz2 298238 RMD160 9f962d49833b4ce09880b6b6691c7b6566722509 SHA1 3df44514039c57477c2ad7c8a3888d4a365e6a9a SHA256 498e91d732e09164cede316d7747558ea3e1b60997268dd573f344b8e6d51119
 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
@@ -39,18 +42,18 @@ EBUILD portage-2.1.2_pre1-r1.ebuild 5807 RMD160 fc6ef761d3e64847eef55920fb847fb2
 MD5 98c125fe38546c43218609df8997aa0c portage-2.1.2_pre1-r1.ebuild 5807
 RMD160 fc6ef761d3e64847eef55920fb847fb2d3c425fc portage-2.1.2_pre1-r1.ebuild 5807
 SHA256 10216d99c592218a597475db8dd2350e2a8bb808e6233d7ac4f13a65a5da4c27 portage-2.1.2_pre1-r1.ebuild 5807
-EBUILD portage-2.1.2_pre1-r3.ebuild 5807 RMD160 84fa4b46641aeec61dfd5d3bb16ad24bf42f738b SHA1 76f1ae201ca365c82c4e5529c634a215c42f89e9 SHA256 e4c8bb47e54045b0652f1064382c148843b553ddd0a963d77cc459cce74c34bd
-MD5 fc97c6c72abb01d124ca7a1c48288b17 portage-2.1.2_pre1-r3.ebuild 5807
-RMD160 84fa4b46641aeec61dfd5d3bb16ad24bf42f738b portage-2.1.2_pre1-r3.ebuild 5807
-SHA256 e4c8bb47e54045b0652f1064382c148843b553ddd0a963d77cc459cce74c34bd portage-2.1.2_pre1-r3.ebuild 5807
+EBUILD portage-2.1.2_pre1-r4.ebuild 5807 RMD160 f8f6e558424ba21ece370ee1c8b2e56d45739e45 SHA1 1ca7db69dd7aafa3ac17e8ab4a8c15173578be0b SHA256 a17ac96c8d60040248d8f3b31784fedfdc6e7e5ce05419232618bfd2107eedf5
+MD5 bd7f4d539688887bf8f917ea96e96801 portage-2.1.2_pre1-r4.ebuild 5807
+RMD160 f8f6e558424ba21ece370ee1c8b2e56d45739e45 portage-2.1.2_pre1-r4.ebuild 5807
+SHA256 a17ac96c8d60040248d8f3b31784fedfdc6e7e5ce05419232618bfd2107eedf5 portage-2.1.2_pre1-r4.ebuild 5807
 EBUILD portage-2.1.2_pre1.ebuild 5804 RMD160 58e96e6a397c8241108d9154a718a8dcec9b9f85 SHA1 de8389b509c4284885a0d304ab2002b8718c3f51 SHA256 29887f1bbca2272028fb7d02b12c6201a071d7f4aad16ea6c91618eb5ae3ddcd
 MD5 0566444ee16a1f69b17e093b31727809 portage-2.1.2_pre1.ebuild 5804
 RMD160 58e96e6a397c8241108d9154a718a8dcec9b9f85 portage-2.1.2_pre1.ebuild 5804
 SHA256 29887f1bbca2272028fb7d02b12c6201a071d7f4aad16ea6c91618eb5ae3ddcd portage-2.1.2_pre1.ebuild 5804
-MISC ChangeLog 14094 RMD160 84f55e1acd1c85ff68e577ce47cbcdb5dcaa4716 SHA1 9d175649cf5c50e8eeebfa74f41190647c40e42b SHA256 cfb4eaa081a35c88356b3daa327262669ee75a64cd080a29d65dd25de309bcf6
-MD5 1299727e24d3844387afa3679dd1963f ChangeLog 14094
-RMD160 84f55e1acd1c85ff68e577ce47cbcdb5dcaa4716 ChangeLog 14094
-SHA256 cfb4eaa081a35c88356b3daa327262669ee75a64cd080a29d65dd25de309bcf6 ChangeLog 14094
+MISC ChangeLog 14271 RMD160 a7221c91647e27750fe8ea24379671ec57bfa1fa SHA1 98aadc42d9c33a59b63bc858cf5a3353acc4e2f3 SHA256 19ad9ca8136a6a8f096451558c7ac044b9f81fb93a11a8a53a69995fe96b575c
+MD5 bb450afa20089fdc6b47759f5740123c ChangeLog 14271
+RMD160 a7221c91647e27750fe8ea24379671ec57bfa1fa ChangeLog 14271
+SHA256 19ad9ca8136a6a8f096451558c7ac044b9f81fb93a11a8a53a69995fe96b575c ChangeLog 14271
 MISC metadata.xml 219 RMD160 613195ece366b33606e71ff1753be048f2507841 SHA1 d162fb909241ef50b95a3539bdfcde95429bdf81 SHA256 cbd3a20e5c89a48a842f7132fe705bf39959f02c1025052efce8aad8a8baa8dc
 MD5 74421bbd5bae342d72a7a30b98a69662 metadata.xml 219
 RMD160 613195ece366b33606e71ff1753be048f2507841 metadata.xml 219
@@ -73,6 +76,13 @@ SHA256 cc9ebce98fefa560f5f7e5c94d28e463e3207815ef8b46c9a78b2b33bb09d6a4 files/di
 MD5 7b00eaae09038c453228e994d2d76260 files/digest-portage-2.1.2_pre1-r1 1054
 RMD160 f1b2672a9783c019e035601701240bd1d1cba0f8 files/digest-portage-2.1.2_pre1-r1 1054
 SHA256 d4dfcaf52685b662ca59cb0d82202e6524295cb3996fd9a75b08f430273c9827 files/digest-portage-2.1.2_pre1-r1 1054
-MD5 ab1ca4c3d2edf031e0ab46af1a8f34b0 files/digest-portage-2.1.2_pre1-r3 1054
-RMD160 9b071025e7391c154a9a7e233fd30a298265ed79 files/digest-portage-2.1.2_pre1-r3 1054
-SHA256 8b195584e2864602df8e12c1ec9f767ca05d51771b5b2827c3030af6c4b78338 files/digest-portage-2.1.2_pre1-r3 1054
+MD5 ca31f235b704520bbf40424f915eab52 files/digest-portage-2.1.2_pre1-r4 1054
+RMD160 955248935db8bbf45d3adc9e58390ee85b3171da files/digest-portage-2.1.2_pre1-r4 1054
+SHA256 fd24f2dd4d90f8a1ea4c1424396c13da8f52788c33cb4ddc5b73e714a8c2e82c files/digest-portage-2.1.2_pre1-r4 1054
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFGuHG/ejvha5XGaMRAgUlAJwLNe/qOTmReR14rF+13HH5oI9/1wCgrmmN
+XHNB6WX5Kh6cYHaEaFEFVYQ=
+=f+75
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/digest-portage-2.1.2_pre1-r3 b/sys-apps/portage/files/digest-portage-2.1.2_pre1-r3
deleted file mode 100644
index 727af9ec756a..000000000000
--- a/sys-apps/portage/files/digest-portage-2.1.2_pre1-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 faf8ff65684481b1586ad1140bc17723 portage-2.1.2_pre1-r3.patch.bz2 20134
-RMD160 e042ad862fc0adeb89401ab31dbd5adc269fb1a9 portage-2.1.2_pre1-r3.patch.bz2 20134
-SHA256 05916c0487f63abba2b2db07dc0508553ef5fe61bf560389b788de28b790f475 portage-2.1.2_pre1-r3.patch.bz2 20134
-MD5 6b545a8fc30d0de1f83a091994418d38 portage-2.1.2_pre1.tar.bz2 298238
-RMD160 9f962d49833b4ce09880b6b6691c7b6566722509 portage-2.1.2_pre1.tar.bz2 298238
-SHA256 498e91d732e09164cede316d7747558ea3e1b60997268dd573f344b8e6d51119 portage-2.1.2_pre1.tar.bz2 298238
-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.2_pre1-r3.ebuild b/sys-apps/portage/portage-2.1.2_pre1-r3.ebuild
deleted file mode 100644
index a05607b35b1d..000000000000
--- a/sys-apps/portage/portage-2.1.2_pre1-r3.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.2_pre1-r3.ebuild,v 1.1 2006/09/26 01:52:39 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
-}