Version bump wrt #376367 by tman, including upstream patch for building against libv4l instead of v4l1 from linux-headers wrt #361943 by Jouni Rinne. Use python2 instead of python wrt #315053 by Arfrever Frehtes Taifersar Arahesis. Fix imagemagick vs. graphicsmagick dependencies wrt #314337 by Wojciech Porczyk.

Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64

3 files changed, 96 insertions, 7 deletions

diff --git a/media-video/lives/ChangeLog b/media-video/lives/ChangeLog
index f99bfbe71350..c5c82123e6c7 100644
--- a/media-video/lives/ChangeLog
+++ b/media-video/lives/ChangeLog
@@ -1,6 +1,15 @@
 # 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.31 2011/04/04 13:05:26 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/lives/ChangeLog,v 1.32 2011/09/30 19:13:53 ssuominen Exp $
+
+*lives-1.4.6 (30 Sep 2011)
+
+  30 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> +lives-1.4.6.ebuild:
+  Version bump wrt #376367 by tman, including upstream patch for building
+  against libv4l instead of v4l1 from linux-headers wrt #361943 by Jouni Rinne.
+  Use python2 instead of python wrt #315053 by Arfrever Frehtes Taifersar
+  Arahesis. Fix imagemagick vs. graphicsmagick dependencies wrt #314337 by
+  Wojciech Porczyk.
 
 *lives-1.4.2 (04 Apr 2011)
 
diff --git a/media-video/lives/Manifest b/media-video/lives/Manifest
index 17f8fbee19f6..114e436d8539 100644
--- a/media-video/lives/Manifest
+++ b/media-video/lives/Manifest
@@ -1,16 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 DIST LiVES-1.0.0.tar.bz2 2781862 RMD160 0bdb9c2f912c5a15b4352352d882f5d3b62798cd SHA1 3d68b4fccab650d6a8d14c59eb2b28c931891613 SHA256 17b18391ef4873da2a07ddd1e7288a497052a70e326f17d6c6295ed765c601c4
 DIST LiVES-1.4.2.tar.bz2 3116692 RMD160 425a4d62014bf0ca646f606321192a70945bd055 SHA1 4f432b16400daad9017f37abf14399b930e7e388 SHA256 f5036daa07496a19fb117a4ca25462b16aeb026c3a8b47226ac86188d4ea9811
+DIST LiVES-1.4.6.tar.bz2 3086311 RMD160 8a3da63940f3449479b393cd1718c4842fa9c01e SHA1 6e5aa19ab29247d73d85be4924ad4bb50b863764 SHA256 67fb57571b80da680463f53f4e1aa2ac92d88f9437b7c9feb048faef7e617d59
 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
+EBUILD lives-1.4.6.ebuild 1937 RMD160 550722411d031cd38dab639db05f0d42b9cb170b SHA1 66f1c714c8dca33bc311e1c27c64a6292adcf308 SHA256 5ae3428ad46aa752550d701f5f76452deb6a38f929d308acf4f75692e0c50f05
+MISC ChangeLog 4843 RMD160 199c051954e2a3bd2358f378d926a9177e10b010 SHA1 9f513eae73025593752348125ea4d42170a2a8a8 SHA256 c1a71c63f49e28ac44cab80bbaa0edd6f7c314c7556372e2de05e01431e8befe
 MISC metadata.xml 305 RMD160 56aca1392bb785b378c019d73f727615c872ca8d SHA1 f8f046e301348ddff86afbc63591e087e63b94fb SHA256 3bdae23d81481e833af249e9ee4872ee56c7d2f7b19cbefe59fcbc5b0cc49930
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk2ZwhYACgkQcXOrnRGRc45q+AEAsAWDryfDMgyb3P0TEmLqySny
-W23J8q1Emxx/SpFp5XQA/j2yv6yjfRxOB06RPJrxOa4UkgtGbWP8hOQVDa4IA4y8
-=jHwr
+iQEcBAEBAgAGBQJOhhUZAAoJEEdUh39IaPFN7rsH/i2h1BGyk7vEqqqIFcogbpod
+tjnA3pAom3T6zfJQelm8lo94SyvJJhnzvtUqECAzFebBh4vpv4UQYvNs8gnj/yKW
+NFKGtHTjqaCOnDZuxgTJt2+nyz5zzAYTzzF638jw+PWCpCek0YypSYdLGETvcmjk
+AVs06cTFF8KDfzCMsxpSEt3Hb8+f2e6gl02OcfLOvPEEtKNBNzMIDpgJ+FHcoaAE
+Rgik2tPBalTppLZ90EI2TfREMCZsAEEnmV8k7MsbzKAJ+QF2ROd8KnLIuSstHKS7
+oNWH9KayuSkHQ7NpskQHFf3CdgOTTddEQWBkZDDxB5CH+r5neyV0AjbHldpzWTk=
+=ul1B
 -----END PGP SIGNATURE-----
diff --git a/media-video/lives/lives-1.4.6.ebuild b/media-video/lives/lives-1.4.6.ebuild
new file mode 100644
index 000000000000..c9765830b32a
--- /dev/null
+++ b/media-video/lives/lives-1.4.6.ebuild
@@ -0,0 +1,74 @@
+# 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.6.ebuild,v 1.1 2011/09/30 19:13:53 ssuominen Exp $
+
+EAPI=4
+inherit eutils
+
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="libvisual matroska nls ogg theora" # static-libs
+
+# FIXME (incomplete workaround in place):
+# !!<${CATEGORY}/${PF} is because if you have lives installed, the bundled
+# libweed never gets installed in second emerge
+# See also bug 295293
+RDEPEND="media-video/mplayer
+	|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
+	dev-lang/perl
+	>=dev-libs/glib-2.14
+	>=x11-libs/gtk+-2.16:2
+	media-libs/libsdl
+	media-libs/libv4l
+	virtual/ffmpeg
+	virtual/jpeg
+	media-sound/sox
+	virtual/cdrtools
+	|| ( dev-lang/python:2.7 dev-lang/python:2.6 )
+	media-plugins/frei0r-plugins
+	media-sound/jack-audio-connection-kit
+	>=media-video/mjpegtools-1.6.2
+	sys-libs/libavc1394
+	libvisual? ( media-libs/libvisual )
+	matroska? ( media-video/mkvtoolnix )
+	ogg? ( media-sound/ogmtools )
+	theora? ( media-libs/libtheora )
+	!!<${CATEGORY}/${PF}"
+DEPEND="${DEPEND}
+	dev-util/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+DOCS=( AUTHORS BUGS ChangeLog FEATURES GETTING.STARTED NEWS README )
+
+src_prepare() {
+	esvn_clean
+
+	# Use python 2.x as per reference in plugins
+	sed -i \
+		-e '/#!.*env/s:python:python2:' \
+		lives-plugins/plugins/encoders/multi_encoder* \
+		lives-plugins/marcos-encoders/lives_*_encoder* || die
+
+}
+
+src_configure() {
+	# $(use_enable static-libs static)
+	econf \
+		--disable-static \
+		$(use_enable libvisual) \
+		$(use_enable nls)
+}
+
+src_install() {
+	default
+	find "${ED}"usr -name '*.la' -exec rm -f {} +
+	# use static-libs ||
+	rm -f "${ED}"usr/lib*/libweed-*.a
+}