Added built_with_use check on cdinstall for quake3-data for bug #123148.

Package-Manager: portage-2.1_pre4-r1

3 files changed, 40 insertions, 10 deletions

diff --git a/games-fps/quake3-bin/ChangeLog b/games-fps/quake3-bin/ChangeLog
index 1083500a2eca..2ef447ce51bc 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.6 2006/01/05 02:30:46 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-bin/ChangeLog,v 1.7 2006/02/17 14:32:44 wolf31o2 Exp $
+
+  17 Feb 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  quake3-bin-1.32b-r4.ebuild:
+  Added built_with_use check on cdinstall for quake3-data for bug #123148.
 
   05 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   quake3-bin-1.31.ebuild, -quake3-bin-1.32b-r3.ebuild,
diff --git a/games-fps/quake3-bin/Manifest b/games-fps/quake3-bin/Manifest
index d76eff7f2bf0..3123ee2cbb6a 100644
--- a/games-fps/quake3-bin/Manifest
+++ b/games-fps/quake3-bin/Manifest
@@ -1,8 +1,24 @@
-MD5 323c4af805b98d29bf5412eb11ccd5f5 ChangeLog 4943
+MD5 cac709f80d17d9e8c996ae3126b8ab41 ChangeLog 5103
+RMD160 4fe679b3f83f98015a3a74b6ad18841ff7e3bd61 ChangeLog 5103
+SHA256 9d20c0822ba8098408fd37777e1e081d05854cb953eb6fe65c82096031539609 ChangeLog 5103
 MD5 aa25102bc1d29a9d3cef6ccb88b87833 files/digest-quake3-bin-1.31 73
+RMD160 084f01025559c82469e11dda19bc3c2353071bc2 files/digest-quake3-bin-1.31 73
+SHA256 c27c9a3d460c1225b266681f375e8a4b6e05310094eb81beced1871115064725 files/digest-quake3-bin-1.31 73
 MD5 ac0eeb5bcea4995d27e0c6575b8f4dbb files/digest-quake3-bin-1.32b-r4 76
+RMD160 619670e44685690f2ce6bb9f4693b7e31f9b4428 files/digest-quake3-bin-1.32b-r4 76
+SHA256 8e94e99e4b05c413ff0330a3dffe98b56eb8ebe575d8e62ebb27129df9eb03af files/digest-quake3-bin-1.32b-r4 76
 MD5 72c65c35c66233c80ad323c2e003f09e files/q3ded.conf.d 307
+RMD160 8abab77c1ef7e7fd57c42094e8870ab5f918d21f files/q3ded.conf.d 307
+SHA256 b9ba53020ff1da7bbd5b8c37d21435ea499b164d7a45c79a2a75d2c96e41f701 files/q3ded.conf.d 307
 MD5 bce99c15571ed629697bcfe7c6f0d1e8 files/q3ded.rc 847
+RMD160 9cbc38fd7f922bc53ff7756f1595e3ec1e4f2772 files/q3ded.rc 847
+SHA256 fc6f8b2a04370bb02661fe5f06d2128007e0ea60388d9bc4593629071975f1b4 files/q3ded.rc 847
 MD5 0a25a9c85ee385ef578cb770a957756d metadata.xml 954
+RMD160 178b4856c0cdf3c57df6660d283aa9e4709d2511 metadata.xml 954
+SHA256 c8178e5b0a05fe236018af52c641a40d6262dd3e8d24965efafbe61f155bf58f metadata.xml 954
 MD5 b810d8e14df961be914f9447d62ac5c3 quake3-bin-1.31.ebuild 2333
-MD5 88216c3c13c89f01417e3a5782aa7c83 quake3-bin-1.32b-r4.ebuild 2856
+RMD160 a968ed38d1a08ecbc36b8d48b402a53a579b3e4b quake3-bin-1.31.ebuild 2333
+SHA256 58833466633886b98eac6c62151e6755cc6160c80a08a4137f944c4d5980aeac quake3-bin-1.31.ebuild 2333
+MD5 643eb9adef7836aa3e4a1c4db571b6b2 quake3-bin-1.32b-r4.ebuild 3060
+RMD160 9dad044c8be2bce589bd03a3a7f1e7494dacf4b3 quake3-bin-1.32b-r4.ebuild 3060
+SHA256 945b744d509022658a99b3b129669f05436bdad4f16ac7987e321037bcd79ba3 quake3-bin-1.32b-r4.ebuild 3060
diff --git a/games-fps/quake3-bin/quake3-bin-1.32b-r4.ebuild b/games-fps/quake3-bin/quake3-bin-1.32b-r4.ebuild
index bf1f6e533162..2a7df240163b 100644
--- a/games-fps/quake3-bin/quake3-bin-1.32b-r4.ebuild
+++ b/games-fps/quake3-bin/quake3-bin-1.32b-r4.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.32b-r4.ebuild,v 1.3 2006/01/05 02:30:46 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-bin/quake3-bin-1.32b-r4.ebuild,v 1.4 2006/02/17 14:32:44 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -31,17 +31,26 @@ RDEPEND="sys-libs/glibc
 		app-emulation/emul-linux-x86-baselibs
 		opengl? (
 			app-emulation/emul-linux-x86-xlibs
-			|| ( >=media-video/nvidia-glx-1.0.6629-r3
-			>=x11-drivers/ati-drivers-8.8.25-r1 ) ) )
+			|| (
+				>=media-video/nvidia-glx-1.0.6629-r3
+				>=x11-drivers/ati-drivers-8.8.25-r1 ) ) )
 	games-fps/quake3-data"
 
 S=${WORKDIR}
+
+GAMES_CHECK_LICENSE="yes"
 dir=${GAMES_PREFIX_OPT}/quake3
 Ddir=${D}/${dir}
 
 pkg_setup() {
-	check_license Q3AEULA
 	games_pkg_setup
+	if use cdinstall
+	then
+		if [ ! built_with_use games-fps/quake3-data cdinstall ]
+		then
+			die "You must install quake3-data with USE=cdinstall to get the required data."
+		fi
+	fi
 }
 
 src_unpack() {
@@ -82,9 +91,10 @@ src_install() {
 pkg_postinst() {
 	games_pkg_postinst
 	echo
-	ewarn "There are two possible security bugs in this package, both causing a	denial"
-	ewarn "of service.  One affects the game when running a server, the other when running"
-	ewarn "as a client.  For more information, see bug #82149."
+	ewarn "There are two possible security bugs in this package, both causing a"
+	ewarn "denial of service. One affects the game when running a server, the"
+	ewarn "other when running as a client. For more information, please see bug"
+	ewarn "#82149."
 	if ! use cdinstall ; then
 		echo
 		einfo "You need to copy pak0.pk3 from your Quake3 CD into ${dir}/baseq3."