Disable openssl dependency (which was also wrong, it wasn't RDEPEND), and avoid using it altogether. Thanks to Maxim Kammerer in bug #427526.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

5 files changed, 27 insertions, 68 deletions

diff --git a/dev-libs/nettle/ChangeLog b/dev-libs/nettle/ChangeLog
index b73ce023503f..5779ea8199db 100644
--- a/dev-libs/nettle/ChangeLog
+++ b/dev-libs/nettle/ChangeLog
@@ -1,6 +1,11 @@
 # 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.61 2012/07/12 22:03:33 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nettle/ChangeLog,v 1.62 2012/07/24 15:08:38 flameeyes Exp $
+
+  24 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org> -nettle-1.15.ebuild,
+  nettle-2.4.ebuild, nettle-2.5.ebuild:
+  Disable openssl dependency (which was also wrong, it wasn't RDEPEND), and
+  avoid using it altogether. Thanks to Maxim Kammerer in bug #427526.
 
 *nettle-2.5 (12 Jul 2012)
 
diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest
index ec00e44bd972..7f6d6ecf3861 100644
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -1,27 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+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
 AUX nettle-2.4-missing-libm-link.patch 636 SHA256 a8506fafe954a4f576f2223f9ff2aa73c5e86ba81aa391c77e74976a91b8903c SHA512 13681c21d7bc1b3ecf86ea57dfd8531312467dd10ba7ab39623ae52d2cae2b77e153049854dc718d1fe1f154c8dd05af17b346aea09eda5d64b426dfa48bc200 WHIRLPOOL cbc9f9b028087e4a5512e97a879700bc231a9e01969b8b5b748af7e09d446a711064a29b4c6cc4f194858b4a52ae2a3cff31c2b89da2644b9ecce1c3542774aa
 AUX nettle-2.5-missing-libm-link.patch 354 SHA256 d6f3fc36e75c4fa5c8f4d12078ab79bab0433bfae9a3f7506e8ff55baf0545f4 SHA512 35a4c9e18abcd3078359c035c6b2bbdc3d52ee8f2cd8036dc3854e4376cef66dbb283c3426d5ed63a11d2b611699ac227921d00194db362abd453febcfdebd19 WHIRLPOOL c055c8c813dbea23f7885838d6e9c1133701a23e9869d7944d72de23fca06bb882269b97c5e698d5dab4cd1785ce33a62a97e59c05f15761b408378e95c8c66c
-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
-EBUILD nettle-1.15.ebuild 1087 SHA256 1a7ebb2919a69148629230f6464dc3a86dc53565f4d48e9df1cb8327fc5d6b14 SHA512 d51a85acbb676be3ff6121028d82eddbeca722f6d92f06301741f15068c44ba926bf72eb5eda8f4656f0d9b6cbf229b9277f6d3784c0acb52e68cb5b44f65f00 WHIRLPOOL 43ae6ca4a432da8d9b192e6f9c17e44269e81cd2fa3c7bd7960271bbffad2b300841d7d31b830420b3c55bc60bb71af785af77f81e8ceb8c6b4d08a7eda489c6
-EBUILD nettle-2.4.ebuild 1103 SHA256 8ac01c09795b840ed85a8a9b8dc3aaa80e549ffd5e15243516c0eb7d1363a5b3 SHA512 dba74b02336a45fad51ac85da2881401aa8e8be3744c5bea967785c7357922ef5fff56a3491bc7e70f9405b430af2afa488e802bcd4e0c350250a666f674612a WHIRLPOOL 424fbd729700fb11f87d35384c73f8a28676275da5755301e767c51c48aa00dc91025d1656928cb4dc7d34b92ab193fa0ce53e85f832e3484408e2efa050bff7
-EBUILD nettle-2.5.ebuild 1058 SHA256 c1478ddde8ea059fa9922d3d80331f4ae947324cc7197b6ab864fc51101d4031 SHA512 7709a828d2c5621f96bf66bf38b6a9684606c215f16d930fd3e75c7eb6431d513a810d841af97587473cedb4fdad9d04e459efce00549f1ccd410101f077f3f2 WHIRLPOOL eb78b0a64f151d4fa5c0a875c4b29cd12fb35f1fb0bf2ccb5d242b1de446ce8081e98fa4632d768e884d581545ac264cdce7d1cb22e90f605cae37c865b93ecb
-MISC ChangeLog 7909 SHA256 ad923823114a50c3d1d8138fc7db4c215fdf2cbbb6c823df51963f6b44ac9a77 SHA512 854ca6d8e99b362162e933fd7e681e5f4a89bf7f72a3121fc3e460f734a9090f709a4236dbd23579b7b855b571cc5e2a3bac468aed884101a303962f1ed030a1 WHIRLPOOL dd88da69153670f9ed88b7821f84aad47e00287d943443833a3bcd8561618443bc6c3863a7da71cf48d8fa241ba9493e16da665140620e21bcd9341cbb8a5bcf
+EBUILD nettle-2.4.ebuild 1097 SHA256 b7f725a7d24f5441126f63c77996c35fb2b6ab6363a46e57b12bcd5fbf510601 SHA512 438174edf6ac6ec6b0a4b3a00b7edffdb6a21816d1111fee5e23dddc6cb2cfb8cda7c1db41f3f5e01cc87a267889a679a5ce36ff7f446b17f130a8070ebe69bf WHIRLPOOL 1bf775f2f6c7cbc09512dda20cae8c43573e4436032a33cc508330fb329f9ba04a5159ce896dbd55bf0aebabe40488ed79586d8201870cb1821dd27193893fc3
+EBUILD nettle-2.5.ebuild 1052 SHA256 a6670174b3d3cac9467ffc51262c11f8dae6676b513e64f6e7cb190895022114 SHA512 e45080a85891f9b00961a7889e5b79c84dfb9ee278caee8859e33ea3c4e4014c181de5c59afab6629fd96706a518445f1e139cdf750372625d991e490e5ca8af WHIRLPOOL b44b340a3414aa9c46c4bed970fe92fd48360d131933745a37223d7fc50ac4ed42e52a8702921bfe84514e4a5fddc5f79fd8626241bb67626b7031920d3f845b
+MISC ChangeLog 8173 SHA256 fe8bf122550328077c4e4a6d68ced1c06f2c0980cd3e6749b87a308276089fce SHA512 102922c29e419943085148215d8ce4babc2432cbb36601b1c4967d24273c8f45ea929c563d9439479d1c06d2ee6f294fc60572a988b69b881bfa93505bce8dd0 WHIRLPOOL ead8f3e602779628f20f52b1435d7080dfeb4d823fa6a4257d5689af5a957720fca12b18a9cb59fc23245504372f303d9f5c8340fd9729d423e26e0301bf45de
 MISC metadata.xml 159 SHA256 fabd15e2740a2a68e0bda738d0cd4300b133ff11239802afe7e60aa3862c9c03 SHA512 96a1f7f082adc57e52a1a32666e1206e68f8ff03c728fdb7666ff98c255905977491fc4dfc37bc8bdf5da0eb50cdc408adec357bbd75bd980bc90659cc157194 WHIRLPOOL 82fca1c4b75b090abdb0a4233c8e49fc43535ca6e470f725c1872653ea922b6693e9646bc3ee1fd6f1293ebedad661642cec13b2817fb5315268300f7675a751
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJP/0m+AAoJEEqz6FtPBkyjptcH/AxAzL8PjMp4rj7SZVxJ/FLe
-K6N4fjygfsUUWLNO84wQkWDlIrYpCzol8zNN3BsiiP06iefATJXdsDtCFqqSK34z
-AME2PULvLiU184cLRSmbEF5q1ynNmwnlk3AOmAnym5WB52D384Ay6wYlUn2pm3Jj
-vcEHym16/g6ZIQDFktrcn2wKWD0r1TvhThy8H+dRYYmbsYvMdKPm9H+qsX3mXnfj
-gZXctdaplua/PMVYosLfkdEdJ2AxvjBRQrVXG4nXeZaX+kweA/HAPgWQwj1hUpS+
-v1FNTyiIc3F/hDu8LmLdmOlqAKrKepEoiUMRm5IevvPlOsgJDmvLe1QD3RUaYn8=
-=Fsgl
+iQEcBAEBCAAGBQJQDrsgAAoJEBzRPIrUMBNCW+kH/A3S7MIwrjzxKCyaG3um2S8+
+80tjjICQM57BUCViyanzpKOtxuz3SbiYJ77Rk8F4/A8cOLm9vxy1IIaBzC2v1eN7
+hK6fdv0ljvsgLuhDnrk9EPY0i3O3sOM6ca3jUwTwlV0LvfQ0+KMQU6CGCNH8MzY4
+1bT/eqnacaf/ND2VeWFyuXRw6d0uqKml/IyP84UxW+xqAiqMGxW2BsHHSiNw0D2b
+8tuecYHa8re6KX2zBACnMazKkn20NIywLLR8S9KxXjrAMN7r98HEQboo33Q9mLT/
+XwXp2R8yvIujUS3MWJlMS5FrZQ4dBUGWLpZEbj4XbD8ixinxzinIQDFFPJEXQb4=
+=8edy
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/nettle/nettle-1.15.ebuild b/dev-libs/nettle/nettle-1.15.ebuild
deleted file mode 100644
index ab283d1d1c76..000000000000
--- a/dev-libs/nettle/nettle-1.15.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2012 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.8 2012/01/01 16:13:42 slyfox 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
-}
diff --git a/dev-libs/nettle/nettle-2.4.ebuild b/dev-libs/nettle/nettle-2.4.ebuild
index 60e770eb72ea..bb3920606de2 100644
--- a/dev-libs/nettle/nettle-2.4.ebuild
+++ b/dev-libs/nettle/nettle-2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nettle/nettle-2.4.ebuild,v 1.14 2012/07/06 02:44:16 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nettle/nettle-2.4.ebuild,v 1.15 2012/07/24 15:08:38 flameeyes Exp $
 
 EAPI="4"
 
@@ -13,10 +13,9 @@ SRC_URI="http://www.lysator.liu.se/~nisse/archive/${P}.tar.gz"
 LICENSE="|| ( LGPL-3 LGPL-2.1 )"
 SLOT="0"
 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="+gmp ssl"
+IUSE="+gmp"
 
-DEPEND="gmp? ( dev-libs/gmp )
-	ssl? ( dev-libs/openssl )"
+DEPEND="gmp? ( dev-libs/gmp )"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
@@ -28,8 +27,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# --disable-openssl bug #427526
 	econf \
 		--enable-shared \
 		$(use_enable gmp public-key) \
-		$(use_enable ssl openssl)
+		--disable-openssl
 }
diff --git a/dev-libs/nettle/nettle-2.5.ebuild b/dev-libs/nettle/nettle-2.5.ebuild
index 0002db72acbe..71f24eafc570 100644
--- a/dev-libs/nettle/nettle-2.5.ebuild
+++ b/dev-libs/nettle/nettle-2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nettle/nettle-2.5.ebuild,v 1.1 2012/07/12 22:03:33 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nettle/nettle-2.5.ebuild,v 1.2 2012/07/24 15:08:38 flameeyes Exp $
 
 EAPI="4"
 
@@ -13,10 +13,9 @@ SRC_URI="http://www.lysator.liu.se/~nisse/archive/${P}.tar.gz"
 LICENSE="|| ( LGPL-3 LGPL-2.1 )"
 SLOT="0"
 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="+gmp ssl"
+IUSE="+gmp"
 
-DEPEND="gmp? ( dev-libs/gmp )
-	ssl? ( dev-libs/openssl )"
+DEPEND="gmp? ( dev-libs/gmp )"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
@@ -27,8 +26,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# --disable-openssl bug #427526
 	econf \
 		--enable-shared \
 		$(use_enable gmp public-key) \
-		$(use_enable ssl openssl)
+		--disable-openssl
 }