Build the lib & bin in diff subdirs so we can avoid the clean step.

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

3 files changed, 35 insertions, 23 deletions

diff --git a/app-arch/unrar/ChangeLog b/app-arch/unrar/ChangeLog
index fddb7a2f6186..83201b420f63 100644
--- a/app-arch/unrar/ChangeLog
+++ b/app-arch/unrar/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-arch/unrar
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/unrar/ChangeLog,v 1.237 2014/11/15 04:16:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/unrar/ChangeLog,v 1.238 2014/11/15 04:17:12 vapier Exp $
+
+  15 Nov 2014; Mike Frysinger <vapier@gentoo.org> unrar-5.2.2.ebuild:
+  Build the lib & bin in diff subdirs so we can avoid the clean step.
 
   15 Nov 2014; Mike Frysinger <vapier@gentoo.org> unrar-5.1.6.ebuild,
   unrar-5.2.1.ebuild, unrar-5.2.2.ebuild,
diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index cefd82ee0d5a..dd75c0f5893c 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -2,24 +2,31 @@
 Hash: SHA256
 
 AUX unrar-5.0.2-build.patch 1340 SHA256 f30c2362646138be07afafb401315ef2ae205d4de9f2b455f733dc46c07e72ef SHA512 cbb65b03bd5ef89972a7d6f286921f4542861b0c4f27b8d61c48dcb09535a316037303e2e44b749af3903d71fb31bbdb9aa117310a7550c65a4669c161bd6711 WHIRLPOOL a586035f92a669079f7a50262ba90875044e484b44473a57054fda8e514e293823a6f3f45c2a48fbe124e7f686adf95a6e562fb78943a92a6d42e0a4ae208ec6
+AUX unrar-5.2.2-no-auto-clean.patch 446 SHA256 3c458b58f8ee61f92c747abd8fa78dc7e9bdd7133d018c30492f276c6b9f3670 SHA512 e360b45555af804de8aac577a99ea682cd699b30988239b62197d222b41c26e129fc08b8c492e69d59249908c035f3b68db5cd4d998faede942563ed82098d72 WHIRLPOOL b89451a9c987852850f26fb690c8a1b7babfdca9485a22c723a8c7d2929a8b59b47e9e4ee386ca201acb827b85f59953dc95ab3fdc5ead9622c650908d740edf
 DIST unrarsrc-5.0.14.tar.gz 209707 SHA256 e276ea30a2dc9b8961a4268772e5b6caccaa984664e2d5255a43fcb0f5d59806 SHA512 91b05bd2974e0a1cb8bd8f01ee90637c9c48da71a4ffa74e161de969f17bedbcda0cfbac128d366ffa5065e8195004fe82763a2a1e8628f0016621b1c2d364f2 WHIRLPOOL 665833a5cac5cfddaa6bf852b6820e8447604019286f7f81dce910ad49b8eccf5a4ceab2c1177837e71492ba0c37d2d288b78eb0a531fd47d34cdd8256fd7f19
 DIST unrarsrc-5.1.6.tar.gz 215185 SHA256 3c38eaabc655527244fd0c3ba3beff567ea24aad37d448488643242fd4cf41a5 SHA512 a7a7800ac94850320ce3e2dd24c5005694dd59360b7f3fc7886ef241153e471459b0b9397d1dacbc3adcd19044cdcb8a8a847e16d7b224af149a1455f46fcaa0 WHIRLPOOL bcb9d1b60f42357cb236cbb5e86eb19dd4ed623244036fc1e8fc3759eef3d4002e6ffc90d3cf5b5200e81fe018a2215c0238ee2aac7148e51f130e43ad3e5ea0
 DIST unrarsrc-5.2.1.tar.gz 217272 SHA256 a075a8943412abb2ff5600038330a3d5a8f5a39cbe8e92543cc2c45b6247d05d SHA512 bd89acbed0377f48c88e5b9f6c3701dff1d0a5a65e74e9668690daf0ce0188c74914ed7edb093c0139b0507cf0785790fd8505be7d54204d16bcfced64b4dc29 WHIRLPOOL 6e21e981663eaa14e5d94553cb8fb93db601fe1058f73fc32d3f9a30f399210e71c657d342495d1be18b0e011a5677084242e01b5dff8aa476379bcbae1f7857
 DIST unrarsrc-5.2.2.tar.gz 217481 SHA256 4c134a739467dd0a18bd8aaa48f32750335c842d8a27e11b955ccc33a73ac834 SHA512 ae1d9c3009b9e632bffff54553c0ccc347e59a77236b0a76d9fe603285e17229ce295e718ca6e7658fb050a3145a03dcb2daa6e704cd459d2b7a6eb1a101daa3 WHIRLPOOL 6e3e98be8df13729b89a0c64e775c148ac560c31bb2ff8d61c7ba3ba75421da698e702336604944787eee5e3edc774ee09df62395610c4af0f6262f5870134be
 EBUILD unrar-5.0.14.ebuild 1538 SHA256 795e82c90d96c9a1e379e56259e42edf545c6407675bc5a943ca083558c0e1da SHA512 f5e9db6bf5d097145329c085e0b560b9b5a44e6089174ece3570b3a887fe55ff1489c74166977f700e2ec10af38942f0bf548b867e3a598ed4d738d6c7fd56c8 WHIRLPOOL 9c21cb435005f004de6402a1175ee75deb3decaf2876fd70acb56a92e6ed02649bb7f772a4b20da9cd9e24018ce0a01aca6a12d0beae11b1cf1c2aa3351a6718
