Stabilise 0.8.0-r1 as it works even with older libva. Drop older binary-only release.

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0x8EEE3BE8

5 files changed, 27 insertions, 68 deletions

diff --git a/x11-libs/xvba-video/ChangeLog b/x11-libs/xvba-video/ChangeLog
index b9c2371ace21..d4e64cf9bcb3 100644
--- a/x11-libs/xvba-video/ChangeLog
+++ b/x11-libs/xvba-video/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/xvba-video
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xvba-video/ChangeLog,v 1.13 2013/02/04 19:09:19 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xvba-video/ChangeLog,v 1.14 2013/03/09 10:45:29 scarabeus Exp $
+
+  09 Mar 2013; Tomáš Chvátal <scarabeus@gentoo.org> -xvba-video-0.8.0.ebuild,
+  xvba-video-0.8.0-r1.ebuild, xvba-video-9999.ebuild:
+  Stabilise 0.8.0-r1 as it works even with older libva. Drop older binary-only
+  release.
 
   04 Feb 2013; Tomáš Chvátal <scarabeus@gentoo.org>
   +files/xvba-video-fix-mesa-gl.h.patch, xvba-video-0.8.0-r1.ebuild,
diff --git a/x11-libs/xvba-video/Manifest b/x11-libs/xvba-video/Manifest
index b64316efe841..dfba9afeedcb 100644
--- a/x11-libs/xvba-video/Manifest
+++ b/x11-libs/xvba-video/Manifest
@@ -3,27 +3,24 @@ Hash: SHA256
 
 AUX xvba-video-fix-mesa-gl.h.patch 716 SHA256 dfca7a791d22baefeb9b0b7e6b7f8baad0d1f1785c35d1e43019b4a9c5949204 SHA512 103b424161c17c82bf02a35008603db5b17059e77937b9a7727517da6c3e6c211023cb62fe09cdd5035447209c8c10ed293879e576b1b5c7bcae303d79536adb WHIRLPOOL 590e52fd91658d7272940d0265d20e28b06c0f0e43d7c0b2f5764751855e6a31671b94c330b734505843873c7cc00a7656a07d7be285ad0c2571c649d0a30fa7
 DIST xvba-driver-0.8.0.tar.bz2 80424 SHA256 bd56e64c619732956fe3e900520a704de90c1849f0b0e0ab6b8db5ff695d38a2 SHA512 1e968f6123c5563f5dfc1f01cd2b7ed9b3f6afa9cf93b50b2079b1408670f6048f8d6b6d47c1ebbad1defc3600788ddf85a93bee772d90e05a8769ff19e2425b WHIRLPOOL df19706f84c17c6141e9a3cacec230012767b8fb06117477b95ed4b511b52321e9092455d927ff4147b1a951aea234d35575758fd69ba577ade131fb27d79da1
