Bug #337504: compile-fix for gnutls linked with gcrypt. Relies on WANT_AUTOMAKE=none eautoreconf support added to autotools.eclass as openldap configure.in uses AM_INIT_AUTOMAKE but there are no Makefile.am (all Makefile.in are hand-written).

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

8 files changed, 87 insertions, 13 deletions

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index bd774578f87a..8dd4c24162ec 100644
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-nds/openldap
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.389 2012/02/10 18:10:03 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.390 2012/02/12 00:54:14 robbat2 Exp $
+
+  12 Feb 2012; Robin H. Johnson <robbat2@gentoo.org>
+  +files/openldap-2.4.28-gnutls-gcrypt.patch, openldap-2.4.21.ebuild,
+  openldap-2.4.23.ebuild, openldap-2.4.24.ebuild, openldap-2.4.25-r1.ebuild,
+  openldap-2.4.25.ebuild, openldap-2.4.28.ebuild:
+  Bug #337504: compile-fix for gnutls linked with gcrypt. Relies on
+  WANT_AUTOMAKE=none eautoreconf support added to autotools.eclass as openldap
+  configure.in uses AM_INIT_AUTOMAKE but there are no Makefile.am (all
+  Makefile.in are hand-written).
 
   10 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> openldap-2.3.43-r1.ebuild,
   openldap-2.4.19-r1.ebuild, openldap-2.4.21.ebuild, openldap-2.4.23.ebuild,
diff --git a/net-nds/openldap/files/openldap-2.4.28-gnutls-gcrypt.patch b/net-nds/openldap/files/openldap-2.4.28-gnutls-gcrypt.patch
new file mode 100644
index 000000000000..aeecb0f40132
--- /dev/null
+++ b/net-nds/openldap/files/openldap-2.4.28-gnutls-gcrypt.patch
@@ -0,0 +1,11 @@
+--- openldap-2.4.28/configure.in.orig	2012-02-11 22:40:36.004360795 +0000
++++ openldap-2.4.28/configure.in	2012-02-11 22:40:13.410986851 +0000
+@@ -1214,7 +1214,7 @@
+ 				ol_with_tls=gnutls
+ 				ol_link_tls=yes
+ 
+-				TLS_LIBS="-lgnutls"
++				TLS_LIBS="-lgnutls -lgcrypt"
+ 
+ 				AC_DEFINE(HAVE_GNUTLS, 1, 
+ 					[define if you have GNUtls])
diff --git a/net-nds/openldap/openldap-2.4.21.ebuild b/net-nds/openldap/openldap-2.4.21.ebuild
index 3d968581601e..a2e45619fd82 100644
--- a/net-nds/openldap/openldap-2.4.21.ebuild
+++ b/net-nds/openldap/openldap-2.4.21.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.21.ebuild,v 1.3 2012/02/10 18:10:03 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.21.ebuild,v 1.4 2012/02/12 00:54:14 robbat2 Exp $
 
 EAPI="2"
-inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs
+WANT_AUTOMAKE=none
+inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs autotools
 
 DESCRIPTION="LDAP suite of application and development tools"
 HOMEPAGE="http://www.OpenLDAP.org/"
