Added modular X dependencies.

(Portage version: 2.1_pre3-r1)

4 files changed, 18 insertions, 82 deletions

diff --git a/games-action/rune/ChangeLog b/games-action/rune/ChangeLog
index cf52ba7ccb08..4898295e5081 100644
--- a/games-action/rune/ChangeLog
+++ b/games-action/rune/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/rune
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/rune/ChangeLog,v 1.4 2005/11/22 16:16:56 wolf31o2 Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/rune/ChangeLog,v 1.5 2006/01/10 22:55:55 wolf31o2 Exp $
+
+  10 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> -rune-1.07.ebuild,
+  rune-1.07-r1.ebuild:
+  Added modular X dependencies.
 
   22 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org> rune-1.07-r1.ebuild:
   Changed 2->1 and 1->0.  Changed rune.bin->rune-bin.  Closing bug #113234.
diff --git a/games-action/rune/files/digest-rune-1.07 b/games-action/rune/files/digest-rune-1.07
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/games-action/rune/files/digest-rune-1.07
+++ /dev/null
diff --git a/games-action/rune/rune-1.07-r1.ebuild b/games-action/rune/rune-1.07-r1.ebuild
index 31ef20318130..0bf01f33af4c 100644
--- a/games-action/rune/rune-1.07-r1.ebuild
+++ b/games-action/rune/rune-1.07-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-action/rune/rune-1.07-r1.ebuild,v 1.2 2005/11/22 16:16:56 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/rune/rune-1.07-r1.ebuild,v 1.3 2006/01/10 22:55:55 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -14,10 +14,16 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="virtual/x11
-	!amd64? ( =media-libs/libsdl-1.2* )
-	opengl? ( virtual/opengl )
-	amd64? ( app-emulation/emul-linux-x86-xlibs
+RDEPEND="virtual/opengl
+	x86? (
+		|| (
+			(
+				x11-libs/libX11
+				x11-libs/libXext )
+			virtual/x11 )
+		=media-libs/libsdl-1.2* )
+	amd64? (
+		app-emulation/emul-linux-x86-xlibs
 		app-emulation/emul-linux-x86-compat
 		app-emulation/emul-linux-x86-sdl )"
 
diff --git a/games-action/rune/rune-1.07.ebuild b/games-action/rune/rune-1.07.ebuild
deleted file mode 100644
index 17c760430db1..000000000000
--- a/games-action/rune/rune-1.07.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/rune/rune-1.07.ebuild,v 1.2 2005/10/27 22:39:43 wolf31o2 Exp $
-
-inherit eutils games
-
-DESCRIPTION="Viking hack and slay game"
-HOMEPAGE="http://www.runegame.com"
-SRC_URI=""
-
-LICENSE="LOKI-EULA"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="virtual/x11
-	!amd64? ( =media-libs/libsdl-1.2* )
-	opengl? ( virtual/opengl )
-	amd64? ( app-emulation/emul-linux-x86-xlibs
-		app-emulation/emul-linux-x86-compat
-		app-emulation/emul-linux-x86-sdl )"
-
-DEPEND=""
-
-S=${WORKDIR}
-
-GAMES_CHECK_LICENSE="yes"
-dir=${GAMES_PREFIX_OPT}/${PN}
-Ddir=${D}/${dir}
-
-pkg_setup() {
-	games_pkg_setup
-	cdrom_get_cds System/rune-bin
-}
-
-src_unpack() {
-	# unpack the data files
-	dodir "${dir}"
-	tar xzf "${CDROM_ROOT}"/data.tar.gz || die "Could not unpack data.tar.gz"
-}
-
-src_install() {
-	insinto "${dir}"
-	exeinto "${dir}"
-	einfo "Copying files... this may take a while..."
-
-	for j in Help Maps Meshes Sounds System Textures Web
-	do
-		doins -r ${j} || die "copying ${j}"
-	done
-
-	# copy linux specific files
-	doins -r "${CDROM_ROOT}"/System \
-		|| die "Could not copy Linux specific files"
-
-	# the most important things: rune and ucc :)
-	doexe "${CDROM_ROOT}"/bin/x86/rune \
-		|| die "Could not install rune executable"
-	fperms 750 ${dir}/System/{ucc{,-bin},rune-bin} \
-		|| die "Could not make executables executable"
-	use amd64 && mv ${Ddir}/System/libSDL-1.2.so.0 \
-		${Ddir}/System/libSDL-1.2.so.0.backup
-
-	games_make_wrapper rune ./rune "${dir}" "${dir}"
-
-	# installing documentation/icon
-	dodoc "${CDROM_ROOT}"/{README,CREDITS} || die "Could not dodoc README.linux"
-	newicon "${CDROM_ROOT}"/icon.xpm rune.xpm || die "Could not copy pixmap"
-	make_desktop_entry rune "Rune" rune.xpm "Game;ActionGame"
-
-	find ${Ddir} -exec touch '{}' \;
-
-	prepgamesdirs
-}