Version bump

7 files changed, 140 insertions, 59 deletions

diff --git a/app-emulation/uae/ChangeLog b/app-emulation/uae/ChangeLog
index 2c0ce0f038b1..ddcc12fe1eb2 100644
--- a/app-emulation/uae/ChangeLog
+++ b/app-emulation/uae/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/uae
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/uae/ChangeLog,v 1.19 2004/07/16 13:23:16 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/uae/ChangeLog,v 1.20 2004/07/20 15:10:29 dholm Exp $
+
+*uae-0.8.27_pre20040720 (20 Jul 2004)
+
+  20 Jul 2004; David Holm <dholm@gentoo.org>
+  +files/uae-0.8.27_pre20040720-ppc-asm-fix.patch,
+  -uae-0.8.23_pre20040129.ebuild, +uae-0.8.27_pre20040720.ebuild:
+  Version bumped using CVS snapshot.
+  Removed version 0.8.23 from portage.
 
   16 Jul 2004; David Holm <dholm@gentoo.org> uae-0.8.25_pre20040302.ebuild:
   Strip -msse and -msse2 as they break compilation on x86.
diff --git a/app-emulation/uae/Manifest b/app-emulation/uae/Manifest
index fa4bf1711204..58b6c9d43af8 100644
--- a/app-emulation/uae/Manifest
+++ b/app-emulation/uae/Manifest
@@ -1,10 +1,11 @@
-MD5 64fce9607488a5f2f6d77b08c7524143 ChangeLog 2987
+MD5 e692650a82b32ba395190b656399a0bb ChangeLog 3265
 MD5 800d59bca6b74f54268ca8c63af928ee metadata.xml 668
 MD5 af8db5e7e94c29b370ea7f832f4506c4 uae-0.8.22.ebuild 1279
-MD5 e3a6a31c581dbf492fdaa613502a6c51 uae-0.8.23_pre20040129.ebuild 1395
 MD5 29d8dc818001e2f0ce15c9effdc2b36b uae-0.8.25_pre20040302.ebuild 1819
+MD5 ca57570bdffa34194ebb2dbad0a513ac uae-0.8.27_pre20040720.ebuild 2132
 MD5 b2fac0f21ee34abaa6279cf7ad023119 files/digest-uae-0.8.22 62
-MD5 24ce02be9243fef32739ff76bd9ba84c files/digest-uae-0.8.23_pre20040129 73
 MD5 02f734719ea8dc27787fb6be6ddcc11e files/digest-uae-0.8.25_pre20040302 73
 MD5 77b204c71d52f0a0423054b5a9b8a0cb files/split_cpuemu.pl 498
 MD5 4d3af2d2cc2945b006249066cb8c7adb files/uae-patch.diff 364
