Version 1.3 no longer supports fglrx module. Force due to unsynced cvs tree

Package-Manager: portage-2.2_rc33/cvs/Linux i686
RepoMan-Options: --force

3 files changed, 18 insertions, 6 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 75bc6460e693..e3f9ac7dd44d 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.431 2009/07/28 13:03:22 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.432 2009/07/29 08:05:43 scarabeus Exp $
+
+  29 Jul 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  xorg-server-1.3.0.0-r6.ebuild:
+  Version 1.3 no longer supports fglrx module.
 
 *xorg-server-1.6.2.901 (28 Jul 2009)
 
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 71b9402b2e45..5d926d58e347 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,3 +1,6 @@
+-----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
@@ -58,12 +61,19 @@ DIST xorg-server-1.6.2-gentoo-patches-03.tar.bz2 9299 RMD160 914123bc25ce08eff6f
 DIST xorg-server-1.6.2.901-gentoo-patches-01.tar.bz2 2110 RMD160 7a5d674b5acd5f1d21391e506e176b2fe2e09c03 SHA1 106605ec773195f29b1f784a1c59622c1e58ec63 SHA256 ea3e47518ceba0fa03b25fac5471a482c8d0fb4b1c690c849a39fe268c0b49c7
 DIST xorg-server-1.6.2.901.tar.bz2 4646810 RMD160 e9822920c4b91ff24c0a6f1907f8488ced2d053c SHA1 b422d0a82dff86632159e8dfeac27092c0182fad SHA256 fbded3505438c9cd3719636bff0535188913b3a2496feae06f70dd69302e9709
 DIST xorg-server-1.6.2.tar.bz2 4647067 RMD160 37af2d733cdc7155de13cfdb21cc6367135bb440 SHA1 7eb0ae82762eecf5be031d63a77f0c1281569414 SHA256 893e92ad2ccd1bcd646bba9540dd9dfc53ccc95f8dc5fd69444afe54fae8c261
-EBUILD xorg-server-1.3.0.0-r6.ebuild 15978 RMD160 ed56f0dc502d36d5299a1f6935120404750f6c6f SHA1 d00e08179a957d655ccd05b367c08985c9ee0065 SHA256 dc29848b5603e07bc5212470cfc819201b9060b9b22cf0dcddbca5231bb8facf
+EBUILD xorg-server-1.3.0.0-r6.ebuild 15906 RMD160 5523e6bd695da723fe092360241b3187357fbd90 SHA1 6a2774ccc35ebf157dcb3a9dbbad0d9157ba0a8d SHA256 02ba8e4575399f1624dad91f4f2045c0216cca42738aba4eea2b6a872f2ced4b
 EBUILD xorg-server-1.4.2.ebuild 15865 RMD160 9eb7dfa4797fee8ef71619ca68efa2659a699058 SHA1 7100457bbc1b0995060d9a37f5af979ae4acf564 SHA256 7fb1cacd58b608f27c8b95984f26204c82706557cb3f7a2b7ebf71f4a31db5ff
 EBUILD xorg-server-1.5.3-r6.ebuild 15821 RMD160 e8d12ed466d1931d42bb3db031e5152f9c99dc44 SHA1 24fdfec544f54b48e359b731f48990934463096a SHA256 b74427adfbd77427c27b22f15bc52e1bc34a6a9e935d8e50139ae65cd21bb30e
 EBUILD xorg-server-1.5.3-r7.ebuild 15844 RMD160 e5aa688e0094227e81b61e59d2fb3d862485cb9a SHA1 93efcee3c42bd3e3b834ca7ac9bc179719045ba4 SHA256 184b1e1ba14b82afd23a372c8b33a76a8855b8f2a7dc7e9eb81cb16793d10cff
 EBUILD xorg-server-1.6.2-r1.ebuild 13069 RMD160 985b32e0cb6bd727f024568f6a53735bfea37d87 SHA1 bc012201b9d3a3e0c955bda571f5965ae3f4ee78 SHA256 c2dd4cb7e53fed0b85c43e2ed01e665835166b192040360150796fba7b4114c9
 EBUILD xorg-server-1.6.2.901.ebuild 13071 RMD160 a099c3227fd9ecdc75203f3267166a2be9aaa2e0 SHA1 1857c05adeaff64dcf69cf44cd7960e712584665 SHA256 5889cdd7a7de67f8c2d12439859b89b8237b6bc653d5606f9dda9a5adfa4e47c
 EBUILD xorg-server-1.6.2.ebuild 13067 RMD160 4cf34631909758d61d03e73c82b4260fe96365b6 SHA1 ebc5aefae65f1575c21d96311aea145a9a4748bc SHA256 e3de5c3cbb702ba6b24f114437e365d7a27ebe5e1953b6e26e6fd641fcabc32c
-MISC ChangeLog 99024 RMD160 51c7c850e3b8d2eef6d576043039747f6bc60466 SHA1 87cf1d191b0dfdf9c18abe301a6041880b269926 SHA256 faa98ff88243a5f716f144751df13948380bf22542a924564d3550f7eb6f4698
+MISC ChangeLog 99165 RMD160 763b197df1f7bc67045514f1dad4e707d941906c SHA1 355b8aca4bcde243a8008c8377922ddf7cb673e7 SHA256 1f0e5f2336e0bed70bdf2619571068b297274192f3a2e9bce8428a1236ffbc60
 MISC metadata.xml 439 RMD160 c96c2c91bc0374b9ec854aec534988afa77cd42c SHA1 631c118285d63e25d63c21487ecac7a05a8304f0 SHA256 cc8d98da43263c08185727cdc0848c5182d54145d5f9caa908294b7d4ef4ed7b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkpwAuEACgkQHB6c3gNBRYdqRACfVBcqTFyPfoGgL/YnTp9CsF0G
+QgQAoMuW4TyFrJaGFnXD9hI8EgtH4FgE
+=zorF
+-----END PGP SIGNATURE-----
diff --git a/x11-base/xorg-server/xorg-server-1.3.0.0-r6.ebuild b/x11-base/xorg-server/xorg-server-1.3.0.0-r6.ebuild
index b0724e415008..e9d578e06af0 100644
--- a/x11-base/xorg-server/xorg-server-1.3.0.0-r6.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.3.0.0-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.3.0.0-r6.ebuild,v 1.11 2009/07/13 10:53:18 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.3.0.0-r6.ebuild,v 1.12 2009/07/29 08:05:43 scarabeus Exp $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
@@ -84,7 +84,6 @@ IUSE_VIDEO_CARDS="
 	video_cards_via
 	video_cards_vmware
 	video_cards_voodoo
-	video_cards_fglrx
 	video_cards_nvidia"
 IUSE_SERVERS="dmx kdrive xorg"
 IUSE="${IUSE_VIDEO_CARDS}
@@ -228,7 +227,6 @@ PDEPEND="
 		video_cards_voodoo? ( >=x11-drivers/xf86-video-voodoo-1.1.0 )
 		video_cards_tdfx? ( 3dfx? ( >=media-libs/glide-v3-3.10 ) )
 		video_cards_nvidia? ( x11-drivers/nvidia-drivers )
-		video_cards_fglrx? ( >=x11-drivers/ati-drivers-8.37.6 )
 	)"
 LICENSE="${LICENSE} MIT"