Add patch to fix compilation on Darwin, marked ~x64-macos

Package-Manager: portage-2.2.01.19824-prefix/cvs/Darwin i386

diff --git a/dev-libs/nettle/ChangeLog b/dev-libs/nettle/ChangeLog
index 4e0ebe9e303637d03c4b2615eec9b5fefbe56f1a..eb184af22887fba245fb291e1a6a60a247cbb897 100644 (file)
--- a/dev-libs/nettle/ChangeLog
+++ b/dev-libs/nettle/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/nettle
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nettle/ChangeLog,v 1.45 2011/09/04 04:10:48 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nettle/ChangeLog,v 1.46 2011/12/03 13:29:58 grobian Exp $
+
+  03 Dec 2011; Fabian Groffen <grobian@gentoo.org>
+  +files/nettle-2.4-darwin-shlink.patch, nettle-2.4.ebuild:
+  Add patch to fix compilation on Darwin, marked ~x64-macos
 
 *nettle-2.4 (04 Sep 2011)
 

diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest
index 635a362434b02b13112b017379060f556b0fd184..272bb845280ed9fec2d5341f3d760820bba4bde0 100644 (file)
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -1,8 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX nettle-1.14-make-as-needed.patch 471 RMD160 a81f9d7337c99e8c8c86b6f60cf5d94693e67886 SHA1 43256f88cfc0db51012cde89882a92956c65f36b SHA256 f8552cde7b7c91923c276afca147e9c37b851b60896e1c9d5eb729ecd5bbc324
 AUX nettle-2.0-asneeded.patch 397 RMD160 735bbf72df60ee2538f04b591504d5c144e1f7a7 SHA1 fad5db4641b0bbce998d4809dc98df5e009ba7d6 SHA256 bac166a7ff2dbab851e2a138e7660be4b86f177647123c7ed451d152a0b68ff0
+AUX nettle-2.4-darwin-shlink.patch 2309 RMD160 13f40a577015b8acccc748538c77716b734a7753 SHA1 bdc173a775ee4eaf576aea4d5810fc50110f105e SHA256 51bae592f4aa56083f9fc823de4025bcf35eecf2b2dba29f8b5c8ecb4ffd6bba
 DIST nettle-1.15.tar.gz 829862 RMD160 8944901d4a856bb25b8e44e420ba4475c0fd0a93 SHA1 0f2d95a859fc64ff3e490f9f2bec0d206ae95a7e SHA256 d6e540bf4acc857a3b09580e7f61822d352ee83c119579bf7333f0a785f7d9ac
 DIST nettle-2.0.tar.gz 883732 RMD160 1e9e8b6f01276376514bee3d34aa479f5de44e0b SHA1 bfe436a556afecad0991fe4afef096992a77647f SHA256 65b9e230b953bfb075f10473917e216df9b825fc325b88f69cdf756ffa17cbd6
 DIST nettle-2.1.tar.gz 965345 RMD160 56bd66654e8320abb12812d0fa1b79733bc62094 SHA1 15f660ef6cfd62c1c3302f68055f194913de0dfb SHA256 b7d26b3e38842d83c02f807ea7a2cbaa6e2d8f22e5fb20d97ab7a171d039d74e
@@ -12,17 +13,13 @@ EBUILD nettle-1.15.ebuild 1046 RMD160 8f584b64dd59a8eeec5e4f467e113be2ee091569 S
 EBUILD nettle-2.0.ebuild 1044 RMD160 f918d36affce4d4fdb272c8be0d1c6bf0abc1633 SHA1 e5da5488a40fee84b4c1cabba8b94a7701ac1b08 SHA256 0d9a565c7e70e81e8f8cf22c5e2bda0239d2383190ef6a9ab1c4aa9dde6ceb4b
 EBUILD nettle-2.1.ebuild 1018 RMD160 0ca854a55b6c6b225362a7b981856b767acf446b SHA1 84012a0e80a71ca8e0822155e83e874e3a579b86 SHA256 c8eb12eae032152fba1574a744e5c5b79d0bb7df273552e63c52eb8533c3788e
 EBUILD nettle-2.2.ebuild 971 RMD160 6f927ef236590d2f3e00650b59cc054e8ed58cbd SHA1 8f11fa2cb70615d85dc0b357b276c093f7d62352 SHA256 5464b2fe3e7f1993b89aab108a6b10915c4cf06e7d84f04c910c60c3d4fa2dfe
