version bump. patch and ebuild cleanup byArfrever in bug #242572

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.26-gentoo-r4 x86_64

4 files changed, 76 insertions, 13 deletions

diff --git a/app-crypt/gpgme/ChangeLog b/app-crypt/gpgme/ChangeLog
index b5ca0efec4ee..54afb22fa3ce 100644
--- a/app-crypt/gpgme/ChangeLog
+++ b/app-crypt/gpgme/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/gpgme
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/ChangeLog,v 1.149 2008/11/17 19:56:16 flameeyes Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/ChangeLog,v 1.150 2009/01/03 09:02:45 dragonheart Exp $
+
+*gpgme-1.1.7 (03 Jan 2009)
+
+  03 Jan 2009; Daniel Black <dragonheart@gentoo.org>
+  +files/gpgme-1.1.7-_gpgme_cancel_with_err.patch, +gpgme-1.1.7.ebuild:
+  version bump. patch and ebuild cleanup byArfrever in bug #242572
 
   17 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org>
   files/gpgme3.m4.patch:
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index 8a0fb1c836a5..fac389dcf249 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -1,20 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gpgme-1.1.6-cvs.patch 6683 RMD160 81247a6a691aac302d10c469805a4a1c15401739 SHA1 7f3a01a31c0708bd7df473173904f7bc47050897 SHA256 2a47856e3164ce107c7e6c7c8a835abf5864995d2f9ce8bc6d16f6c0fbff4ddd
+AUX gpgme-1.1.7-_gpgme_cancel_with_err.patch 615 RMD160 e632f937a2d0d654f1c492387e1253154db515d1 SHA1 6cee716015905c9370c249d281649195db2d99f1 SHA256 811ae9967ac1e84434615f6160cca40e3bf7899df168d51dc50689faeaa9265e
 AUX gpgme3.m4.patch 472 RMD160 7135d85d557f7e17c30d8956e3e9bb2ed6d3c235 SHA1 6773ab5656162215f0aca6160ca249ee0e36905b SHA256 db3f0150c46f526bc1e2c5c7a3ce517d9c567599d6c7d983c5c03957fc29afc3
 DIST gpgme-0.3.14.tar.gz 655474 RMD160 96d1db35441611d0ddc3e2e8824e2b1d673b9837 SHA1 c97a4fdca455acc70c6b3a106da07389db4d50ed SHA256 4e822b5bb4f8d3269ab9d205e714ed9463b951c77e8ac0ffc0cf8ba7667bdc88
 DIST gpgme-1.1.5.tar.gz 929270 RMD160 54520e0bcacecc337e33b92e6dac6d1ced8a30af SHA1 428d0faee47509e69ce95620d5075579296cb884 SHA256 4ffb19d69b7cf9179252fa7f0a5f0db9064417024da260770d959dcf7bc3492a
 DIST gpgme-1.1.6.tar.gz 961286 RMD160 b761fed5ad88ef4b467c981bcc0ef95317c11ac1 SHA1 8dee551f362fc428c25c9bd542ce944ac916347d SHA256 7cf6cd9dfc1f02488eab8cb8a64d3904c71df9a04b1e9614beeec72dbde3f49f
+DIST gpgme-1.1.7.tar.gz 1041253 RMD160 6c2f612b30d3fcb2a8e485b6a614622acd6b2c2a SHA1 88e461a570a8a10db26b20cd858932c91134af94 SHA256 597a5799d4cfa022acb8ef731177b29276480f8cad2e64cd0b3d161fd0c46e2f
 EBUILD gpgme-0.3.14-r2.ebuild 2185 RMD160 362743b80a9e6b19fe7a376f6a6f0ca7160c5903 SHA1 7088827b0a1458558bc9390da7bee316be69b262 SHA256 50860499c21ea7abebd616d05588148b36c9f1352fe8049e862c112dd13f0e13
 EBUILD gpgme-1.1.5.ebuild 1100 RMD160 46d5bf59729e2e61c5f1b529384d4def34036d7f SHA1 8afba454be212ad404e1c4e763e46a9b91e7b35a SHA256 f73a3c61431f03b4d5b08c3fa363de84a0d867b92b95b8bec6669280bade8f38
 EBUILD gpgme-1.1.6.ebuild 1168 RMD160 1edf8d7e91418bcb46cc720c3926481693c7d30c SHA1 302c8974010c72826a2c9b02616d8f20e34529a7 SHA256 318984d22f18cb6dc939a42fd3da46393ea63f9347fdf4d38d6415b2e65fdc4b
