Install xorg.conf.example like 6.x did. (Bug #138623, requested by

Christopher Covington; patch written by Donnie and I) Don't build kdrive
servers that use vm86.h on non-x86 systems. (Bug #150052, Shvetsov Alex)
(Portage version: 2.1.2_pre2-r8)
 (Unsigned Manifest commit)

1 files changed, 12 insertions, 18 deletions

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 971970a5970d..db0f78a3a9ef 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 01-no-move-damage.patch 1149 RMD160 f40d73e020376e1b9603dfa5ceb2fd0b48b45e31 SHA1 b8adef394d05a8769627d71b8da302f7fc3622d5 SHA256 9396f282e3d62927e86c4aa38b0d6245b83ca8e2ea48624f22c3c6d35751d997
 MD5 0faff1bfae0c6378fae5d2875fb3972c files/01-no-move-damage.patch 1149
 RMD160 f40d73e020376e1b9603dfa5ceb2fd0b48b45e31 files/01-no-move-damage.patch 1149
@@ -65,6 +62,10 @@ AUX x11r7.0-setuid.diff 3513 RMD160 a6b7b95e54b748ad2d1892395927a9c681e940ea SHA
 MD5 0411ec21c16bdabd945159476b1c796a files/x11r7.0-setuid.diff 3513
 RMD160 a6b7b95e54b748ad2d1892395927a9c681e940ea files/x11r7.0-setuid.diff 3513
 SHA256 8305e689358d5a92c1fae74f520a044677d468d6a617afddc5013af7b37c5db6 files/x11r7.0-setuid.diff 3513
+AUX xorg-conf-example.patch 1924 RMD160 04325d6624ad01ee69702b069be3665b5e96b647 SHA1 2d7b8328c695dc179e4f6e1d0e4609bb449159ee SHA256 ceb0dd0ccc6b02a026b599f1c838fc0a0c3f789f58407e85ee783ddaf9989350
+MD5 f2c08e04fd4d36bf1e9e5fd25102c243 files/xorg-conf-example.patch 1924
+RMD160 04325d6624ad01ee69702b069be3665b5e96b647 files/xorg-conf-example.patch 1924
+SHA256 ceb0dd0ccc6b02a026b599f1c838fc0a0c3f789f58407e85ee783ddaf9989350 files/xorg-conf-example.patch 1924
 AUX xorg-server-1.0.2-64bit-fix-for-glx.patch 414 RMD160 17732b6ebe06e1533ce8f9b97e6ca8d7e4347a88 SHA1 3464a0f714810d36da11424103550e604f93b22f SHA256 1b2337fa0438c72fc8a17d710133f79ed17d49650efd9bc530bbb97b116427c4
 MD5 900d8194df467de2c86276d446522062 files/xorg-server-1.0.2-64bit-fix-for-glx.patch 414
 RMD160 17732b6ebe06e1533ce8f9b97e6ca8d7e4347a88 files/xorg-server-1.0.2-64bit-fix-for-glx.patch 414
@@ -124,18 +125,18 @@ EBUILD xorg-server-1.1.0-r1.ebuild 24569 RMD160 89333463053a1326e882153cc1aa5b9e
 MD5 6931e96ed29cdf066cf9bf399c751ad5 xorg-server-1.1.0-r1.ebuild 24569
 RMD160 89333463053a1326e882153cc1aa5b9e81b27eb0 xorg-server-1.1.0-r1.ebuild 24569
 SHA256 8eedd866ec4963ae94241d3ea90a8e80e2aa3f35a0f20fa793fde05e338bb995 xorg-server-1.1.0-r1.ebuild 24569
-EBUILD xorg-server-1.1.1-r1.ebuild 15992 RMD160 1caf019a39a191b67cd29ed909c2e6a8ae77d371 SHA1 f0212a8c64b60c73fe71f85bc9eeba18fe65b5b8 SHA256 f5fb2f6918b2a55819374d52ffc56547b9a0ecfdee59b227f2fbdd16ef82327a
-MD5 22ed989713263c1c74ee89a81be1c4e6 xorg-server-1.1.1-r1.ebuild 15992
-RMD160 1caf019a39a191b67cd29ed909c2e6a8ae77d371 xorg-server-1.1.1-r1.ebuild 15992
-SHA256 f5fb2f6918b2a55819374d52ffc56547b9a0ecfdee59b227f2fbdd16ef82327a xorg-server-1.1.1-r1.ebuild 15992
+EBUILD xorg-server-1.1.1-r1.ebuild 16253 RMD160 1f21e8ecb748ab4df911ba183216953413001a09 SHA1 aef80d16cc675ce0cef8a92bfea85b8aade4d8f0 SHA256 37e9bee454f0670770b5e261f3c574e79b690cea5db637d19b261df4b243a4cf
+MD5 c9cda5031d2186974edbe64b4c3b630a xorg-server-1.1.1-r1.ebuild 16253
+RMD160 1f21e8ecb748ab4df911ba183216953413001a09 xorg-server-1.1.1-r1.ebuild 16253
+SHA256 37e9bee454f0670770b5e261f3c574e79b690cea5db637d19b261df4b243a4cf xorg-server-1.1.1-r1.ebuild 16253
 EBUILD xorg-server-1.1.1.ebuild 15382 RMD160 32ebd2bef1415d0193a42f7c9d80b07b36a653ac SHA1 527956284fa7c6f68126db52adb3a25ac078d171 SHA256 1608007b9b32c0ec110dffd2e65a7ac69200975b0f48fce27ba68a33c7a51dcb
 MD5 9a5fa768a77f72877ec3303f890f614e xorg-server-1.1.1.ebuild 15382
 RMD160 32ebd2bef1415d0193a42f7c9d80b07b36a653ac xorg-server-1.1.1.ebuild 15382
 SHA256 1608007b9b32c0ec110dffd2e65a7ac69200975b0f48fce27ba68a33c7a51dcb xorg-server-1.1.1.ebuild 15382
-MISC ChangeLog 35790 RMD160 375c4a3f94d6d7f9e0da913e6eabbe155e0539c2 SHA1 54b72d9b9c8d6802b122f52df5505c410bd73278 SHA256 03b2fc9708f0e436051d6ad5866dd6b7d1027533cd69414ae8c510c70c6a04c9
-MD5 714ec6bb2c9245ed578a765358b6ae6d ChangeLog 35790
-RMD160 375c4a3f94d6d7f9e0da913e6eabbe155e0539c2 ChangeLog 35790
-SHA256 03b2fc9708f0e436051d6ad5866dd6b7d1027533cd69414ae8c510c70c6a04c9 ChangeLog 35790
+MISC ChangeLog 36135 RMD160 b02b5ffabd3bc18f29a4dc9d033757f8240c7a72 SHA1 e34a422bc77e8abf65bebbd5eb117c8a7f56add2 SHA256 97158bcd12a2d1a68fe866853999ee56491a51f1c65525651d9e1e4e1d3d269d
+MD5 315854c06992c045cee4317fa471da89 ChangeLog 36135
+RMD160 b02b5ffabd3bc18f29a4dc9d033757f8240c7a72 ChangeLog 36135
+SHA256 97158bcd12a2d1a68fe866853999ee56491a51f1c65525651d9e1e4e1d3d269d ChangeLog 36135
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -152,10 +153,3 @@ SHA256 1bea059c9ffe1dee3634293efe79b0a429d52ca18eda558e2e7b9e0605b0504a files/di
 MD5 08a18214630142f3409a9ac0467c29b5 files/digest-xorg-server-1.1.1-r1 506
 RMD160 b782fed9f834cabd0293533c4820a1564c0e58ab files/digest-xorg-server-1.1.1-r1 506
 SHA256 64c42412d824c7523b5fc70a87b0624f8c18a9980e27b1bf6208103e164a508a files/digest-xorg-server-1.1.1-r1 506
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFJtFVkT4lNIS36YERAj4vAJ9CseuifNhc4zJqqvBnCfb9TNl48QCfQpNH
-OVK3PL3t6iLmTH5Zkvdmqu0=
-=68BV
------END PGP SIGNATURE-----