Version bump #75680 by cpu.

6 files changed, 46 insertions, 16 deletions

diff --git a/games-emulation/zsnes/ChangeLog b/games-emulation/zsnes/ChangeLog
index 24eb420665e3..32c25aabc43a 100644
--- a/games-emulation/zsnes/ChangeLog
+++ b/games-emulation/zsnes/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-emulation/zsnes
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/ChangeLog,v 1.11 2004/11/20 12:24:34 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/ChangeLog,v 1.12 2004/12/26 22:22:37 vapier Exp $
+
+*zsnes-1.40 (26 Dec 2004)
+
+  26 Dec 2004; Mike Frysinger <vapier@gentoo.org> +files/1.40-LDFLAGS.patch,
+  -zsnes-1.37_pre20040920.ebuild, +zsnes-1.40.ebuild:
+  Version bump #75680 by cpu.
 
 *zsnes-1.37_pre20041024 (20 Nov 2004)
 
diff --git a/games-emulation/zsnes/Manifest b/games-emulation/zsnes/Manifest
index 3a61ba731983..f0f5b9ab39f2 100644
--- a/games-emulation/zsnes/Manifest
+++ b/games-emulation/zsnes/Manifest
@@ -1,9 +1,10 @@
 MD5 420e80080d004920c31cdcb2586c7339 ChangeLog 4229
-MD5 8c1a379dff1b3df750bf69ef17f339a2 zsnes-1.36.ebuild 883
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 8c1a379dff1b3df750bf69ef17f339a2 zsnes-1.36.ebuild 883
 MD5 72e63acb3d8445cdd97d7d09ad60f666 zsnes-1.37_pre20040920.ebuild 1573
-MD5 c16c5d8354eea7ee7719a64d14e6d8fb zsnes-1.37_pre20041024.ebuild 1623
-MD5 80ca4b35a91db4fc77d10b9e3c51f48e files/digest-zsnes-1.37_pre20040920 64
+MD5 be79853d68e68791bb58d32d87ef0ff4 zsnes-1.40.ebuild 1607
+MD5 4309f61426978735396c10fa6e1fd1ea files/digest-zsnes-1.40 64
 MD5 b828464647d2d51e3a08b60e05795f1d files/digest-zsnes-1.36 63
-MD5 63565a81de9b21332b2c3950d280589a files/digest-zsnes-1.37_pre20041024 64
+MD5 80ca4b35a91db4fc77d10b9e3c51f48e files/digest-zsnes-1.37_pre20040920 64
 MD5 46cccb6864144319a93aa5d953fadb0c files/command-line.patch 717
