Revbump: also drop -L flags from libgcrypt-config as done for libgpg-error; avoid forcing PIC code for static libraries (if they are even enabled); use EAPI=4 features; remove .la files if the static libraries are not installed.

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

4 files changed, 82 insertions, 5 deletions

diff --git a/dev-libs/libgcrypt/ChangeLog b/dev-libs/libgcrypt/ChangeLog
index 59112756adff..8f4fb6565338 100644
--- a/dev-libs/libgcrypt/ChangeLog
+++ b/dev-libs/libgcrypt/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/libgcrypt
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/ChangeLog,v 1.151 2011/09/22 14:21:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/ChangeLog,v 1.152 2011/09/22 14:44:39 flameeyes Exp $
+
+*libgcrypt-1.5.0-r1 (22 Sep 2011)
+
+  22 Sep 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  +libgcrypt-1.5.0-r1.ebuild, +files/libgcrypt-multilib-syspath.patch:
+  Revbump: also drop -L flags from libgcrypt-config as done for libgpg-error;
+  avoid forcing PIC code for static libraries (if they are even enabled); use
+  EAPI=4 features; remove .la files if the static libraries are not installed.
 
   22 Sep 2011; Diego E. Pettenò <flameeyes@gentoo.org>
   -libgcrypt-1.5.0_beta1-r1.ebuild, -libgcrypt-1.5.0_beta1-r2.ebuild,
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index a61d2c3056a5..627168ed2f85 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -2,17 +2,19 @@
 Hash: SHA1
 
 AUX libgcrypt-1.5.0-uscore.patch 981 RMD160 5993a5da17db5c557a141490144027d3d6ffef3d SHA1 c0559284fcd8885c38c9b5c2bd71eac028dc9b02 SHA256 4cbb34cebce02531b9b940494b78b7186b2fd05b802866d9ecb42d478e88e845
+AUX libgcrypt-multilib-syspath.patch 588 RMD160 e59f8299b74ac2c1856c6eda96fdd4357f353ed6 SHA1 daf1d29be3647d37416f2a4d9f0c19083a2f719d SHA256 a3fc53f24b9cd0355a5267bc3ca8e88c397878473046536068c8ae4ae0b526eb
 DIST libgcrypt-1.4.6.tar.bz2 1151877 RMD160 d4d720c4bfe80f0799b2cbdbbb49d304e3195049 SHA1 445b9e158aaf91e24eae3d1040c6213e9d9f5ba6 SHA256 3e4b30da6b357b565333d0222133b64a0414be99ba72733081165c8ea9bc6b85
 DIST libgcrypt-1.5.0.tar.bz2 1433506 RMD160 f01e8198dcc379ff2fa5e8d3ac39e7b32fc41dad SHA1 3e776d44375dc1a710560b98ae8437d5da6e32cf SHA256 4b62fc516004940a0571025401a0581d49199f1a76dfb5ce6fd63f50db8173fa
 EBUILD libgcrypt-1.4.6-r1.ebuild 1167 RMD160 add8b9922a69f0c631b4c7d08049c8d379cc5e18 SHA1 92a52594ebf4524af911ad7b3e75fbd50df924f8 SHA256 0d9c4e0a4a0a96304499a18706fd9860c7001417eec1cee064feaee95d0abf89
 EBUILD libgcrypt-1.4.6.ebuild 1126 RMD160 bf89e3914988bbfb3e917441cf9a32945b950d71 SHA1 f8445a80a7916f4038860d122afc031fbc84f952 SHA256 e2bf303262e08375c82d10c921c642bfe9383bf3c5c64a7fd20e1d4e704ecf02
+EBUILD libgcrypt-1.5.0-r1.ebuild 1166 RMD160 843457b6eb1a3dceda06fe77117dc90414341180 SHA1 b529383d38472bfec16c2450b95705dacc080d10 SHA256 5e9122ad1f5a4300eb9a67fcad806cfb8bb64b24e588a76cffb7c65b909e59e2
 EBUILD libgcrypt-1.5.0.ebuild 1144 RMD160 c5323eaea9740c04a50bd1344187b030b9873b38 SHA1 e80154a6fac274bdf0c3247bcbddc5266dcdc076 SHA256 a82ce4bb1484fdb671e78fd8e1a24336442aebab447380e88656152955e51a0a
