Fix autotools usage; bug 160156

Package-Manager: portage-2.1.2_rc4-r3

4 files changed, 28 insertions, 28 deletions

diff --git a/app-text/xlhtml/ChangeLog b/app-text/xlhtml/ChangeLog
index b93dd29e2dcc..cee72312875b 100644
--- a/app-text/xlhtml/ChangeLog
+++ b/app-text/xlhtml/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/xlhtml
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xlhtml/ChangeLog,v 1.13 2007/01/05 07:27:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xlhtml/ChangeLog,v 1.14 2007/01/07 00:43:13 masterdriverz Exp $
+
+  07 Jan 2007; Charlie Shepherd <masterdriverz@gentoo.org>
+  xlhtml-0.5.ebuild:
+  Fix autotools usage; bug 160156
 
   05 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> xlhtml-0.5.ebuild:
   Remove gnuconfig_update usage, leave it to econf.
diff --git a/app-text/xlhtml/Manifest b/app-text/xlhtml/Manifest
index b86fc4e29000..3189ff3472fc 100644
--- a/app-text/xlhtml/Manifest
+++ b/app-text/xlhtml/Manifest
@@ -1,26 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST xlhtml-0.5.tgz 271045
-EBUILD xlhtml-0.5.ebuild 1067 RMD160 38984609210abaca70ac31be69c7aa6b113be2b4 SHA1 f3f31a66397ba2a81409f0fdeca5d5cdeeb120d0 SHA256 8057ec3e053f3ae36b73a1ef8817d5717acf07dc4d7ab0edeb14fd1a0b1ff2f2
-MD5 a8e054e4148e76d6361e60633562c1b6 xlhtml-0.5.ebuild 1067
-RMD160 38984609210abaca70ac31be69c7aa6b113be2b4 xlhtml-0.5.ebuild 1067
-SHA256 8057ec3e053f3ae36b73a1ef8817d5717acf07dc4d7ab0edeb14fd1a0b1ff2f2 xlhtml-0.5.ebuild 1067
-MISC ChangeLog 1311 RMD160 6f298b110595a99b0ebc04a160fb399bdeb0c2b9 SHA1 3256cf6e32bb13f6072ccaf1687e1f7ed59fbbf9 SHA256 8733e45a36ba6964d7793862a5e11ae851b59ba0afe884f0095dd4a511dfb827
-MD5 807c14237994014cfda0c1d2cf862f02 ChangeLog 1311
-RMD160 6f298b110595a99b0ebc04a160fb399bdeb0c2b9 ChangeLog 1311
-SHA256 8733e45a36ba6964d7793862a5e11ae851b59ba0afe884f0095dd4a511dfb827 ChangeLog 1311
+DIST xlhtml-0.5.tgz 271045 RMD160 1364cf41645e70f39f6f280183a716a3001ad5ee SHA1 b661e061feb72282dbbe80d1dfe09ce08b44ce25 SHA256 2829b3f9054a932fa718b17e35435d90b768064339859613530347b292730793
+EBUILD xlhtml-0.5.ebuild 1101 RMD160 a7474a97c8e2c0d4137295268306392691bcec36 SHA1 50153e45bab0a207f9dab2f2d720abda48756694 SHA256 1a36dae011165dae24f204cc6ec52ec08f929757c8fe8a5f55ddb61da8889bac
+MD5 4a06a848b245258fb55256e80e329196 xlhtml-0.5.ebuild 1101
+RMD160 a7474a97c8e2c0d4137295268306392691bcec36 xlhtml-0.5.ebuild 1101
+SHA256 1a36dae011165dae24f204cc6ec52ec08f929757c8fe8a5f55ddb61da8889bac xlhtml-0.5.ebuild 1101
+MISC ChangeLog 1430 RMD160 2e674d6f2fe80306f5656c83fdeb0ebfd4f31b9c SHA1 83750008e994bd5810302352a530860cdea39d13 SHA256 dc0bcac30083a6b7499c6e1d42a61cf42c16c1e0d22603a8c9f7e1169e5d1942
+MD5 7b250106271f48e4a6914137cfaf11d3 ChangeLog 1430
+RMD160 2e674d6f2fe80306f5656c83fdeb0ebfd4f31b9c ChangeLog 1430
+SHA256 dc0bcac30083a6b7499c6e1d42a61cf42c16c1e0d22603a8c9f7e1169e5d1942 ChangeLog 1430
 MISC metadata.xml 210 RMD160 c9fe92a44d079ef04bcdd31de9867de5bb9f26e5 SHA1 efa00493ddec7289a21bc4cbcc6e95ec4de749d5 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39
 MD5 c667f921ee8d48ce17ebef0f8d601ea4 metadata.xml 210
 RMD160 c9fe92a44d079ef04bcdd31de9867de5bb9f26e5 metadata.xml 210
 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39 metadata.xml 210
