gentoo resync : 03.03.2019

31 files changed, 591 insertions, 64 deletions

diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 152ddfc7faff..5474b7e001c9 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/mkfontdir/Manifest b/x11-apps/mkfontdir/Manifest
index 89f05ac52105..3481f7ae568b 100644
--- a/x11-apps/mkfontdir/Manifest
+++ b/x11-apps/mkfontdir/Manifest
@@ -1,3 +1,4 @@
 DIST mkfontdir-1.0.7.tar.bz2 108195 BLAKE2B 72625736d0b6d4cc3e5e53ac85db238feef5adf0c3d889c058d912129d4208609a6ebcc73bf2923fa420f87b41b655bee0a9fe841d1743e0d524bee0b827432f SHA512 96d1920565514f90621e18a87fb5a2db9e052d1bffc6552d9659e065a21e252ab98b4e62013755032b98ed6d8c3381eb75c3c8e02651766ee4791ca622dcef1f
 EBUILD mkfontdir-1.0.7.ebuild 450 BLAKE2B 32a790afc843f5a45e209108399d88d670122d354d6083fd323ef27a5f8eda01e76423313ff4d40d5c0b1b78f35fd7b047a3ab3a98be12c73d4eebf819ff058e SHA512 94efba919a17fe74100209f8f0761fe33586aabe1cdc00ad379025866f44c21e889cb2302f32d263679454bba2477ffbccab3ccabc8412f47df56f5857b31e65
+EBUILD mkfontdir-1.2.0.ebuild 540 BLAKE2B c6db9d0781d6bdba4d6799c415575de42b7e8e47c4fd7694bc9b6c90bed80e6e9a2b55195563ecc7e858d7bff063a1b6516ddd1efe8833610254162996c892ac SHA512 4125835bd97af4f08bc2adf83eb720d56737e995aa624a84d4fa8018e15fb23ee4fbe1d073de21f9eed46dae4450c2eadee42798d542b5494125a49506cd74f1
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/mkfontdir/mkfontdir-1.2.0.ebuild b/x11-apps/mkfontdir/mkfontdir-1.2.0.ebuild
new file mode 100644
index 000000000000..106e3bb6bedf
--- /dev/null
+++ b/x11-apps/mkfontdir/mkfontdir-1.2.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="create an index of X font files in a directory"
+HOMEPAGE="https://www.x.org/wiki/ https://cgit.freedesktop.org/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=x11-apps/mkfontscale-1.2.0"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/mkfontscale/Manifest b/x11-apps/mkfontscale/Manifest
index 138792aaab31..45ac133a6700 100644
--- a/x11-apps/mkfontscale/Manifest
+++ b/x11-apps/mkfontscale/Manifest
@@ -1,7 +1,5 @@
-DIST mkfontscale-1.1.1.tar.bz2 139923 BLAKE2B 441aef79b2f1db18c56c5235afb83711c5ed43b16f8046750ab89abbe8eae58f01b7cd5b7a3565bcb10ac8a859ca2bc24b0bdd17ed15caa97f00915c9b2359f2 SHA512 7a6da239b2f166c6283090c219889e998be9332ee1e8eb4d84bbdf0cb58125a3773fe7ee97774d86f2cd5385dc49636a797c7b9c25c6c8bbe24b898329f97220
-DIST mkfontscale-1.1.2.tar.bz2 141728 BLAKE2B e15dea8a22fb59ad21a63a907dc0c30869480d26fa2721ecfd1ba65c81425b3ebf4709f89d4105a8f14d2d5c6e924754122713a244b58789227ad469a2d09d60 SHA512 5c3331f66cd523afe95347aa36440655ba8fdbc716c5987a24ad624c1fbd718c4a8d67aa36330f6d5ab2eb5a6195a409a041954568c0a3375c0e2aeb6a955601
 DIST mkfontscale-1.1.3.tar.bz2 144386 BLAKE2B 8cf4a61472b9357888ef355e89c3087102c4928884ecc6b5671202ad09284a2dc188b81faba6b1727b1a28ccaa6c3c36649c53659faf7a3fae4a2b32ab5a2420 SHA512 509e2f9cd55cf87cc3968c8767bf3f2386016278db8b7be75b7df34bf61f52519dd2778f3b9881ffbe30cc2fe26089c0a5b2c33af46bc7727f46dad83f030a62
-EBUILD mkfontscale-1.1.1.ebuild 565 BLAKE2B 3a79d562c59fe8b21680681361fb950c912ddb1ab5368af49bbb173fe04d59f5ea0a48c461bb466e8a9891d0773e646b2983a9ca43971fcf90d708032a9efe26 SHA512 1c24eaad1272373d83493c6829ecda78d4ae1bc3eb115f08b9ed5df5ac66ed1b9f3d18d4f84ce4ccba06f88a93b10ddec5cebd3d565306b13b340877fed86a50
-EBUILD mkfontscale-1.1.2.ebuild 605 BLAKE2B da214de6a0981b0df0b8e60e147518cfe94eea13925e2d8ba7251928495ec9272726571a732ec15d9d6394f8c4fab033c035585c2b28704c22bbdb637935e319 SHA512 38431c16c4e094bcef8ba874ae14a8cfef0b0de84b9960bf465e3deb26334aee3f76d46567190acf8e93e86ad0e5ae2c89f989a8a6af80a120ec8eb476778325
-EBUILD mkfontscale-1.1.3.ebuild 604 BLAKE2B 09a68c481f48dd3563d608d5667ff15af746ebe7775616c0e2cb02eefaf2990e4fb8cfbe7f4bf192ffdbedd929f997ad4d8937642f1e42301091f7ae76281a24 SHA512 0a5788b32ba76b0f8da63264d8f3a324d9618ace07e8af3d33271a0584b0ba6c23c17807f1749d1f381edc3753626020dee348d24aa8ce43c59ea5586e806d01
+DIST mkfontscale-1.2.0.tar.bz2 150646 BLAKE2B 7f4a0b279f0759b2d8faac584603488c9e405b92b43457b301aa6ba252bdef2cbfe65f58a1fb837e61113cfea139b6fcde1084450333864175e2cc4da84b6626 SHA512 3d02db7e031fe6730a07ed481d2a744592a7d542d75fedf55a4f5ad50d03d92e3534b4105af09d0a8f863bdc0321758222baf5b943de77ce4972978d86a5013f
+EBUILD mkfontscale-1.1.3.ebuild 600 BLAKE2B 1be6ee6b55382ed63fc6464fd83d3a6d90cd39c41952e0a35c2e46f3d88a41e5baed46669260bbd0084073f647ffb66ab18904dad7d1579c4f7afb035b42cb8a SHA512 222722cc686d874d3f457e6a908084fd5dfbeaff3a438f94cfc2f86b2545fec009a559fdfa68fd2ae9a86d80f13e93e980d0194cd858407f3f7ba2d49701cddd
+EBUILD mkfontscale-1.2.0.ebuild 636 BLAKE2B 2ae337a35debc23962c0f1e45bdb4b1a3c45cbc45a888a6eada210b265797e8398be9eecd02288b027866771d5598dde9f09caa396083db8ace8d71089caf3c3 SHA512 7d9d8f8ea83e0c3e955bca7af4bf6e8beca982090ec16fa46a5227dc58162ed3a56adabfae97f5349a004530ebb32b1314d471ed5432ba161726ca94f377dfa0
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/mkfontscale/mkfontscale-1.1.1.ebuild b/x11-apps/mkfontscale/mkfontscale-1.1.1.ebuild
deleted file mode 100644
index 958d59ad0534..000000000000
--- a/x11-apps/mkfontscale/mkfontscale-1.1.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="create an index of scalable font files for X"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="x11-libs/libfontenc
-	media-libs/freetype:2"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	app-arch/gzip
-	app-arch/bzip2"
-
-XORG_CONFIGURE_OPTIONS=(
-	--with-bzip2
-)
diff --git a/x11-apps/mkfontscale/mkfontscale-1.1.2.ebuild b/x11-apps/mkfontscale/mkfontscale-1.1.2.ebuild
deleted file mode 100644
index 75972e49b61a..000000000000
--- a/x11-apps/mkfontscale/mkfontscale-1.1.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="create an index of scalable font files for X"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="x11-libs/libfontenc
-	media-libs/freetype:2
-	sys-libs/zlib
-	app-arch/bzip2"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-misc/util-macros
-	app-arch/gzip"
-
-XORG_CONFIGURE_OPTIONS=(
-	--with-bzip2
-)
diff --git a/x11-apps/mkfontscale/mkfontscale-1.1.3.ebuild b/x11-apps/mkfontscale/mkfontscale-1.1.3.ebuild
index 9cb7e7d141cc..bb2c8a3d40b5 100644
--- a/x11-apps/mkfontscale/mkfontscale-1.1.3.ebuild
+++ b/x11-apps/mkfontscale/mkfontscale-1.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="create an index of scalable font files for X"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libfontenc
diff --git a/x11-apps/mkfontscale/mkfontscale-1.2.0.ebuild b/x11-apps/mkfontscale/mkfontscale-1.2.0.ebuild
new file mode 100644
index 000000000000..c0f737d6f423
--- /dev/null
+++ b/x11-apps/mkfontscale/mkfontscale-1.2.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="create an index of scalable font files for X"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+COMMON_DEPEND="
+	x11-libs/libfontenc
+	media-libs/freetype:2
+	sys-libs/zlib
+	app-arch/bzip2"
+DEPEND="x11-base/xorg-proto"
+RDEPEND="${COMMON_DEPEND}
+	${DEPEND}
+	!<x11-apps/mkfontdir-1.2.0"
+
+XORG_CONFIGURE_OPTIONS=(
+	--with-bzip2
+)
diff --git a/x11-apps/xclock/Manifest b/x11-apps/xclock/Manifest
index 0dad63d1c287..9a2b9d117df5 100644
--- a/x11-apps/xclock/Manifest
+++ b/x11-apps/xclock/Manifest
@@ -1,3 +1,5 @@
 DIST xclock-1.0.7.tar.bz2 164035 BLAKE2B d52db001d577b8eb9208ada8e77784ab2a5916551216dae7e71a51381105915778c90124f35dcc83553e332cb6c6435c00041ae8dd0d2033fd70b69435ee677f SHA512 56689bdae6c83e9e1da5c4c48cf1136ca8b4f45b177f27bc1deeb24758e2c180035b639e8df72e3ebf32dc301bceb59118309fcce2ffab54e5abe9bfa645e607
