EAPI=2

Fix underlink. Bug #367857

Package-Manager: portage-2.1.10/cvs/Linux x86_64

4 files changed, 43 insertions, 18 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/Manifest b/games-action/heroes/Manifest
index f6fe8c8d101e..70bef7730329 100644
--- a/games-action/heroes/Manifest
+++ b/games-action/heroes/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0.21-cvs-segfault-fix.patch 575 RMD160 1b7707085f2d8215564af93b91396ef799d8cbb3 SHA1 0863593dd2abad8f98686aa2faf2bd879112c7fa SHA256 de4e24aa398912af6fa4dffee0ea31e34fb505f6fb5c6768f34797ff8914c7af
 AUX heroes-0.21-gcc4.patch 6016 RMD160 9fab374668c39fcec9e9bf2fb3ba1fe76fcf00bd SHA1 dedd6d285970267c03f143c5c1641142535519e1 SHA256 3ec059d2cbf978d0760ef28e24749202e97dde4c9af7194f094a06758bf9cbee
+AUX heroes-0.21-underlink.patch 476 RMD160 1dcc5dd4059c86bb568de5f269f4586029d54645 SHA1 70f642b46c32f9f4167aa613b65ab42776f5fa29 SHA256 9009629c7ce65aa401f12601367e3a2abe49f4d0e8826f5a2691511c8389ed0b
 DIST heroes-0.21.tar.bz2 709079 RMD160 4d189160ee8b4e2f306ecc3086f50cd564590a8a SHA1 756b2d0ba255484fa2c830798f5f9e62088f3af1 SHA256 47c0dd6dea64a971236d2fb5ec94e3526741ebfaf73110535ed438035d18da74
 DIST heroes-data-1.5.tar.bz2 391970 RMD160 7bcbbc57537318db2e4c661f46dd951947a5d58d SHA1 2aa90ac7c1760f5b137e5ee175729572d9c93d26 SHA256 f3fa8bd0dd15795b906a8b0cfcfdf0d077404c8577a694347f9e3b1115c231ae
 DIST heroes-sound-effects-1.0.tar.bz2 389883 RMD160 5b696068614f2c9259a41b63fa6876c57d26ee82 SHA1 a265bc8b9ee2923e3c7539ac02346b10e767f95b SHA256 400439d4c6d031ed55ebbb18a8c99928e8b7a99c220ab8ccd3a21eca04f2072c
 DIST heroes-sound-tracks-1.0.tar.bz2 1245613 RMD160 e1ddc451b79947c2e34be8a67360411174c1840a SHA1 a05c5e232d62c5b80c8b9d25639e65b9ade3c5b2 SHA256 2a20bd584a97881421b1c5ef0575284f3dae2a6c0866b9d5faedc47b524cd573
-EBUILD heroes-0.21-r1.ebuild 1869 RMD160 b96d54f84fb8ebca07d6b2b42a75e0e4f127726f SHA1 9b83ab9d280d8392875e0c4f3f577b1a418457d0 SHA256 31fb9134437f78bf5ad1c2a3983e4b0114597924abc95bf66c86616d190dffff
-MISC ChangeLog 3282 RMD160 a4aa30316dcf464cf939a31ec569ac2f319307a4 SHA1 795c191947cc08f01452b3a7e453fda468d74e0b SHA256 45689283fc4d9e89d046c711a795ef24fe1ee2ee0783ac5f50be80fb3cbe6c3b
+EBUILD heroes-0.21-r1.ebuild 1821 RMD160 fb469854119d5d591ba48734c2e303239618e72d SHA1 1a3a7b3166edbd61e0f2608683a1e6a7e9f92d81 SHA256 d6a910555bb7d99d8dfc048fe4f926293ab13df5300c9341f11a85ed71f8e77b
+MISC ChangeLog 3465 RMD160 ea74630ea22278907be9830aa84d84f5b76590a2 SHA1 9ef634094ce4bda172741c1707c76d4e5247177a SHA256 7edb20488f5130e2f85a2feb5e76565cd285e2aa6c3752c814c4294eb96f21c3
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk3x7PYACgkQIY77eQFFFC187QCgk6CbSv4Gq9N4KC50g+EnWjfB
+sasAoKSpRKt4t2uviQ7503d9hAZpoPaj
+=uG4f
+-----END PGP SIGNATURE-----
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