13 Mar 2009; Zac Medico <zmedico@gentoo.org> +portage-2.1.6.8.ebuild:

2.1.6.8 bump. This fixes bug #199408 (account for current config with
emerge --resume), bug #250020 (improve merge order), bug #253904 (avoid
slot conflicts), bug #256289 (show normal mask message for use deps when
version with required IUSE is masked), bug #256616 (don't do anything
else when system packages are merging), bug #258433 (warn about
incorrectly defined FETCHCOMMAND for EAPI 2), bug #259124 (apply --color
to fetch output), bug #259882 (disable dispatch-conf confmem-like
behavior), bug #259954 (be careful about system deps with unsatisfied
PDEPEND), bug #260331 (reject set*id binaries that have DT_RPATH:$ORIGIN),
bug #261082 (fetch changed packages with --getbinpkg), bug #261670 (ensure
CHOST metadata reflects the initial CHOST setting), bug #261675 (avoid
interference between FEATURES=digest and concurrent tasks), and bug
unexpected exception), bug #261992 (File name too long exception), bug
bugs fixed since 2.1.6.7.
Package-Manager: portage-2.1.6.8/cvs/Linux i686

3 files changed, 322 insertions, 5 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index cab889927550..fb4b1fa6c096 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,27 @@
 # 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.584 2009/03/12 09:55:05 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.585 2009/03/13 20:30:06 zmedico Exp $
+
+*portage-2.1.6.8 (13 Mar 2009)
+
+  13 Mar 2009; Zac Medico <zmedico@gentoo.org> +portage-2.1.6.8.ebuild:
+  2.1.6.8 bump. This fixes bug #199408 (account for current config with
+  emerge --resume), bug #250020 (improve merge order), bug #253904 (avoid
+  slot conflicts), bug #256289 (show normal mask message for use deps when
+  version with required IUSE is masked), bug #256616 (don't do anything
+  else when system packages are merging), bug #258433 (warn about
+  incorrectly defined FETCHCOMMAND for EAPI 2), bug #259124 (apply --color
+  to fetch output), bug #259882 (disable dispatch-conf confmem-like
+  behavior), bug #259954 (be careful about system deps with unsatisfied
+  PDEPEND), bug #260331 (reject set*id binaries that have DT_RPATH:$ORIGIN),
+  bug #261082 (fetch changed packages with --getbinpkg), bug #261670 (ensure
+  CHOST metadata reflects the initial CHOST setting), bug #261675 (avoid
+  interference between FEATURES=digest and concurrent tasks), and bug
+  #261852 (show mod_echo elog output before showing a traceback from an
+  unexpected exception), bug #261992 (File name too long exception), bug
+  #262012 (invalid message about --newuse triggered by slot conflict), bug
+  #262096 (add elog binaries for sandbox to call). Bug #261959 tracks all
+  bugs fixed since 2.1.6.7.
 
 *portage-2.2_rc25 (12 Mar 2009)
 
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index e54282c72f85..34cf86cba94a 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -9,6 +9,7 @@ DIST portage-2.1.4.5.patch.bz2 16533 RMD160 d30009495e498452892f804926cb9e068f46
 DIST portage-2.1.4.tar.bz2 360454 RMD160 d320cbe7de572989b319326e442f4b5f28579179 SHA1 eedc99e9de390fddadcc2df77e8f9ed67e607e2b SHA256 a10b4b9f9855bc2b340b6d9080d8d423cd3249bfad34aaf0c52b4b70f798ae11
 DIST portage-2.1.6.4.patch.bz2 26289 RMD160 2ce9fcfae8caa8ff7c2b789e6dcdd57862392646 SHA1 2d2a3b8dee8f85305158514b64e3a99d5e9eaa90 SHA256 88345d2334e63c16d35de13f0cb806c23a6f37868f448adde592bbe494b36827
 DIST portage-2.1.6.7.patch.bz2 50118 RMD160 cc0a322570829c8dec9aa4886deb5741f0efb489 SHA1 02021be38b0f829d45b342483834652a1985a952 SHA256 5f0605b51a24d23703330b040d2f7154322284db3e0cefa7499002ff1fa733c0
+DIST portage-2.1.6.8.patch.bz2 128247 RMD160 9e48ae4c17de8e88ab98f0ff2a3acc3b97e4c422 SHA1 78af474a8d97dd327be68214ff7b3ba81f2bc557 SHA256 9f500e339563f1706416353e9a6966e47ee8ed669787785ce0cd8b91a5591cd1
 DIST portage-2.1.6.tar.bz2 518771 RMD160 766ff4eb92497894f4c8678a9c4bc2756e4d9c63 SHA1 a28b191904296b551b22a7af83dacd1c336340a5 SHA256 b1c507445b3858449c861568f477e1cfab8b2326ded906b852c5193fb3839647
 DIST portage-2.2_rc15.tar.bz2 685597 RMD160 ad814885c5c6b31899fd4cd7d5866d19132bbd9b SHA1 3b562f0a4157f2cc1cf492f46560e2600ec0681f SHA256 fc381120f77338d33d2e53eb2892eebae0b772233d05cf8a2443700d3d6754f6
 DIST portage-2.2_rc23.patch.bz2 69470 RMD160 1050d5e8cb9955e66a88216e12d6f34497bec54a SHA1 2b23bada2e7ccec31b9f87cf7cc9f436fe3ce9fe SHA256 63435fe9701b688d8816712dbade479e764966c51fe720a6f599069707b39541
