modular X deps - patch from UncleOwen via bug #122475; clean old

Package-Manager: portage-2.1_pre5-r1

5 files changed, 23 insertions, 41 deletions

diff --git a/games-rpg/freedroidrpg/ChangeLog b/games-rpg/freedroidrpg/ChangeLog
index 9a3e66be3d48..436e59ecfda8 100644
--- a/games-rpg/freedroidrpg/ChangeLog
+++ b/games-rpg/freedroidrpg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-rpg/freedroidrpg
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/freedroidrpg/ChangeLog,v 1.8 2005/09/17 21:32:14 hansmi Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/freedroidrpg/ChangeLog,v 1.9 2006/03/03 15:57:09 mr_bones_ Exp $
+
+  03 Mar 2006; Michael Sterrett <mr_bones_@gentoo.org>
+  freedroidrpg-0.9.13.ebuild:
+  modular X deps - patch from UncleOwen via bug #122475
 
   17 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
   freedroidrpg-0.9.13.ebuild:
diff --git a/games-rpg/freedroidrpg/Manifest b/games-rpg/freedroidrpg/Manifest
index 0571a2ab705a..7a5548d2f946 100644
--- a/games-rpg/freedroidrpg/Manifest
+++ b/games-rpg/freedroidrpg/Manifest
@@ -1,6 +1,12 @@
-MD5 c144a3fd8a99ee9e198773cb1f905de5 metadata.xml 2102
-MD5 7713a838aa74fd573829817729ba7688 ChangeLog 1129
-MD5 570a6326fdaec3647ef7565e2100f768 freedroidrpg-0.9.12.ebuild 782
-MD5 3b9e0d5146e122e14ab7e4584da9468a freedroidrpg-0.9.13.ebuild 779
-MD5 62e1d8dcbe6857c59d1c3bb814343fe6 files/digest-freedroidrpg-0.9.12 74
+MD5 0d0f2c011bd77391b971a03e9864e001 ChangeLog 1274
+RMD160 9ea729b4d56a905c53f06bdc50cf691815db7757 ChangeLog 1274
+SHA256 458934492573ba95a01f59c2ed9e0339e76075d67ea7808f5edbe96b24aaa315 ChangeLog 1274
 MD5 cfe669e06e748b230304f08670ad16b1 files/digest-freedroidrpg-0.9.13 74
+RMD160 533df8b79d884ff322b0a54881571e1ec99f39d3 files/digest-freedroidrpg-0.9.13 74
+SHA256 8c1bc0a4cbaf3ed323e1575c41d621fa3060647cb9827f1cce6f2eb01f0b1698 files/digest-freedroidrpg-0.9.13 74
+MD5 c6fbd5277854bd153fb917a6b63ab31a freedroidrpg-0.9.13.ebuild 861
+RMD160 ad480a961fb028cb8bde91a885ebf96df14683e0 freedroidrpg-0.9.13.ebuild 861
+SHA256 d7e4a872756757300ed5c5f989bed51a2d1df4e13294a666b7d38f09d5fe8a19 freedroidrpg-0.9.13.ebuild 861
+MD5 c144a3fd8a99ee9e198773cb1f905de5 metadata.xml 2102
+RMD160 b4460164b2f9e4bc4cc206fcb7a688afa6f127b7 metadata.xml 2102
+SHA256 d06c8ed4ae0f0763859351dfebfad1b41e3d054261fa555ba26e67be0f7b60f1 metadata.xml 2102
diff --git a/games-rpg/freedroidrpg/files/digest-freedroidrpg-0.9.12 b/games-rpg/freedroidrpg/files/digest-freedroidrpg-0.9.12
deleted file mode 100644
index 910f6535f6e7..000000000000
--- a/games-rpg/freedroidrpg/files/digest-freedroidrpg-0.9.12
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5b8b8e74e641c73645a7597ca8515707 freedroidrpg-0.9.12.tar.bz2 60984286
diff --git a/games-rpg/freedroidrpg/freedroidrpg-0.9.12.ebuild b/games-rpg/freedroidrpg/freedroidrpg-0.9.12.ebuild
deleted file mode 100644
index 2b3c6e8cf287..000000000000
--- a/games-rpg/freedroidrpg/freedroidrpg-0.9.12.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/freedroidrpg/freedroidrpg-0.9.12.ebuild,v 1.6 2005/07/06 22:38:31 mr_bones_ Exp $
-
-inherit games
-
-DESCRIPTION="A modification of the classical Freedroid engine into an RPG"
-HOMEPAGE="http://freedroid.sourceforge.net/"
-SRC_URI="mirror://sourceforge/freedroid/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE=""
-
-DEPEND=">=media-libs/libsdl-1.1.5
-	media-libs/jpeg
-	sys-libs/zlib
-	media-libs/libpng
-	media-libs/sdl-image
-	media-libs/sdl-net
-	media-libs/sdl-mixer
-	virtual/x11"
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO
-	prepgamesdirs
-}
diff --git a/games-rpg/freedroidrpg/freedroidrpg-0.9.13.ebuild b/games-rpg/freedroidrpg/freedroidrpg-0.9.13.ebuild
index d0e4eb302f55..87e0f3696f4a 100644
--- a/games-rpg/freedroidrpg/freedroidrpg-0.9.13.ebuild
+++ b/games-rpg/freedroidrpg/freedroidrpg-0.9.13.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-rpg/freedroidrpg/freedroidrpg-0.9.13.ebuild,v 1.2 2005/09/17 21:32:14 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/freedroidrpg/freedroidrpg-0.9.13.ebuild,v 1.3 2006/03/03 15:57:09 mr_bones_ Exp $
 
 inherit games
 
@@ -13,14 +13,16 @@ SLOT="0"
 KEYWORDS="~amd64 ppc x86"
 IUSE=""
 
-DEPEND=">=media-libs/libsdl-1.1.5
+RDEPEND=">=media-libs/libsdl-1.1.5
 	media-libs/jpeg
 	sys-libs/zlib
 	media-libs/libpng
 	media-libs/sdl-image
 	media-libs/sdl-net
 	media-libs/sdl-mixer
-	virtual/x11"
+	|| ( x11-libs/libX11 virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( x11-libs/libXt virtual/x11 )"
 
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"