Version bump.

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 119 insertions, 15 deletions

diff --git a/app-arch/unrar/ChangeLog b/app-arch/unrar/ChangeLog
index 89e4b2c3bcf6..a45b79ff9b62 100644
--- a/app-arch/unrar/ChangeLog
+++ b/app-arch/unrar/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-arch/unrar
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/unrar/ChangeLog,v 1.197 2013/03/16 15:35:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/unrar/ChangeLog,v 1.198 2013/05/01 11:32:59 ssuominen Exp $
+
+*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:
diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index 5223e47f0cde..dc3adc941146 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -2,26 +2,23 @@
 Hash: SHA256
 
 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.3.tar.gz 164660 SHA256 4fdbd461c6fdd4cb9519b46d89a203307f6aed5b90a6b7afc86c50eb8de82582 SHA512 627612ce42253d11353d97f405b5f69c8a6d1f1373a07668e7a3cc894b70101df17148d0cd6a56c7f654a337adffba2c2d8ebe5770558c7314930f6bc08ee18f WHIRLPOOL d835161ac18d50eee876ed907db6f9743f35facdc1086780625fceb3a7b8c7c81a5ffab6c1aca5e2eb0a06db3d21e1af46f9078a163169071b88059dca4e75de
 DIST unrarsrc-4.2.4.tar.gz 164641 SHA256 9432bf798e5f7123f3060f37b75b7c07f36f0091305f46473dcae9154f8cd686 SHA512 54bdc16c940deb6e5759ddec9739381f0e1b5e2279548ac367eb32c4ff79cd496712692feaf46f4ce3b2ccfa8d622b7c45fb8070420b16315226627c45fef850 WHIRLPOOL 197310c41725280d6a5c4fa3da9d8411e419f20e41f6c645534b37d206ce67474c8b320811a7c7f2acbc375ef0341ec57adfe82a6be7f6bdabe2871841669739
+DIST unrarsrc-5.0.2.tar.gz 205796 SHA256 0de354a34e6bbf0b6968327b2cd8e4b8e0a197423079f26ee0df38afc2a5728c SHA512 9256508333c0d653aa8ac8864745dff99d577e17c4c597aa28d032f3604720e19e8ab4843c6e6c2b7d93481354dfc893f80a4a564318d3ec0baf656d85667920 WHIRLPOOL 5728690e29ce86c98cfa46884cc6dc1f8826528be4224674cf2e3bf5236b4cecb24904e85074629412af9a1ecb6a192c000d326190a223775857329198f41241
 EBUILD unrar-4.2.3.ebuild 1281 SHA256 409e57b0b93b50fd65bf308577b9ed237c3b38172709d9a23311b086dc540214 SHA512 d3889eb20ccc67233071f628aac4fd480d1529c1983d6a9841abd8dc002c5a98c918cf2d7a834a7892e0887b77c4df8580238cfc4dcfd7c2459ff3809d7fff54 WHIRLPOOL b9d3895b3b166c2e25927a91dac6fc641851a520cfa15a25cec4aa56a4a0937964984392c4f7da64d6df0eb7e79b07b4dfbb751a8fcfb3b5d2b300b63856b564
 EBUILD unrar-4.2.4.ebuild 1536 SHA256 24a35287af8304115446f7f0dc6955b30fc24ebe1fadda87db09c929b2accdc9 SHA512 bbcfbca3f99252d8af1be291f166c377c3e26408251a7275c6aad0f979fd3ff5f44f225972997675a6fb110acb8d67d014b74dc9fda7cbe076c19bf76300c7ad WHIRLPOOL d2031ed7497bbcf93b57238509b8a8dee688932dce9a9df859ab9eb2c3043e5c5f59f00f021bf9accb75405ba180aeddd14914a46afed3390a2e3dc7701776c9
