sync

(Portage version: 2.2.8-prefix/hg/Darwin i386, signed Manifest commit with key 0x5F75F607C5C74E89)

9 files changed, 208 insertions, 147 deletions

diff --git a/app-arch/unrar/ChangeLog b/app-arch/unrar/ChangeLog
index 694f032104..ccf0dc4360 100644
--- a/app-arch/unrar/ChangeLog
+++ b/app-arch/unrar/ChangeLog
@@ -1,6 +1,98 @@
 # ChangeLog for app-arch/unrar
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/unrar/ChangeLog,v 1.183 2012/07/15 17:19:06 armin76 Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/unrar/ChangeLog,v 1.208 2013/11/17 15:11:37 ssuominen Exp $
+
+*unrar-5.0.13 (17 Nov 2013)
+
+  17 Nov 2013; Samuli Suominen <ssuominen@gentoo.org> +unrar-5.0.13.ebuild:
+  Version bump.
+
+  09 Oct 2013; Samuli Suominen <ssuominen@gentoo.org> -unrar-5.0.7.ebuild,
+  -unrar-5.0.8.ebuild:
+  old
+
+*unrar-5.0.12 (09 Oct 2013)
+
+  09 Oct 2013; Samuli Suominen <ssuominen@gentoo.org> +unrar-5.0.12.ebuild:
+  Version bump.
+
+*unrar-5.0.8 (29 Jul 2013)
+
+  29 Jul 2013; Samuli Suominen <ssuominen@gentoo.org> +unrar-5.0.8.ebuild:
+  Version bump.
+
+  28 Jul 2013; Alexis Ballier <aballier@gentoo.org> unrar-5.0.7.ebuild:
+  keyword ~amd64-fbsd, bug #477750
+
+  26 Jun 2013; Samuli Suominen <ssuominen@gentoo.org> -unrar-5.0.2.ebuild,
+  -unrar-5.0.3.ebuild:
+  old
+
+*unrar-5.0.7 (26 Jun 2013)
+
+  26 Jun 2013; Samuli Suominen <ssuominen@gentoo.org> +unrar-5.0.7.ebuild:
+  Version bump.
+
+  05 Jun 2013; Mike Frysinger <vapier@gentoo.org> metadata.xml:
+  Add upstream CPE tag (security info) from ChromiumOS.
+
+*unrar-5.0.3 (09 May 2013)
+
+  09 May 2013; Samuli Suominen <ssuominen@gentoo.org> +unrar-5.0.3.ebuild:
+  Version bump.
+
+  01 May 2013; Samuli Suominen <ssuominen@gentoo.org> -unrar-4.2.3.ebuild:
+  old
+
+*unrar-5.0.2 (01 May 2013)
+
+  01 May 2013; Samuli Suominen <ssuominen@gentoo.org> +unrar-5.0.2.ebuild,
+  +files/unrar-5.0.2-build.patch:
+  Version bump.
+
+  16 Mar 2013; Mike Frysinger <vapier@gentoo.org>
+  +files/unrar-4.2.4-build.patch, unrar-4.2.4.ebuild:
+  Fix parallel build failures #461806 by Mikle Kolyada.
+
+  15 Mar 2013; Jeroen Roovers <jer@gentoo.org> unrar-4.2.4.ebuild:
+  Stable for HPPA (bug #461610).
+
+  15 Mar 2013; Agostino Sarubbo <ago@gentoo.org> unrar-4.2.4.ebuild:
+  Stable for sh, wrt bug #461610
+
+  14 Mar 2013; Agostino Sarubbo <ago@gentoo.org> unrar-4.2.4.ebuild:
+  Stable for s390, wrt bug #461610
+
+  14 Mar 2013; Agostino Sarubbo <ago@gentoo.org> unrar-4.2.4.ebuild:
+  Stable for sparc, wrt bug #461610
+
+  14 Mar 2013; Agostino Sarubbo <ago@gentoo.org> unrar-4.2.4.ebuild:
+  Stable for ia64, wrt bug #461610
+
+  14 Mar 2013; Agostino Sarubbo <ago@gentoo.org> unrar-4.2.4.ebuild:
+  Stable for arm, wrt bug #461610
+
+  14 Mar 2013; Agostino Sarubbo <ago@gentoo.org> unrar-4.2.4.ebuild:
+  Stable for alpha, wrt bug #461610
+
+  13 Mar 2013; Agostino Sarubbo <ago@gentoo.org> unrar-4.2.4.ebuild:
+  Stable for ppc64, wrt bug #461610
+
+  13 Mar 2013; Agostino Sarubbo <ago@gentoo.org> unrar-4.2.4.ebuild:
+  Stable for ppc, wrt bug #461610
+
+  13 Mar 2013; Agostino Sarubbo <ago@gentoo.org> unrar-4.2.4.ebuild:
+  Stable for x86, wrt bug #461610
+
+  13 Mar 2013; Agostino Sarubbo <ago@gentoo.org> unrar-4.2.4.ebuild:
+  Stable for amd64, wrt bug #461610
+
+  13 Mar 2013; Samuli Suominen <ssuominen@gentoo.org> -unrar-4.1.4-r2.ebuild,
+  -unrar-4.2.1.ebuild, -unrar-4.2.2.ebuild:
+  old
+
+  17 Feb 2013; Zac Medico <zmedico@gentoo.org> unrar-4.2.4.ebuild:
+  Add ~arm-linux and ~x86-linux keywords.
 
   15 Jul 2012; Raúl Porcel <armin76@gentoo.org> unrar-4.2.3.ebuild:
   alpha/ia64/s390/sh/sparc stable wrt #421221
diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index e4eb8a3a14..0dd4ae9b09 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -4,20 +4,18 @@ Hash: SHA256
 AUX unrar-3.8.2-interix.patch 351 SHA256 9b8a77c64e47d09f5875aeecbbc14ddedab977ad88d190eb9ed08d10876f992e SHA512 da49bd7f3f0e637ebd592521b6381ab95a8491424d6becc61bb66a986e83c9cdf02502468d5c42d40651de7592440e0b7cde247487b80a1b8223c331cc1f7457 WHIRLPOOL 6e63a24f6d74833ec4df11668d6fcbcae5171e4d7d6b3de6248454ae582639f8d9249a7d18e9f32ed4b4b09d092bb1a080bba1fb5dacfa7e3e1e3a6f30e2cf41
 AUX unrar-3.8.5-interix.patch 386 SHA256 9f0251c3bcbc7a9512bed311c26c375006f32058792812d866e755eebd01979b SHA512 b65535e7003bf16b7b42e6ffc55db14e1abe82cce52d1de54492063c58a235e2cccc518da84c25bd1183618621a3ead06fa9af74790a11ec6e4eed8439fc4f89 WHIRLPOOL faa6765bb1c7cfbde4b87076c5bee240a24dfe7aa69f77cd00e14840c2e067eee1246408f105d987fdac4af76ddfce02c48da2d255a2feb8bedb879dc6d9a7a2
 AUX unrar-3.9.10-solaris-byteorder.patch 258 SHA256 0aba1c27041ab8b20d69aba41d0583660e7fa9122ac78522dd7af1c7dad5d08a SHA512 57c27ff5bcae0cdb3f71d6ecab570431edeca71e5248b1c296b1b9c0468814011c1fe65f25fb2b162cf3589538f22c7e93d337617f8acd4e6313b4aa5f6a6a36 WHIRLPOOL e777cbdc74adb5abe2d3e350c8897842673ef74c19bd641dc432c7cd947cbdac555a73150731baf1cc912c925ae8308a9cfefbaea622fba04c246db7b32a6888
-DIST unrarsrc-4.2.1.tar.gz 161564 SHA256 d5b59d98a6604ac41916311bc3b5dce1b94858008fc381aa975311d9248542c0 SHA512 481a1c174fcda7f0dc9b672cf4d94c71c2f3cdc587f45690664c9aaae3e1eab76fc04a2de3221073adc0973f1de529c736bd77a073f8b734b8f6c9e84c9c7d24 WHIRLPOOL caac3decb07011c4ece8cbcf1647ed1c8973f3eb3cfcb15bfff5e36af013ce4d35e8b952314520a15538c4c99077ddacf39ad883d60e4bfe58e47de40d9b3452
-DIST unrarsrc-4.2.2.tar.gz 164101 SHA256 efd5a7053a6efa923618be26f68ae85c2b97e59a27e2e3b3028636df4396820f SHA512 248ef8835e7aa029a5567d9e11475a8b539f9de52f6a00f9082d1e8aaf4d7b9e13b36e3a407c77e751ce98c90824cbba847d0705b31af8b4e032bec6d0bc2a7a WHIRLPOOL 8d9da66e204437c40b84b23e7c5d22e76e5837e9fdcf69122b6e39f78ee19630c09ca2342705a6a6107edb4c4b36f424f44b91f4fadee890252568031fe5c843
-DIST unrarsrc-4.2.3.tar.gz 164660 SHA256 4fdbd461c6fdd4cb9519b46d89a203307f6aed5b90a6b7afc86c50eb8de82582 SHA512 627612ce42253d11353d97f405b5f69c8a6d1f1373a07668e7a3cc894b70101df17148d0cd6a56c7f654a337adffba2c2d8ebe5770558c7314930f6bc08ee18f WHIRLPOOL d835161ac18d50eee876ed907db6f9743f35facdc1086780625fceb3a7b8c7c81a5ffab6c1aca5e2eb0a06db3d21e1af46f9078a163169071b88059dca4e75de
+AUX unrar-4.2.4-build.patch 1154 SHA256 9ef12ee1e1f9529aaa98c02d63f7076048a09c52a6367efad48e1323eb8c826e SHA512 390248fa485c4603b48f0f583ceaaf2c180bf0a8a377b0542dbc7ba97426187f9d0508061f93d1147f472a2f577ee9f1fd01d9d73501bdd811c2a275dd7713ca WHIRLPOOL b19c3fcc0519d2c38c84b470fc858369a747f1bb1577d77e264474d29b4ad028ee1ce5e9d1216e691eea363aa474c547c41709cf106cc469382005998dbee54b
+AUX unrar-5.0.2-build.patch 1340 SHA256 f30c2362646138be07afafb401315ef2ae205d4de9f2b455f733dc46c07e72ef SHA512 cbb65b03bd5ef89972a7d6f286921f4542861b0c4f27b8d61c48dcb09535a316037303e2e44b749af3903d71fb31bbdb9aa117310a7550c65a4669c161bd6711 WHIRLPOOL a586035f92a669079f7a50262ba90875044e484b44473a57054fda8e514e293823a6f3f45c2a48fbe124e7f686adf95a6e562fb78943a92a6d42e0a4ae208ec6
 DIST unrarsrc-4.2.4.tar.gz 164641 SHA256 9432bf798e5f7123f3060f37b75b7c07f36f0091305f46473dcae9154f8cd686 SHA512 54bdc16c940deb6e5759ddec9739381f0e1b5e2279548ac367eb32c4ff79cd496712692feaf46f4ce3b2ccfa8d622b7c45fb8070420b16315226627c45fef850 WHIRLPOOL 197310c41725280d6a5c4fa3da9d8411e419f20e41f6c645534b37d206ce67474c8b320811a7c7f2acbc375ef0341ec57adfe82a6be7f6bdabe2871841669739
-EBUILD unrar-4.2.1.ebuild 1691 SHA256 7a13cf7758953a4caad32a4c16c23b34f5070e9abaebc7e346c27c93d5e62811 SHA512 da5d48e9a274ebe191820187257e3bffc897328409a359130444483ed9b8e3447fd1e1702f0693d45567b3c53211bfdf38ff89a03a80d6f1b1b3d040619ede80 WHIRLPOOL 66e6c4e8704af560890aac089bd4519204854678df5c9cf96cdcb7037e385b417691be8bf9d076b5afd141f35aac567e95430a16a312c809e85d63c88cf0073d
-EBUILD unrar-4.2.2.ebuild 1691 SHA256 7b24c57858f7366712b112ed18c9b4a8dae2457440071bf01e7b9651271ae3ba SHA512 b1016593ce72c38691f9341a12a4edb630da19f35d708259815afd6cf1a024668eee4566981773ffafe2b04e54daf7a063826d0db1b7c00499d6d50bb48060ea WHIRLPOOL 3677a2ad4316ba3de149d13597475ee26002f43f2e1b99fd9dde9c24d808f9a8e565606198bd87d98d8d3aa55cd5c54225b4bcb236e4878d7c33396508e2cf51
-EBUILD unrar-4.2.3.ebuild 1689 SHA256 01adddc8e52c8636a5c6bde2e81794df99a415b7cff14e88c763a435cd7ca28b SHA512 4600e949a4004e370771ff8400c0df78e2221b309888c4db90ccf99dce861c7be8a4617c37e6242bdfcdf24e7b4d636d0b4dd850bf23042cfbc36baa023e3493 WHIRLPOOL 739793a3dca8d4c7d742e5011c5362106d92260303fde6df92ea325fc3e3026435ca5e7c17656dca8afb54ab38b89f8e9bcfa82c2ac575e5cc27d06c84a4a69e
-EBUILD unrar-4.2.4.ebuild 1691 SHA256 b590388833e8f81a807f5fd645fc8dccfb569b3a68819c90c4d409f5b3378c3a SHA512 fdd5a7fec1ca2c755a9a2326e7a1685ecd48518d7b26d29ca45958541371de72a600d33cd05901cd32484214a8cc88aa8c307a9435265e1a3ce3ea2df2b172c1 WHIRLPOOL 2be43aa764cad143251eabe0c2b49f746ddfe14b2d6ad7279cf356e30fce8f4b69bed15bc75a222d915e299f8a45761ee2591cca8f9088de80dab78afc828551
-MISC ChangeLog 21162 SHA256 c069112f18013db429f163708807e244208a307b36715067b874345594bb5f10 SHA512 b2a3946f71caa8a010861c05b6238fffaafb982b08ce6b04033e5ad2e39183a1403592d447345c2c4af7375c0c6ba859e18470f3dc15b236c1157e80332cedb6 WHIRLPOOL b1787d3bc6bd6312de6f69e4bf40167484271813dbeba9ae4a442ca13ef3a70b99d414e63acec669fb76a8461d38f0f51c8195ec1c96dc323577c0b1d497367b
-MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
+DIST unrarsrc-5.0.13.tar.gz 209449 SHA256 71b378c10264b82b8de6f83a8a4e801a98aefd36986425d61657f3fac2c37a09 SHA512 3109adb916d5807407d4dd0e8a289a6258ec30949d6913ebf6ffca7c51a1b6db8682573cce5e03dc2eea154c6a71624c8ad36ff11f34f6dbafa92c63d7b48a4f WHIRLPOOL b75f742e7481ccf9b423419357966df7f9724ee299bd17ad92838ba20a003a62622f4464abff6097694b86062fe1674fef53f59541454615af06fa3c67147bfe
+EBUILD unrar-4.2.4.ebuild 1922 SHA256 1ae23fbbb149075f78cb97ee7e8410210169159efcf17266f2951a0dc9849fcf SHA512 ea7a98db2b7325b8cbefdeeea5769d07e58d16bcd4cd717bbc0935ba6b3f9faa80891ab93190c16452db3b4180f750552777bad8642bd0379782d14de2bfbfcd WHIRLPOOL 16c65edfda0932cceafac76a3e25f632f6256b512c6492f6dacf8a7a9623f2d7752ff457f9f51320b84154cfc86fa1e3a051d8939f076c4c0c1f22251ffe3019
+EBUILD unrar-5.0.13.ebuild 1898 SHA256 f5bb40157d244b30fa1ca04771f898650ad9350eb31dcae35e46b2719c6652af SHA512 c0e359b25a814253420e9b9590915d339988385261cfc83f40b7edacbe1b204463e8b4f622da21ab616315dfa653a05fc7fecdc3b881dadc3a142304cebd18c1 WHIRLPOOL 4765db892ed57907a574ab93487f1f415c3342e8da376a1fe1443a57f6d284de33cd5be7e111094c2577799f00063cbc3f879bdaff3b9942f4f2a432817922a8
+MISC ChangeLog 23993 SHA256 a5ccb0fa6dbf285081f8b64f4ac0058316b366e16f9ed5006c1c41a0ab8a55c3 SHA512 5fb5dad945c469b1f58683b4cba8ecbb16438e984f18693cfc996c0b698999d1fa7f376d902115a3959e061e69a0e29898db832deda68aed732bcaade7faad06 WHIRLPOOL 3521992eb88fdd8dc2f62cca66a7dfa9b5ba88337b61e75e0a3d3f1523804be963e14ca749efd34057e2e8f65b2c982eb528c8ff3cc8ce1544a7ef1acdd57d67
+MISC metadata.xml 243 SHA256 0d3b01bee239974acab3b5c25d987a03b929151a254aeefd3cb5bbd0ee6d3c57 SHA512 730e45ced90a8d71ae4613bc3e368baa66cc49c8b74177d23e03461d8785b20fcac940bef5a85044c9bc2f1db2fceee0de441267448174342caa0fe9d08a7034 WHIRLPOOL ab5dd604416cd7afbdee82d410c8eadaaceb8934ccca1a96c5c3f104f8beee50aa19d561a4fc0728c75cbb4683b822dab290c8031920087685fe732b7358bfbb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (SunOS)
+Version: GnuPG v2.0.22 (Darwin)
 
-iEYEAREIAAYFAlCKztEACgkQX3X2B8XHTomWSwCfS4pxEVShXEi4XRc7E7+k0z5g
-RIMAnjwFQqP+NNzbk+UTVVCHoGBjcdwx
-=7Gdw
+iEYEAREIAAYFAlLVi4EACgkQX3X2B8XHTok9NwCeJrGHj/7v41VTv0QiFowVarMg
+2iQAn2pACNpJpV9vMPsCX1wat8mCQRfq
+=QcV/
 -----END PGP SIGNATURE-----
diff --git a/app-arch/unrar/files/unrar-4.2.4-build.patch b/app-arch/unrar/files/unrar-4.2.4-build.patch
new file mode 100644
index 0000000000..1377ff1a78
--- /dev/null
+++ b/app-arch/unrar/files/unrar-4.2.4-build.patch
@@ -0,0 +1,37 @@
+do not let these targets depend on clean, otherwise it could run in
+parallel with the object compile which runs into races
+https://bugs.gentoo.org/461806
+
+While we're in here, fix up a few other things:
+ - do not bother with `rm` in the output since linking will clober it
+ - use CXXFLAGS when linking
+ - append LIBFLAGS to the individual targets instead of the final link
+
+--- a/makefile.unix
++++ b/makefile.unix
+@@ -116,9 +116,8 @@
+ clean:
+ 	@rm -f *.o *.bak *~
+ 
+-unrar:	clean $(OBJECTS) $(UNRAR_OBJ)
+-	@rm -f unrar
+-	$(LINK) -o unrar $(LDFLAGS) $(OBJECTS) $(UNRAR_OBJ) $(LIBS)	
++unrar:	$(OBJECTS) $(UNRAR_OBJ)
++	$(LINK) -o unrar $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) $(UNRAR_OBJ) $(LIBS)
+ 	$(STRIP) unrar
+ 
+ sfx:	WHAT=SFX_MODULE
+@@ -128,10 +127,9 @@
+ 	$(STRIP) default.sfx
+ 
+ lib:	WHAT=RARDLL
+-lib:	CXXFLAGS+=$(LIBFLAGS)
+-lib:	clean $(OBJECTS) $(LIB_OBJ)
+-	@rm -f libunrar.so
+-	$(LINK) -shared -o libunrar.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ)
++$(OBJECTS) $(LIB_OBJ):	CXXFLAGS+=$(LIBFLAGS)
++lib:	$(OBJECTS) $(LIB_OBJ)
++	$(LINK) -shared -o libunrar.so $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) $(LIB_OBJ)
+ 
+ install-unrar:
+ 			install -D unrar $(DESTDIR)/bin/unrar
diff --git a/app-arch/unrar/files/unrar-5.0.2-build.patch b/app-arch/unrar/files/unrar-5.0.2-build.patch
new file mode 100644
index 0000000000..61de7ee068
--- /dev/null
+++ b/app-arch/unrar/files/unrar-5.0.2-build.patch
@@ -0,0 +1,45 @@
+do not let these targets depend on clean, otherwise it could run in
+parallel with the object compile which runs into races
+https://bugs.gentoo.org/461806
+
+While we're in here, fix up a few other things:
+ - append -pthread to LDFLAGS instead of replacing them
+ - do not bother with `rm` in the output since linking will clober it
+ - use CXXFLAGS when linking
+ - append LIBFLAGS to the individual targets instead of the final link
+
+--- a/makefile
++++ b/makefile
+@@ -7,7 +7,7 @@
+ LIBFLAGS=-fPIC
+ DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DRAR_SMP
+ STRIP=strip
+-LDFLAGS=-pthread
++LDFLAGS+=-pthread
+ DESTDIR=/usr
+ 
+ # Linux using LCC
+@@ -119,8 +119,7 @@
+ 	@rm -f *.o *.bak *~
+ 
+ unrar:	clean $(OBJECTS) $(UNRAR_OBJ)
+-	@rm -f unrar
+-	$(LINK) -o unrar $(LDFLAGS) $(OBJECTS) $(UNRAR_OBJ) $(LIBS)	
++	$(LINK) -o unrar $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) $(UNRAR_OBJ) $(LIBS)	
+ 	$(STRIP) unrar
+ 
+ sfx:	WHAT=SFX_MODULE
+@@ -130,10 +129,9 @@
+ 	$(STRIP) default.sfx
+ 
+ lib:	WHAT=RARDLL
+-lib:	CXXFLAGS+=$(LIBFLAGS)
+-lib:	clean $(OBJECTS) $(LIB_OBJ)
+-	@rm -f libunrar.so
+-	$(LINK) -shared -o libunrar.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ)
++$(OBJECTS) $(LIB_OBJ):	CXXFLAGS+=$(LIBFLAGS)
++lib:	$(OBJECTS) $(LIB_OBJ)
++	$(LINK) -shared -o libunrar.so $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) $(LIB_OBJ)
+ 
+ install-unrar:
+ 			install -D unrar $(DESTDIR)/bin/unrar
diff --git a/app-arch/unrar/metadata.xml b/app-arch/unrar/metadata.xml
index 96a2d58636..0ae854f6c4 100644
--- a/app-arch/unrar/metadata.xml
+++ b/app-arch/unrar/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
+<upstream>
+  <remote-id type="cpe">cpe:/a:rarlab:unrar</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-arch/unrar/unrar-4.2.2.ebuild b/app-arch/unrar/unrar-4.2.2.ebuild
deleted file mode 100644
index e72a0e9ae9..0000000000
--- a/app-arch/unrar/unrar-4.2.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/unrar/unrar-4.2.2.ebuild,v 1.1 2012/05/17 12:00:51 ssuominen Exp $
-
-EAPI=4
-inherit flag-o-matic multilib toolchain-funcs
-
-MY_PN=${PN}src
-
-DESCRIPTION="Uncompress rar files"
-HOMEPAGE="http://www.rarlab.com/rar_add.htm"
-SRC_URI="http://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="unRAR"
-SLOT="0"
-KEYWORDS="~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
-
-S=${WORKDIR}/unrar
-
-src_prepare() {
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i \
-			-e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" \
-			-e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/lib/libunrar$(get_libname ${PV%.*.*}):" \
-			makefile.unix || die
-	else
-		sed -i \
-			-e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" \
-			-e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" \
-			makefile.unix || die
-	fi
-	epatch "${FILESDIR}"/${PN}-3.9.10-solaris-byteorder.patch
-	[[ ${CHOST} == *-interix* ]] && epatch "${FILESDIR}"/${PN}-3.8.5-interix.patch
-}
-
-src_compile() {
-	unrar_make() {
-		emake -f makefile.unix 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 clean
-	unrar_make
-}
-
-src_install() {
-	dobin unrar
-	dodoc readme.txt
-
-	dolib.so libunrar*
-
-	insinto /usr/include/libunrar${PV%.*.*}
-	doins *.hpp
-	dosym libunrar${PV%.*.*} /usr/include/libunrar
-}
diff --git a/app-arch/unrar/unrar-4.2.3.ebuild b/app-arch/unrar/unrar-4.2.3.ebuild
deleted file mode 100644
index eaa4cb886b..0000000000
--- a/app-arch/unrar/unrar-4.2.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/unrar/unrar-4.2.3.ebuild,v 1.8 2012/07/15 17:19:06 armin76 Exp $
-
-EAPI=4
-inherit flag-o-matic multilib toolchain-funcs
-
-MY_PN=${PN}src
-
-DESCRIPTION="Uncompress rar files"
-HOMEPAGE="http://www.rarlab.com/rar_add.htm"
-SRC_URI="http://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="unRAR"
-SLOT="0"
-KEYWORDS="~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
-
-S=${WORKDIR}/unrar
-
-src_prepare() {
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i \
-			-e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" \
-			-e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/lib/libunrar$(get_libname ${PV%.*.*}):" \
-			makefile.unix || die
-	else
-		sed -i \
-			-e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" \
-			-e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" \
-			makefile.unix || die
-	fi
-	epatch "${FILESDIR}"/${PN}-3.9.10-solaris-byteorder.patch
-	[[ ${CHOST} == *-interix* ]] && epatch "${FILESDIR}"/${PN}-3.8.5-interix.patch
-}
-
-src_compile() {
-	unrar_make() {
-		emake -f makefile.unix 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 clean
-	unrar_make
-}
-
-src_install() {
-	dobin unrar
-	dodoc readme.txt
-
-	dolib.so libunrar*
-
-	insinto /usr/include/libunrar${PV%.*.*}
-	doins *.hpp
-	dosym libunrar${PV%.*.*} /usr/include/libunrar
-}
diff --git a/app-arch/unrar/unrar-4.2.4.ebuild b/app-arch/unrar/unrar-4.2.4.ebuild
index 9a927faddc..b70fa9469c 100644
--- a/app-arch/unrar/unrar-4.2.4.ebuild
+++ b/app-arch/unrar/unrar-4.2.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/unrar/unrar-4.2.4.ebuild,v 1.1 2012/06/14 20:55:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/unrar/unrar-4.2.4.ebuild,v 1.14 2013/03/16 15:35:08 vapier Exp $
 
 EAPI=4
-inherit flag-o-matic multilib toolchain-funcs
+inherit flag-o-matic multilib toolchain-funcs eutils
 
 MY_PN=${PN}src
 
@@ -21,6 +21,7 @@ RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
 S=${WORKDIR}/unrar
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-4.2.4-build.patch
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		sed -i \
 			-e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" \
@@ -45,6 +46,9 @@ src_compile() {
 	ln -s libunrar$(get_libname ${PV%.*.*}) libunrar$(get_libname)
 	ln -s libunrar$(get_libname ${PV%.*.*}) 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
 }
diff --git a/app-arch/unrar/unrar-4.2.1.ebuild b/app-arch/unrar/unrar-5.0.13.ebuild
index 7ea7805902..c4262672ae 100644
--- a/app-arch/unrar/unrar-4.2.1.ebuild
+++ b/app-arch/unrar/unrar-5.0.13.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/unrar/unrar-4.2.1.ebuild,v 1.1 2012/05/05 12:20:06 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/unrar/unrar-5.0.13.ebuild,v 1.1 2013/11/17 15:11:37 ssuominen Exp $
 
-EAPI=4
-inherit flag-o-matic multilib toolchain-funcs
+EAPI=5
+inherit eutils flag-o-matic multilib toolchain-funcs
 
 MY_PN=${PN}src
 
@@ -21,16 +21,17 @@ RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
 S=${WORKDIR}/unrar
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-5.0.2-build.patch
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		sed -i \
 			-e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" \
 			-e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/lib/libunrar$(get_libname ${PV%.*.*}):" \
-			makefile.unix || die
+			makefile || die
 	else
 		sed -i \
 			-e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" \
 			-e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" \
-			makefile.unix || die
+			makefile || die
 	fi
 	epatch "${FILESDIR}"/${PN}-3.9.10-solaris-byteorder.patch
 	[[ ${CHOST} == *-interix* ]] && epatch "${FILESDIR}"/${PN}-3.8.5-interix.patch
@@ -38,13 +39,16 @@ src_prepare() {
 
 src_compile() {
 	unrar_make() {
-		emake -f makefile.unix CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
+		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})
 
+	# 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
 }