Fix for bug #159962 for the BSD/OSX folks.

Package-Manager: portage-2.1.2_rc4-r6

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index 884cf23fee2203fe052a99c514614ef75b103d7a..df88da02fb1ba78b403772ce1871a41cf36ea59a 100644 (file)
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/gnupg
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.262 2007/01/03 06:44:00 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.263 2007/01/05 19:41:46 robbat2 Exp $
+
+  05 Jan 2007; Robin H. Johnson <robbat2@gentoo.org>
+  +files/gnupg-2.0.1-bsd-make.patch, gnupg-2.0.1-r2.ebuild:
+  Fix for bug #159962 for the BSD/OSX folks.
 
 *gnupg-2.0.1-r2 (03 Jan 2007)
 

diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 9694c934dfd0a6c52eb89d35fe8e54ed8a03d38c..302a958338a5a70ad423251149fc37d64708b23b 100644 (file)
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -74,6 +74,10 @@ AUX gnupg-1.9.94-make.patch 526 RMD160 2baeb8cdde34e9cb5b9fde85dabde59cc2b07b7b
 MD5 2f2c134892f2a35adc9124b819cccb8a files/gnupg-1.9.94-make.patch 526
 RMD160 2baeb8cdde34e9cb5b9fde85dabde59cc2b07b7b files/gnupg-1.9.94-make.patch 526
 SHA256 43b68e5a4c77083a4c1a2a68b8b6d0e8ef895d8682e4aa4244a71732c286ab33 files/gnupg-1.9.94-make.patch 526
+AUX gnupg-2.0.1-bsd-make.patch 6960 RMD160 694eaf6b2b12eb6aa5e425ca48fd37064ce371f2 SHA1 a6ce2d94be3b305918143da06cc8cf4564c41f64 SHA256 cfac92c65ed1b8efa1927b8194eea62f7e45fadded559028a7072cc0685d29a3
+MD5 30c96069403e772fc6bd777d0622dd9f files/gnupg-2.0.1-bsd-make.patch 6960
+RMD160 694eaf6b2b12eb6aa5e425ca48fd37064ce371f2 files/gnupg-2.0.1-bsd-make.patch 6960
+SHA256 cfac92c65ed1b8efa1927b8194eea62f7e45fadded559028a7072cc0685d29a3 files/gnupg-2.0.1-bsd-make.patch 6960
 DIST gnupg-1.4.0-ecc0.1.6.diff.bz2 16703 RMD160 1d98f70f2f13e96eed4482be9c3646342b46cf4d SHA1 cf868cfc93951b5ee662ef8ce52e66338013a7a8 SHA256 9bb0b4b7b2fdc757410c332fbf6e41049169d5ee67a06f1b347dbd21cd583ce5
 DIST gnupg-1.4.2.2.tar.bz2 3034652 RMD160 cbbf3ffafa51fdf985c2562ecafccd72bc36ea0d SHA1 f5559ddb004e0638f6bd9efe2bac00134c5065ba SHA256 174e7f78c670d76984c4c4bd6077a0b9fec7b4be700b9f3e40c6889b78110c57
 DIST gnupg-1.4.4-ecc0.1.6.diff.bz2 16931 RMD160 30af14d212c50c56d7f170b6697a9148d086bb5a SHA1 15831b5d4cbccdca3c005199d510700ee862fbc5 SHA256 023e1da2837a06e9c92785184f31c6ecb31c0a328446100ab2c6dcf819c1f5be
@@ -140,18 +144,18 @@ EBUILD gnupg-2.0.1-r1.ebuild 2192 RMD160 f8dbe4b96e31e6b4f58563b1c501694852d9463
 MD5 909344ea1c8f804865fde67d5f16e116 gnupg-2.0.1-r1.ebuild 2192
 RMD160 f8dbe4b96e31e6b4f58563b1c501694852d94637 gnupg-2.0.1-r1.ebuild 2192
 SHA256 a5332e970ac7a77daa158745eab75da14896d8f14568783cfd6374d1c7b37ccc gnupg-2.0.1-r1.ebuild 2192
