2.1.2_pre3-r4 revbump. This fixes bugs #151502, #151586, and #151694.

Package-Manager: portage-2.1.2_pre3-r4

3 files changed, 22 insertions, 226 deletions

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 1271bd8cbf53..1b70ba9c7803 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
@@ -16,8 +19,8 @@ DIST portage-2.1.1-r1.patch.bz2 4200 RMD160 e8c003983b1711e296774025f12f01463ed5
 DIST portage-2.1.1.tar.bz2 297006 RMD160 489e6c3e82527917f5308fdbff1c9add1a03f254 SHA1 6fdcb9897cef7f48d98829ab96caf37e31bd14a2 SHA256 3a5da4bb41ca8495f2673178f120622d8d923d8117b8744921418af5843c0389
 DIST portage-2.1.2_pre2-r9.patch.bz2 21911 RMD160 9f91798a79769753ab611f78e1130a570669d04c SHA1 952b44eae625e670b827a335f82e23da9a63453d SHA256 d5cf4d3ca1dce1d672bb057a47607d67b88b73b20ad222a842dce6df6748610d
 DIST portage-2.1.2_pre2.tar.bz2 302712 RMD160 4bd9d9b3ce76c63d4b86d12c5645403be54903c0 SHA1 11297373bc85c6b870ac04f711278d8ec0fffaeb SHA256 caa9828537310067885c365ee49b72d6827cedc781c85825795a46932740e0e3
-DIST portage-2.1.2_pre3-r2.patch.bz2 3223 RMD160 df91331fd15103c5ed20dffbf64f27d4052ae7a2 SHA1 c64ea2c97fbac60fa1f98dd5f04cbec4e8178476 SHA256 c333c9c6f618d0fe994af97e91e948155a675f79e1cf0df3e405f4c2402567da
 DIST portage-2.1.2_pre3-r3.patch.bz2 7787 RMD160 66f25cbc6904f1286491c9754fcb3dea3e13fdc8 SHA1 d7adcb7064f53fb3bafca66a427b3c724b243732 SHA256 906db9bd6880af589d8719b37711e380c5f0f4db40c7c07019cc7199a39dffb1
+DIST portage-2.1.2_pre3-r4.patch.bz2 11313 RMD160 62b05d820f4c4574d1398aa31bdef69bd9dee7c7 SHA1 3accd978fab2156f78c0a29a1bf306a52b780b40 SHA256 ec6fd4cf8b5274a7026111811962d2771cc87e906035ac60337caffb43b960a7
 DIST portage-2.1.2_pre3.tar.bz2 307042 RMD160 7ac4a2453eb9c50b0c1e224f627913aa95dbce0b SHA1 619f2ef48464e04ee009ecb1f580e97a360168fe SHA256 6beea20e872d7256f881e47a2c25fe40fd7edac02a9967b7dd4a2bb54ba6ad44
 DIST portage-man-pl-2.1-r1.patch.bz2 2076 RMD160 be3898714b94fb0253c1826909649ea51da205ad SHA1 6ec21b29a3eff4a034ea68b4e6a889c8f95dcc3e SHA256 28176c04290478ba4373c28ea047edbdf3a40d3ff69bf92da55d1cfcb828ea5b
 DIST portage-man-pl-2.1.2_pre2-r7.patch.bz2 14420 RMD160 f6b798efcc39b81541f5a324dc68f832886731db SHA1 04958eeae1ffd7d32b518e421fb9cefd47844c3f SHA256 e621cb572cf8626c0dd9021830b67f1a3cfabbdffe89f3a7f85f4447e0aaa6e5
@@ -44,18 +47,18 @@ EBUILD portage-2.1.2_pre2-r9.ebuild 6153 RMD160 485112da1370f904f543baf7920c9b1b
 MD5 d25867aecdbdc21106d77bc4609995aa portage-2.1.2_pre2-r9.ebuild 6153
 RMD160 485112da1370f904f543baf7920c9b1ba6a72948 portage-2.1.2_pre2-r9.ebuild 6153
 SHA256 6a18956278533c722172687b91e72ef20c01ead3ff7af694403f16fdc40f89c0 portage-2.1.2_pre2-r9.ebuild 6153
