gentoo resync : 25.11.2020

4 files changed, 63 insertions, 18 deletions

diff --git a/games-util/xqf/Manifest b/games-util/xqf/Manifest
index 365be0d9f392..1b38285e4c5b 100644
--- a/games-util/xqf/Manifest
+++ b/games-util/xqf/Manifest
@@ -1,5 +1,6 @@
-AUX xqf-1.0.6.2-underlink.patch 300 BLAKE2B 24205c2328355fd9e5ee187c3c7e7a3b1875f8020f1afbd7ced7bf6b2f3c57ce1d3485cad6c2d23a70ee830e7cad2ec7060554bb70fb0dbfbe26bc2c339afb9b SHA512 e35c62bf83ccbaaf8ca775978acf33ed419c881158f607e44032a2329b88443512a65603d0797ede1be38edaa66de1318d7c8275f276cd5988d74ef7430b51de
+AUX xqf-1.0.6.2-fno-common.patch 409 BLAKE2B af6a466239abd148b3e158fc761bd7411db1680dd898750068c2bb3b62ee7b25ebaf1ca16f9f058b1ebc2d6eb86325e7e13462b7ade37b6c5545ff3183932045 SHA512 5c9ab675685b4b4881031bfd64f3dbc2afef2b97a20e9b68683ede8f3fc93093ad324ea0210e87b2b39fd2e3c22cbb225dc4ab51be479d61df746c21bb5cb2a0
+AUX xqf-1.0.6.2-underlink.patch 589 BLAKE2B 67c27e6e5e93cf88d937da38c80ec0d00de8f51764eb9074359595f3cccb8a62c4ec7251ae915b68048a28dde05e6692b08b78473a27ee77581ac119df9fe46f SHA512 1f79d677f0d5ca755827adcbeadf9835ca219fe2d7bc0620489861dc44ce9033a73d111c291e25776ae02392a84044a64ed34ff59ccb49ff6125d5c195ff757c
 AUX xqf-1.0.6.2-zlib-1.2.5.1-compile-fix.patch 190 BLAKE2B 3c4a52c059392596c082c4ae3f4259073dc49fd5c94424ef80e4f22076e4b5473eabc60d763eabb3f73177155692db7d722d7ab8cf1f7acc9c285fdfc9d12390 SHA512 11677294d042d8303b72085867855e1795a9995e29f4b5145e415434c8c6188fa20e19c95f02d804a2b3e481f1f827cad9fa865d77f4f1f0880a3a66d69460d8
 DIST xqf-1.0.6.2.tar.gz 595096 BLAKE2B 36c135c064ae61af12daa70e9c78fe2a377ebcaf91b0f36fac43865b6b0601f104d8b09bd84b9d9699afdab7f3d4d3a0e67f3251f20d6ce025e92db2302d21a8 SHA512 8706104dde0f93a89f9f69a4b8f40f5c4c8160a3bb7a99f7572448c0110a595503e430fdba741c50b22f7e92a08f1cf6abee06aaa23956e4e37b7bf894a66a9c
-EBUILD xqf-1.0.6.2.ebuild 940 BLAKE2B e58e3632573416bd915657d88e44a850e03a45a02b16271c9bb8ef9a3eecc63b2a8e6f2e85367a4c846413aae4fde7b04d46e7374b10b54d8df10c1734ba0095 SHA512 77b887d3e70c340cf6e8f4d977c996f26976cf16576888fc0ac7bafab22283b512fb7ab5adb8e93f4c3d6a69d5a419d843a8f6fd7bb42fdf904a8a619b30ec18
+EBUILD xqf-1.0.6.2.ebuild 944 BLAKE2B b0788e7f93296faf3a3fb9dd97b12c13c447218ea29b0f66d6b12f0cf6da61b3ff42de51accfccbbe52a0587d853b668f82901ea56c23fdf7c68ee6f22b6b749 SHA512 900e62a72fe41f6f854c3a5804e323c6f054db784361555fb5becbc93cb22644689279a7d4cde3777424ad01283c27491ffd7df6dace60fa71c907c1b6ebbd60
 MISC metadata.xml 373 BLAKE2B d2337bac8791a2a8985237089b723183ba428527db288b5f98e37499e0dde32503f09eca2fa6d320b354fe8507fb4cd98c12f866f77e2c0f85ee52739758fa05 SHA512 b904d8495fb9fd79c072f12570ef67cb28396ba215e0cbc70f184c64dcd1b1a7c028274bb7927acf8b7012ff55cb22564fa52252d6bc41e75e86d5562761539a
