Version bump. Drop old patches.

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64

5 files changed, 13 insertions, 74 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 91ebfd12fa48..f9dad8a88da1 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.578 2011/04/09 15:53:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.579 2011/04/16 23:34:56 chithanh Exp $
+
+*xorg-server-1.10.1 (16 Apr 2011)
+
+  16 Apr 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  -files/xorg-server-1.7.6-tslib-as-needed.patch,
+  -files/xorg-server-1.8-nouveau-default.patch,
+  -xorg-server-1.10.0.902.ebuild, +xorg-server-1.10.1.ebuild:
+  Version bump. Drop old patches.
 
 *xorg-server-1.10.0.902 (09 Apr 2011)
 
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index be1d03f10d28..5cf33315dab0 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,28 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 0001-Fix-tslib-check-fallback-to-set-TSLIB_LIBS.patch 1113 RMD160 2f9d636c73258b926e3a78c8ac7aaefac8afb7b6 SHA1 fe4da99464a2907cf826051d39a841f6e6be5e2b SHA256 bc0a37897d3284165aa38e281afd206ca41766a6cdadf5a157a2c137a7e93d03
 AUX xdm-setup.initd-1 346 RMD160 e68512e71adbf15743f789bb6b5587b07a9812a3 SHA1 f25303b8bcef0c5d2eb61517d5347b4b88736cd4 SHA256 942ce5e8d1a0770543b683dcc388bae7619a24eb9741c1cd678ed3df97c01406
 AUX xdm.confd-3 853 RMD160 363cd18f760650923e16579bf55f661e93dad63b SHA1 0027b98f2aeb5c43219fa4f9b7d81a05101bec6f SHA256 00af0d957ff1b4f31c1aa4701d93a54080408548792deafac5414cbfa13b89ec
 AUX xdm.initd 5392 RMD160 eec0b0ccefeee366e891afc73d195240b447421f SHA1 d3ce725e86fa3889f77403354b7f69d8184181ae SHA256 0c087c42d46563fd9d63da655753128aab2a0815efb83f906db3f54ba5c886ce
 AUX xdm.initd-3 5551 RMD160 7af6e239e3e75ea88a0766ef2f4976a8b5c51c95 SHA1 bd30222c7941d50fc0f62c5008a0e3b97e2d00e0 SHA256 8f1d35638559d12ed14e8cc2e26800e0ee9a10f14c7be912c834c73d12913601
-AUX xorg-server-1.7.6-tslib-as-needed.patch 942 RMD160 d78cde49e7725890be41eca4cb3234e487625ad3 SHA1 41c634c00dd18783a39e2e3bc2aa6342e364e1e1 SHA256 881f23f2f43f6124de202d4fd54a1ef7f505fef3965371cc6145faffa84c5547
-AUX xorg-server-1.8-nouveau-default.patch 963 RMD160 cb8e530815c21a6015052594204470d89185bd2b SHA1 a865eeb7818ee2c25d4f94d7b3cf94d9b844fd5c SHA256 40525090aa8342c50401f53d2c66e6bee5ff26db02f7ebf23aab42e33af0fb31
 AUX xorg-server-1.9-nouveau-default.patch 916 RMD160 0ebdf0fb76364b7fd0c520c3a2f7cc2cc1a83446 SHA1 daddde0f4f4276e12b87354d2e6825ed5c74c6eb SHA256 a7ff421dd928e3025194279f9afb7cc033a896b3417abe339741e9c6ed4b54ea
 AUX xorg-server-disable-acpi.patch 663 RMD160 7074ca5276369b746ea7606a0795232aafe07c90 SHA1 d300a37dd2e0a8aa3965948c13f6995e6767841d SHA256 5b3cc7c8bea18fe3ba81851d2846d19ffd8fab9cdf5d8f3a274846847e734200
 AUX xorg-sets.conf 199 RMD160 33815115b6e8b8360af4f0778b0e2c5fb1a9aaee SHA1 b5a2fd01a97558fa909c67f510d8a59b55e20f57 SHA256 1201d0337ac69d9715f4454a86dfb8a7bd1ae6f4c2578042fc08f283a997597c
-DIST xorg-server-1.10.0.902.tar.bz2 5347404 RMD160 962665666368ff2a749e80aa3dbee2385c40fb4a SHA1 7d44c57735c321fefd2b58f8917f51a95a829886 SHA256 994ab87bb0cc9b56203e01e3294fddd502a96d074139496ea4ffc03c95b41b42
+DIST xorg-server-1.10.1.tar.bz2 5344169 RMD160 f0333f67f8226c21bfad395bb3ee72e6d10784f6 SHA1 59ada4c9a59f7f1eb4b68c359e9cd58272aa4809 SHA256 143c7c3d7d4428352e1153dffa34fd64af391f72d30b2a03e911e54e36f00b5d
 DIST xorg-server-1.9.4.tar.bz2 5191944 RMD160 1a5531de1eba9939b012e0c7f5628f2ffa553273 SHA1 e8d5776fe973f15c0e907fd827106f8d296acf7e SHA256 ad11047ebba58f2e37b03c70c986db3ea0cc0f1a19d2d3612713ab77b8ec2458
 DIST xorg-server-1.9.5.tar.bz2 5172054 RMD160 6383b126ed313943fc5cb0939fdae4a737aabb70 SHA1 03be24d6906f3ed3237057a5a7df2b02723c9749 SHA256 3fc775097c4f0e8f731447d0183ee709ae37c44c0c286ba00a4b028274e029dc
