no need to rev bump for a compile time fix

5 files changed, 22 insertions, 49 deletions

diff --git a/games-simulation/gl117/Manifest b/games-simulation/gl117/Manifest
index 981d2b5eb967..c136bb07b72f 100644
--- a/games-simulation/gl117/Manifest
+++ b/games-simulation/gl117/Manifest
@@ -1,9 +1,17 @@
-MD5 9c39378ab87e04c92b53be4325473a1b gl117-1.2.ebuild 776
-MD5 6da9c3238e27fd6510a956cbe7ca9070 gl117-1.3-r1.ebuild 823
-MD5 6a7abfd237e3d0b6d722a744b66f11e9 gl117-1.3.ebuild 743
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 cf5ea4c156d021d3a37acb6ae9536a92 ChangeLog 1476
+MD5 a9fb2efb2d6b1cf569fb93938b74a58d gl117-1.3.ebuild 834
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 933609db8a5eee32fd345edfcad90939 files/1.3-gcc-3.4-gentoo.patch 1560
-MD5 b71cc371a34ed8325ca96ab27964f748 files/digest-gl117-1.3 68
-MD5 b71cc371a34ed8325ca96ab27964f748 files/digest-gl117-1.3-r1 68
+MD5 9c39378ab87e04c92b53be4325473a1b gl117-1.2.ebuild 776
 MD5 945f07eb6f434e41cfcb6dd284717073 files/digest-gl117-1.2 67
+MD5 b71cc371a34ed8325ca96ab27964f748 files/digest-gl117-1.3 68
+MD5 dbc181b31b75b84a681b2d278a214165 files/1.3-gcc-3.4-gentoo.patch 1388
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.8 (GNU/Linux)
+
+iD8DBQFAzLCqHTu7gpaalycRAkSnAJ4kaqxnUaV7Dr4vyU+r4AN2EiL6DQCfduk7
+FbSfI4aE6vBEgPbw+SehS54=
+=rFVF
+-----END PGP SIGNATURE-----
diff --git a/games-simulation/gl117/files/1.3-gcc-3.4-gentoo.patch b/games-simulation/gl117/files/1.3-gcc-3.4-gentoo.patch
index 372faad78944..7981c9277e9a 100644
--- a/games-simulation/gl117/files/1.3-gcc-3.4-gentoo.patch
+++ b/games-simulation/gl117/files/1.3-gcc-3.4-gentoo.patch
@@ -1,7 +1,3 @@
-Only in gl-117-1.3-src: Makefile
-Only in gl-117-1.3-src: config.h
-Only in gl-117-1.3-src: config.log
-Only in gl-117-1.3-src: config.status
 diff -ur gl-117-1.3-src.orig/src/3ds.cpp gl-117-1.3-src/src/3ds.cpp
 --- gl-117-1.3-src.orig/src/3ds.cpp	2004-06-12 00:44:13.000000000 -0500
 +++ gl-117-1.3-src/src/3ds.cpp	2004-06-13 13:29:13.191525808 -0500
@@ -50,4 +46,3 @@ diff -ur gl-117-1.3-src.orig/src/objload.cpp gl-117-1.3-src/src/objload.cpp
  

  bool CLoadOBJ::ImportOBJ (CModel *model, char *filename)

  {

-Only in gl-117-1.3-src: stamp-h1
diff --git a/games-simulation/gl117/files/digest-gl117-1.3-r1 b/games-simulation/gl117/files/digest-gl117-1.3-r1
deleted file mode 100644
index 99b4098b4603..000000000000
--- a/games-simulation/gl117/files/digest-gl117-1.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 38740f8d354416d3ae30f1b0e1c203c7 gl-117-1.3-src.tar.bz2 2354750
diff --git a/games-simulation/gl117/gl117-1.3-r1.ebuild b/games-simulation/gl117/gl117-1.3-r1.ebuild
deleted file mode 100644
index ad4a9c4b52e3..000000000000
--- a/games-simulation/gl117/gl117-1.3-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/gl117/gl117-1.3-r1.ebuild,v 1.1 2004/06/13 18:44:22 mkennedy Exp $
-
-inherit games
-
-MY_P="gl-117-${PV}-src"
-DESCRIPTION="An action flight simulator"
-HOMEPAGE="http://home.t-online.de/home/primetime./gl-117/"
-SRC_URI="mirror://sourceforge/gl-117/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc"
-IUSE=""
-
-DEPEND="virtual/x11
-	media-libs/libsdl
-	media-libs/sdl-mixer
-	virtual/opengl
-	virtual/glu
-	virtual/glut"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${PV}-gcc-3.4-gentoo.patch
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog FAQ NEWS README
-	prepgamesdirs
-}
diff --git a/games-simulation/gl117/gl117-1.3.ebuild b/games-simulation/gl117/gl117-1.3.ebuild
index 7fbc9980ac0c..bfec832771e0 100644
--- a/games-simulation/gl117/gl117-1.3.ebuild
+++ b/games-simulation/gl117/gl117-1.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/gl117/gl117-1.3.ebuild,v 1.1 2004/06/13 02:32:05 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/gl117/gl117-1.3.ebuild,v 1.2 2004/06/13 19:52:51 vapier Exp $
 
-inherit games
+inherit games eutils
 
 MY_P="gl-117-${PV}-src"
 DESCRIPTION="An action flight simulator"
@@ -23,6 +23,12 @@ DEPEND="virtual/x11
 
 S="${WORKDIR}/${MY_P}"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-gcc-3.4-gentoo.patch
+}
+
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS ChangeLog FAQ NEWS README