Fix ar detection per bug#438160 by Sean McGovern

Package-Manager: portage-2.2.0_alpha148/cvs/Linux x86_64

4 files changed, 49 insertions, 4 deletions

diff --git a/dev-libs/nettle/ChangeLog b/dev-libs/nettle/ChangeLog
index a341a0249c7f..3f422a836d74 100644
--- a/dev-libs/nettle/ChangeLog
+++ b/dev-libs/nettle/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/nettle
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nettle/ChangeLog,v 1.71 2012/12/14 21:45:31 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nettle/ChangeLog,v 1.72 2012/12/14 22:35:13 alonbl Exp $
+
+  14 Dec 2012;  <alonbl@gentoo.org> +files/nettle-2.5-build-ar.patch,
+  nettle-2.5-r1.ebuild:
+  Fix ar detection per bug#438160 by Sean McGovern
 
 *nettle-2.5-r1 (14 Dec 2012)
 
diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest
index 0cc77e40c420..7bda31f00f51 100644
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -2,6 +2,7 @@ AUX nettle-1.14-make-as-needed.patch 471 SHA256 f8552cde7b7c91923c276afca147e9c3
 AUX nettle-2.0-binutils-2.22.patch 615 SHA256 13bba9e32f8c78ae84c4eeafa459eb67830e5504e43dc7497f5091086271775b SHA512 951d3073ee8f2e42ebe345481bebfcd58f2fe80ddb80a1b49e0c3f27ed62c5bc45cf8a8b81b84733d54e2d4ae2db6f0edc6a4d89e3904b598b50de8d193f9e01 WHIRLPOOL 4633905b1a7c6f5c70cdfacebffd98411f9829c4b2da79aabaad63150c146a497214302f5897a9dffefadd6def60ef2028ac82f530eb681da740df0efa332d04
 AUX nettle-2.4-darwin-shlink.patch 2308 SHA256 3a4cf3bac2be0fc9df29341d9bf42636a4979b83e7a115515048617d5f175098 SHA512 1fed076d3ffe53f8e8b0533f1c116d50af4b749dff031e8a0ad8249c7011071cbebc7230c7d0a5a3c63de97c6f236b01975fa63e055d8e082ea7c2d551df2d0c WHIRLPOOL 4df815e82ff5cedd009e9bb6f2a54a62bc729632e1166f9ac92d4f5aa0bb9d50a2b003bc1cdc8eed425cecd9b2d5f60954dd9a638bbef825de4317f55e8cb658
 AUX nettle-2.4-missing-libm-link.patch 636 SHA256 a8506fafe954a4f576f2223f9ff2aa73c5e86ba81aa391c77e74976a91b8903c SHA512 13681c21d7bc1b3ecf86ea57dfd8531312467dd10ba7ab39623ae52d2cae2b77e153049854dc718d1fe1f154c8dd05af17b346aea09eda5d64b426dfa48bc200 WHIRLPOOL cbc9f9b028087e4a5512e97a879700bc231a9e01969b8b5b748af7e09d446a711064a29b4c6cc4f194858b4a52ae2a3cff31c2b89da2644b9ecce1c3542774aa
+AUX nettle-2.5-build-ar.patch 1059 SHA256 c433976f5955035a403461977db90b808c13d07b4bd6b956275fc2fda296d886 SHA512 99f29164a2b1dcb5dac9c859f2503a95c685fed143edff22b18010db3dd64c36eb51200d7cbd96c1dd7aedbfa83f64918187d3616bfce43e013f609fe433ebc4 WHIRLPOOL 2abee40ffc489fe1dbd6d6f8fade10bee1880fae036ec7eee1187ccd98972499b66ef3e31c79dab0e8a99ca850f0858b6c30a75da34e0694ecb8d9910406fe79
 AUX nettle-2.5-missing-libm-link.patch 354 SHA256 d6f3fc36e75c4fa5c8f4d12078ab79bab0433bfae9a3f7506e8ff55baf0545f4 SHA512 35a4c9e18abcd3078359c035c6b2bbdc3d52ee8f2cd8036dc3854e4376cef66dbb283c3426d5ed63a11d2b611699ac227921d00194db362abd453febcfdebd19 WHIRLPOOL c055c8c813dbea23f7885838d6e9c1133701a23e9869d7944d72de23fca06bb882269b97c5e698d5dab4cd1785ce33a62a97e59c05f15761b408378e95c8c66c
 AUX nettle-2.5-static-libs.patch 3519 SHA256 d364c56d38109982a961a82f9a35d39fe4576149b1b8e9fc305966ca3265d974 SHA512 fb441c9790b31543b638d5d98dcfd86ee1296efb6a150c174f88200b5e086883551082c5c50302739caa5e13655690f5f521067cd8720cd9e180bba035b094a6 WHIRLPOOL ab219dbc2656221b4a369968c0e4e37725c762ae4c091ee82ee4f674ba6c4dffb36adb17bedf5534c6429ffde3ab7b0cea05c34719144ebcdb14bb9bbb0389f4
 DIST nettle-1.15.tar.gz 829862 SHA256 d6e540bf4acc857a3b09580e7f61822d352ee83c119579bf7333f0a785f7d9ac SHA512 90178ab6af3d7048aeba888d65d83f77823b800689713979ead8e5eeec51026bac183953d4421276e249c2bcbb26e9528ed304754c951147df8bdcf35a2c6596 WHIRLPOOL 852cbc828d78a3b495607d89daf110781c8c3e410519be6d2495c65745a923ca4c7ad548b475330744b84bf416c4bdf72ae3eb1569d94dcca45ee989fe0326e3
