Added patch to make blackshades-cvs work with the latest openal versions and closing bug #132815.

Package-Manager: portage-2.1_pre10-r5

5 files changed, 117 insertions, 10 deletions

diff --git a/games-fps/blackshades-cvs/ChangeLog b/games-fps/blackshades-cvs/ChangeLog
index 5250cff1af65..20a0cd7f6215 100644
--- a/games-fps/blackshades-cvs/ChangeLog
+++ b/games-fps/blackshades-cvs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for games-fps/blackshades-cvs
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/blackshades-cvs/ChangeLog,v 1.10 2006/02/12 22:25:24 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/blackshades-cvs/ChangeLog,v 1.11 2006/05/11 15:27:53 wolf31o2 Exp $
+
+*blackshades-cvs-20031110-r1 (11 May 2006)
+
+  11 May 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  +files/blackshades-cvs-freealut.patch,
+  +blackshades-cvs-20031110-r1.ebuild:
+  Added patch to make blackshades-cvs work with the latest openal versions and
+  closing bug #132815.
 
   12 Feb 2006; <Tupone@gentoo.org> blackshades-cvs-20031110.ebuild:
   modular X dependency fix
diff --git a/games-fps/blackshades-cvs/Manifest b/games-fps/blackshades-cvs/Manifest
index 9af18a34edf8..27e809208e1b 100644
--- a/games-fps/blackshades-cvs/Manifest
+++ b/games-fps/blackshades-cvs/Manifest
@@ -1,15 +1,32 @@
-MD5 fdd4095cff8ac342e551aef885467eff ChangeLog 1566
-RMD160 db5675a71f942ea8ea85f37fade620f5f47895e4 ChangeLog 1566
-SHA256 3812d25a040f2fb27b3a5f0f3e1eda46af0647aa82417c4a4ad4ac9eace52137 ChangeLog 1566
-MD5 2ba03d10724d6b7dbb28d77c950d9fd2 blackshades-cvs-20031110.ebuild 1873
-RMD160 e239fa34b14fb1cb62fd177337a8123c5fc152b0 blackshades-cvs-20031110.ebuild 1873
-SHA256 5095430483d6eede46599fbccd35edbaa4632ad7e4df63dfca3dd9c2f57beeb1 blackshades-cvs-20031110.ebuild 1873
+AUX blackshades 50 RMD160 17c711ea130e63ec391af9752fa427068690dc75 SHA1 db0ea17931f7673d908d6fe8a49cd76024a73558 SHA256 2a49cea61fa6a069bff283454d447d9c4a02244cccd6ee08ef71001e90c85e9b size 50
 MD5 4e6f2bc85b9d4a2831f3e58435018339 files/blackshades 50
 RMD160 17c711ea130e63ec391af9752fa427068690dc75 files/blackshades 50
 SHA256 2a49cea61fa6a069bff283454d447d9c4a02244cccd6ee08ef71001e90c85e9b files/blackshades 50
