[gentoo-commits] repo/gentoo:master commit in: app-emulation/uae/, app-emulation/uae/files/, profiles/

[Michał Górny]

commit:     0b897d78aa2c887fbc70f3b17259119b0c853ec4
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue May 28 13:21:52 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue May 28 13:28:03 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b897d78

app-emulation/uae: Remove last-rited pkg

Closes: https://bugs.gentoo.org/432092
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 app-emulation/uae/Manifest                         |  1 -
 app-emulation/uae/files/sdlgfx.h                   | 38 ----------
 .../uae-0.8.25-allow_spaces_in_zip_filenames.diff  | 18 -----
 .../uae-0.8.25-struct_uae_wrong_fields_name.diff   | 18 -----
 .../uae/files/uae-0.8.26-uae_reset_args.diff       | 86 ----------------------
 .../uae/files/uae-0.8.26-underlinking.patch        | 19 -----
 app-emulation/uae/metadata.xml                     | 16 ----
 app-emulation/uae/uae-0.8.29-r2.ebuild             | 70 ------------------
 profiles/package.mask                              |  5 --
 9 files changed, 271 deletions(-)

diff --git a/app-emulation/uae/Manifest b/app-emulation/uae/Manifest
deleted file mode 100644
index 70007bff34c..00000000000
--- a/app-emulation/uae/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST uae-0.8.29.tar.bz2 925508 BLAKE2B 8e3c9d719ecfee863b299214837834715ab660d0ef32d99ae78125d6dc4e062d20f37b380fb2daa06019c8a6f9f176c3a2d9239dd85bc2597f253decc98192f8 SHA512 2b8f362f9ba7171cf9ce71938b0a4f22c5d90d518524d50023792f4dc9f75a1b1e17e55966926e1138801b4d9ffbc2f1ae4c4b5dfa42e98a8e6ec688adb84064

diff --git a/app-emulation/uae/files/sdlgfx.h b/app-emulation/uae/files/sdlgfx.h
deleted file mode 100644
index 30bee2ee402..00000000000
--- a/app-emulation/uae/files/sdlgfx.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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-allow_spaces_in_zip_filenames.diff b/app-emulation/uae/files/uae-0.8.25-allow_spaces_in_zip_filenames.diff
deleted file mode 100644
index 629ae702c52..00000000000
--- a/app-emulation/uae/files/uae-0.8.25-allow_spaces_in_zip_filenames.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-## 03_allow_spaces_in_zip_filenames.dpatch by Florian Ernst <florian@××××××.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Allow spaces in filenames for zipped files, bug#238678
-
-@DPATCH@
-diff -urNad uae-0.8.25~/src/zfile.c uae-0.8.25/src/zfile.c
---- uae-0.8.25~/src/zfile.c	2005-07-01 17:53:26.000000000 +0200
-+++ uae-0.8.25/src/zfile.c	2005-11-08 01:17:59.000000000 +0100
-@@ -126,7 +126,7 @@
-     if (!dst)
- 	return 1;
- #if defined AMIGA || defined __unix
--    sprintf (cmd, "unzip -p %s '*.adf' >%s", src, dst);
-+    sprintf (cmd, "unzip -p \"%s\" '*.adf' >%s", src, dst);
-     return !system (cmd);
- #endif
- }

diff --git a/app-emulation/uae/files/uae-0.8.25-struct_uae_wrong_fields_name.diff b/app-emulation/uae/files/uae-0.8.25-struct_uae_wrong_fields_name.diff
deleted file mode 100644
index cd8d7e00cd8..00000000000
--- a/app-emulation/uae/files/uae-0.8.25-struct_uae_wrong_fields_name.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Somewhere wrong (old) names are used in accessing the preferences structure.
-
-This is just a remainder for the upstream!!
-
-Antonio Ospite <ospite@××××××××××××××.it>
-
-diff -pruN uae-0.8.25/src/tui.c uae-0.8.25_patched/src/tui.c
---- uae-0.8.25/src/tui.c	2006-06-07 17:45:55.000000000 +0200
-+++ uae-0.8.25_patched/src/tui.c	2006-06-07 17:55:39.000000000 +0200
-@@ -606,7 +606,7 @@ static void SoundOptions (void)
- 		currprefs.sound_freq = atoi (tmp);
- 	    break;
- 	 case 5:
--	    currprefs.stereo = (currprefs.stereo + 1) % 3;
-+	    currprefs.sound_stereo = (currprefs.sound_stereo + 1) % 3;
- 	    break;
- 	}
-     }

