commit:     32fa777021b52351dbba778a39f5334cdeab19e2
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 12 07:16:15 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Sep 12 08:56:54 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=32fa7770

dev-libs/appstream: Sync with Gentoo ebuild repo

Closes: https://bugs.gentoo.org/646252
Package-Manager: Portage-2.3.49, Repoman-2.3.10

 dev-libs/appstream/appstream-9999.ebuild | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/dev-libs/appstream/appstream-9999.ebuild 
b/dev-libs/appstream/appstream-9999.ebuild
index 96d764b8fe..230751c476 100644
--- a/dev-libs/appstream/appstream-9999.ebuild
+++ b/dev-libs/appstream/appstream-9999.ebuild
@@ -3,17 +3,16 @@
 
 EAPI=6
 
-inherit meson xdg-utils eapi7-ver
+inherit meson xdg-utils
 
 if [[ ${PV} = 9999 ]]; then
        inherit git-r3
        EGIT_REPO_URI="https://github.com/ximion/${PN}";
 else
-       MY_PV="$(ver_rs 1- _)"
-       MY_P="APPSTREAM_${MY_PV}"
-       SRC_URI="https://github.com/ximion/${PN}/archive/${MY_P}.tar.gz -> 
${P}.tar.gz"
+       MY_PN="AppStream"
+       
SRC_URI="https://www.freedesktop.org/software/appstream/releases/${MY_PN}-${PV}.tar.xz";
        KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-       S="${WORKDIR}/${PN}-${MY_P}"
+       S="${WORKDIR}/${MY_PN}-${PV}"
 fi
 
 DESCRIPTION="Cross-distro effort for providing metadata for software in the 
Linux ecosystem"
@@ -22,36 +21,43 @@ 
HOMEPAGE="https://www.freedesktop.org/wiki/Distributions/AppStream/";
 LICENSE="LGPL-2.1+ GPL-2+"
 # check as_api_level
 SLOT="0/4"
-IUSE="apt doc qt5 test"
+IUSE="apt +introspection qt5 test"
 
 RDEPEND="
        dev-libs/glib:2
-       dev-libs/gobject-introspection
        dev-libs/libxml2:2
        dev-libs/libyaml
        dev-libs/snowball-stemmer
+       introspection? ( >=dev-libs/gobject-introspection-1.56:= )
        qt5? ( dev-qt/qtcore:5 )
 "
 DEPEND="${RDEPEND}
        app-text/docbook-xml-dtd:4.5
+       dev-libs/appstream-glib
        dev-util/itstool
        >=dev-util/meson-0.42.0
-       sys-devel/gettext
+       >=sys-devel/gettext-0.19.8
        test? (
                qt5? ( dev-qt/qttest:5 )
        )
 "
 
+src_prepare() {
+       default
+       sed -e "/^as_doc_target_dir/s/appstream/${PF}/" -i docs/meson.build || 
die
+}
+
 src_configure() {
        xdg_environment_reset
 
        local emesonargs=(
+               -Dapidocs=false
                -Ddocs=false
                -Dmaintainer=false
                -Dstemming=true
                -Dvapi=false
                -Dapt-support=$(usex apt true false)
-               -Dapidocs=$(usex doc true false)
+               -Dgir=$(usex introspection true false)
                -Dqt=$(usex qt5 true false)
        )
 

Reply via email to