2.1.2_rc2-r5 revbump. For bug #131633, RESTRICT=stricter has been disabled.

Package-Manager: portage-2.1.2_rc2-r5

3 files changed, 15 insertions, 256 deletions

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 0482e86c86eb..75c0b6d26ec5 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -19,7 +19,7 @@ DIST portage-2.1.1-r1.patch.bz2 4200 RMD160 e8c003983b1711e296774025f12f01463ed5
 DIST portage-2.1.1-r2.patch.bz2 5263 RMD160 6b749c6700784ea1ecc615b7b3ed39eade28e489 SHA1 4eaedfedf867346d67744d95d5cb3ad5b0da4417 SHA256 4d2bc33b66c6354f008d798507137a347e35ef7448a10ef17e5108160acb0414
 DIST portage-2.1.1.tar.bz2 297006 RMD160 489e6c3e82527917f5308fdbff1c9add1a03f254 SHA1 6fdcb9897cef7f48d98829ab96caf37e31bd14a2 SHA256 3a5da4bb41ca8495f2673178f120622d8d923d8117b8744921418af5843c0389
 DIST portage-2.1.2_rc2-r3.patch.bz2 8415 RMD160 6c0061d3df668c06234253567b628a7977c1db3c SHA1 f42d9c47a9079e0d1aaea91d6d0efeafded6cfcb SHA256 3f15c0ea137fa0316c6488a7ea4c870cc6384883e054915405bf5d6d1c2a943d
-DIST portage-2.1.2_rc2-r4.patch.bz2 17643 RMD160 2cae5611ee7aab1b4b010384d64b6bd978778cf1 SHA1 7530c6b4fd855329db23179fae2e1bfdfcc6123a SHA256 5e717316cc7bbebdbcb76817d48b17d7918a423a9ac92c020247f809cebbf55c
+DIST portage-2.1.2_rc2-r5.patch.bz2 18722 RMD160 e6da13638cdb6aea78b702218e48f466b28f7c6f SHA1 9cf1d2addd4c41042909c4b4b1d63c8b55c9abd3 SHA256 0d6499a3e741891e01ba53c6703a9a19c703fd3d23418216d0baeb76116e55b6
 DIST portage-2.1.2_rc2.tar.bz2 322321 RMD160 bb7db9529c3a86dd03b708f8fb498c11a55ded03 SHA1 d521fe93e7e39fa119fc3074ec926cc01ae79e7b SHA256 64345d0f836225be932e23bfcb9d3a253853067e9f0c842807a7ba2d9c31f0f1
 DIST portage-man-pl-2.1-r1.patch.bz2 2076 RMD160 be3898714b94fb0253c1826909649ea51da205ad SHA1 6ec21b29a3eff4a034ea68b4e6a889c8f95dcc3e SHA256 28176c04290478ba4373c28ea047edbdf3a40d3ff69bf92da55d1cfcb828ea5b
 DIST portage-man-pl-2.1.2_rc1.tar.bz2 53030 RMD160 9ed9037256f3eba59600028f2d8f78792a33383a SHA1 a511121897609bd5a261981fcc7f6789eb1deaaf SHA256 1d03dbfab182397a9fd739604ab526b644e07b9de397f029ea3e7f6969ed1e5a
@@ -44,14 +44,14 @@ EBUILD portage-2.1.2_rc2-r3.ebuild 7699 RMD160 e3430213d0f68ca66e87c66dff506a7ac
 MD5 29b0fa28d52b56fead3b3d00f2258119 portage-2.1.2_rc2-r3.ebuild 7699
 RMD160 e3430213d0f68ca66e87c66dff506a7ac297bfec portage-2.1.2_rc2-r3.ebuild 7699
 SHA256 e3874443f6b272767e944c5b6f5a5363379481b892627a9948c4749c396db697 portage-2.1.2_rc2-r3.ebuild 7699
