12 Mar 2009; Zac Medico <zmedico@gentoo.org> +portage-2.2_rc25.ebuild:

2.2_rc25 bump. This fixes bug #261670 (ensure CHOST metadata reflects the
initial CHOST setting), bug #261992 (File name too long exception), bug
exception triggered by package with empty SLOT). Bug #210077 tracks all
bugs fixed in the 2.2 branch.
Package-Manager: portage-2.2_rc25/cvs/Linux i686

3 files changed, 340 insertions, 5 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 736702daebe1..cab889927550 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,16 @@
 # 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.583 2009/03/10 09:14:21 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.584 2009/03/12 09:55:05 zmedico Exp $
+
+*portage-2.2_rc25 (12 Mar 2009)
+
+  12 Mar 2009; Zac Medico <zmedico@gentoo.org> +portage-2.2_rc25.ebuild:
+  2.2_rc25 bump. This fixes bug #261670 (ensure CHOST metadata reflects the
+  initial CHOST setting), 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 #262211 (InvalidAtom
+  exception triggered by package with empty SLOT). Bug #210077 tracks all
+  bugs fixed in the 2.2 branch.
 
 *portage-2.2_rc24 (10 Mar 2009)
 
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index d1d9c7eb9bd5..e54282c72f85 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -13,6 +13,7 @@ DIST portage-2.1.6.tar.bz2 518771 RMD160 766ff4eb92497894f4c8678a9c4bc2756e4d9c6
 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
 DIST portage-2.2_rc24.patch.bz2 131732 RMD160 ecfe258987d2a9e2d6fa899115ff5ac21616dbb1 SHA1 a38ab835d44f9ea4a5ca58a3e0d1868344e6b520 SHA256 0d503d7325a1316f7e448e75173595b2aa9402130f3af179fb52161b13dca8b1
+DIST portage-2.2_rc25.patch.bz2 148070 RMD160 cef414aafd9975b3578802b8bb187ba86c7827ec SHA1 fc2e7f77a30cbd3538b6d4d5e55be6a68647b144 SHA256 6edb014eca608623ee4d90840ae6e2ad3402b2cf93b52b8b2ce48cf1f55fbb14
 DIST portage-man-pl-2.1-r1.patch.bz2 2076 RMD160 be3898714b94fb0253c1826909649ea51da205ad SHA1 6ec21b29a3eff4a034ea68b4e6a889c8f95dcc3e SHA256 28176c04290478ba4373c28ea047edbdf3a40d3ff69bf92da55d1cfcb828ea5b
 DIST portage-man-pl-2.1.2.tar.bz2 53893 RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c SHA1 c3151e0b330c589625830e54053fbc676b2c64de SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f
 DIST portage-man-pl-2.1.tar.bz2 52425 RMD160 5fdb898b94b0c6bb23234f0903572675f653ff44 SHA1 9942d024d0c29ccf1bc5d71954ed4668a2aaa424 SHA256 7e01f6c9c567f81d8e81dfdc26cf04b8d1f9f375090641cb80580986f8ac4817
@@ -22,12 +23,13 @@ EBUILD portage-2.1.6.4.ebuild 8693 RMD160 84a9ec67abf0b8f7892eb566a543d8bace7730
 EBUILD portage-2.1.6.7.ebuild 8694 RMD160 636b2f5642cbf935ebd1d771432af76c18f09cfd SHA1 f5d8e9125fe3f1983f9df611fc8fec5485e658dd SHA256 d0365f7697a6260701dd1e0d819b5ca1fed1d5fcfede25d745496777f6dc1b80
 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
-MISC ChangeLog 23190 RMD160 30845933238426774e19708a129c2362fe7d40e0 SHA1 99abaf62c32b2b970d1767eae8f9d1c7d9bd95ec SHA256 e3cbbf269978896de8fc5303058c9ea263b491a3de5a52ab9dfeee748ef289aa
+EBUILD portage-2.2_rc25.ebuild 9933 RMD160 4b441920670f556e763f8f30d1b3c0e1629da8a0 SHA1 636415b5b863fa5f71751e98692189e3882d8d26 SHA256 3f02a26dc3052449d7889bcbf69ff524406b0721485b84df3386e652734bb87e
+MISC ChangeLog 23704 RMD160 57d2ed49827ea0abfc2de058ce5de93af6ea2f44 SHA1 07cba762453cca9ad16719195799eed6cb7f4328 SHA256 47ffbce52b6a6c908f77f1cbf5f1e5fbaf69080fc3ab604eada9c9b228957844
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkm2L3sACgkQ/ejvha5XGaMZoQCggTVsH4rAQcRmv+kXp1JNmD6m
-lk4AnA3dS75BKkXlaXkT5jTZW1v/Ljom
-=JKEZ
+iEYEARECAAYFAkm43BEACgkQ/ejvha5XGaPbUQCgo57qmijXsSCN6pojh8gmPdGp
+7WMAoL1uZ+trsls6dTIDm70PJ8ULyup6
+=kbe0
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-2.2_rc25.ebuild b/sys-apps/portage/portage-2.2_rc25.ebuild
new file mode 100644
index 000000000000..65bf91709a97
--- /dev/null
+++ b/sys-apps/portage/portage-2.2_rc25.ebuild
@@ -0,0 +1,323 @@
+# 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_rc25.ebuild,v 1.1 2009/03/12 09:55:05 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.2_rc15"
+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/"{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
+
+	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_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
+}
+
+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
+
+	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/*_pre*}" ]; 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
+}