-EBUILD unrar-5.1.6.ebuild 1823 SHA256 4f5208259fc74d2062b3c524356f6074fa96aa895297ae126e2b2addae09502f SHA512 08a8b2742770db43d11e715cb8bdaa62ffd6cde8f920e0dc6e7334f57d62640e7714b2608a1e3b6613a59be18d0646db493eb695c3b73d58bc2fcfbebcc93924 WHIRLPOOL 58151bd804cffd6277f2e3abcde02d25a4524480d3a449ca370124ed2cc8e1d4fc20b70ee6b61141ed05673e04f4458ab1907589b97c7a93af35c82a0f656257
-EBUILD unrar-5.2.1.ebuild 1830 SHA256 0dd5902ab6333d7e17cb0cc332626c60d3d37e801357913ef6a4a264a999d1cc SHA512 5c312b9b469ae22878e6d9caae72c3c73409226e6c8ed6b766748544fa9e0cdcf7bfe2c76e35a89b7e16e826584ab53e4c70ffd62cd96a9f8629794d0cf04cd0 WHIRLPOOL 5c68bbfbb14bada22862130e73b69de0d665b67d32a0a886d757e49960622812b88b5cc28cb5b810911adbf8be671eed3eed548f252680d2d699ade9f9c41240
-EBUILD unrar-5.2.2.ebuild 1830 SHA256 f11c2c6d83c8747fbcbd2fed919af847ae83191c98080baa35bfda86fd7e1138 SHA512 873e77c607c5269edb8c4805268fc4069de53dad517c47d5709fe3582252acd37aeebdb5ca76d0b83c7932a1b6c8c3bcf1e02d1bb597985ea9e1cf5cde04130b WHIRLPOOL 81f6a609c5888aaacc386cd0f331220588d3d6f871fbe46616fcd623cdf8f75761555ba746b82ff227b3f2a888cedb1f221247c28c12fe699ba1dbf5da396594
-MISC ChangeLog 27004 SHA256 668569b3a046a713b3d52cb5e37f7080530831e69552b3612cea5b87db646122 SHA512 46ebcf0bc395ffacec7735142b333a56f2993e91a36a447cf500dd1b38b9a0a3b07a0b0e264dd7548235680229298e94a89a9ab827a37746758ae96964ec5c2a WHIRLPOOL 8e563a52033847e8299e720c6dc0f30f4d8cbdab310d18aec2867dcab6d15843ab7fac0bb838e6859281dd32b4c7fbe401db7535c9c23ea94dae25fbb1b08b2c
+EBUILD unrar-5.1.6.ebuild 1876 SHA256 7628a5c2b8f7796f3b5a6e8dd309255ade2daae3e41f2c9c4f8ccfc03c8d52f8 SHA512 a167422a876037853f7daaf629674a57a51078c0094d347fa4e479e5699bf95c24b8306482c89098b24903b905c392ee297ed081cbdf58721e70ea815fe62496 WHIRLPOOL 452150af717937693f7dfa248334364db36d53738230e7a53b7c36cb5a57057527f2a9201c12a00130bc949d2fa42f94cdb2dccee870dcad58307f13767c8ea4
+EBUILD unrar-5.2.1.ebuild 1889 SHA256 64d75ec4537f3c00ac2e0427d560af1b67d1113bbeea8f528ea0d68fd158aa8e SHA512 7e24fd580a2afdf3579c3f8b552468ba3a0c310c6372d498fc9f1d13b595f01ed9f325fc7550362be397bec1535ff3f35ce6397a2f5dc8624e69674aa97b2a93 WHIRLPOOL ac8d17a1e9e6643f9439f7abdbf8ab45ca2df3ae5877b1f7783bea9d9cce981d88b080a08130ef70eb0db437e07b506949f0a99067a8b6dda54afe5a9f55c5d7
+EBUILD unrar-5.2.2.ebuild 1910 SHA256 d3d12982dd9f6ee0fc8ce66864e56bfa116d0c8aff7dbc4e9ef702006ac3e944 SHA512 8225bb2a861d9fde49ef926bff1dce74b47aa15b0a6ae2935bec8bdc50a9d1e57682f1c7e4f9793bc92d23c8dea2ad3bb769925317fcb532c5e3f62fe5d9bd28 WHIRLPOOL 3a9cd43533b4bd0f2376807da842682641d42a5516ff6da4ddf328b94c0ee6eac912df8c290d82110718702f739fecab40d4e675bfb6e1bb713018f896c5189a
+MISC ChangeLog 27488 SHA256 f8f2acc09f0c550180837090b2a0d6b0484b08fb796918225e0f2dc87977f94c SHA512 b6b66477c95ea26912b0b90bc066cc6b02a0262f767c1f11d6f290ea8b62b78d6484876ee490110b77ed5d3cc233a711e83c7f63a38c493d8c00245f6bac1da5 WHIRLPOOL 4399ceb60f74296c3c7ebfc906b2d7868c1603822f7d329b58fa37e92bb4544075346a08792760afe10dc9302d2dfccd6951956df14c8fa82709222474985985
 MISC metadata.xml 243 SHA256 0d3b01bee239974acab3b5c25d987a03b929151a254aeefd3cb5bbd0ee6d3c57 SHA512 730e45ced90a8d71ae4613bc3e368baa66cc49c8b74177d23e03461d8785b20fcac940bef5a85044c9bc2f1db2fceee0de441267448174342caa0fe9d08a7034 WHIRLPOOL ab5dd604416cd7afbdee82d410c8eadaaceb8934ccca1a96c5c3f104f8beee50aa19d561a4fc0728c75cbb4683b822dab290c8031920087685fe732b7358bfbb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUXmfwAAoJEEdUh39IaPFNilEIAJQjCBnF4I4qYOhrhS0FcE74
