x11-base/xorg-server: add patches nominated patches for 1.6.6

Package-Manager: portage-2.2_rc50/cvs/Linux i686

3 files changed, 19 insertions, 22 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index b926a1abfed9..358644ee6fd2 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,12 @@
 # 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.461 2009/10/29 22:02:24 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.462 2009/11/18 20:28:01 remi Exp $
+
+*xorg-server-1.6.5-r1 (18 Nov 2009)
+
+  18 Nov 2009; Rémi Cardona <remi@gentoo.org> -xorg-server-1.6.4.ebuild,
+  +xorg-server-1.6.5-r1.ebuild:
+  add patches nominated patches for 1.6.6
 
   29 Oct 2009; Tomáš Chvátal <scarabeus@gentoo.org>
   xorg-server-1.6.5.ebuild:
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 2196ea871845..17576f2fc8f6 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.4-fix-kdrive-automake.patch 382 RMD160 78062824a416a2b452866d50592cc71bf34b13be SHA1 f21a54aed8eae1e718f2f0c262c37c36ccccd152 SHA256 126b67332c902802da506970acf253030004e4f7e17b3b6d2e68dd6b7bb0db81
 AUX 1.4-fpic-libxf86config.patch 374 RMD160 614d69f83b7f4d4999efa906f2059b7f287e22c1 SHA1 1f113823c03f69e79b10965908945df629b73474 SHA256 017e7ba2954dcc2281f8626977d47fd8bd037f05e680e51b8e4ae7316455a237
 AUX 1.6.3.901-0001-dix-append-built-ins-to-the-font-path-in-SetDefaultF.patch 3303 RMD160 69966b78924cc4f03df8ff0edc1666370a6b9e67 SHA1 a95b2e0ec5f47e91769b596872c4a7700101d730 SHA256 8f24228cf93819a59f016b42d31cd1d4c6d4b014a24d690dd3b5e88e0040563f
@@ -8,21 +5,14 @@ AUX 1.6.4-re-fix-DGA-removal.patch 4991 RMD160 568b6250606e4022182aa36e16a4cd4bf
 DIST xorg-server-1.5.3-gentoo-patches-08.tar.bz2 60521 RMD160 5b6572450dd8379a0a932c7eb4762fbd58874ab1 SHA1 e269009caeb536e35f58e4a2ab7963eb9b5070ec SHA256 3ac1f99e5c9e21ddbcdd08ecd9687ad64dda8916282f951b74fadabb68e4badc
 DIST xorg-server-1.5.3.tar.bz2 5622625 RMD160 dc0c552e031963070b7a315ea4499810021d0eed SHA1 177529b6d7191a73df6abf2990cd7708398a8d81 SHA256 a680174f54be7763819e5275c5d5d44fc9e9b6f8e9351dd45c150eb4c182d5bb
 DIST xorg-server-1.6.3.901.tar.bz2 4678171 RMD160 45421fdb4524ffd1b247569a1c7dc728bd0cf965 SHA1 09e3d46178701ce76911553ee53309686822bb31 SHA256 1b8b9c40fc3da9268b03143cb4fc518baa9fcf88da73c7645c2d572bf23dbd50
-DIST xorg-server-1.6.4.tar.bz2 4679094 RMD160 96a0b8467749d45827557e7b3e6fce3fec6b43c1 SHA1 9d37f9c14984568afddf0aa84f8409f895277255 SHA256 9c736d4c0246a6f2214a2f2c1a6fa9e2bf860f7785bf469de575529851fc1145
+DIST xorg-server-1.6.5-gentoo-patches-01.tar.bz2 5482 RMD160 4e415d7aeb24172035f648ae14776aad33f7a441 SHA1 81d59f957f13c30cdcecc3bca0adb58befb26c0e SHA256 10a2184a63eafba51846b96833acd4b67c0524b1338bd4ef0218686d7f8e7414
 DIST xorg-server-1.6.5.tar.bz2 4678406 RMD160 702970358a5643dbc9205f42e39c5b8ed2ff845a SHA1 c57c80dd15d3ca492e58ae993b9015d085ec6ea6 SHA256 f3c0e43cf73e7d438350016cabd9957dc000ded9c5fdeebf84a02df61963b2ce
 DIST xorg-server-1.7.1.tar.bz2 4892079 RMD160 b0ca9079636c11071344af70ccae56bcd7b6ecf9 SHA1 d31e259b3ab975e2c1baea8f7310b57152ae3c62 SHA256 a58c0de29cbd2b7d1a1ac5ee70a94ad1ed2a085132803c0ca83f2dd8513b4c20
 EBUILD xorg-server-1.5.3-r6.ebuild 15760 RMD160 82e5a893c835ef0b3b9cad8e20cd2f388a4cfa75 SHA1 f0b3fc71cf84b5868756f4240c9e323be1d65010 SHA256 2e1c52b41126b59c5de2e806a2fde726fb7d673956c628af51b47b6841002de8
 EBUILD xorg-server-1.5.3-r7.ebuild 15862 RMD160 90ff9fcc140d8578531418669607bdb042af144b SHA1 44d104f7b8f415eb50505ff83c292a087ef34caf SHA256 7762b1b300f0648c479d1e265e9431052a081d641d32ab3541e9e8b44d2498d8
 EBUILD xorg-server-1.6.3.901-r2.ebuild 7085 RMD160 dfbe7f6ae95bf99fc3d610f23d1dbdbec3c95f66 SHA1 9c7a5bda2ecd578145d96863e155e264da028370 SHA256 298b6c1c78e39f902cb08a671ff66cd4479fc11147095e4f7c14e4926685f4e5
