diff options
-rw-r--r-- | dev-libs/nettle/ChangeLog | 7 | ||||
-rw-r--r-- | dev-libs/nettle/files/nettle-2.4-darwin-shlink.patch | 5 | ||||
-rw-r--r-- | dev-libs/nettle/nettle-2.4.ebuild | 6 |
3 files changed, 11 insertions, 7 deletions
diff --git a/dev-libs/nettle/ChangeLog b/dev-libs/nettle/ChangeLog index ced5f81ea7da..9b64a5d012b7 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.47 2012/01/01 16:13:42 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nettle/ChangeLog,v 1.48 2012/02/10 19:45:03 radhermit Exp $ + + 10 Feb 2012; Tim Harder <radhermit@gentoo.org> nettle-2.4.ebuild, + files/nettle-2.4-darwin-shlink.patch: + Enable gmp use flag by default (needed by gnutls) and fix sed line in patch + file (bug #400941). 01 Jan 2012; Sergei Trofimovich <slyfox@gentoo.org> +files/nettle-2.0-binutils-2.22.patch, nettle-1.15.ebuild, nettle-2.0.ebuild, diff --git a/dev-libs/nettle/files/nettle-2.4-darwin-shlink.patch b/dev-libs/nettle/files/nettle-2.4-darwin-shlink.patch index b3c9377f5fe4..da32808c63c6 100644 --- a/dev-libs/nettle/files/nettle-2.4-darwin-shlink.patch +++ b/dev-libs/nettle/files/nettle-2.4-darwin-shlink.patch @@ -15,15 +15,14 @@ Fixed incorrect -gmp argument in LIBS (probably typo) --- configure.ac +++ configure.ac -@@ -61,9 +61,8 @@ +@@ -61,9 +61,7 @@ [enable_gcov=no]) LSH_RPATH_INIT([`echo $with_lib_path | sed 's/:/ /g'` \ - `echo $exec_prefix | sed "s@^NONE@$prefix/lib@g" | sed "s@^NONE@$ac_default_prefix/lib@g"` \ - /usr/local/lib /sw/local/lib /sw/lib \ - /usr/gnu/lib /opt/gnu/lib /sw/gnu/lib /usr/freeware/lib /usr/pkg/lib]) -+ `echo $exec_prefix | sed "s@^NONE@$prefix/lib@g" | sed -+"s@^NONE@$ac_default_prefix/lib@g"`]) ++ `echo $exec_prefix | sed "s@^NONE@$prefix/lib@g" | sed "s@^NONE@$ac_default_prefix/lib@g"`]) # Checks for programs. AC_PROG_CC diff --git a/dev-libs/nettle/nettle-2.4.ebuild b/dev-libs/nettle/nettle-2.4.ebuild index 43400b771ee6..8b6bd2b23d41 100644 --- a/dev-libs/nettle/nettle-2.4.ebuild +++ b/dev-libs/nettle/nettle-2.4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# 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.2 2011/12/03 13:29:58 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nettle/nettle-2.4.ebuild,v 1.3 2012/02/10 19:45:03 radhermit Exp $ EAPI="4" @@ -13,7 +13,7 @@ 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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="gmp ssl" +IUSE="+gmp ssl" DEPEND="gmp? ( dev-libs/gmp ) ssl? ( dev-libs/openssl )" |