2.1.2_pre2-r3 revbump. This fixes bugs #144781 and #149881.

Package-Manager: portage-2.1.2_pre2-r3

3 files changed, 15 insertions, 232 deletions

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index cf322069bdb7..8555c271f927 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -17,8 +17,8 @@ DIST portage-2.0.51.22.tar.bz2 257823 RMD160 068a6fbc3e41f7357d1ee4d65894e7903c4
 DIST portage-2.1-r2.tar.bz2 280469 RMD160 2507c4e2db3fdf1157e44430b449f618e99f5d57 SHA1 06ec20f96618271c7835ce505d4979b8f7914067 SHA256 854c61dd0232cca50d9bb9a3e9e13f22589b76029ea7eeacab2bc5d4ec7e48cc
 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_pre2-r1.patch.bz2 1169 RMD160 680fe4d1863147a0f3d84f28528023fbe2743614 SHA1 e2152a1de8ab0ade6b64f09a9ef1636077d2cf50 SHA256 09c784089794b699cd74663b55e35f41a585ecbdf6dfdd9587354a4f38912f77
 DIST portage-2.1.2_pre2-r2.patch.bz2 4141 RMD160 41405e6b2d863a5f4a3b596818f949f4de238043 SHA1 c0e4abb0b05141066e043408080828748b4edc88 SHA256 3a7490138ab242a290ac1e00c400627ffcf93582a6d1e08cf0eb7f52bfb1bd34
+DIST portage-2.1.2_pre2-r3.patch.bz2 6246 RMD160 8f5bf3da796bb0575179f906e2f4a21bf38167a8 SHA1 ebdc22458ca014cf61158720a157a188ed1bd4c4 SHA256 164bb464ba528acee71ff20190c18b7f250501a2b7619840ee7a6f900dfda8aa
 DIST portage-2.1.2_pre2.tar.bz2 302712 RMD160 4bd9d9b3ce76c63d4b86d12c5645403be54903c0 SHA1 11297373bc85c6b870ac04f711278d8ec0fffaeb SHA256 caa9828537310067885c365ee49b72d6827cedc781c85825795a46932740e0e3
 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
@@ -38,18 +38,18 @@ EBUILD portage-2.1.1.ebuild 6223 RMD160 5140ef703944fb3e33e619d56bae5d3bc5d8273d
 MD5 4ea59171eb61742c3894f253c040b584 portage-2.1.1.ebuild 6223
 RMD160 5140ef703944fb3e33e619d56bae5d3bc5d8273d portage-2.1.1.ebuild 6223
 SHA256 e5cf6598da0ae949cd6e6ac07e8bf9881bbf352791503fbe50d04ce59358a830 portage-2.1.1.ebuild 6223
-EBUILD portage-2.1.2_pre2-r1.ebuild 6146 RMD160 92b725c468d431bfc63f047dcb5df646938df683 SHA1 c90e2938f239efaa9503cd8f4e1ea110b914d99a SHA256 7ee042aa7e3dbc8dd5d58e75a3893afa597d509ca9b30b6587615a79addb7a4d
-MD5 c9ffa96ba35121f3e4ffd1298fe82fa6 portage-2.1.2_pre2-r1.ebuild 6146
-RMD160 92b725c468d431bfc63f047dcb5df646938df683 portage-2.1.2_pre2-r1.ebuild 6146
-SHA256 7ee042aa7e3dbc8dd5d58e75a3893afa597d509ca9b30b6587615a79addb7a4d portage-2.1.2_pre2-r1.ebuild 6146
 EBUILD portage-2.1.2_pre2-r2.ebuild 6146 RMD160 8a5b8941a576d37809a095352660dbbb062d12bc SHA1 a34edaccac2ff28c44500d106e35a07dadc190c4 SHA256 42984c277eb6f1cb50d7f47a9b163bad957401e7dbe9abd6b0c5747db8ea2b92
 MD5 a078f37d65b8f11490d28f809800691e portage-2.1.2_pre2-r2.ebuild 6146
 RMD160 8a5b8941a576d37809a095352660dbbb062d12bc portage-2.1.2_pre2-r2.ebuild 6146
 SHA256 42984c277eb6f1cb50d7f47a9b163bad957401e7dbe9abd6b0c5747db8ea2b92 portage-2.1.2_pre2-r2.ebuild 6146
