2.1.5_rc10 bump. This fixes the KeyError reported in bug #221107,

comment #4. Also, satisfied blockers are now shown in the merge list
in any case when blocking packages will be temporarily installed
simultaneously. For Bug #220701, the ebuild no longer installs tbz2tool.
Bug #216231 tracks all bugs fixed since 2.1.4.x.

Remove the 2.1.5_rc9 ebuild.
(Portage version: 2.1.5_rc10)

2 files changed, 13 insertions, 11 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index e0a07e90dd13..86d06d16f462 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,15 @@
 # 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.514 2008/05/09 20:30:51 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.515 2008/05/10 09:15:38 zmedico Exp $
+
+*portage-2.1.5_rc10 (10 May 2008)
+
+  10 May 2008; Zac Medico <zmedico@gentoo.org> +portage-2.1.5_rc10.ebuild:
+  2.1.5_rc10 bump. This fixes the KeyError reported in bug #221107,
+  comment #4. Also, satisfied blockers are now shown in the merge list
+  in any case when blocking packages will be temporarily installed
+  simultaneously. For Bug #220701, the ebuild no longer installs tbz2tool.
+  Bug #216231 tracks all bugs fixed since 2.1.4.x.
 
 *portage-2.1.5_rc9 (09 May 2008)
 
diff --git a/sys-apps/portage/portage-2.1.5_rc9.ebuild b/sys-apps/portage/portage-2.1.5_rc10.ebuild
index 47bc10445e17..67024cf48ae9 100644
--- a/sys-apps/portage/portage-2.1.5_rc9.ebuild
+++ b/sys-apps/portage/portage-2.1.5_rc10.ebuild
@@ -1,8 +1,8 @@
 # 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.5_rc9.ebuild,v 1.1 2008/05/09 20:30:51 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.5_rc10.ebuild,v 1.1 2008/05/10 09:15:38 zmedico Exp $
 
-inherit toolchain-funcs eutils flag-o-matic multilib
+inherit eutils multilib
 
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
@@ -83,11 +83,7 @@ src_unpack() {
 }
 
 src_compile() {
-	append-lfs-flags
-
 	cd "${S}"/src
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o tbz2tool tbz2tool.c || \
-		die "Failed to build tbz2tool"
 
 	if use doc; then
 		cd "${S}"/doc
@@ -144,7 +140,6 @@ src_install() {
 	fi
 	cd "${S}"/bin
 	doexe *
-	doexe "${S}"/src/tbz2tool
 	dosym newins ${portage_base}/bin/donewins
 
 	local mydir
@@ -168,7 +163,7 @@ src_install() {
 
 	dodir /usr/bin
 	local x
-	for x in ebuild emerge portageq repoman tbz2tool xpak; do
+	for x in ebuild emerge portageq repoman xpak; do
 		dosym ../${libdir}/portage/bin/${x} /usr/bin/${x}
 	done
 
@@ -211,9 +206,7 @@ pkg_preinst() {
 	local portage_base="/usr/$(get_libdir)/portage"
 	if has livecvsportage ${FEATURES} && [ "${ROOT}" = "/" ]; then
 		rm -rf "${D}"/${portage_base}/pym/*
-		mv "${D}"/${portage_base}/bin/tbz2tool "${T}"
 		rm -rf "${D}"/${portage_base}/bin/*
-		mv "${T}"/tbz2tool "${D}"/${portage_base}/bin/
 	fi
 }