-EBUILD nettle-2.4.ebuild 894 RMD160 6529e7b5482d51cf3128884a5a3c2fc0b85965d9 SHA1 a0dc8f0b1a02d358d3278e77e32c2fcdb2cc9509 SHA256 6d910d622215d413c951dfb51c8c1945415c24fd530d85d1b3b86686600fc78c
-MISC ChangeLog 5748 RMD160 117c4d6d64421078a19250cff0d92bab786cc81e SHA1 19333c5d0604557186606de747afb866b42f5d75 SHA256 5e11de1903cc5c06f3005dfa01cb741e854e9edfaebb3e7d4cc5a6d824154192
+EBUILD nettle-2.4.ebuild 957 RMD160 e66f1a816979882c86ba996b67c980c268a3689b SHA1 d4eab339dca6114d89779a3f3948502e775d5d59 SHA256 d551432b8d83af9e9bd326f0d3ab28cc0981a2934ab8c37cdfc0097b81ef6ade
+MISC ChangeLog 5918 RMD160 018f7262125b0202e17229b759ad38637a23d222 SHA1 ba3ba4e7eba1ef268ff2b8a431320573ef8be336 SHA256 9997058fe0c0c75fa5e36ffac42d6b142aad86cb7d97dc11eeef255e8a04328d
 MISC metadata.xml 159 RMD160 7f0018281c6308f73c2d95b3690e3804f0c353c5 SHA1 09baadee9aeb270d0a7f31be07db9db5c105abbc SHA256 fabd15e2740a2a68e0bda738d0cd4300b133ff11239802afe7e60aa3862c9c03
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.18 (Darwin)
 
-iQEcBAEBCgAGBQJOYvpOAAoJEEqz6FtPBkyjpnEH/jgmWl/JRhrCMU2yY1diDd3P
-Eb1ZdrILr6c1Zz3H486y73coZn5UdpoUSQa5xxxbvj8yO9WvL5FZSmDg+EcgbzND
-BIyPD5Unx0jmL/bDMfbk3WlmcETPAvyJZLBva1UycKhaXxTiuWRc0eu8/Jk9m8Rn
-7VLCZ2LnObwoyBeQ+4wMeX0r6d4GaUlPrXMqXGDlPfi2+ixYJHR7MoxXBEB0P1YT
-2GqwBS+xcYXaoPDS27+6wbeXwY3mluQB8uiGNTHsqzoX9iaHJB5MPghnojFNa93j
-de5MJsP4D5G7ILlkSdqGVAeeMzTtVRpIorqP1evXiAj6DhlIWKdZDWNIFWp3zfw=
-=cTiu
+iEYEARECAAYFAk7aJFwACgkQX3X2B8XHTolGrwCdFw8msNCxgOSqz8goAaOLXyUS
+ydUAn3bqR1/9X9vqaNMmK9tWhjrhOcK6
+=3zfI
 -----END PGP SIGNATURE-----

