Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/appstream/files/, dev-libs/appstream/
Date: Fri, 07 Dec 2018 14:40:34
Message-Id: 1544193562.489516176274c2c99f8881ca92367b81774179e3.asturm@gentoo
1 commit: 489516176274c2c99f8881ca92367b81774179e3
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Fri Dec 7 14:39:22 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Fri Dec 7 14:39:22 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48951617
7
8 dev-libs/appstream: Drop old
9
10 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
11 Package-Manager: Portage-2.3.51, Repoman-2.3.11
12
13 dev-libs/appstream/Manifest | 2 -
14 dev-libs/appstream/appstream-0.10.6-r1.ebuild | 72 ----------------------
15 dev-libs/appstream/appstream-0.12.2.ebuild | 68 --------------------
16 .../appstream/files/appstream-0.12.2-gcc-7.3.patch | 24 --------
17 4 files changed, 166 deletions(-)
18
19 diff --git a/dev-libs/appstream/Manifest b/dev-libs/appstream/Manifest
20 index fc967ef5555..68f4f428e76 100644
21 --- a/dev-libs/appstream/Manifest
22 +++ b/dev-libs/appstream/Manifest
23 @@ -1,3 +1 @@
24 -DIST AppStream-0.12.2.tar.xz 1938868 BLAKE2B 968853e9d5f87ca2c1f894a6ffe5439f7fce611459243cd96d3859a15e225243585a1a43e90d8eca8271b91e1237d94eb4615b5c3c0543d9a37646b5fbd7d2fe SHA512 d5c95309d4fddb961f4a5b9ac460840e34d4bae0e256bd0be09ceeab0d45a3ac5254c9e9c183a1e6cb3983ce0a9d6d0e519908f612a5b135ed578ec26556e53d
25 DIST AppStream-0.12.3.tar.xz 1940064 BLAKE2B a0160c4a922abfe315bdbfe6b7b32fea8d5eda5631347be4a39dcf102660ad26a3f40c5fed9dd0bdfb1b91956780ff7cf58e61d7f38b03d2f48a5bf67f2871f6 SHA512 3d54bb499e4056d341ffde2878549011708e6699b3ec58756ef2e4080864279ff5e5003224fcbad601007fd9296bb9ed062da7843e3e02272837ecc5d4c802f9
26 -DIST appstream-0.10.6.tar.gz 1821879 BLAKE2B 49e0476ef41c37d2e9bb12a7c046fcbb2cd8fcb1f521321dce4cda15e504a966cf59a1cbf56fc7359a82f677c54906ba041ad37eeb7f639ad69691e8d2ccd24c SHA512 9f8b4ddc39d580c62b166df0d9a2c5e4caac1b433d25a4e9118b7c73ceea5c7b1ff78f02d682a68cdfeb8da29e806a4838cfc11637fca2982f436af333605256
27
28 diff --git a/dev-libs/appstream/appstream-0.10.6-r1.ebuild b/dev-libs/appstream/appstream-0.10.6-r1.ebuild
29 deleted file mode 100644
30 index 02eef9f850b..00000000000
31 --- a/dev-libs/appstream/appstream-0.10.6-r1.ebuild
32 +++ /dev/null
33 @@ -1,72 +0,0 @@
34 -# Copyright 1999-2017 Gentoo Foundation
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=6
38 -
39 -inherit cmake-utils xdg-utils
40 -
41 -if [[ ${PV} = 9999 ]]; then
42 - inherit git-r3
43 - EGIT_REPO_URI="https://github.com/ximion/${PN}"
44 -else
45 - inherit versionator
46 - MY_PV="$(replace_all_version_separators '_')"
47 - MY_P="APPSTREAM_${MY_PV}"
48 - SRC_URI="https://github.com/ximion/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
49 - KEYWORDS="amd64 ~arm ~arm64 x86"
50 - S="${WORKDIR}/${PN}-${MY_P}"
51 -fi
52 -
53 -DESCRIPTION="Cross-distro effort for providing metadata for software in the Linux ecosystem"
54 -HOMEPAGE="https://www.freedesktop.org/wiki/Distributions/AppStream/"
55 -
56 -LICENSE="LGPL-2.1+ GPL-2+"
57 -# check APPSTREAM_LIB_API_LEVEL
58 -SLOT="0/4"
59 -IUSE="apt doc qt5 test"
60 -
61 -RDEPEND="
62 - dev-libs/glib:2
63 - dev-libs/gobject-introspection
64 - dev-libs/libxml2:2
65 - dev-libs/libyaml
66 - dev-libs/snowball-stemmer
67 - qt5? ( dev-qt/qtcore:5 )
68 -"
69 -DEPEND="${RDEPEND}
70 - app-text/docbook-xml-dtd:4.5
71 - app-text/xmlto
72 - dev-util/itstool
73 - sys-devel/gettext
74 - test? (
75 - qt5? ( dev-qt/qttest:5 )
76 - )
77 -"
78 -
79 -src_prepare() {
80 - cmake-utils_src_prepare
81 -
82 - if ! use test; then
83 - pushd qt > /dev/null || die
84 - cmake_comment_add_subdirectory tests
85 - popd > /dev/null || die
86 - fi
87 -}
88 -
89 -src_configure() {
90 - xdg_environment_reset
91 -
92 - local mycmakeargs=(
93 - -DSTEMMING=ON
94 - -DL18N=ON
95 - -DVAPI=OFF
96 - -DMAINTAINER=OFF
97 - -DSANITIZERS=OFF
98 - -DDOCUMENTATION=OFF
99 - -DAPT_SUPPORT=$(usex apt)
100 - -DINSTALL_PREBUILT_DOCS=$(usex doc)
101 - -DQT=$(usex qt5)
102 - )
103 -
104 - cmake-utils_src_configure
105 -}
106
107 diff --git a/dev-libs/appstream/appstream-0.12.2.ebuild b/dev-libs/appstream/appstream-0.12.2.ebuild
108 deleted file mode 100644
109 index ff514c29496..00000000000
110 --- a/dev-libs/appstream/appstream-0.12.2.ebuild
111 +++ /dev/null
112 @@ -1,68 +0,0 @@
113 -# Copyright 1999-2018 Gentoo Authors
114 -# Distributed under the terms of the GNU General Public License v2
115 -
116 -EAPI=6
117 -
118 -inherit meson xdg-utils
119 -
120 -if [[ ${PV} = 9999 ]]; then
121 - inherit git-r3
122 - EGIT_REPO_URI="https://github.com/ximion/${PN}"
123 -else
124 - MY_PN="AppStream"
125 - SRC_URI="https://www.freedesktop.org/software/appstream/releases/${MY_PN}-${PV}.tar.xz"
126 - KEYWORDS="~amd64 ~arm ~arm64 ~x86"
127 - S="${WORKDIR}/${MY_PN}-${PV}"
128 -fi
129 -
130 -DESCRIPTION="Cross-distro effort for providing metadata for software in the Linux ecosystem"
131 -HOMEPAGE="https://www.freedesktop.org/wiki/Distributions/AppStream/"
132 -
133 -LICENSE="LGPL-2.1+ GPL-2+"
134 -# check as_api_level
135 -SLOT="0/4"
136 -IUSE="apt +introspection qt5 test"
137 -
138 -RDEPEND="
139 - dev-libs/glib:2
140 - dev-libs/libxml2:2
141 - dev-libs/libyaml
142 - dev-libs/snowball-stemmer
143 - introspection? ( >=dev-libs/gobject-introspection-1.56:= )
144 - qt5? ( dev-qt/qtcore:5 )
145 -"
146 -DEPEND="${RDEPEND}
147 - app-text/docbook-xml-dtd:4.5
148 - dev-libs/appstream-glib
149 - dev-util/itstool
150 - >=dev-util/meson-0.42.0
151 - >=sys-devel/gettext-0.19.8
152 - qt5? (
153 - dev-qt/linguist-tools:5
154 - test? ( dev-qt/qttest:5 )
155 - )
156 -"
157 -
158 -PATCHES=( "${FILESDIR}/${P}-gcc-7.3.patch" )
159 -
160 -src_prepare() {
161 - default
162 - sed -e "/^as_doc_target_dir/s/appstream/${PF}/" -i docs/meson.build || die
163 -}
164 -
165 -src_configure() {
166 - xdg_environment_reset
167 -
168 - local emesonargs=(
169 - -Dapidocs=false
170 - -Ddocs=false
171 - -Dmaintainer=false
172 - -Dstemming=true
173 - -Dvapi=false
174 - -Dapt-support=$(usex apt true false)
175 - -Dgir=$(usex introspection true false)
176 - -Dqt=$(usex qt5 true false)
177 - )
178 -
179 - meson_src_configure
180 -}
181
182 diff --git a/dev-libs/appstream/files/appstream-0.12.2-gcc-7.3.patch b/dev-libs/appstream/files/appstream-0.12.2-gcc-7.3.patch
183 deleted file mode 100644
184 index 3eb8b0db877..00000000000
185 --- a/dev-libs/appstream/files/appstream-0.12.2-gcc-7.3.patch
186 +++ /dev/null
187 @@ -1,24 +0,0 @@
188 -From 9252de815e4443d1b617211f38685afe7c0f6b0e Mon Sep 17 00:00:00 2001
189 -From: Matthias Klumpp <matthias@××××××××.net>
190 -Date: Sat, 20 Oct 2018 20:20:09 +0200
191 -Subject: [PATCH] Explicitly include string.h in as-tag.c
192 -
193 -This apparently is necessary to fix an FTBFS issue with older GCC
194 -releases. Resolves #207
195 ----
196 - src/as-tag.c | 2 ++
197 - 1 file changed, 2 insertions(+)
198 -
199 -diff --git a/src/as-tag.c b/src/as-tag.c
200 -index 6afba621..91076e69 100644
201 ---- a/src/as-tag.c
202 -+++ b/src/as-tag.c
203 -@@ -32,6 +32,8 @@
204 -
205 - #include "as-tag.h"
206 -
207 -+#include <string.h>
208 -+
209 - #ifdef __clang__
210 - #pragma clang diagnostic ignored "-Wmissing-field-initializers"
211 - #endif