[gentoo-commits] proj/multilib-portage:master commit in: sys-apps/portage/

["Thomas Sachau" <tommy@gentoo.org>]

commit:     16d2ce07e04e5c0cb942b283a37e1eef1dcab2c5
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 18 16:47:41 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Mar 24 16:34:29 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=16d2ce07

Sync portage ebuild

---
 sys-apps/portage/Manifest                        |    2 +-
 sys-apps/portage/portage-2.2.0_alpha91-r1.ebuild |  257 ++++++++++------------
 2 files changed, 114 insertions(+), 145 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 388a710..532161e 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha91-r1.ebuild 12684 RMD160 f7b430fc222f8c69a2e2fe434a3b0db36cb558e7 SHA1 faddf5109677c4578ff934e07b2ca93cb5640a90 SHA256 432a24e3642ede17e4f54f766e24c20161958d77125bee7943e3c94c192b5931
+EBUILD portage-2.2.0_alpha91-r1.ebuild 12430 RMD160 c297c6765a203fa341010e468f59ad904be7a463 SHA1 9fa8b94179a5ef543da817d2fed00ee0a8ccff98 SHA256 bf12e7cc2d658b0a12867669bf8c032fe5839aaef369ca75b973b3b1d47f1058
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a

diff --git a/sys-apps/portage/portage-2.2.0_alpha91-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha91-r1.ebuild
index 9973f29..04b90e2 100644
--- a/sys-apps/portage/portage-2.2.0_alpha91-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha91-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha74.ebuild,v 1.1 2011/11/11 19:06:30 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha91.ebuild,v 1.1 2012/03/18 00:16:11 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
+EAPI=3
 inherit eutils git-2 multilib python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
@@ -15,15 +15,15 @@ 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"
 SLOT="0"
-IUSE="build doc epydoc +ipc linguas_pl python2 python3 selinux"
+IUSE="build doc epydoc +ipc linguas_pl pypy1_8 python2 python3 selinux xattr"
 
 # Import of the io module in python-2.6 raises ImportError for the
 # thread module if threading is disabled.
 python_dep="python3? ( =dev-lang/python-3* )
-	!python2? ( !python3? (
-		build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) )
-		!build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] >=dev-lang/python-3 ) )
-	) )
+	!pypy1_8? ( !python2? ( !python3? (
+		|| ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] )
+	) ) )
+	pypy1_8? ( !python2? ( !python3? ( dev-python/pypy:1.8[bzip2] ) ) )
 	python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) )"
 
 # The pysqlite blocker is for bug #282760.
@@ -31,8 +31,12 @@ 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 )
-	>=sys-apps/abi-wrapper-1.0-r5"
+	>=sys-apps/abi-wrapper-1.0-r6"
 # Require sandbox-2.2 for bug #288863.
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
+# quite slow, so it's not considered in the dependencies as an alternative to
+# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
+# for now, don't pull in xattr deps for other kernels.
 RDEPEND="${python_dep}
 	!build? ( >=sys-apps/sed-4.0.5
 		>=app-shells/bash-3.2_p17
@@ -41,10 +45,11 @@ RDEPEND="${python_dep}
 	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
 	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
 	>=app-misc/pax-utils-0.1.17
+	xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) )
 	selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) )
 	!<app-shells/bash-3.2_p17
 	!<app-admin/logrotate-3.8.0
