initial import wrt #467358

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

4 files changed, 351 insertions, 2 deletions

diff --git a/games-fps/turtlearena/Manifest b/games-fps/turtlearena/Manifest
index d1be066031c6..7a7edabf1a32 100644
--- a/games-fps/turtlearena/Manifest
+++ b/games-fps/turtlearena/Manifest
@@ -1,6 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX turtlearena-0.6.1-build.patch 6389 SHA256 408ba4ab4a875aa7997c2e9c0d00f238458974c0e6dd1c3c08185c32722aa6e4 SHA512 d20dccd531d4e517106bb61955c529351c779b9b5935ad2ea2643192f79063c28860ad965218610f73da4addcffed9cad53b2b6d5faf6ee06ca66d7b23ecc77b WHIRLPOOL 0488a974baf55c860df6144554dd1c1a83dbd4e6fa61b22cf064233f82274eea1f5fadee598529f3df6ef9fb5378a4f8677ee3b117756dc8351b17b881147657
 DIST turtlearena-0.6.1-0-src.tar.bz2 33355448 SHA256 82a16aabab30b2f77e7541ec9bf0d946207b82cce49d2ef5c1d4e9b11e287c98 SHA512 aa11f66a9ec584226267d34ecd637245a068c3c13ffc49fe0ff1ca16699b3eebf6435255ad68b953fbf02f25c807833830eb76497d53bcff977814e87b804edf WHIRLPOOL 89505581cb80e744657d83e81009461131c9bb898994c51e66b3ebe442de691d871fcb5aa63042d662a537d43dac920831291861db803d01b19067cfd0aaf595
 DIST turtlearena-0.6.1-0.zip 73713016 SHA256 99dfc41e1f00c860f8f0ceb222128cc9c363f20e7bd9e830e47c4c0aceed2a09 SHA512 83c96e572687bbdc6183393d21435806b1032295156c1905d82b300bcb6e00a34cd247731f6958e65f085c4c022fc52195313bc0f44edc7a726f04367483a378 WHIRLPOOL 666582948843469cb051dcec3e3404707b7ee9a8a047bf73b6f2948a0ca4da2ab6446ea228927f8173d6fda0ca8d051738fe58f45824056dcd0a5a4336682268
-EBUILD turtlearena-0.6.1.ebuild 3067 SHA256 3d5031fff90cc1b56af35c6fdca4648c087a16fbf7bb07b6db5233c3876571dd SHA512 dd28119a2f25e3947a1fe6596eabd35f9741a1ec798e7d48269f127c9979c66ff922bd19a4acee05c0a88ff4544b8dd2464c3052dbf83e0a036461d87bed56b7 WHIRLPOOL 5e687eac7f8fce10f14245254505f3714374aafd457293d48d52439d7b0cd58a0dcf25699e0017dc8497b47ad1718c0ecd08aeca64396a91f88d8ab6063faea8
-MISC ChangeLog 319 SHA256 216d8ffb0d41b92d19c5bb7b3e08d69e54e1ed5d0bf268a12cd5b59439487108 SHA512 83b2604569406ef39ed2c03a32504a4bcc97ce1e0a4a1ecb454b9c0609686167dc5645314ad2b0cfef3ee179341980db661eca8cca0f515fefc07ccf6bb71415 WHIRLPOOL 8a17eae467e6222892cb608ef85ecdca21cc428395de24cf3f6ff464148dddb1e3b5aa720bcbb06987e5a76fece62a6ba5fe52c73b9663b9fd2c8512aff852f6
+EBUILD turtlearena-0.6.1.ebuild 3177 SHA256 3573fbcd85c1acedfe82347216d193c8b903975b597263042ac1d01427f5e68f SHA512 65ae9b72d0009bdbf525b5a057dd1f671d633d9fd649941e2efa5f6800dc421a03be1641b89c2849217a20c48ae1dda894c06ab16be499f54339b8aa3c2cbb48 WHIRLPOOL 93e5b69630c590f95916ab40b914e3f31fd62e564f093246013ff81f433ef7b52dc436cd6cc8ec34c62c1c6057bf648bcd968f7618bac73ac33479a798fb30d7
+MISC ChangeLog 414 SHA256 6d069c8e63a03a4266e834602b6e058c6f61b71f900c21a64a840f2220c26333 SHA512 f6edcd9a291c49d37649c093c2ffa13a6ef782738795045a6b716abfff71273a7b3413cbe5cbad234f44bb9c8e617b8ec02601e648e506e6e1a6223f563e5863 WHIRLPOOL 4c9b68072efc14c0f7defb7dde784898b8a34de97c0cb289670c358d20aa77600da271627bc37c31fbc7d56da650ea652d8042ea963c5fda857d14e6cd1ef94d
 MISC metadata.xml 455 SHA256 59274bd90137e89236c7252d4b7ff32695ef7143f6ae7e6f0775ff58957cfc21 SHA512 e09a66958bfeff70ce31b4a612ede1d68cfc58dba6d31b37dbb278dfb40b7e3d74b7e910132ccf0dc124796a6e4fadc7d7c5e8e584608a264913a6170850d20b WHIRLPOOL 3a434bc61307407dc7ef6f01ec1052c8c545841d15e84315b4513c6cb1be9b24810b9bfd5ab75c8d68195aa6421b0d0d0da60da2b8b87ed0450ee5e1ab93811e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJRfaD1AAoJEFpvPKfnPDWzvs4H/2Nb5X8+OkB5KZOhNyOvGmnf
