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

(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)

3 files changed, 54 insertions, 2 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/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)
 }