-EBUILD gnupg-2.0.1-r2.ebuild 2180 RMD160 80f37761ad90f44efa36f9d65dcf0a8c6b6e2d69 SHA1 9d868d13e6546ab348b537e78603b590a2a24245 SHA256 d2b6e00ca3247f1834c2edaa9df871492094a59dd08015f1231e6a123d565dc0
-MD5 38dd645f834f6eb05e3d846aebfcef19 gnupg-2.0.1-r2.ebuild 2180
-RMD160 80f37761ad90f44efa36f9d65dcf0a8c6b6e2d69 gnupg-2.0.1-r2.ebuild 2180
-SHA256 d2b6e00ca3247f1834c2edaa9df871492094a59dd08015f1231e6a123d565dc0 gnupg-2.0.1-r2.ebuild 2180
+EBUILD gnupg-2.0.1-r2.ebuild 2228 RMD160 643f782ada194b40182b7bb788614cfe370f1b30 SHA1 55fdc39deb244e092bb127f83c70ee24663a9855 SHA256 7b54eeaadb12bc1a025ac46df281c8d7fced85cb156d1c445d9c4571e9842133
+MD5 c90ea930766f64e70a14de33fd212ad3 gnupg-2.0.1-r2.ebuild 2228
+RMD160 643f782ada194b40182b7bb788614cfe370f1b30 gnupg-2.0.1-r2.ebuild 2228
+SHA256 7b54eeaadb12bc1a025ac46df281c8d7fced85cb156d1c445d9c4571e9842133 gnupg-2.0.1-r2.ebuild 2228
 EBUILD gnupg-2.0.1.ebuild 2375 RMD160 2f009d186055c4cb251e38bf6e6ba951d0cec430 SHA1 3d70b6b82aaaccc88761a013cf7b07165cfec90b SHA256 5fec10fd56e0bb8e4266ab91e2482f0983f51e4e96afcae7214463ca8002ab4d
 MD5 dffdf508c7bae61f4f4beaa72223a8d4 gnupg-2.0.1.ebuild 2375
 RMD160 2f009d186055c4cb251e38bf6e6ba951d0cec430 gnupg-2.0.1.ebuild 2375
 SHA256 5fec10fd56e0bb8e4266ab91e2482f0983f51e4e96afcae7214463ca8002ab4d gnupg-2.0.1.ebuild 2375
-MISC ChangeLog 40780 RMD160 eb36d25686492c50f866c65a3a0ceb3f79d5d442 SHA1 ece63c189018497742baab4674a15240fbdfc40e SHA256 6a8c7992325dcb753293b65041bdb6b1994de3a98b41d84a4ebb816e4ff11059
-MD5 7203ab35c10f0ef0403d43e657b15137 ChangeLog 40780
-RMD160 eb36d25686492c50f866c65a3a0ceb3f79d5d442 ChangeLog 40780
-SHA256 6a8c7992325dcb753293b65041bdb6b1994de3a98b41d84a4ebb816e4ff11059 ChangeLog 40780
+MISC ChangeLog 40940 RMD160 8b2eae0a4faebafba12043fc6b9e32d1b1185c5e SHA1 39e66fe2e179794f95eee2f1a699f7f0ee028a34 SHA256 e95e28a176c11d112f5802be225783ef4c289ad84b9a2c8ce6836065f3ff9682
+MD5 5e85e7fc5b9d5e6b0b304c961707cb6c ChangeLog 40940
+RMD160 8b2eae0a4faebafba12043fc6b9e32d1b1185c5e ChangeLog 40940
+SHA256 e95e28a176c11d112f5802be225783ef4c289ad84b9a2c8ce6836065f3ff9682 ChangeLog 40940
 MISC metadata.xml 481 RMD160 d5c4e2fc7b94966795cc4c039d850302d8552448 SHA1 13cb529b83ba9feaad91f1d033d6c33d1eafbd25 SHA256 d88eadc2c75a18f57dcd38f20aa72ee7c79504f62bcab3f7dea60651ccd4b672
 MD5 b507ee36c7487372de42cc9dab034370 metadata.xml 481
 RMD160 d5c4e2fc7b94966795cc4c039d850302d8552448 metadata.xml 481