-DIST xvba-video-0.8.0.i686.tar.gz 58245 SHA256 947b186722a2ac22888c7e0d3f6df20335bb2f40fe1383c35b9b17e93287a5ea
-DIST xvba-video-0.8.0.x86_64.tar.gz 64524 SHA256 ffc64d1614d2868495b2181cfda85ada905b2812b84c0d245c864edbbd9339af
-EBUILD xvba-video-0.8.0-r1.ebuild 1399 SHA256 4a3ad963a69a159a39564fb80d1cbc61eae76055861a8e634245faef54f14cec SHA512 bfb9fa5d9db05c51f33acca470dedfd16f948772698d489c8c524ee44ab683ddc4aae59b7950b8c3b4c22888e1d6270fe6b6a9c1a3f4cdb09289c645e1c8adc4 WHIRLPOOL 7dd987091ce6df09fadf20705ff9365224e8ff73467736dbc3ee81f31423ffacb9227555d410c1cff9ee4c39b3810e8022b2dcff91102f47cf427dfa7b9adef9
-EBUILD xvba-video-0.8.0.ebuild 1089 SHA256 894068748e62865451aefb4f9de3e0a7bee433f1a02a721c30b196691b959cae SHA512 212dcca10ab30bb96ac1be45e29e87e9ca1e1684bc1f7ea292b74cb7933e945d2cd19c12f7a1d96f730277b98e754cdea1cc45efc92062c31d349222411cdf6d WHIRLPOOL 7526ec5e89668e76e9cd6247f291d8dca453d3663842ceb1b2be623eac91770c2d05aee1fb76d497f7c3ddf6a45d8e64f9bb306b8398384bbaaeeca107d28880
-EBUILD xvba-video-9999.ebuild 1280 SHA256 00cfd1907d2ed456ec8cce99413db447eb3e63472c92097c1d8cb72c87d5bf05 SHA512 6243e19387850e9c740d180660700f31f279e73dc19406813a449531cf2856db337640332ab14a4f390d182c709eac87b43c4debe9f9e36c9f9e681bd51c72dc WHIRLPOOL 986fc839bf22e1f4b86bf04ac0c8536f9a3e070e62465461c201c3ac225de6dfd0a28f216820eadd7d18680efed9faf1e6f382424095d59b486b7f73e42709bd
-MISC ChangeLog 2259 SHA256 cf290a924357f96a1b877b5c4ae08b7ff80afd784ba736c926226c1b12d8c0d8 SHA512 2f104f7fcaa428f1b9217b369505ba9fd85ae0e7ae67f2de8cd72c60b19ddb63299af3d41f459762af0a7db4997777295e045b615e29f20f2d1e02e4802ed1b1 WHIRLPOOL 7f75dd0ff77c12e243389e4ddc30364c884449b97b8ecb5ef648a4e17e4ca0d901c371f334f78bae2328f104a8f8099b52cea5aeaa00d2f5e4bb72d3440e583f
+EBUILD xvba-video-0.8.0-r1.ebuild 1392 SHA256 c7fa6bec1b752f05ab00a8d4bbe673c2e7eb48d2f74d374c5963b9d73ad6eda9 SHA512 013ad46b98f0c7936493672753be91abb6d1d2756908b2ee0556487158f3b8ca2874d8c02bc4382c119f8ab520bff1db98c7688ad8a8dd6c0311b4d5f8516e8f WHIRLPOOL 6002510477aead8f5a54e8e363b7a666b3e26ce99da5922326fc91dae75e77131d5b19b305f2239141d0506533e55cf6486d22e1c1aa10e501a5ef65511ded22
+EBUILD xvba-video-9999.ebuild 1275 SHA256 54cfd141ed7ba16cfad6e14370cbfa17d769377610a910fcd0dfdc9260f00faa SHA512 fb5fb01e09d35569ae200ac8d9b8b97c1eb6329d5b8ec9f04ee5c9dca0f75d75b5b8d28503417e2e3f1fd83d3f483f4b4467507697018f0232b453593094bb80 WHIRLPOOL 90bb4ba14cc6100ece0d58434d4cb624804fca257b9e287ce1708a4e708e690df6b88604ce30147f9dd926dfd2308157655844ffa6a294cea6ae6a267224d4df
+MISC ChangeLog 2485 SHA256 cb99fc0982a0660214ebe391a925ecbb9fb5007558c10ac99b3fda35d67deb3a SHA512 7770aa399bdf805145aae9635da07a29924a4e00851b410d0a9c5bf17d9127df0a1043bf267530fb9aa4e7cdebb117f091ac5ce9bee8382bda316d214f3a2744 WHIRLPOOL 74e7cb32361b47defa44ea5fdfcb4c682be5e5332d04b5327406318f1235990ef41790f52e8513de4c3f7ac61dad844a4497ef84e83f1a4c0e38ef8387d110fa
 MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJREAdhAAoJEOSiRoyO7jvon+gQAIfzQ0ZfzFjo2Xm/z2QprMQa
-4IQv0pQXk7/QC8oYaaxfXsDbjpTgetp7Ez+q0wIcB1rI0Mi6dpGjxzu+tAfj0sIX
-Al/toYpwHJdpewkmkQgyI0PUhYG4pTb/AWJMAKTGGmEGPv9KQwCWBIbDxm+xYrVg
-vdmcux8DX8NuZkHppVbVYLeMUirOITghnbcyl91Kpr49hNePKt8bi5Y5iEJuags/
-CN9Go9LM7f+Dy6DuQkgLeiR9raX/52Fq+JoDVaqeqwCK4f5hTaHK1+I3WktXlhl6
-5UGkNjlu5vZH21IVVhJG8Ph/5tIRI/jWJWwPYrliq2rIhVi2knGeJhe3OQ6sJAqs
-/4v3qNgXmv/lGSO/MKCkX5TVHd0CmRrNNpAGCMk3cFyYvlZUE3WHWRqYoZS/krWh
-9TlV2ZWQC/duWt715u/T1Za+LjW+RkWx34Uy53IdLSBJcSJzdP4hGIKxaBIXweIU
-PPp679YDUJY7Srbv2Ne4Ujc97hy8QpYYSy5lh+7V8IbOmYVUrTOS+15Ua1t5E0mQ
-00TOPL4zgE1Ui6MpZBrRxek8fKOOtiEOp71Pb3M3F9AixKtPE4XeTrAmdSn/xrfY
-rJV6kCUIAGe6KfXxEp6/xt4kB0MIfZoaJx5T95cnK+fimiHit9rs6pBypMNpZTRp
-n0x0WVXblB+LRRn6UU5c
-=M98t
+iQIcBAEBCAAGBQJROxLaAAoJEOSiRoyO7jvoqDoP/2z0uDVLcUQK2r+qs1PW3Bkf
+tk79z+nmkzdaWhcrCMJvYWdv03hLL2iOMQmxpNhfSMiKTJyZ1wnpbnQZVjWdlcYT
+6BfY+UPZu7wgs4t2W4HL0H7WDP0G2k+1b/OvNfv+kHxEVgwMTiHcMZuVO7Lt3/EH
+LHEaADvgrvep1quHtK7n8ivoNX1qZGN4NZCJqGeaf9yKz0gJ33AfQpPQGcquKUQH
+5awxWBmk1zeCycD1AN2/J+NTRdgFoHgDFBc6ONRZiNq2Hnn2kJDY6fr0Sknnetgt
+OEpZMEE3JpqrkKE+FhKXYrrbG+yufOW6O80TR5qniChtR24x8993zZ6v+PA9cXLB
+kibz8e1blQLlQsS8m2HnBYTqkNAFOada0UeJbq8fIZnQKZk9mFaw49C0E6SFyjYv
+ZHIia0Jdob9jkVH4Q7mUUMWmFXq7Dly6wRVSXZr+WCpPT3eYE/qTH/E24Sfjs3aB
+sW2Cxm+AEU5LACwHGIHQ06P/wyurk7glzN78v/Q1COg6lpVVHDRLWTpLxnPIFG72
+fjBMv7NlQ5dYHmRgp+wUz30g/2wVzroybhn+MI2Kaug/Cg25mmKiGTAftrW6z3p2
+bUXWrKHwNFSZ33lK7FnlGD6hh+LzZeSz482dl+v5XVcDb9RkNUfNxCqjMCYKOIc2
+xDAxnBBr36jFEkLt7HmM
+=srPu
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/xvba-video/xvba-video-0.8.0-r1.ebuild b/x11-libs/xvba-video/xvba-video-0.8.0-r1.ebuild
index f20915f9db5c..bb69800fc425 100644
--- a/x11-libs/xvba-video/xvba-video-0.8.0-r1.ebuild
+++ b/x11-libs/xvba-video/xvba-video-0.8.0-r1.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/xvba-video/xvba-video-0.8.0-r1.ebuild,v 1.5 2013/02/04 19:09:19 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xvba-video/xvba-video-0.8.0-r1.ebuild,v 1.6 2013/03/09 10:45:29 scarabeus Exp $
 
 EAPI=5
 
