Fix some more dependencies. Fix parallel make issue, thanks to Jason Wever, closes...

Package-Manager: portage-2.1.1-r1

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index b833db2c4d6697b3ec670aa3eeebb5d972140daa..899ba15f8e91c71daaee41b6acc36cb32e2264c4 100644 (file)
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/gnupg
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.245 2006/10/30 19:07:40 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.246 2006/10/30 20:09:31 alonbl Exp $
+
+  30 Oct 2006; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/gnupg-1.9.94-make.patch, gnupg-1.9.94.ebuild:
+  Fix some more dependencies. Fix parallel make issue, thanks to Jason Wever,
+  closes bug#153444
 
   30 Oct 2006; Alon Bar-Lev <alonbl@gentoo.org> gnupg-1.9.94.ebuild:
   Fix dependency, thanks to Dale, closes bug#153427

diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 9190ca84884166031e94f7758fd5443274976e0a..662f99596ff6cf79e666f108ca9e5ab9810b757c 100644 (file)
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -62,6 +62,10 @@ AUX gnupg-1.9.94-fbsd.patch 926 RMD160 d16364fef0f594485afc74c3dab28c4f8ee3ee47
 MD5 2235abfce9dd112a3fd402d5363aeb23 files/gnupg-1.9.94-fbsd.patch 926
 RMD160 d16364fef0f594485afc74c3dab28c4f8ee3ee47 files/gnupg-1.9.94-fbsd.patch 926
 SHA256 25d3777d6cf545e4a6ba1c1b52dc261a80265f2247e32444f45d506eec763422 files/gnupg-1.9.94-fbsd.patch 926
+AUX gnupg-1.9.94-make.patch 526 RMD160 2baeb8cdde34e9cb5b9fde85dabde59cc2b07b7b SHA1 f715ea201b73815f3468f959c32ef1c3e5c8cf8e SHA256 43b68e5a4c77083a4c1a2a68b8b6d0e8ef895d8682e4aa4244a71732c286ab33
+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
 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
@@ -108,14 +112,14 @@ EBUILD gnupg-1.9.22.ebuild 2733 RMD160 ac5e8ee811b75c74bbfb1c3043d46d57756bf310
 MD5 c835a86b2fc7abcc9a28ab59d634d8e4 gnupg-1.9.22.ebuild 2733
 RMD160 ac5e8ee811b75c74bbfb1c3043d46d57756bf310 gnupg-1.9.22.ebuild 2733
 SHA256 b4c151be96803d086778b584c48f307531885d355517e3a3a2a270cdcc4d6f4e gnupg-1.9.22.ebuild 2733
-EBUILD gnupg-1.9.94.ebuild 2679 RMD160 4d7d27c22d2dc6a75bd6947bafa6fe188cd589a4 SHA1 17ffdd7cae8de1cd797d46de0bc2e072da822608 SHA256 480dc6822960e4d46b66605cf6653fbb02e0adebf81bd7ac16929cd0cd1cfc3b
-MD5 211e8a7f9084628817f86f938e0cd73f gnupg-1.9.94.ebuild 2679
-RMD160 4d7d27c22d2dc6a75bd6947bafa6fe188cd589a4 gnupg-1.9.94.ebuild 2679
-SHA256 480dc6822960e4d46b66605cf6653fbb02e0adebf81bd7ac16929cd0cd1cfc3b gnupg-1.9.94.ebuild 2679
-MISC ChangeLog 38564 RMD160 f2a5f4334e70eb83cefda7cd9459edadee68fa9c SHA1 c2eccc1d20a626965e21a32c004c1ce5d0bbe742 SHA256 ab9d3d835cdd525f5aa8c7d055c91a50ef37841720ff029e6dace70aa26fa36f
-MD5 7b3cb892acd41cd34d9995020a67fea2 ChangeLog 38564
-RMD160 f2a5f4334e70eb83cefda7cd9459edadee68fa9c ChangeLog 38564
-SHA256 ab9d3d835cdd525f5aa8c7d055c91a50ef37841720ff029e6dace70aa26fa36f ChangeLog 38564
+EBUILD gnupg-1.9.94.ebuild 2715 RMD160 49017c2c22c61bde3813e77fec7be404419c5c70 SHA1 ec5afa230a38ac10ec3d3a6920f379f711bf8b02 SHA256 beb1da15a12d08b3f1d10ddd5b071e44e4b7515729004392755878298e07b33b
+MD5 aa5fd05c3ac69d4928202e8eebf55036 gnupg-1.9.94.ebuild 2715
+RMD160 49017c2c22c61bde3813e77fec7be404419c5c70 gnupg-1.9.94.ebuild 2715
+SHA256 beb1da15a12d08b3f1d10ddd5b071e44e4b7515729004392755878298e07b33b gnupg-1.9.94.ebuild 2715
+MISC ChangeLog 38766 RMD160 eb2cbd9c53c8785892f2b5e270d443bc494e5751 SHA1 48037e6a9e2fd4ce23298d20caed996fcae486a7 SHA256 df20e2ee42f94c1da895211221f3744bf6554e683e803036813950ff2bde3584
+MD5 6c519c0504097db42e75507d20817ca4 ChangeLog 38766
+RMD160 eb2cbd9c53c8785892f2b5e270d443bc494e5751 ChangeLog 38766
+SHA256 df20e2ee42f94c1da895211221f3744bf6554e683e803036813950ff2bde3584 ChangeLog 38766
 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-1.9.94-make.patch b/app-crypt/gnupg/files/gnupg-1.9.94-make.patch
