Changed q3ded to quake3-ded and switched to using default_client function.

Package-Manager: portage-2.1.2_pre3-r5

3 files changed, 40 insertions, 27 deletions

diff --git a/games-fps/quake3-bin/ChangeLog b/games-fps/quake3-bin/ChangeLog
index 03502106e811..a47b868c1364 100644
--- a/games-fps/quake3-bin/ChangeLog
+++ b/games-fps/quake3-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/quake3-bin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-bin/ChangeLog,v 1.21 2006/10/23 18:56:54 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-bin/ChangeLog,v 1.22 2006/10/25 16:03:24 wolf31o2 Exp $
+
+  25 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  quake3-bin-1.32c-r1.ebuild:
+  Changed q3ded to quake3-ded and switched to using default_client function.
 
 *quake3-bin-1.32c-r1 (23 Oct 2006)
 
diff --git a/games-fps/quake3-bin/Manifest b/games-fps/quake3-bin/Manifest
index 778920073a31..31b87b8903be 100644
--- a/games-fps/quake3-bin/Manifest
+++ b/games-fps/quake3-bin/Manifest
@@ -11,18 +11,18 @@ RMD160 9cbc38fd7f922bc53ff7756f1595e3ec1e4f2772 files/q3ded.rc 847
 SHA256 fc6f8b2a04370bb02661fe5f06d2128007e0ea60388d9bc4593629071975f1b4 files/q3ded.rc 847
 DIST linuxq3apoint-1.32b-3.x86.run 30923961 RMD160 eb63177fc0a30cda4976d8b68e065efb6dc41e50 SHA1 802d84af0d515db50a496c4c55d1f1c4f40a9239 SHA256 c36132c5556b35e01950f1e9c646235033a5130f87ad776ba2bc7becf4f4f186
 DIST quake3-1.32c.zip 3056760 RMD160 d53f3b5a44e1b2871b0a6f1f6e93d9b0ad6d5d10 SHA1 82c52c12682aa4c47628ccfc067e07a56bc65da1 SHA256 643ac677892fb58689a86d71f08d6678393efe2939b82c436a5c92368eebb849
-EBUILD quake3-bin-1.32c-r1.ebuild 3559 RMD160 b8a531fa4c2d0f6a6038f108f8239298182e10f3 SHA1 67c02ba57908d727e4b4cac22209061e27078a05 SHA256 2ef5b2aa6099e5019fadeca09db09561538f15e9e027dba30432dc804b7feafa
-MD5 a3f0992c31ef99e803e30799d9893ada quake3-bin-1.32c-r1.ebuild 3559
-RMD160 b8a531fa4c2d0f6a6038f108f8239298182e10f3 quake3-bin-1.32c-r1.ebuild 3559
-SHA256 2ef5b2aa6099e5019fadeca09db09561538f15e9e027dba30432dc804b7feafa quake3-bin-1.32c-r1.ebuild 3559
+EBUILD quake3-bin-1.32c-r1.ebuild 3683 RMD160 4786524984790adf2727c8adf82978e6a1b9bf30 SHA1 61d126e325763295fba045addf2a2a53e78c8e38 SHA256 c6f0a5447f4701faaecd393557c7823d569985085af4c09f0f52e9fbfbb4a727
+MD5 86537d072a3b1b3fb5dbbd55f5cff830 quake3-bin-1.32c-r1.ebuild 3683
+RMD160 4786524984790adf2727c8adf82978e6a1b9bf30 quake3-bin-1.32c-r1.ebuild 3683
+SHA256 c6f0a5447f4701faaecd393557c7823d569985085af4c09f0f52e9fbfbb4a727 quake3-bin-1.32c-r1.ebuild 3683
 EBUILD quake3-bin-1.32c.ebuild 3460 RMD160 6f6f868d806a3543df7f668816ed4497da2eee6f SHA1 8894cad70bc75dcfbea36a325b4760a6e33355e1 SHA256 dccef3603c2267277ee4718f755a19ee93854dae609076e3379a1379bb6a372c
 MD5 8dbf88b58278a74403d295db3bccec70 quake3-bin-1.32c.ebuild 3460
 RMD160 6f6f868d806a3543df7f668816ed4497da2eee6f quake3-bin-1.32c.ebuild 3460
 SHA256 dccef3603c2267277ee4718f755a19ee93854dae609076e3379a1379bb6a372c quake3-bin-1.32c.ebuild 3460
-MISC ChangeLog 8219 RMD160 1c8286e0f8beb390d01e565677b2d5e8e71f529d SHA1 6076dc6fb66eac501807c3704c8f4fd0cc0106a7 SHA256 be785f734fa0b3a1e6a64a2167a26fa68625919c04fdcaa06db68c7b0b039d0b
-MD5 3aefb6f14eb9516b29a39f5daa4f2e60 ChangeLog 8219
-RMD160 1c8286e0f8beb390d01e565677b2d5e8e71f529d ChangeLog 8219
-SHA256 be785f734fa0b3a1e6a64a2167a26fa68625919c04fdcaa06db68c7b0b039d0b ChangeLog 8219
+MISC ChangeLog 8381 RMD160 cf407e194d690e4115a03f3c9d2fe5617a66b5b0 SHA1 e52cd5e18c306c595963d37386fbc15ac0a5a974 SHA256 44a4caf3256e485d0c07ed49ea273a8490e5df803f2f78511c58218632241d03
+MD5 43943fd04ee300756f3ff6016807524b ChangeLog 8381
+RMD160 cf407e194d690e4115a03f3c9d2fe5617a66b5b0 ChangeLog 8381
+SHA256 44a4caf3256e485d0c07ed49ea273a8490e5df803f2f78511c58218632241d03 ChangeLog 8381
 MISC metadata.xml 954 RMD160 178b4856c0cdf3c57df6660d283aa9e4709d2511 SHA1 53680d486f627e45fc1168f66db7cd2a3c628186 SHA256 c8178e5b0a05fe236018af52c641a40d6262dd3e8d24965efafbe61f155bf58f
 MD5 0a25a9c85ee385ef578cb770a957756d metadata.xml 954
 RMD160 178b4856c0cdf3c57df6660d283aa9e4709d2511 metadata.xml 954
