Punt 2.1.2.10 due to bug #181387.

Package-Manager: portage-2.1.2.10

4 files changed, 11 insertions, 265 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 0993e9dd1ccd..57b0a99c3450 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/portage
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.389 2007/06/09 05:10:10 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.390 2007/06/09 09:11:25 zmedico Exp $
+
+  09 Jun 2007; Zac Medico <zmedico@gentoo.org> -portage-2.1.2.10.ebuild:
+  Punt 2.1.2.10 due to bug #181387.
 
 *portage-2.1.2.10 (09 Jun 2007)
 
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 4358ec352e7c..6026a819348d 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -16,7 +16,6 @@ SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 files/RE
 DIST portage-2.0.51.22.tar.bz2 257823 RMD160 068a6fbc3e41f7357d1ee4d65894e7903c467cfe SHA1 16459ce2b19592c94ec580bcfade5a89750a62fb SHA256 f0dac4366b5234b084645bbbd6b871a5abe05d501cf868046af2777e02a4100c
 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.10.patch.bz2 72371 RMD160 62c59aae3df38cb7855f2ac9dd2a0da76945be91 SHA1 647c90c8d099a18f9a94cdf26816f4ff0f78f1c0 SHA256 b8fdea1b1d9525c07c62f376cdf53dfd656f010067afb73ac00241f480273fff
 DIST portage-2.1.2.2.patch.bz2 36946 RMD160 cb55d2d2aa68ee149c8f6d9d94dfa3be5a884554 SHA1 2897ef16683d7cc8d5b8da04b67b93fcc83634d4 SHA256 1f5dd5105698773d46ce2345e9b5668271147d3b68e223216f965bf75a133f73
 DIST portage-2.1.2.7.patch.bz2 52460 RMD160 c6e963d38a1bb5e174b6f2cd8c4e47bac2bef4bf SHA1 817b1d9dd119a90c8e3d8375d996f194215a9be1 SHA256 477aefd64234b77181ef04d3d7617bb86b26739022ffd8108f8aadc2c5f5b084
 DIST portage-2.1.2.9.patch.bz2 61579 RMD160 ba315f393f8ecf4a89811c650131f3ad51b754d9 SHA1 0dfdc95e9becd0475e417f93417edfd8c0ab4fbb SHA256 4de01cc201f60438a1973aef146c4bbc715bc271fac0717e960c1d5cef8205a4
@@ -32,10 +31,6 @@ EBUILD portage-2.1.1-r2.ebuild 7206 RMD160 c028ba3fd434cb86decc7d480b4a900ab59d2
 MD5 3f3860eb123eb52d2dbcd8677b3fd62f portage-2.1.1-r2.ebuild 7206
 RMD160 c028ba3fd434cb86decc7d480b4a900ab59d267c portage-2.1.1-r2.ebuild 7206
 SHA256 f47b7bddd2438839603fd7cf50121221221b4a9e6777f045245656938f01baa8 portage-2.1.1-r2.ebuild 7206
-EBUILD portage-2.1.2.10.ebuild 7188 RMD160 077f9dd581a7b366e3990daf6627db69a14f2ba0 SHA1 fa8e5df94d78f77814144e7eb3766926ea1434f7 SHA256 ac7e10e4c1310a2be82df481edf0d40ebe5f311d5cb2cd7b51e4301b09668799
-MD5 0150381b4ba312158165b13178bd9fe0 portage-2.1.2.10.ebuild 7188
-RMD160 077f9dd581a7b366e3990daf6627db69a14f2ba0 portage-2.1.2.10.ebuild 7188
-SHA256 ac7e10e4c1310a2be82df481edf0d40ebe5f311d5cb2cd7b51e4301b09668799 portage-2.1.2.10.ebuild 7188
 EBUILD portage-2.1.2.2.ebuild 7011 RMD160 e7bc1c9ce8788df19da8609c305a7c54ca3b4b96 SHA1 70c5b22bbfe587ad2af630f98d0a49f661fd6e33 SHA256 9899d28591768c7d88e030bbb5d60375cdf292aa2eaef6000d4d16723a6563d8
 MD5 4c835c577886243b275aa3d9d4ef00da portage-2.1.2.2.ebuild 7011
 RMD160 e7bc1c9ce8788df19da8609c305a7c54ca3b4b96 portage-2.1.2.2.ebuild 7011