-EBUILD portage-2.1.2_rc2-r4.ebuild 7699 RMD160 55a94886933a8c39cb1d05e42d933f71906fb104 SHA1 5863810e84c1f77cff29a2a0bd139bfb75e0ccff SHA256 2799a84a38d8205a4b41fbfadbe76a44020a7c2ebd126948f47afd39803bc985
-MD5 8c85e4f5039e021c0e4327681171725b portage-2.1.2_rc2-r4.ebuild 7699
-RMD160 55a94886933a8c39cb1d05e42d933f71906fb104 portage-2.1.2_rc2-r4.ebuild 7699
-SHA256 2799a84a38d8205a4b41fbfadbe76a44020a7c2ebd126948f47afd39803bc985 portage-2.1.2_rc2-r4.ebuild 7699
-MISC ChangeLog 20158 RMD160 1b7c5511d58f7334fbec68f287c4dd2a26d6f7c1 SHA1 83ccce962f9a01c589804ee349cdbed6e375ac50 SHA256 c35256eda9fba31bcdfbbaac5e6010ccf3bb3a0e6c31707e483de5ceba9c7dc7
-MD5 f320a4861f4286820181c61ac252150c ChangeLog 20158
-RMD160 1b7c5511d58f7334fbec68f287c4dd2a26d6f7c1 ChangeLog 20158
-SHA256 c35256eda9fba31bcdfbbaac5e6010ccf3bb3a0e6c31707e483de5ceba9c7dc7 ChangeLog 20158
+EBUILD portage-2.1.2_rc2-r5.ebuild 7699 RMD160 078229c2350ea0dffaffa784e792123d69fa197c SHA1 fb299a11e8f6a5c119f09f74a44a6570e7173bef SHA256 3848ffd2c2faf31514250a92ebc3f77e5040558c216644303706eefcd6563d9b
+MD5 05e46b3c87253bac4c1ffe80e8b2b29b portage-2.1.2_rc2-r5.ebuild 7699
+RMD160 078229c2350ea0dffaffa784e792123d69fa197c portage-2.1.2_rc2-r5.ebuild 7699
+SHA256 3848ffd2c2faf31514250a92ebc3f77e5040558c216644303706eefcd6563d9b portage-2.1.2_rc2-r5.ebuild 7699
+MISC ChangeLog 20351 RMD160 b5d65a5b1c8049c0d19267fb7263fbb8bd2fefc6 SHA1 9585eb5479a3e728afcf8590f94ce89913c4b146 SHA256 5ea5cde50605ede5be97b1d38d391bd3ddd044476eba415860087cccac360d07
+MD5 f7d6b77d51a201a9ed1c79be3037dfa2 ChangeLog 20351
+RMD160 b5d65a5b1c8049c0d19267fb7263fbb8bd2fefc6 ChangeLog 20351
+SHA256 5ea5cde50605ede5be97b1d38d391bd3ddd044476eba415860087cccac360d07 ChangeLog 20351
 MISC metadata.xml 282 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 SHA1 6c41671928300da9f983586503dabcd90062b4dd SHA256 27d358e2646578efe2f2050052d739b641e49325565ec9cab345030420505d46
 MD5 bd1d8da118e08d72f8ea20785a604acf metadata.xml 282
 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 metadata.xml 282
@@ -71,13 +71,13 @@ SHA256 1dbfd88dcf8f81cff40287b480099fe80fd5e0a9f0b153e23d7706446c01be22 files/di
 MD5 9bf76003407e2b5ffa2eb909e692b2d4 files/digest-portage-2.1.2_rc2-r3 795
 RMD160 926c03404ca14c37e9a66baf554f7c1d4f87c097 files/digest-portage-2.1.2_rc2-r3 795
 SHA256 ad136421db7325d1d6627a3d3419eb1f9ba47b1b2d42ebda724618b7de6552d2 files/digest-portage-2.1.2_rc2-r3 795
