Modular X dependency & svga build fix

(Portage version: 2.1_pre4-r1)

4 files changed, 41 insertions, 12 deletions

diff --git a/games-puzzle/quadra/ChangeLog b/games-puzzle/quadra/ChangeLog
index 33ae9dc3f4ae..981e2114ce8d 100644
--- a/games-puzzle/quadra/ChangeLog
+++ b/games-puzzle/quadra/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/quadra
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/quadra/ChangeLog,v 1.10 2005/05/17 18:40:04 wolf31o2 Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/quadra/ChangeLog,v 1.11 2006/02/17 22:28:23 tupone Exp $
+
+  17 Feb 2006; <Tupone@gentoo.org> quadra-1.1.8.ebuild:
+  Modular X dependency fix
+  Fix build with svga
 
   17 May 2005; Chris Gianelloni <wolf31o2@gentoo.org> quadra-1.1.8.ebuild:
   Cleanup for bug #92745.
diff --git a/games-puzzle/quadra/Manifest b/games-puzzle/quadra/Manifest
index 017b26eaa8df..ba9559e3acbb 100644
--- a/games-puzzle/quadra/Manifest
+++ b/games-puzzle/quadra/Manifest
@@ -1,7 +1,21 @@
-MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 411b886a85def220a24bb88480aaf1e8 quadra-1.1.8.ebuild 1300
-MD5 c0bfbde9e2e6faf0c21152bef7cd9357 ChangeLog 1598
+MD5 663f7a3e13cfb2923381d80c3fb9f657 ChangeLog 1704
+RMD160 d4ff4447da30f7804999cfbb47d8f67f2ac26faa ChangeLog 1704
+SHA256 fd56003a04c73e85bea761bd51fc3caf2f952cd0ff41b81cf844ba5619a7d9f8 ChangeLog 1704
+MD5 14e60e570efd3ac017642659293fdff8 files/digest-quadra-1.1.8 241
+RMD160 00d1804ab7dfb5c1a09e80f6717af6ba25ef6d6b files/digest-quadra-1.1.8 241
+SHA256 bedb0acd7b2cc7358e4d769861c5b82b7f8d9a1b4c919aa9b3bf41df076548d5 files/digest-quadra-1.1.8 241
+MD5 bba09cc9f175516cb6eeadcc7cb5f20b files/libpng-1.2.5.patch 319
+RMD160 8f777f0452e7d6df56c0bd024711ee895ad842ae files/libpng-1.2.5.patch 319
+SHA256 7b00007124b62a247e748f37b85b97d35fb50e31fd18742ea6c217e2dc4543c9 files/libpng-1.2.5.patch 319
 MD5 ffdb7b1e6830df6f4d6064c9fca1f6bb files/quadra-1.1.8-amd64.patch 1075
-MD5 bdff1f4721aa26a2dc4ac7f4f38e7194 files/digest-quadra-1.1.8 65
+RMD160 3f88f9078fe2daed39b20c0bd51109759a2b17c5 files/quadra-1.1.8-amd64.patch 1075
+SHA256 9c8fe51ab59a6234d3f9dd0c4ab0722327e142e99fd3f9a0007009579205893e files/quadra-1.1.8-amd64.patch 1075
 MD5 9e774090da8184c5773262c18467cd32 files/quadra-1.1.8-gcc3.patch 2830
-MD5 bba09cc9f175516cb6eeadcc7cb5f20b files/libpng-1.2.5.patch 319
+RMD160 1b39182540f7117c6d55ec409708227c49d7cb87 files/quadra-1.1.8-gcc3.patch 2830
+SHA256 eb0e08ab1c31a54837b39ab40fa75eaf586a89d3a41525a0d828f9768df0a9a3 files/quadra-1.1.8-gcc3.patch 2830
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
+SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
+MD5 bf6d1655365176b134bf2e639f4b262d quadra-1.1.8.ebuild 1642
+RMD160 a660f7f4870570e2798d36d3d2c4984d37a7bd96 quadra-1.1.8.ebuild 1642
+SHA256 8e1a95694f39e7fd331d603442c8e0f0e15019efcf9fd5192c17f65c9828e9e1 quadra-1.1.8.ebuild 1642
diff --git a/games-puzzle/quadra/files/digest-quadra-1.1.8 b/games-puzzle/quadra/files/digest-quadra-1.1.8
index 0cc4f4f0c726..b57f73522a0a 100644
--- a/games-puzzle/quadra/files/digest-quadra-1.1.8
+++ b/games-puzzle/quadra/files/digest-quadra-1.1.8
@@ -1 +1,3 @@
 MD5 4934ee30d0bd98c4c454829a03224f6f quadra-1.1.8.tar.gz 3379618
+RMD160 e57f25a714d5f447f3dcb34c34af9fa22718560d quadra-1.1.8.tar.gz 3379618
+SHA256 6ebf81d4ffe1cedbebfdcc2cb44fdac875da8ccbd3d113ca5cb62169bf63d201 quadra-1.1.8.tar.gz 3379618
diff --git a/games-puzzle/quadra/quadra-1.1.8.ebuild b/games-puzzle/quadra/quadra-1.1.8.ebuild
index 4436a775914d..c3820c062699 100644
--- a/games-puzzle/quadra/quadra-1.1.8.ebuild
+++ b/games-puzzle/quadra/quadra-1.1.8.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-puzzle/quadra/quadra-1.1.8.ebuild,v 1.10 2005/05/22 13:35:53 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/quadra/quadra-1.1.8.ebuild,v 1.11 2006/02/17 22:28:23 tupone Exp $
 
 inherit eutils toolchain-funcs games
 
@@ -13,10 +13,11 @@ SLOT="0"
 KEYWORDS="~amd64 x86"
 IUSE="svga"
 
-DEPEND="virtual/x11
+RDEPEND="|| ( x11-libs/libXpm virtual/x11 )
 	>=media-libs/libpng-1.2.1
-	sys-libs/zlib
 	svga? ( media-libs/svgalib )"
+DEPEND="${RDEPEND}
+	|| ( x11-proto/xextproto virtual/x11 )"
 
 src_unpack() {
 	unpack ${A}
@@ -34,7 +35,15 @@ src_unpack() {
 }
 
 src_compile() {
-	egamesconf $(use_with svga svgalib) || die
+	# configure script is coded only to accept --without-svgalib
+	# --with-svgalib is bugged
+	# raised bug #1433828 @ quadra - Sourceforge
+	# http://sourceforge.net/tracker/index.php?func=detail&aid=1433828&group_id=7275&atid=107275
+	if use svga; then
+		egamesconf || die
+	else
+		egamesconf --without-svgalib || die
+	fi
 	emake || die "emake failed"
 }