diff options
author | Conrad Kostecki <conikost@gentoo.org> | 2020-01-14 19:45:11 +0100 |
---|---|---|
committer | Conrad Kostecki <conikost@gentoo.org> | 2020-01-14 19:46:59 +0100 |
commit | 8019d4039a201fc897f9c6938a4e0bae78fee8fd (patch) | |
tree | 5551a165750b06c2ec40be63de5c6378a1d6b942 /games-util/nml | |
parent | net-misc/pulseaudio-dlna: python3 bump (diff) | |
download | gentoo-8019d4039a201fc897f9c6938a4e0bae78fee8fd.tar.gz gentoo-8019d4039a201fc897f9c6938a4e0bae78fee8fd.tar.bz2 gentoo-8019d4039a201fc897f9c6938a4e0bae78fee8fd.zip |
games-util/nml: add support for >=dev-python/pillow-7.0.0
Also added support for python3.8 and changed SRC_URI to https.
Closes: https://bugs.gentoo.org/705428
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
Diffstat (limited to 'games-util/nml')
-rw-r--r-- | games-util/nml/files/nml-0.4.5-pillow7.patch | 41 | ||||
-rw-r--r-- | games-util/nml/nml-0.4.5-r2.ebuild | 40 |
2 files changed, 81 insertions, 0 deletions
diff --git a/games-util/nml/files/nml-0.4.5-pillow7.patch b/games-util/nml/files/nml-0.4.5-pillow7.patch new file mode 100644 index 000000000000..a69e40ae3e17 --- /dev/null +++ b/games-util/nml/files/nml-0.4.5-pillow7.patch @@ -0,0 +1,41 @@ +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/nml-0.4.5-r2.ebuild b/games-util/nml/nml-0.4.5-r2.ebuild new file mode 100644 index 000000000000..7627ddc1e890 --- /dev/null +++ b/games-util/nml/nml-0.4.5-r2.ebuild @@ -0,0 +1,40 @@ +# 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 +) + +src_install() { + distutils-r1_src_install + + doman docs/nmlc.1 +} |