*portage-2.1.6.2 (20 Dec 2008)

  20 Dec 2008; Zac Medico <zmedico@gentoo.org> +portage-2.1.6.2.ebuild:
  2.1.6.2 bump. This fixes bug #251591 (repoman inherit.autotools false
  positives) and bug #251616 (performance issue in build log search regex
  makes emerge appear to hang). Bug #216231 tracks all bugs fixed since
  2.1.4.x.

*portage-2.2_rc18 (20 Dec 2008)

  20 Dec 2008; Zac Medico <zmedico@gentoo.org> +portage-2.2_rc18.ebuild:
  2.2_rc18 bump. This fixes bug #250902. This also includes all of the fixes
  that are in 2.1.6 through 2.1.6.2.

  20 Dec 2008; Zac Medico <zmedico@gentoo.org> -portage-2.1.6.ebuild,
  -portage-2.1.6.1.ebuild, -portage-2.2_rc17.ebuild:
  Remove old versions.
Package-Manager: portage-2.1.6.2/cvs/Linux 2.6.27-1216-x86-64 i686

5 files changed, 30 insertions, 261 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index c14afdb9d353..018703745b6b 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,11 +1,29 @@
 # ChangeLog for sys-apps/portage
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.560 2008/12/13 00:21:58 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.561 2008/12/20 22:27:45 zmedico Exp $
+
+*portage-2.1.6.2 (20 Dec 2008)
+
+  20 Dec 2008; Zac Medico <zmedico@gentoo.org> +portage-2.1.6.2.ebuild:
+  2.1.6.2 bump. This fixes bug #251591 (repoman inherit.autotools false
+  positives) and bug #251616 (performance issue in build log search regex
+  makes emerge appear to hang). Bug #216231 tracks all bugs fixed since
+  2.1.4.x.
+
+*portage-2.2_rc18 (20 Dec 2008)
+
+  20 Dec 2008; Zac Medico <zmedico@gentoo.org> +portage-2.2_rc18.ebuild:
+  2.2_rc18 bump. This fixes bug #250902. This also includes all of the fixes
+  that are in 2.1.6 through 2.1.6.2.
+
+  20 Dec 2008; Zac Medico <zmedico@gentoo.org> -portage-2.1.6.ebuild,
+  -portage-2.1.6.1.ebuild, -portage-2.2_rc17.ebuild:
+  Remove old versions.
 
 *portage-2.1.6.1 (12 Dec 2008)
 
   12 Dec 2008; Zac Medico <zmedico@gentoo.org> +portage-2.1.6.1.ebuild:
-  2.1.6.1 bump. This fixes bugs #250148 (emerge hangs with selinux if ebuild
+  2.1.6.1 bump. This fixes bug #250148 (emerge hangs with selinux if ebuild
   spawns a daemon), bug #250166 (trigger download when generating manifest
   if file size differs from existing entry), and bug #250212 (new repoman
   upstream.workaround category for emake -j1 warnings). Bug #216231 tracks
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 40bc75ea35c6..abd5367a96c9 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -7,24 +7,23 @@ DIST portage-2.1.1-r2.patch.bz2 5263 RMD160 6b749c6700784ea1ecc615b7b3ed39eade28
 DIST portage-2.1.1.tar.bz2 297006 RMD160 489e6c3e82527917f5308fdbff1c9add1a03f254 SHA1 6fdcb9897cef7f48d98829ab96caf37e31bd14a2 SHA256 3a5da4bb41ca8495f2673178f120622d8d923d8117b8744921418af5843c0389
 DIST portage-2.1.4.5.patch.bz2 16533 RMD160 d30009495e498452892f804926cb9e068f465f4c SHA1 471a3bc9a1dee021885aff900c52a98fa7ce6009 SHA256 9833b804a4443f9a92a4323505c5546e2b5341569b6dd2825c9269c6d6e6b615
 DIST portage-2.1.4.tar.bz2 360454 RMD160 d320cbe7de572989b319326e442f4b5f28579179 SHA1 eedc99e9de390fddadcc2df77e8f9ed67e607e2b SHA256 a10b4b9f9855bc2b340b6d9080d8d423cd3249bfad34aaf0c52b4b70f798ae11
-DIST portage-2.1.6.1.patch.bz2 12958 RMD160 667710d6f1795cf1e0e453a4ae1b919d864519f3 SHA1 10d86b4478b74b1554b782df66bda2d6491f67a6 SHA256 32527750ad67114ba34195081330d75ca5b38c2e5a8881bb293218ed4fc9cf2a
+DIST portage-2.1.6.2.patch.bz2 13890 RMD160 010e707b80180ad204bd2bcedc6df7c5d319d4fa SHA1 c5879fd4a9a455660902a9b85697e1f890e0e8be SHA256 ab459ee67b40a1b607d1c80eed049dbb697b40c582dfb95dc9c6fbfd4d4f8e0b
 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_rc17.patch.bz2 23423 RMD160 262df78c1399e26cd29b9d6d74ce9b499b5eaeeb SHA1 c29015037b076e20c291357f2b191a2ec688dc4c SHA256 f14405fa1b230fccd234c777225a72d1d929fab4fafec25fa3af6a0c90f58474