-cZhGpIY8rHQ9PuRqBHrBBTpiM85oNyKqhl5Vh1+oot8ozE2oTkjYX+C1uJsRwDjQ
-lNDJauK5Bl55Ip5LG+bY7yIGegCoBI3qLceUm7sL6dIu6RtFwQSWF6OvINU6W4by
-312/RZ2wTJYP93GvL+Tiq8T04BnGO2T+8vWRYEFVE6FP/S7PnO3ajwT9V/kBS/8X
-d93fDqrCzKtGwnzvkehBCafBhjC56XV8LYlNxg/BCE8a/WeDxvf74uEd2/SKwRh/
-M1OP/jfDDqsW1jfMx8uTug7s6XkYtfTQyMzi9sblPeRci9BlCPiWtejwlR4JbfQ=
-=xFYM
+iQIcBAEBCAAGBQJUZtPJAAoJEPGu1DbS6WIA4aEP/234lFYKF4pe27/xypYBxiEB
+9mpVPmw8WEb/IpoDCuNiQuhA3wmBcHSd3LoiSL/YqNOV0G1LafD/qpE4oJ5n+mmW
+LaPxruUxtnh9ZlGL95UDY3VEennQohwC3t0gDurKyi5E3Ruk9RVcd1g6baz6ZIEF
+iBOFZ6+d+vraVOt+etBOJbZHvjrtUIZlvXgPFUaRUbJYJnU0mjcphQK34quAXXRP
+cPyYcjrNMorFondIFQCIu+VVKQFqV/IzJ9pU0iO+ZO/tCVBkYTiB0JcVPM3bIW1B
+rWpF4pvkzY3u9yr3M9045hvaJ0J5TwwipA7rOkP1PRAThhwjrSwt/4M6XiDfX2H2
+tFV+aGgQLpFpWiw3KIhLKZQZzWvtxExYMYl1AKiQZGFRurMI201ESJ9YT6doQ9NY
+rHlcfy7FSGcJgnhPXHyOLeTcrHP2u+4pLjXUQ44BchYyjOY/XnSNM2QTEiiXPAJA
+G2uAvIE+3WWgPr/gLPw2NbaVvQ9JdOqi81Hrfpc7D/reoE/R9X4y8dF9TrglU/Ow
+LlNn8u1VR1ZrPdsFPq4K82EHsF9Tq2n61TtQeqHUifwan8Oq5tajUKsmjo/Siuz7
+tC11y1MzwTqMz9w2WIJzNlZHasVmfJ7h2WL0Q1bM3aw27bY1YcFO7mP2V/s1Yb4j
+6lOySK9S+SE9yVIhVcuc
+=Vl3e
 -----END PGP SIGNATURE-----
