Migrate doc handling into new eclass layout.

41 files changed, 84 insertions, 63 deletions

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index f8a15464..c5a1d9fe 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX xdm-setup.initd-1 339 RMD160 dd3f50da114627d2be776b41a0d7d967ebbff477 SHA1 d86813f810aab72b81a72c298c2d230554d8e82e SHA256 018bc6acc70c708d8e3935617b8da2b84a3f5502a4db4c4731c2eaea7d3f04c0
 AUX xdm.confd-3 853 RMD160 363cd18f760650923e16579bf55f661e93dad63b SHA1 0027b98f2aeb5c43219fa4f9b7d81a05101bec6f SHA256 00af0d957ff1b4f31c1aa4701d93a54080408548792deafac5414cbfa13b89ec
 AUX xdm.initd-3 5551 RMD160 7af6e239e3e75ea88a0766ef2f4976a8b5c51c95 SHA1 bd30222c7941d50fc0f62c5008a0e3b97e2d00e0 SHA256 8f1d35638559d12ed14e8cc2e26800e0ee9a10f14c7be912c834c73d12913601
@@ -8,13 +5,6 @@ AUX xorg-server-1.9-nouveau-default.patch 916 RMD160 0ebdf0fb76364b7fd0c520c3a2f
 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.tar.bz2 5345055 RMD160 aa9587cc76eb7754605cf312c7f63cc9421bda18 SHA1 04df80e079cc8ab5406322a2bb207b30006c3595 SHA256 cb8f95779280da1cb2b7c753a5d1cbdf65fa890fa19e3288a4ea3622a58c4c63
-EBUILD xorg-server-1.10.0.ebuild 7130 RMD160 3b9e4e45ee7978a4b0c7e7af353f2db1856ede8d SHA1 aec2215e7cec4f2dcf6a60e06e8403e6e6994821 SHA256 500e8939b11181945b75b9f5ed6becd5cda0905d3f2d14b95e544eaebf85fddb
-EBUILD xorg-server-9999.ebuild 7130 RMD160 3b9e4e45ee7978a4b0c7e7af353f2db1856ede8d SHA1 aec2215e7cec4f2dcf6a60e06e8403e6e6994821 SHA256 500e8939b11181945b75b9f5ed6becd5cda0905d3f2d14b95e544eaebf85fddb
+EBUILD xorg-server-1.10.0.ebuild 7140 RMD160 3796e8d19b63cd6e8ccf51c950c0126bee78a760 SHA1 635a5ab1bbd437fa549bced45631f0f2dd010734 SHA256 9581412beb2f67656c3b09365be29e21d14c689d3bd86550530564f973832cf0
+EBUILD xorg-server-9999.ebuild 7140 RMD160 3796e8d19b63cd6e8ccf51c950c0126bee78a760 SHA1 635a5ab1bbd437fa549bced45631f0f2dd010734 SHA256 9581412beb2f67656c3b09365be29e21d14c689d3bd86550530564f973832cf0
 MISC metadata.xml 499 RMD160 13985f2e8ee45fa43d4689f4c09ae4d3c8fe7e59 SHA1 b84c2d3e23c3eae539fa1c37aa0e0345083bedea SHA256 f2f68c9cdaf48810cc035fb5b3bb3467569be2aabbe5eb74405b75427d5193ba
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk12bQ8ACgkQnGSe5QXeB7s0dACfVq12rTh6gdAfahMB3JCFTNOi
-w7IAn0IfhqYbhbATOncLXGUhfvLUFVvM
-=6yxG
------END PGP SIGNATURE-----
diff --git a/x11-base/xorg-server/xorg-server-1.10.0.ebuild b/x11-base/xorg-server/xorg-server-1.10.0.ebuild
index 80b3f746..3674f343 100644
--- a/x11-base/xorg-server/xorg-server-1.10.0.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.10.0.ebuild
@@ -3,6 +3,8 @@
 # $Header: $
 
 EAPI=4
+
+XORG_DOC=doc
 inherit xorg-2 multilib versionator
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
 
@@ -10,7 +12,7 @@ DESCRIPTION="X.Org X servers"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 
 IUSE_SERVERS="dmx kdrive xorg"
-IUSE="${IUSE_SERVERS} doc ipv6 minimal nptl tslib +udev"
+IUSE="${IUSE_SERVERS} ipv6 minimal nptl tslib +udev"
 
 RDEPEND=">=app-admin/eselect-opengl-1.0.8
 	dev-libs/openssl
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index 80b3f746..3674f343 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -3,6 +3,8 @@
 # $Header: $
 
 EAPI=4
+
+XORG_DOC=doc
 inherit xorg-2 multilib versionator
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
 
@@ -10,7 +12,7 @@ DESCRIPTION="X.Org X servers"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 
 IUSE_SERVERS="dmx kdrive xorg"