-MISC ChangeLog 22711 SHA256 f097346fc9e0324e705f5230338955c0d2f144f80af79f271ce888db711d8348 SHA512 433d4e07a2fae822a1c5323fe9c634ac5b8d2e9adffb38cf7790efb8420500502e8318229609aea67956ec07f5035b42edd9e3d03d24bd52e8bca8c03f41b99e WHIRLPOOL 2eb7d1ad9a956e1fc58c302866b56a8e1bf2fdfb024273fbfc3beb690ca7696d4ecec06ef223d36eee2cd1e7e288640d97ba8cf81d5cee7e66ffe61a631748e6
+EBUILD unrar-5.0.2.ebuild 1527 SHA256 eac81f310c36d334d91570221796f8e3900b59a3f6a61e1b0e96cf6da97715c7 SHA512 15b7fd71409419a40aff8e9159ff82aa5b2d84b90f300edc47400ef3c4376d1fb0ab63483d91713d55dabf16b766a7d16930ff33b3644db07eade5cbd3f5b29f WHIRLPOOL 53bef514f7cfced2ace3d8897bf78208dd1c4977b9e52a8768430fda00744abe7d664c8cfb2c845e1c635473c967c4a53c84b3d10f2d4f4a33e2c816568d8a1a
+MISC ChangeLog 22868 SHA256 a9ebc7fca386e9cd2749df4388c96aa8e59d4a9d1bcc5d2b76a4c89720b27ef2 SHA512 1ee3a8460c76abf1cb2fff88c33527d0cbd4243f7237589e1e74108248e9f8f97111188c847098c5863ff032550490c57973e2c6c5ed95de900341ea57261636 WHIRLPOOL 1f389110187d6b834d3c1ac1be9339ae78f90daf615f5543f80ba177890a6f25728065e954f048ca688d5cf275b690cfdd2eae2ceba41701d65f9f2022b7f6cf
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRRJHxAAoJELEHsLL7fEFWVlwP/io0SD7y2LA1n4GFlsagAn/E
-nTVR1rlVZ1X/DoQaTSZV8A0w+9Zhw7IDFWS6H2xo3krdV2xZHCEU7m3B+n1gVHCV
-J/d8f3SYCVyoq+/lLjzLt9krBmYWjwzVH4gc4vH25A6ufYFGHGooHYsa+raUGbo+
-rEwdAQ3Tzw7zMy0qyM3NZ3ppG08IwrFDruJu3CCplay3nGoNxMrJWSfud8ouLGRA
-BMZxdTOu01AngmaRqVe8m/HdB3Ku7Vt6oj3St7NLT8yrB5ZrUiAXQ+dv6JE8bURi
-GN4d9zEE+ODpToc0JuoGc+nsAbLgx3xxTzyzxmjKFOvj/4seX97nx7p7J150/zVu
-hfiQLPp21TcRo5weuu876lmNW2oCsr9M1g50q58t8dxLaIMAVxpknlXnWFJDJ/nO
-CLLqLSyBGvtEyWPsrfkXU9DKQbrU+kjOC6SBRrzF3x2a+p92BUo6TaT0fc8LUJRV
-4agug4nrgiJF4UMFoh8A3dpieJGYPqjls8JQLaCoJ92ePRM9qAWJPeJLgWJ7NXHx
-qJVxIZdAldom76aeVat627Q6CF1jvh4qHl8jhSObZ7E7x0UQWaXms40QRA5sg44V
-UKHj/xz8cEkfIIYCa4rBqrbopijgACEWk69fMdPQeHD8vORJlJ/s/d78+JkVQTyk
-qy13JLQsnsVzhjnHEduK
-=fXcE
+iQEcBAEBCAAGBQJRgPz+AAoJEEdUh39IaPFN+xkH/R19hgN9R977qRFbWNWp/5eV
+PXnvpMS5ZSZkWj4iHiqvAzKv9xYo3dtdo0v7PlWDhvKMx5WmZr3ZwLeqS0EAB/nd
+zrsP7bZmvc7G6CgGceuVI73IsDiTbfdQ6uIVoSIql6oX46YtdvREHsF2N46AmFK5
+ktVRzZLbVODylWtZayXg5pd0fvHORdaoK14nMbIDBn39a1mZcss9rUJ8tmDiS36q
+wSvW+uq8znFkzGcVYdO8adllvEec6pwur9eDFF0ts32qAZLeAxb9u+SZCSBFuTjt
+jdfsdo9x+MT4tvud8+mQz78sVnQBZOM88x0OSWA9s9jwTET9eUZGUSKIVE4/KyA=
+=qmWd
 -----END PGP SIGNATURE-----
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 000000000000..61de7ee06891
--- /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/unrar-5.0.2.ebuild b/app-arch/unrar/unrar-5.0.2.ebuild
new file mode 100644
index 000000000000..dcbb63213ac6
--- /dev/null
+++ b/app-arch/unrar/unrar-5.0.2.ebuild
@@ -0,0 +1,56 @@
+# 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-5.0.2.ebuild,v 1.1 2013/05/01 11:32:59 ssuominen Exp $
+
+EAPI=5
+inherit eutils 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="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
+
+S=${WORKDIR}/unrar
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-5.0.2-build.patch
+	sed -i \
+		-e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" \
+		-e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" \
+		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})
+
+	# 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
+}
+
+src_install() {
+	dobin unrar
+	dodoc readme.txt
+
+	dolib.so libunrar*
+
+	insinto /usr/include/libunrar${PV%.*.*}
+	doins *.hpp
+	dosym libunrar${PV%.*.*} /usr/include/libunrar
+}