@@ -237,6 +238,9 @@ src_prepare() {
 	# bug #233633
 	epatch "${FILESDIR}"/${PN}-2.4.17-fix-lmpasswd-gnutls-symbols.patch
 
+	# bug #281495
+	epatch "${FILESDIR}"/${PN}-2.4.28-gnutls-gcrypt.patch
+
 	cd "${S}"/build
 	einfo "Making sure upstream build strip does not do stripping too early"
 	sed -i.orig \
@@ -247,6 +251,11 @@ src_prepare() {
 	sed -i \
 		-e 's|/bin/sh|/bin/bash|g' \
 		"${S}"/tests/scripts/* || die "sed failed"
+
+	cd "${S}"
+	#sed '/AM_INIT_AUTOMAKE/s,^,#,g' -i configure.in || die "sed failed"
+	eautoreconf
+	#sed '/AM_INIT_AUTOMAKE/s,^#,,g' -i configure.in || die "sed failed"
 }
 
 build_contrib_module() {
diff --git a/net-nds/openldap/openldap-2.4.23.ebuild b/net-nds/openldap/openldap-2.4.23.ebuild
index a9ba41842cbd..5feb490b00b3 100644
--- a/net-nds/openldap/openldap-2.4.23.ebuild
+++ b/net-nds/openldap/openldap-2.4.23.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.23.ebuild,v 1.9 2012/02/10 18:10:03 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.23.ebuild,v 1.10 2012/02/12 00:54:14 robbat2 Exp $
 
 EAPI="2"
-inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs
+WANT_AUTOMAKE=none
+inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs autotools
 
 DESCRIPTION="LDAP suite of application and development tools"
 HOMEPAGE="http://www.OpenLDAP.org/"
@@ -237,6 +238,9 @@ src_prepare() {
 	# bug #233633
 	epatch "${FILESDIR}"/${PN}-2.4.17-fix-lmpasswd-gnutls-symbols.patch
 
+	# bug #281495
+	epatch "${FILESDIR}"/${PN}-2.4.28-gnutls-gcrypt.patch
+
 	cd "${S}"/build
 	einfo "Making sure upstream build strip does not do stripping too early"
 	sed -i.orig \
@@ -247,6 +251,11 @@ src_prepare() {
 	sed -i \
 		-e 's|/bin/sh|/bin/bash|g' \
 		"${S}"/tests/scripts/* || die "sed failed"
+
+	cd "${S}"
+	#sed '/AM_INIT_AUTOMAKE/s,^,#,g' -i configure.in || die "sed failed"
+	eautoreconf
+	#sed '/AM_INIT_AUTOMAKE/s,^#,,g' -i configure.in || die "sed failed"
 }
 
 build_contrib_module() {
diff --git a/net-nds/openldap/openldap-2.4.24.ebuild b/net-nds/openldap/openldap-2.4.24.ebuild
index b888f8d061f6..cbe38500758c 100644
--- a/net-nds/openldap/openldap-2.4.24.ebuild
+++ b/net-nds/openldap/openldap-2.4.24.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.24.ebuild,v 1.8 2012/02/10 18:10:03 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.24.ebuild,v 1.9 2012/02/12 00:54:14 robbat2 Exp $
 
 EAPI="2"
-inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs
+WANT_AUTOMAKE=none
+inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs autotools
 
 DESCRIPTION="LDAP suite of application and development tools"
 HOMEPAGE="http://www.OpenLDAP.org/"
@@ -237,6 +238,9 @@ src_prepare() {
 	# bug #233633
 	epatch "${FILESDIR}"/${PN}-2.4.17-fix-lmpasswd-gnutls-symbols.patch
 
+	# bug #281495
+	epatch "${FILESDIR}"/${PN}-2.4.28-gnutls-gcrypt.patch
+
 	cd "${S}"/build
 	einfo "Making sure upstream build strip does not do stripping too early"
 	sed -i.orig \
@@ -247,6 +251,11 @@ src_prepare() {
 	sed -i \
 		-e 's|/bin/sh|/bin/bash|g' \
 		"${S}"/tests/scripts/* || die "sed failed"
+
+	cd "${S}"
+	#sed '/AM_INIT_AUTOMAKE/s,^,#,g' -i configure.in || die "sed failed"
+	eautoreconf
+	#sed '/AM_INIT_AUTOMAKE/s,^#,,g' -i configure.in || die "sed failed"
 }
 
 build_contrib_module() {
diff --git a/net-nds/openldap/openldap-2.4.25-r1.ebuild b/net-nds/openldap/openldap-2.4.25-r1.ebuild
index 3fda021034e5..407efcdd6688 100644
--- a/net-nds/openldap/openldap-2.4.25-r1.ebuild
+++ b/net-nds/openldap/openldap-2.4.25-r1.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.25-r1.ebuild,v 1.3 2012/02/10 18:10:03 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.25-r1.ebuild,v 1.4 2012/02/12 00:54:14 robbat2 Exp $
 
 EAPI="3"
-inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs
+WANT_AUTOMAKE=none
+inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs autotools
 
 DESCRIPTION="LDAP suite of application and development tools"
 HOMEPAGE="http://www.OpenLDAP.org/"
@@ -237,6 +238,9 @@ src_prepare() {
 	# bug #233633
 	epatch "${FILESDIR}"/${PN}-2.4.17-fix-lmpasswd-gnutls-symbols.patch
 
+	# bug #281495
+	epatch "${FILESDIR}"/${PN}-2.4.28-gnutls-gcrypt.patch
+
 	cd "${S}"/build
 	einfo "Making sure upstream build strip does not do stripping too early"
 	sed -i.orig \
@@ -247,6 +251,11 @@ src_prepare() {
 	sed -i \
 		-e 's|/bin/sh|/bin/bash|g' \
 		"${S}"/tests/scripts/* || die "sed failed"
+
+	cd "${S}"
+	#sed '/AM_INIT_AUTOMAKE/s,^,#,g' -i configure.in || die "sed failed"
+	eautoreconf
+	#sed '/AM_INIT_AUTOMAKE/s,^#,,g' -i configure.in || die "sed failed"
 }
 
 build_contrib_module() {
diff --git a/net-nds/openldap/openldap-2.4.25.ebuild b/net-nds/openldap/openldap-2.4.25.ebuild
index 39a91d81452e..044fae90a335 100644
--- a/net-nds/openldap/openldap-2.4.25.ebuild
+++ b/net-nds/openldap/openldap-2.4.25.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.25.ebuild,v 1.3 2012/02/10 18:10:03 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.25.ebuild,v 1.4 2012/02/12 00:54:14 robbat2 Exp $
 
 EAPI="2"
-inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs
+WANT_AUTOMAKE=none
+inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs autotools
 
 DESCRIPTION="LDAP suite of application and development tools"
 HOMEPAGE="http://www.OpenLDAP.org/"
@@ -237,6 +238,9 @@ src_prepare() {
 	# bug #233633
 	epatch "${FILESDIR}"/${PN}-2.4.17-fix-lmpasswd-gnutls-symbols.patch
 
+	# bug #281495
+	epatch "${FILESDIR}"/${PN}-2.4.28-gnutls-gcrypt.patch
+
 	cd "${S}"/build
 	einfo "Making sure upstream build strip does not do stripping too early"
 	sed -i.orig \
@@ -247,6 +251,11 @@ src_prepare() {
 	sed -i \
 		-e 's|/bin/sh|/bin/bash|g' \
 		"${S}"/tests/scripts/* || die "sed failed"
+
+	cd "${S}"
+	#sed '/AM_INIT_AUTOMAKE/s,^,#,g' -i configure.in || die "sed failed"
+	eautoreconf
+	#sed '/AM_INIT_AUTOMAKE/s,^#,,g' -i configure.in || die "sed failed"
 }
 
 build_contrib_module() {
diff --git a/net-nds/openldap/openldap-2.4.28.ebuild b/net-nds/openldap/openldap-2.4.28.ebuild
index cf6a24e64955..34d953e7ca5a 100644
--- a/net-nds/openldap/openldap-2.4.28.ebuild
+++ b/net-nds/openldap/openldap-2.4.28.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.28.ebuild,v 1.1 2012/02/02 20:10:26 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.28.ebuild,v 1.2 2012/02/12 00:54:14 robbat2 Exp $
 
 EAPI="3"
-inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs
+WANT_AUTOMAKE=none
+inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs autotools
 
 DESCRIPTION="LDAP suite of application and development tools"
 HOMEPAGE="http://www.OpenLDAP.org/"
@@ -237,6 +238,9 @@ src_prepare() {
 	# bug #233633
 	epatch "${FILESDIR}"/${PN}-2.4.17-fix-lmpasswd-gnutls-symbols.patch
 
+	# bug #281495
+	epatch "${FILESDIR}"/${PN}-2.4.28-gnutls-gcrypt.patch
+
 	cd "${S}"/build
 	einfo "Making sure upstream build strip does not do stripping too early"
 	sed -i.orig \
@@ -247,6 +251,11 @@ src_prepare() {
 	sed -i \
 		-e 's|/bin/sh|/bin/bash|g' \
 		"${S}"/tests/scripts/* || die "sed failed"
+
+	cd "${S}"
+	#sed '/AM_INIT_AUTOMAKE/s,^,#,g' -i configure.in || die "sed failed"
+	eautoreconf
+	#sed '/AM_INIT_AUTOMAKE/s,^#,,g' -i configure.in || die "sed failed"
 }
 
 build_contrib_module() {