@@ -21,15 +22,16 @@ EBUILD portage-2.1.1-r2.ebuild 7069 RMD160 6516c3412ffc3dfcbb06146c0ca303008bef3
 EBUILD portage-2.1.4.5.ebuild 8038 RMD160 bbe69fdad5ee1226bccb1ccfdcf2d6cf6fb07f36 SHA1 d1177651b3af538eeda9de938ef791d584dbf197 SHA256 0277f7ee9197b4bb8747a7381f9b7ce8809b09aebcc30b7832b284a72ea4cd3c
 EBUILD portage-2.1.6.4.ebuild 8693 RMD160 84a9ec67abf0b8f7892eb566a543d8bace773085 SHA1 5056f1e98fa82035c5bf47f65a3b88984fcce019 SHA256 96a8b60694a41fe1f3bd462cdc1a16d2d8155c56155b32aa2ce6b57646b00b01
 EBUILD portage-2.1.6.7.ebuild 8694 RMD160 636b2f5642cbf935ebd1d771432af76c18f09cfd SHA1 f5d8e9125fe3f1983f9df611fc8fec5485e658dd SHA256 d0365f7697a6260701dd1e0d819b5ca1fed1d5fcfede25d745496777f6dc1b80
+EBUILD portage-2.1.6.8.ebuild 9443 RMD160 b4fa7af10b500d04276ae4fe2f8a8f13116617b9 SHA1 8143488a5ee199a96ddabbc313254fc3b24dcb1f SHA256 b1eb799c1c00b6bdeaa90b1532d810e658b0f19b89af34bbb81ffa39bab2ba34
 EBUILD portage-2.2_rc23.ebuild 9194 RMD160 4a737ef1c001cd9c1daae64f2d19cbafe0a61a81 SHA1 49c14aee2613ac0a6b5406650bb39194ffd1be44 SHA256 01332c20979c8a26143d3a9d413327b30dad4826e967582a14207ac7fae8ff23
 EBUILD portage-2.2_rc24.ebuild 9194 RMD160 dc3ae780f0b7360b5dd7f0167a98cbebd94532b9 SHA1 6d1b31f2e967dcd8842b4958067738a2ac992db6 SHA256 ba0519dc194984c180efc0a6b2cf384e7547b8cf3ceeaaa84042275a82c17955
 EBUILD portage-2.2_rc25.ebuild 9933 RMD160 4b441920670f556e763f8f30d1b3c0e1629da8a0 SHA1 636415b5b863fa5f71751e98692189e3882d8d26 SHA256 3f02a26dc3052449d7889bcbf69ff524406b0721485b84df3386e652734bb87e
