Add gcc-4.3.3 Werror fix. Move to EAPI=2. Per bug #260165.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

3 files changed, 115 insertions, 13 deletions

diff --git a/games-fps/tremulous/ChangeLog b/games-fps/tremulous/ChangeLog
index 1c39f68c57b3..937c1983a04f 100644
--- a/games-fps/tremulous/ChangeLog
+++ b/games-fps/tremulous/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-fps/tremulous
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/tremulous/ChangeLog,v 1.11 2008/09/17 20:19:32 maekke Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/tremulous/ChangeLog,v 1.12 2009/02/25 20:03:35 scarabeus Exp $
+
+*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
diff --git a/games-fps/tremulous/Manifest b/games-fps/tremulous/Manifest
index 8b6ee73283bd..d25f1703537a 100644
--- a/games-fps/tremulous/Manifest
+++ b/games-fps/tremulous/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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
-MISC ChangeLog 1855 RMD160 c073d0ea9d188dd1f9def99ac3490f3681ea0ff6 SHA1 75edf013d983f729b188fa781d43f2f4fc7c520e SHA256 0a657370e94bcb9b1e71a9eb6c50205aa0bb7666358c338ec9ed55eb92e77475
+EBUILD tremulous-1.1.0-r3.ebuild 2887 RMD160 c159b54b329d925adee19ae1b56d5582fd1181f4 SHA1 7285853c86fde00c45fcbe807bcbd2673d5b620a SHA256 8e010c840d9abf042fae51c89da4a5236a28b3bca200b2e58268859838dc7870
+MISC ChangeLog 2037 RMD160 222c59022deb15074885c2ef2d0696a234b03d28 SHA1 dee68bde06d5e5e083da2accbc4be3a74412a1d9 SHA256 981ed6688e0ab08eb53f6955defaf0713551fb5f30499fd584e805baf09d8bf5
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkkiwbsACgkQdz7hIScOURH+EACgwVaBc+lstSnsKaDPP+f/YzNK
-kwwAn1BDt0hDtoexaOHRXEiteJ8qrabE
-=TERQ
------END PGP SIGNATURE-----
diff --git a/games-fps/tremulous/tremulous-1.1.0-r3.ebuild b/games-fps/tremulous/tremulous-1.1.0-r3.ebuild
new file mode 100644
index 000000000000..b3d18d533333
--- /dev/null
+++ b/games-fps/tremulous/tremulous-1.1.0-r3.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2009 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-r3.ebuild,v 1.1 2009/02/25 20:03:35 scarabeus Exp $
+
+EAPI=2
+
+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"
+
+LICENSE="GPL-2 CCPL-Attribution-ShareAlike-2.5"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="dedicated openal +opengl +vorbis"
+
+UIDEPEND="
+	media-libs/libsdl[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
+	# 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 \
+		$(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= \
+		|| die "emake failed"
+}
+
+src_install() {
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r ../base || die "doins -r failed"
+	dodoc ChangeLog ../manual.pdf
+	if use opengl || ! use dedicated ; then
+		newgamesbin build/release-linux-*/${PN}-smp.* ${PN} \
+			|| die "newgamesbin ${PN}"
+		newicon "${WORKDIR}"/tyrant.xpm ${PN}.xpm
+		make_desktop_entry ${PN} Tremulous
+	fi
+	if use dedicated ; then
+		newgamesbin build/release-linux-*/tremded.* ${PN}-ded \
+			|| die "newgamesbin ${PN}-ded failed"
+	fi
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+
+	elog "If you want to add extra maps, download"
+	elog "http://tremulous.bricosoft.com/base/all-maps.tgz"
+	elog "and unpack it into ~/.tremulous/base for your user"
+	elog "or into ${GAMES_DATADIR}/${PN}/base for all users."
+}