diff options
| author |   Thomas Beierlein <tomjbe@gentoo.org> | 2013-06-02 16:35:29 +0000 |
|---|---|---|
| committer | Thomas Beierlein <tomjbe@gentoo.org> | 2013-06-02 16:35:29 +0000 |
| commit | 2846a1eb62239daad759278a57339a1737d9f3fd (patch) | |
| tree | 5359c9a737b38d35bd1c1729070852c610a39379 /media-radio | |
| parent | fix #472046 wrt #472034, drop old (diff) | |
| download | historical-2846a1eb62239daad759278a57339a1737d9f3fd.tar.gz historical-2846a1eb62239daad759278a57339a1737d9f3fd.tar.bz2 historical-2846a1eb62239daad759278a57339a1737d9f3fd.zip | |
Fix import of PIL modules (Bug #471538)
Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0x762053D5
Diffstat (limited to 'media-radio')
| -rw-r--r-- | media-radio/wspr/ChangeLog | 6 | ||||
| -rw-r--r-- | media-radio/wspr/Manifest | 11 | ||||
| -rw-r--r-- | media-radio/wspr/files/wspr-2.00-PIL.patch | 13 | ||||
| -rw-r--r-- | media-radio/wspr/wspr-2.00-r1.ebuild | 3 |
4 files changed, 26 insertions, 7 deletions
diff --git a/media-radio/wspr/ChangeLog b/media-radio/wspr/ChangeLog index 529c54a43097..1eea9f596e35 100644 --- a/media-radio/wspr/ChangeLog +++ b/media-radio/wspr/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-radio/wspr # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-radio/wspr/ChangeLog,v 1.9 2013/03/03 18:42:51 tomjbe Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-radio/wspr/ChangeLog,v 1.10 2013/06/02 16:34:53 tomjbe Exp $ + + 02 Jun 2013; Thomas Beierlein <tomjbe@gentoo.org> wspr-2.00-r1.ebuild, + +files/wspr-2.00-PIL.patch: + Fix import of PIL modules (Bug #471538) 03 Mar 2013; Thomas Beierlein <tomjbe@gentoo.org> wspr-2.00-r1.ebuild: Improve build logic. Thanks for help Michal diff --git a/media-radio/wspr/Manifest b/media-radio/wspr/Manifest index ce1f3041623c..a200e251b9a5 100644 --- a/media-radio/wspr/Manifest +++ b/media-radio/wspr/Manifest @@ -1,18 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX wspr-2.00-PIL.patch 455 SHA256 9653c83cac2b1a8406315912847949d4fe06f8a5321d52231040bc78761b8a60 SHA512 c54315b6febac2669d0b9327434d718201f7da9ee8fd9e67fc64d74849d4c2453a646328248c5d3791f309005a8b0b221a825f9d4e518a9c59fbd84a9743fd2b WHIRLPOOL cebf1c88067b812df5dd5d79c6e6c56c6d0a95e497d512e08ee1d72f72838bf5057ea7cfce7e939e388a3ea3b92401acb17e5819a00a21cc14d9007f7e93d339 AUX wspr-2.00-libdir.patch 1675 SHA256 3f662904c9b3c4e41a6254c8cabb588c7372aefcec6b3a5d70d363d34326c808 SHA512 40912019b0c4605e7fc1ebacd5775927d474cd32cddc5a752df9a21067b78ce629d2cf7095d4aab05f9eeb40fd41e039617be6c803d8f49e8de2b2148770be49 WHIRLPOOL ca348b579b984a39c5d9906b2d4a83a443eb07b178674a0d2a5bdbb90ce6edd1423ecb5792b63eb7fc4c53a2fced4249ac486cd19425ddd7d44af556ab8e8590 AUX wspr-2.00-script.patch 666 SHA256 24a8fd5a571eac5a11c1d48e00743c181ee752148df4fc1ee3a1665201a85420 SHA512 6108a94f0acf2fea143817926d570dc103f66d342803295cacd2ff6b6615a2b51ee6d53cc313730daabd4742864468cc99c202efb7d907b5c1f3a556620e8bb9 WHIRLPOOL ca9fa6afff80d8e923211be201b354ffadc719a68eac3b16665b68756b0c10e5759f0024e0a918d2a2b85ac81ffdae72f70541d4389ce477a8022de0952dd8c8 AUX wspr-2.00-verbose.patch 457 SHA256 9eb34712226466e4bc27e576150ac72d5a3f7ba98aa2c9b74c94e8050dbe01ce SHA512 35d6aa9876bc9de80ab0f9a05616fbe694b6bc51b969bc55cdf5ab961185c41b492232601cf61e592c8cfcf9470b23451219a5953fcb03fe7ff1fbb3d3f17a79 WHIRLPOOL 11329da4ca8f562464bb0189940d4e8803ef230e52e6392e3ca83af3f068b5572161d542f3c69c156451d7c90daab9881950e500fd6a9c56a3e947a81256b99f DIST wspr-2.00.r1714.tgz 2096056 SHA256 6a0e13f354d4e228337ee550851f36027281e268385961505a6757fda1ffc423 SHA512 221ca3c4ac433d5fb292830e183ef4ce44a9b0b31c8c1446faf30c1c2d6fe88cb471434c01126450843af49249e33bf6eccf1cbf839e6c5a09a3206c64a01d78 WHIRLPOOL c46fa1232c16ba42f8a9cf5fe1821291c339a776f2c1afe9ca4933574c026607bc789c31a496581f06d746297d9dfcc4252b79f52b1b38f8292134b445ab353b -EBUILD wspr-2.00-r1.ebuild 2139 SHA256 e7282d022ac6799e1cf446b8271f777c13916c7192fd48a74ec9cf56747e12eb SHA512 531af0c44867eb7ec88c1d0bc3768fbdb36d17aebcddeb07c02a747077a78ee65216ad81a1f5e3659d079702a876b6c9f5fbb7cc70d20eea902ea2a589808217 WHIRLPOOL 070876754b2c5a8613f9801924b9c734bb82e7ac28240f31ec152406a7268c8b53a1e930519a67aa4fceb4a3c4f9d45646513c737acccbfa756440116ae9e76d +EBUILD wspr-2.00-r1.ebuild 2170 SHA256 9e575b9c0f6e5d6aa32dcb9bf15f7eb30e1726c1a5041b54f58abf052a0a6d26 SHA512 9af5d83205de0001df3ccdd6ae666111e147fb36452f095f4e8e597c9758a2ec0b6eb55860bf063befd931e45010548ad618acb82008bf3e82182bcb1501cd80 WHIRLPOOL b75cb1014bab17152debbc13fcfaed650e4c7f3b2cf977713fcce8b4ac5ac1bc3c2acfc9964d00f9aab5ebc2148e0807e04ae53a1f6d4310bc67e11f83c8cd43 EBUILD wspr-2.00.ebuild 1941 SHA256 6dc6655a5616b8928d53a7455aaa4d181f4120c0268aca0d8bd80ad5fcf3f2fe SHA512 2f823e1cfcd21e418c7c85b1e27f7fc02e47aaf9d868a82385b6c73fd52481bde2d8dd29fe68d2a97f49d0f721fc9cb559e7f413ae66cff6ad54887c77446b11 WHIRLPOOL 172d97f0d38d36c33dbb3f15e0b3ca66da785dd92703d0316c255632ae2da1be680e4e0c583e963893dc30bafe3926ee83a100d5738afbdc3c95f8cce61a98e7 -MISC ChangeLog 2710 SHA256 b0cd1afa5b8c58db93c21753cea29efba63bbe4204a313dcfce69104bcbb67d2 SHA512 7339f3ec6afeb6a5f8b5a660ebf979e207bd9e37f0f24c16aa3d3528996468988aa48a6f43a67eb72b2d894cb7a89136dc2b4288cf77143df52dc15940937d61 WHIRLPOOL 156fe91e83caa5914cdde3cad9ddd21317c67f659174ee4524e12135ca39d2a776cc39c27a2fc9bef8d968d897b8780ed03c0170ceedd1e3a3ba856b7604b1d2 +MISC ChangeLog 2857 SHA256 27cb7ee6114498e93e94844c4746be9966b5bb536bcae94a730e4224d8282446 SHA512 2920f944e64f2f0e7809333bf1e56551d4ef8e1c94d3431c0e6795a83185a5e63acb0eaa3d34a98ff70332c9e0268276e4c457a72762c3b277c53e5dccc54f3c WHIRLPOOL 5c3dc9c3769cd29bad7bc28adaab84f220e7a0fa7e750bb1428357670b757f8a0a74e0eba0b6493d8727fa27655981aa83ac7465fa6f1c9eb8bc8bf47b06ede2 MISC metadata.xml 241 SHA256 865a729cb9a1d82ea72849efc0d66c4c499e1c87b59757996f3d45bae77df6cc SHA512 eff33b80d9c4469f6f71c50b6cd7d173d7670c28f7e4162c3be23fdd5b4adacf3f0365ebe0827cd1721f24cc5a40440ae1edd78f59e606648e951bbb10378f2d WHIRLPOOL c248807b5f958ae6b54ed780eef3c255eff1c65f5afdf77fa64c4fd0a51cbeeeeef25e1d5ad550c748ba75bd2f1523d0f8d2d71bcf966306d010751c5ace5e4f -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEAREIAAYFAlEzmbQACgkQQe4uqXYgU9XH7wCgpr4PllA9xs5vDAZnsKS+XA8B -BG0An1QegNYUFmd9rv/SELm9Spw5LVd9 -=GEmS +iEYEAREIAAYFAlGrdEcACgkQQe4uqXYgU9WW7wCfaYLkPMq3byIN03xn55/ySFg1 +Je4AoI75eUnUSE93/M5V15wY04MfN1Uo +=Laqi -----END PGP SIGNATURE----- diff --git a/media-radio/wspr/files/wspr-2.00-PIL.patch b/media-radio/wspr/files/wspr-2.00-PIL.patch new file mode 100644 index 000000000000..69bb853396ac --- /dev/null +++ b/media-radio/wspr/files/wspr-2.00-PIL.patch @@ -0,0 +1,13 @@ +--- wspr.py.orig 2013-06-02 18:25:02.000000000 +0200 ++++ wspr.py 2013-06-02 18:25:51.000000000 +0200 +@@ -15,7 +15,9 @@ + from Numeric import zeros + import array + import dircache +-import Image, ImageTk, ImageDraw ++from PIL import Image ++from PIL import ImageTk ++from PIL import ImageDraw + from WsprMod.palettes import colormapblue, colormapgray0, colormapHot, \ + colormapAFMHot, colormapgray1, colormapLinrad, Colormap2Palette + from types import * diff --git a/media-radio/wspr/wspr-2.00-r1.ebuild b/media-radio/wspr/wspr-2.00-r1.ebuild index 98ec86e26d7b..a297204ea98e 100644 --- a/media-radio/wspr/wspr-2.00-r1.ebuild +++ b/media-radio/wspr/wspr-2.00-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-radio/wspr/wspr-2.00-r1.ebuild,v 1.3 2013/03/03 18:42:51 tomjbe Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-radio/wspr/wspr-2.00-r1.ebuild,v 1.4 2013/06/02 16:34:53 tomjbe Exp $ EAPI="5" PYTHON_COMPAT=( python2_{6,7} ) @@ -53,6 +53,7 @@ python_prepare_all() { "${FILESDIR}"/${P}-libdir.patch "${FILESDIR}"/${P}-verbose.patch "${FILESDIR}"/${P}-script.patch + "${FILESDIR}"/${P}-PIL.patch ) distutils-r1_python_prepare_all |