add epatch_user, fix deps, proxy for maintainer

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0xAABEFD55)

8 files changed, 33 insertions, 10 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 580aea70cf53..ad1644780a5d 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.928 2015/02/02 06:03:37 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.929 2015/02/16 02:16:22 dlan Exp $
+
+  15 Feb 2015; Yixun Lan <dlan@gentoo.org> vlc-2.1.2.ebuild, vlc-2.1.4.ebuild,
+  vlc-2.1.5.ebuild, vlc-2.1.5-r1.ebuild, vlc-2.1.9999.ebuild,
+  vlc-2.2.9999.ebuild, vlc-9999.ebuild:
+  add epatch_user, fix deps, proxy for maintainer
+  1) corrected dependency on ffmpeg: avcodec interface from ffmpeg-2.5 is not
+  supported by vlc-2.1. Fixes bug 539856 reported by b1254633. 2) fix missng
+  on libva while enable USE=vaapi
 
   02 Feb 2015; Michał Górny <mgorny@gentoo.org> vlc-2.1.5-r1.ebuild:
   Re-add missing dep on libva, reported by Arfrever.
diff --git a/media-video/vlc/vlc-2.1.2.ebuild b/media-video/vlc/vlc-2.1.2.ebuild
index 2dac90bd3d9a..98fa81a12cc7 100644
--- a/media-video/vlc/vlc-2.1.2.ebuild
+++ b/media-video/vlc/vlc-2.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.2.ebuild,v 1.21 2015/01/30 05:25:45 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.2.ebuild,v 1.22 2015/02/16 02:16:22 dlan Exp $
 
 EAPI="5"
 
@@ -239,6 +239,8 @@ src_prepare() {
 		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
 	fi
 
+	epatch_user
+
 	eautoreconf
 
 	# Disable automatic running of tests.
diff --git a/media-video/vlc/vlc-2.1.4.ebuild b/media-video/vlc/vlc-2.1.4.ebuild
index ffe5bbf9c1d0..92d9e068e1c0 100644
--- a/media-video/vlc/vlc-2.1.4.ebuild
+++ b/media-video/vlc/vlc-2.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.4.ebuild,v 1.16 2015/01/30 05:25:45 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.4.ebuild,v 1.17 2015/02/16 02:16:22 dlan Exp $
 
 EAPI="5"
 
@@ -240,6 +240,8 @@ src_prepare() {
 		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
 	fi
 
+	epatch_user
+
 	eautoreconf
 
 	# Disable automatic running of tests.
diff --git a/media-video/vlc/vlc-2.1.5-r1.ebuild b/media-video/vlc/vlc-2.1.5-r1.ebuild
index 28a06b18c221..62056629b1a6 100644
--- a/media-video/vlc/vlc-2.1.5-r1.ebuild
+++ b/media-video/vlc/vlc-2.1.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.5-r1.ebuild,v 1.2 2015/02/02 06:03:37 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.5-r1.ebuild,v 1.3 2015/02/16 02:16:22 dlan Exp $
 
 EAPI="5"
 
@@ -65,7 +65,7 @@ RDEPEND="
 		alsa? ( >=media-libs/alsa-lib-1.0.24:0 )
 		avahi? ( >=net-dns/avahi-0.6:0[dbus] )
 		avcodec? (
-			!libav? ( media-video/ffmpeg:0= )
+			!libav? ( <media-video/ffmpeg-2.5:0= )
 			libav? ( media-video/libav:0= )
 		)
 		avformat? (
@@ -259,6 +259,8 @@ src_prepare() {
 	# Disable a bogus check
 	sed -i "s:libavcodec < 56:libavcodec < 57:g" configure.ac || die
 
+	epatch_user
+
 	eautoreconf
 
 	# Disable automatic running of tests.
diff --git a/media-video/vlc/vlc-2.1.5.ebuild b/media-video/vlc/vlc-2.1.5.ebuild
index fff8fbf2d13b..e34ae7f658c7 100644
--- a/media-video/vlc/vlc-2.1.5.ebuild
+++ b/media-video/vlc/vlc-2.1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.5.ebuild,v 1.9 2015/01/30 05:25:45 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.5.ebuild,v 1.10 2015/02/16 02:16:22 dlan Exp $
 
 EAPI="5"
 
@@ -243,6 +243,8 @@ src_prepare() {
 	# Disable a bogus check
 	sed -i "s:libavcodec < 56:libavcodec < 57:g" configure.ac || die
 
+	epatch_user
+
 	eautoreconf
 
 	# Disable automatic running of tests.
diff --git a/media-video/vlc/vlc-2.1.9999.ebuild b/media-video/vlc/vlc-2.1.9999.ebuild
index d501833d4972..20c95556eccd 100644
--- a/media-video/vlc/vlc-2.1.9999.ebuild
+++ b/media-video/vlc/vlc-2.1.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.9999.ebuild,v 1.32 2015/02/01 23:27:53 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.9999.ebuild,v 1.33 2015/02/16 02:16:22 dlan Exp $
 
 EAPI="5"
 
@@ -65,7 +65,7 @@ RDEPEND="
 		alsa? ( >=media-libs/alsa-lib-1.0.24:0 )
 		avahi? ( >=net-dns/avahi-0.6:0[dbus] )
 		avcodec? (
-			!libav? ( media-video/ffmpeg:0= )
+			!libav? ( <media-video/ffmpeg-2.5:0= )
 			libav? ( media-video/libav:0= )
 		)
 		avformat? (
@@ -153,6 +153,7 @@ RDEPEND="
 		upnp? ( net-libs/libupnp:0 )
 		v4l? ( media-libs/libv4l:0 )
 		vaapi? (
+			x11-libs/libva:0[X]
 			!libav? ( media-video/ffmpeg:0=[vaapi] )
 			libav? ( media-video/libav:0=[vaapi] )
 		)
@@ -255,6 +256,8 @@ src_prepare() {
 		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
 	fi
 
+	epatch_user
+
 	eautoreconf
 
 	# Disable automatic running of tests.
diff --git a/media-video/vlc/vlc-2.2.9999.ebuild b/media-video/vlc/vlc-2.2.9999.ebuild
index d2c36cad91e3..50307a50af2b 100644
--- a/media-video/vlc/vlc-2.2.9999.ebuild
+++ b/media-video/vlc/vlc-2.2.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.2.9999.ebuild,v 1.9 2015/02/01 23:27:53 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.2.9999.ebuild,v 1.10 2015/02/16 02:16:22 dlan Exp $
 
 EAPI="5"
 
@@ -262,6 +262,8 @@ src_prepare() {
 		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
 	fi
 
+	epatch_user
+
 	eautoreconf
 
 	# Disable automatic running of tests.
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 9c8037cc10fd..74b05fa5a74d 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.232 2015/02/01 23:27:53 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.233 2015/02/16 02:16:22 dlan Exp $
 
 EAPI="5"
 
@@ -262,6 +262,8 @@ src_prepare() {
 		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
 	fi
 
+	epatch_user
+
 	eautoreconf
 
 	# Disable automatic running of tests.