Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/harfbuzz/
Date: Wed, 04 Jul 2018 08:58:55
Message-Id: 1530694643.fab3cb9ca66dd2b8127f3c98c773ef8e7e8d1f72.polynomial-c@gentoo
1 commit: fab3cb9ca66dd2b8127f3c98c773ef8e7e8d1f72
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jul 4 08:57:23 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Wed Jul 4 08:57:23 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fab3cb9c
7
8 media-libs/harfbuzz: Removed old.
9
10 Package-Manager: Portage-2.3.41, Repoman-2.3.9
11
12 media-libs/harfbuzz/Manifest | 2 -
13 media-libs/harfbuzz/harfbuzz-1.7.2.ebuild | 107 ----------------------------
14 media-libs/harfbuzz/harfbuzz-1.8.0.ebuild | 112 ------------------------------
15 3 files changed, 221 deletions(-)
16
17 diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
18 index 1d5f560ffa0..9cb6aeaec19 100644
19 --- a/media-libs/harfbuzz/Manifest
20 +++ b/media-libs/harfbuzz/Manifest
21 @@ -1,5 +1,3 @@
22 -DIST harfbuzz-1.7.2.tar.bz2 1708416 BLAKE2B d182bdfa163e07ff41bf36e30373470bf0dded24b1c748f1114f09b3aec628f41111c4b3d6830c3f0d46206d5468816e3efb495a023747825adcdf2a9b516e39 SHA512 a895c96a1c4096622c797a5a877e80529ce63e3bd3adea9f68994b32e13e7b3be14cdfe824d338f48b12f49de537f7d0f6db14f422ea896697667c672daeb1cc
23 DIST harfbuzz-1.7.6.tar.bz2 2586909 BLAKE2B 0ae5902b9fe00a4f05a5dc407d698195920454efff79be10f1d85af5430d8bde7df071ba226b978c860d1dd8778a8259f330ab633a1aaa416a4451888fa9ae6a SHA512 259656574b1ec2916ada951b759a591f45c11c5c639fa29831e06320312bf951f4f5ef6306f9ffc373abf0d40dbf944db918d4c54aca3bd7eab2c3a886db7a68
24 -DIST harfbuzz-1.8.0.tar.bz2 3793974 BLAKE2B d6f6a58e1fe2778f5007e73abc90ccd5bed3b170f27ef1a656fcad824a410b2f4d7f560ce01e5dc87ad97dea0bc926c7d49f2c9e87fec5b7c84cac6be4373afc SHA512 90cccdaa45bbd7b5a75c9600d49e15dea820f0db4f9e4eda2c451092000281657a2ecb281b574d339e84e72842e978f5cbf505845fa573e6b76382192d8dd4fb
25 DIST harfbuzz-1.8.1.tar.bz2 3804867 BLAKE2B 9687b35bbdb74a42c28764a7b026a46ff90640b84bc40702bdbfadc79bbe3c393de837d4cdbbb8798f28aa8c75687c4f07e1c79e98bf9bd506403d89b4baf6a5 SHA512 7ef27232b294883b0c7404c8412837acfba95f12677f226d764f87e22cd169fe037e7bf13a9309e78c9aa905225fb332b3a143a01b13308b05fcccaeddb0c931
26 DIST harfbuzz-1.8.2.tar.bz2 3820498 BLAKE2B 7ed1509a7b54571e14d72fa097d19a56e27b3c0020243e51315ff783910319486e6c1af7cec88060c17ccf5788ff1b09f26ee4dbc879b009c983ede767e00316 SHA512 c88a3e9e55866608647318a1af7c5d848863cd894d635583b8a2d2a7a02eea875b7a5a4f0f38555d80f2e81628743e40710f5e6f9251bf629f1d15ac51103e5a
27
28 diff --git a/media-libs/harfbuzz/harfbuzz-1.7.2.ebuild b/media-libs/harfbuzz/harfbuzz-1.7.2.ebuild
29 deleted file mode 100644
30 index faf79815e16..00000000000
31 --- a/media-libs/harfbuzz/harfbuzz-1.7.2.ebuild
32 +++ /dev/null
33 @@ -1,107 +0,0 @@
34 -# Copyright 1999-2018 Gentoo Foundation
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=6
38 -
39 -EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz"
40 -[[ ${PV} == 9999 ]] && inherit git-r3 autotools
41 -
42 -PYTHON_COMPAT=( python2_7 )
43 -
44 -inherit eutils flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
45 -
46 -DESCRIPTION="An OpenType text shaping engine"
47 -HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
48 -[[ ${PV} == 9999 ]] || SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
49 -
50 -LICENSE="Old-MIT ISC icu"
51 -SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
52 -[[ ${PV} == 9999 ]] || \
53 -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
54 -
55 -IUSE="+cairo debug fontconfig +glib +graphite icu +introspection static-libs test +truetype"
56 -REQUIRED_USE="introspection? ( glib )"
57 -
58 -RDEPEND="
59 - cairo? ( x11-libs/cairo:= )
60 - fontconfig? ( media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] )
61 - glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
62 - graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
63 - icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
64 - introspection? ( >=dev-libs/gobject-introspection-1.34:= )
65 - truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
66 -"
67 -DEPEND="${RDEPEND}
68 - dev-util/gtk-doc-am
69 - virtual/pkgconfig
70 - test? ( ${PYTHON_DEPS} )
71 -"
72 -# eautoreconf requires gobject-introspection-common
73 -# ragel needed if regenerating *.hh files from *.rl
74 -[[ ${PV} = 9999 ]] && DEPEND="${DEPEND}
75 - >=dev-libs/gobject-introspection-common-1.34
76 - dev-util/ragel
77 -"
78 -
79 -pkg_setup() {
80 - use test && python-any-r1_pkg_setup
81 - if ! use debug ; then
82 - append-cppflags -DHB_NDEBUG
83 - fi
84 -}
85 -
86 -src_prepare() {
87 - default
88 -
89 - xdg_environment_reset
90 -
91 - if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
92 - # on Darwin/Solaris we need to link with g++, like automake defaults
93 - # to, but overridden by upstream because on Linux this is not
94 - # necessary, bug #449126
95 - sed -i \
96 - -e 's/\<LINK\>/CXXLINK/' \
97 - src/Makefile.am || die
98 - sed -i \
99 - -e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
100 - src/Makefile.in || die
101 - sed -i \
102 - -e '/AM_V_CCLD/s/\<LINK\>/CXXLINK/' \
103 - test/api/Makefile.in || die
104 - fi
105 -
106 - [[ ${PV} == 9999 ]] && eautoreconf
107 - elibtoolize # for Solaris
108 -
109 - # failing test, https://bugs.freedesktop.org/show_bug.cgi?id=89190
110 - sed -e 's#tests/arabic-fallback-shaping.tests##' -i test/shaping/Makefile.in || die "sed failed"
111 -
112 - # bug 618772
113 - append-cxxflags -std=c++14
114 -}
115 -
116 -multilib_src_configure() {
117 - ECONF_SOURCE="${S}" \
118 - # harfbuzz-gobject only used for instrospection, bug #535852
119 - econf \
120 - --without-coretext \
121 - --without-uniscribe \
122 - $(use_enable static-libs static) \
123 - $(multilib_native_use_with cairo) \
124 - $(use_with fontconfig) \
125 - $(use_with glib) \
126 - $(use_with introspection gobject) \
127 - $(use_with graphite graphite2) \
128 - $(use_with icu) \
129 - $(multilib_native_use_enable introspection) \
130 - $(use_with truetype freetype)
131 -
132 - if multilib_is_native_abi; then
133 - ln -s "${S}"/docs/html docs/html || die
134 - fi
135 -}
136 -
137 -multilib_src_install_all() {
138 - einstalldocs
139 - prune_libtool_files --modules
140 -}
141
142 diff --git a/media-libs/harfbuzz/harfbuzz-1.8.0.ebuild b/media-libs/harfbuzz/harfbuzz-1.8.0.ebuild
143 deleted file mode 100644
144 index 778525d28f8..00000000000
145 --- a/media-libs/harfbuzz/harfbuzz-1.8.0.ebuild
146 +++ /dev/null
147 @@ -1,112 +0,0 @@
148 -# Copyright 1999-2018 Gentoo Foundation
149 -# Distributed under the terms of the GNU General Public License v2
150 -
151 -EAPI=6
152 -
153 -PYTHON_COMPAT=( python2_7 )
154 -
155 -inherit flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
156 -
157 -DESCRIPTION="An OpenType text shaping engine"
158 -HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
159 -
160 -if [[ ${PV} = 9999 ]] ; then
161 - EGIT_REPO_URI="https://anongit.freedesktop.org/git/harfbuzz.git"
162 - inherit git-r3 autotools
163 -else
164 - SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
165 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
166 -fi
167 -
168 -LICENSE="Old-MIT ISC icu"
169 -SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
170 -
171 -IUSE="+cairo debug fontconfig +glib +graphite icu +introspection static-libs test +truetype"
172 -REQUIRED_USE="introspection? ( glib )"
173 -
174 -RDEPEND="
175 - cairo? ( x11-libs/cairo:= )
176 - fontconfig? ( media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] )
177 - glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
178 - graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
179 - icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
180 - introspection? ( >=dev-libs/gobject-introspection-1.34:= )
181 - truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
182 -"
183 -DEPEND="${RDEPEND}
184 - dev-util/gtk-doc-am
185 - virtual/pkgconfig
186 - test? ( ${PYTHON_DEPS} )
187 -"
188 -# eautoreconf requires gobject-introspection-common
189 -# ragel needed if regenerating *.hh files from *.rl
190 -if [[ ${PV} = 9999 ]] ; then
191 - DEPEND+="
192 - >=dev-libs/gobject-introspection-common-1.34
193 - dev-util/ragel
194 - "
195 -fi
196 -
197 -pkg_setup() {
198 - use test && python-any-r1_pkg_setup
199 - if ! use debug ; then
200 - append-cppflags -DHB_NDEBUG
201 - fi
202 -}
203 -
204 -src_prepare() {
205 - default
206 -
207 - xdg_environment_reset
208 -
209 - if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
210 - # on Darwin/Solaris we need to link with g++, like automake defaults
211 - # to, but overridden by upstream because on Linux this is not
212 - # necessary, bug #449126
213 - sed -i \
214 - -e 's/\<LINK\>/CXXLINK/' \
215 - src/Makefile.am || die
216 - sed -i \
217 - -e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
218 - src/Makefile.in || die
219 - sed -i \
220 - -e '/AM_V_CCLD/s/\<LINK\>/CXXLINK/' \
221 - test/api/Makefile.in || die
222 - fi
223 -
224 - [[ ${PV} == 9999 ]] && eautoreconf
225 - elibtoolize # for Solaris
226 -
227 - # failing test, https://bugs.freedesktop.org/show_bug.cgi?id=89190
228 - sed -e 's#tests/arabic-fallback-shaping.tests##' -i test/shaping/Makefile.in || die "sed failed"
229 -
230 - # bug 618772
231 - append-cxxflags -std=c++14
232 -}
233 -
234 -multilib_src_configure() {
235 - # harfbuzz-gobject only used for instrospection, bug #535852
236 - local myeconfargs=(
237 - --without-coretext
238 - --without-uniscribe
239 - $(use_enable static-libs static)
240 - $(multilib_native_use_with cairo)
241 - $(use_with fontconfig)
242 - $(use_with glib)
243 - $(use_with introspection gobject)
244 - $(use_with graphite graphite2)
245 - $(use_with icu)
246 - $(multilib_native_use_enable introspection)
247 - $(use_with truetype freetype)
248 - )
249 - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
250 -
251 - if multilib_is_native_abi; then
252 - ln -s "${S}"/docs/html docs/html || die
253 - fi
254 -}
255 -
256 -multilib_src_install_all() {
257 - einstalldocs
258 - find "${ED}" -name "*.la" -delete || die
259 -}