gentoo resync : 02.08.2019

4 files changed, 24 insertions, 31 deletions

diff --git a/app-emulation/fs-uae-launcher/Manifest b/app-emulation/fs-uae-launcher/Manifest
index f07b50af4a21..5fa67b916c65 100644
--- a/app-emulation/fs-uae-launcher/Manifest
+++ b/app-emulation/fs-uae-launcher/Manifest
@@ -1,5 +1,5 @@
-AUX fs-uae-launcher-2.8.3-German-ROMs.patch 747 BLAKE2B a7235e3c55a0e6a365b252e5b856f5a609a8aa938cf114d5717c71d69fb4ac280d1a652f74c5a21088dca44473dd749a6e3955dac453dc8c38396054a90899b5 SHA512 9c757f68f0ed74540affe88af4b061009167c0207b346d77cccef1e3a7184b0cb2112eb2ca1547e04a245a9ccf156f9d55031a35d23ef56312cf283473ff8f26
 AUX fs-uae-launcher-2.8.3-QApplication.patch 457 BLAKE2B 814c7d04240bb3e90f18e0b4d1a8041b985fe6f3241e098b0d26f2d8b096ba79c33e04f0c938a3af2a12b55d080f831fbc9da404e8d62751b16021e3f229a530 SHA512 e1892b9a7f440ea373e7a7c8313d56328395fa054918cf402b9a8b5e96c15f48a3bee901aef4297774a79b5eb1d4f909ff4843da16a0f1a6f8a6343afe104162
-DIST fs-uae-launcher-2.8.3.tar.gz 8784242 BLAKE2B e54f73efde6563d9e4ab6b4f57cc73bca80d72d0ded4db67edc53dc344685889abf485df067541e8d635595ac5457ec456ded0306310b1ad95a3b3ef07e53bc3 SHA512 4eaa5979fe2e8f2c792d4878e9a9ad0a0433206aac42aa380d97aee21e4ba29a54caced2437b83357c2c4d2fab121bfb821fdb8a883ead971766866b02067a2d
-EBUILD fs-uae-launcher-2.8.3-r1.ebuild 2093 BLAKE2B 127c7f61cb14207ff917dea6f10ad8c469ab995e853d6fe81dfdbd9212612afcb34d83e87f971513c40f8813755eb8f26c510a2bdaf7c0338a9caf6af704aadc SHA512 32818439bd446f8e2d1b28b66c5c33c963fb7e542a6a4bb435807726b1023a9def2af1d9fd70f6e64fbc34f58207c950d46981ffc5184346a3495d4ec555b0e1
+AUX fs-uae-launcher-3.0.0-ROMs.patch 626 BLAKE2B 2662476f496345e6dc2f169b8c3e6e579ba68c3c7c1d9c782ce2dff39394520bde6dc1a52d9d43f562bddec9dc28daa3d0e7e1e93f1da48a0a932e1415ad40ea SHA512 8b607f64cd1c66601f7fccf5332377a85e905a6d9ba9fadb9a7234d5f36c350590011141602e093ee7a30dce4c9c6c0e9928b8b7a0be716eeaa15aeff1eacce0
+DIST fs-uae-launcher-3.0.0.tar.gz 9631352 BLAKE2B dc2f940cbde1fe9d2386e512bf5c0ca9a4ea19332826095cc5ba95e90c7f6cfaf0cd5dbaa692c192ac7d74a3ddf245062a0faeeccc9d8a135e544d304119e239 SHA512 76f9c48d2a46ece38aebb318a6d684ff40e85fef76bcc6ac57c7f397c828dae45541ba458a7792f102a8afc69a4183b9932b637318716a8b40ff3dbd3b37cad7
+EBUILD fs-uae-launcher-3.0.0.ebuild 2087 BLAKE2B 5263b455fdf32e2e0c0f3b14839a9963145355dd3de55aaa30d1e3f6cc3f4d81441e3566a9a968566611f34eaed232bac016cab57ba90837edb27bce54b4966c SHA512 02e08e7591e755eb53f98369565e813b803e30fcaf8e1eff2a99844b0172d0e92acb00ddc9ba03ded9f1b8536a22929f5ce68ae624a2b1fb6498c16aea36d96b
 MISC metadata.xml 408 BLAKE2B 8722a14caea4642a007f5baf0988f2a2463243b7a019b845ccf6c6a000aa0971fe92011e7b46a013980ef264986889d83a309914cb2465561812775c69461533 SHA512 1ff8604bcb75d5a36f10b0770d5b0983f2ce0674098d21464fc269d47784a261eec7d134b721be3fb49cdba0c01cb668a7b55046e46e67e6325b2cd70b8ffaf3