+MD5 63565a81de9b21332b2c3950d280589a files/digest-zsnes-1.37_pre20041024 64
diff --git a/games-emulation/zsnes/files/1.40-LDFLAGS.patch b/games-emulation/zsnes/files/1.40-LDFLAGS.patch
new file mode 100644
index 000000000000..02c4c21330e0
--- /dev/null
+++ b/games-emulation/zsnes/files/1.40-LDFLAGS.patch
@@ -0,0 +1,21 @@
+--- zsnes_1_40/src/configure.in.orig	2004-12-26 17:10:48.876796648 -0500
++++ zsnes_1_40/src/configure.in	2004-12-26 17:11:46.142091000 -0500
+@@ -15,8 +15,6 @@
+ dnl Mingw, because it doesnt have a standard file tree. Maybe if ming do this
+ dnl else do -I/usr/include. Or some shit. You figure it out.
+ 
+-LDFLAGS="$LDFLAGS -L/usr/local/lib -L/usr/lib"
+-
+ dnl -- Same thing here.
+ 
+ AC_CANONICAL_SYSTEM
+@@ -84,7 +82,9 @@
+ CFLAGS="$CFLAGS -I$opengl_prefix/include"
+ LDFLAGS-"$LDFLAGS -L$opengl_prefix/lib"
+ fi
++if test x$x_libraries != x; then
+ LDFLAGS="$LDFLAGS -L$x_libraries"
++fi
+ AC_CHECK_LIB(GL, glGetError,found_opengl="yes",,)
+ if test x$found_opengl = xyes; then
+         echo checking for OpenGL... yes
diff --git a/games-emulation/zsnes/files/digest-zsnes-1.37_pre20040920 b/games-emulation/zsnes/files/digest-zsnes-1.37_pre20040920
deleted file mode 100644
index e24c2790b8ae..000000000000
--- a/games-emulation/zsnes/files/digest-zsnes-1.37_pre20040920
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c0e6446075d399a8c2283e116d333d31 ZSNESS_0920.tar.bz2 789004
diff --git a/games-emulation/zsnes/files/digest-zsnes-1.40 b/games-emulation/zsnes/files/digest-zsnes-1.40
new file mode 100644
index 000000000000..e047ecfc54f0
--- /dev/null
+++ b/games-emulation/zsnes/files/digest-zsnes-1.40
@@ -0,0 +1 @@
+MD5 770afa48055722e76574841ca5976126 zsnes140src.tar.gz 1062598
diff --git a/games-emulation/zsnes/zsnes-1.37_pre20040920.ebuild b/games-emulation/zsnes/zsnes-1.40.ebuild
index d19c56dbcf35..02faeda3d5fa 100644
--- a/games-emulation/zsnes/zsnes-1.37_pre20040920.ebuild
+++ b/games-emulation/zsnes/zsnes-1.40.ebuild
@@ -1,20 +1,20 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/zsnes-1.37_pre20040920.ebuild,v 1.1 2004/09/23 21:23:41 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/zsnes-1.40.ebuild,v 1.1 2004/12/26 22:22:37 vapier Exp $
 
-inherit games eutils flag-o-matic
+inherit eutils flag-o-matic games
 
 DESCRIPTION="SNES (Super Nintendo) emulator that uses x86 assembly"
 HOMEPAGE="http://www.zsnes.com/ http://ipherswipsite.com/zsnes/"
-SRC_URI="http://www.ipherswipsite.com/files/zsnes/ZSNESS_${PV/*2004}.tar.bz2"
+SRC_URI="mirror://sourceforge/zsnes/${PN}${PV//.}src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~x86 ~amd64"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="opengl"
 
 # we need libsdl for headers on amd64, even though we'll technically be using
-# the 32bit sdl from emul-linux-x86-sdl. 
+# the 32bit sdl from emul-linux-x86-sdl.
 RDEPEND="opengl? ( virtual/opengl )
 	>=media-libs/libsdl-1.2.0
 	amd64? ( app-emulation/emul-linux-x86-sdl )
@@ -25,7 +25,7 @@ DEPEND="${RDEPEND}
 	sys-devel/automake
 	>=sys-devel/autoconf-2.58"
 
-S="${WORKDIR}/${PN}"
+S="${WORKDIR}/${PN}_${PV//./_}"
 
 multilib_check() {
 	if has_m32 ; then
@@ -39,21 +39,23 @@ multilib_check() {
 
 src_unpack() {
 	unpack ${A}
-	cd "${S}/src"
+	cd "${S}"/src
+	epatch "${FILESDIR}"/${PV}-LDFLAGS.patch
 	aclocal && autoconf || die "autotools failed"
 }
 
 src_compile() {
 	use amd64 && multilib_check
-
 	cd src
-	egamesconf $(use_with opengl) || die
+	egamesconf $(use_enable opengl) || die
 	emake || die "emake failed"
 }
 
 src_install() {
 	dogamesbin src/zsnes || die "dogamesbin failed"
 	newman src/linux/zsnes.1 zsnes.6
-	dodoc *.txt linux/*
+	cd docs
+	dodoc *.txt README.LINUX
+	dohtml -r Linux/*
 	prepgamesdirs
 }