Fix broken autotools handling.

Package-Manager: portage-2.1.2_rc4-r5

diff --git a/net-libs/courier-authlib/ChangeLog b/net-libs/courier-authlib/ChangeLog
index b6cc407a88c9ba522b353edfd7fdf2831fdee3f3..908d8cc2d8cfec9174afede02ee99cbef5902206 100644 (file)
--- a/net-libs/courier-authlib/ChangeLog
+++ b/net-libs/courier-authlib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/courier-authlib
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/ChangeLog,v 1.58 2006/11/23 20:00:22 vivo Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/ChangeLog,v 1.59 2007/01/04 15:51:50 flameeyes Exp $
+
+  04 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
+  courier-authlib-0.58.ebuild:
+  Fix broken autotools handling.
 
   23 Nov 2006; Francesco Riosa <vivo@gentoo.org>
   courier-authlib-0.53.ebuild, courier-authlib-0.54.20050224.ebuild,

diff --git a/net-libs/courier-authlib/Manifest b/net-libs/courier-authlib/Manifest
index 5144ec1195d4d61c9a187e3e1f9bb9276dff0854..c6ad4dabee7f9e41498389a06998145a625e5b4a 100644 (file)
--- a/net-libs/courier-authlib/Manifest
+++ b/net-libs/courier-authlib/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX CVE-2005-3532.patch 456 RMD160 e6edba3d1cd2c4873b892ce8f98be25cf6038f6c SHA1 06277f602f55a905d40b2337e4003afdfb3bce34 SHA256 ddad90488499f5607e30fd68f209553b6f35ab6aa4958c672f8ed73f85fe03ae
 MD5 452ec8a16d520bb91316b7dc1390b325 files/CVE-2005-3532.patch 456
 RMD160 e6edba3d1cd2c4873b892ce8f98be25cf6038f6c files/CVE-2005-3532.patch 456
@@ -54,14 +57,14 @@ EBUILD courier-authlib-0.57.ebuild 6080 RMD160 320f89b4130aba6c77d1f302690e82f04
 MD5 3f7a5f797acd7358d0ab0ca41501481f courier-authlib-0.57.ebuild 6080
 RMD160 320f89b4130aba6c77d1f302690e82f04db4725f courier-authlib-0.57.ebuild 6080
 SHA256 dd479480e745b07fb56d5befe09f4ae7965dddfd624f0a7ea7cfffe77695d1ff courier-authlib-0.57.ebuild 6080
-EBUILD courier-authlib-0.58.ebuild 6073 RMD160 86f87604851f8a9a40644b7598071bbeb5f720dd SHA1 451b20517ce53996889cc5556048e7a38109035a SHA256 85cca3c6035d1e6a52be3c98032fcb84c88cc8dac5440189335f9c6157b5d260
-MD5 ff8c7abe1bdda68ac481a65ac686eb1d courier-authlib-0.58.ebuild 6073
-RMD160 86f87604851f8a9a40644b7598071bbeb5f720dd courier-authlib-0.58.ebuild 6073
-SHA256 85cca3c6035d1e6a52be3c98032fcb84c88cc8dac5440189335f9c6157b5d260 courier-authlib-0.58.ebuild 6073
-MISC ChangeLog 9122 RMD160 f157ff8cd0da5b3c2e5a25da3c3bcf283d126121 SHA1 0b4151e6e74f7b4aba421eee6b4dc85484d4b820 SHA256 bf7a65c45f5da98142f494cbd0fa516424289f7b3a86f083020c1e959520976b
-MD5 59ea2842c7f7d81a45d4ad940ab7deb3 ChangeLog 9122
-RMD160 f157ff8cd0da5b3c2e5a25da3c3bcf283d126121 ChangeLog 9122
-SHA256 bf7a65c45f5da98142f494cbd0fa516424289f7b3a86f083020c1e959520976b ChangeLog 9122
+EBUILD courier-authlib-0.58.ebuild 5824 RMD160 4fe5a9aac77cbeb4fd834e5e8eed76537edfa358 SHA1 04879676b977328cee61c0180022fd27bff094b2 SHA256 70d3c7ae7df80163269b5977b014fa9f573bde10e8feb9622a025f2c4d7ab136
+MD5 5812c08b3f8f4fcc23a5a16bb776dc3a courier-authlib-0.58.ebuild 5824
+RMD160 4fe5a9aac77cbeb4fd834e5e8eed76537edfa358 courier-authlib-0.58.ebuild 5824
+SHA256 70d3c7ae7df80163269b5977b014fa9f573bde10e8feb9622a025f2c4d7ab136 courier-authlib-0.58.ebuild 5824
+MISC ChangeLog 9245 RMD160 a72bf0f475a75e17537e35a4684177ab369bc72a SHA1 d8b70b3a198aede3719d6bb2b97bffd72c5aba13 SHA256 29a6f529440f9a664f1a8270ef798bbb73144161e844a5d15e0ebfb7009e843a
+MD5 b15c2a636aa050aeb107451a0dcd9f40 ChangeLog 9245
+RMD160 a72bf0f475a75e17537e35a4684177ab369bc72a ChangeLog 9245
+SHA256 29a6f529440f9a664f1a8270ef798bbb73144161e844a5d15e0ebfb7009e843a ChangeLog 9245
 MISC metadata.xml 264 RMD160 d6222b0f467d8eba60d21e6aca39f286597beaef SHA1 0801b3c7ed8a52bc3a43092b58ad87a0357b2691 SHA256 712f8d9c0fb0a7cd5ce2c2c4367cc1c7a6d518f1cf2520cde278efcb32240367
 MD5 0364b9fe218debf0191624f65e03edd0 metadata.xml 264
 RMD160 d6222b0f467d8eba60d21e6aca39f286597beaef metadata.xml 264