-	>=sys-apps/abi-wrapper-1.0-r5"
+	>=sys-apps/abi-wrapper-1.0-r6"
 PDEPEND="
 	!build? (
 		>=net-misc/rsync-2.6.4
@@ -54,7 +59,12 @@ PDEPEND="
 # NOTE: FEATURES=install-sources requires debugedit and rsync
 
 compatible_python_is_selected() {
-	[[ $(/usr/bin/python -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x2060000 and "good" or "bad")') = good ]]
+	[[ $("${EPREFIX}/usr/bin/python" -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x2060000 and "good" or "bad")') = good ]]
+}
+
+current_python_has_xattr() {
+	[[ $("${EPREFIX}/usr/bin/python" -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x3030000 and "yes" or "no")') = yes ]] || \
+	"${EPREFIX}/usr/bin/python" -c 'import xattr' 2>/dev/null
 }
 
 pkg_setup() {
@@ -66,7 +76,16 @@ pkg_setup() {
 		ewarn "Both python2 and python3 USE flags are enabled, but only one"
 		ewarn "can be in the shebangs. Using python3."
 	fi
-	if ! use python2 && ! use python3 && ! compatible_python_is_selected ; then
+	if use pypy1_8 && use python3 ; then
+		ewarn "Both pypy1_8 and python3 USE flags are enabled, but only one"
+		ewarn "can be in the shebangs. Using python3."
+	fi
+	if use pypy1_8 && use python2 ; then
+		ewarn "Both pypy1_8 and python2 USE flags are enabled, but only one"
+		ewarn "can be in the shebangs. Using python2"
+	fi
+	if ! use pypy1_8 && ! use python2 && ! use python3 && \
+		! compatible_python_is_selected ; then
 		ewarn "Attempting to select a compatible default python interpreter"
 		local x success=0
 		for x in /usr/bin/python2.* ; do
@@ -90,6 +109,8 @@ pkg_setup() {
 		python_set_active_version 3
 	elif use python2; then
 		python_set_active_version 2
+	elif use pypy1_8; then
+		python_set_active_version 2.7-pypy-1.8
 	fi
 }
 
@@ -116,174 +137,122 @@ src_prepare() {
 			die "failed to patch AbstractEbuildProcess.py"
 	fi
 
+	if use xattr && use kernel_linux ; then
+		einfo "Adding FEATURES=xattr to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
 	if use python3; then
 		einfo "Converting shebangs for python3..."
 		python_convert_shebangs -r 3 .
 	elif use python2; then
 		einfo "Converting shebangs for python2..."
 		python_convert_shebangs -r 2 .
+	elif use pypy1_8; then
+		einfo "Converting shebangs for pypy-c1.8..."
+		python_convert_shebangs -r 2.7-pypy-1.8 .
 	fi
-}
 
-src_compile() {
-	if use doc; then
-		cd "${S}"/doc
-		touch fragment/date
-		make xhtml xhtml-nochunks || die "failed to make docs"
-	fi
+	if [[ -n ${EPREFIX} ]] ; then
+		einfo "Setting portage.const.EPREFIX ..."
+		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
+			-i pym/portage/const.py || \
+			die "Failed to patch portage.const.EPREFIX"
+
+		einfo "Prefixing shebangs ..."
+		find . -type f -print0 | \
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
+					die "sed failed"
+			fi
+		done
 
-	if use epydoc; then
-		einfo "Generating api docs"
-		mkdir "${WORKDIR}"/api
-		local my_modules epydoc_opts=""
-		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"
-		# workaround for bug 282760
-		> "$S/pym/pysqlite2.py"
-		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"
-		rm "$S/pym/pysqlite2.py"
-	fi
-}
+		einfo "Adjusting make.globals ..."
+		sed -e 's|^SYNC=.*|SYNC="rsync://rsync.prefix.freens.org/gentoo-portage-prefix"|' \
+			-e "s|^\(PORTDIR=\)\(/usr/portage\)|\\1\"${EPREFIX}\\2\"|" \
+			-e "s|^\(PORTAGE_TMPDIR=\)\(/var/tmp\)|\\1\"${EPREFIX}\\2\"|" \
+			-i cnf/make.globals || die "sed failed"
 
-src_test() {
-	# make files executable, in case they were created by patch
-	find bin -type f | xargs chmod +x
-	./pym/portage/tests/runTests || die "test(s) failed"
-}
+		einfo "Adding FEATURES=force-prefix to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
 
-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 || die
-
-	insinto "$portage_share_config/sets"
-	doins "$S"/cnf/sets/*.conf || die
-	insinto "$portage_share_config"
-	doins "$S/cnf/make.globals" || die
+	cd "${S}/cnf" || die
 	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 || die
 	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 || die
 	fi
 
-	dosym ..${portage_share_config}/make.globals /etc/make.globals
-
-	insinto /etc/logrotate.d
-	doins "${S}"/cnf/logrotate.d/elog-save-summary || die
-
 	# 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"
+		rm -f "${S}"/bin/ebuild-helpers/sed || \
+			die "Failed to remove sed wrapper"
 	fi
+}
 
-	local x symlinks files
+src_compile() {
+	if use doc; then
+		emake docbook || die
+	fi
+
+	if use epydoc; then
+		einfo "Generating api docs"
+		emake epydoc || die
+	fi
+}
+
+src_test() {
+	# make files executable, in case they were created by patch
+	find bin -type f | xargs chmod +x
+	emake test || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		sysconfdir="${EPREFIX}/etc" \
+		prefix="${EPREFIX}/usr" \
+		libdir="${EPREFIX}/usr/$(get_libdir)" \
+		install || die
+
+	# Use dodoc for compression, since the Makefile doesn't do that.
+	dodoc "${S}"/{ChangeLog,NEWS,RELEASE-NOTES}
 
-	cd "$S" || die "cd failed"
-	for x in $(find bin -type d) ; do
-		exeinto $portage_base/$x || die "exeinto failed"
-		cd "$S"/$x || die "cd failed"
-		files=$(find . -mindepth 1 -maxdepth 1 -type f ! -type l)
-		if [ -n "$files" ] ; then
-			doexe $files || die "doexe failed"
-		fi
-		symlinks=$(find . -mindepth 1 -maxdepth 1 -type l)
-		if [ -n "$symlinks" ] ; then
-			cp -P $symlinks "$D$portage_base/$x" || die "cp failed"
-		fi
-	done
-
-	cd "$S" || die "cd failed"
-	for x in $(find pym/* -type d ! -path "pym/portage/tests*") ; do
-		insinto $portage_base/$x || die "insinto failed"
-		cd "$S"/$x || die "cd failed"
-		# __pycache__ directories contain no py files
-		[[ "*.py" != $(echo *.py) ]] || continue
-		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
-
-	# We install some minimal tests for use as a preinst sanity check.
-	# These tests must be able to run without a full source tree and
-	# without relying on a previous portage instance being installed.
-	cd "$S" || die "cd failed"
-	exeinto $portage_base/pym/portage/tests || die
-	doexe pym/portage/tests/runTests || die
-	insinto $portage_base/pym/portage/tests || die
-	doins pym/portage/tests/*.py || die
-	insinto $portage_base/pym/portage/tests/lint || die
-	doins pym/portage/tests/lint/*.py || die
-	doins pym/portage/tests/lint/__test__ || die
-
-	# 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
-
-	doman "${S}"/man/*.[0-9]
 	if use linguas_pl; then
 		doman -i18n=pl "${S_PL}"/man/pl/*.[0-9] || die
 		doman -i18n=pl_PL.UTF-8 "${S_PL}"/man/pl_PL.UTF-8/*.[0-9] || die
 	fi
-
-	dodoc "${S}"/{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 quickpkg 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
-		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 [[ $ROOT == / ]] ; then
 		# Run some minimal tests as a sanity check.
-		local test_runner=$(find "$D" -name runTests)
+		local test_runner=$(find "$ED" -name runTests)
 		if [[ -n $test_runner && -x $test_runner ]] ; then
 			einfo "Running preinst sanity tests..."
 			"$test_runner" || die "preinst sanity tests failed"
 		fi
 	fi
 
+	if use xattr && ! current_python_has_xattr ; then
+		ewarn "For optimal performance in xattr handling, install"
+		ewarn "dev-python/pyxattr, or install >=dev-lang/python-3.3 and"
+		ewarn "enable USE=python3 for $CATEGORY/$PN."
+	fi
+
 	if ! use build && ! has_version dev-python/pycrypto && \
 		! has_version '>=dev-lang/python-2.6[ssl]' ; then
 		ewarn "If you are an ebuild developer and you plan to commit ebuilds"
@@ -292,8 +261,8 @@ pkg_preinst() {
 		ewarn "to enable RMD160 hash support."
 		ewarn "See bug #198398 for more information."
 	fi
-	if [ -f "${ROOT}/etc/make.globals" ]; then
-		rm "${ROOT}/etc/make.globals"
+	if [ -f "${EROOT}/etc/make.globals" ]; then
+		rm "${EROOT}/etc/make.globals"
 	fi
 
 	has_version "<${CATEGORY}/${PN}-2.2_alpha" \
@@ -320,14 +289,14 @@ pkg_postinst() {
 
 	if $WORLD_MIGRATION_UPGRADE ; then
 		einfo "moving set references from the worldfile into world_sets"
-		cd "${ROOT}/var/lib/portage/"
+		cd "${EROOT}/var/lib/portage/"
 		grep "^@" world >> world_sets
 		sed -i -e '/^@/d' world
 	fi
 
 	if $NEEDED_REBUILD_UPGRADE ; then
 		einfo "rebuilding NEEDED.ELF.2 files"
-		for cpv in "${ROOT}/var/db/pkg"/*/*; do
+		for cpv in "${EROOT}/var/db/pkg"/*/*; do
 			if [ -f "${cpv}/NEEDED" ]; then
 				rm -f "${cpv}/NEEDED.ELF.2"
 				while read line; do
@@ -365,7 +334,7 @@ pkg_postinst() {
 	elog "to MULTILIB_ABI or to add the default MULTILIB_ABI flags"
 
 
-	if [ $MINOR_UPGRADE = 0 ] ; then
+	if $MINOR_UPGRADE ; 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."