2.1.4_rc3 bump. This version adds support for persistence of colon

separated SANDBOX_{DENY,READ,PREDICT,WRITE} variables between phases
so things like the global scope addpredict() call in qt3.eclass will
continue to work.
Package-Manager: portage-2.1.4_rc3

4 files changed, 285 insertions, 8 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index bed15ee40df4..d45b7b8806dd 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.473 2007/11/23 12:08:20 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.474 2007/11/24 06:15:08 zmedico Exp $
+
+  24 Nov 2007; Zac Medico <zmedico@gentoo.org> +portage-2.1.4_rc3.ebuild:
+  2.1.4_rc3 bump. This version adds support for persistence of colon
+  separated SANDBOX_{DENY,READ,PREDICT,WRITE} variables between phases
+  so things like the global scope addpredict() call in qt3.eclass will
+  continue to work.
 
 *portage-2.1.4_rc2 (23 Nov 2007)
 
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 8b9034789348..672ae3494d62 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -20,6 +20,7 @@ DIST portage-2.1.2.12.tar.bz2 336043 RMD160 7994d95bad6672f6602b3556a2237c7547ee
 DIST portage-2.1.3.16.tar.bz2 375210 RMD160 06d0e9bc25431cb5e63004fd651020a11acfb47d SHA1 b3257fb75c4e1db1192814551e30b0a2c986fdd1 SHA256 6657857fa5a0c18c4a9ae3a22665896aae7004a6b69bef50c0046514dd4fdb8f
 DIST portage-2.1.3.19.patch.bz2 20196 RMD160 3d33ecc8ae5176426666ba1aa03155a10ed97c01 SHA1 89a525959e493b0b1834e3b59d182a9b35a6508c SHA256 a69c095a32b2d731cb7b74731269ae7c42357a3c34d7f183e2fc779d79652296
 DIST portage-2.1.4_rc2.patch.bz2 41476 RMD160 61fc6ff55a49ce5e69ab777ff136508a261230fd SHA1 81cb024759f0c42dc81414e9ed6d12a4643f30cd SHA256 ebee5faad4c946e4abb3e985d373b274689528b5c2fcc5b7c796510432aaee0a
+DIST portage-2.1.4_rc3.patch.bz2 42277 RMD160 2e3777f3c86ef4ba07eb16cf1c67c0f2369ab01d SHA1 63f301db99a5d65fc0dab5709ab16870cd05bddc SHA256 5e875c31a25e676926fe41f0cae653866241f1a91320e27eae5ab116cbc3c65f
 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
@@ -43,10 +44,14 @@ EBUILD portage-2.1.4_rc2.ebuild 7444 RMD160 c20e892eef8275aaa0ad447bba031d6f80d1
 MD5 b1d9e0ceb335cf5e4a521e9c6d8d8601 portage-2.1.4_rc2.ebuild 7444
 RMD160 c20e892eef8275aaa0ad447bba031d6f80d1db96 portage-2.1.4_rc2.ebuild 7444
 SHA256 02e746a888d3ac9c697763d543041eec87ffc3a3b318526160d44b287778895f portage-2.1.4_rc2.ebuild 7444
-MISC ChangeLog 19732 RMD160 7777b343de597274373bc654ed67f07c67d9c1f0 SHA1 9d8bbb8151833039395e76ec4b81685db6235d45 SHA256 38a2e8f20b7e4832aba61b6c6d73eed2a09e3c395e51e201a6f4289b3a97ea35
-MD5 c0f6a3f98f2b1ce444ce1b3f0e8d3fd9 ChangeLog 19732
-RMD160 7777b343de597274373bc654ed67f07c67d9c1f0 ChangeLog 19732
-SHA256 38a2e8f20b7e4832aba61b6c6d73eed2a09e3c395e51e201a6f4289b3a97ea35 ChangeLog 19732
+EBUILD portage-2.1.4_rc3.ebuild 7444 RMD160 ad3c8fb3032783b7bff6cad9b7831d44e6da84da SHA1 10e5d154168d5e23b8d649c215ed7ae6803beecc SHA256 26a85d7f7e50a8fd2005070ea0d509f0c0a6e591e84c460c8f8e3f5e581b91f0
+MD5 228ccfcee616df40dd483668a228b31d portage-2.1.4_rc3.ebuild 7444
+RMD160 ad3c8fb3032783b7bff6cad9b7831d44e6da84da portage-2.1.4_rc3.ebuild 7444
+SHA256 26a85d7f7e50a8fd2005070ea0d509f0c0a6e591e84c460c8f8e3f5e581b91f0 portage-2.1.4_rc3.ebuild 7444
+MISC ChangeLog 20038 RMD160 7af1684723f5d68ac08f16d370410d5381b5cdde SHA1 b91bcb07d5a394c4f94e83a4878e9b63b9dc0acf SHA256 a18a54ed5540eb44503ef733860acb6209f89eed604f56e17bd2ce11ff5e0e82
+MD5 306160a07bb01f3e50dcc06aace64573 ChangeLog 20038
+RMD160 7af1684723f5d68ac08f16d370410d5381b5cdde ChangeLog 20038
+SHA256 a18a54ed5540eb44503ef733860acb6209f89eed604f56e17bd2ce11ff5e0e82 ChangeLog 20038
 MISC metadata.xml 282 RMD160 6c4808b6cd95ab87688faa56ba4d2fcf15d2ab53 SHA1 91e4b3ed133aefe77b32ea6de69cd0062b8e40a4 SHA256 8f9dedd85eefb6985a8f28c79b4e7ec448ff3933fbac27cd169e15ed9e686c18
 MD5 dfcfc175ec5ae4909adae41bc375bcd6 metadata.xml 282
 RMD160 6c4808b6cd95ab87688faa56ba4d2fcf15d2ab53 metadata.xml 282
