Gentoo Archives: gentoo-commits

From: Michael Sterrett <mr_bones_@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-util/xqf/, games-util/xqf/files/
Date: Fri, 18 Dec 2015 00:47:36
Message-Id: 1450399158.3c657663b26972c50d29ac25b07af81f5fcd4b6a.mr_bones_@gentoo
1 commit: 3c657663b26972c50d29ac25b07af81f5fcd4b6a
2 Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
3 AuthorDate: Thu Dec 17 19:03:54 2015 +0000
4 Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
5 CommitDate: Fri Dec 18 00:39:18 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c657663
7
8 clean old
9
10 Package-Manager: portage-2.2.24
11
12 games-util/xqf/Manifest | 1 -
13 games-util/xqf/files/xqf-1.0.5-cpu-overrun.patch | 21 -----------
14 games-util/xqf/files/xqf-1.0.5-underlink.patch | 10 -----
15 .../files/xqf-1.0.5-zlib-1.2.5.1-compile-fix.patch | 11 ------
16 games-util/xqf/xqf-1.0.5.ebuild | 43 ----------------------
17 5 files changed, 86 deletions(-)
18
19 diff --git a/games-util/xqf/Manifest b/games-util/xqf/Manifest
20 index 6161228..a9ec949 100644
21 --- a/games-util/xqf/Manifest
22 +++ b/games-util/xqf/Manifest
23 @@ -1,2 +1 @@
24 -DIST xqf-1.0.5.tar.gz 742183 SHA256 ee0ab9a40516c55d9f00e65ab06b1c6669f0de858bc8a7416e6993a76c0d9b67 SHA512 2e571ed43da9ff440b6b13473ac618d2d87634a9571f892a11a7269e39518f74bf54e39e1508f734cb06e336f99cc2d3b9427666c93ff1ad8ec2b37ae6363035 WHIRLPOOL d65f896cfdbf28b4f1647dfe2ec54c68f356fa3d5e393e17b2c50145a0738fc3ff96a36481eb86b7dad96983ea66f311215a0812bdf72940a27bc0f0ff9d6cc4
25 DIST xqf-1.0.6.2.tar.gz 595096 SHA256 bcfb87c9a452993b13bd1019b0c61459a37cbc37b13b951b73f2a93b2b1c83ad SHA512 8706104dde0f93a89f9f69a4b8f40f5c4c8160a3bb7a99f7572448c0110a595503e430fdba741c50b22f7e92a08f1cf6abee06aaa23956e4e37b7bf894a66a9c WHIRLPOOL f4c8e7d0122359aeb615249995eb979502024b18b083a984ad04d85c9f9c00a849899a39440939556d17536201319ea36c318a5493c8f5bfd7b9e26d68c9a3d4
26
27 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
28 deleted file mode 100644
29 index 8797eee..0000000
30 --- a/games-util/xqf/files/xqf-1.0.5-cpu-overrun.patch
31 +++ /dev/null
32 @@ -1,21 +0,0 @@
33 ---- xqf.orig/src/launch.c
34 -+++ xqf/src/launch.c
35 -@@ -168,13 +168,17 @@
36 -
37 - res = read (fd, cl->buffer + cl->pos, CLIENT_ERROR_BUFFER - 1 - cl->pos);
38 -
39 -- if (res <= 0) { /* read error or EOF */
40 -+ if (res < 0) { /* read error or EOF */
41 - if (errno == EAGAIN || errno == EWOULDBLOCK)
42 - return;
43 -
44 - client_detach (cl);
45 - return;
46 - }
47 -+ else if (res == 0) {
48 -+ client_detach (cl);
49 -+ return;
50 -+ }
51 -
52 - if (cl->pos + res == CLIENT_ERROR_BUFFER - 1) {
53 - tmp = &cl->buffer[CLIENT_ERROR_BUFFER - 1];
54
55 diff --git a/games-util/xqf/files/xqf-1.0.5-underlink.patch b/games-util/xqf/files/xqf-1.0.5-underlink.patch
56 deleted file mode 100644
57 index 0948b82..0000000
58 --- a/games-util/xqf/files/xqf-1.0.5-underlink.patch
59 +++ /dev/null
60 @@ -1,10 +0,0 @@
61 ---- src/Makefile.in.old
62 -+++ src/Makefile.in
63 -@@ -311,6 +311,7 @@
64 - $(GEOIP_LIB) \
65 - $(PACKAGE_LIBS) \
66 - $(GDK_PIXBUF_LIBS) \
67 -+ -lX11 -ldl \
68 - -lz
69 -
70 - xqf_LDFLAGS = -Wl,-rpath,$(pkglibdir) -Wl,--export-dynamic -Wl,--version-script=$(top_srcdir)/src/xqf.map
71
72 diff --git a/games-util/xqf/files/xqf-1.0.5-zlib-1.2.5.1-compile-fix.patch b/games-util/xqf/files/xqf-1.0.5-zlib-1.2.5.1-compile-fix.patch
73 deleted file mode 100644
74 index 9bd433b..0000000
75 --- a/games-util/xqf/files/xqf-1.0.5-zlib-1.2.5.1-compile-fix.patch
76 +++ /dev/null
77 @@ -1,11 +0,0 @@
78 ---- xqf-1.0.5/src/zip/ioapi.h
79 -+++ xqf-1.0.5/src/zip/ioapi.h
80 -@@ -6,6 +6,8 @@
81 - Copyright (C) 1998-2003 Gilles Vollant
82 - */
83 -
84 -+#define OF(x) x
85 -+
86 - #ifndef _ZLIBIOAPI_H
87 - #define _ZLIBIOAPI_H
88 -
89
90 diff --git a/games-util/xqf/xqf-1.0.5.ebuild b/games-util/xqf/xqf-1.0.5.ebuild
91 deleted file mode 100644
92 index 626d756..0000000
93 --- a/games-util/xqf/xqf-1.0.5.ebuild
94 +++ /dev/null
95 @@ -1,43 +0,0 @@
96 -# Copyright 1999-2015 Gentoo Foundation
97 -# Distributed under the terms of the GNU General Public License v2
98 -# $Id$
99 -
100 -EAPI=5
101 -inherit eutils
102 -
103 -DESCRIPTION="A server browser for many FPS games (frontend for qstat)"
104 -HOMEPAGE="http://www.linuxgames.com/xqf/"
105 -SRC_URI="mirror://sourceforge/xqf/${P}.tar.gz"
106 -
107 -LICENSE="GPL-2"
108 -SLOT="0"
109 -KEYWORDS="amd64 hppa ppc x86"
110 -IUSE="bzip2 geoip nls"
111 -
112 -RDEPEND="x11-libs/gtk+:2
113 - >=games-util/qstat-2.11
114 - nls? ( virtual/libintl )
115 - geoip? ( dev-libs/geoip )
116 - bzip2? ( app-arch/bzip2 )"
117 -DEPEND="${RDEPEND}
118 - virtual/pkgconfig
119 - nls? ( sys-devel/gettext )"
120 -
121 -# bug #288853
122 -src_prepare() {
123 - epatch \
124 - "${FILESDIR}"/${P}-cpu-overrun.patch \
125 - "${FILESDIR}"/${P}-underlink.patch \
126 - "${FILESDIR}"/${P}-zlib-1.2.5.1-compile-fix.patch
127 - sed -i \
128 - -e '/Icon/s/.png//' \
129 - xqf.desktop.in || die
130 -}
131 -
132 -src_configure() {
133 - econf \
134 - $(use_enable nls) \
135 - $(use_enable geoip) \
136 - $(use_enable bzip2) \
137 - --enable-gtk2
138 -}