@@ -48,10 +43,10 @@ EBUILD portage-2.1.2.9.ebuild 7187 RMD160 5963916b22c77065fd37158826d308a91c0171
 MD5 806b7e90127c74f045b864566b7b70cc portage-2.1.2.9.ebuild 7187
 RMD160 5963916b22c77065fd37158826d308a91c017199 portage-2.1.2.9.ebuild 7187
 SHA256 92da7353b764d1a9203b746d125aaf1fd29f4e557d242ccaf3451c4649f2fcdf portage-2.1.2.9.ebuild 7187
-MISC ChangeLog 14540 RMD160 47f78ef15c2bee9e667a2f5a8c33cf2c6f36a3cd SHA1 d7c0c7260977743ce7d1e0445eaa51c005404840 SHA256 871980cece3a009a905a543ea40f9d120904d18fed5be30d3859e584a3317bae
-MD5 f3834e8a1aebf292d1c348c2fb961245 ChangeLog 14540
-RMD160 47f78ef15c2bee9e667a2f5a8c33cf2c6f36a3cd ChangeLog 14540
-SHA256 871980cece3a009a905a543ea40f9d120904d18fed5be30d3859e584a3317bae ChangeLog 14540
+MISC ChangeLog 14650 RMD160 d858ba6f55e20728115d833e9c9faf711c40adba SHA1 14c7166452fcc60f2adc8a3adbda24c7658a18e4 SHA256 3c93d2430359c0876f033119d61dec817ea94c57671eac71948efe8c9d216473
+MD5 d8d6a3e0ec6fae8c7b23d9873c74d667 ChangeLog 14650
+RMD160 d858ba6f55e20728115d833e9c9faf711c40adba ChangeLog 14650
+SHA256 3c93d2430359c0876f033119d61dec817ea94c57671eac71948efe8c9d216473 ChangeLog 14650
 MISC metadata.xml 282 RMD160 6c4808b6cd95ab87688faa56ba4d2fcf15d2ab53 SHA1 91e4b3ed133aefe77b32ea6de69cd0062b8e40a4 SHA256 8f9dedd85eefb6985a8f28c79b4e7ec448ff3933fbac27cd169e15ed9e686c18
 MD5 dfcfc175ec5ae4909adae41bc375bcd6 metadata.xml 282
 RMD160 6c4808b6cd95ab87688faa56ba4d2fcf15d2ab53 metadata.xml 282
@@ -62,9 +57,6 @@ SHA256 ffe8e80d9f9a07f59b1ec992dc0e0c20aee41408302d64ffa0e2ef72deaf1686 files/di
 MD5 3add5888d02ad00946eb670f1d6eff5c files/digest-portage-2.1.1-r2 1021
 RMD160 082589ba69cde6b349a156722316ba10bdcfe0cd files/digest-portage-2.1.1-r2 1021
 SHA256 1dbfd88dcf8f81cff40287b480099fe80fd5e0a9f0b153e23d7706446c01be22 files/digest-portage-2.1.1-r2 1021
-MD5 e3ee88791ce71a9cced7dd56006778b2 files/digest-portage-2.1.2.10 762
-RMD160 0fd47ea1662fcc865c76d5e5313c38f22b27ff22 files/digest-portage-2.1.2.10 762
-SHA256 009e50a4b18a46af6fe51ca295517d92beb343ce3fb8dc01800b8af447c27906 files/digest-portage-2.1.2.10 762
 MD5 925d42c079e45eec3f978b5f7016bc5e files/digest-portage-2.1.2.2 759
 RMD160 5c05ea1481402ffdc98a69bb6e0f3307596cef33 files/digest-portage-2.1.2.2 759
 SHA256 d8cbd61eab242247e3a0f76d5fafd63a398e4f1b4219e2193dd41f3a926fae05 files/digest-portage-2.1.2.2 759
