19 Feb 2010; Zac Medico <zmedico@gentoo.org> +portage-2.2_rc63.ebuild:

2.2_rc63 version bump. This fixes bug #268724 (make --unmerge suggest
--depclean for safety), bug #277902 (make quickpkg insert comment in
config file placeholders), bug #295197 (show newline when dispatch-conf
exits), bug #298141 (make /etc/portage/sets relative to PORTAGE_CONFIGROOT),
bug #298479 (don't export invalid USER variable), bug #302764 (fix --regen
to handle nested overlays correctly), bug #302937 (handle declare -r in
environment.bz2), bug #303211 (fix SIZE digest verification failure with
old binhost protocol), bug #303401 (don't emerge.log in fetchonly mode),
bug #303445 (fix mixed mask messages from different package.mask files),
bug #303519 (deprecation warning about internal dep_getkey usage),
bug #303567 (merge libc asap), bug #304793 (note in --newuse docs that
--selective is implied), and bug #305393 (fix dispatch-conf to handle sdiff
from diffutils-2.9).
Package-Manager: portage-2.2_rc63/cvs/Linux i686

3 files changed, 378 insertions, 5 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index e5e2a36ac6a6..887abddefc84 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for sys-apps/portage
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.674 2010/02/11 01:14:13 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.675 2010/02/20 01:50:35 zmedico Exp $
+
+*portage-2.2_rc63 (19 Feb 2010)
+
+  19 Feb 2010; Zac Medico <zmedico@gentoo.org> +portage-2.2_rc63.ebuild:
+  2.2_rc63 version bump. This fixes bug #268724 (make --unmerge suggest
+  --depclean for safety), bug #277902 (make quickpkg insert comment in
+  config file placeholders), bug #295197 (show newline when dispatch-conf
+  exits), bug #298141 (make /etc/portage/sets relative to PORTAGE_CONFIGROOT),
+  bug #298479 (don't export invalid USER variable), bug #302764 (fix --regen
+  to handle nested overlays correctly), bug #302937 (handle declare -r in
+  environment.bz2), bug #303211 (fix SIZE digest verification failure with
+  old binhost protocol), bug #303401 (don't emerge.log in fetchonly mode),
+  bug #303445 (fix mixed mask messages from different package.mask files),
+  bug #303519 (deprecation warning about internal dep_getkey usage),
+  bug #303567 (merge libc asap), bug #304793 (note in --newuse docs that
+  --selective is implied), and bug #305393 (fix dispatch-conf to handle sdiff
+  from diffutils-2.9).
 
   11 Feb 2010; Zac Medico <zmedico@gentoo.org> portage-2.1.7.16.ebuild,
   portage-2.1.7.17.ebuild, portage-2.2_rc62.ebuild:
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index d45b077c9733..6b1ea6f92884 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -10,18 +10,20 @@ DIST portage-2.1.7.17.patch.bz2 86084 RMD160 86a4d457e8c0e0bfd9059e501d1952324ac
 DIST portage-2.1.7.tar.bz2 503459 RMD160 245d2b3d778b235e3814ea551a6115e8075d1da5 SHA1 db5b96dfd147954909331f58e24620c41df117e3 SHA256 62f7af85db0090afd424cb398d4b6b434ff1751c77e524dc8a1480e796f28599
 DIST portage-2.2_rc43.tar.bz2 527984 RMD160 3a0c69d0e008bbc50a0f66191820291477507013 SHA1 473e7941d6a29a0a6621267c1e8f55ecf4038b55 SHA256 85ecd07050baa4c86da8215c287d5ff6313a1d49dc6bc2d0d75acb2718cbcd22
 DIST portage-2.2_rc62.patch.bz2 104266 RMD160 85f117fe7dc58cca4b1497b88cb8e755b9d7680b SHA1 a50dcff807b66dca335ce0ae20dfaa69042ec259 SHA256 6aa7f8c412da1a6076060c6796331d454cb783943fcb3ccfbb72c2d40772d762
+DIST portage-2.2_rc63.patch.bz2 126681 RMD160 f64eb2484047f919ab58b4559f675258c9063170 SHA1 71b54aac7e5b46ca5307aab4e5e4e781aa225bee SHA256 8202353648ed018f5ade82544a5d6737cc05154b9870e347c7883e1077847cf3
 DIST portage-man-pl-2.1.2.tar.bz2 53893 RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c SHA1 c3151e0b330c589625830e54053fbc676b2c64de SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f
 EBUILD portage-2.1.6.13.ebuild 9775 RMD160 f25b88d518c4d1726761fe5b71a1a182dbba6837 SHA1 dbef2f6be78a1777215bc679fa0664b5fb244faa SHA256 cc6b6505057461b710ced2cd1abbfea3c409a66dd4d79be4f5226b379f471852
 EBUILD portage-2.1.6.7.ebuild 8427 RMD160 db2928d51c776268181db06c7304b1b10b868a6e SHA1 c9772b4f94224e92fec911e34058ae618cad7616 SHA256 e0713654ab4527ec0e023571ee831f53bf5763466022ae409e5e9358c4e3259d
 EBUILD portage-2.1.7.16.ebuild 9981 RMD160 9bb8dadb116947375c2a61a3bff8b4188e689cd1 SHA1 deb49f5afd5b277ff2740e2c61841240e6894503 SHA256 8d75cbc078820e49f43c5e00fec82d0afef92f28577cda62481e8f5aa5b0f76d
 EBUILD portage-2.1.7.17.ebuild 10050 RMD160 649e8b563807c97c627edcbac98a7e738f41e78c SHA1 b974dc7f8f75b1d37d0fa5f4ccd80da8df6e8c69 SHA256 b858fd1a93980fa4db30f1701b1fbe81f78f20ee143fa8366ab844da93459eb7
 EBUILD portage-2.2_rc62.ebuild 10963 RMD160 39c96d28bb0ec97329a55ae71c9d49b2c2f5c71f SHA1 0f1b69f184f281b119cdda863de7cc255cd5ea5e SHA256 add0181823d2ced4a75859152378c471f46955c3e2c4de6f60b02049e8903d53
