old

(Portage version: 2.2.8-r2/cvs/Linux x86_64, unsigned Manifest commit)

3 files changed, 5 insertions, 99 deletions

diff --git a/games-util/nml/ChangeLog b/games-util/nml/ChangeLog
index 2c350e7f4945..e3746c99d301 100644
--- a/games-util/nml/ChangeLog
+++ b/games-util/nml/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-util/nml
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/nml/ChangeLog,v 1.26 2014/10/12 08:51:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/nml/ChangeLog,v 1.27 2014/10/27 19:17:32 mr_bones_ Exp $
+
+  27 Oct 2014; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/nml-0.2.4-pillow.patch, -nml-0.2.4-r2.ebuild:
+  old
 
   12 Oct 2014; Agostino Sarubbo <ago@gentoo.org> nml-0.3.1.ebuild:
   Stable for x86, wrt bug #522104
diff --git a/games-util/nml/files/nml-0.2.4-pillow.patch b/games-util/nml/files/nml-0.2.4-pillow.patch
deleted file mode 100644
index 648cfac54016..000000000000
--- a/games-util/nml/files/nml-0.2.4-pillow.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-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-r2.ebuild b/games-util/nml/nml-0.2.4-r2.ebuild
deleted file mode 100644
index d1bb20c6a33a..000000000000
--- a/games-util/nml/nml-0.2.4-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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-r2.ebuild,v 1.6 2013/12/13 15:27:00 hasufell Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_6 python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Compiler of NML files into grf/nfo files"
-HOMEPAGE="http://dev.openttdcoop.org/projects/nml"
-SRC_URI="http://bundles.openttdcoop.org/nml/releases/${PV}/${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
-IUSE=""
-
-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}/${P}-pillow.patch" )
-
-src_install() {
-	distutils-r1_src_install
-	doman docs/nmlc.1
-}