Take only gpg - the old 1.4-version, because 1.9 is still unstable, solves bug 130992

Package-Manager: portage-2.1_pre9-r4

3 files changed, 52 insertions, 30 deletions

diff --git a/app-crypt/gpgme/ChangeLog b/app-crypt/gpgme/ChangeLog
index b7eb1b460ca9..24c156903131 100644
--- a/app-crypt/gpgme/ChangeLog
+++ b/app-crypt/gpgme/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/gpgme
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/ChangeLog,v 1.85 2006/03/26 01:16:23 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/ChangeLog,v 1.86 2006/04/24 11:36:37 genstef Exp $
+
+  24 Apr 2006; Stefan Schweizer <genstef@gentoo.org> gpgme-1.1.2.ebuild:
+  Take only gpg - the old 1.4-version, because 1.9 is still unstable, solves
+  bug 130992
 
 *gpgme-1.1.2 (26 Mar 2006)
 
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index 8b7167b94adf..0bb3717f61c4 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -1,42 +1,66 @@
-MD5 348acf187754d17629bca43bb6cf243c ChangeLog 13315
-RMD160 20a2fd11881379e8c03450bd38b4530bed406147 ChangeLog 13315
-SHA256 ffc98e1daeef0c6cc2fa02cc8f1e59dc9f7648b641942821c4fa5d7552c25f26 ChangeLog 13315
-MD5 438d865640f00b860f2c3f88b21e621e files/digest-gpgme-0.3.14-r1 64
-RMD160 7567c2fe0fa51cadab7a612bb49b713fcc012b98 files/digest-gpgme-0.3.14-r1 64
-SHA256 8933c5f50011576f01447e47120a1d30dcc1180060fd04a4066cb580695b27d3 files/digest-gpgme-0.3.14-r1 64
-MD5 4ca60fb78dc0701418130b3f6f18c18f files/digest-gpgme-1.0.2 63
-RMD160 2b846f0d5f27f3747bbc7aadc8037fb4c6e080df files/digest-gpgme-1.0.2 63
-SHA256 785012c555822daa615f78a4334e499abb831a91888c7e72393d4f2bec433e9c files/digest-gpgme-1.0.2 63
-MD5 c7fc60919fd40585f41b90da49e9bf3f files/digest-gpgme-1.0.3 63
-RMD160 38012628b45759c5e230d701f1b85da1a8be905f files/digest-gpgme-1.0.3 63
-SHA256 6311882815d5634520a24819724944375134d6ba6f1a254dca89413d5aa5e8c3 files/digest-gpgme-1.0.3 63
-MD5 5ef603604efc88daba083c920ff1c39d files/digest-gpgme-1.1.0 63
-RMD160 e2b71c0a58bdb61d76bfe916a9c825039cdd3980 files/digest-gpgme-1.1.0 63
-SHA256 aed0a6307aed54a8922eeac96e59cd218d9c9e00dca28614c31d124b3f31cfbe files/digest-gpgme-1.1.0 63
-MD5 99dc1a35872dbab76543c104fc9e4c6b files/digest-gpgme-1.1.2 235
-RMD160 026b14f8f1ab371fe3445549d126d8696870ca42 files/digest-gpgme-1.1.2 235
-SHA256 2f33bdd8584b0943156f8f0538da536f7de767916ed5b30599a6e10367cbb98a files/digest-gpgme-1.1.2 235
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX gpgme-1.1.0-pth-test.patch 1011 RMD160 e3088584b65c70a8f5af933f712a769aa3a4883d SHA1 47301e6a88d66d75f87b724e4576538b29b74406 SHA256 801b0dfb75308185dd0ce0ed08a572120bd1608f9db32b35641b2ed8956cfc54 size 1011
 MD5 8308ab331091a74ef5f6f0567d48d208 files/gpgme-1.1.0-pth-test.patch 1011
 RMD160 e3088584b65c70a8f5af933f712a769aa3a4883d files/gpgme-1.1.0-pth-test.patch 1011
 SHA256 801b0dfb75308185dd0ce0ed08a572120bd1608f9db32b35641b2ed8956cfc54 files/gpgme-1.1.0-pth-test.patch 1011
+AUX gpgme3.m4.patch 482 RMD160 bab51943a422da3e9eeeacfc6536e8480cb11afc SHA1 2a42c91ea4636fab5b1087ba5542e9c79ca143b0 SHA256 8e71df251cbbed19cfb2e929c0781adb92b02fb32759349c62408ab108bcc2c3 size 482
 MD5 afc6d9e463f4b389eb085af310f8b74f files/gpgme3.m4.patch 482
 RMD160 bab51943a422da3e9eeeacfc6536e8480cb11afc files/gpgme3.m4.patch 482
 SHA256 8e71df251cbbed19cfb2e929c0781adb92b02fb32759349c62408ab108bcc2c3 files/gpgme3.m4.patch 482
