Fix multilib issue, bug#543892

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xBF20DC51

diff --git a/dev-libs/nettle/ChangeLog b/dev-libs/nettle/ChangeLog
index 6eeb3a3de39311cdfc09ce2ceb1a73e85b850cca..ecf29cf2a3ee93f1b6209dd4982ebafd31390785 100644 (file)
--- a/dev-libs/nettle/ChangeLog
+++ b/dev-libs/nettle/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/nettle
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nettle/ChangeLog,v 1.118 2015/02/28 21:35:59 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nettle/ChangeLog,v 1.119 2015/03/27 06:41:28 alonbl Exp $
+
+*nettle-2.7.1-r4 (27 Mar 2015)
+
+  27 Mar 2015; Alon Bar-Lev <alonbl@gentoo.org> +nettle-2.7.1-r4.ebuild:
+  Fix multilib issue, bug#543892
 
   28 Feb 2015; Robin H. Johnson <robbat2@gentoo.org> nettle-2.7.1-r2.ebuild:
   Oops, changed old r2 as well, revert.

diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest
index ef9551190015dcf2d72795ae9520344c09f84a2b..636b29429c8cd0aceeeb488701259e54b7f5a07a 100644 (file)
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX nettle-1.14-make-as-needed.patch 471 SHA256 f8552cde7b7c91923c276afca147e9c37b851b60896e1c9d5eb729ecd5bbc324 SHA512 fa5b722875b45617df2099ab3542f09dda8331b6dac9aa1f290a0b4f33b796b87e2026e7900109af103ac23aa3910dcdd6c45df4801ac809a1696843493a9760 WHIRLPOOL bf21b6ba4b7e5e09212f70c4ab0dfcfc65e4ee73365a1f7e3a37205d536082fcc4402b267aec7b1e3776c8df291bb605004cdd227b6ec3f7bd80905a5d21712d
 AUX nettle-2.0-binutils-2.22.patch 615 SHA256 13bba9e32f8c78ae84c4eeafa459eb67830e5504e43dc7497f5091086271775b SHA512 951d3073ee8f2e42ebe345481bebfcd58f2fe80ddb80a1b49e0c3f27ed62c5bc45cf8a8b81b84733d54e2d4ae2db6f0edc6a4d89e3904b598b50de8d193f9e01 WHIRLPOOL 4633905b1a7c6f5c70cdfacebffd98411f9829c4b2da79aabaad63150c146a497214302f5897a9dffefadd6def60ef2028ac82f530eb681da740df0efa332d04
 AUX nettle-2.7-shared.patch 2674 SHA256 d71a578ef9eb153770eb98a4741815e74556d101c9373d8b6884871708dc48f3 SHA512 3a0599356a411e03a3ac5284c03b6bef046e170263a41e5504b3ea1403217eca3508d423a207e8373c596491ac95dfca4bf1d52b2c726e7b0c42f19a7499fa70 WHIRLPOOL 33929850b65edd1e793ac320919c5cde65ad2bd09757a68cfcc8beb5596ea120412e5cad0ba85054c37a80f132b693d69df67281c407b15c55fd9ecb35733a70
@@ -7,6 +10,14 @@ EBUILD nettle-1.15.ebuild 1087 SHA256 81e6ce1502e20b004614beb569f16d003d235bc7ac
 EBUILD nettle-2.7.1-r1.ebuild 1732 SHA256 8dcbe24bff1ea4af663d76532408b56b4bc3cd224bab60aff2322108802eebf0 SHA512 70d41ac4b3414d1b407320a54f3b3ee0664e415e1ffc4715c705c79211e57130792eb3d33b01526a45a5656c093b3a54c9f73ab8da09b4435ec05e0fb647ff1e WHIRLPOOL 79093e3c4f8e08e1f51e9f8db2352ed6040043d4eaa2f4acc54a5cf6e69d87cabeed0f8aef17ba1dcaf57e4683254ded36f8d67fe0c3d71ea0de5b40eae2ab5a
 EBUILD nettle-2.7.1-r2.ebuild 1796 SHA256 5a9dfe1126ddfd6dbcd941f743276ec1ef5d38a94e3004b045fc7addbf1dbc8c SHA512 00d318e2f2e4fd1a10c12ac98f6fa6d325ac3db1dbb267158d88907deb3253d8e620ef4e931c80eef737edd2726662ee647a2de582d97609e08fbb51e03d165d WHIRLPOOL f1dac582dcf83ceeaf6eaf5795f4c1e260d0e7808663438f2fa71bcc4127765e5cd4c2a21d983e227fa306a3036b6ec5aa9ecfa0e0ef17359be82663f58fa410
 EBUILD nettle-2.7.1-r3.ebuild 1816 SHA256 2f2b5e8a5e6625db528320a77bd7541ec87ea8226164d3a17670e6a68688fe7f SHA512 7655722a5e20081468b02d70f9090e83ad2dd1bd4e21d76e9ebd20512217f74aa8c4b7493891335b9ec8d80d5dfd489cc9e82a091a08317dcc0e084c8159ebf2 WHIRLPOOL ad421d5215a12fec2c21e37a115bfbcecf53378a30a2758bf4314a6f3d5182f5b68dbfa32608f78ef7c70124c5faaaf8c60ac5a94f6f835a60e3855eb38d76c3
