2.1_pre9-r4 bug fix revbump

(Portage version: 2.1_pre9-r4)
 (Signed Manifest commit)

3 files changed, 34 insertions, 228 deletions

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 91815f46da22..bccc1133303f 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -37,6 +37,26 @@ AUX 2.1/pre9/1060_r3181_gpg_dir.patch 824 RMD160 69a5af3afa5a8ce93c8f3f4ae42294a
 MD5 3d755f70b99441ad0c0baf1ca10f7e30 files/2.1/pre9/1060_r3181_gpg_dir.patch 824
 RMD160 69a5af3afa5a8ce93c8f3f4ae42294a9b8c0243b files/2.1/pre9/1060_r3181_gpg_dir.patch 824
 SHA256 09907003aea45f2e8a8bff89d672e40406d97a0467cd13cb8f8f020eada1bfdd files/2.1/pre9/1060_r3181_gpg_dir.patch 824
+AUX 2.1/pre9/1070_r3184_bug_130750_distfiles_size.patch 2356 RMD160 2d3f41b2e548c173d95dc61bdf8e953f29e78b6a SHA1 ce1bfeeea5ac11565da1a55f6db4ff164e7a3342 SHA256 ae73f57e2275e2aeebf29aba9ab40a50b275c9290938a172c4af865a3f73a720 size 2356
+MD5 ac2b21f4c0bbdc5672678db4e0f1e219 files/2.1/pre9/1070_r3184_bug_130750_distfiles_size.patch 2356
+RMD160 2d3f41b2e548c173d95dc61bdf8e953f29e78b6a files/2.1/pre9/1070_r3184_bug_130750_distfiles_size.patch 2356
+SHA256 ae73f57e2275e2aeebf29aba9ab40a50b275c9290938a172c4af865a3f73a720 files/2.1/pre9/1070_r3184_bug_130750_distfiles_size.patch 2356
+AUX 2.1/pre9/1080_r3185_bug_116796_download_size.patch 1432 RMD160 5d7c602f762033566c33aff8fc920e28ec5b5c94 SHA1 753fe8e5a1214883c5aae7f8e9ab35be71fea78b SHA256 63b1e587ef3bac44ce7ab13e7f9427c4f085ecb4492037c64ada24eec5303f20 size 1432
+MD5 c432e79787b23554ae4b347b62b65665 files/2.1/pre9/1080_r3185_bug_116796_download_size.patch 1432
+RMD160 5d7c602f762033566c33aff8fc920e28ec5b5c94 files/2.1/pre9/1080_r3185_bug_116796_download_size.patch 1432
+SHA256 63b1e587ef3bac44ce7ab13e7f9427c4f085ecb4492037c64ada24eec5303f20 files/2.1/pre9/1080_r3185_bug_116796_download_size.patch 1432
+AUX 2.1/pre9/1090_r3189_bug_130824_pkgdir_sandbox.patch 726 RMD160 9ab5354c4b9d7b0e3105dacc3a1787541e8e1352 SHA1 639f6d5dc1733a2a44099a7dc35ee4d85cd10bac SHA256 6e319350369595071d214eb3bb432b38abd4dafb428f5d90fa0edca0c67379a7 size 726
+MD5 2083b8fd93bdaf7e874eb292b1276b13 files/2.1/pre9/1090_r3189_bug_130824_pkgdir_sandbox.patch 726
+RMD160 9ab5354c4b9d7b0e3105dacc3a1787541e8e1352 files/2.1/pre9/1090_r3189_bug_130824_pkgdir_sandbox.patch 726
+SHA256 6e319350369595071d214eb3bb432b38abd4dafb428f5d90fa0edca0c67379a7 files/2.1/pre9/1090_r3189_bug_130824_pkgdir_sandbox.patch 726
+AUX 2.1/pre9/1100_r3193_manifest_size.patch 658 RMD160 1e710dc28c2e45cb8d04f7d7931c91bf43f094c3 SHA1 a03acaee772cbe0ac8db58f6da28858ce793876d SHA256 acfb00d9217cf828a8b200b3c625a935a034cbdfddf61520d8ebb2f29ca92e94 size 658
+MD5 af1d6ffdd01be0e1841ed506e6980051 files/2.1/pre9/1100_r3193_manifest_size.patch 658
+RMD160 1e710dc28c2e45cb8d04f7d7931c91bf43f094c3 files/2.1/pre9/1100_r3193_manifest_size.patch 658
+SHA256 acfb00d9217cf828a8b200b3c625a935a034cbdfddf61520d8ebb2f29ca92e94 files/2.1/pre9/1100_r3193_manifest_size.patch 658
+AUX 2.1/pre9/1110_r3194_bug_130928.patch 1070 RMD160 690804a2cac2da0a047dcc879b1c275c2e796a1a SHA1 631bf3630623bccc3f81c7b85d61cac4b15b340d SHA256 671d64b3ce724bb49161229c2623df73d7a0c336b99968c67c05c29d4060c54c size 1070
+MD5 3f1a52882791195ef0bf033dcbe5a2a7 files/2.1/pre9/1110_r3194_bug_130928.patch 1070
+RMD160 690804a2cac2da0a047dcc879b1c275c2e796a1a files/2.1/pre9/1110_r3194_bug_130928.patch 1070
+SHA256 671d64b3ce724bb49161229c2623df73d7a0c336b99968c67c05c29d4060c54c files/2.1/pre9/1110_r3194_bug_130928.patch 1070
 AUX 2.1_pre7/1000_r2994_workdir_mode.patch 1096 RMD160 39e882bb941f5ac3560b9a5cfa795e957199c51e SHA1 3c0526603612fc6caa26cbe1edcf600d7db9dece SHA256 ce4eb3023d4d2a1a2ca52778b843f90d85a147030e190e2bd2bd4473ea2561d2 size 1096
 MD5 5347de9da65c2d77b2ae2faf149364a6 files/2.1_pre7/1000_r2994_workdir_mode.patch 1096
 RMD160 39e882bb941f5ac3560b9a5cfa795e957199c51e files/2.1_pre7/1000_r2994_workdir_mode.patch 1096
