Set WANT_AUTOCONF and WANT_AUTOMAKE

Package-Manager: portage-2.1.2_rc4-r6

4 files changed, 94 insertions, 24 deletions

diff --git a/games-emulation/gngeo/ChangeLog b/games-emulation/gngeo/ChangeLog
index a6d41e72bea6..41e5d216c8f7 100644
--- a/games-emulation/gngeo/ChangeLog
+++ b/games-emulation/gngeo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-emulation/gngeo
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/gngeo/ChangeLog,v 1.16 2006/10/26 20:13:08 tupone Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/gngeo/ChangeLog,v 1.17 2007/01/05 20:17:57 nyhm Exp $
+
+  05 Jan 2007; Tristan Heaven <nyhm@gentoo.org>
+  +files/gngeo-0.7-build.patch, gngeo-0.7.ebuild:
+  Set WANT_AUTOCONF and WANT_AUTOMAKE
 
   26 Oct 2006; <tupone@gentoo.org> +files/gngeo-0.7-concurrentMake.patch,
   gngeo-0.7.ebuild:
diff --git a/games-emulation/gngeo/Manifest b/games-emulation/gngeo/Manifest
index 9f41d0228d2c..8f7ce959823a 100644
--- a/games-emulation/gngeo/Manifest
+++ b/games-emulation/gngeo/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX gngeo-0.7-build.patch 2408 RMD160 d35c087c9866babfb77b92e5ee013bc4d26ed450 SHA1 1300417ea3c0af199d7a3a1004394674f0072cf0 SHA256 2ffb334228be14b42139f47a938acf672c6968f1882ec5e557f0d2a624c0b32e
+MD5 c73d1f3dc350e20bd9f0e6f563d5f560 files/gngeo-0.7-build.patch 2408
+RMD160 d35c087c9866babfb77b92e5ee013bc4d26ed450 files/gngeo-0.7-build.patch 2408
+SHA256 2ffb334228be14b42139f47a938acf672c6968f1882ec5e557f0d2a624c0b32e files/gngeo-0.7-build.patch 2408
 AUX gngeo-0.7-concurrentMake.patch 512 RMD160 f5a3bf730e0c2c2cd86a525a937171427aa5e699 SHA1 993ed5233ea70da71a57f7dff4ec687b95c0d3fa SHA256 dc16caf67c38ac7a94ebeff1f994216352682d36f82f15f80d962a374902551a
 MD5 e1135f02f15e884a523a10ed49cb4ee6 files/gngeo-0.7-concurrentMake.patch 512
 RMD160 f5a3bf730e0c2c2cd86a525a937171427aa5e699 files/gngeo-0.7-concurrentMake.patch 512
@@ -10,14 +14,14 @@ MD5 eb3fb79379d54c7ed1e7dee76f7db95a files/gngeo-0.7-execstacks.patch 2724
 RMD160 167253d907770e72354e524db79ee257621774cb files/gngeo-0.7-execstacks.patch 2724
 SHA256 b9883d76d5b23d3c3b73359055a465a0cf6ff34063b1ec7630ddcd01c091e6d0 files/gngeo-0.7-execstacks.patch 2724
 DIST gngeo-0.7.tar.gz 853892 RMD160 a55a14d3ce2e3665a55c625688de907f7992548e SHA1 1da0daa0f2af0c3964fc857b68900c46015d09ac SHA256 4c1c56aacede9aceb0d8b2900d7b3edccd2ac6efe7f81a0d3723e998177ab5dc
