Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: dev-libs/appstream/
Date: Wed, 12 Sep 2018 08:57:46
Message-Id: 1536742614.32fa777021b52351dbba778a39f5334cdeab19e2.asturm@gentoo
1 commit: 32fa777021b52351dbba778a39f5334cdeab19e2
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 12 07:16:15 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 12 08:56:54 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=32fa7770
7
8 dev-libs/appstream: Sync with Gentoo ebuild repo
9
10 Closes: https://bugs.gentoo.org/646252
11 Package-Manager: Portage-2.3.49, Repoman-2.3.10
12
13 dev-libs/appstream/appstream-9999.ebuild | 24 +++++++++++++++---------
14 1 file changed, 15 insertions(+), 9 deletions(-)
15
16 diff --git a/dev-libs/appstream/appstream-9999.ebuild b/dev-libs/appstream/appstream-9999.ebuild
17 index 96d764b8fe..230751c476 100644
18 --- a/dev-libs/appstream/appstream-9999.ebuild
19 +++ b/dev-libs/appstream/appstream-9999.ebuild
20 @@ -3,17 +3,16 @@
21
22 EAPI=6
23
24 -inherit meson xdg-utils eapi7-ver
25 +inherit meson xdg-utils
26
27 if [[ ${PV} = 9999 ]]; then
28 inherit git-r3
29 EGIT_REPO_URI="https://github.com/ximion/${PN}"
30 else
31 - MY_PV="$(ver_rs 1- _)"
32 - MY_P="APPSTREAM_${MY_PV}"
33 - SRC_URI="https://github.com/ximion/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
34 + MY_PN="AppStream"
35 + SRC_URI="https://www.freedesktop.org/software/appstream/releases/${MY_PN}-${PV}.tar.xz"
36 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
37 - S="${WORKDIR}/${PN}-${MY_P}"
38 + S="${WORKDIR}/${MY_PN}-${PV}"
39 fi
40
41 DESCRIPTION="Cross-distro effort for providing metadata for software in the Linux ecosystem"
42 @@ -22,36 +21,43 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Distributions/AppStream/"
43 LICENSE="LGPL-2.1+ GPL-2+"
44 # check as_api_level
45 SLOT="0/4"
46 -IUSE="apt doc qt5 test"
47 +IUSE="apt +introspection qt5 test"
48
49 RDEPEND="
50 dev-libs/glib:2
51 - dev-libs/gobject-introspection
52 dev-libs/libxml2:2
53 dev-libs/libyaml
54 dev-libs/snowball-stemmer
55 + introspection? ( >=dev-libs/gobject-introspection-1.56:= )
56 qt5? ( dev-qt/qtcore:5 )
57 "
58 DEPEND="${RDEPEND}
59 app-text/docbook-xml-dtd:4.5
60 + dev-libs/appstream-glib
61 dev-util/itstool
62 >=dev-util/meson-0.42.0
63 - sys-devel/gettext
64 + >=sys-devel/gettext-0.19.8
65 test? (
66 qt5? ( dev-qt/qttest:5 )
67 )
68 "
69
70 +src_prepare() {
71 + default
72 + sed -e "/^as_doc_target_dir/s/appstream/${PF}/" -i docs/meson.build || die
73 +}
74 +
75 src_configure() {
76 xdg_environment_reset
77
78 local emesonargs=(
79 + -Dapidocs=false
80 -Ddocs=false
81 -Dmaintainer=false
82 -Dstemming=true
83 -Dvapi=false
84 -Dapt-support=$(usex apt true false)
85 - -Dapidocs=$(usex doc true false)
86 + -Dgir=$(usex introspection true false)
87 -Dqt=$(usex qt5 true false)
88 )