2.1_rc3-r1 revbump

Package-Manager: portage-2.1_rc3-r1

4 files changed, 13 insertions, 271 deletions

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 7841dfea5c6b..14a2da5605de 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -10,16 +10,13 @@ RMD160 aecbf663449b7b6c5fc8f4f343c30c1de7515fb3 files/2.0.51.22-fixes.patch 1057
 AUX README.RESCUE 137 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 SHA1 cfc8fcf81921e265f40b47644916331e0b8f18b9
 MD5 c906e2e6782e197725b70f84cfe112a4 files/README.RESCUE 137
 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 files/README.RESCUE 137
-AUX bug_101196_wget_timeout.patch 1778 RMD160 c1e8f507d24b14449e88139d055774b90b0293f9 SHA1 62d855563ef3b38bb85be2e676d808157482fe36
-MD5 be5d5c21800e850a1a91a5e56d791e0e files/bug_101196_wget_timeout.patch 1778
-RMD160 c1e8f507d24b14449e88139d055774b90b0293f9 files/bug_101196_wget_timeout.patch 1778
 DIST portage-2.0.51.22.tar.bz2 257823 RMD160 068a6fbc3e41f7357d1ee4d65894e7903c467cfe SHA1 16459ce2b19592c94ec580bcfade5a89750a62fb
 DIST portage-2.0.54.tar.bz2 234784 RMD160 26c724df242a7d0c44d7fd06067bfcdbc4e3556b SHA1 0559bf8068976c124f0026ab65f3f4a62ae39d83
-DIST portage-2.1_rc2-r3.patch.bz2 3716 RMD160 3e18f30622d0c6dc49f221ecdd6228468f34f222 SHA1 343f0edc12201147ec025deb621f42937603d0b3
-DIST portage-2.1_rc2.tar.bz2 271929 RMD160 a4b414057dd4ebaf5e6ff301933ec1fc9183fecd SHA1 283570b40e57d277601faac149f72c5d41ea60b1
+DIST portage-2.1_rc3-r1.patch.bz2 2442 RMD160 e63d1b2a1ff4c7699b0659780fc1c119ab7d781a SHA1 48257b3ac21c3544544d8e76ad05a49bda2d645b
 DIST portage-2.1_rc3.tar.bz2 273951 RMD160 76992ceb971bb6da755f64a2d85d8af654f3d920 SHA1 b73e8c57083d806abf7054e446efc0c30ae31101
 DIST portage-patches-2.0.54-1.tar.bz2 4398 RMD160 8b7520b99aec0cb53a117b46345a720f5c7a68c0
 DIST portage-patches-2.0.54-2.tar.bz2 6722 RMD160 a9fbb40ec45c62db6b94e79b33ebabf5de22b287 SHA1 44f0b24d6c5893e50f2e4315d9ca22a288062ba8
+DIST portage-pl-2.1_rc2.tar.bz2 35551 RMD160 4d31b2a617abc83e841be3899b2a018aede8556a SHA1 6111810b85a6c209b158a67980cc1e11be55c2f3
 EBUILD portage-2.0.51.22-r3.ebuild 5796 RMD160 3bdf43216d1d70e8547bac9637a394dbcd9a7bd2 SHA1 b88b2898eb5ba5b4471a10f8fa82df9b8dc747f0
 MD5 4df85686b65f5591383e16bf3d6845ba portage-2.0.51.22-r3.ebuild 5796
 RMD160 3bdf43216d1d70e8547bac9637a394dbcd9a7bd2 portage-2.0.51.22-r3.ebuild 5796
@@ -32,15 +29,15 @@ RMD160 5da0de7035a9e2027757902b835bd1304e017807 portage-2.0.54-r2.ebuild 4254
 EBUILD portage-2.0.54.ebuild 3891 RMD160 4e64e86813b5bbdfbce76d76a56b5afd2305b2f8 SHA1 e499b0e717d7de8947bca591ecbcf3b71b744853
 MD5 f9c41fcd6a2155552f0cacbe7a62101c portage-2.0.54.ebuild 3891
 RMD160 4e64e86813b5bbdfbce76d76a56b5afd2305b2f8 portage-2.0.54.ebuild 3891