+DIST gpgme-0.3.14.tar.gz 655474 size 655474
+DIST gpgme-1.0.2.tar.gz 833949 size 833949
+DIST gpgme-1.0.3.tar.gz 837866 size 837866
+DIST gpgme-1.1.0.tar.gz 862122 size 862122
+DIST gpgme-1.1.2.tar.gz 881432 RMD160 ae30dc9a3e1f482206cf7cf76aae7c9b9e25b4a8 SHA256 644f7391887d9d63462d4137c21f333409ce0ccdd52daab9806a98ca6dfbecc5 size 881432
+EBUILD gpgme-0.3.14-r1.ebuild 2436 RMD160 fafa8b391d9f36bf26bb4a69973a9a1d363b9eb7 SHA1 fa17cec8dcfb0705fd55818a1609e9a759474d1d SHA256 20baadd19e4c7b1e6485ea2425ffed4f821c1d2fe260911d742defc1bc6f8907 size 2436
 MD5 01c6d97b40dda97420a63cb2499101a5 gpgme-0.3.14-r1.ebuild 2436
 RMD160 fafa8b391d9f36bf26bb4a69973a9a1d363b9eb7 gpgme-0.3.14-r1.ebuild 2436
 SHA256 20baadd19e4c7b1e6485ea2425ffed4f821c1d2fe260911d742defc1bc6f8907 gpgme-0.3.14-r1.ebuild 2436
+EBUILD gpgme-1.0.2.ebuild 1901 RMD160 6093b17cc31a36d0b6b0e540ff097bda80601d25 SHA1 1ebc2d2edd0e5541ea2fdcf58d3a54402a8a3a1e SHA256 ce38e73f9f6e9c9680e23da153b1f87d2fb753de163d86625dfe45a6ae44a607 size 1901
 MD5 30461cc0601654249f402132f3b8d286 gpgme-1.0.2.ebuild 1901
 RMD160 6093b17cc31a36d0b6b0e540ff097bda80601d25 gpgme-1.0.2.ebuild 1901
 SHA256 ce38e73f9f6e9c9680e23da153b1f87d2fb753de163d86625dfe45a6ae44a607 gpgme-1.0.2.ebuild 1901
+EBUILD gpgme-1.0.3.ebuild 1527 RMD160 01eefb27423f186d397c0df783c77dd9f9734f7e SHA1 242dfd67b3f547d05e91c71100fda58b605f2d44 SHA256 29909b1e0955d7faae165d6d87b9be5071ffcf82c0fa9bf0683603718149a346 size 1527
 MD5 c2d5eb24b51350faf76c13725219ddc9 gpgme-1.0.3.ebuild 1527
 RMD160 01eefb27423f186d397c0df783c77dd9f9734f7e gpgme-1.0.3.ebuild 1527
 SHA256 29909b1e0955d7faae165d6d87b9be5071ffcf82c0fa9bf0683603718149a346 gpgme-1.0.3.ebuild 1527
+EBUILD gpgme-1.1.0.ebuild 1667 RMD160 5a037efa7f09d9bf53977cd47e1ed024574ad5da SHA1 ddc5a9f40a8f80a74ce490a28c0df59278f4e65f SHA256 62c73bfffe6da91350cc6acb048289473bcbadd58eaf8c2b2dddd69ca2c79add size 1667
 MD5 13921b094794db02ff53f2631138fb77 gpgme-1.1.0.ebuild 1667
 RMD160 5a037efa7f09d9bf53977cd47e1ed024574ad5da gpgme-1.1.0.ebuild 1667
 SHA256 62c73bfffe6da91350cc6acb048289473bcbadd58eaf8c2b2dddd69ca2c79add gpgme-1.1.0.ebuild 1667