@@ -77,7 +69,7 @@ SHA256 930cabb025bc5f9e963cc4f044688bbffb1cbc1e46c4b715ff2314d1469de01c files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGajY8/ejvha5XGaMRAkgIAJ9aYA2ArQGtIFSe35L9lNu2cH0r6QCZAbjG
-g8Q8lXKOyQ7m5qUBHBRAa70=
-=9KkY
+iD8DBQFGam7I/ejvha5XGaMRAp1nAJ4pKbQLdKmWQqQv5teHvi0ojazI0wCbBB27
+ss0Ya25lJnAESoMAUfqPNkg=
+=TMLP
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/digest-portage-2.1.2.10 b/sys-apps/portage/files/digest-portage-2.1.2.10
deleted file mode 100644
index 12cccd8b3349..000000000000
--- a/sys-apps/portage/files/digest-portage-2.1.2.10
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 ae17b99f4bdd3dff72038ad9b795b6c0 portage-2.1.2.10.patch.bz2 72371
-RMD160 62c59aae3df38cb7855f2ac9dd2a0da76945be91 portage-2.1.2.10.patch.bz2 72371
-SHA256 b8fdea1b1d9525c07c62f376cdf53dfd656f010067afb73ac00241f480273fff portage-2.1.2.10.patch.bz2 72371
-MD5 74c705793edb37ac2fb1d3b2e06c689d portage-2.1.2.tar.bz2 311900
-RMD160 75da869c02e3574babc2f40e07b18686f384cf99 portage-2.1.2.tar.bz2 311900
-SHA256 767e2756e51fbbff5a4fd33e3cec5ad83cf6eaad0fa0fa7c35ad07dbda11a008 portage-2.1.2.tar.bz2 311900
-MD5 6409f79dd5efe7922dd8fa36340c4912 portage-man-pl-2.1.2.tar.bz2 53893
-RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c portage-man-pl-2.1.2.tar.bz2 53893
-SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f portage-man-pl-2.1.2.tar.bz2 53893
diff --git a/sys-apps/portage/portage-2.1.2.10.ebuild b/sys-apps/portage/portage-2.1.2.10.ebuild
deleted file mode 100644
index 19ea06056fe7..000000000000
--- a/sys-apps/portage/portage-2.1.2.10.ebuild
+++ /dev/null
@@ -1,240 +0,0 @@
-# Copyright 1999-2007 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.10.ebuild,v 1.1 2007/06/09 05:10:10 zmedico Exp $
-
-inherit toolchain-funcs eutils flag-o-matic multilib
-
-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 ~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 )
-	userland_GNU? ( !selinux? ( >=sys-apps/coreutils-6.4 ) )
-	selinux? ( >=dev-python/python-selinux-2.16 )
-	doc? ( app-portage/portage-manpages )
-	>=dev-python/pycrypto-2.0.1-r5
-	>=net-misc/rsync-2.6.4"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# rsync-2.6.4 rdep is for the --filter option #167668
-SRC_ARCHIVES="http://dev.gentoo.org/~zmedico/portage/archives"
-
-PV_PL="2.1.2"
-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=${PVR}
-if [ -n "${PATCHVER}" ]; then
-	SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PATCHVER}.patch.bz2
-	${SRC_ARCHIVES}/${PN}-${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}-${PATCHVER}.patch"
-	fi
-	einfo "Setting portage.VERSION to ${PVR} ..."
-	sed -i "s/^VERSION=.*/VERSION=\"${PVR}\"/" pym/portage.py || \
-		die "Failed to patch portage.VERSION"
-	eend 0
-	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
-		einfo "Generating api docs"
-		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_test() {
-	./tests/runTests || \
-		die "test(s) failed"
-}
-
-src_install() {
-	local libdir=$(get_libdir)
-	local portage_base="/usr/${libdir}/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 ../${libdir}/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 ../${libdir}/portage/bin/${x} /usr/sbin/${x}
-	done
-	dosym env-update /usr/sbin/update-env
-	dosym etc-update /usr/sbin/update-etc
-
-	dodir /etc/portage
-	keepdir /etc/portage
-
-	echo PYTHONPATH=\"${portage_base}/pym\" > "${WORKDIR}"/05portage.envd
-	doenvd "${WORKDIR}"/05portage.envd
-}
-
-pkg_preinst() {
-	local portage_base="/usr/$(get_libdir)/portage"
-	if has livecvsportage ${FEATURES} && [ "${ROOT}" = "/" ]; then
-		rm -rf "${D}"/${portage_base}/pym/*
-		mv "${D}"/${portage_base}/bin/tbz2tool "${T}"
-		rm -rf "${D}"/${portage_base}/bin/*
-		mv "${T}"/tbz2tool "${D}"/${portage_base}/bin/
-	fi
-	remove_python_bytecodes
-}
-
-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
-	elog "See NEWS and RELEASE-NOTES for further changes."
-	echo
-	portage_docs
-}
-
-pkg_postrm() {
-	remove_python_bytecodes
-}
-
-remove_python_bytecodes() {
-	local d="${ROOT}/usr/$(get_libdir)/portage/pym"
-	[ -d "${d}" ] || return
-	find "${d}" -type d -print0 | \
-	while read -d $'\0' d ; do
-		cd "${d}"
-		rm -f *.pyc *.pyo
-	done
-}