Update Debian patch and fix X lib/inc issues #79496.

(Portage version: 2.0.51.21-r1)

4 files changed, 85 insertions, 2 deletions

diff --git a/games-arcade/xgalaga/ChangeLog b/games-arcade/xgalaga/ChangeLog
index 78a001c37723..1639c3af3394 100644
--- a/games-arcade/xgalaga/ChangeLog
+++ b/games-arcade/xgalaga/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-arcade/xgalaga
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/xgalaga/ChangeLog,v 1.7 2004/12/28 23:00:45 ciaranm Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/xgalaga/ChangeLog,v 1.8 2005/05/15 20:54:55 vapier Exp $
+
+*xgalaga-2.0.34-r6 (15 May 2005)
+
+  15 May 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/xgalaga-2.0.34-xpaths.patch, +xgalaga-2.0.34-r6.ebuild:
+  Update Debian patch and fix X lib/inc issues #79496.
 
   28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/games-arcade/xgalaga/files/digest-xgalaga-2.0.34-r6 b/games-arcade/xgalaga/files/digest-xgalaga-2.0.34-r6
new file mode 100644
index 000000000000..f4b9cfecf5ca
--- /dev/null
+++ b/games-arcade/xgalaga/files/digest-xgalaga-2.0.34-r6
@@ -0,0 +1,2 @@
+MD5 9f7ee685e9c4741b5f0edc3f91df9510 xgalaga_2.0.34.orig.tar.gz 314189
+MD5 5dc2bdaa4b00c3484da24041bf47bf0e xgalaga_2.0.34-30.diff.gz 49219
diff --git a/games-arcade/xgalaga/files/xgalaga-2.0.34-xpaths.patch b/games-arcade/xgalaga/files/xgalaga-2.0.34-xpaths.patch
new file mode 100644
index 000000000000..d93f8cf13a47
--- /dev/null
+++ b/games-arcade/xgalaga/files/xgalaga-2.0.34-xpaths.patch
@@ -0,0 +1,16 @@
+Make sure X paths are set before using
+http://bugs.gentoo.org/79496
+
+--- configure
++++ configure
+@@ -1878,4 +1878,8 @@
+ else
+-  INCS="$INCS -I$x_includes"
+-  LIBS="-L$x_libraries"
++  if test -n "$x_includes" ; then
++    INCS="$INCS -I$x_includes"
++  fi
++  if test -n "$x_libraries" ; then
++    LIBS="-L$x_libraries"
++  fi
+ 
diff --git a/games-arcade/xgalaga/xgalaga-2.0.34-r6.ebuild b/games-arcade/xgalaga/xgalaga-2.0.34-r6.ebuild
new file mode 100644
index 000000000000..9556cf348bea
--- /dev/null
+++ b/games-arcade/xgalaga/xgalaga-2.0.34-r6.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/xgalaga/xgalaga-2.0.34-r6.ebuild,v 1.1 2005/05/15 20:54:55 vapier Exp $
+
+inherit eutils games
+
+DEB_VER=30
+DESCRIPTION="Galaga game clone."
+HOMEPAGE="http://rumsey.org/xgal.html"
+SRC_URI="http://http.us.debian.org/debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz
+	mirror://debian/pool/main/x/${PN}/${PN}_${PV}-${DEB_VER}.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc sparc x86"
+IUSE=""
+
+DEPEND="virtual/x11"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch "${FILESDIR}"/${P}-xpaths.patch #79496
+	epatch "${WORKDIR}"/${PN}_${PV}-${DEB_VER}.diff
+	sed -i \
+		-e "/LEVELDIR\|SOUNDDIR/ s:prefix:datadir/${PN}:" \
+		-e "/\/scores/ s:prefix:localstatedir/${PN}:" configure \
+		|| die "sed configure failed"
+	sed -i \
+		-e '/SOUNDDEFS/ s:@prefix@:@prefix@/bin:' Makefile.in \
+		|| die "sed Makefile.in failed"
+}
+
+src_compile() {
+	egamesconf || die
+	emake CPPFLAGS="-D__NO_STRING_INLINES" || die "compile problem"
+}
+
+src_install() {
+	dogamesbin xgalaga xgal.sndsrv.linux || die "dogamesbin failed"
+	dodoc README README.SOUND CHANGES INSTALL
+	newman xgal.6x xgal.6
+
+	insinto "${GAMES_DATADIR}/${PN}/sounds"
+	doins sounds/*.raw || die "doins failed"
+
+	insinto "${GAMES_DATADIR}/${PN}/levels"
+	doins levels/*.xgl || die "doins failed"
+
+	insinto /usr/share/pixmaps
+	doins xgalaga-icon.xpm || die "doins failed"
+
+	make_desktop_entry xgalaga xgalaga xgalaga-icon.xpm
+
+	dodir "${GAMES_STATEDIR}/${PN}"
+	touch "${D}${GAMES_STATEDIR}/${PN}/scores"
+	fperms 660 "${GAMES_STATEDIR}/${PN}/scores"
+	prepgamesdirs
+}