Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libinput/
Date: Thu, 16 Aug 2018 23:01:43
Message-Id: 1534460441.6a4b543dbfc67cdff52c25a6a4de9778052726d1.leio@gentoo
1 commit: 6a4b543dbfc67cdff52c25a6a4de9778052726d1
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Thu Aug 16 23:00:14 2018 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 16 23:00:41 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a4b543d
7
8 dev-libs/libinput-1.11.3: fix build with USE=test, other tweaks
9
10 New portage allows USE=test independent of FEATURES=test, so handle
11 that case - for now by just always telling meson to disable the build
12 as well, as the deps wouldn't be there.
13
14 Make use of meson_use function from meson.eclass.
15
16 Remove .la and .a file removing, as meson does not use libtool, nor
17 does it build static libraries without asking.
18
19 Closes: https://bugs.gentoo.org/663342
20 Package-Manager: Portage-2.3.46, Repoman-2.3.10
21
22 dev-libs/libinput/libinput-1.11.3.ebuild | 9 ++++-----
23 1 file changed, 4 insertions(+), 5 deletions(-)
24
25 diff --git a/dev-libs/libinput/libinput-1.11.3.ebuild b/dev-libs/libinput/libinput-1.11.3.ebuild
26 index 0635ed1b8fa..e26ac3c3c0f 100644
27 --- a/dev-libs/libinput/libinput-1.11.3.ebuild
28 +++ b/dev-libs/libinput/libinput-1.11.3.ebuild
29 @@ -11,7 +11,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
30 LICENSE="MIT"
31 SLOT="0/10"
32 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
33 -IUSE="doc input_devices_wacom test"
34 +IUSE="doc input_devices_wacom"
35 # Tests require write access to udev rules directory which is a no-no for live system.
36 # Other tests are just about logs, exported symbols and autotest of the test library.
37 RESTRICT="test"
38 @@ -39,9 +39,9 @@ src_configure() {
39 # gui can be built but will not be installed
40 local emesonargs=(
41 -Ddebug-gui=false
42 - -Ddocumentation="$(usex doc true false)"
43 - -Dlibwacom="$(usex input_devices_wacom true false)"
44 - -Dtests="$(usex test true false)"
45 + $(meson_use doc documentation)
46 + $(meson_use input_devices_wacom libwacom)
47 + -Dtests=false # tests are restricted
48 -Dudev-dir="$(get_udevdir)"
49 )
50 meson_src_configure
51 @@ -53,7 +53,6 @@ src_install() {
52 docinto html
53 dodoc -r "${BUILD_DIR}"/html/.
54 fi
55 - find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
56 }
57
58 pkg_postinst() {