Fix missing sdlgfx.h. Adding OSS. Cleaning old.

Package-Manager: portage-2.1.3.5

10 files changed, 85 insertions, 354 deletions

diff --git a/app-emulation/uae/ChangeLog b/app-emulation/uae/ChangeLog
index 6a48e9e77658..8793a3e88d47 100644
--- a/app-emulation/uae/ChangeLog
+++ b/app-emulation/uae/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/uae
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/uae/ChangeLog,v 1.29 2007/08/12 15:15:32 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/uae/ChangeLog,v 1.30 2007/08/13 09:58:58 pva Exp $
+
+  13 Aug 2007; <pva@gentoo.org> -files/uae-0.8.25-gtk-ui-cleanup.patch,
+  -files/uae-0.8.25-uae_reset_args.diff, +files/sdlgfx.h,
+  -uae-0.8.25.ebuild, -uae-0.8.25-r1.ebuild, uae-0.8.26.ebuild:
+  Fix missing sdlgfx.h. Adding OSS. Cleaning old.
 
 *uae-0.8.26 (12 Aug 2007)
 
diff --git a/app-emulation/uae/Manifest b/app-emulation/uae/Manifest
index bbd04281887b..537fcedbe74e 100644
--- a/app-emulation/uae/Manifest
+++ b/app-emulation/uae/Manifest
@@ -1,6 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX sdlgfx.h 974 RMD160 c54d5d4d0d3007233e2e86efd19409e820fa4cae SHA1 65441e1627c9969603de7ca06c4bd3c848ba5a44 SHA256 dcbbcc57ffa9ee951963be49aa454ff6078b6e18d5bbe7b773b4bf8d37f5deea
+MD5 227e7db2dd06f41ba22239c6c95a2300 files/sdlgfx.h 974
+RMD160 c54d5d4d0d3007233e2e86efd19409e820fa4cae files/sdlgfx.h 974
+SHA256 dcbbcc57ffa9ee951963be49aa454ff6078b6e18d5bbe7b773b4bf8d37f5deea files/sdlgfx.h 974
 AUX split_cpuemu.pl 498 RMD160 90013cfcd99bdc4841e3dcf80140294b5f4be19a SHA1 a810ff551a79d272979941b7702efd9dc70d49da SHA256 90e12bb45cc2fdb481da2fa69b23083bcccad65bed772c9d983fb768e9917ee5
 MD5 77b204c71d52f0a0423054b5a9b8a0cb files/split_cpuemu.pl 498
 RMD160 90013cfcd99bdc4841e3dcf80140294b5f4be19a files/split_cpuemu.pl 498
@@ -21,10 +22,6 @@ AUX uae-0.8.25-fix_static_declatarions.diff 3280 RMD160 76c771db81c5b1e1fe063bb1
 MD5 38eea40b5546e49ffb0b3a0b8bc72376 files/uae-0.8.25-fix_static_declatarions.diff 3280
 RMD160 76c771db81c5b1e1fe063bb119d9b61a32081d31 files/uae-0.8.25-fix_static_declatarions.diff 3280
 SHA256 b08afad9ef931cd1a779ffba2691ee0205c943e06d20ee745b424c2bcc78d114 files/uae-0.8.25-fix_static_declatarions.diff 3280
-AUX uae-0.8.25-gtk-ui-cleanup.patch 1841 RMD160 9cce96abcd6529437747cb565bb46f59f2e7d85f SHA1 6ca4f8b13046359fe1de8b176d2b308ce68a04c4 SHA256 da33a715756a10b1c62fcd79f3c9a760bca72f076dc77caedce02a4779e259fd
-MD5 ed65ae19b6daeea0d95ed87192983cf7 files/uae-0.8.25-gtk-ui-cleanup.patch 1841
-RMD160 9cce96abcd6529437747cb565bb46f59f2e7d85f files/uae-0.8.25-gtk-ui-cleanup.patch 1841
-SHA256 da33a715756a10b1c62fcd79f3c9a760bca72f076dc77caedce02a4779e259fd files/uae-0.8.25-gtk-ui-cleanup.patch 1841
 AUX uae-0.8.25-makefile_more_cleaning.diff 626 RMD160 5d6f3f57bf28429abbf61c72aed2898555139ed2 SHA1 9312d8571310576c7a52f60cff45a5e6a19d6c37 SHA256 7f2577bef8a20db494a1793a883f5504c722dba36a7b0bcc638e4ccd0fbcf3f4
 MD5 fee3a5b9bda431ebf1c3781bc47902af files/uae-0.8.25-makefile_more_cleaning.diff 626
 RMD160 5d6f3f57bf28429abbf61c72aed2898555139ed2 files/uae-0.8.25-makefile_more_cleaning.diff 626
