Update to ati 6.6.2, bring rest up to date with main portage tree

svn path=/; revision=2

10 files changed, 121 insertions, 25 deletions

diff --git a/hardened/xorg/x11-drivers/xf86-video-ati/Manifest b/hardened/xorg/x11-drivers/xf86-video-ati/Manifest
index ba3f2a5..ea95f98 100644
--- a/hardened/xorg/x11-drivers/xf86-video-ati/Manifest
+++ b/hardened/xorg/x11-drivers/xf86-video-ati/Manifest
@@ -5,17 +5,33 @@ SHA256 598d13102d74e8e408880dd1bf3d46cf0c49839ddfb6212824909ccc35d276d4 files/xf
 DIST x11-driver-patches-1.tar.bz2 389 RMD160 0c57d4b235d83f3d7c46691c13857fd121ddec2d SHA1 6e2ac0cd255d3c4dc97d35092fe3ef64a71d7ac5 SHA256 64787d5b57d2845c0fa9297a9d924093ba191fc3551798239d9983f0bcca9b3e
 DIST xf86-video-ati-6.5.8.0.tar.bz2 683625 RMD160 f774fc0a4e49481278ab220d454cf7bd8fad85cb SHA1 d0f7c9e7447e0219ea8616bb65a9e23d9ce5eb7c SHA256 564efc8f8e9b46bb0f8ae49d91d2a51a572f0294e571cc9d91dc6ed253ba119d
 DIST xf86-video-ati-6.6.0.tar.bz2 723687 RMD160 ac58673f76c6693f35cb515731c2d7250b8c88b8 SHA1 f6b4eda4e4ee542afd16c2be33e651a91519b0cb SHA256 23027b52d5b82c47201ac7471c545162149a6c6d38ec9c090469f6698e83eb21
