Version bump to 1.6 Bug #350264

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

4 files changed, 119 insertions, 15 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/Manifest b/games-fps/worldofpadman/Manifest
index 50872e6cf4d7..1303ddb08145 100644
--- a/games-fps/worldofpadman/Manifest
+++ b/games-fps/worldofpadman/Manifest
@@ -1,27 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX worldofpadman-1.6-gentoo.patch 524 RMD160 82c47b1be2dfa7907cf7dd8e20b5cf06d2a16bff SHA1 0d2bdbf4e31303438a6b548251b9011bfd23fe80 SHA256 151467453ca218397e202be804f23d2022fc14802b72dbe5535db6bc5961a7ac
+DIST wop-1.5-unified.zip 947290087 RMD160 5a2e1ffdd0f331590d4bce47ae39ca816b18164b SHA1 ff3b24e7067dee9863e83fef19807899530f7445 SHA256 82af4a8b93cac1a6fa8deb2607e9b0a15255f8386b0c8cb21d6e532ac6c601f5
+DIST wop-1.5.x-to-1.6-patch-unified.zip 122204892 RMD160 3563e55acd98f217c496e671bac9f921cf71e64b SHA1 bc83939f1991a5edb3329d35c028a9f54227f3d4 SHA256 fe120218823825d742c506b2f448e15bf6ca756b99bc1d11d12749191e12c4c7
 DIST wop-engine-1.2.tar.bz2 6083105 RMD160 dc9fc47072ab32f8219b050db58b3e730c7f34b8 SHA1 9b9da3e7526043df941cac29f6b58ce7a93c6542 SHA256 23d7c68736796a1566fdb2b4398c18420fbceaaa9e9c385a0332cda2788fa976
 DIST wop_padpack.zip 60771258 RMD160 264f24ea2b12dc6b5c999d52bced15c6407737dc SHA1 75b55fd5c32a018893a9e09d5460630d4c550fd4 SHA256 5737079b80fec3ed9d9eb7097b5861ce489a70e2313619025ba724a6be90fa1f
 DIST wop_patch_1_2.run 72187892 RMD160 8da168113f37e57f15bda46586be0573770c6d4d SHA1 7dbbbd6576b39f234ff46a927713c7a6c2c9c807 SHA256 6aa682063a36177f1c5d663259c2516bc555cc976e3caaeaa30f8a77b3954930
 DIST worldofpadman.run 576952895 RMD160 314b16ef92346e9ff25da39b2fcf148f5423c9a3 SHA1 cd6e37bf6148fbd7a2f1553d6c52bd9aa7c6193f SHA256 35ca142d9f212ac25781f2a28ae4a60180c9e93dcd0acee7d2125bf49871582d
 EBUILD worldofpadman-1.2-r1.ebuild 2333 RMD160 8929546de7f14f07e135c48aeac435824ae12154 SHA1 48178999a4b838bd90ebc58101c5f29eaf4c1eb5 SHA256 48f52a48733940b0e478971228f63e2d5f86b930c1ca3cedc4a745ddd78a2f82
-MISC ChangeLog 1192 RMD160 173ae960b5a7dc5c198237f5700f62e6fff3611a SHA1 a718751bad34cacd6276b8d8624338cc87e96ce5 SHA256 a83aa128f14472059d5fcb129f036af6d3c5a5b5082cd5ed8d1d2cbd6a3f36ab
+EBUILD worldofpadman-1.6.ebuild 2282 RMD160 9550e11f6e099a312b9ce4d1ec226b51d474592e SHA1 72f13de3b41e1a9f0b5dabec22a02b310025ca74 SHA256 4955c3799dc20885443cc7ef1731a65fc8f60a63f45679d9db9ca6b37ff6099b
+MISC ChangeLog 1389 RMD160 2e33146fd5e55fbec06aaf982b677e8e67e67d8e SHA1 51ad235f0e7cd4286711230a8cd4b92cf6b56e37 SHA256 d378d8ba57a13950fa6d071379d946e61c0acc565516dc0b0c73cde6c0b76673
 MISC metadata.xml 235 RMD160 aa0c60d8e162d5720851d213ee34c152d1de6712 SHA1 039cceb76a7f0e8b80b1704ebd8ad8501ea84f61 SHA256 ba7e89e78da07591bbf79b474180b7d9f4e53e8f877663be273bf0b7a6af7c29
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPLhzyAAoJELEHsLL7fEFWeVgP/AqgQLpbN/x2HL5h3oQbs+oR
-9ESTnqqB3+RW1POBGnUVgPSucNdVep0aoMbFOQvVvaU7vB/m6B/DyfBTs3kgl5aG
-A9lxX05TO9zawHyHFnUJKBHFqiR5vYi4MyOzo6l8RsMnfeMmId56UIVDw9WmLcB+
-/aZl4wM8Ls0LTXB+F9NSyULaNcEmQPQCZOMru5JzSszEgNsCgbOwq+E1Ua/u4W6w
-h8vuIy+Ft5NVHcJmcEk6VB2QTIypshfuYw63QDXX+rOVynJydqiUF9B/+PASOwjQ
-i+2ZLlTE3P5xHqWul96eFE91i5ayC4zY1LQMbwTrPufKWtry9IL4iiD1pQfnIkgG
-Fz4VIwUDmcEPboMxJFPHxb+J9CA3q6cUFuK/OXcc25BVHegNWKZk9WRx4kM1zEPI
-gqt2QwNLGwGkWVn9F5K2YcqrlZMmC8PGh1KE4QmDB8XlvYXNWZeZ7RH1jaN+luzt
-xkebMeWPmdccKKjK1DPmwat5zrmtWqCb87R7/trl5HE5+jrQsS9x5Ne9sS71V+Bh
-0WZUt64Y0kwLI7AfERB4nggUbzfBGe5NgGWAXoQ/df2Oww7ZjYXHNRjFgmokB2ML
-X0Pcv/jPgWj0oqp9EOe97aYBcIJhyOQv0dnf+D+6pLFMjiMY54oJTJier/QJYsGZ
-r5DdkvQR38oSrhgbANKv
-=i0bG
+iEYEARECAAYFAk9H92IACgkQIY77eQFFFC2EowCg6ndMAKIgqkh5RRmS6gKxyuvU
+OXAAnjRO3ZZaaZGKxtVE8tm45CAQy2qk
+=Y0W+
 -----END PGP SIGNATURE-----
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
+}