summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2015-07-30 15:17:39 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2015-07-30 15:17:39 +0000
commitfa19b5c428f8c4e6f9e1e213e5ce4a3fd3f96c76 (patch)
tree45850555c046e78a0bfd638f86b9c3281fe29bb3 /games-fps
parentStable for sparc, wrt bug #552244 (diff)
downloadgentoo-2-fa19b5c428f8c4e6f9e1e213e5ce4a3fd3f96c76.tar.gz
gentoo-2-fa19b5c428f8c4e6f9e1e213e5ce4a3fd3f96c76.tar.bz2
gentoo-2-fa19b5c428f8c4e6f9e1e213e5ce4a3fd3f96c76.zip
games-fps/tremulous is gone
Diffstat (limited to 'games-fps')
-rw-r--r--games-fps/tremulous/ChangeLog119
-rw-r--r--games-fps/tremulous/Manifest31
-rw-r--r--games-fps/tremulous/files/tremulous-1.1.0-ldflags.patch38
-rw-r--r--games-fps/tremulous/files/tremulous-1.1.0-system_jpeg-2.patch174
-rw-r--r--games-fps/tremulous/files/tremulous-1.1.0-system_jpeg.patch259
-rw-r--r--games-fps/tremulous/metadata.xml8
-rw-r--r--games-fps/tremulous/tremulous-1.1.0-r4.ebuild115
7 files changed, 0 insertions, 744 deletions
diff --git a/games-fps/tremulous/ChangeLog b/games-fps/tremulous/ChangeLog
deleted file mode 100644
index e10303dd9884..000000000000
--- a/games-fps/tremulous/ChangeLog
+++ /dev/null
@@ -1,119 +0,0 @@
-# ChangeLog for games-fps/tremulous
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/tremulous/ChangeLog,v 1.28 2014/11/21 06:10:50 ulm Exp $
-
- 21 Nov 2014; Ulrich Müller <ulm@gentoo.org> tremulous-1.1.0-r4.ebuild:
- Rename CC-BY-NC-ND to CC-BY-ND-NC, name is different in version 1.0.
-
- 25 Nov 2013; Julian Ospald <hasufell@gentoo.org> tremulous-1.1.0-r4.ebuild:
- fix licenses wrt #476366
-
- 18 Aug 2013; Alfredo Tupone <tupone@gentoo.org>
- files/tremulous-1.1.0-ldflags.patch:
- Should fix underlink. Bug #481444 by Torsten Kaiser
-
- 07 Feb 2013; Ulrich Müller <ulm@gentoo.org> tremulous-1.1.0-r4.ebuild:
- Move Creative Commons licenses to shorter names.
-
- 08 Nov 2012; Tupone Alfredo <tupone@gentoo.org> tremulous-1.1.0-r4.ebuild,
- files/tremulous-1.1.0-ldflags.patch:
- Build with USE=dedicated Bug #397923 by Bjoern Ottervik
-
- 10 Sep 2012; Michael Sterrett <mr_bones_@gentoo.org>
- tremulous-1.1.0-r4.ebuild:
- add joystick dep (bug #434596)
-
- 08 Aug 2011; Michael Sterrett <mr_bones_@gentoo.org>
- tremulous-1.1.0-r4.ebuild:
- Avoid parallel make (bug #298453)
-
- 18 May 2011; Michael Sterrett <mr_bones_@gentoo.org>
- tremulous-1.1.0-r4.ebuild:
- Change the instructions about additional maps to be more general (bug
- #365133)
-
- 26 Feb 2011; Kevin McCarthy <signals@gentoo.org> tremulous-1.1.0-r4.ebuild:
- Update depends from media-libs/jpeg to virtual/jpeg
-
- 15 Oct 2010; Brent Baude <ranger@gentoo.org> tremulous-1.1.0-r4.ebuild:
- stable ppc, bug 313021
-
- 09 Sep 2010; Tupone Alfredo <tupone@gentoo.org> tremulous-1.1.0-r4.ebuild,
- +files/tremulous-1.1.0-ldflags.patch:
- Respect LDFLAGS. Bug #336261 by flameeyes@gentoo.org
-
- 23 May 2010; Pacho Ramos <pacho@gentoo.org> tremulous-1.1.0-r4.ebuild:
- stable amd64, bug 313021
-
- 27 Apr 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
- tremulous-1.1.0-r4.ebuild:
- x86 stable wrt bug #313021
-
-*tremulous-1.1.0-r4 (03 Mar 2010)
-
- 03 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
- +tremulous-1.1.0-r4.ebuild, +files/tremulous-1.1.0-system_jpeg.patch,
- +files/tremulous-1.1.0-system_jpeg-2.patch:
- Use system copy of media-libs/jpeg wrt #252719.
-
- 22 Jan 2010; Brent Baude <ranger@gentoo.org> tremulous-1.1.0-r3.ebuild:
- stable ppc, bug 289368
-
- 29 Oct 2009; Markus Meier <maekke@gentoo.org> tremulous-1.1.0-r3.ebuild:
- amd64/x86 stable, bug #289368
-
-*tremulous-1.1.0-r3 (25 Feb 2009)
-
- 25 Feb 2009; Tomas Chvatal <scarabeus@gentoo.org>
- +tremulous-1.1.0-r3.ebuild:
- Add gcc-4.3.3 Werror fix. Move to EAPI=2. Per bug #260165.
-
- 17 Sep 2008; Markus Meier <maekke@gentoo.org> tremulous-1.1.0-r2.ebuild:
- x86 stable, bug #222119
-
- 16 Sep 2008; Tobias Scherbaum <dertobi123@gentoo.org>
- tremulous-1.1.0-r2.ebuild:
- ppc stable, bug #222119
-
- 08 Sep 2008; Tobias Heinlein <keytoaster@gentoo.org>
- tremulous-1.1.0-r2.ebuild:
- amd64 stable wrt security bug #222119
-
-*tremulous-1.1.0-r2 (07 Sep 2008)
-
- 07 Sep 2008; Tristan Heaven <nyhm@gentoo.org> +tremulous-1.1.0-r2.ebuild:
- New revision from scarabeus with security patches from trem-servers.com,
- bug #222119
-
- 29 Feb 2008; Carsten Lohrke <carlo@gentoo.org> tremulous-1.1.0.ebuild,
- tremulous-1.1.0-r1.ebuild:
- Remove icon extension from desktop entry to match Icon Theme Specification.
-
- 13 Jun 2007; Tristan Heaven <nyhm@gentoo.org>
- +files/tremulous-1.1.0-gcc42.patch, tremulous-1.1.0-r1.ebuild:
- Patch for gcc-4.2
-
-*tremulous-1.1.0-r1 (18 May 2007)
-
- 18 May 2007; Tupone Alfredo <tupone@gentoo.org>
- +tremulous-1.1.0-r1.ebuild:
- Fix uncorrect detection of cross-compiling. Bug #154745 by Kyle Hunter
-
- 05 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
- tremulous-1.1.0.ebuild:
- Removing old virtual/x11 dependency.
-
- 10 Nov 2006; Chris Gianelloni <wolf31o2@gentoo.org>
- tremulous-1.1.0.ebuild:
- Stable on amd64/ppc/x86.
-
- 25 Oct 2006; Michael Hanselmann <hansmi@gentoo.org>
- tremulous-1.1.0.ebuild:
- Added to ~ppc.
-
-*tremulous-1.1.0 (06 Sep 2006)
-
- 06 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org> +metadata.xml,
- +tremulous-1.1.0.ebuild:
- Initial import. Original ebuild by Paul Bredbury <brebs@sent.com>. Edited by
- Tristan Heaven <tristanheaven@gmail.com>. Closing bug #128370.
diff --git a/games-fps/tremulous/Manifest b/games-fps/tremulous/Manifest
deleted file mode 100644
index df43565d2601..000000000000
--- a/games-fps/tremulous/Manifest
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-AUX tremulous-1.1.0-ldflags.patch 1133 SHA256 164be2aaac3ba06a157051b8b664725787a4406322f3fc1296e8b370a0c01693 SHA512 ac5baf49c98e872329c6b529697863c473cae9945bbf937eee59c6a39e8ba9205f719a500bd4e88396f0ecd83d5aaca18c91698cdaa22d5b1f320db99b411e6a WHIRLPOOL 119e62446daba3534f1a292dc4d635370c34f7f32672c9d6907c4ad3e9a009b011b639732bf867eea940477c03f361eafb2ef52975ccbc691c68e91722e22438
-AUX tremulous-1.1.0-system_jpeg-2.patch 5161 SHA256 077f70aaf03c581991ff682be7dab9ab80cabc925df75582273e34f15fcbc6b1 SHA512 d6aeda3da3ec5b4eb94ddb813c35f466a0a5ba112ea8fb2d676b09c4220c8670631cdae323007238111c6c07e3a3cb11ed314c1f43aaeab08ba307bd2f8b867e WHIRLPOOL 02abecf3238c9243035e9c9712f343a3d3a2fad6ae1231686022b00c6245c2b24cd5e348b14c89eb743ff66579347ef0a48b1b0d42344931fda2df96c4493ab3
-AUX tremulous-1.1.0-system_jpeg.patch 5913 SHA256 57ffe4237e18aa97c16eb603f11b5907533a584985fb84a24116a5cbe2522515 SHA512 448d48de1d728cda4d3a61a49068f1f3a6dcdbad9ec58218f00f21468d40b929a65024cc430873fe8afcbfc462dd5d106cad398de8f668cbabe93f1f8ba3a292 WHIRLPOOL adf51b53f00df55dc22df5eeeb1f1965c2dd53464c729f0e3fafc6823fe8a38aabef345fc60c9d89681a886c5d3509e4d65318916375a986d0efcdb21fde36a7
-DIST tremulous-1.1.0.zip 105821907 SHA256 c7bb66f55abc88932edee16c253e5d37f90dded2ce29cf6cb15ad4f78e378987 SHA512 bcbd0ddc876bdf8dcff2e01b212ef4a56cb73b58b6a4ea17d9ca778be9fe63c9984aaaf893d235a7fc3b2ed3a8b58632defa7d66fc4daaa84231b62a1f0d9cbc WHIRLPOOL 756710d10e8e19a04b7bb73a5acb756efb69b6f8531adb8d3049456b3df6c5cb1c27c930a5c640314849120427c985291c0c95772821cfb34b390036e589f5d7
-DIST tremulous-gentoopatches-1.1.0-r5.zip 372877 SHA256 c03f22b49b65d8f7acae18981f3c87eac0f17a44c3916282eaa10afe232ca12b SHA512 c2235c26f5f5c3b8144030ecb8837beab086e56ff8194c3d94d77edca3c3212066db5113021e2c18fdc509d6937bdbebf92687698ddaa6a4dfa74f4fba109638 WHIRLPOOL 9309fa9045daf2109990418af7279137b38d8d2d7913cd94f131a7cbaba26d8cb81e9d736d10dd7d7939477923a1bc712460d1bddc2bec5b1437f368785f23d2
-DIST vms-1.1.t971.pk3 495308 SHA256 bb2f57e5c2dd725e095f0e92a9dfe5fb99f8ba84344618087828d0f5dced797e SHA512 869c0926465c0f56e30daf4b1a2c2432191585e499d982b8a2cfee83e88b5e10b507967dd3f901fae97e45e6156dcdfff6809108de2b909e90edb9856f0cf510 WHIRLPOOL 0c467d6c49684eb1cd5f6b96428ca9ecfb1035b13084d0116039bd244c58ce28d14ea01ff076779bf36b4d59ede5c55c10ac5cbd499ee64e5d2feddfe54250a1
-EBUILD tremulous-1.1.0-r4.ebuild 3246 SHA256 5e65374059856abf78d9b86406710d57299a5a3ec3707b7255e7ac9fec905a78 SHA512 b1788ea196deba8555c6e92dedd5c780db32462a4cedd13f5b234a9f90e29489a5e77572c415cfd50f2a13d5c3d7c34e56e12754d144b9052972d93064600d97 WHIRLPOOL 402bfeb5bf6a868a914e16024f20eafe5e17a59cc32e83eea3ea57a1f7f64658d850a9df428c0442eec3d6ee864251564982ce363aa3f2a502becc08a5e3c4b3
-MISC ChangeLog 4221 SHA256 db75282527194fa64c62917b067095628abeae128e24b4d1f6bb874681bf66ba SHA512 ad5db39b3cae78bf13f6b8b54042bb235be57cfe0a743392b2155dc230a345cba49949b585a69b17d78841d1f738a10ceaac41b9a9baf3a00fb3c644a59f2d43 WHIRLPOOL 14f6287e7cebe83fb976185efe13bef827c4b191176564216b673a55a9744256066b76b1f05a2aa82ec79d14f7403e4baac49589f63e4dfe8bdb32548bc1ba5f
-MISC metadata.xml 238 SHA256 322a901208d6fcbe612a48143298418fd0f809497505454d5f47aae93f0760b0 SHA512 64344f45471a5ca549e38b194265e6a4cc5c248d149d5ae7a60684eeb237c7f60a1029d4daec512ca29350fd71376c3cd684698471aba982bcc63c42b6c88885 WHIRLPOOL 6344b04406647365b875985e23898588eac0006d733741a651860945a5c23820cef7d22f06dbbfe45c88fc62f49afacc50f4f5667094692024d85d0375299b10
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
-
-iQJ8BAEBCgBmBQJVfseMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmit4MP/RUmAF+IVL7MNh4F1GPNQd7L
-hZdwL0ITwXyLmmkSjqyhAHdWjeK1d10LcTzgHNsIFI1uhODCETeRq/1XHo7j2x/l
-P8vrgIfdQv1dDWIRXbID94YqFAGWxdI9Q0vwVo9zfzytbUctZcMs7ISZ6N+fsmdz
-izNYw/L1v0fq8rXQgqFOS8vCsPuSq22SYiKQmjIN5Lpk+6HPd3h2xS0oBGdIqqm6
-weNrIHlwxqUXQ891vXVwv1hnqiqAcmyabzoi8WLGh8+QSCZWGJ4K5tY9YPPE2Jrq
-RALNDfP3nB9VEAHoujm4M0YvfyFsR0m7gvfoIadvQleWri64lP6BQ0xU5Wi+Uzti
-s/LxDd9GzIvD3rT9nR9OQSo0lXxcF2yfXdJed7D9mL/5Yk9fOUui9UoplLvtK/wY
-2D4bdpo7DYa6AKwE/jiR/wAAeEd1nEYNELMNrrqHBYyASdkG7iKkRsCbmeLmbPgG
-Ew6u+xu505OF8Wwuz8UGnQDIOFvwH6+K97afhQ/Kitk29zfDgECnjTQQZMTNkXU+
-8qKObU741T8WErh9Jxb57XX+4n9ZOuX4Ow7ITdNrjhu39xJe4NJW2jTkcyE98oCB
-M+7fJ6zm+J9/ojN0cTgfqqg3OHcalLI1ZlyZ5QvQBaIjfYw7TX5Yt4u6eT7AtQ1H
-kKhLcgt6zoJ58eYxHY2g
-=IWfF
------END PGP SIGNATURE-----
diff --git a/games-fps/tremulous/files/tremulous-1.1.0-ldflags.patch b/games-fps/tremulous/files/tremulous-1.1.0-ldflags.patch
deleted file mode 100644
index 4c728fc7c5fc..000000000000
--- a/games-fps/tremulous/files/tremulous-1.1.0-ldflags.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- Makefile.old 2010-09-09 11:30:26.000000000 +0200
-+++ Makefile 2010-09-09 11:33:41.000000000 +0200
-@@ -253,7 +253,7 @@
- SHLIBLDFLAGS=-shared $(LDFLAGS)
-
- THREAD_LDFLAGS=-lpthread
-- LDFLAGS=-ldl -lm
-+ LDLIBS=-ldl -lm
-
- ifeq ($(USE_SDL),1)
- CLIENT_LDFLAGS=$(shell sdl-config --libs)
-@@ -1069,13 +1069,13 @@
-
- $(B)/tremulous.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ) $(LIBSDLMAIN)
- @echo "LD $@"
-- @$(CC) -o $@ $(Q3OBJ) $(Q3POBJ) $(CLIENT_LDFLAGS) \
-- $(LDFLAGS) $(LIBSDLMAIN)
-+ @$(CC) -o $@ ${LDFLAGS} $(Q3OBJ) $(Q3POBJ) $(CLIENT_LDFLAGS) \
-+ $(LDLIBS) $(LIBSDLMAIN)
-
- $(B)/tremulous-smp.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN)
- @echo "LD $@"
-- @$(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(CLIENT_LDFLAGS) \
-- $(THREAD_LDFLAGS) $(LDFLAGS) $(LIBSDLMAIN)
-+ @$(CC) -o $@ ${LDFLAGS} $(Q3OBJ) $(Q3POBJ_SMP) $(CLIENT_LDFLAGS) \
-+ $(THREAD_LDFLAGS) $(LDLIBS) $(LIBSDLMAIN)
-
- ifneq ($(strip $(LIBSDLMAIN)),)
- ifneq ($(strip $(LIBSDLMAINSRC)),)
-@@ -1153,7 +1153,7 @@
-
- $(B)/tremded.$(ARCH)$(BINEXT): $(Q3DOBJ)
- @echo "LD $@"
-- @$(CC) -o $@ $(Q3DOBJ) $(LDFLAGS)
-+ @$(CC) -o $@ $(LDFLAGS) $(Q3DOBJ) $(LDLIBS)
-
-
-
diff --git a/games-fps/tremulous/files/tremulous-1.1.0-system_jpeg-2.patch b/games-fps/tremulous/files/tremulous-1.1.0-system_jpeg-2.patch
deleted file mode 100644
index d2ade8e5333e..000000000000
--- a/games-fps/tremulous/files/tremulous-1.1.0-system_jpeg-2.patch
+++ /dev/null
@@ -1,174 +0,0 @@
---- /dev/null
-+++ src/renderer/jpeg_memsrc.h
-@@ -0,0 +1,5 @@
-+#include <stdio.h>
-+#include <jpeglib.h>
-+
-+void jpeg_memory_src (j_decompress_ptr cinfo, const JOCTET * buffer,
-+ size_t bufsize);
---- /dev/null
-+++ src/renderer/jpeg_memsrc.c
-@@ -0,0 +1,163 @@
-+/*
-+* memsrc.c
-+*
-+* Copyright (C) 1994-1996, Thomas G. Lane.
-+* This file is part of the Independent JPEG Group's software.
-+* For conditions of distribution and use, see the accompanying README file.
-+*
-+* This file contains decompression data source routines for the case of
-+* reading JPEG data from a memory buffer that is preloaded with the entire
-+* JPEG file. This would not seem especially useful at first sight, but
-+* a number of people have asked for it.
-+* This is really just a stripped-down version of jdatasrc.c. Comparison
-+* of this code with jdatasrc.c may be helpful in seeing how to make
-+* custom source managers for other purposes.
-+*/
-+
-+/* this is not a core library module, so it doesn't define JPEG_INTERNALS */
-+#include <stdio.h>
-+#include <jpeglib.h>
-+#include <jerror.h>
-+
-+
-+/* Expanded data source object for memory input */
-+
-+typedef struct {
-+struct jpeg_source_mgr pub; /* public fields */
-+
-+JOCTET eoi_buffer[2]; /* a place to put a dummy EOI */
-+} my_source_mgr;
-+
-+typedef my_source_mgr * my_src_ptr;
-+
-+
-+/*
-+* Initialize source --- called by jpeg_read_header
-+* before any data is actually read.
-+*/
-+
-+METHODDEF(void)
-+init_source (j_decompress_ptr cinfo)
-+{
-+/* No work, since jpeg_memory_src set up the buffer pointer and count.
-+* Indeed, if we want to read multiple JPEG images from one buffer,
-+* this *must* not do anything to the pointer.
-+*/
-+}
-+
-+
-+/*
-+* Fill the input buffer --- called whenever buffer is emptied.
-+*
-+* In this application, this routine should never be called; if it is called,
-+* the decompressor has overrun the end of the input buffer, implying we
-+* supplied an incomplete or corrupt JPEG datastream. A simple error exit
-+* might be the most appropriate response.
-+*
-+* But what we choose to do in this code is to supply dummy EOI markers
-+* in order to force the decompressor to finish processing and supply
-+* some sort of output image, no matter how corrupted.
-+*/
-+
-+METHODDEF(boolean)
-+fill_input_buffer (j_decompress_ptr cinfo)
-+{
-+my_src_ptr src = (my_src_ptr) cinfo->src;
-+
-+WARNMS(cinfo, JWRN_JPEG_EOF);
-+
-+/* Create a fake EOI marker */
-+src->eoi_buffer[0] = (JOCTET) 0xFF;
-+src->eoi_buffer[1] = (JOCTET) JPEG_EOI;
-+src->pub.next_input_byte = src->eoi_buffer;
-+src->pub.bytes_in_buffer = 2;
-+
-+return TRUE;
-+}
-+
-+
-+/*
-+* Skip data --- used to skip over a potentially large amount of
-+* uninteresting data (such as an APPn marker).
-+*
-+* If we overrun the end of the buffer, we let fill_input_buffer deal with
-+* it. An extremely large skip could cause some time-wasting here, but
-+* it really isn't supposed to happen ... and the decompressor will never
-+* skip more than 64K anyway.
-+*/
-+
-+METHODDEF(void)
-+skip_input_data (j_decompress_ptr cinfo, long num_bytes)
-+{
-+my_src_ptr src = (my_src_ptr) cinfo->src;
-+
-+if (num_bytes > 0) {
-+while (num_bytes > (long) src->pub.bytes_in_buffer) {
-+num_bytes -= (long) src->pub.bytes_in_buffer;
-+(void) fill_input_buffer(cinfo);
-+/* note we assume that fill_input_buffer will never return FALSE,
-+* so suspension need not be handled.
-+*/
-+}
-+src->pub.next_input_byte += (size_t) num_bytes;
-+src->pub.bytes_in_buffer -= (size_t) num_bytes;
-+}
-+}
-+
-+
-+/*
-+* An additional method that can be provided by data source modules is the
-+* resync_to_restart method for error recovery in the presence of RST markers.
-+* For the moment, this source module just uses the default resync method
-+* provided by the JPEG library. That method assumes that no backtracking
-+* is possible.
-+*/
-+
-+
-+/*
-+* Terminate source --- called by jpeg_finish_decompress
-+* after all data has been read. Often a no-op.
-+*
-+* NB: *not* called by jpeg_abort or jpeg_destroy; surrounding
-+* application must deal with any cleanup that should happen even
-+* for error exit.
-+*/
-+
-+METHODDEF(void)
-+term_source (j_decompress_ptr cinfo)
-+{
-+/* no work necessary here */
-+}
-+
-+
-+/*
-+* Prepare for input from a memory buffer.
-+*/
-+
-+GLOBAL(void)
-+jpeg_memory_src (j_decompress_ptr cinfo, const JOCTET * buffer, size_t bufsize)
-+{
-+my_src_ptr src;
-+
-+/* The source object is made permanent so that a series of JPEG images
-+* can be read from a single buffer by calling jpeg_memory_src
-+* only before the first one.
-+* This makes it unsafe to use this manager and a different source
-+* manager serially with the same JPEG object. Caveat programmer.
-+*/
-+if (cinfo->src == NULL) { /* first time for this JPEG object? */
-+cinfo->src = (struct jpeg_source_mgr *)
-+(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
-+sizeof(my_source_mgr));
-+}
-+
-+src = (my_src_ptr) cinfo->src;
-+src->pub.init_source = init_source;
-+src->pub.fill_input_buffer = fill_input_buffer;
-+src->pub.skip_input_data = skip_input_data;
-+src->pub.resync_to_restart = jpeg_resync_to_restart; /* use default method */
-+src->pub.term_source = term_source;
-+
-+src->pub.next_input_byte = buffer;
-+src->pub.bytes_in_buffer = bufsize;
-+}
diff --git a/games-fps/tremulous/files/tremulous-1.1.0-system_jpeg.patch b/games-fps/tremulous/files/tremulous-1.1.0-system_jpeg.patch
deleted file mode 100644
index d8f0f980dc13..000000000000
--- a/games-fps/tremulous/files/tremulous-1.1.0-system_jpeg.patch
+++ /dev/null
@@ -1,259 +0,0 @@
---- Makefile
-+++ Makefile
-@@ -91,6 +91,10 @@
- USE_OPENAL=1
- endif
-
-+ifndef USE_SYSTEM_JPEG
-+USE_SYSTEM_JPEG=1
-+endif
-+
- ifndef USE_OPENAL_DLOPEN
- USE_OPENAL_DLOPEN=0
- endif
-@@ -193,6 +197,10 @@
- endif
- endif
-
-+ ifeq ($(USE_SYSTEM_JPEG),1)
-+ BASE_CFLAGS += -DUSE_SYSTEM_JPEG=1
-+ endif
-+
- ifeq ($(USE_CURL),1)
- BASE_CFLAGS += -DUSE_CURL=1
- ifeq ($(USE_CURL_DLOPEN),1)
-@@ -269,6 +277,10 @@
- CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg
- endif
-
-+ ifeq ($(USE_SYSTEM_JPEG),1)
-+ CLIENT_LDFLAGS += -ljpeg
-+ endif
-+
- ifeq ($(ARCH),x86)
- # linux32 make ...
- BASE_CFLAGS += -m32
-@@ -928,6 +940,33 @@
- $(B)/client/vm.o \
- $(B)/client/vm_interpreted.o \
- \
-+ $(B)/client/tr_animation.o \
-+ $(B)/client/tr_backend.o \
-+ $(B)/client/tr_bloom.o \
-+ $(B)/client/tr_bsp.o \
-+ $(B)/client/tr_cmds.o \
-+ $(B)/client/tr_curve.o \
-+ $(B)/client/tr_flares.o \
-+ $(B)/client/tr_font.o \
-+ $(B)/client/tr_image.o \
-+ $(B)/client/tr_init.o \
-+ $(B)/client/tr_light.o \
-+ $(B)/client/tr_main.o \
-+ $(B)/client/tr_marks.o \
-+ $(B)/client/tr_mesh.o \
-+ $(B)/client/tr_model.o \
-+ $(B)/client/tr_noise.o \
-+ $(B)/client/tr_scene.o \
-+ $(B)/client/tr_shade.o \
-+ $(B)/client/tr_shade_calc.o \
-+ $(B)/client/tr_shader.o \
-+ $(B)/client/tr_shadows.o \
-+ $(B)/client/tr_sky.o \
-+ $(B)/client/tr_surface.o \
-+ $(B)/client/tr_world.o \
-+
-+ifneq ($(USE_SYSTEM_JPEG),1)
-+ Q3OBJ += \
- $(B)/client/jcapimin.o \
- $(B)/client/jchuff.o \
- $(B)/client/jcinit.o \
-@@ -961,32 +1000,10 @@
- $(B)/client/jidctflt.o \
- $(B)/client/jmemmgr.o \
- $(B)/client/jmemnobs.o \
-- $(B)/client/jutils.o \
-- \
-- $(B)/client/tr_animation.o \
-- $(B)/client/tr_backend.o \
-- $(B)/client/tr_bloom.o \
-- $(B)/client/tr_bsp.o \
-- $(B)/client/tr_cmds.o \
-- $(B)/client/tr_curve.o \
-- $(B)/client/tr_flares.o \
-- $(B)/client/tr_font.o \
-- $(B)/client/tr_image.o \
-- $(B)/client/tr_init.o \
-- $(B)/client/tr_light.o \
-- $(B)/client/tr_main.o \
-- $(B)/client/tr_marks.o \
-- $(B)/client/tr_mesh.o \
-- $(B)/client/tr_model.o \
-- $(B)/client/tr_noise.o \
-- $(B)/client/tr_scene.o \
-- $(B)/client/tr_shade.o \
-- $(B)/client/tr_shade_calc.o \
-- $(B)/client/tr_shader.o \
-- $(B)/client/tr_shadows.o \
-- $(B)/client/tr_sky.o \
-- $(B)/client/tr_surface.o \
-- $(B)/client/tr_world.o \
-+ $(B)/client/jutils.o
-+else
-+ Q3OBJ += $(B)/client/jpeg_memsrc.o
-+endif
-
- ifeq ($(ARCH),x86)
- Q3OBJ += \
-@@ -1284,8 +1301,12 @@
- $(B)/client/%.o: $(BLIBDIR)/%.c
- $(DO_BOT_CC)
-
-+ifneq ($(USE_SYSTEM_JPEG),1)
- $(B)/client/%.o: $(JPDIR)/%.c
- $(DO_CC)
-+else
-+$(B)/client/jmemnobs.o : $(JPDIR)/jmemnobs.c; $(DO_CC) $(GL_CFLAGS) $(MINGW_CFLAGS)
-+endif
-
- $(B)/client/%.o: $(RDIR)/%.c
- $(DO_CC)
---- src/jpeg-6/jmemnobs.c
-+++ src/jpeg-6/jmemnobs.c
-@@ -16,11 +16,23 @@
- */
-
- #include "../renderer/tr_local.h"
-+#ifdef USE_SYSTEM_JPEG
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <jpeglib.h>
-+
-+#undef GLOBAL
-+#define GLOBAL
-+#define FAR
-
-+typedef void * backing_store_ptr;
-+
-+#else
- #define JPEG_INTERNALS
- #include "jinclude.h"
- #include "jpeglib.h"
- #include "jmemsys.h" /* import the system-dependent declarations */
-+#endif
-
- /*
- * Memory allocation and ri.Freeing are controlled by the regular library
-@@ -83,7 +95,13 @@
- jpeg_open_backing_store (j_common_ptr cinfo, backing_store_ptr info,
- long total_bytes_needed)
- {
-- ERREXIT(cinfo, JERR_NO_BACKING_STORE);
-+#ifdef USE_SYSTEM_JPEG
-+ fprintf(stderr,
-+ "jmemnobs.c: jpeg_open_backing_store() call, this should never happen!\n");
-+ exit(1);
-+#else
-+ERREXIT(cinfo, JERR_NO_BACKING_STORE);
-+#endif
- }
-
-
---- src/renderer/tr_image.c
-+++ src/renderer/tr_image.c
-@@ -31,8 +31,13 @@
- * You may also wish to include "jerror.h".
- */
-
-+#ifdef USE_SYSTEM_JPEG
-+#include <jpeglib.h>
-+#include "jpeg_memsrc.h"
-+#else
- #define JPEG_INTERNALS
- #include "../jpeg-6/jpeglib.h"
-+#endif
-
- #include "../qcommon/puff.h"
-
-@@ -1409,6 +1414,12 @@
- unsigned char *out;
- byte *fbuffer;
- byte *buf;
-+ size_t bufsize;
-+#ifdef USE_SYSTEM_JPEG
-+ int i,j;
-+ byte *inptr, *outptr;
-+#endif
-+
-
- /* In this example we want to open the input file before doing anything else,
- * so that the setjmp() error recovery below can assume the file is open.
-@@ -1416,7 +1427,7 @@
- * requires it in order to read binary files.
- */
-
-- ri.FS_ReadFile ( ( char * ) filename, (void **)&fbuffer);
-+ bufsize = ri.FS_ReadFile ( ( char * ) filename, (void **)&fbuffer);
- if (!fbuffer) {
- return;
- }
-@@ -1434,8 +1445,11 @@
- jpeg_create_decompress(&cinfo);
-
- /* Step 2: specify data source (eg, a file) */
--
-+#ifdef USE_SYSTEM_JPEG
-+ jpeg_memory_src(&cinfo, fbuffer, bufsize);
-+#else
- jpeg_stdio_src(&cinfo, fbuffer);
-+#endif
-
- /* Step 3: read file parameters with jpeg_read_header() */
-
-@@ -1478,7 +1492,7 @@
- }
-
- memcount = pixelcount * 4;
-- row_stride = cinfo.output_width * cinfo.output_components;
-+ row_stride = cinfo.output_width * 4;
-
- out = ri.Malloc(memcount);
-
-@@ -1499,6 +1513,21 @@
- buf = ((out+(row_stride*cinfo.output_scanline)));
- buffer = &buf;
- (void) jpeg_read_scanlines(&cinfo, buffer, 1);
-+#ifdef USE_SYSTEM_JPEG
-+ /* we have RGB data, we need to expand this out to ARGB */
-+ inptr = buf + cinfo.output_width * 3 - 1;
-+ outptr = buf + row_stride - 1;
-+
-+ for (i = 0; i < cinfo.output_width; i++) {
-+ /* endian dependent? maybe for big endian this must be done after the
-+ color/pixel copy? */
-+ *outptr-- = 255;
-+ for (j = 0; j < 3; j++) {
-+ JOCTET color = *inptr--;
-+ *outptr-- = color;
-+ }
-+ }
-+#endif
- }
-
- buf = out;
-@@ -1617,6 +1646,7 @@
- return TRUE;
- }
-
-+#ifndef USE_SYSTEM_JPEG
-
- /*
- * Compression initialization.
-@@ -1709,6 +1739,8 @@
- return row_ctr;
- }
-
-+#endif
-+
- /*
- * Terminate destination --- called by jpeg_finish_compress
- * after all data has been written. Usually needs to flush buffer.
diff --git a/games-fps/tremulous/metadata.xml b/games-fps/tremulous/metadata.xml
deleted file mode 100644
index 9e6963e7f6d5..000000000000
--- a/games-fps/tremulous/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>games</herd>
- <upstream>
- <remote-id type="sourceforge">tremulous</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/games-fps/tremulous/tremulous-1.1.0-r4.ebuild b/games-fps/tremulous/tremulous-1.1.0-r4.ebuild
deleted file mode 100644
index 958380358d73..000000000000
--- a/games-fps/tremulous/tremulous-1.1.0-r4.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/tremulous/tremulous-1.1.0-r4.ebuild,v 1.13 2014/11/21 06:10:50 ulm Exp $
-
-EAPI=4
-
-inherit eutils toolchain-funcs games
-
-DESCRIPTION="Team-based aliens vs humans FPS with buildable structures"
-HOMEPAGE="http://tremulous.net/ http://trem-servers.com"
-SRC_URI="http://dl.trem-servers.com/${PN}-gentoopatches-${PV}-r5.zip
- http://dl.trem-servers.com/vms-1.1.t971.pk3
- http://0day.icculus.org/mirrors/${PN}/${P}.zip
- ftp://ftp.wireplay.co.uk/pub/quake3arena/mods/${PN}/${P}.zip
- mirror://sourceforge/${PN}/${P}.zip"
-
-# most media: CC-BY-SA-2.5
-# shaderlab textures: shaderlab (relicensed to CC-BY-SA-2.5 wrt
-# http://lists.debian.org/debian-legal/2006/04/msg00229.html)
-# textures by yves allaire: CC-BY-ND-NC-1.0
-# most part of the code: GPL-2
-# src/game/bg_lib.c: BSD
-# src/qcommon/unzip.c: ZLIB
-# src/jpeg-6/* and src/renderer/jpeg_memsrc.c: IJG
-# src/client/snd_adpcm.c: HPND
-LICENSE="BSD CC-BY-ND-NC-1.0 CC-BY-SA-2.5 GPL-2 HPND IJG ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="dedicated openal +opengl +vorbis"
-
-UIDEPEND="
- virtual/jpeg
- media-libs/libsdl[joystick,opengl?]
- vorbis? ( media-libs/libogg media-libs/libvorbis )
- openal? ( media-libs/openal )
- x11-libs/libXau
- x11-libs/libXdmcp"
-RDEPEND="opengl? ( ${UIDEPEND} )
- !opengl? ( !dedicated? ( ${UIDEPEND} ) )"
-DEPEND="${RDEPEND}
- app-arch/unzip"
-
-S=${WORKDIR}/${PN}/${P}-src
-
-src_unpack() {
- unpack ${PN}-gentoopatches-${PV}-r5.zip
- unpack ${P}.zip
-
- cd ${PN}
- unpack ./${P}-src.tar.gz
- cp -f "${DISTDIR}"/vms-1.1.t971.pk3 "${WORKDIR}"/${PN}/base/ || die
-}
-
-src_prepare() {
- # security patches
- epatch "${WORKDIR}"/${PN}-svn755-upto-971.patch
- epatch "${WORKDIR}"/${PN}-t971-client.patch
- epatch "${FILESDIR}"/${P}-system_jpeg.patch \
- "${FILESDIR}"/${P}-system_jpeg-2.patch \
- "${FILESDIR}"/${P}-ldflags.patch
- # fix the gcc-4.3.3 Werror issue
- # This is probably issue for all icculus q3 based games
- sed -i -e '16s/-Werror //' src/tools/asm/Makefile || die
-}
-
-src_compile() {
- buildit() { use $1 && echo 1 || echo 0 ; }
-
- local client=1
- if ! use opengl; then
- client=0
- if ! use dedicated; then
- # user is not sure what he wants
- client=1
- fi
- fi
-
- emake \
- -j1 \
- $(use amd64 && echo ARCH=x86_64) \
- BUILD_CLIENT=${client} \
- BUILD_CLIENT_SMP=${client} \
- BUILD_SERVER=$(buildit dedicated) \
- BUILD_GAME_SO=0 \
- BUILD_GAME_QVM=0 \
- CC="$(tc-getCC)" \
- DEFAULT_BASEDIR="${GAMES_DATADIR}/${PN}" \
- USE_CODEC_VORBIS=$(buildit vorbis) \
- USE_OPENAL=$(buildit openal) \
- USE_LOCAL_HEADERS=0 \
- OPTIMIZE=
-}
-
-src_install() {
- insinto "${GAMES_DATADIR}"/${PN}
- doins -r ../base
- dodoc ChangeLog ../manual.pdf
- if use opengl || ! use dedicated ; then
- newgamesbin build/release-linux-*/${PN}-smp.* ${PN}
- newicon "${WORKDIR}"/tyrant.xpm ${PN}.xpm
- make_desktop_entry ${PN} Tremulous
- fi
- if use dedicated ; then
- newgamesbin build/release-linux-*/tremded.* ${PN}-ded
- fi
- prepgamesdirs
-}
-
-pkg_postinst() {
- games_pkg_postinst
-
- elog "If you want to add extra maps, you can download them"
- elog "and unpack them into ~/.tremulous/base for your user"
- elog "or into ${GAMES_DATADIR}/${PN}/base for all users."
-}