+DIST xclock-1.0.8.tar.bz2 172030 BLAKE2B aced446898a2cc181a0e57260841f194f67dc0fad42fdb6371e2bdd8d11dfb0418d9cbf4e3e51a4df21f2646c74ca5ee2887bfbbc62571cbc84b551f3793396f SHA512 1272221ace3657505bae1b22f181e9ecbf1710900c89a860c8ceae47ae31ca5e75b6557c37dc0a881a0a24c9597b9a07f46200926feb1013f1e2e995111a7646
 EBUILD xclock-1.0.7.ebuild 482 BLAKE2B 789b6460610dc48b46f004e17cef12247f6f359287862eeb37bfcb7f40b80314ff6da4fa62affac67a5f31b4384ae8b4025cdd4a8d36116811c21ec5f7e773c5 SHA512 39dc2021aca60ec45e6c4c29905f56ae206df5f1cbea8f2ac2f006522f1c397ac4273fc3950ae9b39e1bed3913d110141e93f7c7fe701a0d83df8f461f66a4aa
+EBUILD xclock-1.0.8.ebuild 493 BLAKE2B 62dc8abb3d98f874035695ad8ccf92a4cda6cbd79943241747a12b2e1105155ebd27cfa00e346a6c752e920fa6d1916e41c853d5c2e2394a9271268a05dc2b6f SHA512 5849fcb1d4ef88bc95c80e96b7bcc7c45f2983608ba7712520e36b8d7c5e5892010a87ad6f73f0d1b3ea2f84963daa191844488a84026887bbb61ac0f13b5430
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xclock/xclock-1.0.8.ebuild b/x11-apps/xclock/xclock-1.0.8.ebuild
new file mode 100644
index 000000000000..85c863c07f9d
--- /dev/null
+++ b/x11-apps/xclock/xclock-1.0.8.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="analog / digital clock for X"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXrender
+	x11-libs/libXft
+	x11-libs/libxkbfile
+	x11-libs/libXaw"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xdm/Manifest b/x11-apps/xdm/Manifest
index d94c8af79ece..65a8adedc4f3 100644
--- a/x11-apps/xdm/Manifest
+++ b/x11-apps/xdm/Manifest
@@ -2,7 +2,11 @@ AUX Xsession 1521 BLAKE2B cb2090c2f2c1626df08fe45e80ab668ec9ca43f8f647f9a16d09e7
 AUX xdm-1.1.11-arc4random-include.patch 360 BLAKE2B e16532b9e360d735d63d641fcad7a4242d227a5df2715be24d2907115f88e00b0e298ad3aa465a6f4e5b931928d46cbc0ef54cc1e7ea71d23dd60995bbec201b SHA512 2da1c4972c7edcd6c3fc42f29c15ce875888cc582a18e1932a60c3d0881a5a96991129bf5bb8c6649f0731e2102c0a163928c089d7ff9fe19ef82d470f86882f
 AUX xdm-1.1.11-cve-2013-2179.patch 1519 BLAKE2B cd0329d5c97b4bd5051dcd594bf54676004c1abcedefd9c7cbdcfe500bcbcf79cf4a22e9977860b553d8d5d1e79d3514206200bf8b0b8d6e20989df7cb7ca825 SHA512 5890051b134f1ed8f68846ee47d38375fbd0b4c639b9ae834b27d5b1749456aba4e1000a16a16d387072845887685375b1d87c4ce3870cc2acda58c4f17d45ae
 AUX xdm-1.1.11-setproctitle-include.patch 849 BLAKE2B cd5749feb0d11d07208922e94cef14a7063c43b7a05a804c09f6febabfa35941914e8f8d508992f52bc7804aeee12e98525cf5f854250e30a4470ef7389c9b3b SHA512 496ad42ee35ce6d25f87b349330394f65cc8979b388759d7e03636f96bc2272068a999a9f7ac3b2e0486099b7678ef1c0e30505c3e0a08cc3041121936f1abb0
+AUX xdm-1.1.12-consolekit.patch 7815 BLAKE2B 1ef67b15385c3cc9a74797fadc34e5701889bf669f70e9c3720a82db595472dcf8fc36011ce35cad763dc68580a7680a272c7617d9cf58db8314f788974031cd SHA512 e318ebe0e606964712db40cb70177d4aa275679ef6e2c0ca97cd5156434d037e8774bc75dad3584e8d13ad4577798fac6624bdb6359f1a57de9eb2961bfdc5f7
+AUX xdm-1.1.12-make-xinerama-optional.patch 978 BLAKE2B feb81c4815c61c62ebd25acec572de03450c4ee5fd7a634cb0444e17d35566548c0bc8dab05562264533676012410839f61b2e5cb5bc98d83bf9a36daa1b59cc SHA512 efddf2cd662cc4e1ca5cea2a9efe49b4ef8e98276f37def047091088a9deaaadc61646deeefbd8668286d08edabd245a532db84ddf938a2853bdcc1865c221c9
 AUX xdm-consolekit.patch 5712 BLAKE2B 0526aad6742c86d878ca01204a2e6c781dc4532f7de573a67723e4ab3c7dacefe20d25766402b705c957db75fbf41d396c46442e7da500ad3ce2afb3f0facc67 SHA512 d87ec56e4b7d067709679f222d3bd9009f1496d66c3c4335458b54e2a468200e3c7ac99843330c23bad7049995c93e8f3c74f3161529c6fb488e94e9fcd4752a
 DIST xdm-1.1.11.tar.bz2 446612 BLAKE2B ce9bed568e036a882ecc56d75f7ce8646d14ae00c754d6e5542ea5b186c3ef1ce8499e2d70190b4fbc4b344e0c70fd36deab5aacc5f1f55501db709300aee520 SHA512 fe6f2b7817c0f7f07a1f5f497edcdfa15b93986fd87f314daa472dac8625327ef46ebbf40d27fe8d4a8a2f8d5af8a01c4438a29356740e0eb350f2bd0c7ec0d5
