[gentoo-commits] dev/lordvan:master commit in: media-video/openshot/

[Thomas Raschbacher]

commit:     b25639d07206c61be65df1f6faad7f1ba7c0312e
Author:     Thomas Raschbacher <lordvan <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 30 13:58:15 2012 +0000
Commit:     Thomas Raschbacher <lordvan <AT> gentoo <DOT> org>
CommitDate: Thu Aug 30 13:58:15 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/lordvan.git;a=commit;h=b25639d0

add digest

---
 media-video/openshot/Manifest              |    6 +++-
 media-video/openshot/openshot-1.2.2.ebuild |   36 ++++++++++++++--------------
 media-video/openshot/openshot-1.4.1.ebuild |    4 +-
 3 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/media-video/openshot/Manifest b/media-video/openshot/Manifest
index 7db9b57..c02ec3c 100644
--- a/media-video/openshot/Manifest
+++ b/media-video/openshot/Manifest
@@ -1,2 +1,4 @@
-DIST openshot-1.2.2.tar.gz 16192987 RMD160 737ca66a7ccf01ee000fc30691d164f1fbee1788 SHA1 6c0098ecb3d8fecc286760be3b37140504a8e6fc SHA256 e61f5b898a163ab90cca00f4c83dcab9570fe43c7c6d420b9e846a24b0aa8cf1
-EBUILD openshot-1.2.2.ebuild 1783 RMD160 08f253e20f4507c1b4367aa5edb119d9d3f4728c SHA1 6eb612759a89d56795b3ddb1943a5fc1e4553982 SHA256 4aa3ed4c6aa28b52ff414e8c735e3f653b468bd14acb5d1654f0e528d6ed2463
+DIST openshot-1.2.2.tar.gz 16192987 SHA256 e61f5b898a163ab90cca00f4c83dcab9570fe43c7c6d420b9e846a24b0aa8cf1 SHA512 525292c603ec07b9450df9ec15ea799d6e536e806ca53527d7c4def0e447d8b467c9ca5f4852c77025c15f22056b75a073b41d2987681c092e2d00feb81b597f WHIRLPOOL df95677b488e8f13a0cf4cf9188a7d7e77173ef5eb1314007a387642d5b49388c3d7a26929969aa630fc595a825fc4cbc6a9fcb15d0d7b717b6b9c719720a91d
+DIST openshot-1.4.1.tar.gz 35354993 SHA256 367f8b6e852c55da86cd6f76a3715f91bebc849eb5300aa256f65be5df0a0ffd SHA512 2eba19674fb5990048c3aecca4290b3b02ed5bbc58e22ec4cb54f4691a84852caaef2d21ff27ebe18d6eadcaff2ca634bb881ac25b8abc669dcc68f8f2db486b WHIRLPOOL b66172947551b3868d6a12875a5c4ba3bc14c63be9cecf9a1ceac6002a5e265f82977c4aa488472aeb81b16173f70a987880dc15bbee03a4fbaf5cda5a7faa78
+EBUILD openshot-1.2.2.ebuild 1976 SHA256 99b480f1142edb93a6f5ac3b6238ffad75c13a9e63f9f1e9e0d7fa2a4a2b69ba SHA512 397019bb98156247c0c803348aa0eb861ff841905dcf4da2b9bc859244cdaf8a96a15ce68187f2b6d5cd8300b9a51407e5914e17a055f9a47ac778346a1b0ebb WHIRLPOOL a5815e657a7c23f981ef83c447e2796e87f747774f4481dceacb6a12a07e101dc3939c04d9fdb3ad1ed056b4b48025c707e952f8580ede790c72c986f0fd137e
+EBUILD openshot-1.4.1.ebuild 1976 SHA256 99b480f1142edb93a6f5ac3b6238ffad75c13a9e63f9f1e9e0d7fa2a4a2b69ba SHA512 397019bb98156247c0c803348aa0eb861ff841905dcf4da2b9bc859244cdaf8a96a15ce68187f2b6d5cd8300b9a51407e5914e17a055f9a47ac778346a1b0ebb WHIRLPOOL a5815e657a7c23f981ef83c447e2796e87f747774f4481dceacb6a12a07e101dc3939c04d9fdb3ad1ed056b4b48025c707e952f8580ede790c72c986f0fd137e

