Version bump. Drop old.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 23 insertions, 108 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 73c7d9d53746..cef0e2d674a1 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.514 2010/06/04 13:57:09 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.515 2010/06/09 12:52:43 scarabeus Exp $
+
+*xorg-server-1.8.1.901 (09 Jun 2010)
+
+  09 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xorg-server-1.8.1-r1.ebuild, +xorg-server-1.8.1.901.ebuild,
+  -files/1.6.3.901-0001-dix-append-built-ins-to-the-font-path-in-SetDefaultF
+  .patch:
+  Version bump. Drop old.
 
   31 May 2010; Guy Martin <gmsoft@gentoo.org> xorg-server-1.7.6.ebuild:
   hppa stable, #308521
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index e73f5ee25ae5..9f3ae19841d7 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,4 +1,6 @@
-AUX 1.6.3.901-0001-dix-append-built-ins-to-the-font-path-in-SetDefaultF.patch 3303 RMD160 69966b78924cc4f03df8ff0edc1666370a6b9e67 SHA1 a95b2e0ec5f47e91769b596872c4a7700101d730 SHA256 8f24228cf93819a59f016b42d31cd1d4c6d4b014a24d690dd3b5e88e0040563f
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.7.3.901-0001-dix-if-owner-events-is-true-for-passive-grabs-add-th.patch 3142 RMD160 3cd195de58afa6f64df332c80334bdcbd5627706 SHA1 8b226f32183eabf130e85ad07d1bbffaa2a14915 SHA256 c315ee87fb09265b6372503c628192f527064e9493fdd3c66801f26ab974df6a
 AUX 1.7.5.902-fix-tslib-1.0-check.patch 743 RMD160 139969e7c89ccbb6c86a93b7ea74aad2e942cd55 SHA1 621f3dea75aeb84a30279e5854b0ae256f653113 SHA256 03fced212933eb4502554c4fd629ead92027dc13f178ad5c43cd59b7ce615cea
 AUX 1.8.0-match-only-sane-devices.patch 1980 RMD160 4fee29076bb30e8fb1b820ef58a1c26f3bd63c73 SHA1 98d4ea8e493a31f141e39f4a468458469ebff58f SHA256 95f6ab36fa1b6b80786ff90fb2ee1f7fe02d964a1d10c90277060b4982d8eace
@@ -12,11 +14,18 @@ DIST xorg-server-1.6.5.tar.bz2 4678406 RMD160 702970358a5643dbc9205f42e39c5b8ed2
 DIST xorg-server-1.7.6.tar.bz2 4927689 RMD160 811ca10c01da9b4bdeb743ee90b6845971dfd4c7 SHA1 77a8c3dec86960e1be818df3a75d69b5fad6a3c0 SHA256 da372e064aa5c2a0421830941372d4fea864e69c70290d56d6ffc042a6e80760
 DIST xorg-server-1.7.7.tar.bz2 4939257 RMD160 19ab82795abe122cd267e4718152bf87af465829 SHA1 0f1b71363843b7e394d6de62d0db5b74d3e645ef SHA256 54c4d32bfeb8852adbea3ddae6981f3bc2eadb330124d9b35226c617c01926ff
 DIST xorg-server-1.8.0.tar.bz2 5097035 RMD160 4dedc88bcbbbe545b0e795d541edb3c665d12018 SHA1 a5f4fc748fc9841b7c0be6ef7388d26551d0d75b SHA256 423a8092e28affb83aa736695408e01fd4641040727f34ed6bcfae9c06018b77
