use virtual/python-imaging with patch from Jakob Kummerow (bug #471516)

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64

4 files changed, 82 insertions, 26 deletions

diff --git a/games-util/nml/ChangeLog b/games-util/nml/ChangeLog
index 18c7a9ebc93c..c4b1da3c220c 100644
--- a/games-util/nml/ChangeLog
+++ b/games-util/nml/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-util/nml
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/nml/ChangeLog,v 1.14 2013/02/25 12:16:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/nml/ChangeLog,v 1.15 2013/07/20 16:09:22 mr_bones_ Exp $
+
+  20 Jul 2013; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/nml-0.2.4-pillow.patch, nml-0.2.4-r1.ebuild:
+  use virtual/python-imaging with patch from Jakob Kummerow (bug #471516)
 
   25 Feb 2013; Agostino Sarubbo <ago@gentoo.org> nml-0.2.4-r1.ebuild:
   Stable for x86, wrt bug #458240
diff --git a/games-util/nml/Manifest b/games-util/nml/Manifest
index b2f826626163..f5774cf84414 100644
--- a/games-util/nml/Manifest
+++ b/games-util/nml/Manifest
@@ -1,26 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
+AUX nml-0.2.4-pillow.patch 2017 SHA256 5f5ac188db390dbdabdbdb65945f6bf597e8fc2169113987340512bcaaa02ddc SHA512 ef47d22d8c8c3602a129e25597d0d8842df3f265c1a4021f67a26b59ded36de184e81b862a7b982db30594d11a3e71948c91a5a512a41a868756f9d699c95bc5 WHIRLPOOL f8886329a7f7d384da98a5a945305930777e05d01b6900158181f24089c6173be22da1ebd8a8174dbdbac25aab7ca6efc8f357d09fe3504279b1d4cb977ff441
 DIST nml-0.2.3.src.tar.gz 270260 SHA256 0e7b72314b62f6deb057faa7f70795e485e8a748914ff1790a8c67dc1f7ceb64 SHA512 79d37503e93830b735bb9ed58e22a0c41e99ac86ac648256bacf162750a820bfe7fc04b0e687f48e8ca12da16dad7f3a87f79e4b35ed12809729b19501597113 WHIRLPOOL ca1ecd9fea8ae99e264e6fe1cf9eebeae2b9a7f4a501c1d6f5a1cd99776bc27fbb03bba90e842b8140252f24443c471dcd0e2d0ca1251da2c4e4ade28fc47cfa
 DIST nml-0.2.4.src.tar.gz 271892 SHA256 6619a28fd3d359a8881f137bd15af5ca89a75061e94ab7649155cc2434e7d862 SHA512 920ee18a904aeefab76329575487d70693f7e87553fa233672a0ca530ae40f74387354097ce5bf36dadb4e2e3b735a0a37a44895b436dce7f59d4c8d37c0869f WHIRLPOOL dc9b7934e3f4c756b4db68f43bc6f3b7e981d86ddd2ec821bb8a6e9f2624c7ea42a46977023039170c3545b231121f766f56d56c19475ae1b3b89839ec31a2b1
 EBUILD nml-0.2.3.ebuild 772 SHA256 a65d76acf14796133007e98d8821640af6276894d6d2065963d898ca5792860b SHA512 18f89ddc691ee03664e3eb66ea5800c18ce26894955f1b15401e6d55d898385d1a5c7de3ccc9edb73ee77a77114ad903637f6dbcfbd42010eb974421b351625f WHIRLPOOL ba9fc717ff331411378fcf21ee091ea9dda4b28ee4de8c95593e52b9972c1c0a3829df2669dceef002402b1f20fb930a3d83522586e4a1c313adf488a0d22c53
-EBUILD nml-0.2.4-r1.ebuild 749 SHA256 5faaf9f3967d8d486661958f6ca9975a6bc6a183735b5b6b0cc680fc5db3a837 SHA512 6d557c408140222b1f78cf048f51aa01bdd1c018fd413931b2ea021089235d007324c1eb2fd3cf229a67dea1c61e04596692e10ec700b32ea2ea24e0b64cb77d WHIRLPOOL ecd8f8e7f4524a7e0a53109dda9bbe929b9300509bd9517e8f2ba54cf7cf06091b1cef10c4f0a3c5acf136640f262747c6bb8f3e18c5fdca00ba3f8f4408bb2f
-MISC ChangeLog 1911 SHA256 5f4ed34580064835cca15b88c7d0a637473cc2a838d3d0aa62709864a4804f0d SHA512 8a1073ee217442d14d7ed8ce6eaf1a4779da67b769e9f22c9f3fbed140db7dbdf0c60072e0861c54e1f137f375b78aa97f9c783cbd030939e4a00cdba8115a0f WHIRLPOOL a1d2c758444bc6a62c71cbad633408a8c5f372ecc18718be766a4b4713b490644d2f8d1239b43702a0c1417b4e2e18e72bd141bf0eec79324df9aaaa0ae52cbe
+EBUILD nml-0.2.4-r1.ebuild 825 SHA256 31907bfcaa511bed4e2d61d4d23910028168a61c95d9cde1c749a1eef059bd5c SHA512 95738bb59630c9130f48cfde5bc6cfe41d448378df1ef79b239158c986694c3029972f2780431cec716fab2a038ed5c3dfeb3ce17cecd897d72efa8fec4f67db WHIRLPOOL 833788cff9716ddd986852c085a443acdafbda4d0b5eec0066c2d1c9d3a2ace37b83226dd548e30835e0473c321cb7518c41b93dc58f717cf81106d1e2cc2f3e
+MISC ChangeLog 2101 SHA256 9fda70415d207e1f4ca7f2cd644a501bdab891c77e50a61af5c71ad9e046bf18 SHA512 55abe6a31daeab94943b57af274288b84c7b1243c48bf22736e1860ee9bf2b57be39e9281b5cddb4bd3b0e7b1974f04e6144425f9fc4a93c71248afba65f9db2 WHIRLPOOL 7d9e5d0a45cd743494ff43ecd369d9263b8cafd702e86ed2dccd927609f5d97b04cd3d31fa2798b883e19a1f15e92bf0e0591ec8fb6c033ba40e7c434072f81e
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCgAGBQJRK1YoAAoJELp701BxlEWfpoYP/3N+tLMdz5qS/RGNs4G5MZmI
-E90K0AugO0xP+LzfW4XqQDmuACAaSdTRjLe5A3IrEnTk7nM3kbcwv5vwo+uWbSC0
-mvlLR8sC+SK392/txZ5ZrP+c7wfxzw+Q3MgmOnJ3LBPhZxvNJjh7Lx3z2O1D/E3I
-nrbgC20mYIGh6O7NU3ALUZV9DGEMRvZk6h8A8BLvL5tDutoNBOh7ip8czg5arH0H
-gBVmc2apH13SjE44bi9xUMH+R/ivM5zE00oB5g4x5zMbiWLyVnaBovZWkZpLKSgl
-5EXeccaWlnAH3EHi2IyKSk+r0Ky8EQHKkW7Jji049DJ3i2C4hzRsfdrVWutubXI1
-scEJbA9zIpNon3ezdpyGy8xjB5iNOCxnLUwpXls5DkyN8FeiEgftl92CB4uTlT6O
-48n2Mk2U9tOXZ47LOyOF2izJInNqoodBvSOtouaFdXoZhJMm2mT4Rk6Nktu91tUI
-0I6f3N9O/lUeP+0+3U6UaWiIhJfnCbY0y8EMO3lmxx84yBgVVy5zN+a4Qf0y+kve
-WTu7t4Y3nMGD9CBySZYyGqZkthbk5i1Yhe3DdbKl4iRQ6lxzZQpYm+UYTASpWeGs
-Pc4BAmfgqrtW2sPWhFr9jlJjRmfja4yjfNWmQ/oUo9CoYeDLszlnbAmP5rrINgcM
-bFZCqU17u74WnTMz3r61
-=0V6q
------END PGP SIGNATURE-----
diff --git a/games-util/nml/files/nml-0.2.4-pillow.patch b/games-util/nml/files/nml-0.2.4-pillow.patch
new file mode 100644
index 000000000000..648cfac54016
--- /dev/null
+++ b/games-util/nml/files/nml-0.2.4-pillow.patch
@@ -0,0 +1,67 @@
+diff --git a/nml/actions/real_sprite.py b/nml/actions/real_sprite.py
+index 6e03473..5ae2f26 100644
+--- a/nml/actions/real_sprite.py
++++ b/nml/actions/real_sprite.py
+@@ -16,7 +16,8 @@ with NML; if not, write to the Free Software Foundation, Inc.,
+ from nml import generic, expression
+ from nml.actions import base_action
+ from nml.ast import assignment
+-import os, Image
++import os
++from PIL import Image
+ 
+ palmap_d2w = [
+           0, 215, 216, 136,  88, 106,  32,  33, #   0..7
+diff --git a/nml/ast/alt_sprites.py b/nml/ast/alt_sprites.py
+index 163bb23..fb12d0a 100644
+--- a/nml/ast/alt_sprites.py
++++ b/nml/ast/alt_sprites.py
+@@ -16,7 +16,8 @@ with NML; if not, write to the Free Software Foundation, Inc.,
+ from nml import expression, generic, global_constants
+ from nml.actions import real_sprite
+ from nml.ast import base_statement
+-import os, Image
++import os
++from PIL import Image
+ 
+ """
+ List with all AltSpritesBlocks encountered in the nml file.
+diff --git a/nml/main.py b/nml/main.py
+index cbee6d2..abbecda 100644
+--- a/nml/main.py
++++ b/nml/main.py
+@@ -19,7 +19,7 @@ from nml.actions import action2layout, action2var, action8, sprite_count, real_s
+ from nml.ast import general, grf, alt_sprites
+ 
+ try:
+-    import Image
++    from PIL import Image
+ except ImportError:
+     pass
+ 
+diff --git a/nml/output_grf.py b/nml/output_grf.py
+index 8f116aa..b5c05a8 100644
+--- a/nml/output_grf.py
++++ b/nml/output_grf.py
+@@ -18,7 +18,7 @@ from nml import generic, palette, output_base, lz77, grfstrings
+ from nml.actions.real_sprite import palmap_w2d
+ 
+ try:
+-    import Image
++    from PIL import Image
+ except ImportError:
+     pass
+ 
+diff --git a/nml/version_info.py b/nml/version_info.py
+index da0ff94..b077baf 100644
+--- a/nml/version_info.py
++++ b/nml/version_info.py
+@@ -45,7 +45,7 @@ def get_lib_versions():
+     versions = {}
+     #PIL
+     try:
+-        import Image
++        from PIL import Image
+         versions["PIL"] = Image.VERSION
+     except ImportError:
+         versions["PIL"] = "Not found!"
diff --git a/games-util/nml/nml-0.2.4-r1.ebuild b/games-util/nml/nml-0.2.4-r1.ebuild
index 8a4c99ca29c2..dbd66ace5c22 100644
--- a/games-util/nml/nml-0.2.4-r1.ebuild
+++ b/games-util/nml/nml-0.2.4-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/nml/nml-0.2.4-r1.ebuild,v 1.3 2013/02/25 12:16:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/nml/nml-0.2.4-r1.ebuild,v 1.4 2013/07/20 16:09:22 mr_bones_ Exp $
 
 EAPI=5
 
 PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
 
-inherit distutils-r1
+inherit eutils distutils-r1
 
 DESCRIPTION="Compiler of NML files into grf/nfo files"
 HOMEPAGE="http://dev.openttdcoop.org/projects/nml"
@@ -17,13 +17,17 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ~ppc x86"
 IUSE=""
 
-RDEPEND="dev-python/imaging
+RDEPEND="virtual/python-imaging
 	dev-python/ply"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 
 DOCS=( docs/{changelog,readme}.txt )
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-pillow.patch
+}
+
 src_install() {
 	distutils-r1_src_install
 	doman docs/nmlc.1