gentoo resync : 28.04.2018

11 files changed, 13 insertions, 55 deletions

diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index de2e7ff9557a..8cd6c9f04fac 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/fslsfonts/Manifest b/x11-apps/fslsfonts/Manifest
index 81468873e216..54905c024734 100644
--- a/x11-apps/fslsfonts/Manifest
+++ b/x11-apps/fslsfonts/Manifest
@@ -1,3 +1,3 @@
 DIST fslsfonts-1.0.5.tar.bz2 125650 BLAKE2B df08689dc452d07e895a93d5e755b3820b21c1df997b5269835ac04ac81beb09d98ebdcf7030d3e6c7ae288b3e7388b136a8b7b58f95ce3958e12923bab50620 SHA512 3a30598ace981c7396bfe44f0d8f76d40fca3f77158dceb3914a524594a12187dcad0b0f225fa81f251f0b7896bf046cec4ba610b4676da9be311eec5d8c6cc2
-EBUILD fslsfonts-1.0.5.ebuild 320 BLAKE2B ea4c72b99a766776ac54632216d35d48e63aa567ce46a44a5707e1a7d5cf9c0aeb85d86d6b490a0af3a34288ba912d7f5686745e583a3c6957dfe0e10355a197 SHA512 525bfe27f28bd109c226bfd07a7cee4b428f117e7ce8fa876b365753dc2d5d7a16b35d0147b323da0b829fa98e6ecc356162cd4a6152f8ec392abb96e8e3bc8c
+EBUILD fslsfonts-1.0.5-r1.ebuild 323 BLAKE2B 681f817c9a59ab25f11be3e31bc32042aeaf200a18595de6d7f7d149b51f6923e26f2089e900e5b7c76f92881dbf57e1af97f48c3db77b1c94ae3b577424316b SHA512 8d30aceec62fc1ad7d8e737211478f0df02299df4e59bd7e93f9e0a8be24c036997348b3d3076d2467745a0e8059a4b9869cb95160e7a87683c590b69dfd6d9b
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/fslsfonts/fslsfonts-1.0.5.ebuild b/x11-apps/fslsfonts/fslsfonts-1.0.5-r1.ebuild
index a1aa9814f14e..a861d2c640d6 100644
--- a/x11-apps/fslsfonts/fslsfonts-1.0.5.ebuild
+++ b/x11-apps/fslsfonts/fslsfonts-1.0.5-r1.ebuild
@@ -9,6 +9,6 @@ DESCRIPTION="list fonts served by X font server"
 KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND="x11-proto/xproto
-	x11-libs/libFS"
-DEPEND="${RDEPEND}"
+RDEPEND="x11-libs/libFS"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-apps/rstart/Manifest b/x11-apps/rstart/Manifest
index 49672891ef11..ff0d2177a5d6 100644
--- a/x11-apps/rstart/Manifest
+++ b/x11-apps/rstart/Manifest
@@ -1,3 +1,3 @@
 DIST rstart-1.0.5.tar.bz2 144607 BLAKE2B 2048877683a5a1c1d07bb68d8814cea2a0e1755d7cea3f40b62c086a7f2e8ea2582eea81db46117f906f998bc830f50c437188131584d07fbb68730bfe2491ae SHA512 bda43dd29f95ba5ea4ab42e78069c4011afc6987d00dc580250aec8bec217fabb67577a3038607468de1739d54da596a43cea4c1f5be72e3e572ae6d5abbc09a
-EBUILD rstart-1.0.5.ebuild 285 BLAKE2B 6d4a1ed94b25941d040971c6b318bbc8883c0eeba5dbed5689e01904506433167f3e7b6a0c034306594d112af992f0f7d2e31c0ec342c2dd42fa09e445530689 SHA512 0dbbc642253f7f6ef0a2fdc9091fe11fa54f769861261b352bd74f7898d266a8e843655e56ec96314a5372b9350de7a42eaf227d38b2698e42d06800f2003815
+EBUILD rstart-1.0.5-r1.ebuild 287 BLAKE2B d5bdf212f2302d07120132a927ee0e9117550ad422fbea366a81f55d9a162605874a9abcbf47af49810575083abde0d22a226f0dd66391b93c0d25ae1becae6f SHA512 727d5b2ee44db51acd11359df546df21e54ca35f601989fdb0a0b35c8765f5ad2c050f10b50936e5e8e15fd30c48e74ad4f050f5ce9c473fdf41129590a9d842
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/rstart/rstart-1.0.5.ebuild b/x11-apps/rstart/rstart-1.0.5-r1.ebuild
index e74a26a102a1..86908b7e7f16 100644
--- a/x11-apps/rstart/rstart-1.0.5.ebuild
+++ b/x11-apps/rstart/rstart-1.0.5-r1.ebuild
@@ -9,5 +9,5 @@ DESCRIPTION="X.Org rstart application"
 KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
 IUSE=""
 