-IUSE="${IUSE_SERVERS} doc ipv6 minimal nptl tslib +udev"
+IUSE="${IUSE_SERVERS} ipv6 minimal nptl tslib +udev"
 
 RDEPEND=">=app-admin/eselect-opengl-1.0.8
 	dev-libs/openssl
diff --git a/x11-libs/libICE/Manifest b/x11-libs/libICE/Manifest
index 2031844a..009a2d76 100644
--- a/x11-libs/libICE/Manifest
+++ b/x11-libs/libICE/Manifest
@@ -1 +1 @@
-EBUILD libICE-9999.ebuild 702 RMD160 7a0e5a95442d1d0770df809e98a64745c4b0f11c SHA1 c864a9a94e0fb2aaea635311152a6f470dffa5f6 SHA256 288132829817669218d74c21300dcbd7d3eb64ebd2a2559ab85403110a37f7c7
+EBUILD libICE-9999.ebuild 712 RMD160 856378c315a947dbec08bbc1b04c831a52dc4772 SHA1 1896eb5a22143aa8672d7c0df8e6c7b55315d22c SHA256 2ddeb8fb7d790d063f6b6c5a1e068acb3ed651f1fcecde799503bc4cf89ada04
diff --git a/x11-libs/libICE/libICE-9999.ebuild b/x11-libs/libICE/libICE-9999.ebuild
index 2db51380..95205ccb 100644
--- a/x11-libs/libICE/libICE-9999.ebuild
+++ b/x11-libs/libICE/libICE-9999.ebuild
@@ -3,12 +3,14 @@
 # $Header: $
 
 EAPI=4
+
+XORG_DOC=doc
 inherit xorg-2
 
 DESCRIPTION="X.Org ICE library"
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="doc ipv6"
+IUSE="ipv6"
 
 RDEPEND="x11-libs/xtrans
 	x11-proto/xproto"
diff --git a/x11-libs/libSM/Manifest b/x11-libs/libSM/Manifest
index c3d6c1a7..bce23873 100644
--- a/x11-libs/libSM/Manifest
+++ b/x11-libs/libSM/Manifest
@@ -1 +1 @@
-EBUILD libSM-9999.ebuild 1228 RMD160 e19fd8860ddbe609892a52e21252088e59346162 SHA1 22e17f7a14a296443ca6510a58db6447c4bdd119 SHA256 f2b435266760d693594d35e07601114593177619c7f8e99ea8b07ac9a0ea1db3
+EBUILD libSM-9999.ebuild 1213 RMD160 f78b4580a989a18921122916839e790929cf7b29 SHA1 d9d416e6ba71e5e5b89f641d68af4dba6316e455 SHA256 0901c8a5c5863c8420159c8ea2d666db3a8958d63c63ac2de63498a7b3e17dfd
diff --git a/x11-libs/libSM/libSM-9999.ebuild b/x11-libs/libSM/libSM-9999.ebuild
index 2808b937..e5458413 100644
--- a/x11-libs/libSM/libSM-9999.ebuild
+++ b/x11-libs/libSM/libSM-9999.ebuild
@@ -2,13 +2,15 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
+
+XORG_DOC=doc
 inherit xorg-2
 
 DESCRIPTION="X.Org SM library"
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="doc ipv6 +uuid"
+IUSE="ipv6 +uuid"
 
 RDEPEND=">=x11-libs/libICE-1.0.5
 	x11-libs/xtrans
@@ -16,8 +18,7 @@ RDEPEND=">=x11-libs/libICE-1.0.5
 	!elibc_FreeBSD? ( !elibc_IRIX? ( !elibc_SunOS? (
 		uuid? ( >=sys-apps/util-linux-2.16 )
 	) ) )"