-EBUILD portage-2.1.2_pre3-r2.ebuild 6150 RMD160 7aecf79342b26f1c4512990b50fd300048f537fe SHA1 eceabfaad9b90e50d6ba11edd4f2bc72ee39222f SHA256 960b535ae3d0e9b02538cc7219f2c9a5fc4d53b0ebd4e21d0185db6cb17f4b44
-MD5 caba3dd3e1f1cafbda82bc3923a3e990 portage-2.1.2_pre3-r2.ebuild 6150
-RMD160 7aecf79342b26f1c4512990b50fd300048f537fe portage-2.1.2_pre3-r2.ebuild 6150
-SHA256 960b535ae3d0e9b02538cc7219f2c9a5fc4d53b0ebd4e21d0185db6cb17f4b44 portage-2.1.2_pre3-r2.ebuild 6150
 EBUILD portage-2.1.2_pre3-r3.ebuild 6163 RMD160 211c92288940a69f7e120e30244e34511d481f10 SHA1 4213708810ebe52ee04664c76a5636565e6531e5 SHA256 37188900126b082771fd8f82231ea3d6bea884ac0e7408d26a487193b73a057a
 MD5 794296b011b67c1169b48efd40e87f05 portage-2.1.2_pre3-r3.ebuild 6163
 RMD160 211c92288940a69f7e120e30244e34511d481f10 portage-2.1.2_pre3-r3.ebuild 6163
 SHA256 37188900126b082771fd8f82231ea3d6bea884ac0e7408d26a487193b73a057a portage-2.1.2_pre3-r3.ebuild 6163
-MISC ChangeLog 17251 RMD160 97300f639a77735ba89e5d719ff6181f6398a342 SHA1 df1b2256ad6f0d6b2fa71d0ded07b2a9528cab35 SHA256 1c42fb549bffe8c1d92b03ada4b5443ee3e1d6d585c5b9bc77934d72c8076f88
-MD5 05120f028be4aa7b63393b3aac7f0073 ChangeLog 17251
-RMD160 97300f639a77735ba89e5d719ff6181f6398a342 ChangeLog 17251
-SHA256 1c42fb549bffe8c1d92b03ada4b5443ee3e1d6d585c5b9bc77934d72c8076f88 ChangeLog 17251
+EBUILD portage-2.1.2_pre3-r4.ebuild 6162 RMD160 1cd8f7f4e5d210fd81459ef4a20a3b149c94130b SHA1 1ad4ace634704c1d8ef335179a6e30c76a2f7115 SHA256 53653c5f105dc73d20e7e09586972c96639c41c877e37dc133dda15bf825ed9c
+MD5 e8ba05916178d229390ce7aa15271750 portage-2.1.2_pre3-r4.ebuild 6162
+RMD160 1cd8f7f4e5d210fd81459ef4a20a3b149c94130b portage-2.1.2_pre3-r4.ebuild 6162
+SHA256 53653c5f105dc73d20e7e09586972c96639c41c877e37dc133dda15bf825ed9c portage-2.1.2_pre3-r4.ebuild 6162
+MISC ChangeLog 17440 RMD160 3bff7a77b0d00ef0be24d24ef1bb24acbb563e26 SHA1 cab485f6e4614cf051dc875ddfe6ac44b3acf869 SHA256 910fbde820e1ac33cb91706142c85e87767a859eb5ce31587ed548d05b4ff83c
+MD5 6a10986252f88e1747025cd94489e09f ChangeLog 17440
+RMD160 3bff7a77b0d00ef0be24d24ef1bb24acbb563e26 ChangeLog 17440
+SHA256 910fbde820e1ac33cb91706142c85e87767a859eb5ce31587ed548d05b4ff83c ChangeLog 17440
 MISC metadata.xml 282 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 SHA1 6c41671928300da9f983586503dabcd90062b4dd SHA256 27d358e2646578efe2f2050052d739b641e49325565ec9cab345030420505d46
 MD5 bd1d8da118e08d72f8ea20785a604acf metadata.xml 282
 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 metadata.xml 282
@@ -75,9 +78,16 @@ SHA256 21f118dacba4951bac7c5e575c03cc09ead96ecaf45892cb963bba2fcd3d1d6d files/di
 MD5 1e3b37de9d967fb789ea5d121cc22126 files/digest-portage-2.1.2_pre2-r9 1099
 RMD160 c88ca5a071c793b8721f12347a70bae6917614cb files/digest-portage-2.1.2_pre2-r9 1099
 SHA256 3facb727187827fe424fdb63460bc383ac2cdf86e21fad9348b68ad6fd0c0d17 files/digest-portage-2.1.2_pre2-r9 1099
