Gentoo Archives: gentoo-commits

From: Johannes Huber <johu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: dev-libs/appstream/
Date: Sun, 10 Sep 2017 13:24:08
Message-Id: 1505049755.715b09c808b1d1d9633314c7ec5f95ca573f794c.johu@gentoo
1 commit: 715b09c808b1d1d9633314c7ec5f95ca573f794c
2 Author: Johannes Huber <johu <AT> gentoo <DOT> org>
3 AuthorDate: Sun Sep 10 13:20:20 2017 +0000
4 Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 10 13:22:35 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=715b09c8
7
8 dev-libs/appstream: Migrate to meson
9
10 Upstream commit bca85429424ecd64d43a686c490f363233da97b1
11
12 Package-Manager: Portage-2.3.8, Repoman-2.3.3
13
14 dev-libs/appstream/appstream-9999.ebuild | 36 +++++++++++---------------------
15 1 file changed, 12 insertions(+), 24 deletions(-)
16
17 diff --git a/dev-libs/appstream/appstream-9999.ebuild b/dev-libs/appstream/appstream-9999.ebuild
18 index 662af169e1..ea9eee6a1d 100644
19 --- a/dev-libs/appstream/appstream-9999.ebuild
20 +++ b/dev-libs/appstream/appstream-9999.ebuild
21 @@ -3,7 +3,7 @@
22
23 EAPI=6
24
25 -inherit cmake-utils xdg-utils
26 +inherit meson xdg-utils
27
28 if [[ ${PV} = 9999 ]]; then
29 inherit git-r3
30 @@ -13,7 +13,7 @@ else
31 MY_PV="$(replace_all_version_separators '_')"
32 MY_P="APPSTREAM_${MY_PV}"
33 SRC_URI="https://github.com/ximion/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
34 - KEYWORDS="~amd64 ~arm ~x86"
35 + KEYWORDS="~amd64 ~arm ~arm64 ~x86"
36 S="${WORKDIR}/${PN}-${MY_P}"
37 fi
38
39 @@ -21,7 +21,7 @@ DESCRIPTION="Cross-distro effort for providing metadata for software in the Linu
40 HOMEPAGE="https://www.freedesktop.org/wiki/Distributions/AppStream/"
41
42 LICENSE="LGPL-2.1+ GPL-2+"
43 -# check APPSTREAM_LIB_API_LEVEL
44 +# check as_api_level
45 SLOT="0/4"
46 IUSE="apt doc qt5 test"
47
48 @@ -42,30 +42,18 @@ DEPEND="${RDEPEND}
49 )
50 "
51
52 -src_prepare() {
53 - cmake-utils_src_prepare
54 -
55 - if ! use test; then
56 - pushd qt > /dev/null || die
57 - cmake_comment_add_subdirectory tests
58 - popd > /dev/null || die
59 - fi
60 -}
61 -
62 src_configure() {
63 xdg_environment_reset
64
65 - local mycmakeargs=(
66 - -DSTEMMING=ON
67 - -DL18N=ON
68 - -DVAPI=OFF
69 - -DMAINTAINER=OFF
70 - -DSANITIZERS=OFF
71 - -DDOCUMENTATION=OFF
72 - -DAPT_SUPPORT=$(usex apt)
73 - -DINSTALL_PREBUILT_DOCS=$(usex doc)
74 - -DQT=$(usex qt5)
75 + local emesonargs=(
76 + -Ddocs=false
77 + -Dmaintainer=false
78 + -Dstemming=true
79 + -Dvapi=false
80 + -Dapt-support=$(usex apt true false)
81 + -Dapidocs=$(usex doc true false)
82 + -Dqt=$(usex qt5 true false)
83 )
84
85 - cmake-utils_src_configure
86 + meson_src_configure
87 }