-EBUILD xf86-video-ati-6.5.8.0.ebuild 943 RMD160 eaa0d1d7e7d115bd5c1b480cacfb66e2c1359737 SHA1 9af7dc9e092ae657e800f70890b1e4f90b041d2d SHA256 be895809932a885efed686aba46fde9b4658fbc5e5039ca34d6656764bb7c214
-MD5 1990ab4c65e7f06406a7a20f99ea1b28 xf86-video-ati-6.5.8.0.ebuild 943
-RMD160 eaa0d1d7e7d115bd5c1b480cacfb66e2c1359737 xf86-video-ati-6.5.8.0.ebuild 943
-SHA256 be895809932a885efed686aba46fde9b4658fbc5e5039ca34d6656764bb7c214 xf86-video-ati-6.5.8.0.ebuild 943
-EBUILD xf86-video-ati-6.6.0.ebuild 946 RMD160 efe903fb51c63b58de20b951b13aa690a74de519 SHA1 943f0d1c15bf203d09c54b413bc5693489552366 SHA256 65a46098c23579f94997dd679732a213ad62fa0292f9c9d7e81820fdc3bc626a
-MD5 b858b244c49dd5f927e2a5c03b81b1c7 xf86-video-ati-6.6.0.ebuild 946
-RMD160 efe903fb51c63b58de20b951b13aa690a74de519 xf86-video-ati-6.6.0.ebuild 946
-SHA256 65a46098c23579f94997dd679732a213ad62fa0292f9c9d7e81820fdc3bc626a xf86-video-ati-6.6.0.ebuild 946
+DIST xf86-video-ati-6.6.1.tar.bz2 675870 RMD160 3b8a872261bbd85f85ffa1132a25dbc1efb00d65 SHA1 ebf4bc27313a87a6ea5c91c4c0777de9a6e04b80 SHA256 2bed11d2e49e9eff5d999e4c74b35906692e002ceca68887e4a5fbccac278f53
+DIST xf86-video-ati-6.6.2.tar.bz2 722892 RMD160 064ef873c17e9947dc2dbf6cb795d090f31e0063 SHA1 ecb8d83c8bbc1507b7d38b0f110f5264099473b1 SHA256 e069e61b45a81d42bfc0b067345e45d02e712ee385d77b222a4839a6b800aa50
+EBUILD xf86-video-ati-6.5.8.0.ebuild 938 RMD160 c1de11349023239f8ba3f7f9940e6616070d8c17 SHA1 f3cf4f5b0abf142e9b318528ae14f564284d3398 SHA256 8f699bddd8bfce6759b4b0996e72d4dda6ec70021c32d12366dc6c4fe873751c
+MD5 4791cae0160ceab2660065bf1dda68c7 xf86-video-ati-6.5.8.0.ebuild 938
+RMD160 c1de11349023239f8ba3f7f9940e6616070d8c17 xf86-video-ati-6.5.8.0.ebuild 938
+SHA256 8f699bddd8bfce6759b4b0996e72d4dda6ec70021c32d12366dc6c4fe873751c xf86-video-ati-6.5.8.0.ebuild 938
+EBUILD xf86-video-ati-6.6.0.ebuild 949 RMD160 7127c7a16f347a3ed3cc7cc0ccc7885ad47b32a0 SHA1 dea4612e975112b8ef1a2ea081afc25af95ca2e4 SHA256 411ededcaaf6672cef5cefe6c23eb8aeb713bb9ea921bb1912a2e2b53d46cf69
+MD5 3e88911f9dc911574e9e907ef87a8a75 xf86-video-ati-6.6.0.ebuild 949
+RMD160 7127c7a16f347a3ed3cc7cc0ccc7885ad47b32a0 xf86-video-ati-6.6.0.ebuild 949
+SHA256 411ededcaaf6672cef5cefe6c23eb8aeb713bb9ea921bb1912a2e2b53d46cf69 xf86-video-ati-6.6.0.ebuild 949
+EBUILD xf86-video-ati-6.6.1.ebuild 941 RMD160 8f509a4967751a7c92a902b25ec23519473152ec SHA1 c8177204e1aea1d36153a9bd7466c2d348e0902a SHA256 856aba7fd8a57896035b5092d05cffd2ff80dea054539c323652184c468b6701
+MD5 c0bc2e2c7dc3f265a0b63ec2338bdbda xf86-video-ati-6.6.1.ebuild 941
+RMD160 8f509a4967751a7c92a902b25ec23519473152ec xf86-video-ati-6.6.1.ebuild 941
+SHA256 856aba7fd8a57896035b5092d05cffd2ff80dea054539c323652184c468b6701 xf86-video-ati-6.6.1.ebuild 941
+EBUILD xf86-video-ati-6.6.2.ebuild 953 RMD160 93992729c0f54a01cc20dc9d540284d397ea9105 SHA1 d90d2640c6807e781a82314f1b6f3984cdedd95d SHA256 e0aece02be0f220bc25b10f3b0d7a1610dbb06d64c753ddcc5f87afb77cf64d7
+MD5 8bd654c9bf022542e89a05d5c7866534 xf86-video-ati-6.6.2.ebuild 953
+RMD160 93992729c0f54a01cc20dc9d540284d397ea9105 xf86-video-ati-6.6.2.ebuild 953
+SHA256 e0aece02be0f220bc25b10f3b0d7a1610dbb06d64c753ddcc5f87afb77cf64d7 xf86-video-ati-6.6.2.ebuild 953
 MD5 9faed29310a3324108fa498f86106e45 files/digest-xf86-video-ati-6.5.8.0 527
 RMD160 605aa390d1786b15c389363cb54129756718fb06 files/digest-xf86-video-ati-6.5.8.0 527
 SHA256 5ab2e6e336a7534869abb3d01bc5d02583a4391f447835b9cacf8a488b5e35a3 files/digest-xf86-video-ati-6.5.8.0 527
 MD5 9fe6428e15bc57a8c214106d89faf3b2 files/digest-xf86-video-ati-6.6.0 521
 RMD160 7cffbddf1bddbe5b4aad06400497e3168bbd3e1e files/digest-xf86-video-ati-6.6.0 521
 SHA256 2fbb6985c2ce484bf327f8734882a6e0e47524ef219617eea9c5793cf22957a8 files/digest-xf86-video-ati-6.6.0 521
