| 1 |
vapier 11/09/02 21:12:15 |
| 2 |
|
| 3 |
Modified: pbzip2-1.1.5.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Fix broken USE=static handling and respect env CPPFLAGS. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha51/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 app-arch/pbzip2/pbzip2-1.1.5.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/pbzip2/pbzip2-1.1.5.ebuild?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/pbzip2/pbzip2-1.1.5.ebuild?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/pbzip2/pbzip2-1.1.5.ebuild?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: pbzip2-1.1.5.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-arch/pbzip2/pbzip2-1.1.5.ebuild,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- pbzip2-1.1.5.ebuild 2 Aug 2011 19:17:04 -0000 1.1 |
| 23 |
+++ pbzip2-1.1.5.ebuild 2 Sep 2011 21:12:15 -0000 1.2 |
| 24 |
@@ -1,10 +1,10 @@ |
| 25 |
# Copyright 1999-2011 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/pbzip2-1.1.5.ebuild,v 1.1 2011/08/02 19:17:04 spatz Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/pbzip2-1.1.5.ebuild,v 1.2 2011/09/02 21:12:15 vapier Exp $ |
| 29 |
|
| 30 |
EAPI=4 |
| 31 |
|
| 32 |
-inherit multilib eutils |
| 33 |
+inherit flag-o-matic eutils |
| 34 |
|
| 35 |
DESCRIPTION="Parallel bzip2 (de)compressor using libbz2" |
| 36 |
HOMEPAGE="http://compression.ca/pbzip2/" |
| 37 |
@@ -21,26 +21,19 @@ |
| 38 |
src_prepare() { |
| 39 |
epatch "${FILESDIR}"/${PN}-1.1.2-makefile.patch |
| 40 |
tc-export CXX |
| 41 |
-} |
| 42 |
- |
| 43 |
-src_compile() { |
| 44 |
- if use static ; then |
| 45 |
- cp -f /usr/$(get_libdir)/libbz2.a "${S}" |
| 46 |
- emake pbzip2-static || die "Failed to build" |
| 47 |
- else |
| 48 |
- emake pbzip2 || die "Failed to build" |
| 49 |
- fi |
| 50 |
+ use static && append-ldflags -static |
| 51 |
} |
| 52 |
|
| 53 |
src_install() { |
| 54 |
dobin pbzip2 || die "Failed to install" |
| 55 |
dodoc AUTHORS ChangeLog README || die |
| 56 |
doman pbzip2.1 || die "Failed to install man page" |
| 57 |
- dosym /usr/bin/pbzip2 /usr/bin/pbunzip2 |
| 58 |
+ dosym pbzip2 /usr/bin/pbunzip2 |
| 59 |
|
| 60 |
- if use symlink; then |
| 61 |
- dosym /usr/bin/pbzip2 /usr/bin/bzip2 |
| 62 |
- dosym /usr/bin/pbzip2 /usr/bin/bunzip2 |
| 63 |
- dosym /usr/bin/pbzip2 /usr/bin/bzcat |
| 64 |
+ if use symlink ; then |
| 65 |
+ local s |
| 66 |
+ for s in bzip2 bunzip2 bzcat ; do |
| 67 |
+ dosym pbzip2 /usr/bin/${s} || die |
| 68 |
+ done |
| 69 |
fi |
| 70 |
} |
| 71 |
|
| 72 |
|
| 73 |
|
| 74 |
1.97 app-arch/pbzip2/ChangeLog |
| 75 |
|
| 76 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/pbzip2/ChangeLog?rev=1.97&view=markup |
| 77 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/pbzip2/ChangeLog?rev=1.97&content-type=text/plain |
| 78 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/pbzip2/ChangeLog?r1=1.96&r2=1.97 |
| 79 |
|
| 80 |
Index: ChangeLog |
| 81 |
=================================================================== |
| 82 |
RCS file: /var/cvsroot/gentoo-x86/app-arch/pbzip2/ChangeLog,v |
| 83 |
retrieving revision 1.96 |
| 84 |
retrieving revision 1.97 |
| 85 |
diff -u -r1.96 -r1.97 |
| 86 |
--- ChangeLog 2 Aug 2011 19:17:04 -0000 1.96 |
| 87 |
+++ ChangeLog 2 Sep 2011 21:12:15 -0000 1.97 |
| 88 |
@@ -1,6 +1,10 @@ |
| 89 |
# ChangeLog for app-arch/pbzip2 |
| 90 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 91 |
-# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/ChangeLog,v 1.96 2011/08/02 19:17:04 spatz Exp $ |
| 92 |
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/ChangeLog,v 1.97 2011/09/02 21:12:15 vapier Exp $ |
| 93 |
+ |
| 94 |
+ 02 Sep 2011; Mike Frysinger <vapier@g.o> |
| 95 |
+ files/pbzip2-1.1.2-makefile.patch, pbzip2-1.1.5.ebuild: |
| 96 |
+ Fix broken USE=static handling and respect env CPPFLAGS. |
| 97 |
|
| 98 |
*pbzip2-1.1.5 (02 Aug 2011) |
Archives