-DIST xorg-server-1.8.1.tar.bz2 5200978 RMD160 27bd6d1e565e241412f1fb8e18b5b9b194b94356 SHA1 cba0d3b3d28696609a1f9b110d4d129cd066e133 SHA256 bddb974d8f21107ab8f79abf92cebb06ec13243f1ffd1ef56b48452c4994659d
+DIST xorg-server-1.8.1.901.tar.bz2 5220082 RMD160 36c0a17c5b41ddb222117b35616630b093300e5c SHA1 e26228cbeb387ec37ee6c549a208534a2dd2ae43 SHA256 ca9ccea83eb9585f53182df0e984d1303a78b585e77651b2c407d7b500884863
 EBUILD xorg-server-1.6.5-r1.ebuild 6842 RMD160 7dc826b80d62c7bad6bc36dbcd9d5134ac8def0e SHA1 fca33f2816607703c3ed2612be1238f9cd6f28da SHA256 71441f59df32e25dad5deae4838e312e62a87497e0e4362cd297e27f33b96584
 EBUILD xorg-server-1.7.6.ebuild 7309 RMD160 b761bc151ecdc960d3e881e059ce5bafdccc3d32 SHA1 31c1c8915970323e6786eb8a0f5945553d1a9f22 SHA256 c8640d0acde2da02116a589712159b14414840a76e36b7ff555edb7c688f455a
 EBUILD xorg-server-1.7.7.ebuild 7162 RMD160 b099b9dc02ff0b6aaa82ec54ac01203c25a052cb SHA1 85b2efa437730f2623c36ebab3fb4cb28c7a0d0d SHA256 7e0a584a20db0a4b94326bed6ab77f9866b2a4526d3d71dc6a7cb9d88c0b4313
 EBUILD xorg-server-1.8.0.ebuild 8163 RMD160 256d04fae9d5a1f395479558d8ef53c0c5558299 SHA1 26c6e8befd90bf1f8a059914b03f00a0bad172f3 SHA256 a6b7a567f020a1feb343fdde0b9833c2e06b9d4079aa442bde9f0ac9c3f74530