@@ -143,14 +163,14 @@ EBUILD portage-2.1_pre7-r5.ebuild 5990 RMD160 2b36bc22a0b19f920e856d3113131ca374
 MD5 6ef8ace6b92df29e8a3f528127f48c06 portage-2.1_pre7-r5.ebuild 5990
 RMD160 2b36bc22a0b19f920e856d3113131ca374d57a85 portage-2.1_pre7-r5.ebuild 5990
 SHA256 bd7a99b01a04e444fd5870628ee4c83e3864ec72c3baa9483e1d7d3ad1f46073 portage-2.1_pre7-r5.ebuild 5990
-EBUILD portage-2.1_pre9-r3.ebuild 5983 RMD160 9788bf8ab6c4309be4878c0a9b6c62545e644412 SHA1 ddad077b3f415ae4d14a8be969905a4d9eafbc07 SHA256 e1340f9921875cd367337ad6962926154693a1fd696751b2695604a2f61cf12e size 5983
-MD5 7aa82f59cb52c444876174b74c90e002 portage-2.1_pre9-r3.ebuild 5983
-RMD160 9788bf8ab6c4309be4878c0a9b6c62545e644412 portage-2.1_pre9-r3.ebuild 5983
-SHA256 e1340f9921875cd367337ad6962926154693a1fd696751b2695604a2f61cf12e portage-2.1_pre9-r3.ebuild 5983
-MISC ChangeLog 16183 RMD160 0116f00f3cbd591d3d96561868d486978d493ad4 SHA1 1721e5dcd0294bc17856bcad58224e4f7b3ea00b SHA256 a52e36ab11ebbad2dfaecf2ee0469b85a075e6e2e7e066c3bf363aa87029743d size 16183
-MD5 c748278e0b0f468b373ef5318c4800ae ChangeLog 16183
-RMD160 0116f00f3cbd591d3d96561868d486978d493ad4 ChangeLog 16183
-SHA256 a52e36ab11ebbad2dfaecf2ee0469b85a075e6e2e7e066c3bf363aa87029743d ChangeLog 16183
+EBUILD portage-2.1_pre9-r4.ebuild 6180 RMD160 ede61592929aa62a1b2f7dc7a23c2a22e8e0f0d7 SHA1 4b4068ec5efb47d0cf17cb862ff4e1a2942274a3 SHA256 07cebe6ab9a591547d99e4ae1125d04c275ef2730bc92e5fd293deba5e349d33 size 6180
+MD5 0a8c86a4119142057dceff80667e4dbf portage-2.1_pre9-r4.ebuild 6180
+RMD160 ede61592929aa62a1b2f7dc7a23c2a22e8e0f0d7 portage-2.1_pre9-r4.ebuild 6180
+SHA256 07cebe6ab9a591547d99e4ae1125d04c275ef2730bc92e5fd293deba5e349d33 portage-2.1_pre9-r4.ebuild 6180
+MISC ChangeLog 16652 RMD160 17f849c0c263def4c6062c2a37ab349d711266d0 SHA1 4d0ae51fc1da089196f04b81ea208bca312ea986 SHA256 3f3c10248996b5ca17aed94f3da2af87c37405041e20f6cebd153f3781766fbb size 16652
+MD5 010436b48cf3c9724b20572097104a03 ChangeLog 16652
+RMD160 17f849c0c263def4c6062c2a37ab349d711266d0 ChangeLog 16652
+SHA256 3f3c10248996b5ca17aed94f3da2af87c37405041e20f6cebd153f3781766fbb ChangeLog 16652
 MISC metadata.xml 276 RMD160 addc800a374a637032ce56d1a1928542d5c9ef74 SHA1 73bd9b0dacf481b876934c38010be20a91eaf591 SHA256 b57f85b96f11cfb55dc61ac16d743816af60f09660b3f40defa0196d9044f1b7 size 276
 MD5 dc02eeaf8060043bfa8d483a42696963 metadata.xml 276
 RMD160 addc800a374a637032ce56d1a1928542d5c9ef74 metadata.xml 276
