Bug #471550: Fix PIL usage. Also migrate from dev-python/imaging to virtual/python-imaging and to distutils-r1 & EAPI5.

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

4 files changed, 69 insertions, 17 deletions

diff --git a/sci-geosciences/tilecache/ChangeLog b/sci-geosciences/tilecache/ChangeLog
index f182464b6133..ec2cf480710d 100644
--- a/sci-geosciences/tilecache/ChangeLog
+++ b/sci-geosciences/tilecache/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-geosciences/tilecache
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/tilecache/ChangeLog,v 1.5 2011/06/01 09:53:25 scarabeus Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/tilecache/ChangeLog,v 1.6 2013/11/09 19:21:59 robbat2 Exp $
+
+*tilecache-2.11-r1 (09 Nov 2013)
+
+  09 Nov 2013; Robin H. Johnson <robbat2@gentoo.org>
+  +files/tilecache-2.11-pil.patch, +tilecache-2.11-r1.ebuild:
+  Bug #471550: Fix PIL usage. Also migrate from dev-python/imaging to virtual
+  /python-imaging and to distutils-r1 & EAPI5.
 
 *tilecache-2.11 (01 Jun 2011)
 
@@ -26,4 +33,3 @@
   09 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org>
   +tilecache-2.10.ebuild, +metadata.xml:
   Initial commit.