-MISC ChangeLog 23704 RMD160 57d2ed49827ea0abfc2de058ce5de93af6ea2f44 SHA1 07cba762453cca9ad16719195799eed6cb7f4328 SHA256 47ffbce52b6a6c908f77f1cbf5f1e5fbaf69080fc3ab604eada9c9b228957844
+MISC ChangeLog 25002 RMD160 0fbeeb0ba9f41686adee969229929a86a59436c4 SHA1 daf959a8cfdb97f82bf123a4eac69daa95d9d49c SHA256 c9555568f88cd07efe2e25ada558abc866b31887965f6d48b35665554fa36801
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkm43BEACgkQ/ejvha5XGaPbUQCgo57qmijXsSCN6pojh8gmPdGp
-7WMAoL1uZ+trsls6dTIDm70PJ8ULyup6
-=kbe0
+iEYEARECAAYFAkm6wmwACgkQ/ejvha5XGaNiLACeJ7bhJ6r+Jvk8wzJ8E8dQcne3
+SkwAnR4wdQKOx0G7wtcVR7umgqlfNE3x
+=x10j
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-2.1.6.8.ebuild b/sys-apps/portage/portage-2.1.6.8.ebuild
new file mode 100644
index 000000000000..2c68ed19a73a
--- /dev/null
+++ b/sys-apps/portage/portage-2.1.6.8.ebuild
@@ -0,0 +1,294 @@
+# 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.1.6.8.ebuild,v 1.1 2009/03/13 20:30:06 zmedico Exp $
+
+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.4"
+
+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 )"
+RDEPEND="${python_dep}
+	!build? ( >=sys-apps/sed-4.0.5
+		>=app-shells/bash-3.2_p17
+		>=app-admin/eselect-news-20071201 )
+	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
+	elibc_glibc? ( >=sys-apps/sandbox-1.2.17 !mips? ( >=sys-apps/sandbox-1.2.18.1-r2 ) )
+	elibc_uclibc? ( >=sys-apps/sandbox-1.2.17 !mips? ( >=sys-apps/sandbox-1.2.18.1-r2 ) )
+	>=app-misc/pax-utils-0.1.17
+	selinux? ( >=dev-python/python-selinux-2.16 )"
+PDEPEND="
+	!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"
+
+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.1.6
+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}
+
+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/__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/"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
+
+	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/ebuild-helpers/sed || die "Failed to remove sed wrapper"
+	fi
+
+	cd "${S}"/bin || die "cd failed"
+	doexe $(find . -maxdepth 1 -type f) || die "doexe failed"
+
+	local symlinks
+	dodir ${portage_base}/bin/ebuild-helpers || die "dodir failed"
+	exeinto ${portage_base}/bin/ebuild-helpers || die "exeinto failed"
+	cd "${S}"/bin/ebuild-helpers || die "cd failed"
+	doexe $(find . -type f ! -type l) || die "doexe failed"
+	symlinks=$(find . -type l)
+	if [ -n "$symlinks" ] ; then
+		cp -P $symlinks "${D}${portage_base}/bin/ebuild-helpers/" || \
+			die "cp failed"
+	fi
+
+	# These symlinks will be included in the next tarball.
+	# Until then, create them manually.
+	dosym ../portageq ${portage_base}/bin/ebuild-helpers/portageq || \
+		die "dosym failed"
+	local x
+	for x in eerror einfo ewarn eqawarn ; do
+		dosym elog ${portage_base}/bin/ebuild-helpers/$x || die "dosym failed"
+	done
+
+	for mydir in $(find "${S}"/pym -type d | sed -e "s:^${S}/::") ; do
+		dodir ${portage_base}/${mydir}
+		insinto ${portage_base}/${mydir}
+		cd "${S}"/${mydir}
+		doins *.py
+		symlinks=$(find . -mindepth 1 -maxdepth 1 -type l)
+		[ -n "${symlinks}" ] && cp -P ${symlinks} "${D}${portage_base}/${mydir}"
+	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 emerge portageq repoman 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
+}
+
+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_pre"
+	DOWNGRADE_FROM_2_2=$?
+	has_version "<${CATEGORY}/${PN}-2.1.6_pre"
+	UPGRADE_FROM_2_1=$?
+}
+
+pkg_postinst() {
+	# Compile all source files recursively. Any orphans
+	# will be identified and removed in postrm.
+	python_mod_optimize /usr/$(get_libdir)/portage/pym
+
+	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
+
+	local warning_shown=0
+	if [ $DOWNGRADE_FROM_2_2 = 0 ] ; then
+		ewarn
+		echo "Since you have downgraded from portage-2.2, do not forget to" \
+		"use revdep-rebuild when appropriate, since the @preserved-rebuild" \
+		"package set is only supported with portage-2.2." | fmt -w 70 | \
+		while read ; do ewarn "$REPLY" ; done
+		warning_shown=1
+	fi
+	if [ $UPGRADE_FROM_2_1 = 0 ] ; then
+		ewarn
+		echo "In portage-2.1.6, the default behavior has changed for" \
+		"\`emerge world\` and \`emerge system\` commands. These commands" \
+		"will reinstall all packages from the given set unless an option" \
+		"such as --noreplace, --update, or --newuse is specified." \
+		| fmt -w 70 | while read ; do ewarn "$REPLY" ; done
+		ewarn
+		echo "File collision protection is now enabled by default via" \
+		"make.globals with FEATURES=protect-owned. If you want to" \
+		"disable collision protection completely (not recommended), then" \
+		"you need to ensure that neither protect-owned nor collision-protect" \
+		"are enabled." | fmt -w 70 | while read ; do ewarn "$REPLY" ; done
+		ewarn
+		echo "If you have overridden FETCHCOMMAND or RESUMECOMMAND variables," \
+		"for compatibility with EAPI 2, you must ensure that these variables" \
+		"are written such that the downloaded file will be placed at" \
+		"\"\${DISTDIR}/\${FILE}\". Refer to make.conf(5) for" \
+		"information about FETCHCOMMAND and RESUMECOMMAND." | \
+		fmt -w 70 | while read ; do ewarn "$REPLY" ; done
+		warning_shown=1
+	fi
+	if [ $warning_shown = 1 ] ; then
+		ewarn # for symmetry
+	fi
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/$(get_libdir)/portage/pym
+}