Gentoo Archives: gentoo-commits

From: Pacho Ramos <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/photofilmstrip/files/, media-video/photofilmstrip/
Date: Mon, 05 Jun 2017 09:45:11
Message-Id: 1496655893.0a100adf6999220f3db99b8b88edc0812aa64b8b.pacho@gentoo
1 commit: 0a100adf6999220f3db99b8b88edc0812aa64b8b
2 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jun 5 09:44:01 2017 +0000
4 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
5 CommitDate: Mon Jun 5 09:44:53 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a100adf
7
8 media-video/photofilmstrip: Drop old
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.2
11
12 media-video/photofilmstrip/Manifest | 1 -
13 ...ofilmstrip-1.9.91-PIL_modules_imports_fix.patch | 103 ---------------------
14 .../photofilmstrip/photofilmstrip-1.9.91-r1.ebuild | 52 -----------
15 .../photofilmstrip/photofilmstrip-2.1.0-r1.ebuild | 62 -------------
16 .../photofilmstrip/photofilmstrip-2.1.0.ebuild | 61 ------------
17 5 files changed, 279 deletions(-)
18
19 diff --git a/media-video/photofilmstrip/Manifest b/media-video/photofilmstrip/Manifest
20 index 112a21ec513..5c9f8f1017d 100644
21 --- a/media-video/photofilmstrip/Manifest
22 +++ b/media-video/photofilmstrip/Manifest
23 @@ -1,2 +1 @@
24 -DIST photofilmstrip-1.9.91.tar.gz 23599455 SHA256 0c5a7e571213892b736d56aefc24b18ae1c908aa29ece3080948651999cfb46e SHA512 de4718b1090cdee39cc20f9181ca7afffb291ae922385652f8657fdfc826176e7dbc357f4805ffb55cd814456399a326ee2bf3b669e342a9ea9aec0bd503ae81 WHIRLPOOL 8f39a69cf0450ce86a4af82eecac9fb9c46a83d99f6f1a094a8b6d30687ecac94e0ac027c78d372705987989bb51448972ebff982585876875297558161f4433
25 DIST photofilmstrip-2.1.0.tar.gz 243163 SHA256 6889ea2f909a6f5115ddcf14b9b69a7c3cee2bb0277e5093ece750b3018882d5 SHA512 e3cbf19d73d6cc16dcef23c11d84e5bfd1d0721cb72bb4d775390152be2fb20cab14912a9e0e73ef2d9dba9c041883591df2708cdeb7e7447cbcb18e750ea142 WHIRLPOOL 6bf4626e705a296a58ef13d463100c773e274a582b235935bb9aeb6d0aaef1ec052ed51084513ec94a93fe3ef426d9999ae7ec00b9e91855d202d0fa692ac117
26
27 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
28 deleted file mode 100644
29 index 2d5bb479da8..00000000000
30 --- a/media-video/photofilmstrip/files/photofilmstrip-1.9.91-PIL_modules_imports_fix.patch
31 +++ /dev/null
32 @@ -1,103 +0,0 @@
33 ---- photofilmstrip-1.9.91-orig/photofilmstrip/core/__init__.py 2012-01-13 15:26:36.000000000 +0200
34 -+++ photofilmstrip-1.9.91/photofilmstrip/core/__init__.py 2013-06-10 20:43:27.759638837 +0300
35 -@@ -22,47 +22,47 @@
36 - # WA: py2exe and PIL
37 - import os
38 - if os.name == "nt":
39 -- import Image
40 -+ import PIL.Image as Image
41 -
42 -- import ArgImagePlugin
43 -- import BmpImagePlugin
44 -- import BufrStubImagePlugin
45 -- import CurImagePlugin
46 -- import DcxImagePlugin
47 -- import EpsImagePlugin
48 -- import FitsStubImagePlugin
49 -- import FliImagePlugin
50 -- import FpxImagePlugin
51 -- import GbrImagePlugin
52 -- import GifImagePlugin
53 -- import GribStubImagePlugin
54 -- import Hdf5StubImagePlugin
55 -- import IcnsImagePlugin
56 -- import IcoImagePlugin
57 -- import ImImagePlugin
58 -- import ImtImagePlugin
59 -- import IptcImagePlugin
60 -- import JpegImagePlugin
61 -- import McIdasImagePlugin
62 -- import MicImagePlugin
63 -- import MpegImagePlugin
64 -- import MspImagePlugin
65 -- import PalmImagePlugin
66 -- import PcdImagePlugin
67 -- import PcxImagePlugin
68 -- import PdfImagePlugin
69 -- import PixarImagePlugin
70 -- import PngImagePlugin
71 -- import PpmImagePlugin
72 -- import PsdImagePlugin
73 -- import SgiImagePlugin
74 -- import SpiderImagePlugin
75 -- import SunImagePlugin
76 -- import TgaImagePlugin
77 -- import TiffImagePlugin
78 -- import WmfImagePlugin
79 -- import XbmImagePlugin
80 -- import XpmImagePlugin
81 -- import XVThumbImagePlugin
82 -+ import PIL.ArgImagePlugin as ArgImagePlugin
83 -+ import PIL.BmpImagePlugin as BmpImagePlugin
84 -+ import PIL.BufrStubImagePlugin as BufrStubImagePlugin
85 -+ import PIL.CurImagePlugin as CurImagePlugin
86 -+ import PIL.DcxImagePlugin as DcxImagePlugin
87 -+ import PIL.EpsImagePlugin as EpsImagePlugin
88 -+ import PIL.FitsStubImagePlugin as FitsStubImagePlugin
89 -+ import PIL.FliImagePlugin as FliImagePlugin
90 -+ import PIL.FpxImagePlugin as FpxImagePlugin
91 -+ import PIL.GbrImagePlugin as GbrImagePlugin
92 -+ import PIL.GifImagePlugin as GifImagePlugin
93 -+ import PIL.GribStubImagePlugin as GribStubImagePlugin
94 -+ import PIL.Hdf5StubImagePlugin as Hdf5StubImagePlugin
95 -+ import PIL.IcnsImagePlugin as IcnsImagePlugin
96 -+ import PIL.IcoImagePlugin as IcoImagePlugin
97 -+ import PIL.ImImagePlugin as ImImagePlugin
98 -+ import PIL.ImtImagePlugin as ImtImagePlugin
99 -+ import PIL.IptcImagePlugin as IptcImagePlugin
100 -+ import PIL.JpegImagePlugin as JpegImagePlugin
101 -+ import PIL.McIdasImagePlugin as McIdasImagePlugin
102 -+ import PIL.MicImagePlugin as MicImagePlugin
103 -+ import PIL.MpegImagePlugin as MpegImagePlugin
104 -+ import PIL.MspImagePlugin as MspImagePlugin
105 -+ import PIL.PalmImagePlugin as PalmImagePlugin
106 -+ import PIL.PcdImagePlugin as PcdImagePlugin
107 -+ import PIL.PcxImagePlugin as PcxImagePlugin
108 -+ import PIL.PdfImagePlugin as PdfImagePlugin
109 -+ import PIL.PixarImagePlugin as PixarImagePlugin
110 -+ import PIL.PngImagePlugin as PngImagePlugin
111 -+ import PIL.PpmImagePlugin as PpmImagePlugin
112 -+ import PIL.PsdImagePlugin as PsdImagePlugin
113 -+ import PIL.SgiImagePlugin as SgiImagePlugin
114 -+ import PIL.SpiderImagePlugin as SpiderImagePlugin
115 -+ import PIL.SunImagePlugin as SunImagePlugin
116 -+ import PIL.TgaImagePlugin as TgaImagePlugin
117 -+ import PIL.TiffImagePlugin as TiffImagePlugin
118 -+ import PIL.WmfImagePlugin as WmfImagePlugin
119 -+ import PIL.XbmImagePlugin as XbmImagePlugin
120 -+ import PIL.XpmImagePlugin as XpmImagePlugin
121 -+ import PIL.XVThumbImagePlugin as XVThumbImagePlugin
122 - Image._initialized=2
123 - # WA: end
124 ---- photofilmstrip-1.9.91-orig/photofilmstrip/core/PILBackend.py 2012-01-13 15:26:36.000000000 +0200
125 -+++ photofilmstrip-1.9.91/photofilmstrip/core/PILBackend.py 2013-06-10 20:36:00.427888547 +0300
126 -@@ -22,7 +22,8 @@
127 - import logging
128 - import cStringIO
129 -
130 --import Image, ImageDraw
131 -+import PIL.Image as Image
132 -+import PIL.ImageDraw as ImageDraw
133 -
134 - from photofilmstrip.core.Picture import Picture
135 -
136
137 diff --git a/media-video/photofilmstrip/photofilmstrip-1.9.91-r1.ebuild b/media-video/photofilmstrip/photofilmstrip-1.9.91-r1.ebuild
138 deleted file mode 100644
139 index 92175400c1b..00000000000
140 --- a/media-video/photofilmstrip/photofilmstrip-1.9.91-r1.ebuild
141 +++ /dev/null
142 @@ -1,52 +0,0 @@
143 -# Copyright 1999-2016 Gentoo Foundation
144 -# Distributed under the terms of the GNU General Public License v2
145 -
146 -EAPI="5"
147 -PYTHON_COMPAT=( python2_7 )
148 -PYTHON_REQ_USE="sqlite"
149 -
150 -inherit distutils-r1
151 -
152 -DESCRIPTION="Movie slideshow creator using Ken Burns effect"
153 -HOMEPAGE="http://www.photofilmstrip.org"
154 -SRC_URI="mirror://sourceforge/photostoryx/${PN}/${PV}-unstable/${P}.tar.gz"
155 -LICENSE="GPL-2"
156 -SLOT="0"
157 -
158 -KEYWORDS="~amd64 ~x86"
159 -IUSE="cairo sdl"
160 -
161 -RDEPEND="dev-python/wxpython:2.8[cairo?,${PYTHON_USEDEP}]
162 - dev-python/pillow[${PYTHON_USEDEP}]
163 - media-video/mplayer[encode]
164 - sdl? ( dev-python/pygame[${PYTHON_USEDEP}] )"
165 -
166 -DEPEND="${RDEPEND}"
167 -
168 -# Fix bug #472774 (https://bugs.gentoo.org/show_bug.cgi?id=472774)
169 -PATCHES=(
170 - "${FILESDIR}/${P}-PIL_modules_imports_fix.patch"
171 -)
172 -
173 -DOCS=( CHANGES COPYING README )
174 -
175 -src_prepare() {
176 - # Remove unneeded icon resources update needing running X
177 - sed -i \
178 - -e '/self\._make_resources\(\)/d' \
179 - setup.py
180 -
181 - # Fix desktop file entry
182 - sed -i \
183 - -e '/^Version.*/d' \
184 - data/photofilmstrip.desktop
185 -
186 - distutils-r1_src_prepare
187 -}
188 -
189 -src_install() {
190 - # Do not compress the apps help files
191 - docompress -x /usr/share/doc/${PN}
192 -
193 - distutils-r1_src_install
194 -}
195
196 diff --git a/media-video/photofilmstrip/photofilmstrip-2.1.0-r1.ebuild b/media-video/photofilmstrip/photofilmstrip-2.1.0-r1.ebuild
197 deleted file mode 100644
198 index ea403b0de35..00000000000
199 --- a/media-video/photofilmstrip/photofilmstrip-2.1.0-r1.ebuild
200 +++ /dev/null
201 @@ -1,62 +0,0 @@
202 -# Copyright 1999-2017 Gentoo Foundation
203 -# Distributed under the terms of the GNU General Public License v2
204 -
205 -EAPI="6"
206 -PYTHON_COMPAT=( python2_7 )
207 -PYTHON_REQ_USE="sqlite"
208 -DISTUTILS_SINGLE_IMPL=1
209 -
210 -inherit distutils-r1
211 -
212 -DESCRIPTION="Movie slideshow creator using Ken Burns effect"
213 -HOMEPAGE="http://www.photofilmstrip.org"
214 -SRC_URI="mirror://sourceforge/photostoryx/${PN}/${PV}/${P}.tar.gz"
215 -LICENSE="GPL-2+"
216 -SLOT="0"
217 -
218 -KEYWORDS="~amd64 ~x86"
219 -IUSE="cairo sdl"
220 -
221 -RDEPEND="dev-python/wxpython:2.8[cairo?,${PYTHON_USEDEP}]
222 - dev-python/pillow[${PYTHON_USEDEP}]
223 - media-video/mplayer[encode]
224 - sdl? ( dev-python/pygame[${PYTHON_USEDEP}] )"
225 -
226 -DEPEND="${RDEPEND}"
227 -
228 -# Fix bug #472774 (https://bugs.gentoo.org/show_bug.cgi?id=472774)
229 -PATCHES=(
230 - "${FILESDIR}/${P}-PIL_modules_imports_fix.patch"
231 - "${FILESDIR}/${P}-PIL_tostring_fix.patch"
232 -)
233 -
234 -DOCS=( CHANGES COPYING README )
235 -
236 -src_prepare() {
237 - # Remove unneeded icon resources update needing running X
238 - # Fix app doc/help files paths
239 - sed -i \
240 - -e '/self\._make_resources\(\)/d' \
241 - -e "s:\(os\.path\.join(\"share\", \"doc\", \"\)photofilmstrip:\1${PF}:" \
242 - setup.py || die
243 -
244 - sed -i \
245 - -e "s:\"photofilmstrip\":\"${PF}\":" \
246 - photofilmstrip/gui/HelpViewer.py || die
247 -
248 - # Fix desktop file entry
249 - sed -i \
250 - -e '/^Version.*/d' \
251 - data/photofilmstrip.desktop || die
252 -
253 - distutils-r1_src_prepare
254 -}
255 -
256 -src_install() {
257 - doman docs/manpage/*
258 -
259 - # Do not compress the apps help files
260 - docompress -x /usr/share/doc/${PF}/${PN}.hh{c,k,p}
261 -
262 - distutils-r1_src_install
263 -}
264
265 diff --git a/media-video/photofilmstrip/photofilmstrip-2.1.0.ebuild b/media-video/photofilmstrip/photofilmstrip-2.1.0.ebuild
266 deleted file mode 100644
267 index 47a44a77c21..00000000000
268 --- a/media-video/photofilmstrip/photofilmstrip-2.1.0.ebuild
269 +++ /dev/null
270 @@ -1,61 +0,0 @@
271 -# Copyright 1999-2016 Gentoo Foundation
272 -# Distributed under the terms of the GNU General Public License v2
273 -
274 -EAPI="6"
275 -PYTHON_COMPAT=( python2_7 )
276 -PYTHON_REQ_USE="sqlite"
277 -DISTUTILS_SINGLE_IMPL=1
278 -
279 -inherit distutils-r1
280 -
281 -DESCRIPTION="Movie slideshow creator using Ken Burns effect"
282 -HOMEPAGE="http://www.photofilmstrip.org"
283 -SRC_URI="mirror://sourceforge/photostoryx/${PN}/${PV}/${P}.tar.gz"
284 -LICENSE="GPL-2+"
285 -SLOT="0"
286 -
287 -KEYWORDS="~amd64 ~x86"
288 -IUSE="cairo sdl"
289 -
290 -RDEPEND="dev-python/wxpython:2.8[cairo?,${PYTHON_USEDEP}]
291 - dev-python/pillow[${PYTHON_USEDEP}]
292 - media-video/mplayer[encode]
293 - sdl? ( dev-python/pygame[${PYTHON_USEDEP}] )"
294 -
295 -DEPEND="${RDEPEND}"
296 -
297 -# Fix bug #472774 (https://bugs.gentoo.org/show_bug.cgi?id=472774)
298 -PATCHES=(
299 - "${FILESDIR}/${P}-PIL_modules_imports_fix.patch"
300 -)
301 -
302 -DOCS=( CHANGES COPYING README )
303 -
304 -src_prepare() {
305 - # Remove unneeded icon resources update needing running X
306 - # Fix app doc/help files paths
307 - sed -i \
308 - -e '/self\._make_resources\(\)/d' \
309 - -e "s:\(os\.path\.join(\"share\", \"doc\", \"\)photofilmstrip:\1${PF}:" \
310 - setup.py || die
311 -
312 - sed -i \
313 - -e "s:\"photofilmstrip\":\"${PF}\":" \
314 - photofilmstrip/gui/HelpViewer.py || die
315 -
316 - # Fix desktop file entry
317 - sed -i \
318 - -e '/^Version.*/d' \
319 - data/photofilmstrip.desktop || die
320 -
321 - distutils-r1_src_prepare
322 -}
323 -
324 -src_install() {
325 - doman docs/manpage/*
326 -
327 - # Do not compress the apps help files
328 - docompress -x /usr/share/doc/${PF}/${PN}.hh{c,k,p}
329 -
330 - distutils-r1_src_install
331 -}