Version bump for 7.2. Build/dist fix and some code cleanup.

(Portage version: 2.1.2_rc3-r5)
 (Unsigned Manifest commit)

3 files changed, 12 insertions, 50 deletions

diff --git a/x11-drivers/xf86-video-mga/Manifest b/x11-drivers/xf86-video-mga/Manifest
index 351d96197ea0..dc18a257bf79 100644
--- a/x11-drivers/xf86-video-mga/Manifest
+++ b/x11-drivers/xf86-video-mga/Manifest
@@ -12,7 +12,7 @@ DIST x11-driver-patches-4.tar.bz2 346 RMD160 fcbd405de080d07612d46f455b927035fd8
 DIST xf86-video-mga-1.2.1.3.tar.bz2 346787 RMD160 9731f70614c86e76916cf2dc1233358d70b263c9 SHA1 4f3aacd294f13b011506471ca4bab649536cb475 SHA256 ba6863baca71f780d2bf6f74b3a6e105b5f42d3a4449a004b0ed3e891c56aeab
 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
-DIST xf86-video-mga-1.4.5.tar.bz2 375653 RMD160 39c6d370f030f28eece643513bffd9b3d1393588 SHA1 d05a77183d5ddd3100a6954ebf16d96aea43f133 SHA256 9eca89509130e4030e8ef361f77f62846ecf6a9b1af2b377565f395170f7d539
+DIST xf86-video-mga-1.4.6.tar.bz2 376535 RMD160 bee6c4c563758d963a1ed019d891c69ca22cf22b SHA1 1dc167fdbbde795527d507b6e93d1c9b2d166db1 SHA256 27707f3264b7821f85772d8f8a96195c75086a8d0cebc82ac41f8f6eb57ba00a
 EBUILD xf86-video-mga-1.2.1.3.ebuild 870 RMD160 ae2c29bddbb8945dc95df4acd8772ecd644f63e8 SHA1 4a7039d0a0d6dab35128d80667d25c4f279c5161 SHA256 48e9ff88454e4df13c19d2e42592c9de9e73bf825aa772e115c071d54f836d2c
 MD5 f23e2628ddd709ce9fd9559861e7663c xf86-video-mga-1.2.1.3.ebuild 870
 RMD160 ae2c29bddbb8945dc95df4acd8772ecd644f63e8 xf86-video-mga-1.2.1.3.ebuild 870
@@ -29,14 +29,14 @@ EBUILD xf86-video-mga-1.4.2.ebuild 884 RMD160 c27a2618289278bece20355e36e3c50ba1
 MD5 479d7c30bf78109bffbe6588e5339cd7 xf86-video-mga-1.4.2.ebuild 884
 RMD160 c27a2618289278bece20355e36e3c50ba1d295bf xf86-video-mga-1.4.2.ebuild 884
 SHA256 be1bbc0bfa0f40a2f8af068b51be2e9cab520d097392c9577dbad8f7ce19da13 xf86-video-mga-1.4.2.ebuild 884
