Fix autotools handling, closes bug #152497. Also don't use gnuconfig_update.

Package-Manager: portage-2.1.2_rc4-r5

diff --git a/net-mail/vpopmail/ChangeLog b/net-mail/vpopmail/ChangeLog
index 7b1782398c2dd470130a2e54ac967741eec8a603..9e5435e5f975a9df94e4824c32bcf506a8593f1d 100644 (file)
--- a/net-mail/vpopmail/ChangeLog
+++ b/net-mail/vpopmail/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-mail/vpopmail
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/ChangeLog,v 1.75 2006/11/23 16:12:33 vivo Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/ChangeLog,v 1.76 2007/01/04 13:18:35 flameeyes Exp $
+
+  04 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> vpopmail-5.4.16.ebuild:
+  Fix autotools handling, closes bug #152497. Also don't use gnuconfig_update.
 
   23 Nov 2006; Francesco Riosa <vivo@gentoo.org> vpopmail-5.4.6-r1.ebuild,
   vpopmail-5.4.13.ebuild, vpopmail-5.4.16.ebuild:

diff --git a/net-mail/vpopmail/Manifest b/net-mail/vpopmail/Manifest
index be19dd4852cfa9a9a869bd94c61de506e63f7b3d..1437ed87c0bbf50192b670db7b5c53517c12e245 100644 (file)
--- a/net-mail/vpopmail/Manifest
+++ b/net-mail/vpopmail/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 99vpopmail 86 RMD160 2ede3f28e75f950c46fda8b43242b3d9c9d1c55b SHA1 843a382c9e985dceef6e0e4fbe04a5d7c30c42e2 SHA256 15c0f4c42f654492e7d41772974d91e140626fcf8670d7540fc10d608209e9a1
 MD5 3041a3223960dc956b67ac1230f00db7 files/99vpopmail 86
 RMD160 2ede3f28e75f950c46fda8b43242b3d9c9d1c55b files/99vpopmail 86
@@ -45,18 +48,18 @@ EBUILD vpopmail-5.4.13.ebuild 7700 RMD160 0e813fdec70244a2b1cf780f0dc059aacd5bc9
 MD5 7fc3be9dd3ae189e8f729cae7b07f240 vpopmail-5.4.13.ebuild 7700
 RMD160 0e813fdec70244a2b1cf780f0dc059aacd5bc949 vpopmail-5.4.13.ebuild 7700
 SHA256 be74d6b810d19ee5032f049537e881de7e9c6b44a1c6c829a025cd6d4becdae5 vpopmail-5.4.13.ebuild 7700
-EBUILD vpopmail-5.4.16.ebuild 7699 RMD160 95fc9a51d1026bd043a2f2d0c2b4f0fc3792162d SHA1 7ed994312eb7da78c0748162ef11e8b98e2accda SHA256 20bd6e5b4273dc3c853120cd09402f6e843f9338d9cef9f6e91cbdf44d59a913
-MD5 a8b76578f86ef64c58527b0c078dca79 vpopmail-5.4.16.ebuild 7699
-RMD160 95fc9a51d1026bd043a2f2d0c2b4f0fc3792162d vpopmail-5.4.16.ebuild 7699
-SHA256 20bd6e5b4273dc3c853120cd09402f6e843f9338d9cef9f6e91cbdf44d59a913 vpopmail-5.4.16.ebuild 7699
+EBUILD vpopmail-5.4.16.ebuild 7601 RMD160 cc64483f9a40443eb44d604949b2f03831aa39f0 SHA1 639f2d03fb846c0602b954c6448bdbcd5042c189 SHA256 59f537799c16630d661370ff9446f765b2bb0fcea6d240014cf3f30df52040c8
+MD5 d3d0d10e875afbb04b391939710e79c0 vpopmail-5.4.16.ebuild 7601
+RMD160 cc64483f9a40443eb44d604949b2f03831aa39f0 vpopmail-5.4.16.ebuild 7601
+SHA256 59f537799c16630d661370ff9446f765b2bb0fcea6d240014cf3f30df52040c8 vpopmail-5.4.16.ebuild 7601
 EBUILD vpopmail-5.4.6-r1.ebuild 7617 RMD160 f34f8180233fa36c8246410072a917a52c7eebca SHA1 01504f7bd818a823b850fc4d521fcd7465a96557 SHA256 46e04cedd96d23d032da4fd7b32c9de1ad1f0147e5594f85250c03e9c63f6248
 MD5 3786fc3bb64014acd69820d71b7cca74 vpopmail-5.4.6-r1.ebuild 7617
 RMD160 f34f8180233fa36c8246410072a917a52c7eebca vpopmail-5.4.6-r1.ebuild 7617
 SHA256 46e04cedd96d23d032da4fd7b32c9de1ad1f0147e5594f85250c03e9c63f6248 vpopmail-5.4.6-r1.ebuild 7617
