gentoo resync : 13.06.2020

7 files changed, 16 insertions, 32 deletions

diff --git a/games-misc/Manifest.gz b/games-misc/Manifest.gz
index a25fe6c04de2..99f0196f2f0f 100644
--- a/games-misc/Manifest.gz
+++ b/games-misc/Manifest.gz
diff --git a/games-misc/openmsx/Manifest b/games-misc/openmsx/Manifest
index fac3e02934f9..a54dfaf9ccb8 100644
--- a/games-misc/openmsx/Manifest
+++ b/games-misc/openmsx/Manifest
@@ -1,5 +1,5 @@
-AUX openmsx-0.3.1-python3.patch 8650 BLAKE2B 8a26d10fcac16895ad0db10c242aee0be00dbfd3071d909af7f0bdeb1a9ff289bbd51f4861d5cb171128bb857e5ee4d62b0994724dfa1aa228c5c444522ef477 SHA512 d454d982df8f6b6e07f588c6a8b4a3e8e7053f9a8ad6906a83d25f163caf744225e56754d3871b76efd7d2e432c01badd1e3371758dcd7bf4f8ff88b61d8c0a7
+AUX openmsx-0.3.1-python3.patch 8659 BLAKE2B 9f5532b3a8c8c0c5948be64fd19d4ee1b0131fec8eccf9f5982c3d36d1649e9cee03f75a3aa0f13cc4a79ae941a3a9449645afea7457309aab64503ead8902ec SHA512 3d43210297fa52d8df3b0c893cf9b097a99cb6e4cd05921ecf299ae898d27739151946993c7c4da9076385c2eb9048585e34d9c59efc38ea2cefa567c98fef44
 DIST openmsx-0.3.1-source.tar.gz 152798 BLAKE2B 8c6d757b708bf5af9312318d13bf99b7326ed3cf82d158c4e639e04eab5c722d76976820a6a8913cef93246225578fcbd598afde11f09cdadc47d626d977d947 SHA512 e455f99f32d1daa77157def4f109dd1456169ae2b527290035b6a52f591c13fb7464fd221e00eb46bf03f51e8d0101de08a9e47cebe2430ad05a840ab235973e
 EBUILD openmsx-0.3.1-r2.ebuild 702 BLAKE2B 464524bf487c6a872ed156d2275088160279c7ec874b2a968c240485ac67270f454d983e652d43aafd942cfde1be67e93090fbe33d72221230dcb2dd4e901c0f SHA512 86565b559cb611d4b6d1fa235e3f7d5fb6327d242a8de44cda7b3d4f1246e2393d4c7026a49831fb9266ba09c4d7f1bdbf72215b8c7d7cdaacf971b7c346774e
-EBUILD openmsx-0.3.1-r3.ebuild 756 BLAKE2B 7e9aa4fd5390dc133a79af2d87e9965cd42b9567f5cba1cfb1860365ae6ed55fd65e274c4a9ddef2a31b6426af9069e76f7324c99dc4c70c91dbfb874e31bd29 SHA512 a564c7c35e634210f21a4b5f85ba89f607077ecfac065e3b1beb8d3cf721aaf0d87c6f13e41c0b470e1b4dccef59da8d7202304c32b759dfc35e64363397a5c0
+EBUILD openmsx-0.3.1-r4.ebuild 758 BLAKE2B a9ca7e6328145ed0c14c4a45430cba828e28ebd05218b1cf6aea1347d85606281975d65506dff7556c1aeb74f30d755b3c4a9aab5a63f006c9e8df9ed35576a4 SHA512 e2e270c310b2760cda33797cbe8468d7f518586dd0d943460757f2622af35d2629d2d1465dc5c219dea5da8f85dcefe08a8eb27be434abc729d91774a12f00ee
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/openmsx/files/openmsx-0.3.1-python3.patch b/games-misc/openmsx/files/openmsx-0.3.1-python3.patch
index 0e8a44a5ec3d..df403e27a22a 100644
--- a/games-misc/openmsx/files/openmsx-0.3.1-python3.patch
+++ b/games-misc/openmsx/files/openmsx-0.3.1-python3.patch
@@ -1,4 +1,4 @@
-From 7b298b1bacc56392b9a19ba6b95d368309832ad7 Mon Sep 17 00:00:00 2001
+From 5857a22e79dc77c9b571297451dc11c4a68bc198 Mon Sep 17 00:00:00 2001
 From: Stefan Strogin <steils@gentoo.org>
 Date: Fri, 7 Feb 2020 13:15:16 +0200
 Subject: [PATCH] Fix: support Python 3
@@ -47,7 +47,7 @@ index 689ddb9..e041d64 100755
 +		sys.stdout.flush()
 +		break
 diff --git a/scripts/md5list.py b/scripts/md5list.py
-index cf611fc..a60f977 100755
+index cf611fc..781052e 100755
 --- a/scripts/md5list.py
 +++ b/scripts/md5list.py
 @@ -16,28 +16,28 @@ import subprocess
@@ -89,7 +89,7 @@ index cf611fc..a60f977 100755
 +		md5call = md5call + ["src/"+separate[1].strip()]
 +		md5sum = subprocess.Popen(md5call, stdout=subprocess.PIPE).communicate()[0]
 +		md5sum = md5sum.split()
-+		res = "%-32s = %s\n" % (separate[1], md5sum[0])
++		res = "%-32s = %s\n" % (separate[1], md5sum[0].decode())
 +		sys.stdout.write(res)
  	else:
 -		md5call = ["md5sum"]
