Version bump. Includes the DRI locking fix as well as some small code

cleanups.
Package-Manager: portage-2.1.2_pre1-r4

4 files changed, 58 insertions, 5 deletions

diff --git a/x11-drivers/xf86-video-mga/ChangeLog b/x11-drivers/xf86-video-mga/ChangeLog
index f759295be530..fab15c8b0749 100644
--- a/x11-drivers/xf86-video-mga/ChangeLog
+++ b/x11-drivers/xf86-video-mga/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/xf86-video-mga
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-mga/ChangeLog,v 1.29 2006/09/05 23:49:27 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-mga/ChangeLog,v 1.30 2006/09/29 21:58:53 joshuabaergen Exp $
+
+*xf86-video-mga-1.4.2 (29 Sep 2006)
+
+  29 Sep 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xf86-video-mga-1.4.2.ebuild:
+  Version bump.  Includes the DRI locking fix as well as some small code
+  cleanups.
 
   05 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>; +files/mga.xinf:
   Add hwdata files for system-config-display.
diff --git a/x11-drivers/xf86-video-mga/Manifest b/x11-drivers/xf86-video-mga/Manifest
index a3389180057f..6fda15c1e1b6 100644
--- a/x11-drivers/xf86-video-mga/Manifest
+++ b/x11-drivers/xf86-video-mga/Manifest
@@ -7,8 +7,10 @@ MD5 196c3fa93a7704e8cdc6593ae1d06131 files/mga.xinf 907
 RMD160 ce74ca2f9a4fe1f1ec1b488dedf677c03142e756 files/mga.xinf 907
 SHA256 899ef684cac268e9a83169999ba0542643222b11fcb4e304c213b08723ae8196 files/mga.xinf 907
 DIST x11-driver-patches-1.tar.bz2 389 RMD160 0c57d4b235d83f3d7c46691c13857fd121ddec2d SHA1 6e2ac0cd255d3c4dc97d35092fe3ef64a71d7ac5 SHA256 64787d5b57d2845c0fa9297a9d924093ba191fc3551798239d9983f0bcca9b3e
+DIST x11-driver-patches-3.tar.bz2 404 RMD160 7a587f0791717b408f5fdeb86111ddcd9be113ff SHA1 ea479b7a3bc1400fad443801887f593d9eb11084 SHA256 6bc477e01cd88ca8237c581e0d7735c5e7f67c2d812e089043791d21dfd34b1a
 DIST xf86-video-mga-1.2.1.3.tar.bz2 346787
 DIST xf86-video-mga-1.4.1.tar.bz2 367973 RMD160 d283690c1c5daf27fecbed973628b7a51300d4ce SHA1 8f4a48d9f7140148d113f655247350ef7938463d SHA256 5becb5f0caf0f99296db28b32be46eb95d0a88ac8e4829c47cb637fb52d06564
+DIST xf86-video-mga-1.4.2.tar.bz2 365652 RMD160 7ca95f07dba532f533548b1972de6217bd78896f SHA1 c54e22fba89a8fa16617e6c75864581dcee25faf SHA256 652e0f08d3a7c5251dce581772b3af5b72a7ef11a9607508207435471d2d3dae
 EBUILD xf86-video-mga-1.2.1.3.ebuild 855 RMD160 9b11adaa2e37d8a96ce6ccf31a80d25ac56ebadf SHA1 d44e1d064c491362782ab2170752838428a3c5f2 SHA256 fd2f5d43f2e80d0a58b097e4c9befac88830865280c09a670d68a3bd17d52b3d
 MD5 e01ffc8e75bdc846a9ec884d5f39f93e xf86-video-mga-1.2.1.3.ebuild 855
 RMD160 9b11adaa2e37d8a96ce6ccf31a80d25ac56ebadf xf86-video-mga-1.2.1.3.ebuild 855
@@ -21,10 +23,14 @@ EBUILD xf86-video-mga-1.4.1.ebuild 857 RMD160 1ac530fe89cc6535fafd657b08cd44f4b4
 MD5 867b7026ae9b9465162d6864360bbbf7 xf86-video-mga-1.4.1.ebuild 857
 RMD160 1ac530fe89cc6535fafd657b08cd44f4b4a9c762 xf86-video-mga-1.4.1.ebuild 857
 SHA256 68d04101cdc54fd5ebb2914c12bcf2b82ee0ecc42a4cce64655db65b4567f5b6 xf86-video-mga-1.4.1.ebuild 857
