Stable on amd64/x86, removing older ebuilds, and removing virtual/x11 from dependencies.

Package-Manager: portage-2.1.2_pre1-r2

3 files changed, 11 insertions, 126 deletions

diff --git a/games-fps/quake4-bin/Manifest b/games-fps/quake4-bin/Manifest
index e9c63e9db5c9..e92bfe4f4fc7 100644
--- a/games-fps/quake4-bin/Manifest
+++ b/games-fps/quake4-bin/Manifest
@@ -2,33 +2,25 @@
 Hash: SHA1
 
 DIST quake4-linux-1.3-2.x86.run 239448644 RMD160 a5cdf416c225f1b60ae93a26e0185bb719353ccd SHA1 271341e8b14f91c99dbe6c62e8a9dc96d8160549 SHA256 d85d62791aaf56039f131997ccadbddeac17f83d7420102ca5a059af1f284252
-DIST quake4-linux-1.3.x86.run 239447744 RMD160 7af969998f7ad59fb2bd4f8a8a04708e15bea93e SHA1 536054682c2cc4f5d5ce678ce49882e854e98251 SHA256 3ac59bec1e4b3120677ed062293582fb72d2b2bbb11bdaab35efb8f03500c688
-EBUILD quake4-bin-1.3.2.ebuild 2938 RMD160 a0999f3be7294f687f6853d0066f13522e10ee7a SHA1 b4d3d3ff7873e1e328f5d5026adc7dfcda08bc63 SHA256 c5115088aeeeec8fc356a79ea0d25e1e1d50a85f08e27b20f96d266a548022da
-MD5 d85ed909e934ac96178bbeea28fb59ca quake4-bin-1.3.2.ebuild 2938
-RMD160 a0999f3be7294f687f6853d0066f13522e10ee7a quake4-bin-1.3.2.ebuild 2938
-SHA256 c5115088aeeeec8fc356a79ea0d25e1e1d50a85f08e27b20f96d266a548022da quake4-bin-1.3.2.ebuild 2938
-EBUILD quake4-bin-1.3.ebuild 2838 RMD160 7c10cc9b6a9173db1755ade5632f127c3664d227 SHA1 4098e39338d9224307ee122247de5eca33847f19 SHA256 2803f56531fc466d88a6ab1ce0f5b03042bc4f8bad2177a7555de23afe089707
-MD5 4c0636de8a28f618df48a54bf254ca75 quake4-bin-1.3.ebuild 2838
-RMD160 7c10cc9b6a9173db1755ade5632f127c3664d227 quake4-bin-1.3.ebuild 2838
-SHA256 2803f56531fc466d88a6ab1ce0f5b03042bc4f8bad2177a7555de23afe089707 quake4-bin-1.3.ebuild 2838
-MISC ChangeLog 4330 RMD160 a5d2861592a1c2765d5640319bb0391ac7c8231f SHA1 54098e08e7de26c07ec038dc3f3fc1a30fe5e546 SHA256 2bd623b000a192c650b551eb18c8fc5135205053637226ab58cce0619b2e47f2
-MD5 de7fad78ec0351f270f2ed8c2b0a297c ChangeLog 4330
-RMD160 a5d2861592a1c2765d5640319bb0391ac7c8231f ChangeLog 4330
-SHA256 2bd623b000a192c650b551eb18c8fc5135205053637226ab58cce0619b2e47f2 ChangeLog 4330
+EBUILD quake4-bin-1.3.2.ebuild 2897 RMD160 b1d1db2afa1f2cd21d8a5466b772ae6a51a49eaf SHA1 6a196214600476a1734e75478b288c221c538ae7 SHA256 30c22efa0a90df5c34f855929d8e4e2b7ed41fe292734102bcca36b82a9b098f
+MD5 13b8ddeaeccf32843342393fa5cdd8cb quake4-bin-1.3.2.ebuild 2897
+RMD160 b1d1db2afa1f2cd21d8a5466b772ae6a51a49eaf quake4-bin-1.3.2.ebuild 2897
+SHA256 30c22efa0a90df5c34f855929d8e4e2b7ed41fe292734102bcca36b82a9b098f quake4-bin-1.3.2.ebuild 2897
+MISC ChangeLog 4529 RMD160 072dffb50a180d19ae458083436782bfd6018478 SHA1 3aabf8576e75b1891a417322e586e59400150b8e SHA256 4d42b368e777739dd967aef0f98f35c392f0e5ca5d1ebaf0500e1805fda71e16
+MD5 2c07a0387a02ffbc376710e44809df03 ChangeLog 4529
+RMD160 072dffb50a180d19ae458083436782bfd6018478 ChangeLog 4529
+SHA256 4d42b368e777739dd967aef0f98f35c392f0e5ca5d1ebaf0500e1805fda71e16 ChangeLog 4529
 MISC metadata.xml 1046 RMD160 4533166e73a6c0c048441279409fe8c52875b974 SHA1 e5f71bbe83bb2e204263296367240707558b4200 SHA256 4c04b0b912807688e3536ea7318cdbe28858bc462e339b6cc8d4e491d167caf8
 MD5 67bc63233267502c576573939ca95ae9 metadata.xml 1046
 RMD160 4533166e73a6c0c048441279409fe8c52875b974 metadata.xml 1046
 SHA256 4c04b0b912807688e3536ea7318cdbe28858bc462e339b6cc8d4e491d167caf8 metadata.xml 1046
-MD5 92f3b958f9b7670dc4b71f4806b9d958 files/digest-quake4-bin-1.3 262
-RMD160 03dced1d7ad950af484a7dd1e271e98af4496918 files/digest-quake4-bin-1.3 262
-SHA256 39a92eb43bfa4de10414ef83a9fcdd3ee5d9eaae5b752a78be9c06c65ac58682 files/digest-quake4-bin-1.3 262
 MD5 bcfa4d11b431b142ef33909644d01310 files/digest-quake4-bin-1.3.2 268
 RMD160 0a6b163c3ee10306effae8a4a8f76f7aaf9a9753 files/digest-quake4-bin-1.3.2 268
 SHA256 0cf7c8625924b321e608a2ea1c88d2b57c854a8e2edb43d4e92c00b0b7164e34 files/digest-quake4-bin-1.3.2 268
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE/zeykT4lNIS36YERAsVSAKC3NEfwyoSKu87tpBTkcD7bqVn9GwCcDQ2b
-C/EXC0aD85G3D6XkX7Lg3fI=
-=beLG
+iD8DBQFFG8XzkT4lNIS36YERAhKTAJ9cq+eG3rrpGTvpcicC7wIcLvapUgCfUXU1
+ByCvASQZO8jeXDMaVtmBhAI=
+=Y4xm
 -----END PGP SIGNATURE-----
diff --git a/games-fps/quake4-bin/files/digest-quake4-bin-1.3 b/games-fps/quake4-bin/files/digest-quake4-bin-1.3
deleted file mode 100644
index 15e803869b89..000000000000
--- a/games-fps/quake4-bin/files/digest-quake4-bin-1.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 90f9c1390e38e723e62a5a07fd96cc91 quake4-linux-1.3.x86.run 239447744
-RMD160 7af969998f7ad59fb2bd4f8a8a04708e15bea93e quake4-linux-1.3.x86.run 239447744
-SHA256 3ac59bec1e4b3120677ed062293582fb72d2b2bbb11bdaab35efb8f03500c688 quake4-linux-1.3.x86.run 239447744
diff --git a/games-fps/quake4-bin/quake4-bin-1.3.ebuild b/games-fps/quake4-bin/quake4-bin-1.3.ebuild
deleted file mode 100644
index 289cb95c4206..000000000000
--- a/games-fps/quake4-bin/quake4-bin-1.3.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# 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.3.ebuild,v 1.2 2006/08/28 18:34:09 wolf31o2 Exp $
-
-inherit eutils games
-
-DESCRIPTION="Sequel to Quake 2, an id Software 3D first-person shooter"
-HOMEPAGE="http://www.quake4game.com/"
-SRC_URI="mirror://idsoftware/quake4/linux/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
-		|| (
-			>=app-emulation/emul-linux-x86-xlibs-7.0
-			>=media-video/nvidia-glx-1.0.6629-r3
-			x11-drivers/nvidia-drivers
-			x11-drivers/nvidia-legacy-drivers
-			>=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 README-1.3.htm || die "docs"
-	doins -r pb || die "pb"
-	doexe openurl.sh || die "openurl.sh"
-	doexe bin/Linux/x86/quake4.x86 bin/Linux/x86/q4ded.x86 \
-		bin/Linux/x86/libgcc_s.so.1 bin/Linux/x86/libstdc++.so.* \
-		bin/Linux/x86/libSDL-1.2.id.so.0 bin/Linux/x86/quake4smp.x86 \
-		|| die "doexe x86 exes/libs"
-
-	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}"
-		games_make_wrapper quake4-smp ./quake4smp.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
-		make_desktop_entry quake4-smp "Quake IV (SMP)" /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
-}