+MD5 892f9c2140ccb66fdb1b3900cbc4de9f files/uae-0.8.27_pre20040720-ppc-asm-fix.patch 1232
+MD5 472e04bb20f08bf835a95b0cc1ae763e files/digest-uae-0.8.27_pre20040720 72
diff --git a/app-emulation/uae/files/digest-uae-0.8.23_pre20040129 b/app-emulation/uae/files/digest-uae-0.8.23_pre20040129
deleted file mode 100644
index 6b78ef362a96..000000000000
--- a/app-emulation/uae/files/digest-uae-0.8.23_pre20040129
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d22f5a26b7b6f641266464604ed3be9a uae-0.8.23-20040129.tar.bz2 1054558
diff --git a/app-emulation/uae/files/digest-uae-0.8.27_pre20040720 b/app-emulation/uae/files/digest-uae-0.8.27_pre20040720
new file mode 100644
index 000000000000..0a7551855a94
--- /dev/null
+++ b/app-emulation/uae/files/digest-uae-0.8.27_pre20040720
@@ -0,0 +1 @@
+MD5 a9c8e7a9b8652c81857c652a2ab656bc uae-0.8.27-20040720.tar.bz2 916925
diff --git a/app-emulation/uae/files/uae-0.8.27_pre20040720-ppc-asm-fix.patch b/app-emulation/uae/files/uae-0.8.27_pre20040720-ppc-asm-fix.patch
new file mode 100644
index 000000000000..64070bac02bf
--- /dev/null
+++ b/app-emulation/uae/files/uae-0.8.27_pre20040720-ppc-asm-fix.patch
@@ -0,0 +1,45 @@
+--- src/md-ppc-gcc/exectasks.h.orig	2004-07-20 14:33:36.961632176 +0200
++++ src/md-ppc-gcc/exectasks.h	2004-07-20 14:33:42.011864424 +0200
+@@ -28,10 +28,10 @@
+ 
+     __asm__ __volatile__ ("\
+ 	mtctr %0     \n\
+-	mr    r1,%1   \n\
+-	mr    r3,%2   \n\
+-	mr    r4,%3   \n\
+-	mr    r5,%4   \n\
++	mr    1,%1   \n\
++	mr    3,%2   \n\
++	mr    4,%3   \n\
++	mr    5,%4   \n\
+ 	bctr"
+ 	:
+ 	: "r" (pc),
+--- src/picasso96.c.orig	2004-07-20 14:34:42.122726184 +0200
++++ src/picasso96.c	2004-07-20 14:35:03.834425504 +0200
+@@ -126,19 +126,19 @@
+         asm volatile (
+ 	    "addi    %2, %2, -1		\n\
+ 	     mtctr   %2			\n\
+-	     lwz     r0, 0(%1)   	\n\
+-	1:   stwbrx  r0, 0, %0   	\n\
++	     lwz     0, 0(%1)   	\n\
++	1:   stwbrx  0, 0, %0   	\n\
+ 	     addi    %0, %0, 4  	\n\
+-	     lwzu    r0, 4(%1)   	\n\
++	     lwzu    0, 4(%1)   	\n\
+ 	     bdnz    1b         	\n\
+-	     stwbrx  r0, 0, %0"
++	     stwbrx  0, 0, %0"
+ 	: "+r" (dst), "+r" (src), "+r" (words)
+ 	: //"r" (dst), "r" (src), "r" (words)
+ 	:  "r0", "memory");
+    } else {
+ 	__asm volatile (
+-	    "lwz     r0, 0(%1)		\n\
+-	     stwbrx  r0, 0, %0"
++	    "lwz     0, 0(%1)		\n\
++	     stwbrx  0, 0, %0"
+ 	: "+r" (dst), "+r" (src)
+ 	: //"r" (dst), "r" (src)
+ 	: "r0", "memory");
diff --git a/app-emulation/uae/uae-0.8.23_pre20040129.ebuild b/app-emulation/uae/uae-0.8.23_pre20040129.ebuild
deleted file mode 100644
index 64889d94ac22..000000000000
--- a/app-emulation/uae/uae-0.8.23_pre20040129.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/uae/uae-0.8.23_pre20040129.ebuild,v 1.6 2004/06/27 23:07:53 vapier Exp $
-
-inherit flag-o-matic
-
-MY_PV="0.8.23-20040129"
-S="${WORKDIR}/${PN}-${MY_PV}"
-DESCRIPTION="The Umiquious Amiga Emulator"
-HOMEPAGE="http://www.rcdrummond.net/uae/"
-SRC_URI="http://www.rcdrummond.net/uae/uae-${MY_PV}/uae-${MY_PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="X gtk sdl ncurses svga"
-
-DEPEND="virtual/libc
-	X? (
-		virtual/x11
-		gtk? ( x11-libs/gtk+ )
-	)
-	!X? (
-		ncurses? ( sys-libs/ncurses )
-		svga? ( media-libs/svgalib )
-	)
-	sdl? ( media-libs/libsdl )"
-
-src_compile() {
-	ewarn "Compiling the CPU-core requires a substantial amount of RAM."
-	ewarn "Make sure that you have at least 512MB of RAM+SWAP available."
-
-	replace-flags "-O3" "-O2"
-	use sdl && myconf="--with-sdl-sound --with-sdl-gfx"
-
-	econf ${myconf} \
-		--enable-threads \
-		--enable-scsi-device \
-		|| die "./configure failed"
-
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	cp docs/unix/README docs/README.unix
-	dodoc docs/COMPATIBILITY docs/CREDITS docs/FAQ docs/NEWS \
-		docs/README docs/README.PROGRAMMERS docs/README.unix \
-		docs/translated/*
-
-	emake install DESTDIR=${D}
-
-	insinto /usr/share/uae/amiga-tools
-	doins amiga/{*hack,trans*,uae*,*.library}
-}
diff --git a/app-emulation/uae/uae-0.8.27_pre20040720.ebuild b/app-emulation/uae/uae-0.8.27_pre20040720.ebuild
new file mode 100644
index 000000000000..b52f60563574
--- /dev/null
+++ b/app-emulation/uae/uae-0.8.27_pre20040720.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/uae/uae-0.8.27_pre20040720.ebuild,v 1.1 2004/07/20 15:10:29 dholm Exp $
+
+inherit eutils
+inherit flag-o-matic
+
+MY_PV="0.8.27-20040720"
+S="${WORKDIR}/${PN}-${MY_PV}"
+DESCRIPTION="The Umiquious Amiga Emulator"
+HOMEPAGE="http://www.rcdrummond.net/uae/"
+SRC_URI="http://www.rcdrummond.net/uae/uae-${MY_PV}/uae-${MY_PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE="X gtk sdl ncurses svga"
+
+DEPEND="virtual/libc
+	X? (
+		virtual/x11
+		gtk? ( >=x11-libs/gtk+-2.0.0 )
+	)
+	!X? (
+		ncurses? ( sys-libs/ncurses )
+		svga? ( media-libs/svgalib )
+	)
+	sdl? ( media-libs/libsdl )
+	app-cdr/cdrtools
+	games-emulation/caps"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-ppc-asm-fix.patch
+}
+
+src_compile() {
+	# -O3 breaks compilation, GCC will eat all your RAM + Swap and die
+	replace-flags "-O3" "-O2"
+	use x86 && strip-flags "-msse" "-msse2"
+	use ppc && strip-flags "-maltivec" "-mabi=altivec"
+	use sdl && myconf="--with-sdl-sound --with-sdl-gfx"
+
+	cp ${FILESDIR}/split_cpuemu.pl ${S}/src
+	chmod +x ${S}/src/split_cpuemu.pl
+
+	export WANT_AUTOMAKE=1.7
+	export WANT_AUTOCONF=2.5
+	./bootstrap.sh || die "bootstrap failed"
+	econf ${myconf} \
+		--enable-threads \
+		--enable-cdtv \
+		--enable-cd32 \
+		--enable-scsi-device \
+		--enable-bsdsock-new \
+		--with-libscg-includedir=/usr/include/scsilib \
+		|| die "./configure failed"
+
+	cd ${S}/src
+
+	sed -ir 's#cpuemu_6.\([a-z]*\)#cpuemu_6.\1 cpuemu_7.\1#g' Makefile
+	sed -ir 's#cpuemu_nf_6.\([a-z]*\)#cpuemu_nf_6.\1 cpuemu_nf_7.\1#g' Makefile
+	sed -ir 's#\(./tools/build68k <../src/table68k >cpudefs.c\)#\1\n	./split_cpuemu.pl; mv cpuemu_6.t cpuemu_6.c#' Makefile
+
+	cd ${S}
+
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	cp docs/unix/README docs/README.unix
+	dodoc docs/COMPATIBILITY docs/CREDITS docs/FAQ docs/NEWS \
+		docs/README docs/README.PROGRAMMERS docs/README.unix \
+		docs/translated/*
+
+	emake install DESTDIR=${D}
+
+	insinto /usr/share/uae/amiga-tools
+	doins amiga/{*hack,trans*,uae*,*.library}
+}