2.1.2_pre3-r7 revbump. This fixes bugs #17367, #137786, #152157, and #152175.

Package-Manager: portage-2.1.2_pre3-r7

3 files changed, 15 insertions, 229 deletions

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index cd01170e9e31..49537449839d 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -19,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-r5.patch.bz2 13608 RMD160 ba300637987846894e7b9dae913fae978f2aa0f7 SHA1 2fec236b30b0c2efc6a9fb96c7364bfe0a203388 SHA256 628a52639f7b063163a848b3ec471fcdd5bd81b33c03bbbc7c3f9699996b181d
 DIST portage-2.1.2_pre3-r6.patch.bz2 14680 RMD160 e02748982ab711ad2a2940b18c48b5e5231112d9 SHA1 81441999abe4e895d13f509dd7aebf1ea5a64cd5 SHA256 b093f4686e9f964268b74c7adc81d89f372452f6a9d5e497d7f406c8c1000fd6
+DIST portage-2.1.2_pre3-r7.patch.bz2 20377 RMD160 eb14afc0786427c29295b10a75fc4b971ccba26e SHA1 ae5f2805176df74792bb5ec0cb59b7061a5e78eb SHA256 0ee9bc35fba14387e8d1763259ea51010f390530a4c8bb08518c9d8aa9213732
 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
@@ -47,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-r5.ebuild 6162 RMD160 c524d572f273d4ab09bd2e08df1ecfe7239fc7ef SHA1 8eaaeaafb72f53d9db21cd71daef800eb3c9d4d2 SHA256 3ecdf771ca1d7956bc152a0210c85c1289219590aa5359a8590d8503a69e67dd
-MD5 37d135539fbefb3d2ebd50fc2f1c2ffc portage-2.1.2_pre3-r5.ebuild 6162
-RMD160 c524d572f273d4ab09bd2e08df1ecfe7239fc7ef portage-2.1.2_pre3-r5.ebuild 6162
-SHA256 3ecdf771ca1d7956bc152a0210c85c1289219590aa5359a8590d8503a69e67dd portage-2.1.2_pre3-r5.ebuild 6162
 EBUILD portage-2.1.2_pre3-r6.ebuild 6162 RMD160 7baff356544123dd2f017d31b53127fa58218885 SHA1 e654561fb0bd8dc746cf14f0c75c5586314d07c9 SHA256 f30032655899cfac64b60b266952c96f65985bd41954fac9ade46f1fe3e0af0f
 MD5 9219d8735a1308efef490df25c47dab3 portage-2.1.2_pre3-r6.ebuild 6162
 RMD160 7baff356544123dd2f017d31b53127fa58218885 portage-2.1.2_pre3-r6.ebuild 6162
 SHA256 f30032655899cfac64b60b266952c96f65985bd41954fac9ade46f1fe3e0af0f portage-2.1.2_pre3-r6.ebuild 6162
-MISC ChangeLog 17816 RMD160 36b724919421673478d376abdad0c561519d3ea0 SHA1 9f608f8703aeb4d5a650fc5ee1d789d0b512bd82 SHA256 955ec9eff7f568cd1600bf7ea1a8e474b6e704eb852465c9c884434f57643f65
-MD5 6dc8fba7b8e7e747410f6c1de45b21cb ChangeLog 17816
-RMD160 36b724919421673478d376abdad0c561519d3ea0 ChangeLog 17816
-SHA256 955ec9eff7f568cd1600bf7ea1a8e474b6e704eb852465c9c884434f57643f65 ChangeLog 17816
+EBUILD portage-2.1.2_pre3-r7.ebuild 6162 RMD160 fbd8b8e918dc8f7dbd16ff795c7d9eeb4296893b SHA1 1af4cbf602173886ccc64dfac0aa65f1c53cf71c SHA256 4a5c4d9a772ff465decfda0c17321ef25e19f5bcf6f463b9d00d868267d28bda
+MD5 f47f7eb62d9dd87818ac57b8ced81052 portage-2.1.2_pre3-r7.ebuild 6162
+RMD160 fbd8b8e918dc8f7dbd16ff795c7d9eeb4296893b portage-2.1.2_pre3-r7.ebuild 6162
+SHA256 4a5c4d9a772ff465decfda0c17321ef25e19f5bcf6f463b9d00d868267d28bda portage-2.1.2_pre3-r7.ebuild 6162
+MISC ChangeLog 18016 RMD160 832186c81bf40a31fc60dd6377785e80c9b148cb SHA1 9c9cf090c1d1cbb34d7d086069342d59b8517c80 SHA256 3b4ba667926595882d87f8708e30a42214dce54ab8ac11b0b468f7c6098a582d
+MD5 1b66765c02343e38ef1f3f1ee8049553 ChangeLog 18016
+RMD160 832186c81bf40a31fc60dd6377785e80c9b148cb ChangeLog 18016
+SHA256 3b4ba667926595882d87f8708e30a42214dce54ab8ac11b0b468f7c6098a582d ChangeLog 18016
 MISC metadata.xml 282 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 SHA1 6c41671928300da9f983586503dabcd90062b4dd SHA256 27d358e2646578efe2f2050052d739b641e49325565ec9cab345030420505d46
 MD5 bd1d8da118e08d72f8ea20785a604acf metadata.xml 282
 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 metadata.xml 282
