Add minimal out-of-tree build support to speed up the build a bit.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 214 insertions, 15 deletions

diff --git a/app-arch/bzip2/ChangeLog b/app-arch/bzip2/ChangeLog
index 647a44cfa823..95bcc64db936 100644
--- a/app-arch/bzip2/ChangeLog
+++ b/app-arch/bzip2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-arch/bzip2
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/ChangeLog,v 1.109 2014/01/05 17:47:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/ChangeLog,v 1.110 2014/01/05 17:58:12 vapier Exp $
+
+*bzip2-1.0.6-r5 (05 Jan 2014)
+
+  05 Jan 2014; Mike Frysinger <vapier@gentoo.org> +bzip2-1.0.6-r5.ebuild,
+  +files/bzip2-1.0.6-out-of-tree-build.patch, bzip2-1.0.6-r4.ebuild:
+  Add minimal out-of-tree build support to speed up the build a bit.
 
   05 Jan 2014; Mike Frysinger <vapier@gentoo.org> bzip2-1.0.6-r4.ebuild:
   Only set -static in LDFLAGS for prog building #485690 by Greg Turner.
diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest
index 9c40387dd418..682d3d273f45 100644
--- a/app-arch/bzip2/Manifest
+++ b/app-arch/bzip2/Manifest
@@ -7,6 +7,7 @@ AUX bzip2-1.0.4-POSIX-shell.patch 672 SHA256 34bc42c1d6c980e0970a517c9602b904efb
 AUX bzip2-1.0.4-makefile-CFLAGS.patch 569 SHA256 853621ae207f0115210e06f738d4e79861110712823419707875116cb45b105e SHA512 5ad3ecad8b577737386f0e5fc6f9adfd72334598b6dc76755cab6e38611b048c5c6b97462cbca48237a95802e1e2ac0de34b03d579d737edda8eea3e6a31346e WHIRLPOOL f4906ca56ce15b6ea18fccbc745c18858458ac2ecf6d2f1cb57de710ce5888d567dfed1dc34048cf1909d3d9f66a7c3b356bec0ee02674924669e7d717e2e6e2
 AUX bzip2-1.0.4-man-links.patch 422 SHA256 03e6ba8a87a8abcf6bb02c0e44186e4b20b8dc871ac2d4921cfc3c9ea616e971 SHA512 7c650620dc11522c4d8bd17a55da18ab3f8556cf83452459e86bceecf33a5de39b8e05e23eb11c4c8dffa79cc8d23d54741ccc8bc715dea2e108f5f3c8dde20c WHIRLPOOL 33a67aec4d7f668f401e920a9c97d9715535bbe774d0fb4b0baa12f023215081904995a22dc8eaa5708c7e1b736738164055c9e77d188650ad61fe99abcaf8d1
 AUX bzip2-1.0.6-mingw.patch 556 SHA256 8da568f1d7daac4ac6b9d7946dd3b807e062b5a1710a2548029cc4f158e8d717 SHA512 e28442acc456c996eb6bc1866cd3814a9aea9c8a4ac2767a59bd03273ee95e34efdb4d00a17c64242a3395056b38c7083ec6f4c986e91d02f5348af1af2a35c8 WHIRLPOOL 66cbedef7eef3b4890a56dd0aad28529960c2e205fc7809ded96dd7ece17cdd3f18d92eeca25e009f2ca3689f9ad2d2bf81238562078d4147d87124107ac41af
