Cleanup, bug#531426

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xBF20DC51

5 files changed, 10 insertions, 98 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/Manifest b/dev-libs/nettle/Manifest
index 00f902242c95..908451b421a9 100644
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -1,37 +1,21 @@
 -----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.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.7.1.tar.gz 1558863 SHA256 bc71ebd43435537d767799e414fce88e521b7278d48c860651216e1fc6555b40 SHA512 297c69e90bbd448f72e854abe5cc7868c08d710e1c1bcd6a14adf06e25629d58a3ef4d65ab588d001ec7091aa583032312ad15b416ea5479e5bf0ea63717f473 WHIRLPOOL 3a9bca1175652050ac8b96d85ee86dc40968fb56bad416ccdf6e57be85d4ab9f81f75647866c44810dad226830cbfe466cb37d1fdf40afb54b509de6f7a9bcee
 DIST nettle-3.1.tar.gz 1851489 SHA256 f6859d4ec88e70805590af9862b4b8c43a2d1fc7991df0a7a711b1e7ca9fc9d3 SHA512 f0e75218de0ef516e09ee3180fe22a2617272d0118b7239e641d0f5c097377671c6966afd8bd316cb091811d7b731bc83ffc518cef1076c40ae5a31c007910e9 WHIRLPOOL 0261c60f342a95588155cf10ab81df46cc206c2e59baf8c95193452dda99fea804578878ac5150bbf28af05df4ce603ea3ea95fc3cdec27a32e507ddeab74cc0
-EBUILD nettle-1.15.ebuild 1087 SHA256 81e6ce1502e20b004614beb569f16d003d235bc7ac56c1ff1bca8b7ae8b2c951 SHA512 fa8ec4293bc5a9458128dd4ef434aad70b8b5a2301fd72d4f3f6d9690e07b8313f19cf79d154df5898b33c0ff45bc2f1948d51b98673791e8fd9874eb5680214 WHIRLPOOL 584eff1e1024e8624d0961665b7789358d5b041ef63aeaeffb18f393c2e5080be2cfa231b3675679d6f1f7868f1a050cb72ae743f5e371a7f4dbd114f7228016
 EBUILD nettle-2.7.1-r1.ebuild 1732 SHA256 8dcbe24bff1ea4af663d76532408b56b4bc3cd224bab60aff2322108802eebf0 SHA512 70d41ac4b3414d1b407320a54f3b3ee0664e415e1ffc4715c705c79211e57130792eb3d33b01526a45a5656c093b3a54c9f73ab8da09b4435ec05e0fb647ff1e WHIRLPOOL 79093e3c4f8e08e1f51e9f8db2352ed6040043d4eaa2f4acc54a5cf6e69d87cabeed0f8aef17ba1dcaf57e4683254ded36f8d67fe0c3d71ea0de5b40eae2ab5a
 EBUILD nettle-2.7.1-r2.ebuild 1796 SHA256 5a9dfe1126ddfd6dbcd941f743276ec1ef5d38a94e3004b045fc7addbf1dbc8c SHA512 00d318e2f2e4fd1a10c12ac98f6fa6d325ac3db1dbb267158d88907deb3253d8e620ef4e931c80eef737edd2726662ee647a2de582d97609e08fbb51e03d165d WHIRLPOOL f1dac582dcf83ceeaf6eaf5795f4c1e260d0e7808663438f2fa71bcc4127765e5cd4c2a21d983e227fa306a3036b6ec5aa9ecfa0e0ef17359be82663f58fa410
 EBUILD nettle-2.7.1-r3.ebuild 1816 SHA256 2f2b5e8a5e6625db528320a77bd7541ec87ea8226164d3a17670e6a68688fe7f SHA512 7655722a5e20081468b02d70f9090e83ad2dd1bd4e21d76e9ebd20512217f74aa8c4b7493891335b9ec8d80d5dfd489cc9e82a091a08317dcc0e084c8159ebf2 WHIRLPOOL ad421d5215a12fec2c21e37a115bfbcecf53378a30a2758bf4314a6f3d5182f5b68dbfa32608f78ef7c70124c5faaaf8c60ac5a94f6f835a60e3855eb38d76c3
 EBUILD nettle-2.7.1-r4.ebuild 1884 SHA256 7ae5553ad49582e03de876d2561004cd739335b649510e450f484d27a0d5ba6f SHA512 0360fb76c50515b3f1de4e2a4c7c406a92089bada6f7a2c19dab517bc8eb2fd0fd366245397286ae8055005de4c522fefa6dba1bbe8ee025d7377ed6f2a7aa39 WHIRLPOOL b22819b212826c6dad4f022f69e3ac2ab8c5b3c4fcd07b2fc4f421324d82d14de9ef7df55cccfd30ad79fe77e6c1cfc049a39bb109058cf5ebfd12b73d937e00
 EBUILD nettle-2.7.1.ebuild 1456 SHA256 56dbfde5292cb443dbe100a2ad5e24912af39efd541ebbc724656f95bcda334e SHA512 d1f93d6211b27cb8d4b39a245b78af346f1d20e908caacd07d278787520ca4e4c331abeb8d8d4c8d63aeba1f13e2ecf29263fbaf0dee07c1d5cd740c4bc20f5c WHIRLPOOL 0ca9ee2079c0fa182b94bd94796f5c2e42809bb4a68d87a0c64053a9e4ad4810c9eb6f7c3ccbd0409c2aa08adae0763fb4ed573930c6a0b20609e976246bf6a2
 EBUILD nettle-3.1.ebuild 1925 SHA256 6436ef468b9bd7ccb8c04cebfff0b265ade9a3a1f98c5271131d1c5be5ad761a SHA512 ef5c40127aaca4c2107a82f414897d0eb90690ceabe6360c63b6f375c503ceca1b16c76f7e2da6364cc454d4ec7b96c8a3410076dbeed7338ccac603b83c6e74 WHIRLPOOL bab3c1e0243ea2d0f18a1a4d7c8670fab4a7a1315f57395b5c06b207b7d576d90155ed952502ca7539bfbbae5b82a3dcc25216ca7361f8160d9b6ebf35a251e4
