2.1.2.11 bump

Package-Manager: portage-2.1.2.11

4 files changed, 275 insertions, 8 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 3e46b8436209..fc428fd409dc 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,17 @@
 # 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.409 2007/07/28 06:12:47 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.410 2007/07/31 22:31:22 zmedico Exp $
+
+*portage-2.1.2.11 (31 Jul 2007)
+
+  31 Jul 2007; Zac Medico <zmedico@gentoo.org> +portage-2.1.2.11.ebuild:
+  2.1.2.11 bump.  This fixes bugs #8688, #47442, #82378, #131030, #137483,
+  #139383,#139600, #139670, #141550, #143340, #144440, #147558, #149397,
+  #152828, #153967, #156536, #162923, #167057, #169500, #170604, #172194,
+  #172511, #172886, #180045, #180165, #181104, #181355, #181551, #181953,
+  #182021, #182157, #182166, #182964, #183431, #184116, #184412, #184774,
+  #185048, #185504, #185670, #185930, #186610, #186639, and #186960.
+  Bug #187293 tracks all of the above bugs.
 
 *portage-2.1.3 (28 Jul 2007)
 
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index c3a6a0ace840..b801f3f4977e 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -16,6 +16,7 @@ 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.11.tar.bz2 334796 RMD160 cf456fd3da24a3f6df32752253a9db041d8917d6 SHA1 e83c73f3bd496da06274ead2239f5b22ae775d84 SHA256 0982c8d88ba2ec3236dbcfa99cb67d0538fe90c8a744d66d63ad95354cecd7f5
 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
@@ -33,6 +34,10 @@ 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.11.ebuild 7180 RMD160 ccb5e70067abfef18c0c12774c46f60faa2d7939 SHA1 6055b72e0c5dcfa30e3c98ee2c8e5179860bc0a0 SHA256 e72c61bef68e7a5799a6a1e416f0cda71eaba94d6d0c1ff58f3ca130f6944bb6
+MD5 9c9cc69257176ff6508ad95fa3662160 portage-2.1.2.11.ebuild 7180
+RMD160 ccb5e70067abfef18c0c12774c46f60faa2d7939 portage-2.1.2.11.ebuild 7180
+SHA256 e72c61bef68e7a5799a6a1e416f0cda71eaba94d6d0c1ff58f3ca130f6944bb6 portage-2.1.2.11.ebuild 7180
 EBUILD portage-2.1.2.2.ebuild 6998 RMD160 525af4afe8edb15be5e364b67573ed6ec5a6d787 SHA1 03a12cee438484144a5f6b0ae4e13a526a1d9f0b SHA256 dc0746a31b1db60ef70ba11e62145a9b0a77c814ac646227809b6896f85077e6
 MD5 bfc93d30afcace9e0617aca65e909483 portage-2.1.2.2.ebuild 6998
 RMD160 525af4afe8edb15be5e364b67573ed6ec5a6d787 portage-2.1.2.2.ebuild 6998
@@ -53,10 +58,10 @@ EBUILD portage-2.1.3_rc9.ebuild 7319 RMD160 e0c8a5f62f4973b04eae9f0806d71da81c65
 MD5 ae63d9d0d0babc15901fc450a1c47096 portage-2.1.3_rc9.ebuild 7319
 RMD160 e0c8a5f62f4973b04eae9f0806d71da81c653672 portage-2.1.3_rc9.ebuild 7319
 SHA256 604efd57de8f75e3aa6acf1a500c56728d5cd2125daed032011258355b254f4e portage-2.1.3_rc9.ebuild 7319