-RDEPEND="x11-proto/xproto"
-DEPEND="${RDEPEND}"
+DEPEND="x11-base/xorg-proto"
+RDEPEND="${DEPEND}"
diff --git a/x11-apps/xinput_calibrator/Manifest b/x11-apps/xinput_calibrator/Manifest
index 9806a82bbc5b..2e1561514ded 100644
--- a/x11-apps/xinput_calibrator/Manifest
+++ b/x11-apps/xinput_calibrator/Manifest
@@ -1,3 +1,3 @@
 DIST xinput_calibrator-0.7.5.tar.gz 355313 BLAKE2B 72c6b2f1b2cf4d5baaba27827e870adb52c4a51004a9a3f51376c5e30560b26abe6e83a94ae2e308a01dca3204a1938d888d40cad793cce50c1d9acea9f507b3 SHA512 dc022f4de6d7b57912373a571ef0598c7b9d91cdbc3f63bb2b32c6149e43f67eaf820dc0289349d527314381d5195cf8891f6bcb9847110662dd75875f76b9de
-EBUILD xinput_calibrator-0.7.5.ebuild 716 BLAKE2B 6a97121ec00fa5ba4178751d07aab56c1322a643a223e874d530c87557cf302dc406aef85b5be0b5b71c142cc0ea13861f46c0485c90fc70bdc2f1db2d187714 SHA512 2bb012789d39ce0430dfb50371fdc6bc8a7146e62277d4f358f11fb9f2408bfa8a5592bbae6dc2be5dac6455cc1dbc7faccf6b154886707b27e689b13cb650a4
+EBUILD xinput_calibrator-0.7.5-r1.ebuild 716 BLAKE2B 83bbbaea25f741bd3bd6963f3d45e3c887d029e776a9c263d7c409ca320f58fca62872170892dbad91d04cc58142d8ec64a85da6742379b942c6004c4dea718a SHA512 2fc90d932ebbf92c926e756513f004d18fc311c5bb7f8ebe90276c8ee52341842dfa2aeccd56087581f9601300577d4c82c3de27997d623e1798a106d83df798
 MISC metadata.xml 234 BLAKE2B b45f6795dbd73dfcee2a68f93ec5460509b15a69401467bc8f4af9505eeb04a2aa35a2b144eb88781df4abd4e15d2b88fc728daf033c6d646762170ffb00b1a7 SHA512 fabcd59aeede4ac93d66552746edacc44fd565551aafaca67185aff7f8e6a4c0fa21f3d54e4fccd7def948ec57b90489631bd779fb992cd9322132b0a3aa503b
diff --git a/x11-apps/xinput_calibrator/xinput_calibrator-0.7.5.ebuild b/x11-apps/xinput_calibrator/xinput_calibrator-0.7.5-r1.ebuild
index d00be953da85..e1f2aa309667 100644
--- a/x11-apps/xinput_calibrator/xinput_calibrator-0.7.5.ebuild
+++ b/x11-apps/xinput_calibrator/xinput_calibrator-0.7.5-r1.ebuild
@@ -13,13 +13,13 @@ SLOT="0"
 KEYWORDS="amd64 arm x86"
 IUSE="gtk"
 
-DEPEND="x11-libs/libX11
+RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXi
 	x11-libs/libXrandr