-MISC ChangeLog 14840 RMD160 9e9dcf89753502099c1c03fd0509830400160f18 SHA1 ebecb44a483e81273df5422f0592d8cc36610f1c SHA256 30675dfa1ffac3d52671c0e5a4ac5c44f04e63d81e0a0a791237b3a6afbfa9a7
-MD5 571cd4048d755e0984f2f71b1372b317 ChangeLog 14840
-RMD160 9e9dcf89753502099c1c03fd0509830400160f18 ChangeLog 14840
-SHA256 30675dfa1ffac3d52671c0e5a4ac5c44f04e63d81e0a0a791237b3a6afbfa9a7 ChangeLog 14840
+EBUILD portage-2.1.2_pre2-r3.ebuild 6146 RMD160 7b1425ec81f7781e5132da2ac295d0d63c6483a0 SHA1 d519498d0474c12dbc453257f8d25d11d1307998 SHA256 097fa1f13b950b0c5b3c5127a5284db753dcb2680e6a38c384a7b3c77dda3462
+MD5 c9ac86876d09d9de69ad4a757c2bfb0f portage-2.1.2_pre2-r3.ebuild 6146
+RMD160 7b1425ec81f7781e5132da2ac295d0d63c6483a0 portage-2.1.2_pre2-r3.ebuild 6146
+SHA256 097fa1f13b950b0c5b3c5127a5284db753dcb2680e6a38c384a7b3c77dda3462 portage-2.1.2_pre2-r3.ebuild 6146
+MISC ChangeLog 15020 RMD160 6e885db052743f4e277bacf87d91bba3be8fc24b SHA1 1b45f334d67e733faa34d9d3e4621b71eceb2407 SHA256 c09d7881f197e464bb3bc36a50207ea8922823e5e04bea79968286ea018b1ea7
+MD5 51a1012175f4f9de610158792108c0f0 ChangeLog 15020
+RMD160 6e885db052743f4e277bacf87d91bba3be8fc24b ChangeLog 15020
+SHA256 c09d7881f197e464bb3bc36a50207ea8922823e5e04bea79968286ea018b1ea7 ChangeLog 15020
 MISC metadata.xml 282 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 SHA1 6c41671928300da9f983586503dabcd90062b4dd SHA256 27d358e2646578efe2f2050052d739b641e49325565ec9cab345030420505d46
 MD5 bd1d8da118e08d72f8ea20785a604acf metadata.xml 282
 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 metadata.xml 282
@@ -66,16 +66,16 @@ SHA256 54848742dff9ea07bf01d3fc8988a31a868faf590b33982ef6f3f81f87c97e0c files/di
 MD5 84cc321543f8146e88db8ed6060d554f files/digest-portage-2.1.1-r1 1021
 RMD160 6b1ee9d511161b46d6b844985a27a9e57fd48898 files/digest-portage-2.1.1-r1 1021
 SHA256 21f118dacba4951bac7c5e575c03cc09ead96ecaf45892cb963bba2fcd3d1d6d files/digest-portage-2.1.1-r1 1021
-MD5 278d865a642bb53b25691b377fdab59a files/digest-portage-2.1.2_pre2-r1 1051
-RMD160 ee0eac3f9df8d1d6c04384734cfd2839dbf1f790 files/digest-portage-2.1.2_pre2-r1 1051
-SHA256 4ca170ad8b05ad6f7f9cf95ccff8a1850638797c220761533b46bca1b26a44b0 files/digest-portage-2.1.2_pre2-r1 1051
 MD5 a6c977dc49cfaf5d60cf0eb171f4acce files/digest-portage-2.1.2_pre2-r2 1051
 RMD160 181da24517469951657f8a02346ba92d3ea1e8a6 files/digest-portage-2.1.2_pre2-r2 1051
 SHA256 b74abbe10846edca82214c08b4a2f2e1ef21f8e353cb50105da5d864f1a94272 files/digest-portage-2.1.2_pre2-r2 1051
+MD5 58b661807163b02e69fd863587591696 files/digest-portage-2.1.2_pre2-r3 1051
+RMD160 7407f80a1bc14f44c2c1eab7172b96a65aa53ffe files/digest-portage-2.1.2_pre2-r3 1051
+SHA256 4359b9111ce866510feac0bebf14352b235857965168081f2bc00136713eccb3 files/digest-portage-2.1.2_pre2-r3 1051
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFIdmU/ejvha5XGaMRAumpAJ0ZxxTLsKfbz/wuivc2+mKxkkmY9gCgpGD4
-v0I4dh/vri4Cdt7eVf1wYtY=
-=X8ac
+iD8DBQFFI5Ds/ejvha5XGaMRAr8jAKChopH1RyW10/gxDUIW8m00STTo5ACfVczD
+2OfcV1JS2xYjkXMqyPuIpos=
+=duNM
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/digest-portage-2.1.2_pre2-r1 b/sys-apps/portage/files/digest-portage-2.1.2_pre2-r1
deleted file mode 100644
index 35723e9e2cc3..000000000000
--- a/sys-apps/portage/files/digest-portage-2.1.2_pre2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 6f2e8b493016696d8542b372a2530f2a portage-2.1.2_pre2-r1.patch.bz2 1169
-RMD160 680fe4d1863147a0f3d84f28528023fbe2743614 portage-2.1.2_pre2-r1.patch.bz2 1169
-SHA256 09c784089794b699cd74663b55e35f41a585ecbdf6dfdd9587354a4f38912f77 portage-2.1.2_pre2-r1.patch.bz2 1169
-MD5 5b419eec00e4534c412ac7e9ac92760b portage-2.1.2_pre2.tar.bz2 302712
-RMD160 4bd9d9b3ce76c63d4b86d12c5645403be54903c0 portage-2.1.2_pre2.tar.bz2 302712
-SHA256 caa9828537310067885c365ee49b72d6827cedc781c85825795a46932740e0e3 portage-2.1.2_pre2.tar.bz2 302712
-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_pre2-r1.ebuild b/sys-apps/portage/portage-2.1.2_pre2-r1.ebuild
deleted file mode 100644
index 58f3b0e6bde6..000000000000
--- a/sys-apps/portage/portage-2.1.2_pre2-r1.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_pre2-r1.ebuild,v 1.1 2006/10/01 20:27:20 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
-
-	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
-}