Bug #403261: no direct automake need, but OpenLDAP still needs a specific version of aclocal which comes from automake

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

8 files changed, 32 insertions, 38 deletions

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index 369871c5e9bc..701b6ba42be1 100644
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,6 +1,12 @@
 # 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.391 2012/02/12 01:02:33 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.392 2012/02/12 19:24:32 robbat2 Exp $
+
+  12 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> 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 #403261: no direct automake need, but OpenLDAP still needs a specific
+  version of aclocal which comes from automake
 
   12 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> files/slapd-confd,
   files/slapd-initd:
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index 0679dc6ebfe0..1bd89213da9f 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -27,11 +27,11 @@ DIST openldap-2.4.25.tgz 5250595 RMD160 31217119f9a82712240bee10c2a350c8f35e0b8e
 DIST openldap-2.4.28.tgz 5436340 RMD160 b542e19fcae08182cb18969f2d3fe8d87df8a7f2 SHA1 d888beae1723002a5a2ff5509d3040df40885774 SHA256 332ab5b13dbc0f85b1112d7a6f3485069108bfbd4d2603c8b548adbfa9bbc371
 EBUILD openldap-2.3.43-r1.ebuild 18090 RMD160 3415f23627af828e3910c4a6a695eba9410d7930 SHA1 7eb4842bf389d5d6743ef855a257752877e0dece SHA256 33c761272d6d1d57a9f665e06326bc2cd7d51a38e98bb9b3fb9f3376d60e7fd9
 EBUILD openldap-2.4.19-r1.ebuild 19717 RMD160 1e39e23a5dff5301997cfac6200779aeed4b8643 SHA1 a0a98e47bdc186f499103d384b98803b84525f97 SHA256 d5ee7046de27272f6c11a417f17823d4b4dc1c5e12e5f79e1f64d06a8033c414
