5 files changed, 46 insertions, 167 deletions

diff --git a/app-emulation/uae/ChangeLog b/app-emulation/uae/ChangeLog
index dcb3551e5391..9a83884ee866 100644
--- a/app-emulation/uae/ChangeLog
+++ b/app-emulation/uae/ChangeLog
@@ -1,103 +1,11 @@
 # ChangeLog for app-emulation/uae
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/uae/ChangeLog,v 1.26 2005/09/16 21:12:33 ciaranm Exp $
-
-  16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
-  Converted to UTF-8, fixed encoding screwups
-
-*uae-0.8.24 (09 Jul 2005)
-
-  09 Jul 2005; David Holm <dholm@gentoo.org> +uae-0.8.24.ebuild:
-  Version bumped (Bug #71937)
-
-*uae-0.8.22-r1 (22 Oct 2004)
-
-  22 Oct 2004; David Holm <dholm@gentoo.org>
-  +files/uae-0.8.22-alsa-support.diff,
-  -files/uae-0.8.27_pre20040720-ppc-asm-fix.patch, +uae-0.8.22-r1.ebuild,
-  uae-0.8.22.ebuild, -uae-0.8.25_pre20040302.ebuild,
-  -uae-0.8.27_pre20040720.ebuild:
-  Added patch from bug #62957.
-  Moved e-uae out of the uae dir.
-
-  23 Jul 2004; David Holm <dholm@gentoo.org> uae-0.8.27_pre20040720.ebuild:
-  Reverted to old bsdsocket code.
-
-  21 Jul 2004; David Holm <dholm@gentoo.org> :
-  Uploaded correct snapshot in order to fix bug #57809.
-
-*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.
-
-  24 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> uae-0.8.22.ebuild,
-  uae-0.8.23_pre20040129.ebuild, uae-0.8.25_pre20040302.ebuild:
-  don't use deprecated ?: use syntax
-
-  07 Mar 2004; David Holm <dholm@gentoo.org> uae-0.8.25_pre20040302.ebuild:
-  Replace -O3 with -O2 (again). Splitting cpuemu_6.c was not enough.
-
-  05 Mar 2004; David Holm <dholm@gentoo.org> uae-0.8.25_pre20040302.ebuild,
-  files/split_cpuemu.pl:
-  Added split script from Michal Januszewski which reduces the amount of time
-  and memory needed to compile the CPU-core.
-
-  04 Mar 2004; David Holm <dholm@gentoo.org> uae-0.8.25_pre20040302.ebuild,
-  files/install_libscg_gentoo:
-  Cleanup submitted by Jonathan Heaney.
-
-*uae-0.8.25_pre20040302 (04 Mar 2004)
-
-  04 Mar 2004; David Holm <dholm@gentoo.org> metadata.xml,
-  uae-0.8.25_pre20040302.ebuild, files/install_libscg_gentoo:
-  Version bump. Thanks goes to Jonathan Heaney for helping me with scsi support
-  and CAPS.
-
-  11 Feb 2004; David Holm <dholm@gentoo.org> uae-0.8.23_pre20040129.ebuild:
-  Added SDL configure flags as suggested by Jonathan Heaney and compilation fix
-  suggested by Lars Schünzel.
-
-*uae-0.8.23_pre20040129 (09 Feb 2004)
-
-  09 Feb 2004; David Holm <dholm@gentoo.org> uae-0.8.23_pre20040129.ebuild:
-  Added the new and much improved 0.8.23 prerelease from Richard Drummond.
-
-  28 Jan 2004; Brad House <brad_mssw@gentoo.org> uae-0.8.22.ebuild:
-  mark stable on amd64
-
-  02 Sep 2003; Michael Sterrett <msterret@gentoo.org> uae-0.8.22.ebuild:
-  use emake -j1 so I know the makefiles are buggy.
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/uae/ChangeLog,v 1.1 2002/10/09 22:45:26 rphillips Exp $
 
 *uae-0.8.22 (9 Oct 2002)
 
-  02 Sep 2003; Mike Frysinger <vapier@gentoo.org> :
-  Changed emake to make #27797.
-
-  26 Aug 2003; Michael Sterrett <msterret@gentoo.org> uae-0.8.22.ebuild:
-  tidy; add error messages
-
-  02 Nov 2002; Mark Guertin <gerk@gentoo.org> uae-0.8.22.ebuild :
-  added ~ppc to keywords
-
-  17 Oct 2002; Seemant Kulleen <seemant@gentoo.org> uae-0.8.22.ebuild :
-
-  emake->make.  Closes bug #8968 by klausman-usenet@tuts.net (Tobias
-  Klausmann)
-
-  17 Oct 2002; Daniel Ahlberg <aliz@gentoo.org> uae-0.8.22.ebuild :
-  Added IUSE.
-
-  16 Oct 2002; Mike Frysinger <vapier@gentoo.org> :
-  Changed the references to the USE variable 'svgalib' to 'svga'
-
-  09 Oct 2002; Ryan Phillips <rphillips@gentoo.org> ChangeLog :
+  9 Oct 2002; Ryan Phillips <rphillips@gentoo.org> ChangeLog :
+  
   Added initial ChangeLog which should be updated whenever the package is
   updated in any way. This changelog is targetted to users. This means that the
   comments should well explained and written in clean English. The details about
