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

Package-Manager: portage-2.1.9.44/cvs/Linux x86_64

4 files changed, 76 insertions, 13 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/Manifest b/media-video/lives/Manifest
index b1fae6408c20..17f8fbee19f6 100644
--- a/media-video/lives/Manifest
+++ b/media-video/lives/Manifest
@@ -1,18 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 DIST LiVES-1.0.0.tar.bz2 2781862 RMD160 0bdb9c2f912c5a15b4352352d882f5d3b62798cd SHA1 3d68b4fccab650d6a8d14c59eb2b28c931891613 SHA256 17b18391ef4873da2a07ddd1e7288a497052a70e326f17d6c6295ed765c601c4
-EBUILD lives-1.0.0.ebuild 1594 RMD160 19da4b04203f20388e2fe4fc29441f335dccfc0a SHA1 19cecd392a1457b2940c2df4f52fab5a68ccbc03 SHA256 a8ed3a0fd61be7f53d35a0eb6cfb222f9c16ac3704d400ce98ec100842c92fd8
-MISC ChangeLog 4203 RMD160 8820dc19fc3126399f01dfb867d4e4d73ae9cc2e SHA1 e67a475fa9ade3ed896629146097ab810116aae8 SHA256 9e943371720b4e9e2b67c60060311d9437e1ad8b514dc92b82bfa8b803951f0d
+DIST LiVES-1.4.2.tar.bz2 3116692 RMD160 425a4d62014bf0ca646f606321192a70945bd055 SHA1 4f432b16400daad9017f37abf14399b930e7e388 SHA256 f5036daa07496a19fb117a4ca25462b16aeb026c3a8b47226ac86188d4ea9811
+EBUILD lives-1.0.0.ebuild 1580 RMD160 ee31da6824cec1e976d6cf44b69b7a55e622eb8d SHA1 8b781b7f9bcb6eece045aa39e7bb603814aef7c1 SHA256 da43a19762cc3be7d63f067da71f73e930b9c6d6e97636692138e83c2ca5d97c
+EBUILD lives-1.4.2.ebuild 1550 RMD160 e5fa56cb7a02c70641e09836ad35c1f054fb43c7 SHA1 b080366fe4271303149c90d851b1e0a20acd17a6 SHA256 a5cbd82574ace4a0113b78d5388549c0a8c1216186351cd1cb6ec329b1b3010f
+MISC ChangeLog 4414 RMD160 52de01df7fc897170e5cc29f3b0eae25fffe308d SHA1 ac1cdfef5ccb12bf15f348082110c54300f93202 SHA256 45a8f7b6204708e78e366d2dabab8336c3d659986f979680b3132e011acb014f
 MISC metadata.xml 305 RMD160 56aca1392bb785b378c019d73f727615c872ca8d SHA1 f8f046e301348ddff86afbc63591e087e63b94fb SHA256 3bdae23d81481e833af249e9ee4872ee56c7d2f7b19cbefe59fcbc5b0cc49930
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJNibIqAAoJEEqz6FtPBkyjY6AIAIL6CSmZZO6QrxKbuSbYxbUM
-zUkov0FoHQFZMtwookYmrRE9vCx698sMehaH9t36S8ik3E2tZZYJwZFhz5YgdZ7y
-AgBlRcMbg/nHXomBT+hjuDc6MfPuGOt3n4ZcEvclK2r9xCrYrVY+dO5csvzd3t2s
-KGsXy5h+8Rr5WeMT+aXMWsqqXXkGX26lMWX0kK2VnQFCNZW+SXC9PNBiVfDXWRzt
-DKUqZWAX0cShJ1BDTqegtvdQzBZd/AhkyNvFsT2H4Nk27g7TFNgMhA0CZgCGV0pr
-sz8mPmLEsSUhrYyIoVOm61jqihnF8UDltWUXxrvEaW/ZOxrSOiRNHf9qay5DKVU=
-=qCMT
+iF4EAREIAAYFAk2ZwhYACgkQcXOrnRGRc45q+AEAsAWDryfDMgyb3P0TEmLqySny
+W23J8q1Emxx/SpFp5XQA/j2yv6yjfRxOB06RPJrxOa4UkgtGbWP8hOQVDa4IA4y8
+=jHwr
 -----END PGP SIGNATURE-----
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
+}