26 Sep 2009; Zac Medico <zmedico@gentoo.org> +portage-2.2_rc42.ebuild:

2.2_rc42 bump. This fixes bug #285637 (NameError exception triggered by
invalid atom in config), bug #285767 (version range detection in package
deps), and bug #286118 (TypeError exception during global updates). This
release requires at least python-2.6 to be selected as the default
interpreter (see `eselect python --help`). Now python-3 is supported, but
at this time, many packages which use python will certainly fail to build
and/or run if python-3 is selected as the default interpreter.
Package-Manager: portage-2.2_rc42/cvs/Linux i686

3 files changed, 351 insertions, 5 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index c7e158b1af60..2d9d9a521c18 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,17 @@
 # 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.629 2009/09/20 00:17:30 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.630 2009/09/26 03:44:50 zmedico Exp $
+
+*portage-2.2_rc42 (26 Sep 2009)
+
+  26 Sep 2009; Zac Medico <zmedico@gentoo.org> +portage-2.2_rc42.ebuild:
+  2.2_rc42 bump. This fixes bug #285637 (NameError exception triggered by
+  invalid atom in config), bug #285767 (version range detection in package
+  deps), and bug #286118 (TypeError exception during global updates). This
+  release requires at least python-2.6 to be selected as the default
+  interpreter (see `eselect python --help`). Now python-3 is supported, but
+  at this time, many packages which use python will certainly fail to build
+  and/or run if python-3 is selected as the default interpreter.
 
 *portage-2.2_rc41 (19 Sep 2009)
 
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index ff33385f6aa0..73fb33f077ab 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -13,6 +13,7 @@ DIST portage-2.2_rc35.tar.bz2 516372 RMD160 0d82eccd9c00be3ad3f790b2ecb026f35909
 DIST portage-2.2_rc39.patch.bz2 84628 RMD160 9d1caa479c861923e7376ec67b5cbfc4cb1f9baf SHA1 d65834c6819d3ff19a4108b3e433dd70295b68a1 SHA256 5e67d0c0e0dc1779cf20bdd5dc62bfe8ab4fa35d45935fcee9ec6ad75c22c094
 DIST portage-2.2_rc40.patch.bz2 87768 RMD160 3179da04179b8da29fe0e3b313354fc0efeb2720 SHA1 f3a79f5e0bacc8148f3baa02ce3978d9920f58e7 SHA256 e9bf12c39fef3e8e1d91794ea93b81f625e0e33a0f70f79238d9de6b32e8c8bf
 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-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
@@ -21,12 +22,13 @@ EBUILD portage-2.2_rc33.ebuild 10619 RMD160 6eb7b8deba593bdc3fdd12ac10036433a6a4
 EBUILD portage-2.2_rc39.ebuild 9898 RMD160 42a85be13fdcbf9c6fdcc8622b0ea3403ad9e59f SHA1 b8b0706ff5496054fbff377160afdea355860051 SHA256 d7291f542e17fbe04d3094d45ae621731aaac2e3fe4fe056a449bdc27a13a105
 EBUILD portage-2.2_rc40.ebuild 9898 RMD160 a35a96957c431435e56a9dc3f64f9d82d3a7d82b SHA1 f73cf47bf7e25b137934c86a43ba94bf68f7d972 SHA256 895f923614c2181468d4f398bca680599f99777c5dfeefc31e9001b55397c413
 EBUILD portage-2.2_rc41.ebuild 9898 RMD160 4b28731f6d0d9cc412b2d8e5cda44e62df2db370 SHA1 2908c094ef63463354a033b36887f2a59362aaf5 SHA256 fa8767e70a06c3a4d7081b6a8a2bfa4a3b8de3461027197029400b73076a990f
-MISC ChangeLog 39754 RMD160 80d088c9099643cf16d18144315bf57092d24076 SHA1 1a4912de685eff77994038ccbe481e6efe75e4ee SHA256 c48da8a100dc79804e53f41a4a70932e995052992cdc3b6e3e4609fc52432f02
+EBUILD portage-2.2_rc42.ebuild 10322 RMD160 6830137738e0cd413be2f015aaba0240102e9aeb SHA1 f8e56533aa65e07fa3b45497d4ec443a5765c132 SHA256 7d5eff0d502075b1d2f0e387b0f3136dc8a466ba92c16572a27531646f6f63cd
+MISC ChangeLog 40371 RMD160 518985a1116720d8c9382c97d0e7fcc439f4b1c8 SHA1 50f7a40d1808ad3d70ea5cfb97ea3a985418a6e0 SHA256 cf7a5519fe0cc6d97cccc4c867250ff49ff2de7e785740ab7928992768ceb165
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkq1dJMACgkQ/ejvha5XGaNt5gCgx27bM1smNKhc2+HlldpXSyJr
-s3EAoOjd5zlzR+ebkuXMsJdedfoQZ/Ke
-=0oSA
+iEYEARECAAYFAkq9jjkACgkQ/ejvha5XGaPgCgCdEFhqgMxmV3GkrLPVFR45gl9G
+ciIAn0m67dfIlV3U7UN3mqamX4hVMWrn
+=suat
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-2.2_rc42.ebuild b/sys-apps/portage/portage-2.2_rc42.ebuild
new file mode 100644
index 000000000000..f292b0494106
--- /dev/null
+++ b/sys-apps/portage/portage-2.2_rc42.ebuild
@@ -0,0 +1,333 @@
+# 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_rc42.ebuild,v 1.1 2009/09/26 03:44:50 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 selinux linguas_pl"
+
+python_dep=">=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.1 >=app-admin/eselect-news-20071201 ) )
+	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_rc35
+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"
+}
+
+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}" epydoc -o "${WORKDIR}"/api \
+			-qqqqq --no-frames --show-imports $epydoc_opts \
+			--name "${PN}" --url "${HOMEPAGE}" \
+			${my_modules} || die "epydoc failed"
+	fi
+}
+
+src_test() {
+	./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
+}