+EBUILD nettle-2.7.1-r4.ebuild 1884 SHA256 7ae5553ad49582e03de876d2561004cd739335b649510e450f484d27a0d5ba6f SHA512 0360fb76c50515b3f1de4e2a4c7c406a92089bada6f7a2c19dab517bc8eb2fd0fd366245397286ae8055005de4c522fefa6dba1bbe8ee025d7377ed6f2a7aa39 WHIRLPOOL b22819b212826c6dad4f022f69e3ac2ab8c5b3c4fcd07b2fc4f421324d82d14de9ef7df55cccfd30ad79fe77e6c1cfc049a39bb109058cf5ebfd12b73d937e00
 EBUILD nettle-2.7.1.ebuild 1456 SHA256 56dbfde5292cb443dbe100a2ad5e24912af39efd541ebbc724656f95bcda334e SHA512 d1f93d6211b27cb8d4b39a245b78af346f1d20e908caacd07d278787520ca4e4c331abeb8d8d4c8d63aeba1f13e2ecf29263fbaf0dee07c1d5cd740c4bc20f5c WHIRLPOOL 0ca9ee2079c0fa182b94bd94796f5c2e42809bb4a68d87a0c64053a9e4ad4810c9eb6f7c3ccbd0409c2aa08adae0763fb4ed573930c6a0b20609e976246bf6a2
-MISC ChangeLog 15623 SHA256 d5f456d9800f4a1985de8a7a14da390fd08b27b9fee161fb6c1d7aa08f8d4873 SHA512 c47de336cdc96c2f121274a3e0c6e6bcee41826a0d66eaa6c7812bb2105cd6963bfccfe2acd756f30ead5e97e2b5106620930534f1e417d4f76ddd54984c1f74 WHIRLPOOL 3769c59233b932333e9af478102d6e084a76905937bfaff30d4a4e4def031a5a7b54394ec372c2ffe26e0de519b9cd082ebccce91bc4640d366baaa67098a9d5
+MISC ChangeLog 15761 SHA256 9beb0d17e7bafcc6624a193e4e34c6ef06b18544924cd9ca25dd510ab1afa686 SHA512 cc9e820a02f0ba117454fca04a0948c28e15b41664d63067f223791c25d6a1fc823a854ef422f9fe3ba99e2dbe6db0650515d0a1b218052d8a316bcba32888fc WHIRLPOOL e4745f7e29781b8e61108d00b5320327541c0d43855580518989e04624105fa7b3cb6bc155653e2dd10c511c57bd699c00641994cdb37f9d1953369e571f1832
 MISC metadata.xml 159 SHA256 fabd15e2740a2a68e0bda738d0cd4300b133ff11239802afe7e60aa3862c9c03 SHA512 96a1f7f082adc57e52a1a32666e1206e68f8ff03c728fdb7666ff98c255905977491fc4dfc37bc8bdf5da0eb50cdc408adec357bbd75bd980bc90659cc157194 WHIRLPOOL 82fca1c4b75b090abdb0a4233c8e49fc43535ca6e470f725c1872653ea922b6693e9646bc3ee1fd6f1293ebedad661642cec13b2817fb5315268300f7675a751
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iF4EAREIAAYFAlUU+5wACgkQXYk9GL8g3FFmmwD/ZNC4JZzcnbpbQqvLBgIKQCTk
+f1otfnZX3K1hra3hJZwA/i1R1gJS0cRFtyFA9cqCLuQxx+xnPD4WtS1YGVZGCm4k
+=tzSK
+-----END PGP SIGNATURE-----

diff --git a/dev-libs/nettle/nettle-2.7.1-r4.ebuild b/dev-libs/nettle/nettle-2.7.1-r4.ebuild
new file mode 100644 (file)
index 0000000..8fb4c7d
--- /dev/null
+++ b/dev-libs/nettle/nettle-2.7.1-r4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nettle/nettle-2.7.1-r4.ebuild,v 1.1 2015/03/27 06:41:28 alonbl Exp $
+
+EAPI=5
+AUTOTOOLS_AUTORECONF=yes
+
+inherit eutils autotools-multilib multilib toolchain-funcs
+
+DESCRIPTION="Low-level cryptographic library"
+HOMEPAGE="http://www.lysator.liu.se/~nisse/nettle/"
+SRC_URI="http://www.lysator.liu.se/~nisse/archive/${P}.tar.gz"
+
+LICENSE="|| ( LGPL-3 LGPL-2.1 )"
+SLOT="0/4" # subslot = libnettle soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
+IUSE="doc +gmp neon static-libs test"
+
+DEPEND="gmp? ( dev-libs/gmp:0[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}
+       abi_x86_32? (
+               !<=app-emulation/emul-linux-x86-baselibs-20131008-r17
+               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+       )"
+
+MULTILIB_WRAPPED_HEADERS=(
+       /usr/include/nettle/nettle-stdint.h
+)
+
+src_prepare() {
+       tc-is-static-only || epatch "${FILESDIR}"/${PN}-2.7-shared.patch
+
+       sed -e '/CFLAGS=/s: -ggdb3::' \
+               -e 's/solaris\*)/sunldsolaris*)/' \
+               -i configure.ac || die
+
+       # conditionally build tests and examples required by tests
+       use test || sed -i '/SUBDIRS/s/testsuite examples//' Makefile.in || die
+
+       autotools-utils_src_prepare
+}
+
+multilib_src_configure() {
+       # --disable-openssl bug #427526
+       ECONF_SOURCE="${S}" econf \
+               --libdir="${EPREFIX}"/usr/$(get_libdir) \
+               $(use_enable gmp public-key) \
+               $(use_enable static-libs static) \
+               --disable-openssl \
+               $(tc-is-static-only && echo --disable-shared) \
+               $(use_enable doc documentation) \
+               $(use_enable neon arm-neon)
+}
+
+multilib_src_install_all() {
+       einstalldocs
+       if use doc ; then
+               dohtml nettle.html
+               dodoc nettle.pdf
+       fi
+}