Using eautotools. Bug #226723

Package-Manager: portage-2.1.8.3/cvs/Linux i686

4 files changed, 16 insertions, 25 deletions

diff --git a/games-roguelike/hengband/ChangeLog b/games-roguelike/hengband/ChangeLog
index 1fdfef70f162..601bdba7d602 100644
--- a/games-roguelike/hengband/ChangeLog
+++ b/games-roguelike/hengband/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-roguelike/hengband
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/hengband/ChangeLog,v 1.12 2008/03/13 17:50:11 wolf31o2 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/hengband/ChangeLog,v 1.13 2010/06/04 06:32:45 tupone Exp $
+
+  04 Jun 2010; Tupone Alfredo <tupone@gentoo.org> hengband-1.6.2-r1.ebuild,
+  files/hengband-1.6.2-added_faq.patch:
+  Using eautotools. Bug #226723 by flameeyes@gentoo.org
 
   13 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org>
   hengband-1.6.2-r1.ebuild:
diff --git a/games-roguelike/hengband/Manifest b/games-roguelike/hengband/Manifest
index c3e1f14443b1..3f8d84b40e2a 100644
--- a/games-roguelike/hengband/Manifest
+++ b/games-roguelike/hengband/Manifest
@@ -1,6 +1,6 @@
-AUX hengband-1.6.2-added_faq.patch 8548 RMD160 05ddfa8024e868ce0e641543ed9a83fcd553aac3 SHA1 8863e555ff804645224b53f3aea8dfabe2aae731 SHA256 fec234e3b6ee57bf1c8f61a24c20c77eb8bf8ec1a58d404db8a5481c7871198a
+AUX hengband-1.6.2-added_faq.patch 6371 RMD160 79b0d9cf093f3e47faa33723f7a7126f25d9013d SHA1 0dd83b4708c4728eeb4641247bb56fff2d82b902 SHA256 0c8c47e686575791f02432267d9d96d8d4a6d2869cb7cd3a2b49a53cc97b6150
 DIST hengband-1.6.2-mispellings.patch.gz 11964 RMD160 b20a9106b9823de38cf411cca7fd31d7d1f52915 SHA1 304ddf386bf91b644cc81019443399974601a6cf SHA256 68139e72091e12614124bee63f5700f36a560573e98a541974836fa61a12f08d
 DIST hengband-1.6.2.tar.bz2 2029169 RMD160 59f41666dd1724f03739d5fa078e537467dbf36e SHA1 32156fe9363309ba75273d6c8ebb8f2043c97129 SHA256 72f1c8dd9365127ccd155b786d2828a19bbd0311a9d62d07bd16a22600c385b4
-EBUILD hengband-1.6.2-r1.ebuild 1641 RMD160 820b09c23b16f8d3bad8190207378ca674113aa3 SHA1 4b8b60a910deabe0686203fdb8d9f84a47986118 SHA256 638d047687d614588032c4b2ac9966b18692cb888f1f4daee1dbeca51e9a292d
-MISC ChangeLog 1755 RMD160 8dbd6e743157fba8bbc9f76bdbbbf8377012e631 SHA1 f05d5ec17201d5852e0dd2edf1c163951992a281 SHA256 4a60b8ab0ea1d479ae3504898b6102e70684f0b8002dbed968c5c841712aa3f2
+EBUILD hengband-1.6.2-r1.ebuild 1621 RMD160 7e45cb615e36c0717690c2ab2b3d43fcfad1f55d SHA1 f93754d70b221095c4de6f3c0f9f949e07cb5a8d SHA256 22944c8773a7fc752b361b0a874ec6d75fe2abbee7c2a548a8d8f5fbbf3c0d35
+MISC ChangeLog 1926 RMD160 1ddfffdce9aef54fb472ac74a4258af1317d1234 SHA1 da955baa66042da030eb6a9a06bf110ac968a725 SHA256 fe6aeaa50e9f1f88da15df9ec59346bb1058f6653fbc1f58feb45a59ea51d246
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-roguelike/hengband/files/hengband-1.6.2-added_faq.patch b/games-roguelike/hengband/files/hengband-1.6.2-added_faq.patch
index f036e4550266..0e75022145cb 100644
--- a/games-roguelike/hengband/files/hengband-1.6.2-added_faq.patch
+++ b/games-roguelike/hengband/files/hengband-1.6.2-added_faq.patch
@@ -161,15 +161,3 @@ diff -Naur hengband-1.6.2-orig/lib/help/Makefile.am hengband-1.6.2-fixed/lib/hel
  	general.hlp general.txt help.hlp helpinfo.txt \
  	j_general.txt j_item1.txt j_item2.txt j_trans.txt \
  	jattack.hlp jattack.txt jbirth.hlp jbirth.txt \