+MD5 033f99355337e422bf3de08a2712a0ea files/digest-xf86-video-ati-6.6.1 521
+RMD160 daa896a9721c996182ee78799d83e5633aacee5b files/digest-xf86-video-ati-6.6.1 521
+SHA256 014d984f30bd1bba438837bb7ed7263e23791f883d417c56240979abff0c1b0b files/digest-xf86-video-ati-6.6.1 521
+MD5 08cab63f97fab6836cbc49e5d0fce4aa files/digest-xf86-video-ati-6.6.2 521
+RMD160 9f108d5bb37ca95c4657c33b5e5f796c442b11a9 files/digest-xf86-video-ati-6.6.2 521
+SHA256 20bb7187e2b0f0680d7695ea84229f060d9628fcf1ab4abb21cc1d0de851e005 files/digest-xf86-video-ati-6.6.2 521
diff --git a/hardened/xorg/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.6.1 b/hardened/xorg/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.6.1
new file mode 100644
index 0000000..e6680c2
--- /dev/null
+++ b/hardened/xorg/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.6.1
@@ -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 76445561906956fee384017e22d803ae xf86-video-ati-6.6.1.tar.bz2 675870
+RMD160 3b8a872261bbd85f85ffa1132a25dbc1efb00d65 xf86-video-ati-6.6.1.tar.bz2 675870
+SHA256 2bed11d2e49e9eff5d999e4c74b35906692e002ceca68887e4a5fbccac278f53 xf86-video-ati-6.6.1.tar.bz2 675870
diff --git a/hardened/xorg/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.6.2 b/hardened/xorg/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.6.2
new file mode 100644
index 0000000..97c18a6
--- /dev/null
+++ b/hardened/xorg/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.6.2
@@ -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 f295ceb5d9317c8a0e8e212974b1b05a xf86-video-ati-6.6.2.tar.bz2 722892
+RMD160 064ef873c17e9947dc2dbf6cb795d090f31e0063 xf86-video-ati-6.6.2.tar.bz2 722892
+SHA256 e069e61b45a81d42bfc0b067345e45d02e712ee385d77b222a4839a6b800aa50 xf86-video-ati-6.6.2.tar.bz2 722892
diff --git a/hardened/xorg/x11-drivers/xf86-video-ati/xf86-video-ati-6.5.8.0.ebuild b/hardened/xorg/x11-drivers/xf86-video-ati/xf86-video-ati-6.5.8.0.ebuild
index 98db382..7374c0c 100644
--- a/hardened/xorg/x11-drivers/xf86-video-ati/xf86-video-ati-6.5.8.0.ebuild
+++ b/hardened/xorg/x11-drivers/xf86-video-ati/xf86-video-ati-6.5.8.0.ebuild
@@ -1,15 +1,16 @@
 # 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-ati/xf86-video-ati-6.5.8.0.ebuild,v 1.1 2006/04/29 16:57:17 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.5.8.0.ebuild,v 1.4 2006/06/30 15:18:15 wolf31o2 Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
-PATCHES=${FILESDIR}/xf86-video-ati-mainnorefsub.patch
 
 inherit x-modular
 
+PATCHES="${FILESDIR}/xf86-video-ati-mainnorefsub.patch"
+
 DESCRIPTION="X.Org driver for ati cards"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ppc64 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="dri"
 RDEPEND="x11-base/xorg-server"
 DEPEND="${RDEPEND}
diff --git a/hardened/xorg/x11-drivers/xf86-video-ati/xf86-video-ati-6.6.0.ebuild b/hardened/xorg/x11-drivers/xf86-video-ati/xf86-video-ati-6.6.0.ebuild
index 522dd89..ee78478 100644
--- a/hardened/xorg/x11-drivers/xf86-video-ati/xf86-video-ati-6.6.0.ebuild
+++ b/hardened/xorg/x11-drivers/xf86-video-ati/xf86-video-ati-6.6.0.ebuild
@@ -4,7 +4,8 @@
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
-PATCHES=${FILESDIR}/xf86-video-ati-mainnorefsub.patch
+
+PATCHES="${FILESDIR}/xf86-video-ati-mainnorefsub.patch"
 
 inherit x-modular
 
