Dependancy changed thanks to Gregorio Guidi in bug #57193. Ebuilds have been unmasked

4 files changed, 37 insertions, 27 deletions

diff --git a/app-crypt/gpgme/ChangeLog b/app-crypt/gpgme/ChangeLog
index a56716ef5022..947844170d4b 100644
--- a/app-crypt/gpgme/ChangeLog
+++ b/app-crypt/gpgme/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/gpgme
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/ChangeLog,v 1.37 2004/08/07 08:18:25 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/ChangeLog,v 1.38 2004/08/08 03:12:19 dragonheart Exp $
+
+  08 Aug 2004; Daniel Black <dragonheart@gentoo.org> gpgme-0.3.14-r1.ebuild,
+  gpgme-0.9.0-r1.ebuild:
+  Dependancy changed thanks to Gregorio Guidi in bug #57193. Ebuilds have been
+  unmasked
 
 *gpgme-0.3.14-r1 (07 Aug 2004)
 
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index 73d1e6691d2a..11a89ba669b1 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 f414afd3166c8cd99a6c4aa48d58a9da ChangeLog 6036
+MD5 abd85d41b8f48297ac56a39fde8cdcb4 ChangeLog 6229
 MD5 de8949bc858c0729e2e8df0ea8a91f34 gpgme-0.3.14.ebuild 1021
 MD5 44dcb84da565f66966fc2967567c41f8 gpgme-0.3.16.ebuild 832
 MD5 c60aa07c58226f4a164ab89cff2616a1 gpgme-0.4.0.ebuild 1564
 MD5 8954a02f766eaee7c9dc015c96d1bd12 gpgme-0.4.7.ebuild 1552
 MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
-MD5 4bed3cb2347f870f061b97db2d0a3d4c gpgme-0.3.14-r1.ebuild 2252
-MD5 a97de8bcdaf7473bda168111aaa02e71 gpgme-0.9.0-r1.ebuild 1222
+MD5 13398cc5c289da9259f24ed2c77d8913 gpgme-0.3.14-r1.ebuild 2359
+MD5 a1d61ffabe68944481a2b55d71a1f5e5 gpgme-0.9.0-r1.ebuild 1263
 MD5 438d865640f00b860f2c3f88b21e621e files/digest-gpgme-0.3.14 64
 MD5 f8d60472ee71707fd01798c5677b15ae files/digest-gpgme-0.3.16 64
 MD5 1e195068762b5aafd2f260d76b108a70 files/digest-gpgme-0.4.0 63
@@ -18,7 +18,7 @@ MD5 260bf91983886d989efa3e54792c921d files/digest-gpgme-0.9.0-r1 63
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.4 (GNU/Linux)
 
-iD8DBQFBFH6DmdTrptrqvGERApPlAJ4zFAGy2zq9hohMOZoBKPRohgSl+QCgjyUO
-0RL1cx/YtJvSPS6xOL1lOZM=
-=3uPF
+iD8DBQFBFZoLmdTrptrqvGERAsAEAJ4kbBQmzHuq6CYCUAAebR2rB1CKXACeJi3i
+75qpSdtFoFr9k26jF4LvyGw=
+=ns8N
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/gpgme/gpgme-0.3.14-r1.ebuild b/app-crypt/gpgme/gpgme-0.3.14-r1.ebuild
index 2021f8ed60da..88516fe22ea7 100644
--- a/app-crypt/gpgme/gpgme-0.3.14-r1.ebuild
+++ b/app-crypt/gpgme/gpgme-0.3.14-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-0.3.14-r1.ebuild,v 1.1 2004/08/07 08:18:25 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-0.3.14-r1.ebuild,v 1.2 2004/08/08 03:12:19 dragonheart Exp $
 
 DESCRIPTION="GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG easier for applications."
 HOMEPAGE="http://www.gnupg.org/gpgme.html"
