* [gentoo-commits] repo/gentoo:master commit in: games-misc/openmsx/files/, games-misc/openmsx/
@ 2020-02-08 17:11 Stefan Strogin
0 siblings, 0 replies; 3+ messages in thread
From: Stefan Strogin @ 2020-02-08 17:11 UTC (permalink / raw
To: gentoo-commits
commit: 2a0a1a2b6cedd2187d09e11aaf299fc54f0d6b5d
Author: Stefan Strogin <steils <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 8 17:09:46 2020 +0000
Commit: Stefan Strogin <steils <AT> gentoo <DOT> org>
CommitDate: Sat Feb 8 17:11:29 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a0a1a2b
games-misc/openmsx: add patch for Python 3 support
Revbump; https for HOMEPAGE and SRC_URI; EAPI=7.
Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>
.../openmsx/files/openmsx-0.3.1-python3.patch | 306 +++++++++++++++++++++
games-misc/openmsx/openmsx-0.3.1-r3.ebuild | 37 +++
2 files changed, 343 insertions(+)
diff --git a/games-misc/openmsx/files/openmsx-0.3.1-python3.patch b/games-misc/openmsx/files/openmsx-0.3.1-python3.patch
new file mode 100644
index 00000000000..0e8a44a5ec3
--- /dev/null
+++ b/games-misc/openmsx/files/openmsx-0.3.1-python3.patch
@@ -0,0 +1,306 @@
+From 7b298b1bacc56392b9a19ba6b95d368309832ad7 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..a60f977 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])
++ 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.25.0
+
diff --git a/games-misc/openmsx/openmsx-0.3.1-r3.ebuild b/games-misc/openmsx/openmsx-0.3.1-r3.ebuild
new file mode 100644
index 00000000000..256776545d9
--- /dev/null
+++ b/games-misc/openmsx/openmsx-0.3.1-r3.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} )
+
+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}
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-misc/openmsx/files/, games-misc/openmsx/
@ 2020-06-08 23:04 Stefan Strogin
0 siblings, 0 replies; 3+ messages in thread
From: Stefan Strogin @ 2020-06-08 23:04 UTC (permalink / raw
To: gentoo-commits
commit: 8620817027b36a4a70349dc516c5b658e160a262
Author: Stefan Strogin <steils <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 8 22:59:47 2020 +0000
Commit: Stefan Strogin <steils <AT> gentoo <DOT> org>
CommitDate: Mon Jun 8 23:03:40 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86208170
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 <AT> gentoo.org>
games-misc/openmsx/files/openmsx-0.3.1-python3.patch | 8 ++++----
.../openmsx/{openmsx-0.3.1-r3.ebuild => openmsx-0.3.1-r4.ebuild} | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
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 0e8a44a5ec3..df403e27a22 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
similarity index 95%
rename from games-misc/openmsx/openmsx-0.3.1-r3.ebuild
rename to games-misc/openmsx/openmsx-0.3.1-r4.ebuild
index 256776545d9..9edc7a8b3e3 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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-misc/openmsx/files/, games-misc/openmsx/
@ 2021-06-28 22:13 James Le Cuirot
0 siblings, 0 replies; 3+ messages in thread
From: James Le Cuirot @ 2021-06-28 22:13 UTC (permalink / raw
To: gentoo-commits
commit: fa740e0b901f8681e40d5f8426bd383e1c116a44
Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Thu May 20 21:31:58 2021 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Jun 28 22:12:57 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa740e0b
games-misc/openmsx: remove old version
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com>
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
games-misc/openmsx/Manifest | 1 -
.../openmsx/files/openmsx-0.3.1-python3.patch | 306 ---------------------
games-misc/openmsx/openmsx-0.3.1-r5.ebuild | 35 ---
3 files changed, 342 deletions(-)
diff --git a/games-misc/openmsx/Manifest b/games-misc/openmsx/Manifest
index 249ae178c07..26ae53393b9 100644
--- a/games-misc/openmsx/Manifest
+++ b/games-misc/openmsx/Manifest
@@ -1,2 +1 @@
-DIST openmsx-0.3.1-source.tar.gz 152798 BLAKE2B 8c6d757b708bf5af9312318d13bf99b7326ed3cf82d158c4e639e04eab5c722d76976820a6a8913cef93246225578fcbd598afde11f09cdadc47d626d977d947 SHA512 e455f99f32d1daa77157def4f109dd1456169ae2b527290035b6a52f591c13fb7464fd221e00eb46bf03f51e8d0101de08a9e47cebe2430ad05a840ab235973e
DIST openmsx-0.4.0-source.tar.xz 114608 BLAKE2B e693b206cf350ee46b1fc5b7bf4d2a666ae7bee0fea1e2df3a29cfcfd3dbddd58d7d20d8184d6d367d377869ee5e2f970a8721cc1a1ec39babf1352a600bc759 SHA512 9a34a2f7fd9529d8b2d03f47c307a6818ecd753e8f8205c18c966d7425bf8d4a4409cd365b9d1a04d4b00d994da9e73d4270e29af3a388f48f07d3d83486e225
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 df403e27a22..00000000000
--- 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/openmsx-0.3.1-r5.ebuild b/games-misc/openmsx/openmsx-0.3.1-r5.ebuild
deleted file mode 100644
index f6dfaa4d358..00000000000
--- a/games-misc/openmsx/openmsx-0.3.1-r5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-S="${WORKDIR}/${P}-source"
-
-LICENSE="GPL-2"
-SLOT="0"
-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/baseset/${P}"
- doins ${P}/{*.mid,openmsx.obm}
- dodoc ${P}/{changelog.txt,readme.txt}
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-06-28 22:13 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-02-08 17:11 [gentoo-commits] repo/gentoo:master commit in: games-misc/openmsx/files/, games-misc/openmsx/ Stefan Strogin
-- strict thread matches above, loose matches on Subject: below --
2020-06-08 23:04 Stefan Strogin
2021-06-28 22:13 James Le Cuirot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox