Removed virtual/x11 dependency.

(Portage version: 2.1.3_rc8)

5 files changed, 17 insertions, 156 deletions

diff --git a/app-emulation/e-uae/ChangeLog b/app-emulation/e-uae/ChangeLog
index 4848912db66d..404a51bcb091 100644
--- a/app-emulation/e-uae/ChangeLog
+++ b/app-emulation/e-uae/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/e-uae
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/e-uae/ChangeLog,v 1.38 2007/05/26 10:23:38 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/e-uae/ChangeLog,v 1.39 2007/07/22 06:28:08 pva Exp $
+
+  22 Jul 2007; <pva@gentoo.org> e-uae-0.8.28-r3.ebuild,
+  -e-uae-0.8.29_rc4.ebuild, e-uae-0.8.29_rc4-r1.ebuild:
+  Removed virtual/x11 dependency.
 
 *e-uae-0.8.29_rc4-r1 (26 May 2007)
 
diff --git a/app-emulation/e-uae/e-uae-0.8.28-r3.ebuild b/app-emulation/e-uae/e-uae-0.8.28-r3.ebuild
index b9808dd461f7..0695f12c6ea9 100644
--- a/app-emulation/e-uae/e-uae-0.8.28-r3.ebuild
+++ b/app-emulation/e-uae/e-uae-0.8.28-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/e-uae/e-uae-0.8.28-r3.ebuild,v 1.8 2007/05/09 20:18:47 kevquinn Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/e-uae/e-uae-0.8.28-r3.ebuild,v 1.9 2007/07/22 06:28:08 pva Exp $
 
 inherit eutils flag-o-matic pax-utils
 
@@ -15,14 +15,11 @@ IUSE="X dga ncurses sdl gtk alsa oss sdl-sound capslib"
 
 # Note: opposed to ./configure --help zlib support required! Check
 # src/Makefile.am that includes zfile.c unconditionaly.
-RDEPEND="X? ( || ( ( x11-libs/libXt
-					 x11-libs/libxkbfile
-					 x11-libs/libXext
-					 dga? ( x11-libs/libXxf86dga
-						    x11-libs/libXxf86vm )
-				   )
-				   virtual/x11
-				)
+RDEPEND="X? ( x11-libs/libXt
+			 x11-libs/libxkbfile
+			 x11-libs/libXext
+			 dga? ( x11-libs/libXxf86dga
+				    x11-libs/libXxf86vm )
 			)
 		!X? ( sdl? ( media-libs/libsdl )
 			  !sdl? ( sys-libs/ncurses ) )
diff --git a/app-emulation/e-uae/e-uae-0.8.29_rc4-r1.ebuild b/app-emulation/e-uae/e-uae-0.8.29_rc4-r1.ebuild
index 2f9b3de39971..95412c2adee2 100644
--- a/app-emulation/e-uae/e-uae-0.8.29_rc4-r1.ebuild
+++ b/app-emulation/e-uae/e-uae-0.8.29_rc4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/e-uae/e-uae-0.8.29_rc4-r1.ebuild,v 1.1 2007/05/26 10:23:38 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/e-uae/e-uae-0.8.29_rc4-r1.ebuild,v 1.2 2007/07/22 06:28:08 pva Exp $
 
 inherit eutils flag-o-matic pax-utils
 
@@ -27,14 +27,11 @@ IUSE="X dga ncurses sdl gtk alsa oss sdl-sound capslib"
 
 # Note: opposed to ./configure --help zlib support required! Check
 # src/Makefile.am that includes zfile.c unconditionaly.
-RDEPEND="X? ( || ( ( x11-libs/libXt
-					 x11-libs/libxkbfile
-					 x11-libs/libXext
-					 dga? ( x11-libs/libXxf86dga
-						    x11-libs/libXxf86vm )
-				   )
-				   virtual/x11
-				)
+RDEPEND="X? ( x11-libs/libXt
+			 x11-libs/libxkbfile
+			 x11-libs/libXext
+			 dga? ( x11-libs/libXxf86dga
+				    x11-libs/libXxf86vm )
 			)
 		!X? ( sdl? ( media-libs/libsdl )
 			  !sdl? ( sys-libs/ncurses ) )
