Add patch to link properly with GNU gold (bug #367409); regenerate autotools; remove .la files; bump to EAPI=4.

Package-Manager: portage-2.2.0_alpha33/cvs/Linux x86_64

4 files changed, 92 insertions, 15 deletions

diff --git a/app-crypt/gpgme/ChangeLog b/app-crypt/gpgme/ChangeLog
index edce183a17e8..cd0f4a556671 100644
--- a/app-crypt/gpgme/ChangeLog
+++ b/app-crypt/gpgme/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-crypt/gpgme
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/ChangeLog,v 1.183 2011/05/11 20:24:50 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/ChangeLog,v 1.184 2011/05/15 17:27:08 flameeyes Exp $
+
+*gpgme-1.3.0-r1 (15 May 2011)
+
+  15 May 2011; Diego E. Pettenò <flameeyes@gentoo.org> +gpgme-1.3.0-r1.ebuild,
+  +files/gpgme-1.3.0-gold.patch:
+  Add patch to link properly with GNU gold (bug #367409); regenerate autotools;
+  remove .la files; bump to EAPI=4.
 
   11 May 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   gpgme-1.3.0.ebuild, +files/gpgme-1.3.0-gnupg-2.0.17.patch:
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index 0c0af326f995..ad0574b0c6d3 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -3,24 +3,16 @@ Hash: SHA1
 
 AUX gpgme-1.1.8-et_EE.patch 356 RMD160 6ea6ff37a428ececc30e2535793a56540f3c4219 SHA1 6ecf74e97f14b39959f2952a26389977a1843b87 SHA256 dcf67057447f1f6316ebad2b61340bc24086eb470a9cb68cababcb709b329e7b
 AUX gpgme-1.3.0-gnupg-2.0.17.patch 536 RMD160 cc5a4ce314cb0c55873e846949150eabb329cdec SHA1 79aa58ced992adc0cb40fa7bbf803d3b34376d5f SHA256 6b18195ca5fcd157db290556ad90ede115f3862bee6c816672e31e823737df0e
+AUX gpgme-1.3.0-gold.patch 900 RMD160 08b321515930fec77919a87fbe155cf152eec513 SHA1 bc371d9c04f5ecd8a6745c6ddcf3c5adc21a32d0 SHA256 0ea8885c00fcb39504aa985398cbab95e0897d2374429806616c6b958b5cdb43
 DIST gpgme-1.3.0.tar.bz2 869470 RMD160 9699ba5cb991459e41af46112914cac221a9b69d SHA1 0db69082abfbbbaf86c3ab0906f5137de900da73 SHA256 74e040fcd46061f6b0d8b621a2a2a48100a7ba5c9f69e7cf207259a6e2e3e6a1
+EBUILD gpgme-1.3.0-r1.ebuild 1385 RMD160 37351241bcd483fac4c4e496f3eb0e48c48b7f44 SHA1 751c66b54c7e79f1c5f796f4f908faf4505f3b0c SHA256 4510f90fd7cbc5d52f1726308339bdee79ef5ed2fcc0c5b8b64c6b69b8b26bbd
 EBUILD gpgme-1.3.0.ebuild 1336 RMD160 19ca7f0de3e19fcf85f494b06db6054acfc1b71e SHA1 9e7c7190ef9d052c687ae456dce8b6dc74c29882 SHA256 796c78e78a4dbcdc4ebef29dcc93d7968af0c392d106cc2cabd034ab3461f011
-MISC ChangeLog 25914 RMD160 d16dec3ab412220ea13d941c084d82480d5a64a4 SHA1 60768b53cd6a1fa6ba29e914c9ead98f9eb6c622 SHA256 5349961f95f15f4801785eadc03ab29ff563aca887aa862524b29ed107ca808f
+MISC ChangeLog 26176 RMD160 6bf1170978782321a12cf7f47bd6afb90ce38c47 SHA1 0020dd9ed964fc19cef89a62092ba705fe27677e SHA256 1e94d80e26cd601d24634ce07c920f8afcfd15f383c3c924af7adcc0f93d2db6
 MISC metadata.xml 481 RMD160 4d2fa83581185d3e39130832cf4027598b5a6486 SHA1 3ddf6d522cbba3a6c86815d3dce1d1dbfb2df201 SHA256 48032fe71d068f408a7d8781d37f03e0f45bde2fb2939945b4f1825b6feee07e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNyvClAAoJENgZr6v6gHY0i1UQAJ8kfEax007wT+R981rnALOI
-Ew+91vLSB2BT7+a//X5f09E5xxApJNazQkQunI1xW49HcZvCGDk2PVLsktXLdHgy
-dLJvCnTCBPGeDlfJnX3ZpqYVrIsPEJLD5763AJN9ynLzI0+HYfYe6CbHjqfVpLBj
-/gMeITS27L12JWA2C1kZualYKZQc4g0r5JDQmJECpr38BXiQqY/NXrVw8OZ5gU58
-/qGnTDpVZT5jkhHb+RGceSLyhttmveqS0rlvjQka7IzHRBclO9962WOZOy899ZwI
-z3fuCH4X+9cVFvCU6AUdUjsTqd70OO7jvEsZ81pbsbtuYjE7S2iQcjDkm5g+LKZk
-fSaZ/1HBskZjWujwi92MbYXPCWPywHI56/Xri0o8kIgMvpsUCjsM2gfm6vb3lqUM
-x3xGO3A6cA4zIBawQLR7q0KZhYLonJp0MWMqJTD8WXcR5kuPN6xvTU2J13y/d04w
-CYdJloGUzzJa3SFG1PT59W5Yw2zHojljMGUcwNIWYlecq1I7Ern08eWTSPKxMELQ
-bUs8m6FTpc5O3AwrtNTKfq2N0ZILBU32YQkIYAx1xS2BJRw9yKGc6fRa9R4g72sh
-2wPZApnWrqxCdAUZckwm0v4qt33czzlOfodiQ0hy1ZYhJBgNUkyoxsoezp1slZs4
-1JX8eqCZitEg40JL+r9T
-=S82q
+iEYEARECAAYFAk3QDPUACgkQAiZjviIA2XgRNACfbPbB3TL/qr0k4rRIr/TIQtZf
+nxQAn3zFPzYxOWYdxclw1J8fd+JuLIcV
+=IFu2
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/gpgme/files/gpgme-1.3.0-gold.patch b/app-crypt/gpgme/files/gpgme-1.3.0-gold.patch
new file mode 100644
index 000000000000..227cff1791f8
--- /dev/null
+++ b/app-crypt/gpgme/files/gpgme-1.3.0-gold.patch
@@ -0,0 +1,28 @@
+From bc797eb1ebeb2e94573f1b9ad7ada21fe948d9dc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@gmail.com>
+Date: Sun, 15 May 2011 19:07:41 +0200
+Subject: [gpgme PATCH] build-sys: link libassuan and libgpg-error in
+ gpgme-tool as well.
+
+Without this change, the binary would result "underlinked", and GNU gold
+would fail to link it.
+---
+ src/Makefile.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 18c8b3b..0b240ee 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -240,7 +240,7 @@ libgpgme_qt_la_LIBADD = $(gpgme_res) @LIBASSUAN_LIBS@ @LTLIBOBJS@ \
+ endif
+ 
+ noinst_PROGRAMS = gpgme-tool
+-gpgme_tool_LDADD = libgpgme.la
++gpgme_tool_LDADD = libgpgme.la @LIBASSUAN_LIBS@ @GPG_ERROR_LIBS@
+ 
+ status-table.h : gpgme.h extra-stati.h
+ 	cat $(builddir)/gpgme.h $(srcdir)extra-stati.h \
+-- 
+1.7.5.rc3
+
diff --git a/app-crypt/gpgme/gpgme-1.3.0-r1.ebuild b/app-crypt/gpgme/gpgme-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..222b0b8dccea
--- /dev/null
+++ b/app-crypt/gpgme/gpgme-1.3.0-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-1.3.0-r1.ebuild,v 1.1 2011/05/15 17:27:08 flameeyes Exp $
+
+EAPI="4"
+
+inherit eutils libtool 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.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="common-lisp pth"
+
+DEPEND="app-crypt/gnupg
+	>=dev-libs/libassuan-1.1.0
+	>=dev-libs/libgpg-error-1.4
+	pth? ( >=dev-libs/pth-1.2 )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.1.8-et_EE.patch"
+	epatch "${FILESDIR}/${P}-gnupg-2.0.17.patch"
+	epatch "${FILESDIR}/${P}-gold.patch"
+
+	eautoreconf
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		--includedir="${EPREFIX}/usr/include/gpgme" \
+		--with-gpg="${EPREFIX}/usr/bin/gpg" \
+		--with-gpgsm="${EPREFIX}/usr/bin/gpgsm" \
+		$(use_with pth)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	find "${D}" -name '*.la' -delete
+
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+
+	if ! use common-lisp; then
+		rm -fr "${ED}usr/share/common-lisp"
+	fi
+}