gentoo resync : 28.04.2019

4 files changed, 33 insertions, 12 deletions

diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 35c75c304936..c901e9369c13 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,7 +1,7 @@
-DIST libinput-1.11.3.tar.xz 487408 BLAKE2B 38dc14cf018ca59279e8b6e85fd91f4b29545b4a55ab968cb11d9a8afc8d80c311efc6e57339b9baa9fb270f52cfb0758ff8ea313991867c35f3da47910977ac SHA512 5e18daab6202bcbfddeebc35dac4cabb5f726b5b73f5fc87975b58f3019a54a4b1f506a3200e920638ddddfb978a0b96c23c2e90b081942f86d33c16d4836949
 DIST libinput-1.12.6.tar.xz 518784 BLAKE2B 7462f47be3628f9c66ef5b7c8265b588bd0ca328bafe91932f5341a010ac882648b4e7cfd0db241ae526836172e0829d68d21f8966d2be8b49f4e1c0c40df018 SHA512 02ad90c77a0c8c27fd96ec34e1546c5f0947ced49bad386372c1ef7c41b3b2157c39020f0766f20aaf2ab3c97128567e169279bea21115ced39499dda325d2ef
 DIST libinput-1.13.0.tar.xz 529912 BLAKE2B 830dca7387c6527ebdf41e8b01bf9d8df094ec2309e229e3933b56217d51e3ef0b0c53106d6e4d55946a238d947c17a1d7c0a8f43b63119a6f3aa1063a703d64 SHA512 0e3f53acf90fe142ad677b416d1ee830ad7f7f8a83b80023278ea7d3696ff7af5612379b387b1eb5daae6277a8c30d84c21f0086fe3d8b4b6189f239b1eeb4f8
-EBUILD libinput-1.11.3.ebuild 1479 BLAKE2B 3bf99bc9ac1007e56927e43f42aa98fc3e827be6492fc895f19daeea49417e596c5ce39832531a242d71bffe6c6b6c9b588070d42e4204747bf539d641cf0085 SHA512 09b0ea6ee921080658e96ef91e19bf97f6077b7ebcaa82acf5e7b8a9b42b032d848386a633c5b577287de236b1e7d4055627d8dc06911584f9a78edd18f65f5c
-EBUILD libinput-1.12.6.ebuild 2075 BLAKE2B 7097b88f64918da7053c398d268d1857a328439222443b6cabc9a9815bc6264807ce8ca7d8e600944b5f1537d5bae083a5fdf6fa7604a4b05496e684de5742a9 SHA512 46ce18a95c8c206c906b94455ec657c6fa73eddb579ea677a9f09a39fb2b2b2738f3d495a85f91d82edb86f849e32be064b849db89eff3e1d8774a685c5582fc
-EBUILD libinput-1.13.0.ebuild 2084 BLAKE2B 164a483275c47e36024a962f1b1b25481ef388371b9b2b7fa012a70bcaa75ff78c1e585b37af285c41674b9cc08630dedf6a297122adcec1a01ba9377ce92723 SHA512 e5f33cfede51c2917f078065c9f322446693afeebc76ab054276e203b15ca5ca92e4dae94b3cb555a0b5ba7bf759f1a4649d0810e635b6fca6531b9593b3d0c4
+DIST libinput-1.13.1.tar.xz 529516 BLAKE2B 9eb9952ca2762470ee3e9ac0eab6b11c4b404b2702cd81b9f0720e539124a8f71a032803cf77105bbdce412b3c5d4a7fee4e24b8d3ceae991bd2ee9b3460e373 SHA512 a19deec802e704038df0901c103a82a3370f56e0299f4cc1b6aa84c1832a66fb638e6f9d0fa708b51df6c3b939cdc1271e4ff547c645c566be03dce0bc9ff7e0
+EBUILD libinput-1.12.6.ebuild 2072 BLAKE2B 9119a05dc0fcbe73ed2ff112482484a7accd7c9ad1c313bb39ce80ca02c3cdba9de2dab5eb64e12388d2aebd9e12bb17e732c6b03281a8bde82cd6187306c798 SHA512 35e40369e9e55a1be8429e1b0486c16da1d7a799fe36981e59cfa0c873884900df6ed3bae0f5110434a2081fcba2ec3bef0d5d94037a549d03bf28002f44e341
+EBUILD libinput-1.13.0.ebuild 2082 BLAKE2B 7431e359fba2baf63f3f01014dc256cdfb482bc741c9271397a93641ecf6a7d7a386fe02fc2f8984c389f7e3aa6bcb89158715cb8ceb278885751541b037f764 SHA512 e5bdbc2792aac39bb4065566811b85c70563781b20969843164b7d915cb197e204f21b1fa5c6af1b34d21774ce81ea5001556e522e5133aadf559164054c3df4
+EBUILD libinput-1.13.1.ebuild 2082 BLAKE2B 7431e359fba2baf63f3f01014dc256cdfb482bc741c9271397a93641ecf6a7d7a386fe02fc2f8984c389f7e3aa6bcb89158715cb8ceb278885751541b037f764 SHA512 e5bdbc2792aac39bb4065566811b85c70563781b20969843164b7d915cb197e204f21b1fa5c6af1b34d21774ce81ea5001556e522e5133aadf559164054c3df4
 MISC metadata.xml 448 BLAKE2B c7a735047f8d22e10d1094dc4bbcbd118c025f318280dafd36029484956465c5e459326fb765f04fbdddc03743760a9008c6ac2494ad113387134fb4e79c4c48 SHA512 945c1005dccddac8085fd8b2be635c08d5b4da1f8264d564d10526d11cf814131d1fa5fd7620f35811a90b43686517519f4e9aba9253f5d5d5b69daa25be52bf
