2.1_rc1-r1 regression fix revbump

Package-Manager: portage-2.1_rc1-r1

3 files changed, 14 insertions, 228 deletions

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 896a41c9eb95..809f9d6c7c63 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -10,6 +10,9 @@ RMD160 aecbf663449b7b6c5fc8f4f343c30c1de7515fb3 files/2.0.51.22-fixes.patch 1057
 AUX README.RESCUE 137 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 SHA1 cfc8fcf81921e265f40b47644916331e0b8f18b9 size 137
 MD5 c906e2e6782e197725b70f84cfe112a4 files/README.RESCUE 137
 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 files/README.RESCUE 137
+AUX bug_133287.patch 505 RMD160 d022657221b7ac929fa3d5d8acd14cbc239450b4 SHA1 f953bfea7d6a4ca26a50d1c9057cf6a43bfed452 size 505
+MD5 01f5576f1be26ed4dccda087c0eb0863 files/bug_133287.patch 505
+RMD160 d022657221b7ac929fa3d5d8acd14cbc239450b4 files/bug_133287.patch 505
 DIST portage-2.0.51.22.tar.bz2 257823 RMD160 068a6fbc3e41f7357d1ee4d65894e7903c467cfe size 257823
 DIST portage-2.0.54.tar.bz2 234784 RMD160 26c724df242a7d0c44d7fd06067bfcdbc4e3556b size 234784
 DIST portage-2.1_rc1.tar.bz2 269500 RMD160 1fa54bfe61f7a30bf3178997a78ef7272f560a35 size 269500
@@ -27,12 +30,12 @@ RMD160 012bca79eee13230e47e963277bf36f33c509fe8 portage-2.0.54-r2.ebuild 4190
 EBUILD portage-2.0.54.ebuild 3891 RMD160 4e64e86813b5bbdfbce76d76a56b5afd2305b2f8 SHA1 e499b0e717d7de8947bca591ecbcf3b71b744853 size 3891
 MD5 f9c41fcd6a2155552f0cacbe7a62101c portage-2.0.54.ebuild 3891
 RMD160 4e64e86813b5bbdfbce76d76a56b5afd2305b2f8 portage-2.0.54.ebuild 3891
-EBUILD portage-2.1_rc1.ebuild 6562 RMD160 209073f09b4d4713dd8d5038e7858ffa9e5e030d SHA1 6767460cf8371682b584cb46cb55b1aadb3a4f9e size 6562
-MD5 ab03e0f489155bcefb6a5d4ed0cd7034 portage-2.1_rc1.ebuild 6562
-RMD160 209073f09b4d4713dd8d5038e7858ffa9e5e030d portage-2.1_rc1.ebuild 6562
-MISC ChangeLog 20717 RMD160 6e1ea1cc1f67493bd3ef75068ca193fdebb949ec SHA1 b032474940348db94197d8400f2a90d867780abf size 20717
-MD5 8d9c6bb9198849344a914b0f221941c0 ChangeLog 20717
-RMD160 6e1ea1cc1f67493bd3ef75068ca193fdebb949ec ChangeLog 20717
+EBUILD portage-2.1_rc1-r1.ebuild 6605 RMD160 23f9c6753ed7ecc4f68dce77b194e4a439f0c977 SHA1 515a757f749a544fa83d7c3383f4e6d7ea86de1e size 6605
+MD5 27018c0ea6044eb8b4ab6f9a1424a3ee portage-2.1_rc1-r1.ebuild 6605
+RMD160 23f9c6753ed7ecc4f68dce77b194e4a439f0c977 portage-2.1_rc1-r1.ebuild 6605
+MISC ChangeLog 20882 RMD160 80cf614ac135ea2c7396c5ffc41622fe0265b86c SHA1 356df63563ab87029cc092adde785a1a5b693054 size 20882
+MD5 dd506d3d7402b99a3232c1985a3afda2 ChangeLog 20882
+RMD160 80cf614ac135ea2c7396c5ffc41622fe0265b86c ChangeLog 20882
 MISC metadata.xml 276 RMD160 addc800a374a637032ce56d1a1928542d5c9ef74 SHA1 73bd9b0dacf481b876934c38010be20a91eaf591 size 276
 MD5 dc02eeaf8060043bfa8d483a42696963 metadata.xml 276
 RMD160 addc800a374a637032ce56d1a1928542d5c9ef74 metadata.xml 276
@@ -44,12 +47,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 476ee7c4cbf56f2343bdad3b9a8511de files/digest-portage-2.1_rc1 147
-RMD160 cb27af4cc53e0b758947d3570fba2a4c14dc426f files/digest-portage-2.1_rc1 147
+MD5 476ee7c4cbf56f2343bdad3b9a8511de files/digest-portage-2.1_rc1-r1 147
+RMD160 cb27af4cc53e0b758947d3570fba2a4c14dc426f files/digest-portage-2.1_rc1-r1 147
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEZkd+/ejvha5XGaMRAu0gAJ9IE54bDkYwDtJO8UA5VCmIICAW4wCeNd5X
-VHAsUICfzxl3MTG0YQVQFZE=
-=hAvs
+iD8DBQFEZxuv/ejvha5XGaMRAlLzAJ9OUOkGo8fR12M2N6PcxEdIfu1iLgCgpR1h
+cQqwY9JKR6mhF10rDL+0ERM=
+=yN8y
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/digest-portage-2.1_rc1 b/sys-apps/portage/files/digest-portage-2.1_rc1
deleted file mode 100644
index 7c33bcbe57aa..000000000000
--- a/sys-apps/portage/files/digest-portage-2.1_rc1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 957fd35122a02e96f02aa3b901cdefa1 portage-2.1_rc1.tar.bz2 269500
-RMD160 1fa54bfe61f7a30bf3178997a78ef7272f560a35 portage-2.1_rc1.tar.bz2 269500
diff --git a/sys-apps/portage/portage-2.1_rc1.ebuild b/sys-apps/portage/portage-2.1_rc1.ebuild
deleted file mode 100644
index cdfe645dfc51..000000000000
--- a/sys-apps/portage/portage-2.1_rc1.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_rc1.ebuild,v 1.1 2006/05/13 20:54:13 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"
-IUSE="build doc selinux"
-DEPEND=">=dev-lang/python-2.3
-	!build? ( >=sys-apps/sed-4.0.5 )"
-RDEPEND="!build? ( >=dev-lang/python-2.3
-		dev-python/python-fchksum
-		userland_GNU? ( sys-apps/debianutils )
-		>=app-shells/bash-2.05a
-		>=sys-apps/sed-4.0.5 )
-	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"
-PATCHVER=""
-SRC_URI="mirror://gentoo/${PN}-${PV}.tar.bz2
-	http://dev.gentoo.org/~zmedico/portage/archives/${PN}-${PV}.tar.bz2"
-[ -n "${PATCHVER}" ] && \
-	SRC_URI="${SRC_URI} mirror://gentoo/${PN}-patches-${PV}${PATCHVER}.tar.bz2"
-unset PATCHVER
-
-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}"
-	if [ -d "${WORKDIR}/patch" ]; then
-		local p
-		for p in $(ls "${WORKDIR}"/patch | sort); do
-			epatch "${WORKDIR}"/patch/${p}
-		done
-	fi
-
-	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() {
-	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
-}