Cleanup, bug#531426

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key BF20DC51)

4 files changed, 6 insertions, 78 deletions

diff --git a/dev-libs/nettle/ChangeLog b/dev-libs/nettle/ChangeLog
index 3359cc2318f6..af6ff24e6a0c 100644
--- a/dev-libs/nettle/ChangeLog
+++ b/dev-libs/nettle/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/nettle
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nettle/ChangeLog,v 1.121 2015/04/10 04:24:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nettle/ChangeLog,v 1.122 2015/04/26 15:38:17 alonbl Exp $
+
+  26 Apr 2015; Alon Bar-Lev <alonbl@gentoo.org>
+  -files/nettle-1.14-make-as-needed.patch,
+  -files/nettle-2.0-binutils-2.22.patch, -nettle-1.15.ebuild:
+  Cleanup, bug#531426
 
   10 Apr 2015; Michał Górny <mgorny@gentoo.org> nettle-3.1.ebuild:
   Wrap version.h, bug #546104.
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
deleted file mode 100644
index ec1380f4c2f8..000000000000
--- a/dev-libs/nettle/files/nettle-1.14-make-as-needed.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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-binutils-2.22.patch b/dev-libs/nettle/files/nettle-2.0-binutils-2.22.patch
deleted file mode 100644
index 072fb66dce95..000000000000
--- a/dev-libs/nettle/files/nettle-2.0-binutils-2.22.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://bugs.gentoo.org/396659
-
-Fix build failure againsn binutils-2.22.
-Picked from upstream.
---- nettle-2.0/x86/md5-compress.asm	2009-06-08 21:27:11.000000000 +0300
-+++ nettle-2.1/x86/md5-compress.asm	2010-07-25 22:30:14.000000000 +0300
-@@ -88,7 +88,7 @@
- 	movl	12(TMP), SD
- 
- 	C Pointer to source data.
--	C Note that if analigned, we suffer unaligned accesses
-+	C Note that if unaligned, we suffer unaligned accesses
- 	movl	24(%esp), INPUT
- 
- 	ROUND(<F1>, SA, SB, SC, SD, REF( 0), $0xd76aa478, 7)
-@@ -171,4 +171,4 @@
- 	popl	%ebp
- 	popl	%ebx
- 	ret
--EPILOGUE(_nettle_sha1_compress)
-+EPILOGUE(_nettle_md5_compress)
diff --git a/dev-libs/nettle/nettle-1.15.ebuild b/dev-libs/nettle/nettle-1.15.ebuild
deleted file mode 100644
index 764f0b79440a..000000000000
--- a/dev-libs/nettle/nettle-1.15.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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-1.15.ebuild,v 1.12 2014/12/02 21:21:38 pacho 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 )
-	"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-1.14-make-as-needed.patch"
-	epatch "${FILESDIR}"/${PN}-2.0-binutils-2.22.patch #bug 396659
-	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
-}