-MISC ChangeLog 21934 RMD160 c07a0058d5bee9d6fb64b6c052cdd2f16976989c SHA1 82bf542958ef487b09bf6db7488deb77197c0895 SHA256 1010cb9e0afed38d168a60aae6f0611442e416ec9a0c1b44056349cec0586450
+MISC ChangeLog 22332 RMD160 104b6745231ba81a2aa54da71fb171a07459ed06 SHA1 89c8d81dcfa82a2b9e2227c014c624634641c4e5 SHA256 9e0d61fcdae84eeca7ca0de24206812e756dbe2cdbac5ca3885396d3eb81a24c
 MISC metadata.xml 160 RMD160 61ea9f9370afee3db802f40f7c6b2edd2f5347cf SHA1 51cf29a3589cff823294704e225b0de18f65e6dd SHA256 7419f4e73ddd07284403525f1380824fc68280cad69e2dfae0645ad52b33ef10
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk57RFMACgkQAiZjviIA2XhJ4QCg8TZH4APGqOsbzvE2b2tOlqDO
-AT4AnRTfmi8t2utuB3VdoPd/PdqEtG19
-=otbD
+iEYEARECAAYFAk57SdoACgkQAiZjviIA2XgXFACfRi5zIEozBbi/RuGo5WR4aEqU
+1ucAoJ8fqHGmdP0FTkwuY67DpBJwpZyY
+=eP3V
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libgcrypt/files/libgcrypt-multilib-syspath.patch b/dev-libs/libgcrypt/files/libgcrypt-multilib-syspath.patch
new file mode 100644
index 000000000000..7859851ccc4a
--- /dev/null
+++ b/dev-libs/libgcrypt/files/libgcrypt-multilib-syspath.patch
@@ -0,0 +1,23 @@
+diff --git a/src/libgcrypt-config.in b/src/libgcrypt-config.in
+index c052638..4c8ddc3 100644
+--- a/src/libgcrypt-config.in
++++ b/src/libgcrypt-config.in
+@@ -154,9 +154,12 @@ if test "$echo_libs" = "yes"; then
+     libs_final="$libs"
+ 
+     # Set up `libdirs'.
+-    if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/lib"; then
+-	libdirs="-L$libdir"
+-    fi
++    case "$libdir" in
++        /usr/lib|/usr/lib64|/lib|/lib64) ;;
++        *)
++            libdirs="-L$libdir"
++            ;;
++    esac
+ 
+     # Set up `libs_final'.
+     libs_final="$libs_final $gpg_error_libs"
+-- 
+1.7.6.1
+
diff --git a/dev-libs/libgcrypt/libgcrypt-1.5.0-r1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.5.0-r1.ebuild
new file mode 100644
index 000000000000..5bc754f272b7
--- /dev/null
+++ b/dev-libs/libgcrypt/libgcrypt-1.5.0-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.5.0-r1.ebuild,v 1.1 2011/09/22 14:44:39 flameeyes Exp $
+
+EAPI="4"
+
+inherit autotools
+
+DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
+HOMEPAGE="http://www.gnupg.org/"
+SRC_URI="mirror://gnupg/libgcrypt/${P}.tar.bz2
+	ftp://ftp.gnupg.org/gcrypt/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="static-libs"
+
+RDEPEND=">=dev-libs/libgpg-error-1.8"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-uscore.patch
+	epatch "${FILESDIR}"/${PN}-multilib-syspath.patch
+	eautoreconf
+}
+
+src_configure() {
+	# --disable-padlock-support for bug #201917
+	econf \
+		--disable-padlock-support \
+		--disable-dependency-tracking \
+		--enable-noexecstack \
+		--disable-O-flag-munging \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	use static-libs || find "${D}" -name '*.la' -delete
+}