diff --git a/dev-libs/nettle/files/nettle-2.4-darwin-shlink.patch b/dev-libs/nettle/files/nettle-2.4-darwin-shlink.patch
new file mode 100644 (file)
index 0000000..b3c9377
--- /dev/null
+++ b/dev-libs/nettle/files/nettle-2.4-darwin-shlink.patch
@@ -0,0 +1,54 @@
+From MacPorts:
+https://trac.macports.org/browser/trunk/dports/devel/nettle/files/patch-configure.diff
+
+nettle: move -L. before $(LDFLAGS) (which will contain -L${prefix}/lib)
+so future updates when the new and old libraries are incompatible don't
+go awry
+
+Reworked by Gentoo for configure.ac
+
+Fixes in particular the linking stage on Darwin, using the right
+dependency libs, and creating the right names.
+
+Fixed incorrect -gmp argument in LIBS (probably typo)
+
+
+--- configure.ac
++++ configure.ac
+@@ -61,9 +61,8 @@
+   [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"`])
+ 
+ # Checks for programs.
+ AC_PROG_CC
+@@ -281,16 +280,16 @@
+     ;;
+   darwin*)
+     LIBNETTLE_FORLINK=libnettle.dylib
+-    LIBNETTLE_SONAME='$(LIBNETTLE_FORLINK).$(LIBNETTLE_MAJOR)'
+-    LIBNETTLE_FILE='$(LIBNETTLE_SONAME).$(LIBNETTLE_MINOR)'
+-    LIBNETTLE_LINK='$(CC) -dynamiclib $(LDFLAGS)'
+-    LIBNETTLE_LIBS=''
++    LIBNETTLE_SONAME='libnettle.$(LIBNETTLE_MAJOR).dylib'
++    LIBNETTLE_FILE='libnettle.$(LIBNETTLE_MAJOR).$(LIBNETTLE_MINOR).dylib'
++    LIBNETTLE_LINK='$(CC) -dynamiclib $(LDFLAGS) -install_name ${libdir}/$(LIBNETTLE_SONAME) -compatibility_version $(LIBNETTLE_MAJOR) -current_version $(LIBNETTLE_MAJOR).$(LIBNETTLE_MINOR)'
++    LIBNETTLE_LIBS='$(LIBS)'
+ 
+     LIBHOGWEED_FORLINK=libhogweed.dylib
+-    LIBHOGWEED_SONAME='$(LIBHOGWEED_FORLINK).$(LIBHOGWEED_MAJOR)'
+-    LIBHOGWEED_FILE='$(LIBHOGWEED_SONAME).$(LIBHOGWEED_MINOR)'
+-    LIBHOGWEED_LINK='$(CC) -dynamiclib $(LDFLAGS)'
+-    LIBHOGWEED_LIBS=''
++    LIBHOGWEED_SONAME='libhogweed.$(LIBHOGWEED_MAJOR).dylib'
++    LIBHOGWEED_FILE='libhogweed.$(LIBHOGWEED_MAJOR).$(LIBHOGWEED_MINOR).dylib'
++    LIBHOGWEED_LINK='$(CC) -dynamiclib -L. $(LDFLAGS) -install_name ${libdir}/$(LIBHOGWEED_SONAME) -compatibility_version $(LIBHOGWEED_MAJOR) -current_version $(LIBHOGWEED_MAJOR).$(LIBHOGWEED_MINOR)'
++    LIBHOGWEED_LIBS='$(LIBS) -lnettle'
+     ;;
+   solaris*)
+     # Sun's ld uses -h to set the soname, and this option is passed

diff --git a/dev-libs/nettle/nettle-2.4.ebuild b/dev-libs/nettle/nettle-2.4.ebuild
index d79e2a4b63aa8799265b2516c0ebc37a98345c2e..43400b771ee6942556b5a95b3d1baac16b7d5cd9 100644 (file)
--- a/dev-libs/nettle/nettle-2.4.ebuild
+++ b/dev-libs/nettle/nettle-2.4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 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.1 2011/09/04 04:10:48 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nettle/nettle-2.4.ebuild,v 1.2 2011/12/03 13:29:58 grobian Exp $
 
 EAPI="4"
 
-inherit autotools
+inherit eutils autotools
 
 DESCRIPTION="Low-level cryptographic library"
 HOMEPAGE="http://www.lysator.liu.se/~nisse/nettle/"
@@ -12,7 +12,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 ~x86-macos"
+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"
 
 DEPEND="gmp? ( dev-libs/gmp )
@@ -21,6 +21,7 @@ RDEPEND="${DEPEND}"
 
 src_prepare() {
        sed -e "/CFLAGS=/s: -ggdb3::" -i configure.ac || die "sed failed"
+       epatch "${FILESDIR}"/${P}-darwin-shlink.patch
        eautoreconf
 }