2.2_rc8 bump. This fixes a regression in rc7 which results in a KeyError

when ACCEPT_LICENSE is set (bug #234478). Bug #210077 tracks all bugs
fixed since 2.1.5.x.

Remove old 2.2_rc1 and 2.2_rc5 ebuilds.
Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-0810-x86-64 i686

4 files changed, 15 insertions, 286 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 7b06502f047a..fb0f55b1b40c 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,13 @@
 # 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.538 2008/08/10 13:17:43 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.539 2008/08/12 20:20:44 zmedico Exp $
+
+*portage-2.2_rc8 (12 Aug 2008)
+
+  12 Aug 2008; Zac Medico <zmedico@gentoo.org> +portage-2.2_rc8.ebuild:
+  2.2_rc8 bump. This fixes a regression in rc7 which results in a KeyError
+  when ACCEPT_LICENSE is set (bug #234478). Bug #210077 tracks all bugs
+  fixed since 2.1.5.x.
 
 *portage-2.2_rc7 (10 Aug 2008)
 
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 8e4ad367d230..d282dc9fabce 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -13,9 +13,9 @@ DIST portage-2.1.4.tar.bz2 360454 RMD160 d320cbe7de572989b319326e442f4b5f2857917
 DIST portage-2.1.5.6.patch.bz2 43905 RMD160 1109eeb124f787470d4a48352515ed9bcfa3a3a2 SHA1 1913b30493e6eb7be7cbd844b4e4a7358cced0c3 SHA256 6e4667a7a95173e81311d746a5cfadfd8eaa37881d268f43728eef18c4f14232
 DIST portage-2.1.5.tar.bz2 380031 RMD160 18cefc905c2a25b8c2bdfd71161d6326f7122dae SHA1 2143560f501b7ba1b284c8ee7a29f02c078a55e9 SHA256 e644bece703de9e407dda94b365f570f757e665a11243194ac2cb30d84578f69
 DIST portage-2.2_rc1.tar.bz2 581957 RMD160 c8280f5ba1ea08c609151b3699e1cc967351e4c2 SHA1 4453bd666c4b9d82cb6825c703f5de248a2a648f SHA256 cceb6662580585c42b69fd486d295c5a1441a9e0bfdff50991b3806bab276bd2
-DIST portage-2.2_rc5.patch.bz2 117347 RMD160 ecb4cbde30c9409aafb36f1b67a3229ea041ccff SHA1 3fb25ff6e4ded4be740b9ce46777700dc0b688db SHA256 0c2af255837b310a63e9914bf5e1a4689a67985fd11d6c227fd495113b9c878a
 DIST portage-2.2_rc6.patch.bz2 125210 RMD160 cfb376ef21ced19665cff43d51110dddeddf31b2 SHA1 aa3aaf5e2ba49fb834eefaf975d369cb32f5630f SHA256 61bca7389d176825426b20e7d820c8fb1b0daba65892fa91f653475fb34ce562
 DIST portage-2.2_rc7.patch.bz2 141191 RMD160 fa2a29664ad0b6e5f37f0045f496488993a00e3d SHA1 d8c8646402a96b203945d447b12d4bbbc0c592fe SHA256 3df59dbce70afd749a7e4b416f5e54244e4c958cf77d31ff93c113501f9b8edc
+DIST portage-2.2_rc8.patch.bz2 142558 RMD160 e8f45302717449c42ad4a4d30adbc0c63836aa72 SHA1 375b3d823c6a064b69e47e7f02c63b00cae5f87e SHA256 6ecad8245332c5761f90feb26d715647e28ec85636a0c95575864f23347dcf17
 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
@@ -23,16 +23,15 @@ EBUILD portage-2.0.51.22-r3.ebuild 5645 RMD160 aa9a32e18b1190c809eca4bf780d7a33a
 EBUILD portage-2.1.1-r2.ebuild 7071 RMD160 55ae2117db2a60ab4a63b5a21309be258082a947 SHA1 4a72145a36ca3da55c275a65de7999058411fe4f SHA256 8a26a0bde49de97906b6ec181e5ecbfe51679cc598d6b501e3f1f95ba2b6ac58
 EBUILD portage-2.1.4.4.ebuild 8040 RMD160 a7503dd4cc751c71b9fc01b23b34c6a544c84355 SHA1 2079cbf4ad68622c340ab6971e3e01bc73a4781a SHA256 0b00f1d93651606931d3b6e6addd9fe70183f6d7a8127146d48e093b00ff6198
 EBUILD portage-2.1.5.6.ebuild 8087 RMD160 4f60a69a380686583acb4de33c3d71abcaf9e304 SHA1 8998bc2244a040e23e6fc97dcd3135c2a46fdbb5 SHA256 c6af288fa2fa1636e41121f29a6b9cddd5ee42b00c6e4ae97ad5ecaa1cb74265
-EBUILD portage-2.2_rc1.ebuild 8216 RMD160 2860e36aaae9ddd2f8827f29f37723759302e5da SHA1 7ffe3b675af205f195d45c699f36a61baa0a29a2 SHA256 3ad7e23aeb76f159757622e595b4459eaba4683342573a98dc8420415a1450ee
-EBUILD portage-2.2_rc5.ebuild 8246 RMD160 f2e7cf960dad6f28e91befd84ac1e923244c2d0a SHA1 6d66be629790ff7c944b831a270d321ef93941bb SHA256 838d30f45fdc96add92eb609fd0a677291716a1b01a35b43beb6d94b06233863
 EBUILD portage-2.2_rc6.ebuild 8246 RMD160 713895027378858b8a1cac2ff44f726d879d83ac SHA1 851e1fc48fb5687f86fcae854dd89e81f1d9299b SHA256 339a593f48c7d780baa593c0b9088af80483befbf7055725626427ac7e5aed94
 EBUILD portage-2.2_rc7.ebuild 8246 RMD160 9547f1913f0e0dca7bb43bed246735cfd3d8366b SHA1 de0b76b9a8151dc41be514c5f87bd73d521b4967 SHA256 23cd7e060f390d75372b27fff24c28662301a920bd4e6431e4c81ff49d868010
-MISC ChangeLog 14868 RMD160 6960f87c99c1a7a04f76fe1ae5beea5caee42cca SHA1 121fdc23791f0899bf8aa29231a78ad2995688cf SHA256 acac0c77fd36b81a88784971beb1335daf89db42fc2ed7ece55abc94ca917bb9
+EBUILD portage-2.2_rc8.ebuild 8246 RMD160 d5dd69102ded0634bf0d3120089d54911c6aea8a SHA1 1703abcd6cc8ceb22247ddbf925ffcf5f646b4db SHA256 f9f60f33702661e85d6e046650012dd165c1262cd46e861093757af549d96656
+MISC ChangeLog 15143 RMD160 7c2d249ca21f775ea531dfdea989c5c97570dd4f SHA1 fa610dd76f31c54ad4fe5c624b32913a06da07b4 SHA256 7009034acd2e94e374ad3815aecfb267d32e9a2214f8f008576605f861864498
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkie6ngACgkQ/ejvha5XGaMMwwCg6gkLUt9+0UUwsams5TkOPOrQ
-v/gAoK2KAoMg9KXmXuAVGPQsbCGqL6LQ
-=vvrr
+iEYEARECAAYFAkih8J8ACgkQ/ejvha5XGaM1IQCeMAYvtQizw9RjEa6XBuyQWZHN
+WdwAoLh9IwIskweEN3dzZWV1nWZmXhtj
+=3p4K
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-2.2_rc1.ebuild b/sys-apps/portage/portage-2.2_rc1.ebuild
deleted file mode 100644
index 50ea94b16911..000000000000
--- a/sys-apps/portage/portage-2.2_rc1.ebuild
+++ /dev/null
@@ -1,277 +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.2_rc1.ebuild,v 1.3 2008/06/28 18:01:55 vapier 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* )"
-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 http://dev.gentoo.org/~genone/distfiles"
-
-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=""
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	$(prefix_src_archives ${P}.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}"/${P}
-S_PL="${WORKDIR}"/${PN}-${PV_PL}
-
-pkg_setup() {
-	MINOR_UPGRADE=$(has_version '>=sys-apps/portage-2.2_alpha' && echo true)
-	WORLD_MIGRATION_UPGRADE=$(has_version '<=sys-apps/portage-2.2_pre5' && echo true)
-	NEEDED_REBUILD_UPGRADE=$(has_version '<=sys-apps/portage-2.2_pre7' && echo true)
-}
-
-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
-		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 \
-			--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/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
-}
-
-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 [ -n "${WORLD_MIGRATION_UPGRADE}" ]; 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 [ -n "${NEEDED_REBUILD_UPGRADE}" ]; 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
-
-	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 [ -z "${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."
-		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
-}
diff --git a/sys-apps/portage/portage-2.2_rc5.ebuild b/sys-apps/portage/portage-2.2_rc8.ebuild
index 1aed5a429e97..9e540c1417ee 100644
--- a/sys-apps/portage/portage-2.2_rc5.ebuild
+++ b/sys-apps/portage/portage-2.2_rc8.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_rc5.ebuild,v 1.1 2008/07/30 10:18:57 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_rc8.ebuild,v 1.1 2008/08/12 20:20:44 zmedico Exp $
 
 inherit eutils multilib python