From 9c417bacd51da6d8b57fa9f37425161d30d4b95b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 28 Nov 2020 20:40:51 +0000 Subject: gentoo resync : 28.11.2020 --- games-util/nml/Manifest | 10 ++----- games-util/nml/files/nml-0.4.4-pillow3.patch | 11 ------- games-util/nml/files/nml-0.4.5-pillow6.patch | 31 -------------------- games-util/nml/files/nml-0.4.5-pillow7.patch | 41 --------------------------- games-util/nml/files/nml-0.4.5-python38.patch | 37 ------------------------ games-util/nml/nml-0.4.5-r3.ebuild | 41 --------------------------- games-util/nml/nml-0.5.2.ebuild | 32 --------------------- games-util/nml/nml-0.5.3.ebuild | 32 +++++++++++++++++++++ 8 files changed, 34 insertions(+), 201 deletions(-) delete mode 100644 games-util/nml/files/nml-0.4.4-pillow3.patch delete mode 100644 games-util/nml/files/nml-0.4.5-pillow6.patch delete mode 100644 games-util/nml/files/nml-0.4.5-pillow7.patch delete mode 100644 games-util/nml/files/nml-0.4.5-python38.patch delete mode 100644 games-util/nml/nml-0.4.5-r3.ebuild delete mode 100644 games-util/nml/nml-0.5.2.ebuild create mode 100644 games-util/nml/nml-0.5.3.ebuild (limited to 'games-util/nml') diff --git a/games-util/nml/Manifest b/games-util/nml/Manifest index 98a063f12a66..f2a970da564c 100644 --- a/games-util/nml/Manifest +++ b/games-util/nml/Manifest @@ -1,9 +1,3 @@ -AUX nml-0.4.4-pillow3.patch 288 BLAKE2B 5d1446821d75432002a36439c6e39fa7f644f9a63be0da178c33287893fe65637d6ce66aa55df916227636cb8e0228a08e363a0b682b02dc63823a671b50849c SHA512 cdb6113102fadbf3b3d9cab930b15cfd88d609c9bb09048a3fb247051169933a0796c10d0c29b9d6bf9320ddcf73a4681255d8e1465a7a98268029d3433ba524 -AUX nml-0.4.5-pillow6.patch 981 BLAKE2B 56e1f6ed41a6978a021db50880092fed7199d104cd006962a54fb09bcba365a320cac878041b4fe6ee6a6801a2c7e666154105a4dd2b349f030b62da9669d1fe SHA512 de304562bb2ef90b9068a1975a3cb5fd83a9b5e473371f87620fe5a02866b805adba37b46c8c1b40a7a6d304d5c8339ee78ee4a87d683c540126e5fc3ea49303 -AUX nml-0.4.5-pillow7.patch 1381 BLAKE2B 8099d451f7bf93fb5b996335852103751b024a47b5b24c054cf77708d6deea6002a053bf92aa245d63ea52bca710620598e6d6544739c0c01d64bf9c0f7938dd SHA512 7dd7a60391a4e316273243468c18d30b7b674c241e3c0fb2a24c3559b0dfbc7a2f3d67baf8b5cda9ec419a7dc1f2a1c0942cdd9d1beedebaeafef76111c4fd19 -AUX nml-0.4.5-python38.patch 1275 BLAKE2B 07fd6888dbc77fe9f0005b524381e35cd80ee108da84b6bcff3f610237e8a72e6c08e5ddc21690edbf5dde3bfeb4357ed013dfcd62cada98c6c8bdbb663c7957 SHA512 0946fa8ce28ed803a85e85f78dd2f25103500147c5fc90d23fcb4bf13bdbe4ff8742d2771cf896772c635ea38309d6e65ee49f98f7fb57f22addda9f7725881d -DIST nml-0.4.5.tar.gz 378578 BLAKE2B 1283cdcabd4cbaf12dda926b89c88a3942e9e4469879812abe372facd2c41ff20af0df792bbdadf71d9d3ad8d72e98e293fd903c880e77d3e4ee8a1b73e36ca9 SHA512 64b2f46a1c2e37fce8f51231094e30334f368b0db39c6a3977a144a798d8034d1abbe7c14af3921eb81f4b7caa193e7e53ccb9e27acd113e0407926b109ca952 -DIST nml-0.5.2.tar.gz 531460 BLAKE2B 02f4e4a190bca0e46380c9075b769ea1925f3eaf655a2f09b8367890d4b9d0494dda9246f144bb735ef27906fcf22a198530fecc5c92e77f1b72f8a73832625e SHA512 edcada26ad011533065f3096b708b343ed6af742968606d187f01298e09f945904e2eba96fc8b37d88e243e7fd4bc6efdc8be614acbec199b06778ee32b5fc3b -EBUILD nml-0.4.5-r3.ebuild 840 BLAKE2B f69aa3c9135726184e3aa5e1142c431fe13e70e3f4b86510a092f35770e597ce794710aac3d9f712eb33cd63df5820dbc90ba256d6f70d8ec51fe9a988c819fb SHA512 87801e6d5dd7a0e1986a007f00794a2e99db6b1257ab9cfabc056572b4578cf66d856e4d58672085a24f6e0c25b250a0ce859cac4e7e004e2dc4bedb3a394fa3 -EBUILD nml-0.5.2.ebuild 654 BLAKE2B 49381ca954c092faebd4331c620aef547d4479d80e88f2ba05280c39b9e1582dfd93a56ddbb2f216cd4a9267ce513827136203b5d469392928f8c9d7c01742dc SHA512 bc3b177bda53e1d0c85ac97511f7c401908af4791989ca655759c1e5946ae3d128385245ec7fa95b1a70f2bde03d116192b2d3e72656623c52129a28fc201656 +DIST nml-0.5.3.tar.gz 532842 BLAKE2B dbd775ca8b066fd60cd8fa1a377c95d337a61ba353fa527bb45f929d13b89a41c65156cff22f8ded6526444fdc74c82987da045e6355b411a30c0593a3a39edb SHA512 518be737273af6bfff23f223d07328312c4b7e070a334d4b0ecffc303aab8257ad8b26ff3b74e992db263d446fedc3e0080573b6670f0061ca78bb933c959c6a +EBUILD nml-0.5.3.ebuild 661 BLAKE2B 1b660acc2cf775857f18f8b80be1e93e002135b261f2a415ef15a59dba1d203a8eb304a6e19a338afab0df28b6ba1b0e5acc76ab67dcb6da89a888aa439c4cfd SHA512 b389b4d7687415a65736e8872767f1a15ad3978feb032edc6fe67512ab7b6de1c75087699d9f6d3645ae673ab4b536c585dba632dbcc17d1e6271bbe35948a31 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 diff --git a/games-util/nml/files/nml-0.4.4-pillow3.patch b/games-util/nml/files/nml-0.4.4-pillow3.patch deleted file mode 100644 index e55d989fbc1b..000000000000 --- a/games-util/nml/files/nml-0.4.4-pillow3.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- nml-0.4.4.orig/nml/lz77.py -+++ nml-0.4.4/nml/lz77.py -@@ -25,7 +25,7 @@ - @return: Compressed data. - @rtype: C{bytearray} - """ -- stream = data.tostring() -+ stream = data.tobytes() - position = 0 - output = array.array('B') - literal_bytes = array.array('B') diff --git a/games-util/nml/files/nml-0.4.5-pillow6.patch b/games-util/nml/files/nml-0.4.5-pillow6.patch deleted file mode 100644 index 5b04aef0d95a..000000000000 --- a/games-util/nml/files/nml-0.4.5-pillow6.patch +++ /dev/null @@ -1,31 +0,0 @@ -From fc7517a66fa6c0424d176a8a1d44659273a04a1d Mon Sep 17 00:00:00 2001 -From: Conrad Kostecki -Date: Thu, 18 Apr 2019 22:14:49 +0200 -Subject: [PATCH] Add compatibility with >=pillow-6.0.0 - -Changed VERSION to PILLOW_VERSION, -as it got removed with >=pillow-6.0.0. - -Signed-off-by: Conrad Kostecki ---- - nml/version_info.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/nml/version_info.py b/nml/version_info.py -index d7faec0..32aa3b1 100644 ---- a/nml/version_info.py -+++ b/nml/version_info.py -@@ -139,11 +139,11 @@ def get_lib_versions(): - #PIL - try: - from PIL import Image -- versions["PIL"] = Image.VERSION -+ versions["PIL"] = Image.PILLOW_VERSION - except ImportError: - try: - import Image -- versions["PIL"] = Image.VERSION -+ versions["PIL"] = Image.PILLOW_VERSION - except ImportError: - versions["PIL"] = "Not found!" - diff --git a/games-util/nml/files/nml-0.4.5-pillow7.patch b/games-util/nml/files/nml-0.4.5-pillow7.patch deleted file mode 100644 index a69e40ae3e17..000000000000 --- a/games-util/nml/files/nml-0.4.5-pillow7.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 70c0b3110509dc7da2cfa688e0717e6c966e21df Mon Sep 17 00:00:00 2001 -From: Conrad Kostecki -Date: Wed, 23 Oct 2019 12:52:15 +0200 -Subject: [PATCH] Fix #39: Add compatibility with >=pillow-7.0.0 - -Changed PILLOW_VERSION to PIL.__version__, -as it got removed with >=pillow-7.0.0. - -In order not to break compatibility with older versions, -PILLOW_VERSION will be used as a fallback. - -Closes: https://github.com/OpenTTD/nml/issues/39 -Signed-off-by: Conrad Kostecki ---- - nml/version_info.py | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/nml/version_info.py b/nml/version_info.py -index 32aa3b13..da60328e 100644 ---- a/nml/version_info.py -+++ b/nml/version_info.py -@@ -139,11 +139,17 @@ def get_lib_versions(): - #PIL - try: - from PIL import Image -- versions["PIL"] = Image.PILLOW_VERSION -+ try: -+ versions["PIL"] = Image.__version__ -+ except AttributeError: -+ versions["PIL"] = Image.PILLOW_VERSION - except ImportError: - try: - import Image -- versions["PIL"] = Image.PILLOW_VERSION -+ try: -+ versions["PIL"] = Image.__version__ -+ except AttributeError: -+ versions["PIL"] = Image.PILLOW_VERSION - except ImportError: - versions["PIL"] = "Not found!" - diff --git a/games-util/nml/files/nml-0.4.5-python38.patch b/games-util/nml/files/nml-0.4.5-python38.patch deleted file mode 100644 index 526a2e19f262..000000000000 --- a/games-util/nml/files/nml-0.4.5-python38.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 5b8764c3c4079941fab7be8d9086c38a88ae09ba Mon Sep 17 00:00:00 2001 -From: glx22 -Date: Sun, 20 Oct 2019 11:05:25 +0200 -Subject: [PATCH] Fix #52: time.clock() has been removed in python 3.8 (#53) - ---- - nml/generic.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/nml/generic.py b/nml/generic.py -index ce064b6c..8ee602f1 100644 ---- a/nml/generic.py -+++ b/nml/generic.py -@@ -295,7 +295,7 @@ def clear_progress(): - hide_progress() - - if (progress_message is not None) and (verbosity_level >= VERBOSITY_TIMING): -- print("{} {:.1f} s".format(progress_message, time.clock() - progress_start_time)) -+ print("{} {:.1f} s".format(progress_message, time.process_time() - progress_start_time)) - - progress_message = None - progress_start_time = None -@@ -324,12 +324,12 @@ def print_progress(msg, incremental = False): - progress_message = msg - - if incremental: -- t = time.clock() -+ t = time.process_time() - if (progress_update_time is not None) and (t - progress_update_time < 1): - return - progress_update_time = t - else: -- progress_start_time = time.clock() -+ progress_start_time = time.process_time() - - print_eol(msg) - diff --git a/games-util/nml/nml-0.4.5-r3.ebuild b/games-util/nml/nml-0.4.5-r3.ebuild deleted file mode 100644 index 3588cfc60e87..000000000000 --- a/games-util/nml/nml-0.4.5-r3.ebuild +++ /dev/null @@ -1,41 +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,8} ) - -inherit distutils-r1 - -DESCRIPTION="Compiler of NML files into GRF/NFO files" -HOMEPAGE="https://dev.openttdcoop.org/projects/nml" -SRC_URI="https://bundles.openttdcoop.org/nml/releases/${PV}/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" - -RDEPEND=" - dev-python/pillow[zlib,${PYTHON_USEDEP}] - dev-python/ply[${PYTHON_USEDEP}] -" - -DEPEND=" - ${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] -" - -DOCS=( docs/{changelog,readme}.txt ) - -PATCHES=( - "${FILESDIR}"/${PN}-0.4.4-pillow3.patch - "${FILESDIR}"/${PN}-0.4.5-pillow6.patch - "${FILESDIR}"/${PN}-0.4.5-pillow7.patch - "${FILESDIR}"/${PN}-0.4.5-python38.patch -) - -src_install() { - distutils-r1_src_install - - doman docs/nmlc.1 -} diff --git a/games-util/nml/nml-0.5.2.ebuild b/games-util/nml/nml-0.5.2.ebuild deleted file mode 100644 index e7fcb7a0ff99..000000000000 --- a/games-util/nml/nml-0.5.2.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_USE_SETUPTOOLS="rdepend" -PYTHON_COMPAT=( python3_{6,7,8} ) - -inherit distutils-r1 - -DESCRIPTION="Compiler of NML files into GRF/NFO files" -HOMEPAGE="https://github.com/OpenTTD/nml" -SRC_URI="https://github.com/OpenTTD/${PN}/releases/download/${PV}/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" - -RDEPEND=" - dev-python/pillow[zlib,${PYTHON_USEDEP}] - dev-python/ply[${PYTHON_USEDEP}] -" - -DEPEND="${RDEPEND}" - -DOCS=( "README.md" "docs/changelog.txt" ) - -src_install() { - distutils-r1_src_install - - doman docs/nmlc.1 -} diff --git a/games-util/nml/nml-0.5.3.ebuild b/games-util/nml/nml-0.5.3.ebuild new file mode 100644 index 000000000000..34c16e3e7b12 --- /dev/null +++ b/games-util/nml/nml-0.5.3.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DISTUTILS_USE_SETUPTOOLS="rdepend" +PYTHON_COMPAT=( python3_{6,7,8} ) + +inherit distutils-r1 + +DESCRIPTION="Compiler of NML files into GRF/NFO files" +HOMEPAGE="https://github.com/OpenTTD/nml" +SRC_URI="https://github.com/OpenTTD/${PN}/releases/download/${PV}/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" + +RDEPEND=" + dev-python/pillow[zlib,${PYTHON_USEDEP}] + dev-python/ply[${PYTHON_USEDEP}] +" + +DEPEND="${RDEPEND}" + +DOCS=( "README.md" "docs/changelog.txt" ) + +src_install() { + distutils-r1_src_install + + doman docs/nmlc.1 +} -- cgit v1.2.3