Binary files shouldn't be in the tree. Uncompressing small patch

Package-Manager: portage-2.2_rc63/cvs/Linux x86_64

5 files changed, 29 insertions, 14 deletions

diff --git a/sys-fs/aufs2/ChangeLog b/sys-fs/aufs2/ChangeLog
index 73c4d94e8e9e..f270c6d9f48d 100644
--- a/sys-fs/aufs2/ChangeLog
+++ b/sys-fs/aufs2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/aufs2
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/ChangeLog,v 1.13 2009/12/18 17:32:10 tommy Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/ChangeLog,v 1.14 2010/03/06 22:03:26 halcy0n Exp $
+
+  06 Mar 2010; Mark Loeser <halcy0n@gentoo.org> aufs2-0_p20090916-r1.ebuild,
+  +files/aufs2-0_p20090916-makefile.patch,
+  -files/aufs2-0_p20090916-makefile.patch.bz2:
+  Binary files shouldn't be in the tree. Uncompressing small patch
 
 *aufs2-0_p20091214 (18 Dec 2009)
 
diff --git a/sys-fs/aufs2/Manifest b/sys-fs/aufs2/Manifest
index c0f3629e1c57..952f767817d1 100644
--- a/sys-fs/aufs2/Manifest
+++ b/sys-fs/aufs2/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX aufs2-0_p20090916-makefile.patch.bz2 252 RMD160 7137af507519d0f0d5a151878342c3f8b3108759 SHA1 8c071ba83db3ec9872a583a6c391a38d1c47aa8e SHA256 4f39dd44604c3329c4199e66818941ce0f7e711cb7c3c08f82a7c08ff5606f34
+AUX aufs2-0_p20090916-makefile.patch 320 RMD160 dac9d28782a6a701108076e96d4ce9d551ea03e6 SHA1 48858904490640cffbb81d7ed678b7b8dfdf8b66 SHA256 42b2db7a6c38989d98d82b89c5e15097b1fef32f3043d2966c102c9f7eed2110
 AUX aufs2-base-28.patch 2895 RMD160 8055dd188e288ba4e66fafd11d78dcf5e97cae90 SHA1 ed691340ef5abce398f8b11e679b64db9bcee312 SHA256 d1869072da1a25d908a06dd34700cf8c5b03fde93b3d7ffef0d6a2948396430e
 AUX aufs2-base-29.patch 2895 RMD160 bf89ba5f9f52ea1b9e320439e0bc18f8a006c8c3 SHA1 92a4aff3a945ea7a4a4509ed3539d0a3689c0737 SHA256 b4d8c9883f7f919f0d0a15792420e59f14d41bc1b0daab906ba7affc29485dac
 AUX aufs2-base-30.patch 2895 RMD160 13d6fcb45135e4177d6dd506bc7a32fc6b2741fe SHA1 4845f3608540dbc0fa2fa5c914907eb14b51a0f0 SHA256 11f9061805e715c9d9a58dab04a32876ed27bced61c3157cde4e58a08dcdde51
@@ -16,16 +16,14 @@ AUX aufs2-standalone-32.patch 5828 RMD160 8d525c7155df964a933bf6ec01bb6904211a33
 AUX utils-2.6.31.patch 444 RMD160 b89f0373c7d9537cc3124e7d8beaa0eda411a6f3 SHA1 8dcb097c0ddb4a325aef7f043db6809dcbef4035 SHA256 d10f948b03dd47cf2e5635a064c02231d4b7af2c28d45e0368fb0470b15cae62
 DIST aufs2-0_p20090916.tar.bz2 3239334 RMD160 619c1656514ddaf4b046b27d065208823d4c502e SHA1 aaae8f72a9388c40bca68ae2147afa32ad930ac7 SHA256 a68818cd382cf93ed7a32839a6ec6b23c0291b8125657db8b559659bbb89db10
 DIST aufs2-0_p20091214.tar.bz2 4253193 RMD160 df114f6e040bb3fb9a319e39313b59b5190742b7 SHA1 f8d1efa056fd657318b212e1b3b5bd344d0648d8 SHA256 2a9c6b4f69bb1d3fbab1ab403ad446af8efb5c794c451ec40166841dfd40b297
