2.1.3_rc8 bump

Package-Manager: portage-2.1.3_rc8

4 files changed, 275 insertions, 8 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 45f7b84db879..84cac9548c10 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,12 @@
 # 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.406 2007/07/08 21:30:00 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.407 2007/07/11 20:26:58 zmedico Exp $
+
+*portage-2.1.3_rc8 (11 Jul 2007)
+
+  11 Jul 2007; Zac Medico <zmedico@gentoo.org> +portage-2.1.3_rc8.ebuild:
+  2.1.3_rc8 bump. This fixes bugs #184604, #184679, #184687, #184806,
+  and #184843. Bug #181949 tracks all bugs fixed since 2.1.2.x.
 
 *portage-2.1.3_rc7 (08 Jul 2007)
 
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 1408fd5ffa64..49fc3c61129f 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -22,6 +22,7 @@ DIST portage-2.1.2.9.patch.bz2 61579 RMD160 ba315f393f8ecf4a89811c650131f3ad51b7
 DIST portage-2.1.2.tar.bz2 311900 RMD160 75da869c02e3574babc2f40e07b18686f384cf99 SHA1 72980508e881d837e78b9309d53dba62ef76c247 SHA256 767e2756e51fbbff5a4fd33e3cec5ad83cf6eaad0fa0fa7c35ad07dbda11a008
 DIST portage-2.1.3_rc6.patch.bz2 110936 RMD160 e785c3364c6be31bde573c3ae938a86e22d49178 SHA1 8645bf95c43140bfe6b4e8657e51d6ed83709d15 SHA256 2001b9b32f28d7377abe40aa103e9dd66affab4d12ae9f11f791fd2071600bbe
 DIST portage-2.1.3_rc7.patch.bz2 125474 RMD160 fa2db698cc8be3a6d597f4d0f3edef6cb70b4bbd SHA1 2e6d7d8753e1829908b28cdfb46a2bba13ac04ce SHA256 97a040b228634e7900fcd61ec9b069e561dff09bfc552f5bc3f6ae47003b7692
+DIST portage-2.1.3_rc8.patch.bz2 128238 RMD160 b85e5f23c603f67e82fe81d1974e05f4bd4fa542 SHA1 2e13bd85b4aa6da4ae2dc15cc604e7bad4bc63d2 SHA256 fb654b19cb546eb37eb03bb7b9697d2ff318addd3ee29c43e04a5c612feffa58
 DIST portage-man-pl-2.1-r1.patch.bz2 2076 RMD160 be3898714b94fb0253c1826909649ea51da205ad SHA1 6ec21b29a3eff4a034ea68b4e6a889c8f95dcc3e SHA256 28176c04290478ba4373c28ea047edbdf3a40d3ff69bf92da55d1cfcb828ea5b
 DIST portage-man-pl-2.1.2.tar.bz2 53893 RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c SHA1 c3151e0b330c589625830e54053fbc676b2c64de SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f
 DIST portage-man-pl-2.1.tar.bz2 52425 RMD160 5fdb898b94b0c6bb23234f0903572675f653ff44 SHA1 9942d024d0c29ccf1bc5d71954ed4668a2aaa424 SHA256 7e01f6c9c567f81d8e81dfdc26cf04b8d1f9f375090641cb80580986f8ac4817
@@ -53,10 +54,14 @@ EBUILD portage-2.1.3_rc7.ebuild 7319 RMD160 6cc590dd7a4566c1ff0f3f355e0e6f1d12bc
 MD5 168077e637331129b5eca796be6f0704 portage-2.1.3_rc7.ebuild 7319
 RMD160 6cc590dd7a4566c1ff0f3f355e0e6f1d12bcf618 portage-2.1.3_rc7.ebuild 7319
 SHA256 482e31a130c31328b2e2809ffbbb6cf49e84517c68467e7ff242a28a4c85f0e3 portage-2.1.3_rc7.ebuild 7319