@@ -78,16 +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 c846e83719862a9871941fc5e7e332cc files/digest-portage-2.1.2_pre3-r5 807
-RMD160 68b2352d08aec16ac8bea41e293833d45226b190 files/digest-portage-2.1.2_pre3-r5 807
-SHA256 fbfa829fde8f41d3ecf7ff6d651ca4851ff0fa8a6bc83951d131779da0f1d263 files/digest-portage-2.1.2_pre3-r5 807
 MD5 2a4cb4efed08964ec2797d6d3edabf25 files/digest-portage-2.1.2_pre3-r6 807
 RMD160 95e0711d22208ec27f1651e7e180861316677848 files/digest-portage-2.1.2_pre3-r6 807
 SHA256 2063e983a8d0608f0ecb12c3e395bd6fdf9b5576f761ac95f90cf108c9dbd642 files/digest-portage-2.1.2_pre3-r6 807
+MD5 f92fc44bc9b5370eb2650e2b026a79b7 files/digest-portage-2.1.2_pre3-r7 807
+RMD160 6dc89a6630f16af787089875488e29782be1a534 files/digest-portage-2.1.2_pre3-r7 807
+SHA256 7cad128364e12bffca37b2e0d6496c61b5768ba1f01e5559247e65a212f6dfc4 files/digest-portage-2.1.2_pre3-r7 807
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFOVnv/ejvha5XGaMRAsQ1AKDrIDKrN3KT50YmxCMBILZsA2OjDwCfUQZF
-ZrkEdDAPPrcFOe47FpsFCGA=
-=5UaA
+iD8DBQFFO+G1/ejvha5XGaMRAuxeAJ4xfNDhSu914y7esVTQpKNyzyIRbACfec4g
+lmq2CieXjjVc682LuZakJuk=
+=gv8o
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/digest-portage-2.1.2_pre3-r5 b/sys-apps/portage/files/digest-portage-2.1.2_pre3-r5
deleted file mode 100644
index a5b1639a981a..000000000000
--- a/sys-apps/portage/files/digest-portage-2.1.2_pre3-r5
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 7b4704e7fd454e4e357e1c3de946752c portage-2.1.2_pre3-r5.patch.bz2 13608
-RMD160 ba300637987846894e7b9dae913fae978f2aa0f7 portage-2.1.2_pre3-r5.patch.bz2 13608
-SHA256 628a52639f7b063163a848b3ec471fcdd5bd81b33c03bbbc7c3f9699996b181d portage-2.1.2_pre3-r5.patch.bz2 13608
-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-r5.ebuild b/sys-apps/portage/portage-2.1.2_pre3-r5.ebuild
deleted file mode 100644
index 75ee0c4d3fec..000000000000
--- a/sys-apps/portage/portage-2.1.2_pre3-r5.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-r5.ebuild,v 1.1 2006/10/18 21:24:02 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 ~sparc-fbsd ~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
-}