-MD5 8010df06dfb66308d2184b1facabfd6c files/digest-portage-2.1.2_rc2-r4 798
-RMD160 e8b2eb17b63c83c1fbf66ee1d541597dfd552271 files/digest-portage-2.1.2_rc2-r4 798
-SHA256 1f99306b3e73b2c623446d1b6894990d1f284cfa4d15011e55dada76737309d7 files/digest-portage-2.1.2_rc2-r4 798
+MD5 27a70ce05e818ac6f7b5eed187d82cfe files/digest-portage-2.1.2_rc2-r5 798
+RMD160 1ecb3e41e91fa6539917382629c2d4f53f9e360b files/digest-portage-2.1.2_rc2-r5 798
+SHA256 15c6188619953e877f76115df9c7d089bc346c8f32eb6ba8419e811d6d768913 files/digest-portage-2.1.2_rc2-r5 798
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFcm3J/ejvha5XGaMRAg51AJ9LpLqQDKAMLlk6BznxG4b7kmPd/gCeKII9
-SHPoBuHo55wXvzc0la8PYSc=
-=gpsG
+iD8DBQFFc83q/ejvha5XGaMRAsArAJwOB73sNB/8dVLey+WRUURWrOVPVQCeOxgv
+rRIbGw1lGLPszGpgA/OD5Uc=
+=EInD
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/digest-portage-2.1.2_rc2-r4 b/sys-apps/portage/files/digest-portage-2.1.2_rc2-r4
deleted file mode 100644
index 1a53f5fe89dd..000000000000
--- a/sys-apps/portage/files/digest-portage-2.1.2_rc2-r4
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 2efe0961cad1c13b4517fa55b85cc7a8 portage-2.1.2_rc2-r4.patch.bz2 17643
-RMD160 2cae5611ee7aab1b4b010384d64b6bd978778cf1 portage-2.1.2_rc2-r4.patch.bz2 17643
-SHA256 5e717316cc7bbebdbcb76817d48b17d7918a423a9ac92c020247f809cebbf55c portage-2.1.2_rc2-r4.patch.bz2 17643
-MD5 333a807684b5f83524ff584148cbca27 portage-2.1.2_rc2.tar.bz2 322321
-RMD160 bb7db9529c3a86dd03b708f8fb498c11a55ded03 portage-2.1.2_rc2.tar.bz2 322321
-SHA256 64345d0f836225be932e23bfcb9d3a253853067e9f0c842807a7ba2d9c31f0f1 portage-2.1.2_rc2.tar.bz2 322321
-MD5 624d18249325e364c13dc7ef7647f986 portage-man-pl-2.1.2_rc1.tar.bz2 53030
-RMD160 9ed9037256f3eba59600028f2d8f78792a33383a portage-man-pl-2.1.2_rc1.tar.bz2 53030
-SHA256 1d03dbfab182397a9fd739604ab526b644e07b9de397f029ea3e7f6969ed1e5a portage-man-pl-2.1.2_rc1.tar.bz2 53030
diff --git a/sys-apps/portage/portage-2.1.2_rc2-r4.ebuild b/sys-apps/portage/portage-2.1.2_rc2-r4.ebuild
deleted file mode 100644
index bd3407a26aad..000000000000
--- a/sys-apps/portage/portage-2.1.2_rc2-r4.ebuild
+++ /dev/null
@@ -1,232 +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.2_rc2-r4.ebuild,v 1.6 2006/12/03 06:26:00 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 ~sparc-fbsd ~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 epydoc selinux linguas_pl ${IUSE_ELIBC} ${IUSE_USERLAND}"
-DEPEND=">=dev-lang/python-2.3
-	!build? ( >=sys-apps/sed-4.0.5 )
-	epydoc? ( >=dev-python/epydoc-2.0 )"
-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-1.2.17 )
-	elibc_uclibc? ( >=sys-apps/sandbox-1.2.17 )
-	!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.2_rc1"
-PATCHVER_PL=""
-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
-
-	if use epydoc; then
-		mkdir "${WORKDIR}"/api
-		local my_modules
-		my_modules="$(find "${S}/pym" -name "*.py" \
-			| sed -e 's:.*__init__.py$::' -e 's:\.py$::' -e "s:^${S}/pym/::" \
-			 -e 's:/:.:g')" || die "error listing modules"
-		PYTHONPATH="${S}/pym:${PYTHONPATH}" epydoc -o "${WORKDIR}"/api \
-			-qqqqq --ignore-param-mismatch ${my_modules} || die "epydoc failed"
-	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
-	use epydoc && dohtml -r "${WORKDIR}"/api
-
-	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 bin 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 "In portage-2.1.2, installation actions do not necessarily pull in build time"
-	ewarn "dependencies that are not strictly required.  This behavior is adjustable"
-	ewarn "via the new --with-bdeps option that is documented in the emerge(1) man page."
-	ewarn "For more information regarding this change, please refer to bug #148870."
-	echo
-	ewarn "In portage-2.1.2_rc2, the implicit RDEPEND behavior has been reverted back to"
-	ewarn "the way it was in <portage-2.0.52. This change restricts implicit RDEPEND to"
-	ewarn "the ebuild level, making it independent of whatever RDEPEND may or may not be"
-	ewarn "defined in the inherited eclasses.  As a result, some ebuilds will get"
-	ewarn "implicit RDEPEND that they did not get previously.  Also, some ebuilds will"
-	ewarn "loose some implicit RDEPEND that they previously got from eclasses.  Users"
-	ewarn "that sync with the rsync mirrors will have their metadata cache automatically"
-	ewarn "updated on the next sync (or the next time that they run"
-	ewarn "\`emerge --metadata\`).  Users of the gentoo-x86 CVS repository, in order to"
-	ewarn "make the change immediately effective, will have to manually remove the"
-	ewarn "entire contents of /var/cache/edb/dep/ and then run \`emerge --regen\`."
-	ewarn "If necessary, please refer to bug #153591 for more information."
-	echo
-	elog "See NEWS and RELEASE-NOTES for further changes."
-	echo
-	portage_docs
-}