-EBUILD xorg-server-1.8.1-r1.ebuild 7947 RMD160 008eef5afe009792d76cc138a1a8424c898c61b4 SHA1 6a05f689982cd36498a3c40ced2112f88d8ae4b8 SHA256 5f5b00296da10c672d517db04b724229cc0c064505238aaa24cfbd284fff547b
-MISC ChangeLog 114634 RMD160 e6af48c53463ed0810bddb0307a7527a9604fa39 SHA1 9e1e1a1f798cd0a27ef61a580f5eab285036e821 SHA256 79fe806677e7226347c24b6bb94ffaeff483e5ab91a52fd3962c241eb3b84393
+EBUILD xorg-server-1.8.1.901.ebuild 7949 RMD160 52a35f61b468b56236dec7fe2b4f533f364f1550 SHA1 353c3f3463c4a7253c424c67db328a40823a5f7b SHA256 c8f194e74274f0964183db1d0dc30a521ef50dfb0471a41aec78833a88f7137d
+MISC ChangeLog 114907 RMD160 ad7c8fcd264cae4d232786914268c1c82676762e SHA1 063373198d3ea7016801ff1f9d880cd38616440c SHA256 de776fdb317922cf06c403ec1153eb0f805b9b66e323d52e8b81501f8fe2b8e0
 MISC metadata.xml 499 RMD160 13985f2e8ee45fa43d4689f4c09ae4d3c8fe7e59 SHA1 b84c2d3e23c3eae539fa1c37aa0e0345083bedea SHA256 f2f68c9cdaf48810cc035fb5b3bb3467569be2aabbe5eb74405b75427d5193ba
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkwPjnwACgkQHB6c3gNBRYf9ZACgmviWZZyamwnfBhxcfWbRFtQn
+6pAAnAgWV807qYOV/wbdeK4W6voXBw21
+=OTZE
+-----END PGP SIGNATURE-----
diff --git a/x11-base/xorg-server/files/1.6.3.901-0001-dix-append-built-ins-to-the-font-path-in-SetDefaultF.patch b/x11-base/xorg-server/files/1.6.3.901-0001-dix-append-built-ins-to-the-font-path-in-SetDefaultF.patch
deleted file mode 100644
index eb3ec7d6b181..000000000000
--- a/x11-base/xorg-server/files/1.6.3.901-0001-dix-append-built-ins-to-the-font-path-in-SetDefaultF.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From c6753b750d76564bee02b317d10a496d0ced4274 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org>
-Date: Fri, 4 Sep 2009 23:05:29 +0200
-Subject: [PATCH] dix: append "built-ins" to the font path in SetDefaultFontPath
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-49b93df8a3002db7196aa3fc1fd8dca1c12a55d6 made the hard dependency on
-a "fixed" font go away but only Xorg could use the built-ins fonts by
-default.
-
-With this commit, all DDXs get "built-ins" appended to their FontPath, not
-just Xorg.
-
-Tested with Xorg, Xvfb and Xnest.
-
-Signed-off-by: Rémi Cardona <remi@gentoo.org>
----
- dix/dixfonts.c                 |   20 ++++++++++++++++++--
- hw/xfree86/common/xf86Config.c |   16 ----------------
- 2 files changed, 18 insertions(+), 18 deletions(-)
-
-diff --git a/dix/dixfonts.c b/dix/dixfonts.c
-index 719bca4..4d69025 100644
---- a/dix/dixfonts.c
-+++ b/dix/dixfonts.c
-@@ -1818,6 +1818,9 @@ SetDefaultFontPath(char *path)
-     unsigned char *cp,
-                *pp,
-                *nump,
-+               *temp_path,
-+               *start,
-+               *end,
-                *newpath;
-     int         num = 1,
-                 len,
-@@ -1825,12 +1828,24 @@ SetDefaultFontPath(char *path)
-                 size = 0,
-                 bad;
- 
-+    /* ensure temp_path contains "built-ins" */
-+    start = strstr(path, "built-ins");
-+    end = start + strlen("built-ins");
-+    if (start == NULL ||
-+	!((start == path || start[-1] == ',') && (!*end || *end == ','))) {
-+	temp_path = Xprintf("%s%sbuilt-ins", path, *path ? "," : "");
-+    } else {
-+        temp_path = Xstrdup(path);
-+    }
-+    if (!temp_path)
-+        return BadAlloc;
-+
-     /* get enough for string, plus values -- use up commas */
--    len = strlen(path) + 1;
-+    len = strlen(temp_path) + 1;
-     nump = cp = newpath = (unsigned char *) xalloc(len);
-     if (!newpath)
- 	return BadAlloc;
--    pp = (unsigned char *) path;
-+    pp = (unsigned char *) temp_path;
-     cp++;
-     while (*pp) {
- 	if (*pp == ',') {
-@@ -1849,6 +1864,7 @@ SetDefaultFontPath(char *path)
-     err = SetFontPathElements(num, newpath, &bad, TRUE);
- 
-     xfree(newpath);
-+    xfree(temp_path);
- 
-     return err;
- }
-diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
-index 9376119..ddf4745 100644
---- a/hw/xfree86/common/xf86Config.c
-+++ b/hw/xfree86/common/xf86Config.c
-@@ -612,22 +612,6 @@ configFiles(XF86ConfFilesPtr fileconf)
- 	pathFrom = X_DEFAULT;
-     temp_path = defaultFontPath ? defaultFontPath : "";
- 
--    /* ensure defaultFontPath contains "built-ins" */
--    start = strstr(temp_path, "built-ins");
--    end = start + strlen("built-ins");
--    if (start == NULL ||
--	!((start == temp_path || start[-1] == ',') && (!*end || *end == ','))) {
--	defaultFontPath = Xprintf("%s%sbuilt-ins",
--				  temp_path, *temp_path ? "," : "");
--	if (must_copy == TRUE) {
--	    if (defaultFontPath != NULL) {
--		must_copy = FALSE;
--	    }
--	} else {
--	    /* already made a copy of the font path */
--	    xfree(temp_path);
--	}
--    }
-     /* xf86ValidateFontPath modifies its argument, but returns a copy of it. */
-     temp_path = must_copy ? XNFstrdup(defaultFontPath) : defaultFontPath;
-     defaultFontPath = xf86ValidateFontPath(temp_path);
--- 
-1.6.4.2
-
diff --git a/x11-base/xorg-server/xorg-server-1.8.1-r1.ebuild b/x11-base/xorg-server/xorg-server-1.8.1.901.ebuild
index e8a1db2be5bb..697ce05407f2 100644
--- a/x11-base/xorg-server/xorg-server-1.8.1-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.8.1.901.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.8.1-r1.ebuild,v 1.2 2010/05/20 14:28:12 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.8.1.901.ebuild,v 1.1 2010/06/09 12:52:43 scarabeus Exp $
 
 EAPI=3
 XORG_EAUTORECONF="yes"