Drop 3dfx/video-cards-tdfx stuff as the glide-v3 is masked.

Package-Manager: portage-2.2.0_alpha26/cvs/Linux x86_64

4 files changed, 17 insertions, 25 deletions

diff --git a/games-fps/quakeforge/ChangeLog b/games-fps/quakeforge/ChangeLog
index 6a7e72e577b8..550c2ef59447 100644
--- a/games-fps/quakeforge/ChangeLog
+++ b/games-fps/quakeforge/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/quakeforge
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quakeforge/ChangeLog,v 1.24 2009/11/21 07:30:59 tove Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quakeforge/ChangeLog,v 1.25 2011/03/08 17:05:10 scarabeus Exp $
+
+  08 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> quakeforge-0.5.5.ebuild,
+  quakeforge-0.5.5-r2.ebuild:
+  Drop 3dfx/video-cards-tdfx stuff as the glide-v3 is masked.
 
   20 Nov 2009; Alfredo Tupone <tupone@gentoo.org> quakeforge-0.5.5.ebuild,
   quakeforge-0.5.5-r2.ebuild, +files/quakeforge-0.5.5-noWerror.patch:
diff --git a/games-fps/quakeforge/Manifest b/games-fps/quakeforge/Manifest
index de956987c118..68b2c42a483d 100644
--- a/games-fps/quakeforge/Manifest
+++ b/games-fps/quakeforge/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 0.5.5-ipv6.patch 302 RMD160 7e1255c42df1c6c6ee59e87fa034324bfe2a83b5 SHA1 d24595bf4feb9e51c69bae9d716370f0262d15bf SHA256 8b473c335e6dc191e4aae7e7ada09ea5fc6d649e1132bb6230c1427fa0692e7a
 AUX quakeforge-0.5.5-amd64.patch 617 RMD160 1a0f3fedc34dfdecb2a3d07d235a7e2a25e0a2f2 SHA1 9b61c7f8f7230b6af083a0d10da7292e92148226 SHA256 75b8e2d329a620f131fbf01ff81211a4985c65e0a1166ccecd618e59b0bfba2a
 AUX quakeforge-0.5.5-gcc41.patch 11887 RMD160 927ccee1af7ce986317c5a865dd67caf1bb2f489 SHA1 e57ad56650cbc80de3b8abfe58127a0ded0f0be5 SHA256 a8409922b14d1690f3a0f58a7961371944f1c96798f5e5f85ee8247ea1bab20d
@@ -8,14 +5,7 @@ AUX quakeforge-0.5.5-keys.patch 2732 RMD160 e12fe9e7738294130b2efc6f47287e9c0d05
 AUX quakeforge-0.5.5-no-page-size.patch 354 RMD160 6e2fc49b4282b3ffe9038dba77eb35be2e461560 SHA1 929c4a27fb9e645bf09f40885abb5b2a8e278d07 SHA256 8ff7557e497cf5e691e9e3707b3615f32111e770e57baf362cec5bed16aba7ab
 AUX quakeforge-0.5.5-noWerror.patch 2413 RMD160 17580a3df00b1464985b79f8609bddcd2cf67839 SHA1 8f40571bd8969cce1edf49b88242ec738d2c9566 SHA256 ade037928aa9a58f99e2e62b4df461365336c595be712cc6697337b20d39258e
 DIST quakeforge-0.5.5.tar.bz2 1954072 RMD160 1caf8d7b272c9e588708ac39841d46aac2c5df79 SHA1 680e47a189de508f8cc7c5c525537f0aa2dafb05 SHA256 9ff29340f571fc26d19992a32f58e767e1b811248688f383083bc2ccb263ec6a