diff --git a/hardened/xorg/x11-drivers/xf86-video-ati/xf86-video-ati-6.6.1.ebuild b/hardened/xorg/x11-drivers/xf86-video-ati/xf86-video-ati-6.6.1.ebuild
new file mode 100644
index 0000000..43383d7
--- /dev/null
+++ b/hardened/xorg/x11-drivers/xf86-video-ati/xf86-video-ati-6.6.1.ebuild
@@ -0,0 +1,33 @@
+# 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-ati/xf86-video-ati-6.6.1.ebuild,v 1.4 2006/07/10 22:33:10 agriffis Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+PATCHES="${FILESDIR}/xf86-video-ati-mainnorefsub.patch"
+
+inherit x-modular
+
+DESCRIPTION="X.Org driver for ati cards"
+KEYWORDS="alpha ~amd64 arm ia64 ppc ppc64 sh sparc ~x86 ~x86-fbsd"
+IUSE="dri"
+RDEPEND=">=x11-base/xorg-server-1.0.99"
+DEPEND="${RDEPEND}
+	x11-proto/fontsproto
+	x11-proto/randrproto
+	x11-proto/videoproto
+	x11-proto/xextproto
+	x11-proto/xineramaproto
+	x11-proto/xf86miscproto
+	x11-proto/xproto
+	dri? ( x11-proto/xf86driproto
+			>=x11-libs/libdrm-2 )"
+
+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
+}
diff --git a/hardened/xorg/x11-drivers/xf86-video-ati/xf86-video-ati-6.6.2.ebuild b/hardened/xorg/x11-drivers/xf86-video-ati/xf86-video-ati-6.6.2.ebuild
new file mode 100644
index 0000000..28790f2
--- /dev/null
+++ b/hardened/xorg/x11-drivers/xf86-video-ati/xf86-video-ati-6.6.2.ebuild
@@ -0,0 +1,33 @@
+# 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-ati/xf86-video-ati-6.6.2.ebuild,v 1.1 2006/08/25 03:29:19 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+PATCHES="${FILESDIR}/xf86-video-ati-mainnorefsub.patch"
+
+inherit x-modular
+
+DESCRIPTION="X.Org driver for ati cards"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="dri"
+RDEPEND=">=x11-base/xorg-server-1.0.99"
+DEPEND="${RDEPEND}
+	x11-proto/fontsproto
+	x11-proto/randrproto
+	x11-proto/videoproto
+	x11-proto/xextproto
+	x11-proto/xineramaproto
+	x11-proto/xf86miscproto
+	x11-proto/xproto
+	dri? ( x11-proto/xf86driproto
+			>=x11-libs/libdrm-2 )"
+
+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
+}
diff --git a/hardened/xorg/x11-drivers/xf86-video-cirrus/Manifest b/hardened/xorg/x11-drivers/xf86-video-cirrus/Manifest
index 00845e1..b8b2d15 100644
--- a/hardened/xorg/x11-drivers/xf86-video-cirrus/Manifest
+++ b/hardened/xorg/x11-drivers/xf86-video-cirrus/Manifest
@@ -4,15 +4,15 @@ RMD160 958f35935bb6abda2f9c0703eb435d6a6b30efc2 files/xf86-video-cirrus-mainnore
 SHA256 637ed9b68cde2ce16365b261e2ebea73a20973a409f7e7d12d1bc6ad7cd50db2 files/xf86-video-cirrus-mainnorefsub.patch 2566
 DIST x11-driver-patches-1.tar.bz2 389 RMD160 0c57d4b235d83f3d7c46691c13857fd121ddec2d SHA1 6e2ac0cd255d3c4dc97d35092fe3ef64a71d7ac5 SHA256 64787d5b57d2845c0fa9297a9d924093ba191fc3551798239d9983f0bcca9b3e
 DIST xf86-video-cirrus-1.0.0.5.tar.bz2 254801 RMD160 0909ad4269146aa9639c73a5196f4f6695f64ae1 SHA1 d4c15798447d5c9f66d016d9d38a84c314fdf78f SHA256 06100d81ea5a6b55ee277f0c82718e45e6bac1299a7875c83fee63cfd1c9f681
