version bump

Package-Manager: portage-2.1.9.42/cvs/Linux i686

4 files changed, 147 insertions, 3 deletions

diff --git a/games-action/wordwarvi/ChangeLog b/games-action/wordwarvi/ChangeLog
index 2acb3d257a4b..112a1b44def1 100644
--- a/games-action/wordwarvi/ChangeLog
+++ b/games-action/wordwarvi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-action/wordwarvi
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/wordwarvi/ChangeLog,v 1.7 2010/02/08 22:52:26 mr_bones_ Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/wordwarvi/ChangeLog,v 1.8 2011/06/12 00:53:19 mr_bones_ Exp $
+
+*wordwarvi-1.00 (12 Jun 2011)
+
+  12 Jun 2011; Michael Sterrett <mr_bones_@gentoo.org> +wordwarvi-1.00.ebuild,
+  +files/wordwarvi-1.00-sound.patch:
+  version bump
 
   08 Feb 2010; Michael Sterrett <mr_bones_@gentoo.org>
   wordwarvi-0.26.ebuild, +files/wordwarvi-0.26-sound.patch:
diff --git a/games-action/wordwarvi/Manifest b/games-action/wordwarvi/Manifest
index 4e582e32404d..954e1e973143 100644
--- a/games-action/wordwarvi/Manifest
+++ b/games-action/wordwarvi/Manifest
@@ -1,5 +1,8 @@
 AUX wordwarvi-0.26-sound.patch 2878 RMD160 7fbf12c49619ad1025998e317ef764f488178250 SHA1 667bed585508c13ce4a02074f5b80d72dede8b24 SHA256 669f7c3a75ae928b844871029625008f261afe867382a3bbfdb8f63332cc3182
+AUX wordwarvi-1.00-sound.patch 2869 RMD160 66863f97dbeae1a449f77e89e4f33f1cb1c55650 SHA1 ffba191695e82a72889471f82120abbf6c821016 SHA256 36f8b038927784f46aec2e98e0bb880a8a5ad2171d33c8f7dc31e50497a6f394
 DIST wordwarvi-0.26.tar.gz 8830212 RMD160 8f11cc1184f17bcc5e5e8619f58cf8195bc1fba3 SHA1 f856a94c81e3edd8cb39e3027f7de56d55c58160 SHA256 96b0bd59749ae116cf33b03b04ef5535cd28ac360df14de96086ca11e289cd48
+DIST wordwarvi-1.00.tar.gz 8828099 RMD160 74adb46fc6afb184f19c2fabbd4107161fa14c76 SHA1 4d686074a20d2734c83228ef6f94419f1c2b481c SHA256 7aa668b18096e85583ee0cfa1e21316b6754268df564adb4ff6ae8a8fe791ee9
 EBUILD wordwarvi-0.26.ebuild 1502 RMD160 7ad3ac1c88f1f30c4a376f37acb761bc9f535762 SHA1 d647401a90e1022b5c464fd4ac7511dc5f0a5ed9 SHA256 014b158c7493a5309991e3fd57a0955a326385d4edc9967271c80015c7e9ba7b
