Version bump to 2.1 from 2.0 with a simple ebuild copy and adding DP_FS_BASEDIR=${GAMES_DATADIR}/quake1 to each emake line.

Package-Manager: portage-2.1.2_pre1-r2

6 files changed, 220 insertions, 28 deletions

diff --git a/games-fps/nexuiz/ChangeLog b/games-fps/nexuiz/ChangeLog
index cdf8e4129e9a..91c35e56db15 100644
--- a/games-fps/nexuiz/ChangeLog
+++ b/games-fps/nexuiz/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-fps/nexuiz
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/nexuiz/ChangeLog,v 1.12 2006/06/28 21:57:53 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/nexuiz/ChangeLog,v 1.13 2006/09/27 22:21:59 wolf31o2 Exp $
+
+*nexuiz-2.1 (27 Sep 2006)
+
+  27 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org> +nexuiz-2.1.ebuild:
+  Version bump to 2.1 from 2.0 with a simple ebuild copy and adding
+  DP_FS_BASEDIR=${GAMES_DATADIR}/quake1 to each emake line.
 
   28 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org> nexuiz-2.0.ebuild:
   Fixing dependencies and closing bug #138380.
diff --git a/games-fps/nexuiz/Manifest b/games-fps/nexuiz/Manifest
index e80f88f31127..4013a504a918 100644
--- a/games-fps/nexuiz/Manifest
+++ b/games-fps/nexuiz/Manifest
@@ -3,6 +3,7 @@ Hash: SHA1
 
 DIST nexuiz-15.zip 187010881 RMD160 6efcb9e8ec4abf97094d59b6562af871b454a14b SHA1 195c03860a444a33472814a7dcb2a88a2222be81 SHA256 a53b1afbdcbd2cdd3d5417aefffe2512a990035cdc020156a05139d1a2df6006
 DIST nexuiz-20.zip 199962978 RMD160 d08f4288b2d29c605fb260f75c9e90682617ccaa SHA1 20943ebdc38d864f5b611fc6933c70a05fa22acf SHA256 ec530582a8050ddc6f270446994e83a24aa8b664f136132f5764f9a9aa192bf1
+DIST nexuiz-21.zip 198728869 RMD160 76ee000c55931b02702ed31b93d5b3e789d3264a SHA1 08045abd5417293928f10340c88f34e0d9993e06 SHA256 4374cd921df8cd18260761840da0b83f363060e409f7921d173afaef2bc77ba2
 EBUILD nexuiz-1.5.ebuild 2964 RMD160 e00ba097876bbe429eea427bbf48f4b5f0c6271f SHA1 c22332730ce4b9a5299cb6d5a3280f52464a49cc SHA256 3f04d800006c4792ef357091c1bacba8456528648767b6a2ef2f843af7d5d451
 MD5 f223f08656abc0bcabb9311d95af8549 nexuiz-1.5.ebuild 2964
 RMD160 e00ba097876bbe429eea427bbf48f4b5f0c6271f nexuiz-1.5.ebuild 2964
@@ -11,10 +12,14 @@ EBUILD nexuiz-2.0.ebuild 3821 RMD160 aa7e3c4c47ccae85f0e3ea0fde184e40737b44c8 SH
 MD5 1ef90500003ee62f5c271a5e58839d79 nexuiz-2.0.ebuild 3821
 RMD160 aa7e3c4c47ccae85f0e3ea0fde184e40737b44c8 nexuiz-2.0.ebuild 3821
 SHA256 ce80b9726a9aed54da2091c80da8a08bc4c1cb232cdf348a40a12ac4ffe28e1c nexuiz-2.0.ebuild 3821
