2.1.1_pre2 release.

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

3 files changed, 26 insertions, 217 deletions

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 1821e5c951cb..ae3b307dd04d 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 05portage.envd 34 RMD160 014194a1786a0983a8ba91c3924b798f353c330d SHA1 2af2c9a7ce535c36749dfe81b6555426225620e2 SHA256 dbe8db19d03b39ad2b7f9f6dfcd24c615a14886b3fe6d5ce4dd88bac27c0e225
 MD5 d5d5b818347fd87b290ecb0b17516b34 files/05portage.envd 34
 RMD160 014194a1786a0983a8ba91c3924b798f353c330d files/05portage.envd 34
@@ -17,9 +20,9 @@ SHA256 7dd6cc900dbf83e8efd85e1c2fad86e18fb8489d8d3f70b7b0dabbe183b1d664 files/bu
 DIST portage-2.0.51.22.tar.bz2 257823 RMD160 068a6fbc3e41f7357d1ee4d65894e7903c467cfe SHA1 16459ce2b19592c94ec580bcfade5a89750a62fb SHA256 f0dac4366b5234b084645bbbd6b871a5abe05d501cf868046af2777e02a4100c
 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_pre1-r2.patch.bz2 28543 RMD160 0070ce2403ba2db4c1910833de5d61e392b060e2 SHA1 ab0bd2c718f2dd5f5c9d72883ffcddd4ad978299 SHA256 53f9852725670c3e5e8602afa2b32882072bfe99a18757ebcbc59caa7db25990
 DIST portage-2.1.1_pre1-r5.patch.bz2 39728 RMD160 d82b4203462e77c17dc4f3ba87c62a09b53745a7 SHA1 01ffcc7123c7b89109699d043a86ddafb2cbb80b SHA256 abe00224559f2ae45261d46b36cea9b6a1add88aa145093482e1786b5b866bea
 DIST portage-2.1.1_pre1.tar.bz2 277982 RMD160 41fc05479ba8774ad35939b6b5f597e559602f0e SHA1 bd7787676d3db97932867983ab01781cf5f56b78 SHA256 de7d23e15681a6eff9199a505bc9bdf59a5a43d5c51e6223d6296659c1a0cc3e
+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
 DIST portage-man-pl-2.1.tar.bz2 52425 RMD160 5fdb898b94b0c6bb23234f0903572675f653ff44 SHA1 9942d024d0c29ccf1bc5d71954ed4668a2aaa424 SHA256 7e01f6c9c567f81d8e81dfdc26cf04b8d1f9f375090641cb80580986f8ac4817
@@ -37,26 +40,26 @@ EBUILD portage-2.1-r1.ebuild 7553 RMD160 b60e6828cd7ae8f547dd890d11f7513b5f88a51
 MD5 b948f44a5b7d1ace44208ddde7ebe08c portage-2.1-r1.ebuild 7553
 RMD160 b60e6828cd7ae8f547dd890d11f7513b5f88a510 portage-2.1-r1.ebuild 7553
 SHA256 3bbc63edbe646d86c703d5d82ce7af6fb4a7db567f64d19d9e4e2273de823112 portage-2.1-r1.ebuild 7553
-EBUILD portage-2.1.1_pre1-r2.ebuild 5644 RMD160 d2dd3334b7a642d12da053c66c20da5cc8bd4f5c SHA1 4a5171cb9d6003cbc481bbe47ce673c4259dec8a SHA256 3661a35f30ef5d432d07c0fabb6145416cae17cc846be29e3bd014476e416f05
-MD5 cdfe661aeaa0cb765a0e04e82a855e72 portage-2.1.1_pre1-r2.ebuild 5644
-RMD160 d2dd3334b7a642d12da053c66c20da5cc8bd4f5c portage-2.1.1_pre1-r2.ebuild 5644
-SHA256 3661a35f30ef5d432d07c0fabb6145416cae17cc846be29e3bd014476e416f05 portage-2.1.1_pre1-r2.ebuild 5644
 EBUILD portage-2.1.1_pre1-r5.ebuild 5692 RMD160 1d0b157a7b3c74cbee5bfd4f67a2631e8dbbd766 SHA1 89c8aaf599345f6a8939f1ffb351768d7fb8d884 SHA256 26df65f5f419c00e2c345fb2b8c808dd9c84551c23eb52b528018d5fc6e72c16
 MD5 210a4557c343011fcdf8a5077cdeef3e portage-2.1.1_pre1-r5.ebuild 5692
 RMD160 1d0b157a7b3c74cbee5bfd4f67a2631e8dbbd766 portage-2.1.1_pre1-r5.ebuild 5692
 SHA256 26df65f5f419c00e2c345fb2b8c808dd9c84551c23eb52b528018d5fc6e72c16 portage-2.1.1_pre1-r5.ebuild 5692
