stable for x86; fix QA warnings with patch to configure.ac

Package-Manager: portage-2.1.2.2

5 files changed, 94 insertions, 35 deletions

diff --git a/games-emulation/generator/ChangeLog b/games-emulation/generator/ChangeLog
index f25e8ad057f1..497118fd2f95 100644
--- a/games-emulation/generator/ChangeLog
+++ b/games-emulation/generator/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-emulation/generator
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/generator/ChangeLog,v 1.17 2007/03/07 16:48:24 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/generator/ChangeLog,v 1.18 2007/04/11 20:51:37 mr_bones_ Exp $
+
+  11 Apr 2007; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/generator-0.35-configure.patch,
+  files/generator-0.35-execstacks.patch, generator-0.35-r3.ebuild:
+  stable for x86; fix QA warnings with patch to configure.ac
 
   07 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org> generator-0.35.ebuild:
   Change all instances of [ to [[.
diff --git a/games-emulation/generator/Manifest b/games-emulation/generator/Manifest
index 6dfe2991f30c..8144a588a9df 100644
--- a/games-emulation/generator/Manifest
+++ b/games-emulation/generator/Manifest
@@ -1,28 +1,29 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX generator-0.35-execstacks.patch 563 RMD160 046b18fd6bbea01ccad03fadbb445f02ff3833a5 SHA1 751f1a4d4849d66248e7222828506821fcad2d7e SHA256 0a73e832c5718d5d548d123756c3d6a803c6d62b32ab13290809e6b6e420712c
-MD5 cfbede23add691a37dbdfad5a6015d09 files/generator-0.35-execstacks.patch 563
-RMD160 046b18fd6bbea01ccad03fadbb445f02ff3833a5 files/generator-0.35-execstacks.patch 563
-SHA256 0a73e832c5718d5d548d123756c3d6a803c6d62b32ab13290809e6b6e420712c files/generator-0.35-execstacks.patch 563
+AUX generator-0.35-configure.patch 2354 RMD160 a9ce7928157307313ac08dcfd17edb9c1d2e77d4 SHA1 81064296563f3c55ae5f5c0da5ce6f7f45edf69d SHA256 918c8159ed4936e12b91a642a6fd11f62d16a17d7e60d09aee04b3df77582b11
+MD5 9ea4dfb321b8fe397069ad21e40dedb1 files/generator-0.35-configure.patch 2354
+RMD160 a9ce7928157307313ac08dcfd17edb9c1d2e77d4 files/generator-0.35-configure.patch 2354
+SHA256 918c8159ed4936e12b91a642a6fd11f62d16a17d7e60d09aee04b3df77582b11 files/generator-0.35-configure.patch 2354
+AUX generator-0.35-execstacks.patch 429 RMD160 cfea637a080c669c5901ab7eced001ca28fe4af9 SHA1 10c7cb18bd70d3c8069c6e5642311efae3e6efa3 SHA256 ea7c9d4098007a314c38dc750fea6f2aabd2c1d133027a8fa1502a5902d0f545
+MD5 22dfef9cc5ba182474f4d71a11f9a59f files/generator-0.35-execstacks.patch 429
+RMD160 cfea637a080c669c5901ab7eced001ca28fe4af9 files/generator-0.35-execstacks.patch 429
+SHA256 ea7c9d4098007a314c38dc750fea6f2aabd2c1d133027a8fa1502a5902d0f545 files/generator-0.35-execstacks.patch 429
 AUX netbsd-gcc-3.3.patch 1345 RMD160 94d4d22321c81248f8b12c24389e517fe448b7a6 SHA1 6bc259408bb02411c014b9d146ab33e7237ddad4 SHA256 1cbc8749da616ebe356364a7730bbb7f1832456742dff6192ea9e152fa6ba906
 MD5 9ad78ba06412ba4a6b57b93e759e1016 files/netbsd-gcc-3.3.patch 1345
 RMD160 94d4d22321c81248f8b12c24389e517fe448b7a6 files/netbsd-gcc-3.3.patch 1345
 SHA256 1cbc8749da616ebe356364a7730bbb7f1832456742dff6192ea9e152fa6ba906 files/netbsd-gcc-3.3.patch 1345
 DIST generator-0.35-cbiere-r2.tar.bz2 446101 RMD160 394145e32f3bf61ac4ed5fa21d2873978c5bd341 SHA1 bb329925298ef7a087601e61f570af8d4e615915 SHA256 10da28fc5eb77e3a7d54e6b9d08a0630d3effedd0576dd1767ff5f74f57f2a17
 DIST generator-0.35.tar.gz 469541 RMD160 6b448018b8ed0fd9755ddb850f48892304d12e78 SHA1 a61138579efd97028d3a69c54c3c6fcd0a3d74ab SHA256 5e622e4234125eeea9bc6fa2759f8cdf42844092bdb007d4a43f55c40c4cd7f5
-EBUILD generator-0.35-r3.ebuild 1594 RMD160 07f5568659019713192d56fa9563a0fe39a9b756 SHA1 fdbd28ca29085ef147954ae889f0f415bd88b770 SHA256 95269c29b4903677412e5eecf5eb45889f26e81a9b3661b625a94af74ddef1ce
-MD5 4b6bd8101023206d7fc7898f7297c597 generator-0.35-r3.ebuild 1594
-RMD160 07f5568659019713192d56fa9563a0fe39a9b756 generator-0.35-r3.ebuild 1594
-SHA256 95269c29b4903677412e5eecf5eb45889f26e81a9b3661b625a94af74ddef1ce generator-0.35-r3.ebuild 1594
+EBUILD generator-0.35-r3.ebuild 1608 RMD160 f03fafeb1fc7f0a66bb7ba37ad63f80b540d6fa7 SHA1 a106641e40745ae538e8659e42c4d8429b9bf9ce SHA256 5190e05355c9c723e15e415e800390390a18435395bd3fa3ace4fcb7568ba83a
+MD5 4738b1689bfe4f28183dfc1d324962a4 generator-0.35-r3.ebuild 1608
+RMD160 f03fafeb1fc7f0a66bb7ba37ad63f80b540d6fa7 generator-0.35-r3.ebuild 1608
+SHA256 5190e05355c9c723e15e415e800390390a18435395bd3fa3ace4fcb7568ba83a generator-0.35-r3.ebuild 1608
 EBUILD generator-0.35.ebuild 1719 RMD160 808b9c81f4ad92b786edac15ed306cf8cc555f92 SHA1 4a658d970efd1cb4b84fdb555932aec62dbebcb8 SHA256 09ae66d230048ebacb15c3a97b1f244d2c47ea801e53740d1b38dbed7e45d198
 MD5 681b051aabf3174334050f3324ac0ce8 generator-0.35.ebuild 1719
 RMD160 808b9c81f4ad92b786edac15ed306cf8cc555f92 generator-0.35.ebuild 1719
 SHA256 09ae66d230048ebacb15c3a97b1f244d2c47ea801e53740d1b38dbed7e45d198 generator-0.35.ebuild 1719
-MISC ChangeLog 2918 RMD160 48e318c106e7340fc0a24dc4e2b0f2afcd319226 SHA1 2f7e6d2f5498e8eb4ec8bcb6f6632ca069003ce0 SHA256 94864d442989c90b938c58ea3f314336ba6df5a70efab8c52967a0056bf419cb
-MD5 37c60b2a0bb15352d3032fa7baeff365 ChangeLog 2918
-RMD160 48e318c106e7340fc0a24dc4e2b0f2afcd319226 ChangeLog 2918
-SHA256 94864d442989c90b938c58ea3f314336ba6df5a70efab8c52967a0056bf419cb ChangeLog 2918
+MISC ChangeLog 3144 RMD160 4eff9382bbecfce186f6e2add309c7f9bb9595e1 SHA1 ec5b4b81e27e530bb6e3e335a993568c4b647dda SHA256 9b6efbf87ac8eec54d4ff54dca38cb74c1c6f0afdfb0ce6d2fb249c567a87441
+MD5 7d4affc2931f9e8674dc1a9c1c115ffe ChangeLog 3144
+RMD160 4eff9382bbecfce186f6e2add309c7f9bb9595e1 ChangeLog 3144
+SHA256 9b6efbf87ac8eec54d4ff54dca38cb74c1c6f0afdfb0ce6d2fb249c567a87441 ChangeLog 3144
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -33,10 +34,3 @@ SHA256 d64cc6fa39a62a23a842102782bc39cc69e6dee76f0ca1c864070a87e425b887 files/di
 MD5 f56926056560ebc91a002761911d554a files/digest-generator-0.35-r3 277
 RMD160 192b34e99e0bcf01ae4a45dde32e8a94ca4aee63 files/digest-generator-0.35-r3 277
 SHA256 258e370f5aa5701dbde2a704bdd080c33aace03c50b0a2beeb1817be10549c15 files/digest-generator-0.35-r3 277
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFF7uzekT4lNIS36YERAl9VAJwMM3kWcB1Amlk/0GUrxTvOZREmigCggLOI
-3yFy7aCbp+8fNv1iKyX8BgQ=
-=2jiS
------END PGP SIGNATURE-----
diff --git a/games-emulation/generator/files/generator-0.35-configure.patch b/games-emulation/generator/files/generator-0.35-configure.patch
new file mode 100644
index 000000000000..cc4046c7e62b
--- /dev/null
+++ b/games-emulation/generator/files/generator-0.35-configure.patch
@@ -0,0 +1,61 @@
+--- configure.ac.orig	2007-04-11 16:28:09.000000000 -0400
++++ configure.ac	2007-04-11 16:29:07.000000000 -0400
+@@ -202,50 +202,6 @@
+       CFLAGS="$CFLAGS -Wstrict-prototypes -Wunused"
+     fi
+   fi
+-  if [[ "x$DEBUG" != "xno" ]]; then
+-    AC_MSG_RESULT(Turning on debug flags)
+-    CFLAGS="$CFLAGS -g -O"
+-    optimum=no
+-  else
+-    if [[ "x$GCCVER" != "xno" ]]; then
+-      AC_MSG_RESULT(Turning on gcc optimisations)
+-      CFLAGS="$CFLAGS -O3 -fomit-frame-pointer"
+-      if [[ "x$GCCVER" = "x3" ]]; then
+-        AC_MSG_RESULT(Turning on gcc 3 optimisations)
+-        CFLAGS="$CFLAGS -fno-math-errno"
+-      fi
+-      case "$CFLAGS" in
+-        *mcpu*|*march*) AC_MSG_RESULT(Skipping target optimisations)
+-              ;;
+-        *) case "$target_cpu" in
+-             i386) AC_MSG_RESULT(Turning on i386 optimisations)
+-                   CFLAGS="$CFLAGS -march=i386 -ffast-math"
+-                   ;;
+-             i486) AC_MSG_RESULT(Turning on i486 optimisations)
+-                   CFLAGS="$CFLAGS -march=i486 -ffast-math"
+-                   ;;
+-             i586) AC_MSG_RESULT(Turning on pentium optimisations)
+-                   # cannot do malign-double as we link to other libraries and
+-                   # it would break binary compatibility
+-                   CFLAGS="$CFLAGS -march=pentium -ffast-math"
+-                   ;;
+-             i?86) AC_MSG_RESULT(Turning on i686 optimisations)
+-                   # cannot do malign-double as we link to other libraries and
+-                   # it would break binary compatibility
+-                   CFLAGS="$CFLAGS -march=i686 -ffast-math"
+-                   ;;
+-             alpha*) AC_MSG_RESULT(Adding -mieee for Alpha)
+-                   CFLAGS="$CFLAGS -mieee"
+-                   ;;
+-                *) AC_MSG_RESULT(Sorry unknown target CPU)
+-                   ;;
+-           esac
+-      esac
+-    else
+-      AC_MSG_WARN(You did not opt for gcc optimisations!)
+-      optimum=no
+-    fi
+-  fi
+   AC_CHECK_LIB(jpeg, jpeg_start_compress, 
+     [ MY_LIBS="-ljpeg $MY_LIBS"; AC_DEFINE(JPEG, 1, [JPEG features]) ])
+ 
+@@ -305,6 +261,7 @@
+   AC_CHECK_SIZEOF(unsigned long, 4)
+   AC_CHECK_SIZEOF(unsigned long long, 8)
+   AC_CHECK_HEADERS(sys/param.h)
++  AC_CHECK_HEADERS(sys/time.h)
+   AC_CHECK_HEADERS(bzlib.h)
+   AC_CHECK_HEADERS(zlib.h)
+   AC_CHECK_HEADERS(tcl8.0.h)
diff --git a/games-emulation/generator/files/generator-0.35-execstacks.patch b/games-emulation/generator/files/generator-0.35-execstacks.patch
index efe4c21483e2..f92ef6121f5a 100644
--- a/games-emulation/generator/files/generator-0.35-execstacks.patch
+++ b/games-emulation/generator/files/generator-0.35-execstacks.patch
@@ -1,5 +1,5 @@
---- raze/Makefile.in.old	2006-09-03 03:17:39.000000000 +0200
-+++ raze/Makefile.in	2006-09-03 03:16:36.000000000 +0200
+--- raze/Makefile.am.old	2006-09-03 03:17:39.000000000 +0200
++++ raze/Makefile.am	2006-09-03 03:16:36.000000000 +0200
 @@ -343,6 +343,10 @@
  raze:	raze.o
  raze.o:	raze.asm raze.reg
