version bump and avoid collision with media-video/mjpegtools

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

4 files changed, 98 insertions, 7 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/Manifest b/x11-libs/libva/Manifest
index 5a96bab822bf..91134af82124 100644
--- a/x11-libs/libva/Manifest
+++ b/x11-libs/libva/Manifest
@@ -6,17 +6,19 @@ DIST libva-1.0.15.tar.bz2 488805 SHA256 7cc24ae9c947aa13904255244810d3637b03d41e
 DIST libva-1.0.16.tar.bz2 496776 SHA256 a9a39a2b92eeab73c517de7e6b841c2840b040ea685f850866fe58242cc2f161 SHA512 5c7db891d418764db9cce34175c10a84abdb649aa14cdc10df4a294ef86af707937e13a783748b547294f72d9b11aa075d871198165243bb9870f7e7b92a0019 WHIRLPOOL b388beeef6f738110e6b947a9b59e6c246217372644c9c4488aef78d2d87cfdab52a3c4e6a6c016acf46fbb9ae17aff515e247ebee57ec2a0dbee150e6d0f55a
 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
 EBUILD libva-1.0.15.ebuild 1653 SHA256 ec48b13914bcccfcece05ae3fc9bc217fc6eeaa0798948e5e292190fd9f9ac00 SHA512 c89d1e282383764572b30abdc48d0196394606682f982928936993557bc54fe9911354197db63c3a7cccac475878b0aae763a062ca51636043cae5cc359228d0 WHIRLPOOL 4ef49f5b6d965fc7f6934d4d1e0b24711f90d20098a92a706bdeaf8a0658f2a71c933c65931235bf1f790aaf81a71246e2921ee3c54739a7c6144d822dec4c6c
 EBUILD libva-1.0.16.ebuild 1664 SHA256 31b149acc9c65ed45c3ea7e8f4eaf0840b1272f8494e1cf4654d37bab77813dc SHA512 50c3a373c64050d23e9822c58ce6a86b0ae44a91cde871bfe0a456eff2b5c1e963a837fb9f8e7b06b99c00ef1488cebccc133356c772fce518ca6f18070cb5cc WHIRLPOOL d9833619016dd1b679f09ec449d00c32279cab7b5de25010d4fb898960ea6539219ed87fb8cfe344cbed49ceb6c589e0e7b6fcdfea237dafa93710c0e91ca596
 EBUILD libva-1.1.0.ebuild 1886 SHA256 f3adad856b250a8061ea1e7e0718c03c24dc4a7dfbf87506121cfac1b736afbc SHA512 4e9d94ca6a3a46c91b7b3f4cde7f1709fd5a820e3913c4441ec0d7341dc730ff219cf1fc3fd48e18577b396018c0c990c724f54e8b25a0f881c5825fa8f3130b WHIRLPOOL 5c841b403362aed5d34b30cd03f02872fbc1fb7ff9cd73b8fb34ec0df2f302e14c8dfb499fa8be600e9689d26efbbc719c7c1ab10ffdb25d336b15827365b202
 EBUILD libva-1.1.1.ebuild 1865 SHA256 2b74dcc212b462c0f4477b9368d62093e1ad5bb282fa4ccbae160c972d610624 SHA512 310e32287ce98e5f79b4e0ca1f3d056792d9e7a9d2392cb1fe949d4904fc63ec9ec3cc454f25138bd986b155cce673990ffda14bc38c56a68597555daa493b74 WHIRLPOOL 27c33d6c2874a5e1001b247171aa896f4d5d983d8d8d92ace67a2db5235d44ca53c22b10ad881c0cc1a5f93ef3f2d9038681379354262aff346958a5809a2e2e