-MISC ChangeLog 4271 RMD160 2ffa1f9df5668abce34bae001fd5501bed99ee20 SHA1 0a9d7bb004ffff0109a61fd97e12e0d83a43ce65 SHA256 f238fd627aaac2c583c4921c14279941e161653df61699bbed38453c2b45a121
-MD5 6976e11a1fc417f11e2b7f78dd8e844c ChangeLog 4271
-RMD160 2ffa1f9df5668abce34bae001fd5501bed99ee20 ChangeLog 4271
-SHA256 f238fd627aaac2c583c4921c14279941e161653df61699bbed38453c2b45a121 ChangeLog 4271
+EBUILD xf86-video-mga-1.4.2.ebuild 880 RMD160 39a166055643f9162a5385b2e7b0b4d04323e6aa SHA1 2e1a4ae75b79515ccc429123b449ede13734aeeb SHA256 1ffcfa39bb4d4da552550445fb7b93f9bc95f7dbabb1c03918d5bc7d393d1fc2
+MD5 9fa1737aa409f6385ffefdae4b608b61 xf86-video-mga-1.4.2.ebuild 880
+RMD160 39a166055643f9162a5385b2e7b0b4d04323e6aa xf86-video-mga-1.4.2.ebuild 880
+SHA256 1ffcfa39bb4d4da552550445fb7b93f9bc95f7dbabb1c03918d5bc7d393d1fc2 xf86-video-mga-1.4.2.ebuild 880
+MISC ChangeLog 4487 RMD160 d5dbd660f28b7335368b2796a24129323ecad37b SHA1 5886284c2af1944b9dda3019985d0f43265ca250 SHA256 9b3db0d8662c2cd60b444df44793e94cffd801b9187451647e63b268d077cb9d
+MD5 6f89842984677cf7e8627cefb9cc905b ChangeLog 4487
+RMD160 d5dbd660f28b7335368b2796a24129323ecad37b ChangeLog 4487
+SHA256 9b3db0d8662c2cd60b444df44793e94cffd801b9187451647e63b268d077cb9d ChangeLog 4487
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -38,3 +44,6 @@ SHA256 c836aca9dc79e8015db2157d549cef7d53a38cef3396e9d103dd538f5797cae7 files/di
 MD5 3ae58ecddeb4bc06e32db27618c62e39 files/digest-xf86-video-mga-1.4.1-r1 521
 RMD160 9d8b7427ef962555e350324d9583b9129bccc62e files/digest-xf86-video-mga-1.4.1-r1 521
 SHA256 c836aca9dc79e8015db2157d549cef7d53a38cef3396e9d103dd538f5797cae7 files/digest-xf86-video-mga-1.4.1-r1 521
+MD5 f9a6d65e2cb5a7892601aacbb547f96b files/digest-xf86-video-mga-1.4.2 521
+RMD160 e5448c516efb921fb06b31f63b0eda1177463c5e files/digest-xf86-video-mga-1.4.2 521
+SHA256 9c644a5f507e7a44c0fd0ac665a0436be2c8889d76adfeec5dffe3b7adcbf13f files/digest-xf86-video-mga-1.4.2 521
diff --git a/x11-drivers/xf86-video-mga/files/digest-xf86-video-mga-1.4.2 b/x11-drivers/xf86-video-mga/files/digest-xf86-video-mga-1.4.2
new file mode 100644
index 000000000000..2d0bc88f5c86
--- /dev/null
+++ b/x11-drivers/xf86-video-mga/files/digest-xf86-video-mga-1.4.2
@@ -0,0 +1,6 @@
+MD5 1bdda42ee3348fbd0a12aa83bf0df80a x11-driver-patches-3.tar.bz2 404
+RMD160 7a587f0791717b408f5fdeb86111ddcd9be113ff x11-driver-patches-3.tar.bz2 404
+SHA256 6bc477e01cd88ca8237c581e0d7735c5e7f67c2d812e089043791d21dfd34b1a x11-driver-patches-3.tar.bz2 404
+MD5 4f7ad5fa9b3819bed18ca8f05c3cb69a xf86-video-mga-1.4.2.tar.bz2 365652
+RMD160 7ca95f07dba532f533548b1972de6217bd78896f xf86-video-mga-1.4.2.tar.bz2 365652
+SHA256 652e0f08d3a7c5251dce581772b3af5b72a7ef11a9607508207435471d2d3dae xf86-video-mga-1.4.2.tar.bz2 365652
diff --git a/x11-drivers/xf86-video-mga/xf86-video-mga-1.4.2.ebuild b/x11-drivers/xf86-video-mga/xf86-video-mga-1.4.2.ebuild
new file mode 100644
index 000000000000..188076d1602f
--- /dev/null
+++ b/x11-drivers/xf86-video-mga/xf86-video-mga-1.4.2.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-mga/xf86-video-mga-1.4.2.ebuild,v 1.1 2006/09/29 21:58:53 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+XDPVER="3"
+
+inherit x-modular
+
+DESCRIPTION="X.Org driver for mga 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/renderproto
+	x11-proto/videoproto
+	x11-proto/xextproto
+	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
+}