-EBUILD xf86-video-mga-1.4.5.ebuild 892 RMD160 61de7b5a5f4f369a1c4e66d159ed6dac8c61d306 SHA1 2540f860a34f81cfe986badc9c0640923728df02 SHA256 505e99c0993bfb3b2318d74fccf75aa06b9fd8b5567bb0575fea9a4cd3d86530
-MD5 8b72a6e03e4aa1b12122f6e27f08af99 xf86-video-mga-1.4.5.ebuild 892
-RMD160 61de7b5a5f4f369a1c4e66d159ed6dac8c61d306 xf86-video-mga-1.4.5.ebuild 892
-SHA256 505e99c0993bfb3b2318d74fccf75aa06b9fd8b5567bb0575fea9a4cd3d86530 xf86-video-mga-1.4.5.ebuild 892
-MISC ChangeLog 6835 RMD160 e3473e4f4268a026d2cf36f2555fc813c50f7c41 SHA1 f9b68405657cda77df331fa18036c0410fcfff9b SHA256 447dde5278c302b06aa2567dd3df0b59d8b332aa60c3b97a198e52e5d67826ec
-MD5 31a77822df731ba99a469ef5e0500c2e ChangeLog 6835
-RMD160 e3473e4f4268a026d2cf36f2555fc813c50f7c41 ChangeLog 6835
-SHA256 447dde5278c302b06aa2567dd3df0b59d8b332aa60c3b97a198e52e5d67826ec ChangeLog 6835
+EBUILD xf86-video-mga-1.4.6.ebuild 892 RMD160 b0c9a28042e9c0f52cbdaf3bc0b515866cd70293 SHA1 df5f0df6c36bbd25d20fffba33dbac05fb58b979 SHA256 0a0c3aa7f81889abce45fea638a2120e81f010093f848aaa7b1c2753d63f64a4
+MD5 aebf8829342d982e87f0ce2f747d0094 xf86-video-mga-1.4.6.ebuild 892
+RMD160 b0c9a28042e9c0f52cbdaf3bc0b515866cd70293 xf86-video-mga-1.4.6.ebuild 892
+SHA256 0a0c3aa7f81889abce45fea638a2120e81f010093f848aaa7b1c2753d63f64a4 xf86-video-mga-1.4.6.ebuild 892
+MISC ChangeLog 7055 RMD160 569d197c685a9d75c5fbeb8e6b85bcc1caa3a4b3 SHA1 bdde88bd10856e2eba79d2e636b2c50f37b01a6d SHA256 b283bd089843f00bc4ed37d835ad445c709b4970df649d4be4d26d0dfd76ed8c
+MD5 87eba71d9c4533d5ee5b12437f76ac16 ChangeLog 7055
+RMD160 569d197c685a9d75c5fbeb8e6b85bcc1caa3a4b3 ChangeLog 7055
+SHA256 b283bd089843f00bc4ed37d835ad445c709b4970df649d4be4d26d0dfd76ed8c ChangeLog 7055
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -53,6 +53,6 @@ SHA256 c836aca9dc79e8015db2157d549cef7d53a38cef3396e9d103dd538f5797cae7 files/di
 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
-MD5 0c7a516a76eeddfb20a836b716f3efb4 files/digest-xf86-video-mga-1.4.5 521
-RMD160 6c1b5aeadf8fc303659b21f4d86f9db698f7b118 files/digest-xf86-video-mga-1.4.5 521
-SHA256 5484c2ebc1b9fc7fa04b1a47f3b4cadfc0c1c632f6babde4c5dd556ef4fafacc files/digest-xf86-video-mga-1.4.5 521
+MD5 2e62d361cb3d6b754b8a70d857ee4992 files/digest-xf86-video-mga-1.4.6 521
+RMD160 52a386ff74da432498a09d2d96acf39331c7a14e files/digest-xf86-video-mga-1.4.6 521
+SHA256 f57698fbc4ccd833276bc0b2f3c9731a3707431cdeaa5e660b21c03fd8fe2779 files/digest-xf86-video-mga-1.4.6 521
diff --git a/x11-drivers/xf86-video-mga/files/digest-xf86-video-mga-1.4.5 b/x11-drivers/xf86-video-mga/files/digest-xf86-video-mga-1.4.5
deleted file mode 100644
index 8700ae7cac89..000000000000
--- a/x11-drivers/xf86-video-mga/files/digest-xf86-video-mga-1.4.5
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 56566e8c3fb4bb99791d1788d0a9a1a8 x11-driver-patches-4.tar.bz2 346
-RMD160 fcbd405de080d07612d46f455b927035fd8123a8 x11-driver-patches-4.tar.bz2 346
-SHA256 07069bbd072f2def50e83801a8f2a41a4c96495104f15cd6f56f7df7f89769bf x11-driver-patches-4.tar.bz2 346
-MD5 bfecd6814cfbe2d7a678724aaab81d0d xf86-video-mga-1.4.5.tar.bz2 375653
-RMD160 39c6d370f030f28eece643513bffd9b3d1393588 xf86-video-mga-1.4.5.tar.bz2 375653
-SHA256 9eca89509130e4030e8ef361f77f62846ecf6a9b1af2b377565f395170f7d539 xf86-video-mga-1.4.5.tar.bz2 375653
diff --git a/x11-drivers/xf86-video-mga/xf86-video-mga-1.4.5.ebuild b/x11-drivers/xf86-video-mga/xf86-video-mga-1.4.5.ebuild
deleted file mode 100644
index 3c36b5cd971a..000000000000
--- a/x11-drivers/xf86-video-mga/xf86-video-mga-1.4.5.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-mga/xf86-video-mga-1.4.5.ebuild,v 1.1 2006/12/02 16:05:10 joshuabaergen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-XDPVER=4
-
-inherit x-modular
-
-DESCRIPTION="Matrox video driver"
-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-proto/glproto
-			>=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
-}