-MISC ChangeLog 21540 RMD160 eedcfb475dfe7604604baa9d073a90e49c5b7f8c SHA1 32382cbe7c5747ffa4028c51f10221ceb9430258 SHA256 f357fa3590efcf464fc59f65781e0461ddd1a70716ad7129e30f6fe20a665b9f
+EBUILD gpgme-1.1.7.ebuild 1167 RMD160 ae3046a5d29d974013b60bc339ed7f4c7bec99ff SHA1 77f791833afa821701ca9bf16b65e95dc44a5925 SHA256 49f720ae0de3523f7ac5500900f771c76a6f6406da8ee6f9ced348d13a3660f0
+MISC ChangeLog 21763 RMD160 78d4c20598521e96c438108ccd48528c98b4754f SHA1 2b3654deda52589575e1c99935198b8dc21aaf86 SHA256 f70a14715100d85a2efe6b1bc13cb684a96c79ad2757d412013401e9b4feec7e
 MISC metadata.xml 421 RMD160 6467db2a7ffb640a07bbfb5137c271663ac8613f SHA1 c20459466b39b55995cd1a6bfe4709eb26f2203f SHA256 dc6e832b4e73e3346166e39067104fe27dd0da8569d471958ff1851111cf950b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkkhzGUACgkQAiZjviIA2XjzQwCfYezhlHcrBkyaR6kaaO00zAfd
-FxwAn3jG0lp8XQ1xhRQZXg9qR+EwGQZJ
-=1/Pw
------END PGP SIGNATURE-----
diff --git a/app-crypt/gpgme/files/gpgme-1.1.7-_gpgme_cancel_with_err.patch b/app-crypt/gpgme/files/gpgme-1.1.7-_gpgme_cancel_with_err.patch
new file mode 100644
index 000000000000..26f48b9e884f
--- /dev/null
+++ b/app-crypt/gpgme/files/gpgme-1.1.7-_gpgme_cancel_with_err.patch
@@ -0,0 +1,22 @@
+--- gpgme-1.1.7/gpgme/gpgme.h
++++ gpgme-1.1.7-fixed/gpgme/gpgme.h
+@@ -1117,6 +1117,8 @@
+ 
+ /* Crypto Operations.  */
+ 
++gpgme_error_t _gpgme_cancel_with_err (gpgme_ctx_t ctx, gpg_error_t ctx_err);
++
+ /* Cancel a pending asynchronous operation.  */
+ gpgme_error_t gpgme_cancel (gpgme_ctx_t ctx);
+ 
+--- gpgme-1.1.7/gpgme/wait-global.c
++++ gpgme-1.1.7-fixed/gpgme/wait-global.c
+@@ -202,7 +202,7 @@
+ 	if (err)
+ 	  /* An error occured.  Close all fds in this context, and
+ 	     send the error in a done event.  */
+-	  _gpgme_cancel_with_err (ctx, &err);
++	  _gpgme_cancel_with_err (ctx, err);
+       }
+       break;
+ 
diff --git a/app-crypt/gpgme/gpgme-1.1.7.ebuild b/app-crypt/gpgme/gpgme-1.1.7.ebuild
new file mode 100644
index 000000000000..bee11e8f6682
--- /dev/null
+++ b/app-crypt/gpgme/gpgme-1.1.7.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-1.1.7.ebuild,v 1.1 2009/01/03 09:02:45 dragonheart Exp $
+
+inherit eutils autotools
+
+DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
+HOMEPAGE="http://www.gnupg.org/related_software/gpgme"
+SRC_URI="mirror://gnupg/gpgme/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="pth"
+
+DEPEND=">=dev-libs/libgpg-error-1.4
+	>=app-crypt/gnupg-1.9.20-r1
+	pth? ( >=dev-libs/pth-1.2 )"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-_gpgme_cancel_with_err.patch
+	# We need to call elibtoolize so that we get sane .so versioning on
+	# fbsd.
+	elibtoolize
+}
+
+src_compile() {
+	econf \
+		--includedir=/usr/include/gpgme \
+		--with-gpg=/usr/bin/gpg \
+		--with-gpgsm=/usr/bin/gpgsm \
+		$(use_with pth) || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+}