diff --git a/app-emulation/uae/files/uae-0.8.26-uae_reset_args.diff b/app-emulation/uae/files/uae-0.8.26-uae_reset_args.diff
deleted file mode 100644
index 3df99e4d2a4..00000000000
--- a/app-emulation/uae/files/uae-0.8.26-uae_reset_args.diff
+++ /dev/null
@@ -1,86 +0,0 @@
-diff -Naur uae-0.8.26.orig/src/ncurses.c uae-0.8.26/src/ncurses.c
---- uae-0.8.26.orig/src/ncurses.c	2007-08-05 20:01:58.000000000 +0400
-+++ uae-0.8.26/src/ncurses.c	2007-08-12 18:36:33.000000000 +0400
-@@ -595,7 +595,7 @@
- 	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 -Naur uae-0.8.26.orig/src/NeXTwin.m uae-0.8.26/src/NeXTwin.m
---- uae-0.8.26.orig/src/NeXTwin.m	1997-10-18 17:39:04.000000000 +0400
-+++ uae-0.8.26/src/NeXTwin.m	2007-08-12 18:36:33.000000000 +0400
-@@ -86,7 +86,7 @@
- @implementation AmigaView
- -reset:sender
- 	{
--	uae_reset();
-+	uae_reset(0);
- 	//m68k_reset();
- 	return self;
- 	}
-diff -Naur uae-0.8.26.orig/src/od-beos/beos.cpp uae-0.8.26/src/od-beos/beos.cpp
---- uae-0.8.26.orig/src/od-beos/beos.cpp	2001-02-19 23:59:11.000000000 +0300
-+++ uae-0.8.26/src/od-beos/beos.cpp	2007-08-12 18:36:33.000000000 +0400
-@@ -719,7 +719,7 @@
- 	uint32 mouse_buttons;
- 
- 	if (reset_thyself) {
--		uae_reset();
-+		uae_reset(0);
- 		reset_thyself = false;
- 	}
- 
-diff -Naur uae-0.8.26.orig/src/od-win32/keyboard.c uae-0.8.26/src/od-win32/keyboard.c
---- uae-0.8.26.orig/src/od-win32/keyboard.c	2007-08-06 00:23:08.000000000 +0400
-+++ uae-0.8.26/src/od-win32/keyboard.c	2007-08-12 18:36:33.000000000 +0400
-@@ -488,8 +488,8 @@
- 	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 -Naur uae-0.8.26.orig/src/od-win32/win32gui.c uae-0.8.26/src/od-win32/win32gui.c
---- uae-0.8.26.orig/src/od-win32/win32gui.c	2007-08-06 00:23:08.000000000 +0400
-+++ uae-0.8.26/src/od-win32/win32gui.c	2007-08-12 18:36:33.000000000 +0400
-@@ -2260,7 +2260,7 @@
- 	    }
- 	    break;
- 	case IDC_RESETAMIGA:
--	    uae_reset();
-+	    uae_reset(0);
- 	    break;
- 	case IDC_QUITEMU:
- 	    uae_quit();
-diff -Naur uae-0.8.26.orig/src/svga.c uae-0.8.26/src/svga.c
---- uae-0.8.26.orig/src/svga.c	2007-08-05 20:01:58.000000000 +0400
-+++ uae-0.8.26/src/svga.c	2007-08-12 18:36:33.000000000 +0400
-@@ -438,7 +438,7 @@
- 
-     /* "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 -Naur uae-0.8.26.orig/src/tui.c uae-0.8.26/src/tui.c
---- uae-0.8.26.orig/src/tui.c	2007-08-12 18:35:41.000000000 +0400
-+++ uae-0.8.26/src/tui.c	2007-08-12 18:36:33.000000000 +0400
-@@ -683,7 +683,7 @@
- 	     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/files/uae-0.8.26-underlinking.patch b/app-emulation/uae/files/uae-0.8.26-underlinking.patch
deleted file mode 100644
index 16bf5744826..00000000000
--- a/app-emulation/uae/files/uae-0.8.26-underlinking.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- configure.in
-+++ configure.in
-@@ -81,6 +81,16 @@
- AC_CHECK_LIB(audio, alOpenPort, HAVE_SGIAUDIO_LIB=yes, HAVE_SGIAUDIO_LIB=no)
- AC_CHECK_LIB(asound, snd_pcm_open, HAVE_ALSA=yes, HAVE_ALSA=no)
- 
-+dnl Check for libm for cos()
-+AC_SEARCH_LIBS([cos], [m], [], [
-+	AC_MSG_ERROR([unable to find the cos() function])
-+])
-+
-+dnl Check for libm for floor()
-+AC_SEARCH_LIBS([floor], [m], [], [
-+	AC_MSG_ERROR([unable to find the floor() function])
-+])
-+
- AC_PATH_XTRA
- AC_CONFIG_HEADER(src/sysconfig.h)
- 

diff --git a/app-emulation/uae/metadata.xml b/app-emulation/uae/metadata.xml
deleted file mode 100644
index 86f65e79702..00000000000
--- a/app-emulation/uae/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<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. It's
-		first incarnation, the A1000, appeared in 1985, followed by the highly
-		successful A500 and A2000 models.
-	</longdescription>
-	<use>
-		<flag name="scsi">Enable the uaescsi.device</flag>
-	</use>
-</pkgmetadata>

diff --git a/app-emulation/uae/uae-0.8.29-r2.ebuild b/app-emulation/uae/uae-0.8.29-r2.ebuild
deleted file mode 100644
index 98485c01745..00000000000
--- a/app-emulation/uae/uae-0.8.29-r2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils autotools
-
-DESCRIPTION="The Umiquious Amiga Emulator"
-HOMEPAGE="http://www.amigaemulator.org/"
-SRC_URI="ftp://ftp.amigaemulator.org/pub/uae/sources/develop/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="sdl alsa scsi"
-
-DEPEND="sdl? ( media-libs/libsdl
-		   media-libs/sdl-gfx
-		   x11-libs/gtk+:2
-		   alsa? ( media-libs/alsa-lib )
-	)
-	!sdl? ( x11-libs/libXext
-		 x11-libs/gtk+:2
-	)
-	alsa? ( media-libs/alsa-lib )
-	scsi? ( app-cdr/cdrtools )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.8.25-allow_spaces_in_zip_filenames.diff
-	epatch "${FILESDIR}"/${PN}-0.8.25-struct_uae_wrong_fields_name.diff
-	epatch "${FILESDIR}"/${PN}-0.8.26-uae_reset_args.diff
-	epatch "${FILESDIR}"/${PN}-0.8.26-underlinking.patch
-
-	cp "${FILESDIR}"/sdlgfx.h "${S}"/src || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# disabling lots of options, cause many code-paths are broken, these should compile,
-	# if you want/need other options, please test if they work with other combinations
-	# before opening a bug
-	econf --enable-ui --with-x --without-svgalib \
-		--without-asciiart --without-sdl-sound --enable-threads \
-		$(use_with sdl) $(use_with sdl sdl-gfx) \
-		$(use_with alsa) \
-		$(use_enable scsi scsi-device)
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	dobin uae readdisk
-	cp docs/unix/README docs/README.unix || die
-	rm -r docs/{AmigaOS,BeOS,pOS,translated,unix} || die
-	dodoc docs/*
-
-	insinto /usr/share/uae/amiga-tools
-	doins amiga/{*hack,trans*,uae*}
-}
-
-pkg_postinst() {
-	elog
-	elog "Upstream recommends using SDL graphics (with an environment variable)"
-	elog "SDL_VIDEO_X11_XRANDR=1 for fullscreen support."
-	echo
-}

diff --git a/profiles/package.mask b/profiles/package.mask
index 2f8a3f11082..d00171a09e9 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -410,11 +410,6 @@ dev-python/python-rethinkdb
 # Removal in 30 days.  Bug #650256, #673672.
 sys-cluster/moosefs
 
-# James Le Cuirot <chewi@g.o> (20 Apr 2019)
-# Ancient and long dead upstream. Use app-emulation/fs-uae
-# instead. Removal in 30 days. Bug #432092.
-app-emulation/uae
-
 # Miroslav Šulc <fordfrog@g.o> (19 Apr 2019)
 # Depends on >=virtual/{jdk,jre}-11 which is masked
 =www-servers/tomcat-9.0.19