-EBUILD gngeo-0.7.ebuild 1050 RMD160 b8d0cb0037b69bd4e09607f07bb48f2c4a7e22a7 SHA1 62c10b18c78dd3ccc1522cc674e7d9dd4b458f13 SHA256 539c47f3e87ba3d8fc3064efdf3d1a2b58b1511f209ecf7a191225ce97752648
-MD5 245f34c9b87c29b60db51bdea12da6c5 gngeo-0.7.ebuild 1050
-RMD160 b8d0cb0037b69bd4e09607f07bb48f2c4a7e22a7 gngeo-0.7.ebuild 1050
-SHA256 539c47f3e87ba3d8fc3064efdf3d1a2b58b1511f209ecf7a191225ce97752648 gngeo-0.7.ebuild 1050
-MISC ChangeLog 2249 RMD160 d9f0492d49e1f01cd7b356cb5d4250b2d0762191 SHA1 20714438467874428ef321672d52876aa50af33d SHA256 1cf801fffd448d7fc8b09c6e741c4ae9ea40a420ffaee2be390d309e7a16576f
-MD5 57e0c9a42ab98714cf2e016a8aa04666 ChangeLog 2249
-RMD160 d9f0492d49e1f01cd7b356cb5d4250b2d0762191 ChangeLog 2249
-SHA256 1cf801fffd448d7fc8b09c6e741c4ae9ea40a420ffaee2be390d309e7a16576f ChangeLog 2249
+EBUILD gngeo-0.7.ebuild 1050 RMD160 97323e26ff8d6d34e724e5ec23c29281b50d60d6 SHA1 b3d213ace6f966be66676405cdc35619df41bc1e SHA256 1f75cd8fb0333822fa51beb9ea875e6bc8a9a132fbd19cb5f2a8a255897b1694
+MD5 13badce1ef1009f2dec8d6d589a93f92 gngeo-0.7.ebuild 1050
+RMD160 97323e26ff8d6d34e724e5ec23c29281b50d60d6 gngeo-0.7.ebuild 1050
+SHA256 1f75cd8fb0333822fa51beb9ea875e6bc8a9a132fbd19cb5f2a8a255897b1694 gngeo-0.7.ebuild 1050
+MISC ChangeLog 2384 RMD160 cdbcd2cf061beacfe50467289303840d04d14653 SHA1 775b080ee8aae81fd8532efc4d2714fbfca821e9 SHA256 fb96e610c7d6c8c8699082d77d254b87cbd9aa9261a35c443a982729fd92c039
+MD5 55839b8e3e75049a6d43b6e0df1a67e5 ChangeLog 2384
+RMD160 cdbcd2cf061beacfe50467289303840d04d14653 ChangeLog 2384
+SHA256 fb96e610c7d6c8c8699082d77d254b87cbd9aa9261a35c443a982729fd92c039 ChangeLog 2384
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -26,9 +30,9 @@ MD5 ffea421966a809ad8f17a1b136ac4a71 files/digest-gngeo-0.7 229
 RMD160 f8224fcc2cb13870df2fb0323c9cb7e287d8cdae files/digest-gngeo-0.7 229
 SHA256 bd83bf9d6a1f3d62c5da42433384024c24ab88d2cc8fa8322eeb5264153b146a files/digest-gngeo-0.7 229
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFQRbfbfN2jvlVAhwRAkbPAJ49kMUyiil7oLGjsxSUnJtiOHJkaQCgth5z
-q16+FIwBOL/yWaO7Bqukw50=
-=ig7p
+iD8DBQFFnrJ/dz7hIScOURERAhIBAJ9tMz9w1+43PcMlhpFFf3kTXSUYwACeKLWg
+NAzU6I1xUYWs7d6proLGnQw=
+=awOH
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/gngeo/files/gngeo-0.7-build.patch b/games-emulation/gngeo/files/gngeo-0.7-build.patch
new file mode 100644
index 000000000000..742524486a70
--- /dev/null
+++ b/games-emulation/gngeo/files/gngeo-0.7-build.patch
@@ -0,0 +1,61 @@
+--- configure.in
++++ configure.in
+@@ -17,13 +17,14 @@
+ AC_SUBST(CC_FOR_BUILD)
+ 
+ # Humm is this a good idea?
+-CFLAGS=""
++CFLAGS="$CFLAGS -Wall -Wno-unused"
+ 
+  #echo $CC
+ 
+ # Checks for programs.
+ AC_PROG_CC
+ AC_PROG_RANLIB
++AM_PROG_AS
+ 
+ 
+ 
+@@ -213,33 +214,14 @@
+     i?86)  AC_MSG_RESULT(Turning on x86 processor optimisations)
+            AC_DEFINE(PROCESSOR_INTEL, 1, [Define if you have an x86 processor])
+            ALIGNLONGS=0
+-	   if test $CC_MAJOR -ge 3 ; then
+-		CFLAGS="$CFLAGS -O3 -fstrength-reduce -frerun-loop-opt -Wall -Wno-unused -funroll-loops \
+-                    -ffast-math -falign-functions=2 -falign-jumps=2 -fexpensive-optimizations \
+-                    -falign-loops=2 -fschedule-insns2 -malign-double -fomit-frame-pointer -g \
+-		    -fno-strict-aliasing -pipe -mtune=$target_cpu -DCPU=$target_cpu"
+-	   else
+-		CFLAGS="$CFLAGS -O3 -fstrength-reduce -frerun-loop-opt -Wall -Wno-unused -funroll-loops \
+-                    -ffast-math -malign-functions=2 -malign-jumps=2 -fexpensive-optimizations \
+-                    -malign-loops=2 -fschedule-insns2 -malign-double -fomit-frame-pointer -g \
+-		    -fno-strict-aliasing -pipe -mcpu=$target_cpu -DCPU=$target_cpu"
+-           fi
+            ;;
+     sparc*) AC_MSG_RESULT(Turning on sparc processor optimisations)
+            AC_DEFINE(PROCESSOR_SPARC, 1, [Define if you have a sparc processor])
+ 	   ALIGNLONGS=1
+-	   if test $target_cpu = sparc64 && test $CC_MAJOR -ge 3 ; then
+-		CFLAGS="$CFLAGS -mcpu=v9"
+-	   fi
+-	   CFLAGS="$CFLAGS -O3 -Wall -Wno-unused -funroll-loops \
+-                    -ffast-math -fomit-frame-pointer -g"
+            ;;
+     arm)   AC_MSG_RESULT(Turning on arm processor optimisations)
+            #AC_DEFINE(PROCESSOR_ARM, 1, [Define if you have an ARM processor])
+            ALIGNLONGS=1
+-	   CFLAGS="$CFLAGS -O3 -Wall -ftracer -fstrength-reduce -Wno-unused -funroll-loops \
+-                    -fomit-frame-pointer -fstrict-aliasing -ffast-math \
+-	   	    "
+ 	   #CFLAGS="$CFLAGS -O2 -Wall -ftracer -fstrength-reduce -Wno-unused  \
+            #         -fomit-frame-pointer -fstrict-aliasing -ffast-math \
+ 	   #	    "
+@@ -248,8 +230,6 @@
+     *)     AC_MSG_WARN(Processor type not known - Use generic optimisations)
+            ALIGNLONGS=1
+            optimum=no
+-	   CFLAGS="$CFLAGS -O3 -Wall -Wno-unused -funroll-loops \
+-                    -ffast-math -g"
+            ;;
+   esac
+   
diff --git a/games-emulation/gngeo/gngeo-0.7.ebuild b/games-emulation/gngeo/gngeo-0.7.ebuild
index 868f8b5f250f..22a01ed8b678 100644
--- a/games-emulation/gngeo/gngeo-0.7.ebuild
+++ b/games-emulation/gngeo/gngeo-0.7.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/gngeo/gngeo-0.7.ebuild,v 1.2 2006/10/26 20:13:08 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/gngeo/gngeo-0.7.ebuild,v 1.3 2007/01/05 20:17:57 nyhm Exp $
 
