[gentoo-commits] repo/gentoo:master commit in: games-util/xqf/files/, games-util/xqf/

["Michael Sterrett" <mr_bones_@gentoo.org>]

commit:     e91c25c4d7a40388fdf840fbd243c68e3b7cb777
Author:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 14 06:35:55 2015 +0000
Commit:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Wed Oct 14 06:36:48 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e91c25c4

version bump (bug #563036) with ebuild submission by Lars Wendler

Package-Manager: portage-2.2.20.1

 games-util/xqf/Manifest                            |  1 +
 games-util/xqf/files/xqf-1.0.5-cpu-overrun.patch   |  5 +--
 games-util/xqf/files/xqf-1.0.5-underlink.patch     |  4 +-
 ...underlink.patch => xqf-1.0.6.2-underlink.patch} | 10 ++---
 .../xqf-1.0.6.2-zlib-1.2.5.1-compile-fix.patch     | 11 +++++
 games-util/xqf/xqf-1.0.6.2.ebuild                  | 47 ++++++++++++++++++++++
 6 files changed, 68 insertions(+), 10 deletions(-)

diff --git a/games-util/xqf/Manifest b/games-util/xqf/Manifest
index 53ccf87..6161228 100644
--- a/games-util/xqf/Manifest
+++ b/games-util/xqf/Manifest
@@ -1 +1,2 @@
 DIST xqf-1.0.5.tar.gz 742183 SHA256 ee0ab9a40516c55d9f00e65ab06b1c6669f0de858bc8a7416e6993a76c0d9b67 SHA512 2e571ed43da9ff440b6b13473ac618d2d87634a9571f892a11a7269e39518f74bf54e39e1508f734cb06e336f99cc2d3b9427666c93ff1ad8ec2b37ae6363035 WHIRLPOOL d65f896cfdbf28b4f1647dfe2ec54c68f356fa3d5e393e17b2c50145a0738fc3ff96a36481eb86b7dad96983ea66f311215a0812bdf72940a27bc0f0ff9d6cc4
+DIST xqf-1.0.6.2.tar.gz 595096 SHA256 bcfb87c9a452993b13bd1019b0c61459a37cbc37b13b951b73f2a93b2b1c83ad SHA512 8706104dde0f93a89f9f69a4b8f40f5c4c8160a3bb7a99f7572448c0110a595503e430fdba741c50b22f7e92a08f1cf6abee06aaa23956e4e37b7bf894a66a9c WHIRLPOOL f4c8e7d0122359aeb615249995eb979502024b18b083a984ad04d85c9f9c00a849899a39440939556d17536201319ea36c318a5493c8f5bfd7b9e26d68c9a3d4

diff --git a/games-util/xqf/files/xqf-1.0.5-cpu-overrun.patch b/games-util/xqf/files/xqf-1.0.5-cpu-overrun.patch
index 567d82a..8797eee 100644
--- a/games-util/xqf/files/xqf-1.0.5-cpu-overrun.patch
+++ b/games-util/xqf/files/xqf-1.0.5-cpu-overrun.patch
@@ -1,6 +1,5 @@
-diff -aburN xqf.orig/src/launch.c xqf/src/launch.c
---- xqf.orig/src/launch.c	2009-10-13 11:58:24.000000000 +0200
-+++ xqf/src/launch.c	2009-10-13 11:59:35.000000000 +0200
+--- xqf.orig/src/launch.c
++++ xqf/src/launch.c
 @@ -168,13 +168,17 @@
  
    res = read (fd, cl->buffer + cl->pos, CLIENT_ERROR_BUFFER - 1 - cl->pos);

diff --git a/games-util/xqf/files/xqf-1.0.5-underlink.patch b/games-util/xqf/files/xqf-1.0.5-underlink.patch
index 523204c..0948b82 100644
--- a/games-util/xqf/files/xqf-1.0.5-underlink.patch
+++ b/games-util/xqf/files/xqf-1.0.5-underlink.patch
@@ -1,5 +1,5 @@
---- src/Makefile.in.old	2011-06-14 21:32:28.929746563 +0200
-+++ src/Makefile.in	2011-06-14 21:32:46.567818865 +0200
+--- src/Makefile.in.old
++++ src/Makefile.in
 @@ -311,6 +311,7 @@
  	    $(GEOIP_LIB) \
  	    $(PACKAGE_LIBS) \

diff --git a/games-util/xqf/files/xqf-1.0.5-underlink.patch b/games-util/xqf/files/xqf-1.0.6.2-underlink.patch
similarity index 52%
copy from games-util/xqf/files/xqf-1.0.5-underlink.patch
copy to games-util/xqf/files/xqf-1.0.6.2-underlink.patch
index 523204c..fe93c76 100644
--- a/games-util/xqf/files/xqf-1.0.5-underlink.patch
+++ b/games-util/xqf/files/xqf-1.0.6.2-underlink.patch
@@ -1,10 +1,10 @@
---- src/Makefile.in.old	2011-06-14 21:32:28.929746563 +0200
-+++ src/Makefile.in	2011-06-14 21:32:46.567818865 +0200
-@@ -311,6 +311,7 @@
+--- xqf-xqf-1.0.6.2/src/Makefile.am
++++ xqf-xqf-1.0.6.2/src/Makefile.am
+@@ -41,6 +41,7 @@
  	    $(GEOIP_LIB) \
  	    $(PACKAGE_LIBS) \
  	    $(GDK_PIXBUF_LIBS) \
-+	    -lX11 -ldl \
- 	    -lz
++	    -lX11 \
+ 	    -lz -ldl
  
  xqf_LDFLAGS = -Wl,-rpath,$(pkglibdir) -Wl,--export-dynamic -Wl,--version-script=$(top_srcdir)/src/xqf.map

diff --git a/games-util/xqf/files/xqf-1.0.6.2-zlib-1.2.5.1-compile-fix.patch b/games-util/xqf/files/xqf-1.0.6.2-zlib-1.2.5.1-compile-fix.patch
new file mode 100644
index 0000000..9bd433b
--- /dev/null
+++ b/games-util/xqf/files/xqf-1.0.6.2-zlib-1.2.5.1-compile-fix.patch
@@ -0,0 +1,11 @@
+--- xqf-1.0.5/src/zip/ioapi.h
++++ xqf-1.0.5/src/zip/ioapi.h
+@@ -6,6 +6,8 @@
+    Copyright (C) 1998-2003 Gilles Vollant
+ */
+ 
++#define OF(x) x
++
+ #ifndef _ZLIBIOAPI_H
+ #define _ZLIBIOAPI_H
+ 

diff --git a/games-util/xqf/xqf-1.0.6.2.ebuild b/games-util/xqf/xqf-1.0.6.2.ebuild
new file mode 100644
index 0000000..7982b0a
--- /dev/null
+++ b/games-util/xqf/xqf-1.0.6.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="A server browser for many FPS games (frontend for qstat)"
+HOMEPAGE="http://xqf.github.io/en/"
+SRC_URI="https://github.com/XQF/xqf/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE="bzip2 geoip nls"
+
+RDEPEND="x11-libs/gtk+:2
+	>=games-util/qstat-2.11
+	nls? ( virtual/libintl )
+	geoip? ( dev-libs/geoip )
+	bzip2? ( app-arch/bzip2 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+S=${WORKDIR}/${PN}-${P}
+
+# bug #288853
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-underlink.patch \
+		"${FILESDIR}"/${P}-zlib-1.2.5.1-compile-fix.patch
+	sed -i \
+		-e '/Icon/s/.png//' \
+		xqf.desktop.in || die
+
+
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable geoip) \
+		$(use_enable bzip2)
+}