EAPI=2

Fix underlink. Bug #367857

(Portage version: 2.1.10/cvs/Linux x86_64)

3 files changed, 30 insertions, 16 deletions

diff --git a/games-action/heroes/ChangeLog b/games-action/heroes/ChangeLog
index 5ae16d443d03..3662db317104 100644
--- a/games-action/heroes/ChangeLog
+++ b/games-action/heroes/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-action/heroes
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/heroes/ChangeLog,v 1.15 2007/05/03 21:18:32 mr_bones_ Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/heroes/ChangeLog,v 1.16 2011/06/10 10:07:40 tupone Exp $
+
+  10 Jun 2011; Tupone Alfredo <tupone@gentoo.org> heroes-0.21-r1.ebuild,
+  +files/heroes-0.21-underlink.patch:
+  Migrating to EAPI=2
+  Fix underlink. Bug #367857 by Diego Elio Pettenò
 
   03 May 2007; Michael Sterrett <mr_bones_@gentoo.org>
   heroes-0.21-r1.ebuild:
diff --git a/games-action/heroes/files/heroes-0.21-underlink.patch b/games-action/heroes/files/heroes-0.21-underlink.patch
new file mode 100644
index 000000000000..4b805aebc707
--- /dev/null
+++ b/games-action/heroes/files/heroes-0.21-underlink.patch
@@ -0,0 +1,11 @@
+--- src/Makefile.am.old	2011-06-10 11:32:03.905618275 +0200
++++ src/Makefile.am	2011-06-10 11:32:15.539347083 +0200
+@@ -42,7 +42,7 @@
+ heroeslvl_SOURCES = heroeslvl.c
+ 
+ heroes_LDADD = lvl/libhlvl.a media/libhmcommon.a ../lib/libheroes.a \
+-	       $(INTLLIBS) $(LIBALT_LOCAL_XLDADD) $(LIBALT_XLDADD)
++	       $(INTLLIBS) $(LIBALT_LOCAL_XLDADD) $(LIBALT_XLDADD) -lm
+ heroes_LDFLAGS = $(LIBALT_XLDFLAGS)
+ 
+ ## Depend upon Makefile because the value of LIBALT_LOCAL_LDADD might
diff --git a/games-action/heroes/heroes-0.21-r1.ebuild b/games-action/heroes/heroes-0.21-r1.ebuild
index 70871064d941..35503270b213 100644
--- a/games-action/heroes/heroes-0.21-r1.ebuild
+++ b/games-action/heroes/heroes-0.21-r1.ebuild
@@ -1,6 +1,7 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/heroes/heroes-0.21-r1.ebuild,v 1.8 2007/05/03 21:18:32 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/heroes/heroes-0.21-r1.ebuild,v 1.9 2011/06/10 10:07:40 tupone Exp $
+EAPI=2
 
 inherit eutils autotools games
 
@@ -27,20 +28,18 @@ RDEPEND="nls? ( virtual/libintl )
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
-S=${WORKDIR}
-
-src_unpack() {
-	unpack ${A}
-	cd "${WORKDIR}"/${P}
-	epatch "${FILESDIR}"/${PV}-cvs-segfault-fix.patch #56118
-	epatch "${FILESDIR}/${P}"-gcc4.patch
+src_prepare() {
+	#56118
+	epatch "${FILESDIR}"/${PV}-cvs-segfault-fix.patch \
+		"${FILESDIR}/${P}"-gcc4.patch \
+		"${FILESDIR}/${P}"-underlink.patch
 	sed -i 's:$(localedir):/usr/share/locale:' \
 		$(find . -name 'Makefile.in*') \
 		|| die "sed failed"
-	AT_M4DIR=m4 eautoreconf
+	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	local myconf
 
 	if use sdl || ! use ggi ; then
@@ -51,21 +50,20 @@ src_compile() {
 
 	local pkg
 	for pkg in ${A//.tar.bz2} ; do
-		cd "${S}"/${pkg}
+		cd "${WORKDIR}"/${pkg}
 		egamesconf \
 			--disable-heroes-debug \
 			--disable-optimizations \
 			$(use_enable nls) \
 			${myconf} \
 			|| die
-		emake || die "unable to compile ${pkg}"
 	done
 }
 
 src_install() {
 	local pkg
 	for pkg in ${A//.tar.bz2} ; do
-		cd "${S}"/${pkg}
+		cd "${WORKDIR}"/${pkg}
 		emake DESTDIR="${D}" install || die "emake install failed"
 	done
 	prepgamesdirs