2.1.1_pre4-r1 revbump. This fixes bugs #51370 and #105384.

Package-Manager: portage-4048-svn

3 files changed, 12 insertions, 232 deletions

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 6bcdf0c3c774..e27fdea2a58c 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,6 +1,3 @@
------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 +13,7 @@ SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 files/RE
 DIST portage-2.0.51.22.tar.bz2 257823 RMD160 068a6fbc3e41f7357d1ee4d65894e7903c467cfe SHA1 16459ce2b19592c94ec580bcfade5a89750a62fb SHA256 f0dac4366b5234b084645bbbd6b871a5abe05d501cf868046af2777e02a4100c
 DIST portage-2.0.54.tar.bz2 234784 RMD160 26c724df242a7d0c44d7fd06067bfcdbc4e3556b SHA1 0559bf8068976c124f0026ab65f3f4a62ae39d83 SHA256 69075ab4599958c4f7c7a932b95dcd77efa1b3c46ac28acb577284bc48a1db06
 DIST portage-2.1-r1.patch.bz2 12201 RMD160 ceff46c18d8e28f341cc0c1a0c41150733c2dc98 SHA1 0948e3de6cdd8869c9abbb7c8a3ad54e0aebb937 SHA256 78bdf92a43e8d34d090592bcd92779383dbaca9a9295418e4cc9b39f217fbf80
-DIST portage-2.1.1_pre3-r5.patch.bz2 30472 RMD160 7aac0b39bc0d4d9c27f28ed56f4cc599fecf9f1c SHA1 7e347a537965a6c5319df5666d80b0f62775822d SHA256 da0368ee8f445dd7f51ab222bfa122841dc814e4887da475c96894563cc849aa
-DIST portage-2.1.1_pre3.tar.bz2 287206 RMD160 f3224349459899e33b9f29e60c5a8c49f63807af SHA1 c661aa975e2b02f8f13ee32bfd19d49d798e4508 SHA256 baf1535f9d02201b7bbeba55953aeee588727d8e43dc10dabe7c91eaba772363
+DIST portage-2.1.1_pre4-r1.patch.bz2 1734 RMD160 56a85dea0a7630c2a9ce9c292d372c66e450b269 SHA1 def9ebb8e79b334b46e63f09ba851ecaea383572 SHA256 a11b3d5213f72378692cf77bb4ad59f2d54190185ff2c54b7dfe7f80a5746c39
 DIST portage-2.1.1_pre4.tar.bz2 291237 RMD160 b679a01f045c886ab6d4c1929a1c6231f02add75 SHA1 5bd5812619b8db7faf61077858ead14c72794ba7 SHA256 5027efaed47dba5637fd495aa1b23b2deef4654fba06719d306e4ecc0cb1a3a5
 DIST portage-2.1.tar.bz2 277243 RMD160 e8290e18f0de5935cc263d76e7bce15da5c899d2 SHA1 459f59cc332e6b06d439af2cc18de57969f208d1 SHA256 29560a50df1de053c943582b277beb600c364edfe177d42affc74e98db412ef0
 DIST portage-man-pl-2.1-r1.patch.bz2 2076 RMD160 be3898714b94fb0253c1826909649ea51da205ad SHA1 6ec21b29a3eff4a034ea68b4e6a889c8f95dcc3e SHA256 28176c04290478ba4373c28ea047edbdf3a40d3ff69bf92da55d1cfcb828ea5b
@@ -35,18 +31,18 @@ EBUILD portage-2.1-r1.ebuild 7519 RMD160 f6a6e35dd94fd05c5739ab529bfd6eebbd9a87a
 MD5 4573216aa36cf4904976d82b14825c02 portage-2.1-r1.ebuild 7519
 RMD160 f6a6e35dd94fd05c5739ab529bfd6eebbd9a87a4 portage-2.1-r1.ebuild 7519
 SHA256 bdadfb8a6e2dab3dadd1f573f8ffc5603b1e263adf48999b396663ee313b11c1 portage-2.1-r1.ebuild 7519