-	x11-proto/inputproto
 	gtk? ( dev-cpp/gtkmm:2.4 )"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
 
 src_configure() {
 	append-cxxflags -std=c++11 #566594
diff --git a/x11-apps/xman/Manifest b/x11-apps/xman/Manifest
index 25c1d39334db..80eddde33080 100644
--- a/x11-apps/xman/Manifest
+++ b/x11-apps/xman/Manifest
@@ -1,7 +1,4 @@
 AUX xman-1.1.3-mandb-2.7.patch 1843 BLAKE2B 471ec7f63c69e4bb4febbe49bbde9164b579371168caa763a6af58d71c65e248e6d58531d7dc1d50cd0d3240b881b2cd94fb22e1aeb6a0978a1c1578024b034a SHA512 74d4467ea8a2904cc4adfa02a92d57020ec045bc72ca1571451511080227a9031c0e5fb0d7b97c8a6625755f611a4bf4a352a751f420da18985a86289d0a0f5f
-DIST xman-1.1.3.tar.bz2 184340 BLAKE2B 361df81666621c5b8e0e07616ef2b5e600846ae0b52f3f7837e99932117f0c0eddfbba41dac4a6b0b5554a41d7297b6e61b68e661083acfa3d24a09f73809a0c SHA512 7c6475434984205f359ff3cb47a41282536be6aefe7bc6e970736c4372b23b5de01a26864d7f5b2cae2f770eeef6d254ebbdf6db717b5efab0042a47cb7497be
 DIST xman-1.1.4.tar.bz2 188259 BLAKE2B 3be982bfc9cad53b47dfe87e85d2fdafca4d0e9336c05eaf80665a79a1c420941226da9a3acfbdf7eb7c9d299085d78cb392d67c6859e28f07a304c6f935931b SHA512 785e973eb15b0300de08aace24f3604dfee61421c7f64ea4cde2e280480bf5d3ad797ab8208668dc023a375494f8db7534fbcaa1c1ef16e79464fdd017b5da68
-EBUILD xman-1.1.3-r1.ebuild 449 BLAKE2B 7c59a7e39e22cd54ba9c0abbfb581223cd08d25e18d07c1ee1cbd15002828665148213b5991596d91ed6c31fea099d5d67440bcb81be11f31df8bae4a1366c55 SHA512 28c8ebdaf60e9aa1dcc90e3ba61c802f9c8de387ac1e82447698749cac8398a2707001a559f09bdea02df33d15c2d6d1bda5b72f4ea551ffb9a99132a1183a1b
-EBUILD xman-1.1.3.ebuild 389 BLAKE2B 428054a5e0c48fc17bd74c0b7866a28eedf66acd758c998b4fd9355fc2e9c6416ea1b1d8712c6f00219fcda44e812923b00c044e9ac9df696f93df2b181582d0 SHA512 fdd55a83abb82d67c2d20d6f03012194049200e78f4a796bbbebd8c565db17e1376de99b8c7484cf96f694dd41585ac2eaf0860809fe3be5ead6826c93d87833
-EBUILD xman-1.1.4.ebuild 453 BLAKE2B 2ff8cf43d9070fe2cef9a9939d3d965264d9c555f7ee3698e03f7a6fccade40fa4020d2eb8ad92aa54c0639b773b3b8aac73a597ff0960e8f2da19a30adad371 SHA512 f30ebc70da303437a95d08c13e3de0539a86f21e9c4faf76f82aac9cbb4b2cc6a622eca104450b50bd3fccf4953303a5f27666351730b9162e9e20367f304d69
+EBUILD xman-1.1.4-r1.ebuild 435 BLAKE2B d16cfc7ddcba89dc732158918b8c10108f2b43a68bbd745040587204f1930b305a6695f3fc20b1ef6dc4eab5b20e0bf5b95231a7977ea27ece64ba21b4c56b3b SHA512 8dd3c27aea8b18973a8b595e0f004497d55f23241e0f4c1f1b728c71b33d95009bbca969e0539c3e600c9fdfe23d104e80a523a78745c8326ba489823eeeb228
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xman/xman-1.1.3-r1.ebuild b/x11-apps/xman/xman-1.1.3-r1.ebuild
deleted file mode 100644
index 35afd7622a73..000000000000
--- a/x11-apps/xman/xman-1.1.3-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-XORG_EAUTORECONF=yes
-inherit xorg-2
-
-DESCRIPTION="Manual page display program for the X Window System"
-
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-DEPEND="x11-libs/libXaw
-	x11-libs/libXt
-	x11-libs/libXmu
-	x11-proto/xproto"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.3-mandb-2.7.patch
-)
diff --git a/x11-apps/xman/xman-1.1.3.ebuild b/x11-apps/xman/xman-1.1.3.ebuild
deleted file mode 100644
index f046ff40375f..000000000000
--- a/x11-apps/xman/xman-1.1.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="Manual page display program for the X Window System"
-
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE=""
-
-DEPEND="x11-libs/libXaw
-	x11-libs/libXt
-	x11-libs/libXmu
-	x11-proto/xproto"
-RDEPEND="${DEPEND}
-	!>=sys-apps/man-db-2.7"
diff --git a/x11-apps/xman/xman-1.1.4.ebuild b/x11-apps/xman/xman-1.1.4-r1.ebuild
index f312218b2583..e4fd534b0ac9 100644
--- a/x11-apps/xman/xman-1.1.4.ebuild
+++ b/x11-apps/xman/xman-1.1.4-r1.ebuild
@@ -12,8 +12,7 @@ IUSE=""
 
 DEPEND="x11-libs/libXaw
 	x11-libs/libXt
-	x11-libs/libXmu
-	x11-proto/xproto"
+	x11-libs/libXmu"
 RDEPEND="${DEPEND}"
 
 PATCHES=(