xorg-server: Sync with x11 overlay and update dependencies.

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 9f8339552dd5a15d6b1362efcc672d0af6e6213e..67d9553ff40509611bb15447459c840311b1c516 100644 (file)
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -6,10 +6,12 @@ AUX xdm-setup.initd-1 346 RMD160 e68512e71adbf15743f789bb6b5587b07a9812a3 SHA1 f
 AUX xdm.confd-3 853 RMD160 363cd18f760650923e16579bf55f661e93dad63b SHA1 0027b98f2aeb5c43219fa4f9b7d81a05101bec6f SHA256 00af0d957ff1b4f31c1aa4701d93a54080408548792deafac5414cbfa13b89ec
 AUX xdm.initd 5392 RMD160 eec0b0ccefeee366e891afc73d195240b447421f SHA1 d3ce725e86fa3889f77403354b7f69d8184181ae SHA256 0c087c42d46563fd9d63da655753128aab2a0815efb83f906db3f54ba5c886ce
 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.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
 EBUILD xorg-server-1.7.7.ebuild 7220 RMD160 ed925fe7fccf08ae58ce59314a0c472535f13ec0 SHA1 5d72d32a1b8c9c4f40f88627b42d749ed4223e7b SHA256 f70710b49e1ca43c8cc765fe20ab9819bc5b2793eff0064cee607e4703d73ccc
 EBUILD xorg-server-1.8.0.ebuild 8221 RMD160 6aa53ec1042a8c12b9aa06c1aee767a50e1c2445 SHA1 d1e770f5108c161fb5d20207c612c568c32cfdc8 SHA256 5e21d8ab052b17774c40b67fb20981847a289ddbad39b8753501d21b50a6d450
 EBUILD xorg-server-1.8.1-r1.ebuild 7998 RMD160 c1035725f811ee2b5723a8bdac73cb3eeb3f6dd0 SHA1 08cf52506fb9eb2261b9c3d64dd8807fd95daeb5 SHA256 43b5bc070b8f479c08532f4a5c62b332cf8f579ee5f49614ffb256a1bb746a1a
-EBUILD xorg-server-9999.ebuild 7242 RMD160 44616d066db61f867abfcb83fc213c76239ac0bb SHA1 aee603592a792a9d08216169ede40883de05ed9f SHA256 257e15068c5b744dfaaa5b7d26d391db954ef5dfdda1ccdbfd3f6b501475b765
+EBUILD xorg-server-9999.ebuild 7396 RMD160 16d302c1721b7acb22059850caec602575641e36 SHA1 8c019ebf95ece1fb20b5873b95a75d8c2fd1ef2b SHA256 48e5a9770e38cb9f2c08b584ad363447ea5b5ecf778e874a9d640f0767db1174
+MISC xorg-server-9999.ebuild.orig 7242 RMD160 44616d066db61f867abfcb83fc213c76239ac0bb SHA1 aee603592a792a9d08216169ede40883de05ed9f SHA256 257e15068c5b744dfaaa5b7d26d391db954ef5dfdda1ccdbfd3f6b501475b765

diff --git a/x11-base/xorg-server/files/xorg-sets.conf b/x11-base/xorg-server/files/xorg-sets.conf
new file mode 100644 (file)
index 0000000..5cd8112
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-sets.conf
@@ -0,0 +1,6 @@
+# Rebuild all X11 modules (mostly useful after xorg-server ABI change).
+[x11-module-rebuild]
+class = portage.sets.dbapi.VariableSet
+world-candidate = false
+variable = CATEGORY
+includes = x11-drivers

diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index 27a80e1a44a446c3e383aa28e29e6f8adc607819..31699eb2279baf698ace9670422044d770479861 100644 (file)
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -78,7 +78,7 @@ DEPEND="${RDEPEND}
        >=x11-proto/xineramaproto-1.1.3
        >=x11-proto/xproto-7.0.17
        dmx? ( >=x11-proto/dmxproto-2.2.99.1 )
-       doc? ( app-doc/doxygen )
+       doc? ( >=app-doc/doxygen-1.6.1 )
        !minimal? (
                >=x11-proto/xf86driproto-2.1.0
                >=x11-proto/dri2proto-2.1
@@ -202,6 +202,10 @@ src_install() {
        newinitd "${T}"/xdm.initd xdm || die "initd file install failed"
        newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup || die
        newconfd "${FILESDIR}"/xdm.confd-3 xdm || die
+
+       # install the @x11-module-rebuild set for Portage
+       insinto /usr/share/portage/config/sets
+       newins "${FILESDIR}"/xorg-sets.conf xorg.conf || die
 }
 
 pkg_postinst() {