-MISC ChangeLog 12029 RMD160 61a04ec875696b97ce67a4c08b6b4a9a8811a701 SHA1 97b389b485318c8210f46ed6f114135d6cd51735 SHA256 5d65f7a275ab0429c57feeb8d470996b37f75a0f0c851899007d459303a86eae
-MD5 72ddff3eced8b47e535b331f3b65554d ChangeLog 12029
-RMD160 61a04ec875696b97ce67a4c08b6b4a9a8811a701 ChangeLog 12029
-SHA256 5d65f7a275ab0429c57feeb8d470996b37f75a0f0c851899007d459303a86eae ChangeLog 12029
+MISC ChangeLog 12191 RMD160 266436732e59b9a20c92cf8f22845e886508537a SHA1 8e078e73497ec14768407b945eb4c8a517f3a43c SHA256 6d65ea68b2cf6c371cb4446e81a34832be23ddcb3c344ef20001925bd1c6374e
+MD5 587daf2df336c0f02ec2b96a29fdd64d ChangeLog 12191
+RMD160 266436732e59b9a20c92cf8f22845e886508537a ChangeLog 12191
+SHA256 6d65ea68b2cf6c371cb4446e81a34832be23ddcb3c344ef20001925bd1c6374e ChangeLog 12191
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 metadata.xml 161
@@ -70,3 +73,10 @@ SHA256 911d2a37db98d55dfb2e9884e9fa64a529d3b29882e5c9add69d3a0d62b7201f files/di
 MD5 41940b909f3928fd1c089110417861cb files/digest-vpopmail-5.4.6-r1 244
 RMD160 10810e8d7187a63d42b1f8ea76248d6b54aec5b4 files/digest-vpopmail-5.4.6-r1 244
 SHA256 a16460925abde005f0253cfed6cf47708707992726f5a664f0a6f4953103e35a files/digest-vpopmail-5.4.6-r1 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.1 (GNU/Linux)
+
+iD8DBQFFnP6yAiZjviIA2XgRAjrEAJ98r94DmtzVxv/oq5JNZHOwormWLQCeJPiK
+FBX8Y/zv0GcZcwwAiR+Qs2I=
+=JBjv
+-----END PGP SIGNATURE-----

diff --git a/net-mail/vpopmail/vpopmail-5.4.16.ebuild b/net-mail/vpopmail/vpopmail-5.4.16.ebuild
index 87df3ef2113f7cb4a08ea637e07459bd11492d37..104a59494283a076d6684734d71fb7a92bb339b4 100644 (file)
--- a/net-mail/vpopmail/vpopmail-5.4.16.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.16.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-mail/vpopmail/vpopmail-5.4.16.ebuild,v 1.9 2006/11/23 16:12:33 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.16.ebuild,v 1.10 2007/01/04 13:18:35 flameeyes Exp $
 
-inherit eutils gnuconfig fixheadtails
+WANT_AUTOCONF=latest
+WANT_AUTOMAKE=latest
+
+inherit eutils fixheadtails autotools
 
 # TODO: all ldap, sybase support
 #MY_PV=${PV/_/-}
@@ -72,10 +75,7 @@ src_unpack() {
                vdelivermail.c vpopbull.c vqmaillocal.c \
                || die "failed to remove vpopmail advertisement"
 
-       gnuconfig_update
-       aclocal || die "aclocal failed"
-       WANT_AUTOMAKE="1.6" automake --add-missing || die "automake failed."
-       autoconf || die "reconfigure failed."
+       eautoreconf
        ht_fix_file ${S}/cdb/Makefile || die "failed to fix file"
 }
 
@@ -214,7 +214,7 @@ pkg_postinst() {
                einfo "> create database vpopmail;"
                einfo "> use mysql;"
                einfo "> grant select, insert, update, delete, create, drop on vpopmail.* to"
-               einfo "  vpopmail@localhost identified by 'your password';"
+               einfo "  vpopmail@localhost identified by 'your password';"
                einfo "> flush privileges;"
                echo
                einfo "If you have problems with vpopmail not accepting mail properly,"