-DEPEND="${RDEPEND}
-	doc? ( app-text/xmlto )"
+DEPEND="${RDEPEND}"
 
 pkg_setup() {
 	xorg-2_pkg_setup
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index 3afebe23..90ae8be5 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -1,4 +1,4 @@
 AUX libX11-1.1.4-aix-pthread.patch 300 RMD160 88a513751566665b4284331df0e2a51f1e2e3ed9 SHA1 c61372b9f2eafd2109be4ba947e30f4250011fc5 SHA256 4b7fcb715a3a7568b8febeac29cfb32674c56e884a8bd274ddc6a2d69ea1dfe3
 AUX libX11-1.1.5-solaris.patch 246 RMD160 ec5fb4d330c45f248f77ae4236f11141eee5a32c SHA1 10c031e08415147a0824d96f3eec7cfefb895e5e SHA256 89210b0559e936cdb0a42b9bc5df9bf47704b88b53d93d329b372ca855cddd0c
 AUX libX11-1.1.5-winnt-private.patch 420 RMD160 6406109f3addf9721f01f8fd78d24c8303535218 SHA1 91212c729b4a7e1f34207f73cfa415670d62ef91 SHA256 d0349ef4d379ab3eefa33a28d20e0ec9c630ab0b5c64a52c3849cc8d1d4abba0
-EBUILD libX11-9999.ebuild 1345 RMD160 3f79d2835a2aaca537ceadfb851c81c647113afe SHA1 9784c4e436423044658c6585bd3ecc83a11d8897 SHA256 c8401eb92a6b22224d0919c5fe6b46f1b4916d16020a8088be994f9aaab256e8
+EBUILD libX11-9999.ebuild 1330 RMD160 ce204949e09b616e745ef5b8d599e8b2a5a78d19 SHA1 14a9ad27ec52d21ae80cd9cde46b39c232de0b92 SHA256 ef571ca11641870f0c1ad2e8998c759c1b4334d43e929973e3109fa389af1804
diff --git a/x11-libs/libX11/libX11-9999.ebuild b/x11-libs/libX11/libX11-9999.ebuild
index 6e75a13b..33e260b3 100644
--- a/x11-libs/libX11/libX11-9999.ebuild
+++ b/x11-libs/libX11/libX11-9999.ebuild
@@ -3,12 +3,14 @@
 # $Header: $
 
 EAPI=4
+
+XORG_DOC=doc
 inherit xorg-2 toolchain-funcs flag-o-matic
 
 DESCRIPTION="X.Org X11 library"
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ppc-aix ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="doc ipv6 test"
+IUSE="ipv6 test"
 
 RDEPEND=">=x11-libs/libxcb-1.1.92
 	x11-libs/xtrans
@@ -18,7 +20,6 @@ RDEPEND=">=x11-libs/libxcb-1.1.92
 	x11-proto/kbproto
 	x11-proto/xextproto"
 DEPEND="${RDEPEND}
-	doc? ( app-text/xmlto )
 	test? ( dev-lang/perl )"
 
 PATCHES=(
diff --git a/x11-libs/libXaw/Manifest b/x11-libs/libXaw/Manifest
index 0a2e3683..301d16df 100644
--- a/x11-libs/libXaw/Manifest
+++ b/x11-libs/libXaw/Manifest
@@ -1 +1 @@
-EBUILD libXaw-9999.ebuild 694 RMD160 1db7c777222e37a75195983407cd2cda0dfa8e47 SHA1 f1cf499de50360b0a22af6681ffdc7cdee2da48a SHA256 5ede7ea523d1e6ee5001e3aeab16a3815b5348857c6d58ec41307ee4bbea3407
+EBUILD libXaw-9999.ebuild 705 RMD160 3c8eb117b443b9c8e8641142cf7848cb3018bcff SHA1 dcaf2984bc3ba4051bd7e1bcd0079ba3ed5ec023 SHA256 c9cbf35e8cd5e70cab02025b18f539f43d1f6f371b384f1b852748f1aea67c74
diff --git a/x11-libs/libXaw/libXaw-9999.ebuild b/x11-libs/libXaw/libXaw-9999.ebuild
index 0c62d54e..f7ec9dde 100644
--- a/x11-libs/libXaw/libXaw-9999.ebuild
+++ b/x11-libs/libXaw/libXaw-9999.ebuild
@@ -3,12 +3,14 @@
 # $Header: $
 
 EAPI=4
+
+XORG_DOC=doc
 inherit xorg-2
 
 DESCRIPTION="X.Org Xaw library"
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
+IUSE=""
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
diff --git a/x11-libs/libXcomposite/Manifest b/x11-libs/libXcomposite/Manifest
index 6af57c6c..c949804a 100644
--- a/x11-libs/libXcomposite/Manifest
+++ b/x11-libs/libXcomposite/Manifest
@@ -1 +1 @@
-EBUILD libXcomposite-9999.ebuild 630 RMD160 96f633deb01a576c2641414a8f5edb84530aa26b SHA1 305c5fced78a386fa2abeb3698a9abd3190e6c5d SHA256 aabf7c7451fa826a613cf08cc2c17d93ae2ee994f948d257f93ce285cf4a380e
+EBUILD libXcomposite-9999.ebuild 641 RMD160 1920380418f48921f01ccf68e8d858a74ab3eaad SHA1 d6dcfa4bcc9489bf543c2daac25fe6610aa8727d SHA256 5b99ce3e018ef88d5512df9094214999305d94540b4fc5d2ec998119611689ac
diff --git a/x11-libs/libXcomposite/libXcomposite-9999.ebuild b/x11-libs/libXcomposite/libXcomposite-9999.ebuild
index c87a74ef..4bab3817 100644
--- a/x11-libs/libXcomposite/libXcomposite-9999.ebuild
+++ b/x11-libs/libXcomposite/libXcomposite-9999.ebuild
@@ -3,12 +3,14 @@
 # $Header: $
 
 EAPI=4
+
+XORG_DOC=doc
 inherit xorg-2
 
 DESCRIPTION="X.Org Xcomposite library"
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
+IUSE=""
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXfixes
diff --git a/x11-libs/libXdmcp/Manifest b/x11-libs/libXdmcp/Manifest
index c93644f5..404fc778 100644
--- a/x11-libs/libXdmcp/Manifest
+++ b/x11-libs/libXdmcp/Manifest
@@ -1 +1 @@
-EBUILD libXdmcp-9999.ebuild 635 RMD160 1ee1f7ce9b16203deb6d5a7191fafcda018e2bfa SHA1 d0790971489c4b3c3861debd161dcb0d11391d75 SHA256 66892827f6788dd875e83830e674119239aeca443bd5904131360aa098fadf2a
+EBUILD libXdmcp-9999.ebuild 646 RMD160 a0ec44183aa11c2ee1c0e2cc79ff8bd91ca3fa26 SHA1 34de0487f7f62b892448948e42bf2a354192b1ba SHA256 8bba241c7c3a8ebbb2c9927afef9f953c34e10738d28dd723ab696095cee8702
diff --git a/x11-libs/libXdmcp/libXdmcp-9999.ebuild b/x11-libs/libXdmcp/libXdmcp-9999.ebuild
index 4b1fba73..60db383f 100644
--- a/x11-libs/libXdmcp/libXdmcp-9999.ebuild
+++ b/x11-libs/libXdmcp/libXdmcp-9999.ebuild
@@ -3,12 +3,14 @@
 # $Header: $
 
 EAPI=4
+
+XORG_DOC=doc
 inherit xorg-2
 
 DESCRIPTION="X.Org Xdmcp library"
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="doc"
+IUSE=""
 
 RDEPEND="x11-proto/xproto"
 DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXext/Manifest b/x11-libs/libXext/Manifest
index 3d39db17..7a885bf1 100644
--- a/x11-libs/libXext/Manifest
+++ b/x11-libs/libXext/Manifest
@@ -1 +1 @@
-EBUILD libXext-9999.ebuild 648 RMD160 8674adb8d60d01aa1c7923a013f21e2005b353ea SHA1 3e4b593e0f368086d91d27260f8eb3c57a75a64d SHA256 7e0093a5456326180ce84bc69242bc9864400900e0d0a37efc7839815b2185a9
+EBUILD libXext-9999.ebuild 659 RMD160 87c7b49908d85235798e404912d079d9e70486fc SHA1 ebec8b760ecead39435637f7c43f2457f799f1ed SHA256 9246b4d1a8722727930b507abadd231011a3590c255a3b0fa4c23060502e0cd9
diff --git a/x11-libs/libXext/libXext-9999.ebuild b/x11-libs/libXext/libXext-9999.ebuild
index b50c9382..20dc8532 100644
--- a/x11-libs/libXext/libXext-9999.ebuild
+++ b/x11-libs/libXext/libXext-9999.ebuild
@@ -3,12 +3,14 @@
 # $Header: $
 
 EAPI=4
+
+XORG_DOC=doc
 inherit xorg-2
 
 DESCRIPTION="X.Org Xext library"
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="doc"
+IUSE=""
 
 RDEPEND=">=x11-libs/libX11-1.2
 	>=x11-proto/xextproto-7.1"
diff --git a/x11-libs/libXfont/Manifest b/x11-libs/libXfont/Manifest
index 716f3e83..e6618cc6 100644
--- a/x11-libs/libXfont/Manifest
+++ b/x11-libs/libXfont/Manifest
@@ -1 +1 @@
-EBUILD libXfont-9999.ebuild 769 RMD160 02e24735a7b8ba7fff5ed20d55aa663934342d78 SHA1 d58e715032ba51c45ce83b795c691a9b5e0e1d39 SHA256 3054df1046e0ee79673908aeeb2a197268fc44346d68fcfec3d4b43415a71cc3
+EBUILD libXfont-9999.ebuild 779 RMD160 39800e29092467c0f7c2a8d13fca5ceb8b84e9b1 SHA1 0031081becbdcddf6594fedff8b5a2b3509d7d8d SHA256 846359ea4a2a61068d4fa671a53ce05c8bdcff26b81ea3b6267f9e25c6b04255
diff --git a/x11-libs/libXfont/libXfont-9999.ebuild b/x11-libs/libXfont/libXfont-9999.ebuild
index 3703380a..c0d52a81 100644
--- a/x11-libs/libXfont/libXfont-9999.ebuild
+++ b/x11-libs/libXfont/libXfont-9999.ebuild
@@ -3,12 +3,14 @@
 # $Header: $
 
 EAPI=4
+
+XORG_DOC=doc
 inherit xorg-2
 
 DESCRIPTION="X.Org Xfont library"
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc ipv6"
+IUSE="ipv6"
 
 RDEPEND="x11-libs/xtrans
 	x11-libs/libfontenc
diff --git a/x11-libs/libXi/Manifest b/x11-libs/libXi/Manifest
index e96153e3..9806d7b0 100644
--- a/x11-libs/libXi/Manifest
+++ b/x11-libs/libXi/Manifest
@@ -1,2 +1,2 @@
-EBUILD libXi-9999.ebuild 943 RMD160 d2fd32f916ef4687439962997fbb512e36101a5c SHA1 348f2ba6db90a80e1db554bbaefec8fc39e99cd8 SHA256 d74aa0e3c99180e122a65516fabe41010a8a8c9957c4ca18a00fbe6239bb5f7e
+EBUILD libXi-9999.ebuild 907 RMD160 b22e94dd70ec85dbf5786de880ec19b6879c3cfc SHA1 4099311a7bb47f1b8655deb6f1dc68e195eb4161 SHA256 5fb4fd3032bbd11d177c550039fde27eba0b8f749fcbbc3862aeb4e589243e0e
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
diff --git a/x11-libs/libXi/libXi-9999.ebuild b/x11-libs/libXi/libXi-9999.ebuild
index 6ee0ee2f..7a8182ba 100644
--- a/x11-libs/libXi/libXi-9999.ebuild
+++ b/x11-libs/libXi/libXi-9999.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=4
 
+XORG_DOC=doc
 inherit xorg-2
 
 DESCRIPTION="X.Org Xi library"
@@ -15,12 +16,7 @@ RDEPEND=">=x11-libs/libX11-1.3
 	>=x11-proto/inputproto-2.0
 	>=x11-proto/xproto-7.0.13
 	>=x11-proto/xextproto-7.0.3"
-DEPEND="${RDEPEND}
-	doc? (
-		app-text/asciidoc
-		app-text/xmlto
-	)
-"
+DEPEND="${RDEPEND}"
 
 pkg_setup() {
 	xorg-2_pkg_setup
diff --git a/x11-libs/libXmu/Manifest b/x11-libs/libXmu/Manifest
index 8605bf51..a71c9807 100644
--- a/x11-libs/libXmu/Manifest
+++ b/x11-libs/libXmu/Manifest
@@ -1 +1 @@
-EBUILD libXmu-9999.ebuild 691 RMD160 aab86ed2620e7f0360311623e3bdf8ce006bc8eb SHA1 3b88ece12abc36bba922bafb8b3d193375413ad8 SHA256 6f232d5de6a695917d6ed8005d63ec7b76c27afd89dfad6256f6e24071c6285f
+EBUILD libXmu-9999.ebuild 701 RMD160 81fdb4cfac587f1bab7b04cf7a04e1ed050a9f9e SHA1 74a3782c3f019738f955b85e463bbe100d20646d SHA256 d63c661ac2a9cf0f2eec4396157cc9408505b6d07d4c49e5b83552b7ceda1066
diff --git a/x11-libs/libXmu/libXmu-9999.ebuild b/x11-libs/libXmu/libXmu-9999.ebuild
index b2f25c5b..4c2aba0b 100644
--- a/x11-libs/libXmu/libXmu-9999.ebuild
+++ b/x11-libs/libXmu/libXmu-9999.ebuild
@@ -3,12 +3,14 @@
 # $Header: $
 
 EAPI=4
+
+XORG_DOC=doc
 inherit xorg-2
 
 DESCRIPTION="X.Org Xmu library"
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc ipv6"
+IUSE="ipv6"
 
 RDEPEND="x11-libs/libXt
 	x11-libs/libXext
diff --git a/x11-libs/libxcb/Manifest b/x11-libs/libxcb/Manifest
index 07799111..f827c128 100644
--- a/x11-libs/libxcb/Manifest
+++ b/x11-libs/libxcb/Manifest
@@ -1 +1 @@
-EBUILD libxcb-9999.ebuild 964 RMD160 c46c2d2e5b8a569954563cdfbc53be6a35f67625 SHA1 afe1909df7c4f62a246eb4c2f5ec3a4f943f3c56 SHA256 18bf48730ebeb91110ca17b02ac9d55c1ca734ba60ab28580789df30765f1c41
+EBUILD libxcb-9999.ebuild 947 RMD160 c6a8ccfe4a5d0441bcf3b5653891010700164ac4 SHA1 54e12eddb43d43cb40051c5071fa3c3a2bda696f SHA256 b6dff9ca0e8e133a976f3af8e8f093ed55dd96068edb3d5aeae4a0db7128b49d
diff --git a/x11-libs/libxcb/libxcb-9999.ebuild b/x11-libs/libxcb/libxcb-9999.ebuild
index 2dcaf4f9..4e961da7 100644
--- a/x11-libs/libxcb/libxcb-9999.ebuild
+++ b/x11-libs/libxcb/libxcb-9999.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=3
 
+XORG_DOC=doc
 inherit python xorg-2
 
 DESCRIPTION="X C-language Bindings library"
@@ -13,7 +14,7 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/libxcb"
 	SRC_URI="http://xcb.freedesktop.org/dist/${P}.tar.bz2"
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc selinux"
+IUSE="selinux"
 
 RDEPEND="dev-libs/libpthread-stubs
 	x11-libs/libXau
@@ -21,8 +22,7 @@ RDEPEND="dev-libs/libpthread-stubs
 	>=x11-proto/xcb-proto-1.6"
 DEPEND="${RDEPEND}
 	=dev-lang/python-2*[xml]
-	dev-libs/libxslt
-	doc? ( app-doc/doxygen )"
+	dev-libs/libxslt"
 
 pkg_setup() {
 	python_set_active_version 2
diff --git a/x11-libs/xtrans/Manifest b/x11-libs/xtrans/Manifest
index a02a7c22..20a592a6 100644
--- a/x11-libs/xtrans/Manifest
+++ b/x11-libs/xtrans/Manifest
@@ -1,2 +1,2 @@
-EBUILD xtrans-9999.ebuild 704 RMD160 972b7d08a47213a4f5f53e543765a1f4c480f056 SHA1 2923a2e7d2910457db321b1715121aa6ddc39ee7 SHA256 354f3fe310c73ff74ba299ad3a4dc816240ffe752f03ac17e946def85d030452
+EBUILD xtrans-9999.ebuild 714 RMD160 3455bcd1654208f33b2cc7e7a34be975728e3b4c SHA1 e566045eed420ed8d10659d255e94790336d5845 SHA256 326797e80b71622834907bec73cbad2be91432ab5bac7259ae52249701a66745
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
diff --git a/x11-libs/xtrans/xtrans-9999.ebuild b/x11-libs/xtrans/xtrans-9999.ebuild
index c11e97b9..45a60546 100644
--- a/x11-libs/xtrans/xtrans-9999.ebuild
+++ b/x11-libs/xtrans/xtrans-9999.ebuild
@@ -7,11 +7,12 @@ EAPI=4
 PACKAGE_NAME="lib${PN}"
 # this package just installs some .c and .h files, no libraries
 XORG_STATIC=no
+XORG_DOC=doc
 inherit xorg-2
 
 DESCRIPTION="X.Org xtrans library"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
+IUSE=""
 
 RDEPEND=""
 DEPEND="${RDEPEND}"
diff --git a/x11-proto/bigreqsproto/Manifest b/x11-proto/bigreqsproto/Manifest
index 6876d56f..b27904cd 100644
--- a/x11-proto/bigreqsproto/Manifest
+++ b/x11-proto/bigreqsproto/Manifest
@@ -1 +1 @@
-EBUILD bigreqsproto-9999.ebuild 596 RMD160 ffeead250fbbf469ecf82bf4f07cd7adc7d8913f SHA1 ed118dbb0bd31741a57fc1834763e3b93f98138c SHA256 9682478c3b2605414099f1e432f21232694b73bd27742014dc26e4c1386b9f6e
+EBUILD bigreqsproto-9999.ebuild 607 RMD160 09d12465c12fe7d3863c167d4eaa1519eabef541 SHA1 1c307391ee90c24ce0212596ea0d36fbe846bc97 SHA256 88621cf98c524101702ba952eda3a0c9465d52541e7be1a58419820aa1a0aeb9
diff --git a/x11-proto/bigreqsproto/bigreqsproto-9999.ebuild b/x11-proto/bigreqsproto/bigreqsproto-9999.ebuild
index d8b56d06..1ddbdb95 100644
--- a/x11-proto/bigreqsproto/bigreqsproto-9999.ebuild
+++ b/x11-proto/bigreqsproto/bigreqsproto-9999.ebuild
@@ -3,12 +3,14 @@
 # $Header: $
 
 EAPI=4
+
+XORG_DOC=doc
 inherit xorg-2
 
 DESCRIPTION="X.Org BigReqs protocol headers"
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
+IUSE=""
 
 RDEPEND=""
 DEPEND="${RDEPEND}"
diff --git a/x11-proto/fontsproto/Manifest b/x11-proto/fontsproto/Manifest
index 740ea441..186b1462 100644
--- a/x11-proto/fontsproto/Manifest
+++ b/x11-proto/fontsproto/Manifest
@@ -1 +1 @@
-EBUILD fontsproto-9999.ebuild 581 RMD160 7a31042262f4710c9aad3e3de538fbd48c6ae537 SHA1 387126de616c6d444d44f1ef0bba9c0f38436efe SHA256 7bb4724fdd595ef368b069a4cccc517a595c926026347b13c7b28b09ef10a713
+EBUILD fontsproto-9999.ebuild 592 RMD160 2fbe66c6e7d7dd5e076846a858b69dec96e089fb SHA1 1bdc8739bb4fcb072160b7bd6c0006e486705c1a SHA256 0a02a5e93212e8eb13b3e8595ea3be74f990ec1e435db6b80feeb45bab61efda
diff --git a/x11-proto/fontsproto/fontsproto-9999.ebuild b/x11-proto/fontsproto/fontsproto-9999.ebuild
index 9e9b1050..7a3667bb 100644
--- a/x11-proto/fontsproto/fontsproto-9999.ebuild
+++ b/x11-proto/fontsproto/fontsproto-9999.ebuild
@@ -3,12 +3,14 @@
 # $Header: $
 
 EAPI=4
+
+XORG_DOC=doc
 inherit xorg-2
 
 DESCRIPTION="X.Org Fonts protocol headers"
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="doc"
+IUSE=""
 
 RDEPEND=""
 DEPEND="${RDEPEND}"
diff --git a/x11-proto/recordproto/Manifest b/x11-proto/recordproto/Manifest
index 8e5b280d..0560545b 100644
--- a/x11-proto/recordproto/Manifest
+++ b/x11-proto/recordproto/Manifest
@@ -1 +1 @@
-EBUILD recordproto-9999.ebuild 600 RMD160 9f9869065a5cc2478af04b08c9a301ea593ac7fd SHA1 6a655579643db8eaf9ab0602ef52cb1150798bdd SHA256 5632e322d567cca2fcd1d5a91a68f97f5b294a519810cf5aa88ca1edab792edc
+EBUILD recordproto-9999.ebuild 611 RMD160 382422e79be88d2e8e9a79dcd9425f6a4ebd6fd2 SHA1 7c17fcd8f324d64b855793a2bab232c107d85030 SHA256 9d627c5ed08929a71181ed02c0782a041f043c679e28fee745406a78feb81bc5
diff --git a/x11-proto/recordproto/recordproto-9999.ebuild b/x11-proto/recordproto/recordproto-9999.ebuild
index 00446025..77159a92 100644
--- a/x11-proto/recordproto/recordproto-9999.ebuild
+++ b/x11-proto/recordproto/recordproto-9999.ebuild
@@ -3,12 +3,14 @@
 # $Header: $
 
 EAPI=4
+
+XORG_DOC=doc
 inherit xorg-2
 
 DESCRIPTION="X.Org Record protocol headers"
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="doc"
+IUSE=""
 
 RDEPEND="!<x11-libs/libXtst-1.0.99.2"
 DEPEND="${RDEPEND}"
diff --git a/x11-proto/scrnsaverproto/Manifest b/x11-proto/scrnsaverproto/Manifest
index b03757f6..14fa63e6 100644
--- a/x11-proto/scrnsaverproto/Manifest
+++ b/x11-proto/scrnsaverproto/Manifest
@@ -1 +1 @@
-EBUILD scrnsaverproto-9999.ebuild 585 RMD160 5ad2838c967facae1c180b1233e4f14798599541 SHA1 66c4511202d7b356d1a0e163ab0c8cfb1564e868 SHA256 0acc8a1a618553cc5bd00163015aad80ff40662fd0c41f5a854278bd292a6935
+EBUILD scrnsaverproto-9999.ebuild 596 RMD160 aebf5804c16c9565b47e4f9501b4519596dccc1f SHA1 40a07cf423bc5b7942d63191a5059b43b23104d0 SHA256 23cf4ae06418c4740c6e6475317867ce313059f870e24cc846a5ca96376dc3ad
diff --git a/x11-proto/scrnsaverproto/scrnsaverproto-9999.ebuild b/x11-proto/scrnsaverproto/scrnsaverproto-9999.ebuild
index 4410d30c..7926bce0 100644
--- a/x11-proto/scrnsaverproto/scrnsaverproto-9999.ebuild
+++ b/x11-proto/scrnsaverproto/scrnsaverproto-9999.ebuild
@@ -3,12 +3,14 @@
 # $Header: $
 
 EAPI=4
+
+XORG_DOC=doc
 inherit xorg-2
 
 DESCRIPTION="X.Org ScrnSaver protocol headers"
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
+IUSE=""
 
 RDEPEND="!<x11-libs/libXScrnSaver-1.2"
 DEPEND="${RDEPEND}"
diff --git a/x11-proto/xcmiscproto/Manifest b/x11-proto/xcmiscproto/Manifest
index 264a7f35..b4520dd7 100644
--- a/x11-proto/xcmiscproto/Manifest
+++ b/x11-proto/xcmiscproto/Manifest
@@ -1 +1 @@
-EBUILD xcmiscproto-9999.ebuild 595 RMD160 a4f666fab1f5f2a5a17a86a8e338333bfd131a45 SHA1 2227c8be71b1d64ed1ddd1f9d39c455f7a084aa9 SHA256 f9be986cc82d2b78ec65511b2a7544dedc6ce45450016af9ae41a65decacafd5
+EBUILD xcmiscproto-9999.ebuild 606 RMD160 1555d8feecf70a3106ee520affc487c9e6500a49 SHA1 90832ae09082d88fc87ab4cd0ae28a5e47a2680f SHA256 adc42fab22449731a3644b917cf7ceaa0a8b3932a9b49be2caba3f6f6bfc49b2
diff --git a/x11-proto/xcmiscproto/xcmiscproto-9999.ebuild b/x11-proto/xcmiscproto/xcmiscproto-9999.ebuild
index cff619b1..ec8c5b07 100644
--- a/x11-proto/xcmiscproto/xcmiscproto-9999.ebuild
+++ b/x11-proto/xcmiscproto/xcmiscproto-9999.ebuild
@@ -3,12 +3,14 @@
 # $Header: $
 
 EAPI=4
+
+XORG_DOC=doc
 inherit xorg-2
 
 DESCRIPTION="X.Org XCMisc protocol headers"
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
+IUSE=""
 
 RDEPEND=""
 DEPEND="${RDEPEND}"
diff --git a/x11-proto/xextproto/Manifest b/x11-proto/xextproto/Manifest
index 27537379..195c8181 100644
--- a/x11-proto/xextproto/Manifest
+++ b/x11-proto/xextproto/Manifest
@@ -1 +1 @@
-EBUILD xextproto-9999.ebuild 632 RMD160 bb06f2d181857faa31a28d2e1664286efbe4ad44 SHA1 abbc976d2fa4e03cd5e713705020a92d1fa799de SHA256 c0042f44476748e25d9de3b22701620193a089e9f36b56aa41c5cf1c77abcd4b
+EBUILD xextproto-9999.ebuild 643 RMD160 f579a3b1bf4bad7f8664d5682556d3864c00d2c3 SHA1 8d89f1b51599329d9c667bedabb03fa8cb4b8c00 SHA256 d472e2a50ac8e0d15de907dde781b761de65e51496b1a27db04ebfae50123943
diff --git a/x11-proto/xextproto/xextproto-9999.ebuild b/x11-proto/xextproto/xextproto-9999.ebuild
index 9d51507d..222ab82e 100644
--- a/x11-proto/xextproto/xextproto-9999.ebuild
+++ b/x11-proto/xextproto/xextproto-9999.ebuild
@@ -3,12 +3,14 @@
 # $Header: $
 
 EAPI=4
+
+XORG_DOC=doc
 inherit xorg-2
 
 DESCRIPTION="X.Org XExt protocol headers"
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="doc"
+IUSE=""
 
 RDEPEND="!<x11-libs/libXext-1.0.99"
 DEPEND="${RDEPEND}"
diff --git a/x11-proto/xproto/Manifest b/x11-proto/xproto/Manifest
index 0a2f807b..46535d76 100644
--- a/x11-proto/xproto/Manifest
+++ b/x11-proto/xproto/Manifest
@@ -1 +1 @@
-EBUILD xproto-9999.ebuild 629 RMD160 016d31977dc1c77a67d02113994367698c88eca4 SHA1 76a56a3dc83ce0a9aca6dbee7f9d48aff3f7373d SHA256 85368a43e3f21c64cf1400fd7ea6901b910675204c22afd6d3790ee4b809242c
+EBUILD xproto-9999.ebuild 640 RMD160 f7cf54522e3f51f379a7e213fd0b3c3cbd13ec63 SHA1 364f51a6af33263081649ca4af753bb9740899dc SHA256 0e531ec872ae5ab4748faf6450c843799a29d01d4da159ec7d194f4340a6726e
diff --git a/x11-proto/xproto/xproto-9999.ebuild b/x11-proto/xproto/xproto-9999.ebuild
index 4011b6b5..63cdd820 100644
--- a/x11-proto/xproto/xproto-9999.ebuild
+++ b/x11-proto/xproto/xproto-9999.ebuild
@@ -3,11 +3,13 @@
 # $Header: $
 
 EAPI=4
+
+XORG_DOC=doc
 inherit xorg-2
 
 DESCRIPTION="X.Org xproto protocol headers"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
+IUSE=""
 
 RDEPEND=""
 DEPEND="${RDEPEND}"