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

(Portage version: 2.1.1-r1)

3 files changed, 21 insertions, 4 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index b833db2c4d66..899ba15f8e91 100644
--- 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/files/gnupg-1.9.94-make.patch b/app-crypt/gnupg/files/gnupg-1.9.94-make.patch
new file mode 100644
index 000000000000..d53220e0b252
--- /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 800c08c977e7..65837c310d2f 100644
--- 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
 }