gentoo resync : 29.06.2021

4 files changed, 10 insertions, 320 deletions

diff --git a/games-misc/openmsx/Manifest b/games-misc/openmsx/Manifest
index c096c6d184a8..b8f092a03347 100644
--- a/games-misc/openmsx/Manifest
+++ b/games-misc/openmsx/Manifest
@@ -1,4 +1,3 @@
-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-r5.ebuild 751 BLAKE2B a992a6c15d59ff9bb1e6aedd18a91798f0dde93e072697a1683230a5bb13de5335965b250ad91186e8a919b5f0b58ddf7f8d143e138dd6482fb901dcaea6c9b0 SHA512 3519000571c217f1c44a0560504618cbb267d084e85fa01ad90df11167e1b4e6b97b329a26b1e576ecbaab54f4bb40e0edc451cfc6d49946529443fb85dd5a72
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
+DIST openmsx-0.4.0-source.tar.xz 114608 BLAKE2B e693b206cf350ee46b1fc5b7bf4d2a666ae7bee0fea1e2df3a29cfcfd3dbddd58d7d20d8184d6d367d377869ee5e2f970a8721cc1a1ec39babf1352a600bc759 SHA512 9a34a2f7fd9529d8b2d03f47c307a6818ecd753e8f8205c18c966d7425bf8d4a4409cd365b9d1a04d4b00d994da9e73d4270e29af3a388f48f07d3d83486e225
+EBUILD openmsx-0.4.0.ebuild 675 BLAKE2B bab91189c73256918108bb2841f654d0bf75ee5f96f303e038171155358976bda78e60ec125c64e6034a9fb58f07be9b3baac08dc16c3fbe72cbbba94f80e410 SHA512 dfe7ad4aa00de3ce2c51f49951dc1ffdab776d3c54f7b68e552d32e8dfd73380cc62b25eac2d6383008fc646373c8be74b7ae3417b5312cac99beae6d3f2c235
+MISC metadata.xml 326 BLAKE2B 01149ee6e9fe3a8535486cba4beb33d9745ed58a86a4fc16e02cefe08d7a09f234ba3a6a0e61b51e97c98a19e61cb0da0c6dc5afa43e37bdea56ab1955cf0ae5 SHA512 0940aac05ae55e167c2397cf5a70a0b052b6b2838674cdafdb810ad46f3642748c6fe4419f280653921cfb0602be645c09896da5b04ea74f6b85b7091449a2ab
diff --git a/games-misc/openmsx/files/openmsx-0.3.1-python3.patch b/games-misc/openmsx/files/openmsx-0.3.1-python3.patch
deleted file mode 100644
index df403e27a22a..000000000000
--- a/games-misc/openmsx/files/openmsx-0.3.1-python3.patch
+++ /dev/null
@@ -1,306 +0,0 @@
-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
-
-Correct tabs and spaces in scripts to make them consistent.
-Don't call deprecated methods.
-
-Upstream-Status: Submitted [https://github.com/OpenTTD/OpenMSX/pull/2]
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- scripts/authorlist.py    | 20 ++++++++---------
- scripts/md5list.py       | 48 ++++++++++++++++++++--------------------
- scripts/midifiles.py     | 30 ++++++++++++-------------
- scripts/namelist.py      | 34 ++++++++++++++--------------
- scripts/playlist.py      | 42 +++++++++++++++++------------------
- scripts/sanitize_list.py | 48 ++++++++++++++++++++--------------------
- 6 files changed, 111 insertions(+), 111 deletions(-)
-
-diff --git a/scripts/authorlist.py b/scripts/authorlist.py
-index 689ddb9..e041d64 100755
---- a/scripts/authorlist.py
-+++ b/scripts/authorlist.py
-@@ -14,14 +14,14 @@ import string
- import sys
- 
- while 1:
--    data = sys.stdin.readline()
--    if data != '':
--        # do some processing of the contents of
--        # the data variable
--        separate = string.split(data,";")
--        print '%-30s %s' % (separate[1]+":", separate[2])
--        # end of data processing command group
-+	data = sys.stdin.readline()
-+	if data != '':
-+		# do some processing of the contents of
-+		# the data variable
-+		separate = data.split(';')
-+		print('%-30s %s' % (separate[1]+":", separate[2]))
-+		# end of data processing command group
- 		#        sys.stdout.write(res)
--    else:
--        sys.stdout.flush()
--        break
-+	else:
-+		sys.stdout.flush()
-+		break
-diff --git a/scripts/md5list.py b/scripts/md5list.py
-index cf611fc..781052e 100755
---- a/scripts/md5list.py
-+++ b/scripts/md5list.py
-@@ -16,28 +16,28 @@ import subprocess
- import os
- 
- while 1:
--    data = sys.stdin.readline()
--    if data != '':
--	# leave out all comment lines (lines starting with '#')
--	comment_pos = string.find(data,'#')
--	if comment_pos == 0:
--		continue
--	# separate the single entries by ';'
--	separate = string.split(data,";")
--	if len(separate) != 4:
--		continue
--	systemtype = (os.uname())[0]
--	if systemtype == 'Linux':
--		md5call = ["md5sum"]
--	elif systemtype == 'Darwin':
--		md5call = ["md5", "-r"]
-+	data = sys.stdin.readline()
-+	if data != '':
-+		# leave out all comment lines (lines starting with '#')
-+		comment_pos = data.find('#')
-+		if comment_pos == 0:
-+			continue
-+		# separate the single entries by ';'
-+		separate = data.split(';')
-+		if len(separate) != 4:
-+			continue
-+		systemtype = (os.uname())[0]
-+		if systemtype == 'Linux':
-+			md5call = ["md5sum"]
-+		elif systemtype == 'Darwin':
-+			md5call = ["md5", "-r"]
-+		else:
-+			md5call = ["md5sum"]
-+		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].decode())
-+		sys.stdout.write(res)
- 	else:
--		md5call = ["md5sum"]
--	md5call = md5call + ["src/"+string.strip(separate[1])]
--	md5sum = subprocess.Popen(md5call, stdout=subprocess.PIPE).communicate()[0]
--	md5sum = string.split(md5sum)
--	res = "%-32s = %s\n" % (separate[1], md5sum[0])
--        sys.stdout.write(res)
--    else:
--        sys.stdout.flush()
--        break
-+		sys.stdout.flush()
-+		break
-diff --git a/scripts/midifiles.py b/scripts/midifiles.py
-index 3b5ec57..a89e4f2 100755
---- a/scripts/midifiles.py
-+++ b/scripts/midifiles.py
-@@ -15,18 +15,18 @@ import sys
- 
- res = ""
- while 1:
--    data = sys.stdin.readline()
--    if data != '':
--	# leave out all comment lines (lines starting with '#')
--	comment_pos = string.find(data,'#')
--	if comment_pos == 0:
--		continue
--	# separate the single entries by ';'
--        separate = string.split(data,";")
--	if len(separate) != 4:
--		continue
--	res = res + " src/" + string.strip(separate[1])
--    else:
--	sys.stdout.write(res)
--        sys.stdout.flush()
--        break
-+	data = sys.stdin.readline()
-+	if data != '':
-+		# leave out all comment lines (lines starting with '#')
-+		comment_pos = data.find('#')
-+		if comment_pos == 0:
-+			continue
-+		# separate the single entries by ';'
-+		separate = data.split(';')
-+		if len(separate) != 4:
-+			continue
-+		res = res + " src/" + separate[1].strip()
-+	else:
-+		sys.stdout.write(res)
-+		sys.stdout.flush()
-+		break
-diff --git a/scripts/namelist.py b/scripts/namelist.py
-index cdac127..107ad00 100755
---- a/scripts/namelist.py
-+++ b/scripts/namelist.py
-@@ -14,23 +14,23 @@ import string
- import sys
- 
- while 1:
--    data = sys.stdin.readline()
--    if data != '':
--	# leave out all comment lines (lines starting with '#')
--	comment_pos = string.find(data,'#')
--	if comment_pos == 0:
--		continue
--	# separate the single entries by ';'
--        separate = string.split(data,";")
--	if len(separate) != 4:
--		continue
--	res = "%-32s = %s\n" % (separate[1], string.strip(separate[3]))
--        sys.stdout.write(res)
--    else:
--        sys.stdout.flush()
--        break
-+	data = sys.stdin.readline()
-+	if data != '':
-+		# leave out all comment lines (lines starting with '#')
-+		comment_pos = data.find('#')
-+		if comment_pos == 0:
-+			continue
-+		# separate the single entries by ';'
-+		separate = data.split(';')
-+		if len(separate) != 4:
-+			continue
-+		res = "%-32s = %s\n" % (separate[1], separate[3].strip())
-+		sys.stdout.write(res)
-+	else:
-+		sys.stdout.flush()
-+		break
- 
- def authorlist(mystr):
--	separate = string.split()
-+	separate = separate.split()
- 	for str in separate:
--		print string.strip(str)
-\ No newline at end of file
-+		print(str.strip())
-diff --git a/scripts/playlist.py b/scripts/playlist.py
-index 939d03d..e77b02a 100755
---- a/scripts/playlist.py
-+++ b/scripts/playlist.py
-@@ -14,27 +14,27 @@ import string
- import sys
- 
- while 1:
--    data = sys.stdin.readline()
--    if data != '':
--	# leave out all comment lines (lines starting with '#')
--	comment_pos = string.find(data,'#')
--	if comment_pos == 0:
--		continue
--	# separate the single entries by ';'
--        separate = string.split(data,";")
--	res = ""
--	# leave out all lines which don't have the proper number of elements
--	if len(separate) >= 1:
--		res = string.strip(separate[0]) + " = "
--	if len(separate) == 4:
--		res = res + separate[1]
--	res = res + "\n"
--        sys.stdout.write(res)
--    else:
--        sys.stdout.flush()
--        break
-+	data = sys.stdin.readline()
-+	if data != '':
-+		# leave out all comment lines (lines starting with '#')
-+		comment_pos = data.find('#')
-+		if comment_pos == 0:
-+			continue
-+		# separate the single entries by ';'
-+		separate = data.split(';')
-+		res = ""
-+		# leave out all lines which don't have the proper number of elements
-+		if len(separate) >= 1:
-+			res = separate[0].strip() + " = "
-+		if len(separate) == 4:
-+			res = res + separate[1]
-+		res = res + "\n"
-+		sys.stdout.write(res)
-+	else:
-+		sys.stdout.flush()
-+		break
- 
- def authorlist(mystr):
--	separate = string.split()
-+	separate = separate.split()
- 	for str in separate:
--		print string.strip(str)
-\ No newline at end of file
-+		print(str.strip())
-diff --git a/scripts/sanitize_list.py b/scripts/sanitize_list.py
-index f97709a..5368831 100755
---- a/scripts/sanitize_list.py
-+++ b/scripts/sanitize_list.py
-@@ -14,30 +14,30 @@ import string
- import sys
- 
- while 1:
--    data = sys.stdin.readline()
--    if data != '':
--	# leave out all comment lines (lines starting with '#')
--	comment_pos = string.find(data,'#')
--	if comment_pos == 0:
--		continue
--	# separate the single entries by ';'
--        separate = string.split(data,";")
--	if len(separate) != 4:
--		continue
--	res = ""
--	for str in separate:
--		if res != '':
--			res = res + ";" + string.strip(str)
--		else:
--			res = string.strip(str)
--        # end of data processing command group
--	res = res + "\n"
--        sys.stdout.write(res)
--    else:
--        sys.stdout.flush()
--        break
-+	data = sys.stdin.readline()
-+	if data != '':
-+		# leave out all comment lines (lines starting with '#')
-+		comment_pos = data.find('#')
-+		if comment_pos == 0:
-+			continue
-+		# separate the single entries by ';'
-+		separate = data.split(';')
-+		if len(separate) != 4:
-+			continue
-+		res = ""
-+		for str in separate:
-+			if res != '':
-+				res = res + ";" + str.strip()
-+			else:
-+				res = str.strip()
-+		# end of data processing command group
-+		res = res + "\n"
-+		sys.stdout.write(res)
-+	else:
-+		sys.stdout.flush()
-+		break
- 
- def authorlist(mystr):
--	separate = string.split()
-+	separate = separate.split()
- 	for str in separate:
--		print string.strip(str)
-\ No newline at end of file
-+		print(str.strip())
--- 
-2.27.0
-
diff --git a/games-misc/openmsx/metadata.xml b/games-misc/openmsx/metadata.xml
index 78274e0fa550..5fa1469d6783 100644
--- a/games-misc/openmsx/metadata.xml
+++ b/games-misc/openmsx/metadata.xml
@@ -5,4 +5,7 @@
 	<email>games@gentoo.org</email>
 	<name>Gentoo Games Project</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">OpenTTD/OpenMSX</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/games-misc/openmsx/openmsx-0.3.1-r5.ebuild b/games-misc/openmsx/openmsx-0.4.0.ebuild
index 8e63fcc6ab4c..64aca69dd87e 100644
--- a/games-misc/openmsx/openmsx-0.3.1-r5.ebuild
+++ b/games-misc/openmsx/openmsx-0.4.0.ebuild
@@ -8,8 +8,8 @@ PYTHON_COMPAT=( python3_{7..9} )
 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"
+HOMEPAGE="https://wiki.openttd.org/en/Basesets/OpenMSX https://github.com/OpenTTD/OpenMSX"
+SRC_URI="https://cdn.openttd.org/openmsx-releases/${PV}/${P}-source.tar.xz"
 S="${WORKDIR}/${P}-source"
 
 LICENSE="GPL-2"
@@ -18,18 +18,12 @@ KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 
 BDEPEND="${PYTHON_DEPS}"
 
-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}"
+	insinto "/usr/share/openttd/baseset/${P}"
 	doins ${P}/{*.mid,openmsx.obm}
-	dodoc ${P}/{changelog.txt,readme.txt}
+	dodoc ${P}/{changelog,readme}.txt
 }