media-video/photofilmstrip: bump to vn. 2.1.0

PIL_modules_imports_fix.patch updated to new verion,
patch and diff for ebuild supplied by proxy maintainer via

Gentoo bug: #563166

Package-Manager: portage-2.2.26

3 files changed, 156 insertions, 0 deletions

diff --git a/media-video/photofilmstrip/Manifest b/media-video/photofilmstrip/Manifest
index 5c6179a43a5d..112a21ec5132 100644
--- a/media-video/photofilmstrip/Manifest
+++ b/media-video/photofilmstrip/Manifest
@@ -1 +1,2 @@
 DIST photofilmstrip-1.9.91.tar.gz 23599455 SHA256 0c5a7e571213892b736d56aefc24b18ae1c908aa29ece3080948651999cfb46e SHA512 de4718b1090cdee39cc20f9181ca7afffb291ae922385652f8657fdfc826176e7dbc357f4805ffb55cd814456399a326ee2bf3b669e342a9ea9aec0bd503ae81 WHIRLPOOL 8f39a69cf0450ce86a4af82eecac9fb9c46a83d99f6f1a094a8b6d30687ecac94e0ac027c78d372705987989bb51448972ebff982585876875297558161f4433
+DIST photofilmstrip-2.1.0.tar.gz 243163 SHA256 6889ea2f909a6f5115ddcf14b9b69a7c3cee2bb0277e5093ece750b3018882d5 SHA512 e3cbf19d73d6cc16dcef23c11d84e5bfd1d0721cb72bb4d775390152be2fb20cab14912a9e0e73ef2d9dba9c041883591df2708cdeb7e7447cbcb18e750ea142 WHIRLPOOL 6bf4626e705a296a58ef13d463100c773e274a582b235935bb9aeb6d0aaef1ec052ed51084513ec94a93fe3ef426d9999ae7ec00b9e91855d202d0fa692ac117
diff --git a/media-video/photofilmstrip/files/photofilmstrip-2.1.0-PIL_modules_imports_fix.patch b/media-video/photofilmstrip/files/photofilmstrip-2.1.0-PIL_modules_imports_fix.patch
new file mode 100644
index 000000000000..989459775413
--- /dev/null
+++ b/media-video/photofilmstrip/files/photofilmstrip-2.1.0-PIL_modules_imports_fix.patch
@@ -0,0 +1,91 @@
+--- photofilmstrip-2.1.0-orig/photofilmstrip/core/__init__.py
++++ photofilmstrip-2.1.0/photofilmstrip/core/__init__.py
+@@ -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
diff --git a/media-video/photofilmstrip/photofilmstrip-2.1.0.ebuild b/media-video/photofilmstrip/photofilmstrip-2.1.0.ebuild
new file mode 100644
index 000000000000..44b1cebab8e0
--- /dev/null
+++ b/media-video/photofilmstrip/photofilmstrip-2.1.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="Movie slideshow creator using Ken Burns effect"
+HOMEPAGE="http://www.photofilmstrip.org"
+SRC_URI="mirror://sourceforge/photostoryx/${PN}/${PV}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="cairo sdl"
+
+RDEPEND="dev-python/wxpython:2.8[cairo?,${PYTHON_USEDEP}]
+	dev-python/pillow[${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 app doc/help files paths
+	sed -i \
+         -e "s:\(os\.path\.join(\"share\", \"doc\", \"\)photofilmstrip:\1${PF}:" \
+         setup.py
+	sed -i \
+         -e "s:\"photofilmstrip\":\"${PF}\":" \
+         photofilmstrip/gui/HelpViewer.py
+
+	# Fix desktop file entry
+	sed -i \
+        -e '/^Version.*/d' \
+        data/photofilmstrip.desktop
+
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	doman docs/manpage/*
+
+	# Do not compress the apps help files
+	docompress -x  /usr/share/doc/${PF}/${PN}.hh{c,k,p}
+
+	distutils-r1_src_install
+}