-
diff --git a/sci-geosciences/tilecache/Manifest b/sci-geosciences/tilecache/Manifest
index a39ca8dbbf17..a9a3a4936caf 100644
--- a/sci-geosciences/tilecache/Manifest
+++ b/sci-geosciences/tilecache/Manifest
@@ -1,14 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST tilecache-2.11.tar.gz 68705 RMD160 723452a6f7682e7f3e8b30db4a76bfda77d62a8c SHA1 7fb9f8230b6c51123646a031f45b9bb27f3a944d SHA256 b46dc2731a19b40e3207cf3c9b43ea59b899a622a586aaa3c397c3b5aa00f887
-EBUILD tilecache-2.11.ebuild 638 RMD160 1a1453890db1e0d73e70b6b11b3cdd8b1d9ec924 SHA1 234a79e312f72b058f8955e8dea17c1d22157420 SHA256 155c490a0c392716d77a914a025a87259a0a834f65a4780d3a8aa9cd3f186bca
-MISC ChangeLog 975 RMD160 4f805729ac3de0474e6f24ecf1a8d0202b16abac SHA1 b898c4a7549a19072b353bc94e1afcc28bb58c02 SHA256 5c82f6c1e932e5b3da29f007cdf7c22218b6da2159eeea32332e13971e79f25a
-MISC metadata.xml 168 RMD160 156c29f9b364fbbaf0028d17736a01112e5d8cab SHA1 1221e73982792f6e23f10d95e878e86e8f62fe35 SHA256 2fc15316b226307080574c36b3761f27a23a642e89c60f02feabdc64049a188d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk3mDBoACgkQHB6c3gNBRYdDQACeJBR92PESVVgMqlmc+1xVPNvb
-UbYAoL6s4jgxXsCkfEC6ZFLS1XQYALIH
-=mFgW
------END PGP SIGNATURE-----
+AUX tilecache-2.11-pil.patch 935 SHA256 8c871b69f7d166ee09a50f31afcd4e3f509ff6572767bf94347f2137b9ca84e0 SHA512 1fcc6b35ce464a76d99b858f2e6d3baf9a4e4e22ee81db4dc178eb63dfcf30f0501cd420624406a85987eb78f387156a2756f2d151c52cf301e2592500e5e924 WHIRLPOOL b8905f26ffe33ae4016e7d403aedb90d82d8ceae3918c9dcf6d43db277ef713d614513b4e7ff87d22fb0f145d98c9ac12bf797e97f0150d3798c6ade51e33239
+DIST tilecache-2.11.tar.gz 68705 SHA256 b46dc2731a19b40e3207cf3c9b43ea59b899a622a586aaa3c397c3b5aa00f887 SHA512 234fdba3465b9f940b4bf45a4427c61a803f4458266c59ac08d52bdaace4a186d7bf37cce7af6f273ba0ade9e8d6118fa58ce6dd37645a0667230dc507ee991a WHIRLPOOL aa3da22b95b35da7b6612ed6078ccec34828c0488ddff18b33642cdcbb7dc45a502f6b5717f25264b6d9ffc0b5d2bdd1fb4091bc49277d5c135d216f24b3567c
+EBUILD tilecache-2.11-r1.ebuild 738 SHA256 6570177b610d0fbd57ce9e1427dc1478cff03760adb0c14c8b8183f94001817b SHA512 9fee8201d350fdc56393b8d2c8646b6ebb4a1ae99ca603ce05150f2c43626562dc330dfffa10cf2209c37fe3c77a201534d3ce884f932dc084fb772078f89347 WHIRLPOOL 5ae8b2fe154507d8ad07f474dfbe964b4564439f3ec71f923bbd772c001ec67336b636db7d914df02f3e8a19390daad46c09fbb0732615c566842ef04a9c96aa
+EBUILD tilecache-2.11.ebuild 638 SHA256 155c490a0c392716d77a914a025a87259a0a834f65a4780d3a8aa9cd3f186bca SHA512 fba67c17185e09be94bd0a027c8feb63b4bbb650a2306fb25dbbbf76b11dfb1fe39dabd6d8b973e050b0e6248128645558aa433fb1443d158d5be05f3b25188d WHIRLPOOL 838339031e8ba7bbb378bcbad61569534d331a8a0e5a777eb711d4e4ead61536e3988ecf48d3a986dd253aa1ef0446c5ee823ca9876c342e13fa6e45b1ee4815
+MISC ChangeLog 1247 SHA256 ce25dfb7383a40196cb9fcc556efdd8a88815db6caa30c5d710daeef13c6e684 SHA512 e0280cb3240c10614a5d780ca821265c90f82c4bfe70b55348bb041bf053875c1f3bd4c504c9824b79a38b86f0a324e1bbb0774223bde692b25cde050040db4f WHIRLPOOL 806609bd8d644c7a0e42268655b945c1f34e8272a79d7a509da08178a99060d76660323e90bca62119499873125df38ac0620a55c2b9122f1a3244974feee725
+MISC metadata.xml 168 SHA256 2fc15316b226307080574c36b3761f27a23a642e89c60f02feabdc64049a188d SHA512 eec7cb4444156fec7e8fa88c1ae6a02d0cf125174ae058f4286c77806eaa40ab8f7644b319bc01a3a8fdb717c9bd13c93111c4756e13cb3724a55783cf9b5eda WHIRLPOOL 3a4c3ce31b3f3a766d4791d8e41880c365501387bca1219bc1b411c27d002c68e31119b18ebbd646d0fb1bd7630176692ac9159350f8bbfe1998fd3a76f83ff1
diff --git a/sci-geosciences/tilecache/files/tilecache-2.11-pil.patch b/sci-geosciences/tilecache/files/tilecache-2.11-pil.patch
new file mode 100644
index 000000000000..b596ae449ff7
--- /dev/null
+++ b/sci-geosciences/tilecache/files/tilecache-2.11-pil.patch
@@ -0,0 +1,21 @@
+diff -Nuar tilecache-2.11.orig/TileCache/Layer.py tilecache-2.11/TileCache/Layer.py
+--- tilecache-2.11.orig/TileCache/Layer.py	2010-10-15 04:00:18.000000000 -0700
++++ tilecache-2.11/TileCache/Layer.py	2013-11-09 11:05:17.620475332 -0800
+@@ -391,7 +391,7 @@
+         return MetaTile(self, x, y, tile.z) 
+ 
+     def renderMetaTile (self, metatile, tile):
+-        import StringIO, Image
++        import StringIO, PIL.Image as Image
+ 
+         data = self.renderTile(metatile)
+         image = Image.open( StringIO.StringIO(data) )
+@@ -444,7 +444,7 @@
+                 return self.renderTile(tile)
+ 
+     def watermark (self, img):
+-        import StringIO, Image, ImageEnhance
++        import StringIO, PIL.Image as Image, PIL.ImageEnhance as ImageEnhance
+         tileImage = Image.open( StringIO.StringIO(img) )
+         wmark = Image.open(self.watermarkimage)
+         assert self.watermarkopacity >= 0 and self.watermarkopacity <= 1
diff --git a/sci-geosciences/tilecache/tilecache-2.11-r1.ebuild b/sci-geosciences/tilecache/tilecache-2.11-r1.ebuild
new file mode 100644
index 000000000000..34d96eee3dc6
--- /dev/null
+++ b/sci-geosciences/tilecache/tilecache-2.11-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/tilecache/tilecache-2.11-r1.ebuild,v 1.1 2013/11/09 19:21:59 robbat2 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Web map tile caching system"
+HOMEPAGE="http://tilecache.org/"
+SRC_URI="http://${PN}.org/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="virtual/python-imaging
+	dev-python/paste"
+DEPEND="${RDEPEND}
+	dev-python/setuptools
+"
+
+PATCHES=( "${FILESDIR}/tilecache-2.11-pil.patch" )
+
+src_install() {
+	distutils-r1_src_install "--debian"
+}
+
+python_test() {
+	python setup.py test || die "Failed tests"
+}