@@ -41,10 +38,6 @@ AUX uae-0.8.25-struct_uae_wrong_fields_name.diff 613 RMD160 21d0e159961c5e7b5a52
 MD5 eb2c157fe7240609563c436dc2ca5b69 files/uae-0.8.25-struct_uae_wrong_fields_name.diff 613
 RMD160 21d0e159961c5e7b5a527db59dd787fdb481171f files/uae-0.8.25-struct_uae_wrong_fields_name.diff 613
 SHA256 ac020eacef32f92b82740022c0383fb5746c6a6d205a96c2564805063ad9035a files/uae-0.8.25-struct_uae_wrong_fields_name.diff 613
-AUX uae-0.8.25-uae_reset_args.diff 4013 RMD160 39926c387602817abfc373011cd672cffb442b6e SHA1 d1becbf7f3c246504c588ac12869345dd2293330 SHA256 1946a51c6af63f8e007aa707f7038170e295e604a91cbab2a54d65e645c171e7
-MD5 e7fff375c47c05fac0b5d0e77258180a files/uae-0.8.25-uae_reset_args.diff 4013
-RMD160 39926c387602817abfc373011cd672cffb442b6e files/uae-0.8.25-uae_reset_args.diff 4013
-SHA256 1946a51c6af63f8e007aa707f7038170e295e604a91cbab2a54d65e645c171e7 files/uae-0.8.25-uae_reset_args.diff 4013
 AUX uae-0.8.26-gtk-ui-cleanup.patch 1472 RMD160 bd73022a5161c0ebe0164ac9b8d8fc78063117c3 SHA1 0b9e125cdfec3d6fb4362546fdd62371498b0ef7 SHA256 c87f354a4afe35aeec1eb02509e8f0716818fb534e9ed829f8d6613405e942a5
 MD5 2b19f07716a6829b293d9ad810a551d3 files/uae-0.8.26-gtk-ui-cleanup.patch 1472
 RMD160 bd73022a5161c0ebe0164ac9b8d8fc78063117c3 files/uae-0.8.26-gtk-ui-cleanup.patch 1472
@@ -53,41 +46,19 @@ AUX uae-0.8.26-uae_reset_args.diff 3216 RMD160 a4c87ae59a5c0e12683600d4eaf4b14ff
 MD5 f94f4f2bc52f8b00e2b1e7aecce6b09b files/uae-0.8.26-uae_reset_args.diff 3216
 RMD160 a4c87ae59a5c0e12683600d4eaf4b14ffdaae35f files/uae-0.8.26-uae_reset_args.diff 3216
 SHA256 c7223329a49a6fc4545fcc9606fc66f1b9c0e011cfad2f75a6198c146bc8d536 files/uae-0.8.26-uae_reset_args.diff 3216
-DIST uae-0.8.25.tar.gz 970727 RMD160 6990dc7aaf43c8bda0d7b86e6d0ae164209d1eb1 SHA1 41b7a70cf672d3cc516bd3856a051459a95a6517 SHA256 611a7e04dd77080d87c7e9680aed997ed2be45116eec91613eb36a85235a686a
 DIST uae-0.8.26.tar.gz 1013196 RMD160 8394b85b4ea2c74a758984e89b2793157c585da1 SHA1 3e705798f3a9089578902a853b41c991b9d4b2f7 SHA256 9da8f71f9fe1bfaf18f6ea227f31baadb89d12ba78cb7ac9ce6132f35055f868
