version bump and mpeg2enc has been renamed upstream so we dont need to rename it anymore

Package-Manager: portage-2.2.0_alpha185/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

4 files changed, 96 insertions, 9 deletions

diff --git a/x11-libs/libva/ChangeLog b/x11-libs/libva/ChangeLog
index ac1df8de9b06..32673111d8fb 100644
--- a/x11-libs/libva/ChangeLog
+++ b/x11-libs/libva/ChangeLog
@@ -1,6 +1,13 @@
 # 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.53 2013/06/27 13:59:58 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/ChangeLog,v 1.54 2013/06/29 03:43:38 aballier Exp $
+
+*libva-1.2.1 (29 Jun 2013)
+
+  29 Jun 2013; Alexis Ballier <aballier@gentoo.org> +libva-1.2.1.ebuild,
+  libva-9999.ebuild:
+  version bump and mpeg2enc has been renamed upstream so we dont need to rename
+  it anymore
 
   27 Jun 2013; Alexis Ballier <aballier@gentoo.org> libva-1.0.15.ebuild,
   libva-1.0.16.ebuild, libva-1.1.0.ebuild, libva-1.1.1.ebuild,
diff --git a/x11-libs/libva/Manifest b/x11-libs/libva/Manifest
index 895b95a8e3c0..565a5c8cf45e 100644
--- a/x11-libs/libva/Manifest
+++ b/x11-libs/libva/Manifest
@@ -7,18 +7,20 @@ DIST libva-1.0.16.tar.bz2 496776 SHA256 a9a39a2b92eeab73c517de7e6b841c2840b040ea
 DIST libva-1.1.0.tar.bz2 728879 SHA256 db6adc24a6f02f234a823dd8ced4a7e38084581f4ae02b6aac10716e523cefa8 SHA512 3ae73e789a26b6d2eee0a38a5e1dc7f06430dbca5ca73785295ca5a1bcc0bdc0ca2423e481e1304203471b55369faf62b2a234daa6370edc7ca8013affb6eaee WHIRLPOOL 27e6d4648aa2eddf2846f57a1300f97820dd013675bd173a019b9a8b1ccf343109a13df822f8581012020451a35cb485974f97be55bf8d2f131a8988e6807c1d
 DIST libva-1.1.1.tar.bz2 812302 SHA256 c0af7bf3e96e19fbd0513fbf461a010638907136b5ee0d68094fa0cc7e66cd4d SHA512 5ded27982e0bdb4f83bf3b183da73e5cdcb72752875a05658991f024e86973d6e11c941346fa015236d3d80ce7c515c323094782a9b48a34b881cae145bb6253 WHIRLPOOL 93712aec8321df6e2e1a2678d13281321eb7a91df582a9651a57e2421d00c9df368e3286e73389b7c43ef114565ab7066df7d5ccdbaa2f2be74a249c1ea4c79f
 DIST libva-1.2.0.tar.bz2 914646 SHA256 15c6d69ba52d4313e8c9f8bf8bbe2a7211ab03966f3beaafb4448e517418e1c4 SHA512 e45bc48a778515fea01461115802bea625999050d6e37c6bf4d5ae006c03763d577a8d4b812a912d416f0a7e321f67b94018c4a50994a68b5281f38c81108d9e WHIRLPOOL 2f16cd8830e8cd2cadc583edc8a2fd1268026354520eb73a23073d254e21b85b5404d679d540ef9f4a8ca9930ee749c709cf7c7cc167ae91296e4a6809d9918e