@@ -36,7 +36,7 @@ SHA256 12fbeb9c02f5a699ab55af056584e4f2761e4628698f2ffe88ecb5ab29064967 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFPRCOkT4lNIS36YERAoYnAJ4/6fkXmn3GopQkmcrTuSWTbnXvGQCgnWYk
-sdzfFOivsL1zy/X7SnhT/6Q=
-=EPb1
+iD8DBQFFP4rnkT4lNIS36YERArosAKCqMhMTSExHhn/PWtIj8DhFFAA9DACgum8F
+M/jS8b0oF9rQbrXZTSgsWGQ=
+=hZAO
 -----END PGP SIGNATURE-----
diff --git a/games-fps/quake3-bin/quake3-bin-1.32c-r1.ebuild b/games-fps/quake3-bin/quake3-bin-1.32c-r1.ebuild
index ee7199dc234c..c5199c9612b1 100644
--- a/games-fps/quake3-bin/quake3-bin-1.32c-r1.ebuild
+++ b/games-fps/quake3-bin/quake3-bin-1.32c-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-bin/quake3-bin-1.32c-r1.ebuild,v 1.1 2006/10/23 18:56:54 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-bin/quake3-bin-1.32c-r1.ebuild,v 1.2 2006/10/25 16:03:24 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -48,6 +48,16 @@ QA_TEXTRELS="${dir:1}/pb/pbag.so
 	${dir:1}/pb/pbcl.so
 	${dir:1}/pb/pbsv.so"
 
+default_client() {
+	if use opengl || ! use dedicated
+	then
+		# Use opengl by default
+		return 0
+	else
+		return 1
+	fi
+}
+
 pkg_setup() {
 	if use cdinstall
 	then
@@ -63,25 +73,24 @@ src_unpack() {
 }
 
 src_install() {
-	dodir ${dir}/{baseq3,missionpack}
+	dodir "${dir}"/{baseq3,missionpack}
 	if use cdinstall ; then
-		dosym ${GAMES_DATADIR}/quake3/baseq3/pak0.pk3 ${dir}/baseq3/pak0.pk3
-		use teamarena && dosym ${GAMES_DATADIR}/quake3/missionpack/pak0.pk3 \
-			${dir}/missionpack/pak0.pk3
+		dosym "${GAMES_DATADIR}"/quake3/baseq3/pak0.pk3 "${dir}"/baseq3/pak0.pk3
+		use teamarena && dosym "${GAMES_DATADIR}"/quake3/missionpack/pak0.pk3 \
+			"${dir}"/missionpack/pak0.pk3
 	fi
 	for pk3 in baseq3/*.pk3 missionpack/*.pk3 ; do
-		dosym ${GAMES_DATADIR}/quake3/${pk3} ${dir}/${pk3}
+		dosym "${GAMES_DATADIR}"/quake3/${pk3} "${dir}"/${pk3}
 	done
 
-	insinto ${dir}
+	insinto "${dir}"
 	doins -r Docs pb || die "ins docs/pb"
 
-	exeinto ${dir}
-	insinto ${dir}
-	doexe "Quake III Arena 1.32c"/linux/quake3*.x86 || die "doexe"
+	exeinto "${dir}"
 	doins quake3.xpm README* Q3A_EULA.txt
-	if use opengl || ! use dedicated
+	if default_client
 	then
+		doexe "Quake III Arena 1.32c"/linux/quake3*.x86 || die "doexe"
 		games_make_wrapper ${PN} ./quake3.x86 "${dir}" "${dir}"
 		newicon quake3.xpm ${PN}.xpm
 		make_desktop_entry ${PN} "Quake III Arena (binary)" ${PN}.xpm
@@ -96,9 +105,9 @@ src_install() {
 	if use dedicated
 	then
 		doexe "Quake III Arena 1.32c"/linux/q3ded || die "doexe q3ded"
-		games_make_wrapper q3ded-bin ./q3ded "${dir}" "${dir}"
-		newinitd "${FILESDIR}"/q3ded.rc q3ded
-		newconfd "${FILESDIR}"/q3ded.conf.d q3ded
+		games_make_wrapper quake3-ded ./q3ded "${dir}" "${dir}"
+		newinitd "${FILESDIR}"/q3ded.rc quake3-ded
+		newconfd "${FILESDIR}"/q3ded.conf.d quake3-ded
 	fi
 
 	games_link_mods
@@ -114,7 +123,7 @@ pkg_postinst() {
 	if use dedicated; then
 		echo
 		einfo "To start a dedicated server, run"
-		einfo "  /etc/init.d/q3ded start"
+		einfo "  /etc/init.d/quake3-ded start"
 		echo
 		einfo "The dedicated server is started under the ${GAMES_USER_DED} user account."
 	fi