Update PIL imports, bug 472774. Migrate to distutils-r1. Commited by proxy for PhobosK.

(Portage version: 2.2.0_alpha179/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)

3 files changed, 165 insertions, 1 deletions

diff --git a/media-video/photofilmstrip/ChangeLog b/media-video/photofilmstrip/ChangeLog
index 53d444f537f5..b387d8a6eadc 100644
--- a/media-video/photofilmstrip/ChangeLog
+++ b/media-video/photofilmstrip/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/photofilmstrip
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/photofilmstrip/ChangeLog,v 1.1 2013/01/26 18:00:25 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/photofilmstrip/ChangeLog,v 1.2 2013/06/15 15:41:28 floppym Exp $
+
+*photofilmstrip-1.9.91-r1 (15 Jun 2013)
+
+  15 Jun 2013; Mike Gilbert <floppym@gentoo.org>
+  +files/photofilmstrip-1.9.91-PIL_modules_imports_fix.patch,
+  +photofilmstrip-1.9.91-r1.ebuild:
+  Update PIL imports, bug 472774. Migrate to distutils-r1. Commited by proxy for
+  PhobosK.
 
 *photofilmstrip-1.9.91 (26 Jan 2013)
 
diff --git a/media-video/photofilmstrip/files/photofilmstrip-1.9.91-PIL_modules_imports_fix.patch b/media-video/photofilmstrip/files/photofilmstrip-1.9.91-PIL_modules_imports_fix.patch
new file mode 100644
index 000000000000..2d5bb479da8d
--- /dev/null
+++ b/media-video/photofilmstrip/files/photofilmstrip-1.9.91-PIL_modules_imports_fix.patch
@@ -0,0 +1,103 @@
+--- photofilmstrip-1.9.91-orig/photofilmstrip/core/__init__.py	2012-01-13 15:26:36.000000000 +0200
++++ photofilmstrip-1.9.91/photofilmstrip/core/__init__.py	2013-06-10 20:43:27.759638837 +0300
+@@ -22,47 +22,47 @@
+ # WA: py2exe and PIL
+ import os
+ if os.name == "nt":
+-    import Image
++    import PIL.Image as Image
+ 
+-    import ArgImagePlugin
+-    import BmpImagePlugin
+-    import BufrStubImagePlugin
+-    import CurImagePlugin
+-    import DcxImagePlugin
+-    import EpsImagePlugin
+-    import FitsStubImagePlugin
+-    import FliImagePlugin
+-    import FpxImagePlugin
+-    import GbrImagePlugin
+-    import GifImagePlugin
+-    import GribStubImagePlugin
+-    import Hdf5StubImagePlugin
+-    import IcnsImagePlugin
+-    import IcoImagePlugin
+-    import ImImagePlugin
+-    import ImtImagePlugin
+-    import IptcImagePlugin
+-    import JpegImagePlugin
+-    import McIdasImagePlugin
+-    import MicImagePlugin
+-    import MpegImagePlugin
+-    import MspImagePlugin
+-    import PalmImagePlugin
+-    import PcdImagePlugin
+-    import PcxImagePlugin
+-    import PdfImagePlugin
+-    import PixarImagePlugin
+-    import PngImagePlugin
+-    import PpmImagePlugin
+-    import PsdImagePlugin
+-    import SgiImagePlugin
+-    import SpiderImagePlugin
+-    import SunImagePlugin
+-    import TgaImagePlugin
+-    import TiffImagePlugin
+-    import WmfImagePlugin
+-    import XbmImagePlugin
+-    import XpmImagePlugin
+-    import XVThumbImagePlugin
++    import PIL.ArgImagePlugin as ArgImagePlugin
++    import PIL.BmpImagePlugin as BmpImagePlugin
++    import PIL.BufrStubImagePlugin as BufrStubImagePlugin
++    import PIL.CurImagePlugin as CurImagePlugin
++    import PIL.DcxImagePlugin as DcxImagePlugin
++    import PIL.EpsImagePlugin as EpsImagePlugin
++    import PIL.FitsStubImagePlugin as FitsStubImagePlugin
++    import PIL.FliImagePlugin as FliImagePlugin
++    import PIL.FpxImagePlugin as FpxImagePlugin
++    import PIL.GbrImagePlugin as GbrImagePlugin
++    import PIL.GifImagePlugin as GifImagePlugin
++    import PIL.GribStubImagePlugin as GribStubImagePlugin
++    import PIL.Hdf5StubImagePlugin as Hdf5StubImagePlugin
++    import PIL.IcnsImagePlugin as IcnsImagePlugin
++    import PIL.IcoImagePlugin as IcoImagePlugin
++    import PIL.ImImagePlugin as ImImagePlugin
++    import PIL.ImtImagePlugin as ImtImagePlugin
++    import PIL.IptcImagePlugin as IptcImagePlugin
++    import PIL.JpegImagePlugin as JpegImagePlugin
++    import PIL.McIdasImagePlugin as McIdasImagePlugin
++    import PIL.MicImagePlugin as MicImagePlugin
++    import PIL.MpegImagePlugin as MpegImagePlugin
++    import PIL.MspImagePlugin as MspImagePlugin
++    import PIL.PalmImagePlugin as PalmImagePlugin
++    import PIL.PcdImagePlugin as PcdImagePlugin
++    import PIL.PcxImagePlugin as PcxImagePlugin
++    import PIL.PdfImagePlugin as PdfImagePlugin
++    import PIL.PixarImagePlugin as PixarImagePlugin
++    import PIL.PngImagePlugin as PngImagePlugin
++    import PIL.PpmImagePlugin as PpmImagePlugin
++    import PIL.PsdImagePlugin as PsdImagePlugin
++    import PIL.SgiImagePlugin as SgiImagePlugin
++    import PIL.SpiderImagePlugin as SpiderImagePlugin
++    import PIL.SunImagePlugin as SunImagePlugin
++    import PIL.TgaImagePlugin as TgaImagePlugin
++    import PIL.TiffImagePlugin as TiffImagePlugin
++    import PIL.WmfImagePlugin as WmfImagePlugin
++    import PIL.XbmImagePlugin as XbmImagePlugin
++    import PIL.XpmImagePlugin as XpmImagePlugin
++    import PIL.XVThumbImagePlugin as XVThumbImagePlugin
+     Image._initialized=2
+ # WA: end
+--- photofilmstrip-1.9.91-orig/photofilmstrip/core/PILBackend.py	2012-01-13 15:26:36.000000000 +0200
++++ photofilmstrip-1.9.91/photofilmstrip/core/PILBackend.py	2013-06-10 20:36:00.427888547 +0300
+@@ -22,7 +22,8 @@
+ import logging
+ import cStringIO
+ 
+-import Image, ImageDraw
++import PIL.Image as Image
++import PIL.ImageDraw as ImageDraw
+ 
+ from photofilmstrip.core.Picture import Picture
+ 
diff --git a/media-video/photofilmstrip/photofilmstrip-1.9.91-r1.ebuild b/media-video/photofilmstrip/photofilmstrip-1.9.91-r1.ebuild
new file mode 100644
index 000000000000..ee0f2ac91f51
--- /dev/null
+++ b/media-video/photofilmstrip/photofilmstrip-1.9.91-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/photofilmstrip/photofilmstrip-1.9.91-r1.ebuild,v 1.1 2013/06/15 15:41:28 floppym Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_{6,7} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="Movie slideshow creator using Ken Burns effect"
+HOMEPAGE="http://www.photofilmstrip.org"
+SRC_URI="mirror://sourceforge/photostoryx/${PN}/${PV}-unstable/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="cairo sdl"
+
+RDEPEND="dev-python/wxpython:2.8[cairo?,${PYTHON_USEDEP}]
+	virtual/python-imaging[${PYTHON_USEDEP}]
+	media-video/mplayer[encode]
+	sdl? ( dev-python/pygame[${PYTHON_USEDEP}] )"
+
+DEPEND="${RDEPEND}"
+
+# Fix bug #472774 (https://bugs.gentoo.org/show_bug.cgi?id=472774)
+PATCHES=(
+	"${FILESDIR}/${P}-PIL_modules_imports_fix.patch"
+)
+
+DOCS=( CHANGES COPYING README )
+
+src_prepare() {
+	# Remove unneeded icon resources update needing running X
+	sed -i \
+        -e '/self\._make_resources\(\)/d' \
+        setup.py
+
+	# Fix desktop file entry
+	sed -i \
+        -e '/^Version.*/d' \
+        data/photofilmstrip.desktop
+
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	# Do not compress the apps help files
+	docompress -x  /usr/share/doc/${PN}
+
+	distutils-r1_src_install
+}