From 05e7080c10760ff1f038fec2f11d196ccff6d2e2 Mon Sep 17 00:00:00 2001
From: Nikos Chantziaras <realnc@gmail.com>
Date: Sun, 28 Jun 2009 17:26:52 +0300
Subject: [PATCH] Use autotools eclass, remove automake from DEPEND and drop
 EGIT_BRANCH.

Instead of calling the package's bootstrap script, use eautoreconf from
the autotools eclass.  Use WANT_AUTOMAKE instead of putting the automake
version in DEPEND.  Drop the definition of EGIT_BRANCH completely since
"master" is the default branch anyway.
---
 games-engines/frobtads/Manifest             |  3 ++-
 games-engines/frobtads/frobtads-9999.ebuild | 22 +++++++++-------------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/games-engines/frobtads/Manifest b/games-engines/frobtads/Manifest
index ed93ff4..951b1d2 100644
--- a/games-engines/frobtads/Manifest
+++ b/games-engines/frobtads/Manifest
@@ -1 +1,2 @@
-EBUILD frobtads-9999.ebuild 2081 RMD160 6f619a9176dac9a538a7eeab9bd0342b27e316b8 SHA1 88adfc6f2a691feb92bb098205f9a5b06c870414 SHA256 b48f09e2d3f3114826d896f5ceb1ccd651cccb286fdd3616463a8e5ea18fbfe7
+EBUILD frobtads-9999.ebuild 1962 RMD160 b3ae4891044a2b41551a14fe5c20dc45ec9f394d SHA1 3c33dbbadb1bbee39304f5f0adfca99c36c61224 SHA256 a44f059b5fb36f6a5c8763b4fa2c0abbd5fde6f2894dae5ffc411f0d594cccaa
+MISC frobtads-9999.ebuild~ 1962 RMD160 4c743c5736578124dee69f6b97d5cee4eddc6c9d SHA1 fb23f983c1f7391c8d1736855f6e9ca3d27b2120 SHA256 5b9ef880b00769ada4f27703a81e4d7bb2cccf765e972f9bb503017b9ead4c61
diff --git a/games-engines/frobtads/frobtads-9999.ebuild b/games-engines/frobtads/frobtads-9999.ebuild
index 817b2db..9823a2f 100644
--- a/games-engines/frobtads/frobtads-9999.ebuild
+++ b/games-engines/frobtads/frobtads-9999.ebuild
@@ -3,8 +3,13 @@
 # $Header: $
 
 EAPI=2
+if [ "$PV" == "9999" ]; then
+	# The package uses AM_SILENT_RULES which is only available in automake
+	# 1.11 and later.
+	WANT_AUTOMAKE="1.11"
+	inherit git autotools
+fi
 inherit flag-o-matic games
-[ "$PV" == "9999" ] && inherit git
 
 DESCRIPTION="Curses-based interpreter and development tools for TADS 2 and TADS 3 text adventures"
 HOMEPAGE="http://www.tads.org/frobtads.htm"
@@ -17,7 +22,6 @@ if [ "$PV" != "9999" ]; then
 	RESTRICT="!tads3compiler? ( test )"
 else
 	SRC_URI=""
-	EGIT_BRANCH="master"
 	EGIT_REPO_URI="git://git.assembla.com/frobtads.git"
 	KEYWORDS=""
 	IUSE="debug"
@@ -27,12 +31,6 @@ SLOT="0"
 
 DEPEND="sys-libs/ncurses"
 RDEPEND="${DEPEND}"
-if [ "$PV" == "9999" ]; then
-	# The package uses AM_SILENT_RULES which is only available
-	# in automake 1.11 and later.
-	DEPEND="${DEPEND}
-		>=sys-devel/automake-1.11"
-fi
 
 src_unpack() {
 	if [ "${PV}" != "9999" ]; then
@@ -45,15 +43,13 @@ src_unpack() {
 		fi
 	else
 		git_src_unpack
+		cd "${S}"
+		einfo "Regenerating autotools files..."
+		eautoreconf
 	fi
-
 }
 
 src_configure() {
-	if [ "$PV" == "9999" ]; then
-		einfo "Regenerating autotools files..."
-		"${S}/bootstrap" || die "${S}/bootstrap failed"
-	fi
 	append-cxxflags -fno-strict-aliasing
 	egamesconf $(use_enable debug t3debug) || die "egamesconf failed"
 }
-- 
2.11.4.GIT