-EBUILD uae-0.8.25-r1.ebuild 2348 RMD160 82d07f606029da78add45208c74513967c36b798 SHA1 29e5ada0810054f7429e221ea77d6c95ea553e76 SHA256 73322efcd3a0d084a48c9133729ccb075f9d7125001099dde76a21b2076a8cd7
-MD5 9c6e906e942f527f5376c98df1cfe771 uae-0.8.25-r1.ebuild 2348
-RMD160 82d07f606029da78add45208c74513967c36b798 uae-0.8.25-r1.ebuild 2348
-SHA256 73322efcd3a0d084a48c9133729ccb075f9d7125001099dde76a21b2076a8cd7 uae-0.8.25-r1.ebuild 2348
-EBUILD uae-0.8.25.ebuild 2400 RMD160 9d22869ccbecbdf4a9c1466f20d099d7da68e1ba SHA1 08d75781e3d6b15bed36295f1e74659f7eba2c5f SHA256 20521f8013530a7538b1b01c48cccb99eaecada6e86064cd79796510058b3c48
-MD5 764859e252ef9dbeb2ddf1e33617339d uae-0.8.25.ebuild 2400
-RMD160 9d22869ccbecbdf4a9c1466f20d099d7da68e1ba uae-0.8.25.ebuild 2400
-SHA256 20521f8013530a7538b1b01c48cccb99eaecada6e86064cd79796510058b3c48 uae-0.8.25.ebuild 2400
-EBUILD uae-0.8.26.ebuild 4897 RMD160 1ecf551087b024d7e3df16a92c1c901b7a5f6948 SHA1 6cfdc052290423c5733cf67f06ba766890b6de92 SHA256 c2af2e9920e81246257531a256fe18ce74a3f751ced36516e0adc5745628b3a2
-MD5 b27fef532b634942e700a1437d7a98f6 uae-0.8.26.ebuild 4897
-RMD160 1ecf551087b024d7e3df16a92c1c901b7a5f6948 uae-0.8.26.ebuild 4897
-SHA256 c2af2e9920e81246257531a256fe18ce74a3f751ced36516e0adc5745628b3a2 uae-0.8.26.ebuild 4897
-MISC ChangeLog 5374 RMD160 dc709f8e9c253a85a8a8237f5fd6aa08820e6e54 SHA1 3fba23a399abf67c0e294540e34604174957cc66 SHA256 ec13d8ae31bea790f26a5a065487758635a0c9e29cc1608b39b4fdd42e4ed943
-MD5 738c4b42ff91348dcecf55266429e03a ChangeLog 5374
-RMD160 dc709f8e9c253a85a8a8237f5fd6aa08820e6e54 ChangeLog 5374
-SHA256 ec13d8ae31bea790f26a5a065487758635a0c9e29cc1608b39b4fdd42e4ed943 ChangeLog 5374
+EBUILD uae-0.8.26.ebuild 6005 RMD160 a4090b8cb3cadebcd7bf4d41b4314c70ff21c866 SHA1 a6bdcd9d3a4263f79d76d6d59a266799dc1e61d2 SHA256 0159304ff16a37c0300c573ab53bdf14e056933782f0bac31def85c4dfbf57e8
+MD5 5cf658ac319cfe4322c37d20f42c253c uae-0.8.26.ebuild 6005
+RMD160 a4090b8cb3cadebcd7bf4d41b4314c70ff21c866 uae-0.8.26.ebuild 6005
+SHA256 0159304ff16a37c0300c573ab53bdf14e056933782f0bac31def85c4dfbf57e8 uae-0.8.26.ebuild 6005
+MISC ChangeLog 5619 RMD160 0210d602c3959e44e969f5d2bbf6127be52bcefb SHA1 13e55d039ba6eb6fd0cdb2ea36c035c6d321d9db SHA256 20bcfefbe5dab6953144680d6417b10559d2303ebaa12b2a945aa4fdea329641
+MD5 fba2991b6c6b87bbade5d06be78f0c03 ChangeLog 5619
+RMD160 0210d602c3959e44e969f5d2bbf6127be52bcefb ChangeLog 5619
+SHA256 20bcfefbe5dab6953144680d6417b10559d2303ebaa12b2a945aa4fdea329641 ChangeLog 5619
 MISC metadata.xml 668 RMD160 b7ba19a061d3ca237bfeca2709346e8cf3fe86f3 SHA1 910d7f0379c233559cb51ebca71a2fe8009689fa SHA256 afa4747772ac1eaa54ff9a14804f1b466500192c932d6849ce1a27ff2af29bcc
 MD5 800d59bca6b74f54268ca8c63af928ee metadata.xml 668
 RMD160 b7ba19a061d3ca237bfeca2709346e8cf3fe86f3 metadata.xml 668
 SHA256 afa4747772ac1eaa54ff9a14804f1b466500192c932d6849ce1a27ff2af29bcc metadata.xml 668
