Remove 2.1.1_pre2-r7 due to bug #140045.

(Portage version: 2.1.1_pre2-r6)
 (Signed Manifest commit)

3 files changed, 7 insertions, 225 deletions

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 7ca1476389b2..a0f8400d357a 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -21,7 +21,6 @@ DIST portage-2.0.51.22.tar.bz2 257823 RMD160 068a6fbc3e41f7357d1ee4d65894e7903c4
 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_pre2-r5.patch.bz2 14811 RMD160 6d5fb74511e27b22e3aaea7240b7abf661d2c9ba SHA1 b70b367e6ce2da6ccaab8f2fbf0b1d9281e58222 SHA256 bae0b087ae3661ed4650e985a7b7122c40ff601baba3014f9413a85560803c6d
-DIST portage-2.1.1_pre2-r7.patch.bz2 20013 RMD160 098bdee8781a159502901b8e59b7b727e28c18ac SHA1 11a1eb1531981077221cce5645748418eee265c7 SHA256 75c65676fbf10ffc653498d475b242448c687fce6504a9739611402588bb53d7
 DIST portage-2.1.1_pre2.tar.bz2 283920 RMD160 5827bafecf45e4e82f8ecfc5e79b21e323cf130a SHA1 069cc6e1d1d317b1db0000f5b5d9be9557101001 SHA256 e8168565cf496ac09e0dec77c2a997476218f1acdb418a301253569c78b429f4
 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
@@ -43,14 +42,10 @@ EBUILD portage-2.1.1_pre2-r6.ebuild 5828 RMD160 676007ad6f1de4f001ce2b036f25c3f9
 MD5 7b40a97555396626a85639ec0eaeb8ca portage-2.1.1_pre2-r6.ebuild 5828
 RMD160 676007ad6f1de4f001ce2b036f25c3f9d761e430 portage-2.1.1_pre2-r6.ebuild 5828
 SHA256 430d9c178aa01bf1c74ec03d76613357e3e8ff295f373a187707e44e4bb361c2 portage-2.1.1_pre2-r6.ebuild 5828
-EBUILD portage-2.1.1_pre2-r7.ebuild 5781 RMD160 60a7a9c331ccf7968e98adbd39525a5e1974102c SHA1 dadc509162b2e3c998b0802c16123e177a6937e5 SHA256 4f9a1428e0e650f4f318273121d2e16cd067d95c9ec4e0ff37545efce25bc7f6
-MD5 68b3bde25db5611a6050a3b395d21aaa portage-2.1.1_pre2-r7.ebuild 5781
-RMD160 60a7a9c331ccf7968e98adbd39525a5e1974102c portage-2.1.1_pre2-r7.ebuild 5781
-SHA256 4f9a1428e0e650f4f318273121d2e16cd067d95c9ec4e0ff37545efce25bc7f6 portage-2.1.1_pre2-r7.ebuild 5781
-MISC ChangeLog 17119 RMD160 2971188849975652c44c590830568407f7693d99 SHA1 e49fa9f11a3cf33018a60099475ecb38444c8abf SHA256 b4e773bd4a0e7074fa8257a2507ba948b7bdc18fac12cc3da6708fe22acd1d6e
-MD5 f03b4c07e18b16e7fa9159c3099ac571 ChangeLog 17119
-RMD160 2971188849975652c44c590830568407f7693d99 ChangeLog 17119
-SHA256 b4e773bd4a0e7074fa8257a2507ba948b7bdc18fac12cc3da6708fe22acd1d6e ChangeLog 17119
+MISC ChangeLog 17241 RMD160 1db2cf81dfc0f1de3ad8e56e2a916731f58e247e SHA1 1b392d541205e081fb86e06ac485db7adf9a8c5f SHA256 6cf5435fa0d96d4eef5da19baff3a97ce3758b50cfaac1c9ce0bee2dfe23ee55
+MD5 fd00e223a1fbc01e121bdf2f688219fc ChangeLog 17241
+RMD160 1db2cf81dfc0f1de3ad8e56e2a916731f58e247e ChangeLog 17241
+SHA256 6cf5435fa0d96d4eef5da19baff3a97ce3758b50cfaac1c9ce0bee2dfe23ee55 ChangeLog 17241
 MISC metadata.xml 219 RMD160 613195ece366b33606e71ff1753be048f2507841 SHA1 d162fb909241ef50b95a3539bdfcde95429bdf81 SHA256 cbd3a20e5c89a48a842f7132fe705bf39959f02c1025052efce8aad8a8baa8dc
 MD5 74421bbd5bae342d72a7a30b98a69662 metadata.xml 219
 RMD160 613195ece366b33606e71ff1753be048f2507841 metadata.xml 219
