version bump and avoid collision with media-video/mjpegtools

(Portage version: 2.2.0_alpha185/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

3 files changed, 91 insertions, 2 deletions

diff --git a/x11-libs/libva/ChangeLog b/x11-libs/libva/ChangeLog
index ce7bb9b69743..c251ec26bea9 100644
--- a/x11-libs/libva/ChangeLog
+++ b/x11-libs/libva/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/libva
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/ChangeLog,v 1.51 2013/06/19 19:34:54 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/ChangeLog,v 1.52 2013/06/26 19:06:36 aballier Exp $
+
+*libva-1.2.0 (26 Jun 2013)
+
+  26 Jun 2013; Alexis Ballier <aballier@gentoo.org> +libva-1.2.0.ebuild,
+  libva-9999.ebuild:
+  version bump and avoid collision with media-video/mjpegtools
 
   19 Jun 2013; Alexis Ballier <aballier@gentoo.org> libva-1.1.1.ebuild,
   libva-9999.ebuild, metadata.xml:
diff --git a/x11-libs/libva/libva-1.2.0.ebuild b/x11-libs/libva/libva-1.2.0.ebuild
new file mode 100644
index 000000000000..7f86d0af66dd
--- /dev/null
+++ b/x11-libs/libva/libva-1.2.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-1.2.0.ebuild,v 1.1 2013/06/26 19:06:36 aballier Exp $
+
+EAPI=4
+
+SCM=""
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SCM=git-2
+	EGIT_BRANCH=master
+	EGIT_REPO_URI="git://anongit.freedesktop.org/vaapi/libva"
+fi
+
+inherit autotools ${SCM} multilib
+
+DESCRIPTION="Video Acceleration (VA) API for Linux"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SRC_URI=""
+	S="${WORKDIR}/${PN}"
+else
+	SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva/${P}.tar.bz2"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+if [ "${PV%9999}" = "${PV}" ] ; then
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+else
+	KEYWORDS=""
+fi
+IUSE="+drm egl opengl wayland X"
+REQUIRED_USE="|| ( drm wayland X )"
+
+VIDEO_CARDS="dummy nvidia intel fglrx"
+for x in ${VIDEO_CARDS}; do
+	IUSE+=" video_cards_${x}"
+done
+
+RDEPEND=">=x11-libs/libdrm-2.4
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXfixes
+	)
+	egl? ( media-libs/mesa[egl] )
+	opengl? ( virtual/opengl )
+	wayland? ( >=dev-libs/wayland-1 )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+PDEPEND="video_cards_nvidia? ( x11-libs/libva-vdpau-driver )
+	video_cards_fglrx? ( x11-libs/xvba-video )
+	video_cards_intel? ( >=x11-libs/libva-intel-driver-1.0.18 )
+	"
+
+REQUIRED_USE="opengl? ( X )"
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-silent-rules \
+		--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers" \
+		$(use_enable video_cards_dummy dummy-driver) \
+		$(use_enable opengl glx) \
+		$(use_enable X x11) \
+		$(use_enable wayland) \
+		$(use_enable egl) \
+		$(use_enable drm)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc NEWS || die
+	find "${D}" -name '*.la' -delete
+	# collision with media-video/mjpegtools
+	mv "${ED}"/usr/bin/{mpeg2enc,mpeg2enc_libva} || die
+}
diff --git a/x11-libs/libva/libva-9999.ebuild b/x11-libs/libva/libva-9999.ebuild
index bd5aa5e5255e..38b6c516a9a3 100644
--- a/x11-libs/libva/libva-9999.ebuild
+++ b/x11-libs/libva/libva-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-9999.ebuild,v 1.15 2013/06/19 19:34:54 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-9999.ebuild,v 1.16 2013/06/26 19:06:36 aballier Exp $
 
 EAPI=4
 
@@ -76,4 +76,6 @@ src_install() {
 	emake DESTDIR="${D}" install || die
 	dodoc NEWS || die
 	find "${D}" -name '*.la' -delete
+	# collision with media-video/mjpegtools
+	mv "${ED}"/usr/bin/{mpeg2enc,mpeg2enc_libva} || die
 }