a little FHS lovin

3 files changed, 51 insertions, 9 deletions

diff --git a/games-action/orbital-eunuchs-sniper/ChangeLog b/games-action/orbital-eunuchs-sniper/ChangeLog
index 1cbee6880db0..d2e3302aa102 100644
--- a/games-action/orbital-eunuchs-sniper/ChangeLog
+++ b/games-action/orbital-eunuchs-sniper/ChangeLog
@@ -1,13 +1,16 @@
 # ChangeLog for games-action/orbital-eunuchs-sniper
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/orbital-eunuchs-sniper/ChangeLog,v 1.3 2003/10/25 00:39:11 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/orbital-eunuchs-sniper/ChangeLog,v 1.4 2003/12/31 21:16:47 vapier Exp $
+
+*orbital-eunuchs-sniper-1.29 (22 Apr 2003)
+
+  31 Dec 2003; Mike Frysinger <vapier@gentoo.org> :
+  Add patch to clean up the install ... now binaries are in /usr/games/bin while data is in /usr/share/games/<PN>.
 
   24 Oct 2003; Michael Sterrett <mr_bones_@gentoo.org>
   orbital-eunuchs-sniper-1.29.ebuild:
   use more of games eclass; more error messages; tidy
 
-*orbital-eunuchs-sniper-1.29 (22 Apr 2003)
-
   22 Apr 2003; Phil Bordelon <sunflare@gentoo.org> orbital-eunuchs-sniper-1.29.ebuild:
   lu_zero tested it on PPC, and it worked.  Joy and rapture!  Added.
 
diff --git a/games-action/orbital-eunuchs-sniper/files/1.29-gentoo-paths.patch b/games-action/orbital-eunuchs-sniper/files/1.29-gentoo-paths.patch
new file mode 100644
index 000000000000..ac62ac21c5d3
--- /dev/null
+++ b/games-action/orbital-eunuchs-sniper/files/1.29-gentoo-paths.patch
@@ -0,0 +1,17 @@
+diff -ur orbital_eunuchs_sniper-1.29.orig/src/snipe2d.cpp orbital_eunuchs_sniper-1.29/src/snipe2d.cpp
+--- orbital_eunuchs_sniper-1.29.orig/src/snipe2d.cpp	2003-12-31 16:05:07.079304568 -0500
++++ orbital_eunuchs_sniper-1.29/src/snipe2d.cpp	2003-12-31 16:06:52.962207920 -0500
+@@ -1632,10 +1632,11 @@
+ 
+     srand(SDL_GetTicks());
+    
+-    Game.mediaPath = (char*)calloc(strlen(argv[0]), sizeof(char));
++    Game.mediaPath = (char*)calloc(strlen("GENTOO_DIR\0")+1, sizeof(char));
+ //   invocation = (char*)malloc(strlen(argv[0]) + 1); memcpy(invocation, argv[0], strlen(argv[0]));
+     invocation = strdup(argv[0]);
+-    sprintf(Game.mediaPath, "%s", dirname(invocation));
++    sprintf(Game.mediaPath, "GENTOO_DIR\0");
++    chdir(Game.mediaPath);
+     free(invocation);
+     invocation = argv[0];
+ 
diff --git a/games-action/orbital-eunuchs-sniper/orbital-eunuchs-sniper-1.29.ebuild b/games-action/orbital-eunuchs-sniper/orbital-eunuchs-sniper-1.29.ebuild
index 3b33f0f4bdaf..4fe9184b94fe 100644
--- a/games-action/orbital-eunuchs-sniper/orbital-eunuchs-sniper-1.29.ebuild
+++ b/games-action/orbital-eunuchs-sniper/orbital-eunuchs-sniper-1.29.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/orbital-eunuchs-sniper/orbital-eunuchs-sniper-1.29.ebuild,v 1.2 2003/10/25 00:39:11 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/orbital-eunuchs-sniper/orbital-eunuchs-sniper-1.29.ebuild,v 1.3 2003/12/31 21:16:47 vapier Exp $
 
 inherit games
 
-S="${WORKDIR}/orbital_eunuchs_sniper-${PV}"
+MY_PN=${PN//-/_}
 DESCRIPTION="Snipe terrorists from your orbital base"
-HOMEPAGE="http://icculus.org/oes"
-SRC_URI="http://filesingularity.timedoctor.org/orbital_eunuchs_sniper-${PV}.tar.gz"
+HOMEPAGE="http://icculus.org/oes/"
+SRC_URI="http://filesingularity.timedoctor.org/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
@@ -17,8 +17,30 @@ DEPEND=">=media-libs/libsdl-1.2.5-r1
 	>=media-libs/sdl-mixer-1.2.5-r1
 	>=media-libs/sdl-image-1.2.2"
 
+S=${WORKDIR}/${MY_PN}-${PV}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i 's:datadir="$with_games_dir"::' configure
+	cp -rf ${S}{,.orig}
+	epatch ${FILESDIR}/${PV}-gentoo-paths.patch
+	sed -i "s:GENTOO_DIR:${GAMES_DATADIR}/${MY_PN}:" src/snipe2d.cpp
+}
+
+src_compile() {
+	egamesconf --with-games-dir=${GAMES_PREFIX} || die
+	emake || die
+}
+
 src_install() {
-	make DESTDIR=${D} install                      || die "make install failed"
-	dodoc AUTHORS ChangeLog README TODO readme.txt || die "dodoc failed"
+	make DESTDIR=${D} install || die "make install failed"
+	dodir ${GAMES_LIBDIR}/${PN}
+	mv ${D}/${GAMES_DATADIR}/${MY_PN}/snipe2d.* ${D}/${GAMES_LIBDIR}/${PN}/
+
+	dogamesbin ${FILESDIR}/snipe2d
+	dosed "s:GENTOO_DIR:${GAMES_LIBDIR}/${PN}:" ${GAMES_BINDIR}/snipe2d
+
+	dodoc AUTHORS ChangeLog README TODO readme.txt
 	prepgamesdirs
 }