+DIST xdm-1.1.12.tar.bz2 512074 BLAKE2B a82d124f4b7ce3185d703fca3aade92e86094602aec5343566ba8c91c54b70cdedbaea2fa6fee330d7ed48d9138b04a998aa2dae06db2683bfcce6c7693edc82 SHA512 1a4be0a070ced5db8fda6fc74794c9f9ed0cb37fa440fda6a3a7652aff62dfc3d7ba68b9facf054671ebf0f4db2a0eec29d0aa3716e3407ccd5529bac3553bdb
 EBUILD xdm-1.1.11-r3.ebuild 1807 BLAKE2B 1c98b7e9ea0bb96ccd82c355d3e4fb16641eadc41167fd5d559927405c95b7153f0aea14d3a906540d053c2f88d289330007bf312c1e8470fa98d04efd68c78c SHA512 7d30353885804970be0e0fd31c455d9ff52615ad1ae2611da2ab30705e048114221bf78de639bc05923ea3eeca4af251fa3b6935e7100c3a987db6e01532ab8a
+EBUILD xdm-1.1.12.ebuild 1962 BLAKE2B e1a1052aa6085fe6fd9dcba43cd36ef12c4f11de44be96154c4e088ac3a6a452e7d0f1c62a76bc9f30420b7d26f305307cefae3acb3cd8918cc097d170214292 SHA512 479c779494675dc951e1f0f9c54fc58ea514beb1743544f4949723d92099008c8955b4148f14313f3cccf717f462d74e547e10cbfa594155337496a713062822
 MISC metadata.xml 414 BLAKE2B 6e4d9441a5a392ed6a989fbfd08b9e664dfd6843fa6b6f4f9644b4ace383cd5ed8ea859a0f6e1d34580fd8acac06333eb566bf6460144128494a046991fe08c0 SHA512 f3acd7a9e8f8e1d93ca5c657409efbaeb5695dc81528926d9ecdc517cff8a7c2f597b9ac8b856cb81246ff39c2ceaac5bd72587db68a5d260c3117599e24c38c
