gentoo resync : 14.07.2018

7 files changed, 225 insertions, 0 deletions

diff --git a/games-action/bzflag/Manifest b/games-action/bzflag/Manifest
new file mode 100644
index 000000000000..171c3ec8b98b
--- /dev/null
+++ b/games-action/bzflag/Manifest
@@ -0,0 +1,8 @@
+AUX bzflag-2.4.12-configure.patch 1113 BLAKE2B 922feac9bb501d21a0b5decbc3ae8aff96f8f5d6747868bc46e25145d8908a238dbfa406238f5d023e6c72bf4daf3bc5ff8d1dbeb384aef65d9cf034ea5ab26e SHA512 f3b6cc3422c3d4f0c4b39fa58e440f4a4cc1b2e0a56a4cad41eae3cbaf1d23e153b711246420143bb3132fa5e87538d814653131e0adf5cfe752b68ff4d82f05
+AUX bzflag-2.4.12-sdl2-cppflags.patch 437 BLAKE2B e7abcaf318a67f9252e32be1215b1e80edfbe0926bdf5533849f39b5366a3acaf19bec88428bb700a7be2fe2a63053006c69d1284e4050adbf71e0f34d853394 SHA512 eb59f965b716869168cc5dc40f8b4e55d27abe997e83f2434de5e54802b6b29410e43b3fb00e5ede7da56e631bb4e0daaabd3072b4577e14127e54aa2fab9428
+AUX bzflag-2.4.12-tinfo.patch 683 BLAKE2B 720a6b5aa97a474c2e37bb2927cd9680a55249e732f6f07cc894e114c745b15886325a2d56a7731d397580a1dedba6be1acb71086e146bb8af2f983c908b3bb0 SHA512 f670e7362fc81055d3996a16c213746fa55338aed0756c36565c856eae4e7f9ed8bed3b2b2955b659f83bf03d4b4249b53a7ea02e614409fe38dbcd215c805da
+DIST bzflag-2.4.12.tar.bz2 14042357 BLAKE2B eb18072f459549b18bf99fbe0b635aea24568ad39494082f443e8eb7a604db0341aa18f1d458a950b5344f34278599215b351bcad35bd88f33f01449b89489b8 SHA512 9b5fa6b7ab7eb13043242defcc86cbed083e98306b2f611932b48d6d833a37bbe2ab05a0a3d1a2c9b861bfbd834fc6e86783ba82d8a841527d0eedb06f3bde9f
+DIST bzflag-2.4.14.tar.bz2 14066129 BLAKE2B 7ec44bc9b7ccb644b98dac0b99770471b488b9e34b12a34e4fa76cdc22a4e7b14324915b83db76a69bb4b8ebd928018e69145aa6b87e48a379d37c23ce84c575 SHA512 c092a869813bd300e5eff5bf17ea46708b566a9e4f56cb6c4ccd92346ab1e87c8837efb8295d3b4485cd8d4de5b0d92b079c70390d06a481cfee693d393aca21
+EBUILD bzflag-2.4.12.ebuild 1214 BLAKE2B 479c7b6f185e2ef76eb1a609e7a95920e1a2a026892af6f1800a9a68bdfbf065488a1a54d0a3fe84afc2bc05131a9396906386c0d57d8c5cd6f9644bbff8456c SHA512 2d4737201bad699ebde6b2e9175d10672016e3c895bb3e9d9c4a125752935796ae25a11011e1aae1af1aca9ff3b229a319d0847cb4d1bd6735dd56b4acfd3b18
+EBUILD bzflag-2.4.14.ebuild 1346 BLAKE2B 35937e3904679a061ac44200876fff419b64c83f6ae14bd8a22438d898e4f425df83a90e8d835d73a721a8bf619d7f7462989ecca92175fbc387c425427098bd SHA512 cb27d9b6ed99c028f4caf462b43cd6a92e67c6a7a5bfe1818969e8a4c4c7004e5e3a7214bb0d155cc4eff43c7bf93f25dc7a3ebca096fd7dc6b9095fa9a24627
+MISC metadata.xml 329 BLAKE2B 045c2426f059b10e768ba5764ec7c26ad95f98ca1754358df18faa4ec58d3b26c02d905222c877c6d508eeb47f3ae3f22dd319b1d719f169e91ab31d824ab30d SHA512 4f9e157aef5067fb6a97fd7d7e68f758a280a37b8093c7291b45ada10169ca8c79ee0e7770fdbcc4d2de517b7bf05f1e3585585c72c1fdf7692d4e568f5d8301
diff --git a/games-action/bzflag/bzflag-2.4.12.ebuild b/games-action/bzflag/bzflag-2.4.12.ebuild
new file mode 100644
index 000000000000..0f6e8a8722e5
--- /dev/null
+++ b/games-action/bzflag/bzflag-2.4.12.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic autotools
+
+DESCRIPTION="3D tank combat simulator game"
+HOMEPAGE="https://www.bzflag.org/"
+SRC_URI="https://download.bzflag.org/bzflag/source/${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dedicated upnp"
+
+RDEPEND="
+	net-dns/c-ares
+	>=net-misc/curl-7.15.0
+	sys-libs/ncurses:0
+	sys-libs/zlib
+	!dedicated? (
+		media-libs/libsdl2[joystick,sound,video]
+		virtual/glu
+		virtual/opengl )
+	upnp? ( net-libs/miniupnpc )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+PATCHES=(
+	"${FILESDIR}"/${P}-configure.patch
+	"${FILESDIR}"/${P}-tinfo.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	if use dedicated ; then
+		ewarn
+		ewarn "You are building a server-only copy of BZFlag"
+		ewarn
+		myconf="--disable-client --without-SDL"
+	fi
+
+	econf \
+		$(use_enable upnp UPnP) \
+		${myconf}
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog DEVINFO PORTING README README.Linux" \
+		default
+
+	if ! use dedicated ; then
+		newicon data/bzflag-48x48.png ${PN}.png
+		make_desktop_entry ${PN} "BZFlag"
+	fi
+
+	prune_libtool_files --modules
+}
diff --git a/games-action/bzflag/bzflag-2.4.14.ebuild b/games-action/bzflag/bzflag-2.4.14.ebuild
new file mode 100644
index 000000000000..290ef54d300a
--- /dev/null
+++ b/games-action/bzflag/bzflag-2.4.14.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic autotools
+
+DESCRIPTION="3D tank combat simulator game"
+HOMEPAGE="https://www.bzflag.org/"
+SRC_URI="https://download.bzflag.org/bzflag/source/${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dedicated upnp"
+
+RDEPEND="
+	net-dns/c-ares
+	>=net-misc/curl-7.15.0
+	sys-libs/ncurses:0
+	sys-libs/zlib
+	!dedicated? (
+		media-libs/libsdl2[joystick,sound,video]
+		virtual/glu
+		virtual/opengl )
+	upnp? ( net-libs/miniupnpc )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4.12-configure.patch
+	"${FILESDIR}"/${PN}-2.4.12-tinfo.patch
+	"${FILESDIR}"/${PN}-2.4.12-sdl2-cppflags.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	if use dedicated ; then
+		ewarn
+		ewarn "You are building a server-only copy of BZFlag"
+		ewarn
+		myconf="--disable-client --without-SDL"
+	else
+		myconf="--with-SDL=2"
+	fi
+
+	econf \
+		$(use_enable upnp UPnP) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		${myconf}
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog DEVINFO PORTING README README.Linux" \
+		default
+
+	if ! use dedicated ; then
+		newicon data/bzflag-48x48.png ${PN}.png
+		make_desktop_entry ${PN} "BZFlag"
+	fi
+
+	prune_libtool_files --modules
+}
diff --git a/games-action/bzflag/files/bzflag-2.4.12-configure.patch b/games-action/bzflag/files/bzflag-2.4.12-configure.patch
new file mode 100644
index 000000000000..e1c546f37a34
--- /dev/null
+++ b/games-action/bzflag/files/bzflag-2.4.12-configure.patch
@@ -0,0 +1,36 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -215,7 +215,7 @@
+ AC_SUBST(AR)
+ AC_SUBST(AR_FLAGS)
+ 
+-AC_PATH_PROG(CCACHE, ccache)
++AC_PATH_PROG(CCACHE, ccachex)
+ if test "$CCACHE" ; then
+     CC="ccache $CC"
+     CXX="ccache $CXX"
+@@ -747,13 +747,13 @@
+ #
+ # the GCC version is known to be at least 4.3 because it has C++0x support
+ # possible future warnings: -Wconversion (1894) -Wfloat-equal (317)
+-FLAGS="-Wall -Wextra -Wcast-qual -Wredundant-decls -Wshadow -Wundef -pedantic"
++FLAGSx="-Wall -Wextra -Wcast-qual -Wredundant-decls -Wshadow -Wundef -pedantic"
+ case $host_os in
+      linux*)
+ 	AC_DEFINE(HALF_RATE_AUDIO, 1, [Half rate Audio])
+ 	CONF_CFLAGS="$CONF_CFLAGS $FLAGS"
+ 	CONF_CXXFLAGS="$CONF_CXXFLAGS $FLAGS"
+-	case $host_vendor in
++	case $host_vendorx in
+ 	     pc)
+ 	       if expr `$CC -dumpversion` \>= "3.4" > /dev/null ; then
+ 		 FLAGS=-mtune
+@@ -836,7 +836,7 @@
+     CXXFLAGS="$user_CXXFLAGS"
+     AC_DEFINE(DEBUG, 1, [Debugging enabled])
+ else
+-    if test "$GCC" = yes ; then
++    if test "$GCC" = yesx ; then
+ 	case "`$CC --version 2>&1`" in
+ 	    *LLVM*)
+ 		# Apple LLVM falsely claims to be GCC
diff --git a/games-action/bzflag/files/bzflag-2.4.12-sdl2-cppflags.patch b/games-action/bzflag/files/bzflag-2.4.12-sdl2-cppflags.patch
new file mode 100644
index 000000000000..f7f6dfd7f14c
--- /dev/null
+++ b/games-action/bzflag/files/bzflag-2.4.12-sdl2-cppflags.patch
@@ -0,0 +1,19 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -236,6 +236,7 @@
+ AC_PROG_CC
+ AC_PROG_LN_S
+ AC_CHECK_PROG(AR, ar, ar)
++PKG_PROG_PKG_CONFIG
+ AC_SUBST(AR)
+ AC_SUBST(AR_FLAGS)
+ 
+@@ -716,6 +717,8 @@
+ fi
+ if test "x$with_SDL" = "x2"; then
+     AC_DEFINE(HAVE_SDL2, 1, [Using SDL2])
++    PKG_CHECK_MODULES(sdl2, sdl2,
++        [CONF_CPPFLAGS="$CONF_CPPFLAGS $sdl2_CFLAGS"],[])
+ fi
+ 
+ AM_CONDITIONAL(HAVE_SDL, test x$with_SDL = x1 -o x$with_SDL = x2)
diff --git a/games-action/bzflag/files/bzflag-2.4.12-tinfo.patch b/games-action/bzflag/files/bzflag-2.4.12-tinfo.patch
new file mode 100644
index 000000000000..aa43980b9b67
--- /dev/null
+++ b/games-action/bzflag/files/bzflag-2.4.12-tinfo.patch
@@ -0,0 +1,15 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -125,7 +125,11 @@
+ BZ_CONFIGURE_STAGE([arguments], [1 of 9])
+ 
+ # provide a with-curses option, test for curses
+-MP_WITH_CURSES
++PKG_CHECK_MODULES(ncurses, ncurses,
++	[CURSES_LIB="$ncurses_LIBS"]
++	AC_DEFINE(HAVE_NCURSES_H, , [Use the header file ncurses.h]),
++	AC_MSG_ERROR([Could not find ncurses]))
++AC_SUBST(CURSES_LIB)
+ 
+ # check for SDL option (enabled by default now)
+ AC_ARG_WITH(SDL, AS_HELP_STRING([--without-SDL | --with-SDL={1,2}],[Do not use Simple DirectMedia Layer or force using a specific version (by default tries 2, then 1, then resorts to native platform code if available]), sdl_version="$withval", sdl_version="detect")
diff --git a/games-action/bzflag/metadata.xml b/games-action/bzflag/metadata.xml
new file mode 100644
index 000000000000..66090a0275ee
--- /dev/null
+++ b/games-action/bzflag/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">bzflag</remote-id>
+	</upstream>
+</pkgmetadata>