@@ -67,13 +62,10 @@ SHA256 9f002b314a87d8dfad176863f83c6963acec51093a45494201b53e9c0cf87cd8 files/di
 MD5 c3763350fa7c71736a77cd2724a25779 files/digest-portage-2.1.1_pre2-r6 1054
 RMD160 785885112976473160774f7ba721ece110e8f61b files/digest-portage-2.1.1_pre2-r6 1054
 SHA256 d869f5bca5f06fce7c1e1ea6f8da1167ddef0c008ca7191d3ac3111aeaaee5a6 files/digest-portage-2.1.1_pre2-r6 1054
-MD5 6919994cfeb13e5695d5357e3d90cd9b files/digest-portage-2.1.1_pre2-r7 1054
-RMD160 fd9a8c6a1a9eb0dde812e5845f6496face9812b4 files/digest-portage-2.1.1_pre2-r7 1054
-SHA256 58f2f65b45aa2b1f51db361d0c9c174245917520852ee5dc9108b02d4e51f896 files/digest-portage-2.1.1_pre2-r7 1054
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEs/oM/ejvha5XGaMRAk6zAJwLT51ztVks10Bi3CEWWFMZQ04nWQCg3/E3
-wE6oROwQT+7osswbGC1O+Kw=
-=jvF3
+iD8DBQFEtKdY/ejvha5XGaMRAsAwAKCWsb4CVV6RdxlFTggog4J65DiPtgCdGutM
+DVZoHYDHOJwQZgXrkDWTlm8=
+=JrUS
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/digest-portage-2.1.1_pre2-r7 b/sys-apps/portage/files/digest-portage-2.1.1_pre2-r7
deleted file mode 100644
index f0c5f5a8f4ff..000000000000
--- a/sys-apps/portage/files/digest-portage-2.1.1_pre2-r7
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 eef91eb70d4740d34cc2c1ad232003fa portage-2.1.1_pre2-r7.patch.bz2 20013
-RMD160 098bdee8781a159502901b8e59b7b727e28c18ac portage-2.1.1_pre2-r7.patch.bz2 20013
-SHA256 75c65676fbf10ffc653498d475b242448c687fce6504a9739611402588bb53d7 portage-2.1.1_pre2-r7.patch.bz2 20013
-MD5 2f933f22a47e42e284639097e6abaa4a portage-2.1.1_pre2.tar.bz2 283920
-RMD160 5827bafecf45e4e82f8ecfc5e79b21e323cf130a portage-2.1.1_pre2.tar.bz2 283920
-SHA256 e8168565cf496ac09e0dec77c2a997476218f1acdb418a301253569c78b429f4 portage-2.1.1_pre2.tar.bz2 283920
-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_pre2-r7.ebuild b/sys-apps/portage/portage-2.1.1_pre2-r7.ebuild
deleted file mode 100644
index ff9275701a7c..000000000000
--- a/sys-apps/portage/portage-2.1.1_pre2-r7.ebuild
+++ /dev/null
@@ -1,198 +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_pre2-r7.ebuild,v 1.1 2006/07/11 19:21:00 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 ) )
-	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
-}