Fix path issues #90263 by hodak@nemo.physics.ncsu.edu / Andrew Sayman.

(Portage version: 2.0.51.20)

4 files changed, 126 insertions, 1 deletions

diff --git a/games-arcade/crack-attack/ChangeLog b/games-arcade/crack-attack/ChangeLog
index 9c03eda17bec..c3bff145b79f 100644
--- a/games-arcade/crack-attack/ChangeLog
+++ b/games-arcade/crack-attack/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-arcade/crack-attack
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/crack-attack/ChangeLog,v 1.17 2005/04/24 03:02:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/crack-attack/ChangeLog,v 1.18 2005/04/25 01:01:13 vapier Exp $
+
+*crack-attack-1.1.13-r1 (25 Apr 2005)
+
+  25 Apr 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/crack-attack-1.1.13-binpaths.patch, +crack-attack-1.1.13-r1.ebuild:
+  Fix path issues #90263 by hodak@nemo.physics.ncsu.edu / Andrew Sayman.
 
 *crack-attack-1.1.13 (24 Apr 2005)
 
diff --git a/games-arcade/crack-attack/crack-attack-1.1.13-r1.ebuild b/games-arcade/crack-attack/crack-attack-1.1.13-r1.ebuild
new file mode 100644
index 000000000000..a229eff027f2
--- /dev/null
+++ b/games-arcade/crack-attack/crack-attack-1.1.13-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/crack-attack/crack-attack-1.1.13-r1.ebuild,v 1.1 2005/04/25 01:01:13 vapier Exp $
+
+inherit eutils flag-o-matic games
+
+DESCRIPTION="Addictive OpenGL-based block game"
+HOMEPAGE="http://savannah.nongnu.org/projects/crack-attack/"
+SRC_URI="http://savannah.nongnu.org/download/crack-attack/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm hppa ia64 ppc sparc x86"
+IUSE="gtk"
+
+DEPEND="virtual/glut
+	gtk? ( >=x11-libs/gtk+-2.4 )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-binpaths.patch
+}
+
+src_compile() {
+	append-flags -DGL_GLEXT_LEGACY
+	egamesconf \
+		--disable-binreloc \
+		$(use_enable gtk) \
+		|| die
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog README
+	dohtml -A xpm doc/*
+	doicon "${FILESDIR}"/crack-attack.xpm
+	make_desktop_entry crack-attack Crack-attack crack-attack.xpm
+	prepgamesdirs
+}
diff --git a/games-arcade/crack-attack/files/crack-attack-1.1.13-binpaths.patch b/games-arcade/crack-attack/files/crack-attack-1.1.13-binpaths.patch
new file mode 100644
index 000000000000..6c4628aff344
--- /dev/null
+++ b/games-arcade/crack-attack/files/crack-attack-1.1.13-binpaths.patch
@@ -0,0 +1,77 @@
+Fix paths so the game actually works :)
+
+Patch suggested by Andrew Sayman and taken from upstream CVS
+
+http://bugs.gentoo.org/show_bug.cgi?id=90263
+
+Index: src/Game.h
+===================================================================
+RCS file: /cvsroot/crack-attack/crack-attack/src/Game.h,v
+retrieving revision 1.18
+retrieving revision 1.19
+diff -u -r1.18 -r1.19
+--- src/Game.h
++++ src/Game.h
+@@ -82,7 +82,7 @@
+ #    define GC_DATA_DIRECTORY(x)          DATA_DIRECTORY x
+ #  endif
+ #  define GC_LOCAL_DATA_DIRECTORY        GC_DD "." GC_BINARY GC_DD
+-#  define GC_BINARY_LOCATION             DATA_DIRECTORY ".." GC_DD ".."
++#  define GC_BINARY_LOCATION             BINARY_DIRECTORY GC_DD GC_BINARY
+ #else
+ #  define GC_DATA_DIRECTORY(x)              ".." GC_DD "data" GC_DD x
+ #  define GC_LOCAL_DATA_DIRECTORY           ".." GC_DD "localdata" GC_DD
+Index: src/gtk-gui/Makefile.am
+===================================================================
+RCS file: /cvsroot/crack-attack/crack-attack/src/gtk-gui/Makefile.am,v
+retrieving revision 1.4
+retrieving revision 1.5
+diff -u -r1.4 -r1.5
+--- src/gtk-gui/Makefile.am
++++ src/gtk-gui/Makefile.am
+@@ -5,10 +5,17 @@
+   interface.h   callbacks.h   support.h   gui_main.h   persist.h   modeparser.h
+ 
+ AM_CXXFLAGS = -O2
+-INCLUDES = -DDATA_DIRECTORY='"${pkgdatadir}/"'	\
+-    -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
+-	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+-  @PACKAGE_CFLAGS@ @DEBUG_INCLUDES@
++
++if WANT_BINRELOC
++  PATH_INCLUDES = 
++else
++  PATH_INCLUDES = -DDATA_DIRECTORY='"${pkgdatadir}/"' \
++      -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
++    -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
++		-DBINARY_DIRECTORY='"${bindir}"'
++endif
++
++INCLUDES = @PACKAGE_CFLAGS@ @DEBUG_INCLUDES@ ${PATH_INCLUDES}
+ 
+ AM_LDFLAGS = ${all_libraries}
+ LDADD = ${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS} -lGL -lGLU -lglut -lXi -lX11 -lXmu @PACKAGE_LIBS@
+Index: src/Makefile.am
+===================================================================
+RCS file: /cvsroot/crack-attack/crack-attack/src/Makefile.am,v
+retrieving revision 1.9
+retrieving revision 1.11
+diff -u -r1.9 -r1.11
+--- src/Makefile.am
++++ src/Makefile.am
+@@ -19,11 +19,12 @@
+ AM_CXXFLAGS = -DBR_PTHREAD=0 @DEBUG_CFLAGS@ @AUDIO_CFLAGS@
+ 
+ if WANT_BINRELOC
++  PATH_INCLUDES = 
++else
+   PATH_INCLUDES = -DDATA_DIRECTORY='"${pkgdatadir}/"' \
+       -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
+-    -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
+-else
+-  PATH_INCLUDES = 
++    -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
++		-DBINARY_DIRECTORY='"${bindir}"'
+ endif
+ 
+ INCLUDES = @PACKAGE_CFLAGS@ @DEBUG_INCLUDES@ ${PATH_INCLUDES} 
diff --git a/games-arcade/crack-attack/files/digest-crack-attack-1.1.13-r1 b/games-arcade/crack-attack/files/digest-crack-attack-1.1.13-r1
new file mode 100644
index 000000000000..ea8b5dcab036
--- /dev/null
+++ b/games-arcade/crack-attack/files/digest-crack-attack-1.1.13-r1
@@ -0,0 +1 @@
+MD5 9eb4963f44ed6f631d3a6e899c907cb6 crack-attack-1.1.13.tar.bz2 619484