+AUX bzip2-1.0.6-out-of-tree-build.patch 2121 SHA256 2dd4db48de0a3b1a927725640ad4f56e90d68c33ea3cea9ff0dab7bdb8f7ccc1 SHA512 f4a85c8b9ba0fe0ffadcb058550bb948e84c51f4c213957ffeb1072258efb1caa957c496ce0a0fb4d4b5f7dfdf062995a819487b9475389cfb25583fa061143e WHIRLPOOL 18491f4d99ef866154379112d4c0b840bf6960a116cb03c338aa132cb5440f8cfec8a0933460794902e11b2c0cc13edd99aefc424d3d0f91e4b30d221230ff56
 AUX bzip2-1.0.6-progress.patch 5756 SHA256 f93e6b50082a8e880ee8436c7ec6a65a8f01e9282436af77f95bb259b1c7f7f7 SHA512 c3f5959027346a471182fbcac72fe3b755d9327557ac31fd8d36746c643afd418f5a59bf434493109af4536b90e69220e985a25eb3ce7e3d05029583a9d0bcdc WHIRLPOOL 830dab52ec0efd50a0266863dec0180e40db7ef519cd5c02991bc12fb978bb5df5d0329ede896aff02fc2abbfa09c4380949c8f5eb48a9ccbb562675fa5d2003
 AUX bzip2-1.0.6-saneso.patch 439 SHA256 8345a9fcfce28a459a12126748ac27480a384e80974c31d9fae752d818ea05d9 SHA512 4f5d499227e3381e87c43b4afa48b5cd1f796142805dee19bf7f9f3a8547ca5baaf0b1d1f42079a61b63e3c279650292cca119e7d177ad04425c93e23f1bbd88 WHIRLPOOL 35d83bd455116a1121c87675bf0ceda0e37ac48a76a1379d0455e39026b1445c3d90493923ee1c4c49f3cc388c8344b8a4379d6c44e01564d658ebd22c3a5a10
 DIST bzip2-1.0.6.tar.gz 782025 SHA256 a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd SHA512 00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12 WHIRLPOOL 8e92c24f77c3711f5103a26d6fefbe61fe49a7d1e46879d259d46347c606ca956b7228ab011aa88007db771f86a500d4954057c7f9c70bd8380ca6c9430bd81e
@@ -14,23 +15,24 @@ EBUILD bzip2-1.0.6-r1.ebuild 2183 SHA256 4d7615ffc4a8b3fa39d5626a7c2fa3d18ec9e34
 EBUILD bzip2-1.0.6-r2.ebuild 2155 SHA256 664d950904d6a048cb299fc6eb93f18cb820c6fa009b32394d72b255c627eb15 SHA512 5187182a3260c6e131d72a78c86beceab6cadedac9e2410a7e0ae1e1fd4596baefbf457b415c8c3ad964d3a7d141a20dcab4bc95be031d76e5764d2ac0e429b3 WHIRLPOOL 261c2b2fdebac16d41cf5b8deb5f6f0c31f9aa715fac0366b53b28932be5f614990c837bd55cd29333bce1de5567c4cbbc968365eef4829207adac2a62b70ace
 EBUILD bzip2-1.0.6-r3.ebuild 2426 SHA256 780f1ab3808463a24d83316973eea0b70477104f5f304ba66a4ef2a899695363 SHA512 ce8e0b2c93ce84efe8356348f24d4f3ff6877a6295e41ddd8848b46bc9c08be89ced4d1b17c7a669cd7361c41ed8d539be82b997a2048214f66d000fc5c3661c WHIRLPOOL 1bc5264b6840881bc67396795ae5d6f59a1b32d221827c547d0de183534fc6637aef6fdac92fa5f6b4b92c0ab74f89545d0445c1dbe3ef62c5ac629c671b664d
 EBUILD bzip2-1.0.6-r4.ebuild 2578 SHA256 2a67b917070e05bff9a6a19c1bdb35baaba0de458130e6479e876ede3c4e04bc SHA512 f1125185b05f6cc295e27e7d5d1c5e99a8d34738262779553f18d51d199aeead7b48998707ee0ec46b4584620eb892dce6ffa11cfea326a74811cdf52d5c8f7f WHIRLPOOL 58a5013afc3697d7eab007890982bcb050f1de7add95cc8edc3a57e579922f2f81d8f2688c4927fe6c0543d7aba971133e09fea10461db74546a05037a79bade
+EBUILD bzip2-1.0.6-r5.ebuild 3103 SHA256 fcf0461aa4301b58191c3263ba2735f77f64618fcaf07502a4dfba490cd2a58c SHA512 b651f3bee0d97deff7e7db551e2ce746cecc64390964a7fa83c5cf5146d5d222d2c6f2928721e4ce3f83d26f71635bfa1ded4aa56daabe12c2c0c4294f9a42c9 WHIRLPOOL c57d530e0f764c283f87621c7c787ad60221fa23e4a16ce4863f5b7a71924c929f0f740df0728a270caf644fec2a68b34d2cd68536ae25c498df9304c506bd7b
 EBUILD bzip2-1.0.6.ebuild 2045 SHA256 c8d2600e7a05cfe24a1c252ea0a44f66ea6239dc9f87ee8d2c1fd06e32e69196 SHA512 5c8a274078b798d74f66f41fb44691b80f5c077d2f68fd0416fa8d1ab2f4a1fa73d0a6e87c8b8851fb98cd235fd4c10cbc72ef29512b1b27b841e8ed3ab1d725 WHIRLPOOL 8e2215e34cae5792eb025490a9dad88b6458f127ed2dd2abd09e8c973ae5c07e618237b3ff4da1eedebf277f6826cc2e12f859be9ba67df92199aa57e827b04f
