Proper use of WANT_AUTOMAKE (bug #148273).

Package-Manager: portage-2.1.2_pre2-r5

3 files changed, 32 insertions, 16 deletions

diff --git a/app-text/sgml-common/ChangeLog b/app-text/sgml-common/ChangeLog
index 106a0ec36b56..6f75b4ccd2eb 100644
--- a/app-text/sgml-common/ChangeLog
+++ b/app-text/sgml-common/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/sgml-common
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sgml-common/ChangeLog,v 1.38 2006/05/09 00:31:46 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/sgml-common/ChangeLog,v 1.39 2006/10/07 21:12:35 nattfodd Exp $
+
+  07 Oct 2006; Alexandre Buisse <nattfodd@gentoo.org>
+  sgml-common-0.6.3-r5.ebuild:
+  Force automake-1.4 (bug #148273) by setting WANT_AUTOMAKE at the right
+  place.
 
   09 May 2006; Leonardo Boshell <leonardop@gentoo.org>
   sgml-common-0.6.3-r5.ebuild:
diff --git a/app-text/sgml-common/Manifest b/app-text/sgml-common/Manifest
index a5f055b80512..3b7847244274 100644
--- a/app-text/sgml-common/Manifest
+++ b/app-text/sgml-common/Manifest
@@ -1,25 +1,28 @@
-AUX sgml-common-0.6.3-configure.in.patch 360 RMD160 03454741e40ff5436d58e2379ee9b8a8da8b5986 SHA1 638aeeac37141b48d4f6162f538105e5d469eb08 SHA256 c1377215a0a92526cfa476dff941d00a713d156667ce37c39bf3f0fa02b71ad4 size 360
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX sgml-common-0.6.3-configure.in.patch 360 RMD160 03454741e40ff5436d58e2379ee9b8a8da8b5986 SHA1 638aeeac37141b48d4f6162f538105e5d469eb08 SHA256 c1377215a0a92526cfa476dff941d00a713d156667ce37c39bf3f0fa02b71ad4
 MD5 9518ad388371b562c9376c868e64a44f files/sgml-common-0.6.3-configure.in.patch 360
 RMD160 03454741e40ff5436d58e2379ee9b8a8da8b5986 files/sgml-common-0.6.3-configure.in.patch 360
 SHA256 c1377215a0a92526cfa476dff941d00a713d156667ce37c39bf3f0fa02b71ad4 files/sgml-common-0.6.3-configure.in.patch 360
-AUX sgml-common-0.6.3-install-catalog.in 4919 RMD160 df1cc3c659f9932285849ed0dac2b41eb97a1be8 SHA1 884a03ed2a4c519c12a15024954ea6336e955a5f SHA256 fb46e52b385ddbe38f83b4c68b9bf13763e546cd149c07e9172d9fc17c044d93 size 4919
+AUX sgml-common-0.6.3-install-catalog.in 4919 RMD160 df1cc3c659f9932285849ed0dac2b41eb97a1be8 SHA1 884a03ed2a4c519c12a15024954ea6336e955a5f SHA256 fb46e52b385ddbe38f83b4c68b9bf13763e546cd149c07e9172d9fc17c044d93
 MD5 3c3dbb1383763ce8ff70062fd60e96c0 files/sgml-common-0.6.3-install-catalog.in 4919
 RMD160 df1cc3c659f9932285849ed0dac2b41eb97a1be8 files/sgml-common-0.6.3-install-catalog.in 4919
 SHA256 fb46e52b385ddbe38f83b4c68b9bf13763e546cd149c07e9172d9fc17c044d93 files/sgml-common-0.6.3-install-catalog.in 4919
-DIST sgml-common-0.6.3.tgz 76783 RMD160 246d01272f70cd8382a7d596392e61d7dc0eec78 SHA256 7dc418c1d361123ffc5e45d61f1b97257940a8eb35d0bfbbc493381cc5b1f959 size 76783
-EBUILD sgml-common-0.6.3-r4.ebuild 1997 RMD160 a0b67262bb01dfff67c35e45ee6d341b3ca706db SHA1 7974b323f2f0d42a41fdb33291d79dc120a6a790 SHA256 08553153140a8cd48399433ec9955fcee77c14a4ef2fb9556251b857c5afbb57 size 1997
+DIST sgml-common-0.6.3.tgz 76783 RMD160 246d01272f70cd8382a7d596392e61d7dc0eec78 SHA1 b7d211c19b83accb92dcb51719de65227fb4c27c SHA256 7dc418c1d361123ffc5e45d61f1b97257940a8eb35d0bfbbc493381cc5b1f959
+EBUILD sgml-common-0.6.3-r4.ebuild 1997 RMD160 a0b67262bb01dfff67c35e45ee6d341b3ca706db SHA1 7974b323f2f0d42a41fdb33291d79dc120a6a790 SHA256 08553153140a8cd48399433ec9955fcee77c14a4ef2fb9556251b857c5afbb57
 MD5 7991f940485ba5e1687d7e42c121bb29 sgml-common-0.6.3-r4.ebuild 1997
 RMD160 a0b67262bb01dfff67c35e45ee6d341b3ca706db sgml-common-0.6.3-r4.ebuild 1997
 SHA256 08553153140a8cd48399433ec9955fcee77c14a4ef2fb9556251b857c5afbb57 sgml-common-0.6.3-r4.ebuild 1997
-EBUILD sgml-common-0.6.3-r5.ebuild 2104 RMD160 3cd9a52677b6f0a1b1547edc3c2a9b31bfadcb56 SHA1 7bbf6bcb50f25a7db8372d5cbfa62254d9a3ea7f SHA256 8399d823dd6aa36ea7cad471c58a8b2c8e610ecd20459c12016166a067de92dc size 2104
-MD5 3eb7f78b8b0421de99c9c9b770b14f48 sgml-common-0.6.3-r5.ebuild 2104
-RMD160 3cd9a52677b6f0a1b1547edc3c2a9b31bfadcb56 sgml-common-0.6.3-r5.ebuild 2104
-SHA256 8399d823dd6aa36ea7cad471c58a8b2c8e610ecd20459c12016166a067de92dc sgml-common-0.6.3-r5.ebuild 2104
-MISC ChangeLog 5728 RMD160 c1ec28d5d8d5d0d327b8470944751b9ccf55acd3 SHA1 fd2c0f3692bcaf2fb0e42654217cbb89b4f2a688 SHA256 e9e6e04521c438811b7fef1068b21802879bb77cdd3b8b04dd780fa3100e718c size 5728
-MD5 9ffe64972750ea8ef74e96226991e8f6 ChangeLog 5728
-RMD160 c1ec28d5d8d5d0d327b8470944751b9ccf55acd3 ChangeLog 5728
-SHA256 e9e6e04521c438811b7fef1068b21802879bb77cdd3b8b04dd780fa3100e718c ChangeLog 5728
-MISC metadata.xml 164 RMD160 698422e821458386b8da17baa6014296f8284e0b SHA1 a805613d38e6e3bff93cba3858d6a92cc79fe2f7 SHA256 7bd4d93c657a26aa9af1dea4232520c0d388cc92115dd9ca0eb04259228e044f size 164
+EBUILD sgml-common-0.6.3-r5.ebuild 2096 RMD160 1b03b7c1f047234421e674c4fcf0066122975137 SHA1 9296deaecab2b267ec2a5e160a2137368723201f SHA256 0f64a6ad94b2bda56d8f53125bfd337b1e764cd182ad9070962d82afee2ab6c9
+MD5 bdbe8296b9c0add3adefa9f446bb71ed sgml-common-0.6.3-r5.ebuild 2096
+RMD160 1b03b7c1f047234421e674c4fcf0066122975137 sgml-common-0.6.3-r5.ebuild 2096
+SHA256 0f64a6ad94b2bda56d8f53125bfd337b1e764cd182ad9070962d82afee2ab6c9 sgml-common-0.6.3-r5.ebuild 2096
+MISC ChangeLog 5895 RMD160 19c2566711c77d6a53447837c9be87f9c16f31e6 SHA1 87bbe13a072db2fca97b286775a7f52626ba723c SHA256 90868dc9707ceda6c0e7e94a1c8c00b58e74e00b7b5a9707ed2eceb9acb25f62
+MD5 0c3931441da76f8be7060e738be4485a ChangeLog 5895
+RMD160 19c2566711c77d6a53447837c9be87f9c16f31e6 ChangeLog 5895
+SHA256 90868dc9707ceda6c0e7e94a1c8c00b58e74e00b7b5a9707ed2eceb9acb25f62 ChangeLog 5895
+MISC metadata.xml 164 RMD160 698422e821458386b8da17baa6014296f8284e0b SHA1 a805613d38e6e3bff93cba3858d6a92cc79fe2f7 SHA256 7bd4d93c657a26aa9af1dea4232520c0d388cc92115dd9ca0eb04259228e044f
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
 RMD160 698422e821458386b8da17baa6014296f8284e0b metadata.xml 164
 SHA256 7bd4d93c657a26aa9af1dea4232520c0d388cc92115dd9ca0eb04259228e044f metadata.xml 164
@@ -29,3 +32,10 @@ SHA256 32c78d10e852b45bba816c390d7ed87d87754ca91cad13a2946f717a6c22daca files/di
 MD5 ed80d3150b7151b2db464cac2220e87b files/digest-sgml-common-0.6.3-r5 241
 RMD160 31bebdffb57759155f94d90653e17956f8e30654 files/digest-sgml-common-0.6.3-r5 241
 SHA256 32c78d10e852b45bba816c390d7ed87d87754ca91cad13a2946f717a6c22daca files/digest-sgml-common-0.6.3-r5 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFKBjUwx9vvAARv2sRAiGWAJ0YSX8dQCUz+osxf3yl+GB5wlQvWQCgv6U4
+cVWdGfzoHdwN7NEAvlfj/do=
+=CGvI
+-----END PGP SIGNATURE-----
diff --git a/app-text/sgml-common/sgml-common-0.6.3-r5.ebuild b/app-text/sgml-common/sgml-common-0.6.3-r5.ebuild
index 0067ff6139ee..701d2d7c4a64 100644
--- a/app-text/sgml-common/sgml-common-0.6.3-r5.ebuild
+++ b/app-text/sgml-common/sgml-common-0.6.3-r5.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sgml-common/sgml-common-0.6.3-r5.ebuild,v 1.5 2006/05/09 00:31:46 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/sgml-common/sgml-common-0.6.3-r5.ebuild,v 1.6 2006/10/07 21:12:35 nattfodd Exp $
+
+WANT_AUTOMAKE=1.4
 
 inherit autotools eutils
 
@@ -23,7 +25,6 @@ src_unpack() {
 	cp "${FILESDIR}/${P}-install-catalog.in" "${S}/bin/install-catalog.in"
 	cd ${S}
 	epatch ${FILESDIR}/${P}-configure.in.patch
-	export WANT_AUTOMAKE=1.4
 	eautoreconf
 }