diff --git a/games-util/xqf/files/xqf-1.0.6.2-fno-common.patch b/games-util/xqf/files/xqf-1.0.6.2-fno-common.patch
new file mode 100644
index 000000000000..15147ac6d917
--- /dev/null
+++ b/games-util/xqf/files/xqf-1.0.6.2-fno-common.patch
@@ -0,0 +1,21 @@
+--- a/src/filter.c
++++ b/src/filter.c
+@@ -88,6 +88,8 @@
+ const char* filter_quick_get(void);
+ void filter_quick_unset (void);
+ 
++unsigned int current_server_filter;
++
+ /* /QUICK FILTER */
+ 
+ struct filter filters[FILTERS_TOTAL] = {
+--- a/src/filter.h
++++ b/src/filter.h
+@@ -89,7 +89,6 @@
+ 
+ extern GArray* server_filters;
+ 
+-unsigned int current_server_filter;
+ extern unsigned int current_server_filter;
+ 
+ 
diff --git a/games-util/xqf/files/xqf-1.0.6.2-underlink.patch b/games-util/xqf/files/xqf-1.0.6.2-underlink.patch
index fe93c7624675..0e3ba3ed22e4 100644
--- a/games-util/xqf/files/xqf-1.0.6.2-underlink.patch
+++ b/games-util/xqf/files/xqf-1.0.6.2-underlink.patch
@@ -1,5 +1,25 @@
---- xqf-xqf-1.0.6.2/src/Makefile.am
-+++ xqf-xqf-1.0.6.2/src/Makefile.am
+--- a/configure.in
++++ b/configure.in
+@@ -23,6 +23,7 @@
+ AC_ISC_POSIX
+ AC_PROG_LN_S
+ AC_PROG_RANLIB
++AM_PROG_AR
+ 
+ dnl Checks for header files.
+ AC_HEADER_STDC
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
+@@ -21,6 +21,7 @@
+ #src/rc.c
+ src/rcon.c
+ src/redial.c
++src/scripts.c
+ #src/server.c
+ #src/skin.c
+ #src/skin_pcx.c
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -41,6 +41,7 @@
  	    $(GEOIP_LIB) \
  	    $(PACKAGE_LIBS) \
diff --git a/games-util/xqf/xqf-1.0.6.2.ebuild b/games-util/xqf/xqf-1.0.6.2.ebuild
index 5ea89476375a..9c9510182f86 100644
--- a/games-util/xqf/xqf-1.0.6.2.ebuild
+++ b/games-util/xqf/xqf-1.0.6.2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools eutils
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="A server browser for many FPS games (frontend for qstat)"
 HOMEPAGE="http://xqf.github.io/en/"
@@ -13,26 +14,28 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~x86"
 IUSE="bzip2 geoip nls"
 
-RDEPEND="x11-libs/gtk+:2
+RDEPEND="
+	x11-libs/gdk-pixbuf-xlib
+	x11-libs/gtk+:2
 	>=games-util/qstat-2.11
 	nls? ( virtual/libintl )
 	geoip? ( dev-libs/geoip )
 	bzip2? ( app-arch/bzip2 )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
 
-S=${WORKDIR}/${PN}-${P}
+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
+PATCHES=(
+	"${FILESDIR}"/${P}-underlink.patch
+	"${FILESDIR}"/${P}-zlib-1.2.5.1-compile-fix.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
 
+src_prepare() {
+	default
 	mv configure.{in,ac} || die
 	eautoreconf
 }