@@ -158,31 +178,25 @@ SHA256 b57f85b96f11cfb55dc61ac16d743816af60f09660b3f40defa0196d9044f1b7 metadata
 MD5 705737811b9ae5871759cca1a00013d0 files/digest-portage-2.0.51.22-r3 256
 RMD160 1bab4fc9bf2e3d805e696a68704ea119671f0474 files/digest-portage-2.0.51.22-r3 256
 SHA256 ffe8e80d9f9a07f59b1ec992dc0e0c20aee41408302d64ffa0e2ef72deaf1686 files/digest-portage-2.0.51.22-r3 256
-size 256 files/digest-portage-2.0.51.22-r3 256
 MD5 cea801f17500b6f481aad58cab986e8f files/digest-portage-2.0.53 247
 RMD160 1e0ed345fbf0aa539cd65c6ff7836f7628440b1d files/digest-portage-2.0.53 247
 SHA256 2be877b65f6a7c187cad50e3c66fd5b6c2da03c93b16fc8c3e7b50e7ab81a732 files/digest-portage-2.0.53 247
-size 247 files/digest-portage-2.0.53 247
 MD5 9e5bd07f71a62b11c8d1f5c128a5c220 files/digest-portage-2.0.54 247
 RMD160 a2154fa14f7806c5aeee80b2533632aa6e985cb9 files/digest-portage-2.0.54 247
 SHA256 d12b5844039163fd2cb532560d0e82ef7c4b860ea3ef02e0616b34264be13299 files/digest-portage-2.0.54 247
-size 247 files/digest-portage-2.0.54 247
 MD5 5c917f224be67cca41a62284c21f5877 files/digest-portage-2.0.54-r1 518
 RMD160 55e93cf68ff50faba851c5e938ad7b1baf515372 files/digest-portage-2.0.54-r1 518
 SHA256 eed2cd362ddd79b3068eb40cb11e65917eb4b1ae1590f92c303b6b784bf2fc65 files/digest-portage-2.0.54-r1 518
