Fix autotools rebuilding, force automake 1.9 because it does not work with 1.10....

Package-Manager: portage-2.1.2_pre3-r6

diff --git a/dev-libs/cyrus-sasl/ChangeLog b/dev-libs/cyrus-sasl/ChangeLog
index 97349b58d012e4851820dd86f0a98ebe2ee448a3..0fa572fd8dec316d02c956db80c36619aadb9b83 100644 (file)
--- a/dev-libs/cyrus-sasl/ChangeLog
+++ b/dev-libs/cyrus-sasl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/cyrus-sasl
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.161 2006/10/15 09:24:06 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.162 2006/10/23 10:00:31 flameeyes Exp $
+
+  23 Oct 2006; Diego Pettenò <flameeyes@gentoo.org>
+  cyrus-sasl-2.1.22.ebuild:
+  Fix autotools rebuilding, force automake 1.9 because it does not work with
+  1.10. Closes bug #148207.
 
   15 Oct 2006; Bryan Østergaard <kloeri@gentoo.org>
   cyrus-sasl-2.1.22.ebuild:

diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index 8c5d79a10db666826f17c70e65688dcd47cb3c16..03a487b809ed06999d60456107f3ea8a6897c00e 100644 (file)
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX cyrus-sasl-2.1.17-pgsql-include.patch 617 RMD160 b6a01c3447b49c8cc33ae0c7ca63294cad8e672c SHA1 a7a22f113044d8bda07e8345781913c317941f53 SHA256 394b196e7d5d7abb3d340de69ddea718bf80936de1eb667580ebae40b9cca228
 MD5 b9ab0670db5b9b5a74de379c18e5370d files/cyrus-sasl-2.1.17-pgsql-include.patch 617
 RMD160 b6a01c3447b49c8cc33ae0c7ca63294cad8e672c files/cyrus-sasl-2.1.17-pgsql-include.patch 617
@@ -62,14 +65,14 @@ EBUILD cyrus-sasl-2.1.21-r3.ebuild 9333 RMD160 8f018802d70906c6c2bb67edc8a649852
 MD5 0d80749c507d562fc146be655c0d3186 cyrus-sasl-2.1.21-r3.ebuild 9333
 RMD160 8f018802d70906c6c2bb67edc8a6498528fbb97e cyrus-sasl-2.1.21-r3.ebuild 9333
 SHA256 16da48132a712ad356c13f53bf91296eaff3ea7b601d7b08d17627e444619a68 cyrus-sasl-2.1.21-r3.ebuild 9333