-MD5 f2f5eccca49574f457d69f154697cbe1 files/digest-xlhtml-0.5 59
-RMD160 f8325c17d9da52b62799bbb5efc3a44f7b955901 files/digest-xlhtml-0.5 59
-SHA256 71217b5d2f6e4a279d065ca11ff13fd9fd98a84884722d0b1a9671a01d459a6f files/digest-xlhtml-0.5 59
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFFnf3iAiZjviIA2XgRAuJXAJ4zm0DjaSSfGYxs2YslJT7/Z8leGgCffl/X
-N1MHebpXoV1RnHZCZ+75PDg=
-=45lO
------END PGP SIGNATURE-----
+MD5 d1d948b34c48d15ed1744effe001eab4 files/digest-xlhtml-0.5 223
+RMD160 0f9500e0822badcb87b4e422496e4b1af834e545 files/digest-xlhtml-0.5 223
+SHA256 c73fbced8d3ea9d03f040406488d3d569be612b60f0d218fd0362eb5df9790e8 files/digest-xlhtml-0.5 223
diff --git a/app-text/xlhtml/files/digest-xlhtml-0.5 b/app-text/xlhtml/files/digest-xlhtml-0.5
index c20b9959f351..642181b9cf42 100644
--- a/app-text/xlhtml/files/digest-xlhtml-0.5
+++ b/app-text/xlhtml/files/digest-xlhtml-0.5
@@ -1 +1,3 @@
 MD5 2ff805c5384bdde9675cb136f54df32e xlhtml-0.5.tgz 271045
+RMD160 1364cf41645e70f39f6f280183a716a3001ad5ee xlhtml-0.5.tgz 271045
+SHA256 2829b3f9054a932fa718b17e35435d90b768064339859613530347b292730793 xlhtml-0.5.tgz 271045
diff --git a/app-text/xlhtml/xlhtml-0.5.ebuild b/app-text/xlhtml/xlhtml-0.5.ebuild
index c1ea765a9e49..9bc50d4e9bb0 100644
--- a/app-text/xlhtml/xlhtml-0.5.ebuild
+++ b/app-text/xlhtml/xlhtml-0.5.ebuild
@@ -1,6 +1,11 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xlhtml/xlhtml-0.5.ebuild,v 1.13 2007/01/05 07:27:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xlhtml/xlhtml-0.5.ebuild,v 1.14 2007/01/07 00:43:13 masterdriverz Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+inherit autotools
 
 DESCRIPTION="Convert MS Excel and Powerpoint files to HTML"
 HOMEPAGE="http://chicago.sourceforge.net/xlhtml/"
@@ -14,11 +19,10 @@ DEPEND=""
 
 src_unpack() {
 	unpack ${A}
-
+	cd "${S}"
 	# This is needed specifically for depcomp, which is necessary for
 	# building xlhtml, but isn't included.
-	cd ${S}; aclocal; autoconf
-	cd ${S}; automake --add-missing
+	eautoreconf
 }
 
 src_install() {
@@ -31,5 +35,5 @@ src_install() {
 	docinto xlhtml
 	dodoc xlhtml/{ChangeLog,README,THANKS,TODO}
 	rm -rf xlhtml/contrib/CVS
-	cp -pPR xlhtml/contrib ${D}/usr/share/doc/${PF}/xlhtml
+	cp -pPR xlhtml/contrib "${D}/usr/share/doc/${PF}/xlhtml"
 }