modular X dependency & opengl use flag fix

(Portage version: 2.1_pre4-r1)

4 files changed, 40 insertions, 26 deletions

diff --git a/games-fps/prboom/ChangeLog b/games-fps/prboom/ChangeLog
index 7f6876c687ca..5dd9e753d090 100644
--- a/games-fps/prboom/ChangeLog
+++ b/games-fps/prboom/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/prboom
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/prboom/ChangeLog,v 1.11 2005/05/30 19:44:27 gustavoz Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/prboom/ChangeLog,v 1.12 2006/02/14 22:22:53 tupone Exp $
+
+  14 Feb 2006; <Tupone@gentoo.org> prboom-2.2.4-r1.ebuild:
+  Modular X dependency fix
+  USE="-opengl" fixes for bugged configure.in (raised at prboom Id:1431820)
 
   30 May 2005; Gustavo Zacarias <gustavoz@gentoo.org>
   prboom-2.2.4-r1.ebuild:
diff --git a/games-fps/prboom/Manifest b/games-fps/prboom/Manifest
index 9aa6ffdeedb8..45b52407ac22 100644
--- a/games-fps/prboom/Manifest
+++ b/games-fps/prboom/Manifest
@@ -1,17 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 766cac70c82072ddf06fe2c42f8083b0 ChangeLog 1595
-MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 662098dfc14ece34364f58bd3d21cb8c prboom-2.2.4-r1.ebuild 1717
+MD5 3294bf951b5f67b680bd91df64c2e2bb ChangeLog 1758
+RMD160 13160f64c0cfec745271b5a132e022cdb8ecae8d ChangeLog 1758
+SHA256 ea1628d1633f7e3a462c696cb7d6896f40495b644020fda9e97fbdfadecc88d8 ChangeLog 1758
 MD5 e3d9b24d0bbddd7177cdc13ec010c225 files/2.2.4-gcc34.patch 629
+RMD160 941aeeda5371d8b711fc91b07972c2316d8e3df4 files/2.2.4-gcc34.patch 629
+SHA256 bc3726ecc1630c5369280085f171a87e529cf969d9596116730228e47c4a51e2 files/2.2.4-gcc34.patch 629
 MD5 6baf3ffdd34dfe4b85618dd603616a80 files/2.2.4-nvidia-test.c 90
+RMD160 423a4874c8c9c92482b7df72cb88f5140ebbbd5c files/2.2.4-nvidia-test.c 90
+SHA256 5df0930928328c700cafba8ac3367dc799118dddcd16d71d2bb0d65eb3a2d185 files/2.2.4-nvidia-test.c 90
 MD5 d8fff22fba51330be33cc8905f81d425 files/2.2.4-nvidia.patch 1761
-MD5 1f849cf0b94a12ff9f846fc538f27b83 files/digest-prboom-2.2.4-r1 65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFCm20xKRy60XGEcJIRAo6PAJ9or2fNBs250r4BxVTOmUQdReNbDACgrhtk
-dLxuGbCnFq5yNV8d+Emyu54=
-=vBTO
------END PGP SIGNATURE-----
+RMD160 8c980004ffca3fc69fdf25301ea629428599b75a files/2.2.4-nvidia.patch 1761
+SHA256 b097c952ea093751448d0082424f09a7ef1d5fefe253dd22ea3d0c5b0f5aa0bc files/2.2.4-nvidia.patch 1761
+MD5 092d3523c655f13311d5f6c4b910d083 files/digest-prboom-2.2.4-r1 241
+RMD160 ef4cfff5ca532b62d922bc52be8023b6a3d9aa6d files/digest-prboom-2.2.4-r1 241
+SHA256 0e0628bae3270ae8cff114affa217d9f1fb90ea69b94bd0917198206d1e743fb files/digest-prboom-2.2.4-r1 241
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
+SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
+MD5 da02997c31735e07e0fa81d4019f92fa prboom-2.2.4-r1.ebuild 1839
+RMD160 6b7543e002c64b308b2bb9505f8116a1feea840b prboom-2.2.4-r1.ebuild 1839
+SHA256 91ddad71ef377910043b26072d34ba3cdf3c944e1d18d067443c66c32ed57262 prboom-2.2.4-r1.ebuild 1839
diff --git a/games-fps/prboom/files/digest-prboom-2.2.4-r1 b/games-fps/prboom/files/digest-prboom-2.2.4-r1
index c9a016540d2e..6a9a7529b7bb 100644
--- a/games-fps/prboom/files/digest-prboom-2.2.4-r1
+++ b/games-fps/prboom/files/digest-prboom-2.2.4-r1
@@ -1 +1,3 @@
 MD5 a7cd473d5b6bb69f815bf156b93aeacc prboom-2.2.4.tar.gz 1001103
+RMD160 644e018cc94d60841728310c44afdf2cd202a20f prboom-2.2.4.tar.gz 1001103
+SHA256 db00f70a0e420b156ae2c7696f1267b6333cdbade694aec51add4e3f3cbcc76b prboom-2.2.4.tar.gz 1001103
diff --git a/games-fps/prboom/prboom-2.2.4-r1.ebuild b/games-fps/prboom/prboom-2.2.4-r1.ebuild
index caa2399536ca..e73a587a05ba 100644
--- a/games-fps/prboom/prboom-2.2.4-r1.ebuild
+++ b/games-fps/prboom/prboom-2.2.4-r1.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/prboom/prboom-2.2.4-r1.ebuild,v 1.7 2005/05/30 19:44:27 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/prboom/prboom-2.2.4-r1.ebuild,v 1.8 2006/02/14 22:22:53 tupone Exp $
 
 inherit eutils toolchain-funcs games
 
@@ -13,12 +13,11 @@ SLOT="0"
 KEYWORDS="x86 amd64 ~ppc sparc"
 IUSE="opengl"
 
-DEPEND="virtual/x11
-	>=media-libs/libsdl-1.1.3
-	media-libs/sdl-mixer
-	media-libs/sdl-net
-	media-libs/smpeg
-	opengl? ( virtual/opengl )"
+DEPEND=">=media-libs/libsdl-1.1.3
+		media-libs/sdl-mixer
+		media-libs/sdl-net
+		opengl? ( virtual/opengl virtual/glu )
+		media-libs/smpeg"
 
 src_unpack() {
 	unpack ${A}
@@ -32,11 +31,16 @@ src_unpack() {
 }
 
 src_compile() {
+	local myconf
+	# configure.in should be fixed as
+	# --enable-gl and 
+	# --disable-gl are threated the same
+	use opengl && myconf="--enable-gl"
 	# leave --disable-cpu-opt in otherwise the configure script
 	# will append -march=i686 and crap ... let the user's CFLAGS
 	# handle this ...
 	egamesconf \
-		$(use_enable opengl gl) \
+		${myconf} \
 		$(use_enable x86 i386-asm) \
 		--disable-cpu-opt \
 		|| die
@@ -59,7 +63,7 @@ src_install() {
 	doins data/*.wad || die "doins failed"
 
 	doman doc/*.{5,6}
-	dodoc AUTHORS ChangeLog NEWS README TODO doc/README.* doc/*.txt
+	dodoc AUTHORS NEWS README TODO doc/README.* doc/*.txt
 
 	prepgamesdirs
 }