Version bump, move to virtual/ffmpeg, it cannot use mplayer2 yet since it uses mencoder

(Portage version: 2.1.9.44/cvs/Linux x86_64)

3 files changed, 68 insertions, 3 deletions

diff --git a/media-video/lives/ChangeLog b/media-video/lives/ChangeLog
index e0732ded6dc0..f99bfbe71350 100644
--- a/media-video/lives/ChangeLog
+++ b/media-video/lives/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/lives
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/lives/ChangeLog,v 1.30 2011/03/23 08:41:07 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/lives/ChangeLog,v 1.31 2011/04/04 13:05:26 lu_zero Exp $
+
+*lives-1.4.2 (04 Apr 2011)
+
+  04 Apr 2011; Luca Barbato <lu_zero@gentoo.org> lives-1.0.0.ebuild,
+  +lives-1.4.2.ebuild:
+  Version bump, move to virtual/ffmpeg, it cannot use mplayer2 yet since it
+  uses mencoder
 
   23 Mar 2011; Tim Harder <radhermit@gentoo.org> -lives-0.9.8.6.ebuild,
   -lives-0.9.8.12.ebuild, lives-1.0.0.ebuild:
diff --git a/media-video/lives/lives-1.0.0.ebuild b/media-video/lives/lives-1.0.0.ebuild
index 559f48c9c08d..e1ecc8c88dc9 100644
--- a/media-video/lives/lives-1.0.0.ebuild
+++ b/media-video/lives/lives-1.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/lives/lives-1.0.0.ebuild,v 1.3 2011/03/23 08:41:07 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/lives/lives-1.0.0.ebuild,v 1.4 2011/04/04 13:05:26 lu_zero Exp $
 
 EAPI=1
 
@@ -22,7 +22,7 @@ DEPEND=">=media-video/mplayer-0.90-r2
 		>=dev-lang/perl-5.8.0-r12
 		>=x11-libs/gtk+-2.2.1:2
 		media-libs/libsdl
-		>=media-video/ffmpeg-0.4.8
+		virtual/ffmpeg
 		virtual/jpeg
 		>=media-sound/sox-12.17.3-r3
 		virtual/cdrtools
diff --git a/media-video/lives/lives-1.4.2.ebuild b/media-video/lives/lives-1.4.2.ebuild
new file mode 100644
index 000000000000..d5dc9445b6b6
--- /dev/null
+++ b/media-video/lives/lives-1.4.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/lives/lives-1.4.2.ebuild,v 1.1 2011/04/04 13:05:26 lu_zero Exp $
+
+EAPI=2
+
+inherit flag-o-matic
+
+MY_P="LiVES-${PV}"
+DESCRIPTION="LiVES is a Video Editing System"
+HOMEPAGE="http://lives.sf.net"
+SRC_URI="http://www.xs4all.nl/~salsaman/lives/current/${MY_P}.tar.bz2"
+	# sf.net only has rpms for this version
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE="matroska ogg theora libvisual nls" #sdl jack dv"
+
+DEPEND=">=media-video/mplayer-0.90-r2
+		>=media-gfx/imagemagick-5.5.6
+		>=dev-lang/perl-5.8.0-r12
+		>=x11-libs/gtk+-2.2.1:2
+		media-libs/libsdl
+		virtual/ffmpeg
+		virtual/jpeg
+		>=media-sound/sox-12.17.3-r3
+		virtual/cdrtools
+		theora? ( media-libs/libtheora )
+		>=dev-lang/python-2.3.4
+		matroska? ( media-video/mkvtoolnix
+					media-libs/libmatroska )
+		ogg? ( media-sound/ogmtools )
+		>=media-video/mjpegtools-1.6.2
+		libvisual? ( media-libs/libvisual )
+		media-sound/jack-audio-connection-kit
+		sys-libs/libavc1394"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# hardcoding -03 is wrong!
+	sed -i -e "s:-O3::g" \
+		"${S}"/{libweed,lives-plugins/{plugins/{decoders,playback/video},weed-plugins{,/gdk}},src}/Makefile.* || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable libvisual) \
+		$(use_enable nls) \
+		|| die "configure failed"
+}
+
+src_install() {
+	dodir /usr/share/pixmaps
+	dodir /usr/share/applications
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS FEATURES GETTING.STARTED
+}