fixes things from lbzip2

4 files changed, 41 insertions, 10 deletions

diff --git a/app-arch/lbzip2/ChangeLog b/app-arch/lbzip2/ChangeLog
index 625c86b55..848967532 100644
--- a/app-arch/lbzip2/ChangeLog
+++ b/app-arch/lbzip2/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  15 Apr 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
+  files/0.15-Makefile.patch, lbzip2-0.15.ebuild:
+  included upstreams comment to lfs
+
 *lbzip2-0.15 (15 Apr 2009)
 
   15 Apr 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
diff --git a/app-arch/lbzip2/Manifest b/app-arch/lbzip2/Manifest
index 6b4f5e750..6f67b0b28 100644
--- a/app-arch/lbzip2/Manifest
+++ b/app-arch/lbzip2/Manifest
@@ -1,8 +1,8 @@
 AUX 0.14-Makefile.patch 506 RMD160 0345e9ea7663f7d7c0baa1abad4c0b45e617a04e SHA1 ed0362482ee7bc3ad3074feaea5c67f48a0584c5 SHA256 2655b4e2413addc2dad6f02b74814e693bb48a1ac00bd6f7927cb331502efc07
-AUX 0.15-Makefile.patch 509 RMD160 e47c23504bf99fcfd15519e559d668c13d6b5412 SHA1 e389e71702d6d77ac74bbadbc7576643fc40ccde SHA256 16ff5880be6c280fb7ba2d235470bb7245a11b4f946258754fdbc52725c0e58b
+AUX 0.15-Makefile.patch 1423 RMD160 80f4c71195942d47268679533299199eb49eb4cd SHA1 148aedd17d55c3216d143e060cad7684e737d660 SHA256 185e84d290eae5f9fc3050c0fb4fe66cf77e140708c873d1b966ff991e352b1c
 DIST lbzip2-0.14.tar.gz 61369 RMD160 6d9d5cdf22209509234d146221c520ac1fc87d11 SHA1 abaf728c83b0e249dc3fca2f36147ca4d2934037 SHA256 6f262d2408794e282a86fca5c1903b40bfe8abbdb753e925fe28eea7c00e15f3
 DIST lbzip2-0.15.tar.gz 62774 RMD160 7a5c5e0acc4772141eccaa3b22778146f1a8f69f SHA1 f547ddbb39e4fcceb25c3ebdd586aa8a053a4ae0 SHA256 4b49477a4854984520995d75dab7bdc4abcb4e463a949df3db4cf635f8dadb5e
 EBUILD lbzip2-0.14.ebuild 1013 RMD160 dd7d933f9f776d7599474b08bffb2d3f671ac2ca SHA1 bbaef58a571aec4f74dc993372c6fee45a708512 SHA256 72b8969b6d27d043df71b9b52c960c74c2aa34f0d2b66f534b0bdce6105b9718
-EBUILD lbzip2-0.15.ebuild 1093 RMD160 ccfc4a0e0fd41f3b1470d0bb151b34fe68b3952d SHA1 ff558a3da49bb83249e782815bb04e51d0a288c7 SHA256 95c9a933e198d5dc96cf672355d517d9a8daa23111856f40322b5e36bd7aa103
-MISC ChangeLog 440 RMD160 87aff254bf821db6136e2b7496fda1faf9a78461 SHA1 f28332901f066ef4783fe0f3f6089bcd03592ef7 SHA256 ea296de3f192806c5012d4e004b43fae4e4d812478b3068e4f4886feff038e53
+EBUILD lbzip2-0.15.ebuild 1110 RMD160 6fde04b7398455560cfc7295514041349bbc6da7 SHA1 bcd994e973c949d0a0b8bd4d7b295660bc7e8ca0 SHA256 f7538139676a7949fc71f29dbd2128cf024c03513cdc704f334711ccd50edb95
+MISC ChangeLog 583 RMD160 67923588e1c9e5eac2e43355848067d88d269695 SHA1 954ec98a0d900127fcc1197266884d3cb72528ac SHA256 7501b018f4ba6965895d57fd372753f3a61d04e2eb0ce54322bc0e17d94db324
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/app-arch/lbzip2/files/0.15-Makefile.patch b/app-arch/lbzip2/files/0.15-Makefile.patch
index a6c877be0..5bca44468 100644
--- a/app-arch/lbzip2/files/0.15-Makefile.patch
+++ b/app-arch/lbzip2/files/0.15-Makefile.patch
@@ -1,9 +1,10 @@
 --- Makefile	2009-04-04 00:33:49.000000000 +0200