-MD5 cfe0d3dbf587e70f3c9f169558cfa09b files/digest-portage-2.1.2_pre3-r2 804
-RMD160 65eae4fe297df33cff60154a9eeafdd65937f32e files/digest-portage-2.1.2_pre3-r2 804
-SHA256 b723d764f12ff534480e44b08a37234b301ce673c45d06b959a19f43272a3abc files/digest-portage-2.1.2_pre3-r2 804
 MD5 2c7120c3c2a3a6d8d3225904efb37311 files/digest-portage-2.1.2_pre3-r3 804
 RMD160 f48c8f7d792b4c984feff6e37d5f8bc88da464f2 files/digest-portage-2.1.2_pre3-r3 804
 SHA256 7bfc5bcd86178759f9c032dc3ebcc23ddf1399292ea79084ab8eff9a02366e96 files/digest-portage-2.1.2_pre3-r3 804
+MD5 a1ef3f453b4f4279253e097addd70103 files/digest-portage-2.1.2_pre3-r4 807
+RMD160 5e0b5f96d922a21ee21626a7b6062027dc03bc11 files/digest-portage-2.1.2_pre3-r4 807
+SHA256 ea8f1ebbffab7a736eb812d1835ccc3079d02e489b2c7ab8cff5bd6651e68623 files/digest-portage-2.1.2_pre3-r4 807
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFNVha/ejvha5XGaMRAjGIAJsHxJOLlQT2UBR+EQsuU7RXsVjq8ACguPn+
+Mb0k9ffCIophmwQIvTNQz+M=
+=1QXD
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/digest-portage-2.1.2_pre3-r2 b/sys-apps/portage/files/digest-portage-2.1.2_pre3-r2
deleted file mode 100644
index 6dd4a5023cb1..000000000000
--- a/sys-apps/portage/files/digest-portage-2.1.2_pre3-r2
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 71fc0f508fc9d4733a7265f13c80f53c portage-2.1.2_pre3-r2.patch.bz2 3223
-RMD160 df91331fd15103c5ed20dffbf64f27d4052ae7a2 portage-2.1.2_pre3-r2.patch.bz2 3223
-SHA256 c333c9c6f618d0fe994af97e91e948155a675f79e1cf0df3e405f4c2402567da portage-2.1.2_pre3-r2.patch.bz2 3223
-MD5 886ff49946cd8b8d2a727bdd504ad45d portage-2.1.2_pre3.tar.bz2 307042
-RMD160 7ac4a2453eb9c50b0c1e224f627913aa95dbce0b portage-2.1.2_pre3.tar.bz2 307042
-SHA256 6beea20e872d7256f881e47a2c25fe40fd7edac02a9967b7dd4a2bb54ba6ad44 portage-2.1.2_pre3.tar.bz2 307042
-MD5 aa8c11d2540016412e9662cfd1fded60 portage-man-pl-2.1.2_pre3.tar.bz2 52723
-RMD160 29ab9951091789e096b1b13b69f8dfca36b23f2d portage-man-pl-2.1.2_pre3.tar.bz2 52723
-SHA256 3084288d59bdb061b614a4aca4a2f135caf98c9bad36b749f834d1d7fb64a761 portage-man-pl-2.1.2_pre3.tar.bz2 52723
diff --git a/sys-apps/portage/portage-2.1.2_pre3-r2.ebuild b/sys-apps/portage/portage-2.1.2_pre3-r2.ebuild
deleted file mode 100644
index 20ba8912d896..000000000000
--- a/sys-apps/portage/portage-2.1.2_pre3-r2.ebuild
+++ /dev/null
@@ -1,205 +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_pre3-r2.ebuild,v 1.1 2006/10/15 01:14:17 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.2_pre3"
-PATCHVER_PL=""
-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
-
-	ewarn "In portage-2.1.2, installation actions do not necessarily pull in build time"
-	ewarn "dependencies that are not strictly required.  This behavior is adjustable"
-	ewarn "via the new --with-bdeps option that is documented in the emerge(1) man page."
-	ewarn "For more information regarding this change, please refer to bug #148870."
-
-	portage_docs
-}