-EBUILD libva-9999.ebuild 1865 SHA256 4b96068e79db6c7a45a876d05636f22afcc4c0d095518af33d0efac4b3fe8eb3 SHA512 a71e965f47c3337845e778637877fefc67367cef49764b35f86a8ee7708f0cfa3558146f8c7c0c4fd66c9ab54cc53fbb3e6635aafd7bd97c87913847e247dba0 WHIRLPOOL 52ede61ebe5584ff6cf478d3099c4268526d8cc68b0cb9422df1227eb5312488b03abddecf3dae4b368ac57b526f168aba2882807bcb7cf31e53a05fcb530b28
-MISC ChangeLog 7498 SHA256 63feb10b53f8450838689304a07abaf86406a2f65040093afed16d127454cfa6 SHA512 0c9f34ed5a0ebaa08140c29520f7f0d90b6dd6f1945f9226e72e44d51309d5faf0004f94e6c444730eac0b9c96ad04d548086d263b685fa9dbd6771cab3c9382 WHIRLPOOL 9a5337f20543a8ad04795692679d3055e5d0e20a60670bc70c17de5291aa3c7c0105d27c3aca14c9a10f97daf9a33f7ddfb2cd58b0a88ed5034cd4bdc4545aa4
+EBUILD libva-1.2.0.ebuild 1959 SHA256 7afee8e222627887ea29d4fb5805dbeb4cff1002b2cbb22ac9e26772277da751 SHA512 50a6efff1e2f7ec8bc97611ef15ad9b867942d7ec660678508e6ab2792249a3ce5bb612e0f514cdb550e398d9df9a913bc6a01d9942727c624d4fa69a4551a37 WHIRLPOOL fd5f35ac14ba991fc2a40ef7b635101c82ca7b74f3300930c193071fa6f20e8bdcf373ee1e0b050ce4cd129a17cf071861fb33c65d17afa7304a59102fdf3cff
+EBUILD libva-9999.ebuild 1959 SHA256 e477149757852a71d7333565fd859394db579110accbd6e95df142239d89d45c SHA512 c409ae6ef1752b7872c4ef07f62b546220f0e3fb6c2bd0ece4d49e8a698c63d549e5f9a37f92c81b8057c5b933d4f8ca4da6ca7f25a4f2408b879909d9956775 WHIRLPOOL 6ea168ba0d4c0a4789ed071846c9701d13d9103a5468e58f0726a869df468c0e7f55c229a5a0bc8cd0ad2d1b6deb37cf4a6c78988561f6f1f9a2331e0e3ca9a3
+MISC ChangeLog 7684 SHA256 28aed7911e5d25bcdef4bec93d826adf91ba0dd192aabff26a2fa3907e9c8877 SHA512 674b3a6c068b4bbd7e85c5be4725aedb42e32a1d31367b7fcc52f059585c918d4d3dae5b32465fbf1381ca2f11a94a78a879f1fcab329f36168b41ebda27624f WHIRLPOOL 97b52a6d4bee5bd79e19a54b35c93659380e4c244d547f6299ae38bc1309d3230a68d2cc001c6f8a0499d1e551202a67d57a908dce402ac803fe5ae4a7b4566f
 MISC metadata.xml 360 SHA256 89b04f6b5df8b32ce52e950dd6861ab8b27c56ee9187b511b07d557d583d47b9 SHA512 ffbf3e513601bcd30a21371790c4379136de2193246881e8b01d19ffe837fa387ab0277ff8d3e0218157ca1c070a9eb74c0f22cb4be4b9620b41c54746b738d1 WHIRLPOOL 0592d5c21a3c6e73a1b8debab4bc8e2f1f9ca48fdc0e2a0459656de4befd71e763ac3d961936e936443f1a80beedf9b99c8061728b534085587a6136ec1b55fd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHCB98ACgkQvFcC4BYPU0qieACgg8dFP67O1BJNDYL2NDZsskwm
-ZHgAnjZeiOLU9UHLo482ai7OLoZ7KVOb
-=0HPc
+iEYEAREIAAYFAlHLO70ACgkQvFcC4BYPU0rcUACeMZHTyF3lK8AimxSoUdYECe5a
+8KoAoMNDuHGD4NYdLgeRikmqHtb/gtG5
+=Aap5
 -----END PGP SIGNATURE-----
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
 }