gentoo resync : 28.04.2019

4 files changed, 42 insertions, 8 deletions

diff --git a/games-util/nml/Manifest b/games-util/nml/Manifest
index 7fb031800e9a..0825d643c907 100644
--- a/games-util/nml/Manifest
+++ b/games-util/nml/Manifest
@@ -1,6 +1,6 @@
 AUX nml-0.4.4-pillow3.patch 288 BLAKE2B 5d1446821d75432002a36439c6e39fa7f644f9a63be0da178c33287893fe65637d6ce66aa55df916227636cb8e0228a08e363a0b682b02dc63823a671b50849c SHA512 cdb6113102fadbf3b3d9cab930b15cfd88d609c9bb09048a3fb247051169933a0796c10d0c29b9d6bf9320ddcf73a4681255d8e1465a7a98268029d3433ba524
-DIST nml-0.4.4.tar.gz 377998 BLAKE2B a65df2c371c1b1dda2469a968372f21f9f27e9739c8d8a9a0f582c126169921ee3ffc9745f6ef4ac21aebdeea35fd26385d3149e84d50381c4796b71b378571f SHA512 fd7b8d7abfc8b5ea694eedf00bbc4069a82de942178a58ec05e9d3efe7c8663103ffb6b98f7614ce165eb7cba42cb4c7589f77fb67dd95eb6293f62b3179c7b0
+AUX nml-0.4.5-pillow6.patch 981 BLAKE2B 56e1f6ed41a6978a021db50880092fed7199d104cd006962a54fb09bcba365a320cac878041b4fe6ee6a6801a2c7e666154105a4dd2b349f030b62da9669d1fe SHA512 de304562bb2ef90b9068a1975a3cb5fd83a9b5e473371f87620fe5a02866b805adba37b46c8c1b40a7a6d304d5c8339ee78ee4a87d683c540126e5fc3ea49303
 DIST nml-0.4.5.tar.gz 378578 BLAKE2B 1283cdcabd4cbaf12dda926b89c88a3942e9e4469879812abe372facd2c41ff20af0df792bbdadf71d9d3ad8d72e98e293fd903c880e77d3e4ee8a1b73e36ca9 SHA512 64b2f46a1c2e37fce8f51231094e30334f368b0db39c6a3977a144a798d8034d1abbe7c14af3921eb81f4b7caa193e7e53ccb9e27acd113e0407926b109ca952
-EBUILD nml-0.4.4-r1.ebuild 699 BLAKE2B 73334bef1122002b0aecbe5834c4f09ef093774ef9cf09872bdf1a934d1d748d671e07fa70734e77a014c9d226daae95bc9180300ef0a2a92464129f801f8d60 SHA512 e2b0db49d56dc6e3df8ddf90cacd8e71b9a6d6231cb5e1789ece9d683183c49831f5f0b2a4d5f34706189e4d159732efc7a3002f03cfdd26874e856aba08512b
-EBUILD nml-0.4.5.ebuild 703 BLAKE2B 4fdec7d1ad63392e50de8946e2578df2f8c249b4562d728fc6acffb3cf2cf04e1d869eb2d0a33c0285d6d61a85208cd8e5c57a73508c10eed353eb0a0cddf047 SHA512 87e6b12b4e5da3e8e93a71468687ab846f2382f0aa27a0e7e0efeceb2c46e4f3677f95fab06f891e69f6e0c852371c1e4b736b2a3f08aea635a719d3c323e488
+EBUILD nml-0.4.5-r1.ebuild 745 BLAKE2B 4fd6a442b3e1a80336c96607b4fc9f05956e00c334c07225d6d25f279020f5a729f14f08f385b0c0e66f49d6fdaf00e63bfa28e42474146ac9e4bf6e70750175 SHA512 ee519cbb97522bf5cf18c222edd614d77acddab2e096c8c664141bf82a27cd4efce5380b42a8dda18588df27b3dc5f6f43519ddf0dae0906bf84235a294629b5
+EBUILD nml-0.4.5.ebuild 710 BLAKE2B aaea4b308ca590768ff30895309a5220192c9c617610bcff11041fc5a98051d8023cd4a7e6b262ff71c75d58b159c7e14f22112516ed9e0115400b74f891e2ba SHA512 29bbce32649a58ba3eecf2599226c03383f60a4f979205e594e1d2db0a51d008321c856ae53199d050776b5e28d268cfbb7f3c4c380f10dbc6b7e9aead9f4f29
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-util/nml/files/nml-0.4.5-pillow6.patch b/games-util/nml/files/nml-0.4.5-pillow6.patch
new file mode 100644
index 000000000000..5b04aef0d95a
--- /dev/null
+++ b/games-util/nml/files/nml-0.4.5-pillow6.patch
@@ -0,0 +1,31 @@
+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/nml-0.4.4-r1.ebuild b/games-util/nml/nml-0.4.5-r1.ebuild
index b50f0471e311..6f8e7f6ea8da 100644
--- a/games-util/nml/nml-0.4.4-r1.ebuild
+++ b/games-util/nml/nml-0.4.5-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Compiler of NML files into grf/nfo files"
@@ -19,7 +19,10 @@ DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 
 DOCS=( docs/{changelog,readme}.txt )
-PATCHES=( "${FILESDIR}"/${P}-pillow3.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4.4-pillow3.patch
+	"${FILESDIR}"/${PN}-0.4.5-pillow6.patch
+)
 
 src_install() {
 	distutils-r1_src_install
diff --git a/games-util/nml/nml-0.4.5.ebuild b/games-util/nml/nml-0.4.5.ebuild
index 0e8f0244e466..23ae3722e28b 100644
--- a/games-util/nml/nml-0.4.5.ebuild
+++ b/games-util/nml/nml-0.4.5.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 
-RDEPEND="dev-python/pillow[zlib,${PYTHON_USEDEP}]
+RDEPEND="<dev-python/pillow-6.0.0[zlib,${PYTHON_USEDEP}]
 	dev-python/ply[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"