From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D5A19138351 for ; Wed, 4 Mar 2020 20:45:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0BA42E0DCC; Wed, 4 Mar 2020 20:45:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 91E89E0DCC for ; Wed, 4 Mar 2020 20:45:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0DA1B34F2E8 for ; Wed, 4 Mar 2020 20:45:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2E18410B for ; Wed, 4 Mar 2020 20:45:25 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1583354693.c80686ffa38465feef3dc3da17795b80c8d2abe1.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libevdev/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/libevdev/libevdev-9999.ebuild X-VCS-Directories: dev-libs/libevdev/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: c80686ffa38465feef3dc3da17795b80c8d2abe1 X-VCS-Branch: master Date: Wed, 4 Mar 2020 20:45:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 89472ec8-b6fd-4d3d-97d9-58a5d5bfe510 X-Archives-Hash: f13a99064752277a3c4f188499f6ebe1 commit: c80686ffa38465feef3dc3da17795b80c8d2abe1 Author: Matt Turner gentoo org> AuthorDate: Wed Mar 4 20:42:34 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Wed Mar 4 20:44:53 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c80686ff dev-libs/libevdev: Port to Meson Signed-off-by: Matt Turner gentoo.org> dev-libs/libevdev/libevdev-9999.ebuild | 38 +++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/dev-libs/libevdev/libevdev-9999.ebuild b/dev-libs/libevdev/libevdev-9999.ebuild index ffddd6b0bd1..c975e202b80 100644 --- a/dev-libs/libevdev/libevdev-9999.ebuild +++ b/dev-libs/libevdev/libevdev-9999.ebuild @@ -3,16 +3,16 @@ 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" @@ -20,28 +20,38 @@ 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