Adapt with xf86-video-amd to xf86-video-geode move.

Package-Manager: portage-2.1.5_rc7

4 files changed, 14 insertions, 20 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index bfaf352003f6..4c0d16871adf 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.325 2008/05/08 08:20:32 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.326 2008/05/09 20:03:45 leio Exp $
+
+  09 May 2008; Mart Raudsepp <leio@gentoo.org>
+  xorg-server-1.4.0.90-r3.ebuild, xorg-server-1.4.0.90-r4.ebuild:
+  Adapt with xf86-video-amd to xf86-video-geode move.
 
 *xorg-server-1.4.0.90-r4 (08 May 2008)
 
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index d25c7ec9b25b..993eb0d41f37 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.2.0-fix-amd-cpu-detection.patch 1715 RMD160 7290fd57dc2a9e2dd8edbe08da5074a30815486c SHA1 b749e5ac35fad295fd7a1f13cfee2e42a2a06035 SHA256 0126a880eb5f21eb8dbbd119a425e7412b37689e1321c2b9ff63c5dc8de47f6a
 AUX 1.2.0-properly-free-device-devprivates-memory-leak-fix.patch 1199 RMD160 c55891ff6797d1b161524cd5c3e9a4382ec0bcad SHA1 98e07d5a542bc1e990921234f8f6399120ae5a63 SHA256 ba60d2fbb7944da45344f5ffc1431bf0e812ab861f4455522592ecb0c475138c
 AUX 1.2.0-typo-fix.patch 1321 RMD160 237c072869df15afbc2b35dfd8cc6e5143cb59f9 SHA1 3a22190fde5487b84c0d9a8862421f102bf41c63 SHA256 9dbf526f9cb3bf2596ffdc1795eda16181384db33562daf4fd1ddb359b5a77bd
@@ -90,14 +87,7 @@ DIST xorg-server-1.3.0.0.tar.bz2 5968263 RMD160 1a4fecd73aed0d5adabe84066c24ce69
 DIST xorg-server-1.4.0.90.tar.bz2 6315011 RMD160 181b3c682710265df3c6ed30e164be9290f1f39e SHA1 7c492ac32bd83b521f5c016e4728fccf9cba55db SHA256 b89f2d17be5ba71e3cc25379e18155c55ea36ba94ac1abae953214f13c020ffe
 EBUILD xorg-server-1.3.0.0-r4.ebuild 17872 RMD160 caf61a35a2486a3248dab00dc2a928dd2e11e015 SHA1 2552f8fc12bc8b446e65b912dbd86f7cf4019ec5 SHA256 fcf3d38047d812e887769b17ffe7c94035fc6376bc6b307b04190851bb3ed19c
 EBUILD xorg-server-1.3.0.0-r5.ebuild 18114 RMD160 e6fffcc39506db21aafee5e70b8bb043026d5290 SHA1 3e716d92bc096757eb29c3e1e7ae9365a1925f07 SHA256 bb90fb9650d061d42625d99aefefe4de9e032c0b8e517be7c19a5b9ea15a742d
-EBUILD xorg-server-1.4.0.90-r3.ebuild 19018 RMD160 1079fe20b0de68e0677071ac70e878f7096bc385 SHA1 47cd9165b2da82a910e87ed14ee0da30fbd20ebe SHA256 7e21429ca3c6bfe57fddeb3c5d7d57d3e5a50108a5c1c4bb6b987014bc08923e
-EBUILD xorg-server-1.4.0.90-r4.ebuild 18261 RMD160 b4a517b86a0c7fd391a1b5727abcc1f50164058c SHA1 3f42930920c1b5afa8b4c4e75f881bf402fcfe31 SHA256 8563be846f91086ff956e0f82fa9ffe7e1b3065028ab886cb4f08550d808443f
-MISC ChangeLog 73809 RMD160 829919b01b938c44de56c292a4863fcf2cf1b5b6 SHA1 30f4bdac8b250da957eb90c3165ff9427e89408d SHA256 567f3574d6df135f7abc5fb1d86838e7b6f91ffe43dd0bbb67d7b11766ea309a
+EBUILD xorg-server-1.4.0.90-r3.ebuild 19019 RMD160 9fd7322fc14c5f0aba0eba2852aac1cac55a89ee SHA1 791569ee44e071ac8151b0169e002f3b873ebcd7 SHA256 be61c04dd39bcd8262151491b86a323a5a818d3800772c0c868a715487052a10
+EBUILD xorg-server-1.4.0.90-r4.ebuild 18262 RMD160 797007a86244ea11e55b4d67a1e316dc9098ce42 SHA1 75405704571a6f4e5fb205950bd1887b7c2b37de SHA256 934485ffd8368f43d811a5e303dc7cbb92e54cffc8f4656508092761adf808e7
+MISC ChangeLog 73972 RMD160 033881807f7a747929259dc35db487b2be9c799e SHA1 55af9dbda70af4b0f29e4d81202ca2b62602f388 SHA256 98da3700126d317ea73cc76eb29d873c9b4a364bfb8110295ab0bbf0c9320e10
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkgit9YACgkQXVaO67S1rtvkQQCffpdqcFCqXroNLyk6I9OYivqr
-RugAoNbDEnPDMzD5DAzkVlNWDgMlbiVz
-=JB3/
------END PGP SIGNATURE-----
diff --git a/x11-base/xorg-server/xorg-server-1.4.0.90-r3.ebuild b/x11-base/xorg-server/xorg-server-1.4.0.90-r3.ebuild
index 353e75f91b43..f53dfe9b0d97 100644
--- a/x11-base/xorg-server/xorg-server-1.4.0.90-r3.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.4.0.90-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.4.0.90-r3.ebuild,v 1.5 2008/05/07 03:30:44 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.4.0.90-r3.ebuild,v 1.6 2008/05/09 20:03:45 leio Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -51,7 +51,6 @@ IUSE_INPUT_DEVICES="
 	input_devices_synaptics
 	input_devices_wacom"
 IUSE_VIDEO_CARDS="