-MD5 a8bc45a7e84ed5c37b6181d628edbfe4 files/digest-uae-0.8.25 232
-RMD160 e19483b6ed38d300d83062a22cdd2eb8d9b432ba files/digest-uae-0.8.25 232
-SHA256 f63c9f0dbc9851c5809d8f55e5c62f14376dc0ab0a4873da6b41be8eb50cbb14 files/digest-uae-0.8.25 232
-MD5 a8bc45a7e84ed5c37b6181d628edbfe4 files/digest-uae-0.8.25-r1 232
-RMD160 e19483b6ed38d300d83062a22cdd2eb8d9b432ba files/digest-uae-0.8.25-r1 232
-SHA256 f63c9f0dbc9851c5809d8f55e5c62f14376dc0ab0a4873da6b41be8eb50cbb14 files/digest-uae-0.8.25-r1 232
 MD5 8fc08da35100e708f469e9c3147aa563 files/digest-uae-0.8.26 235
 RMD160 9a733a6e86ce3ee5ceb4c8b34fe057d400035ec3 files/digest-uae-0.8.26 235
 SHA256 3cefc5d1aa8e4128bf01a0730614cebe08304f468fd43950ddaf530bb4e2c84d files/digest-uae-0.8.26 235
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.5 (GNU/Linux)
-
-iD8DBQFGv2O+/ejvha5XGaMRAtykAKDWx5Elfw7kJ+PDsjLcDrcnrqsyAwCfX3RV
-YQtKU1GH24ANyXGF8l7n5T0=
-=Z6km
------END PGP SIGNATURE-----
diff --git a/app-emulation/uae/files/digest-uae-0.8.25 b/app-emulation/uae/files/digest-uae-0.8.25
deleted file mode 100644
index 1c1390f95d26..000000000000
--- a/app-emulation/uae/files/digest-uae-0.8.25
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e660ca2bec3c016c978ef88117b0c432 uae-0.8.25.tar.gz 970727
-RMD160 6990dc7aaf43c8bda0d7b86e6d0ae164209d1eb1 uae-0.8.25.tar.gz 970727
-SHA256 611a7e04dd77080d87c7e9680aed997ed2be45116eec91613eb36a85235a686a uae-0.8.25.tar.gz 970727
diff --git a/app-emulation/uae/files/digest-uae-0.8.25-r1 b/app-emulation/uae/files/digest-uae-0.8.25-r1
deleted file mode 100644
index 1c1390f95d26..000000000000
--- a/app-emulation/uae/files/digest-uae-0.8.25-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e660ca2bec3c016c978ef88117b0c432 uae-0.8.25.tar.gz 970727
-RMD160 6990dc7aaf43c8bda0d7b86e6d0ae164209d1eb1 uae-0.8.25.tar.gz 970727
-SHA256 611a7e04dd77080d87c7e9680aed997ed2be45116eec91613eb36a85235a686a uae-0.8.25.tar.gz 970727
diff --git a/app-emulation/uae/files/sdlgfx.h b/app-emulation/uae/files/sdlgfx.h
new file mode 100644
index 000000000000..30bee2ee4024
--- /dev/null
+++ b/app-emulation/uae/files/sdlgfx.h
@@ -0,0 +1,38 @@
+/*
+ * UAE - The Un*x Amiga Emulator
+ *
+ * SDL graphics support
+ *
+ * Copyright 2004 Richard Drummond
+ */
+
+/*
+ * What graphics platform are we running on . . .?
+ *
+ * Yes, SDL is supposed to abstract away from the underlying
+ * platform, but we need to know this to be able to map raw keys
+ * and to work around any platform-specific quirks . . .
+ */
+enum {
+    SDLGFX_DRIVER_UNKNOWN,
+    SDLGFX_DRIVER_X11,
+    SDLGFX_DRIVER_DGA,
+    SDLGFX_DRIVER_SVGALIB,
+    SDLGFX_DRIVER_FBCON,
+    SDLGFX_DRIVER_DIRECTFB,
+    SDLGFX_DRIVER_QUARTZ,
+    SDLGFX_DRIVER_BWINDOW,
+    SDLGFX_DRIVER_CYBERGFX,
+    SDLGFX_DRIVER_AMIGAOS4
+};
+
+extern int get_sdlgfx_type (void);
+
+/* keyboard support */
+struct uae_input_device_kbr_default *get_default_raw_keymap (int type);
+extern int keysym2amiga (int keycode);
+int modifier_hack (int *scancode, int *pressed);
+
+/* hotkey support */
+struct uae_hotkeyseq *get_default_cooked_hotkeys (void);
+struct uae_hotkeyseq *get_default_raw_hotkeys (void);
diff --git a/app-emulation/uae/files/uae-0.8.25-gtk-ui-cleanup.patch b/app-emulation/uae/files/uae-0.8.25-gtk-ui-cleanup.patch
deleted file mode 100644
index 2c05d4d4a511..000000000000
--- a/app-emulation/uae/files/uae-0.8.25-gtk-ui-cleanup.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- uae-0.8.25/src/gtkui.c.orig	2007-02-16 18:40:02.000000000 +0300
-+++ uae-0.8.25/src/gtkui.c	2007-02-16 18:40:06.000000000 +0300
-@@ -762,8 +762,8 @@
- 	return;
- 
-     write_comm_pipe_int (&from_gui_pipe, 0, 0);
--    write_comm_pipe_int (&from_gui_pipe, (int)data, 1);
--    gtk_label_set_text (GTK_LABEL (disk_text_widget[(int)data]), "");
-+    write_comm_pipe_int (&from_gui_pipe, GPOINTER_TO_INT(data), 1);
-+    gtk_label_set_text (GTK_LABEL (disk_text_widget[GPOINTER_TO_INT(data)]), "");
- }
- 
- static void pause_uae (void)
-@@ -851,7 +851,7 @@
- 
- static void did_insert (GtkWidget *w, gpointer data)
- {
--    int n = (int)data;
-+    int n = GPOINTER_TO_INT(data);
-     if (filesel_active != -1)
- 	return;
-     filesel_active = n;
-@@ -1131,7 +1131,7 @@
-     gdk_color_alloc (colormap, led_off + nr);
-     led_widgets[nr] = thing;
-     gtk_signal_connect (GTK_OBJECT (thing), "event",
--			(GtkSignalFunc) driveled_event, (gpointer) thing);
-+			(GtkSignalFunc) driveled_event, GINT_TO_POINTER(thing));
-     gtk_widget_show (thing);
- 
-     thing = gtk_preview_new (GTK_PREVIEW_COLOR);
-@@ -1198,13 +1198,13 @@
- 	gtk_box_pack_start (GTK_BOX (buttonbox), thing, FALSE, TRUE, 0);
- 	gtk_widget_show (thing);
- 	disk_eject_widget[i] = thing;
--	gtk_signal_connect (GTK_OBJECT (thing), "clicked", (GtkSignalFunc) did_eject, (gpointer) i);
-+	gtk_signal_connect (GTK_OBJECT (thing), "clicked", (GtkSignalFunc) did_eject, GINT_TO_POINTER(i));
- 
- 	thing = gtk_button_new_with_label ("Insert");
- 	gtk_box_pack_start (GTK_BOX (buttonbox), thing, FALSE, TRUE, 0);
- 	gtk_widget_show (thing);
- 	disk_insert_widget[i] = thing;
--	gtk_signal_connect (GTK_OBJECT (thing), "clicked", (GtkSignalFunc) did_insert, (gpointer) i);
-+	gtk_signal_connect (GTK_OBJECT (thing), "clicked", (GtkSignalFunc) did_insert, GINT_TO_POINTER(i));
-     }
- 
-     add_empty_vbox (vbox);
diff --git a/app-emulation/uae/files/uae-0.8.25-uae_reset_args.diff b/app-emulation/uae/files/uae-0.8.25-uae_reset_args.diff
deleted file mode 100644
index f9bf6e323fc9..000000000000
--- a/app-emulation/uae/files/uae-0.8.25-uae_reset_args.diff
+++ /dev/null
@@ -1,102 +0,0 @@
-uae_reset() now wants some argument!
-
-Antonio Ospite <ospite@studenti.unina.it>
-
-diff -pruN uae-0.8.25___orig/src/ncurses.c uae-0.8.25/src/ncurses.c
---- uae-0.8.25___orig/src/ncurses.c	2006-06-07 17:41:49.000000000 +0200
-+++ uae-0.8.25/src/ncurses.c	2006-06-07 17:42:33.000000000 +0200
-@@ -596,7 +596,7 @@ void handle_events(void)
- 	if (ch == 16) --lastmy; /* ^P */
- 	if (ch == 11) {buttonstate[0] = keydelay;ch = 0;} /* ^K */
- 	if (ch == 25) {buttonstate[2] = keydelay;ch = 0;} /* ^Y */
--	if (ch == 15) uae_reset (); /* ^O */
-+	if (ch == 15) uae_reset (0); /* ^O */
- 	if (ch == 17) uae_quit (); /* ^Q */
- 	if (ch == KEY_F(1)) {
- 	  curses_insert_disk();
-diff -pruN uae-0.8.25___orig/src/NeXTwin.m uae-0.8.25/src/NeXTwin.m
---- uae-0.8.25___orig/src/NeXTwin.m	2006-06-07 17:41:49.000000000 +0200
-+++ uae-0.8.25/src/NeXTwin.m	2006-06-07 17:42:15.000000000 +0200
-@@ -86,7 +86,7 @@ static int keycode2amiga(NXEvent * theEv
- @implementation AmigaView
- -reset:sender
- 	{
--	uae_reset();
-+	uae_reset(0);
- 	//m68k_reset();
- 	return self;
- 	}
-diff -pruN uae-0.8.25___orig/src/od-beos/beos.cpp uae-0.8.25/src/od-beos/beos.cpp
---- uae-0.8.25___orig/src/od-beos/beos.cpp	2006-06-07 17:41:49.000000000 +0200
-+++ uae-0.8.25/src/od-beos/beos.cpp	2006-06-07 17:43:48.000000000 +0200
-@@ -719,7 +719,7 @@ void handle_events(void)
- 	uint32 mouse_buttons;
- 
- 	if (reset_thyself) {
--		uae_reset();
-+		uae_reset(0);
- 		reset_thyself = false;
- 	}
- 
-diff -pruN uae-0.8.25___orig/src/od-win32/keyboard.c uae-0.8.25/src/od-win32/keyboard.c
---- uae-0.8.25___orig/src/od-win32/keyboard.c	2006-06-07 17:41:49.000000000 +0200
-+++ uae-0.8.25/src/od-win32/keyboard.c	2006-06-07 17:44:04.000000000 +0200
-@@ -489,8 +489,8 @@ int my_kbd_handler (int keycode, int sca
- 	record_key ((akey << 1) + 1);
- 
-     /* "Affengriff" */
--	if(  (keystate[AK_CTRL] || keystate[AK_RCTRL] ) && keystate[AK_LAMI] && keystate[AK_RAMI])uae_reset();
--    //if(  (keystate[AK_CTRL] || keystate[AK_RCTRL] ) && keystate[AK_RAMI])uae_reset();
-+	if(  (keystate[AK_CTRL] || keystate[AK_RCTRL] ) && keystate[AK_LAMI] && keystate[AK_RAMI])uae_reset(0);
-+    //if(  (keystate[AK_CTRL] || keystate[AK_RCTRL] ) && keystate[AK_RAMI])uae_reset(0);
- 
-     return 0;
- }
-diff -pruN uae-0.8.25___orig/src/od-win32/win32gui.c uae-0.8.25/src/od-win32/win32gui.c
---- uae-0.8.25___orig/src/od-win32/win32gui.c	2006-06-07 17:41:49.000000000 +0200
-+++ uae-0.8.25/src/od-win32/win32gui.c	2006-06-07 17:44:16.000000000 +0200
-@@ -2261,7 +2261,7 @@ static BOOL CALLBACK MiscDlgProc (HWND h
- 	    }
- 	    break;
- 	case IDC_RESETAMIGA:
--	    uae_reset();
-+	    uae_reset(0);
- 	    break;
- 	case IDC_QUITEMU:
- 	    uae_quit();
-diff -pruN uae-0.8.25___orig/src/sdlgfx.c uae-0.8.25/src/sdlgfx.c
---- uae-0.8.25___orig/src/sdlgfx.c	2006-06-07 17:41:49.000000000 +0200
-+++ uae-0.8.25/src/sdlgfx.c	2006-06-07 17:42:57.000000000 +0200
-@@ -875,7 +875,7 @@ void handle_events (void)
- 
-     /* Handle UAE reset */
-     if ((keystate[AK_CTRL] || keystate[AK_RCTRL]) && keystate[AK_LAMI] && keystate[AK_RAMI])
--	uae_reset ();
-+	uae_reset (0);
- }
- 
- int check_prefs_changed_gfx (void)
-diff -pruN uae-0.8.25___orig/src/svga.c uae-0.8.25/src/svga.c
---- uae-0.8.25___orig/src/svga.c	2006-06-07 17:41:49.000000000 +0200
-+++ uae-0.8.25/src/svga.c	2006-06-07 17:43:17.000000000 +0200
-@@ -439,7 +439,7 @@ static void my_kbd_handler (int scancode
- 
-     /* "Affengriff" */
-     if ((keystate[AK_CTRL] || keystate[AK_RCTRL]) && keystate[AK_LAMI] && keystate[AK_RAMI])
--	uae_reset ();
-+	uae_reset (0);
- }
- 
- static void leave_graphics_mode (void)
-diff -pruN uae-0.8.25___orig/src/tui.c uae-0.8.25/src/tui.c
---- uae-0.8.25___orig/src/tui.c	2006-06-07 17:41:49.000000000 +0200
-+++ uae-0.8.25/src/tui.c	2006-06-07 17:43:32.000000000 +0200
-@@ -684,7 +684,7 @@ static int do_gui (int mode)
- 	     case 0: DiskOptions (); break;
- 	     case 1: OtherOptions (); break;
- 	     case 2: save_settings (); break;
--	     case 3: uae_reset (); break;
-+	     case 3: uae_reset (0); break;
- 	     case 4: uae_quit (); break;
- 	    }
- 	}
diff --git a/app-emulation/uae/uae-0.8.25-r1.ebuild b/app-emulation/uae/uae-0.8.25-r1.ebuild
deleted file mode 100644
index 31b25d54d29a..000000000000
--- a/app-emulation/uae/uae-0.8.25-r1.ebuild
+++ /dev/null
@@ -1,75 +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/uae/uae-0.8.25-r1.ebuild,v 1.1 2007/02/16 15:50:01 pva Exp $
-
-inherit eutils
-
-DESCRIPTION="The Umiquious Amiga Emulator"
-HOMEPAGE="http://www.freiburg.linux.de/~uae/"
-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 dga svga ncurses alsa sdl-sound scsi gtk"
-
-DEPEND="X? ( x11-libs/libXext
-			x11-libs/libXxf86vm
-			dga? ( x11-libs/libXxf86dga ) )
-		!X? ( svga? ( media-libs/svgalib )
-			  !svga? ( sys-libs/ncurses ) )
-	alsa? ( media-libs/alsa-lib )
-	scsi? ( app-cdr/cdrtools )
-	gtk? ( x11-libs/gtk+ )"
-
-pkg_setup() {
-	if use X ; then
-		elog "Enabling X11 for video output."
-		my_config="$(use_with X x) $(use_enable X vidmode)"
-		use dga && my_config="${my_config} $(use_enable dga)"
-	elif use svga ; then
-		elog "Enabling svga for video output."
-		my_config="$(use_with svga svgalib)"
-	elif use ncurses ; then
-		elog "Enabling ncurses for video output."
-		my_config="$(use_with ncurses asciiart)"
-	else
-		ewarn "You have not enabled X or svga or ncruses in USE!"
-		ewarn "Video output is not selected. Falling back on ncurses..."
-		my_config="--with-asciiart"
-	fi
-
-	my_config="${my_config} $(use_with alsa)"
-	my_config="${my_config} $(use_enable gtk ui)"
-	my_config="${my_config} $(use_enable scsi scsi-device)"
-	my_config="${my_config} --enable-threads"
-}
-
-src_unpack() {
-	unpack ${A}
-
-	epatch "${FILESDIR}"/${P}-makefile_more_cleaning.diff
-	epatch "${FILESDIR}"/${P}-memory_leaks_in_gui.diff
-	epatch "${FILESDIR}"/${P}-allow_spaces_in_zip_filenames.diff
-	epatch "${FILESDIR}"/${P}-preserve_home_in_writing_optionsfile.diff
-	epatch "${FILESDIR}"/${P}-close_window_hack.diff
-	epatch "${FILESDIR}"/${P}-struct_uae_wrong_fields_name.diff
-	epatch "${FILESDIR}"/${P}-fix_save_config.diff
-	epatch "${FILESDIR}"/${P}-uae_reset_args.diff
-	epatch "${FILESDIR}"/${P}-fix_static_declatarions.diff
-	epatch "${FILESDIR}"/${P}-gtk-ui-cleanup.patch
-}
-
-src_compile() {
-	econf ${my_config} || die "configure failed"
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	dobin uae readdisk || die
-	cp docs/unix/README docs/README.unix
-	dodoc docs/*
-
-	insinto /usr/share/uae/amiga-tools
-	doins amiga/{*hack,trans*,uae*}
-}
diff --git a/app-emulation/uae/uae-0.8.25.ebuild b/app-emulation/uae/uae-0.8.25.ebuild
deleted file mode 100644
index 0a5045fd5ccb..000000000000
--- a/app-emulation/uae/uae-0.8.25.ebuild
+++ /dev/null
@@ -1,77 +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/uae/uae-0.8.25.ebuild,v 1.3 2007/07/12 06:39:56 mr_bones_ Exp $
-
-inherit eutils
-
-DESCRIPTION="The Umiquious Amiga Emulator"
-HOMEPAGE="http://www.freiburg.linux.de/~uae/"
-SRC_URI="ftp://ftp.freiburg.linux.de/pub/uae/sources/develop/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="sdl X dga svga ncurses alsa sdl-sound scsi gtk"
-
-DEPEND="sdl? ( media-libs/libsdl )
-	!sdl? ( X? ( x11-libs/libXext
-				 x11-libs/libXxf86vm
-				 dga? ( x11-libs/libXxf86dga ) )
-			!X? ( svga? ( media-libs/svgalib )
-				  !svga? ( ncurses? ( sys-libs/ncurses )
-				  		   !ncurses? ( media-libs/libsdl ) ) ) )
-	alsa? ( media-libs/alsa-lib )
-	!alsa? ( sdl-sound? ( media-libs/libsdl ) )
-	scsi? ( app-cdr/cdrtools )
-	gtk? ( x11-libs/gtk+ )"
-
-pkg_setup() {
-	if use sdl ; then
-		elog "Enabling sdl for video output."
-		my_config="$(use_with sdl) $(use_with sdl sdl-gfx)"
-	elif use X ; then
-		elog "Enabling X11 for video output."
-		my_config="$(use_with X x) $(use_enable X vidmode)"
-		use dga && my_config="${my_config} $(use_enable dga)"
-	elif use svga ; then
-		elog "Enabling svga for video output."
-		my_config="$(use_with svga svgalib)"
-	elif use ncurses ; then
-		elog "Enabling ncurses for video output."
-		my_config="$(use_with ncurses asciiart)"
-	else
-		ewarn "You have not enabled sdl or X or svga or ncruses in USE!"
-		ewarn "Video output is not selected. Falling back on sdl..."
-		my_config="$(use_with sdl) $(use_with sdl sdl-gfx)"
-	fi
-
-	if use alsa ; then
-		elog "Enabling alsa for sound output."
-		my_config="${my_config} $(use_with alsa)"
-	elif use sdl-sound ; then
-		elog "Enabling sdl for sound output."
-		my_config="${my_config} $(use_with sdl sdl-sound)"
-	else
-		elog "You have not enabled sdl-sound and alsa in USE!"
-		elog "Using sound output to file."
-		my_config="${my_config} --enable-file-sound"
-	fi
-
-	use gtk && my_config="${my_config} --enable-ui"
-	use scsi && my_config="${my_config} --enable-scsi-device"
-	my_config="${my_config} --enable-threads"
-}
-
-src_compile() {
-	econf ${my_config} || die "configure failed"
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	dobin uae readdisk || die
-	cp docs/unix/README docs/README.unix
-	dodoc docs/*
-
-	insinto /usr/share/uae/amiga-tools
-	doins amiga/{*hack,trans*,uae*}
-}
diff --git a/app-emulation/uae/uae-0.8.26.ebuild b/app-emulation/uae/uae-0.8.26.ebuild
index 3545acad5421..365343e13ea1 100644
--- a/app-emulation/uae/uae-0.8.26.ebuild
+++ b/app-emulation/uae/uae-0.8.26.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/uae/uae-0.8.26.ebuild,v 1.2 2007/08/12 15:36:52 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/uae/uae-0.8.26.ebuild,v 1.3 2007/08/13 09:58:58 pva Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.coresystems.de/pub/uae/sources/develop/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="sdl X dga svga aalib alsa sdl-sound scsi ui"
+IUSE="sdl X dga svga aalib oss alsa sdl-sound scsi ui"
 
 DEPEND="sdl? ( media-libs/libsdl
 			   media-libs/sdl-gfx
@@ -46,10 +46,18 @@ src_unpack() {
 	epatch "${FILESDIR}"/uae-0.8.25-preserve_home_in_writing_optionsfile.diff
 	epatch "${FILESDIR}"/uae-0.8.25-struct_uae_wrong_fields_name.diff
 	epatch "${FILESDIR}"/${P}-uae_reset_args.diff
+	cp "${FILESDIR}"/sdlgfx.h "${S}"/src
 }
 
 pkg_setup() {
 	# See configure.in for possible pathes of logic...
+	echo
+	elog "It was told by upstream developer Bernd Schmidt that sdl-sound is"
+	elog "broken now and alsa driver seems to be not in best shape. So OSS"
+	elog "(don't forget alsa emulation of OSS) is prefered, but it'll be"
+	elog "autodetected and thus it's possible that uae misses it and you'll"
+	elog "have no error but no sound too. Be carful and report this cases."
+	echo
 	if use sdl ; then
 		elog "Enabling sdl for video output."
 		my_config="$(use_with sdl) $(use_with sdl sdl-gfx)"
@@ -61,7 +69,11 @@ pkg_setup() {
 			elog "You do not have ui in USE. Disabling UI"
 			my_config="${my_config} --disable-ui"
 		fi
-		if use sdl-sound ; then
+		if use oss ; then
+			elog "Disabling alsa and sdl-sound and falling back on oss autodetection."
+			elog "You'll have to be carefull: if that fails you'll have no audio."
+			my_config="${my_config} --without-sdl-sound --without-alsa"
+		elif use sdl-sound ; then
 			elog "Enabling sdl-sound for sound output."
 			my_config="${my_config} $(use_with sdl-sound)"
 		elif use alsa ; then
@@ -124,7 +136,11 @@ pkg_setup() {
 				fi
 			fi
 		fi
-		if use alsa ; then
+		if use oss ; then
+			elog "Disabling alsa and sdl-sound and falling back on oss autodetection."
+			elog "You'll have to be carefull: if that fails you'll have no audio."
+			my_config="${my_config} --without-sdl-sound --without-alsa"
+		elif use alsa ; then
 			elog "Enabling alsa for sound output."
 			my_config="${my_config} $(use_with alsa)"
 		else
@@ -134,7 +150,7 @@ pkg_setup() {
 			my_config="${my_config} --enable-file-sound"
 		fi
 	fi
-
+	echo
 	my_config="${my_config} $(use_enable scsi scsi-device)"
 	my_config="${my_config} --enable-threads"
 }
@@ -147,8 +163,16 @@ src_compile() {
 src_install() {
 	dobin uae readdisk || die
 	cp docs/unix/README docs/README.unix
+	rm -r docs/{AmigaOS,BeOS,pOS,translated,unix}
 	dodoc docs/*
 
 	insinto /usr/share/uae/amiga-tools
 	doins amiga/{*hack,trans*,uae*}
 }
+
+pkg_postinst() {
+	elog
+	elog "Upstream recomends using SDL graphics (with an environment variable"
+	elog "SDL_VIDEO_X11_XRANDR=1 for fullscreen support."
+	echo
+}