+DIST libva-1.2.1.tar.bz2 915262 SHA256 70080f8b260ca4316f7e100f2ce15ad3e2356a2b9eff951278085ff8d48ea83b SHA512 20a24e65169da97c03501abfd1dc59e92de5388b3d395e82cedfed0ff6d1ac888ec5c356e879c21a1f5ddf048c112a9a8cb61b6ffa155a62ae10aab909db15c9 WHIRLPOOL f7cc4d2f4dbf78a5fd7349440aeceb6e1e5f28f46fe651474f296bd97a1be91cf2fb96c3e53e552f63200e59d6fc9b2e2b3634a04626662742e7262cab5f5e69
 EBUILD libva-1.0.15.ebuild 1698 SHA256 4b4233129b3ba73343c32b5dc549b555e714b9e718dfeed42eac8bf90a76332c SHA512 b1c2914a4885f7bcee2345da434e0a6c34f2a6f8da116d213d36e62256ad8ded736dcb587d4b33c0c07981b02ef30a784ae3e50e01023f588b44a2e0997c1242 WHIRLPOOL b39a53d01deb2b804a61feeb477532e420da27dbd8b37279d27383e01e835ca6d34e9f4b4b7857d86ab0d6f2f8c0f18225032a8c6e415ab08715f354f4950e19
 EBUILD libva-1.0.16.ebuild 1709 SHA256 51de1752e2fb62bd1624cb77f63c8a14bb84bda2ab94a24069953c2233b78134 SHA512 1d3e1f8285dbd06c7863c0c40c59a4049c5dfec91452a044aba17408439cfeffee0f690f861674fbe3a7afe704442ba2461cf328536b8c99af990aa68622dded WHIRLPOOL 229e9aa1f5b753906f571bbcfd6d4ca2553e54b2976060fb390f6dd84333ab78fb9d8ceaee5743513e3066bfcc32b1f55cac4e96f541146556b1b7dd79a9364b
 EBUILD libva-1.1.0.ebuild 1932 SHA256 634e7f50cd3a52c0394b84fdc3dcb5c85a5db342b4b79d0deab1be9d2c2345e9 SHA512 521006edabcdb447a863eaeeb08d38595e7e034c5c035f1f88dbba7883c1aed6a1a013e5c6f60c90d6c75a2976375de9d5920d5f10e2e02fb42fabc5da017187 WHIRLPOOL eb2e29397f0e9822b2287fb72b2447abcdf1208d53b596fb615dc2abbbd70136fc19bee8b1b5f01f13e806ed01e2b67e62d72439bf03cd2a7937919d6a5d75e3
 EBUILD libva-1.1.1.ebuild 1911 SHA256 7889f7e04e38a5d6a4a1dda01ae4382996597a2fb179fad33e3c784dfbcc3b4f SHA512 8be3916ee2b1ec0749dbb149475c29e1a9e59fb7917723a053c53b16f0cd19481cada63da2f68d0ab9d6b34ec02a22ad21a84c4221f68b40f77b33663ebd4219 WHIRLPOOL 1f443afc5ec9c783408f62de2d2400dc460a4894ef6b214d3cf684fc6ac166bde00fd2d0f7725034286793477f844068507e4e23ea415dd10d25b85882435505
 EBUILD libva-1.2.0.ebuild 2005 SHA256 c54bef8418968923d9eed608381344ac22b46dfcbfe3f33650872b61217ab911 SHA512 357ccfe827089c9da51f2c8f5ea287a8e93c45e9e0cc5206f55a10a1e5d989d69e3ed578d346ffad6f9734b5f700a6af66254c2165b3d15a8fdfc3a2284fa194 WHIRLPOOL febdaab5244c087dc0c4e03c25fbd9998ebbee38361c6586db6b4bda6af82f217f0d79cc84131613e5d9b9933dedc07e1ad99384418cb48fce628c679e48d6ce
