[patch] nettle-2.7.1.ebuild.diff

nettle-2.7.1.ebuild.diff (text/plain), 2.00 KB, created by Alon Bar-Lev (RETIRED) on 2014-02-16 00:29:41 UTC

--- nettle-2.7.1.ebuild	2013-10-05 18:29:34.226689700 +0300
+++ nettle-2.7.1-r1.ebuild	2014-02-15 23:44:55.000000000 +0200
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.ebuild,v 1.11 2013/08/06 13:07:05 ago Exp $
+# $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
+inherit eutils autotools-multilib multilib
 
 DESCRIPTION="Low-level cryptographic library"
 HOMEPAGE="http://www.lysator.liu.se/~nisse/nettle/"
@@ -12,11 +12,15 @@ SRC_URI="http://www.lysator.liu.se/~niss
 
 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"
+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}"
+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
@@ -31,9 +35,9 @@ src_prepare() {
 	eautoreconf
 }
 
-src_configure() {
+multilib_src_configure() {
 	# --disable-openssl bug #427526
-	econf \
+	ECONF_SOURCE="${S}" econf \
 		--libdir="${EPREFIX}"/usr/$(get_libdir) \
 		$(use_enable gmp public-key) \
 		$(use_enable static-libs static) \
@@ -42,9 +46,7 @@ src_configure() {
 		$(use_enable neon arm-neon)
 }
 
-src_install() {
-	default
-
+multilib_src_install_all() {
 	if use doc ; then
 		dohtml nettle.html
 		dodoc nettle.pdf