diff --git a/app-emulation/fs-uae-launcher/files/fs-uae-launcher-2.8.3-German-ROMs.patch b/app-emulation/fs-uae-launcher/files/fs-uae-launcher-2.8.3-German-ROMs.patch
deleted file mode 100644
index 41843d5230f9..000000000000
--- a/app-emulation/fs-uae-launcher/files/fs-uae-launcher-2.8.3-German-ROMs.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/fsgs/amiga/roms.py	2017-07-06 16:50:33.351036624 +0200
-+++ b/fsgs/amiga/roms.py	2017-07-06 16:52:58.335040977 +0200
-@@ -11,6 +11,8 @@
-     # Kickstart v1.3 r34.5 (1987)(Commodore)(A500-A1000-A2000-CDTV)[!]
-     # Kickstart v1.3 r34.5 (1987)(Commodore)(A500-A1000-A2000-CDTV)[o] (patch)
-     "891e9a547772fe0c6c19b610baf8bc4ea7fcb785",
-+    # kick13.rom - from Upgrade Commodore Amiga 500 (1989)
-+    "90933936cce43ca9bc6bf375662c076b27e3c458",
- ]
- 
- A500P_KICKSTARTS = [
-@@ -55,6 +57,9 @@
- 
-     # Kickstart v3.1 r40.68 (1993)(Commodore)(A4000)[h Cloanto]
-     # "c3c481160866e60d085e436a24db3617ff60b5f9",
-+
-+    # Kickstart v3.1 r40.10 (15.7.93) from german A4000
-+    "3b7f1493b27e212830f989f26ca76c02049f09ca",
- ]
- 
- CD32_KICKSTARTS = [
diff --git a/app-emulation/fs-uae-launcher/files/fs-uae-launcher-3.0.0-ROMs.patch b/app-emulation/fs-uae-launcher/files/fs-uae-launcher-3.0.0-ROMs.patch
new file mode 100644
index 000000000000..44427642253f
--- /dev/null
+++ b/app-emulation/fs-uae-launcher/files/fs-uae-launcher-3.0.0-ROMs.patch
@@ -0,0 +1,14 @@
+diff -Naur a/fsgs/amiga/roms.py b/fsgs/amiga/roms.py
+--- a/fsgs/amiga/roms.py	2019-06-21 17:49:42.000000000 +0100
++++ b/fsgs/amiga/roms.py	2019-07-21 21:42:14.135600616 +0100
+@@ -10,7 +10,9 @@
+     # amiga-os-130.rom (decrypted, patched)
+     # Kickstart v1.3 r34.5 (1987)(Commodore)(A500-A1000-A2000-CDTV)[!]
+     # Kickstart v1.3 r34.5 (1987)(Commodore)(A500-A1000-A2000-CDTV)[o] (patch)
+-    "891e9a547772fe0c6c19b610baf8bc4ea7fcb785"
++    "891e9a547772fe0c6c19b610baf8bc4ea7fcb785",
++    # kick13.rom - from Upgrade Commodore Amiga 500 (1989)
++    "90933936cce43ca9bc6bf375662c076b27e3c458",
+ ]
+ 
+ A500_1_2_KICKSTARTS = [
diff --git a/app-emulation/fs-uae-launcher/fs-uae-launcher-2.8.3-r1.ebuild b/app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.0.ebuild
index ea3355abae22..62652d3eb997 100644
--- a/app-emulation/fs-uae-launcher/fs-uae-launcher-2.8.3-r1.ebuild
+++ b/app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.0.ebuild
@@ -18,9 +18,9 @@ IUSE="lha"
 
 RDEPEND="
 	app-emulation/fs-uae
-	dev-python/pyopengl[${PYTHON_USEDEP}]
 	dev-python/PyQt5[${PYTHON_USEDEP},declarative,gui,network,opengl,widgets]
-	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/pyopengl[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
 	lha? ( dev-python/python-lhafile[${PYTHON_USEDEP}] )
 "
 
@@ -29,17 +29,17 @@ DEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${P}-German-ROMs.patch
-	"${FILESDIR}"/${P}-QApplication.patch
+	"${FILESDIR}"/${P}-ROMs.patch
+	"${FILESDIR}"/${PN}-2.8.3-QApplication.patch
 )
 
 src_prepare() {
 	default
 
-	# Unbundle some libraries. Keep oyoyo IRC library because upstream
+	# Unbundle OpenGL library. Keep oyoyo IRC library because upstream
 	# is long dead and it's not worth packaging separately.
-	rm -r {OpenGL,six}/ || die
-	sed -i -r "/OpenGL|six/d" setup.py || die
+	rm -r OpenGL || die
+	sed -i -r "/OpenGL/d" setup.py || die
 }
 
 src_compile() {