Don't use lfs.sh from test.sh. Should help BSD.

Package-Manager: portage-2.1.10.3/cvs/Linux x86_64

4 files changed, 32 insertions, 7 deletions

diff --git a/app-arch/lbzip2/ChangeLog b/app-arch/lbzip2/ChangeLog
index bcd75af1c60b..d97b78dacbfe 100644
--- a/app-arch/lbzip2/ChangeLog
+++ b/app-arch/lbzip2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-arch/lbzip2
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lbzip2/ChangeLog,v 1.16 2011/08/06 19:19:45 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lbzip2/ChangeLog,v 1.17 2011/08/14 23:35:13 mattst88 Exp $
+
+  14 Aug 2011; Matt Turner <mattst88@gentoo.org> +files/0.23-test.sh.patch,
+  lbzip2-0.23-r2.ebuild:
+  Don't use lfs.sh from test.sh. Should help BSD.
 
 *lbzip2-0.23-r2 (06 Aug 2011)
 
diff --git a/app-arch/lbzip2/Manifest b/app-arch/lbzip2/Manifest
index 361533d4b924..eb6bf275a41e 100644
--- a/app-arch/lbzip2/Manifest
+++ b/app-arch/lbzip2/Manifest
@@ -5,20 +5,21 @@ AUX 0.20-Makefile.patch 1421 RMD160 8ddbb18af454e17b88af17778cf428a03df1daf1 SHA
 AUX 0.22-Makefile.patch 1421 RMD160 8ddbb18af454e17b88af17778cf428a03df1daf1 SHA1 dbfed4e90b83cb55d63a82743a1feb4152066d86 SHA256 6e9a50209ce7523af3543b7323ef6c385282d2e6467d6dfa41614142cd7321d4
 AUX 0.23-Makefile.patch 1389 RMD160 98bcdfba3697608bf46f9f83de63edd1950fe367 SHA1 16c3a8f418554e50b7ca59016983cb539c41fd04 SHA256 1fa306143aa8030381d561c29022bab2775877b7e5dcd3aa63476205ae3c375a
 AUX 0.23-s_isreg.patch 350 RMD160 7df41d6497744477c8976a9d04c607cca3863bec SHA1 26c5dab3730669b6bf36f35ce0258ccdf62a5119 SHA256 38c1c133faf8c30440164fad7c1539df555cee606934a3e75ed6a149eeb5d1d6
+AUX 0.23-test.sh.patch 648 RMD160 936877f97aafb2e0f91d17eb527989561788fd5e SHA1 d6be87e8ce2c54d6c47ffb9547518ec52e00cdc3 SHA256 e37454a09697a49574068ad5c89d2047a9f4f5d9df32aacd3b01584f2b0477a1
 DIST lbzip2-0.20.tar.gz 75983 RMD160 e2fc720341bcfba65370411bd67b4a484cb41426 SHA1 5ec3dd318c55c8ff9b24ed06a4a4a0cfdae4b71e SHA256 d73942a99f1158bc59bfc5828a2abbe00d738a961651e050fb362621825482da
 DIST lbzip2-0.22.tar.gz 76373 RMD160 2ee38fcab11f8c365d7c403e1f464c06bc13ecd9 SHA1 76e13c4b88e2a055daa73ebab1aa86c17fa1c702 SHA256 759d737928a665f06a690667ae930a1a84d993103ca997b8afeb19ada36060a3
 DIST lbzip2-0.23.tar.gz 77720 RMD160 404cdfdfde7f65f7742a8c9345512238c310d9d8 SHA1 b4b9eee37ebaf5b9370a63a7e7042acfccf5e9f1 SHA256 2838cc2be818b8107ab1311208e6344baf9969168199be84287a32fef4733411
 EBUILD lbzip2-0.20.ebuild 1321 RMD160 550e6079534d2f156ab41a6c25be5bd0d659143f SHA1 ad8e2f8e6f9b92cc3d1a438905d0570b9bd2f1d4 SHA256 c088c71a173308239a19f8e27f33d256644f534036ce764060c3bd3e00eb47c3
 EBUILD lbzip2-0.22.ebuild 1321 RMD160 e405be2e5ff318bd7dff6d56f1af6106f0677c72 SHA1 c9d29045e5736c7bcb8590cc1fbfdf9010bfcd5c SHA256 197c87e6f251a862e0db92b8a4848d54a0d93a34fdf60f3af0e83dd72827b518
 EBUILD lbzip2-0.23-r1.ebuild 1448 RMD160 9b103758315adb727dc675f5337ca050bd299da2 SHA1 d3fb6d3bda40ca3da3a5919be51b6d2454096889 SHA256 9316072dfd72cdf226c37adc081512073108502fbd70ee8cf7f1503094efd64c