diff --git a/app-arch/unrar/unrar-5.2.2.ebuild b/app-arch/unrar/unrar-5.2.2.ebuild
index 02cd44fe9e50..4715ad5e334a 100644
--- a/app-arch/unrar/unrar-5.2.2.ebuild
+++ b/app-arch/unrar/unrar-5.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/unrar/unrar-5.2.2.ebuild,v 1.2 2014/11/15 04:16:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/unrar/unrar-5.2.2.ebuild,v 1.3 2014/11/15 04:17:12 vapier Exp $
 
 EAPI=5
 inherit eutils flag-o-matic multilib toolchain-funcs
@@ -32,27 +32,29 @@ src_prepare() {
 	sed -i "${sed_args[@]}" makefile
 }
 
+src_configure() {
+	mkdir -p build-{lib,bin}
+	printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
+	cp build-{lib,bin}/Makefile || die
+}
+
 src_compile() {
 	unrar_make() {
 		emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
 	}
 
-	unrar_make CXXFLAGS+=" -fPIC" lib
-	ln -s libunrar$(get_libname ${PV%.*.*}) libunrar$(get_libname)
-	ln -s libunrar$(get_libname ${PV%.*.*}) libunrar$(get_libname ${PV})
+	unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname)
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV})
 
-	# The stupid code compiles a lot of objects differently if
-	# they're going into a lib (-DRARDLL) or into the main app.
-	# So for now, we can't link the main app against the lib.
-	unrar_make clean
-	unrar_make
+	unrar_make -C build-bin
 }
 
 src_install() {
-	dobin unrar
+	dobin build-bin/unrar
 	dodoc readme.txt
 
-	dolib.so libunrar*
+	dolib.so build-lib/libunrar*
 
 	insinto /usr/include/libunrar${PV%.*.*}
 	doins *.hpp