gentoo Easter resync : 12.04.2020

4 files changed, 14 insertions, 171 deletions

diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 113c2cd6fcaf..b7f388e25213 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,7 +1,3 @@
-DIST libinput-1.14.3.tar.xz 567560 BLAKE2B 76d38b795a5e721a73062e9c37b23bf6739291549cadc66401ef47b1a9afd5766f1d0ed855fc66912e4257fae4b1b813946c67246adb8d8566d5ad9478079636 SHA512 f01d1bd1b25b8060519575644597d35f0c89de5386d298441f440128ceee3e57549921a058adec31adc8b33dbdedf4c0bd12c76905a69f752859d3136e26336d
-DIST libinput-1.15.1.tar.xz 579236 BLAKE2B 0b0b8cd6643ef33c1fc52461caea332d98cee38b79eee3947fc3d853e6a9402ffc9ba2ac5588430c28c73b6444fa06f6743b0c932077ef29e97d0b1384e20fca SHA512 634810359bc4d86f2c4c75f472bee5eaed04ed93af3c91c4bc46a596402323941f9cc90173e278bfa7e5cbda6b7a20adc59bd09520dd4152fc961302b7e57904
-DIST libinput-1.15.2.tar.xz 580624 BLAKE2B a13bf121b12c58d904f3505fe2fa60ea32eee78a057ac1fe9e64d3017fa840bb92af053f472d2b163d46a958f2a3a5039154efbb9558eddabda3b2422cafb2ca SHA512 f6b50dbdf6ee6b65f88e020c4292c94c3178125d58629f27c2e52f92b658ccd67e0c5604fbf0b303621ff0386637ce1e291daaa991761d4145e8bcda4dd128a2
-EBUILD libinput-1.14.3.ebuild 2062 BLAKE2B 2f69359a6fbf4ff51d52b31d98a1219577414f7462ead908fe9cceb9b46c1825f50bb422a666a3f69b5fb3086bdc6747908826cbb2a7d093e0a8a6bce9adb25a SHA512 d10de59e53d94998d274502d0e9f9c384e4ad267783b87bf3509d1e3e40132b25832926fabdf24a40a8fa2426d81c64622635d35b198dd12d39fac5a4f0af39c
-EBUILD libinput-1.15.1.ebuild 2105 BLAKE2B e9ff1aba1ea011b3bdc5c54480485d5e4f72871bbc655261f89b42e4d73ec7e0fc718be7452967cbca6717997663584220ada483fb3d8ebd12028cbddf898223 SHA512 7a72ecb0d8cf333018d72709a7cb08e3c9a67a7c4ea8674357284937358a77111a1414444c806c35a493c18121a6dcbd2a70fa47f78612f53b06b051ba2662e5
-EBUILD libinput-1.15.2.ebuild 2105 BLAKE2B e9ff1aba1ea011b3bdc5c54480485d5e4f72871bbc655261f89b42e4d73ec7e0fc718be7452967cbca6717997663584220ada483fb3d8ebd12028cbddf898223 SHA512 7a72ecb0d8cf333018d72709a7cb08e3c9a67a7c4ea8674357284937358a77111a1414444c806c35a493c18121a6dcbd2a70fa47f78612f53b06b051ba2662e5
+DIST libinput-1.15.4.tar.xz 580616 BLAKE2B cac324f08b8dc3c6cc18ca62d528c3a00fbd70a1d434aa171da2e144d8d74f961bcb491f6dc39b365f766ea8e5ed87b29b1dd5aa9f62b12707f8e49e5c63a5d7 SHA512 4659818952dc729cd5bdb78ebe21edbbacbf8a66a592b13ba30f3bb4c4e264208ec94440a253cfa4edc8b2ef904954eecea6be0f8d63cf239e3858d3abb64a80
+EBUILD libinput-1.15.4.ebuild 2147 BLAKE2B c163fdd7790a7a2266f4690f9236d8a16211ad5404c81a0c325ae3afcaa4eb3a0d2eaf3f5bb5ff6121ec894eebc02fd49f6b4a88a51aba60367cc100e5d91ce5 SHA512 a3f8dbff4fa659685e11e9334409f2d14ccf5eafae7e61708775efc9cdc559fa293993a98306dce3b87612634a3567735eaf56d40f0a03443a85ba9fc90c8cc7
 MISC metadata.xml 448 BLAKE2B c7a735047f8d22e10d1094dc4bbcbd118c025f318280dafd36029484956465c5e459326fb765f04fbdddc03743760a9008c6ac2494ad113387134fb4e79c4c48 SHA512 945c1005dccddac8085fd8b2be635c08d5b4da1f8264d564d10526d11cf814131d1fa5fd7620f35811a90b43686517519f4e9aba9253f5d5d5b69daa25be52bf
