Version bump. Adds MergedFB and i965 support.

Package-Manager: portage-2.1.1_pre4-r4

4 files changed, 56 insertions, 5 deletions

diff --git a/x11-drivers/xf86-video-i810/ChangeLog b/x11-drivers/xf86-video-i810/ChangeLog
index 0ec194447956..e94567cc4d12 100644
--- a/x11-drivers/xf86-video-i810/ChangeLog
+++ b/x11-drivers/xf86-video-i810/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-drivers/xf86-video-i810
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/ChangeLog,v 1.29 2006/07/29 17:50:00 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/ChangeLog,v 1.30 2006/08/10 01:36:29 joshuabaergen Exp $
+
+*xf86-video-i810-1.6.4 (10 Aug 2006)
+
+  10 Aug 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xf86-video-i810-1.6.4.ebuild:
+  Version bump.  Adds MergedFB and i965 support.
 
 *xf86-video-i810-1.6.1 (29 Jul 2006)
 
diff --git a/x11-drivers/xf86-video-i810/Manifest b/x11-drivers/xf86-video-i810/Manifest
index ce5a7151d7d1..1c306043abb5 100644
--- a/x11-drivers/xf86-video-i810/Manifest
+++ b/x11-drivers/xf86-video-i810/Manifest
@@ -2,6 +2,7 @@ DIST x11-driver-patches-1.tar.bz2 389 RMD160 0c57d4b235d83f3d7c46691c13857fd121d
 DIST xf86-video-i810-1.4.1.3.tar.bz2 377092
 DIST xf86-video-i810-1.6.0.tar.bz2 408777 RMD160 530e26d75978bfa75bc02a998d1077d058fbf2b6 SHA1 e2b4928e8bf0bf23a61b69613798dabae07e6df4 SHA256 47fe2f41c5eb06a344282de0273dc69c968d3d34009778faf2cb983cdf795291
 DIST xf86-video-i810-1.6.1.tar.bz2 411541 RMD160 87ecd83bcdcede77535e1264718956c54dfc4a54 SHA1 fbfb49a6207c7ade29374df4d846e70988983e8f SHA256 98eb0b6a338a7512aeba8bbb75c3f8b1ff5adb1976cd8c59847efa00fba786e8
+DIST xf86-video-i810-1.6.4.tar.bz2 444453 RMD160 d46554a3384cb51b43f28ec51cb51720677d3050 SHA1 3b2e2c591139019bb942aacb5001e13c1b45c860 SHA256 0d9fe2a4923df6b1d6ff1b17332ff4c9a5f84d4a376ad4b0fd3223b2dd939351
 EBUILD xf86-video-i810-1.4.1.3.ebuild 842 RMD160 517638a0e16f84bd365fb06ddbc7520444e2ca45 SHA1 bf3b5723998736cefc6bf7c4788e7a76a5fdc37a SHA256 b11a540f11e1a955162cec6daa6f687056a25aa4e9162d437367cb430cb12daf
 MD5 992f932c1fe86779699bb597fe6c39ff xf86-video-i810-1.4.1.3.ebuild 842
 RMD160 517638a0e16f84bd365fb06ddbc7520444e2ca45 xf86-video-i810-1.4.1.3.ebuild 842
@@ -14,10 +15,14 @@ EBUILD xf86-video-i810-1.6.1.ebuild 866 RMD160 e735df7d452f7bd75e8cc096d753b3954
 MD5 9b74943330cd6b0bd3f5d4a9fc59c80b xf86-video-i810-1.6.1.ebuild 866
 RMD160 e735df7d452f7bd75e8cc096d753b395420edba7 xf86-video-i810-1.6.1.ebuild 866
 SHA256 d5b6b30f5949ce8537b48584205a0b6da90ae6b57990d0b298fd6e69a68a4e18 xf86-video-i810-1.6.1.ebuild 866
