Version bumped to 1.2 and closing bug #127912.

Package-Manager: portage-2.1_pre7-r5

4 files changed, 128 insertions, 4 deletions

diff --git a/games-fps/quake4-bin/ChangeLog b/games-fps/quake4-bin/ChangeLog
index 777401ead0e5..519d3264912c 100644
--- a/games-fps/quake4-bin/ChangeLog
+++ b/games-fps/quake4-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-fps/quake4-bin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake4-bin/ChangeLog,v 1.14 2006/03/31 21:10:37 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake4-bin/ChangeLog,v 1.15 2006/04/19 23:01:17 wolf31o2 Exp $
+
+*quake4-bin-1.2 (19 Apr 2006)
+
+  19 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  +quake4-bin-1.2.ebuild:
+  Version bumped to 1.2 and closing bug #127912.
 
   31 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   quake4-bin-1.0.6.ebuild, quake4-bin-1.0.6-r1.ebuild:
diff --git a/games-fps/quake4-bin/Manifest b/games-fps/quake4-bin/Manifest
index 4a0b58292129..28053761a67e 100644
--- a/games-fps/quake4-bin/Manifest
+++ b/games-fps/quake4-bin/Manifest
@@ -1,12 +1,15 @@
-MD5 2978e88e259120dcf93bfb7d20b0d3ab ChangeLog 2240
-RMD160 0183b04e325c366fd38c9c715ca563981dd27937 ChangeLog 2240
-SHA256 8cb288adfb83daee11bd72cc2936e2d945e37775217da231f7449831d8b09da9 ChangeLog 2240
+MD5 e4ca3d6d4ae1811f0a955b8f018813c0 ChangeLog 2401
+RMD160 f9a597af7c9bb397184b902f067c414f1fd70839 ChangeLog 2401
+SHA256 37b7379b8bd2b480f396ab69b4d8cb738cc915169992b6e0f9208a50493bb34b ChangeLog 2401
 MD5 ad34f8ffdd4f64dea0130b33ac443011 files/digest-quake4-bin-1.0.6 73
 RMD160 82faecb90a441c6f71266bb3a5d1e4cbee77bf46 files/digest-quake4-bin-1.0.6 73
 SHA256 dc3e8a2d421a6a84bd9cd54d530c54a263878a83c9c7ca640f80d8c64512b762 files/digest-quake4-bin-1.0.6 73
 MD5 1f16a9fcd4a24238aecb3ec650ad0442 files/digest-quake4-bin-1.0.6-r1 265
 RMD160 b17c4fcffee77e1666137c9259ff29b51fa99626 files/digest-quake4-bin-1.0.6-r1 265
 SHA256 66d98cd5ef3c1b2cc68342a57f1ba201786f35e750e50db76fe932f76ea5aa09 files/digest-quake4-bin-1.0.6-r1 265
+MD5 e17249fc56136eae1c759e06b823491d files/digest-quake4-bin-1.2 262
+RMD160 72ed3fd1d910d585bdbe8339e3656f38cf77b4af files/digest-quake4-bin-1.2 262
+SHA256 2836b6183bc576411925b43b408eb90a7a3bf5fe5f14dff1d4f3c7f35e421032 files/digest-quake4-bin-1.2 262
 MD5 67bc63233267502c576573939ca95ae9 metadata.xml 1046
 RMD160 4533166e73a6c0c048441279409fe8c52875b974 metadata.xml 1046
 SHA256 4c04b0b912807688e3536ea7318cdbe28858bc462e339b6cc8d4e491d167caf8 metadata.xml 1046
@@ -16,3 +19,6 @@ SHA256 7d63e48e14d1492903e675bc557046f98fc9dc6b6be3cfe09f9d9439b05e77c7 quake4-b
 MD5 daee34a89085279a95020332b2f478c9 quake4-bin-1.0.6.ebuild 2691
 RMD160 fb8b308bfb3f3d50fac28fab50059e94abe7196c quake4-bin-1.0.6.ebuild 2691
 SHA256 440360a043b0c8865a1d42f8e3a180257d79af39fa2e5940e18fd63e92aeb00e quake4-bin-1.0.6.ebuild 2691
