Stabilise 0.4.1-r1 on amd64 and x86. Drop overshadowed.

Package-Manager: portage-2.2.0_alpha96/cvs/Linux x86_64

4 files changed, 22 insertions, 65 deletions

diff --git a/x11-libs/libvdpau/ChangeLog b/x11-libs/libvdpau/ChangeLog
index 2d3189dd6797..edfc33ef5c4c 100644
--- a/x11-libs/libvdpau/ChangeLog
+++ b/x11-libs/libvdpau/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/libvdpau
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libvdpau/ChangeLog,v 1.20 2012/02/15 14:41:04 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libvdpau/ChangeLog,v 1.21 2012/04/01 16:51:47 scarabeus Exp $
+
+  01 Apr 2012; Tomáš Chvátal <scarabeus@gentoo.org> -libvdpau-0.4.1.ebuild,
+  libvdpau-0.4.1-r1.ebuild:
+  Stabilise 0.4.1-r1 on amd64 and x86. Drop overshadowed.
 
 *libvdpau-0.4.1-r1 (15 Feb 2012)
 
diff --git a/x11-libs/libvdpau/Manifest b/x11-libs/libvdpau/Manifest
index 2280f87ea592..372a2e65e55b 100644
--- a/x11-libs/libvdpau/Manifest
+++ b/x11-libs/libvdpau/Manifest
@@ -2,24 +2,23 @@
 Hash: SHA1
 
 DIST libvdpau-0.4.1.tar.gz 456607 RMD160 94bd82e0c1a9d1fd3854bec4718720b9bc6894f1 SHA1 d09deff305e4927bc96fca8383f991d137e64d45 SHA256 061b6f86c64912f79851bfefcac4f77b401e9a939dbbb7b1ec795bc7d5aaf59b
-EBUILD libvdpau-0.4.1-r1.ebuild 1316 RMD160 65ea3ca51f06db791f87dc77803accb00aa38c73 SHA1 03ed13a086a02e16d65ca5371d262a4983c9a7c4 SHA256 33e36548d5adc3be1e7374114490059b4a8f0d676b3ab2d7488d8cafdbe9d082
-EBUILD libvdpau-0.4.1.ebuild 1303 RMD160 9c7f802342923fde5fd067d197162487a4aad33c SHA1 8ee7c29b6e5331376bb287b5b6ca8ae0d0530606 SHA256 3f03409c884730c8d77b558590a7cad33d41ad56a2ece9f589e1e843b3482bc6
-MISC ChangeLog 3338 RMD160 c6318699dd18c5b149339036148bea17cc637aeb SHA1 0ca1f069e910f07b36a1f4e54cad6cb04ebdf318 SHA256 34d57ac84ed0dcea1b64dd207bc597cade96813d86a492ac0d6811dc3fbad51d
+EBUILD libvdpau-0.4.1-r1.ebuild 1314 RMD160 a86a5d475bb2f166b231d06925236eaa63435dad SHA1 886f734ada193b776ffd33e9d9e41949cf00ad56 SHA256 71b2f727685c0e21751b6a588013666122e6ee6dca402eb12012b49975bccfcd
+MISC ChangeLog 3504 RMD160 0d934176b4f487d2672fe185e87f30a4b7bad7f3 SHA1 2c0c73e469fdbb36a2b9705e7805ebe535fee762 SHA256 59fcdb77202b773da421633e65afde3dfeed03bba7aeaf4f4e2589bfeb2163e5
 MISC metadata.xml 233 RMD160 f42b954fe0cf1433a9195c6b6617ce8ff2dcff87 SHA1 ff77d9c3d72988c1b66b5684c37d580c4d9613c5 SHA256 4f6eb9347c8506bffb12ff1131bd8f36ce040f0507575c6756f54243776af8ce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPO8RvAAoJEOSiRoyO7jvoObEP/RhBfhCHjxMvjZdDA2s/onl3