+EBUILD portage-2.1.1_pre2.ebuild 5736 RMD160 25514373f0cb287f54030cfdb68f7723470b587c SHA1 dd5abd918e20f9bf439b40befbb65ba2d381b5a4 SHA256 60362706621349c2fcb080cb8bbd1ee31b11c6cac65c4616aff9b5aa6074f3c7
+MD5 0478d57ee0f060713995a82455135105 portage-2.1.1_pre2.ebuild 5736
+RMD160 25514373f0cb287f54030cfdb68f7723470b587c portage-2.1.1_pre2.ebuild 5736
+SHA256 60362706621349c2fcb080cb8bbd1ee31b11c6cac65c4616aff9b5aa6074f3c7 portage-2.1.1_pre2.ebuild 5736
 EBUILD portage-2.1.ebuild 7248 RMD160 e54df351244bb056247dc870e8cae61f9d4d69c2 SHA1 820a21fbe6b7b1d60987a9bda32df12cd85b76e7 SHA256 93eeb65fc06e62c619785c7ac4dbf8aaf2f2a07d547f7e1d2a860ad1cdce2d13
 MD5 34ee3d531b703420790ae14a8dbb5f79 portage-2.1.ebuild 7248
 RMD160 e54df351244bb056247dc870e8cae61f9d4d69c2 portage-2.1.ebuild 7248
 SHA256 93eeb65fc06e62c619785c7ac4dbf8aaf2f2a07d547f7e1d2a860ad1cdce2d13 portage-2.1.ebuild 7248
-MISC ChangeLog 15139 RMD160 c4bc7ee4bc929b15708f9852d4f07a5b210bc835 SHA1 5b303ecad851b028c3ffd2f476f31664562138d6 SHA256 d1dad076734e55771d9b428cff38838a8a02b83fc5b496353a8cda151dcde102
-MD5 f5fe79a3a0e13031d17bb85ed7bf09c7 ChangeLog 15139
-RMD160 c4bc7ee4bc929b15708f9852d4f07a5b210bc835 ChangeLog 15139
-SHA256 d1dad076734e55771d9b428cff38838a8a02b83fc5b496353a8cda151dcde102 ChangeLog 15139
-MISC metadata.xml 276 RMD160 addc800a374a637032ce56d1a1928542d5c9ef74 SHA1 73bd9b0dacf481b876934c38010be20a91eaf591 SHA256 b57f85b96f11cfb55dc61ac16d743816af60f09660b3f40defa0196d9044f1b7
-MD5 dc02eeaf8060043bfa8d483a42696963 metadata.xml 276
-RMD160 addc800a374a637032ce56d1a1928542d5c9ef74 metadata.xml 276
-SHA256 b57f85b96f11cfb55dc61ac16d743816af60f09660b3f40defa0196d9044f1b7 metadata.xml 276
+MISC ChangeLog 15322 RMD160 5b73341ecbed6725d63b4986b1b5ee1fe2f882f5 SHA1 cc3f6f22079f955aa2e51cb50ec3bd28b1cba951 SHA256 e0a4a11b467420f0759fe54d5e7f62cb1dd50ddca1b4b4bb6920ac3d380e80f9
+MD5 71062eed7bd0bba3111ceee7ff00d08a ChangeLog 15322
+RMD160 5b73341ecbed6725d63b4986b1b5ee1fe2f882f5 ChangeLog 15322
+SHA256 e0a4a11b467420f0759fe54d5e7f62cb1dd50ddca1b4b4bb6920ac3d380e80f9 ChangeLog 15322
+MISC metadata.xml 219 RMD160 613195ece366b33606e71ff1753be048f2507841 SHA1 d162fb909241ef50b95a3539bdfcde95429bdf81 SHA256 cbd3a20e5c89a48a842f7132fe705bf39959f02c1025052efce8aad8a8baa8dc
+MD5 74421bbd5bae342d72a7a30b98a69662 metadata.xml 219
+RMD160 613195ece366b33606e71ff1753be048f2507841 metadata.xml 219
+SHA256 cbd3a20e5c89a48a842f7132fe705bf39959f02c1025052efce8aad8a8baa8dc metadata.xml 219
 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
