Revbump: patch gpg-error-config to not provide -L options to system library paths (submitted upstream, closes bug #383863); use EAPI=4 and its features; avoid installing-and-removing the common-lisp code; remove .la file since the library has no dependencies.

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

4 files changed, 98 insertions, 16 deletions

diff --git a/dev-libs/libgpg-error/ChangeLog b/dev-libs/libgpg-error/ChangeLog
index 779360b1b268..9914910e389c 100644
--- a/dev-libs/libgpg-error/ChangeLog
+++ b/dev-libs/libgpg-error/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-libs/libgpg-error
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgpg-error/ChangeLog,v 1.81 2011/05/07 18:41:05 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgpg-error/ChangeLog,v 1.82 2011/09/22 13:43:15 flameeyes Exp $
+
+*libgpg-error-1.10-r1 (22 Sep 2011)
+
+  22 Sep 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  +libgpg-error-1.10-r1.ebuild, +files/libgpg-error-multilib-syspaths.patch:
+  Revbump: patch gpg-error-config to not provide -L options to system library
+  paths (submitted upstream, closes bug #383863); use EAPI=4 and its features;
+  avoid installing-and-removing the common-lisp code; remove .la file since the
+  library has no dependencies.
 
   07 May 2011; Raúl Porcel <armin76@gentoo.org> libgpg-error-1.10.ebuild:
   arm/ia64/m68k/s390/sh/sparc stable wrt #355265
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index 2ca404ea22d7..7e34357ab4db 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -1,24 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX libgpg-error-multilib-syspaths.patch 1243 RMD160 d307d66299558099721c7c5eaeece967ba2372ae SHA1 251203448be4f2538dfffb9246ad688af30fd944 SHA256 55897bbc0041e1a229cdaf78e2d5220b50b476b9fa1eff342ed4a9e5e5d27bd1
 DIST libgpg-error-1.10.tar.bz2 439213 RMD160 435fcf1c748ae6877b5de7f133a741cd55dc1140 SHA1 95b324359627fbcb762487ab6091afbe59823b29 SHA256 520629b4568b5c29b1991c8ffc267c8bdee5f223c7333c42a651b56f9b1c5431
+EBUILD libgpg-error-1.10-r1.ebuild 1253 RMD160 cb7dba16997376cffdb0a644e83f1a49439b2bbc SHA1 e4a7c31ddb8d18e71d9b65a4350e47454d12440e SHA256 c410e3d18de718bb7163d1082ae28789305364e65cc528dc21b862d1ef9b13d4
 EBUILD libgpg-error-1.10.ebuild 1190 RMD160 b86862b2b730b146a7edd2bd20705739589b5204 SHA1 07794e549225cc8884e0f45fe6744534abf3a31d SHA256 89986fedc2c7414aabddf4a6034461c26db9116ef416592fc020e0be4a3a41e8
-MISC ChangeLog 10598 RMD160 e8f94a89e7c98e5c390e130a42fc4beccecc0986 SHA1 f4ff15ebe13afe27545d497f564a1f8e2f8b531c SHA256 a986895c71532335920d72671199d63ead9396e9a2c0bbb9e306177571924f2e
+MISC ChangeLog 11039 RMD160 50386c82129462c158690e5e6f516a27c17f69c3 SHA1 02b14e19fdb9f94fe8e2b9271daf73caa0e5d9f2 SHA256 e86577208acb01d326f10ec20193a9522dcf0868499bbc0c0a23ab7667ae1f7f
 MISC metadata.xml 235 RMD160 8cd8a7d1a6def464222a37e7ed6619f176ab812f SHA1 0aaad42f83a977bbabbb85e57d7fa1bc480fd50c SHA256 457ae31679e09fa587eb1ce494f8bed85d9057e2a1c2b72462b4c02186067e26
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNzvQ4AAoJEE70JXb4HvNVeIsQAI273189MPmdg1wbKaI8WbCe
-skBLMJV2nKZYc6zXQOfyk1XZhZuU3TCC49g0qHj0utwRNntw3ElZ5SZy7kvocX2g
-XBel263918v9sqdrtFqDMMatz9eQkJiCpsod+7cgp3dVSlfYsHtTS/pok/Lq+29Y
-K6hILt+ZKffeKVF2NHLH9qH0TSVJu0UBmegfyCV8USyRVzY+qi+TxUXKctD4JK3h
-66QMkBf2YnlJ6tvKJmwVkaCcEmY3HFXPnsuDzL/sDwmWKZdrr4JJsz1HcZXU5tBe
-ZbjeC8r1O6CF/8ZyeCOO/Fe5gYslGcMYjgG7eDFm15n0V8PSLs+/1H0QpoZgnYbV
-aogGTiVNiDPaYVkcyMWWhdR6F/QAu6jrpSmWS6CzHrikOHIF2DZX1D4Cz36iL8ch
-SqTwJIct73lzNNIS0tSjfTVLkWYraFFIgzko6ZTKR0HcJIRaQ3eoCi/JKsagYTii
-fKXnHmZJvOk/hndcVr9GAMwkR9nw21F1DFJ9sZaDAG6NvC2uPGjR9Ge1k7H5sFvo
-57TdJBpoPBTbJ+F5JRgGz3+/Jb3jHvkojZ8ubKP0TrsUZ1G0RYn0kbMbIqXomEvy
-r+RFJXJ1XmImaB1TfWwW7agZjH6Z3ty/Cn7uEtgoJ3MTa0Ehu8lKHVPt/I40/Pyx
-oqTgdk+euC1+5nm7M70G
-=GCsV
+iEYEARECAAYFAk57O3wACgkQAiZjviIA2XhwWACgkYWFzST+2pgbXsbYEETJd2cU
+qacAoJ3JLVXeQzREzwMeWP06ArBXj+/V
+=T0Ry
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libgpg-error/files/libgpg-error-multilib-syspaths.patch b/dev-libs/libgpg-error/files/libgpg-error-multilib-syspaths.patch
new file mode 100644
index 000000000000..7b52106cfb5c
--- /dev/null
+++ b/dev-libs/libgpg-error/files/libgpg-error-multilib-syspaths.patch
@@ -0,0 +1,40 @@
+From 078a9a026db2043718abca4207b93d73666bb907 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu>
+Date: Thu, 22 Sep 2011 15:28:34 +0200
+Subject: [PATCH] gpg-error-config: handle /usr/lib64, /lib64 just like
+ /usr/lib and /lib
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Distributions such as Gentoo Linux use /usr/lib64 for system libraries on
+multilib setups, so in those cases, ignore the libraries as well.
+
+Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
+---
+ src/gpg-error-config.in |    9 ++++++---
+ 1 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/src/gpg-error-config.in b/src/gpg-error-config.in
+index 14f0625..df27f0a 100644
+--- a/src/gpg-error-config.in
++++ b/src/gpg-error-config.in
+@@ -69,9 +69,12 @@ while test $# -gt 0; do
+ 	    output="$output @GPG_ERROR_CONFIG_CFLAGS@"
+ 	    ;;
+ 	--libs)
+-	    if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/lib"; then
+-		output="$output -L$libdir"
+-	    fi
++	    case "$libdir" in
++		/usr/lib|/usr/lib64|/lib|/lib64) ;;
++		*)
++		    output="$output -L$libdir"
++		    ;;
++	    esac
+ 	    output="$output @GPG_ERROR_CONFIG_LIBS@"
+ 	    ;;
+         --host)
+-- 
+1.7.6.1
+
diff --git a/dev-libs/libgpg-error/libgpg-error-1.10-r1.ebuild b/dev-libs/libgpg-error/libgpg-error-1.10-r1.ebuild
new file mode 100644
index 000000000000..f483e630e0e1
--- /dev/null
+++ b/dev-libs/libgpg-error/libgpg-error-1.10-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgpg-error/libgpg-error-1.10-r1.ebuild,v 1.1 2011/09/22 13:43:15 flameeyes Exp $
+
+EAPI="4"
+
+inherit eutils libtool
+
+DESCRIPTION="Contains error handling functions used by GnuPG software"
+HOMEPAGE="http://www.gnupg.org/related_software/libgpg-error"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="common-lisp nls static-libs"
+
+RDEPEND="nls? ( virtual/libintl )"
+DEPEND="nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-multilib-syspaths.patch
+	epunt_cxx
+	elibtoolize
+}
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable static-libs static) \
+		$(use_enable common-libs languages)
+}
+
+src_install() {
+	default
+
+	# library has no dependencies, so it does not need the .la file
+	find "${D}" -name '*.la' -delete
+}