Fix for static-only platforms, such as FreeMiNT, bug #528794

Package-Manager: portage-2.2.14_rc1-prefix/cvs/Darwin i386
Manifest-Sign-Key: 0x5F75F607C5C74E89

3 files changed, 14 insertions, 20 deletions

diff --git a/dev-libs/nettle/ChangeLog b/dev-libs/nettle/ChangeLog
index 6be4b1a37a3a..584a89f0f087 100644
--- a/dev-libs/nettle/ChangeLog
+++ b/dev-libs/nettle/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/nettle
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nettle/ChangeLog,v 1.108 2014/06/10 00:41:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nettle/ChangeLog,v 1.109 2014/11/10 19:35:40 grobian Exp $
+
+  10 Nov 2014; Fabian Groffen <grobian@gentoo.org> nettle-2.7.1-r1.ebuild:
+  Fix for static-only platforms, such as FreeMiNT, bug #528794
 
   10 Jun 2014; Mike Frysinger <vapier@gentoo.org> nettle-2.7.1-r1.ebuild,
   nettle-2.7.1.ebuild:
diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest
index 62aa0970479b..f9243659d56e 100644
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -21,25 +21,15 @@ EBUILD nettle-2.4.ebuild 1097 SHA256 b7f725a7d24f5441126f63c77996c35fb2b6ab6363a
 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
 EBUILD nettle-2.6.ebuild 1352 SHA256 9701af684b1ad9be6444070c285c07c65cd557fb53ac2ea98d60512e9580e3c4 SHA512 cc16972450484f7352de6eab5d03651aa51e18406a66c378b476d3a7ef5af92c6e0a2dfb55336439b6f55afd6c14a51a604e3829ef2b8aeb3782f5142aab0c74 WHIRLPOOL d1fd342a650a29d58295c7b9201f41a1ca404c8fd4adff002d989410dfcb03a2743faf1b7c02e1c11ce4bc32a34d3475a1170f41f2c8624f81fe7f4af34d4eb9
-EBUILD nettle-2.7.1-r1.ebuild 1642 SHA256 9086db155562479053be50999ed4c532fbf26bd80389146a9d79f58c34db2b40 SHA512 97bc882cc68df5ff785d68101702e51db6abcacbf3b65173bde8ec3ccb77e535bbb7e006883c3983e4aa525c71d1b4561bb01856a612434508504de2b5f78e2d WHIRLPOOL bf5dcad9ee435476c4627a1403e13b14e9619a2426aa5fc5384b76230119e86c0556a98fedca08e94a3507e06e905df378bd4d46add8d37a80b2306e8a66d962
+EBUILD nettle-2.7.1-r1.ebuild 1741 SHA256 4f53bb8257154a549de2806b493ccdfba773633226c2fea676448a50f97383c9 SHA512 c2cc6aaba74fdab877c3f2a2764ee96592642352c173f6b56cf102ffef947377a70143596ee76387c1dba54c7a3901678f5c7ced04cd89acddad9d5d0065035e WHIRLPOOL 152c90c9585c82bdc30954def01e9c5730658fe30ed98c8655efd8e68411675d552e4e0dab621301a18fcbb8b72129aa95a37a1e6570d2a5e1a4dfcb0bb98138
 EBUILD nettle-2.7.1.ebuild 1456 SHA256 56dbfde5292cb443dbe100a2ad5e24912af39efd541ebbc724656f95bcda334e SHA512 d1f93d6211b27cb8d4b39a245b78af346f1d20e908caacd07d278787520ca4e4c331abeb8d8d4c8d63aeba1f13e2ecf29263fbaf0dee07c1d5cd740c4bc20f5c WHIRLPOOL 0ca9ee2079c0fa182b94bd94796f5c2e42809bb4a68d87a0c64053a9e4ad4810c9eb6f7c3ccbd0409c2aa08adae0763fb4ed573930c6a0b20609e976246bf6a2
 EBUILD nettle-2.7.ebuild 1454 SHA256 14002add119affff30e093003769dfb147c7e2fda477a7a9b569b7c0b19cc66e SHA512 4035a9492c4e91d6cb378cbb8fe85f2f424275a39a4730dd7104807e197d4b6cfec035735350bdd82e34556fcb7972a3c55a42f5003138d0837ba5ca82002911 WHIRLPOOL 59ad11f1a69741a5762ff5496f121ea0a4da7b07d633c4a2c8f13dcae92b93e5cef728ce9f24d60fa3a1a81993ff17a3c9b52e2e374e31baa8156b3f8a4c2309
