Revert multilib, bug#501436

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

3 files changed, 8 insertions, 60 deletions

diff --git a/dev-libs/nettle/ChangeLog b/dev-libs/nettle/ChangeLog
index 8e0f30c6b4a6..8b128f756548 100644
--- a/dev-libs/nettle/ChangeLog
+++ b/dev-libs/nettle/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/nettle
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nettle/ChangeLog,v 1.103 2014/02/15 21:44:55 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nettle/ChangeLog,v 1.104 2014/02/16 00:28:29 alonbl Exp $
+
+  16 Feb 2014; Alon Bar-Lev <alonbl@gentoo.org> -nettle-2.7.1-r1.ebuild:
+  Revert multilib, bug#501436
 
 *nettle-2.7.1-r1 (15 Feb 2014)
 
diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest
index e4075f1c3678..2b68fe2dcde6 100644
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -21,15 +21,14 @@ EBUILD nettle-2.4.ebuild 1097 SHA256 b7f725a7d24f5441126f63c77996c35fb2b6ab6363a
 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
-EBUILD nettle-2.7.1-r1.ebuild 1634 SHA256 26dc990c0e2f4329a88ef78a5e34772ffd0547796522bae82d139819c79791d1 SHA512 138402277bcc21f17a5d4cac7e8cc77349ee3e511c21d3910197712354fbb24ca6ef5a6c15ce8284eee04a7aa4072e4077b5979df7ad7ba8779d0a6d374957c1 WHIRLPOOL a22c746af41f2f65ba055791bc6b7df900e283bc00cea6f68247d2c216932f2696e940b9284b5eb2d7fda77ea9d2d2bfc211ed5ea26a109fafb67acd253dbcc7
 EBUILD nettle-2.7.1.ebuild 1448 SHA256 4be33a316226b6867e9ebd1abc006144a2d5a0669115e951c4fc09f92ec3cd7f SHA512 ca6ee79dfe0ecae635ed02e285cb895ea1dd7cc227b2f46ddccacdfb04b7a92551b0d8ac5b45797ca2c7acdf44d453562796015880c78f4c150c5f93462aee5c WHIRLPOOL 30af29d76793ef8a36e3e9a562e7bf477cb838380f8466d9dbf8837ff7498796d1c56e29e6ed6211e0a3a28943b7a0bdfee9eef9c581111633cd409a8e62cd80
 EBUILD nettle-2.7.ebuild 1454 SHA256 14002add119affff30e093003769dfb147c7e2fda477a7a9b569b7c0b19cc66e SHA512 4035a9492c4e91d6cb378cbb8fe85f2f424275a39a4730dd7104807e197d4b6cfec035735350bdd82e34556fcb7972a3c55a42f5003138d0837ba5ca82002911 WHIRLPOOL 59ad11f1a69741a5762ff5496f121ea0a4da7b07d633c4a2c8f13dcae92b93e5cef728ce9f24d60fa3a1a81993ff17a3c9b52e2e374e31baa8156b3f8a4c2309
-MISC ChangeLog 12994 SHA256 96b2f41ba548c73b29a8b24d9dc252915c4a75535eba0b90bf834330d14d48cc SHA512 8ba6cc680832f3250b6f5861ef2e0b6a67c4e266ef1eda5bfd84c4998deed80f5843fc86bb69fe858a0450191e7f2347cb8505f340cd663b28c77368c9459207 WHIRLPOOL 8ba2508d5099792e3c134f29cedb228cc2473fe41b9063394ee367911b898d44ad6b37926847460b89f4e9d77dfecdb8aeac425aeda31e5c9c0826190a73bb2f
+MISC ChangeLog 13098 SHA256 42c97e4fe7a40fde4f4790254764961a3db37640bb14b137269e180beb44f11f SHA512 cf68257b524755f5413ba24d6bc623a471c3085fecc2d19aff65756c82ae459672dfd0a9728a46d1dfdd77d78b6af4718d1a963b3b62563ea35b50d0f93a59c7 WHIRLPOOL a4c7fb7bcc81b24f6ee865e1b901cfe699d86d4b6882bfc387e401c52cd50de36a62dc5bcc442723dea98ff5c4634b034c132ad30f5bd038f21973b9df3f8f29
 MISC metadata.xml 159 SHA256 fabd15e2740a2a68e0bda738d0cd4300b133ff11239802afe7e60aa3862c9c03 SHA512 96a1f7f082adc57e52a1a32666e1206e68f8ff03c728fdb7666ff98c255905977491fc4dfc37bc8bdf5da0eb50cdc408adec357bbd75bd980bc90659cc157194 WHIRLPOOL 82fca1c4b75b090abdb0a4233c8e49fc43535ca6e470f725c1872653ea922b6693e9646bc3ee1fd6f1293ebedad661642cec13b2817fb5315268300f7675a751
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlL/394ACgkQXYk9GL8g3FE27QEAl2K5Xk121POyp6Eqko+tjxat
-btk3zCtmGr7uO3cZP/EA/ic7qi1SFWqHrrv+INfLwePvks4ceAADhJtLBXkN7jF/
-=VHWp
+iF4EAREIAAYFAlMABjQACgkQXYk9GL8g3FEtpgEAkvl1NAf3KNrhIsRw2Aze4nr/
+m33N3YUV2PLvVBuyRUUBAIfYfo8GGe/J25/R0qx+xBdRI4KjBNDHohYLXJe/NkPu
+=PM+e
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/nettle/nettle-2.7.1-r1.ebuild b/dev-libs/nettle/nettle-2.7.1-r1.ebuild
deleted file mode 100644
index de66f87334f1..000000000000
--- a/dev-libs/nettle/nettle-2.7.1-r1.ebuild
+++ /dev/null
@@ -1,54 +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-2.7.1-r1.ebuild,v 1.1 2014/02/15 21:44:55 alonbl Exp $
-
-EAPI=5
-
-inherit eutils autotools-multilib multilib
-
-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}
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20131008-r9
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.7-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
-}
-
-multilib_src_configure() {
-	# --disable-openssl bug #427526
-	ECONF_SOURCE="${S}" econf \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		$(use_enable gmp public-key) \
-		$(use_enable static-libs static) \
-		--disable-openssl \
-		$(use_enable doc documentation) \
-		$(use_enable neon arm-neon)
-}
-
-multilib_src_install_all() {
-	if use doc ; then
-		dohtml nettle.html
-		dodoc nettle.pdf
-	fi
-}