Respect AR/CXX/CPPFLAGS, and use CXX when linking #464042 by Patrick Lauer.

Package-Manager: portage-2.2.0_alpha170/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

3 files changed, 31 insertions, 27 deletions

diff --git a/app-arch/unar/ChangeLog b/app-arch/unar/ChangeLog
index 915baf6b5f15..e126ef8ae793 100644
--- a/app-arch/unar/ChangeLog
+++ b/app-arch/unar/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-arch/unar
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/unar/ChangeLog,v 1.3 2013/01/10 22:17:58 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/unar/ChangeLog,v 1.4 2013/05/05 05:00:39 vapier Exp $
+
+  05 May 2013; Mike Frysinger <vapier@gentoo.org> unar-1.5.ebuild:
+  Respect AR/CXX/CPPFLAGS, and use CXX when linking #464042 by Patrick Lauer.
 
 *unar-1.5 (10 Jan 2013)
 
@@ -29,4 +32,3 @@
   08 Oct 2011; Hanno Boeck <hanno@gentoo.org> +TheUnarchiver-2.7.1.ebuild,
   +metadata.xml:
   Initial commit, unpacker for various archiving formats including rar v3.
-
diff --git a/app-arch/unar/Manifest b/app-arch/unar/Manifest
index dd191d604680..b80c894021e8 100644
--- a/app-arch/unar/Manifest
+++ b/app-arch/unar/Manifest
@@ -6,23 +6,23 @@ DIST unar1.2_src.zip 3599730 SHA256 653ebb2bb6568e6de9f5513aeaabf13b12ae55159e64
 DIST unar1.5_src.zip 2530160 SHA256 22e9b6c31fb6dea27e59222bfaaa8aee08af92aed1cfcbff407d1cf11be6ea78 SHA512 a6239279b9706f43feb02f7a80993c360ed21d79e448f08fcc40f14ef078f24b21daf3974fc7f5880f3e5188880e903e028e5aaeaeb4565593d9945fbeced27b WHIRLPOOL 7242af7ba9c7a470bf31ca4860b35d00b1e88611083c6fcab872b0c2a6e2e53a6bcf03309c76f322e4334ead736ac0d7f93f5e66863268d334ea1fcf9ab57bf3
 EBUILD unar-1.1.ebuild 1058 SHA256 fd5c5cf3fe262e1d47e4ff74f2918e1b2a3e3b45444824ace8dc93ca652e11e6 SHA512 a68c2d6daa4672a9a51e9e080000400c709150c0b10c390182c1108c6f4c5e5b04493fbdeb1b98273a94a0c41e573599da623cc8df4d937b2a32b4ea4247d969 WHIRLPOOL 25441b8183bccfc8b9c7c3e5d7a2ba2ab0f84a54b8000a737ccccee4324f151e2f78d0b0a8bd18ebdc2314b0f17423b589c0273eee2a933ab03fb879fc6e991e
 EBUILD unar-1.2.ebuild 1058 SHA256 0acf1e26576958cd259385bf1214e344435c57c4606fdf494376e22644108557 SHA512 e96fb141d955822bc8726a6ea5df3c2209821f26e103cefafc5d7c4f56695171b76ba35379380ab4ec71229e54e61c89a6fb1ab3e9b74eb0a77a5db4d5ddb764 WHIRLPOOL 6f638d3cf983577489829b3a9e13c202797b4ecef228e777c11fe63d46760297fae23ad61303ed15d8d515311bc9894181b616afb18f655d987fc24fb5e0f12b