+MD5 59d191d6fe7e18fd8f49b31e81850d49 quake4-bin-1.2.ebuild 2889
+RMD160 bbc59877cc6b2700de62304c80c820875a622a20 quake4-bin-1.2.ebuild 2889
+SHA256 1a01c733ae7edb4a3ef6320a2f533a7797935e32a110d2b1dedba7bc8d038a08 quake4-bin-1.2.ebuild 2889
diff --git a/games-fps/quake4-bin/files/digest-quake4-bin-1.2 b/games-fps/quake4-bin/files/digest-quake4-bin-1.2
new file mode 100644
index 000000000000..94940b2ea63d
--- /dev/null
+++ b/games-fps/quake4-bin/files/digest-quake4-bin-1.2
@@ -0,0 +1,3 @@
+MD5 29d75fc79d2096c24e072a5e6ba0dca0 quake4-linux-1.2.x86.run 120152959
+RMD160 db0885d891dc362ba8184363489404fcacd8d25c quake4-linux-1.2.x86.run 120152959
+SHA256 78d6927b005acbc3e2f70088f4a20b5e27c8da49db867586959c8a0db62970ff quake4-linux-1.2.x86.run 120152959
diff --git a/games-fps/quake4-bin/quake4-bin-1.2.ebuild b/games-fps/quake4-bin/quake4-bin-1.2.ebuild
new file mode 100644
index 000000000000..b0b6beb0664d
--- /dev/null
+++ b/games-fps/quake4-bin/quake4-bin-1.2.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake4-bin/quake4-bin-1.2.ebuild,v 1.1 2006/04/19 23:01:17 wolf31o2 Exp $
+
+inherit eutils games
+
+DESCRIPTION="Sequel to Quake 2, an Id 3D first-person shooter"
+HOMEPAGE="http://www.quake4game.com/"
+SRC_URI="mirror://3dgamers/quake4/quake4-linux-${PV}.x86.run
+	mirror://idsoftware/quake4/linux/quake4-linux-${PV}.x86.run
+	http://filebase.gmpf.de/quake4/quake4-linux-${PV}.x86.run
+	http://www.holarse.de/mirror/quake4-linux-${PV}.x86.run"
+
+LICENSE="QUAKE4"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="alsa cdinstall dedicated opengl"
+RESTRICT="strip"
+
+UIDEPEND="virtual/opengl
+	x86? (
+		|| (
+			(
+				x11-libs/libXext
+				x11-libs/libX11
+				x11-libs/libXau
+				x11-libs/libXdmcp )
+			virtual/x11 ) )
+		media-libs/libsdl
+	amd64? (
+		app-emulation/emul-linux-x86-sdl
+		app-emulation/emul-linux-x86-xlibs
+		|| (
+			>=media-video/nvidia-glx-1.0.6629-r3
+			>=x11-drivers/ati-drivers-8.8.25-r1 ) )
+	alsa? ( >=media-libs/alsa-lib-1.0.6 )"
+
+RDEPEND="sys-libs/glibc
+	dedicated? ( app-misc/screen )
+	amd64? ( app-emulation/emul-linux-x86-baselibs )
+	opengl? ( ${UIDEPEND} )
+	cdinstall? ( games-fps/quake4-data )
+	!dedicated? ( !opengl? ( ${UIDEPEND} ) )"
+
+S=${WORKDIR}
+
+GAMES_CHECK_LICENSE="yes"
+dir=${GAMES_PREFIX_OPT}/quake4
+Ddir=${D}/${dir}
+
+src_unpack() {
+	unpack_makeself quake4-linux-${PV}.x86.run
+}
+
+src_install() {
+	insinto "${dir}"
+	exeinto "${dir}"
+
+	doins *.txt README q4icon.bmp us/version.info
+	doins -r pb
+	doexe openurl.sh || die "openurl.sh"
+	if use x86; then
+		doexe bin/Linux/x86/quake4.x86 bin/Linux/x86/q4ded.x86 \
+			bin/Linux/x86/libgcc_s.so.1 bin/Linux/x86/libstdc++.so.* \
+			|| die "doexe x86 exes/libs"
+	elif use amd64; then
+		doexe bin/Linux/x86_64/quake4.x86 bin/Linux/x86_64/q4ded.x86 \
+			bin/Linux/x86_64/libgcc_s.so.1 bin/Linux/x86_64/libstdc++.so.* \
+			|| die "doexe amd64 exes/libs"
+	else
+		die "Cannot copy executables!"
+	fi
+
+	insinto ${dir}/q4base
+	doins q4base/* us/q4base/* || die "doins q4base"
+	if use dedicated
+	then
+		games_make_wrapper quake4-ded ./q4ded.x86 "${dir}" "${dir}"
+	fi
+
+	if use opengl || ! use dedicated
+	then
+		games_make_wrapper quake4 ./quake4.x86 "${dir}" "${dir}"
+#		doicon ${FILESDIR}/quake4.png || die "copying icon"
+#		make_desktop_entry quake4 "Quake IV" quake4.png
+		newicon q4icon.bmp quake4.bmp || die "copying icon"
+		make_desktop_entry quake4 "Quake IV" /usr/share/pixmaps/quake4.bmp
+	fi
+
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+
+	if ! use cdinstall
+	then
+		einfo "You need to copy pak001.pk4 through pak012.pk4, along with"
+		einfo "zpak*.pk4 from either your installation media or your hard drive"
+		einfo "to ${dir}/q4base before running the game."
+		echo
+	fi
+	if use opengl || ! use dedicated
+	then
+		einfo "To play the game run:"
+		einfo " quake4"
+		echo
+	fi
+}