Gentoo Archives: gentoo-commits

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