-EBUILD portage-2.1_rc2-r3.ebuild 6812 RMD160 8f0b2a4b85883252b247762d3010115b7f27d28e SHA1 782504101610eed33656f714a82082bcc39a276b
-MD5 9d453699e3b1e62af9afadb9544f6ed7 portage-2.1_rc2-r3.ebuild 6812
-RMD160 8f0b2a4b85883252b247762d3010115b7f27d28e portage-2.1_rc2-r3.ebuild 6812
+EBUILD portage-2.1_rc3-r1.ebuild 7001 RMD160 80ae647e29c4244cdb3004d70a0bd83bc2524929 SHA1 46774db13d28ed8974b27e1929d55b38d8f5b567
+MD5 f4c9e78c85eb568c463c457252ae6884 portage-2.1_rc3-r1.ebuild 7001
+RMD160 80ae647e29c4244cdb3004d70a0bd83bc2524929 portage-2.1_rc3-r1.ebuild 7001
 EBUILD portage-2.1_rc3.ebuild 6756 RMD160 483623ac543c03c40583bde47999cbf097037963 SHA1 321bc7a09722c5d275dcce75f7d6f4e61f396897
 MD5 0d78f33eac78cd8aa2124c1f99ff2cb3 portage-2.1_rc3.ebuild 6756
 RMD160 483623ac543c03c40583bde47999cbf097037963 portage-2.1_rc3.ebuild 6756
-MISC ChangeLog 9424 RMD160 fcde355b3afba37de5dfeec9a0f2cd97ca7a3582 SHA1 ccfaaebe7a3a00eea7fa58d6ec2773fdb8def3a2
-MD5 c28a07cdaf46506eabd6c013baf9d355 ChangeLog 9424
-RMD160 fcde355b3afba37de5dfeec9a0f2cd97ca7a3582 ChangeLog 9424
+MISC ChangeLog 9584 RMD160 738bac817fdeb84e44e28c1eee3e2733fa3af044 SHA1 8802868d407516f9952fa1205cc3c0c781d8c868
+MD5 598597491991d42c5ec4d52d4af5bc95 ChangeLog 9584
+RMD160 738bac817fdeb84e44e28c1eee3e2733fa3af044 ChangeLog 9584
 MISC metadata.xml 276 RMD160 addc800a374a637032ce56d1a1928542d5c9ef74 SHA1 73bd9b0dacf481b876934c38010be20a91eaf591
 MD5 dc02eeaf8060043bfa8d483a42696963 metadata.xml 276
 RMD160 addc800a374a637032ce56d1a1928542d5c9ef74 metadata.xml 276
@@ -52,14 +49,14 @@ MD5 5b857931bd168ec3192114e2ab6c5a72 files/digest-portage-2.0.54-r1 306
 RMD160 990b4d62ad267177500fbaf3b8170c9de54b304f files/digest-portage-2.0.54-r1 306
 MD5 6cbef6dfb5cc519ab1dbcf288b05681d files/digest-portage-2.0.54-r2 306
 RMD160 8610a1ba4262db214f6d990bf6587f78ed5f4a5d files/digest-portage-2.0.54-r2 306
-MD5 724147033bcdfc23b4e32e6a749f2346 files/digest-portage-2.1_rc2-r3 300
-RMD160 cd298e47117b80e0c27cf659bec694485a466dfe files/digest-portage-2.1_rc2-r3 300
 MD5 fae483ac8335089414ddf3de635d3740 files/digest-portage-2.1_rc3 147
 RMD160 13ba6951090f20b841b9fade7fd3cd5e216a73ce files/digest-portage-2.1_rc3 147