-EBUILD unar-1.5.ebuild 1058 SHA256 bf9e71c5a2b01fddb8b6b4f4c652cfb9bceae53d7c73160dfd4d146fdd7e54e2 SHA512 6df255b8e9b6731daf2b1f14e6f8b3bcb083abc366c5ee4620dab795ece43c2ac1f937d5588f5a5d41343feac1729c04ef48efd25dca881ca2d0f1bbf2deb6e8 WHIRLPOOL 0acd665e7fdcd6774fcbe485efc480423dc648783840284e654b0ed788a2948fdc90255f8f661bd7a1ed5734ffa0ab8ea773bf7439bfd3ed0f505a706299282b
-MISC ChangeLog 1043 SHA256 9ea2f20261631fad10376f20a53ee3aed2f27b6feaad2c944501381c8202aca2 SHA512 91db1329c772f24bead732df848554317ea3d2268a6223cfdedd5df491d5947025551383080976f24b343d7eba31c7b8b9213a9594021c604f5e941e623bb692 WHIRLPOOL 4eb6d5e2c5c95a222c1e057669269033519a75be4b223004b1845673c79101a443950f5be4d9d5c93026721db3c26ab43529beeadc196daa8e19b5d0418dd558
+EBUILD unar-1.5.ebuild 1085 SHA256 f8cb6d18e6aa419683896d29975e19923f1cf1b9668d086c6381fa61d2021b29 SHA512 661b5b54b5dddce9e32911cd4220b743d11ebb44d19e4f29bdd19b9eef812b8c8897cd820f17ad832a777f6df04edd429ff72528f702d85c2eadf43ea4d9c000 WHIRLPOOL b738d603df771613c1906b2f47bb89f779cf86153183ef69f58a03ab41bf8986fcef031cc8a6b8b04ded77a3ce3180727a3a6eb13eaa39b801d390e2719e244a
+MISC ChangeLog 1189 SHA256 fb969ce601760bbff30e47596bb1ccd53cf3021731fea3970ca5f167b444a265 SHA512 142011fc0750601f644e03b79f08412d3671fa963b3ebc11e6fa9111769a0b2af04591d4558fa83512a5a1e92bb448a627611238f6a0ba58c4322e493d710d41 WHIRLPOOL 056e4cee63a15dd30c5ab052696be07578f1ca57bb1d3293fc621f4a616417787105398ab24cd88ac6376ac0d0873655de917ac59d6b22688901cae582b4361a
 MISC metadata.xml 285 SHA256 7462d896945bd964fbe51ab01820196cdced8a5115984c21f9ef6e8ef8d171a5 SHA512 cad1baf7a87347e5fa678826756e595bdcb80f3ebb4d859e43546d5be132b354eaf3a96558095f935ef23889c46350154a2dcb6d209f9293b2ee2c3548ba8660 WHIRLPOOL 8236af34441bcdd634968b517decd93aa59f93aaa135c115df6dcffe23a9260a3d491277e0e0bd02c05eaf57e2e53cff91936643e68a5935736af470dca0b398
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ7z4ZAAoJEKWIAHK7tR5C6OEP/3voih26GASwmNtm+99Z3FWE
-FE6hcO2WxlPOVPh1kPY+LdSYUc66GY5b4Nr5FcPoUfFB8QS8GlUDQpOnz5Oqd9Pb
-w9cyRnqpI4j0Tqzig2EUYs3naMBbDTwSUXbLVikJTBGz8oAonDDOvjkz7Ch9tGNJ
-myrNKUQI2YQIq/KlUy6cRKBeGNAvjImjvSUsgQ9IaL45W7+XtIJx1XMH1u/PkSPL
-k30k7EozX7NyisThOyeieB8AFfHdF6o1I6nXM+Q05obLIax2rV/nudEjrzxplZJy
-l6RJxOGK9CMrbRfsWIBJudF1u9QtaSZU9d6WguTvOXHmljWMeSosLyupiP2TNcBG
-C6/G4cO0L+sCVvDcfcOO8S6QqYP2E43wWLij0bSfplr/EfDjUt9bCRbpq5eMncum
-VsgfZqZcga1EylfjTn812IKeDlksaoBTIlfuoANsEkZxgW7yZyWZfD5YjJ3uyRuh
-K1UhWNLDLAaeE6dpSDPnzrG0Wxg5Kjf1UsYX9puzct7DZVhkRGCTV7pQ4HtviN7c
-8mA664VNzQWvie79xBzYAvQkqc6OQr4CHu/t0JMaww1Yb6cBjZA4pXGcV/mO3ImW
-aBXcYwRAKO46FP2OGE0kjmiGgcEAclB2q64L1+b0+Qzsuw9KsUhNI5z1mk0L5fRB
-faGW1c4F4YCMLsDN69kU
-=cYP+
+iQIcBAEBCAAGBQJRhed/AAoJELEHsLL7fEFWMOkP/32GNKZ/Ga83nC9FMM9oHtP5
+0Fxk3MCH5HleVnqFeo1B4RG5OW8Rtt1OH5HG11QZ9h5f3NqdTvmY1R1j/+ZwkU0O
+b5lTlx3pptVnCgHCtxnRxBj+9Ywa2/gnYWflAHJrKQBcjacfBUAYRrO9DxGgZLys
+E7oNcRRDXIPbw0/isui0ecH4JxNrIQAnASXPss6715bwz2knkx0ZOc7VOcZUXgW7
+eKg/09aadYAZMAfMHu+tHLJ/Auvrm9ASBvffhYgGdQk0JvMJdO6xzBtwypCIYFqC
+a7CB4STIFMok+tVyBTmYeC2IxgtOUazUsszNSlRzPb3u8kSZqv05YZJzL8sVyqRP
+rWKj+vyptii4WXy1FGT0CN1TINU5S3oSBZ1ooc5ef+J9IAGMEByLmFkA7a0UXkRM
+/Hx+wOkYFI3A0Z0YCQ3ADiHhOo1S6V+1x9JKsdHzYYVBwGaUqLCMk6+pJSsrq6px
+eMx5JBwdyno1Og/sZ7TVlmkDf8ePTWQSGa09AfsDqZQ5FStHFNu4qY7p6lb0CDrR
+LziX21C+DapreZpAyu7YLWfsvz8xOG283moDiiYV2w4t8xO2bqLRNg0uEEopSxKk
+zXsRkFUQeBXBZYuNo6W0E5LWlBG1/xh3BWjb+Fg8XaSN258Z4CUF6B2DAfwt3t58
+hyux2u/YZUGvhmad5TtT
+=0wP6
 -----END PGP SIGNATURE-----
