games-action/bzflag: version bump to 2.4.6. Bug #592270

Package-Manager: portage-2.3.3

games-action/bzflag/Manifest

@@ -1,2 +1,3 @@
 DIST bzflag-2.4.2.tar.bz2 15971448 SHA256 4f7bc52284cc4b39fc352855e555b2b064c1de6a18f7474e249073070762c811 SHA512 e5645e825f19896ad4dc1e3bf97c9b52ed3838210d97d5532936a9306623283330c9535288af90f86e32c88a1a7996b2c872b9c081558eea48400b86b3a1a6ff WHIRLPOOL 82a5e543a8fdcb80c516394c63901c80c77fc659090f952cb36f65a9fb14c5ca06d6547dc9d347c6abf0ee706c40437f80edf20c424775bf6e202423e025794c
 DIST bzflag-2.4.4.tar.bz2 13922761 SHA256 5842941e53440d2e88c955ddb594964fc5145912f61100832d224c1a017e2ecb SHA512 ee9eefe6a24250f1aa0ac808755f2e3700ea97c559019ca8beefb8d236afd1571314f07a8f19662677526ae364d38617a1a62b356e851c27669cb9acef1a8fd3 WHIRLPOOL c96853e3f1053a9b53c9d6ba27a6f638c2913e87a26d6188151a66f8f78aeeb78fac28e8cefde10d23d65fe02e49b93cd4516993e5b48a6f3f240ec67ab0fc8e
+DIST bzflag-2.4.6.tar.bz2 13919761 SHA256 a44506828d09fe26f06658aae7f579080ecbaef5bd19a938dfed604e0c8afb45 SHA512 b2c82b75a99aa47975d98030104654da6ae3943582a22e18faf157c8929d96ab255a4343e044baa76714b8564c60194b6edbc7b8e28a3352848c471365678205 WHIRLPOOL 069dc60acc93b6159bac330c81a63493e370590ce09b871a17acdfcdf8b9ac6f84c6937ecc29df5d826a475f527f6fdaabf3b26f31ec5ef29824964f43c232de

games-action/bzflag/bzflag-2.4.6.ebuild

@@ -0,0 +1,62 @@
+# Copyright 1999-2017 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="http://www.bzflag.org/"
+SRC_URI="https://download.bzflag.org/bzflag/source/${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="dedicated upnp"
+
+DEPEND="
+	net-dns/c-ares
+	>=net-misc/curl-7.15.0
+	sys-libs/ncurses:0
+	sys-libs/zlib
+	!dedicated? (
+		media-libs/libsdl[joystick,sound,video]
+		virtual/glu
+		virtual/opengl )
+	upnp? ( net-libs/miniupnpc )"
+RDEPEND=${DEPEND}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-configure.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
+}

games-action/bzflag/files/bzflag-2.4.6-configure.patch

@@ -0,0 +1,37 @@
+diff -ru bzflag-2.4.4.orig/configure.ac bzflag-2.4.4/configure.ac
+--- bzflag-2.4.4.orig/configure.ac	2016-02-14 19:09:51.000000000 -0500
++++ bzflag-2.4.4/configure.ac	2016-05-05 16:35:35.475935345 -0400
+@@ -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