Cleanup autotools #148762 by David Philippi.

Package-Manager: portage-2.1.2_pre1

3 files changed, 35 insertions, 34 deletions

diff --git a/games-rpg/adonthell/ChangeLog b/games-rpg/adonthell/ChangeLog
index dd4b0d0e43ba..0310ac6aed3d 100644
--- a/games-rpg/adonthell/ChangeLog
+++ b/games-rpg/adonthell/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-rpg/adonthell
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/adonthell/ChangeLog,v 1.10 2006/04/03 18:59:18 tupone Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/adonthell/ChangeLog,v 1.11 2006/09/23 12:18:53 vapier Exp $
+
+  23 Sep 2006; Mike Frysinger <vapier@gentoo.org> adonthell-0.3.4a.ebuild:
+  Cleanup autotools #148762 by David Philippi.
 
   03 Apr 2006; <Tupone@gentoo.org> +files/adonthell-0.3.4a-gcc-41.patch,
   adonthell-0.3.4a.ebuild:
diff --git a/games-rpg/adonthell/Manifest b/games-rpg/adonthell/Manifest
index 9a5df254a04d..2cec7cd0eb38 100644
--- a/games-rpg/adonthell/Manifest
+++ b/games-rpg/adonthell/Manifest
@@ -1,7 +1,6 @@
-AUX 0.3.3-configure.in.patch 2957 RMD160 769e470899becf31390d90d29223b1204fe30a80 SHA1 17b0204597a04505a7e58e76c72b7d7f91a28dfb SHA256 a1a35d88a31ca70e9b30f0e456414da17adad9dc31359e73fd3fcbaa15370157
-MD5 f8819f0b8b8a019c2ab89d7c707665eb files/0.3.3-configure.in.patch 2957
-RMD160 769e470899becf31390d90d29223b1204fe30a80 files/0.3.3-configure.in.patch 2957
-SHA256 a1a35d88a31ca70e9b30f0e456414da17adad9dc31359e73fd3fcbaa15370157 files/0.3.3-configure.in.patch 2957
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0.3.4a-configure.in.patch 2964 RMD160 251fac9fbb7bb6e1bd3ccc54faa392755181212e SHA1 3e2bc377d30833f6236733910b7a542597e0adc5 SHA256 fc9ffbc5cc1cba59f48909be92804e7d1d8b21c56e5dfff8449d84aff2cff2a2
 MD5 a0765112fe0c2b1b0d15cca93141c3eb files/0.3.4a-configure.in.patch 2964
 RMD160 251fac9fbb7bb6e1bd3ccc54faa392755181212e files/0.3.4a-configure.in.patch 2964
@@ -10,27 +9,26 @@ AUX adonthell-0.3.4a-gcc-41.patch 368 RMD160 7809943ceb905846fbda7ac175dddd12eba
 MD5 e0df3c89f64308db7e23f21e9d654b5c files/adonthell-0.3.4a-gcc-41.patch 368
 RMD160 7809943ceb905846fbda7ac175dddd12eba82888 files/adonthell-0.3.4a-gcc-41.patch 368
 SHA256 8725778c536ef332586e22451fab31273e4efc1db1b28c3bc6fd2c1498dbb30b files/adonthell-0.3.4a-gcc-41.patch 368
