--- /usr/portage/media-video/lives/lives-1.4.6.ebuild	2015-08-09 23:34:52.000000000 +0300
+++ /usr/local/portage/media-video/lives/lives-2.4.6.ebuild	2015-12-22 19:41:31.371758410 +0200
@@ -1,78 +1,113 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
+EAPI=5
+
 inherit autotools 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"
+HOMEPAGE="http://lives-video.com"
+SRC_URI="http://lives-video.com/releases/${MY_P}.tar.bz2"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="libvisual matroska nls ogg theora" # static-libs
+KEYWORDS="~amd64 ~x86"
+IUSE="dirac doc dv ffmpeg fftw frei0r gtk3 imagemagick jack ladspa lame libav libvisual matroska mjpeg mplayer nls oil ogg opencv opengl projectm pulseaudio theora x264 youtube"
 
-RDEPEND="media-video/mplayer
-	|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
-	dev-lang/perl
+LANGS="ar fr ca cs da ja nl_NL de_DE pt pt_BR hu es it pl tr ru zh_CN sk he en_GB fi et gl uz te ro uk oc hr ug"
+for X in ${LANGS} ; do
+	IUSE+=" linguas_${X}"
+done
+
+RDEPEND="
+	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
+	gtk3? ( >=x11-libs/gtk+-3.0:3 )
+	ffmpeg? (
+		libav? ( media-video/libav:0=[encode,sdl,mp3,theora,vorbis] )
+		!libav? ( media-video/ffmpeg:0=[encode,sdl,mp3,theora,vorbis] )
+	)
 	>=dev-libs/glib-2.14
-	>=x11-libs/gtk+-2.16:2
-	media-libs/libsdl
+	dev-lang/perl
+	dev-lang/python:*
+	sys-libs/libavc1394
 	media-libs/libv4l
-	virtual/ffmpeg
-	virtual/jpeg
+	media-libs/libpng:=
+	virtual/jpeg:62
+	media-libs/libsdl
 	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
+	dirac? ( media-video/dirac )
+	dv? ( media-libs/libdv
+		  media-video/dvgrab )
+	fftw? ( sci-libs/fftw:= )
+	frei0r? ( media-plugins/frei0r-plugins )
+	imagemagick? ( || ( media-gfx/imagemagick[jpeg,png] media-gfx/graphicsmagick[imagemagick,jpeg,png] ) )
+	jack? ( media-sound/jack-audio-connection-kit )
+	ladspa? ( media-libs/ladspa-sdk )
+	lame? ( media-sound/lame )
 	libvisual? ( media-libs/libvisual )
 	matroska? ( media-video/mkvtoolnix )
+	mjpeg? ( >=media-video/mjpegtools-1.6.2 )
+	mplayer? ( media-video/mplayer[encode,jpeg,png] )
+	oil? ( dev-libs/liboil )
 	ogg? ( media-sound/ogmtools )
-	theora? ( media-libs/libtheora )"
-DEPEND="${DEPEND}
+	opencv? ( media-libs/opencv )
+	opengl? ( virtual/opengl virtual/glu )
+	projectm? ( media-libs/libprojectm )
+	pulseaudio? ( media-sound/pulseaudio )
+	theora? ( media-libs/libtheora )
+	x264? ( media-libs/x264 )
+	youtube? ( net-misc/youtube-dl )
+	"
+DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
+	doc? ( app-doc/doxygen )
+	nls? ( sys-devel/gettext )
+	"
 
 DOCS=( AUTHORS BUGS ChangeLog FEATURES GETTING.STARTED NEWS README )
 
 src_prepare() {
-	esvn_clean
+	# Don't try to detect installed by lives copies of weed #295293
+	sed -i -e '/^PKG_CHECK_MODULES(WEED/s:true:false:' configure.ac || die
+
+	# Since we disable static - fix sendOSC static lib problem
+	sed -i -e '/^sendOSC_LDFLAGS/s:\.a:.la:' libOSC/sendOSC/Makefile.am || die
+
+	# Since we disable static - fix OSC static lib problem
+	sed -i -e '/^osc_LDADD=/s:\.a:.la:g' src/Makefile.am || die
 
-	# Don't try to detect installed copies wrt #295293
-	sed -i -e '/^PKG_CHECK_MODULES(WEED/s:true:false:' configure.in || die
-	sed -i -e '/test/s:sendOSC:dIsAbLeAuToMaGiC:' libOSC/sendOSC/Makefile.am || die
-
-	# 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
+	# Don't remove system weed
+	sed -i -e '/install-exec-hook:/,+1{s/^/#/}' libweed/Makefile.am || die
 
-	AT_M4DIR="mk/autoconf" eautoreconf # for the seds
+	AT_M4DIR="mk/autoconf" eautoreconf
 }
 
 src_configure() {
-	# $(use_enable static-libs static)
+	use doc || myconf+=" --disable-doxygen"
+	use ffmpeg || use libav || myconf+=" --disable-ffmpeg"
+	use frei0r || myconf+=" --disable-frei0r"
+	use gtk3 || myconf+=" --disable-gtk3"
+	use jack || myconf+=" --disable-jack --disable-jack-transport"
+	use ladspa || myconf+=" --disable-ladspa"
+	use libvisual || myconf+=" --disable-libvisual"
+	use mjpeg || myconf+=" --disable-mjpegtools"
+	use nls || myconf+=" --disable-nls"
+	use oil || myconf+=" --disable-liboil"
+	use opengl || myconf+=" --disable-opengl"
+	use projectm || myconf+=" --disable-projectM"
+
 	econf \
 		--disable-static \
-		$(use_enable libvisual) \
-		$(use_enable nls)
+		${myconf}
 }
 
 src_install() {
 	default
 
-	rm -f "${ED}"usr/bin/lives #384727
-	dosym lives-exe /usr/bin/lives
-
 	find "${ED}"usr -name '*.la' -exec rm -f {} +
-	# use static-libs ||
 	rm -f "${ED}"usr/lib*/libweed-*.a
 }