Fix uncorrect detection of cross-compiling. Bug #154745

Package-Manager: portage-2.1.2.2

4 files changed, 119 insertions, 10 deletions

diff --git a/games-fps/tremulous/ChangeLog b/games-fps/tremulous/ChangeLog
index c1f98a624bec..2164422e245c 100644
--- a/games-fps/tremulous/ChangeLog
+++ b/games-fps/tremulous/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-fps/tremulous
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/tremulous/ChangeLog,v 1.4 2006/12/05 18:03:48 wolf31o2 Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/tremulous/ChangeLog,v 1.5 2007/05/18 22:46:46 tupone Exp $
+
+*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:
diff --git a/games-fps/tremulous/Manifest b/games-fps/tremulous/Manifest
index 8ffdd2540bd2..5cc0cf7dd046 100644
--- a/games-fps/tremulous/Manifest
+++ b/games-fps/tremulous/Manifest
@@ -2,14 +2,18 @@
 Hash: SHA1
 
 DIST tremulous-1.1.0.zip 105821907 RMD160 36d25fee8ee6b348b1045ab027ab6733aef77a1d SHA1 39d820cc50eda1eff58917158bb0ec68b62f633c SHA256 c7bb66f55abc88932edee16c253e5d37f90dded2ce29cf6cb15ad4f78e378987
+EBUILD tremulous-1.1.0-r1.ebuild 2186 RMD160 0e8f1f9e8049a6ab953c3b851dad9c2f94cd675e SHA1 a31197cb0ffecaf5d2b8aa825233e539a2a79f39 SHA256 255084563a9ce8727f870351664052750af1cab0c3c63b55a13e8fca4d7f2083
+MD5 2657f1cf8a31da349dae75c9315802ed tremulous-1.1.0-r1.ebuild 2186
+RMD160 0e8f1f9e8049a6ab953c3b851dad9c2f94cd675e tremulous-1.1.0-r1.ebuild 2186
+SHA256 255084563a9ce8727f870351664052750af1cab0c3c63b55a13e8fca4d7f2083 tremulous-1.1.0-r1.ebuild 2186
 EBUILD tremulous-1.1.0.ebuild 2157 RMD160 e2cb0788acd1af3eba4ddf696b64ca04d6e5ac9c SHA1 d86ed0cf0d8b6a6d07473d4b038dae94b869bc5e SHA256 fea233def4a10c2c2aaeb78b9a5f7bdb91c0b7a90598571e81aef9572b416c71
 MD5 725e450fda8c7420b9e62ba3bb416ea7 tremulous-1.1.0.ebuild 2157
 RMD160 e2cb0788acd1af3eba4ddf696b64ca04d6e5ac9c tremulous-1.1.0.ebuild 2157
 SHA256 fea233def4a10c2c2aaeb78b9a5f7bdb91c0b7a90598571e81aef9572b416c71 tremulous-1.1.0.ebuild 2157
-MISC ChangeLog 812 RMD160 d2ed1b5346a88f290e14cbce0a2e27f9e253b59e SHA1 3d0f37d4300a38698563e7d89de82d3797891508 SHA256 5980e004e3f3f9bcb6261d32aab2d7d40af2eaf8d1728cbcb08e7a78489a3a64
-MD5 69aa9e9c6fdfd252fcd8f7f2b2e54186 ChangeLog 812
-RMD160 d2ed1b5346a88f290e14cbce0a2e27f9e253b59e ChangeLog 812
-SHA256 5980e004e3f3f9bcb6261d32aab2d7d40af2eaf8d1728cbcb08e7a78489a3a64 ChangeLog 812
+MISC ChangeLog 999 RMD160 8a8b79a7592e50cf6dee307c949b2e9056c029b2 SHA1 78393a2c9dc9b93170f92c24d8b95bdf6860c4dc SHA256 a670629c2d1a50abb072e02050770bacdcfb69f53213db51e66b4838e09a84d1
+MD5 ce2f02db60405dddc8d3fc0849a4170c ChangeLog 999
+RMD160 8a8b79a7592e50cf6dee307c949b2e9056c029b2 ChangeLog 999
+SHA256 a670629c2d1a50abb072e02050770bacdcfb69f53213db51e66b4838e09a84d1 ChangeLog 999
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -17,10 +21,13 @@ SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata
 MD5 b20f67e86d7888db5aad44273ae6532a files/digest-tremulous-1.1.0 247
 RMD160 5f606ea66d8584939f64cbcd3e2439cd74d887ac files/digest-tremulous-1.1.0 247
 SHA256 e72fd29e6a2a877b17769e96c97b780f761acaf68876b9047e0f3b69e52e8bb2 files/digest-tremulous-1.1.0 247
+MD5 b20f67e86d7888db5aad44273ae6532a files/digest-tremulous-1.1.0-r1 247
+RMD160 5f606ea66d8584939f64cbcd3e2439cd74d887ac files/digest-tremulous-1.1.0-r1 247
+SHA256 e72fd29e6a2a877b17769e96c97b780f761acaf68876b9047e0f3b69e52e8bb2 files/digest-tremulous-1.1.0-r1 247
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFdbSQkT4lNIS36YERAmkjAJ4zgF2f7h+ErcsQVM2osoWK1LWf/ACbBm5O
-95sf/0oppRzFVmxpyhJssPo=
-=RZvJ
+iD8DBQFGTizlRmMZkarFlIwRAkFGAJ9F0M2z8n2/xTM/Ke9SUWdHTQb4vwCgpeQp
+Ovm0onZcl5ro4S3fmFHv8xk=
+=XGoq
 -----END PGP SIGNATURE-----
diff --git a/games-fps/tremulous/files/digest-tremulous-1.1.0-r1 b/games-fps/tremulous/files/digest-tremulous-1.1.0-r1
new file mode 100644
index 000000000000..624ad9d6eb07
--- /dev/null
+++ b/games-fps/tremulous/files/digest-tremulous-1.1.0-r1
@@ -0,0 +1,3 @@
+MD5 3df5f7565571fb9524656308347bce1b tremulous-1.1.0.zip 105821907
+RMD160 36d25fee8ee6b348b1045ab027ab6733aef77a1d tremulous-1.1.0.zip 105821907
+SHA256 c7bb66f55abc88932edee16c253e5d37f90dded2ce29cf6cb15ad4f78e378987 tremulous-1.1.0.zip 105821907
diff --git a/games-fps/tremulous/tremulous-1.1.0-r1.ebuild b/games-fps/tremulous/tremulous-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..e9c196fafa0f
--- /dev/null
+++ b/games-fps/tremulous/tremulous-1.1.0-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2007 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-r1.ebuild,v 1.1 2007/05/18 22:46:46 tupone 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= \
+		COMPILE_ARCH=${ARCH} \
+		|| 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}.xpm
+	fi
+
+	if use dedicated ; then
+		newgamesbin ${bindir}/tremded.${ARCH} ${PN}-ded \
+			|| die "newgamesbin ded failed"
+	fi
+
+	prepgamesdirs
+}