bug#405525 add support for USE static-libs

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

4 files changed, 153 insertions, 12 deletions

diff --git a/dev-libs/nettle/ChangeLog b/dev-libs/nettle/ChangeLog
index d67f61ceda14..a341a0249c7f 100644
--- a/dev-libs/nettle/ChangeLog
+++ b/dev-libs/nettle/ChangeLog
@@ -1,6 +1,12 @@
 # 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.70 2012/10/20 16:40:22 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nettle/ChangeLog,v 1.71 2012/12/14 21:45:31 alonbl Exp $
+
+*nettle-2.5-r1 (14 Dec 2012)
+
+  14 Dec 2012;  <alonbl@gentoo.org> +files/nettle-2.5-static-libs.patch,
+  +nettle-2.5-r1.ebuild:
+  bug#405525 add support for USE static-libs
 
   20 Oct 2012; Raúl Porcel <armin76@gentoo.org> nettle-2.5.ebuild:
   alpha/ia64/s390/sh/sparc stable wrt #433235
diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest
index 7ae52bc33c80..0cc77e40c420 100644
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -1,23 +1,15 @@
------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.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-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
 DIST nettle-2.4.tar.gz 1075789 SHA256 a6009208df6881f75aa1a87081ccfb2ccac1884da10670c53d7b76596f649c3f SHA512 2523e3a0119918c5f4988d8c7e62b1895067b7ffee440910f2040c7cba22d1d26d8f13aee266779edb88605faa6252e4d2e22acbee54d886f766c0c0c9765516 WHIRLPOOL bc5f23379d3c49e59b646f63f28967219f51443767e937043859fb5cccd83b863f1600ca6560019355dcec55428e6113200354a8357bd8770d6cdcb5569a944b
 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.ebuild 1039 SHA256 af811b23075e5f1f6f327ca6a15f0bef3ea45bceee4b642d5b37bef0711b39b5 SHA512 a3b555f337257164893f0e160502f34b3c5b134742d095d341ada4839cd73160c35b721efc6fb83aa31410dc818295c3cc31abe557cc9a2a2be33059ce49dd43 WHIRLPOOL 8b867409ba38014beda5937e6fda825c91f9e29d441c1c3774658fa95f5729301f7826a830c1418633a07a46a3b1afb4673889bedc1f0ed121acfa4a4eda7b94
