3 files changed, 3 insertions, 117 deletions
diff --git a/games-fps/tremulous/Manifest b/games-fps/tremulous/Manifest
index a15978cc035c..8b6ee73283bd 100644
--- a/games-fps/tremulous/Manifest
+++ b/games-fps/tremulous/Manifest
@@ -1,18 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX tremulous-1.1.0-gcc42.patch 562 RMD160 73a40b62e02e822188333e033e1a0aebbb4c2979 SHA1 64d04738a7bd571a8336f977a60606315b6e64b1 SHA256 b93f5deb27e3ad4f800f0d21b671c5ad94015da48689da850f78b325e6a86e48
 DIST tremulous-1.1.0.zip 105821907 RMD160 36d25fee8ee6b348b1045ab027ab6733aef77a1d SHA1 39d820cc50eda1eff58917158bb0ec68b62f633c SHA256 c7bb66f55abc88932edee16c253e5d37f90dded2ce29cf6cb15ad4f78e378987
 DIST tremulous-gentoopatches-1.1.0-r5.zip 372877 RMD160 08d07feaa9b8df910a880beb8574ff1aed5a97cc SHA1 ce2bfa1535f1774c92aa3fdf738d3054f7bb5b65 SHA256 c03f22b49b65d8f7acae18981f3c87eac0f17a44c3916282eaa10afe232ca12b
 DIST vms-1.1.t971.pk3 495308 RMD160 fc970c73cb4401ab1f9524cfc090af1ac0976560 SHA1 ea11d498a92abeaa5fc5bd5567771dca3a7ea55e SHA256 bb2f57e5c2dd725e095f0e92a9dfe5fb99f8ba84344618087828d0f5dced797e
 EBUILD tremulous-1.1.0-r2.ebuild 2706 RMD160 e7362d913bf311417f10171e2a0ef39d38556a67 SHA1 539e49ad91c9493bacec29d910663695bfab2b6b SHA256 930da649ddb3ea929caf8387efdc584c0a199b4f651c26b651b3af3637fae16a
-EBUILD tremulous-1.1.0.ebuild 2150 RMD160 953565c4769f4adc83f13abc21fdbf965153e216 SHA1 e69983f1b892ac32fcef37ce4a6b17ab258da620 SHA256 a81c72b2ec82609b36a84d082bc9e8366a7c4629128a7bfb712bd75be6d13b3c
 MISC ChangeLog 1855 RMD160 c073d0ea9d188dd1f9def99ac3490f3681ea0ff6 SHA1 75edf013d983f729b188fa781d43f2f4fc7c520e SHA256 0a657370e94bcb9b1e71a9eb6c50205aa0bb7666358c338ec9ed55eb92e77475
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjRZrAACgkQkKaRLQcq0GJ5dgCgqYy8CPAnMHop5jcEsfHyatPr
-iYkAn0e+Y+HX0l3li/H6EYp3Q91tiCCv
-=fIe1
+iEYEARECAAYFAkkiwbsACgkQdz7hIScOURH+EACgwVaBc+lstSnsKaDPP+f/YzNK
+kwwAn1BDt0hDtoexaOHRXEiteJ8qrabE
+=TERQ
 -----END PGP SIGNATURE-----
diff --git a/games-fps/tremulous/files/tremulous-1.1.0-gcc42.patch b/games-fps/tremulous/files/tremulous-1.1.0-gcc42.patch
deleted file mode 100644
index f04398fa9c5d..000000000000
--- a/games-fps/tremulous/files/tremulous-1.1.0-gcc42.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/tools/asm/cmdlib.c
-+++ src/tools/asm/cmdlib.c
-@@ -313,7 +313,7 @@
- char *ExpandPath (const char *path)
- {
- 	static char full[1024];
--	if (!qdir)
-+	if (!qdir[0])
- 		Error ("ExpandPath called without qdir set");
- 	if (path[0] == '/' || path[0] == '\\' || path[1] == ':') {
- 		strcpy( full, path );
-@@ -326,7 +326,7 @@
- char *ExpandGamePath (const char *path)
- {
- 	static char full[1024];
--	if (!qdir)
-+	if (!qdir[0])
- 		Error ("ExpandGamePath called without qdir set");
- 	if (path[0] == '/' || path[0] == '\\' || path[1] == ':') {
- 		strcpy( full, path );
diff --git a/games-fps/tremulous/tremulous-1.1.0.ebuild b/games-fps/tremulous/tremulous-1.1.0.ebuild
deleted file mode 100644
index e7697c93d75b..000000000000
--- a/games-fps/tremulous/tremulous-1.1.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2008 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.ebuild,v 1.6 2008/02/29 19:22:46 carlo Exp $
-
-inherit eutils toolchain-funcs games
-
-DESCRIPTION="Team-based aliens vs humans FPS with buildable structures"
-HOMEPAGE="http://tremulous.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.zip
-	http://0day.icculus.org/mirrors/${PN}/${P}.zip
-	ftp://ftp.wireplay.co.uk/pub/quake3arena/mods/${PN}/${P}.zip"
-
-LICENSE="GPL-2
-	CCPL-Attribution-ShareAlike-2.5"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="dedicated openal opengl vorbis"
-
-UIDEPEND="openal? ( media-libs/openal )
-	media-libs/libsdl
-	vorbis? ( media-libs/libogg media-libs/libvorbis )
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-libs/libXext"
-RDEPEND="opengl? ( ${UIDEPEND} )
-	!opengl? ( !dedicated? ( ${UIDEPEND} ) )
-	!games-fps/tremulous-bin"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/${PN}/${P}-src
-
-pkg_setup() {
-	games_pkg_setup
-
-	if use amd64 ; then
-		ewarn "emerge games-fps/tremulous-bin instead for better performance."
-		echo
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${PN}
-
-	unpack ./${P}-src.tar.gz
-}
-
-src_compile() {
-	buildit() { use $1 && echo 1 || echo 0 ; }
-
-	local build_client=1
-	if use dedicated && ! use opengl ; then
-		build_client=0
-	fi
-
-	emake \
-		BUILD_CLIENT=${build_client} \
-		BUILD_SERVER=$(buildit dedicated) \
-		CC="$(tc-getCC)" \
-		DEFAULT_BASEDIR="${GAMES_DATADIR}/${PN}" \
-		USE_CODEC_VORBIS=$(buildit vorbis) \
-		USE_OPENAL=$(buildit openal) \
-		USE_LOCAL_HEADERS=0 \
-		OPTIMIZE= \
-		|| die "emake failed"
-}
-
-src_install() {
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r ../base || die "doins -r failed"
-
-	dodoc ChangeLog ../manual.pdf
-
-	local bindir=build/release-linux-${ARCH}
-
-	if use opengl || ! use dedicated ; then
-		newgamesbin ${bindir}/${PN}.${ARCH} ${PN} \
-			|| die "newgamesbin client failed"
-		doicon misc/${PN}.xpm
-		make_desktop_entry ${PN} Tremulous ${PN}
-	fi
-
-	if use dedicated ; then
-		newgamesbin ${bindir}/tremded.${ARCH} ${PN}-ded \
-			|| die "newgamesbin ded failed"
-	fi
-
-	prepgamesdirs
-}