dev-libs/libgcrypt: Revbump. Disable flag munging wrt bug 360503.

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

4 files changed, 77 insertions, 4 deletions

diff --git a/dev-libs/libgcrypt/ChangeLog b/dev-libs/libgcrypt/ChangeLog
index 8bdd480f8c2b..5a93a9d0879d 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.146 2011/02/23 16:09:48 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/ChangeLog,v 1.147 2011/04/06 18:37:54 c1pher Exp $
+
+*libgcrypt-1.5.0_beta1-r1 (06 Apr 2011)
+*libgcrypt-1.4.6-r1 (06 Apr 2011)
+
+  06 Apr 2011; Dane Smith <c1pher@gentoo.org> +libgcrypt-1.4.6-r1.ebuild,
+  -libgcrypt-1.5.0_beta1.ebuild, +libgcrypt-1.5.0_beta1-r1.ebuild:
+  Revbump for both 1.4.6 and 1.5.0_ beta1. Disable flag munging wrt 
+  bug 360503. Remove old 1.5.0_beta1.
 
 *libgcrypt-1.5.0_beta1 (23 Feb 2011)
 
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index e0913ac12e58..aaed3b5bae3c 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -1,6 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST libgcrypt-1.4.6.tar.bz2 1151877 RMD160 d4d720c4bfe80f0799b2cbdbbb49d304e3195049 SHA1 445b9e158aaf91e24eae3d1040c6213e9d9f5ba6 SHA256 3e4b30da6b357b565333d0222133b64a0414be99ba72733081165c8ea9bc6b85
 DIST libgcrypt-1.5.0-beta1.tar.bz2 1172939 RMD160 de82f94a1f7fd3b8460fa857edc4ab53ebb7cb27 SHA1 fbdbf8cde578835b4e492f34bd83f91deb97a2af SHA256 06842acbc36e3e8f427a56bd794f2e4f958f44e2ad2f41573db23a68ad050be4
+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_beta1.ebuild 1122 RMD160 ced5a95d1029d2b01581a97266d6125a613c1f9d SHA1 d6b980c528fb44706f2aa4fe3d20a3f8f07ce181 SHA256 a8ce2eaeb6c2241b991b69dc65c5ed24258947b8b49af5413712519f6696d983
-MISC ChangeLog 20764 RMD160 3412fdc57c1bfde1bfd58a0114bf810865f62478 SHA1 53c0577e635496781e7b8ea04f2cbfcd7163a131 SHA256 9e5a9f50462c228c595ce3a87fd0c004a40b0d3c996337bfc19c53e7010e811d
+EBUILD libgcrypt-1.5.0_beta1-r1.ebuild 1152 RMD160 d110e58e96c5b316c8f91855ef903c572cd842da SHA1 f63c83f1f515c2e5ff4ad4ce4f1cbbc29cd96e41 SHA256 489a81252e453a3791715ec3a79f0e3a74eba5a21a7ba3ea15ba12fec2ca5ab2
+MISC ChangeLog 21086 RMD160 6f57448194b0608953b37b59dbe7951eaedf7fef SHA1 4e3beb0da54f9a2629f52e249dca574945c7d1d3 SHA256 17781d52f417783c7314b989e05ebcb975cf1ffc707285ebf4c118ad49cd85ea
 MISC metadata.xml 160 RMD160 61ea9f9370afee3db802f40f7c6b2edd2f5347cf SHA1 51cf29a3589cff823294704e225b0de18f65e6dd SHA256 7419f4e73ddd07284403525f1380824fc68280cad69e2dfae0645ad52b33ef10
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJNnLJMAAoJEEsurZwMLhUxdGMP/2vHwzEJ2jsPv4SdDEBmPkBf
+Tv8WcKeu121viQ5Vnkj8p/kNILthNzQjeTy4xaolbzq2yfqaoqLdRxDgW7CihG2c
+i6drLLlFjKXjG84soE1486j2e0YANEmgwecLRbdgtgZyfGlF5lXx0+/bPGnkRZae
+JB4Qpn4zyeNkPPlhgpe1op2bVKqOIEgwWIvfnxeIGwIi27y1ptIG0WN4lNaxdYqJ
+M3P8yQ9kP0Wi6pkjmj4kXFB6YWW2Lf47RtbllN+UFdZLIIst4xyqwApUTR+2kZMK
+rr6KNgagknD3alOEEiqqg9t5C34RUgK96kREdwTXW1DcDg3h7TKxKb4dptuVsAOX
+e1Hm0yiyhLOjeglUaAZZ3TJe9/rKMrgHy5W0pmpFI6/HiseFfkbnWiS9Be2S1h9t
+bsqDwN7CLaL4K2xQ6YjDPyTIgz7JFaznqCM2UGv+bZr3oj4kMLVuxhIcXM2ZIOmk
+PJ8DFbUvWopYY/D79Gi8O8oMYIXYuVyPKdEdbiX2sJEsBqluZQ8k0IzFtRX/FG8L
+MeKhIOKqg1Ul080Nzbc4fYE9PN7PKCaj0kHkmWrcqn4uqAkUOGMb4U3ZgWePo6N1
+H+nRJd+HZUOaVSITkWkuZ3SgywcmE/LYhV86NCdwo0HBJkgkgCywu4grdBf3L7di
+QJyNN1BPmp8dQwXrF9qf
+=UUO5
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/libgcrypt/libgcrypt-1.4.6-r1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.4.6-r1.ebuild
new file mode 100644
index 000000000000..8ba9b28f9f49
--- /dev/null
+++ b/dev-libs/libgcrypt/libgcrypt-1.4.6-r1.ebuild
@@ -0,0 +1,43 @@
+# 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.4.6-r1.ebuild,v 1.1 2011/04/06 18:37:54 c1pher Exp $
+
+EAPI="3"
+
+inherit autotools eutils
+
+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.5"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# Fix build failure with non-bash /bin/sh.
+	eautoreconf
+
+	epunt_cxx
+}
+
+src_configure() {
+	# --disable-padlock-support for bug #201917
+	econf \
+		--disable-padlock-support \
+		--disable-dependency-tracking \
+		--with-pic \
+		--enable-noexecstack \
+		--disable-O-flag-munging \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog NEWS README* THANKS TODO || die "dodoc failed"
+}
diff --git a/dev-libs/libgcrypt/libgcrypt-1.5.0_beta1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.5.0_beta1-r1.ebuild
index 104ea202e039..b97f9c03f735 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.5.0_beta1.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.5.0_beta1-r1.ebuild
@@ -1,6 +1,6 @@
 # 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_beta1.ebuild,v 1.1 2011/02/23 16:09:48 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.5.0_beta1-r1.ebuild,v 1.1 2011/04/06 18:37:54 c1pher Exp $
 
 EAPI="3"
 
@@ -27,6 +27,7 @@ src_configure() {
 		--disable-dependency-tracking \
 		--with-pic \
 		--enable-noexecstack \
+		--disable-O-flag-munging \
 		$(use_enable static-libs static)
 }