diff --git a/dev-libs/libinput/libinput-1.12.6.ebuild b/dev-libs/libinput/libinput-1.12.6.ebuild
index 21bd0253ca3b..fd10ed0a4e7d 100644
--- a/dev-libs/libinput/libinput-1.12.6.ebuild
+++ b/dev-libs/libinput/libinput-1.12.6.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 
 inherit meson python-any-r1 udev
 
@@ -12,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 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc 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.
diff --git a/dev-libs/libinput/libinput-1.13.0.ebuild b/dev-libs/libinput/libinput-1.13.0.ebuild
index 5bd8983e0dad..f8e313004d15 100644
--- a/dev-libs/libinput/libinput-1.13.0.ebuild
+++ b/dev-libs/libinput/libinput-1.13.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 
 inherit meson python-any-r1 udev
 
diff --git a/dev-libs/libinput/libinput-1.11.3.ebuild b/dev-libs/libinput/libinput-1.13.1.ebuild
index 072c1deee40e..f8e313004d15 100644
--- a/dev-libs/libinput/libinput-1.11.3.ebuild
+++ b/dev-libs/libinput/libinput-1.13.1.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit meson udev
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{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/ https://gitlab.freedesktop.org/libinput/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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~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.
@@ -24,8 +26,13 @@ RDEPEND="
 	virtual/udev
 "
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
 	doc? (
+		$(python_gen_any_dep '
+			dev-python/commonmark[${PYTHON_USEDEP}]
+			dev-python/recommonmark[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			>=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]
+		')
 		>=app-doc/doxygen-1.8.3
 		>=media-gfx/graphviz-2.38.0
 	)
@@ -34,6 +41,20 @@ DEPEND="${RDEPEND}
 #		>=dev-libs/check-0.9.10
 #		dev-util/valgrind
 #		sys-libs/libunwind )
+BDEPEND="
+	virtual/pkgconfig
+"
+
+python_check_deps() {
+	has_version "dev-python/commonmark[${PYTHON_USEDEP}]" && \
+	has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" && \
+	has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && \
+	has_version ">=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
 
 src_configure() {
 	# gui can be built but will not be installed
@@ -51,7 +72,7 @@ src_install() {
 	meson_src_install
 	if use doc ; then
 		docinto html
-		dodoc -r "${BUILD_DIR}"/html/.
+		dodoc -r "${BUILD_DIR}"/Documentation/.
 	fi
 }