[gentoo-commits] repo/gentoo:master commit in: media-video/photofilmstrip/

[gentoo-commits] repo/gentoo:master commit in: media-video/photofilmstrip/

[Göktürk Yüksek]

commit:     a8aecf4ec24c1004ab860a07cd9eb2e7d99b0192
Author:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  5 02:35:00 2016 +0000
Commit:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Mon Jun  6 03:02:54 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8aecf4e

media-video/photofilmstrip: fix license, combine sed, add missing die

Package-Manager: portage-2.2.28

 .../photofilmstrip/photofilmstrip-2.1.0.ebuild     | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/media-video/photofilmstrip/photofilmstrip-2.1.0.ebuild b/media-video/photofilmstrip/photofilmstrip-2.1.0.ebuild
index 44b1ceb..622804a 100644
--- a/media-video/photofilmstrip/photofilmstrip-2.1.0.ebuild
+++ b/media-video/photofilmstrip/photofilmstrip-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -12,7 +12,7 @@ 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"
+LICENSE="GPL-2+"
 SLOT="0"
 
 KEYWORDS="~amd64 ~x86"
@@ -34,22 +34,20 @@ 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
+		-e '/self\._make_resources\(\)/d' \
+		-e "s:\(os\.path\.join(\"share\", \"doc\", \"\)photofilmstrip:\1${PF}:" \
+		setup.py || die
+
 	sed -i \
-         -e "s:\"photofilmstrip\":\"${PF}\":" \
-         photofilmstrip/gui/HelpViewer.py
+		 -e "s:\"photofilmstrip\":\"${PF}\":" \
+		 photofilmstrip/gui/HelpViewer.py || die
 
 	# Fix desktop file entry
 	sed -i \
-        -e '/^Version.*/d' \
-        data/photofilmstrip.desktop
+		-e '/^Version.*/d' \
+		data/photofilmstrip.desktop || die
 
 	distutils-r1_src_prepare
 }

[gentoo-commits] repo/gentoo:master commit in: media-video/photofilmstrip/

[Michał Górny]

commit:     9d8506e07cad3be7f00f2243450247f3129ae40e
Author:     Felix Janda <felix.janda <AT> posteo <DOT> de>
AuthorDate: Fri Aug  5 16:19:25 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Aug  6 16:46:37 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d8506e0

media-video/photofilmstrip: whitespace

 media-video/photofilmstrip/photofilmstrip-1.9.91-r1.ebuild | 12 ++++++------
 media-video/photofilmstrip/photofilmstrip-2.1.0.ebuild     |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/media-video/photofilmstrip/photofilmstrip-1.9.91-r1.ebuild b/media-video/photofilmstrip/photofilmstrip-1.9.91-r1.ebuild
index 933ed5e..15ced63 100644
--- a/media-video/photofilmstrip/photofilmstrip-1.9.91-r1.ebuild
+++ b/media-video/photofilmstrip/photofilmstrip-1.9.91-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -34,20 +34,20 @@ DOCS=( CHANGES COPYING README )
 src_prepare() {
 	# Remove unneeded icon resources update needing running X
 	sed -i \
-        -e '/self\._make_resources\(\)/d' \
-        setup.py
+		-e '/self\._make_resources\(\)/d' \
+		setup.py
 
 	# Fix desktop file entry
 	sed -i \
-        -e '/^Version.*/d' \
-        data/photofilmstrip.desktop
+		-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}
+	docompress -x /usr/share/doc/${PN}
 
 	distutils-r1_src_install
 }

diff --git a/media-video/photofilmstrip/photofilmstrip-2.1.0.ebuild b/media-video/photofilmstrip/photofilmstrip-2.1.0.ebuild
index 622804a..840d045 100644
--- a/media-video/photofilmstrip/photofilmstrip-2.1.0.ebuild
+++ b/media-video/photofilmstrip/photofilmstrip-2.1.0.ebuild
@@ -56,7 +56,7 @@ src_install() {
 	doman docs/manpage/*
 
 	# Do not compress the apps help files
-	docompress -x  /usr/share/doc/${PF}/${PN}.hh{c,k,p}
+	docompress -x /usr/share/doc/${PF}/${PN}.hh{c,k,p}
 
 	distutils-r1_src_install
 }

[gentoo-commits] repo/gentoo:master commit in: media-video/photofilmstrip/

[Göktürk Yüksek]

commit:     73defb740c0a4b4ef415ff03d0f2ae236cde4d98
Author:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 10 17:27:42 2017 +0000
Commit:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Mon Apr 10 17:30:48 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73defb74

media-video/photofilmstrip: remove unresponsive proxied-maintainer

Please contact the proxy-maintainers project to reinstate maintainer
status, if still interested.

Package-Manager: Portage-2.3.3, Repoman-2.3.2

 media-video/photofilmstrip/metadata.xml | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/media-video/photofilmstrip/metadata.xml b/media-video/photofilmstrip/metadata.xml
index 168df034aef..e317c382d28 100644
--- a/media-video/photofilmstrip/metadata.xml
+++ b/media-video/photofilmstrip/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>phobosk@fastmail.fm</email>
-		<name>PhobosK</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 PhotoFilmStrip creates movies out of your pictures in just three steps.
 There are several output possibilities for VCD, SVCD, DVD up to FULL-HD.

[gentoo-commits] repo/gentoo:master commit in: media-video/photofilmstrip/

[Pacho Ramos]

commit:     bd810aeb57793691753989f65d53fbe701354436
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  5 09:43:18 2017 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Mon Jun  5 09:44:50 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd810aeb

media-video/photofilmstrip: Fix wxpython depend (#584124)

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 .../photofilmstrip/photofilmstrip-2.1.0-r2.ebuild  | 63 ++++++++++++++++++++++
 1 file changed, 63 insertions(+)

diff --git a/media-video/photofilmstrip/photofilmstrip-2.1.0-r2.ebuild b/media-video/photofilmstrip/photofilmstrip-2.1.0-r2.ebuild
new file mode 100644
index 00000000000..d20fa98d706
--- /dev/null
+++ b/media-video/photofilmstrip/photofilmstrip-2.1.0-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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:3.0[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"
+	"${FILESDIR}/${P}-PIL_tostring_fix.patch"
+)
+
+DOCS=( CHANGES COPYING README )
+
+src_prepare() {
+	# Remove unneeded icon resources update needing running X
+	# Fix app doc/help files paths
+	sed -i \
+		-e '/self\._make_resources\(\)/d' \
+		-e "s:\(os\.path\.join(\"share\", \"doc\", \"\)photofilmstrip:\1${PF}:" \
+		setup.py || die
+
+	sed -i \
+		 -e "s:\"photofilmstrip\":\"${PF}\":" \
+		 photofilmstrip/gui/HelpViewer.py || die
+
+	# Fix desktop file entry
+	sed -i \
+		-e '/^Version.*/d' \
+		data/photofilmstrip.desktop || die
+
+	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
+}