+DIST portage-2.2_rc18.patch.bz2 36145 RMD160 7c2d3910fe5e847fc95806f4cc6b90c11bb7f89a SHA1 05de90573b8f4b0bd4fa003cc07f89904e95463a SHA256 a4da01f71ddf46c1c7527be7db40a39d2f4ed3e4bdb6dc2a9917e67557d9c516
 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
 EBUILD portage-2.1.1-r2.ebuild 7071 RMD160 55ae2117db2a60ab4a63b5a21309be258082a947 SHA1 4a72145a36ca3da55c275a65de7999058411fe4f SHA256 8a26a0bde49de97906b6ec181e5ecbfe51679cc598d6b501e3f1f95ba2b6ac58
 EBUILD portage-2.1.4.5.ebuild 8040 RMD160 844d2958f6544f7411f052c4102b4ce2e0acab96 SHA1 23c376a9a0061c5c989210cb862711ef95e4dffc SHA256 8fe8dc69ec7d052d7ab557af53f1a4d8504af03e52595cf9c2a3c521dd474ad7
-EBUILD portage-2.1.6.1.ebuild 7409 RMD160 8b4b8db1185b0d1af42927b7fef3b7373c384ea6 SHA1 1669b31e9586e80db62bac650289f98472111c36 SHA256 f1a64b45c382c9c2223de44eb5fb6b7660ff1483f99e65806f065b1f7d5a03ae
-EBUILD portage-2.1.6.ebuild 7404 RMD160 73eaf80bcb21e6c2aa75e5eeb5a73b2eb4db20b6 SHA1 48d1af12f155ccefdf3abd989ae1f58e03ad5c0b SHA256 b15b5b7872892b53570b26cb7751def29cfd3061aac39dce405620e63ed41268
-EBUILD portage-2.2_rc17.ebuild 9190 RMD160 d4978cbaaf2b9288f0ebb145a26bb17ae5b721bd SHA1 3751afad6c3fbfa61a15ad425db26ce96138ab28 SHA256 42b031280c469471c5f7664c92704918b464763aed3952c3b84ddc640712570d
-MISC ChangeLog 14434 RMD160 6535c5b6747f426fa5edd5275cb44d7095b4f5ea SHA1 d199ff817f30e6c60c784b32821055b9f0c9533b SHA256 9e7c87993b90ac7b969df8c96562d2d0edbd4525c40872bc33d232c8b1f9cdec
+EBUILD portage-2.1.6.2.ebuild 7409 RMD160 33d743d2de575e1130e0bb774aa968e457fd27ec SHA1 2584e0b5021b4f6ed65ba647f07200d1c7cc48ab SHA256 45063a6b1ef669c9031b4150f8e2a0c4e346a863ff5d026b097701744762cd57
+EBUILD portage-2.2_rc18.ebuild 9190 RMD160 fdace4fc7bcf6e30f2f55d8ea948e230f0ef2c6c SHA1 19b06d4d741fbd4730ff6142be552c8f0798dce5 SHA256 c7b52550c815d002437dc31773a6d206739e3e40c98bd342fa5d5f6b10fb32f6
+MISC ChangeLog 15135 RMD160 66c5ed7ded4ff13e87f611d3b4e4710009d3336b SHA1 6de814e95cc806f5d017b08115dc0b4f4ae39a7f SHA256 ebf05117ed21ceffd834a08794f6b0d5143343e3bdc4b5db1e12f78f8fb04f0e
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAklDAC0ACgkQ/ejvha5XGaOmzQCgjEQU/8wZdaxGoeLTdpnCR4Xx
-m64AoJOUliG36nihoV4bdxfluFDgG1cc
-=C/gb
+iEYEARECAAYFAklNcXYACgkQ/ejvha5XGaO/1ACggWHNhvaavC/AFJuta8veeBZB
+vecAn21HOIjnrtDo8KQsLADPh3TNAEVD
+=czmg
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-2.1.6.1.ebuild b/sys-apps/portage/portage-2.1.6.2.ebuild
index 2a02248f0e8c..d977e95b0a36 100644
--- a/sys-apps/portage/portage-2.1.6.1.ebuild
+++ b/sys-apps/portage/portage-2.1.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.1.ebuild,v 1.1 2008/12/13 00:21:58 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.6.2.ebuild,v 1.1 2008/12/20 22:27:45 zmedico Exp $
 
 inherit eutils multilib python
 
diff --git a/sys-apps/portage/portage-2.1.6.ebuild b/sys-apps/portage/portage-2.1.6.ebuild
deleted file mode 100644
index 7062bcfdfc9f..000000000000
--- a/sys-apps/portage/portage-2.1.6.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2008 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.ebuild,v 1.1 2008/12/07 21:29:55 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=
-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/sed || die "Failed to remove sed wrapper"
-	fi
-
-	cd "${S}"/bin
-	doexe *
-	dosym newins ${portage_base}/bin/donewins
-
-	local symlinks
-	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=$?
-}
-
-pkg_postinst() {
-	# Compile all source files recursively. Any orphans
-	# will be identified and removed in postrm.
-	python_mod_optimize /usr/$(get_libdir)/portage/pym
-
-	elog
-	elog "For help with using portage please consult the Gentoo Handbook"
-	elog "at http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3"
-	elog
-
-	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
-		ewarn
-	fi
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/portage/pym
-}
diff --git a/sys-apps/portage/portage-2.2_rc17.ebuild b/sys-apps/portage/portage-2.2_rc18.ebuild
index 144642c6c02a..2a30e7f0f4c4 100644
--- a/sys-apps/portage/portage-2.2_rc17.ebuild
+++ b/sys-apps/portage/portage-2.2_rc18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_rc17.ebuild,v 1.1 2008/12/05 01:34:34 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_rc18.ebuild,v 1.1 2008/12/20 22:27:45 zmedico Exp $
 
 inherit eutils multilib python