From 8620817027b36a4a70349dc516c5b658e160a262 Mon Sep 17 00:00:00 2001
From: Stefan Strogin <steils@gentoo.org>
Date: Tue, 9 Jun 2020 01:59:47 +0300
Subject: games-misc/openmsx: fix Python 3 patch; add python3_8

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Stefan Strogin <steils@gentoo.org>
---
 .../openmsx/files/openmsx-0.3.1-python3.patch      |  8 ++---
 games-misc/openmsx/openmsx-0.3.1-r3.ebuild         | 37 ----------------------
 games-misc/openmsx/openmsx-0.3.1-r4.ebuild         | 37 ++++++++++++++++++++++
 3 files changed, 41 insertions(+), 41 deletions(-)
 delete mode 100644 games-misc/openmsx/openmsx-0.3.1-r3.ebuild
 create mode 100644 games-misc/openmsx/openmsx-0.3.1-r4.ebuild

(limited to 'games-misc')

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-r3.ebuild
deleted file mode 100644
index 256776545d93..000000000000
--- a/games-misc/openmsx/openmsx-0.3.1-r3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit python-any-r1
-
-DESCRIPTION="Open source music base set for OpenTTD"
-HOMEPAGE="https://wiki.openttd.org/OpenMSX https://github.com/OpenTTD/OpenMSX"
-SRC_URI="https://cdn.openttd.org/openmsx-releases/${PV}/${P}-source.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="${PYTHON_DEPS}"
-
-S=${WORKDIR}/${P}-source
-
-PATCHES=( "${FILESDIR}"/${P}-python3.patch )
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_compile() {
-	emake _V= bundle
-}
-
-src_install() {
-	insinto "/usr/share/games/openttd/gm/${P}"
-	doins ${P}/{*.mid,openmsx.obm}
-	dodoc ${P}/{changelog.txt,readme.txt}
-}
diff --git a/games-misc/openmsx/openmsx-0.3.1-r4.ebuild b/games-misc/openmsx/openmsx-0.3.1-r4.ebuild
new file mode 100644
index 000000000000..9edc7a8b3e3d
--- /dev/null
+++ b/games-misc/openmsx/openmsx-0.3.1-r4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit python-any-r1
+
+DESCRIPTION="Open source music base set for OpenTTD"
+HOMEPAGE="https://wiki.openttd.org/OpenMSX https://github.com/OpenTTD/OpenMSX"
+SRC_URI="https://cdn.openttd.org/openmsx-releases/${PV}/${P}-source.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}"
+
+S=${WORKDIR}/${P}-source
+
+PATCHES=( "${FILESDIR}"/${P}-python3.patch )
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_compile() {
+	emake _V= bundle
+}
+
+src_install() {
+	insinto "/usr/share/games/openttd/gm/${P}"
+	doins ${P}/{*.mid,openmsx.obm}
+	dodoc ${P}/{changelog.txt,readme.txt}
+}
-- 
cgit v1.2.3-18-g5258