06 Oct 2009; Zac Medico <zmedico@gentoo.org> +portage-2.2_rc44.ebuild:

2.2_rc44 bump. This makes the pkgsplit function backward compatible,
to fix breakage of epkginfo with 2.2_rc43. There's also a new
--accept-properties option for emerge which allows you to use
--accept-properties=-interactive in order to temporarily exclude
interactive updates.
Package-Manager: portage-2.2_rc44/cvs/Linux i686

3 files changed, 354 insertions, 5 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 09820ef8ef08..582928a1cef6 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-apps/portage
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.634 2009/10/04 00:14:52 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.635 2009/10/06 08:13:27 zmedico Exp $
+
+*portage-2.2_rc44 (06 Oct 2009)
+
+  06 Oct 2009; Zac Medico <zmedico@gentoo.org> +portage-2.2_rc44.ebuild:
+  2.2_rc44 bump. This makes the pkgsplit function backward compatible,
+  to fix breakage of epkginfo with 2.2_rc43. There's also a new
+  --accept-properties option for emerge which allows you to use
+  --accept-properties=-interactive in order to temporarily exclude
+  interactive updates.
 
 *portage-2.2_rc43 (03 Oct 2009)
 
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index e4658a6f36b2..38892597dd1a 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -15,6 +15,7 @@ DIST portage-2.2_rc40.patch.bz2 87768 RMD160 3179da04179b8da29fe0e3b313354fc0efe
 DIST portage-2.2_rc41.patch.bz2 112276 RMD160 4004cb8a63e4e0916c226698bedbaa7f9dd5910d SHA1 470bcbc78d15c8fc723fa11ce1015557a9c3ef44 SHA256 9be5c5d332b253d65fd4126c7d65edbeab7c2fa59ba77d13fa32e5519c62f18d
 DIST portage-2.2_rc42.patch.bz2 191327 RMD160 c00dbd02b0b07007df3c3cecc760fe621e2898fb SHA1 3b5297c90f8919e046e5e0e4a7d82db8923a5551 SHA256 daa0c918ce1d113af4a257a693fab0812bf3d61efa85996eca5a9d50f6c675d4
 DIST portage-2.2_rc43.tar.bz2 527984 RMD160 3a0c69d0e008bbc50a0f66191820291477507013 SHA1 473e7941d6a29a0a6621267c1e8f55ecf4038b55 SHA256 85ecd07050baa4c86da8215c287d5ff6313a1d49dc6bc2d0d75acb2718cbcd22
+DIST portage-2.2_rc44.patch.bz2 9369 RMD160 27deb603755acf99ff5f728a4a8d1016647eaf7c SHA1 29b4b18dd7b1371bb4f2bd0c26dd3c1dc80643b5 SHA256 3c5e8e4a2586a2ff3a24ee1b74b8bf686bfb9451f79156411ef9afd263be0f57
 DIST portage-man-pl-2.1.2.tar.bz2 53893 RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c SHA1 c3151e0b330c589625830e54053fbc676b2c64de SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f
 EBUILD portage-2.1.4.5.ebuild 8038 RMD160 bbe69fdad5ee1226bccb1ccfdcf2d6cf6fb07f36 SHA1 d1177651b3af538eeda9de938ef791d584dbf197 SHA256 0277f7ee9197b4bb8747a7381f9b7ce8809b09aebcc30b7832b284a72ea4cd3c
 EBUILD portage-2.1.6.13.ebuild 10211 RMD160 8d9d95171980acf439af3f82b1b3ce4eae9348a9 SHA1 85cfe53cce8fe1a91b0373e5c4b4af61068dc918 SHA256 e82f4c2fc9b9f99a04f3da6e0da9cc8c7c969b0a3731c21303d51bf1c0448fe4
@@ -25,12 +26,13 @@ EBUILD portage-2.2_rc40.ebuild 9853 RMD160 6bfcea6a23f1055589dcada6870902b14019b
 EBUILD portage-2.2_rc41.ebuild 9853 RMD160 b59699be6e4b25104fd56105814624b4bd00403f SHA1 a31c918762acb1c9f1aad325be9e3747c0eb8307 SHA256 f41181045ad2eca98d5b70acce9885bac803a7bd5cfa48d7c62f967c10e6da5c
 EBUILD portage-2.2_rc42.ebuild 10577 RMD160 ea085da802ee8464cadf3a168377f2254835d506 SHA1 23e4c7b50482944f03dcf711515930ed6928ca0b SHA256 94e7b7ed0830c3f73d0a1eab1795b21edecc35fbda9cc6bd6d73f558225521da
 EBUILD portage-2.2_rc43.ebuild 10548 RMD160 00d3e5210a327ad44f782f77cf5a451c1c260ce2 SHA1 0c3a3767335ca5fff0de229e52f1707708fd42ab SHA256 f2b9afbef20208a8c319afb2fe8ab66634fa753171ecec4d8b1c1aeadb9f933e