-EBUILD aufs2-0_p20090916-r1.ebuild 2958 RMD160 68da42877796919e684b32106dd3a5c35b3ea09f SHA1 09c41c34e1f5d18b29b4f89275342b69765ac09e SHA256 b3ce3776fa79794844642112a6dbc16fafe41d1f160c83e8736faf9ed2a80344
+EBUILD aufs2-0_p20090916-r1.ebuild 2956 RMD160 69e5deec678ccbc3a92bd5f2f69497fb02eac37f SHA1 6149a0d8f16704b1cd5e97e569f28fed79e63af4 SHA256 49fefe29a35b99ce7a570b59da2d17e383f163cbfac4531e9dcf0f52b10e925f
 EBUILD aufs2-0_p20091214.ebuild 2888 RMD160 c2e96ffb0012186a7d26744e44fbb086d9b2cae9 SHA1 3259c4b2d853382882e10f567f396e5bc22bab56 SHA256 89e7fd4899301c9f601861282c89227c922e52ea2045c2477defd471c51edd3f
-MISC ChangeLog 3067 RMD160 4dbfdea364321ef6903af2aa49efa50a919bd91f SHA1 fdfeece1bf48b65167a5a41b0ad23334f454d598 SHA256 06e70a7f94709686818fbca4f8a54810bbe070b0813c80232069d488d1755044
+MISC ChangeLog 3304 RMD160 cbb8a2b59b058f578909630e4f16d6748db07ee5 SHA1 db0897929aa1bf66277dd197dea1a82b6a328b6e SHA256 b44b3b14d13bad888e12aa41cd8041a495655271bc57c8a03ef7ebc96f92570c
 MISC metadata.xml 550 RMD160 7269bc138013ec091e6025c4cb09148bd7740db5 SHA1 18b669d81765a665d50d3df22d14d77b576a89c1 SHA256 e9ea661a4a691f3c119d65ebab8ee933df91862f63a8cbfb8a1591307e49fc03
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iJwEAQECAAYFAksrvKUACgkQG7kqcTWJkGd+SgQAkY0fO5d/lHn2mgYmsLeup0VZ
-PFaULCgeV0xSlxl9ZdC9dKwroE7/wYxwP6tjiPCxl70gsjousCR/krcyjDdPhTcT
-LcIZsE/0AYU12/SidG4XFzW0oDGuLWe+dfdne+pzxiHO1ccDEE8CMmEd90OTKwFw
-SW34Z8MrjTZlhMrN/+c=
-=6C76
+iEYEARECAAYFAkuS0TMACgkQCRZPokWLroQOtQCfWJBuGD1JqSaq8Jq3WqBpejei
+2tMAoMIbukF5/WYIrNQQOwlQkeajJsFN
+=vKAA
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/aufs2/aufs2-0_p20090916-r1.ebuild b/sys-fs/aufs2/aufs2-0_p20090916-r1.ebuild
index e544bf2bb8b4..d32b8f0f5bf0 100644
--- a/sys-fs/aufs2/aufs2-0_p20090916-r1.ebuild
+++ b/sys-fs/aufs2/aufs2-0_p20090916-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/aufs2-0_p20090916-r1.ebuild,v 1.2 2009/11/27 14:14:40 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/aufs2-0_p20090916-r1.ebuild,v 1.3 2010/03/06 22:03:26 halcy0n Exp $
 
 EAPI="2"
 
@@ -66,7 +66,7 @@ src_prepare() {
 
 	cd "${WORKDIR}"/${PN}-util
 	sed -i "/LDFLAGS += -static -s/d" Makefile || die
-	epatch "${FILESDIR}"/{${P}-makefile.patch.bz2,utils-2.6.31.patch}
+	epatch "${FILESDIR}"/{${P}-makefile.patch,utils-2.6.31.patch}
 }
 
 src_compile() {
diff --git a/sys-fs/aufs2/files/aufs2-0_p20090916-makefile.patch b/sys-fs/aufs2/files/aufs2-0_p20090916-makefile.patch
new file mode 100644
index 000000000000..091df6b3cb8a
--- /dev/null
+++ b/sys-fs/aufs2/files/aufs2-0_p20090916-makefile.patch
@@ -0,0 +1,12 @@
+diff --git a/Makefile b/Makefile
+index 9b8dec7..cca9c4f 100644
+--- a/Makefile
++++ b/Makefile
+@@ -44,6 +44,7 @@ ${BinObj}: %.o: %.c ${LibUtilHdr} ${LibUtil}
+ 
+ ${LibUtilObj}: %.o: %.c ${LibUtilHdr}
+ ${LibUtil}: ${LibUtil}(${LibUtilObj})
++.NOTPARALLEL: ${LibUtil}
+ 
+ # this is unnecessary on 64bit system?
+ rdu64.c: rdu.c
diff --git a/sys-fs/aufs2/files/aufs2-0_p20090916-makefile.patch.bz2 b/sys-fs/aufs2/files/aufs2-0_p20090916-makefile.patch.bz2
deleted file mode 100644
index 6d9be72b5b5e..000000000000
--- a/sys-fs/aufs2/files/aufs2-0_p20090916-makefile.patch.bz2
+++ /dev/null