diff --git a/app-emulation/e-uae/e-uae-0.8.29_rc4.ebuild b/app-emulation/e-uae/e-uae-0.8.29_rc4.ebuild
deleted file mode 100644
index eafe13bb6886..000000000000
--- a/app-emulation/e-uae/e-uae-0.8.29_rc4.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/e-uae/e-uae-0.8.29_rc4.ebuild,v 1.3 2007/05/09 20:18:47 kevquinn Exp $
-
-inherit eutils flag-o-matic pax-utils
-
-DESCRIPTION="The Ubiquitous Amiga Emulator with an emulation core largely based on WinUAE"
-HOMEPAGE="http://www.rcdrummond.net/uae/"
-# We support _rcX for WIPX versions and _preYYYYMMDD for CVS snapshots.
-if [[ "${PV%%_rc*}" = "${PV}" ]] ; then
-	# _pre is used, cvs version
-	my_ver=${PV%%_pre*}
-	snap_ver=${PV##*_pre}
-	S="${WORKDIR}"/${PN}-${my_ver}-${snap_ver}
-	SRC_URI="http://www.rcdrummond.net/uae/test/${snap_ver}/${PN}-${my_ver}-${snap_ver}.tar.bz2"
-else
-	my_ver=${PV%%_rc*}
-	WIP_ver=${PV##*_rc}
-	S="${WORKDIR}"/${PN}-${my_ver}-WIP${WIP_ver}
-	SRC_URI="http://www.rcdrummond.net/uae/${PN}-${my_ver}-WIP${WIP_ver}/${PN}-${my_ver}-WIP${WIP_ver}.tar.bz2"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="X dga ncurses sdl gtk alsa oss sdl-sound capslib"
-
-# Note: opposed to ./configure --help zlib support required! Check
-# src/Makefile.am that includes zfile.c unconditionaly.
-RDEPEND="X? ( || ( ( x11-libs/libXt
-					 x11-libs/libxkbfile
-					 x11-libs/libXext
-					 dga? ( x11-libs/libXxf86dga
-						    x11-libs/libXxf86vm )
-				   )
-				   virtual/x11
-				)
-			)
-		!X? ( sdl? ( media-libs/libsdl )
-			  !sdl? ( sys-libs/ncurses ) )
-		alsa? ( media-libs/alsa-lib )
-		!alsa? ( sdl-sound? ( media-libs/sdl-sound ) )
-		gtk? ( >=x11-libs/gtk+-2.0 )
-		capslib? ( >=games-emulation/caps-20060612 )
-		sys-libs/zlib
-		virtual/cdrtools"
-
-DEPEND="$RDEPEND
-		X? ( dga? ( x11-proto/xf86vidmodeproto
-					x11-proto/xf86dgaproto ) )"
-
-pkg_setup() {
-	# Sound setup.
-	if use alsa; then
-		elog "Choosing alsa as sound target to use."
-		myconf="--with-alsa --without-sdl-sound"
-	elif use sdl-sound ; then
-		if ! use sdl ; then
-			ewarn "sdl-sound is not enabled because sdl USE flag is disabled. Leaving"
-			ewarn "sound on oss autodetection."
-			myconf="--without-alsa --without-sdl-sound"
-			ebeep
-		else
-			elog "Choosing sdl-sound as sound target to use."
-			ewarn "E-UAE with the SDL audio back-end doesn't work correctly in Linux."
-			ewarn "Better use alsa... You've been warned ;)"
-			ebeep
-			myconf="--without-alsa --with-sdl-sound"
-		fi
-	elif use oss ; then
-		elog "Choosing oss as sound target to use."
-		ewarn "oss will be autodetected. See output of configure."
-		myconf="--without-alsa --without-sdl-sound"
-	else
-		ewarn "There is no alsa, sdl-sound or oss in USE. Sound target disabled!"
-		myconf="--disable-audio"
-	fi
-
-	# VIDEO setup. X is autodetected (there is no --with-X option).
-	if use X ; then
-		elog "Using X11 for video output."
-		ewarn "Fullscreen mode is not working in X11 currently. Use sdl."
-		myconf="$myconf --without-curses --without-sdl-gfx"
-		use dga && ewarn "To use dga you have to run e-uae as root."
-		use dga && myconf="$myconf --enable-dga --enable-vidmode"
-	elif use sdl ; then
-		elog "Using sdl for video output."
-		myconf="$myconf --with-sdl --with-sdl-gfx --without-curses"
-	elif use ncurses; then
-		elog "Using ncurses for video output."
-		myconf="$myconf --with-curses --without-sdl-gfx"
-	else
-		ewarn "There is no X or sdl or ncurses in USE!"
-		ewarn "Following upstream falling back on ncurses."
-		myconf="$myconf --with-curses --without-sdl-gfx"
-		ebeep
-	fi
-
-	use gtk && myconf="$myconf --enable-ui --enable-threads"
-	use gtk || myconf="$myconf --disable-ui"
-
-	myconf="$myconf $(use_with capslib caps)"
-
-	myconf="$myconf --with-zlib"
-
-	# And explicitly state defaults:
-	myconf="$myconf --enable-aga"
-	myconf="$myconf --enable-autoconfig --enable-scsi-device --enable-cdtv --enable-cd32"
-	myconf="$myconf --enable-bsdsock"
-}
-
-src_compile() {
-	strip-flags
-
-	econf ${myconf} \
-		--with-libscg-includedir=/usr/include/scsilib \
-		|| die "./configure failed"
-
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	# The emulator needs to be able to create executable heap
-	# - doesn't need trampoline emulation though.
-	pax-mark me "${D}/usr/bin/uae"
-
-	# Rename it to e-uae
-	mv "${D}/usr/bin/uae" "${D}/usr/bin/${PN}"
-	mv "${D}/usr/bin/readdisk" "${D}/usr/bin/e-readdisk"
-
-	dodoc docs/* README ChangeLog
-}
diff --git a/app-emulation/e-uae/files/digest-e-uae-0.8.29_rc4 b/app-emulation/e-uae/files/digest-e-uae-0.8.29_rc4
deleted file mode 100644
index e00c4dc480f7..000000000000
--- a/app-emulation/e-uae/files/digest-e-uae-0.8.29_rc4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 cbfd7e3d7a1b323331afbb92ea7ff4f0 e-uae-0.8.29-WIP4.tar.bz2 1122718
-RMD160 823810cd4c41ee31c394fcea9302f4ca680f0567 e-uae-0.8.29-WIP4.tar.bz2 1122718
-SHA256 9828cb0fca783160bcb33900d0254f4bdaade1c9a41256e5f298e973d0c07456 e-uae-0.8.29-WIP4.tar.bz2 1122718