new file mode 100644 (file)
index 0000000..d53220e
--- /dev/null
+++ b/app-crypt/gnupg/files/gnupg-1.9.94-make.patch
@@ -0,0 +1,11 @@
+diff -urNp gnupg-1.9.94.org/common/Makefile.am gnupg-1.9.94/common/Makefile.am
+--- gnupg-1.9.94.org/common/Makefile.am        2006-10-17 13:49:02.000000000 +0200
++++ gnupg-1.9.94/common/Makefile.am    2006-10-30 21:21:39.000000000 +0200
+@@ -80,6 +80,6 @@ module_tests = t-convert
+ t_common_ldadd = ../jnlib/libjnlib.a ../common/libcommon.a ../gl/libgnu.a \
+                  $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS)
+ 
+-t_convert_DEPENDENCIES = convert.c
++t_convert_DEPENDENCIES = convert.c libcommon.a
+ t_convert_LDADD = $(t_common_ldadd)
+ 

diff --git a/app-crypt/gnupg/gnupg-1.9.94.ebuild b/app-crypt/gnupg/gnupg-1.9.94.ebuild
index 800c08c977e73d93191775c3947d6c21e9d7d726..65837c310d2fcbb04e2f196b63669d73834aef17 100644 (file)
--- a/app-crypt/gnupg/gnupg-1.9.94.ebuild
+++ b/app-crypt/gnupg/gnupg-1.9.94.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.9.94.ebuild,v 1.4 2006/10/30 19:07:40 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.9.94.ebuild,v 1.5 2006/10/30 20:09:31 alonbl Exp $
 
 WANT_AUTOMAKE='latest'
 
@@ -18,8 +18,8 @@ IUSE="X gpg2-experimental doc ldap nls openct pcsc-lite smartcard selinux"
 COMMON_DEPEND="
        virtual/libc
        >=dev-libs/pth-1.3.7
-       >=dev-libs/libgcrypt-1.1.94
-       >=dev-libs/libksba-0.9.15
+       >=dev-libs/libgcrypt-1.2.0
+       >=dev-libs/libksba-1.0.0
        >=dev-libs/libgpg-error-1.4
        >=dev-libs/libassuan-0.9.3
        pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )
@@ -49,6 +49,7 @@ src_unpack() {
        sed -i -e '/AM_CFLAGS/s!-Wno-pointer-sign!!g' ${S}/g10/Makefile.am
        sed -i -e '/AM_CFLAGS/s!-Wno-pointer-sign!!g' ${S}/g10/Makefile.in
 
+       epatch "${FILESDIR}/${P}-make.patch"
        epatch "${FILESDIR}/${P}-fbsd.patch"
        AT_M4DIR="m4 gl/m4" eautoreconf
 }