gentoo resync : 22.10.2018

3 files changed, 24 insertions, 7 deletions

diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index e5c397c41e20..96830071059e 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,9 +1,8 @@
 DIST libinput-1.10.7.tar.xz 494648 BLAKE2B ddcbe5f54b90f8291c16e5912fa3d673fb2c66f0247c9d771f7c2dfeeef9b51404f31d7ac99cfd20b37e1d01d6b2b3bc95155ab6581c6a94e922e153d9098892 SHA512 b102b8065ceed7511ad26efba34d5d9b0c13f0f7aaa882bb21501f7a5166f4cbe140fcbb488e90e6880bd47bb2b27667a4d6aa79b8726269fa1337897034a684
 DIST libinput-1.11.3.tar.xz 487408 BLAKE2B 38dc14cf018ca59279e8b6e85fd91f4b29545b4a55ab968cb11d9a8afc8d80c311efc6e57339b9baa9fb270f52cfb0758ff8ea313991867c35f3da47910977ac SHA512 5e18daab6202bcbfddeebc35dac4cabb5f726b5b73f5fc87975b58f3019a54a4b1f506a3200e920638ddddfb978a0b96c23c2e90b081942f86d33c16d4836949
-DIST libinput-1.12.0.tar.xz 519320 BLAKE2B b40036740350180ca0e183088651647e3604bca236ab27c99a941934b27ed67a21d8596be9baab68dd798dea9c5967cca3a038623ba2870dc2ad3db8336e0b96 SHA512 4aee877785f9ac080e4f8ee20f3643bc4f3ddbc568aca6c363a962f8c8f76b8db7dc113c8167092f0277d112346a85b9a7e7c3c3f227ed243aaba32c9092c924
 DIST libinput-1.12.1.tar.xz 520072 BLAKE2B 2d2b2d82f27ac01ff25b3bf6fd7b77ca56467ab818cdc5d4a641629fed623ef5042915889f54f71b1881595af1d85770bbf4ecfd798c079878efa0a0546c4a36 SHA512 de1714526ee1244e3086729efa5b72724b2b989fa8d04418e633d1ef5a8ea777ae3cd4b8c5b015ca0da2b8cf5b07111bff2283c7d6068abcdfa81c3f71b81d68
 EBUILD libinput-1.10.7.ebuild 1440 BLAKE2B 203a9e8e20785cb93d221d8614aec3488a316d301672d3bbacbd223cd959c31edae176c17d1d575426cec24bd6e89c82b80244bcb7273a4531743555c4ba3b42 SHA512 c0e320acdb66994bcb5fe11b60ac4dc88955cae25da1dc3de028738bfb86c57eba90d23f258ed076ddba0da2737af9027ccde6a73705e6ff4feb8beffb591f0b
 EBUILD libinput-1.11.3.ebuild 1443 BLAKE2B 95c2a74f98abe1b021f14df89375e8acba26cad0df3ebbd753844cdbe477fcb7d2d9606c76b51676ee0fb27623a5de658a6326d74d7d90e9d1cf5be0cb8d8428 SHA512 2e91a777ad1f5a3a849ad7a559f34f43dffbeda2c5be97a06c0870d52d558c916045ff98229f155527cca58e38e155e76a48473a8f03c7d3b8ad045bb595fcd6