@@ -9,7 +10,7 @@ DIST nettle-2.4.tar.gz 1075789 SHA256 a6009208df6881f75aa1a87081ccfb2ccac1884da1
 DIST nettle-2.5.tar.gz 1113274 SHA256 4aa142e908b0053082d7729fc0155dc90dbe71c8ef5f50f30034805ed5c92c72 SHA512 186c3d8687628d7ce2d0e3880355741970bb6e0354f1b3aa49118e7c729cb65348fa2b1ce3b56dbdf01fbcb25a2bd6d5ce634b8a1ab419f9f93b693321f57ea1 WHIRLPOOL 4229b8a11b3bf45396bad775ead91f9a5c4bb45bde821ba49185a19cd7595e840883e0f90af52744e3aae8ffef17e526c025cc1830b4e228c578debf5a8811ca
 EBUILD nettle-1.15.ebuild 1091 SHA256 72b8395e01466561ba5c0054bbb2cf6297cbcea98d27c8fb01b57e263db667a6 SHA512 46ca663d6677b906796cd54848d8c4117c92f0a76b02805bf963775356570db1a7ccf4ddf6f335d2837f75aca0235c070f656b22eb6483093643da0bcf8e76f4 WHIRLPOOL dfab2f30313d6a97f3176da64e90550c518d481b5b365edad69b27ced79bfeee10d46bac3968b720b7f6eb8f29b8716dc1719984de7497635477d1226a36ff06
 EBUILD nettle-2.4.ebuild 1097 SHA256 b7f725a7d24f5441126f63c77996c35fb2b6ab6363a46e57b12bcd5fbf510601 SHA512 438174edf6ac6ec6b0a4b3a00b7edffdb6a21816d1111fee5e23dddc6cb2cfb8cda7c1db41f3f5e01cc87a267889a679a5ce36ff7f446b17f130a8070ebe69bf WHIRLPOOL 1bf775f2f6c7cbc09512dda20cae8c43573e4436032a33cc508330fb329f9ba04a5159ce896dbd55bf0aebabe40488ed79586d8201870cb1821dd27193893fc3
-EBUILD nettle-2.5-r1.ebuild 1126 SHA256 18cb8b03f8068dde44548d8a032447a8074fa7732d2665f42e80c595455471a9 SHA512 015cc2a7ae02197120381d6198e4fbc215052c6a2698a8f99d761979ff9a5f311318ee30fe9a4d2001112cbc6263ca3486b331c06353bc4adaef64198763a922 WHIRLPOOL 78524377ca3128211fcb08a2a2b0a9aa108be3d129b34fd96eb70d7fbd992a9129a277e904c643dd43da2897114864f88b50c611fd0f27d640fc7686a9e3a873
+EBUILD nettle-2.5-r1.ebuild 1168 SHA256 72ce9ac362d0492a3971a509d09bd40b27e1309ccac300d2220a90b23ad2a875 SHA512 7a6b1689535446def39f367588ca89e70b8599cceacbd2e0908436245887d3753816cbf20594dc48d085c71b432bc956437df9a9ae92f9eb5d079055ba92b23a WHIRLPOOL 20189b6c71f492009d4c08f10779951d8d4cae60ae75b2c0e53680851466ccb7f0b905c9b4c51067ce1b3727e12f9c533f13ae4d4d9bf80bf06fdcc71fb2074c
 EBUILD nettle-2.5.ebuild 1039 SHA256 af811b23075e5f1f6f327ca6a15f0bef3ea45bceee4b642d5b37bef0711b39b5 SHA512 a3b555f337257164893f0e160502f34b3c5b134742d095d341ada4839cd73160c35b721efc6fb83aa31410dc818295c3cc31abe557cc9a2a2be33059ce49dd43 WHIRLPOOL 8b867409ba38014beda5937e6fda825c91f9e29d441c1c3774658fa95f5729301f7826a830c1418633a07a46a3b1afb4673889bedc1f0ed121acfa4a4eda7b94
