versions gpgme-0.3.14-r1 and gpgme-0.9.0-r1 commited as per bug #57193. Will unmask once dependancies are fixed

6 files changed, 131 insertions, 28 deletions

diff --git a/app-crypt/gpgme/ChangeLog b/app-crypt/gpgme/ChangeLog
index 9491d10c3c67..a56716ef5022 100644
--- a/app-crypt/gpgme/ChangeLog
+++ b/app-crypt/gpgme/ChangeLog
@@ -1,6 +1,13 @@
 # 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.36 2004/07/31 02:13:46 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/ChangeLog,v 1.37 2004/08/07 08:18:25 dragonheart Exp $
+
+*gpgme-0.3.14-r1 (07 Aug 2004)
+
+  07 Aug 2004; Daniel Black <dragonheart@gentoo.org> +gpgme-0.3.14-r1.ebuild,
+  +gpgme-0.9.0-r1.ebuild, -gpgme-0.9.0.ebuild:
+  versions gpgme-0.3.14-r1 and gpgme-0.9.0-r1 commited as per bug #57193. Will
+  unmask once dependancies are fixed
 
   31 Jul 2004; Tom Gall <tgall@gentoo.org> gpgme-0.3.16.ebuild:
   stable on ppc64, bug #57114
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index 47985013663f..73d1e6691d2a 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -1,12 +1,24 @@
-MD5 58fe2df22d96f91e7533cb4a116265c5 ChangeLog 5756
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f414afd3166c8cd99a6c4aa48d58a9da ChangeLog 6036
 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 efb733a259b7127731a10f47013600d9 gpgme-0.9.0.ebuild 1622
+MD5 4bed3cb2347f870f061b97db2d0a3d4c gpgme-0.3.14-r1.ebuild 2252
+MD5 a97de8bcdaf7473bda168111aaa02e71 gpgme-0.9.0-r1.ebuild 1222
 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
 MD5 f61d73bc505b5a542662b75aa0fa219f files/digest-gpgme-0.4.7 63
-MD5 260bf91983886d989efa3e54792c921d files/digest-gpgme-0.9.0 63
+MD5 438d865640f00b860f2c3f88b21e621e files/digest-gpgme-0.3.14-r1 64
+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
+-----END PGP SIGNATURE-----
diff --git a/app-crypt/gpgme/files/digest-gpgme-0.3.14-r1 b/app-crypt/gpgme/files/digest-gpgme-0.3.14-r1
new file mode 100644
index 000000000000..3562ea6d4238
--- /dev/null
+++ b/app-crypt/gpgme/files/digest-gpgme-0.3.14-r1
@@ -0,0 +1 @@
+MD5 b5351e212aa10336e5d88ebf4babccf7 gpgme-0.3.14.tar.gz 655474
diff --git a/app-crypt/gpgme/files/digest-gpgme-0.9.0 b/app-crypt/gpgme/files/digest-gpgme-0.9.0-r1
index fd563d5218eb..fd563d5218eb 100644
--- a/app-crypt/gpgme/files/digest-gpgme-0.9.0
+++ b/app-crypt/gpgme/files/digest-gpgme-0.9.0-r1
diff --git a/app-crypt/gpgme/gpgme-0.3.14-r1.ebuild b/app-crypt/gpgme/gpgme-0.3.14-r1.ebuild
new file mode 100644
index 000000000000..2021f8ed60da
--- /dev/null
+++ b/app-crypt/gpgme/gpgme-0.3.14-r1.ebuild
@@ -0,0 +1,94 @@
+# 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 $
+
+DESCRIPTION="GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG easier for applications."
+HOMEPAGE="http://www.gnupg.org/gpgme.html"
+SRC_URI="ftp://ftp.gnupg.org/gcrypt/gpgme/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0.3"
+KEYWORDS="-*"
+IUSE="nls doc smime"
+
+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 )"
+
+RDEPEND="virtual/libc"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	find . -name Makefile -o -name Makefile.in -exec rm {} \;
+
+	sed -i -e 's:libgpgme:libgpgme3:g' \
+		`find . -name Makefile.am` doc/gpgme.info
+
+	sed -i -e 's:gpgme-config:gpgme3-config:g' \
+		configure.ac gpgme/Makefile.am doc/gpgme.texi \
+		./doc/gpgme.info-1 gpgme/gpgme-config.in
+
+	sed -i -e 's:gpgme\.info:gpgme3.info:g' \
+		-e 's:gpgme\.texi:gpgme3\.texi:g' \
+		doc/Makefile.am doc/gpgme.info
+
+	sed -i -e 's:-lgpgme:-lgpgme3:g' \
+		gpgme/gpgme-config.in doc/gpgme.info-1 \
+		doc/gpgme.texi configure.ac
+
+	sed -i -e 's:gpgme\.m4:gpgme3.m4:g' \
+		-e 's:gpgme\.h:gpgme3.h:g' \
+		gpgme/Makefile.am configure.ac doc/gpgme.texi
+
+	sed -i -e 's:gpgme\.info:gpgme3.info:' doc/gpgme.texi
+
+	mv doc/gpgme{,3}.texi
+	mv gpgme/gpgme{,3}-config.in
+	mv gpgme/gpgme{,3}.m4
+	mv gpgme/gpgme{,3}.h
+}
+
+
+src_compile() {
+	local myconf
+
+	use doc \
+		&& myconf="${myconf} --enable-maintainer-mode"
+
+	if [ -x ${ROOT}usr/bin/gpg2 ]; then
+		myconf="${myconf} --with-gpg=${ROOT}usr/bin/gpg2"
+	else
+		myconf="${myconf} --with-gpg=${ROOT}usr/bin/gpg2"
+	fi
+
+	aclocal
+	autoconf
+	automake
+
+	econf \
+		--enable-gpgmeplug \
+		--includedir=/usr/include/gpgme3 \
+		$(use_with smime gpgsm /usr/bin/gpgsm) \
+		`use_enable nls` \
+		--with-gpg=$GPGBIN \
+		${myconf} \
+		|| die "econf failed"
+
+
+	econf ${myconf} || die "econf failed"
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	dodoc AUTHORS ChangeLog INSTALL NEWS README README-alpha THANKS TODO VERSION
+}
diff --git a/app-crypt/gpgme/gpgme-0.9.0.ebuild b/app-crypt/gpgme/gpgme-0.9.0-r1.ebuild
index e31aab3a7e40..38a80fc060a6 100644
--- a/app-crypt/gpgme/gpgme-0.9.0.ebuild
+++ b/app-crypt/gpgme/gpgme-0.9.0-r1.ebuild
@@ -1,13 +1,13 @@
 # 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.ebuild,v 1.1 2004/07/29 21:43:41 caleb Exp $
+# $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 $
 
 DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
 HOMEPAGE="http://www.gnupg.org/(en)/related_software/gpgme/index.html"
 SRC_URI="ftp://ftp.gnupg.org/gcrypt/alpha/gpgme/${P}.tar.gz"
 
 LICENSE="GPL-2"
-SLOT="0.4"
+SLOT="1"
 KEYWORDS="-*"
 IUSE="nls smime"
 
@@ -16,27 +16,16 @@ DEPEND=">=sys-libs/zlib-1.1.3
 	sys-apps/gawk
 	sys-devel/libtool
 	sys-devel/gcc
-	dev-libs/libgpg-error"
-RDEPEND="nls? ( sys-devel/gettext )
-	dev-libs/libgcrypt"
+	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"
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i -e 's:libgpgme:libgpgme4:g' \
-		`find . -name Makefile.in` doc/gpgme.info
-	sed -i -e 's:gpgme-config:gpgme4-config:g' \
-		configure gpgme/Makefile.in doc/gpgme.info gpgme/gpgme-config.in
-	sed -i -e 's:-lgpgme:-lgpgme4:g' \
-		gpgme/gpgme-config.in doc/gpgme.info configure
-	sed -i -e 's:gpgme\.info:gpgme4.info:g' \
-		doc/Makefile.in doc/gpgme.info
-	sed -i -e 's:gpgme\.m4:gpgme4.m4:g' gpgme/Makefile.in
-	mv gpgme/gpgme{,4}-config.in
-	mv doc/gpgme{,4}.info
-	mv gpgme/libgpgme{,4}.vers
-	mv gpgme/gpgme{,4}.m4
-}
+RDEPEND="virtual/libc
+	dev-libs/libgpg-error"
 
 src_compile() {
 	if [ -x /usr/bin/gpg2 ]; then
@@ -46,8 +35,8 @@ src_compile() {
 	fi
 
 	econf \
-		--includedir=/usr/include/gpgme4 \
-		$(use_with smime gpgsm $(which gpgsm)) \
+		--includedir=/usr/include/gpgme \
+		$(use_with smime gpgsm /usr/bin/gpgsm) \
 		`use_enable nls` \
 		--with-gpg=$GPGBIN \
 		|| die "econf failed"