-MISC ChangeLog 9056 SHA256 8f5f92979b85f8cd654b0cf4d4e315c7be0a9be8c09902a5f7fef78206664326 SHA512 9116f9660896bbd6a2e2e0f14455838b9dba5a0005d381f809c54dd1d0b1dc76a234da806a3ece114fbd647f8fe33e60b42fd0f00945b1658651abdc83a25396 WHIRLPOOL 614908d6e9434647e369a901c7203980ddb3e08c2f0b66c35b5e7c36e0a94857a9cc06082a1c0af7c7ec708bae395ec3524d5005afa4d8c8a74a662c3d4f9299
+MISC ChangeLog 9229 SHA256 d7712970afc7f7bb4f2abb05bc11c2905f9d3dfdc0129a84a72ce1618c3e4d9d SHA512 36e1a7a9b9bc48de20b69da8a6d6a611a22886f3d91944bae6adb11911e39af05928f0fc2cbd5b83915658d32c094d16922c1d3b704bbfec6479fc680084e05b WHIRLPOOL f6db2ed9261c85618bcb1e23fea15969d8b96b237840a19ec66edc83db52f62b75dcad3c22ebd593ee5b85b1e5a567a0496c4fead78151dfa1e3796a060aa47f
 MISC metadata.xml 159 SHA256 fabd15e2740a2a68e0bda738d0cd4300b133ff11239802afe7e60aa3862c9c03 SHA512 96a1f7f082adc57e52a1a32666e1206e68f8ff03c728fdb7666ff98c255905977491fc4dfc37bc8bdf5da0eb50cdc408adec357bbd75bd980bc90659cc157194 WHIRLPOOL 82fca1c4b75b090abdb0a4233c8e49fc43535ca6e470f725c1872653ea922b6693e9646bc3ee1fd6f1293ebedad661642cec13b2817fb5315268300f7675a751
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREIAAYFAlCC0/gACgkQuQc30/atMkAjIQCcD4KjMhEJBm7SaQwbzZvTuI94
-go4Anj52eudC6KIhrQR/8ZFPmZChx/IU
-=sezZ
------END PGP SIGNATURE-----
diff --git a/dev-libs/nettle/files/nettle-2.5-static-libs.patch b/dev-libs/nettle/files/nettle-2.5-static-libs.patch
new file mode 100644
index 000000000000..4434d582dce5
--- /dev/null
+++ b/dev-libs/nettle/files/nettle-2.5-static-libs.patch
@@ -0,0 +1,108 @@
+From c4a57cf2b0ebf3b99309f40cfa1c5107ae038d84 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Fri, 14 Dec 2012 23:31:10 +0200
+Subject: [PATCH] build: add --enable-static option
+
+Gentoo bug#405525, support not installing static libraries.
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ Makefile.in  |   16 ++++++++++------
+ configure.ac |   12 ++++++++++++
+ 2 files changed, 22 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index be0de3c..d4a2a7d 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -21,7 +21,11 @@ include config.make
+ PRE_CPPFLAGS = -I.
+ # FIXME: Add configuration of LIBEXT?
+ LIBTARGETS = libnettle.a @IF_HOGWEED@ libhogweed.a
+-SHLIBTARGETS = $(LIBNETTLE_FORLINK) @IF_HOGWEED@ $(LIBHOGWEED_FORLINK)
++@IF_STATIC@INSTALL_LIBTARGETS = install-static
++@IF_STATIC@UNINSTALL_LIBTARGETS = uninstall-static
++@IF_SHARED@SHLIBTARGETS = $(LIBNETTLE_FORLINK) @IF_HOGWEED@ $(LIBHOGWEED_FORLINK)
++@IF_SHARED@INSTALL_SHLIBTARGETS = install-shared-nettle @IF_HOGWEED@ install-shared-hogweed
++@IF_SHARED@UNINSTALL_SHLIBTARGETS = uninstall-shared
+ 
+ getopt_SOURCES = getopt.c getopt1.c
+ getopt_TARGETS = $(getopt_SOURCES:.c=.$(OBJEXT))
+@@ -32,7 +36,7 @@ internal_TARGETS = $(internal_SOURCES:.c=.$(OBJEXT))
+ TARGETS = aesdata$(EXEEXT) desdata$(EXEEXT) twofishdata$(EXEEXT) \
+ 	  shadata$(EXEEXT) gcmdata$(EXEEXT) \
+ 	  $(getopt_TARGETS) $(internal_TARGETS) \
+-	  $(LIBTARGETS) @IF_SHARED@ $(SHLIBTARGETS)
++	  $(LIBTARGETS) $(SHLIBTARGETS)
+ IMPLICIT_TARGETS = @IF_DLL@ $(LIBNETTLE_FILE) $(LIBHOGWEED_FILE)
+ 
+ DOCTARGETS = nettle.info nettle.html nettle.pdf
+@@ -302,8 +306,8 @@ hogweed.pc: hogweed.pc.in config.status
+ 	./config.status $@
+ 
+ # Installation
+-install-here: install-info install-headers install-static install-pkgconfig \
+-	@IF_SHARED@ install-shared-nettle @IF_HOGWEED@ install-shared-hogweed
++install-here: install-info install-headers install-pkgconfig \
++	$(INSTALL_LIBTARGETS) $(INSTALL_SHLIBTARGETS)
+ 
+ install-static: $(LIBTARGETS)
+ 	$(MKDIR_P) $(DESTDIR)$(libdir)
+@@ -369,8 +373,8 @@ install-pkgconfig: $(PKGCONFIG_FILES)
+ 	done
+ 
+ # Uninstall
+-uninstall-here: uninstall-info uninstall-headers uninstall-static \
+-		uninstall-pkgconfig @IF_SHARED@ uninstall-shared
++uninstall-here: uninstall-info uninstall-headers uninstall-pkgconfig \
++		$(UNINSTALL_LIBTARGETS) $(UNINSTALL_SHLIBTARGETS)
+ 
+ uninstall-static:
+ 	for f in $(LIBTARGETS) ; do \
+diff --git a/configure.ac b/configure.ac
+index 6bf2b8b..994ee75 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -43,6 +43,10 @@ AC_ARG_ENABLE(assembler,
+   AC_HELP_STRING([--disable-assembler],[Disable assembler code]),,
+   [enable_assembler=yes])
+ 
++AC_ARG_ENABLE(static,
++  AC_HELP_STRING([--disable-static], [Do not build any static library]),,
++  [enable_static=yes])
++
+ AC_ARG_ENABLE(shared,
+   AC_HELP_STRING([--disable-shared], [Do not build any shared library]),,
+   [enable_shared=yes])
+@@ -566,6 +570,12 @@ else
+   IF_HOGWEED='#'
+ fi
+ 
++if test "x$enable_static" = xyes ; then
++  IF_STATIC=''
++else
++  IF_STATIC='#'
++fi
++
+ if test "x$enable_shared" = xyes ; then
+   IF_SHARED=''
+ else
+@@ -573,6 +583,7 @@ else
+ fi
+ 
+ AC_SUBST(IF_HOGWEED)
++AC_SUBST(IF_STATIC)
+ AC_SUBST(IF_SHARED)
+ AC_SUBST(IF_DLL)
+ 
+@@ -654,6 +665,7 @@ AC_MSG_NOTICE([summary of build options:
+   Install prefix:    ${prefix}
+   Library directory: ${libdir}
+   Compiler:          ${CC}
++  Static libraries:  ${enable_static}
+   Shared libraries:  ${enable_shared}
+   Public key crypto: ${enable_public_key}
+ ])
+-- 
+1.7.8.6
+
diff --git a/dev-libs/nettle/nettle-2.5-r1.ebuild b/dev-libs/nettle/nettle-2.5-r1.ebuild
new file mode 100644
index 000000000000..19cdd91c5a22
--- /dev/null
+++ b/dev-libs/nettle/nettle-2.5-r1.ebuild
@@ -0,0 +1,35 @@
+# 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 $
+
+EAPI="4"
+
+inherit eutils autotools
+
+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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="static-libs +gmp"
+
+DEPEND="gmp? ( dev-libs/gmp )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -e "/CFLAGS=/s: -ggdb3::" -i configure.ac || die
+	epatch "${FILESDIR}"/${PN}-2.5-missing-libm-link.patch
+	sed -i -e 's/solaris\*)/sunldsolaris*)/' configure.ac || die
+	epatch "${FILESDIR}/${P}-static-libs.patch"
+	eautoreconf
+}
+
+src_configure() {
+	# --disable-openssl bug #427526
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable gmp public-key) \
+		--disable-openssl
+}