diff --git a/app-crypt/gnupg/files/gnupg-2.0.1-bsd-make.patch b/app-crypt/gnupg/files/gnupg-2.0.1-bsd-make.patch
new file mode 100644 (file)
index 0000000..2e6395f
--- /dev/null
+++ b/app-crypt/gnupg/files/gnupg-2.0.1-bsd-make.patch
@@ -0,0 +1,149 @@
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+Date: Fri Jan  5 11:30:30 PST 2007
+
+This patch adds LIBICONV wherever LIBINTL is used. This is needed for compiles
+on Gentoo/OSX and Gentoo/BSD.
+
+There are two cases (t-convert, gpgsplit) where neither LIBINTL nor LIBICONV
+were brought in before, and I added them as well. It might be overkill.
+
+diff -Nuar --exclude '*~' gnupg-2.0.1.orig/agent/Makefile.am gnupg-2.0.1/agent/Makefile.am
+--- gnupg-2.0.1.orig/agent/Makefile.am 2006-10-20 07:07:09.000000000 -0700
++++ gnupg-2.0.1/agent/Makefile.am      2007-01-05 11:28:29.000000000 -0800
+@@ -53,7 +53,7 @@
+ gpg_agent_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_PTH_CFLAGS) $(PTH_CFLAGS)
+ gpg_agent_LDADD = $(commonpth_libs) \
+                 $(LIBGCRYPT_LIBS) $(LIBASSUAN_PTH_LIBS) $(PTH_LIBS) \
+-              $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS)
++              $(GPG_ERROR_LIBS) $(LIBICONV) $(LIBINTL) $(NETLIBS)
+ 
+ gpg_protect_tool_SOURCES = \
+       protect-tool.c \
+@@ -62,14 +62,14 @@
+ 
+ # Needs $(NETLIBS) for libsimple-pwquery.la.
+ gpg_protect_tool_LDADD =  $(pwquery_libs) $(common_libs) \
+-         $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS)
++         $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBICONV) $(LIBINTL) $(NETLIBS)
+ 
+ gpg_preset_passphrase_SOURCES = \
+       preset-passphrase.c
+ 
+ # Needs $(NETLIBS) for libsimple-pwquery.la.
+ gpg_preset_passphrase_LDADD =  $(pwquery_libs) $(common_libs) \
+-       $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS)
++       $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBICONV) $(LIBINTL) $(NETLIBS)
+ 
+ 
+ # Make sure that all libs are build before we use them.  This is
+@@ -83,7 +83,7 @@
+ TESTS = t-protect
+ 
+ t_common_ldadd = $(common_libs) \
+-                 $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL)
++                 $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBICONV) $(LIBINTL)
+ 
+ t_protect_SOURCES = t-protect.c protect.c 
+ t_protect_LDADD = $(t_common_ldadd)
+diff -Nuar --exclude '*~' gnupg-2.0.1.orig/common/Makefile.am gnupg-2.0.1/common/Makefile.am
+--- gnupg-2.0.1.orig/common/Makefile.am        2006-11-05 06:32:09.000000000 -0800
++++ gnupg-2.0.1/common/Makefile.am     2007-01-05 11:29:09.000000000 -0800
+@@ -79,7 +79,7 @@
+ module_tests = t-convert
+ 
+ t_common_ldadd = ../jnlib/libjnlib.a ../common/libcommon.a ../gl/libgnu.a \
+-                 $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS)
++                 $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBICONV) $(LIBINTL)
+ 
+ t_convert_DEPENDENCIES = convert.c libcommon.a
+ t_convert_LDADD = $(t_common_ldadd)
+diff -Nuar --exclude '*~' gnupg-2.0.1.orig/g10/Makefile.am gnupg-2.0.1/g10/Makefile.am
+--- gnupg-2.0.1.orig/g10/Makefile.am   2006-11-21 06:49:41.000000000 -0800
++++ gnupg-2.0.1/g10/Makefile.am        2007-01-05 11:27:06.000000000 -0800
+@@ -117,7 +117,7 @@
+ 
+ LDADD =  $(needed_libs) ../common/libgpgrl.a \
+          $(ZLIBS) $(DNSLIBS) $(LIBREADLINE) \
+-         $(LIBINTL) $(CAPLIBS) $(NETLIBS)
++         $(LIBICONV) $(LIBINTL) $(CAPLIBS) $(NETLIBS)
+ gpg2_LDADD = $(LIBGCRYPT_LIBS) $(LDADD) $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS)
+ gpgv2_LDADD = $(LIBGCRYPT_LIBS) $(LDADD) $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS)
+ 
+diff -Nuar --exclude '*~' gnupg-2.0.1.orig/kbx/Makefile.am gnupg-2.0.1/kbx/Makefile.am
+--- gnupg-2.0.1.orig/kbx/Makefile.am   2006-09-20 02:35:52.000000000 -0700
++++ gnupg-2.0.1/kbx/Makefile.am        2007-01-05 11:24:46.000000000 -0800
+@@ -48,6 +48,6 @@
+ kbxutil_SOURCES = kbxutil.c $(common_sources)
+ kbxutil_LDADD   = ../jnlib/libjnlib.a ../gl/libgnu.a \
+                 $(KSBA_LIBS) $(LIBGCRYPT_LIBS) \
+-                  -lgpg-error $(LIBINTL) ../common/libcommon.a
++                  -lgpg-error $(LIBICONV) $(LIBINTL) ../common/libcommon.a
+ 
+ $(PROGRAMS) : ../jnlib/libjnlib.a ../gl/libgnu.a ../common/libcommon.a
+diff -Nuar --exclude '*~' gnupg-2.0.1.orig/scd/Makefile.am gnupg-2.0.1/scd/Makefile.am
+--- gnupg-2.0.1.orig/scd/Makefile.am   2006-11-21 01:38:26.000000000 -0800
++++ gnupg-2.0.1/scd/Makefile.am        2007-01-05 11:27:24.000000000 -0800
+@@ -46,7 +46,7 @@
+ 
+ scdaemon_LDADD = ../jnlib/libjnlib.a ../common/libcommonpth.a ../gl/libgnu.a \
+       $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_PTH_LIBS) $(PTH_LIBS) \
+-      $(LIBUSB_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(DL_LIBS) $(NETLIBS)
++      $(LIBUSB_LIBS) $(GPG_ERROR_LIBS) $(LIBICONV) $(LIBINTL) $(DL_LIBS) $(NETLIBS)
+ 
+ # Removed for now: We need to decide whether it makes sense to
+ # continue it at all, given that gpg has now all required
+diff -Nuar --exclude '*~' gnupg-2.0.1.orig/sm/Makefile.am gnupg-2.0.1/sm/Makefile.am
+--- gnupg-2.0.1.orig/sm/Makefile.am    2006-11-05 06:32:08.000000000 -0800
++++ gnupg-2.0.1/sm/Makefile.am 2007-01-05 11:26:33.000000000 -0800
+@@ -58,7 +58,7 @@
+ 
+ gpgsm_LDADD = $(common_libs) \
+               $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) \
+-              $(GPG_ERROR_LIBS) $(LIBINTL) $(ZLIBS)
++              $(GPG_ERROR_LIBS) $(LIBICONV) $(LIBINTL) $(ZLIBS)
+ 
+ # Make sure that all libs are build before we use them.  This is
+ # important for things like make -j2.
+diff -Nuar --exclude '*~' gnupg-2.0.1.orig/tools/Makefile.am gnupg-2.0.1/tools/Makefile.am
+--- gnupg-2.0.1.orig/tools/Makefile.am 2006-11-23 06:48:46.000000000 -0800
++++ gnupg-2.0.1/tools/Makefile.am      2007-01-05 11:28:45.000000000 -0800
+@@ -54,34 +54,34 @@
+ common_libs = ../jnlib/libjnlib.a ../common/libcommon.a ../gl/libgnu.a
+ pwquery_libs = ../common/libsimple-pwquery.a
+ 
+-gpgsplit_LDADD = $(common_libs) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(ZLIBS)
++gpgsplit_LDADD = $(common_libs) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(ZLIBS) $(LIBICONV) $(LIBINTL)
+ 
+ gpgconf_SOURCES = gpgconf.c gpgconf.h gpgconf-comp.c no-libgcrypt.c
+ 
+ # jnlib/common sucks in gpg-error, will they, nil they (some compilers
+ # do not eliminate the supposed-to-be-unused-inline-functions).
+-gpgconf_LDADD = $(common_libs) $(LIBINTL) $(GPG_ERROR_LIBS)
++gpgconf_LDADD = $(common_libs) $(LIBICONV) $(LIBINTL) $(GPG_ERROR_LIBS)
+ 
+ gpgparsemail_SOURCES = gpgparsemail.c rfc822parse.c rfc822parse.h
+ gpgparsemail_LDADD = 
+ 
+ symcryptrun_SOURCES = symcryptrun.c
+ symcryptrun_LDADD = $(LIBUTIL_LIBS) $(common_libs) $(pwquery_libs) \
+-                    $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL)
++                    $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBICONV) $(LIBINTL)
+ 
+ watchgnupg_SOURCES = watchgnupg.c 
+ watchgnupg_LDADD = $(NETLIBS)
+ 
+ gpg_connect_agent_SOURCES = gpg-connect-agent.c no-libgcrypt.c
+ gpg_connect_agent_LDADD = $(common_libs) $(LIBASSUAN_LIBS) \
+-                        $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS)
++                        $(GPG_ERROR_LIBS) $(LIBICONV) $(LIBINTL) $(NETLIBS)
+ 
+ gpgkey2ssh_SOURCES = gpgkey2ssh.c
+ gpgkey2ssh_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS)
+ # common sucks in jnlib, via use of BUG() in an inline function, which
+ # some compilers do not eliminate.
+ gpgkey2ssh_LDADD = $(common_libs) \
+-                   $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL)
++                   $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBICONV) $(LIBINTL)
+ 
+ 
+ # Make sure that all libs are build before we use them.  This is

diff --git a/app-crypt/gnupg/gnupg-2.0.1-r2.ebuild b/app-crypt/gnupg/gnupg-2.0.1-r2.ebuild
index d818193e615efef4b787adcb19bb949f6ad5b352..b83b82a30c6fbf65b37c0008a6fdf19f533f1507 100644 (file)
--- a/app-crypt/gnupg/gnupg-2.0.1-r2.ebuild
+++ b/app-crypt/gnupg/gnupg-2.0.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.1-r2.ebuild,v 1.1 2007/01/03 06:44:00 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.1-r2.ebuild,v 1.2 2007/01/05 19:41:46 robbat2 Exp $
 
 WANT_AUTOMAKE='latest'
 
@@ -43,6 +43,7 @@ RDEPEND="${COMMON_DEPEND}
 
 src_unpack() {
        unpack ${A}
+       epatch ${FILESDIR}/${PN}-2.0.1-bsd-make.patch
        cd "${S}"
 
        AT_M4DIR="m4 gl/m4" eautoreconf