-MD5 84e3538657e4d4b4f2acfd47144e4494 files/digest-blackshades-cvs-20031110 494
-RMD160 550d63181e9e39868b53e6fa9c102ca9d5411a1a files/digest-blackshades-cvs-20031110 494
-SHA256 99550789989b8b04e3115cf7378ce18cd0c4653ff5a670700581993b320e482e files/digest-blackshades-cvs-20031110 494
+AUX blackshades-cvs-freealut.patch 370 RMD160 a68103f4bc6a3fb5362f22ef52141ab7086e49fd SHA1 42a52ca9394e5736a2890d7cb3bd703bbda3ffa8 SHA256 0d85cc82982ac57b79678e964598dfc65e3718005ba0cf7fff8461aed569ec32 size 370
+MD5 c3f12dbd9674dbbe7b04d78fde1e8e72 files/blackshades-cvs-freealut.patch 370
+RMD160 a68103f4bc6a3fb5362f22ef52141ab7086e49fd files/blackshades-cvs-freealut.patch 370
+SHA256 0d85cc82982ac57b79678e964598dfc65e3718005ba0cf7fff8461aed569ec32 files/blackshades-cvs-freealut.patch 370
+DIST Textures.tar.bz2 340110 RMD160 6fa3072a7a013649093da0d586e69be3bba02b54 SHA256 084f4592e1c83a0ae79a14823f59fe210dc6ae83ff35111972d3b0239b276607 size 340110
+DIST blackshades-20031110.tar.bz2 765970 RMD160 8ed3b2c3d683bbd3c0e56179d8d69b71c9642ad9 SHA256 2fd16d4b1c7a5b48854040e2a7857089fc0cbd7d72d489005530b89b769fd003 size 765970
+EBUILD blackshades-cvs-20031110-r1.ebuild 1948 RMD160 85a9575deff9e367c76c35749d31a5443119f6c8 SHA1 94c5aaf322784b56fe052152b1ff32b3c2cbf286 SHA256 824d7a0c5439ef645a98b159cd02fa3707e85b380eb3defed25e610913f0ac14 size 1948
+MD5 b675bc91fcff9142056778686126959e blackshades-cvs-20031110-r1.ebuild 1948
+RMD160 85a9575deff9e367c76c35749d31a5443119f6c8 blackshades-cvs-20031110-r1.ebuild 1948
+SHA256 824d7a0c5439ef645a98b159cd02fa3707e85b380eb3defed25e610913f0ac14 blackshades-cvs-20031110-r1.ebuild 1948
+EBUILD blackshades-cvs-20031110.ebuild 1873 RMD160 e239fa34b14fb1cb62fd177337a8123c5fc152b0 SHA1 3e8dec6db03dc8173858f6bee3e39617b6cc6c47 SHA256 5095430483d6eede46599fbccd35edbaa4632ad7e4df63dfca3dd9c2f57beeb1 size 1873
+MD5 2ba03d10724d6b7dbb28d77c950d9fd2 blackshades-cvs-20031110.ebuild 1873
+RMD160 e239fa34b14fb1cb62fd177337a8123c5fc152b0 blackshades-cvs-20031110.ebuild 1873
+SHA256 5095430483d6eede46599fbccd35edbaa4632ad7e4df63dfca3dd9c2f57beeb1 blackshades-cvs-20031110.ebuild 1873
+MISC ChangeLog 1849 RMD160 ebb7041ffce60d7d62cc0a715448a1a7fd8a0637 SHA1 94c91a5c1c20e0aa2bd822ec229f6cad5879b283 SHA256 33511aab0c5d3d2dc4898c8fa6f26c388cba58d220ae02d729e823b0ed95b502 size 1849
+MD5 25b123d06ebb0386058be8ad2516a93e ChangeLog 1849
+RMD160 ebb7041ffce60d7d62cc0a715448a1a7fd8a0637 ChangeLog 1849
+SHA256 33511aab0c5d3d2dc4898c8fa6f26c388cba58d220ae02d729e823b0ed95b502 ChangeLog 1849
+MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 size 158
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
+MD5 84e3538657e4d4b4f2acfd47144e4494 files/digest-blackshades-cvs-20031110 494
+RMD160 550d63181e9e39868b53e6fa9c102ca9d5411a1a files/digest-blackshades-cvs-20031110 494
+SHA256 99550789989b8b04e3115cf7378ce18cd0c4653ff5a670700581993b320e482e files/digest-blackshades-cvs-20031110 494
+MD5 84e3538657e4d4b4f2acfd47144e4494 files/digest-blackshades-cvs-20031110-r1 494
+RMD160 550d63181e9e39868b53e6fa9c102ca9d5411a1a files/digest-blackshades-cvs-20031110-r1 494
+SHA256 99550789989b8b04e3115cf7378ce18cd0c4653ff5a670700581993b320e482e files/digest-blackshades-cvs-20031110-r1 494
diff --git a/games-fps/blackshades-cvs/blackshades-cvs-20031110-r1.ebuild b/games-fps/blackshades-cvs/blackshades-cvs-20031110-r1.ebuild
new file mode 100644
index 000000000000..2d8bf9aa2f66
--- /dev/null
+++ b/games-fps/blackshades-cvs/blackshades-cvs-20031110-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/blackshades-cvs/blackshades-cvs-20031110-r1.ebuild,v 1.1 2006/05/11 15:27:53 wolf31o2 Exp $
+
+#ECVS_PASS="anonymous"
+#ECVS_SERVER="icculus.org:/cvs/cvsroot"
+ECVS_MODULE="blackshades"
+#inherit cvs
+inherit eutils games
+
+DESCRIPTION="you control a psychic bodyguard, and try to protect the VIP"
+HOMEPAGE="http://www.wolfire.com/blackshades.html http://www.icculus.org/blackshades/"
+SRC_URI="http://filesingularity.timedoctor.org/Textures.tar.bz2
+	mirror://gentoo/blackshades-${PV}.tar.bz2"
+
+LICENSE="blackshades"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+IUSE=""
+
+DEPEND="virtual/opengl
+	virtual/glu
+	media-libs/libvorbis
+	~media-libs/openal-0.0.8
+	media-libs/freealut
+	media-libs/libsdl"
+
+S=${WORKDIR}/${ECVS_MODULE}
+
+src_unpack() {
+	if [ -z "${ECVS_SERVER}" ] ; then
+		unpack blackshades-${PV}.tar.bz2
+	else
+		cvs_src_unpack
+	fi
+	cd "${WORKDIR}"
+	unpack Textures.tar.bz2
+	cd "${S}"
+	rm -rf Data/Textures
+	mv "${WORKDIR}"/Textures Data/ || die "mv failed"
+	sed -i \
+		-e "/^CFLAGS/s:$: ${CFLAGS}:" Makefile \
+		|| die "sed Makefile failed"
+	find "${S}" -type d -name CVS -exec rm -rf \{\} \; 2> /dev/null
+	find "${S}/Data/Textures" -type f -name ".*" -exec rm -f \{\} \;
+	find "${S}/Data/" -type f -exec chmod a-x \{\} \;
+	# Glut is not really needed, but there is an include in the source
+	# We patch it
+	sed -i \
+		-e "/glut.h/d" Source/Decals.h \
+		|| die "removing glut include failed"
+	epatch "${FILESDIR}"/${PN}-freealut.patch
+}
+
+src_install() {
+	games_make_wrapper blackshades blackshades-bin "${GAMES_DATADIR}/${PN}"
+	newgamesbin objs/blackshades blackshades-bin || die "newgamesbin failed"
+
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r Data/ || die "doins failed"
+
+	dodoc IF_THIS_IS_A_README_YOU_HAVE_WON Readme TODO uDevGame_Readme
+	make_desktop_entry blackshades "Black Shades"
+	prepgamesdirs
+}
diff --git a/games-fps/blackshades-cvs/files/blackshades-cvs-freealut.patch b/games-fps/blackshades-cvs/files/blackshades-cvs-freealut.patch
new file mode 100644
index 000000000000..4c0324fa3b06
--- /dev/null
+++ b/games-fps/blackshades-cvs/files/blackshades-cvs-freealut.patch
@@ -0,0 +1,11 @@
+--- Makefile
++++ Makefile
+@@ -8,7 +8,7 @@
+ 
+ CFLAGS := -O2 -Wall -g $(shell sdl-config --cflags) -I$(SRCDIR) -include Source/Support.h
+ CXXFLAGS := $(CFLAGS)
+-LDFLAGS := $(shell sdl-config --libs) -lGL -lGLU -lopenal # -framework QuickTime
++LDFLAGS := $(shell sdl-config --libs) -lGL -lGLU -lopenal -lalut # -framework QuickTime
+ 
+ # Don't want ogg?
+ #CFLAGS += -DNOOGG
diff --git a/games-fps/blackshades-cvs/files/digest-blackshades-cvs-20031110-r1 b/games-fps/blackshades-cvs/files/digest-blackshades-cvs-20031110-r1
new file mode 100644
index 000000000000..b1f552daec7f
--- /dev/null
+++ b/games-fps/blackshades-cvs/files/digest-blackshades-cvs-20031110-r1
@@ -0,0 +1,6 @@
+MD5 3fcee1f31c0a062ed7a0d8d6aafc1b06 Textures.tar.bz2 340110
+RMD160 6fa3072a7a013649093da0d586e69be3bba02b54 Textures.tar.bz2 340110
+SHA256 084f4592e1c83a0ae79a14823f59fe210dc6ae83ff35111972d3b0239b276607 Textures.tar.bz2 340110
+MD5 15635e23702a292d97f4cb97410ebb83 blackshades-20031110.tar.bz2 765970
+RMD160 8ed3b2c3d683bbd3c0e56179d8d69b71c9642ad9 blackshades-20031110.tar.bz2 765970
+SHA256 2fd16d4b1c7a5b48854040e2a7857089fc0cbd7d72d489005530b89b769fd003 blackshades-20031110.tar.bz2 765970