-MISC ChangeLog 41408 RMD160 5fcd465f652a31f454cba4e94f11ed3ddc1b98de SHA1 22bf6b9ac0dd8b2eb7a09d9b5d4ae015db9e9423 SHA256 4ef1d2155325a14c92e82cde2b396e45491bfb149b148aff0c275ff302e5f696
+EBUILD portage-2.2_rc44.ebuild 10551 RMD160 ab9e743ea14ec64a6e2a3a9ace91bf0387082c21 SHA1 643b9f3feb365ed18114ef9564a482989c2740f5 SHA256 61fb0d3496b523e0a0435c2253c0045aa5ded0a846694f2f5ccd7ffc6e4cca2c
+MISC ChangeLog 41804 RMD160 6daf014945d706725fd28ee38014636022437d19 SHA1 50dd2902c3a7e4ef9719cc78eb4ed79f036e3976 SHA256 3fdb0e9e9e6fd27ae58c0688b0e23c2c4982feb4d3f076571c74335abb2bfe13
 MISC metadata.xml 436 RMD160 ac90cc20b6b1e04e386ee758372fa8d9261046ec SHA1 01ec015d6e3a341353400be991c61347fd1f9142 SHA256 cf021b3830c7b854696e5b46b5b802156555e2cd5618ff27826a6a2f8f57a1c0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkrH6RYACgkQ/ejvha5XGaNwWQCfU3e9Y/0jSN/9N/10dWj+sJca