-EBUILD portage-2.1.1_pre3-r5.ebuild 5740 RMD160 dcbf65a71907275fef1e64d097afb7a8f0e92003 SHA1 3fa54cdff95e06acbaad36b871adb6125aad94fe SHA256 afd741b2824279e60e530e01c9e177dd5517583aac983e0d078ee151865c9e20
-MD5 5fbe51fdda5cc61280a4b079f84232d5 portage-2.1.1_pre3-r5.ebuild 5740
-RMD160 dcbf65a71907275fef1e64d097afb7a8f0e92003 portage-2.1.1_pre3-r5.ebuild 5740
-SHA256 afd741b2824279e60e530e01c9e177dd5517583aac983e0d078ee151865c9e20 portage-2.1.1_pre3-r5.ebuild 5740
+EBUILD portage-2.1.1_pre4-r1.ebuild 5740 RMD160 361257e15ad56e4e91b32a8693f21550f7279674 SHA1 53a2343bfbea1ccd22858929cb4f079cf03acc84 SHA256 c621575356e636ebae1373e209cca594d009156f7062a4b22a49009c850fef2d
+MD5 e154697942d33bea4bdfc714b6f36a15 portage-2.1.1_pre4-r1.ebuild 5740
+RMD160 361257e15ad56e4e91b32a8693f21550f7279674 portage-2.1.1_pre4-r1.ebuild 5740
+SHA256 c621575356e636ebae1373e209cca594d009156f7062a4b22a49009c850fef2d portage-2.1.1_pre4-r1.ebuild 5740
 EBUILD portage-2.1.1_pre4.ebuild 5731 RMD160 10e3770f2039c80f5e56f8a21f81c1e26f710d2f SHA1 d612d9b7e4482f99af563ad39e776ede4e83cc86 SHA256 154bb3ebda5c2793dde9870dfeaf9caa663f473945484210f6c7339ea8298243
 MD5 42814ac7d84256eb83fc5fd70cf270b2 portage-2.1.1_pre4.ebuild 5731
 RMD160 10e3770f2039c80f5e56f8a21f81c1e26f710d2f portage-2.1.1_pre4.ebuild 5731
 SHA256 154bb3ebda5c2793dde9870dfeaf9caa663f473945484210f6c7339ea8298243 portage-2.1.1_pre4.ebuild 5731
-MISC ChangeLog 18871 RMD160 a03ee61cedef05ef7719274c6fc98b339677af15 SHA1 15c66f542f554fbd23661db554708acb17f90988 SHA256 a5d2a0a44e82ef5f97c8d7e3a1ec2d163719b48e0b3fbdbfa7cb524e272ab50e
-MD5 889fee5c478c9c88aadec79f6b493930 ChangeLog 18871
-RMD160 a03ee61cedef05ef7719274c6fc98b339677af15 ChangeLog 18871
-SHA256 a5d2a0a44e82ef5f97c8d7e3a1ec2d163719b48e0b3fbdbfa7cb524e272ab50e ChangeLog 18871
+MISC ChangeLog 19050 RMD160 1c5c35d5e9d6f0ba059b7e528125498b76ec1587 SHA1 02e43dd4ae52075e6529cf2d1d5e556d542831aa SHA256 b5cf14f1ed3d6671de6dd999898e339192d6d09c0390e51d3af2f536b8cb32c2
+MD5 aed540e1a24916154fb79ea97cc24dd2 ChangeLog 19050
+RMD160 1c5c35d5e9d6f0ba059b7e528125498b76ec1587 ChangeLog 19050
+SHA256 b5cf14f1ed3d6671de6dd999898e339192d6d09c0390e51d3af2f536b8cb32c2 ChangeLog 19050
 MISC metadata.xml 219 RMD160 613195ece366b33606e71ff1753be048f2507841 SHA1 d162fb909241ef50b95a3539bdfcde95429bdf81 SHA256 cbd3a20e5c89a48a842f7132fe705bf39959f02c1025052efce8aad8a8baa8dc
 MD5 74421bbd5bae342d72a7a30b98a69662 metadata.xml 219
 RMD160 613195ece366b33606e71ff1753be048f2507841 metadata.xml 219