@@ -69,9 +72,16 @@ SHA256 998fe70d318d97ec7c596b0ab72151080acb5a41fe03ed92ad77e5eb2f511545 files/di
 MD5 5a9aac645d5a2bdb9d987f45813d495a files/digest-portage-2.1-r1 1012
 RMD160 ae625221b6669b5f4f1aef277b2a8ea3ae70e1ae files/digest-portage-2.1-r1 1012
 SHA256 9f002b314a87d8dfad176863f83c6963acec51093a45494201b53e9c0cf87cd8 files/digest-portage-2.1-r1 1012
-MD5 ee378755043ca7f32e9d4bcc3808ecfe files/digest-portage-2.1.1_pre1-r2 1054
-RMD160 92bb8c4c4df24f07b6dc9789c08bc71bd80a6048 files/digest-portage-2.1.1_pre1-r2 1054
-SHA256 7c19b83520d83f0121c07343cdb9ea0a46de2606a5f55df361bfc16a6b448dfa files/digest-portage-2.1.1_pre1-r2 1054
 MD5 65e33a514b2084c868cb3ee45f7fda32 files/digest-portage-2.1.1_pre1-r5 1054
 RMD160 2c1a5753d848cd1c61d917ec06f346ce838a19bf files/digest-portage-2.1.1_pre1-r5 1054
 SHA256 76b054610dbdad6aa3cb0e21cefa2a8f3a9470494f8b57cf49b99799f6a84573 files/digest-portage-2.1.1_pre1-r5 1054
+MD5 9d8a3ce9bc303047ac7e7e2c493c5960 files/digest-portage-2.1.1_pre2 783
+RMD160 4f8c6f2026a766eb35446c195a116f62634f4c2e files/digest-portage-2.1.1_pre2 783
+SHA256 5c952eac6357a3876939e7516ff155d4bb7e236457e555b88107319e0be67bc1 files/digest-portage-2.1.1_pre2 783
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.4 (GNU/Linux)
+
+iD8DBQFEpv/r/ejvha5XGaMRAvERAJ9j5vSuxffXUHxKXBDFakKz3qvYJwCgwuSK
+MtzKGCI1QLWLvTePqaC/iW0=
+=ZW6N
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/digest-portage-2.1.1_pre1-r2 b/sys-apps/portage/files/digest-portage-2.1.1_pre1-r2
deleted file mode 100644
index a4eb46898929..000000000000
--- a/sys-apps/portage/files/digest-portage-2.1.1_pre1-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 c022f325d53e29fd07e1aad0b6637a4b portage-2.1.1_pre1-r2.patch.bz2 28543
-RMD160 0070ce2403ba2db4c1910833de5d61e392b060e2 portage-2.1.1_pre1-r2.patch.bz2 28543
-SHA256 53f9852725670c3e5e8602afa2b32882072bfe99a18757ebcbc59caa7db25990 portage-2.1.1_pre1-r2.patch.bz2 28543
-MD5 3dc4fb1d5bc1aac640b579e82db58dfd portage-2.1.1_pre1.tar.bz2 277982
-RMD160 41fc05479ba8774ad35939b6b5f597e559602f0e portage-2.1.1_pre1.tar.bz2 277982
-SHA256 de7d23e15681a6eff9199a505bc9bdf59a5a43d5c51e6223d6296659c1a0cc3e portage-2.1.1_pre1.tar.bz2 277982
-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_pre1-r2.ebuild b/sys-apps/portage/portage-2.1.1_pre1-r2.ebuild
deleted file mode 100644
index a5afccfe6721..000000000000
--- a/sys-apps/portage/portage-2.1.1_pre1-r2.ebuild
+++ /dev/null
@@ -1,189 +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_pre1-r2.ebuild,v 1.1 2006/06/23 19:44:22 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"
-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 )"
-
-if [ "${PR}" != "r0" ]; then
-	PATCHVER="-${PR}"
-	PATCHVER_PL="-r1"
-	SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PV}${PATCHVER}.patch.bz2
-	${SRC_ARCHIVES}/${PN}-${PV}${PATCHVER}.patch.bz2
-	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() {
-	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"
-		use linguas_pl && \
-			epatch "${WORKDIR}/${PN}-man-pl-${PV_PL}${PATCHVER_PL}.patch"
-		einfo "Setting portage.VERSION to ${PVR} ..."
-		sed -i "s/^VERSION=.*/VERSION=\"${PVR}\"/" pym/portage.py || \
-			die "Failed to patch portage.VERSION"
-		eend 0
-	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
-}