@@ -9,5 +9,4 @@
 +		>> raze2.asm
 +	echo "%endif" >> raze2.asm
  	nasm -f @ASMOUTPUT@ raze2.asm -o raze.o -praze.reg
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
+
diff --git a/games-emulation/generator/generator-0.35-r3.ebuild b/games-emulation/generator/generator-0.35-r3.ebuild
index dcba5b7dfe4e..5fd5ba72cc2f 100644
--- a/games-emulation/generator/generator-0.35-r3.ebuild
+++ b/games-emulation/generator/generator-0.35-r3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/generator/generator-0.35-r3.ebuild,v 1.2 2007/02/03 08:01:50 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/generator/generator-0.35-r3.ebuild,v 1.3 2007/04/11 20:51:37 mr_bones_ Exp $
 
-inherit eutils toolchain-funcs games
+inherit autotools eutils toolchain-funcs games
 
 DESCRIPTION="Sega Genesis / Mega Drive emulator"
 HOMEPAGE="http://www.ghostwhitecrab.com/generator/"
@@ -10,7 +10,7 @@ SRC_URI="http://www.ghostwhitecrab.com/generator/${P}-cbiere-r2.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="gtk sdlaudio svga"
 
 S=${WORKDIR}/${P}-cbiere-r2
@@ -27,11 +27,10 @@ src_unpack() {
 	cd "${S}"
 	mkdir my-bins
 
-	epatch "${FILESDIR}"/${P}-execstacks.patch
-
-	sed -i \
-		-e '/CFLAGS.*-O3/d' \
-		configure || die "sed configure failed"
+	epatch \
+		"${FILESDIR}"/${P}-execstacks.patch \
+		"${FILESDIR}"/${P}-configure.patch
+	eautoreconf
 }
 
 # builds SDL by default since otherwise -svga -gtk builds nothing
@@ -51,6 +50,7 @@ src_compile() {
 		egamesconf \
 			${myconf} \
 			--with-${mygui} \
+			--without-tcltk \
 			--with-gcc=$(gcc-major-version) \
 			$(use_with sdlaudio sdl-audio) \
 			--disable-dependency-tracking || die