-EBUILD quakeforge-0.5.5-r2.ebuild 4024 RMD160 76b57804edea1bcb589f25e65e9a307ffd3343f0 SHA1 9ce13c7e5a2bc1299107676386cce0a125695120 SHA256 ea3c8f22a8db6e81273bb0212e3591d276c5289fb3b07996448e0995ed5d1ef4
-EBUILD quakeforge-0.5.5.ebuild 3836 RMD160 f490859880a673bfa20b7f5a73ce6b8ad2c0d8c0 SHA1 d17d7dea1df9b6abc9c6d001869803bb7261841c SHA256 d2007fe272d7e90fc37f0c53f67b9b9945e52598562dd8180283549b139ce85d
-MISC ChangeLog 4307 RMD160 2187bbe810a21ed792b99161dd72b406cbc602bf SHA1 c049fa70bc144ee084e861ac5dfe4aa29afe5097 SHA256 fa589d807b560e7b9a0cc7294760fd12d1ab912c6fad85384061fcda11c779b5
+EBUILD quakeforge-0.5.5-r2.ebuild 3916 RMD160 6788f9e6c6b64cfaf6129f1c151f32c6133f010d SHA1 e29f6bd097106e2c2bbad103d2313bf4251dce70 SHA256 759ee6893da38872640e4429c9e661fd4d5d99321a2ecea5e843bdbe69664fc3
+EBUILD quakeforge-0.5.5.ebuild 3766 RMD160 0a839102c8c1bc8f9f701ba63b330f974c47bdc1 SHA1 da0c3d4df9db5ddf8c6e863dbb1501b6dcf7f14e SHA256 fd2442c2bb0d74ad49c3bbb20c5eff324845116f0445b86e5b9187d44f5b51dd
+MISC ChangeLog 4485 RMD160 991f2e2c11c70fbafbe5c82f04f8970522710d36 SHA1 9d532f804a7066d88486f97a88b53f99089313a1 SHA256 d0d9c27a7eafc38abfb9281246f83db89e855050d07cdbb270219075abc087c7
 MISC metadata.xml 1396 RMD160 b7e31184f0351596c32f9014e0c0b6b9a31ad4f1 SHA1 2ff09d93c6d3c1a1f5947ad4039d9160d9b0df48 SHA256 21be4035c9338cf0635afcaf8b23e1a0e98affcabbddd47f6a7663b2afa0d2bb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAksHlzkACgkQV3J2n04EauxEWQCgymCHr9ilbCt+dEZexse+1zGG
-ZKsAoJfqKGrv1HBB9dvoXAKpoz56P1S8
-=N1Wr
------END PGP SIGNATURE-----
diff --git a/games-fps/quakeforge/quakeforge-0.5.5-r2.ebuild b/games-fps/quakeforge/quakeforge-0.5.5-r2.ebuild
index 924b377ac333..40f91f53cead 100644
--- a/games-fps/quakeforge/quakeforge-0.5.5-r2.ebuild
+++ b/games-fps/quakeforge/quakeforge-0.5.5-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quakeforge/quakeforge-0.5.5-r2.ebuild,v 1.6 2009/11/20 16:57:53 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quakeforge/quakeforge-0.5.5-r2.ebuild,v 1.7 2011/03/08 17:05:10 scarabeus Exp $
 
 EAPI=2
 inherit base eutils autotools games
@@ -12,10 +12,10 @@ SRC_URI="mirror://sourceforge/quake/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="cdinstall debug fbcon opengl sdl svga X ncurses vorbis zlib ipv6 xv dga alsa oss video_cards_tdfx"
+IUSE="cdinstall debug fbcon opengl sdl svga X ncurses vorbis zlib ipv6 xv dga alsa oss"
 RESTRICT="userpriv"
 
-RDEPEND="video_cards_tdfx? ( media-libs/glide-v3 )
+RDEPEND="
 	opengl? ( virtual/opengl )
 	sdl? ( media-libs/libsdl )
 	svga? ( media-libs/svgalib )
@@ -68,7 +68,6 @@ src_configure() {
 		|| debugopts="--disable-debug --disable-profile"
 
 	local clients=${QF_CLIENTS}
-	use video_cards_voodoo && clients="${clients},3dfx"
 	use fbcon && clients="${clients},fbdev"
 	use opengl && clients="${clients},glx"
 	use sdl && clients="${clients},sdl,sdl32"
diff --git a/games-fps/quakeforge/quakeforge-0.5.5.ebuild b/games-fps/quakeforge/quakeforge-0.5.5.ebuild
index 559597780830..b916ec127067 100644
--- a/games-fps/quakeforge/quakeforge-0.5.5.ebuild
+++ b/games-fps/quakeforge/quakeforge-0.5.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quakeforge/quakeforge-0.5.5.ebuild,v 1.20 2009/11/20 16:57:53 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quakeforge/quakeforge-0.5.5.ebuild,v 1.21 2011/03/08 17:05:10 scarabeus Exp $
 
 inherit eutils games
 
@@ -11,10 +11,10 @@ SRC_URI="mirror://sourceforge/quake/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="ppc x86"
-IUSE="cdinstall debug 3dfx fbcon opengl sdl svga X ncurses vorbis zlib ipv6 xv dga alsa oss"
+IUSE="cdinstall debug fbcon opengl sdl svga X ncurses vorbis zlib ipv6 xv dga alsa oss"
 RESTRICT="userpriv"
 
-RDEPEND="3dfx? ( media-libs/glide-v3 )
+RDEPEND="
 	opengl? ( virtual/opengl )
 	sdl? ( media-libs/libsdl )
 	svga? ( media-libs/svgalib )
@@ -58,7 +58,6 @@ src_compile() {
 		|| debugopts="--disable-debug --disable-profile"
 
 	local clients=${QF_CLIENTS}
-	use 3dfx && clients="${clients},3dfx"
 	use fbcon && clients="${clients},fbdev"
 	use opengl && clients="${clients},glx"
 	use sdl && clients="${clients},sdl,sdl32"