-MISC ChangeLog 1877 RMD160 b8748a6bcb7e17942eae51467e7e9971a4c9e6ad SHA1 ffe27c8c1c26331c4df85f0be6417597e8041279 SHA256 bcffc5b9093ab0716423114d256b85a7b1b1a4b66734c83c7481e8ac378ac082
-MD5 d84feb22e74865a2ffa059fe67f110f2 ChangeLog 1877
-RMD160 b8748a6bcb7e17942eae51467e7e9971a4c9e6ad ChangeLog 1877
-SHA256 bcffc5b9093ab0716423114d256b85a7b1b1a4b66734c83c7481e8ac378ac082 ChangeLog 1877
+EBUILD nexuiz-2.1.ebuild 3952 RMD160 0a007444bafaf50043c1a6944910e0a382fb71da SHA1 a6a9b53fbd1a242dfbb8dd03bc0c66830b1849c1 SHA256 b29edd4a2c511d7e2cbf2a4578f34be2891b92ae5228bbf9f4ec3cb68d8713b1
+MD5 de62b62fc422c95f542386bf8a7afdd8 nexuiz-2.1.ebuild 3952
+RMD160 0a007444bafaf50043c1a6944910e0a382fb71da nexuiz-2.1.ebuild 3952
+SHA256 b29edd4a2c511d7e2cbf2a4578f34be2891b92ae5228bbf9f4ec3cb68d8713b1 nexuiz-2.1.ebuild 3952
+MISC ChangeLog 2107 RMD160 e45c5180a085a67af3eb9de26f95e45271910add SHA1 ef84a311f9e3ca674279b5359cdccd8aa04af837 SHA256 016bc5947669bc63f78248744fd1b99037cbcc074ce9e96e1e98ac569197c943
+MD5 afe6660a4cd4923fb8727fa0cfea0dfc ChangeLog 2107
+RMD160 e45c5180a085a67af3eb9de26f95e45271910add ChangeLog 2107
+SHA256 016bc5947669bc63f78248744fd1b99037cbcc074ce9e96e1e98ac569197c943 ChangeLog 2107
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -25,10 +30,13 @@ SHA256 ec2be70525df5848021df3cd5daa2ba744e5381fba6b60ee2da823f2f7e03b50 files/di
 MD5 9e33d646474618967b7e855332365a1c files/digest-nexuiz-2.0 229
 RMD160 b1f88d281cbf26fa74d58b5a07fa3b938fb147f2 files/digest-nexuiz-2.0 229
 SHA256 fa80a822918bd7bd450d3a4599e6b295aaf186cdd5f9d446bfbddbe136943e0b files/digest-nexuiz-2.0 229
+MD5 f6d7d7363e5e380e6eaa36e4d565f24c files/digest-nexuiz-2.1 229
+RMD160 4d231bba3db1ed25f471541cd77b09acc436caf6 files/digest-nexuiz-2.1 229
+SHA256 accdc37a309a23ee898a72aa97ce2c25d546050e4f0160c410c8f1ef75f3c474 files/digest-nexuiz-2.1 229
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFEovuHkT4lNIS36YERApZeAJ9Eg8GroQmhWrZN4Vq+AfB6DNCkKACfZNT0
-G1wInB0Cr76325jdvA1G3K4=
-=nabl
+iD8DBQFFGvmlkT4lNIS36YERAvBOAJ9STuag7YyJ0Qj3p48NbY/V7Xk3eQCgiiA9
+3t+/XusccT8vZWt2jl4cucw=
+=0Rx9
 -----END PGP SIGNATURE-----
