Fix issues with dri and missing assert.h. (Bug #130320, Bill Krueger)

Package-Manager: portage-2.1_rc1-r2

3 files changed, 26 insertions, 63 deletions

diff --git a/x11-drivers/xf86-video-via/Manifest b/x11-drivers/xf86-video-via/Manifest
index f99df5f417d9..92b1f53bfe4f 100644
--- a/x11-drivers/xf86-video-via/Manifest
+++ b/x11-drivers/xf86-video-via/Manifest
@@ -1,28 +1,29 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 9406ac78a7370e67b4068c7edf3b55a5 ChangeLog 3157
-RMD160 4058bce3097d19ee7ec43b70851ae4912ec3ce67 ChangeLog 3157
-SHA256 238f0996209fb9ff2f83ea8a3b08b4b0aa7563006ee230f65a2743d9583ddb88 ChangeLog 3157
-MD5 2eccf8fe0fb3245a0585cc3d7fe49d49 files/digest-xf86-video-via-0.1.33.2 146
-RMD160 d1c34b27721df6358eff1255cc178fbd0b513bbe files/digest-xf86-video-via-0.1.33.2 146
-SHA256 0532b3c97f22d279e1af828306c79c947963d3e45d32a800a3a4e9211806a591 files/digest-xf86-video-via-0.1.33.2 146
-MD5 ff8e98184b9ee52525a92ae0489e21e8 files/digest-xf86-video-via-0.2.1 521
-RMD160 4f5fa2adf8619be3bec8876bbb170e47fdc7906e files/digest-xf86-video-via-0.2.1 521
-SHA256 60b482d04c3a5856a8e5fca95806bb35e41aa938afd86d13de6ecdaed519d710 files/digest-xf86-video-via-0.2.1 521
-MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
-RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
-SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156
+AUX missing-assert.patch 334 RMD160 892962b73f1a2aa964465440951fa16b8f113871 SHA1 44186a5e7e07c7173c02b7b66ab5bc15bac0c2ba SHA256 167800bdfcb400a92f40d316a5a9addd8fc461f80f70a2346f6d8baa2da3dd3a size 334
+MD5 2316fb7a4010b3a7a93cce404ce8a7b4 files/missing-assert.patch 334
+RMD160 892962b73f1a2aa964465440951fa16b8f113871 files/missing-assert.patch 334
+SHA256 167800bdfcb400a92f40d316a5a9addd8fc461f80f70a2346f6d8baa2da3dd3a files/missing-assert.patch 334
+DIST x11-driver-patches-1.tar.bz2 389 RMD160 0c57d4b235d83f3d7c46691c13857fd121ddec2d SHA256 64787d5b57d2845c0fa9297a9d924093ba191fc3551798239d9983f0bcca9b3e size 389
+DIST xf86-video-via-0.1.33.2.tar.bz2 364333 size 364333
+DIST xf86-video-via-0.2.1.tar.bz2 386913 RMD160 7fd9ee7420a27766e240e2910247cb11ec4f315f SHA256 436c61ea2dfbc58b48430290d31aa8c71f55458f0048f4b8397344b2eec3a1c8 size 386913
+EBUILD xf86-video-via-0.1.33.2.ebuild 853 RMD160 cb2ff6faf4bc141105952bdc39f7573553f2c675 SHA1 a9355eb345e61cedcc5cd98aa96edbb3394d867a SHA256 2217b82876c58d43f4a16e564d68b68c21dfdd15bfdd66fac164bd0541d2cf36 size 853
 MD5 cf53232ac086043ab3d960f48b8e68fc xf86-video-via-0.1.33.2.ebuild 853
 RMD160 cb2ff6faf4bc141105952bdc39f7573553f2c675 xf86-video-via-0.1.33.2.ebuild 853
 SHA256 2217b82876c58d43f4a16e564d68b68c21dfdd15bfdd66fac164bd0541d2cf36 xf86-video-via-0.1.33.2.ebuild 853
-MD5 702f0ca9b165f7a2e4323c99e29c8081 xf86-video-via-0.2.1.ebuild 853
-RMD160 6ac745b8bc1d99f145fcde28907fc9bcd7e6cd3c xf86-video-via-0.2.1.ebuild 853
-SHA256 92d6bff68572b8018207706aa6e2754fb1114a20ae1c84f06eae5abdb4c0423e xf86-video-via-0.2.1.ebuild 853
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEQlRJAiZjviIA2XgRAt4xAKCJvfL4V0r52stMse5eotqnligdxQCgo2FY
-CI8pglzPufQatLhULIwGTQU=
-=6DZd
------END PGP SIGNATURE-----
+EBUILD xf86-video-via-0.2.1-r1.ebuild 888 RMD160 ca61853a666e1872c9983d4006e189c21f508e4f SHA1 d84f12922daf7fc23cb385f1aae692aa558974a9 SHA256 65d78422e63a769c3d4cc4c2b3421fe31687bd5352fa924e723ea9fb732d3814 size 888
+MD5 1245e991176f3bf725d4ada96b78cde9 xf86-video-via-0.2.1-r1.ebuild 888
+RMD160 ca61853a666e1872c9983d4006e189c21f508e4f xf86-video-via-0.2.1-r1.ebuild 888
+SHA256 65d78422e63a769c3d4cc4c2b3421fe31687bd5352fa924e723ea9fb732d3814 xf86-video-via-0.2.1-r1.ebuild 888
+MISC ChangeLog 3428 RMD160 7b532931940c56ce6f912cc899c58868a1084501 SHA1 d39a188737ecc0b92de8e67891c8f0ab938b9a7a SHA256 6fb4cdc72bdd86c4ba1fabd6e46653040c64c2ca52655fe10077ba6677c0defe size 3428
+MD5 7a5deb5eee4132fb39bb9222aef15c2f ChangeLog 3428
+RMD160 7b532931940c56ce6f912cc899c58868a1084501 ChangeLog 3428
+SHA256 6fb4cdc72bdd86c4ba1fabd6e46653040c64c2ca52655fe10077ba6677c0defe ChangeLog 3428
+MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 size 156
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
+SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156
+MD5 6078ce7f265d31711529d3964049fabb files/digest-xf86-video-via-0.1.33.2 332
+RMD160 f03332ec9ccde33f400eaa476d11f12d68cca96d files/digest-xf86-video-via-0.1.33.2 332
+SHA256 6401cde1fa7efb66c070c550227efb4ec25d7637241718d55fc99b150308e519 files/digest-xf86-video-via-0.1.33.2 332
+MD5 ff8e98184b9ee52525a92ae0489e21e8 files/digest-xf86-video-via-0.2.1-r1 521
+RMD160 4f5fa2adf8619be3bec8876bbb170e47fdc7906e files/digest-xf86-video-via-0.2.1-r1 521
+SHA256 60b482d04c3a5856a8e5fca95806bb35e41aa938afd86d13de6ecdaed519d710 files/digest-xf86-video-via-0.2.1-r1 521
diff --git a/x11-drivers/xf86-video-via/files/digest-xf86-video-via-0.2.1 b/x11-drivers/xf86-video-via/files/digest-xf86-video-via-0.2.1
deleted file mode 100644
index 5badcf3af080..000000000000
--- a/x11-drivers/xf86-video-via/files/digest-xf86-video-via-0.2.1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 1b8cfd2923836ee93eda69abe50dda04 x11-driver-patches-1.tar.bz2 389
-RMD160 0c57d4b235d83f3d7c46691c13857fd121ddec2d x11-driver-patches-1.tar.bz2 389
-SHA256 64787d5b57d2845c0fa9297a9d924093ba191fc3551798239d9983f0bcca9b3e x11-driver-patches-1.tar.bz2 389
-MD5 7c92846dcf363204f7530fa0fa621e43 xf86-video-via-0.2.1.tar.bz2 386913
-RMD160 7fd9ee7420a27766e240e2910247cb11ec4f315f xf86-video-via-0.2.1.tar.bz2 386913
-SHA256 436c61ea2dfbc58b48430290d31aa8c71f55458f0048f4b8397344b2eec3a1c8 xf86-video-via-0.2.1.tar.bz2 386913
diff --git a/x11-drivers/xf86-video-via/xf86-video-via-0.2.1.ebuild b/x11-drivers/xf86-video-via/xf86-video-via-0.2.1.ebuild
deleted file mode 100644
index b15a1beb0844..000000000000
--- a/x11-drivers/xf86-video-via/xf86-video-via-0.2.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-via/xf86-video-via-0.2.1.ebuild,v 1.1 2006/04/14 17:30:44 joshuabaergen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org driver for via cards"
-KEYWORDS="~amd64 ~ia64 ~sh ~x86"
-IUSE="dri"
-RDEPEND=">=x11-base/xorg-server-1.0.99
-		x11-libs/libXvMC"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/xextproto
-	x11-proto/xproto
-	dri? ( x11-proto/xf86driproto
-		>=x11-libs/libdrm-2
-		x11-libs/libX11 )"
-
-PATCHES=""
-CONFIGURE_OPTIONS="$(use_enable dri)"
-
-pkg_setup() {
-	if use dri && ! built_with_use x11-base/xorg-server dri; then
-		die "Build x11-base/xorg-server with USE=dri."
-	fi
-}