2.1.1_rc1-r4 revbump for bug #146289 and other small fixes, including support for package.use.mask in repoman.

(Portage version: 4407-svn)
 (Signed Manifest commit)

3 files changed, 15 insertions, 227 deletions

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 3fd4a2460389..81cdb97b919b 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -16,8 +16,8 @@ SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 files/RE
 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-r2.tar.bz2 280469 RMD160 2507c4e2db3fdf1157e44430b449f618e99f5d57 SHA1 06ec20f96618271c7835ce505d4979b8f7914067 SHA256 854c61dd0232cca50d9bb9a3e9e13f22589b76029ea7eeacab2bc5d4ec7e48cc
-DIST portage-2.1.1_rc1-r2.patch.bz2 3654 RMD160 1cfcdc1fb25c58da6a3c19c890c181505d0121e9 SHA1 a44b43219d0f5299d67272382ac1c12cd525ff44 SHA256 c06681674acc9f2331fc4611bd54d528f6679d36f35c4667f692a8636a49b630
 DIST portage-2.1.1_rc1-r3.patch.bz2 4394 RMD160 3b0949cf71204141e04bc75483ff2bd29341b288 SHA1 9ae4f56ca905caef0a42d82a7a45d825714da3f1 SHA256 82c552476efd6f22245c4771f0f1b4468c9d29fb807ba10364e576daeee005f9
+DIST portage-2.1.1_rc1-r4.patch.bz2 5553 RMD160 49f92e226dd1e1c6179fa2d04f359bb4b7e00665 SHA1 b4bbb9192d873f79821ceb897cf00a774cdec67e SHA256 1dc0cab729ca61e4d5f994a1a848379a3e690b161b600320a8a586a51e7e58b2
 DIST portage-2.1.1_rc1.tar.bz2 295029 RMD160 5c1f8b9bd56843b5248d0be33b702008f9284695 SHA1 8a341d527b160a30e65ce97ea3455f835fa499c0 SHA256 d29a6adcb6684c965bfec91796aedbd7ab0cf2bb05794eb1acb79a5408cef95d
 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
@@ -34,18 +34,18 @@ EBUILD portage-2.1-r2.ebuild 7077 RMD160 709488f3f40f375fbd8dc38c0fee414b2075dc4
 MD5 1b28b65bd43e57ce31605f24e54732f1 portage-2.1-r2.ebuild 7077
 RMD160 709488f3f40f375fbd8dc38c0fee414b2075dc4d portage-2.1-r2.ebuild 7077
 SHA256 1a7fd886c4b04bff6cfa34e6d2c11255e87286a0a0ea14da1cac8feeda21a92d portage-2.1-r2.ebuild 7077
-EBUILD portage-2.1.1_rc1-r2.ebuild 5806 RMD160 0da549355a870218987e498c2e0c78a28627e075 SHA1 0e83c720556c3ac35d5b4d358ec4b0c3956e0a2f SHA256 4d279f5d7c95f4c46ad5edfd47e6c1f18cd1a2ea8267e9278729d25c361edaac
-MD5 cafdad884a4033923efbce3d076d39bf portage-2.1.1_rc1-r2.ebuild 5806
-RMD160 0da549355a870218987e498c2e0c78a28627e075 portage-2.1.1_rc1-r2.ebuild 5806
-SHA256 4d279f5d7c95f4c46ad5edfd47e6c1f18cd1a2ea8267e9278729d25c361edaac portage-2.1.1_rc1-r2.ebuild 5806
 EBUILD portage-2.1.1_rc1-r3.ebuild 5806 RMD160 2082752171c262aec1eafed092495b78c9f1be58 SHA1 b9f3169013c8d6a05906f9735548f4011d24e3b1 SHA256 1db2641e0647b19810193c38bd8a812d7b964798644d1b4bdeb2fac2f0114983
 MD5 d46414545afe54fff944fd0a28cf197f portage-2.1.1_rc1-r3.ebuild 5806
 RMD160 2082752171c262aec1eafed092495b78c9f1be58 portage-2.1.1_rc1-r3.ebuild 5806
 SHA256 1db2641e0647b19810193c38bd8a812d7b964798644d1b4bdeb2fac2f0114983 portage-2.1.1_rc1-r3.ebuild 5806