-MISC ChangeLog 16614 SHA256 961c30f998fb17deeef7ef3ea8227f0311ed890aab66b180311cf1da7e492ab0 SHA512 bbb9a247f0f6616c5460b15b011fe9bb341939041b980eba54bf4634b0a19aaf6e498785a0b9aa52435197778ad382209b6be42966588a19e7ad5765526d2892 WHIRLPOOL edf3cf2e52a8a283d96fdf5613b988d1b1ba510699b596b0bc504df184b3d5a6cd0c80769e639de2ded91b4057c012db960f3e763e597a60afa226971ef902da
+MISC ChangeLog 16858 SHA256 4d5e811e01e9ee36208bb0f193559963cb69d412e4c1916f2bac1a52dc637098 SHA512 fc266b95626555bb2c4e4fa1ce97fa1c4e4e99e4ed33fb27752518f0eae3802b002289cacedd775c273b597310dcf6070cf769ae6ad821124797436ad5561683 WHIRLPOOL 455f0d500db18d9bf895ef8c9679b9038a02bd860f50bf5d8308f62459de81364229a3d5f45810950019c82f324fe7ead9dc5fecadf58f2c6f42b9e58ca3be05
 MISC metadata.xml 241 SHA256 c9ef9f8a652ceb4655983472cec571c6762f53934447a83b38b311cf9e50254d SHA512 23ed7f7371d00caf97235d7a4f905286637cd286f9e8fc7c0413865dbab0772ff00dd9ecf65b5f199d694b42f032dc14ad9d3ac447cf1bb95124abf9203c0f1d WHIRLPOOL d687e040f4378e573d241a08b46ba7bd0f4c9d5ef4c9cf836a479102e5f8902e67244308747adf34b6bc605511244d37873b796f8089dc3e181a627302843d02
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSyZqqAAoJEPGu1DbS6WIAZucP/3xO6EEGSbpM0r3bs3USlGOG
-Hle0OcsxJy8JMauJ3Z9HswkO+EQFgIIuXdtXLrZ6EgRViqtMPNlHrdPyw7y10FkV
-jt+to2+H74zN8Z8YPBvjS9fMDO6/syjfgkBDguaCiY1iBGXN6KFBfdzpZpCNwmA8
-Dxrr/vkhBCqdVaiq8vMTlWBOx+kauZ4J6KWZinYQTlzb56E5OTv6Q0ODFA81KPPJ
-lQy+HAH/ot8JU83HfvzJamDNtb4eVkdiylcmNUsBSgfBvdCgXRz4JNP3JD31pzcN
-B4XtyOAonpOE+QQs7KwuR6WQz/z5RJkOkFdfY/p+uzJ2FOuaTOEr9Ck3ahoCbRLs
-Hd6DOtJD8wyO1/lZ2qfm4j+2Y/Uu4eILVQ1fnrkdyE/3DUsMUmcEqf7/jO0JuXbM
-+4uOlDqq99vXEUh+YrjJD8smPzKLUIfe0karxHeTc9mA48eeX4hMLf/MzFA+qlxU
-rmhHxCybTS+q1gO8HaEddpD0iX69Z90nnoTkBb84xXNe0mASHlZdogpg4vk+yW3+
-PNC9H1E+q2PeVific/iQSpCARo7uhoyONgiXqfQU7TnLgdC/70kXUdEZ8z1RnPNl
-0ce7/hG9EnWOQj3NGkTSQjIUwU1XNvWzEo9jnMFgWo10R68WmzYja7K2DY19La7n
-ht/MYUkNLrIJVNEvt7So
-=IEeS
+iQIcBAEBCAAGBQJSyZ04AAoJEPGu1DbS6WIAfl8P/j0XMTgb20W6RNeHlhlIyeDm
+T1iDCvFWSlC7UVNBETOPCC2I1f72ZbRWDwerOVqp/cd4f9dYpR608MyfzWb2wcxo
+hFHZuq1LYpdd/jqbxb1s+HXnV0ae2H75mrGlqIzh4rhPep7f0wLIFBznD8cnB0qI
+4TIHCpp34CKy2It3iOYK1vdvQ0dxyc8Ri3uUL6TgACq8eUU9rP4V9Cgiez8vABXS
+1zsCYD3LzGJewshJQIaXN7LhHBwUcXO5fpf4dqAQSXHiME7/8PyUpF0q8Lj8TQo5
+oFbz/k9WyA60fwPZ+uVQBkR4PeAqMUPpTppsVvlpe1MmVPr/4aylYCMW9FCYuYQE
+98qFms8CFOoNfowKYazuwNIiC7FftO7jnNT2YSZV3nEluEZiU8V2q5VKtJ+HP2TQ
+hfY0maTfBBQgHeGJHLWy3BuBym9AKIkPkb/GoPaxuhSxCaTl/oHOVCRl0/0hGxp2
+/WOnMIfTml35OimFsylVCtQ1+9thijnsVy8HF1/iJYS481USC5YqXHAlH29opPgp
+2GDlozaZRVhP+lGC4RAuBYFzaT769IqxfP5ftnM75QoF2NBCN/qFLRV8aCwi+/VL
+tXMlGA3r/UPqRw5TaEJfIW9Ci7uRwanU6zITnGM7XyT3G3lFhzl6eIBXeEZYpqNP
+qLWHDSYvsCr2jPs6vFub
+=Ehu9
 -----END PGP SIGNATURE-----