-	video_cards_amd
 	video_cards_apm
 	video_cards_ark
 	video_cards_chips
@@ -60,6 +59,7 @@ IUSE_VIDEO_CARDS="
 	video_cards_dummy
 	video_cards_epson
 	video_cards_fbdev
+	video_cards_geode
 	video_cards_glint
 	video_cards_i128
 	video_cards_i740
@@ -217,7 +217,6 @@ PDEPEND="
 		input_devices_synaptics? ( x11-drivers/synaptics )
 		input_devices_wacom? ( x11-drivers/linuxwacom )
 
-		video_cards_amd? ( >=x11-drivers/xf86-video-amd-2.7.7.0 )
 		video_cards_apm? ( >=x11-drivers/xf86-video-apm-1.1.1 )
 		video_cards_ark? ( >=x11-drivers/xf86-video-ark-0.6.0 )
 		video_cards_chips? ( >=x11-drivers/xf86-video-chips-1.1.1 )
@@ -225,6 +224,7 @@ PDEPEND="
 		video_cards_cyrix? ( >=x11-drivers/xf86-video-cyrix-1.1.0 )
 		video_cards_dummy? ( >=x11-drivers/xf86-video-dummy-0.2.0 )
 		video_cards_fbdev? ( >=x11-drivers/xf86-video-fbdev-0.2.0 )
+		video_cards_geode? ( >=x11-drivers/xf86-video-geode-2.7.7.0 )
 		video_cards_glint? ( >=x11-drivers/xf86-video-glint-1.1.1 )
 		video_cards_i128? ( >=x11-drivers/xf86-video-i128-1.2.0 )
 		video_cards_i740? ( >=x11-drivers/xf86-video-i740-1.1.0 )
diff --git a/x11-base/xorg-server/xorg-server-1.4.0.90-r4.ebuild b/x11-base/xorg-server/xorg-server-1.4.0.90-r4.ebuild
index 7ebf4f22596e..caa1e7520ce8 100644
--- a/x11-base/xorg-server/xorg-server-1.4.0.90-r4.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.4.0.90-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.4.0.90-r4.ebuild,v 1.1 2008/05/08 08:20:32 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.4.0.90-r4.ebuild,v 1.2 2008/05/09 20:03:45 leio Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -51,7 +51,6 @@ IUSE_INPUT_DEVICES="
 	input_devices_synaptics
 	input_devices_wacom"
 IUSE_VIDEO_CARDS="
-	video_cards_amd
 	video_cards_apm
 	video_cards_ark
 	video_cards_chips
@@ -60,6 +59,7 @@ IUSE_VIDEO_CARDS="
 	video_cards_dummy
 	video_cards_epson
 	video_cards_fbdev
+	video_cards_geode
 	video_cards_glint
 	video_cards_i128
 	video_cards_i740
@@ -217,7 +217,6 @@ PDEPEND="
 		input_devices_synaptics? ( x11-drivers/synaptics )
 		input_devices_wacom? ( x11-drivers/linuxwacom )
 
-		video_cards_amd? ( >=x11-drivers/xf86-video-amd-2.7.7.0 )
 		video_cards_apm? ( >=x11-drivers/xf86-video-apm-1.1.1 )
 		video_cards_ark? ( >=x11-drivers/xf86-video-ark-0.6.0 )
 		video_cards_chips? ( >=x11-drivers/xf86-video-chips-1.1.1 )
@@ -225,6 +224,7 @@ PDEPEND="
 		video_cards_cyrix? ( >=x11-drivers/xf86-video-cyrix-1.1.0 )
 		video_cards_dummy? ( >=x11-drivers/xf86-video-dummy-0.2.0 )
 		video_cards_fbdev? ( >=x11-drivers/xf86-video-fbdev-0.2.0 )
+		video_cards_geode? ( >=x11-drivers/xf86-video-geode-2.7.7.0 )
 		video_cards_glint? ( >=x11-drivers/xf86-video-glint-1.1.1 )
 		video_cards_i128? ( >=x11-drivers/xf86-video-i128-1.2.0 )
 		video_cards_i740? ( >=x11-drivers/xf86-video-i740-1.1.0 )