diff options
author | Conrad Kostecki <conikost@gentoo.org> | 2020-11-26 21:03:44 +0100 |
---|---|---|
committer | Conrad Kostecki <conikost@gentoo.org> | 2020-11-26 22:16:47 +0100 |
commit | 78febd1302d1fb8d6d71f409ba20d96c2b5678f3 (patch) | |
tree | 6677b11662a835709c9c5f83064e0885867f041d /games-util | |
parent | games-util/nml: bump to version 0.5.3 (diff) | |
download | gentoo-78febd1302d1fb8d6d71f409ba20d96c2b5678f3.tar.gz gentoo-78febd1302d1fb8d6d71f409ba20d96c2b5678f3.tar.bz2 gentoo-78febd1302d1fb8d6d71f409ba20d96c2b5678f3.zip |
games-util/nml: drop old version
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
Diffstat (limited to 'games-util')
-rw-r--r-- | games-util/nml/Manifest | 2 | ||||
-rw-r--r-- | games-util/nml/files/nml-0.4.4-pillow3.patch | 11 | ||||
-rw-r--r-- | games-util/nml/files/nml-0.4.5-pillow6.patch | 31 | ||||
-rw-r--r-- | games-util/nml/files/nml-0.4.5-pillow7.patch | 41 | ||||
-rw-r--r-- | games-util/nml/files/nml-0.4.5-python38.patch | 37 | ||||
-rw-r--r-- | games-util/nml/nml-0.4.5-r3.ebuild | 41 | ||||
-rw-r--r-- | games-util/nml/nml-0.5.2.ebuild | 32 |
7 files changed, 0 insertions, 195 deletions
diff --git a/games-util/nml/Manifest b/games-util/nml/Manifest index 71706ec650e4..ceca62690530 100644 --- a/games-util/nml/Manifest +++ b/games-util/nml/Manifest @@ -1,3 +1 @@ -DIST nml-0.4.5.tar.gz 378578 BLAKE2B 1283cdcabd4cbaf12dda926b89c88a3942e9e4469879812abe372facd2c41ff20af0df792bbdadf71d9d3ad8d72e98e293fd903c880e77d3e4ee8a1b73e36ca9 SHA512 64b2f46a1c2e37fce8f51231094e30334f368b0db39c6a3977a144a798d8034d1abbe7c14af3921eb81f4b7caa193e7e53ccb9e27acd113e0407926b109ca952 -DIST nml-0.5.2.tar.gz 531460 BLAKE2B 02f4e4a190bca0e46380c9075b769ea1925f3eaf655a2f09b8367890d4b9d0494dda9246f144bb735ef27906fcf22a198530fecc5c92e77f1b72f8a73832625e SHA512 edcada26ad011533065f3096b708b343ed6af742968606d187f01298e09f945904e2eba96fc8b37d88e243e7fd4bc6efdc8be614acbec199b06778ee32b5fc3b DIST nml-0.5.3.tar.gz 532842 BLAKE2B dbd775ca8b066fd60cd8fa1a377c95d337a61ba353fa527bb45f929d13b89a41c65156cff22f8ded6526444fdc74c82987da045e6355b411a30c0593a3a39edb SHA512 518be737273af6bfff23f223d07328312c4b7e070a334d4b0ecffc303aab8257ad8b26ff3b74e992db263d446fedc3e0080573b6670f0061ca78bb933c959c6a 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 <conrad@kostecki.com> -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 <conrad@kostecki.com> ---- - 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 <conrad@kostecki.com> -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 <conrad@kostecki.com> ---- - 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 <glx22@users.noreply.github.com> -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 -} |