-MD5 1f637b534c07b4c2851cd869a445d713 gpgme-1.1.2.ebuild 1235
-RMD160 80210fe5307594ba3924f4ca55fd6e8829c76b86 gpgme-1.1.2.ebuild 1235
-SHA256 905c2e1275300b0c3cb196d54737cac287cbdd5feb3a9bd0700aeecb969434f9 gpgme-1.1.2.ebuild 1235
+EBUILD gpgme-1.1.2.ebuild 1153 RMD160 b26297ca435affa2014deeb2fd8c5e1e9bd15b48 SHA1 beb33f09fc40f7d814687b6783cb14750547ae62 SHA256 f96775bf8765f2c14f0b649a0cbc58d13c79713b695f1afbcd6a88de45b694d8 size 1153
+MD5 a9d909b9e2a5f04bb27addbf66986252 gpgme-1.1.2.ebuild 1153
+RMD160 b26297ca435affa2014deeb2fd8c5e1e9bd15b48 gpgme-1.1.2.ebuild 1153
+SHA256 f96775bf8765f2c14f0b649a0cbc58d13c79713b695f1afbcd6a88de45b694d8 gpgme-1.1.2.ebuild 1153
+MISC ChangeLog 13479 RMD160 5a0736178d2db617f272bbb1c8361c18b4317f04 SHA1 810a982cae4fbd025db0be13d1feef2b35fb6c00 SHA256 6bd38c540140c68ec209e6f431086195222ae06b409b85296fb9eae4f573fbd7 size 13479
+MD5 b0b231be35830db33392518ccf73c12b ChangeLog 13479
+RMD160 5a0736178d2db617f272bbb1c8361c18b4317f04 ChangeLog 13479
+SHA256 6bd38c540140c68ec209e6f431086195222ae06b409b85296fb9eae4f573fbd7 ChangeLog 13479
+MISC metadata.xml 314 RMD160 594e5dcc88b300efe20b11d117449d1bec5e826a SHA1 ac00fbb2fc2f2de37d5dda93c775ef53f979eb28 SHA256 e80fd4c62ac2351fda3e7d6322e17edcb04fa5001d55e7b55bc19ece8ca89649 size 314
 MD5 ce0db60fd655ade98789a1643d4fdd9d metadata.xml 314
 RMD160 594e5dcc88b300efe20b11d117449d1bec5e826a metadata.xml 314
 SHA256 e80fd4c62ac2351fda3e7d6322e17edcb04fa5001d55e7b55bc19ece8ca89649 metadata.xml 314
+MD5 438d865640f00b860f2c3f88b21e621e files/digest-gpgme-0.3.14-r1 64
+RMD160 7567c2fe0fa51cadab7a612bb49b713fcc012b98 files/digest-gpgme-0.3.14-r1 64
+SHA256 8933c5f50011576f01447e47120a1d30dcc1180060fd04a4066cb580695b27d3 files/digest-gpgme-0.3.14-r1 64
+MD5 4ca60fb78dc0701418130b3f6f18c18f files/digest-gpgme-1.0.2 63
+RMD160 2b846f0d5f27f3747bbc7aadc8037fb4c6e080df files/digest-gpgme-1.0.2 63
+SHA256 785012c555822daa615f78a4334e499abb831a91888c7e72393d4f2bec433e9c files/digest-gpgme-1.0.2 63
+MD5 c7fc60919fd40585f41b90da49e9bf3f files/digest-gpgme-1.0.3 63
+RMD160 38012628b45759c5e230d701f1b85da1a8be905f files/digest-gpgme-1.0.3 63
+SHA256 6311882815d5634520a24819724944375134d6ba6f1a254dca89413d5aa5e8c3 files/digest-gpgme-1.0.3 63
+MD5 5ef603604efc88daba083c920ff1c39d files/digest-gpgme-1.1.0 63
+RMD160 e2b71c0a58bdb61d76bfe916a9c825039cdd3980 files/digest-gpgme-1.1.0 63
+SHA256 aed0a6307aed54a8922eeac96e59cd218d9c9e00dca28614c31d124b3f31cfbe files/digest-gpgme-1.1.0 63
+MD5 99dc1a35872dbab76543c104fc9e4c6b files/digest-gpgme-1.1.2 235
+RMD160 026b14f8f1ab371fe3445549d126d8696870ca42 files/digest-gpgme-1.1.2 235
+SHA256 2f33bdd8584b0943156f8f0538da536f7de767916ed5b30599a6e10367cbb98a files/digest-gpgme-1.1.2 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFETLhYNJowsmZ/PzARAu4CAKCPK+zys5nXYXRNvhqNJ81RD/X9xQCcCKdU
+0UUPfUxcENVUL6RI5pkiYeI=
+=oNNU
+-----END PGP SIGNATURE-----
diff --git a/app-crypt/gpgme/gpgme-1.1.2.ebuild b/app-crypt/gpgme/gpgme-1.1.2.ebuild
index d8da7550b586..91a7107eee3b 100644
--- a/app-crypt/gpgme/gpgme-1.1.2.ebuild
+++ b/app-crypt/gpgme/gpgme-1.1.2.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/gpgme/gpgme-1.1.2.ebuild,v 1.1 2006/03/26 01:16:23 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-1.1.2.ebuild,v 1.2 2006/04/24 11:36:37 genstef 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"
@@ -20,19 +20,13 @@ RDEPEND="${DEPEND}
 	dev-libs/libgcrypt"
 
 src_compile() {
-	if [ -x /usr/bin/gpg2 ]; then
-		GPGBIN=/usr/bin/gpg2
-	else
-		GPGBIN=/usr/bin/gpg
-	fi
-
 	if use selinux; then
 		sed -i -e "s:tests = tests:tests = :" Makefile.in || die "sed failed"
 	fi
 
 	econf \
 		--includedir=/usr/include/gpgme \
-		--with-gpg=$GPGBIN \
+		--with-gpg=/usr/bin/gpg \
 		--with-pth=yes \
 		$(use_with smime gpgsm /usr/bin/gpgsm) \
 		|| die "econf failed"