-EBUILD xorg-server-1.10.0.902.ebuild 7255 RMD160 2cc93deb79d66ecf709b93e9b709ad327cf15cd3 SHA1 586d6aeaccd79abf50d6ea86c5cf0b22ac019685 SHA256 95d632a7ab5eb24e4d92b2a333aa26349545e0b357a014b65ce110d5e08f450d
+EBUILD xorg-server-1.10.1.ebuild 7250 RMD160 955002c114f22bd5d77da38104298dc639bba4e8 SHA1 c1a6fc9acfcdb5ce6d6145babd67d3105872e2de SHA256 8b9919e5a60bc782490db2d8e6f24a8247a7cc2ae0bef50037631fa9e6888071
 EBUILD xorg-server-1.9.4.ebuild 7804 RMD160 be63938727e77f858c9de4ed6892809b21abadd3 SHA1 d5d35ea11f5840459af5e001a1a86701f4ca7192 SHA256 bab747527e1ec78239d0894c08d49178739ea75ffc5afb29b9b4daf07adaf295
 EBUILD xorg-server-1.9.5.ebuild 7813 RMD160 c72d1a16efe64a502739eac678da908a7aa7a52f SHA1 754e7537c8dcd412e619e377388f7f6cdbdd7b88 SHA256 745a7b00690e761f295340cab7116d522d701b00f1c1319f14d339e15c899488
-MISC ChangeLog 125335 RMD160 08b551fdbc2d0527d655ddd1903754026d8ca6d7 SHA1 e0d6c65181e6ec2aa11a5cdbdac7489ae58d69d7 SHA256 14f2cc7b97f77d36e7e576bb329cd2d1f684b470c6ab4f6667b618cae0b0db9e
+MISC ChangeLog 125633 RMD160 f40604ff1cc527f6a67dfb4607c42db831d851f2 SHA1 45ebef06f2d89e334f6c43abf42bec55173969af SHA256 2e728df3b21b94025a58575bff278d38ad7d30ecde96cc48eb86bc2d595d267b
 MISC metadata.xml 439 RMD160 c96c2c91bc0374b9ec854aec534988afa77cd42c SHA1 631c118285d63e25d63c21487ecac7a05a8304f0 SHA256 cc8d98da43263c08185727cdc0848c5182d54145d5f9caa908294b7d4ef4ed7b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk2nGp4ACgkQVWmRsqeSphM4OQCfcS/ZmeM97YJ97RtKMEOms0HE
-Cp8AnRXZ2jk58gM3sVYEUSFiEd8LozUE
-=X0N8
------END PGP SIGNATURE-----
diff --git a/x11-base/xorg-server/files/xorg-server-1.7.6-tslib-as-needed.patch b/x11-base/xorg-server/files/xorg-server-1.7.6-tslib-as-needed.patch
deleted file mode 100644
index 6e1b3e59401c..000000000000
--- a/x11-base/xorg-server/files/xorg-server-1.7.6-tslib-as-needed.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From c5eeb329f06a3c58704351261f8633c0ed753f18 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Mon, 4 Oct 2010 19:02:29 +0200
-Subject: [PATCH] Fix linking with tslib, with -Wl,--as-needed.
-
----
- configure.ac |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4408e86..47df6c3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1981,7 +1981,7 @@ if test "$KDRIVE" = yes; then
-     KDRIVE_LOCAL_LIBS="$MAIN_LIB $DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB $CONFIG_LIB"
-     KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $FB_LIB $MI_LIB $KDRIVE_PURE_LIBS"
-     KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB $OS_LIB"
--    KDRIVE_LIBS="$TSLIB_LIBS $KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS"
-+    KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS $TSLIB_LIBS"
- 
-     AC_SUBST([XEPHYR_LIBS])
-     AC_SUBST([XEPHYR_INCS])
--- 
-1.7.3.1
-
diff --git a/x11-base/xorg-server/files/xorg-server-1.8-nouveau-default.patch b/x11-base/xorg-server/files/xorg-server-1.8-nouveau-default.patch
deleted file mode 100644
index 3d144e2dd3b6..000000000000
--- a/x11-base/xorg-server/files/xorg-server-1.8-nouveau-default.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
-index 7f4ada8..d964c6c 100644
---- a/hw/xfree86/common/xf86AutoConfig.c
-+++ b/hw/xfree86/common/xf86AutoConfig.c
-@@ -192,7 +192,24 @@ videoPtrToDriverList(struct pci_device *dev,
- 	    break;
- 	case 0x102b:		    driverList[0] = "mga";	break;
- 	case 0x10c8:		    driverList[0] = "neomagic"; break;
--	case 0x10de: case 0x12d2:   driverList[0] = "nv";	break;
-+	case 0x10de: case 0x12d2:
-+	    switch (dev->device_id) {
-+	    /* NV1 */
-+	    case 0x0008:
-+	    case 0x0009:
-+		driverList[0] = "vesa";
-+		break;
-+	    /* NV3 */
-+	    case 0x0018:
-+	    case 0x0019:
-+		driverList[0] = "nv";
-+		break;
-+	    default:
-+		driverList[0] = "nouveau";
-+		driverList[1] = "nv";
-+		break;
-+	    }
-+	    break;
- 	case 0x1106:		    driverList[0] = "openchrome"; break;
-         case 0x1b36:		    driverList[0] = "qxl"; break;
- 	case 0x1163:		    driverList[0] = "rendition"; break;
--- 
-1.6.5.2
diff --git a/x11-base/xorg-server/xorg-server-1.10.0.902.ebuild b/x11-base/xorg-server/xorg-server-1.10.1.ebuild
index 785a969c3608..df108f173453 100644
--- a/x11-base/xorg-server/xorg-server-1.10.0.902.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.10.0.902.ebuild,v 1.1 2011/04/09 15:53:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.10.1.ebuild,v 1.1 2011/04/16 23:34:56 chithanh Exp $
 
 EAPI=4