-DIST xf86-video-cirrus-1.1.0.tar.bz2 264167 RMD160 027e6b8cfc78dab762207d809cb61ecf97c92638 SHA256 5988962199d5013274f6a6952939e4f405df658bb6616ebf9954c993b1179b1b
-EBUILD xf86-video-cirrus-1.0.0.5.ebuild 666 RMD160 238f367ddddb7ace3acfc14a7f09da74a15355e6 SHA1 fcc95e824f025e03ee5aa9c96664415eb8171509 SHA256 893adedaaee5a87fe8fc4b212851ed366d503649bd2f808b6dc5a5ee491a6d1d
-MD5 85aba66d5c4122548c62cf8d0de4fd5c xf86-video-cirrus-1.0.0.5.ebuild 666
-RMD160 238f367ddddb7ace3acfc14a7f09da74a15355e6 xf86-video-cirrus-1.0.0.5.ebuild 666
-SHA256 893adedaaee5a87fe8fc4b212851ed366d503649bd2f808b6dc5a5ee491a6d1d xf86-video-cirrus-1.0.0.5.ebuild 666
-EBUILD xf86-video-cirrus-1.1.0.ebuild 673 RMD160 acdf0326c54b7332a5efc7c0918c62ff503d5c9e SHA1 e521d0d06f2e19db3fe108a7cbe2ba8ad36ebc64 SHA256 fbe5f9b1a58386f3f32a9481c85aec581a1064fd2f5d0a1faa03b4224a779619
-MD5 a6de987fd095eb5c54278655cfa16b64 xf86-video-cirrus-1.1.0.ebuild 673
-RMD160 acdf0326c54b7332a5efc7c0918c62ff503d5c9e xf86-video-cirrus-1.1.0.ebuild 673
-SHA256 fbe5f9b1a58386f3f32a9481c85aec581a1064fd2f5d0a1faa03b4224a779619 xf86-video-cirrus-1.1.0.ebuild 673
+DIST xf86-video-cirrus-1.1.0.tar.bz2 264167 RMD160 027e6b8cfc78dab762207d809cb61ecf97c92638 SHA1 1832fc03ea9d60a96bfd96c156cb439818bfc579 SHA256 5988962199d5013274f6a6952939e4f405df658bb6616ebf9954c993b1179b1b
+EBUILD xf86-video-cirrus-1.0.0.5.ebuild 663 RMD160 72dcc1849ddebcd56492db1bc6685cc8da4a3ddb SHA1 572039249e28fd1345cf55073a67809e07043766 SHA256 a2c6f8e05a9fc0ff0881b037e04d0d1db04d698836e19d70e4e9db90069b1c2b
+MD5 c442e216c98c0df482ce76d815999b17 xf86-video-cirrus-1.0.0.5.ebuild 663
+RMD160 72dcc1849ddebcd56492db1bc6685cc8da4a3ddb xf86-video-cirrus-1.0.0.5.ebuild 663
+SHA256 a2c6f8e05a9fc0ff0881b037e04d0d1db04d698836e19d70e4e9db90069b1c2b xf86-video-cirrus-1.0.0.5.ebuild 663
+EBUILD xf86-video-cirrus-1.1.0.ebuild 668 RMD160 b7fabefd74fc3a1ae25931d8de63292709fb14cf SHA1 bb44ca6798a23b379c8b7e8895bffbea4bc3eeb7 SHA256 ecabfa4c331c6a26d1a5004305a83d3c159646eddd1fb91f3a38920af16ef251
+MD5 91dfa433d7cf8b1d9a31d905340e3756 xf86-video-cirrus-1.1.0.ebuild 668
+RMD160 b7fabefd74fc3a1ae25931d8de63292709fb14cf xf86-video-cirrus-1.1.0.ebuild 668
+SHA256 ecabfa4c331c6a26d1a5004305a83d3c159646eddd1fb91f3a38920af16ef251 xf86-video-cirrus-1.1.0.ebuild 668
 MD5 975adf178f52b0441f3c61ce37b43cd5 files/digest-xf86-video-cirrus-1.0.0.5 536
 RMD160 c8704fa5d87f766ccf6dff6d6aa0c11f1c0bfa05 files/digest-xf86-video-cirrus-1.0.0.5 536
 SHA256 c824e2f2e7d170681614ed0d8ec099e4efeb041c82329d6d027947e634318575 files/digest-xf86-video-cirrus-1.0.0.5 536
diff --git a/hardened/xorg/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.0.0.5.ebuild b/hardened/xorg/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.0.0.5.ebuild
index e47f64a..8381c90 100644
--- a/hardened/xorg/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.0.0.5.ebuild
+++ b/hardened/xorg/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.0.0.5.ebuild
@@ -1,6 +1,6 @@
 # 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-cirrus/xf86-video-cirrus-1.0.0.5.ebuild,v 1.7 2006/04/16 14:07:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.0.0.5.ebuild,v 1.9 2006/06/30 15:19:13 wolf31o2 Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -9,7 +9,7 @@ PATCHES=${FILESDIR}/xf86-video-cirrus-mainnorefsub.patch
 inherit x-modular
 
 DESCRIPTION="X.Org driver for cirrus cards"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sh ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~sh x86 ~x86-fbsd"
 RDEPEND="x11-base/xorg-server"
 DEPEND="${RDEPEND}
 	x11-proto/fontsproto
diff --git a/hardened/xorg/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.1.0.ebuild b/hardened/xorg/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.1.0.ebuild
index ef33cbd..45bda81 100644
--- a/hardened/xorg/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.1.0.ebuild
+++ b/hardened/xorg/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.1.0.ebuild
@@ -1,6 +1,6 @@
 # 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-cirrus/xf86-video-cirrus-1.1.0.ebuild,v 1.2 2006/06/05 21:29:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.1.0.ebuild,v 1.4 2006/07/10 22:20:30 agriffis Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -9,7 +9,7 @@ PATCHES=${FILESDIR}/xf86-video-cirrus-mainnorefsub.patch
 inherit x-modular
 
 DESCRIPTION="X.Org driver for cirrus cards"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sh ~x86 ~x86-fbsd"
+KEYWORDS="alpha ~amd64 ia64 ppc sh ~x86 ~x86-fbsd"
 RDEPEND=">=x11-base/xorg-server-1.0.99"
 DEPEND="${RDEPEND}
 	x11-proto/fontsproto