-MISC ChangeLog 11944 RMD160 e558f66ae8c5713e1d9da1fed7ac98e6bcef28d6 SHA1 5452c0b536d9efc4096a8c29374e39489e60e928 SHA256 3eda060f13a101dd934144e496da1816942564f264710bfe89573ab5607792c2
-MD5 6962c2894bde9b26b0ffadfa392fa563 ChangeLog 11944
-RMD160 e558f66ae8c5713e1d9da1fed7ac98e6bcef28d6 ChangeLog 11944
-SHA256 3eda060f13a101dd934144e496da1816942564f264710bfe89573ab5607792c2 ChangeLog 11944
+EBUILD portage-2.1.1_rc1-r4.ebuild 5806 RMD160 89fd738ed68592291936db2fcfe3a20ad062af9c SHA1 6f9293a331791f7265b00a3406a17b9c8bce8124 SHA256 c6e688d4601cea4b98da186aef9e9e53dd460f1212b6edcfa7bf912f68d7f592
+MD5 e81fca0340d1df295eea89777e5b0988 portage-2.1.1_rc1-r4.ebuild 5806
+RMD160 89fd738ed68592291936db2fcfe3a20ad062af9c portage-2.1.1_rc1-r4.ebuild 5806
+SHA256 c6e688d4601cea4b98da186aef9e9e53dd460f1212b6edcfa7bf912f68d7f592 portage-2.1.1_rc1-r4.ebuild 5806
+MISC ChangeLog 12166 RMD160 9714ff8b490c4327a67e98a87b0cd6732aaa91c7 SHA1 e85626bf2bd279b4a359696963ea69b5d8f3f4f8 SHA256 c8cd7103bc573b2cbf662bde98ca73fd4264e5af4549c9082391ca632f5b5e2d
+MD5 3fbdaab61851dcfa9cfbd4cfb7471f36 ChangeLog 12166
+RMD160 9714ff8b490c4327a67e98a87b0cd6732aaa91c7 ChangeLog 12166
+SHA256 c8cd7103bc573b2cbf662bde98ca73fd4264e5af4549c9082391ca632f5b5e2d ChangeLog 12166
 MISC metadata.xml 219 RMD160 613195ece366b33606e71ff1753be048f2507841 SHA1 d162fb909241ef50b95a3539bdfcde95429bdf81 SHA256 cbd3a20e5c89a48a842f7132fe705bf39959f02c1025052efce8aad8a8baa8dc
 MD5 74421bbd5bae342d72a7a30b98a69662 metadata.xml 219
 RMD160 613195ece366b33606e71ff1753be048f2507841 metadata.xml 219
@@ -59,16 +59,16 @@ SHA256 e494cfdb2648a2b63f87602043fe2a34432e684159ec53347bdc6395a16cf17e files/di
 MD5 de7e755113f65dd715d1660e1fb0da21 files/digest-portage-2.1-r2 771
 RMD160 0579c77c3080d58fc96b4087ab593fb0ea8f24c6 files/digest-portage-2.1-r2 771
 SHA256 96af979679274f1696e26b58a1347812f388963a675147aa03bc7acd65a659b5 files/digest-portage-2.1-r2 771
-MD5 04336030128d3bf51b63763bf2ba6487 files/digest-portage-2.1.1_rc1-r2 1045
-RMD160 52f0894ebacf6ef86ff6d5d5a9a88880c50be187 files/digest-portage-2.1.1_rc1-r2 1045
-SHA256 aa86cac5406adcfc65f9a3b661ddcdf1fd1fd281ba6ac0d54c7429f75079394c files/digest-portage-2.1.1_rc1-r2 1045
 MD5 ff118cb081b8cf1601aaa1b2cec62f5d files/digest-portage-2.1.1_rc1-r3 1045
 RMD160 d001c6c1b3a517ec23eab55d423b1d8bdfef763d files/digest-portage-2.1.1_rc1-r3 1045
 SHA256 1523c1efbf7766e2c7a492cb9bae4987e3ec6a0dac253a0c39dc132affa25d7c files/digest-portage-2.1.1_rc1-r3 1045
+MD5 5fd3e821757cb73cd86a944fbcb7394d files/digest-portage-2.1.1_rc1-r4 1045
+RMD160 095082c241ab7c08820c4e5c76121842eb605e24 files/digest-portage-2.1.1_rc1-r4 1045
+SHA256 9f1e652e4277abcc8c3279be46efccee4451ee351d1c494c7b9d74bfa7f1703e files/digest-portage-2.1.1_rc1-r4 1045
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE+0+4/ejvha5XGaMRAu7MAJwOVQjJjmHneGW2CDD4LHGUUofdjgCfVwV2
-vFs3OIr8rUSI/oNVPmz/LqU=
-=RETb
+iD8DBQFE/OBB/ejvha5XGaMRAuHAAJ4q4GYUhfNSxDlFJ5e93dxqn9aTAACbB6Qk
+YryMXQkcl6lGp7JG47f1LWQ=
+=hhvA
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/digest-portage-2.1.1_rc1-r2 b/sys-apps/portage/files/digest-portage-2.1.1_rc1-r2
deleted file mode 100644
index 9bd2a2116d92..000000000000
--- a/sys-apps/portage/files/digest-portage-2.1.1_rc1-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 09e6f772e50a3c5a509a148ad21638a0 portage-2.1.1_rc1-r2.patch.bz2 3654
-RMD160 1cfcdc1fb25c58da6a3c19c890c181505d0121e9 portage-2.1.1_rc1-r2.patch.bz2 3654
-SHA256 c06681674acc9f2331fc4611bd54d528f6679d36f35c4667f692a8636a49b630 portage-2.1.1_rc1-r2.patch.bz2 3654
-MD5 ad76c9fb311fd603e7c3c75f7d5b09c0 portage-2.1.1_rc1.tar.bz2 295029
-RMD160 5c1f8b9bd56843b5248d0be33b702008f9284695 portage-2.1.1_rc1.tar.bz2 295029
-SHA256 d29a6adcb6684c965bfec91796aedbd7ab0cf2bb05794eb1acb79a5408cef95d portage-2.1.1_rc1.tar.bz2 295029
-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_rc1-r2.ebuild b/sys-apps/portage/portage-2.1.1_rc1-r2.ebuild
deleted file mode 100644
index 354840df1f6f..000000000000
--- a/sys-apps/portage/portage-2.1.1_rc1-r2.ebuild
+++ /dev/null
@@ -1,200 +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_rc1-r2.ebuild,v 1.1 2006/08/30 05:56:05 zmedico Exp $
-
-inherit toolchain-funcs eutils flag-o-matic
-
-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_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}" != "r0" ] && 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() {
-	append-lfs-flags
-
-	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
-}