+F/pcoLGkgBjbIT5OG98vffuY9xRdW4aHDMznrINayiSH2/un4l+KIyDsmpfKnKDB
+F0cujxOYkCYdJ0yRPl6sGHqwPXeVBId57Rwi0Yp9u+p0m7rDPyg3LwHFf7o5+irk
+RthVv6hykhJUQRM0BHZ0Hd57ll75XvzHQbIKRVvvQsBubFAVumXrFUrTNwdhXVdq
+NSipRMLjGrilZfow+aZc7ySLkqFRn1Ps96wuFYYKdtNkSHxxMwTx5ZCG0MrkSeiT
+wX7j/8PIzJ9dpG6lzh1GZRqql/1IoKxyRfRrcAJGFwZ6mwIJI30AcR3iVuWN0M0=
+=+AQQ
+-----END PGP SIGNATURE-----
diff --git a/games-fps/turtlearena/files/turtlearena-0.6.1-build.patch b/games-fps/turtlearena/files/turtlearena-0.6.1-build.patch
new file mode 100644
index 000000000000..76843b08ebf6
--- /dev/null
+++ b/games-fps/turtlearena/files/turtlearena-0.6.1-build.patch
@@ -0,0 +1,201 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Sat Apr 27 20:53:37 UTC 2013
+
+* use PKG_CONFIG var (used in cross compiling scripts, does
+  cross compiling even work?)
+* consistently use pkg-config where possible, define proper fallbacks
+* unbundle the unzip.c properly and fix headers
+* make -m* flags depend on CROSS_COMPILING var
+
+--- engine/Makefile
++++ engine/Makefile
+@@ -346,27 +346,31 @@
+ 
+ bin_path=$(shell which $(1) 2> /dev/null)
+ 
++PKG_CONFIG ?= pkg-config
++SDL_CONFIG ?= sdl-config
++
+ # We won't need this if we only build the server
+ ifneq ($(BUILD_CLIENT),0)
+-  # set PKG_CONFIG_PATH to influence this, e.g.
+-  # PKG_CONFIG_PATH=/opt/cross/i386-mingw32msvc/lib/pkgconfig
+-  ifneq ($(call bin_path, pkg-config),)
+-    CURL_CFLAGS=$(shell pkg-config --silence-errors --cflags libcurl)
+-    CURL_LIBS=$(shell pkg-config --silence-errors --libs libcurl)
+-    OPENAL_CFLAGS=$(shell pkg-config --silence-errors --cflags openal)
+-    OPENAL_LIBS=$(shell pkg-config --silence-errors --libs openal)
+-    SDL_CFLAGS=$(shell pkg-config --silence-errors --cflags sdl|sed 's/-Dmain=SDL_main//')
+-    SDL_LIBS=$(shell pkg-config --silence-errors --libs sdl)
+-    FREETYPE_CFLAGS=$(shell pkg-config --silence-errors --cflags freetype2)
+-  endif
+-  # Use sdl-config if all else fails
+-  ifeq ($(SDL_CFLAGS),)
+-    ifneq ($(call bin_path, sdl-config),)
+-      SDL_CFLAGS=$(shell sdl-config --cflags)
+-      SDL_LIBS=$(shell sdl-config --libs)
+-    endif
+-  endif
+-endif
++    CURL_CFLAGS=$(shell $(PKG_CONFIG) --cflags libcurl 2>/dev/null)
++    CURL_LIBS=$(shell $(PKG_CONFIG) --libs libcurl 2>/dev/null || echo "-lcurl")
++    OPENAL_CFLAGS=$(shell $(PKG_CONFIG) --cflags openal 2>/dev/null || echo "-I/usr/include/AL")
++    OPENAL_LIBS=$(shell $(PKG_CONFIG) --libs openal 2>/dev/null || echo "-lopenal")
++    SDL_CFLAGS=$(shell $(PKG_CONFIG) --cflags sdl 2>/dev/null || $(SDL_CONFIG) --cflags 2>/dev/null || echo "-I/usr/include/SDL")
++    SDL_LIBS=$(shell $(PKG_CONFIG) --libs sdl 2>/dev/null || $(SDL_CONFIG) --libs 2>/dev/null || echo "-lsdl")
++    FREETYPE_CFLAGS=$(shell $(PKG_CONFIG) --cflags freetype2 2>/dev/null || echo "-I/usr/include/freetype2")
++    FREETYPE_LIBS=$(shell $(PKG_CONFIG) --libs freetype2 2>/dev/null || echo "-lfreetype")
++    OPENGL_LIBS=$(shell $(PKG_CONFIG) --libs gl 2>/dev/null || echo "-lGL")
++    VORIBS_CFLAGS=$(shell $(PKG_CONFIG) --cflags vorbis vorbisfile 2>/dev/null)
++    VORBIS_LIBS=$(shell $(PKG_CONFIG) --libs vorbis vorbisfile 2>/dev/null || echo "-lvorbis -lvorbisfile -logg")
++    THEORA_CFLAGS=$(shell $(PKG_CONFIG) --cflags theora 2>/dev/null)
++    THEORA_LIBS=$(shell $(PKG_CONFIG) --libs theora 2>/dev/null || echo "-ltheora")
++    SPEEX_CFLAGS=$(shell $(PKG_CONFIG) --cflags speex speexdsp 2>/dev/null)
++    SPEEX_LIBS=$(shell $(PKG_CONFIG) --libs speex speexdsp 2>/dev/null || echo "-lspeex")
++endif
++
++# common deps
++ZLIB_CFLAGS=$(shell $(PKG_CONFIG) --cflags zlib minizip 2>/dev/null || echo "-I/usr/include/minizip")
++ZLIB_LIBS=$(shell $(PKG_CONFIG) --libs zlib minizip 2>/dev/null || echo "-lz -lminizip")
+ 
+ ifneq ($(BUILD_FINAL),1)
+ 	# Add svn version info
+@@ -421,7 +425,7 @@
+   endif
+ 
+   BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
+-    -pipe -DUSE_ICON
++    -DUSE_ICON
+   CLIENT_CFLAGS += $(SDL_CFLAGS)
+ 
+   OPTIMIZEVM = -O3 -funroll-loops -fomit-frame-pointer
+@@ -470,25 +474,29 @@
+   LIBS=-ldl -lm
+ 
+   CLIENT_LIBS=$(SDL_LIBS)
+-  RENDERER_LIBS = $(SDL_LIBS) -lGL
++  RENDERER_LIBS = $(SDL_LIBS) $(OPENGL_LIBS)
+ 
+   ifeq ($(USE_OPENAL),1)
+     ifneq ($(USE_OPENAL_DLOPEN),1)
+-      CLIENT_LIBS += -lopenal
+-    endif
++      CLIENT_CFLAGS += $(OPENAL_CFLAGS)
++      CLIENT_LIBS += $(OPENAL_LIBS)
++  endif
+   endif
+ 
+   ifeq ($(USE_CURL),1)
+     ifneq ($(USE_CURL_DLOPEN),1)
+-      CLIENT_LIBS += -lcurl
++      CLIENT_CFLAGS += $(CURL_CFLAGS)
++      CLIENT_LIBS += $(CURL_LIBS)
+     endif
+   endif
+ 
+   ifeq ($(USE_CODEC_VORBIS),1)
+-    CLIENT_LIBS += -lvorbisfile -lvorbis -logg
++    CLIENT_CFLAGS += $(VORBIS_CFLAGS)
++    CLIENT_LIBS += $(VORBIS_LIBS)
+   endif
+   ifeq ($(USE_CODEC_THEORA),1)
+-    CLIENT_LIBS += -ltheora
++    CLIENT_CFLAGS += $(THEORA_CFLAGS)
++    CLIENT_LIBS += $(THEORA_LIBS)
+   endif
+ 
+   ifeq ($(USE_MUMBLE),1)
+@@ -503,14 +511,18 @@
+     BASE_CFLAGS += $(FREETYPE_CFLAGS)
+   endif
+ 
++  # cross-compiling tweaks
+   ifeq ($(ARCH),i386)
+-    # linux32 make ...
+-    BASE_CFLAGS += -m32
+-  else
+-  ifeq ($(ARCH),ppc64)
+-    BASE_CFLAGS += -m64
++    ifeq ($(CROSS_COMPILING),1)
++      BASE_CFLAGS += -m32
++    endif
+   endif
++  ifeq ($(ARCH),amd64)
++    ifeq ($(CROSS_COMPILING),1)
++      BASE_CFLAGS += -m64
++    endif
+   endif
++
+ else # ifeq Linux
+ 
+ #############################################################################
+@@ -1155,7 +1167,8 @@
+   ifeq ($(USE_INTERNAL_SPEEX),1)
+     CLIENT_CFLAGS += -DFLOATING_POINT -DUSE_ALLOCA -I$(SPEEXDIR)/include
+   else
+-    CLIENT_LIBS += -lspeex -lspeexdsp
++    CLIENT_CFLAGS += $(SPEEX_CFLAGS)
++    CLIENT_LIBS += $(SPEEX_LIBS)
+   endif
+ endif
+ 
+@@ -1163,7 +1176,8 @@
+   BASE_CFLAGS += -DNO_GZIP
+   BASE_CFLAGS += -I$(ZDIR)
+ else
+-  LIBS += -lz
++  BASE_CFLAGS += $(ZLIB_CFLAGS)
++  LIBS += $(ZLIB_LIBS)
+ endif
+ 
+ ifeq ($(USE_INTERNAL_JPEG),1)
+@@ -1177,7 +1191,8 @@
+   BASE_CFLAGS += -I$(FTDIR)/include \
+ 					-DFT2_BUILD_LIBRARY
+ else
+-  RENDERER_LIBS += -lfreetype
++  BASE_CFLAGS += $(FREETYPE_CFLAGS)
++  RENDERER_LIBS += $(FREETYPE_LIBS)
+ endif
+ 
+ ifeq ("$(CC)", $(findstring "$(CC)", "clang" "clang++"))
+@@ -1650,8 +1665,6 @@
+   $(B)/client/q_math.o \
+   $(B)/client/q_shared.o \
+   \
+-  $(B)/client/unzip.o \
+-  $(B)/client/ioapi.o \
+   $(B)/client/puff.o \
+   $(B)/client/vm.o \
+   $(B)/client/vm_interpreted.o \
+@@ -2076,8 +2089,6 @@
+   $(B)/ded/q_math.o \
+   $(B)/ded/q_shared.o \
+   \
+-  $(B)/ded/unzip.o \
+-  $(B)/ded/ioapi.o \
+   $(B)/ded/vm.o \
+   $(B)/ded/vm_interpreted.o \
+   \
+--- engine/code/qcommon/files.c
++++ engine/code/qcommon/files.c
+@@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin St, Fifth
+ 
+ #include "q_shared.h"
+ #include "qcommon.h"
+-#include "unzip.h"
++#include <minizip/unzip.h>
+ 
+ /*
+ =============================================================================
+--- engine/code/renderer/tr_public.h
++++ engine/code/renderer/tr_public.h
+@@ -25,7 +25,7 @@
+ #include "tr_types.h"
+ 
+ #ifdef IOQ3ZTM // PNG_SCREENSHOTS
+-#include "../zlib/zlib.h"
++#include <zlib.h>
+ #endif
+ 
+ #define	REF_API_VERSION		8
diff --git a/games-fps/turtlearena/metadata.xml b/games-fps/turtlearena/metadata.xml
new file mode 100644
index 000000000000..a49183660599
--- /dev/null
+++ b/games-fps/turtlearena/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>games</herd>
+	<maintainer>
+		<email>hasufell@gentoo.org</email>
+		<name>Julian Ospald</name>
+	</maintainer>
+	<use>
+	    <flag name="mumble">Adds player-location (positional audio) support to VoIP</flag>
+		<flag name="server">Build server target</flag>
+	    <flag name="voice">Adds VoIP support</flag>
+	</use>
+</pkgmetadata>
diff --git a/games-fps/turtlearena/turtlearena-0.6.1.ebuild b/games-fps/turtlearena/turtlearena-0.6.1.ebuild
new file mode 100644
index 000000000000..2939955fcf83
--- /dev/null
+++ b/games-fps/turtlearena/turtlearena-0.6.1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/turtlearena/turtlearena-0.6.1.ebuild,v 1.1 2013/04/28 22:21:38 hasufell Exp $
+
+EAPI=5
+
+inherit eutils gnome2-utils games
+
+MY_P=${PN/-/}-${PV}
+
+DESCRIPTION="A turtle featuring free and open source third-person action game (ioq3 engine)"
+HOMEPAGE="http://ztm.x10host.com/ta/index.htm"
+SRC_URI="http://turtlearena.googlecode.com/files/${MY_P}-0-src.tar.bz2
+	http://turtlearena.googlecode.com/files/${MY_P}-0.zip"
+
+LICENSE="GPL-2 CC-BY-SA-3.0 mplus-fonts lcc"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+curl debug dedicated mumble openal server theora voice vorbis"
+
+RDEPEND="
+	sys-libs/zlib[minizip]
+	!dedicated? (
+		media-libs/freetype:2
+		media-libs/libsdl[X,audio,joystick,opengl,video]
+		virtual/jpeg
+		virtual/opengl
+		curl? ( net-misc/curl )
+		openal? ( media-libs/openal )
+		theora? ( media-libs/libtheora )
+		voice? (
+			media-libs/speex
+			mumble? ( media-sound/mumble )
+		)
+		vorbis? ( media-libs/libvorbis )
+	)"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}-0-src
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build.patch
+
+	rm -r engine/code/{AL,libcurl,libogg,libspeex,libtheora,libvorbis,SDL12,zlib} \
+		engine/code/freetype* engine/code/jpeg-* \
+		engine/code/qcommon/unzip.{c,h} || die
+}
+
+src_compile() {
+	buildit() { use $1 && echo 1 || echo 0 ; }
+	nobuildit() { use $1 && echo 0 || echo 1 ; }
+
+	myarch=$(usex amd64 "x86_64" "x86")
+	emake -C engine \
+		Q="" \
+		ARCH=${myarch} \
+		CROSS_COMPILING=0 \
+		BUILD_GAME_QVM=0 \
+		BUILD_GAME_SO=0 \
+		BUILD_CLIENT=$(nobuildit dedicated) \
+		BUILD_SERVER=$(usex dedicated "1" "$(buildit server)") \
+		DEFAULT_BASEDIR="${GAMES_DATADIR}/${PN}" \
+		GENERATE_DEPENDENCIES=0 \
+		OPTIMIZEVM="" \
+		OPTIMIZE="" \
+		DEBUG_CFLAGS="" \
+		USE_MUMBLE=$(buildit mumble) \
+		USE_VOIP=$(buildit voice) \
+		USE_INTERNAL_SPEEX=0 \
+		USE_INTERNAL_OGG=0 \
+		USE_INTERNAL_ZLIB=0 \
+		USE_INTERNAL_JPEG=0 \
+		USE_INTERNAL_FREETYPE=0 \
+		USE_CODEC_VORBIS=$(buildit vorbis) \
+		USE_INTERNAL_VORBIS=0 \
+		USE_CODEC_THEORA=$(buildit theora) \
+		USE_OPENAL=$(buildit openal) \
+		USE_OPENAL_DLOPEN=0 \
+		USE_CURL=$(buildit curl) \
+		USE_CURL_DLOPEN=0 \
+		USE_LOCAL_HEADERS=0 \
+		$(usex debug "debug" "release")
+}
+
+src_install() {
+	dodoc engine/{ChangeLog,BUGS,TODO}
+	use voice && dodoc engine/voip-readme.txt
+
+	if ! use dedicated ; then
+		newgamesbin engine/build/$(usex debug "debug" "release")-linux-${myarch}/turtlearena.${myarch} turtlearena
+		newicon -s scalable engine/misc/quake3-tango.svg ${PN}.svg
+		newicon -s 256 engine/misc/quake3-tango.png ${PN}.png
+		make_desktop_entry ${PN}
+	fi
+
+	if use dedicated || use server ; then
+		newgamesbin engine/build/$(usex debug "debug" "release")-linux-${myarch}/turtlearena-server.${myarch} turtlearena-server
+	fi
+
+	insinto "${GAMES_DATADIR}/${PN}"
+	doins -r "${WORKDIR}"/${MY_P}-0/base
+
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	use dedicated || gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	use dedicated || gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	use dedicated || gnome2_icon_cache_update
+}