summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Gianelloni <wolf31o2@gentoo.org>2006-01-04 15:10:39 +0000
committerChris Gianelloni <wolf31o2@gentoo.org>2006-01-04 15:10:39 +0000
commit3a3d689388704874197477d3d7428fac19e35138 (patch)
tree4e0466dfa7451634360e14bf7832ad6f534b842a /app-arch
parentfix qmake calling (diff)
downloadgentoo-2-3a3d689388704874197477d3d7428fac19e35138.tar.gz
gentoo-2-3a3d689388704874197477d3d7428fac19e35138.tar.bz2
gentoo-2-3a3d689388704874197477d3d7428fac19e35138.zip
Fixed bug #104727.
(Portage version: 2.1_pre3-r1)
Diffstat (limited to 'app-arch')
-rw-r--r--app-arch/pbzip2/ChangeLog7
-rw-r--r--app-arch/pbzip2/pbzip2-0.9.4.ebuild27
2 files changed, 25 insertions, 9 deletions
diff --git a/app-arch/pbzip2/ChangeLog b/app-arch/pbzip2/ChangeLog
index 86d0b6ec7ff7..095afda5ca9b 100644
--- a/app-arch/pbzip2/ChangeLog
+++ b/app-arch/pbzip2/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-arch/pbzip2
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/ChangeLog,v 1.9 2005/09/14 17:50:15 grobian Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/ChangeLog,v 1.10 2006/01/04 15:10:39 wolf31o2 Exp $
+
+ 04 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> pbzip2-0.9.4.ebuild:
+ Fixed bug #104727.
14 Sep 2005; Fabian Groffen <grobian@gentoo.org> pbzip2-0.9.4.ebuild:
Marking ~ppc-macos (bug #105854)
diff --git a/app-arch/pbzip2/pbzip2-0.9.4.ebuild b/app-arch/pbzip2/pbzip2-0.9.4.ebuild
index 3d6203439a4f..18c5b32447ad 100644
--- a/app-arch/pbzip2/pbzip2-0.9.4.ebuild
+++ b/app-arch/pbzip2/pbzip2-0.9.4.ebuild
@@ -1,6 +1,8 @@
-# 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.9.4.ebuild,v 1.2 2005/09/14 17:50:15 grobian Exp $
+# $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/"
@@ -14,20 +16,31 @@ 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
- make pbzip2-static
+ if use static
+ then
+ cp -f /usr/$(get_libdir)/libbz2.a ${S}
+ emake pbzip2-static || die "Failed to build"
else
- make pbzip2
+ emake pbzip2 || die "Failed to build"
fi
}
src_install() {
- dobin pbzip2
- dodoc *.txt
+ dobin pbzip2 || die "Failed to install"
+ dodoc AUTHORS ChangeLog README || Die "Failed to install docs"
+ doman pbzip2.1 || die "Failed to install man page"
}