Fix Makefile ARCH setting which was disabling the bytecode compiler on amd64; add openal USE flag; respect LDFLAGS

Package-Manager: portage-2.2_rc42/cvs/Linux x86_64

3 files changed, 113 insertions, 3 deletions

diff --git a/games-fps/worldofpadman/ChangeLog b/games-fps/worldofpadman/ChangeLog
index 62d126c0acbd..ec87ff09e01a 100644
--- a/games-fps/worldofpadman/ChangeLog
+++ b/games-fps/worldofpadman/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-fps/worldofpadman
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/worldofpadman/ChangeLog,v 1.2 2008/03/17 22:45:00 nyhm Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/worldofpadman/ChangeLog,v 1.3 2009/09/27 18:33:00 nyhm Exp $
+
+*worldofpadman-1.2-r1 (27 Sep 2009)
+
+  27 Sep 2009; Tristan Heaven <nyhm@gentoo.org>
+  +worldofpadman-1.2-r1.ebuild:
+  Fix Makefile ARCH setting which was disabling the bytecode compiler on
+  amd64; add openal USE flag; respect LDFLAGS
 
   17 Mar 2008; Tristan Heaven <nyhm@gentoo.org> worldofpadman-1.2.ebuild:
   Add ~amd64 keyword, bug #207565
diff --git a/games-fps/worldofpadman/Manifest b/games-fps/worldofpadman/Manifest
index e85045d4136d..2a3f488fbdfa 100644
--- a/games-fps/worldofpadman/Manifest
+++ b/games-fps/worldofpadman/Manifest
@@ -1,7 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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 2299 RMD160 3841c58c4f3fb2d1985fcd49bfc2ca760186a80e SHA1 3421824a65852b14285f7314e552c050170ffce8 SHA256 5503d5e9a7b4bc412bbba3fc54f74444786f81747e55e79bc5ffd274b42b4107
 EBUILD worldofpadman-1.2.ebuild 2020 RMD160 65390dffc770d5a14ca85956d326fed4bded7985 SHA1 c932394cfacbc6dffedf7aa6f2a1acb5ea402979 SHA256 28eee52d6d92ed6c206c49694cb86f52b07ba98395536a639be6d1fef2bfd66f
-MISC ChangeLog 483 RMD160 682064842d77a2622587717b2038829dd6f52477 SHA1 104df061a65467d60203d2dd1b5b97e8a211752e SHA256 df88d4a5eb8b9f7dc71fedd625c0ec09a60c364366da730106d6a0f74d4bdad4
+MISC ChangeLog 720 RMD160 a08be9f8e95019a6e59559b4cfede1dd1aed79e2 SHA1 53e4d57f7d20d884b2e19213bd932c6ca3be8f6e SHA256 6aac5fcc7eca97081b939f582b0b91bea359528b949e4e4eaeb4c09dc8c86f1c
 MISC metadata.xml 235 RMD160 aa0c60d8e162d5720851d213ee34c152d1de6712 SHA1 039cceb76a7f0e8b80b1704ebd8ad8501ea84f61 SHA256 ba7e89e78da07591bbf79b474180b7d9f4e53e8f877663be273bf0b7a6af7c29
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkq/r+IACgkQdz7hIScOURE3vwCg1rHP4Ca/8FvFsX0j+ZRN7TbT
+vIwAoIleI0HsLTrj8QGpjfD8zs9FaIeN
+=1yMr
+-----END PGP SIGNATURE-----
diff --git a/games-fps/worldofpadman/worldofpadman-1.2-r1.ebuild b/games-fps/worldofpadman/worldofpadman-1.2-r1.ebuild
new file mode 100644
index 000000000000..177e26687ab4
--- /dev/null
+++ b/games-fps/worldofpadman/worldofpadman-1.2-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/worldofpadman/worldofpadman-1.2-r1.ebuild,v 1.1 2009/09/27 18:33:00 nyhm Exp $
+
+EAPI=2
+inherit eutils games
+
+MY_P=wop-engine-${PV}
+DESCRIPTION="A cartoon style multiplayer first-person shooter"
+HOMEPAGE="http://worldofpadman.com/"
+SRC_URI="ftp://kickchat.com/wop/${MY_P}.tar.bz2
+	ftp://kickchat.com/wop/wop_patch_${PV/./_}.run
+	http://thilo.kickchat.com/download/${PN}.run
+	maps? ( http://thilo.kickchat.com/download/wop_padpack.zip )"
+
+LICENSE="GPL-2 worldofpadman"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dedicated maps openal opengl"
+
+UIDEPEND="virtual/opengl
+	media-libs/libsdl
+	media-libs/libogg
+	media-libs/libvorbis
+	net-misc/curl
+	openal? ( media-libs/openal )"
+RDEPEND="opengl? ( ${UIDEPEND} )
+	!opengl? ( !dedicated? ( ${UIDEPEND} ) )"
+DEPEND="${RDEPEND}
+	maps? ( app-arch/unzip )"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${MY_P}.tar.bz2
+	unpack_makeself ${PN}.run
+	unpack_makeself wop_patch_1_2.run
+	unpack ./readme.tar
+	mkdir wop
+	cd wop
+	unpack ./../wop-data.tar
+	unpack ./../wop-data-${PV}.tar
+	use dedicated && unpack ./../extras.tar || rm -f *.cfg
+	use maps && unpack wop_padpack.zip
+}
+
+src_prepare() {
+	sed -i \
+		-e '/ LDFLAGS=/s:=:+=:' \
+		Makefile \
+		|| die "sed failed"
+}
+
+src_compile() {
+	local arch
+
+	if use amd64 ; then
+		arch=x86_64
+	elif use x86 ; then
+		arch=i386
+	fi
+
+	emake \
+		ARCH=${arch} \
+		BUILD_CLIENT=$(use opengl || ! use dedicated && echo 1 || echo 0) \
+		BUILD_SERVER=$(use dedicated && echo 1 || echo 0) \
+		DEFAULT_BASEDIR="${GAMES_DATADIR}"/${PN} \
+		OPTIMIZE= \
+		USE_CURL_DLOPEN=0 \
+		USE_LOCAL_HEADERS=0 \
+		USE_OPENAL=$(use openal && echo 1 || echo 0) \
+		USE_OPENAL_DLOPEN=0 \
+		|| die "emake failed"
+}
+
+src_install() {
+	cd build/release-*
+	if use opengl || ! use dedicated ; then
+		newgamesbin wop-engine.* ${PN} || die "newgamesbin ${PN} failed"
+		newicon "${WORKDIR}"/wop.png ${PN}.png
+		make_desktop_entry ${PN} "World of Padman"
+	fi
+	if use dedicated ; then
+		newgamesbin wopded.* ${PN}-ded || die "newgamesbin ${PN}-ded failed"
+	fi
+	cd "${WORKDIR}"
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r wop || die "doins failed"
+	dohtml -r readme readme.html
+	dodoc wop_patch_*.txt
+	prepgamesdirs
+}