diff --git a/app-arch/unar/unar-1.5.ebuild b/app-arch/unar/unar-1.5.ebuild
index ca0c2a7bf976..bf71293ae8c4 100644
--- a/app-arch/unar/unar-1.5.ebuild
+++ b/app-arch/unar/unar-1.5.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/unar/unar-1.5.ebuild,v 1.1 2013/01/10 22:17:58 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/unar/unar-1.5.ebuild,v 1.2 2013/05/05 05:00:38 vapier Exp $
 
 EAPI=4
 
 inherit toolchain-funcs
 
-DESCRIPTION="Unpacker for various archiving formats, e.g. rar v3."
+DESCRIPTION="unpacker for various archiving formats, e.g. rar v3"
 HOMEPAGE="http://unarchiver.c3.cx/"
 SRC_URI="http://theunarchiver.googlecode.com/files/${PN}${PV}_src.zip"
-LICENSE="LGPL-2.1"
 
+LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
@@ -25,16 +25,18 @@ S="${WORKDIR}/The Unarchiver/XADMaster"
 
 src_compile() {
 	emake -f Makefile.linux \
+		AR="$(tc-getAR)" \
 		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
 		OBJCC="$(tc-getCC)" \
-		C_OPTS="-std=gnu99 ${CFLAGS}" \
-		OBJC_OPTS="-std=gnu99 ${CFLAGS}" \
-		LD="$(tc-getCC)" \
-		LDFLAGS="-Wl,--whole-archive -fexceptions -fgnu-runtime \
-		${LDFLAGS}" || die "emake failed"
+		C_OPTS="-std=gnu99 ${CFLAGS} ${CPPFLAGS}" \
+		CXX_OPTS="${CXXFLAGS} ${CPPFLAGS}" \
+		OBJC_OPTS="-std=gnu99 ${CFLAGS} ${CPPFLAGS}" \
+		LD="$(tc-getCXX)" \
+		LDFLAGS="-Wl,--whole-archive -fexceptions -fgnu-runtime ${LDFLAGS}"
 }
 
 src_install() {
-	dobin unar lsar || die "dobin failed"
-	doman ../Extra/lsar.1 ../Extra/unar.1 || die "doman failed"
+	dobin {ls,un}ar
+	doman ../Extra/{ls,un}ar.1
 }