Version bump to 1.6 Bug #350264

(Portage version: 2.1.10.49/cvs/Linux i686)

3 files changed, 111 insertions, 1 deletions

diff --git a/games-fps/worldofpadman/ChangeLog b/games-fps/worldofpadman/ChangeLog
index bcc78df74a11..a529a8208f79 100644
--- a/games-fps/worldofpadman/ChangeLog
+++ b/games-fps/worldofpadman/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-fps/worldofpadman
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/worldofpadman/ChangeLog,v 1.7 2012/02/05 06:08:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/worldofpadman/ChangeLog,v 1.8 2012/02/24 20:47:16 tupone Exp $
+
+*worldofpadman-1.6 (24 Feb 2012)
+
+  24 Feb 2012; Tupone Alfredo <tupone@gentoo.org> +worldofpadman-1.6.ebuild,
+  +files/worldofpadman-1.6-gentoo.patch:
+  Version bump to 1.6 Bug #350264 by daniel
 
   05 Feb 2012; Mike Frysinger <vapier@gentoo.org> worldofpadman-1.2-r1.ebuild:
   Move to new unpacker eclass for unpack_makeself.
diff --git a/games-fps/worldofpadman/files/worldofpadman-1.6-gentoo.patch b/games-fps/worldofpadman/files/worldofpadman-1.6-gentoo.patch
new file mode 100644
index 000000000000..1fc70501e6a6
--- /dev/null
+++ b/games-fps/worldofpadman/files/worldofpadman-1.6-gentoo.patch
@@ -0,0 +1,11 @@
+--- Makefile.old	2012-02-23 12:15:09.582701642 +0100
++++ Makefile	2012-02-23 12:15:37.970700295 +0100
+@@ -1780,7 +1780,7 @@
+ 
+ $(B)/wop-smp$(FULLBINEXT): $(Q3OBJ) $(Q3ROBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN)
+ 	$(echo_cmd) "LD $@"
+- 	$(Q)$(CC) $(CLIENT_CFLAGS) $(CFLAGS) $(CLIENT_LDFLAGS) $(LDFLAGS) $(THREAD_LDFLAGS) \
++	$(Q)$(CC) $(CLIENT_CFLAGS) $(CFLAGS) $(CLIENT_LDFLAGS) $(LDFLAGS) $(THREAD_LDFLAGS) \
+ 		-o $@ $(Q3OBJ) $(Q3ROBJ) $(Q3POBJ_SMP) \
+  		$(THREAD_LIBS) $(LIBSDLMAIN) $(CLIENT_LIBS) $(RENDERER_LIBS) $(LIBS)
+ endif
diff --git a/games-fps/worldofpadman/worldofpadman-1.6.ebuild b/games-fps/worldofpadman/worldofpadman-1.6.ebuild
new file mode 100644
index 000000000000..c0735e92d906
--- /dev/null
+++ b/games-fps/worldofpadman/worldofpadman-1.6.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/worldofpadman/worldofpadman-1.6.ebuild,v 1.1 2012/02/24 20:47:16 tupone Exp $
+
+EAPI=3
+
+inherit base games
+
+DESCRIPTION="A cartoon style multiplayer first-person shooter"
+HOMEPAGE="http://worldofpadman.com/"
+SRC_URI="mirror://sourceforge/${PN}/wop-1.5-unified.zip
+	mirror://sourceforge/${PN}/wop-1.5.x-to-1.6-patch-unified.zip"
+
+LICENSE="GPL-2 worldofpadman"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+curl dedicated maps +openal +theora +vorbis"
+
+RDEPEND="sys-libs/zlib
+	!dedicated? (
+		media-libs/speex
+		virtual/jpeg
+		media-libs/libsdl
+		virtual/opengl
+		openal? ( media-libs/openal )
+		curl? ( net-misc/curl )
+		vorbis? ( media-libs/libvorbis )
+		theora? (
+			media-libs/libtheora
+			media-libs/libogg
+		)
+	)"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S="${WORKDIR}"/${P}_svn2178-src
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_unpack() {
+	unpack ${A}
+	unzip XTRAS/"editing files"/${P}-src.zip
+}
+
+src_compile() {
+	local arch
+
+	if use amd64 ; then
+		arch=x86_64
+	elif use x86 ; then
+		arch=i386
+	fi
+
+	emake \
+		V=1 \
+		ARCH=${arch} \
+		BUILD_CLIENT=$(use dedicated && echo 0) \
+		DEFAULT_BASEDIR="${GAMES_DATADIR}"/${PN} \
+		OPTIMIZE= \
+		USE_CURL=$(use curl && echo 1 || echo 0) \
+		USE_CURL_DLOPEN=0 \
+		USE_OPENAL=$(use openal && echo 1 || echo 0) \
+		USE_OPENAL_DLOPEN=0 \
+		USE_CODEC_VORBIS=$(use vorbis && echo 1 || echo 0) \
+		USE_CIN_THEORA=$(use theora && echo 1 || echo 0) \
+		USE_RENDERER_DLOPEN=0 \
+		USE_INTERNAL_ZLIB=0 \
+		USE_INTERNAL_JPEG=0 \
+		USE_INTERNAL_SPEEX=0 \
+		|| die "died running emake"
+}
+
+src_install() {
+	newgamesbin build/release-*/wopded.* ${PN}-ded \
+		|| die "newgamesbin ${PN}-ded failed"
+	if ! use dedicated ; then
+		newgamesbin build/release-*/wop.* ${PN} \
+			|| die "newgamesbin ${PN} failed"
+		newicon misc/quake3.png ${PN}.png || die "newicon failed"
+		make_desktop_entry ${PN} "World of Padman"
+	fi
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r ../wop || die "doins failed"
+
+	dodoc id-readme.txt \
+		IOQ3-README \
+		voip-readme.txt \
+		../XTRAS/changelog.txt \
+		../XTRAS/sounds_readme.txt \
+		|| die "dodoc failed"
+	dohtml -r ../XTRAS/readme{,.html} || die "dohtml failed"
+	prepgamesdirs
+}