-DIST adonthell-src-0.3.3.tar.gz 1023601
-DIST adonthell-src-0.3.4a.tar.gz 680872 RMD160 0ad52d2940375fbddccd387346f84fa8f009a03c SHA256 05e0a282d15dfdac282f9a8fee077e43d09423eb30ae9a1654ada765e3052087
-EBUILD adonthell-0.3.3-r1.ebuild 1217 RMD160 6e96161df2f37661eed0e8caff9d6e6632db49b3 SHA1 7407347580568bbc30e920145a026a16e2a9fa2f SHA256 22bf7ace0fe48e4523367bff810581d2934ea6be60d8bf5220f1682dce000c62
-MD5 73d4b7e27d435af64ffcc6b24b1d43f7 adonthell-0.3.3-r1.ebuild 1217
-RMD160 6e96161df2f37661eed0e8caff9d6e6632db49b3 adonthell-0.3.3-r1.ebuild 1217
-SHA256 22bf7ace0fe48e4523367bff810581d2934ea6be60d8bf5220f1682dce000c62 adonthell-0.3.3-r1.ebuild 1217
-EBUILD adonthell-0.3.4a.ebuild 1448 RMD160 7222bf8266684808ff204b8bc3cf17239b04b4e9 SHA1 7ed8019fb33382456b6a83caacc85a0cbce62912 SHA256 8bc7a786a4280c4983d991ca4269a902f26307743a0388843526d4acfc829afa
-MD5 9160c8358662e00979a978271590424c adonthell-0.3.4a.ebuild 1448
-RMD160 7222bf8266684808ff204b8bc3cf17239b04b4e9 adonthell-0.3.4a.ebuild 1448
-SHA256 8bc7a786a4280c4983d991ca4269a902f26307743a0388843526d4acfc829afa adonthell-0.3.4a.ebuild 1448
-MISC ChangeLog 1980 RMD160 cf33a1d5f67078674f0b0fdbb09311a42ffee94a SHA1 eb9449d101a6943d1622c16c5906b2b652f01afd SHA256 ace4126bd65bdc5be608a5217c38d50a90162d90c276d8f48731607966ffa801
-MD5 ac002a3cb0e4736dfeeb6f3aa73fc171 ChangeLog 1980
-RMD160 cf33a1d5f67078674f0b0fdbb09311a42ffee94a ChangeLog 1980
-SHA256 ace4126bd65bdc5be608a5217c38d50a90162d90c276d8f48731607966ffa801 ChangeLog 1980
+DIST adonthell-src-0.3.4a.tar.gz 680872 RMD160 0ad52d2940375fbddccd387346f84fa8f009a03c SHA1 01c07a138a7c41f5640d4306f2197f71a8554aee SHA256 05e0a282d15dfdac282f9a8fee077e43d09423eb30ae9a1654ada765e3052087
+EBUILD adonthell-0.3.4a.ebuild 1423 RMD160 552310a9fe766803c8bcd215955a7857f8af0f1d SHA1 cd6962cc0229bab384669cdc14139fc35b7a5374 SHA256 e5104015b302994cdf83221a627964bfd0162c41ee885c2bb44cc61c88b30c79
+MD5 c633e92ad89944673d3b02d2cc0f363b adonthell-0.3.4a.ebuild 1423
+RMD160 552310a9fe766803c8bcd215955a7857f8af0f1d adonthell-0.3.4a.ebuild 1423
+SHA256 e5104015b302994cdf83221a627964bfd0162c41ee885c2bb44cc61c88b30c79 adonthell-0.3.4a.ebuild 1423
+MISC ChangeLog 2103 RMD160 ee0ab6cdab309bf61aecc8a0af05590e8d07ec94 SHA1 288a80d5b290b3071418d4db0851427abe335fe2 SHA256 3cf22abdfb4a08fd22a5784ab56385f5b5ca340fd0a927d0a876c279f9476dbe
+MD5 47db0ba3cabf32d27f2030efe9e1b4f1 ChangeLog 2103
+RMD160 ee0ab6cdab309bf61aecc8a0af05590e8d07ec94 ChangeLog 2103
+SHA256 3cf22abdfb4a08fd22a5784ab56385f5b5ca340fd0a927d0a876c279f9476dbe ChangeLog 2103
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
-MD5 e944f3812b6938f625c3a2bba14b3b35 files/digest-adonthell-0.3.3-r1 72
-RMD160 b570716d9a8a48c92c390566ccfed7f9fa96fe05 files/digest-adonthell-0.3.3-r1 72
-SHA256 19c53539821960785392c108709099c234104c1343c4aba242cd6722adc1147b files/digest-adonthell-0.3.3-r1 72
 MD5 6022b1fa92080a5bc8eaf2173f22c719 files/digest-adonthell-0.3.4a 262
 RMD160 eaf0dda5b8c28ed6f9739b689a195f2133fbc213 files/digest-adonthell-0.3.4a 262
 SHA256 55ad2c29c969c3c38f0de77abb1e99f3672ce73d5f14f1c8ea5e5847ed185f6d files/digest-adonthell-0.3.4a 262
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFFSY0amhnQswr0vIRAktPAJ9/7gPmxMiVVjFIobYxdL1SQ/tfHQCfaqU6
+SGx0IMhtP1pMtCJRdKM9Pkg=
+=CcfW
+-----END PGP SIGNATURE-----
diff --git a/games-rpg/adonthell/adonthell-0.3.4a.ebuild b/games-rpg/adonthell/adonthell-0.3.4a.ebuild
index 79c40644ee00..4f727278a21d 100644
--- a/games-rpg/adonthell/adonthell-0.3.4a.ebuild
+++ b/games-rpg/adonthell/adonthell-0.3.4a.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/adonthell/adonthell-0.3.4a.ebuild,v 1.5 2006/04/03 18:59:18 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/adonthell/adonthell-0.3.4a.ebuild,v 1.6 2006/09/23 12:18:53 vapier Exp $
 
-inherit eutils games
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+inherit autotools eutils games
 
 DESCRIPTION="roleplaying game engine"
 HOMEPAGE="http://adonthell.linuxgames.com/"
@@ -22,21 +24,19 @@ RDEPEND="dev-lang/python
 DEPEND="${RDEPEND}
 	doc? (
 		media-gfx/graphviz
-		app-doc/doxygen )
-	sys-devel/autoconf"
+		app-doc/doxygen
+	)"
 
 S=${WORKDIR}/${PN}-${PV/a/}
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${PV}-configure.in.patch \
-		"${FILESDIR}/${P}"-gcc-41.patch
+	epatch \
+		"${FILESDIR}"/${PV}-configure.in.patch \
+		"${FILESDIR}"/${P}-gcc-41.patch
 	rm -f ac{local,include}.m4
-	aclocal && \
-	libtoolize -c -f && \
-	autoconf && \
-	automake -a -c || die "autotools failed"
+	AT_M4DIR="m4" eautoreconf
 }
 
 src_compile() {
@@ -53,7 +53,7 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "make install failed"
 	keepdir "${GAMES_DATADIR}/${PN}/games"
 	dodoc AUTHORS ChangeLog FULLSCREEN.howto NEWBIE NEWS README
 	prepgamesdirs