-diff -Naur hengband-1.6.2-orig/lib/help/Makefile.in hengband-1.6.2-fixed/lib/help/Makefile.in
---- hengband-1.6.2-orig/lib/help/Makefile.in	2004-07-12 10:54:14.000000000 +0400
-+++ hengband-1.6.2-fixed/lib/help/Makefile.in	2005-11-22 12:01:06.000000000 +0300
-@@ -64,7 +64,7 @@
- PACKAGE = @PACKAGE@
- VERSION = @VERSION@
- 
--angband_files =  	attack.hlp attack.txt birth.hlp birth.txt 	bldg.txt raceclas.hlp raceclas.txt command.hlp 	command.txt commdesc.hlp commdesc.txt defend.hlp 	defend.txt dungeon.hlp dungeon.txt gambling.txt 	general.hlp general.txt help.hlp helpinfo.txt 	j_general.txt j_item1.txt j_item2.txt j_trans.txt 	jattack.hlp jattack.txt jbirth.hlp jbirth.txt 	jbldg.txt jraceclas.hlp jraceclas.txt jcommand.hlp 	jcommand.txt jcommdesc.hlp jcommdesc.txt jdefend.hlp 	jdefend.txt jdungeon.hlp jdungeon.txt jgambling.txt 	jgeneral.hlp jgeneral.txt jhelp.hlp jhelpinfo.txt 	jlicense.txt 	jmagic.hlp jmagic.txt jmonster.hlp jmonster.txt 	jobjects.hlp jobjects.txt joption.hlp joption.txt 	jpref.hlp jpref.txt jspecial.hlp jtang.txt 	jtown.hlp jtown.txt jversion.txt magic.hlp 	magic.txt monster.hlp monster.txt objects.hlp 	objects.txt option.hlp option.txt pref.hlp 	pref.txt tang.txt town.hlp town.txt 	version.txt
-+angband_files =  	attack.hlp attack.txt birth.hlp birth.txt 	bldg.txt raceclas.hlp raceclas.txt command.hlp 	command.txt commdesc.hlp commdesc.txt defend.hlp 	defend.txt dungeon.hlp dungeon.txt faq.txt gambling.txt 	general.hlp general.txt help.hlp helpinfo.txt 	j_general.txt j_item1.txt j_item2.txt j_trans.txt 	jattack.hlp jattack.txt jbirth.hlp jbirth.txt 	jbldg.txt jraceclas.hlp jraceclas.txt jcommand.hlp 	jcommand.txt jcommdesc.hlp jcommdesc.txt jdefend.hlp 	jdefend.txt jdungeon.hlp jdungeon.txt jgambling.txt 	jgeneral.hlp jgeneral.txt jhelp.hlp jhelpinfo.txt 	jlicense.txt 	jmagic.hlp jmagic.txt jmonster.hlp jmonster.txt 	jobjects.hlp jobjects.txt joption.hlp joption.txt 	jpref.hlp jpref.txt jspecial.hlp jtang.txt 	jtown.hlp jtown.txt jversion.txt magic.hlp 	magic.txt monster.hlp monster.txt objects.hlp 	objects.txt option.hlp option.txt pref.hlp 	pref.txt tang.txt town.hlp town.txt 	version.txt
- 
- 
- EXTRA_DIST =    $(angband_files)
diff --git a/games-roguelike/hengband/hengband-1.6.2-r1.ebuild b/games-roguelike/hengband/hengband-1.6.2-r1.ebuild
index 630a7deb95d9..997d3733f13f 100644
--- a/games-roguelike/hengband/hengband-1.6.2-r1.ebuild
+++ b/games-roguelike/hengband/hengband-1.6.2-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/hengband/hengband-1.6.2-r1.ebuild,v 1.3 2008/03/13 17:50:11 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/hengband/hengband-1.6.2-r1.ebuild,v 1.4 2010/06/04 06:32:45 tupone Exp $
+EAPI="2"
 
-inherit toolchain-funcs eutils games
+inherit toolchain-funcs eutils autotools games
 
 DESCRIPTION="An Angband variant, with a Japanese/fantasy theme"
 HOMEPAGE="http://hengband.sourceforge.jp/en/"
@@ -19,9 +20,7 @@ RDEPEND=">=sys-libs/ncurses-5
 DEPEND="${RDEPEND}
 	X? ( x11-libs/libXt )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	# Removing Xaw dependency as is not used
 	sed -i \
 		-e '/Xaw/d' src/main-xaw.c \
@@ -34,9 +33,10 @@ src_unpack() {
 			|| die "sed configure failed"
 	epatch "../${P}"-mispellings.patch	\
 		"${FILESDIR}/${P}"-added_faq.patch
+	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	local myconf
 	use linguas_ja || myconf="--disable-japanese"
 
@@ -46,7 +46,6 @@ src_compile() {
 		`use_with X x` \
 		${myconf} \
 		|| die
-	emake || die "emake failed"
 }
 
 src_install() {