-w6YAniDLhyOLv8i0/eI9K9HlAPen57zU
-=MZz1
+iEYEARECAAYFAkrK/E4ACgkQ/ejvha5XGaP/ngCg4meZelvGIRrkDNSJPCbecndf
+k0AAoLF17qW06Y1m5HSj5d1V1fO5GOem
+=NhG+
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-2.2_rc44.ebuild b/sys-apps/portage/portage-2.2_rc44.ebuild
new file mode 100644
index 000000000000..39f674547ff2
--- /dev/null
+++ b/sys-apps/portage/portage-2.2_rc44.ebuild
@@ -0,0 +1,338 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_rc44.ebuild,v 1.1 2009/10/06 08:13:28 zmedico Exp $
+
+# Require EAPI 2 since we now require at least python-2.6 (for python 3
+# syntax support) which also requires EAPI 2.
+EAPI=2
+inherit eutils multilib python
+
+DESCRIPTION="Portage is the 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 linguas_pl python3 selinux"
+
+python_dep="python3? ( =dev-lang/python-3* )
+	!python3? ( >=dev-lang/python-2.6 )"
+
+# the pysqlite blocker is for bug #282760
+DEPEND="${python_dep}
+	!build? ( >=sys-apps/sed-4.0.5 )
+	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+	epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )"
+RDEPEND="${python_dep}
+	!build? ( >=sys-apps/sed-4.0.5
+		>=app-shells/bash-3.2_p17
+		>=app-admin/eselect-1.2 )
+	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
+	elibc_glibc? ( >=sys-apps/sandbox-1.6 )
+	elibc_uclibc? ( >=sys-apps/sandbox-1.6 )
+	>=app-misc/pax-utils-0.1.17
+	selinux? ( sys-libs/libselinux )"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		userland_GNU? ( >=sys-apps/coreutils-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"
+
+prefix_src_archives() {
+	local x y
+	for x in ${@}; do
+		for y in ${SRC_ARCHIVES}; do
+			echo ${y}/${x}
+		done
+	done
+}
+
+PV_PL="2.1.2"
+PATCHVER_PL=""
+TARBALL_PV=2.2_rc43
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
+	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)
+	linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}.tar.bz2
+		$(prefix_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
+	$(prefix_src_archives ${PN}-${PATCHVER}.patch.bz2)"
+fi
+
+S="${WORKDIR}"/${PN}-${TARBALL_PV}
+S_PL="${WORKDIR}"/${PN}-${PV_PL}
+
+pkg_setup() {
+	if [[ $(python -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x2060000 and "good" or "bad")') != good ]] ; then
+		die "This version of portage requires at least python-2.6 to be selected as the default python interpreter (see \`eselect python --help\`)."
+	fi
+}
+
+src_prepare() {
+	if [ -n "${PATCHVER}" ] ; then
+		epatch "${WORKDIR}/${PN}-${PATCHVER}.patch"
+	fi
+	einfo "Setting portage.VERSION to ${PVR} ..."
+	sed -i "s/^VERSION=.*/VERSION=\"${PVR}\"/" pym/portage/__init__.py || \
+		die "Failed to patch portage.VERSION"
+
+	if use python3; then
+		sed -e '1s/\(^#!.*\)python\(.*$\)/\1python3\2/' -i $(find -perm /111 -type f) || die "Conversion of shebangs failed"
+	fi
+}
+
+src_compile() {
+	if use doc; then
+		cd "${S}"/doc
+		touch fragment/date
+		make xhtml xhtml-nochunks || die "failed to make docs"
+	fi
+
+	if use epydoc; then
+		einfo "Generating api docs"
+		mkdir "${WORKDIR}"/api
+		local my_modules epydoc_opts=""
+		# A name collision between the portage.dbapi class and the
+		# module with the same name triggers an epydoc crash unless
+		# portage.dbapi is excluded from introspection.
+		ROOT=/ has_version '>=dev-python/epydoc-3_pre0' && \
+			epydoc_opts='--exclude-introspect portage\.dbapi'
+		my_modules="$(find "${S}/pym" -name "*.py" \
+			| sed -e 's:/__init__.py$::' -e 's:\.py$::' -e "s:^${S}/pym/::" \
+			 -e 's:/:.:g' | sort)" || die "error listing modules"
+		PYTHONPATH=${S}/pym:${PYTHONPATH:+:}${PYTHONPATH} \
+			epydoc -o "${WORKDIR}"/api \
+			-qqqqq --no-frames --show-imports $epydoc_opts \
+			--name "${PN}" --url "${HOMEPAGE}" \
+			${my_modules} || die "epydoc failed"
+	fi
+}
+
+src_test() {
+	PYTHONPATH=${S}/pym:${PYTHONPATH:+:}${PYTHONPATH} \
+		./pym/portage/tests/runTests || die "test(s) failed"
+}
+
+src_install() {
+	local libdir=$(get_libdir)
+	local portage_base="/usr/${libdir}/portage"
+	local portage_share_config=/usr/share/portage/config
+
+	cd "${S}"/cnf
+	insinto /etc
+	doins etc-update.conf dispatch-conf.conf
+
+	dodir "${portage_share_config}"
+	insinto "${portage_share_config}"
+	doins "${S}/cnf/"{sets.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
+
+	dosym ..${portage_share_config}/make.globals /etc/make.globals
+
+	insinto /etc/logrotate.d
+	doins "${S}"/cnf/logrotate.d/elog-save-summary
+
+	# BSD and OSX need a sed wrapper so that find/xargs work properly
+	if use userland_GNU; then
+		rm "${S}"/bin/ebuild-helpers/sed || die "Failed to remove sed wrapper"
+	fi
+
+	local x symlinks
+	for x in $(find "$S"/bin -type d) ; do
+		x=${x#$S/}
+		dodir $portage_base/$x || die "dodir failed"
+		exeinto $portage_base/$x || die "exeinto failed"
+		cd "$S"/$x || die "cd failed"
+		doexe $(find . -mindepth 1 -maxdepth 1 -type f ! -type l) || \
+			die "doexe failed"
+		symlinks=$(find . -mindepth 1 -maxdepth 1 -type l)
+		if [ -n "$symlinks" ] ; then
+			cp -P $symlinks "$D$portage_base/$x" || die "cp failed"
+		fi
+	done
+
+	for x in $(find "$S"/pym -type d) ; do
+		x=${x#$S/}
+		dodir $portage_base/$x || die "dodir failed"
+		insinto $portage_base/$x || die "insinto failed"
+		cd "$S"/$x || die "cd failed"
+		doins *.py || die "doins failed"
+		symlinks=$(find . -mindepth 1 -maxdepth 1 -type l)
+		if [ -n "$symlinks" ] ; then
+			cp -P $symlinks "$D$portage_base/$x" || die "cp failed"
+		fi
+	done
+
+	# Symlinks to directories cause up/downgrade issues and the use of these
+	# modules outside of portage is probably negligible.
+	for x in "${D}${portage_base}/pym/"{cache,elog_modules} ; do
+		[ ! -L "${x}" ] && continue
+		die "symlink to directory will cause upgrade/downgrade issues: '${x}'"
+	done
+
+	exeinto ${portage_base}/pym/portage/tests
+	doexe  "${S}"/pym/portage/tests/runTests
+
+	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,NEWS,RELEASE-NOTES}
+	use doc && dohtml -r "${S}"/doc/*
+	use epydoc && dohtml -r "${WORKDIR}"/api
+
+	dodir /usr/bin
+	for x in ebuild egencache emerge portageq repoman ; 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
+}
+
+pkg_preinst() {
+	if ! use build && ! has_version dev-python/pycrypto && \
+		has_version '>=dev-lang/python-2.5' ; then
+		if ! built_with_use '>=dev-lang/python-2.5' ssl ; then
+			ewarn "If you are an ebuild developer and you plan to commit ebuilds"
+			ewarn "with this system then please install dev-python/pycrypto or"
+			ewarn "enable the ssl USE flag for >=dev-lang/python-2.5 in order"
+			ewarn "to enable RMD160 hash support."
+			ewarn "See bug #198398 for more information."
+		fi
+	fi
+	if [ -f "${ROOT}/etc/make.globals" ]; then
+		rm "${ROOT}/etc/make.globals"
+	fi
+
+	has_version "<${CATEGORY}/${PN}-2.2_alpha"
+	MINOR_UPGRADE=$?
+
+	has_version "<=${CATEGORY}/${PN}-2.2_pre5"
+	WORLD_MIGRATION_UPGRADE=$?
+
+	# If portage-2.1.6 is installed and the preserved_libs_registry exists,
+	# assume that the NEEDED.ELF.2 files have already been generated.
+	has_version "<=${CATEGORY}/${PN}-2.2_pre7" && \
+		! ( [ -e "$ROOT"var/lib/portage/preserved_libs_registry ] && \
+		has_version ">=${CATEGORY}/${PN}-2.1.6_rc" )
+	NEEDED_REBUILD_UPGRADE=$?
+
+	has_version "<${CATEGORY}/${PN}-2.2_alpha"
+	ADD_SYSTEM_TO_WORLD=$?
+
+	if [ $ADD_SYSTEM_TO_WORLD != 0 -a "$ROOT" != / ] && \
+		! has_version "${CATEGORY}/${PN}" ; then
+		# building stage 1
+		ADD_SYSTEM_TO_WORLD=0
+	fi
+
+	[[ -n $PORTDIR_OVERLAY ]] && has_version "<${CATEGORY}/${PN}-2.1.6.12"
+	REPO_LAYOUT_CONF_WARN=$?
+}
+
+pkg_postinst() {
+	# Compile all source files recursively. Any orphans
+	# will be identified and removed in postrm.
+	python_mod_optimize /usr/$(get_libdir)/portage/pym
+
+	if [ $ADD_SYSTEM_TO_WORLD = 0 ] && \
+		[ ! -e "$ROOT"var/lib/portage/world_sets ] ; then
+		einfo "adding @system to world_sets for backward compatibility"
+		echo @system > "$ROOT"var/lib/portage/world_sets
+	fi
+
+	if [ $WORLD_MIGRATION_UPGRADE = 0 ] ; then
+		einfo "moving set references from the worldfile into world_sets"
+		cd "${ROOT}/var/lib/portage/"
+		grep "^@" world >> world_sets
+		sed -i -e '/^@/d' world
+	fi
+
+	if [ $NEEDED_REBUILD_UPGRADE = 0 ] ; then
+		einfo "rebuilding NEEDED.ELF.2 files"
+		for cpv in "${ROOT}/var/db/pkg"/*/*; do
+			if [ -f "${cpv}/NEEDED" ]; then
+				rm -f "${cpv}/NEEDED.ELF.2"
+				while read line; do
+					filename=${line% *}
+					needed=${line#* }
+					needed=${needed//+/++}
+					needed=${needed//#/##}
+					needed=${needed//%/%%}
+					newline=$(scanelf -BF "%a;%F;%S;%r;${needed}" $filename)
+					newline=${newline//  -  }
+					echo "${newline:3}" >> "${cpv}/NEEDED.ELF.2"
+				done < "${cpv}/NEEDED"
+			fi
+		done
+	fi
+
+	if [ $REPO_LAYOUT_CONF_WARN = 0 ] ; then
+		ewarn
+		echo "If you want overlay eclasses to override eclasses from" \
+			"other repos then see the portage(5) man page" \
+			"for information about the new layout.conf and repos.conf" \
+			"configuration files." \
+			| fmt -w 75 | while read -r ; do ewarn "$REPLY" ; done
+		ewarn
+	fi
+
+	einfo
+	einfo "For help with using portage please consult the Gentoo Handbook"
+	einfo "at http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3"
+	einfo
+
+	if [ $MINOR_UPGRADE = 0 ] ; then
+		elog "If you're upgrading from a pre-2.2 version of portage you might"
+		elog "want to remerge world (emerge -e world) to take full advantage"
+		elog "of some of the new features in 2.2."
+		elog "This is not required however for portage to function properly."
+		elog
+	fi
+
+	if [ -z "${PV/*_rc*}" ]; then
+		elog "If you always want to use the latest development version of portage"
+		elog "please read http://www.gentoo.org/proj/en/portage/doc/testing.xml"
+		elog
+	fi
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/$(get_libdir)/portage/pym
+}