Version bump. Update to EAPI 5 and add subslot, add doc and test use flags, and run tests.

Package-Manager: portage-2.2.0_alpha154/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

4 files changed, 185 insertions, 3 deletions

diff --git a/dev-libs/nettle/ChangeLog b/dev-libs/nettle/ChangeLog
index 7c63313d64b0..fd2506295b1d 100644
--- a/dev-libs/nettle/ChangeLog
+++ b/dev-libs/nettle/ChangeLog
@@ -1,6 +1,13 @@
 # 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.73 2012/12/15 12:06:14 alonbl Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nettle/ChangeLog,v 1.74 2013/01/18 00:57:24 radhermit Exp $
+
+*nettle-2.6 (18 Jan 2013)
+
+  18 Jan 2013; Tim Harder <radhermit@gentoo.org> +nettle-2.6.ebuild,
+  +files/nettle-2.6-shared.patch:
+  Version bump. Update to EAPI 5 and add subslot, add doc and test use flags,
+  and run tests.
 
   14 Dec 2012;  Alon Bar-Lev <alonbl@gentoo.org> +files/nettle-2.5-build-ar.patch,
   nettle-2.5-r1.ebuild:
diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest
index a45b5a0bbaf3..5ff6c1c92bbe 100644
--- 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.4-darwin-shlink.patch 2308 SHA256 3a4cf3bac2be0fc9df29341d9bf42636a4979b83e7a115515048617d5f175098 SHA512 1fed076d3ffe53f8e8b0533f1c116d50af4b749dff031e8a0ad8249c7011071cbebc7230c7d0a5a3c63de97c6f236b01975fa63e055d8e082ea7c2d551df2d0c WHIRLPOOL 4df815e82ff5cedd009e9bb6f2a54a62bc729632e1166f9ac92d4f5aa0bb9d50a2b003bc1cdc8eed425cecd9b2d5f60954dd9a638bbef825de4317f55e8cb658
@@ -5,12 +8,26 @@ AUX nettle-2.4-missing-libm-link.patch 636 SHA256 a8506fafe954a4f576f2223f9ff2aa
 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
+AUX nettle-2.6-shared.patch 3522 SHA256 775fcb3753bae2310f0b71b859b9870fa05c9aeb1dac424e24d1c6cbb07f06cf SHA512 f01fd81c32bdaa1254f9d4691c9523366dd8c6acc42efe54baa2751df4dfc9c5b1f35b79deb97c9a0563d961896d7685284e0a8fc24250654202fc743f522722 WHIRLPOOL 44b9f773fa9f918328209f2ed36b514f025e15c740606b824323f2fd62ad344ecac51a171b9efba130bca64287f39ab1ccfb407349be419bde79b46980924a14
 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
+DIST nettle-2.6.tar.gz 1385695 SHA256 60df624f63b997c832cae29f48ab9ada99df815bcd60d231526b83e786b4b156 SHA512 edee4b7ecd34d7db8636650e59916c358a9be323128b4b7ad6eb4088a0a09a6744d0ebf382b23143fbcee3d40b148f43a54f25759141b16ba0befc3c46740b80 WHIRLPOOL a7f56870918400ae4966ad0b6f398667e629ab91355bc3cbd51039757dbd9bd140fa501ae1b8a0a3cf82196036afd90671776dcb5f2587ba281bc01c27049ae6
 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 1168 SHA256 72ce9ac362d0492a3971a509d09bd40b27e1309ccac300d2220a90b23ad2a875 SHA512 7a6b1689535446def39f367588ca89e70b8599cceacbd2e0908436245887d3753816cbf20594dc48d085c71b432bc956437df9a9ae92f9eb5d079055ba92b23a WHIRLPOOL 20189b6c71f492009d4c08f10779951d8d4cae60ae75b2c0e53680851466ccb7f0b905c9b4c51067ce1b3727e12f9c533f13ae4d4d9bf80bf06fdcc71fb2074c
 EBUILD nettle-2.5.ebuild 1039 SHA256 af811b23075e5f1f6f327ca6a15f0bef3ea45bceee4b642d5b37bef0711b39b5 SHA512 a3b555f337257164893f0e160502f34b3c5b134742d095d341ada4839cd73160c35b721efc6fb83aa31410dc818295c3cc31abe557cc9a2a2be33059ce49dd43 WHIRLPOOL 8b867409ba38014beda5937e6fda825c91f9e29d441c1c3774658fa95f5729301f7826a830c1418633a07a46a3b1afb4673889bedc1f0ed121acfa4a4eda7b94