-i4PDsEPjPCAjhbj9ToUMB+7Zfdin6kaH+7ckVibO9VxiYtazNOlCk+tftx4aWwRl
-T9UzML6aVAmgb5Z2cnZUB0OnnokcFEyG/4p04OFGZUUJFwLwLEks8/LlVElgIxRA
-schCVBcF69zaq/DHPwiT+ZeU9QyI3NStQyd/rVrIzvHqQFMOjED4gqgnF1vQ0xUv
-e1d7qHTRVnigml7ltDXibXKMweXUDy08bph8BTonbpN0kC0WHyvgq1g270ihC3m1
-W2fMxsz6MtCeP40m51mFoff/ix6vznHGapduJdA4fp5gwAxrJSWigzyIwrOqqvtJ
-AWA6j1fmQqFnBiwpVZrSAC+cwKGKQWAeBwDk9iJhH+seMy387Q4EzoNi12+5Uq4b
-kfSNTDTEgwZWuFXiYMoZC2VK/TYfen3LVE5z2OG+IP5CdMazX/auPRsIpjcgNAmO
-2cJVjbD2qVRal9/MEpvosF3IGkz6thQW2r9yBpDtWXmcgKkCKVYvwCtNtjRdAGmR
-CU4Uhr9jiaFIwJwqT7Ean3HnGNuf/t3tB81HrP+5kSIAhToX8+rZxAC+uuWFJHU0
-rBy56H7r0uCxFbRwnV2Q7KEWM0xFdS3q95CxygCD7j7rxG/+GwabeLxaT2nno+Zz
-4grfZvGjAT3CIAXnbTXI
-=HP5y
+iQIcBAEBAgAGBQJPeIepAAoJEOSiRoyO7jvo6IAQAKfIXX9jwIgQD2XFjiW6ve7O
+0y/9rrI+OA1WH/4m1VrqtL38o78WsosJcFan3joaQTzfaDwHtuXF9QnYUfcZMi7s
+2HvLDItNNv0Tsm/TmrXJpnb7/yZlQYdV9BZ+7O7Nwk6BHXARDDBcbd8zr8mctD8j
+HJfU/Jl8FVjR47iCQjprvlhcyY2sFrsJReSntSTq4357Zgy+oF6K0g+gdYRiJabL
+YmnYjRhSje3VBhWERjZkCr5aPckxswnsAcgD1x/Hs/xikTvBF1WhGKaSJDfq6h2T
+ejCcgZbfFc9PF3BZ2Sa/dHNJlZbDF93AEjly58jSWMlGSiX8+oByvD6MVX1/xdB9
+F9vPcd4/glBsqSSpPKHjsVcbS9eCTG+yjOzdJsG+hYPM4yis6c5cXf4fDOW2len9
+I5Nh4eTFWN0anFr2mo035n2/L5Wx/cNIkhGMyZ8QisQqL3L82jnT2/L/zUC1KkeO
+/Ws/+vGTiemH50jBmzV9Trj8e3FelvIg7xEVJ4z1Qxh3mVF3cpZOfpKgXmgWGKnH
+d44N3DNdi+sLQJshUJYqwdHL7YfqEBLw1VbCtIuDfus/uPYtw8s404EHfx6atHGC
+mnb5IASu+gjWQGVbOyfzZPQNQCdqdxJazpsIyZX2dkXZDyg6xx4UGta5S/uy5p2J
+R5M3yDti04ssDvuzVIW2
+=aQmV
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/libvdpau/libvdpau-0.4.1-r1.ebuild b/x11-libs/libvdpau/libvdpau-0.4.1-r1.ebuild
index 893ab2c4ebd2..e712fdfc6850 100644
--- a/x11-libs/libvdpau/libvdpau-0.4.1-r1.ebuild
+++ b/x11-libs/libvdpau/libvdpau-0.4.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libvdpau/libvdpau-0.4.1-r1.ebuild,v 1.1 2012/02/15 14:41:04 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libvdpau/libvdpau-0.4.1-r1.ebuild,v 1.2 2012/04/01 16:51:47 scarabeus Exp $
 
 EAPI=4
 inherit multilib
@@ -11,7 +11,7 @@ SRC_URI="http://people.freedesktop.org/~aplattner/vdpau/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 x86 ~x86-fbsd"
 IUSE="doc"
 
 #unfortunately, there's driver versions in between that this works with
diff --git a/x11-libs/libvdpau/libvdpau-0.4.1.ebuild b/x11-libs/libvdpau/libvdpau-0.4.1.ebuild
deleted file mode 100644
index f82a60916204..000000000000
--- a/x11-libs/libvdpau/libvdpau-0.4.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libvdpau/libvdpau-0.4.1.ebuild,v 1.6 2011/11/01 20:12:08 mattst88 Exp $
-
-EAPI=2
-inherit multilib
-
-DESCRIPTION="VDPAU wrapper and trace libraries"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/VDPAU"
-SRC_URI="http://people.freedesktop.org/~aplattner/vdpau/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 x86 ~x86-fbsd"
-IUSE="doc"
-
-#unfortunately, there's driver versions in between that this works with
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	!=x11-drivers/nvidia-drivers-180*
-	!=x11-drivers/nvidia-drivers-185*
-	!=x11-drivers/nvidia-drivers-190.18
-	!=x11-drivers/nvidia-drivers-190.25
-	!=x11-drivers/nvidia-drivers-190.32
-	!=x11-drivers/nvidia-drivers-190.36
-	!=x11-drivers/nvidia-drivers-190.40"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=x11-proto/dri2proto-2.2
-	doc? ( app-doc/doxygen
-		media-gfx/graphviz
-		virtual/latex-base )"
-
-src_configure() {
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-dependency-tracking \
-		$(use_enable doc documentation) \
-		--with-module-dir=/usr/$(get_libdir)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog
-	find "${D}" -name '*.la' -exec rm -f '{}' +
-}