2.1.2_pre3-r1 regression fix revbump for bug #151331.

Package-Manager: portage-2.1.2_pre3-r1

3 files changed, 18 insertions, 225 deletions

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 8fa3c0cdb122..0a8eb652a215 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -13,6 +13,10 @@ AUX README.RESCUE 137 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 SHA1 cfc8f
 MD5 c906e2e6782e197725b70f84cfe112a4 files/README.RESCUE 137
 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 files/README.RESCUE 137
 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 files/README.RESCUE 137
+AUX blockers_151331.patch 1396 RMD160 439fcd2246f003ad9147c3727f6dee4e7e20f17b SHA1 67051d7d024c156dedb4f5d12ad175782196a8ad SHA256 ef50d03fa338f939e931e03edfc2e23f515e4241fbd6acf2963375b991bcc160
+MD5 7f53cf2629324140aee17628d500c896 files/blockers_151331.patch 1396
+RMD160 439fcd2246f003ad9147c3727f6dee4e7e20f17b files/blockers_151331.patch 1396
+SHA256 ef50d03fa338f939e931e03edfc2e23f515e4241fbd6acf2963375b991bcc160 files/blockers_151331.patch 1396
 AUX repoman_settings.patch 675 RMD160 b063e487176541dd96e325e404ef1bde41fa34c1 SHA1 ea1e06000fa86aae7214b86f0bf0c4046a97951c SHA256 72653e6f1ee23dc93940a6270248355a49f36e6946939523d9946c76e68f6173
 MD5 cd4f7a267aaf9c4e6d408f2722fa275c files/repoman_settings.patch 675
 RMD160 b063e487176541dd96e325e404ef1bde41fa34c1 files/repoman_settings.patch 675
@@ -54,14 +58,14 @@ 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.ebuild 6147 RMD160 b1d8eb1a5cc6f34cbf30e139419262de8c158b47 SHA1 69f85b8c4c4cbd448590d747d484679f56ff4f00 SHA256 0ee893df0577a812a404c2c15e9f080f232f8243a80c66af014973d98edee4a8
-MD5 31578fa28ed0e7c12e8bbcb1d13449b0 portage-2.1.2_pre3.ebuild 6147
-RMD160 b1d8eb1a5cc6f34cbf30e139419262de8c158b47 portage-2.1.2_pre3.ebuild 6147
-SHA256 0ee893df0577a812a404c2c15e9f080f232f8243a80c66af014973d98edee4a8 portage-2.1.2_pre3.ebuild 6147
-MISC ChangeLog 16448 RMD160 43f3c5bfad3dd5d6fa417091c134f4b4b29ab4a7 SHA1 b7ebad966275f87ed8c422ae4d26a211552c4054 SHA256 fba79a2fa2cd24c37c328b1e53120b99c50e84272deb11e6823f1f0a5dff1533
-MD5 5a3a7a966f203c773f9278d95c0b6e5f ChangeLog 16448
-RMD160 43f3c5bfad3dd5d6fa417091c134f4b4b29ab4a7 ChangeLog 16448
-SHA256 fba79a2fa2cd24c37c328b1e53120b99c50e84272deb11e6823f1f0a5dff1533 ChangeLog 16448
+EBUILD portage-2.1.2_pre3-r1.ebuild 6195 RMD160 4834423ec8316815de676f4364c244e2a9321011 SHA1 bc6f30c3aa4d2304416ead362cda08cd95cc65d8 SHA256 3127a0f1230ab99174cfd6e3cf61bcf631d06a918b70e54b6d0c470c239340e1
+MD5 5ecbc31dc8fc0bfa473ded6b553083cb portage-2.1.2_pre3-r1.ebuild 6195
+RMD160 4834423ec8316815de676f4364c244e2a9321011 portage-2.1.2_pre3-r1.ebuild 6195
+SHA256 3127a0f1230ab99174cfd6e3cf61bcf631d06a918b70e54b6d0c470c239340e1 portage-2.1.2_pre3-r1.ebuild 6195
+MISC ChangeLog 16681 RMD160 d3734b5af31201af6004e0205b6e738da5e779d0 SHA1 eee02ed8c8c300b30695250ab11d787abe391424 SHA256 1c41337cbd5dc5a5976efdc11421c30667ddaf6b968ee2941cbdc47ddab5fba4
+MD5 a0a3e0f0bb398ee5f38c7389ecd0dd41 ChangeLog 16681
+RMD160 d3734b5af31201af6004e0205b6e738da5e779d0 ChangeLog 16681
+SHA256 1c41337cbd5dc5a5976efdc11421c30667ddaf6b968ee2941cbdc47ddab5fba4 ChangeLog 16681
 MISC metadata.xml 282 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 SHA1 6c41671928300da9f983586503dabcd90062b4dd SHA256 27d358e2646578efe2f2050052d739b641e49325565ec9cab345030420505d46
 MD5 bd1d8da118e08d72f8ea20785a604acf metadata.xml 282
 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 metadata.xml 282
@@ -84,13 +88,13 @@ SHA256 00b4462e504e664a74c3a83fae36a07472a45fb52e839b94b9b505841208616f 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 8ae5b5dbfd90fb20116bbb81743ce44e files/digest-portage-2.1.2_pre3 536
-RMD160 9233df534c08592f803baeca80efc7014f3d7b71 files/digest-portage-2.1.2_pre3 536
-SHA256 cfa852e871d940289e273518552f3cf9357ebccff74d04820d69b53baddae709 files/digest-portage-2.1.2_pre3 536
+MD5 8ae5b5dbfd90fb20116bbb81743ce44e files/digest-portage-2.1.2_pre3-r1 536
+RMD160 9233df534c08592f803baeca80efc7014f3d7b71 files/digest-portage-2.1.2_pre3-r1 536
+SHA256 cfa852e871d940289e273518552f3cf9357ebccff74d04820d69b53baddae709 files/digest-portage-2.1.2_pre3-r1 536
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFMJUF/ejvha5XGaMRAnO7AJ9pALZF7aIpTKQcIxjzO8LPedq8AQCgqCNV
-oSccf9vI6tMOPLmEt6mFXgw=
-=Wf9f
+iD8DBQFFMPGs/ejvha5XGaMRAtsdAKClXRERfRLQ/2h7CSsW9TFVAm3ZXQCg00g2
+k7gn+DHJEj3FphB9sZas4KI=
+=O/ev
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/digest-portage-2.1.2_pre3 b/sys-apps/portage/files/digest-portage-2.1.2_pre3
deleted file mode 100644
index 2bd2ce293386..000000000000
--- a/sys-apps/portage/files/digest-portage-2.1.2_pre3
+++ /dev/null
@@ -1,6 +0,0 @@
-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.ebuild b/sys-apps/portage/portage-2.1.2_pre3.ebuild
deleted file mode 100644
index 696558e8381f..000000000000
--- a/sys-apps/portage/portage-2.1.2_pre3.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.ebuild,v 1.1 2006/10/14 07:52:41 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
-}