@@ -19,11 +19,11 @@ LICENSE="GPL-2+ MIT"
 SLOT="0"
 # newline is needed for broken ekeyword
 [[ ${PV} = 9999 ]] || \
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug opengl"
 
 RDEPEND="
-	>=x11-libs/libva-1.1.0[X,opengl?]
+	x11-libs/libva[X(+),opengl?]
 	x11-libs/libvdpau
 	x11-drivers/ati-drivers
 "
diff --git a/x11-libs/xvba-video/xvba-video-0.8.0.ebuild b/x11-libs/xvba-video/xvba-video-0.8.0.ebuild
deleted file mode 100644
index 30bae6a5b6ac..000000000000
--- a/x11-libs/xvba-video/xvba-video-0.8.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xvba-video/xvba-video-0.8.0.ebuild,v 1.4 2012/12/26 11:33:31 ulm Exp $
-
-EAPI=4
-
-inherit multilib
-
-x86name="${P}.i686"
-amd64name="${P}.x86_64"
-
-DESCRIPTION="XVBA Backend for Video Acceleration (VA) API"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi/"
-SRC_URI="
-	amd64? ( http://www.splitted-desktop.com/~gbeauchesne/${PN}/${amd64name}.tar.gz )
-	x86? ( http://www.splitted-desktop.com/~gbeauchesne/${PN}/${x86name}.tar.gz )
-"
-
-LICENSE="GPL-2+ MIT"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-
-RDEPEND="x11-libs/libva[opengl]
-	x11-drivers/ati-drivers"
-DEPEND=""
-
-S=${WORKDIR}
-
-# TODO: ignore QA warning about ldflags since this is binary
-QA_PRESTRIPPED="
-	usr/lib\(32\|64\)\?/va/drivers/xvba_drv_video.so
-	usr/lib\(32\|64\)\?/va/drivers/fglrx_drv_video.so
-"
-
-src_install() {
-	use x86 && cd "${x86name}"
-	use amd64 && cd "${amd64name}"
-
-	dodoc AUTHORS NEWS README
-	exeinto /usr/$(get_libdir)/va/drivers/
-	doexe usr/lib/va/drivers/*
-}
diff --git a/x11-libs/xvba-video/xvba-video-9999.ebuild b/x11-libs/xvba-video/xvba-video-9999.ebuild
index 499b27402e66..5458992a3df0 100644
--- a/x11-libs/xvba-video/xvba-video-9999.ebuild
+++ b/x11-libs/xvba-video/xvba-video-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/xvba-video/xvba-video-9999.ebuild,v 1.5 2013/02/04 19:09:19 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xvba-video/xvba-video-9999.ebuild,v 1.6 2013/03/09 10:45:29 scarabeus Exp $
 
 EAPI=5
 
@@ -22,7 +22,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="debug opengl"
 
 RDEPEND="
-	>=x11-libs/libva-1.1.0[X,opengl?]
+	x11-libs/libva[X(+),opengl?]
 	x11-libs/libvdpau
 	x11-drivers/ati-drivers
 "