@@ -96,3 +99,10 @@ SHA256 d91e0bc608673dbbce9c3703d085fe7aa6406666e4b956ebead60e9b0fbec0a5 files/di
 MD5 4cc2f8a9b13e49b3df351d0fc139b5d1 files/digest-courier-authlib-0.58 268
 RMD160 13974bb3b0b57b205e5da3c9a2f43086590afe30 files/digest-courier-authlib-0.58 268
 SHA256 24d46d530a68dccb1d51628593632dfcf6ed86bd6fe6547660656f6511e818ed files/digest-courier-authlib-0.58 268
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.1 (GNU/Linux)
+
+iD8DBQFFnSKdAiZjviIA2XgRAtlPAJ9UNA9TF0dbcHq613Jy2jWiK58jpwCdGfAF
+Gr4VCdv4F4Q8y7a6VByi85k=
+=Nqo9
+-----END PGP SIGNATURE-----

diff --git a/net-libs/courier-authlib/courier-authlib-0.58.ebuild b/net-libs/courier-authlib/courier-authlib-0.58.ebuild
index fe59fcef331e82bc6152669747c14363635f36e9..de9077224bfaf4b71c9ecb9ab94ed66ea1c76b15 100644 (file)
--- a/net-libs/courier-authlib/courier-authlib-0.58.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.58.ebuild
@@ -1,8 +1,11 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/courier-authlib-0.58.ebuild,v 1.10 2006/11/23 20:00:22 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/courier-authlib-0.58.ebuild,v 1.11 2007/01/04 15:51:50 flameeyes Exp $
 
-inherit eutils gnuconfig flag-o-matic
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+inherit eutils flag-o-matic autotools
 
 DESCRIPTION="courier authentication library"
 [ -z "${PV/?.??/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
@@ -44,22 +47,13 @@ src_unpack() {
        use elibc_uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub
        if ! use gdbm ; then
                epatch ${FILESDIR}/configure-db4.patch
-               export WANT_AUTOCONF="2.5"
-               gnuconfig_update
-               libtoolize --copy --force
-               ebegin "Recreating configure"
-                       autoconf ||  die "recreate configure failed"
-               eend $?
-               cd ${S}/bdbobj
-               libtoolize --copy --force
-               ebegin "Recreating bdbobj/configure"
-                       autoconf ||  die "recreate bdbobj/configure failed"
-               eend $?
        fi
        sed -i -e'/for dir in/a@@INDENT@@/etc/courier-imap \\' ${S}/authmigrate.in
        sed -i -e'/for dir in/a@@INDENT@@/etc/courier/authlib \\' ${S}/authmigrate.in
        sed -i -e"s|@@INDENT@@|         |g" ${S}/authmigrate.in
        sed -i -e"s|\$sbindir/makeuserdb||g" ${S}/authmigrate.in
+
+       eautoreconf
 }
 
 src_compile() {