Modular X dependency fix & Remove use X

Package-Manager: portage-2.1_pre4-r1

diff --git a/games-puzzle/mirrormagic/ChangeLog b/games-puzzle/mirrormagic/ChangeLog
index cfa46991a4c2db5c1319513e4391c999d8e1fc0e..04b99d75d2558203300391731e38fe3eb6a4b61b 100644 (file)
--- a/games-puzzle/mirrormagic/ChangeLog
+++ b/games-puzzle/mirrormagic/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/mirrormagic
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/mirrormagic/ChangeLog,v 1.6 2004/12/28 16:08:53 josejx Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/mirrormagic/ChangeLog,v 1.7 2006/02/17 22:55:53 tupone Exp $
+
+  17 Feb 2006; <Tupone@gentoo.org> mirrormagic-2.0.2.ebuild:
+  Modular X dependency fix
+  Build X or SDL, not both.
 
   29 Dec 2004; Joseph Jezak <josejx@gentoo.org> mirrormagic-2.0.2.ebuild:
   Marked ppc stable.

diff --git a/games-puzzle/mirrormagic/Manifest b/games-puzzle/mirrormagic/Manifest
index 8fd409f741278eb885b690c22aec6de500040dd7..4e0f288abb6dd435c59fee1559dce2511f665256 100644 (file)
--- a/games-puzzle/mirrormagic/Manifest
+++ b/games-puzzle/mirrormagic/Manifest
@@ -1,14 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 3d26411147ef3c39390d1c746d7829d7 ChangeLog 718
+MD5 db4328aab57634669efa78c3b9482ee6 ChangeLog 835
+RMD160 71195cb366da18d55390b1b954dee64b02270724 ChangeLog 835
+SHA256 b939ea28a6a9b3997986b9fca25c092c5e59b8a16ce7f933050cef036c95e55e ChangeLog 835
+MD5 88db32de8f23127438de94d0f2b599a2 files/digest-mirrormagic-2.0.2 256
+RMD160 e4cefe049763e5dd1913a4d91aabcb204d6ed1aa files/digest-mirrormagic-2.0.2 256
+SHA256 9fffd58068085973091ca10472dffaa9207718f135ab4f0d2d524a4972d57f59 files/digest-mirrormagic-2.0.2 256
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 28065bdba88b9bfea641e27e63ccd156 mirrormagic-2.0.2.ebuild 1291
-MD5 e164643d1c4780689578a96706b24b50 files/digest-mirrormagic-2.0.2 70
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.14 (GNU/Linux)
-
-iD8DBQFB4Z7DroRuSHgZdywRAmykAJ9ZpuWCW5X/CC/htwJQ6M/bFIVsSACfWwg+
-G8sng6IMQ0vtZhNCswJIZ9c=
-=DHFk
------END PGP SIGNATURE-----
+RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
+SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
+MD5 09604c023a0c062c1f0d707c197c606a mirrormagic-2.0.2.ebuild 1260
+RMD160 d3d3ebc3d3f8cbc3c67450bd0d9193edb23564be mirrormagic-2.0.2.ebuild 1260
+SHA256 f6195489b17ecdf368a4c4aa021c3df7a0ce93c35fc4d7509fd63d1032f50d08 mirrormagic-2.0.2.ebuild 1260

diff --git a/games-puzzle/mirrormagic/files/digest-mirrormagic-2.0.2 b/games-puzzle/mirrormagic/files/digest-mirrormagic-2.0.2
index 3bb3e532a55bf41814b5085377fdaa22f1c9decd..61ca1abd36140d616a521652e9fb2811fd6bbdce 100644 (file)
--- a/games-puzzle/mirrormagic/files/digest-mirrormagic-2.0.2
+++ b/games-puzzle/mirrormagic/files/digest-mirrormagic-2.0.2
@@ -1 +1,3 @@
 MD5 32fd3909c1e27f493d89bc2276da6744 mirrormagic-2.0.2.tar.gz 1168098
+RMD160 57de928f2b37575886ddb5cbafcababf9de765dc mirrormagic-2.0.2.tar.gz 1168098
+SHA256 79b3f13d493523438eeb988beffc272c804bc7a4361b83167a082c77e74b3ce2 mirrormagic-2.0.2.tar.gz 1168098

diff --git a/games-puzzle/mirrormagic/mirrormagic-2.0.2.ebuild b/games-puzzle/mirrormagic/mirrormagic-2.0.2.ebuild
index 5db64b151d69bcba50bc7e9c3a7512c3a6e859bb..c3d923912c28b4f5a0fcfc5df6f3ee013281d5c1 100644 (file)
--- a/games-puzzle/mirrormagic/mirrormagic-2.0.2.ebuild
+++ b/games-puzzle/mirrormagic/mirrormagic-2.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 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/mirrormagic/mirrormagic-2.0.2.ebuild,v 1.13 2005/01/09 21:14:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/mirrormagic/mirrormagic-2.0.2.ebuild,v 1.14 2006/02/17 22:55:53 tupone Exp $
 
 inherit flag-o-matic games
 
@@ -11,34 +11,31 @@ SRC_URI="http://www.artsoft.org/RELEASES/unix/mirrormagic/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~amd64 ppc"
-IUSE="X sdl"
+IUSE="sdl"
 
-DEPEND="virtual/libc
-       X? ( virtual/x11 )
+RDEPEND="!sdl? ( || ( x11-libs/libX11 virtual/x11 ) )
        sdl? (
                >=media-libs/libsdl-1.1
                >=media-libs/sdl-mixer-1.2.4
                >=media-libs/sdl-image-1.2.2
        )"
+DEPEND="${RDEPEND}
+       !sdl? ( || ( x11-libs/libXt virtual/x11 ) )"
 
 src_compile() {
        replace-flags -march=k6 -march=i586
 
        local makeopts="X11_PATH=/usr/X11R6 RO_GAME_DIR=${GAMES_DATADIR}/${PN} RW_GAME_DIR=${GAMES_STATEDIR}/${PN}"
-       if use X || ! use sdl ; then
-               make clean || die
-               make ${makeopts} OPTIONS="${CFLAGS}" x11 || die
-               mv mirrormagic{,.x11}
-       fi
+       make clean || die
        if use sdl ; then
-               make clean || die
                make ${makeopts} OPTIONS="${CFLAGS}" sdl || die
-               mv mirrormagic{,.sdl}
+       else
+               make ${makeopts} OPTIONS="${CFLAGS}" x11 || die
        fi
 }
 
 src_install() {
-       dogamesbin mirrormagic.{sdl,x11} || die "dogamesbin failed"
+       dogamesbin mirrormagic || die "dogamesbin failed"
        dodir "${GAMES_DATADIR}/${PN}"
        cp -R graphics levels music sounds "${D}/${GAMES_DATADIR}/${PN}/"
        dodoc CHANGES CREDITS README TODO