-MISC ChangeLog 9229 SHA256 d7712970afc7f7bb4f2abb05bc11c2905f9d3dfdc0129a84a72ce1618c3e4d9d SHA512 36e1a7a9b9bc48de20b69da8a6d6a611a22886f3d91944bae6adb11911e39af05928f0fc2cbd5b83915658d32c094d16922c1d3b704bbfec6479fc680084e05b WHIRLPOOL f6db2ed9261c85618bcb1e23fea15969d8b96b237840a19ec66edc83db52f62b75dcad3c22ebd593ee5b85b1e5a567a0496c4fead78151dfa1e3796a060aa47f
+MISC ChangeLog 9375 SHA256 c3e77e34e425d3f769ccf00cac26cbec83018c6bafba411f0481e0150a098d44 SHA512 bfaeaaee84f0182f286401f271c5cb2ec7630c23c8e1e67feccdf22f24a6990da46085c476ce71d3a034ea754bdab002368e7dd5ace98977df5e609939bdabd0 WHIRLPOOL b45257daf2bebd47166f3c7ff0e4ed4580e6124b0e50e6879655b93fabf139915cbbaf3b79b1f0f7316cf14ae6e84a11a8b85eb7cc3d2597dedbdac2322b8541
 MISC metadata.xml 159 SHA256 fabd15e2740a2a68e0bda738d0cd4300b133ff11239802afe7e60aa3862c9c03 SHA512 96a1f7f082adc57e52a1a32666e1206e68f8ff03c728fdb7666ff98c255905977491fc4dfc37bc8bdf5da0eb50cdc408adec357bbd75bd980bc90659cc157194 WHIRLPOOL 82fca1c4b75b090abdb0a4233c8e49fc43535ca6e470f725c1872653ea922b6693e9646bc3ee1fd6f1293ebedad661642cec13b2817fb5315268300f7675a751
diff --git a/dev-libs/nettle/files/nettle-2.5-build-ar.patch b/dev-libs/nettle/files/nettle-2.5-build-ar.patch
new file mode 100644
index 000000000000..636c1fafc08b
--- /dev/null
+++ b/dev-libs/nettle/files/nettle-2.5-build-ar.patch
@@ -0,0 +1,39 @@
+From 3f35444ca2ae842a546010180e2b16cdd0169b6c Mon Sep 17 00:00:00 2001
+From: Sean McGovern <gseanmcg@gmail.com>
+Date: Tue, 30 Oct 2012 19:23:27 -0400
+Subject: [PATCH] Probe for archiver tool
+
+Gentoo bug#438160.
+---
+ config.make.in |    2 +-
+ configure.ac   |    1 +
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/config.make.in b/config.make.in
+index 58ee19c..f42421f 100644
+--- a/config.make.in
++++ b/config.make.in
+@@ -46,7 +46,7 @@ LIBHOGWEED_FORLINK = @LIBHOGWEED_FORLINK@
+ LIBHOGWEED_LIBS = @LIBHOGWEED_LIBS@
+ LIBHOGWEED_LINK = @LIBHOGWEED_LINK@
+ 
+-AR = ar
++AR = @AR@
+ ARFLAGS = cru
+ AUTOCONF = autoconf
+ AUTOHEADER = autoheader
+diff --git a/configure.ac b/configure.ac
+index dea9bd4..737febb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -104,6 +104,7 @@ AC_PROG_RANLIB
+ AC_CHECK_TOOL(NM, nm, strings)
+ # Used only for the GNU-stack configure test.
+ AC_CHECK_TOOL(OBJDUMP, objdump, false)
++AC_CHECK_TOOL(AR, ar, false)
+ 
+ if test "x$ac_cv_prog_cc_stdc" = xno ; then
+   AC_ERROR([the C compiler doesn't handle ANSI-C]) #'
+-- 
+1.7.8.6
+
diff --git a/dev-libs/nettle/nettle-2.5-r1.ebuild b/dev-libs/nettle/nettle-2.5-r1.ebuild
index 19cdd91c5a22..a7e825705160 100644
--- a/dev-libs/nettle/nettle-2.5-r1.ebuild
+++ b/dev-libs/nettle/nettle-2.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nettle/nettle-2.5-r1.ebuild,v 1.1 2012/12/14 21:45:31 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nettle/nettle-2.5-r1.ebuild,v 1.2 2012/12/14 22:35:13 alonbl Exp $
 
 EAPI="4"
 
@@ -23,6 +23,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.5-missing-libm-link.patch
 	sed -i -e 's/solaris\*)/sunldsolaris*)/' configure.ac || die
 	epatch "${FILESDIR}/${P}-static-libs.patch"
+	epatch "${FILESDIR}/${P}-build-ar.patch"
 	eautoreconf
 }