Merge branch 'master' of git+ssh://git.overlays.gentoo.org/user/smithdanea

9 files changed, 195 insertions, 0 deletions

diff --git a/dev-libs/nettle/ChangeLog b/dev-libs/nettle/ChangeLog
new file mode 100644
index 0000000..53f51fa
--- /dev/null
+++ b/dev-libs/nettle/ChangeLog
@@ -0,0 +1,19 @@
+# ChangeLog for dev-libs/nettle
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*nettle-2.1 (10 Aug 2010)
+
+  10 Aug 2010; Dane Smith (c1pher) <smithdanea@gmail.com>
+  +nettle-2.1.ebuild:
+  Updated ebuild for 2.1. All patches are obsolete. Merged into upstream. 
+
+*nettle-2.0 (10 Aug 2010)
+*nettle-1.15 (10 Aug 2010)
+
+  10 Aug 2010; Dane Smith (c1pher) <smithdanea@gmail.com>
+  +files/nettle-1.14-make-as-needed.patch, +nettle-1.15.ebuild,
+  +nettle-2.0.ebuild, +files/nettle-2.0-asneeded.patch,
+  +files/nettle-2.0-makefile.patch, +metadata.xml:
+  New ebuild for nettle-2.0. Fixes bug 326385
+
diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest
new file mode 100644
index 0000000..c78de19
--- /dev/null
+++ b/dev-libs/nettle/Manifest
@@ -0,0 +1,13 @@
+AUX nettle-1.14-make-as-needed.patch 471 RMD160 a81f9d7337c99e8c8c86b6f60cf5d94693e67886 SHA1 43256f88cfc0db51012cde89882a92956c65f36b SHA256 f8552cde7b7c91923c276afca147e9c37b851b60896e1c9d5eb729ecd5bbc324
+AUX nettle-2.0-asneeded.patch 397 RMD160 735bbf72df60ee2538f04b591504d5c144e1f7a7 SHA1 fad5db4641b0bbce998d4809dc98df5e009ba7d6 SHA256 bac166a7ff2dbab851e2a138e7660be4b86f177647123c7ed451d152a0b68ff0
+AUX nettle-2.0-makefile.patch 494 RMD160 e76bfb14f07f3185913e80aeb22d2855f1d1b734 SHA1 1c47555864b63aabfb53f7861a11cf71967ef049 SHA256 c335e13c3322dc58768e7a468ba5fa4622656202db588089467c776b3c2933b0
+DIST nettle-1.15.tar.gz 829862 RMD160 8944901d4a856bb25b8e44e420ba4475c0fd0a93 SHA1 0f2d95a859fc64ff3e490f9f2bec0d206ae95a7e SHA256 d6e540bf4acc857a3b09580e7f61822d352ee83c119579bf7333f0a785f7d9ac
+DIST nettle-2.0.tar.gz 883732 RMD160 1e9e8b6f01276376514bee3d34aa479f5de44e0b SHA1 bfe436a556afecad0991fe4afef096992a77647f SHA256 65b9e230b953bfb075f10473917e216df9b825fc325b88f69cdf756ffa17cbd6
+DIST nettle-2.1.tar.gz 965345 RMD160 56bd66654e8320abb12812d0fa1b79733bc62094 SHA1 15f660ef6cfd62c1c3302f68055f194913de0dfb SHA256 b7d26b3e38842d83c02f807ea7a2cbaa6e2d8f22e5fb20d97ab7a171d039d74e
+EBUILD nettle-1.15.ebuild 1026 RMD160 58f5f1104e0a159b4f8ef22d89676d97c624cc75 SHA1 740bd77037a0efe9678021ff33a1162e17dc9c34 SHA256 4926afe7d4a665e4575912d0449568e076c253afd8491fb8906734b8de18e986
+EBUILD nettle-2.0.ebuild 1086 RMD160 925b036f4471303bab17a6eabea5b53c3d2d9681 SHA1 0272894e12e164db6ee4d52c25bcaa2bfa3421fd SHA256 0472db115b4f8f8bc93c7f9acee5ed1149876e37add80c3bc5a67ecd67f07307
+EBUILD nettle-2.1.ebuild 1002 RMD160 1deae8c75fb86b8bce8b93e8edf4557c8331c5eb SHA1 de755f7ea96141d7ce5a2c095abd250b7d42d2d8 SHA256 4fbe461919d9e8d816ffaa615d3d0beebd8b6667a6ff9fa3c2b11228e8f6216e
+MISC ChangeLog 629 RMD160 405a982c890a3700e1d1cc6e8ade2aff0e224273 SHA1 21b886b2c84eaae5011f2c94bdcb2d8ac50ab037 SHA256 95cde473182eec693d71b1d326d9a9034832e86913200575a0ee49e0440e891f
+MISC ChangeLog.new~ 206 RMD160 21466a8294cb05fa66b3e70b63e95c2c812f642d SHA1 f850f5692c5fd15bea0dcb1b9a65e41172551f24 SHA256 8f7cdd63d566465bf0d6d1e47e8aea2b94be01ec612f05509b0bb0cf5375d767
+MISC metadata.xml 159 RMD160 7f0018281c6308f73c2d95b3690e3804f0c353c5 SHA1 09baadee9aeb270d0a7f31be07db9db5c105abbc SHA256 fabd15e2740a2a68e0bda738d0cd4300b133ff11239802afe7e60aa3862c9c03
+MISC nettle-2.1.ebuild~ 1051 RMD160 bba02d8b87f254a6c8543af952fb3be827830ac8 SHA1 23564e5739a09f849792f0cfc92a2c8bf3691f3f SHA256 ee9c2db6ac74edc1a6c920b93bfd0a78cacae986244ade794350ac8ae8daa9ea
diff --git a/dev-libs/nettle/files/nettle-1.14-make-as-needed.patch b/dev-libs/nettle/files/nettle-1.14-make-as-needed.patch
new file mode 100644
index 0000000..ec1380f
--- /dev/null
+++ b/dev-libs/nettle/files/nettle-1.14-make-as-needed.patch
@@ -0,0 +1,12 @@
+diff -urNp nettle-1.13.org/configure.ac nettle-1.13/configure.ac
+--- nettle-1.13.org/configure.ac	2005-10-06 22:29:11.000000000 +0300
++++ nettle-1.13/configure.ac	2006-10-31 21:19:24.000000000 +0200
+@@ -152,7 +152,7 @@ case `uname -sr` in
+     SHLIBFILE='$(SHLIBSONAME).$(SHLIBMINOR)'
+     SHLIBLINK='$(CC) $(LDFLAGS) -shared -Wl,-soname=$(SHLIBSONAME)'
+     # FIXME: It might make some sense to link with -lgmp
+-    SHLIBLIBS=''
++    SHLIBLIBS='$(LIBS)'
+     ;;
+ esac
+ 
diff --git a/dev-libs/nettle/files/nettle-2.0-asneeded.patch b/dev-libs/nettle/files/nettle-2.0-asneeded.patch
new file mode 100644
index 0000000..05e87bd
--- /dev/null
+++ b/dev-libs/nettle/files/nettle-2.0-asneeded.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/show_bug.cgi?id=285747
+
+--- configure.ac
++++ configure.ac
+@@ -206,7 +206,7 @@
+     LIBHOGWEED_FILE='$(LIBHOGWEED_SONAME).$(LIBHOGWEED_MINOR)'
+     LIBHOGWEED_LINK='$(CC) $(LDFLAGS) -shared -Wl,-soname=$(LIBHOGWEED_SONAME)'
+     # FIXME: It might make some sense to link with -lnettle -lgmp
+-    LIBHOGWEED_LIBS=''
++    LIBHOGWEED_LIBS='-L. -lnettle $(LIBS)'
+     ;;
+ esac
+ 
diff --git a/dev-libs/nettle/files/nettle-2.0-makefile.patch b/dev-libs/nettle/files/nettle-2.0-makefile.patch
new file mode 100644
index 0000000..d997076
--- /dev/null
+++ b/dev-libs/nettle/files/nettle-2.0-makefile.patch
@@ -0,0 +1,11 @@
+--- Makefile.in	2009-06-08 14:27:11.000000000 -0400
++++ Makefile.nettle.in	2010-08-09 19:58:19.000000000 -0400
+@@ -148,7 +148,7 @@
+ 	[ -z "$(LIBNETTLE_SONAME)" ] || (cd .lib \
+           && ln -sf ../$(LIBNETTLE_FORLINK) $(LIBNETTLE_SONAME))
+ 
+-$(LIBHOGWEED_FORLINK): $(hogweed_PURE_OBJS)
++$(LIBHOGWEED_FORLINK): $(hogweed_PURE_OBJS) $(LIBNETTLE_FORLINK)
+ 	$(LIBHOGWEED_LINK) $(hogweed_PURE_OBJS) -o $@ $(LIBHOGWEED_LIBS)
+ 	-mkdir .lib 2>/dev/null
+ 	[ -z "$(LIBHOGWEED_SONAME)" ] || (cd .lib \
diff --git a/dev-libs/nettle/metadata.xml b/dev-libs/nettle/metadata.xml
new file mode 100644
index 0000000..d68fe97
--- /dev/null
+++ b/dev-libs/nettle/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>crypto</herd>
+</pkgmetadata>
diff --git a/dev-libs/nettle/nettle-1.15.ebuild b/dev-libs/nettle/nettle-1.15.ebuild
new file mode 100644
index 0000000..4f4b99d
--- /dev/null
+++ b/dev-libs/nettle/nettle-1.15.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nettle/nettle-1.15.ebuild,v 1.6 2007/12/11 10:03:54 vapier Exp $
+
+inherit eutils autotools
+
+DESCRIPTION="cryptographic library that is designed to fit easily in any context"
+HOMEPAGE="http://www.lysator.liu.se/~nisse/nettle/"
+SRC_URI="http://www.lysator.liu.se/~nisse/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc s390 sparc x86 ~x86-fbsd"
+IUSE="gmp ssl"
+
+DEPEND="gmp? ( dev-libs/gmp )
+	ssl? ( dev-libs/openssl )
+	!<dev-libs/lsh-1.4.3-r1"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-1.14-make-as-needed.patch"
+	sed -i \
+		-e '/CFLAGS/s:-ggdb3::' \
+		configure.ac || die
+	eautoreconf
+}
+
+src_compile() {
+	econf \
+		--enable-shared \
+		$(use_enable ssl openssl) \
+		$(use_enable gmp public-key) \
+		|| die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install  || die
+	dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/dev-libs/nettle/nettle-2.0.ebuild b/dev-libs/nettle/nettle-2.0.ebuild
new file mode 100644
index 0000000..5afcbaa
--- /dev/null
+++ b/dev-libs/nettle/nettle-2.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nettle/nettle-2.0.ebuild,v 1.8 2010/03/29 10:52:52 ssuominen Exp $
+
+EAPI=2
+inherit autotools eutils
+
+DESCRIPTION="cryptographic library that is designed to fit easily in any context"
+HOMEPAGE="http://www.lysator.liu.se/~nisse/nettle/"
+SRC_URI="http://www.lysator.liu.se/~nisse/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="gmp ssl"
+
+DEPEND="gmp? ( dev-libs/gmp )
+	ssl? ( dev-libs/openssl )
+	!<dev-libs/lsh-1.4.3-r1"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-asneeded.patch
+	epatch "${FILESDIR}"/${P}-makefile.patch
+	sed -i \
+		-e '/CFLAGS/s:-ggdb3::' \
+		configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-shared \
+		$(use_enable gmp public-key) \
+		$(use_enable ssl openssl)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install  || die
+	dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/dev-libs/nettle/nettle-2.1.ebuild b/dev-libs/nettle/nettle-2.1.ebuild
new file mode 100644
index 0000000..3618cb5
--- /dev/null
+++ b/dev-libs/nettle/nettle-2.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nettle/nettle-2.0.ebuild,v 1.8 2010/03/29 10:52:52 ssuominen Exp $
+
+EAPI=2
+inherit autotools eutils
+
+DESCRIPTION="cryptographic library that is designed to fit easily in any context"
+HOMEPAGE="http://www.lysator.liu.se/~nisse/nettle/"
+SRC_URI="http://www.lysator.liu.se/~nisse/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="gmp ssl"
+
+DEPEND="gmp? ( dev-libs/gmp )
+	ssl? ( dev-libs/openssl )
+	!<dev-libs/lsh-1.4.3-r1"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -i \
+		-e '/CFLAGS/s:-ggdb3::' \
+		configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-shared \
+		$(use_enable gmp public-key) \
+		$(use_enable ssl openssl)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install  || die
+	dodoc AUTHORS ChangeLog NEWS README
+}