-EBUILD libinput-1.12.0.ebuild 1443 BLAKE2B 95c2a74f98abe1b021f14df89375e8acba26cad0df3ebbd753844cdbe477fcb7d2d9606c76b51676ee0fb27623a5de658a6326d74d7d90e9d1cf5be0cb8d8428 SHA512 2e91a777ad1f5a3a849ad7a559f34f43dffbeda2c5be97a06c0870d52d558c916045ff98229f155527cca58e38e155e76a48473a8f03c7d3b8ad045bb595fcd6
-EBUILD libinput-1.12.1.ebuild 1440 BLAKE2B 0a7cacdd6a101e465108981d625476b8e360872f7f0be8a7a583415215403a31f6c2f81275d00a626b2a8a7d5d31487cf64c768f4072d76ce695b7123478920b SHA512 60b1254d675c0bae51157b20145f4ba4a40983ec2950af0862a923a72df3a6de742752c27e0408c539698d9715b938b3abd65113859c2528a25eabc66aa7e4a1
+EBUILD libinput-1.12.1-r1.ebuild 1854 BLAKE2B d6f9387dfff57346bf5daa581c2426004244a77a23d86463370518ef9798dc2b497b0369c194784b8adb806063d9fc0f4e5aeb6d3356421c251aba3cef830ba5 SHA512 3b6f6bd4e80a894f474dc1ac66e206f3e9e12add2e682ea69c80d8a3661b3622397e2466038e2b2186eeb76d264610444755c378f6905c90a7a3fe812d8d1814
+EBUILD libinput-1.12.1.ebuild 1460 BLAKE2B 066dfe5ee976f24475f2572d040c685b2a429cc27d22d2199bcaaa0e92886a9e76b2dc489457e5657f8b4ac6a0e61af75cd7041af96647bc1dd911d5c84e3585 SHA512 3bd9c1fb51fee929bcf85349996e679b202d2e064bcb88926a4d0cda0453f82c7ec9f8bd0ba0e4870781fc936a36da034b91e23223ad3f9764b4781468bf8b19
 MISC metadata.xml 448 BLAKE2B c7a735047f8d22e10d1094dc4bbcbd118c025f318280dafd36029484956465c5e459326fb765f04fbdddc03743760a9008c6ac2494ad113387134fb4e79c4c48 SHA512 945c1005dccddac8085fd8b2be635c08d5b4da1f8264d564d10526d11cf814131d1fa5fd7620f35811a90b43686517519f4e9aba9253f5d5d5b69daa25be52bf
diff --git a/dev-libs/libinput/libinput-1.12.0.ebuild b/dev-libs/libinput/libinput-1.12.1-r1.ebuild
index e26ac3c3c0ff..edf6037ad99c 100644
--- a/dev-libs/libinput/libinput-1.12.0.ebuild
+++ b/dev-libs/libinput/libinput-1.12.1-r1.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit meson udev
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+
+inherit meson python-any-r1 udev
 
 DESCRIPTION="Library to handle input devices in Wayland"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/"
@@ -10,7 +12,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0/10"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="doc input_devices_wacom"
 # Tests require write access to udev rules directory which is a no-no for live system.
 # Other tests are just about logs, exported symbols and autotest of the test library.
@@ -26,6 +28,11 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? (
+		$(python_gen_any_dep '
+			dev-python/commonmark[${PYTHON_USEDEP}]
+			dev-python/recommonmark[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+		')
 		>=app-doc/doxygen-1.8.3
 		>=media-gfx/graphviz-2.38.0
 	)
@@ -35,6 +42,16 @@ DEPEND="${RDEPEND}
 #		dev-util/valgrind
 #		sys-libs/libunwind )
 
+python_check_deps() {
+	has_version "dev-python/commonmark[${PYTHON_USEDEP}]" && \
+	has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" && \
+	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
 src_configure() {
 	# gui can be built but will not be installed
 	local emesonargs=(
@@ -51,7 +68,7 @@ src_install() {
 	meson_src_install
 	if use doc ; then
 		docinto html
-		dodoc -r "${BUILD_DIR}"/html/.
+		dodoc -r "${BUILD_DIR}"/Documentation/.
 	fi
 }
 
diff --git a/dev-libs/libinput/libinput-1.12.1.ebuild b/dev-libs/libinput/libinput-1.12.1.ebuild
index e4f4f74efb75..c19ff354838c 100644
--- a/dev-libs/libinput/libinput-1.12.1.ebuild
+++ b/dev-libs/libinput/libinput-1.12.1.ebuild
@@ -26,6 +26,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? (
+		dev-python/sphinx
 		>=app-doc/doxygen-1.8.3
 		>=media-gfx/graphviz-2.38.0
 	)