Adding modular X dependencies and removing older revision of 1.32b ebuild.

(Portage version: 2.1_pre3-r1)

5 files changed, 36 insertions, 100 deletions

diff --git a/games-fps/quake3-bin/ChangeLog b/games-fps/quake3-bin/ChangeLog
index 59cfcc370b2b..1083500a2eca 100644
--- a/games-fps/quake3-bin/ChangeLog
+++ b/games-fps/quake3-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-fps/quake3-bin
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-bin/ChangeLog,v 1.5 2005/11/12 22:22:44 lu_zero Exp $
+# 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 $
+
+  05 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  quake3-bin-1.31.ebuild, -quake3-bin-1.32b-r3.ebuild,
+  quake3-bin-1.32b-r4.ebuild:
+  Adding modular X dependencies and removing older revision of 1.32b ebuild.
 
   12 Nov 2005; Luca Barbato <lu_zero@gentoo.org> quake3-bin-1.32b-r3.ebuild:
   Dependency update: media-video/ati-drivers -> x11-drivers/ati-drivers.
diff --git a/games-fps/quake3-bin/files/digest-quake3-bin-1.32b-r3 b/games-fps/quake3-bin/files/digest-quake3-bin-1.32b-r3
deleted file mode 100644
index 9a97af6bbece..000000000000
--- a/games-fps/quake3-bin/files/digest-quake3-bin-1.32b-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c71fdddccb20e8fc393d846e9c61d685 linuxq3apoint-1.32b-3.x86.run 30923961
diff --git a/games-fps/quake3-bin/quake3-bin-1.31.ebuild b/games-fps/quake3-bin/quake3-bin-1.31.ebuild
index 597a2b0ad635..9a43107b3046 100644
--- a/games-fps/quake3-bin/quake3-bin-1.31.ebuild
+++ b/games-fps/quake3-bin/quake3-bin-1.31.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.31.ebuild,v 1.2 2005/11/12 22:20:37 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-bin/quake3-bin-1.31.ebuild,v 1.3 2006/01/05 02:30:46 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -15,9 +15,18 @@ IUSE="dedicated opengl"
 RESTRICT="nostrip"
 
 RDEPEND="sys-libs/glibc
-	opengl? ( virtual/opengl
-		virtual/x11 )
-	dedicated? ( app-misc/screen )
+	opengl? (
+		virtual/opengl
+		x86? (
+			|| (
+				(
+					x11-libs/libXext
+					x11-libs/libX11
+					x11-libs/libXau
+					x11-libs/libXdmcp )
+				virtual/x11 ) ) )
+	dedicated? (
+		app-misc/screen )
 	amd64? (
 		app-emulation/emul-linux-x86-baselibs
 		opengl? (
diff --git a/games-fps/quake3-bin/quake3-bin-1.32b-r3.ebuild b/games-fps/quake3-bin/quake3-bin-1.32b-r3.ebuild
deleted file mode 100644
index 1b6af3f470c5..000000000000
--- a/games-fps/quake3-bin/quake3-bin-1.32b-r3.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2005 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-r3.ebuild,v 1.2 2005/11/12 22:22:44 lu_zero Exp $
-
-inherit eutils games
-
-DESCRIPTION="Quake III Arena - 3rd installment of the classic id 3D first-person shooter"
-HOMEPAGE="http://www.idsoftware.com/"
-SRC_URI="ftp://ftp.idsoftware.com/idstuff/quake3/linux/linuxq3apoint-${PV}-3.x86.run"
-
-LICENSE="Q3AEULA"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="dedicated opengl"
-RESTRICT="nostrip"
-
-RDEPEND="sys-libs/glibc
-	opengl? ( virtual/opengl
-		virtual/x11 )
-	dedicated? ( app-misc/screen )
-	amd64? (
-		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 ) ) )"
-
-S=${WORKDIR}
-dir=${GAMES_PREFIX_OPT}/quake3
-Ddir=${D}/${dir}
-
-pkg_setup() {
-	check_license Q3AEULA
-	games_pkg_setup
-}
-
-src_unpack() {
-	unpack_makeself
-}
-
-src_install() {
-	insinto ${dir}/baseq3
-	doins baseq3/*.pk3
-	mv Docs ${Ddir}/
-	insinto ${dir}/missionpack
-	doins missionpack/*.pk3
-	mv pb ${Ddir}/
-
-	exeinto ${dir}
-	insinto ${dir}
-	doexe bin/Linux/x86/{quake3.x86,q3ded}
-	doins quake3.xpm README* Q3A_EULA.txt
-	games_make_wrapper quake3-bin ./quake3.x86 "${dir}" "${dir}"
-	games_make_wrapper q3ded-bin ./q3ded "${dir}" "${dir}"
-
-	newinitd ${FILESDIR}/q3ded.rc q3ded
-	newconfd ${FILESDIR}/q3ded.conf.d q3ded
-	doicon quake3.xpm
-
-	prepgamesdirs
-	make_desktop_entry quake3-bin "Quake III Arena (binary)" quake3.xpm
-}
-
-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."
-	echo
-	einfo "You need to copy pak0.pk3 from your Quake3 CD into ${dir}/baseq3."
-	einfo "Or if you have got a Window installation of Q3 make a symlink to save space."
-	if use dedicated; then
-		echo
-		einfo "To start a dedicated server, run"
-		einfo "  /etc/init.d/q3ded start"
-		echo
-		einfo "The dedicated server is started under the ${GAMES_USER_DED} user account."
-	fi
-
-	# IA32 Emulation required for amd64
-	if use amd64 ; then
-		echo
-		ewarn "NOTE: IA32 Emulation must be compiled into your kernel for Quake3 to run."
-	fi
-}
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 63116bea4db0..bf1f6e533162 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-2005 Gentoo Foundation
+# 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.2 2005/11/12 22:20:04 lu_zero Exp $
+# $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 $
 
 inherit eutils games
 
@@ -15,16 +15,25 @@ IUSE="cdinstall dedicated opengl"
 RESTRICT="nostrip"
 
 RDEPEND="sys-libs/glibc
-	opengl? ( virtual/opengl
-		virtual/x11 )
-	dedicated? ( app-misc/screen )
+	opengl? (
+		virtual/opengl
+		x86? (
+			|| (
+				(
+					x11-libs/libXext
+					x11-libs/libX11
+					x11-libs/libXau
+					x11-libs/libXdmcp )
+				virtual/x11 ) ) )
+	dedicated? (
+		app-misc/screen )
 	amd64? (
 		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 ) ) )
-	cdinstall? ( games-fps/quake3-data )"
+	games-fps/quake3-data"
 
 S=${WORKDIR}
 dir=${GAMES_PREFIX_OPT}/quake3