diff --git a/app-emulation/uae/Manifest b/app-emulation/uae/Manifest
index 778bf7fb886f..e69de29bb2d1 100644
--- a/app-emulation/uae/Manifest
+++ b/app-emulation/uae/Manifest
@@ -1,21 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 6feb17ff442210f38ae20e0aa5558c3b uae-0.8.22.ebuild 1293
-MD5 807e92f7fa89c3f028725141b97a8e51 uae-0.8.24.ebuild 1273
-MD5 ffdbea5c29ac3b103ff6ace56db8a770 uae-0.8.22-r1.ebuild 1399
-MD5 800d59bca6b74f54268ca8c63af928ee metadata.xml 668
-MD5 a4074dae5e75fe11b88de59b4c98e02c ChangeLog 4057
-MD5 827829b7999933c091736f210ef9903e files/uae-0.8.22-alsa-support.diff 10321
-MD5 77b204c71d52f0a0423054b5a9b8a0cb files/split_cpuemu.pl 498
-MD5 1ff2a8aad09cc3871732f041caacd162 files/digest-uae-0.8.24 62
-MD5 b2fac0f21ee34abaa6279cf7ad023119 files/digest-uae-0.8.22-r1 62
-MD5 4d3af2d2cc2945b006249066cb8c7adb files/uae-patch.diff 364
-MD5 b2fac0f21ee34abaa6279cf7ad023119 files/digest-uae-0.8.22 62
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDKzWLLLFUmVNQ7rkRAoXIAJwNU9lw2g92YG1KTSGYuafbYK7IXQCguZtE
-NzFJ0YQ5hXV6lm+5uUEtZQg=
-=1V3w
------END PGP SIGNATURE-----
diff --git a/app-emulation/uae/metadata.xml b/app-emulation/uae/metadata.xml
index def340094bb4..169e91426444 100644
--- a/app-emulation/uae/metadata.xml
+++ b/app-emulation/uae/metadata.xml
@@ -4,7 +4,6 @@
 <herd>no-herd</herd>
 <maintainer>
   <email>dholm@gentoo.org</email>
-  <name>David Holm</name>
 </maintainer>
 <longdescription>UAE is a mostly complete software emulation of the hardware of the Commodore Amiga 500/1000/2000. A Commodore Amiga is a 16/32 bit computer system based on the Motorola 680x0 CPU and a few specially designed custom chips that provide very good graphics and sound capabilities. Its first incarnation, the A1000, appeared in 1985, followed by the highly successful A500 and A2000 models.</longdescription>
 </pkgmetadata>