-EBUILD cyrus-sasl-2.1.22.ebuild 9562 RMD160 65327a1f90ea13fd8b292ba23d2c78a97d8d9d46 SHA1 c4f483e50aeafe1e69f93400fd1e0df10f0f24b8 SHA256 78be6347cfd4ea27d7d957af2ac4a2c3c90999453d4574dc16ea3e788ba3ae83
-MD5 20ecfcc785def249c94b04df401f26e1 cyrus-sasl-2.1.22.ebuild 9562
-RMD160 65327a1f90ea13fd8b292ba23d2c78a97d8d9d46 cyrus-sasl-2.1.22.ebuild 9562
-SHA256 78be6347cfd4ea27d7d957af2ac4a2c3c90999453d4574dc16ea3e788ba3ae83 cyrus-sasl-2.1.22.ebuild 9562
-MISC ChangeLog 27890 RMD160 bb517d353d386b28d0989eedcc2212ceacb23fbb SHA1 6d06d371a792fae485e6538c935b0cb7a1fd7c87 SHA256 c15036eb99323364447b605be479328c9dfe26b9de4f17a8d020bdc5c4a88b90
-MD5 fc602acb44484f31564971f77a7f69cf ChangeLog 27890
-RMD160 bb517d353d386b28d0989eedcc2212ceacb23fbb ChangeLog 27890
-SHA256 c15036eb99323364447b605be479328c9dfe26b9de4f17a8d020bdc5c4a88b90 ChangeLog 27890
+EBUILD cyrus-sasl-2.1.22.ebuild 9117 RMD160 5c765507e2b3faf2908ce96802fac0cd0663d7c8 SHA1 72d2e11420cd6d438f46c4362465fc806df5b09f SHA256 06537ba92efddab0e9a91923aa39c198c761cfe34d462fc4b707e16e878b5121
+MD5 fb47175d489c0d68f88f82f1e638e097 cyrus-sasl-2.1.22.ebuild 9117
+RMD160 5c765507e2b3faf2908ce96802fac0cd0663d7c8 cyrus-sasl-2.1.22.ebuild 9117
+SHA256 06537ba92efddab0e9a91923aa39c198c761cfe34d462fc4b707e16e878b5121 cyrus-sasl-2.1.22.ebuild 9117
+MISC ChangeLog 28080 RMD160 c1b9a7532b5de043f688497000c3e6d5056eaf88 SHA1 cde5f56a9c3dc96f008303a9b92d98c434d9d04a SHA256 88a83a09e901a168237d9752f524fce179b3b6e98b91ca5e7375b816e206e03a
+MD5 9461db620c0a5ae5c9b70eb78044ed30 ChangeLog 28080
+RMD160 c1b9a7532b5de043f688497000c3e6d5056eaf88 ChangeLog 28080
+SHA256 88a83a09e901a168237d9752f524fce179b3b6e98b91ca5e7375b816e206e03a ChangeLog 28080
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 metadata.xml 161
@@ -83,3 +86,10 @@ SHA256 b32d41e1a514f5363d5747eedf3f52e1a01e44ec21faf8f885fa752ffb2193a4 files/di
 MD5 867cdff3326eba0a057e9f78e16f9de1 files/digest-cyrus-sasl-2.1.22 560
 RMD160 70eac19a0f9ef23cfefcd6061eb588cab116b3d1 files/digest-cyrus-sasl-2.1.22 560
 SHA256 69ae66e16518d7fa10bfda885a7994bdedea8a317b51cf7e27bb6d823f332cbb files/digest-cyrus-sasl-2.1.22 560
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFPJLIAiZjviIA2XgRAoDFAKDKbMjHe6W8KSRX8ZTQoZ5FnCd/VgCgnZvg
+NSdjKGXHqZdiLM2LIo7YfjE=
+=T6VK
+-----END PGP SIGNATURE-----

diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.22.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.22.ebuild
index 2e1a2fe0945788356c29b94d6ddd174b716e8f10..41f46879949167f8402dd0f6a6aae2e758bddfa5 100644 (file)
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.22.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.22.ebuild
@@ -1,8 +1,11 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.22.ebuild,v 1.16 2006/10/15 09:24:06 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.22.ebuild,v 1.17 2006/10/23 10:00:31 flameeyes Exp $
 
-inherit eutils gnuconfig flag-o-matic java-pkg multilib
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="1.9"
+
+inherit eutils gnuconfig flag-o-matic java-pkg multilib autotools
 
 ntlm_patch=${P}-ntlm_impl-spnego.patch.gz
 SASLAUTHD_CONF_VER=2.1.21
@@ -35,10 +38,7 @@ RDEPEND="berkdb? ( >=sys-libs/db-3.2 )
        java? ( =virtual/jdk-1.4* )
        ntlm_unsupported_patch? ( >=net-fs/samba-3.0.9 )"
 DEPEND="${RDEPEND}
-       >=sys-apps/sed-4
-       >=sys-devel/autoconf-2.58
-       sys-devel/automake
-       sys-devel/libtool"
+       >=sys-apps/sed-4"
 
 pkg_setup() {
 
@@ -97,21 +97,9 @@ src_unpack() {
        sed -i 's:^sasldir = .*$:sasldir = $(plugindir):' "${S}"/plugins/Makefile.{am,in}
 
        # Recreate configure.
-       export WANT_AUTOCONF="2.5"
-       rm -rf configure config.h.in autom4te.cache
-       ebegin "Recreating configure"
-       aclocal -I "${S}/cmulocal" -I "${S}/config" && autoheader && autoconf || \
-               die "recreate configure failed"
-       eend $?
-
-       # Recreate configure in saslauthd.
-       cd "${S}/saslauthd" || die "cd ${S}/saslauthd failed"
-       rm -rf configure config.h.in autom4te.cache
-       ebegin "Recreating configure in saslauthd"
-       aclocal -I "${S}/cmulocal" -I "${S}/config" && autoheader && autoconf || \
-               die "recreate configure failed"
-       eend $?
-
+       cd "${S}"
+       rm "${S}/config/libtool.m4"
+       AT_M4DIR="${S}/cmulocal ${S}/config" eautoreconf
 }
 
 src_compile() {