gentoo resync : 15.01.2020

5 files changed, 89 insertions, 6 deletions

diff --git a/games-util/nml/Manifest b/games-util/nml/Manifest
index 0825d643c907..cda0cb06967c 100644
--- a/games-util/nml/Manifest
+++ b/games-util/nml/Manifest
@@ -1,6 +1,8 @@
 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
 DIST nml-0.4.5.tar.gz 378578 BLAKE2B 1283cdcabd4cbaf12dda926b89c88a3942e9e4469879812abe372facd2c41ff20af0df792bbdadf71d9d3ad8d72e98e293fd903c880e77d3e4ee8a1b73e36ca9 SHA512 64b2f46a1c2e37fce8f51231094e30334f368b0db39c6a3977a144a798d8034d1abbe7c14af3921eb81f4b7caa193e7e53ccb9e27acd113e0407926b109ca952
-EBUILD nml-0.4.5-r1.ebuild 745 BLAKE2B 4fd6a442b3e1a80336c96607b4fc9f05956e00c334c07225d6d25f279020f5a729f14f08f385b0c0e66f49d6fdaf00e63bfa28e42474146ac9e4bf6e70750175 SHA512 ee519cbb97522bf5cf18c222edd614d77acddab2e096c8c664141bf82a27cd4efce5380b42a8dda18588df27b3dc5f6f43519ddf0dae0906bf84235a294629b5
-EBUILD nml-0.4.5.ebuild 710 BLAKE2B aaea4b308ca590768ff30895309a5220192c9c617610bcff11041fc5a98051d8023cd4a7e6b262ff71c75d58b159c7e14f22112516ed9e0115400b74f891e2ba SHA512 29bbce32649a58ba3eecf2599226c03383f60a4f979205e594e1d2db0a51d008321c856ae53199d050776b5e28d268cfbb7f3c4c380f10dbc6b7e9aead9f4f29
+EBUILD nml-0.4.5-r1.ebuild 743 BLAKE2B 86201ab24cf3ea84ecca66daf178674896870804167b605239164febb7d520fc028fa0554ea34de89ac6e72f0ea21c1734d609cc87217556b1327356dadef8b1 SHA512 300d9c672851b9fb35bdab80ddf04373eb7ab2d71af963712c65c16f39320101cc72501f914f65d670ff6d0fc12f9e2838569675b969d1e6815eb259c8ea757c
+EBUILD nml-0.4.5-r2.ebuild 798 BLAKE2B cd95acb191dba0e912fccfb6b6a9847c1c9c80c3e071fdb3654b4593ff486429861fff51765aca9d7784b56f828d9af567ca6940934cebbf0e61277f5b406461 SHA512 f53d919219266fa156cfa0f58ae278115cefa231c1aa83cd8b94ee1d60d5946671c6c61f305bebcb109a68f9be1bddb60a77d555c0d877e6b9cfe6c4c2e9c4d8
+EBUILD nml-0.4.5.ebuild 708 BLAKE2B 9920a8690e33ac2ea04a96095873138a4c222da9299998fc81323ea928ea87890ff3577b968a4e5981cf76af17ae65a1473763ad87634fb076800f75de65a779 SHA512 aef814f3b17d06efeb3438192ff03427ee1d14ea5312b3211d78017644c08a433bed003f13d943f09f16715194ed3cac47ae17ec29d43a813aacdf6143c9bac1
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
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-r1.ebuild b/games-util/nml/nml-0.4.5-r1.ebuild
index 6f8e7f6ea8da..8b53673e33f2 100644
--- a/games-util/nml/nml-0.4.5-r1.ebuild
+++ b/games-util/nml/nml-0.4.5-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Compiler of NML files into grf/nfo files"
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
+}
diff --git a/games-util/nml/nml-0.4.5.ebuild b/games-util/nml/nml-0.4.5.ebuild
index 23ae3722e28b..66998758e626 100644
--- a/games-util/nml/nml-0.4.5.ebuild
+++ b/games-util/nml/nml-0.4.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Compiler of NML files into grf/nfo files"