5 files changed, 10 insertions, 53 deletions
diff --git a/app-arch/pbzip2/ChangeLog b/app-arch/pbzip2/ChangeLog
index 08349538b39c..e28dabb4231b 100644
--- a/app-arch/pbzip2/ChangeLog
+++ b/app-arch/pbzip2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-arch/pbzip2
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/ChangeLog,v 1.11 2006/01/04 15:13:59 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/ChangeLog,v 1.12 2006/03/20 18:40:39 wolf31o2 Exp $
+
+  20 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org> pbzip2-0.8.ebuild,
+  -pbzip2-0.9.4.ebuild, pbzip2-0.9.5.ebuild:
+  Marked stable on x86 wrt bug #126984 and cleaning up older ebuilds.
 
 *pbzip2-0.9.5 (04 Jan 2006)
 
diff --git a/app-arch/pbzip2/files/digest-pbzip2-0.9.4 b/app-arch/pbzip2/files/digest-pbzip2-0.9.4
deleted file mode 100644
index e4434a104d7d..000000000000
--- a/app-arch/pbzip2/files/digest-pbzip2-0.9.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ba5e06d89ac3fded55d30d33cdfeb872 pbzip2-0.9.4.tar.gz 18765
diff --git a/app-arch/pbzip2/pbzip2-0.8.ebuild b/app-arch/pbzip2/pbzip2-0.8.ebuild
index 8db14c867b65..6b266799ad73 100644
--- a/app-arch/pbzip2/pbzip2-0.8.ebuild
+++ b/app-arch/pbzip2/pbzip2-0.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/pbzip2-0.8.ebuild,v 1.4 2005/05/16 12:44:41 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/pbzip2-0.8.ebuild,v 1.5 2006/03/20 18:40:39 wolf31o2 Exp $
 
 DESCRIPTION="A parallel version of BZIP2"
 HOMEPAGE="http://compression.ca/pbzip2/"
@@ -8,7 +8,7 @@ SRC_URI="http://compression.ca/${PN}/${P}.tar.gz"
 
 LICENSE="PBZIP2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64 s390"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
 IUSE="static"
 
 DEPEND="virtual/libc
diff --git a/app-arch/pbzip2/pbzip2-0.9.4.ebuild b/app-arch/pbzip2/pbzip2-0.9.4.ebuild
deleted file mode 100644
index 18c5b32447ad..000000000000
--- a/app-arch/pbzip2/pbzip2-0.9.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/pbzip2-0.9.4.ebuild,v 1.3 2006/01/04 15:10:39 wolf31o2 Exp $
-
-inherit eutils
-
-DESCRIPTION="A parallel version of BZIP2"
-HOMEPAGE="http://compression.ca/pbzip2/"
-SRC_URI="http://compression.ca/${PN}/${P}.tar.gz"
-
-LICENSE="PBZIP2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sparc ~x86"
-IUSE="static"
-
-DEPEND="virtual/libc
-	app-arch/bzip2"
-
-pkg_setup() {
-	if use static
-	then
-		built_with_use app-arch/bzip2 static || \
-			die "You must compile bzip2 with USE=static"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	sed -i -e 's:-O3:${CFLAGS}:g' ${P}/Makefile || die
-}
-
-src_compile() {
-	if use static
-	then
-		cp -f /usr/$(get_libdir)/libbz2.a ${S}
-		emake pbzip2-static || die "Failed to build"
-	else
-		emake pbzip2 || die "Failed to build"
-	fi
-}
-
-src_install() {
-	dobin pbzip2 || die "Failed to install"
-	dodoc AUTHORS ChangeLog README || Die "Failed to install docs"
-	doman pbzip2.1 || die "Failed to install man page"
-}
diff --git a/app-arch/pbzip2/pbzip2-0.9.5.ebuild b/app-arch/pbzip2/pbzip2-0.9.5.ebuild
index 5f2c49d49804..2ec049c1aff0 100644
--- a/app-arch/pbzip2/pbzip2-0.9.5.ebuild
+++ b/app-arch/pbzip2/pbzip2-0.9.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/pbzip2-0.9.5.ebuild,v 1.1 2006/01/04 15:13:59 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/pbzip2-0.9.5.ebuild,v 1.2 2006/03/20 18:40:39 wolf31o2 Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://compression.ca/${PN}/${P}.tar.gz"
 
 LICENSE="PBZIP2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sparc x86"
 IUSE="static"
 
 DEPEND="virtual/libc