@@ -8,20 +8,22 @@ SRC_URI="ftp://ftp.gnupg.org/gcrypt/gpgme/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0.3"
-KEYWORDS="-*"
-IUSE="nls doc smime"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64"
+IUSE="doc"
+# smime once post gnupg-1.9+ gets unmasked
 
 DEPEND=">=sys-libs/zlib-1.1.3
-	>=app-crypt/gnupg-1.0.7
 	sys-apps/gawk
 	sys-devel/libtool
 	sys-devel/gcc
 	sys-devel/autoconf
 	sys-devel/automake
 	>=sys-apps/sed-4
-	nls? ( sys-devel/gettext )
-	>=app-crypt/gnupg-1.2.0
-	smime? ( >=app-crypt/newpg-0.9.2 )"
+	>=app-crypt/gnupg-1.2.0"
+
+#For gnupg-1.9+ gets unmasked
+#       !smime? ( >=app-crypt/gnupg-1.2.5 )
+#       smime? ( >=app-crypt/gnupg-1.9.10 )
 
 RDEPEND="virtual/libc"
 
@@ -74,11 +76,13 @@ src_compile() {
 	autoconf
 	automake
 
+	# For gnugpg-1.9+
+	# 		$(use_with smime gpgsm /usr/bin/gpgsm) 
+	#
+
 	econf \
 		--enable-gpgmeplug \
 		--includedir=/usr/include/gpgme3 \
-		$(use_with smime gpgsm /usr/bin/gpgsm) \
-		`use_enable nls` \
 		--with-gpg=$GPGBIN \
 		${myconf} \
 		|| die "econf failed"
diff --git a/app-crypt/gpgme/gpgme-0.9.0-r1.ebuild b/app-crypt/gpgme/gpgme-0.9.0-r1.ebuild
index 38a80fc060a6..83326f0c5b6b 100644
--- a/app-crypt/gpgme/gpgme-0.9.0-r1.ebuild
+++ b/app-crypt/gpgme/gpgme-0.9.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-0.9.0-r1.ebuild,v 1.1 2004/08/07 08:18:25 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-0.9.0-r1.ebuild,v 1.2 2004/08/08 03:12:19 dragonheart Exp $
 
 DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
 HOMEPAGE="http://www.gnupg.org/(en)/related_software/gpgme/index.html"
@@ -8,22 +8,22 @@ SRC_URI="ftp://ftp.gnupg.org/gcrypt/alpha/gpgme/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="-*"
-IUSE="nls smime"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64"
+IUSE=""
+#IUSE="smime"
 
-DEPEND=">=sys-libs/zlib-1.1.3
-	>=app-crypt/gnupg-1.2.2
+DEPEND=">=app-crypt/gnupg-1.2.4
 	sys-apps/gawk
 	sys-devel/libtool
 	sys-devel/gcc
 	dev-libs/libgpg-error
-	dev-libs/libgpg-error
-	nls? ( sys-devel/gettext )
 	dev-libs/libgcrypt
-	>=app-crypt/gnupg-1.2.2
-	smime? ( >=app-crypt/newpg-1.9.6 )
 	!<=app-crypt/gpgme-0.3.14"
 
+# For when gnupg-1.9+ gets unmasked
+#	!smime? ( >=app-crypt/gnupg-1.2.5 )
+#	smime? ( >=app-crypt/gnupg-1.9.10 )
+
 RDEPEND="virtual/libc
 	dev-libs/libgpg-error"
 
@@ -34,10 +34,11 @@ src_compile() {
 		GPGBIN=/usr/bin/gpg
 	fi
 
+	# For when gnupg-1.9+ gets unmasked
+	#	$(use_with smime gpgsm /usr/bin/gpgsm) \
+
 	econf \
 		--includedir=/usr/include/gpgme \
-		$(use_with smime gpgsm /usr/bin/gpgsm) \
-		`use_enable nls` \
 		--with-gpg=$GPGBIN \
 		|| die "econf failed"
 	emake || die