@@ -302,5 +302,5 @@ index f97709a..5368831 100755
 \ No newline at end of file
 +		print(str.strip())
 -- 
-2.25.0
+2.27.0
 
diff --git a/games-misc/openmsx/openmsx-0.3.1-r3.ebuild b/games-misc/openmsx/openmsx-0.3.1-r4.ebuild
index 256776545d93..9edc7a8b3e3d 100644
--- a/games-misc/openmsx/openmsx-0.3.1-r3.ebuild
+++ b/games-misc/openmsx/openmsx-0.3.1-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit python-any-r1
 
diff --git a/games-misc/wtf/Manifest b/games-misc/wtf/Manifest
index 4d97fd9c0f0e..400f88077e13 100644
--- a/games-misc/wtf/Manifest
+++ b/games-misc/wtf/Manifest
@@ -1,4 +1,3 @@
-AUX wtf-20090924-prefix.patch 351 BLAKE2B c5b9ef4f6c9e3ff7f0d6ee83e55b1fa58638a5c0c50cf87f20838defe7f023d6206cfa4c23e1d0991a6b0082855906a2864e254113cd789e539dbd692b8222a3 SHA512 ff8eb5bd961c0498f0371d6ba850d1d407a0e9779469838a5982bce843d40d08bd7a97b50ce013054928198da7c9fa395d9472b4c995e9454c93bced8d953a25
-DIST wtf-20090924.tar.bz2 9888 BLAKE2B 67cd7c7b4af61d576373faa242e8718fe9a8286b3aaf9a9eaf45ac83a8a322257ccb694222a2d8b1052cf709ecd6bfc73c6a4dcb9e96985601e933ebe80c5f1c SHA512 85a7b5b7add12f775272851095f86efa2962875aa9008aec5079d3aec31a74a2d475d5c904013134b4045872fb8e301e95f3c5fa25ab8872a7d31012653bddb0
-EBUILD wtf-20090924.ebuild 750 BLAKE2B 871814d5248cc1a759b5add5cf9cb7f7d8adff44466d1b20bf001ae455a9b731cd0740e3b3483f97541e106f559d07b4b1e0b555e5efc1b128239dbe93ee1700 SHA512 19b85997e1c37845e3e65b6007d8a3b47411ed88469178fb32d8f62e9103e93d75bcae86e29e6d520418b6934fcb3cc459aed0202cd2657c9dd259bf7a77796c
+DIST wtf-20200518.tar.gz 30204 BLAKE2B 6e05561e78c8c6644d8891a72f064f5e18c4e546f8c22dbcf04a3a8e805ef3756cb9332ecc8e6b35b569008f203ddc0e156f216b53ff585dbe4946d0a059958a SHA512 8538021b09c6863cec63faa14df3e1b1e9019c7741f13ed3adf243c36cf9c57fcf973d619c9152560d061ab293a2b333a59739c38d351387a2a0bf2093c40a94
+EBUILD wtf-20200518.ebuild 664 BLAKE2B b9bc3c3c87b53be29a9b11cee31fe9932f6e143e3a133db6ff715a45880089753139f0df271897bf52eee398c3fb0a6fdac2fe0c4c44243e5f74621b76c23708 SHA512 6792322ac6b4c200b2dce91e2a6fa82df8b595f174cdfc4f180132688e7d886a21f63905955d642fa58898e447a7c53f4f379c7379a7cbcb6ad9108f72b8c1d4
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/wtf/files/wtf-20090924-prefix.patch b/games-misc/wtf/files/wtf-20090924-prefix.patch
deleted file mode 100644
index 87dc6436e086..000000000000
--- a/games-misc/wtf/files/wtf-20090924-prefix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- wtf.orig	2009-09-27 10:46:12 +0200
-+++ wtf	2009-09-27 10:46:57 +0200
-@@ -12,7 +12,7 @@
- 	exit 1
- }
- 
--acronyms=${ACRONYMDB:-`ls /usr/share/misc/acronyms* 2>/dev/null`}
-+acronyms=${ACRONYMDB:-`ls "@GENTOO_PORTAGE_EPREFIX@"/usr/share/misc/acronyms* 2>/dev/null`}
- 
- if [ "$acronyms" = "" ]; then
- 	echo "$PROGNAME: acronyms database not found!" >&2
diff --git a/games-misc/wtf/wtf-20090924.ebuild b/games-misc/wtf/wtf-20200518.ebuild
index 1e6e7942b7d8..4c1d931f0513 100644
--- a/games-misc/wtf/wtf-20090924.ebuild
+++ b/games-misc/wtf/wtf-20200518.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils prefix
+EAPI=7
 
-DESCRIPTION="translates acronyms for you"
+inherit prefix
+
+DESCRIPTION="Translates acronyms for you"
 HOMEPAGE="http://netbsd.org/"
-SRC_URI="http://dev.gentooexperimental.org/~darkside/distfiles/${PN}/${P}.tar.bz2"
+SRC_URI="https://sourceforge.net/projects/bsd${PN}/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
@@ -17,12 +18,8 @@ DEPEND="!games-misc/bsd-games"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-prefix.patch
-	eprefixify wtf
-}
-
-src_compile() {
-	:
+	default
+	hprefixify wtf
 }
 
 src_install() {
@@ -30,5 +27,4 @@ src_install() {
 	doman wtf.6
 	insinto /usr/share/misc
 	doins acronyms*
-	dodoc README
 }