-MISC ChangeLog 57188 RMD160 8214fed909991212eb0124ad068a8ae30acb80a0 SHA1 c709f67210b22739e41bfa707ed1dca72cd0f835 SHA256 a6d548937473afc06b44fd989631190d1408ccc0e844b43cca03b7a60ced1a56
+EBUILD portage-2.2_rc63.ebuild 10963 RMD160 4246a1ffb55e02044d7eab94011b676efe5aec27 SHA1 6bc76af45fac3ac2675dca19851cfe5afebb2d80 SHA256 ddc73b396488c1debe0bbe95529d5f898936f87ece7842ae0f71e889ff4a1241
+MISC ChangeLog 58210 RMD160 543a0bc7fb7f2222d9c28ef955c9e09ec5ce0809 SHA1 8d06f08bba25db1fc53f497bfcf9f4db785aa615 SHA256 e682de4703b173f5eb9dc3d46ad46f0230e8b0a731b59a37bafe8c2f0001c43d
 MISC metadata.xml 436 RMD160 ac90cc20b6b1e04e386ee758372fa8d9261046ec SHA1 01ec015d6e3a341353400be991c61347fd1f9142 SHA256 cf021b3830c7b854696e5b46b5b802156555e2cd5618ff27826a6a2f8f57a1c0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktzWjkACgkQ/ejvha5XGaO9IACghSn64wMX9N6hfFY9VqyD71fO
-mbMAoKCeN+NdImYY3YNuy5atA5mRQ0JL
-=K+9M
+iEYEARECAAYFAkt/QEsACgkQ/ejvha5XGaO0bgCgh4w32bbSTcieJv81DCXiIi0I
+9LQAoMrsOCYjtKXVxBX3HRTusMGiDEjR
+=UA7N
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-2.2_rc63.ebuild b/sys-apps/portage/portage-2.2_rc63.ebuild
new file mode 100644
index 000000000000..902a4acd0801
--- /dev/null
+++ b/sys-apps/portage/portage-2.2_rc63.ebuild
@@ -0,0 +1,354 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_rc63.ebuild,v 1.1 2010/02/20 01:50:35 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.8 dev-lang/python:2.7 dev-lang/python:2.6 >=dev-lang/python-3 ) )"
+
+# 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 )"
+# Require sandbox-2.2 for bug #288863.
+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-2.2 )
+	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+	>=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}
+
+compatible_python_is_selected() {
+	[[ $(/usr/bin/python -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x2060000 and "good" or "bad")') = good ]]
+}
+
+pkg_setup() {
+	if ! 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
+			x=${x#/usr/bin/python2.}
+			if [[ $x -ge 6 ]] 2>/dev/null ; then
+				eselect python set python2.$x
+				if compatible_python_is_selected ; then
+					elog "Default python interpreter is now set to python-2.$x"
+					success=1
+					break
+				fi
+			fi
+		done
+		if [ $success != 1 ] ; then
+			eerror "Unable to select a compatible default python interpreter!"
+			die "This version of portage requires at least python-2.6 to be selected as the default python interpreter (see \`eselect python --help\`)."
+		fi
+	fi
+
+	if use python3; then
+		python_set_active_version 3
+	fi
+}
+
+src_prepare() {
+	if [ -n "${PATCHVER}" ] ; then
+		if [[ -L $S/bin/ebuild-helpers/portageq ]] ; then
+			rm "$S/bin/ebuild-helpers/portageq" \
+				|| die "failed to remove portageq helper symlink"
+		fi
+		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
+		python_convert_shebangs -r 3 .
+	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 || die
+
+	insinto "${portage_share_config}"
+	doins "${S}/cnf/"{sets.conf,make.globals} || 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"
+	fi
+
+	local x symlinks
+
+	# current tarball contains outdated stuff
+	rm -rf "$S"/bin/ebuild-helpers/3
+	for x in dohard dosed ; do
+		dosym ../../banned-helper ${portage_base}/bin/ebuild-helpers/4/$x
+	done
+
+	for x in $(find "$S"/bin -type d) ; do
+		x=${x#$S/}
+		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/}
+		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.6[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.6 in order"
+		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"
+	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=$?
+
+	[[ -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 [ $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
+}