+WANT_AUTOCONF=latest
+WANT_AUTOMAKE=latest
 inherit eutils autotools games
 
 DESCRIPTION="A NeoGeo emulator"
@@ -14,24 +16,23 @@ KEYWORDS="~amd64 ppc x86"
 IUSE=""
 
 RDEPEND="virtual/opengl
-	sys-libs/zlib
 	media-libs/sdl-image
-	>=media-libs/libsdl-1.2"
-# gcc-3.3 gets it wrong - bug #128587
+	media-libs/libsdl"
 DEPEND="${RDEPEND}
-	>=sys-devel/gcc-3.4
 	x86? ( >=dev-lang/nasm-0.98 )"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}/${P}-execstacks.patch" \
+	epatch \
+		"${FILESDIR}"/${P}-build.patch \
+		"${FILESDIR}"/${P}-execstacks.patch \
 		"${FILESDIR}"/${P}-concurrentMake.patch
-	autoreconf
+	eautoreconf
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS FAQ NEWS README* TODO sample_gngeorc
 	prepgamesdirs
 }
@@ -39,6 +40,6 @@ src_install() {
 pkg_postinst() {
 	games_pkg_postinst
 	echo
-	einfo "A licensed NeoGeo BIOS copy is required to run the emulator."
+	elog "A licensed NeoGeo BIOS copy is required to run the emulator."
 	echo
 }