Stable x86; I don't have hardware or anyone who does..but it seems to merge fine so

Package-Manager: portage-2.1.1-r1

diff --git a/x11-drivers/xf86-video-mga/ChangeLog b/x11-drivers/xf86-video-mga/ChangeLog
index 1cc356b0e871a4bbf47e539e446de271adc72083..8c0b89d38c08b4c858ad3c346df2482b83ab97fa 100644 (file)
--- a/x11-drivers/xf86-video-mga/ChangeLog
+++ b/x11-drivers/xf86-video-mga/ChangeLog
@@ -1,6 +1,10 @@
 # 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.40 2006/11/07 14:14:09 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-mga/ChangeLog,v 1.41 2006/11/08 05:16:43 tsunam Exp $
+
+  08 Nov 2006; Joshua Jackson <tsunam@gentoo.org>
+  xf86-video-mga-1.4.2.ebuild:
+  Stable x86; bug #154165
 
   07 Nov 2006; Gustavo Zacarias <gustavoz@gentoo.org>
   xf86-video-mga-1.4.2.ebuild:

diff --git a/x11-drivers/xf86-video-mga/Manifest b/x11-drivers/xf86-video-mga/Manifest
index d25343fc81244f442c22990b8ebcc4b6bf8f078d..05258de3bb6499d52d9f4ddcaf22c533fad4d1e7 100644 (file)
--- a/x11-drivers/xf86-video-mga/Manifest
+++ b/x11-drivers/xf86-video-mga/Manifest
@@ -27,18 +27,18 @@ EBUILD xf86-video-mga-1.4.1.ebuild 851 RMD160 1b1793c53732f9544decb4f06feaa5dd37
 MD5 b4ca75be9574c43db3e7c98aee5f7cf7 xf86-video-mga-1.4.1.ebuild 851
 RMD160 1b1793c53732f9544decb4f06feaa5dd37eb0932 xf86-video-mga-1.4.1.ebuild 851
 SHA256 5f0980112dc583c62f0c7ccf68cb6b4f2278be5a00d3914a104fdffcc5395818 xf86-video-mga-1.4.1.ebuild 851
-EBUILD xf86-video-mga-1.4.2.ebuild 866 RMD160 c6d6e366d21aa707bac886fdcc4930ad6af5395d SHA1 9bbc2a2948a486a2415af1261dbf953d3eba04cd SHA256 063d1b332a9a1e0fc2fd739f4a7bad6c6c505d4ca87091bc2416f92425a26474
-MD5 16f06401bbcb8bfdcbbdce8598ea1098 xf86-video-mga-1.4.2.ebuild 866
-RMD160 c6d6e366d21aa707bac886fdcc4930ad6af5395d xf86-video-mga-1.4.2.ebuild 866
-SHA256 063d1b332a9a1e0fc2fd739f4a7bad6c6c505d4ca87091bc2416f92425a26474 xf86-video-mga-1.4.2.ebuild 866
+EBUILD xf86-video-mga-1.4.2.ebuild 863 RMD160 92163fa8f0b18f337b87724d2ce92890ccbf3ccd SHA1 61410c7e6b4ec2660fcd2059737a01c989934fd2 SHA256 49c6a6aad1c4f0492c6563ef46cc07f9c28552be2fb379fdc0535a865c9f12e5
+MD5 5f29b16b6278a8732016352af32525ae xf86-video-mga-1.4.2.ebuild 863
+RMD160 92163fa8f0b18f337b87724d2ce92890ccbf3ccd xf86-video-mga-1.4.2.ebuild 863
+SHA256 49c6a6aad1c4f0492c6563ef46cc07f9c28552be2fb379fdc0535a865c9f12e5 xf86-video-mga-1.4.2.ebuild 863
 EBUILD xf86-video-mga-1.4.4.ebuild 871 RMD160 95c40634617ae1ba0a11ff901c015ae719efec13 SHA1 99f13d568bc43191f957e236d8db4d7bda0992ce SHA256 266dbb87cf39a8d3193c0920d0f65a76b85898dfac368b290089e2d02f5e5d99
 MD5 1edb6de8c80aafb4e4852ab54bc03f85 xf86-video-mga-1.4.4.ebuild 871
 RMD160 95c40634617ae1ba0a11ff901c015ae719efec13 xf86-video-mga-1.4.4.ebuild 871
 SHA256 266dbb87cf39a8d3193c0920d0f65a76b85898dfac368b290089e2d02f5e5d99 xf86-video-mga-1.4.4.ebuild 871
-MISC ChangeLog 5873 RMD160 45517ae391a39502cf30262a582cfdadedafc3fe SHA1 5d0fd1367b50cce4fcb2a69438f303aec5ceba19 SHA256 7bc86d9a0d97ba0e69bc9bc414c8c75fa769d10afb6e0f59d6dc010cb533d018
-MD5 f5e967700b9d91ee924ec84fecff599c ChangeLog 5873
-RMD160 45517ae391a39502cf30262a582cfdadedafc3fe ChangeLog 5873
-SHA256 7bc86d9a0d97ba0e69bc9bc414c8c75fa769d10afb6e0f59d6dc010cb533d018 ChangeLog 5873
+MISC ChangeLog 5979 RMD160 3419f8c6bedbb362966397d3dab4f492d1ab9e2f SHA1 2df240ccc129bb9618a735ca0c9ff6c3375af6c1 SHA256 d5b5668d2286149230f16290aeb4ca087772b824afb7ff85058a04e220e68406
+MD5 c3056fa577e0f63031dec32631d7a38b ChangeLog 5979
+RMD160 3419f8c6bedbb362966397d3dab4f492d1ab9e2f ChangeLog 5979
+SHA256 d5b5668d2286149230f16290aeb4ca087772b824afb7ff85058a04e220e68406 ChangeLog 5979
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -59,9 +59,9 @@ MD5 4beaadc97a27f8ecba572cc04b781ef8 files/digest-xf86-video-mga-1.4.4 521
 RMD160 b5bb29fe62dc26da83c0ec7d84d4c98a7f861357 files/digest-xf86-video-mga-1.4.4 521
 SHA256 82f5148f027df59a4f65262d54b42c8260c435ce3e43b548415dfa80e161ea84 files/digest-xf86-video-mga-1.4.4 521
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFUJSnKRy60XGEcJIRArXbAKCPU6NHfbabJYBAyNXx5ehA7tniUwCgmK0d
-BMZ68bRfKAuq6CbMxMQYFyA=
-=T8jq
+iD8DBQFFUWhX2ZWR0Jhg/EsRAktqAJ9Znc8XQX4h/qx9MhapZ9/KSL9ElACfQgpe
+pO4fgsMu33O5f9DQUEuOzo4=
+=ZWYh
 -----END PGP SIGNATURE-----

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
index 0770e18f22ce4dcedc8f287a4427e82f417e5e24..dfee6ac4b26986b4fafd689fd486655d38651223 100644 (file)
--- 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
@@ -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-mga/xf86-video-mga-1.4.2.ebuild,v 1.4 2006/11/07 14:14:08 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-mga/xf86-video-mga-1.4.2.ebuild,v 1.5 2006/11/08 05:16:43 tsunam Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -9,7 +9,7 @@ XDPVER="3"
 inherit x-modular
 
 DESCRIPTION="Matrox video driver"
-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-1.0.99"
 DEPEND="${RDEPEND}