-EBUILD lbzip2-0.23-r2.ebuild 1489 RMD160 c92e2066efd708bf11dd66ea1fe2b37bc6fa28e2 SHA1 a5ede3c1f5821eda53094196d49290c8ba2e14e5 SHA256 afff709d68ed8f50ed228362de61a1c09c9a4bb6c93525f3fe49e460ffd95e12
+EBUILD lbzip2-0.23-r2.ebuild 1530 RMD160 0b857c0e4a38902d5af37089feb84dafd76fd4fe SHA1 60219aef59fcec8c91d7690dea16371dfa83063e SHA256 7cace257d1e633c6500c712faa6f8d7759c599c451c7cb89c1e45b93fc0d4fec
 EBUILD lbzip2-0.23.ebuild 1364 RMD160 dee822d1c83a2b2bbaa6b2666416a39f9c1a2ca0 SHA1 44476992364550eb5a421a014c22d3d325d2b87d SHA256 976ebb8df12e6c2aaa0368296556a1c5b4ba5d293b3a35cedbdcdc579535b6ea
-MISC ChangeLog 2406 RMD160 ccc557b44342bba05650a431a6f689bf3d080e92 SHA1 3e07f848ebccecc0f2b5ecb6f1c882d6112f1cee SHA256 fdc98c3dbdde3bfe6b21ef27738ae1f2579056667d1cc67778d98c2c3beba9fe
+MISC ChangeLog 2558 RMD160 1087f2c91660952f7f42fe600f02365fc1989cc4 SHA1 4cd67a0db0c5bea752eb4af4aba0ea7abe924c69 SHA256 bfa31fdb782bc81354cc75423a0df90e10d3db08f5233865356cf5a2acd5afda
 MISC metadata.xml 520 RMD160 e6a56aa8f6c8d3c98ddfbad46a75c0500ce015ae SHA1 5059d633aad4510ed93a2199e0b635f195e24787 SHA256 7ef596606ea4a9790b7749274a0e476ab83d1107f10a77c5c731e312c9e00d09
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk49k9QACgkQTVUdg23rv53jEACfQYEmO5kq+Whjuao2Fl02lVho
-7qwAn21Xi9gqLfx9VHYIHS/3mif8JXlc
-=2HJx
+iEYEARECAAYFAk5IW7UACgkQTVUdg23rv53lZgCfQMa/TLd+vIS8Oieq4wiEGOio
+fa4An2BOydDrAdAoa4xu9JNhEMrg9aru
+=fK6H
 -----END PGP SIGNATURE-----
diff --git a/app-arch/lbzip2/files/0.23-test.sh.patch b/app-arch/lbzip2/files/0.23-test.sh.patch
new file mode 100644
index 000000000000..f6ed68a4e1ad
--- /dev/null
+++ b/app-arch/lbzip2/files/0.23-test.sh.patch
@@ -0,0 +1,19 @@
+Only in lbzip2: .lfs.sh.swp
+diff -u lbzip2.orig//test.sh lbzip2/test.sh
+--- lbzip2.orig//test.sh	2009-11-26 22:38:44.000000000 -0500
++++ lbzip2/test.sh	2011-08-14 19:28:31.746454047 -0400
+@@ -99,12 +99,8 @@
+ }
+ EOT
+ 
+-  T_CFLAGS="$(set CFLAGS; set +e; . "$OLDPWD"/lfs.sh)"
+-  T_LDFLAGS="$(set LDFLAGS; set +e; . "$OLDPWD"/lfs.sh)"
+-  T_LIBS="$(set LIBS; set +e; . "$OLDPWD"/lfs.sh)"
+-
+-  $C_CC1 $T_CFLAGS -D _XOPEN_SOURCE=500 $C_CC2 -o scratch/nullfmt -s \
+-      $T_LDFLAGS scratch/nullfmt.c $T_LIBS
++  $C_CC1 $CFLAGS $C_CC2 -o scratch/nullfmt -s \
++      $LDFLAGS scratch/nullfmt.c $LIBS
+   C_NULLFMT="$(scratch/nullfmt)"
+ fi
+ readonly C_NULLFMT
diff --git a/app-arch/lbzip2/lbzip2-0.23-r2.ebuild b/app-arch/lbzip2/lbzip2-0.23-r2.ebuild
index 8836d20c458c..ea3f51cb17ca 100644
--- a/app-arch/lbzip2/lbzip2-0.23-r2.ebuild
+++ b/app-arch/lbzip2/lbzip2-0.23-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lbzip2/lbzip2-0.23-r2.ebuild,v 1.1 2011/08/06 19:19:45 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lbzip2/lbzip2-0.23-r2.ebuild,v 1.2 2011/08/14 23:35:13 mattst88 Exp $
 
 EAPI="3"
 
@@ -28,6 +28,7 @@ S=${WORKDIR}/${PN}
 src_prepare() {
 	epatch "${FILESDIR}"/${PV}-s_isreg.patch
 	epatch "${FILESDIR}"/0.23-Makefile.patch
+	epatch "${FILESDIR}"/0.23-test.sh.patch
 }
 
 src_compile() {