-size 518 files/digest-portage-2.0.54-r1 518
 MD5 6aebb952d3a284aa4f52d7e5dc7791de files/digest-portage-2.1_pre7-r5 253
 RMD160 437829798fb49cf829eadb8dd84fd8353eb4fdb1 files/digest-portage-2.1_pre7-r5 253
 SHA256 f96288447c0bb578ae0fb80a0169df536c3421f00df4dd8a83d2e910ca489fb5 files/digest-portage-2.1_pre7-r5 253
-size 253 files/digest-portage-2.1_pre7-r5 253
-MD5 67e276de13aafcdf016b324e9d982c77 files/digest-portage-2.1_pre9-r3 253
-RMD160 e92a9e761f9f33a96978374a38b340bfd66e26cb files/digest-portage-2.1_pre9-r3 253
-SHA256 6f2bd6c793f88f16cbcc260b5c1393a38b40579b04ee2f1776dc046664126bab files/digest-portage-2.1_pre9-r3 253
-size 253 files/digest-portage-2.1_pre9-r3 253
+MD5 67e276de13aafcdf016b324e9d982c77 files/digest-portage-2.1_pre9-r4 253
+RMD160 e92a9e761f9f33a96978374a38b340bfd66e26cb files/digest-portage-2.1_pre9-r4 253
+SHA256 6f2bd6c793f88f16cbcc260b5c1393a38b40579b04ee2f1776dc046664126bab files/digest-portage-2.1_pre9-r4 253
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFESp6u/ejvha5XGaMRAlU1AJ40KAWNSO8YmtjVqWg0cadYLTjDZACfT9P4
-Wl7pz6crxpa1MXhnY/nite4=
-=vsyr
+iD8DBQFESzkS/ejvha5XGaMRArHEAJ4q5E480bxky+P43aF+nu3sSeY8WwCdFWVJ
+hfp2eAbkrjBy0azpu5RTCtk=
+=jZhj
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/digest-portage-2.1_pre9-r3 b/sys-apps/portage/files/digest-portage-2.1_pre9-r3
deleted file mode 100644
index b8605c1727f7..000000000000
--- a/sys-apps/portage/files/digest-portage-2.1_pre9-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 da49b427cd47b47cca13703d7e3f5949 portage-2.1_pre9.tar.bz2 260738
-RMD160 6a31123ff904395c5d22f631241293e808b5f94f portage-2.1_pre9.tar.bz2 260738
-SHA256 aef6464ee7bb732038e31250252d544c81ad642691ee78fb2f90074b92c9d726 portage-2.1_pre9.tar.bz2 260738
diff --git a/sys-apps/portage/portage-2.1_pre9-r3.ebuild b/sys-apps/portage/portage-2.1_pre9-r3.ebuild
deleted file mode 100644
index 22c9e9888025..000000000000
--- a/sys-apps/portage/portage-2.1_pre9-r3.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_pre9-r3.ebuild,v 1.1 2006/04/22 20:21:12 antarus Exp $
-
-inherit toolchain-funcs
-
-DESCRIPTION="The Portage Package Management System. The primary package management and distribution system for Gentoo."
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${PN}-${PV}.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/${PN}-${PV}.tar.bz2"
-LICENSE="GPL-2"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-
-SLOT="0"
-IUSE="build doc selinux"
-DEPEND=">=dev-lang/python-2.3"
-RDEPEND="!build? ( >=sys-apps/sed-4.0.5 \
-					dev-python/python-fchksum \
-					>=dev-lang/python-2.3 \
-					userland_GNU? ( sys-apps/debianutils ) \
-					>=app-shells/bash-2.05a ) \
-		elibc_glibc? ( sys-apps/sandbox )
-		elibc_uclibc? ( sys-apps/sandbox )
-		!userland_Darwin? ( >=app-misc/pax-utils-0.1.10 )
-		selinux? ( >=dev-python/python-selinux-2.15 ) \
-		doc? ( app-portage/portage-manpages )
-		>=dev-python/pycrypto-2.0.1-r4"
-
-PROVIDE="virtual/portage"
-
-S=${WORKDIR}/${PN}-${PV}
-
-portage_docs() {
-	einfo ""
-	einfo "For help with using portage please consult the Gentoo Handbook"
-	einfo "at http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3"
-	einfo ""
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	local my_patches="1000_r3171_readDigests.patch
-		1010_r3173_bug_57445_gpgsign.patch
-		1020_r3176_bug_130406_bz.patch
-		1030_r3177_bug_130541_auto_manifest.patch
-		1040_r3178_bug_127585_other_phase.patch
-		1050_r3179_commitmsgfile.patch
-		1060_r3181_gpg_dir.patch"
-	local patches_dir="${PV%_*}/${PV/*_}"
-	for patch_name in ${my_patches}; do
-		einfo "Applying ${patch_name} ..."
-		patch -p0 --no-backup-if-mismatch < \
-			"${FILESDIR}"/${patches_dir}/${patch_name} >/dev/null || \
-			die "Failed to apply patch"
-	done
-	if [ "${PR}" != "r0" ]; then
-		einfo "Setting portage.VERSION to ${PVR} ..."
-		sed -i "s/^VERSION=.*/VERSION=\"${PVR}\"/" pym/portage.py || \
-			die "Failed to patch portage.VERSION"
-	fi
-}
-
-src_compile() {
-	python -O -c "import compileall; compileall.compile_dir('${S}/pym')"
-
-	cd "${S}"/src
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o tbz2tool tbz2tool.c || \
-		die "Failed to build tbz2tool"
-
-	if ! use userland_Darwin; then
-		cd "${S}"/src/python-missingos
-		chmod +x setup.py
-		./setup.py build || die "Failed to build missingos module"
-	fi
-
-	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() {
-	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 userland_Darwin; then
-		cd "${S}"/src/python-missingos
-		./setup.py install --root ${D} || \
-			die "Failed to install missingos module"
-	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 /usr/lib/portage/bin
-	exeinto /usr/lib/portage/bin
-	# BSD and OSX need a sed wrapper so that find/xargs work properly
-	if ! use userland_GNU; then
-		doexe ${FILESDIR}/sed
-	fi
-	cd "${S}"/bin
-	doexe *
-	doexe "${S}"/src/tbz2tool
-	dosym newins /usr/lib/portage/bin/donewins
-
-	for mydir in pym pym/cache pym/elog_modules; do
-		dodir /usr/lib/portage/${mydir}
-		insinto /usr/lib/portage/${mydir}
-		cd "${S}"/${mydir}
-		doins *.py *.pyo
-	done
-
-	doman "${S}"/man/*.[0-9]
-	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"
-	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() {
-	if has livecvsportage ${FEATURES} && [ "${ROOT}" = "/" ]; then
-		rm -rf ${IMAGE}/usr/lib/portage/pym/*
-		mv ${IMAGE}/usr/lib/portage/bin/tbz2tool ${T}
-		rm -rf ${IMAGE}/usr/lib/portage/bin/*
-		mv ${T}/tbz2tool ${IMAGE}/usr/lib/portage/bin/
-	else
-		for mydir in pym pym/cache pym/elog_modules; do
-			rm /usr/lib/portage/${mydir}/*.pyc >& /dev/null
-			rm /usr/lib/portage/${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 "This series contains a completely rewritten caching framework."
-	ewarn "If you are using any cache modules (such as the CDB cache"
-	ewarn "module) portage will not work until they have been disabled."
-	echo
-	einfo "The default cache format has changed between 2.0.x and 2.1"
-	einfo "versions. If you have upgraded from 2.0.x, before using"
-	einfo "emerge, run \`emerge --metadata\` to restore portage's local"
-	einfo "cache."
-	echo
-	einfo "Flag ordering has changed for \`emerge --pretend --verbose\`."
-	einfo "Add EMERGE_DEFAULT_OPTS=\"--alphabetical\" to /etc/make.conf"
-	einfo "to restore the previous ordering."
-	echo
-	einfo "See NEWS and RELEASE-NOTES for further changes."
-
-	portage_docs
-}