diff --git a/dev-libs/libinput/libinput-1.14.3.ebuild b/dev-libs/libinput/libinput-1.14.3.ebuild
deleted file mode 100644
index 7a369d3cd2dd..000000000000
--- a/dev-libs/libinput/libinput-1.14.3.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 2014-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{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"
-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 ~s390 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.
-RESTRICT="test"
-
-BDEPEND="
-	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
-	)
-"
-#	test? ( dev-util/valgrind )
-RDEPEND="
-	input_devices_wacom? ( >=dev-libs/libwacom-0.20 )
-	>=dev-libs/libevdev-1.3
-	>=sys-libs/mtdev-1.1
-	virtual/libudev:=
-	virtual/udev
-"
-DEPEND="${RDEPEND}"
-#	test? ( >=dev-libs/check-0.9.10 )
-
-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
-	local emesonargs=(
-		-Ddebug-gui=false
-		$(meson_use doc documentation)
-		$(meson_use input_devices_wacom libwacom)
-		-Dtests=false # tests are restricted
-		-Dudev-dir="${EPREFIX}$(get_udevdir)"
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	if use doc ; then
-		docinto html
-		dodoc -r "${BUILD_DIR}"/Documentation/.
-	fi
-}
-
-pkg_postinst() {
-	udevadm hwdb --update --root="${ROOT}"
-}
diff --git a/dev-libs/libinput/libinput-1.15.2.ebuild b/dev-libs/libinput/libinput-1.15.2.ebuild
deleted file mode 100644
index 313a4e3d067c..000000000000
--- a/dev-libs/libinput/libinput-1.15.2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 2014-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{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"
-SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0/10"
-[[ "$(ver_cut 3)" -gt 900 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~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.
-RESTRICT="test"
-
-BDEPEND="
-	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
-	)
-"
-#	test? ( dev-util/valgrind )
-RDEPEND="
-	input_devices_wacom? ( >=dev-libs/libwacom-0.20 )
-	>=dev-libs/libevdev-1.3
-	>=sys-libs/mtdev-1.1
-	virtual/libudev:=
-	virtual/udev
-"
-DEPEND="${RDEPEND}"
-#	test? ( >=dev-libs/check-0.9.10 )
-
-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
-	local emesonargs=(
-		-Ddebug-gui=false
-		$(meson_use doc documentation)
-		$(meson_use input_devices_wacom libwacom)
-		-Dtests=false # tests are restricted
-		-Dudev-dir="${EPREFIX}$(get_udevdir)"
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	if use doc ; then
-		docinto html
-		dodoc -r "${BUILD_DIR}"/Documentation/.
-	fi
-}
-
-pkg_postinst() {
-	udevadm hwdb --update --root="${ROOT}"
-}
diff --git a/dev-libs/libinput/libinput-1.15.1.ebuild b/dev-libs/libinput/libinput-1.15.4.ebuild
index 313a4e3d067c..1e8da08891db 100644
--- a/dev-libs/libinput/libinput-1.15.1.ebuild
+++ b/dev-libs/libinput/libinput-1.15.4.ebuild
@@ -13,11 +13,9 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 LICENSE="MIT"
 SLOT="0/10"
 [[ "$(ver_cut 3)" -gt 900 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~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.
-RESTRICT="test"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+IUSE="doc input_devices_wacom test"
+RESTRICT="!test? ( test )"
 
 BDEPEND="
 	virtual/pkgconfig
@@ -40,8 +38,8 @@ RDEPEND="
 	virtual/libudev:=
 	virtual/udev
 "
-DEPEND="${RDEPEND}"
-#	test? ( >=dev-libs/check-0.9.10 )
+DEPEND="${RDEPEND}
+	test? ( >=dev-libs/check-0.9.10 )"
 
 python_check_deps() {
 	has_version "dev-python/commonmark[${PYTHON_USEDEP}]" && \
@@ -60,7 +58,7 @@ src_configure() {
 		-Ddebug-gui=false
 		$(meson_use doc documentation)
 		$(meson_use input_devices_wacom libwacom)
-		-Dtests=false # tests are restricted
+		$(meson_use test tests)
 		-Dudev-dir="${EPREFIX}$(get_udevdir)"
 	)
 	meson_src_configure
@@ -75,5 +73,11 @@ src_install() {
 }
 
 pkg_postinst() {
+	pkgname="dev-python/python-libevdev"
+	if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version "${pkgname}"; then
+		einfo "${pkgname} must be installed to use the"
+		einfo "libinput measure and libinput replay tools."
+	fi
+
 	udevadm hwdb --update --root="${ROOT}"
 }