diff --git a/app-emulation/uae/uae-0.8.22-r1.ebuild b/app-emulation/uae/uae-0.8.22-r1.ebuild
index 1388512a9b15..6c2b0e9371a9 100644
--- a/app-emulation/uae/uae-0.8.22-r1.ebuild
+++ b/app-emulation/uae/uae-0.8.22-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.22-r1.ebuild,v 1.3 2005/01/01 14:18:27 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/uae/uae-0.8.22-r1.ebuild,v 1.1 2004/10/22 13:10:52 dholm Exp $
 
 inherit eutils
 
-DESCRIPTION="The Umiquious Amiga Emulator"
+DESCRIPTION="An amiga emulator"
 HOMEPAGE="http://www.freiburg.linux.de/~uae/"
 SRC_URI="ftp://ftp.freiburg.linux.de/pub/uae/sources/develop/${P}.tar.gz"
 
diff --git a/app-emulation/uae/uae-0.8.22.ebuild b/app-emulation/uae/uae-0.8.22.ebuild
index e83a92110abe..99ef7dec4ab3 100644
--- a/app-emulation/uae/uae-0.8.22.ebuild
+++ b/app-emulation/uae/uae-0.8.22.ebuild
@@ -1,62 +1,55 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/uae/uae-0.8.22.ebuild,v 1.18 2005/01/01 14:18:27 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/uae/uae-0.8.22.ebuild,v 1.1 2002/10/09 22:45:26 rphillips Exp $
 
-inherit eutils
-
-DESCRIPTION="The Umiquious Amiga Emulator"
+S=${WORKDIR}/${P}
+DESCRIPTION="An amiga emulator"
 HOMEPAGE="http://www.freiburg.linux.de/~uae/"
+LICENSE="GPL"
+DEPEND="X? ( virtual/x11 gtk? ( x11-libs/gtk+ ) ) : ( sys-libs/ncurses svgalib? ( media-libs/svgalib ) )
+		sdl? media-libs/libsdl"
 SRC_URI="ftp://ftp.freiburg.linux.de/pub/uae/sources/develop/${P}.tar.gz"
-
-LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc amd64"
-IUSE="X gtk svga sdl"
-
-DEPEND="virtual/libc
-	X? (
-		virtual/x11
-		gtk? ( x11-libs/gtk+ )
-	)
-	!X? (
-		sys-libs/ncurses
-		svga? ( media-libs/svgalib )
-	)
-	sdl? ( media-libs/libsdl )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/uae-patch.diff
-}
+KEYWORDS="x86"
+
 
 src_compile() {
-	local myconf=""
-
-	if use X ; then
-		myconf="--with-x --enable-dga --enable-vidmode --with-sdl --with-sdl-sound --with-sdl-gfx"
-		myconf="$myconf `use_enable gtk ui`"
-	else
-		if use svga ; then
-			myconf="--with-svgalib";
-		else
-			myconf="--with-asciiart";
-		fi
+	local myopt
+	myopt="";
+
+	if [ `use X` ];
+	   then
+	      myopt="--with-x --enable-dga --enable-vidmode\
+                     --with-sdl --with-sdl-sound --with-sdl-gfx";
+
+               use gtk && myopt="$myopt --enable-ui";
+               use gtk || myopt="$myopt --disable-ui";
+	   else
+	       if [ `use svgalib` ];
+		  then
+		     myopt="--with-svgalib";
+		  else
+		     myopt="--with-asciiart";
+		  fi
 	fi
 
-	econf \
-		--enable-threads \
-		--enable-scsi-device \
-		${myconf} || die "./configure failed"
-
-	emake -j1 || die "emake failed"
+	patch -p0 < ${FILESDIR}/uae-patch.diff
+	./configure \
+		--host=${CHOST} \
+		--prefix=/usr \
+	        --enable-threads \
+                --enable-scsi-device \
+				${myopt} || die "./configure failed"
+	
+	emake || die
 }
 
-src_install() {
-	dobin uae readdisk || die
-	cp docs/unix/README docs/README.unix
+src_install () {
+	dobin uae readdisk
+	mv docs/unix/README docs/README.unix
 	dodoc docs/*
 
 	insinto /usr/share/uae/amiga-tools
 	doins amiga/{*hack,trans*,uae*}
 }
+