-MISC ChangeLog 9401 SHA256 fa075707eb3ab59f009fbfb9d64a6cd9164378e3d2b4d733535a3981eb4d3de8 SHA512 7727d8c1fcf6357c4867e9a24050384ee6caa5bb91c972ce0d2f741868d447995818b038c8bca00703e5129dbd66e021e67add0a7f3c25999a9092c7786cb275 WHIRLPOOL f0c05f66295419b2679162086f765180bd01421da8e5612a5969b5674a81841095a37c998a64460ee1f443c7cab7dcc65b48256ad4a478c4b55296be9392661f
+EBUILD nettle-2.6.ebuild 1482 SHA256 2b7aa4a03c60a4a846552b3a77da6c4a0bc48ae5a25cdf02912575eb1b19797e SHA512 5ed418a7cb34a033a4ccd9d9f279ceead7ace32e6d4ff9ca5b0ad1e347b7d5cf9ac65cddff2a2b9d78c2583c7275d20d2fbc003c654b37aac0f55ae92bb29d56 WHIRLPOOL 0e6c1086fe3fa04f0b422ea74b5a99a2eba4d1bfd29ec2c7ecf488bbcac7221c7f0904c8d660a4d6200baa6bfc6773b677cf9d054a466cd3d96a834afe4ca1fb
+MISC ChangeLog 9630 SHA256 2cac143dbc68ca271640f3163d43ed06b2d4fd5bbd7ffa319c4579502748c265 SHA512 598be019641eb19a283575d657c3ae2799a824149d0046132c294268f559a86f355387b883215462463122f0e4b48867e028bb34cf680b9651388e90adee2f04 WHIRLPOOL bec612dea2e92ba4fc0a3dc3407836003d8132e73864eb3c3e1ca401812b474837dfc37fd230631e5fe387e0df8267eca16f3f28dbb26612d38b17ad922d6619
 MISC metadata.xml 159 SHA256 fabd15e2740a2a68e0bda738d0cd4300b133ff11239802afe7e60aa3862c9c03 SHA512 96a1f7f082adc57e52a1a32666e1206e68f8ff03c728fdb7666ff98c255905977491fc4dfc37bc8bdf5da0eb50cdc408adec357bbd75bd980bc90659cc157194 WHIRLPOOL 82fca1c4b75b090abdb0a4233c8e49fc43535ca6e470f725c1872653ea922b6693e9646bc3ee1fd6f1293ebedad661642cec13b2817fb5315268300f7675a751
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQ+J34AAoJEEqz6FtPBkyjgn4H/jMgRUMSKR6n74SCUkKGgyOO
+07Lsj+NAFLGDbmp51Qz+XA/gI5K6GAWIWlop+VPdQ/JHBODYL/NNx5UWiEmw9z2A
+R1sJh0UnJrEdX0DbsU9iFHiaYeqe3dCICmdTjLmDd5La5v+BMY3ScL3bOVCvdCB+
+kwEuMfqknUKXV8+mHdL68MaTZlBPdbcFqXDHHVnwnN/rKokgI4hxCouYfXWvvDF4
+dRbP9COhWJxMjiEoP8s2H0wyrn3ZiKhcxoppAbW+5lc7Yt7zMZFq3QpoXhiYk4uZ
+o5VQ4sgIJA5keQmsj0sgX5voKzqYk6j1C7FBbpxAB7DzanrfTxsXNGTbchULAk8=
+=6aXA
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/nettle/files/nettle-2.6-shared.patch b/dev-libs/nettle/files/nettle-2.6-shared.patch
new file mode 100644
index 000000000000..0a322bef5316
--- /dev/null
+++ b/dev-libs/nettle/files/nettle-2.6-shared.patch
@@ -0,0 +1,100 @@
+--- nettle-2.6/examples/Makefile.in
++++ nettle-2.6/examples/Makefile.in
+@@ -8,7 +8,7 @@
+ include ../config.make
+ 
+ PRE_CPPFLAGS = -I.. -I$(top_srcdir)
+-PRE_LDFLAGS = -L..
++PRE_LDFLAGS = -L../.lib
+ 
+ OPENSSL_LIBFLAGS = @OPENSSL_LIBFLAGS@
+ BENCH_LIBS = @BENCH_LIBS@ -lm
+@@ -49,11 +49,11 @@
+ 	( cd .. && $(MAKE) nettle-internal.$(OBJEXT))
+ 
+ # For Solaris and BSD make, we have to use an explicit rule for each executable
+-next-prime$(EXEEXT): next-prime.$(OBJEXT) $(GETOPT_OBJS) ../libhogweed.a
++next-prime$(EXEEXT): next-prime.$(OBJEXT) $(GETOPT_OBJS) ../$(LIBHOGWEED_FORLINK)
+ 	$(LINK) next-prime.$(OBJEXT) $(GETOPT_OBJS) \
+ 	-lhogweed -lnettle $(LIBS) -o next-prime$(EXEEXT)
+ 
+-random-prime$(EXEEXT): random-prime.$(OBJEXT) io.$(OBJEXT) $(GETOPT_OBJS) ../libhogweed.a
++random-prime$(EXEEXT): random-prime.$(OBJEXT) io.$(OBJEXT) $(GETOPT_OBJS) ../$(LIBHOGWEED_FORLINK)
+ 	$(LINK) random-prime.$(OBJEXT) io.$(OBJEXT) $(GETOPT_OBJS) \
+ 	-lhogweed -lnettle $(LIBS) -o random-prime$(EXEEXT)
+ 
+@@ -102,7 +102,7 @@
+ nettle-benchmark$(EXEEXT): $(BENCH_OBJS)
+ 	$(LINK) $(BENCH_OBJS) -lnettle $(BENCH_LIBS) $(OPENSSL_LIBFLAGS) -o nettle-benchmark$(EXEEXT)
+ 
+-$(TARGETS) : io.$(OBJEXT) ../libnettle.a
++$(TARGETS) : io.$(OBJEXT) ../$(LIBNETTLE_FORLINK)
+ 
+ 
+ check: $(TS_ALL)
+--- nettle-2.6/run-tests
++++ nettle-2.6/run-tests
+@@ -28,6 +28,8 @@
+ 
+ export srcdir
+ 
++export LD_LIBRARY_PATH="../.lib"
++
+ # When used in make rules, we sometimes get the filenames VPATH
+ # expanded, but usually not.
+ find_program () {
+--- nettle-2.6/testsuite/Makefile.in
++++ nettle-2.6/testsuite/Makefile.in
+@@ -8,7 +8,7 @@
+ include ../config.make
+ 
+ PRE_CPPFLAGS = -I.. -I$(top_srcdir)
+-PRE_LDFLAGS = -L..
++PRE_LDFLAGS = -L../.lib
+ 
+ TS_NETTLE_SOURCES = aes-test.c arcfour-test.c arctwo-test.c \
+ 		    blowfish-test.c cast128-test.c \
+@@ -93,7 +93,7 @@
+ include $(srcdir)/.test-rules.make
+ 
+ $(TARGETS) $(EXTRA_TARGETS): testutils.$(OBJEXT) ../nettle-internal.$(OBJEXT) \
+-	../libnettle.a @IF_HOGWEED@ ../libhogweed.a
++	../$(LIBNETTLE_FORLINK) @IF_HOGWEED@ ../$(LIBHOGWEED_FORLINK)
+ 
+ # For use as, e.g.,
+ #
+--- nettle-2.6/tools/Makefile.in
++++ nettle-2.6/tools/Makefile.in
+@@ -15,7 +15,7 @@
+ include ../config.make
+ 
+ PRE_CPPFLAGS = -I.. -I$(top_srcdir)
+-PRE_LDFLAGS = -L..
++PRE_LDFLAGS = -L../.lib
+ 
+ HOGWEED_TARGETS = pkcs1-conv$(EXEEXT)
+ TARGETS = sexp-conv$(EXEEXT) nettle-hash$(EXEEXT) nettle-lfib-stream$(EXEEXT) \
+@@ -34,19 +34,19 @@
+ DISTFILES = $(SOURCES) Makefile.in input.h misc.h output.h parse.h
+ 
+ sexp_conv_OBJS = $(sexp_conv_SOURCES:.c=.$(OBJEXT)) $(getopt_OBJS)
+-sexp-conv$(EXEEXT): $(sexp_conv_OBJS) ../libnettle.a
++sexp-conv$(EXEEXT): $(sexp_conv_OBJS) ../$(LIBNETTLE_FORLINK)
+ 	$(LINK) $(sexp_conv_OBJS) -lnettle $(LIBS) -o $@
+ 
+-nettle-lfib-stream$(EXEEXT): nettle-lfib-stream.$(OBJEXT) ../libnettle.a
++nettle-lfib-stream$(EXEEXT): nettle-lfib-stream.$(OBJEXT) ../$(LIBNETTLE_FORLINK)
+ 	$(LINK) nettle-lfib-stream.$(OBJEXT) -lnettle $(LIBS) -o $@
+ 
+ pkcs1_conv_OBJS = $(pkcs1_conv_SOURCES:.c=.$(OBJEXT)) $(getopt_OBJS)
+-pkcs1-conv$(EXEEXT): $(pkcs1_conv_OBJS) ../libnettle.a ../libhogweed.a
++pkcs1-conv$(EXEEXT): $(pkcs1_conv_OBJS) ../$(LIBNETTLE_FORLINK) ../$(LIBHOGWEED_FORLINK)
+ 	$(LINK) $(pkcs1_conv_OBJS) -lhogweed -lnettle $(LIBS) -o $@
+ 
+ # FIXME: Avoid linking with gmp
+ nettle_hash_OBJS = $(nettle_hash_SOURCES:.c=.$(OBJEXT)) $(getopt_OBJS)
+-nettle-hash$(EXEEXT): $(nettle_hash_OBJS) ../libnettle.a
++nettle-hash$(EXEEXT): $(nettle_hash_OBJS) ../$(LIBNETTLE_FORLINK)
+ 	$(LINK) $(nettle_hash_OBJS) -lnettle $(LIBS) -o $@
+ 
+ 
diff --git a/dev-libs/nettle/nettle-2.6.ebuild b/dev-libs/nettle/nettle-2.6.ebuild
new file mode 100644
index 000000000000..e17ff43ff867
--- /dev/null
+++ b/dev-libs/nettle/nettle-2.6.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nettle/nettle-2.6.ebuild,v 1.1 2013/01/18 00:57:24 radhermit Exp $
+
+EAPI="5"
+
+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/4" # subslot = libnettle soname version
+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="doc +gmp static-libs test"
+
+DEPEND="gmp? ( dev-libs/gmp )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-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.*//' Makefile.in || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# --disable-openssl bug #427526
+	econf \
+		$(use_enable gmp public-key) \
+		$(use_enable static-libs static) \
+		$(use_enable doc documentation) \
+		--disable-openssl
+}
+
+src_test() {
+	cd testsuite
+
+	# symbols test requires static libs
+	use static-libs || rm symbols-test || die
+
+	../run-tests || die
+}
+
+src_install() {
+	default
+
+	if use doc ; then
+		dohtml nettle.html
+		dodoc nettle.pdf
+	fi
+}