diff --git a/games-fps/nexuiz/files/digest-nexuiz-2.1 b/games-fps/nexuiz/files/digest-nexuiz-2.1
new file mode 100644
index 000000000000..a0a07792ffa0
--- /dev/null
+++ b/games-fps/nexuiz/files/digest-nexuiz-2.1
@@ -0,0 +1,3 @@
+MD5 b614b2e8e9de82085cfe3175a3d26562 nexuiz-21.zip 198728869
+RMD160 76ee000c55931b02702ed31b93d5b3e789d3264a nexuiz-21.zip 198728869
+SHA256 4374cd921df8cd18260761840da0b83f363060e409f7921d173afaef2bc77ba2 nexuiz-21.zip 198728869
diff --git a/games-fps/nexuiz/nexuiz-2.1.ebuild b/games-fps/nexuiz/nexuiz-2.1.ebuild
new file mode 100644
index 000000000000..de826b7b06fc
--- /dev/null
+++ b/games-fps/nexuiz/nexuiz-2.1.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/nexuiz/nexuiz-2.1.ebuild,v 1.1 2006/09/27 22:21:59 wolf31o2 Exp $
+
+inherit eutils flag-o-matic games
+
+MY_PV=${PV//./}
+MY_PN="Nexuiz"
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Deathmatch FPS based on DarkPlaces, an advanced Quake 1 engine"
+HOMEPAGE="http://www.nexuiz.com"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
+	http://www.alientrap.org/Releases/${MY_P}.zip"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="alsa dedicated opengl oss sdl"
+
+UIRDEPEND="alsa? ( media-libs/alsa-lib )
+	media-libs/libogg
+	media-libs/libvorbis
+	|| (
+		(
+			x11-libs/libX11
+			x11-libs/libXau
+			x11-libs/libXdmcp
+			x11-libs/libXext
+			x11-libs/libXxf86dga
+			x11-libs/libXxf86vm )
+		virtual/x11 )"
+UIDEPEND="|| (
+	(
+		x11-proto/xextproto
+		x11-proto/xf86dgaproto
+		x11-proto/xf86vidmodeproto
+		x11-proto/xproto )
+	virtual/x11 )"
+RDEPEND="media-libs/jpeg
+	sys-libs/glibc
+	sys-libs/zlib
+	sdl? ( media-libs/libsdl ${UIRDEPEND} )
+	opengl? ( virtual/opengl ${UIRDEPEND} )
+	!dedicated? ( !sdl? ( !opengl? ( virtual/opengl ${UIRDEPEND} ) ) )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	app-arch/unzip
+	sdl? ( media-libs/libsdl ${UIDEPEND} )
+	opengl? ( virtual/opengl ${UIDEPEND} )
+	!dedicated? ( !sdl? ( !opengl? ( virtual/opengl ${UIDEPEND} ) ) )"
+
+S=${WORKDIR}/darkplaces
+# This is the right dir, so that e.g. "darkplaces -game nexuiz" will work
+dir=${GAMES_DATADIR}/quake1
+exe=${PN}
+
+default_client() {
+	if use opengl || $( ! use dedicated && ! use sdl ) ; then
+		# Build default client
+		return 0
+	fi
+	return 1
+}
+
+pkg_setup() {
+	games_pkg_setup
+
+	if default_client && ! use opengl ; then
+		einfo "Defaulting to OpenGL client"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	local f
+	for f in "${MY_PN}"/sources/*.zip ; do
+		unpack ./"${f}"
+	done
+
+	rm "${MY_PN}"/Docs/server/{*_mac.*,*.bat}
+
+	cd "${S}"
+	# Make the game automatically look in the correct data directory
+	sed -i fs.c \
+		-e "s:strlcpy(fs_basedir, \"\"):strlcpy(fs_basedir, \"${dir}\"):" \
+		-e "s:gamedirname1:\"${PN}\":" \
+		|| die "sed fs.c failed"
+
+	# Only additional CFLAGS optimization is the -march flag
+	local march=$(get-flag -march)
+	sed -i makefile.inc \
+		-e '/^CC=/d' \
+		-e "s:-lasound:$(pkg-config --libs alsa):" \
+		-e "s:CPUOPTIMIZATIONS=:CPUOPTIMIZATIONS=${march}:" \
+		-e "s:strip:#strip:" \
+		|| die "sed makefile.inc failed"
+
+	# Reduce SDL audio buffer, to fix latency
+	sed -i "s:requested->speed / 20.0:512:" snd_sdl.c \
+		|| die "sed snd_sdl.c failed"
+
+	# Default sound is alsa.
+	if ! use alsa ; then
+		if use oss ; then
+			sed -i "s:DEFAULT_SNDAPI=ALSA:DEFAULT_SNDAPI=OSS:" makefile \
+				|| die "sed oss failed"
+		else
+			sed -i "s:DEFAULT_SNDAPI=ALSA:DEFAULT_SNDAPI=NULL:" makefile \
+				|| die "sed null failed"
+		fi
+	fi
+}
+
+src_compile() {
+	if default_client ; then
+		emake cl-${PN} DP_FS_BASEDIR=${GAMES_DATADIR}/quake1 \
+			|| die "emake cl-${PN} failed"
+	fi
+
+	if use sdl ; then
+		emake sdl-${PN} DP_FS_BASEDIR=${GAMES_DATADIR}/quake1 \
+			|| die "emake sdl-${PN} failed"
+	fi
+
+	if use dedicated ; then
+		emake sv-${PN} DP_FS_BASEDIR=${GAMES_DATADIR}/quake1 \
+			|| die "emake sv-${PN} failed"
+	fi
+}
+
+src_install() {
+	if default_client || use sdl ; then
+		newicon darkplaces72x72.png ${PN}.png
+	fi
+
+	if default_client ; then
+		newgamesbin ${PN}-glx ${PN} \
+			|| die "newgamesbin opengl failed"
+		make_desktop_entry ${PN} Nexuiz ${PN}.png
+	fi
+
+	if use sdl ; then
+		dogamesbin ${PN}-sdl \
+			|| die "dogamesbin sdl failed"
+		make_desktop_entry ${PN}-sdl "Nexuiz (SDL)" ${PN}.png
+	fi
+
+	if use dedicated ; then
+		newgamesbin ${PN}-dedicated ${PN}-ded \
+			|| die "newgamesbin ded failed"
+		games_make_wrapper ${PN}-ded ./${PN}-ded "${dir}"
+	fi
+
+	cd "${WORKDIR}/${MY_PN}"
+	insinto "${dir}/${PN}"
+	doins -r data/* || die "doins data failed"
+
+	dodoc Docs/*.txt
+	dohtml Docs/*.{htm,html}
+	docinto server
+	dodoc Docs/server/*
+
+	prepgamesdirs
+}
diff --git a/games-fps/quake4-data/Manifest b/games-fps/quake4-data/Manifest
index 0b0350d1352c..e5de83cf94d6 100644
--- a/games-fps/quake4-data/Manifest
+++ b/games-fps/quake4-data/Manifest
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-EBUILD quake4-data-1.0.2147.12.ebuild 1648 RMD160 3c39dcee24cae6c77fdf6693e18e0932ac44a02f SHA1 8ce8592b880dcd7dbc2b3f5e964a12850164e074 SHA256 ff8a10e2200f018797d398cacca7ff4bd774289d7cd69144f9876c28b565b9b1
-MD5 6921b327896a18af8cc659d6c5ac45ab quake4-data-1.0.2147.12.ebuild 1648
-RMD160 3c39dcee24cae6c77fdf6693e18e0932ac44a02f quake4-data-1.0.2147.12.ebuild 1648
-SHA256 ff8a10e2200f018797d398cacca7ff4bd774289d7cd69144f9876c28b565b9b1 quake4-data-1.0.2147.12.ebuild 1648
-MISC ChangeLog 1095 RMD160 b92b9e7a934fc42a1e42ef90e7160ddaf6c4ce2e SHA1 720e9cf6e3e53f20be68c8289b0c5a486b05490b SHA256 584dc0e9e537a8bef862d50a32948c54861eca73131847ca9753b0b3a29f493e
-MD5 dc43461616c2f57fbc68ebf16ef1bff0 ChangeLog 1095
-RMD160 b92b9e7a934fc42a1e42ef90e7160ddaf6c4ce2e ChangeLog 1095
-SHA256 584dc0e9e537a8bef862d50a32948c54861eca73131847ca9753b0b3a29f493e ChangeLog 1095
+EBUILD quake4-data-1.0.2147.12.ebuild 1679 RMD160 2ef5d87ad4fee992eb519de3b23232d9e446dff3 SHA1 ab954552d066f442f51ecb1a694390d680a6aa83 SHA256 ecd049127cfdbb40b3b1ac86ecebcac2ea92117722a477eda8252d8f4cc0bea3
+MD5 5be11af847c655bce97c140d6db094a7 quake4-data-1.0.2147.12.ebuild 1679
+RMD160 2ef5d87ad4fee992eb519de3b23232d9e446dff3 quake4-data-1.0.2147.12.ebuild 1679
+SHA256 ecd049127cfdbb40b3b1ac86ecebcac2ea92117722a477eda8252d8f4cc0bea3 quake4-data-1.0.2147.12.ebuild 1679
+MISC ChangeLog 1289 RMD160 d401566e70fd4413267fdf7d8124922a499446c4 SHA1 c99a64d79a3f83cc029f1fa66c63a16fa8df6000 SHA256 8e80553be59efc08e9af8cabfc4131338294a3711bedd968f029027b4e6f3c3a
+MD5 f356e605a3656c0e389095266c5edfc6 ChangeLog 1289
+RMD160 d401566e70fd4413267fdf7d8124922a499446c4 ChangeLog 1289
+SHA256 8e80553be59efc08e9af8cabfc4131338294a3711bedd968f029027b4e6f3c3a ChangeLog 1289
 MISC metadata.xml 1046 RMD160 4533166e73a6c0c048441279409fe8c52875b974 SHA1 e5f71bbe83bb2e204263296367240707558b4200 SHA256 4c04b0b912807688e3536ea7318cdbe28858bc462e339b6cc8d4e491d167caf8
 MD5 67bc63233267502c576573939ca95ae9 metadata.xml 1046
 RMD160 4533166e73a6c0c048441279409fe8c52875b974 metadata.xml 1046
@@ -19,7 +19,7 @@ SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFGufqkT4lNIS36YERAln0AJ49luQ7pDZhh+1quWgK/jfOimEJ0ACgsMWu
-MSg7343BowHUYFIffM5WLps=
-=tLkI
+iD8DBQFFGvo0kT4lNIS36YERAnXmAJ9MhvdIYDhIhaYyDKCFu9/wjErJHQCeNV6D
+xPWsDvSUpFD179FfxkJwU9g=
+=7R7R
 -----END PGP SIGNATURE-----
diff --git a/games-fps/ut2004-data/Manifest b/games-fps/ut2004-data/Manifest
index 9fdac0601b2f..cb83cda8c3fb 100644
--- a/games-fps/ut2004-data/Manifest
+++ b/games-fps/ut2004-data/Manifest
@@ -1,11 +1,14 @@
-EBUILD ut2004-data-3186-r3.ebuild 7959 RMD160 927d3bc5dc3d320e97e9d6baf440ea084a2a4aab SHA1 e6b34cf04984862e5476c6011e35e520b11e87fd SHA256 7b61ef3c89e6023eb378dab82e9d67e7b56e3e818e5cf06efb8937fd28343b4c
-MD5 9fbf6225b3aa4fc66773ee3575041236 ut2004-data-3186-r3.ebuild 7959
-RMD160 927d3bc5dc3d320e97e9d6baf440ea084a2a4aab ut2004-data-3186-r3.ebuild 7959
-SHA256 7b61ef3c89e6023eb378dab82e9d67e7b56e3e818e5cf06efb8937fd28343b4c ut2004-data-3186-r3.ebuild 7959
-MISC ChangeLog 3400 RMD160 7bce805a69d7309fde68325f6d0398d061f315ee SHA1 4ce6bc27a17ddcd888f0a8237821f5c39aac48cb SHA256 5275c5f1a62401c8a6ba0235b8a48268c3fc89aa7364166738d29fc2a7069753
-MD5 76e5fbee96983c5a3a22b486d1daa070 ChangeLog 3400
-RMD160 7bce805a69d7309fde68325f6d0398d061f315ee ChangeLog 3400
-SHA256 5275c5f1a62401c8a6ba0235b8a48268c3fc89aa7364166738d29fc2a7069753 ChangeLog 3400
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+EBUILD ut2004-data-3186-r3.ebuild 7986 RMD160 3d35223d5c5454688050f0784538de40d0936fb1 SHA1 e95f0fd92a7fb55f69c6c307e192fb771c2a67b6 SHA256 1c67e1fe63fe53644a4d44849c268aed29c40192ce51374733fcf43e7f34beee
+MD5 6a0efd994356258b6c610bee044aa057 ut2004-data-3186-r3.ebuild 7986
+RMD160 3d35223d5c5454688050f0784538de40d0936fb1 ut2004-data-3186-r3.ebuild 7986
+SHA256 1c67e1fe63fe53644a4d44849c268aed29c40192ce51374733fcf43e7f34beee ut2004-data-3186-r3.ebuild 7986
+MISC ChangeLog 3586 RMD160 d91e0bf441e2d220586458d6efb8f066ac42cf17 SHA1 fccd8bc22fded7093133c804555478e1160d0691 SHA256 69260ae97db218834fdcb4d251392bf271b6414ef97c6ad04396ff0d9d489a8b
+MD5 b226da8413c3707705132fa284d1a633 ChangeLog 3586
+RMD160 d91e0bf441e2d220586458d6efb8f066ac42cf17 ChangeLog 3586
+SHA256 69260ae97db218834fdcb4d251392bf271b6414ef97c6ad04396ff0d9d489a8b ChangeLog 3586
 MISC metadata.xml 254 RMD160 877a1dc36df2be58926bc51041093feafdefe429 SHA1 45f0334cd127c4a1b4ece41f7098ab70046e378a SHA256 2916aab684ec3908fffb515065eeb2c481cde563380b682646add582bed5f535
 MD5 11a7e1491b1ac042ac7216b26b4ad1fb metadata.xml 254
 RMD160 877a1dc36df2be58926bc51041093feafdefe429 metadata.xml 254
@@ -13,3 +16,10 @@ SHA256 2916aab684ec3908fffb515065eeb2c481cde563380b682646add582bed5f535 metadata
 MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-ut2004-data-3186-r3 1
 RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-ut2004-data-3186-r3 1
 SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-ut2004-data-3186-r3 1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFGvqskT4lNIS36YERAlg9AJ9hkELJNnwwhcbmMlzWCR6KZIolVwCbB9wb
+JE0YXBzmZcm9UZUMtMe7T4Y=
+=ypKg
+-----END PGP SIGNATURE-----