-+++ Makefile.new	2009-04-15 08:35:07.000000000 +0200
-@@ -2,14 +2,8 @@
++++ Makefile.new	2009-04-15 21:12:02.886390550 +0200
+@@ -1,34 +1,27 @@
+ # Makefile,v 1.9 2009-04-03 22:33:49 lacos Exp
  .POSIX:
  
- CC=gcc
+-CC=gcc
 -CFLAGS=$$($(SHELL) lfs.sh CFLAGS) -D _XOPEN_SOURCE=500 -pipe -ansi -pedantic \
 -    -O2
 -
@@ -16,4 +17,29 @@
 +LIBS=-l pthread -l bz2
  
  lbzip2: main.o lbzip2.o lbunzip2.o lbunzip2_single.o lacos_rbtree.o
- 	$(CC) -o lbzip2 $(LDFLAGS) main.o lbzip2.o lbunzip2.o \
+-	$(CC) -o lbzip2 $(LDFLAGS) main.o lbzip2.o lbunzip2.o \
++	$(CC) $(CPPFLAGS) $(LDFLAGS) -o lbzip2 main.o lbzip2.o lbunzip2.o \
+   lbunzip2_single.o lacos_rbtree.o $(LIBS)
+ 
+ main.o: main.c main.h lbunzip2_single.h lbunzip2.h lbzip2.h
+-	$(CC) $(CFLAGS) -c main.c
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c main.c
+ 
+ lbzip2.o: lbzip2.c main.h lbzip2.h lacos_rbtree.h
+-	$(CC) $(CFLAGS) -c lbzip2.c
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c lbzip2.c
+ 
+ lbunzip2.o: lbunzip2.c main.h lbunzip2.h lacos_rbtree.h
+-	$(CC) $(CFLAGS) -c lbunzip2.c
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c lbunzip2.c
+ 
+ lbunzip2_single.o: lbunzip2_single.c main.h lbunzip2_single.h
+-	$(CC) $(CFLAGS) -c lbunzip2_single.c
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c lbunzip2_single.c
+ 
+ lacos_rbtree.o: lacos_rbtree.c lacos_rbtree.h
+-	$(CC) $(CFLAGS) -c lacos_rbtree.c
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c lacos_rbtree.c
+ 
+ clean:
+ 	rm -f lbzip2 main.o lbzip2.o lbunzip2.o lbunzip2_single.o \
diff --git a/app-arch/lbzip2/lbzip2-0.15.ebuild b/app-arch/lbzip2/lbzip2-0.15.ebuild
index 22d43d789..6b3cc7007 100644
--- a/app-arch/lbzip2/lbzip2-0.15.ebuild
+++ b/app-arch/lbzip2/lbzip2-0.15.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs eutils flag-o-matic
 
 DESCRIPTION="Pthreads-based parallel bzip2/bunzip2 filter, passable to GNU tar"
 HOMEPAGE="http://freshmeat.net/projects/lbzip2"
@@ -26,6 +26,7 @@ src_unpack() {
 }
 
 src_compile() {
+	append-lfs-flags
 	emake CC=$(tc-getCC) || die "emake failed"
 }
 
@@ -42,6 +43,6 @@ src_install() {
 	dobin ${PN} || die "Installation of ${PN} failed"
 	dodoc ChangeLog README || die "no docs"
 	doman ${PN}.1 || die "no man"
-	insinto"/usr/share/${PN}"
-	doins corr-perf.sh malloc_trace.pl test.sh lfs.sh || die
+	insinto "/usr/share/${PN}"
+	doins corr-perf.sh malloc_trace.pl || die
 }