-MISC ChangeLog 4960 RMD160 c800faaed881cb98da70cfc94fc3a8fcf17bafb3 SHA1 3eae01616aeb55bbb4d74f9de466d8e7e71e826c SHA256 5db2e0779a411f4c57301afb84316a5215230307a0a6e8d061d66dad7babc59a
-MD5 723c8f5db0caca10d18d2722b9599ae3 ChangeLog 4960
-RMD160 c800faaed881cb98da70cfc94fc3a8fcf17bafb3 ChangeLog 4960
-SHA256 5db2e0779a411f4c57301afb84316a5215230307a0a6e8d061d66dad7babc59a ChangeLog 4960
+EBUILD xf86-video-i810-1.6.4.ebuild 857 RMD160 b6cec41b70d1f878f8ee19f39ddc243dd14531fe SHA1 cfa6c3dc53971a3d7a9643cd19e7bdbc04934b3e SHA256 53e17cd6c32311931ee4e7979e910c32765824352c17da8af41540f596d77c40
+MD5 71d697bd1fbd18c4f9c8f420439beecb xf86-video-i810-1.6.4.ebuild 857
+RMD160 b6cec41b70d1f878f8ee19f39ddc243dd14531fe xf86-video-i810-1.6.4.ebuild 857
+SHA256 53e17cd6c32311931ee4e7979e910c32765824352c17da8af41540f596d77c40 xf86-video-i810-1.6.4.ebuild 857
+MISC ChangeLog 5138 RMD160 365da404353424739ac0a6e9b61b26147104379e SHA1 8af4dcad46a3b6ef36f4602912109f6e2157212b SHA256 b3d63308cb9df337c2c5515f2a1ecf7020d195942d828a91e48016e12f30f2d9
+MD5 0101033e38a0f9d6ac44694b8e45ee6c ChangeLog 5138
+RMD160 365da404353424739ac0a6e9b61b26147104379e ChangeLog 5138
+SHA256 b3d63308cb9df337c2c5515f2a1ecf7020d195942d828a91e48016e12f30f2d9 ChangeLog 5138
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -31,3 +36,6 @@ SHA256 5b359cef10a99bc6ee980e4c05ef6e358ee10ac825330d381e3acbf9f27b80c5 files/di
 MD5 43119dbb745a067f3c62ebe4d612c57c files/digest-xf86-video-i810-1.6.1 268
 RMD160 e1dc761fc65a6637397d55ffcf12673017cd1581 files/digest-xf86-video-i810-1.6.1 268
 SHA256 90ea333ca178dfa7f10b3872852e5c6acb914a449f3f1499e084b3feaaee9d7d files/digest-xf86-video-i810-1.6.1 268
+MD5 8edd2a3d88e5e1ca0a8a534b4d76f0ad files/digest-xf86-video-i810-1.6.4 524
+RMD160 e9f397b71bc73eff6c4c4f2773912f3b68dbceb1 files/digest-xf86-video-i810-1.6.4 524
+SHA256 520ebabae4d63a168c6b695bef2d86413c3562c42132d975fabf4064d0127849 files/digest-xf86-video-i810-1.6.4 524
diff --git a/x11-drivers/xf86-video-i810/files/digest-xf86-video-i810-1.6.4 b/x11-drivers/xf86-video-i810/files/digest-xf86-video-i810-1.6.4
new file mode 100644
index 000000000000..a2ad3179b915
--- /dev/null
+++ b/x11-drivers/xf86-video-i810/files/digest-xf86-video-i810-1.6.4
@@ -0,0 +1,6 @@
+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 56e24a79cccb1d3828de48cb9a7a61b6 xf86-video-i810-1.6.4.tar.bz2 444453
+RMD160 d46554a3384cb51b43f28ec51cb51720677d3050 xf86-video-i810-1.6.4.tar.bz2 444453
+SHA256 0d9fe2a4923df6b1d6ff1b17332ff4c9a5f84d4a376ad4b0fd3223b2dd939351 xf86-video-i810-1.6.4.tar.bz2 444453
diff --git a/x11-drivers/xf86-video-i810/xf86-video-i810-1.6.4.ebuild b/x11-drivers/xf86-video-i810/xf86-video-i810-1.6.4.ebuild
new file mode 100644
index 000000000000..b1489baef4ff
--- /dev/null
+++ b/x11-drivers/xf86-video-i810/xf86-video-i810-1.6.4.ebuild
@@ -0,0 +1,31 @@
+# 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-i810/xf86-video-i810-1.6.4.ebuild,v 1.1 2006/08/10 01:36:29 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org driver for Intel cards"
+KEYWORDS="~amd64 ~ia64 ~sh ~x86 ~x86-fbsd"
+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 )"
+
+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
+}