diff --git a/x11-apps/xdm/files/xdm-1.1.12-consolekit.patch b/x11-apps/xdm/files/xdm-1.1.12-consolekit.patch
new file mode 100644
index 000000000000..232d10d94db8
--- /dev/null
+++ b/x11-apps/xdm/files/xdm-1.1.12-consolekit.patch
@@ -0,0 +1,269 @@
+http://bugs.gentoo.org/360987
+http://projects.archlinux.org/svntogit/packages.git/plain/trunk/xdm-consolekit.patch?h=packages/xorg-xdm
+http://lists.x.org/archives/xorg-devel/2011-February/019615.html
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=615020
+---
+ configure.ac   |  20 ++++++++--
+ include/dm.h   |   3 ++
+ man/xdm.man    |   6 +++
+ xdm/resource.c |  13 ++++++-
+ xdm/session.c  | 102 +++++++++++++++++++++++++++++++++++++++++++++++++
+ 5 files changed, 140 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index d110809..db973f7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -168,15 +168,15 @@ AS_IF([test "x$with_systemdsystemunitdir" != "xno"], [
+ AM_CONDITIONAL(HAVE_SYSTEMD, [test "x$with_systemdsystemunitdir" != "xno"])
+ 
+ # Check whether to enable systemd startup notification.
+-# This requires libsystemd-daemon.
++# This requires libsystemd.
+ AC_ARG_WITH([systemd-daemon], AS_HELP_STRING([--with-systemd-daemon],
+ 	[Add support for systemd startup notification (default is autodetected)]),
+ 	[USE_SYSTEMD_DAEMON=$withval], [USE_SYSTEMD_DAEMON=auto])
+ AS_IF([test "x$USE_SYSTEMD_DAEMON" != "xno"], [
+-    PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd-daemon],
++    PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd],
+ 	[AC_DEFINE(USE_SYSTEMD_DAEMON,1,[Use systemd startup notification])],
+ 	[AS_IF([test "x$USE_SYSTEMD_DAEMON" = "xyes"],
+-	    [AC_MSG_ERROR([systemd startup notification support requested, but libsystemd-daemon not found.])]
++	    [AC_MSG_ERROR([systemd startup notification support requested, but libsystemd not found.])]
+ 	)]
+     )
+ ])
+@@ -395,6 +395,20 @@ PKG_CHECK_MODULES(DMCP, xdmcp)
+ PKG_CHECK_MODULES(XLIB, x11)
+ PKG_CHECK_MODULES(AUTH, xau)
+ 
++# ConsoleKit support
++AC_ARG_WITH(consolekit, AC_HELP_STRING([--with-consolekit], [Use ConsoleKit]),
++	[USE_CONSOLEKIT=$withval], [USE_CONSOLEKIT=yes])
++if test x"$USE_CONSOLEKIT" != xno; then
++	PKG_CHECK_MODULES(CK_CONNECTOR, ck-connector,
++		[USE_CONSOLEKIT=yes], [USE_CONSOLEKIT=no])
++	if test x"$USE_CONSOLEKIT" = xyes; then
++		AC_DEFINE([USE_CONSOLEKIT], 1, [Define to 1 to use ConsoleKit])
++		XDM_CFLAGS="$XDM_CFLAGS $CK_CONNECTOR_CFLAGS -DUSE_CONSOLEKIT"
++		XDM_LIBS="$XDM_LIBS $CK_CONNECTOR_LIBS"
++	fi
++fi
++dnl AM_CONDITIONAL(USE_CONSOLEKIT, test$USE_CONSOLEKIT = xyes)
++
+ #
+ # Greeter
+ #
+diff --git a/include/dm.h b/include/dm.h
+index 9116d6f..27fdd71 100644
+--- a/include/dm.h
++++ b/include/dm.h
+@@ -327,6 +327,9 @@ extern char	*randomFile;
+ extern char	*prngdSocket;
+ extern int	prngdPort;
+ # endif
++#ifdef USE_CONSOLEKIT
++extern int	use_consolekit;
++#endif
+ 
+ extern char	*greeterLib;
+ extern char	*willing;
+diff --git a/man/xdm.man b/man/xdm.man
+index ef57d8c..de99d25 100644
+--- a/man/xdm.man
++++ b/man/xdm.man
+@@ -48,6 +48,8 @@ xdm \- X Display Manager with support for XDMCP, host chooser
+ ] [
+ .B \-session
+ .I session_program
++] [
++.B \-noconsolekit
+ ]
+ .SH DESCRIPTION
+ .I Xdm
+@@ -215,6 +217,10 @@ indicates the program to run as the session after the user has logged in.
+ .IP "\fB\-xrm\fP \fIresource_specification\fP"
+ Allows an arbitrary resource to be specified, as in most
+ X Toolkit applications.
++.IP "\fB\-noconsolekit\fP"
++Specifies ``false'' as the value for the \fBDisplayManager.consoleKit\fP
++resource.
++This suppresses the session management using ConsoleKit.
+ .SH RESOURCES
+ At many stages the actions of
+ .I xdm
+diff --git a/xdm/resource.c b/xdm/resource.c
+index 316ace4..725351e 100644
+--- a/xdm/resource.c
++++ b/xdm/resource.c
+@@ -65,6 +65,9 @@ char	*randomDevice;
+ char	*prngdSocket;
+ int	prngdPort;
+ #endif
++#ifdef USE_CONSOLEKIT
++int	use_consolekit;
++#endif
+ 
+ char	*greeterLib;
+ char	*willing;
+@@ -192,6 +195,10 @@ struct dmResources {
+ 				"false"} ,
+ { "willing",	"Willing",	DM_STRING,	&willing,
+ 				""} ,
++#ifdef USE_CONSOLEKIT
++{ "consoleKit",	"ConsoleKit",	DM_BOOL,	(char **) &use_consolekit,
++				"true"} ,
++#endif
+ };
+ 
+ #define NUM_DM_RESOURCES	(sizeof DmResources / sizeof DmResources[0])
+@@ -377,7 +384,11 @@ XrmOptionDescRec optionTable [] = {
+ {"-debug",	"*debugLevel",		XrmoptionSepArg,	(caddr_t) NULL },
+ {"-xrm",	NULL,			XrmoptionResArg,	(caddr_t) NULL },
+ {"-daemon",	".daemonMode",		XrmoptionNoArg,		"true"         },
+-{"-nodaemon",	".daemonMode",		XrmoptionNoArg,		"false"        }
++{"-nodaemon",	".daemonMode",		XrmoptionNoArg,		"false"        },
++#ifdef USE_CONSOLEKIT
++{"-consolekit",	".consoleKit",		XrmoptionNoArg,		"true"  },
++{"-noconsolekit", ".consoleKit",	XrmoptionNoArg,		"false" }
++#endif
+ };
+ 
+ static int	originalArgc;
+diff --git a/xdm/session.c b/xdm/session.c
+index 4fd7d0a..c16978d 100644
+--- a/xdm/session.c
++++ b/xdm/session.c
+@@ -73,6 +73,11 @@ extern int key_setnet(struct key_netstarg *arg);
+ # endif
+ #endif /* USE_PAM */
+ 
++#ifdef USE_CONSOLEKIT
++#include <ck-connector.h>
++#include <dbus/dbus.h>
++#endif
++
+ #ifdef USE_SELINUX
+ #include <selinux/selinux.h>
+ #include <selinux/get_context_list.h>
+@@ -523,6 +528,97 @@ UnsecureDisplay (struct display *d, Display *dpy)
+     }
+ }
+ 
++#ifdef USE_CONSOLEKIT
++
++static CkConnector *connector;
++
++static int openCKSession(struct verify_info *verify, struct display *d)
++{
++    int ret;
++    DBusError error;
++    char  *remote_host_name = "";
++    dbus_bool_t is_local;
++    char *display_name = "";
++    char *display_device = "";
++    char devtmp[16];
++
++    if (!use_consolekit)
++	return 1;
++
++    is_local = d->displayType.location == Local;
++    if (d->peerlen > 0 && d->peer)
++	remote_host_name = d->peer;
++    if (d->name)
++	display_name = d->name;
++    /* how can we get the corresponding tty at best...? */
++    if (d->windowPath) {
++	display_device = strchr(d->windowPath, ':');
++	if (display_device && display_device[1])
++	    display_device++;
++	else
++	    display_device = d->windowPath;
++	snprintf(devtmp, sizeof(devtmp), "/dev/tty%s", display_device);
++	display_device = devtmp;
++    }
++
++    connector = ck_connector_new();
++    if (!connector) {
++	LogOutOfMem("ck_connector");
++	return 0;
++    }
++
++    dbus_error_init(&error);
++    ret = ck_connector_open_session_with_parameters(
++		connector, &error,
++		"unix-user", &verify->uid,
++		"x11-display", &display_name,
++		"x11-display-device", &display_device,
++		"remote-host-name", &remote_host_name,
++		"is-local", &is_local,
++		NULL);
++    if (!ret) {
++	if (dbus_error_is_set(&error)) {
++	    LogError("Dbus error: %s\n", error.message);
++	    dbus_error_free(&error);
++	} else {
++	    LogError("ConsoleKit error\n");
++	}
++	LogError("console-kit-daemon not running?\n");
++	ck_connector_unref(connector);
++	connector = NULL;
++	return 0;
++    }
++
++    verify->userEnviron = setEnv(verify->userEnviron,
++		"XDG_SESSION_COOKIE", ck_connector_get_cookie(connector));
++    return 1;
++}
++
++static void closeCKSession(void)
++{
++    DBusError error;
++
++    if (!connector)
++	return;
++
++    dbus_error_init(&error);
++    if (!ck_connector_close_session(connector, &error)) {
++	if (dbus_error_is_set(&error)) {
++	    LogError("Dbus error: %s\n", error.message);
++	    dbus_error_free(&error);
++	} else {
++	    LogError("ConsoleKit close error\n");
++	}
++	LogError("console-kit-daemon not running?\n");
++    }
++    ck_connector_unref(connector);
++    connector = NULL;
++}
++#else
++#define openCKSession(v,d)	1
++#define closeCKSession()
++#endif
++
+ void
+ SessionExit (struct display *d, int status, int removeAuth)
+ {
+@@ -537,6 +633,8 @@ SessionExit (struct display *d, int status, int removeAuth)
+     }
+ #endif
+ 
++    closeCKSession();
++
+     /* make sure the server gets reset after the session is over */
+     if (d->serverPid >= 2 && d->resetSignal)
+ 	kill (d->serverPid, d->resetSignal);
+@@ -614,6 +712,10 @@ StartClient (
+ #ifdef USE_PAM
+     if (pamh) pam_open_session(pamh, 0);
+ #endif
++
++    if (!openCKSession(verify, d))
++	return 0;
++
+     switch (pid = fork ()) {
+     case 0:
+ 	CleanUpChild ();
+-- 
+2.19.2
+
diff --git a/x11-apps/xdm/files/xdm-1.1.12-make-xinerama-optional.patch b/x11-apps/xdm/files/xdm-1.1.12-make-xinerama-optional.patch
new file mode 100644
index 000000000000..bc953ff0f31c
--- /dev/null
+++ b/x11-apps/xdm/files/xdm-1.1.12-make-xinerama-optional.patch
@@ -0,0 +1,34 @@
+ configure.ac | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index db973f7..64a0e37 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -330,7 +330,13 @@ AC_SUBST(SHELL_CMD)
+ 
+ PKG_CHECK_MODULES(XDM, [xmu x11 xau xproto >= 7.0.17])
+ 
+-PKG_CHECK_EXISTS(xinerama, [
++AC_ARG_WITH(xinerama,
++	AS_HELP_STRING([--with-xinerama],
++			[Use Xinerama (default is YES if installed)]),
++	[USE_XINERAMA="$withval"],
++	PKG_CHECK_EXISTS(xinerama, [USE_XINERAMA="yes"], [USE_XINERAMA="no"]))
++
++if test "x$USE_XINERAMA" = "xyes" ; then
+ 	AC_DEFINE([USE_XINERAMA], 1,
+ 		[Define to 1 to use XINERAMA in greeter & chooser])
+ 	PKG_CHECK_MODULES(XINERAMA, xinerama)
+@@ -338,7 +344,7 @@ PKG_CHECK_EXISTS(xinerama, [
+ 	CHOOSER_LIBS="$CHOOSER_LIBS $XINERAMA_LIBS"
+ 	GREETER_CFLAGS="$GREETER_CFLAGS $XINERAMA_CFLAGS"
+ 	GREETER_LIBS="$GREETER_LIBS $XINERAMA_LIBS"
+-])
++fi
+ 
+ # Xft text drawing for the greeter screen
+ AC_ARG_WITH(xft,
+-- 
+2.19.2
+
diff --git a/x11-apps/xdm/xdm-1.1.12.ebuild b/x11-apps/xdm/xdm-1.1.12.ebuild
new file mode 100644
index 000000000000..e7d6bd756525
--- /dev/null
+++ b/x11-apps/xdm/xdm-1.1.12.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_EAUTORECONF=yes
+
+inherit multilib xorg-3 pam systemd
+
+DEFAULTVT=vt7
+
+DESCRIPTION="X.Org xdm application"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="consolekit ipv6 pam systemd truetype xinerama xpm"
+
+RDEPEND="
+	x11-apps/sessreg
+	x11-apps/xconsole
+	x11-apps/xinit
+	x11-apps/xrdb
+	x11-apps/xsm
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXdmcp
+	x11-libs/libXmu
+	x11-libs/libXt
+	consolekit? ( sys-auth/consolekit )
+	pam? ( virtual/pam )
+	systemd? ( >=sys-apps/systemd-209 )
+	truetype? (
+		x11-libs/libXrender
+		x11-libs/libXft
+	)
+	xinerama? ( x11-libs/libXinerama )
+	xpm? ( x11-libs/libXpm )
+	elibc_glibc? ( dev-libs/libbsd )"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	consolekit? ( !=sys-auth/pambase-20101024-r1 )"
+
+pkg_setup() {
+	PATCHES=(
+		"${FILESDIR}"/${P}-consolekit.patch
+		"${FILESDIR}"/${P}-make-xinerama-optional.patch
+	)
+
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable ipv6)
+		$(use_with consolekit)
+		$(use_with pam)
+		$(use_with systemd systemd-daemon)
+		$(use_with truetype xft)
+		$(use_with xinerama)
+		$(use_enable xpm xpm-logos)
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		--with-default-vt=${DEFAULTVT}
+		--with-xdmconfigdir=/etc/X11/xdm
+	)
+}
+
+src_prepare() {
+	sed -i -e 's:^Alias=.*$:Alias=display-manager.service:' \
+		xdm.service.in || die
+
+	# Disable XDM-AUTHORIZATION-1 (bug #445662).
+	# it causes issue with libreoffice and SDL games (bug #306223).
+	sed -i -e '/authorize/a DisplayManager*authName:	MIT-MAGIC-COOKIE-1' \
+			config/xdm-config.in || die
+
+	xorg-3_src_prepare
+}
+
+src_install() {
+	xorg-3_src_install
+
+	exeinto /usr/$(get_libdir)/X11/xdm
+	doexe "${FILESDIR}"/Xsession
+
+	use pam && pamd_mimic system-local-login xdm auth account session
+
+	# Keep /var/lib/xdm. This is where authfiles are stored. See #286350.
+	keepdir /var/lib/xdm
+}
diff --git a/x11-apps/xev/Manifest b/x11-apps/xev/Manifest
index 487aa09056e7..b44424dd3a84 100644
--- a/x11-apps/xev/Manifest
+++ b/x11-apps/xev/Manifest
@@ -1,5 +1,7 @@
 DIST xev-1.2.1.tar.bz2 125884 BLAKE2B faa41acc01b47c4b031ac0aa69154839cf43c180d90287cb929a922b2c5b8d174834f559c80cfeecc3839e4064d8e37d29c340756ce37e114f4420bf551b9e80 SHA512 6fbe8e69eeeafff4561b695293f23d9ce0f20261474f4a0f0281278b13f11e7ed9efd49f2712586f909e3e7a26b9fe39f8e98b50a2bf189d077668fc67388d19
 DIST xev-1.2.2.tar.bz2 132596 BLAKE2B 243556cda4ea52f488b60c98566fa1b84896c972eef484f9a29d8a7a3e6709a26c47f5478f7a010d430c79471f1f04d684a5b761a721013540f9f1e08d0573c9 SHA512 453fc18072e4d4fd088a1b2e918f3772aaa2c56b36c082deb41ec4d434d1579de75f447fc4e0507086c170152e02d6db8b60dc7fd87ae18a2e817448bd628fca
+DIST xev-1.2.3.tar.bz2 134866 BLAKE2B 9ff8bdb1e75754a5390115d10dd5851f71b2319ad7ff02299ff28284aa23c14cd1ad3ee9eea81718ed355fc31983e4f7ec0312b31e3f86d3691bb52ebbe0cc4e SHA512 47cc7ac096e77cfa4e687914d767263cf3e1dca5bffd0f68c7ba0fe751b248c8a16525bd2da4d6efa0ea8d637831c893d41c9687cace4aaa9c0909a45ef1943e
 EBUILD xev-1.2.1.ebuild 400 BLAKE2B f988e39967c29da855fff0c4c5c7fcdddeca88deb8c3fe0bfe762bc50db8083106eb335bbb9e5532405e0298fd1bea2f9eabbce6a57fcd6a76c8bf17d317d5f2 SHA512 b00e75fa86a063f07cdb93543e4f261620c83a6f5d9f57460fa04ac4fce4cbf941261fc8a0b320219c916742287463d50b625771f327f9301beadc9ef322ec7a
 EBUILD xev-1.2.2.ebuild 407 BLAKE2B 605deef3a200013078478f032006cff46d9f1c2e301878a1f1a6905ad0d75a44d5a157da805a4a3b74eb51a33f105f9cc3506640cb37812f7ab2f5747f40d6b7 SHA512 6a383e6d74c0fcc6fd24a23728b805897ff3809e1fcaecce20d3cd1da7ddc054ed970d1850a1e13909e0732b2662d07e1beab61acc52d11087f2c1e8ca2d46c4
+EBUILD xev-1.2.3.ebuild 413 BLAKE2B 0f15995f1940a1b88f7ecb0a27c248c2fdd74c054a40c2e0107bf04266715fe996854d2ed8c389a177ee5294308d6eb1ea2356941da35670ae631ad1b83fa7d9 SHA512 3034f10cfc06711cc8afc76119559bedaae7bec7a4c62462bc9e1df92def796a432ba7bff2fa15f543b813bdbbf12f961246f7e78f51dd5206a571df7a315570
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xev/xev-1.2.3.ebuild b/x11-apps/xev/xev-1.2.3.ebuild
new file mode 100644
index 000000000000..f03e86b75dd0
--- /dev/null
+++ b/x11-apps/xev/xev-1.2.3.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="Print contents of X events"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-winnt"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXrandr"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-apps/xhost/Manifest b/x11-apps/xhost/Manifest
index e287c2aad856..73cab6e80886 100644
--- a/x11-apps/xhost/Manifest
+++ b/x11-apps/xhost/Manifest
@@ -1,5 +1,7 @@
 DIST xhost-1.0.6.tar.bz2 133176 BLAKE2B 8cb649716b93d3bf020e4897f2d6f7f1a0a765c4fb8715b1c128475725bc6822cfe49aebfdc6677c1eccc8510938848dae538f7b4c90282c4b01df0af124fb62 SHA512 4e9b8b5b3a13b995e4f3596b26fa637d5892936090516eef1eb296c257358496ed5ad7b5c1e924003fcc18b6c8d4592f83e515d66a605a895f1d9fdc5d064f1a
 DIST xhost-1.0.7.tar.bz2 135767 BLAKE2B 0156640ede491a8a2f1610ca5d68d97e88fa349bcbad39a308aae46d29f7cf8f93a8fee8273ba369484efd9641653e7bcfbd8fb3ec14d9f07b20e4ffd7fd6fd2 SHA512 670a8c97291565f6c36c94e135f7bd60a572bb42b4fca9d2460823db0d0576187c64f9b876ed60d348029d3f74a732862eea4ce889a6b6b9c97665746a38b1d7
+DIST xhost-1.0.8.tar.bz2 138539 BLAKE2B f05d58444537431d9dce5e6dccc27bc8116141d66b34b6edb356dbe823898dbb2927f8ad8dc133178efc7e5b399b7b6428883ea7c665577d4b1984300474eabe SHA512 55581f9bc45a70a73b13fe718ca83c4cb0a6116d26addc0f07659ebeb5bf7d2379e84cab5a1702ae77a298a66f42ae03f41ddc7d5acd61c6f18448e58ad7cb6b
 EBUILD xhost-1.0.6.ebuild 539 BLAKE2B 5bd6f53495eb8967fa9f96cdbca7a5c505e8f35e97622227a4a982591f3e64b98f93e71337730633edb669570aa866bf325d2f55472d3d5dc0f650a39ae668e3 SHA512 3a6d8513658e09b8e97c31fd82857c1509863bb4277f8f7645997433c0c5f3a59c869957d013bba934cfb858d560571811c315a6271168196b31cf03c28d73e8
 EBUILD xhost-1.0.7.ebuild 541 BLAKE2B 19116804d6c067bb7a27327ab43aea0a3a7d1ceade0414b859e8d1230140459ced0b4e8b69eff14fcaddb65d65089ab2733b694ef721821a8b95c9b98ef820ae SHA512 7b1fff2934bf6dad0ae27a111b78aca84efad4aa1c2d02a264b66e6d076075b76d43365e8d767f20ba0d6c790864b850f1c21e2a6fe6dc512b18e7f28953c008
+EBUILD xhost-1.0.8.ebuild 552 BLAKE2B ac3aa8eff581a3b8b1d988c23ce5582cc8d2efe87390931c8ec501176905682b6ba7e40875efb4a8a732c39fcfc78b867d7675d251e6a0a4d3d783dbf61092ea SHA512 db4bea74edf23fdfb632ca5252a7bfa833a2a93016790530d6e8e18ab0ec3095b2f76d3fe12022d0c8fb3c692ff6813a33f167d3963c02d434c140aeecf3bbc0
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xhost/xhost-1.0.8.ebuild b/x11-apps/xhost/xhost-1.0.8.ebuild
new file mode 100644
index 000000000000..c31226dbf270
--- /dev/null
+++ b/x11-apps/xhost/xhost-1.0.8.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="Controls host and/or user access to a running X server"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="ipv6"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXau"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	XORG_CONFIGURE_OPTIONS="$(use_enable ipv6)"
+}
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index 1ef959066bb8..32757065a2c1 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -2,10 +2,10 @@ AUX 00-xhost 255 BLAKE2B 78ccf786ceae797177342b77fb675068786815818796a04087a8f52
 AUX Xsession 2187 BLAKE2B d6df80e9d0faecd9286be70b2639b7bb993d363a7834cd63b108be2ed35457faf8d5069803fb80275cd7f0afc155ffbc359bb7e3184c5468b2e00e63b4605a99 SHA512 a20e12f338ead48f4758268506fe899a0123c25babb1366678e643b4101ece8c913305b44c9395897a82e65ee0dd402edc0adf99adf74b3c6085bf39dd12f048
 AUX Xsession.desktop 229 BLAKE2B f1daf7f0ef98a3be220195fb64bc057180db20016ef991e5d2000c60b74cb729a962270ff342e29088e9e928a163732c7b1f7aafc1c056e85d73b6ca8ba9e96c SHA512 2d2fea82972d77ac925e6edcd488c730b678dd74635cc3a06536413ec8bdff63be915161139f12636214023926dded9fa549f053f9a2b916ef905be79591093d
 AUX chooser.sh 1192 BLAKE2B d0afaaed792dae06c4716ea33924568aca5da3251b15067fc5ba92b2dd5651185ce64329a69ae588f5a4532b8e4b123f7f29bd2db7352df1b496a6e4e03191a8 SHA512 6149a5dc19104773d3500d2e89e8be5c9da49fad8b38148d511af237c6fef84c3223a94d4c0451296e7b27c86c513c5f4fd425a738d94c30d26f1ac888bbc255
-AUX startDM.sh 818 BLAKE2B b9ccb2e8dc8c711b6ca550a0e94b15af38df59bb3a508666e5768a9a070c5d4c742f7b88319d5d936956f14f543af5b7c6f0b2fdccebe57a82280fe87fbac5ca SHA512 f3b3aa841edfbd23810d2da7c56e23e3f1c1eb650b1196feea2fc8dc6092ad5d4c2fba70943a1bc86d716d838ab4ebc0d93e8a2c2ccdf69b171c1fdc4989942c
+AUX startDM.sh 821 BLAKE2B 2705e4a5fdadc1d7da7ef9d9df1b1c56ce3e36170658b49d3129ffd25f02339524547a5764b4d72e7b94c20f292f88137515ed775029a24102789b4955d29189 SHA512 11a21170c0db92d5f0bf40b07158f9781df611737cca5bc6a4ca8be376e179dab68e9579b112e8f8ce423af7e651e502aadd3b3d425465f7a15103777b647110
 AUX xinit-1.3.3-gentoo-customizations.patch 1494 BLAKE2B 1a67f486324e07aee07078648101a3f82b10d5953084c6afe6564530132fb92d299c44559e4d6d3ab74554139be02c285b2076b959413ec248b57cc2aafbc733 SHA512 810066a3af51fd31c177f1aa33d3020e63d1656bacc297fa2bb44e0f3745bfd27d466745ebb07343f7b95339a9f6c8821c6f117e0b2f99724e21a0869427228b
 AUX xinit-1.4.0-startx-current-vt.patch 740 BLAKE2B f5ac87b96f76bd4c845cde4844f935afbb757908d0c94f6f5b9c7e6b8055841fcdf4de44af964fe3703d2599b9097fca300551bb4a3dce003e20c266d619eb49 SHA512 97e0ac72c49a9a5ac29a09f169076f0bcec48978f645be01f3b40b6c32b4af4d188f96662c0cf62bab0a6b356ae80c25e0614c0b87a368d7a01a11e603ecdd15
 AUX xserverrc.2 143 BLAKE2B b33fac4b5ba731c79167d21a07840c46abfbb33e8fbb80aa1c3f23a8717f836819da3a947b72bd99c7a14516534e9771033bcd1e26d167f2f7083be20eae3b2f SHA512 61afea54f66b9f397860e467cf87a41e1d9f97d7194930bccc254e44dd4178bca7b402bff7aa2a1d6f44a91680f3f1ee10a5b57e527aaff80438623edc1b07c5
 DIST xinit-1.4.0.tar.bz2 174491 BLAKE2B 5a613a244a22f3bb4de43ae23b8f590b41a6af2c3adb282d2a089f4b94117220d86654c16cbb20ad0a50b6aab1be65512a7a42850e9047cfca96f25af964d081 SHA512 53a29081130c1e195eb441ee77ccaa044b18b4cca3d2d5da3a6d67aa421dfd9718fa18b6be6232a41e40cf260c8190064c4d8d9ab771177bd5cd12e77a8fa79e
-EBUILD xinit-1.4.0-r1.ebuild 1756 BLAKE2B 25da1e58cc6769074e2335027a629505d93600d398651e43cdf4add3f13f72fb99bb0bc55430f8739c9f442f324bc704249c3fe30be3ed58a7c55c59eeaed599 SHA512 f1588cfae21cfa8b6bcca1d5576034c138377d3cb784388f9ec34994bc303ec6281abb6e4e0c2a64dba1bd1e2cb54e6b7eaceff168445dfabaad98bc0019591e
+EBUILD xinit-1.4.0-r1.ebuild 1810 BLAKE2B 623cbe4d86624fefa0d71cca672e5936fda35f73372c71b8683899a3fa3d3c4b923b80302112a02aeb22d2a9fe04ad6ecf1f763dde0e7b4b81a45c9225136b7d SHA512 05ab5c2a75271a87587621aeab62542501872115ff5fa29fd819bb69dbf57df47de52d6573f9cb586b10056e21c398918c70032567a6648f1b4deb17534e10c9
 MISC metadata.xml 480 BLAKE2B 190a0b3a84e4d0d85e0928b964cb820599510c6c09a1a7c385b2f9b402a44478e08b48fce2d88216fe2fd52a3f35ec02d99cb7d738caf8a2d8dd6418e36f6125 SHA512 5dcfabd3eff26ffb33bd8ae8248cc3214c67a0fb10d5c214b2432fea7625b2555b29bb654d9712e8d55a081b25912da65ac367203fe529a860febc59fb91de55
diff --git a/x11-apps/xinit/files/startDM.sh b/x11-apps/xinit/files/startDM.sh
index 66cceb3a68f5..e2da6098d6a0 100644
--- a/x11-apps/xinit/files/startDM.sh
+++ b/x11-apps/xinit/files/startDM.sh
@@ -17,7 +17,7 @@ fi
 # We enable this by default
 export GDK_USE_XFT=1
 
-export SVCNAME=xdm
+export RC_SVCNAME=xdm
 EXEC="$(get_options service)"
 NAME="$(get_options name)"
 PIDFILE="$(get_options pidfile)"
diff --git a/x11-apps/xinit/xinit-1.4.0-r1.ebuild b/x11-apps/xinit/xinit-1.4.0-r1.ebuild
index a8b0150bc16d..f8dedbb1ce77 100644
--- a/x11-apps/xinit/xinit-1.4.0-r1.ebuild
+++ b/x11-apps/xinit/xinit-1.4.0-r1.ebuild
@@ -56,12 +56,15 @@ src_install() {
 
 pkg_postinst() {
 	xorg-2_pkg_postinst
-	ewarn "If you use startx to start X instead of a login manager like gdm/kdm,"
-	ewarn "you can set the XSESSION variable to anything in /etc/X11/Sessions/ or"
-	ewarn "any executable. When you run startx, it will run this as the login session."
-	ewarn "You can set this in a file in /etc/env.d/ for the entire system,"
-	ewarn "or set it per-user in ~/.bash_profile (or similar for other shells)."
-	ewarn "Here's an example of setting it for the whole system:"
-	ewarn "    echo XSESSION=\"Gnome\" > /etc/env.d/90xsession"
-	ewarn "    env-update && source /etc/profile"
+
+	if ! has_version 'x11-apps/xinit'; then
+		ewarn "If you use startx to start X instead of a login manager like gdm/kdm,"
+		ewarn "you can set the XSESSION variable to anything in /etc/X11/Sessions/ or"
+		ewarn "any executable. When you run startx, it will run this as the login session."
+		ewarn "You can set this in a file in /etc/env.d/ for the entire system,"
+		ewarn "or set it per-user in ~/.bash_profile (or similar for other shells)."
+		ewarn "Here's an example of setting it for the whole system:"
+		ewarn "    echo XSESSION=\"Gnome\" > /etc/env.d/90xsession"
+		ewarn "    env-update && source /etc/profile"
+	fi
 }
diff --git a/x11-apps/xlsatoms/Manifest b/x11-apps/xlsatoms/Manifest
index f09eef9dd858..d87b1a57ff88 100644
--- a/x11-apps/xlsatoms/Manifest
+++ b/x11-apps/xlsatoms/Manifest
@@ -1,3 +1,5 @@
 DIST xlsatoms-1.1.2.tar.bz2 123157 BLAKE2B db6dcd01a8494411068ae43cb93c03fe03191c981d400a7f1fe2c179e7db2bc665af8989f6e4f0b136668d3f78cf491015b58d5fc3dc7707925b9688be780848 SHA512 f29001de22818792212312f1b9daee1bf7afa2ef2ae945cd8c14bdc1a7bb40064d3878c5efea60458ac0bf515ab1ece16fa90cbd2b0a879a5f07f3aa3e6a0baa
+DIST xlsatoms-1.1.3.tar.bz2 126327 BLAKE2B 7a4ca35e6968432fc99dcf665b3f63ac84e5bda8a7b061fca9df7bb12e447e83feaf4c82d80a4e469e680042d7b856708821febe44897acf5cba7777e90073c4 SHA512 c267ccfdc5a83e834bfb5c3b144e22642badcadef4eb146eeec2df6fe6f85e9379500ae4219912c70fa2e535036a1a96cf496381f5d814e79af075e03c975f30
 EBUILD xlsatoms-1.1.2.ebuild 341 BLAKE2B 920c1f44de8613ff2ae2edd650003c2869017b707739fc1ed700a8d4ba8d0f01c4fdd1cf57c9eb7e7cec9c738eef24cc79407e60794b7323e3b69cdcb3a70c62 SHA512 220d8b3c42669824e12f018beb64604b94bdde2f6bbaf5a40b23f442de7ad7427a61dc6f0305cdf6fe77fae2e0ae65428267542fdb023ba560997a05dc7a6a6a
+EBUILD xlsatoms-1.1.3.ebuild 349 BLAKE2B 86827bb0db31d41993ef80a0cacf5db3d8d7816050497d72fe08b10e5d3de94a5d05a801055b01c6755d592d64836c3d5ace6fcdd614b289ad883b02dd159550 SHA512 cc7f35bd12a43b0b764ad67b8f351e85027e2cd3d06bb022b94f77fa1409fb4d62e3beb75212dfb206d2072c80df96d71609ae5e4ceb6d7e56df4df9eb810ca7
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xlsatoms/xlsatoms-1.1.3.ebuild b/x11-apps/xlsatoms/xlsatoms-1.1.3.ebuild
new file mode 100644
index 000000000000..520a0d79ab35
--- /dev/null
+++ b/x11-apps/xlsatoms/xlsatoms-1.1.3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="list interned atoms defined on server"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libxcb:="
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xmodmap/Manifest b/x11-apps/xmodmap/Manifest
index cb0697aad3bd..a4c9eb0a3fe6 100644
--- a/x11-apps/xmodmap/Manifest
+++ b/x11-apps/xmodmap/Manifest
@@ -1,5 +1,7 @@
+DIST xmodmap-1.0.10.tar.bz2 145489 BLAKE2B 503e72882a1d6d5c916cb60b898156adbdccc3e90bda85b161ac7a57ee607605331be73bd779603cfab1013d065e28f3165cce2ef50d71579330ab0361078a22 SHA512 324c7dcef843186088f16b3bc47485eb3c9b4331e56ce43b692deb4bb3d4f4f27512480e91a379cceac8383df920dc5e37cd825246b50b6343291cec48134c04
 DIST xmodmap-1.0.8.tar.bz2 141026 BLAKE2B 1c2e510d7083f98a7b72d7a48a0fd74f4d660ee8966c7282f15d6e898b0b0ce6083f626915d48d345db8be385e187ff542c724f23aaf0deefbbaaae2be1f0597 SHA512 716cd1ee2cdb1db31b84c018eb223fb3eb05d499a7e76e0bdf038b58a5f71dd17631c8ce39d8108f6c47fe11fad718016f2891baa813b35a9dc607d3a3946a63
 DIST xmodmap-1.0.9.tar.bz2 142565 BLAKE2B 36fc73d518240fc37243c67ecd5101f4cd39343198c7271717eb6c491c502db6579ffd5db639b509977f2e168b4f0995b8aa7a9a821dbde5ede65199c2feb39f SHA512 6e50f2ba072ec171bd3fc34f75b21c63f9834f3c0f1608c857f80a4b2c8a9696b03dde79f8342bf67504b759297bc24a64056a625d295a4f89dd31eb938400ac
+EBUILD xmodmap-1.0.10.ebuild 438 BLAKE2B 84939d57b7fadcddc04467f7883962480919a1d363f3c4b4515adfde36b5653bba953bd1464acdd548f90a947b4904208bfe84b58db88e9c8119b761ff3578d7 SHA512 d1d18f9e86679d3226a466ab7a91f3e0f1429453e53182462af6d450b1b219df5e4a228d72b2ec7a8b097b1c784626f21f651c207136c68530a4846ba4cd1d24
 EBUILD xmodmap-1.0.8.ebuild 425 BLAKE2B 3935d8125e1d80964392ac6b8dac749855aa462e51a8fe7a5dd8d9022f156e5ff8b4ca99af99055fac058c176c28ea0f689c809229392e9fd92aec8995b59073 SHA512 89f90c309ca3d06f42fffae83bcd9fb4c608c0aa1a09d29963485f7d3cb01fb72ea0489f316185ad88574a7c9048254b460ac2ba8076cb7460e17ae30e368b25
 EBUILD xmodmap-1.0.9.ebuild 432 BLAKE2B 4b25e4babdcbfac594fd041dc1acb8397327bba3eabc9f9468799a28fabb5d67571860f7aa7ecd3f062b1f7f45a4986171e3ee683cfebc74a6a6dadf7fd0db80 SHA512 309087b2637bff0e66531838bfd252b0adfd0758d9f0fda7dc8b25bf8d4202ba4ddba1580799c8f36644b526edf4c9d437e80998d38673d7cf8ea50b2afe7187
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xmodmap/xmodmap-1.0.10.ebuild b/x11-apps/xmodmap/xmodmap-1.0.10.ebuild
new file mode 100644
index 000000000000..a0a6e05eff58
--- /dev/null
+++ b/x11-apps/xmodmap/xmodmap-1.0.10.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="utility for modifying keymaps and pointer button mappings in X"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xrdb/Manifest b/x11-apps/xrdb/Manifest
index d7221c7cb9e3..2172fc9c730d 100644
--- a/x11-apps/xrdb/Manifest
+++ b/x11-apps/xrdb/Manifest
@@ -1,5 +1,7 @@
 DIST xrdb-1.1.0.tar.bz2 138035 BLAKE2B 62cea13d943692cf8be654b53c89751925c0e1b07c84cbe954070c109a5792908bb3642b208ac2da151f8416ab645c05d3d54084424d9fc9d5aba4efc99604e6 SHA512 8e2a177653d5aa895c71ed3640e0f1dd9fe8bf5cd6f0c6ff7e372394a2a41c3aa2286905fd9c69e3d140024d235b81a1f32b5d4012b1ac5ac1ed945599dee407
 DIST xrdb-1.1.1.tar.bz2 141950 BLAKE2B bfd0e384e4bdbae3209caf4e729a8151ec174ca1a461d3dd5a357b8a383fcf7da072741e539a8830434b416c894684e20cde8bde11fb211420d5796c2c08298b SHA512 20c342004ef911fc4d3ef4ac3ac15d1c30bb946b8156f3a6916c242e470be0cb63261563462fd1e2e07b1a7cc527b8cacf5f913e31b02196629a95043cf8d13f
+DIST xrdb-1.2.0.tar.bz2 142194 BLAKE2B 2fee77b287f43125413bbbc288b1d89986a93775797c02dde564e678bec3c429bca487d752d82f8da924a95e177a46e3b4de507b7fdca56b95789e1d7ea3dae3 SHA512 14e1cdfb2152fb28f1f4641b177ab236648d7e967a95b952bf4cfce8d3e1ef085e85385354e3381aaf644462e8888a1847f755ab4016ecb4cb4a715b001dd2ef
 EBUILD xrdb-1.1.0.ebuild 442 BLAKE2B 0f0cbc0fcdfb83c5edcb9208ddd991b4ac56923d340ecff8b5dc46f202ed2f654502cc8ba51b966d715d4db6eea9b204f631ca7711639d15f77e5482ec7bdf1b SHA512 f084e5cd7418d130d7d48759b0eac6a41795627b8402deecdb3e581f7c6a9db0571e2a589d2a3e71543cb2f4606fe83e4488b50edef523daf1c3adb15f9abe07
 EBUILD xrdb-1.1.1.ebuild 437 BLAKE2B 971347e98a84f0e20e0b3fde0c280f6cad592d4e1e996fad97d3edd8a010e9bb2850062d00d8ecc9590ad8f5bf61e47fd916823c2d48d5152e9f6f99ab5ed863 SHA512 92df490f87c1f7bed58f1b875f78bf56f1aef670be1a07f7c6d846456301ec93bd2e751ece39197109f22848f47608b93042ea33ee3c012508186675acf0e510
+EBUILD xrdb-1.2.0.ebuild 448 BLAKE2B b821d262730d8f6f58ab988e524bd40fb19324752c11d255b8589df3e95857c507c0f2d0dbba180da301ac39b1442ddae4d837ccee150c1e2f29d46f5a0aaaf8 SHA512 0da8bbd27fa2da0a77b61389c8204ae338d6c8ce0fc6071791d64a5fa1436f7c56d248d06ad55f983d3503a376d46baf6bdf2b5c537c91fb45b86560190b92a7
 MISC metadata.xml 317 BLAKE2B 02ff19551010134a361010ad2647deb4949c46241c2f3ff388fc8fb7aad6194a822c795f8505cb72896229f9702857b29235197675a227a1da9755d051e5930e SHA512 460dc7431825b65cf43260ca92bad810e99a9cdcc0602da758d5f23ec6faf69a3c056d2db6df266055aed47fe3a1c7063cdd2cb942e09a9b08f60ea81597bc96
diff --git a/x11-apps/xrdb/xrdb-1.2.0.ebuild b/x11-apps/xrdb/xrdb-1.2.0.ebuild
new file mode 100644
index 000000000000..0d57b078b2df
--- /dev/null
+++ b/x11-apps/xrdb/xrdb-1.2.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="X server resource database utility"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libXmu
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xstdcmap/Manifest b/x11-apps/xstdcmap/Manifest
index 669b47c96394..c5deeacf6b98 100644
--- a/x11-apps/xstdcmap/Manifest
+++ b/x11-apps/xstdcmap/Manifest
@@ -1,3 +1,5 @@
 DIST xstdcmap-1.0.3.tar.bz2 117491 BLAKE2B 971dc6e2e42fa7631f8cb084a6cf22dcb87e20ae23d93c1f73d92c5532878e36a4c192707ce49dbd9d6a6a95ac4c3d36911f63f3d7fc1847d503d43499736a44 SHA512 8037ddb9c6b8f3a65d35637a1fca2b1b6c7e76afce5c13b1947cf72c3ca87679aa2ed05caf308d90549432b7fe029a522a99f32701bd0087c140bf4fafdb4d49
+DIST xstdcmap-1.0.4.tar.bz2 126269 BLAKE2B 5c2fccbc374871738ae03d722a045cc3ffd6bc431774d76525653e70c5ddb9a4281b2372996ff492807f9d4aee414eac1016f2696ea4e1979407a5b7cf37e1b5 SHA512 2adbb0aec1766341e04090efa962241ff6c9e32c612851b7221cec0ee16852107d406a08ec5251070f39df882c13e3c8c9edcd88f278187a9f373e1727643a8f
 EBUILD xstdcmap-1.0.3.ebuild 308 BLAKE2B d60bf5e731858ebdfc89ad720f443d33d62537d36305ce7c3c8cf03d2072a2a653cb890de552f60842f8f8f19e81883026fa907d5613b187cf06600f489496cb SHA512 dada4e88db321dc4f7c43a6b5bbb5c946c8a86fb543a835d6648233919e74c9b10f674210a1ddce7d70ec09d0669f35845631e6f60cb167dc724d60a6dc3c9da
+EBUILD xstdcmap-1.0.4.ebuild 311 BLAKE2B 795cc00df1dfcd2d54570272c7cd2101d4ef4aa764c677b3383e37cd6c97cd672500d2e46e305802bad3e08fd6d9db66785adfc31f723487eec39e6204065876 SHA512 edd9148b5c1796dfef51f8367af98837bc77ab229e62feebeebbcf1114189c45614cab047723202fb85b2bc4804c76c30b3c0ab3e008f56b035bacbf2d142daa
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xstdcmap/xstdcmap-1.0.4.ebuild b/x11-apps/xstdcmap/xstdcmap-1.0.4.ebuild
new file mode 100644
index 000000000000..f7396b9cf08e
--- /dev/null
+++ b/x11-apps/xstdcmap/xstdcmap-1.0.4.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="X standard colormap utility"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+RDEPEND="x11-libs/libXmu
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xvinfo/Manifest b/x11-apps/xvinfo/Manifest
index 3a07b0f03185..b9eeb3d0fc0e 100644
--- a/x11-apps/xvinfo/Manifest
+++ b/x11-apps/xvinfo/Manifest
@@ -1,5 +1,7 @@
 DIST xvinfo-1.1.2.tar.bz2 116906 BLAKE2B 11775fe342b840dec32ad48a4d47a53e897d9b4157a3a49b59768963855b2df470ba9ab098f418fa87f526c6723effc9584f993f7f2641870f7e92735dc46ad5 SHA512 0cf431afb52807f88654aaa3acbd286630461c934516ee5bbe280ec468ebfd3970b5b10f69d3a25aa36b6e0c0ac46d1c20c9606ac1de76261df80f1821362732
 DIST xvinfo-1.1.3.tar.bz2 123750 BLAKE2B 4a180335e7829ac31258f880955a36d1e6a5abccd3ce2cba1dcb8ec43aca6a5584df2fa4e345d6ce5885efc55b6c586e13a78010cd009cb01bec17dc5b8ab0a9 SHA512 df8356898390d2aec4fbd15cee1627bb86b57ff8af41a527d4f6f6703a81f399a3098da342b94af6d4cf4a817d9fda1946a206bfbe3995e87ceb9910bb8b51bc
+DIST xvinfo-1.1.4.tar.bz2 126503 BLAKE2B 54a1e08913cd51cfeaced1c704834e0348d02cfb2e606f2cbb103acfdf649595a77680364bfb5bbe684a15c743d2d18b6031e77150d0e9fb0d3405d474accc3c SHA512 85e1f936c5c826f0fdde3670bd77d5cde8641c6e8e7849e42142e91b5aa01d7e0e60d2b064eb6fef4f5666321813ca2dc9f9656756ccbe6dcda37b119ee8a63e
 EBUILD xvinfo-1.1.2.ebuild 361 BLAKE2B a53ed74eb7ec3438693f19ce2f097049b0648441fb5eab9fc5add297f8ad2b496357674095513c69985da5f79f9ebcad2e2dcd34b0627fdf9c83fbdfdf7a62ba SHA512 6cf8103a22a853ec1c65b5eeb3c2a89e98d36bb228c2b923538390a29de5961dec685b12ce1824385311e334884fff406a496d7e9eac60acfac704de2888f94e
 EBUILD xvinfo-1.1.3.ebuild 368 BLAKE2B 524114e20b3e44c1b7de12f4fbf9d8710a629c495952bfc61f67f8e97de258255edaa81fe942f3e499eeae25fd9cefabbff0379cb7e29ae8d0a8fd514ef29448 SHA512 84ec7d89440db62d346cdb880db34116b03ebe93ee4c61332ed1154dc35662a41db998829f522a3f58c0ebc74714984f9bd6c2a210e0e2d44f9ac82fe9c44413
+EBUILD xvinfo-1.1.4.ebuild 374 BLAKE2B a19673310188995badb0ce7ef369e017dd556d12f10b7907e4d51c36abbdc21f04e813056196d90c772e091ce7c9be60207ea32f8ad6c2b69a21f8ebc21c1cc9 SHA512 e8a92f0bb648eb10fded40d1f0f91f1f3c45d571bc83e8fae32093a251f47aef49bb42fe9e4b4d788b69e4cc4b839b493c1d34b91037764022f35fc6917105af
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xvinfo/xvinfo-1.1.4.ebuild b/x11-apps/xvinfo/xvinfo-1.1.4.ebuild
new file mode 100644
index 000000000000..65e01d47494a
--- /dev/null
+++ b/x11-apps/xvinfo/xvinfo-1.1.4.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="Print out X-Video extension adaptor information"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libXv
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"