diff --git a/media-video/openshot/openshot-1.2.2.ebuild b/media-video/openshot/openshot-1.2.2.ebuild
index 5890700..4227e43 100644
--- a/media-video/openshot/openshot-1.2.2.ebuild
+++ b/media-video/openshot/openshot-1.2.2.ebuild
@@ -2,36 +2,33 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="xml"
+EAPI=2
 
-inherit distutils fdo-mime python
+PYTHON_DEPEND=2:2.5
+PYTHON_USE_WITH=xml
+
+inherit distutils fdo-mime python versionator
 
 DESCRIPTION="OpenShot Video Editor is a non-linear video editor"
 HOMEPAGE="http://www.openshotvideo.com"
-SRC_URI="http://launchpad.net/openshot/1.2/${PV}/+download/${P}.tar.gz"
+SRC_URI="http://launchpad.net/openshot/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="dv faac faad flac ieee1394 mp3 ogg quicktime theora vorbis wavpack x264 \
-xvid"
+IUSE="dv faac faad flac ieee1394 mp3 ogg quicktime theora vorbis wavpack x264 xvid"
 
-CDEPEND="
+DEPEND=""
+RDEPEND="
 	>=x11-libs/gtk+-2.18
 	dev-python/pygtk
 	dev-python/pygoocanvas
 	dev-python/pyxdg
-	dev-python/librsvg-python"
-
-RDEPEND="${CDEPEND}
-	media-libs/mlt[dv?,ffmpeg,frei0r,gtk,melt,python,quicktime?,sdl,vorbis?,xml]
+	dev-python/librsvg-python
+	>=media-libs/mlt-0.4.6-r1[dv?,ffmpeg,frei0r,gtk,melt,python,quicktime?,sdl,vorbis?,xml,kde]
 	media-sound/sox[encode,ffmpeg,flac?,ogg?,wavpack?]
-	media-video/ffmpeg[encode,faac?,faad?,ieee1394?,mp3?,sdl,theora?,vorbis?,\
-x264?,xvid?]"
-
-DEPEND="${CDEPEND}"
+	>=media-video/ffmpeg-0.6[encode,faac?,faad?,ieee1394?,mp3?,sdl,theora?,vorbis?,vpx,x264?,xvid?]
+	"
 
 pkg_setup() {
 	python_set_active_version 2
@@ -42,11 +39,15 @@ src_prepare() {
 	python_convert_shebangs -q -r 2 .
 	distutils_src_prepare
 
+	# Disable the installation of the mime.types file.
+	# The .desktop file would be used to update the mime database.
+	sed -ie '/launcher/,+1d' setup.py || die
+
 	# Avoid stuff covered by fdo-mime.eclass
 	# (update-mime-database update-desktop-database update-mime)
 	# export "FAKEROOTKEY=gentoo" does not work as this variable is filtered
 	# by portage
-	sed -i -e '/FAILED = /q' setup.py
+	sed -ie '/FAILED = /,$d' setup.py || die
 }
 
 # TODO: check stuff installed to /usr/lib/python2.6/site-packages as there are
@@ -66,4 +67,3 @@ pkg_postrm() {
 	fdo-mime_desktop_database_update
 	distutils_pkg_postrm
 }
-

diff --git a/media-video/openshot/openshot-1.4.1.ebuild b/media-video/openshot/openshot-1.4.1.ebuild
index 8aa738b..4227e43 100644
--- a/media-video/openshot/openshot-1.4.1.ebuild
+++ b/media-video/openshot/openshot-1.4.1.ebuild
@@ -7,11 +7,11 @@ EAPI=2
 PYTHON_DEPEND=2:2.5
 PYTHON_USE_WITH=xml
 
-inherit distutils fdo-mime python
+inherit distutils fdo-mime python versionator
 
 DESCRIPTION="OpenShot Video Editor is a non-linear video editor"
 HOMEPAGE="http://www.openshotvideo.com"
-SRC_URI="http://launchpad.net/openshot/1.2/${PV}/+download/${P}.tar.gz"
+SRC_URI="http://launchpad.net/openshot/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"