@@ -60,16 +56,9 @@ SHA256 e494cfdb2648a2b63f87602043fe2a34432e684159ec53347bdc6395a16cf17e files/di
 MD5 5a9aac645d5a2bdb9d987f45813d495a files/digest-portage-2.1-r1 1012
 RMD160 ae625221b6669b5f4f1aef277b2a8ea3ae70e1ae files/digest-portage-2.1-r1 1012
 SHA256 9f002b314a87d8dfad176863f83c6963acec51093a45494201b53e9c0cf87cd8 files/digest-portage-2.1-r1 1012
-MD5 36786d7bcdaedadeaa1d8a6e511cb852 files/digest-portage-2.1.1_pre3-r5 1054
-RMD160 6b8250bf067c94e5c9e8331ffe95ccf13c0d63da files/digest-portage-2.1.1_pre3-r5 1054
-SHA256 b0ba2052fb51b3719e780ed7eecbcccc62ea92caed415a9252d8f23a18c2b7c9 files/digest-portage-2.1.1_pre3-r5 1054
 MD5 8db93e05a7bbea85a4bcb1e58775ac9d files/digest-portage-2.1.1_pre4 783
 RMD160 b2fd4f24b6376e8abded6e3b34ab80ee75b6d0c1 files/digest-portage-2.1.1_pre4 783
 SHA256 d4bcb3de99b3db0599c6ab6a769ac78172552a89fc828e2dd2d730a50a982877 files/digest-portage-2.1.1_pre4 783
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD8DBQFEylJ6/ejvha5XGaMRAkJ+AKDvzbzvywsP6eU6N1wqkQpIb8r96ACg2wUq
-faTwRA+sHCzqzvqsdOHTdYw=
-=mjBM
------END PGP SIGNATURE-----
+MD5 f08105dae2a07d9cc83005f055e9dea0 files/digest-portage-2.1.1_pre4-r1 1051
+RMD160 b82af2ab25c739124045c174b5e74d595b466342 files/digest-portage-2.1.1_pre4-r1 1051
+SHA256 3dd21e31b5707c45dc149016a167efb3dc13835baa4e3473a59bb5ef2828d5b3 files/digest-portage-2.1.1_pre4-r1 1051
diff --git a/sys-apps/portage/files/digest-portage-2.1.1_pre3-r5 b/sys-apps/portage/files/digest-portage-2.1.1_pre3-r5
deleted file mode 100644
index f2c34e31fafd..000000000000
--- a/sys-apps/portage/files/digest-portage-2.1.1_pre3-r5
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 fe0a61c70f0d62dc884f67b85608f76b portage-2.1.1_pre3-r5.patch.bz2 30472
-RMD160 7aac0b39bc0d4d9c27f28ed56f4cc599fecf9f1c portage-2.1.1_pre3-r5.patch.bz2 30472
-SHA256 da0368ee8f445dd7f51ab222bfa122841dc814e4887da475c96894563cc849aa portage-2.1.1_pre3-r5.patch.bz2 30472
-MD5 78baab083cf81f14f5929da16550584a portage-2.1.1_pre3.tar.bz2 287206
-RMD160 f3224349459899e33b9f29e60c5a8c49f63807af portage-2.1.1_pre3.tar.bz2 287206
-SHA256 baf1535f9d02201b7bbeba55953aeee588727d8e43dc10dabe7c91eaba772363 portage-2.1.1_pre3.tar.bz2 287206
-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.1_pre3-r5.ebuild b/sys-apps/portage/portage-2.1.1_pre3-r5.ebuild
deleted file mode 100644
index 77ed9f20140e..000000000000
--- a/sys-apps/portage/portage-2.1.1_pre3-r5.ebuild
+++ /dev/null
@@ -1,197 +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.1_pre3-r5.ebuild,v 1.1 2006/07/25 19:26:10 zmedico Exp $
-
-inherit toolchain-funcs eutils
-
-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}"
-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() {
-	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
-}