gentoo Easter resync : 12.04.2020

3 files changed, 53 insertions, 33 deletions

diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
index 5e85c64a4c76..cb3023a25b0f 100644
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@@ -1,4 +1,4 @@
-DIST libevdev-1.8.0.tar.xz 439000 BLAKE2B 408c60669557419c945901da5f146302cf0cdc43ed74cf4dc8ff4a9c272319c49f644bf95acf3d8656173bfc2f3763a6cc172ee4707a7f0129d15449701e9449 SHA512 8d285632f4fe87c01e81f94e514bec4e37fed4bc44d6d38b9297dba1114e42f6ed8d143fc05f3d0e8d51b08b659e34481dc4c65f60421c54e2f3e11efbafdeb4
-EBUILD libevdev-1.8.0.ebuild 1101 BLAKE2B b59518fd0e42768821b5d28326430de969e51cd27aa093353fd1a985c888ef68f5ec27c6b2f0b0c8cedf6ac1b9907ffce0005e3efe83c796b1a349c900e87ff5 SHA512 862ad52029ab5f00883ce0fd5c35d11f517d641bbc6506584f8f935639b6800adfcd7c07f84a25ecf53bd8effda727859b9573dbc2fa4da0ff1de4ff4b38a104
-EBUILD libevdev-9999.ebuild 1111 BLAKE2B b6c4e0879dbf3c835ef3875217d5bf916b3cfee67c736276ba1b8bffd92c55d5457d50641665dae25b1a4609ef29346107d9691e1e0fadb3661a0de230f72d86 SHA512 710c8ba52f27cb93d19ad95c7d8999da9ca20bbd604ea4e06b68791ec5459e3ec9aac579c92842f6eddbdd4230af8708e5d469e91adcb0862afbc136105aaad6
+DIST libevdev-1.9.0.tar.xz 443208 BLAKE2B 858567ec82f20d567f66d0c41bd1519ffd023a0374e346cff270a0bae0b5136a469a4fd56fcbd3d53b2a2ace6166821ec5e75c90e08eb347331e7974865ceda7 SHA512 6e7589b5776437ac23fbf65b3194fb1dd3a68a294696145060cdd97bcdeb9b04f355f2be028dc1a5efe98ef2cafca15e4f61115edf5d62591e3a8944dc95942a
+EBUILD libevdev-1.9.0.ebuild 1219 BLAKE2B 989379846ee90c38e1d4f6f60b8605a432a83b2a1d071fc53ea438aea4d0a9abb5b8e0be4e3aa1e8bcc80046332e262299dcdfb908de904a7f202c3a53168b0b SHA512 e1b47cbad9968c03aa9ee3c458537b5b4f4f9c3fc4cec639e528226c9b6f7c522ee45836a262624ceb561dd16cf64ca0b762fd7f74949ee5ce3c4ad294995788
+EBUILD libevdev-9999.ebuild 1227 BLAKE2B e14b4f64ca8279fa83d6df895cf4cec92cab75bf88115e3ec8572bef16d9d365f3ce4b20161586601050c3a71f52b75858f125e7621c31c3bd3ee8a55aa88a5c SHA512 1088514caf2d2235214998945c8007bd9e57f417cc6a27c8bd33e72b2870ec59a227c2c74b241d51e0d062442fd9d53bbae13cfd7c06655b8b9ef5f7a57badf7
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/libevdev/libevdev-1.8.0.ebuild b/dev-libs/libevdev/libevdev-1.9.0.ebuild
index c3b2cd42dbad..7c180b35ce81 100644
--- a/dev-libs/libevdev/libevdev-1.8.0.ebuild
+++ b/dev-libs/libevdev/libevdev-1.9.0.ebuild
@@ -3,45 +3,55 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit multilib-minimal python-any-r1
+inherit meson multilib-minimal python-any-r1
 
 DESCRIPTION="Handler library for evdev events"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/libevdev/ https://gitlab.freedesktop.org/libevdev/libevdev"
 
 if [[ ${PV} == 9999* ]] ; then
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/libevdev/libevdev.git"
-	inherit autotools git-r3
+	inherit git-r3
 else
 	SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="doc static-libs"
+IUSE="doc test"
 
+DEPEND="test? ( dev-libs/check[${MULTILIB_USEDEP}] )"
 BDEPEND="
 	${PYTHON_DEPS}
 	doc? ( app-doc/doxygen )
-	virtual/pkgconfig
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
 "
-RESTRICT="test" # Tests need to run as root.
+RESTRICT="!test? ( test )"
 
-src_prepare() {
-	default
-	[[ ${PV} == 9999* ]] && eautoreconf
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_feature doc documentation)
+		$(meson_feature test tests)
+	)
+	meson_src_configure
 }
 
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
 }
 
 multilib_src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-	if use doc ;then
+	meson_src_install
+}
+
+multilib_src_install_all() {
+	if use doc; then
 		local HTML_DOCS=( doc/html/. )
 		einstalldocs
 	fi
diff --git a/dev-libs/libevdev/libevdev-9999.ebuild b/dev-libs/libevdev/libevdev-9999.ebuild
index ffddd6b0bd13..7fbea6d971fe 100644
--- a/dev-libs/libevdev/libevdev-9999.ebuild
+++ b/dev-libs/libevdev/libevdev-9999.ebuild
@@ -3,45 +3,55 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit multilib-minimal python-any-r1
+inherit meson multilib-minimal python-any-r1
 
 DESCRIPTION="Handler library for evdev events"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/libevdev/ https://gitlab.freedesktop.org/libevdev/libevdev"
 
 if [[ ${PV} == 9999* ]] ; then
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/libevdev/libevdev.git"
-	inherit autotools git-r3
+	inherit git-r3
 else
 	SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="doc static-libs"
+IUSE="doc test"
 
+DEPEND="test? ( dev-libs/check[${MULTILIB_USEDEP}] )"
 BDEPEND="
 	${PYTHON_DEPS}
 	doc? ( app-doc/doxygen )
-	virtual/pkgconfig
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
 "
-RESTRICT="test" # Tests need to run as root.
+RESTRICT="!test? ( test )"
 
-src_prepare() {
-	default
-	[[ ${PV} == 9999* ]] && eautoreconf
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_feature doc documentation)
+		$(meson_feature test tests)
+	)
+	meson_src_configure
 }
 
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
 }
 
 multilib_src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-	if use doc ;then
+	meson_src_install
+}
+
+multilib_src_install_all() {
+	if use doc; then
 		local HTML_DOCS=( doc/html/. )
 		einstalldocs
 	fi