-MISC ChangeLog 15985 SHA256 b0af8c127c2b418932644bac2a4c244f10bf45b66fffdab7df66afb6a3b08d26 SHA512 91995fdc2e05c10f587d76b7144d73dc1d41f554fd33ccd44d26cd1f43f024a8f49d6e76bcd5ad7db99bf2197df2a676ac13b82aedb3d6981ca207bb91f9acae WHIRLPOOL c7fc5bb451f513b4f8d8f05be50ebc313a12fe61263c5dddc6b120ea8c2836c3baf732ddb1be7c5f94aa9e8f8ffb4a75686afa58f4114c2796a74597174bb23a
+MISC ChangeLog 16161 SHA256 b6084444e0a013730e22b2721bcde8d14dc6795c18e28c35575ad27eebb236e5 SHA512 98a253d77d188928d558636ae6eb2cee551994f9a6e7bdcdbee1c79e298bf07ae213b435ed57e875bcfcfe7138c4470e796a389490abfb7015cc3d700988dca6 WHIRLPOOL 8a9c0d91d70766a26e1acc9f02279ab831eca888f5ad539d7bf2e494122652ca2f58fcfcb6fec1f6a6fadbac54819e1f8c26e51a4766d2a29567bd9a546e45db
 MISC metadata.xml 159 SHA256 fabd15e2740a2a68e0bda738d0cd4300b133ff11239802afe7e60aa3862c9c03 SHA512 96a1f7f082adc57e52a1a32666e1206e68f8ff03c728fdb7666ff98c255905977491fc4dfc37bc8bdf5da0eb50cdc408adec357bbd75bd980bc90659cc157194 WHIRLPOOL 82fca1c4b75b090abdb0a4233c8e49fc43535ca6e470f725c1872653ea922b6693e9646bc3ee1fd6f1293ebedad661642cec13b2817fb5315268300f7675a751
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVJ1B3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOFZ4P/0fa0TmdV19YbH2NHoCe/Lb9
-6cWMHCyAh/03GiES/I6TtI6JkfxszM3EJ/JjfKoR/ZjqaHgTh04swub8tm0Thar8
-qwFmpk9NXNfrK3CIrofurGJRx+BDR+MReCy2z2H1CUuWlsczLbmhd00GrSlcZtvU
-1VPz3sY6WtwuIQrpw2Poy8qFkWjn1Pk9HAwmaTswLtcmE49+7/Nqp/yGlqr+Jg9c
-TCBkbewkiKISwKWzP8xw3VK1ytAfilDigELvCzgQptYDGvtcOa9We8WXtzDiBoa8
-5Qgehu9koQY8CrT07PjsOiZsSKiblVqcR5e1WAFFqdpIxQUtCZ9EnhCmzMExA5x8
-3K86ssfguugAolZ7KgBmabqlReIR/nkZAhv5SOB6pRZzNEGRckQ5LVMAfzct/NdQ
-rwaY9k6xCgMSmsNxrd1YbACry7PgIuuIhJNaAj8O/9jm4Wn8N31zZOSkM166i8Va
-7tP0ycZx3JQWsVmRu+uYYAfrif3BsQwK9WQRe0uhG5/eevqiJzxg71y55KvOA/h2
-bDVPI/13svLru9XTQkrpghVyKUWtZUoMQwo2iE4SheNpTCxLTQWflStnVzgJSK5+
-JBwUCzvLhcOaSyTJ2O1bG6OvLZiOTrk4u67uCWyAx/Y3fQbGFrLf+VowPKXNJcuO
-1PI0RAhf/hH85R0uF2fP
-=JnFy
+iF4EAREIAAYFAlU9Bm0ACgkQXYk9GL8g3FHEIQD8DpKHffKRRSQjsoggYHiVRFDS
+EIJa/ZvH0Bj47dukHJkBAJ272l2EG/1tPeckOSqp2To2M8S64tMqSJubHvQUUDW+
+=EqYT
 -----END PGP SIGNATURE-----
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
-}