-EBUILD openldap-2.4.21.ebuild 20184 RMD160 508643b50977c0d29b2a019582246f572cf1eb68 SHA1 9a4f6d767892641726b40b9c8a08bda991bc5db6 SHA256 b58113d2f6d193acaa1e65f7551fba92c228ad78fa42230316588ab9eb24ef80
-EBUILD openldap-2.4.23.ebuild 20174 RMD160 52f1ac72f742764a35ae9d085204ad0851ce9263 SHA1 45b47293cc775c65cc9e7cfacf17094b108eaacb SHA256 2df6bbd02003b8a30275bf50bc6aa896177b64fa31e5c72c383970cf84d67bdc
-EBUILD openldap-2.4.24.ebuild 20173 RMD160 49fe1c0a3d415691858f50728a5dd218c2de4cff SHA1 68653ce967c24e821e2a8893c7151397b1b014f2 SHA256 36174edb27b4eda5d93731626e10fe4870c86c4e3d44d55a11c408c370da2d8b
-EBUILD openldap-2.4.25-r1.ebuild 20879 RMD160 85f10aed763b082a0f94f28967c7fa5dde548b9a SHA1 9936f70278756bb82279dd0d3313a545a215394a SHA256 54a76ebd749c5a24a435d2b6d69f45efa20377ab5cb02212f8ad523e5a327063
-EBUILD openldap-2.4.25.ebuild 20184 RMD160 1f8c50d7af86a7b4fa443db1f9137125cffc6e00 SHA1 81ceaee7464a4b0032025a633dd81c7b3f8021ce SHA256 b75c30e30cc5d30011c731d5212a627cafc7f5f2b485fbdc651611fc2109223f
-EBUILD openldap-2.4.28.ebuild 20876 RMD160 b63e24a39c5a2b926fa1bd9c5e6ca27935e733ef SHA1 67c596c1738dcb177896510f0b75c2365258f1ad SHA256 4d6c64089973745eff3176677d603ef419d82e567136d75977b3ed315a5830cf
-MISC ChangeLog 67638 RMD160 abd5608f5279a8ef432f36af892c20c9253a4120 SHA1 55bb9125ce5253781a3a0acdae9037253d6921c2 SHA256 8fbcd240298d70a42cdf585d102edc77d0d65a548bd9bae42b98303d56ab9071
+EBUILD openldap-2.4.21.ebuild 20062 RMD160 6422e239d513d6a008b8026bf3546577d57d189c SHA1 fccdc11824d3f618ce641548bf8cba2d056feea3 SHA256 550ed1df44e25df085ee4abdf2eea959f8a9574ce55412e505abe62a18aabdf8
+EBUILD openldap-2.4.23.ebuild 20052 RMD160 d2c5f2716d2296aad789211c82b78ef8b495809a SHA1 6c809c13633353c507ad6b0bee6b68dca2e62c82 SHA256 63db93bb80a4346de667463099197330ecba56b73b5e2dbd9f83515c90731ee5
+EBUILD openldap-2.4.24.ebuild 20052 RMD160 77114e0debd47dcac5801ebfdae170ee095f0c50 SHA1 643cb2c8a497c03f2650cf3b31f05b30faedcc22 SHA256 37bc805f492fae267b05d190072e3b0767e49e4392500bb1a668b87c896f0dc0
+EBUILD openldap-2.4.25-r1.ebuild 20757 RMD160 536f4617a8f90ee3b693256f70dd7266af71ab24 SHA1 96e979f3b41ab8064689096bdf38a698e19d39cb SHA256 539863c414651234577065139ca2943b482cd8bf2a02d88571ee3445a62b89a2
+EBUILD openldap-2.4.25.ebuild 20062 RMD160 30c937f5f4acd362398dceb3405a464bd87dd852 SHA1 b29a8c0a0cca5ea3732464917f7ad4774cf21923 SHA256 c7645f239f81881c349dc85ade86ddaa39f252f47421e84f76b7b2c7c717c27c
+EBUILD openldap-2.4.28.ebuild 20754 RMD160 5ad88b51ee4e5b38f8f17d209c934078ae177249 SHA1 4788c1e97335214a3da5ded7014fa44644507617 SHA256 1f93c0eb42b2b404065b4a73ef10a6a73677efaf9567402359f7787f22d08b52
+MISC ChangeLog 67966 RMD160 df1de711692d71bd163f8cd627c636c079a000c6 SHA1 437f2bdd9c3464e11875a078f93f3b11e9e043a0 SHA256 676b0457cd1a4891ac9df4f3d5b0c217ee97a942394e4b22f7d08cd9265e2a8d
 MISC metadata.xml 556 RMD160 14eae07812da4eecd05e467d1dccf841e6e16be6 SHA1 fa4c8d1aa03dd6bb9c27a7758fbaba5355cfe590 SHA256 405d4cd6f15d8495d0c7365f7b7d6bda9b82775d7e157339f3a6e92d46eed2c8
diff --git a/net-nds/openldap/openldap-2.4.21.ebuild b/net-nds/openldap/openldap-2.4.21.ebuild
index a2e45619fd82..3b99d671d49f 100644
--- a/net-nds/openldap/openldap-2.4.21.ebuild
+++ b/net-nds/openldap/openldap-2.4.21.ebuild
@@ -1,9 +1,9 @@
 # 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.4 2012/02/12 00:54:14 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.21.ebuild,v 1.5 2012/02/12 19:24:32 robbat2 Exp $
 
 EAPI="2"
-WANT_AUTOMAKE=none
+WANT_AUTOMAKE=1.9
 inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs autotools
 
 DESCRIPTION="LDAP suite of application and development tools"