@@ -66,10 +71,13 @@ SHA256 41cfad5b48183c6fa7667e247eb242a5a04eacd7a73123f5ea1c5192b3761327 files/di
 MD5 ae269f171613076c3cb1579ff4739d21 files/digest-portage-2.1.4_rc2 774
 RMD160 63698953d619938e26e94c4cd38836344b7f1dc1 files/digest-portage-2.1.4_rc2 774
 SHA256 c841a5a2fd9459709099292b8b5b47f13fb429c7c76e62686df735a5e924c5c2 files/digest-portage-2.1.4_rc2 774
+MD5 505e4d32bb6ff6f056f5601ecdf0bd2f files/digest-portage-2.1.4_rc3 774
+RMD160 0c695931d3dbfefc97e45e6b520ce24208ea1878 files/digest-portage-2.1.4_rc3 774
+SHA256 1808885add1f4548d17c737a40013b1dfeadfdbba2cce37458df77a742eb57c9 files/digest-portage-2.1.4_rc3 774
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHRsK9/ejvha5XGaMRAuqBAJ9nrceMxUN8SVb8n9lx7Iu/Tt6RcQCfecXw
-T1x8ueCvY3cu7LRGbnDRCss=
-=wtIp
+iD8DBQFHR8F8/ejvha5XGaMRAjqVAJ95XIJ7jpZJOawKbPnBtqPhkkHM6gCg6dPw
+L+5mDAia+e2ooCN5S6nvkr0=
+=Z6wr
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/digest-portage-2.1.4_rc3 b/sys-apps/portage/files/digest-portage-2.1.4_rc3
new file mode 100644
index 000000000000..a8baf53a2b28
--- /dev/null
+++ b/sys-apps/portage/files/digest-portage-2.1.4_rc3
@@ -0,0 +1,9 @@
+MD5 1650b5ea49895b610fc21ae6d36413ad portage-2.1.3.16.tar.bz2 375210
+RMD160 06d0e9bc25431cb5e63004fd651020a11acfb47d portage-2.1.3.16.tar.bz2 375210
+SHA256 6657857fa5a0c18c4a9ae3a22665896aae7004a6b69bef50c0046514dd4fdb8f portage-2.1.3.16.tar.bz2 375210
+MD5 7c3449ec621a53f4eaeef3c8dd1b776a portage-2.1.4_rc3.patch.bz2 42277
+RMD160 2e3777f3c86ef4ba07eb16cf1c67c0f2369ab01d portage-2.1.4_rc3.patch.bz2 42277
+SHA256 5e875c31a25e676926fe41f0cae653866241f1a91320e27eae5ab116cbc3c65f portage-2.1.4_rc3.patch.bz2 42277
+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.4_rc3.ebuild b/sys-apps/portage/portage-2.1.4_rc3.ebuild
new file mode 100644
index 000000000000..ab014ecd368c
--- /dev/null
+++ b/sys-apps/portage/portage-2.1.4_rc3.ebuild
@@ -0,0 +1,254 @@
+# 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.4_rc3.ebuild,v 1.1 2007/11/24 06:15:08 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"
+IUSE="build doc epydoc selinux linguas_pl"
+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
+		>=app-shells/bash-3.2_p17 )
+	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
+	elibc_glibc? ( >=sys-apps/sandbox-1.2.17 )
+	elibc_uclibc? ( >=sys-apps/sandbox-1.2.17 )
+	>=app-misc/pax-utils-0.1.13
+	selinux? ( >=dev-python/python-selinux-2.16 )"
+PDEPEND="
+	doc? (
+		|| ( app-portage/eclass-manpages app-portage/portage-manpages )
+	)
+	!build? (
+		>=net-misc/rsync-2.6.4
+		userland_GNU? ( >=sys-apps/coreutils-6.4 )
+		|| ( >=dev-lang/python-2.5 >=dev-python/pycrypto-2.0.1-r6 )
+	)"
+# 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.3.16"
+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=${PV}
+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
+
+	local mydir
+	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
+	local x
+	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() {
+	if ! use build && ! has_version dev-python/pycrypto && \
+		has_version '>=dev-lang/python-2.5' ; then
+		# Bug #198398 - Unless pycrypto is installed, we need
+		# python's ssl flag enabled for RMD160 support.
+		built_with_use '>=dev-lang/python-2.5' ssl
+	fi
+	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
+}
+
+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
+
+	# Compile all source files recursively. Any orphans
+	# will be identified and removed in postrm.
+	compile_all_python_bytecodes "${ROOT}usr/$(get_libdir)/portage/pym"
+
+	portage_docs
+}
+
+pkg_postrm() {
+	remove_orphan_python_bytecodes "${ROOT}usr/$(get_libdir)/portage/pym"
+}
+
+compile_all_python_bytecodes() {
+	python -c "from compileall import compile_dir; compile_dir('${1}', quiet=True)"
+	python -O -c "from compileall import compile_dir; compile_dir('${1}', quiet=True)"
+}
+
+remove_orphan_python_bytecodes() {
+	[[ -d ${1} ]] || return
+	find "${1}" -name '*.py[co]' -print0 | \
+	while read -d $'\0' f ; do
+		src_py=${f%[co]}
+		[[ -f ${src_py} ]] && continue
+		rm -f "${src_py}"[co]
+	done
+}