Version bump. This is 0.8.29-WIP4! Enjoy :)

(Portage version: 2.1.2.2)

7 files changed, 26 insertions, 166 deletions

diff --git a/app-emulation/e-uae/ChangeLog b/app-emulation/e-uae/ChangeLog
index ca95ad89b563..666270264418 100644
--- a/app-emulation/e-uae/ChangeLog
+++ b/app-emulation/e-uae/ChangeLog
@@ -1,6 +1,14 @@
 # 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.34 2007/03/19 10:56:33 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/e-uae/ChangeLog,v 1.35 2007/04/09 15:19:28 pva Exp $
+
+*e-uae-0.8.29_rc4 (09 Apr 2007)
+
+  09 Apr 2007; <pva@gentoo.org>
+  -files/e-uae-0.8.29-20070223-filesys_fix.diff,
+  -e-uae-0.8.29_pre20070223-r1.ebuild, -e-uae-0.8.29_pre20070317.ebuild,
+  +e-uae-0.8.29_rc4.ebuild:
+  Version bump. This is 0.8.29-WIP4! Enjoy :)
 
 *e-uae-0.8.29_pre20070317 (19 Mar 2007)
 
diff --git a/app-emulation/e-uae/e-uae-0.8.29_pre20070317.ebuild b/app-emulation/e-uae/e-uae-0.8.29_pre20070317.ebuild
deleted file mode 100644
index 91e0eb4fc166..000000000000
--- a/app-emulation/e-uae/e-uae-0.8.29_pre20070317.ebuild
+++ /dev/null
@@ -1,123 +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_pre20070317.ebuild,v 1.1 2007/03/19 10:56:33 pva Exp $
-
-inherit eutils flag-o-matic
-
-my_ver=${PV%%_pre*}
-snap_ver=${PV##*_pre}
-
-DESCRIPTION="The Ubiquitous Amiga Emulator with an emulation core largely based on WinUAE"
-HOMEPAGE="http://www.rcdrummond.net/uae/"
-SRC_URI="http://www.rcdrummond.net/uae/test/${snap_ver}/${PN}-${my_ver}-${snap_ver}.tar.bz2"
-
-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 ) )"
-
-S="${WORKDIR}"/${PN}-${my_ver}-${snap_ver}
-
-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"
-
-	# 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/e-uae-0.8.29_pre20070223-r1.ebuild b/app-emulation/e-uae/e-uae-0.8.29_rc4.ebuild
index cbf21f3949d2..e5e65c756fa8 100644
--- a/app-emulation/e-uae/e-uae-0.8.29_pre20070223-r1.ebuild
+++ b/app-emulation/e-uae/e-uae-0.8.29_rc4.ebuild
@@ -1,15 +1,24 @@
 # 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_pre20070223-r1.ebuild,v 1.1 2007/02/26 07:19:26 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/e-uae/e-uae-0.8.29_rc4.ebuild,v 1.1 2007/04/09 15:19:28 pva Exp $
 
 inherit eutils flag-o-matic
 
-my_ver=${PV%%_pre*}
-snap_ver=${PV##*_pre}
-
 DESCRIPTION="The Ubiquitous Amiga Emulator with an emulation core largely based on WinUAE"
 HOMEPAGE="http://www.rcdrummond.net/uae/"
-SRC_URI="http://www.rcdrummond.net/uae/test/${snap_ver}/${PN}-${my_ver}-${snap_ver}.tar.bz2"
+# 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"
@@ -40,8 +49,6 @@ DEPEND="$RDEPEND
 		X? ( dga? ( x11-proto/xf86vidmodeproto
 					x11-proto/xf86dgaproto ) )"
 
-S="${WORKDIR}"/${PN}-${my_ver}-${snap_ver}
-
 pkg_setup() {
 	# Sound setup.
 	if use alsa; then
@@ -102,13 +109,6 @@ pkg_setup() {
 	myconf="$myconf --enable-bsdsock"
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-${my_ver}-${snap_ver}-filesys_fix.diff
-}
-
 src_compile() {
 	strip-flags
 
diff --git a/app-emulation/e-uae/files/digest-e-uae-0.8.29_pre20070223-r1 b/app-emulation/e-uae/files/digest-e-uae-0.8.29_pre20070223-r1
deleted file mode 100644
index 520cc3c61735..000000000000
--- a/app-emulation/e-uae/files/digest-e-uae-0.8.29_pre20070223-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 21738a7aa9b37f934570c33a4b147c7b e-uae-0.8.29-20070223.tar.bz2 1087783
-RMD160 540edb66a91aa954aa4cc147fa9430abaa14f880 e-uae-0.8.29-20070223.tar.bz2 1087783
-SHA256 fe915e1792eb5e4e428cb1aab9a748021fd4e88c18c21f295360d7db535938fc e-uae-0.8.29-20070223.tar.bz2 1087783
diff --git a/app-emulation/e-uae/files/digest-e-uae-0.8.29_pre20070317 b/app-emulation/e-uae/files/digest-e-uae-0.8.29_pre20070317
deleted file mode 100644
index 89766697378b..000000000000
--- a/app-emulation/e-uae/files/digest-e-uae-0.8.29_pre20070317
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5ac9d37bb6a1e9afa2ba1bd3df12badb e-uae-0.8.29-20070317.tar.bz2 1121746
-RMD160 11095be5bd1182e6dbf774e8f1a9c4fcfae57621 e-uae-0.8.29-20070317.tar.bz2 1121746
-SHA256 2c4e9bdc2d3b379653754efa9b32b98cb7c7d7581f4f866e113a058eb248f1db e-uae-0.8.29-20070317.tar.bz2 1121746
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
new file mode 100644
index 000000000000..e00c4dc480f7
--- /dev/null
+++ b/app-emulation/e-uae/files/digest-e-uae-0.8.29_rc4
@@ -0,0 +1,3 @@
+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
diff --git a/app-emulation/e-uae/files/e-uae-0.8.29-20070223-filesys_fix.diff b/app-emulation/e-uae/files/e-uae-0.8.29-20070223-filesys_fix.diff
deleted file mode 100644
index 1f6b72863534..000000000000
--- a/app-emulation/e-uae/files/e-uae-0.8.29-20070223-filesys_fix.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: src/main.c
-===================================================================
-RCS file: /cvsroot/uaedev/uae/src/main.c,v
-retrieving revision 1.51
-diff -u -r1.51 main.c
---- src/main.c	23 Feb 2007 02:07:58 -0000	1.51
-+++ src/main.c	25 Feb 2007 19:26:10 -0000
-@@ -912,9 +912,11 @@
- 
- 	    set_inhibit_frame (IHF_QUIT_PROGRAM);
- 
--	    if (uae_target_state == UAE_STATE_COLD_START || uae_target_state == UAE_STATE_WARM_START) {
--		filesys_prepare_reset ();
--	    }
-+#ifdef FILESYS
-+	    /* Ensure any cached changes to virtual filesystem are flushed before
-+	     * resetting or exitting. */
-+	    filesys_prepare_reset ();
-+#endif
- 
- 	} /* while (!QUITTING && !STOPPED) */
-