2.1_rc4 release candidate

(Portage version: 2.1_rc4)
 (Signed Manifest commit)

3 files changed, 12 insertions, 239 deletions

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 8cf2a688ef69..29667d158875 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -12,8 +12,7 @@ MD5 c906e2e6782e197725b70f84cfe112a4 files/README.RESCUE 137
 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 files/README.RESCUE 137
 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_rc3-r5.patch.bz2 4687 RMD160 1f9a272b308ac827ce0d87654fd205b7c462550f SHA1 d60cbbbe3839aeb2fc567a2d4bc1dcb186e51ec8
-DIST portage-2.1_rc3.tar.bz2 273951 RMD160 76992ceb971bb6da755f64a2d85d8af654f3d920 SHA1 b73e8c57083d806abf7054e446efc0c30ae31101
+DIST portage-2.1_rc4.tar.bz2 275728 RMD160 9fdea87d80b961706399255ec994b75480e09cf7 SHA1 838aa969221680fc7bec4f2ceec3f714a390e735
 DIST portage-patches-2.0.54-1.tar.bz2 4398 RMD160 8b7520b99aec0cb53a117b46345a720f5c7a68c0 SHA1 43f27fb384c5dbca5cebd00951c1c89f15f5d10d
 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
@@ -29,12 +28,12 @@ RMD160 80eeec613d740d8c425947089e408138aa81a2e2 portage-2.0.54-r2.ebuild 4251
 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_rc3-r5.ebuild 7001 RMD160 f00bfd19a4c933e45d68e31173655469f24814d7 SHA1 f6d62f2d41e79c607bddbf6fd0deb3ac0020ab6e
-MD5 f50ca2b971501d133f1c24e3af3b41ab portage-2.1_rc3-r5.ebuild 7001
-RMD160 f00bfd19a4c933e45d68e31173655469f24814d7 portage-2.1_rc3-r5.ebuild 7001
-MISC ChangeLog 10468 RMD160 05ae338c91417b2da7d4061a6da73153a7b04938 SHA1 f182a755b24488bbedab36d7242c033dd44d7455
-MD5 7161538f467f91a03fc97e8c367615e2 ChangeLog 10468
-RMD160 05ae338c91417b2da7d4061a6da73153a7b04938 ChangeLog 10468
+EBUILD portage-2.1_rc4.ebuild 6998 RMD160 cae9b499e96f9532b3a3ad47d9ccf8730253cef1 SHA1 d8e78f96ebaeb600e9abecc5e3332f81e6ad66e6
+MD5 76e72aa3812ca8391c4fac4efa9b0eb3 portage-2.1_rc4.ebuild 6998
+RMD160 cae9b499e96f9532b3a3ad47d9ccf8730253cef1 portage-2.1_rc4.ebuild 6998
+MISC ChangeLog 10640 RMD160 4176e69d4ae2a7247467e0f0a8a4e90fcd7a462a SHA1 2c59d621f25fd89dd41ceca839de689e2cc19289
+MD5 b071ae566599406ae9a139b9dbfbbd1e ChangeLog 10640
+RMD160 4176e69d4ae2a7247467e0f0a8a4e90fcd7a462a ChangeLog 10640
 MISC metadata.xml 276 RMD160 addc800a374a637032ce56d1a1928542d5c9ef74 SHA1 73bd9b0dacf481b876934c38010be20a91eaf591
 MD5 dc02eeaf8060043bfa8d483a42696963 metadata.xml 276
 RMD160 addc800a374a637032ce56d1a1928542d5c9ef74 metadata.xml 276
@@ -46,12 +45,12 @@ 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 2b169143efd60be3dfeab761dbde188c files/digest-portage-2.1_rc3-r5 451
-RMD160 d7458b881b15cd4f9532589c4053b06f599be0da files/digest-portage-2.1_rc3-r5 451
+MD5 5f28b10a4225c21a4895511ca1c4c5aa files/digest-portage-2.1_rc4 298
+RMD160 df91cf65afbc2459ba493a93bfd7c4b3be381045 files/digest-portage-2.1_rc4 298
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEf6YL/ejvha5XGaMRAhvqAJ4uTMA/HP9t6O5NX+uDe55aDadG6ACeK3zT
-Q30NyKFatNyHFRNVH1qj1bc=
-=O2I2
+iD8DBQFEgRKp/ejvha5XGaMRAtWjAKDG5WmUOYVWncKt+EBogz8sp8gG0gCfdz4x
+OvpY8teSAGSudIQC5E1Vv+A=
+=JBMc
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/digest-portage-2.1_rc3-r5 b/sys-apps/portage/files/digest-portage-2.1_rc3-r5
deleted file mode 100644
index de75b4bd7db7..000000000000
--- a/sys-apps/portage/files/digest-portage-2.1_rc3-r5
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 df8351e6b283ba037678859efdffecf2 portage-2.1_rc3-r5.patch.bz2 4687
-RMD160 1f9a272b308ac827ce0d87654fd205b7c462550f portage-2.1_rc3-r5.patch.bz2 4687
-MD5 e80970e8e94d84e17a200de30e15b0d2 portage-2.1_rc3.tar.bz2 273951
-RMD160 76992ceb971bb6da755f64a2d85d8af654f3d920 portage-2.1_rc3.tar.bz2 273951
-MD5 4e188ec08ee0c959f46b6a8704811c84 portage-pl-2.1_rc2.tar.bz2 35551
-RMD160 4d31b2a617abc83e841be3899b2a018aede8556a portage-pl-2.1_rc2.tar.bz2 35551
diff --git a/sys-apps/portage/portage-2.1_rc3-r5.ebuild b/sys-apps/portage/portage-2.1_rc3-r5.ebuild
deleted file mode 100644
index 8f147351ac77..000000000000
--- a/sys-apps/portage/portage-2.1_rc3-r5.ebuild
+++ /dev/null
@@ -1,220 +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_rc3-r5.ebuild,v 1.1 2006/06/02 02:44:36 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_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_ARCHIVES="http://dev.gentoo.org/~zmedico/portage/archives"
-PV_PL="2.1_rc2"
-SRC_URI="mirror://gentoo/${PN}-${PV}.tar.bz2
-	${SRC_ARCHIVES}/${PN}-${PV}.tar.bz2
-	linguas_pl? ( mirror://gentoo/${PN}-pl-${PV_PL}.tar.bz2
-	${SRC_ARCHIVES}/${PN}-pl-${PV_PL}.tar.bz2 )"
-
-if [ "${PR}" != "r0" ]; then
-	PATCHVER="-${PR}"
-	SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PV}${PATCHVER}.patch.bz2"
-fi
-
-S="${WORKDIR}"/${PN}-${PV}
-S_PL="${WORKDIR}"/${PV_PL}
-
-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"
-		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]
-	use linguas_pl && doman -i18n=pl "${S_PL}"/pl/*.[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
-}