-MISC ChangeLog 18702 RMD160 868cf93edeb6feaac6efba16a2f2fd3950b8bb8e SHA1 a067703d67ae9c88b441d3af4aaca00163e5724c SHA256 cf824e6010f17ee2ad87be190bacf8d2f8a98d01d25188ec817cde48f3ba4973
-MD5 362da41726ec9f79f6a82d240a8b40e3 ChangeLog 18702
-RMD160 868cf93edeb6feaac6efba16a2f2fd3950b8bb8e ChangeLog 18702
-SHA256 cf824e6010f17ee2ad87be190bacf8d2f8a98d01d25188ec817cde48f3ba4973 ChangeLog 18702
+MISC ChangeLog 19292 RMD160 c381864a6e9187d69304177fb29692b2fece8abe SHA1 7e1828b594c176d7cc5e43b6e580888b284ea9ec SHA256 1eaa5699456b564711fe3af938e4a9d199df523d0cee46d404d9db631db05133
+MD5 3d1917f03e57d2df7b5b0d5e627472f9 ChangeLog 19292
+RMD160 c381864a6e9187d69304177fb29692b2fece8abe ChangeLog 19292
+SHA256 1eaa5699456b564711fe3af938e4a9d199df523d0cee46d404d9db631db05133 ChangeLog 19292
 MISC metadata.xml 282 RMD160 6c4808b6cd95ab87688faa56ba4d2fcf15d2ab53 SHA1 91e4b3ed133aefe77b32ea6de69cd0062b8e40a4 SHA256 8f9dedd85eefb6985a8f28c79b4e7ec448ff3933fbac27cd169e15ed9e686c18
 MD5 dfcfc175ec5ae4909adae41bc375bcd6 metadata.xml 282
 RMD160 6c4808b6cd95ab87688faa56ba4d2fcf15d2ab53 metadata.xml 282
@@ -67,6 +72,9 @@ 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 cc58fe743b1815814cfbede4feedf6a3 files/digest-portage-2.1.2.11 515
+RMD160 7fbf56d60c9db8a3768beb17409d42759de44871 files/digest-portage-2.1.2.11 515
+SHA256 cf333ff21423fe9ad3969d4ff1479566adf67b2cfe374a1910f6972d52a54b50 files/digest-portage-2.1.2.11 515
 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
@@ -85,7 +93,7 @@ SHA256 49f1c6e9b6ffa4490bc994c508d45cb99f2ac35dbc4103490966147c66f60a42 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFGqt5j/ejvha5XGaMRAmMFAKDfvgsvxwgs0Uir9CjdSGlL3LkkGgCg3/Vc
-iC0ohwanlPyaiXSUZa9NV7s=
-=BHZ3
+iD8DBQFGr7hC/ejvha5XGaMRAvsXAKCcdfqQqEuI4nLE/umowhYaNeyE0QCgk0Zy
+a6em35j96n4P6C5uYZ/kfiQ=
+=UW+x
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/digest-portage-2.1.2.11 b/sys-apps/portage/files/digest-portage-2.1.2.11
new file mode 100644
index 000000000000..909a1b15fbba
--- /dev/null
+++ b/sys-apps/portage/files/digest-portage-2.1.2.11
@@ -0,0 +1,6 @@
+MD5 4a25c4e4c17ce4f2b707c131626b5a46 portage-2.1.2.11.tar.bz2 334796
+RMD160 cf456fd3da24a3f6df32752253a9db041d8917d6 portage-2.1.2.11.tar.bz2 334796
+SHA256 0982c8d88ba2ec3236dbcfa99cb67d0538fe90c8a744d66d63ad95354cecd7f5 portage-2.1.2.11.tar.bz2 334796
+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.11.ebuild b/sys-apps/portage/portage-2.1.2.11.ebuild
new file mode 100644
index 000000000000..54b35d88d627
--- /dev/null
+++ b/sys-apps/portage/portage-2.1.2.11.ebuild
@@ -0,0 +1,242 @@
+# 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.11.ebuild,v 1.1 2007/07/31 22:31:22 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="build doc epydoc selinux linguas_pl userland_GNU ${IUSE_ELIBC}"
+DEPEND=">=dev-lang/python-2.4
+	!build? ( >=sys-apps/sed-4.0.5 )
+	epydoc? ( >=dev-python/epydoc-2.0 )"
+RDEPEND=">=dev-lang/python-2.4
+	!build? ( >=sys-apps/sed-4.0.5
+		dev-python/python-fchksum
+		>=app-shells/bash-3.0 )
+	elibc_glibc? ( >=sys-apps/sandbox-1.2.17 )
+	elibc_uclibc? ( >=sys-apps/sandbox-1.2.17 )
+	>=app-misc/pax-utils-0.1.13
+	userland_GNU? ( >=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=""
+TARBALL_PV=${PV}
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
+	${SRC_ARCHIVES}/${PN}-${TARBALL_PV}.tar.bz2
+	linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}.tar.bz2
+	${SRC_ARCHIVES}/${PN}-man-pl-${PV_PL}.tar.bz2 )"
+
+PATCHVER=""
+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}-${TARBALL_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 --no-frames --show-imports \
+			--name "${PN}" --url "${HOMEPAGE}" \
+			${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
+}