+MD5 ffb5c5384dd7a9787146688e590e29af files/digest-portage-2.1_rc3-r1 451
+RMD160 cb546d9faa69c448b927949d454203f628c350f2 files/digest-portage-2.1_rc3-r1 451
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEeDQP/ejvha5XGaMRAjJsAJ4nyrBEywQ9yFmXHA2qmxk7E5iNxwCfTEGD
-Ek+GElfaPEm83SKPiiId7uY=
-=qESe
+iD8DBQFEelod/ejvha5XGaMRAjqEAJ9m+UMw2IJ7PsfjQaQKcbh4Lqq46wCgtEzb
+939MpGv2a53PC0M8mPKjkoc=
+=2pPd
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/bug_101196_wget_timeout.patch b/sys-apps/portage/files/bug_101196_wget_timeout.patch
deleted file mode 100644
index 5e459cda4f33..000000000000
--- a/sys-apps/portage/files/bug_101196_wget_timeout.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: cnf/make.globals
-===================================================================
---- cnf/make.globals	(revision 3411)
-+++ cnf/make.globals	(revision 3413)
-@@ -29,8 +29,8 @@
- PORTAGE_TMPDIR=/var/tmp
- 
- # Fetching command (5 tries, passive ftp for firewall compatibility)
--FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp -P \${DISTDIR} \${URI}"
--RESUMECOMMAND="/usr/bin/wget -c -t 5 --passive-ftp -P \${DISTDIR} \${URI}"
-+FETCHCOMMAND="/usr/bin/wget -t 5 -T 60 --passive-ftp -P \${DISTDIR} \${URI}"
-+RESUMECOMMAND="/usr/bin/wget -c -t 5 -T 60 --passive-ftp -P \${DISTDIR} \${URI}"
- 
- # Default user options
- FEATURES="sandbox distlocks metadata-transfer"
-Index: cnf/make.conf
-===================================================================
---- cnf/make.conf	(revision 3411)
-+++ cnf/make.conf	(revision 3413)
-@@ -117,12 +117,12 @@
- # will be available.
- #
- # Default fetch command (5 tries, passive ftp for firewall compatibility)
--#FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp \${URI} -P \${DISTDIR}"
--#RESUMECOMMAND="/usr/bin/wget -c -t 5 --passive-ftp \${URI} -P \${DISTDIR}"
-+#FETCHCOMMAND="/usr/bin/wget -t 5 -T 60 --passive-ftp \${URI} -P \${DISTDIR}"
-+#RESUMECOMMAND="/usr/bin/wget -c -t 5 -T 60 --passive-ftp \${URI} -P \${DISTDIR}"
- #
- # Using wget, ratelimiting downloads
--#FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp --limit-rate=200k \${URI} -P \${DISTDIR}"
--#RESUMECOMMAND="/usr/bin/wget -c -t 5 --passive-ftp --limit-rate=200k \${URI} -P \${DISTDIR}"
-+#FETCHCOMMAND="/usr/bin/wget -t 5 -T 60 --passive-ftp --limit-rate=200k \${URI} -P \${DISTDIR}"
-+#RESUMECOMMAND="/usr/bin/wget -c -t 5 -T 60 --passive-ftp --limit-rate=200k \${URI} -P \${DISTDIR}"
- #
- # Lukemftp (BSD ftp):
- #FETCHCOMMAND="/usr/bin/lukemftp -s -a -o \${DISTDIR}/\${FILE} \${URI}"
diff --git a/sys-apps/portage/files/digest-portage-2.1_rc2-r3 b/sys-apps/portage/files/digest-portage-2.1_rc2-r3
deleted file mode 100644
index a2a836a80c9a..000000000000
--- a/sys-apps/portage/files/digest-portage-2.1_rc2-r3
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 9a23197ee7bf57a2a81918905e560e8d portage-2.1_rc2-r3.patch.bz2 3716
-RMD160 3e18f30622d0c6dc49f221ecdd6228468f34f222 portage-2.1_rc2-r3.patch.bz2 3716
-MD5 01d6dbb143179bc67dad3ec3c1e5d6d2 portage-2.1_rc2.tar.bz2 271929
-RMD160 a4b414057dd4ebaf5e6ff301933ec1fc9183fecd portage-2.1_rc2.tar.bz2 271929
diff --git a/sys-apps/portage/portage-2.1_rc2-r3.ebuild b/sys-apps/portage/portage-2.1_rc2-r3.ebuild
deleted file mode 100644
index 4d1177e04b06..000000000000
--- a/sys-apps/portage/portage-2.1_rc2-r3.ebuild
+++ /dev/null
@@ -1,215 +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_rc2-r3.ebuild,v 1.2 2006/05/25 17:42:23 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 ${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_GNU? ( sys-apps/debianutils )
-		!userland_Darwin? ( >=app-shells/bash-3.0 )
-		userland_Darwin? ( >=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-r5"
-SRC_URI="mirror://gentoo/${PN}-${PV}.tar.bz2
-	http://dev.gentoo.org/~zmedico/portage/archives/${PN}-${PV}.tar.bz2"
-
-if [ "${PR}" != "r0" ]; then
-	PATCHVER="-${PR}"
-	SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PV}${PATCHVER}.patch.bz2"
-fi
-
-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}
-	if [ "${PR}" != "r0" ]; then
-		cd "${S}"
-		epatch "${WORKDIR}/${PN}-${PV}${PATCHVER}.patch"
-		epatch "${FILESDIR}"/bug_101196_wget_timeout.patch
-		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() {
-	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 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 ${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
-	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 *.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() {
-	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 "Portage 2.1 contains a completely rewritten caching framework."
-	ewarn "If you are using any cache modules from portage-2.0.x (such as"
-	ewarn "the CDB cache module), portage will not work until they have"
-	ewarn "been disabled via /etc/portage/modules."
-	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 "With the new metadata_overlay cache module, it is possible to"
-	einfo "disable FEATURES=\"metadata-transfer\" (see make.conf.5)."
-	einfo "When this module is used, eclasses in \${PORTDIR} must never"
-	einfo "be modified by the user because portage will not be able to"
-	einfo "detect that cache regeneration is necessary."
-	einfo "When metadata_overlay is initially enabled by setting"
-	einfo "portdbapi.auxdbmodule = cache.metadata_overlay.database"
-	einfo "in /etc/portage/modules, the user must completely remove"
-	einfo "/var/cache/edb/dep/\${PORTDIR} in order to avoid unecessary"
-	einfo "cache regeneration."
-	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
-}