Version bump (bug #467468), add neon use flag.

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

4 files changed, 146 insertions, 5 deletions

diff --git a/dev-libs/nettle/ChangeLog b/dev-libs/nettle/ChangeLog
index e19ea6330045..a904538e70ba 100644
--- a/dev-libs/nettle/ChangeLog
+++ b/dev-libs/nettle/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/nettle
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nettle/ChangeLog,v 1.88 2013/03/15 15:25:17 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nettle/ChangeLog,v 1.89 2013/04/27 22:26:11 radhermit Exp $
+
+*nettle-2.7 (27 Apr 2013)
+
+  27 Apr 2013; Tim Harder <radhermit@gentoo.org> +nettle-2.7.ebuild,
+  +files/nettle-2.7-shared.patch:
+  Version bump (bug #467468), add neon use flag.
 
   15 Mar 2013; Jeroen Roovers <jer@gentoo.org> nettle-2.6.ebuild:
   Stable for HPPA (bug #461104).
diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest
index 196b2c444557..8d2bc09e3a85 100644
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -9,21 +9,28 @@ AUX nettle-2.5-build-ar.patch 1059 SHA256 c433976f5955035a403461977db90b808c13d0
 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 3285 SHA256 7aba54a117afe7f3845501fe7c260ebaab8179a527fb5ef5caf08a85e09ddbcb SHA512 1746f4a26eecda67b10b1a3098446229404df5e35b2ae20549d8a1b0d20b8ce17e57bff990dcb3a817ebf4f04a8ae413d2b7806b29a3716d4c4708892e0b0e71 WHIRLPOOL 75887241e290227884392ce512b2aa20614bd0bec9cb9ffa68cef3ebac83cbec89dd3d56f2ad60d5004b0b0e257f09a333e96b564de13613906f402c92f51c5c
+AUX nettle-2.7-shared.patch 2674 SHA256 d71a578ef9eb153770eb98a4741815e74556d101c9373d8b6884871708dc48f3 SHA512 3a0599356a411e03a3ac5284c03b6bef046e170263a41e5504b3ea1403217eca3508d423a207e8373c596491ac95dfca4bf1d52b2c726e7b0c42f19a7499fa70 WHIRLPOOL 33929850b65edd1e793ac320919c5cde65ad2bd09757a68cfcc8beb5596ea120412e5cad0ba85054c37a80f132b693d69df67281c407b15c55fd9ecb35733a70
 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
+DIST nettle-2.7.tar.gz 1557615 SHA256 c294ea133c05382cc2effb1734d49f4abeb1ad8515543a333de49a11422cd4d6 SHA512 394cbe567f958594e1bca42b48802e2fbc9c31c468cd1c399a0aec6f94138220b4bf3c307590262314664e15a74a7a52f9fd2b4f9fb01dde669e1fbe23e57caf WHIRLPOOL d039631285f9df5a50895cc2715dc78c2f77b42ecad05cbb6ee507608793811c49a49de914342c6211777a7199c93b1e95f90bfdde42b818d778d71b3a7e16ea
 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
 EBUILD nettle-2.6.ebuild 1352 SHA256 9701af684b1ad9be6444070c285c07c65cd557fb53ac2ea98d60512e9580e3c4 SHA512 cc16972450484f7352de6eab5d03651aa51e18406a66c378b476d3a7ef5af92c6e0a2dfb55336439b6f55afd6c14a51a604e3829ef2b8aeb3782f5142aab0c74 WHIRLPOOL d1fd342a650a29d58295c7b9201f41a1ca404c8fd4adff002d989410dfcb03a2743faf1b7c02e1c11ce4bc32a34d3475a1170f41f2c8624f81fe7f4af34d4eb9
-MISC ChangeLog 11193 SHA256 277e3659de7bf3a79d8204b1a33f6aa741b35f46512505f6c728e96a58b99dc9 SHA512 914af4539474b1f0146ba9e2fd57d775a0c4352de46e7af1bd1094d2306cfdea9949731ecab949aeb7424475efc65823df36a37d41df4824d9e3b7a5d9aef855 WHIRLPOOL c528e0064a91548815c44c28d06c0de4c06bc2c4476e6d3afd231ee4879e0c0d275ed356a268fea50385229a797c323a42c91374d64322908bfd11afa0b74843
+EBUILD nettle-2.7.ebuild 1403 SHA256 e128737cf8e7b293ecb0c8c983ac34b52f29cfd9ec3719bc0b0d6f08cb034ea7 SHA512 2323e89fe4791a3d6bb5e6b1dce081a02c2bd90d9f1f64d018253ec669494440b4c0743a26f15b61929ca901aab04a27844731475c9c0bbab1ff0ba57c901d7a WHIRLPOOL 3641df6b7704bf1646ad9cbc0a13b03215690da4fd55689d528c8f32023a4e6f497b82252ac1916553f677cc5565c39151766c84a9f5e45b1317ebfedc17256b
+MISC ChangeLog 11379 SHA256 4aae785f925b0951aa3c1c2b7f68ea4c666acf5efb5c31d9f7c4f478eb5400a3 SHA512 388006f20343880cb26e0a3df9ecd43488f99d3eb1f30dd16d15d8995b08d478864473ca990327ed0f11d2de493dde02891ce7274c3f3a8028c380f65b51d653 WHIRLPOOL 528bcd94dec252bf55e4aa47c50d626248e9a0494a96925fbe90018d7d2dde0d459886847c984de4a6c526bc3f38328687da5f2490cdd7d8dcf988efd3edf541
 MISC metadata.xml 159 SHA256 fabd15e2740a2a68e0bda738d0cd4300b133ff11239802afe7e60aa3862c9c03 SHA512 96a1f7f082adc57e52a1a32666e1206e68f8ff03c728fdb7666ff98c255905977491fc4dfc37bc8bdf5da0eb50cdc408adec357bbd75bd980bc90659cc157194 WHIRLPOOL 82fca1c4b75b090abdb0a4233c8e49fc43535ca6e470f725c1872653ea922b6693e9646bc3ee1fd6f1293ebedad661642cec13b2817fb5315268300f7675a751
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFDPV4ACgkQVWmRsqeSphMQKQCbBsjfKvxj+CUdijY9VKsyNd23
-9LYAn3GIAZN7siTC1qDyKIrj9E+03jp5
-=j4fN
+iQEcBAEBCAAGBQJRfFCHAAoJEEqz6FtPBkyjTvcH/jhB5CJmsOd7qSE7gi49vKk1
+OSOL3tpauHukvWn6/mQ/InYznJqIkrRQsjm5RL8zHHyUT75cg7LjytySEEWm+nn8
+s5IkbV36M77HR49xY20c3lZxvE6S8NP3kKSeINko/BpV4qkVqLXCoHZiR6p4+3pL
+jjCM26CnktAvo67AtOukHkqAiTihqQWa44C3CGIDKmj87lp8QIDFmWrhkCRkeo1a
+eCq4cvj3eiC1a8NVRKePuBjRUkWUqTtKFTZgdlNz+XAvNcNYY0+gRgkD82dXrBM/
+u3o5ES2LvqTsRy/rx0+kmiafM9Dx8PheCml97kL+xB0aGO2+I5fYLeAYmlIzUSI=
+=asSp
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/nettle/files/nettle-2.7-shared.patch b/dev-libs/nettle/files/nettle-2.7-shared.patch
new file mode 100644
index 000000000000..9b9d6c884d14
--- /dev/null
+++ b/dev-libs/nettle/files/nettle-2.7-shared.patch
@@ -0,0 +1,77 @@
+--- nettle-2.7/examples/Makefile.in
++++ nettle-2.7/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
+@@ -117,8 +117,8 @@
+ 	-lhogweed -lnettle $(BENCH_LIBS) $(LIBS) $(OPENSSL_LIBFLAGS) \
+ 	-o hogweed-benchmark$(EXEEXT)
+ 
+-$(TARGETS) : io.$(OBJEXT) ../libnettle.a
+-$(HOGWEED_TARGETS): ../libhogweed.a
++$(TARGETS) : io.$(OBJEXT) ../$(LIBNETTLE_FORLINK)
++$(HOGWEED_TARGETS): ../$(LIBHOGWEED_FORLINK)
+ 
+ check: $(TS_ALL)
+ 	LD_LIBRARY_PATH=../.lib PATH="../.lib:$$PATH" srcdir="$(srcdir)" \
+--- nettle-2.7/testsuite/Makefile.in
++++ nettle-2.7/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 \
+@@ -96,7 +96,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.7/tools/Makefile.in
++++ nettle-2.7/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.7.ebuild b/dev-libs/nettle/nettle-2.7.ebuild
new file mode 100644
index 000000000000..f76d932446dd
--- /dev/null
+++ b/dev-libs/nettle/nettle-2.7.ebuild
@@ -0,0 +1,51 @@
+# 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.7.ebuild,v 1.1 2013/04/27 22:26:11 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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="doc +gmp neon 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 examples//' Makefile.in || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# --disable-openssl bug #427526
+	econf \
+		$(use_enable gmp public-key) \
+		$(use_enable static-libs static) \
+		--disable-openssl \
+		$(use_enable doc documentation) \
+		$(use_enable neon arm-neon)
+}
+
+src_install() {
+	default
+
+	if use doc ; then
+		dohtml nettle.html
+		dodoc nettle.pdf
+	fi
+}