-MISC ChangeLog 17937 RMD160 e8ecc6e8283d07c7888c40589d1d479faa774b71 SHA1 ca86682df36050d0f50d4c4de21c51eccc2454d8 SHA256 bd6b3b49b40b2375f4377d26a1e863c7b6ab5d7d49567a251e892369f48fc9f6
-MD5 d75793f749621c6c3449df34d91b6607 ChangeLog 17937
-RMD160 e8ecc6e8283d07c7888c40589d1d479faa774b71 ChangeLog 17937
-SHA256 bd6b3b49b40b2375f4377d26a1e863c7b6ab5d7d49567a251e892369f48fc9f6 ChangeLog 17937
+EBUILD portage-2.1.3_rc8.ebuild 7319 RMD160 11cbbdf2f3accd12cf112ee6112c02cbe68407cd SHA1 dad5072d8db83643f03a1d661d599424fe088ae1 SHA256 edbe51d4cd487452637446d567b7bfbb240e6d6167ce56e668a70e0fd97ea993
+MD5 ea82ac92ae04adbe1828774b340f63ce portage-2.1.3_rc8.ebuild 7319
+RMD160 11cbbdf2f3accd12cf112ee6112c02cbe68407cd portage-2.1.3_rc8.ebuild 7319
+SHA256 edbe51d4cd487452637446d567b7bfbb240e6d6167ce56e668a70e0fd97ea993 portage-2.1.3_rc8.ebuild 7319
+MISC ChangeLog 18180 RMD160 de8f37d9fa855cf0ef71124cb0cf5dffb6a208dc SHA1 25971bff0634865341ae509d5358b4e58856c69d SHA256 6b2771a28ed2c26fdce54ef96fb756fb239008ede6fd7925e68da72bd1ac7b3b
+MD5 f1a3ff983670eb4218c636fd8e66125d ChangeLog 18180
+RMD160 de8f37d9fa855cf0ef71124cb0cf5dffb6a208dc ChangeLog 18180
+SHA256 6b2771a28ed2c26fdce54ef96fb756fb239008ede6fd7925e68da72bd1ac7b3b ChangeLog 18180
 MISC metadata.xml 282 RMD160 6c4808b6cd95ab87688faa56ba4d2fcf15d2ab53 SHA1 91e4b3ed133aefe77b32ea6de69cd0062b8e40a4 SHA256 8f9dedd85eefb6985a8f28c79b4e7ec448ff3933fbac27cd169e15ed9e686c18
 MD5 dfcfc175ec5ae4909adae41bc375bcd6 metadata.xml 282
 RMD160 6c4808b6cd95ab87688faa56ba4d2fcf15d2ab53 metadata.xml 282
@@ -82,10 +87,13 @@ SHA256 4bebe79146f5492cd04f3510e0cad6b455f407627c1e65bc2a6e4e5d7931f61d files/di
 MD5 d5342d791564657df96ddf8a5235e706 files/digest-portage-2.1.3_rc7 768
 RMD160 e6538892fbbb85f9d6ee873348cc703d7e2392e5 files/digest-portage-2.1.3_rc7 768
 SHA256 c8c695a932fdb0148a29b0bc68537516d3d0223c38dc5873d594d5f27573532a files/digest-portage-2.1.3_rc7 768
+MD5 48d02f850feefb90f8f11e032d86c605 files/digest-portage-2.1.3_rc8 768
+RMD160 a484a04de12cce5846cb110b7f8a9846fb432fda files/digest-portage-2.1.3_rc8 768
+SHA256 1da71d79e92e5a40111a84fc25cc590fa577d4f7a99cdd28dd3bffdf3526d607 files/digest-portage-2.1.3_rc8 768
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD4DBQFGkVdj/ejvha5XGaMRAqkZAJdfpEnNzvJudFJLQRC7w0Vnj9HAAJ9GnCVS
-ZTmQCBQ6yxTLYeabGqbBww==
-=ekMt
+iD8DBQFGlT0Z/ejvha5XGaMRAqspAKDCH7bCErI979t3l5uaPd9JeOD+ygCfcWDf
+BfWEIDYo9A2l4b2JICoRBCs=
+=T4p9
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/digest-portage-2.1.3_rc8 b/sys-apps/portage/files/digest-portage-2.1.3_rc8
new file mode 100644
index 000000000000..d35b11915095
--- /dev/null
+++ b/sys-apps/portage/files/digest-portage-2.1.3_rc8
@@ -0,0 +1,9 @@
+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 1b55e51bab5583cd63ef5a4a9b96d366 portage-2.1.3_rc8.patch.bz2 128238
+RMD160 b85e5f23c603f67e82fe81d1974e05f4bd4fa542 portage-2.1.3_rc8.patch.bz2 128238
+SHA256 fb654b19cb546eb37eb03bb7b9697d2ff318addd3ee29c43e04a5c612feffa58 portage-2.1.3_rc8.patch.bz2 128238
+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.3_rc8.ebuild b/sys-apps/portage/portage-2.1.3_rc8.ebuild
new file mode 100644
index 000000000000..c4333779a237
--- /dev/null
+++ b/sys-apps/portage/portage-2.1.3_rc8.ebuild
@@ -0,0 +1,244 @@
+# 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.3_rc8.ebuild,v 1.1 2007/07/11 20:26:58 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 )
+	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+	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_FreeBSD? ( dev-python/py-freebsd )
+	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="2.1.2"
+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="${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}-${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 doc; then
+		cd "${S}"/doc
+		touch fragment/date
+		sed -i "s/svn-trunk/${PVR}/" fragment/version
+		make xhtml-nochunks || die "failed to make docs"
+	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
+
+	insinto /etc/logrotate.d
+	doins "${S}"/cnf/logrotate.d/elog-save-summary
+
+	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 doc && dohtml "${S}"/doc/*.html
+	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
+
+	elog
+	elog "The world file now supports slot atoms such as 'sys-devel/gcc:3.4'. In some"
+	elog "cases, emerge --depclean may remove slots that it would not have removed"
+	elog "in the past. The emerge --noreplace command can be used to add an atom to"
+	elog "the world file and prevent matching packages from being removed.  A slot"
+	elog "atom will be recorded in the world file for any atom that is precise enough"
+	elog "to identify a specific slot."
+
+	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
+}