@@ -253,9 +253,7 @@ src_prepare() {
 		"${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"
+	WANT_AUTOMAKE=none eautoreconf
 }
 
 build_contrib_module() {
diff --git a/net-nds/openldap/openldap-2.4.23.ebuild b/net-nds/openldap/openldap-2.4.23.ebuild
index 5feb490b00b3..1a7b153fdf09 100644
--- a/net-nds/openldap/openldap-2.4.23.ebuild
+++ b/net-nds/openldap/openldap-2.4.23.ebuild
@@ -1,9 +1,9 @@
 # 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.10 2012/02/12 00:54:14 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.23.ebuild,v 1.11 2012/02/12 19:24:32 robbat2 Exp $
 
 EAPI="2"
-WANT_AUTOMAKE=none
+WANT_AUTOMAKE=1.9
 inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs autotools
 
 DESCRIPTION="LDAP suite of application and development tools"
@@ -253,9 +253,7 @@ src_prepare() {
 		"${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"
+	WANT_AUTOMAKE=none eautoreconf
 }
 
 build_contrib_module() {
diff --git a/net-nds/openldap/openldap-2.4.24.ebuild b/net-nds/openldap/openldap-2.4.24.ebuild
index cbe38500758c..e8d74beacfbe 100644
--- a/net-nds/openldap/openldap-2.4.24.ebuild
+++ b/net-nds/openldap/openldap-2.4.24.ebuild
@@ -1,9 +1,9 @@
 # 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.9 2012/02/12 00:54:14 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.24.ebuild,v 1.10 2012/02/12 19:24:32 robbat2 Exp $
 
 EAPI="2"
-WANT_AUTOMAKE=none
+WANT_AUTOMAKE=1.9
 inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs autotools
 
 DESCRIPTION="LDAP suite of application and development tools"
@@ -253,9 +253,7 @@ src_prepare() {
 		"${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"
+	WANT_AUTOMAKE=none eautoreconf
 }
 
 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 407efcdd6688..276e30df83ee 100644
--- a/net-nds/openldap/openldap-2.4.25-r1.ebuild
+++ b/net-nds/openldap/openldap-2.4.25-r1.ebuild
@@ -1,9 +1,9 @@
 # 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.4 2012/02/12 00:54:14 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.25-r1.ebuild,v 1.5 2012/02/12 19:24:32 robbat2 Exp $
 
 EAPI="3"
-WANT_AUTOMAKE=none
+WANT_AUTOMAKE=1.9
 inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs autotools
 
 DESCRIPTION="LDAP suite of application and development tools"
@@ -253,9 +253,7 @@ src_prepare() {
 		"${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"
+	WANT_AUTOMAKE=none eautoreconf
 }
 
 build_contrib_module() {
diff --git a/net-nds/openldap/openldap-2.4.25.ebuild b/net-nds/openldap/openldap-2.4.25.ebuild
index 044fae90a335..7fcef7a0d0b1 100644
--- a/net-nds/openldap/openldap-2.4.25.ebuild
+++ b/net-nds/openldap/openldap-2.4.25.ebuild
@@ -1,9 +1,9 @@
 # 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.4 2012/02/12 00:54:14 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.25.ebuild,v 1.5 2012/02/12 19:24:32 robbat2 Exp $
 
 EAPI="2"
-WANT_AUTOMAKE=none
+WANT_AUTOMAKE=1.9
 inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs autotools
 
 DESCRIPTION="LDAP suite of application and development tools"
@@ -253,9 +253,7 @@ src_prepare() {
 		"${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"
+	WANT_AUTOMAKE=none eautoreconf
 }
 
 build_contrib_module() {
diff --git a/net-nds/openldap/openldap-2.4.28.ebuild b/net-nds/openldap/openldap-2.4.28.ebuild
index 34d953e7ca5a..8cb500791314 100644
--- a/net-nds/openldap/openldap-2.4.28.ebuild
+++ b/net-nds/openldap/openldap-2.4.28.ebuild
@@ -1,9 +1,9 @@
 # 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.2 2012/02/12 00:54:14 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.28.ebuild,v 1.3 2012/02/12 19:24:32 robbat2 Exp $
 
 EAPI="3"
-WANT_AUTOMAKE=none
+WANT_AUTOMAKE=1.9
 inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs autotools
 
 DESCRIPTION="LDAP suite of application and development tools"
@@ -253,9 +253,7 @@ src_prepare() {
 		"${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"
+	WANT_AUTOMAKE=none eautoreconf
 }
 
 build_contrib_module() {