-MISC ChangeLog 1148 RMD160 f49b2480c440bd3ac32896ddc1e9238a9a29a99d SHA1 b1bcab5172f2695e37e569bdd8c9cbcf96259134 SHA256 8ceec9bb2f3b39e3894284715ced1f4daf4e391f7534b5fa521a51d405ffb834
+EBUILD wordwarvi-1.00.ebuild 1509 RMD160 1130480a1989a62091bce9021b0c61b3405a14bf SHA1 e4b2ca7d1472bdc02d135790e52571eb32504433 SHA256 295d29186b2a3f811b27719a056f9b3d80c7c1d1c1a1aed3cc81da3d3639b286
+MISC ChangeLog 1311 RMD160 2e7ea4e959a4221636219202e564fb2a56613f97 SHA1 788b17db532b9967e5f7dc8eae9470eb72be1cfa SHA256 fd1be584b872cbbeeaac7ed343c7545ac86ce6ecbbaaa0fda9fe2e6142751691
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-action/wordwarvi/files/wordwarvi-1.00-sound.patch b/games-action/wordwarvi/files/wordwarvi-1.00-sound.patch
new file mode 100644
index 000000000000..5ad7bc8440b9
--- /dev/null
+++ b/games-action/wordwarvi/files/wordwarvi-1.00-sound.patch
@@ -0,0 +1,80 @@
+diff -ru wordwarvi-1.00.orig/Makefile wordwarvi-1.00/Makefile
+--- wordwarvi-1.00.orig/Makefile	2011-06-09 00:06:22.000000000 -0400
++++ wordwarvi-1.00/Makefile	2011-06-11 19:57:55.609619777 -0400
+@@ -1,5 +1,5 @@
+ PREFIX=/usr
+-DATADIR=${PREFIX}/share/wordwarvi
++DATADIR?=${PREFIX}/share/wordwarvi
+ MANDIR?=${PREFIX}/share/man
+ MANPAGEDIR=${MANDIR}/man6
+ 
+@@ -24,18 +24,6 @@
+ CC ?= gcc
+ BUILD_CC ?= gcc
+ 
+-# DEBUG=-g
+-# DEBUG=
+-# PROFILE_FLAG=-pg
+-#PROFILE_FLAG=
+-#OPTIMIZE_FLAG=
+-# OPTIMIZE_FLAG=-O3
+-#OPTIMIZE_FLAG=-O3 -pedantic -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security
+-OPTIMIZE_FLAG=-O3 -pedantic
+-
+-
+-LDFLAGS=${PROFILE_FLAG}
+-
+ DEFINES=${SNDFLAGS} -DDATADIR=\"${DATADIR}/\"
+ 
+ all:	wordwarvi wordwarvi.6.gz
+@@ -53,24 +41,24 @@
+ endif
+ 
+ joystick.o:	joystick.c joystick.h Makefile
+-	$(CC) ${DEBUG} ${PROFILE_FLAG} ${OPTIMIZE_FLAG} -pthread -Wall -c joystick.c
++	$(CC) ${DEBUG} ${PROFILE_FLAG} ${CFLAGS} -pthread -Wall -c joystick.c
+ 
+ ogg_to_pcm.o:	ogg_to_pcm.c ogg_to_pcm.h Makefile
+-	$(CC) ${DEBUG} ${PROFILE_FLAG} ${OPTIMIZE_FLAG} `pkg-config --cflags vorbisfile` \
++	$(CC) ${DEBUG} ${PROFILE_FLAG} ${CFLAGS} `pkg-config --cflags vorbisfile` \
+ 		-pthread -Wall -c ogg_to_pcm.c
+ 
+ wwviaudio.o:	wwviaudio.c wwviaudio.h ogg_to_pcm.h my_point.h Makefile
+-	$(CC) -Wall ${DEBUG} ${PROFILE_FLAG} ${OPTIMIZE_FLAG} \
++	$(CC) -Wall ${DEBUG} ${PROFILE_FLAG} ${CFLAGS} \
+ 		${DEFINES} \
+ 		-pthread `pkg-config --cflags vorbisfile` \
+ 		-c wwviaudio.c
+ 
+ rumble.o:	rumble.c rumble.h Makefile
+-	$(CC) ${DEBUG} ${PROFILE_FLAG} ${OPTIMIZE_FLAG} `pkg-config --cflags vorbisfile` \
++	$(CC) ${DEBUG} ${PROFILE_FLAG} ${CFLAGS} `pkg-config --cflags vorbisfile` \
+ 		-pthread -Wall -c rumble.c
+ 
+ wwvi_font.o:	wwvi_font.c wwvi_font.h my_point.h Makefile
+-	$(CC) ${DEBUG} ${PROFILE_FLAG} ${OPTIMIZE_FLAG} -pthread -Wall -c wwvi_font.c
++	$(CC) ${DEBUG} ${PROFILE_FLAG} ${CFLAGS} -pthread -Wall -c wwvi_font.c
+ 
+ stamp:	stamp.c
+ 	$(BUILD_CC) -o stamp stamp.c
+@@ -78,7 +66,7 @@
+ wordwarvi:	wordwarvi.c joystick.o rumble.o ${OGGOBJ} wwviaudio.o wwvi_font.o \
+ 		Makefile version.h stamp levels.h rumble.h
+ 	./stamp > stamp.h
+-	$(CC) ${DEBUG} ${PROFILE_FLAG} ${OPTIMIZE_FLAG} ${SCREENSAVERFLAG} -pthread -Wall  ${DEFINES} \
++	$(CC) $(LDFLAGS) ${DEBUG} ${PROFILE_FLAG} ${CFLAGS} ${SCREENSAVERFLAG} -pthread -Wall  ${DEFINES} \
+ 		joystick.o \
+ 		rumble.o \
+ 		wwvi_font.o \
+diff -ru wordwarvi-1.00.orig/wwviaudio.c wordwarvi-1.00/wwviaudio.c
+--- wordwarvi-1.00.orig/wwviaudio.c	2011-06-09 00:06:22.000000000 -0400
++++ wordwarvi-1.00/wwviaudio.c	2011-06-11 19:57:17.394274660 -0400
+@@ -121,7 +121,7 @@
+ 	if (clipnum >= max_sound_clips || clipnum < 0)
+ 		return -1;
+ 
+-	snprintf(filebuf, PATH_MAX, "%s/%s", DATADIR, filename);
++	snprintf(filebuf, PATH_MAX, "GENTOO_DATADIR/%s", DATADIR, filename);
+ 	rc = stat(filebuf, &statbuf);
+ 	if (rc != 0) {
+ 		strncpy(filebuf, filename, PATH_MAX);
diff --git a/games-action/wordwarvi/wordwarvi-1.00.ebuild b/games-action/wordwarvi/wordwarvi-1.00.ebuild
new file mode 100644
index 000000000000..5ec0a257860a
--- /dev/null
+++ b/games-action/wordwarvi/wordwarvi-1.00.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/wordwarvi/wordwarvi-1.00.ebuild,v 1.1 2011/06/12 00:53:19 mr_bones_ Exp $
+
+EAPI=2
+inherit eutils games
+
+DESCRIPTION="A retro side-scrolling shoot'em up based on the editor war story"
+HOMEPAGE="http://wordwarvi.sourceforge.net"
+SRC_URI="mirror://sourceforge/wordwarvi/${P}.tar.gz"
+
+LICENSE="GPL-2 CCPL-Attribution-2.0 CCPL-Attribution-ShareAlike-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="portaudio"
+
+RDEPEND="x11-libs/gtk+:2
+	portaudio? ( media-libs/libvorbis
+		>=media-libs/portaudio-19_pre1 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-sound.patch
+	sed -i \
+		-e "/^WITHAUDIO/s/yes/$(use portaudio && echo yes || echo no)/" \
+		Makefile \
+		|| die "sed failed"
+	sed -i \
+		-e "s:GENTOO_DATADIR:${GAMES_DATADIR}/${PN}:" \
+		wwviaudio.c \
+		|| die "sed failed"
+}
+
+src_compile() {
+	emake \
+		PREFIX="${GAMES_PREFIX}" \
+		DATADIR="${GAMES_DATADIR}/${PN}" \
+		MANDIR="/usr/share/man" \
+		|| die "emake failed"
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${GAMES_PREFIX}" \
+		DATADIR="${GAMES_DATADIR}/${PN}" \
+		MANDIR="/usr/share/man" \
+		install || die "emake install failed"
+	use portaudio || rm -rf "${D}${GAMES_DATADIR}"
+	dodoc README AUTHORS changelog.txt AAA_HOW_TO_MAKE_NEW_LEVELS.txt
+	newicon icons/wordwarvi_icon_128x128.png ${PN}.png
+	make_desktop_entry ${PN} "Word War vi"
+	prepgamesdirs
+}