-EBUILD xorg-server-1.6.4.ebuild 6908 RMD160 8ae1016f592701b383c37416a55c0eaeaec9a42d SHA1 8e0dc15c81c5cde1a9b980fbba291f96c4906113 SHA256 4b9f18c849e0f9641864668ec362369fa28e4c3f00ba2f16d8b3d1925d3d40c6
+EBUILD xorg-server-1.6.5-r1.ebuild 6864 RMD160 89ab4e02dfcb4d366cbc273aed15877adf494af8 SHA1 f46a3ca9eb54155bb89d704ac2c108c0b8eabedf SHA256 0bb5fe71b8e9f592556c0cffd987e2dc1c86a1da0ec1455326862c4f55bda34d
 EBUILD xorg-server-1.6.5.ebuild 6870 RMD160 6caca72750504aa7439fdf56f652e13cef55da7f SHA1 be34e22e5ccf628989a66fdcd991a37c5679493c SHA256 a9fc8338a7571fe6043db1fd2f311c5b54abf6816b1a57e9b5c3fafa56f4f514
 EBUILD xorg-server-1.7.1.ebuild 6862 RMD160 7713fdf22c224a75c53c7ceadcd735b56317cb84 SHA1 71df1278e7864d4c07e967d4de96f3b0b7647629 SHA256 ae37fb9bbec38d3a5cad764a5b00aae5a211295d959c84e32dfbdc10d74d690f
-MISC ChangeLog 106326 RMD160 1f519d2f5cbafe3cbe55940d6c40a4ad6da67eca SHA1 e3819855e54148b99396f7da789a9b28bbdd6623 SHA256 51f4dd442a2b9fa9bb2b3298b628944d5553d258e78ca91231b33a60a8c9d7c5
+MISC ChangeLog 106507 RMD160 f9216462b29ef721a49143b16a5630f320945840 SHA1 d1d5e50c465081de29790bf7e86d41c23230d73d SHA256 8513285befc4eca752fb9fb5e963252e671a5272a558198015fc8b92e759b55a
 MISC metadata.xml 439 RMD160 c96c2c91bc0374b9ec854aec534988afa77cd42c SHA1 631c118285d63e25d63c21487ecac7a05a8304f0 SHA256 cc8d98da43263c08185727cdc0848c5182d54145d5f9caa908294b7d4ef4ed7b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
-
-iEYEARECAAYFAkrqEQQACgkQHB6c3gNBRYeTYwCeMBFg6+NDrJFRXN3ocYhdac1L
-URcAn2prAesynTe/f0B68y5vvwLQiPil
-=2JfO
------END PGP SIGNATURE-----
diff --git a/x11-base/xorg-server/xorg-server-1.6.4.ebuild b/x11-base/xorg-server/xorg-server-1.6.5-r1.ebuild
index 44627fd223da..22880baea40c 100644
--- a/x11-base/xorg-server/xorg-server-1.6.4.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.6.5-r1.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.6.4.ebuild,v 1.2 2009/10/02 14:10:00 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.6.5-r1.ebuild,v 1.1 2009/11/18 20:28:01 remi Exp $
 
 EAPI="2"
 
@@ -9,8 +9,8 @@ EAPI="2"
 
 inherit x-modular multilib versionator
 
-SRC_URI="${SRC_URI}"
-#	mirror://gentoo/${P}-gentoo-patches-01.tar.bz2
+SRC_URI="${SRC_URI}
+	mirror://gentoo/${P}-gentoo-patches-01.tar.bz2"
 
 OPENGL_DIR="xorg-x11"
 
@@ -19,7 +19,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-
 
 IUSE_SERVERS="dmx kdrive xorg"
 IUSE="${IUSE_SERVERS} tslib hal ipv6 minimal nptl sdl"
-RDEPEND="hal? ( sys-apps/hal )
+
+RDEPEND="
+	hal? ( sys-apps/hal )
 	tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto )
 	dev-libs/openssl
 	>=x11-libs/libXfont-1.4.0
@@ -99,12 +101,11 @@ EPATCH_FORCE="yes"
 EPATCH_SUFFIX="patch"
 
 # These have been sent upstream
-#UPSTREAMED_PATCHES=(
-#	"${WORKDIR}/patches/"
-#	)
+UPSTREAMED_PATCHES=(
+	"${WORKDIR}/patches/"
+	)
 
 PATCHES=(
-	"${FILESDIR}/1.6.4-re-fix-DGA-removal.patch"
 	"${UPSTREAMED_PATCHES[@]}"
 	)