-EBUILD libva-9999.ebuild 2005 SHA256 3d285eb5ba2a018f303adc0e58a6f70de6b09495299a113981a4037990ad1254 SHA512 6505e552301274d4df58013240e633c99a7477720d89941eff2ad9e2c6ebf7f30d606b95b1f6fd04e9b54075c7899974f8a031e1fc034f815e9a1a2810a90d2f WHIRLPOOL c73c02d72b7c1b1d6e61962de6eff2dac6ae3c12701d375e783f95ed926449627d10cac79d69318456db2499edecddd2f9b88f7dc831c8951e34496d695b0189
-MISC ChangeLog 7925 SHA256 780a4d599a5a81bfb47a16d8505bf5dbc97e40b14743cb2cc7ef5654e223677c SHA512 b2a645d730d3e776d1cbeac964b02f469ca8d32ffae27d1cc3681dcb5b05e63ecfc8b9f9e6d88d294276679e7655fda293cfb1fabba652624ab1787e6d822b2f WHIRLPOOL f1833be3162e621c60062e9f4c8afe32328afad28bff9edace97e9464538f408093eb71dd4ab416334c253d005e5edbb9e73eb9638432a7c138219fa247b7d9e
+EBUILD libva-1.2.1.ebuild 1911 SHA256 aae07077c7f80fcd7ec6bfbe5a626fc7972811c52f5e04093dfa66530b1271d9 SHA512 24e00cf6c814af99d742ee8b6f2f5539814f1ccb81f759956cfaf0ecf870a93dce66f86b546aea51e63fc87369a4775d933f128b30654c0464d6cfb0881b891b WHIRLPOOL 54aa7a38f7e347b610c310000985e64a7ffe0b24155c983afcc4a89043f475ccab0697879087ea2210714496b85f8befa05206d828d975522317be8625308386
+EBUILD libva-9999.ebuild 1911 SHA256 11f85a52911b220adcba673229e12a754871b5dd43a82d779cbad3ea9dc11fa4 SHA512 a86144fdc5e052c5fd911d47cb15b270c26b1e0125fbe726bbeedcef52e598e313bf23c5ddee124395f0c3623a87b7f9067e673336f6e156bb1e14915f31316e WHIRLPOOL 199d1b685b9098000a9ab36194018567902d3248e0b19a4409a95b25e574bf61cd58d2d87074f09437c2228cde9c04e1ab67db40b33b4d8fd0c61b534ca2b1a3
+MISC ChangeLog 8141 SHA256 8fb081e8662473c5afc1077cec477325eb62dc7f8bec417dc15180e58b88b8ee SHA512 383256e8dadc021629f05e16682a3b5cd4ca10912993a882ac0928378e6df001b8d7a7065457abde1d2689d967f11c473aac1e8711e64b0755855c4ba41a36a8 WHIRLPOOL 151c9723b5c785a0efbed0d9f0efe4958c047eebbaa66d3d2879e70b664f7f95cc3a0e42b3d336cf3b81668a505787743dc886cd49e18695dd32a79cf9ff85b1
 MISC metadata.xml 360 SHA256 89b04f6b5df8b32ce52e950dd6861ab8b27c56ee9187b511b07d557d583d47b9 SHA512 ffbf3e513601bcd30a21371790c4379136de2193246881e8b01d19ffe837fa387ab0277ff8d3e0218157ca1c070a9eb74c0f22cb4be4b9620b41c54746b738d1 WHIRLPOOL 0592d5c21a3c6e73a1b8debab4bc8e2f1f9ca48fdc0e2a0459656de4befd71e763ac3d961936e936443f1a80beedf9b99c8061728b534085587a6136ec1b55fd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHMRV8ACgkQvFcC4BYPU0pgZQCfb1azXcbBJI9rDG2043R3rtiB
-VHgAn3TB0KkqfSAUAifWa9LX0toEqcfL
-=bht1
+iEYEAREIAAYFAlHOV+sACgkQvFcC4BYPU0oRxQCbBbVNJAQSh1w0Pz/qqiv65T0h
+q5oAoMtvzy8L5u4K9RV0mh/El12JbbIJ
+=J12t
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/libva/libva-1.2.1.ebuild b/x11-libs/libva/libva-1.2.1.ebuild
new file mode 100644
index 000000000000..3b97003ead1b
--- /dev/null
+++ b/x11-libs/libva/libva-1.2.1.ebuild
@@ -0,0 +1,80 @@
+# 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.1.ebuild,v 1.1 2013/06/29 03:43:38 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 vdpau 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 )
+	vdpau? ( 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
+}
diff --git a/x11-libs/libva/libva-9999.ebuild b/x11-libs/libva/libva-9999.ebuild
index f9e00bbad0f1..631f6448dfe7 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.17 2013/06/27 13:59:58 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-9999.ebuild,v 1.18 2013/06/29 03:43:38 aballier Exp $
 
 EAPI=4
 
@@ -77,6 +77,4 @@ 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
 }