-MISC ChangeLog 13629 SHA256 46f833a238c550f98b7eb12d7d2ed3e0ae0e21d17b2481ad41baf4feca775164 SHA512 c858bfc30a8899941803f8db497a79fe72b373d622da810dd47c537fd7f878cfa2c53e0b1cf9c58367cfbccaf0326f03df615ae0b091c4ab967da98097a1502c WHIRLPOOL 8048c0d53d2fbecc7a5529b1933a0de1b21175297ed9cc4301a15f13bbcf946fee33bad9b3f05e36e9dfc4300d3cf19ecd54dce3f454d6044b09aee09af6622c
+MISC ChangeLog 13769 SHA256 0ac1003630bd34decc093f215f1a85f9de681e0d288355e5569095d68eb8b5f1 SHA512 e61b81e3fc812267cc198bbdff86bf3f6f96e4589859f12f0fc606091110c3a9df40fafb7049d02591dd63e0a08cd2d3161156500f081506b7f1d23da35b59da WHIRLPOOL 417b95c816a697336e9d3b4ee7666dd8e92db7d25a9da2f5dd7063b678a0c13aebddeae3598546cded22e479968d348ada36cf1fd29617c60b3585c4e288c7a4
 MISC metadata.xml 159 SHA256 fabd15e2740a2a68e0bda738d0cd4300b133ff11239802afe7e60aa3862c9c03 SHA512 96a1f7f082adc57e52a1a32666e1206e68f8ff03c728fdb7666ff98c255905977491fc4dfc37bc8bdf5da0eb50cdc408adec357bbd75bd980bc90659cc157194 WHIRLPOOL 82fca1c4b75b090abdb0a4233c8e49fc43535ca6e470f725c1872653ea922b6693e9646bc3ee1fd6f1293ebedad661642cec13b2817fb5315268300f7675a751
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTllQpAAoJEPGu1DbS6WIALa4P/0+U2BoznRlxgie2kbBZhD+j
-mR6FENLlok98Y7y8kTUI42bbRKmxieKuilDcTfPzNARnW5DiQk98y4/5JwlX6LxZ
-8PkRl/5nfVk1Mln8nhidMhX9vV3BlqezSv6DDv45gTJ2+G5bAv+ux7DTEgSbl6G5
-qTx0n/7itasqdZ8M5PyYXfWziC18vVCozs9M5ErX38qZEiJlmdOkr+sFqxVFeSNd
-KmJb1XwWZP4FMmG3FqThPz4ZMq/QDl6ab9XporjzAPTGkcLQF2mZb/JdaVwg4jZG
-PTV1wjh66ak7r0YKjllW8AuCwI5WyjpJF7OKbYSwDidl8zYT/Qs8md1VR34KkfCt
-9u4IekT3M6+5q3KnrWAJkIq8XItjn/ra/AosXhNAFF2PF6C2+jhuB6FGgt4l277G
-85/sFOqRi7bn8L8olPtlqYLRgcoJomhMIyG+hSLUSV8sGFbmPWxOEyCNC6zGPIYB
-KXFDZsdXIRIRLyn8CvhLdserZf2DDQHI5x9LEg0gYszViCbCModD3BtqO6UTyWFE
-Jz3e9k1H4PPfPRsVDOx/rF0KkQ2qX8FwHJdzQKVoUDV70lRQ3oesyKQoWaCyL5am
-zFiNf4ZNHSnN8MXbMwGu0R12Cz7mnoS7sHLBJxRE6hi7hMVdJyNr179H3Knvt52T
-gTTJAMZEWaEco4r6bjvP
-=HnkW
+iEYEAREIAAYFAlRhE40ACgkQX3X2B8XHTolVkwCfVKQ1U2BQgYKVln4oNpJ7rGzO
+/NoAoIgZwhd+VkGLwfeN1Pk29Ov2a9aO
+=yT8T
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/nettle/nettle-2.7.1-r1.ebuild b/dev-libs/nettle/nettle-2.7.1-r1.ebuild
index 125b614fe83f..482e4b61220c 100644
--- a/dev-libs/nettle/nettle-2.7.1-r1.ebuild
+++ b/dev-libs/nettle/nettle-2.7.1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 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-r1.ebuild,v 1.5 2014/06/10 00:41:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nettle/nettle-2.7.1-r1.ebuild,v 1.6 2014/11/10 19:35:40 grobian Exp $
 
 EAPI=5
 
-inherit eutils autotools-multilib multilib
+inherit eutils autotools-multilib multilib toolchain-funcs
 
 DESCRIPTION="Low-level cryptographic library"
 HOMEPAGE="http://www.lysator.liu.se/~nisse/nettle/"
@@ -12,7 +12,7 @@ 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 ~sparc-solaris ~x86-solaris"
+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 )"
@@ -23,7 +23,7 @@ RDEPEND="${DEPEND}
 	)"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.7-shared.patch
+	tc-is-static-only || epatch "${FILESDIR}"/${PN}-2.7-shared.patch
 
 	sed -e '/CFLAGS=/s: -ggdb3::' \
 		-e 's/solaris\*)/sunldsolaris*)/' \
@@ -42,6 +42,7 @@ multilib_src_configure() {
 		$(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)
 }