summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-arch/pbzip2/ChangeLog6
-rw-r--r--app-arch/pbzip2/pbzip2-1.1.0.ebuild46
-rw-r--r--app-arch/pbzip2/pbzip2-1.1.1.ebuild4
3 files changed, 7 insertions, 49 deletions
diff --git a/app-arch/pbzip2/ChangeLog b/app-arch/pbzip2/ChangeLog
index 68a60110dabc..c5a98d7d1087 100644
--- a/app-arch/pbzip2/ChangeLog
+++ b/app-arch/pbzip2/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-arch/pbzip2
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/ChangeLog,v 1.84 2010/04/20 12:46:37 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/ChangeLog,v 1.85 2010/06/03 13:36:09 spatz Exp $
+
+ 03 Jun 2010; Dror Levin <spatz@gentoo.org> -pbzip2-1.1.0.ebuild,
+ pbzip2-1.1.1.ebuild:
+ Stable on amd64, bug 322531. Drop old.
*pbzip2-1.1.1 (20 Apr 2010)
diff --git a/app-arch/pbzip2/pbzip2-1.1.0.ebuild b/app-arch/pbzip2/pbzip2-1.1.0.ebuild
deleted file mode 100644
index 84b4fc163192..000000000000
--- a/app-arch/pbzip2/pbzip2-1.1.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/pbzip2-1.1.0.ebuild,v 1.1 2010/03/13 23:35:03 spatz Exp $
-
-EAPI=2
-
-inherit multilib eutils
-
-DESCRIPTION="parallel bzip2 (de)compressor using libbz2"
-HOMEPAGE="http://compression.ca/pbzip2/"
-SRC_URI="http://compression.ca/${PN}/${P}.tar.gz"
-
-LICENSE="PBZIP2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="static symlink"
-
-DEPEND="app-arch/bzip2"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-makefile.patch
- tc-export CXX
-}
-
-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
- doman pbzip2.1 || die "Failed to install man page"
- dosym /usr/bin/pbzip2 /usr/bin/pbunzip2
-
- if use symlink; then
- dosym /usr/bin/pbzip2 /usr/bin/bzip2
- dosym /usr/bin/pbzip2 /usr/bin/bunzip2
- dosym /usr/bin/pbzip2 /usr/bin/bzcat
- fi
-}
diff --git a/app-arch/pbzip2/pbzip2-1.1.1.ebuild b/app-arch/pbzip2/pbzip2-1.1.1.ebuild
index 6515ee505588..a28580320d45 100644
--- a/app-arch/pbzip2/pbzip2-1.1.1.ebuild
+++ b/app-arch/pbzip2/pbzip2-1.1.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/pbzip2-1.1.1.ebuild,v 1.1 2010/04/20 12:46:37 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/pbzip2-1.1.1.ebuild,v 1.2 2010/06/03 13:36:09 spatz Exp $
EAPI=2
@@ -12,7 +12,7 @@ SRC_URI="http://compression.ca/${PN}/${P}.tar.gz"
LICENSE="PBZIP2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
IUSE="static symlink"
DEPEND="app-arch/bzip2"