diff --git a/app-arch/bzip2/bzip2-1.0.6-r5.ebuild b/app-arch/bzip2/bzip2-1.0.6-r5.ebuild
new file mode 100644
index 000000000000..cfb814576329
--- /dev/null
+++ b/app-arch/bzip2/bzip2-1.0.6-r5.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/bzip2-1.0.6-r5.ebuild,v 1.1 2014/01/05 17:58:12 vapier Exp $
+
+# XXX: atm, libbz2.a is always PIC :(, so it is always built quickly
+#      (since we're building shared libs) ...
+
+EAPI=4
+
+inherit eutils toolchain-funcs multilib multilib-minimal
+
+DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
+HOMEPAGE="http://www.bzip.org/"
+SRC_URI="http://www.bzip.org/${PV}/${P}.tar.gz"
+
+LICENSE="BZIP2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="static static-libs"
+
+RDEPEND="abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20130224
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch
+	epatch "${FILESDIR}"/${PN}-1.0.6-saneso.patch
+	epatch "${FILESDIR}"/${PN}-1.0.4-man-links.patch #172986
+	epatch "${FILESDIR}"/${PN}-1.0.6-progress.patch
+	epatch "${FILESDIR}"/${PN}-1.0.3-no-test.patch
+	epatch "${FILESDIR}"/${PN}-1.0.4-POSIX-shell.patch #193365
+	epatch "${FILESDIR}"/${PN}-1.0.6-mingw.patch #393573
+	epatch "${FILESDIR}"/${PN}-1.0.6-out-of-tree-build.patch
+
+	# - Use right man path
+	# - Generate symlinks instead of hardlinks
+	# - pass custom variables to control libdir
+	sed -i \
+		-e 's:\$(PREFIX)/man:\$(PREFIX)/share/man:g' \
+		-e 's:ln -s -f $(PREFIX)/bin/:ln -s -f :' \
+		-e 's:$(PREFIX)/lib:$(PREFIX)/$(LIBDIR):g' \
+		Makefile || die
+}
+
+bemake() {
+	emake \
+		VPATH="${S}" \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)" \
+		"$@"
+}
+
+multilib_src_compile() {
+	bemake -f "${S}"/Makefile-libbz2_so all
+	bemake -f "${S}"/Makefile all LDFLAGS="${LDFLAGS} $(usex static -static '')"
+}
+
+multilib_src_install() {
+	into /usr
+
+	# Install the shared lib manually.  We install:
+	#  .x.x.x - standard shared lib behavior
+	#  .x.x   - SONAME some distros use #338321
+	#  .x     - SONAME Gentoo uses
+	dolib.so libbz2.so.${PV}
+	local v
+	for v in libbz2.so{,.{${PV%%.*},${PV%.*}}} ; do
+		dosym libbz2.so.${PV} /usr/$(get_libdir)/${v}
+	done
+
+	if multilib_build_binaries ; then
+		gen_usr_ldscript -a bz2
+
+		dobin bzip2recover
+		into /
+		dobin bzip2
+	fi
+}
+
+multilib_src_install_all() {
+	# `make install` doesn't cope with out-of-tree builds, nor with
+	# installing just non-binaries, so handle things ourselves.
+	insinto /usr/include
+	doins bzlib.h
+	into /usr
+	dobin bz{diff,grep,more}
+	doman *.1
+
+	dosym bzdiff /usr/bin/bzcmp
+	dosym bzdiff.1 /usr/share/man/man1/bzcmp.1
+
+	dosym bzmore /usr/bin/bzless
+	dosym bzmore.1 /usr/share/man/man1/bzless.1
+
+	local x
+	for x in bunzip2 bzcat bzip2recover ; do
+		dosym bzip2.1 /usr/share/man/man1/${x}.1
+	done
+	for x in bz{e,f}grep ; do
+		dosym bzgrep /usr/bin/${x}
+		dosym bzgrep.1 /usr/share/man/man1/${x}.1
+	done
+
+	dodoc README* CHANGES manual.pdf
+	dohtml manual.html
+
+	# move "important" bzip2 binaries to /bin and use the shared libbz2.so
+	dosym bzip2 /bin/bzcat
+	dosym bzip2 /bin/bunzip2
+}
diff --git a/app-arch/bzip2/files/bzip2-1.0.6-out-of-tree-build.patch b/app-arch/bzip2/files/bzip2-1.0.6-out-of-tree-build.patch
new file mode 100644
index 000000000000..806339ebb6b4
--- /dev/null
+++ b/app-arch/bzip2/files/bzip2-1.0.6-out-of-tree-build.patch
@@ -0,0 +1,79 @@
+--- a/Makefile
++++ b/Makefile
+@@ -53,7 +53,6 @@ libbz2.a: $(OBJS)
+ 
+ check: test
+ test: bzip2
+-	@cat words1
+ 	./bzip2 -1  < sample1.ref > sample1.rb2
+ 	./bzip2 -2  < sample2.ref > sample2.rb2
+ 	./bzip2 -3  < sample3.ref > sample3.rb2
+@@ -66,7 +65,6 @@ test: bzip2
+ 	cmp sample1.tst sample1.ref
+ 	cmp sample2.tst sample2.ref
+ 	cmp sample3.tst sample3.ref
+-	@cat words3
+ 
+ install: bzip2 bzip2recover
+ 	if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi
+@@ -115,25 +113,8 @@ clean:
+ 	sample1.rb2 sample2.rb2 sample3.rb2 \
+ 	sample1.tst sample2.tst sample3.tst
+ 
+-blocksort.o: blocksort.c
+-	@cat words0
+-	$(CC) $(CFLAGS) -c blocksort.c
+-huffman.o: huffman.c
+-	$(CC) $(CFLAGS) -c huffman.c
+-crctable.o: crctable.c
+-	$(CC) $(CFLAGS) -c crctable.c
+-randtable.o: randtable.c
+-	$(CC) $(CFLAGS) -c randtable.c
+-compress.o: compress.c
+-	$(CC) $(CFLAGS) -c compress.c
+-decompress.o: decompress.c
+-	$(CC) $(CFLAGS) -c decompress.c
+-bzlib.o: bzlib.c
+-	$(CC) $(CFLAGS) -c bzlib.c
+-bzip2.o: bzip2.c
+-	$(CC) $(CFLAGS) -c bzip2.c
+-bzip2recover.o: bzip2recover.c
+-	$(CC) $(CFLAGS) -c bzip2recover.c
++%.o: %.c
++	$(CC) $(CFLAGS) -c $<
+ 
+ 
+ distclean: clean
+--- a/Makefile-libbz2_so
++++ b/Makefile-libbz2_so
+@@ -36,9 +36,7 @@ OBJS= blocksort.o  \
+ 
+ all: $(OBJS)
+ 	$(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.6 $(OBJS)
+-	$(CC) $(LDFLAGS) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6
+-	rm -f libbz2.so.1.0
+-	ln -s libbz2.so.1.0.6 libbz2.so.1.0
++	ln -sf libbz2.so.1.0.6 libbz2.so.1.0
+ 
+ clean: 
+ 	rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 libbz2.so.1.0 bzip2-shared
+@@ -43,17 +43,5 @@ all: $(OBJS)
+ clean: 
+ 	rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 libbz2.so.1.0 bzip2-shared
+ 
+-blocksort.o: blocksort.c
+-	$(CC) $(CFLAGS) -c blocksort.c
+-huffman.o: huffman.c
+-	$(CC) $(CFLAGS) -c huffman.c
+-crctable.o: crctable.c
+-	$(CC) $(CFLAGS) -c crctable.c
+-randtable.o: randtable.c
+-	$(CC) $(CFLAGS) -c randtable.c
+-compress.o: compress.c
+-	$(CC) $(CFLAGS) -c compress.c
+-decompress.o: decompress.c
+-	$(CC) $(CFLAGS) -c decompress.c
+-bzlib.o: bzlib.c
+-	$(CC) $(CFLAGS) -c bzlib.c
++%.o: %.c
++	$(CC) $(CFLAGS) -c $<