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/fontconfig/
Date: Fri, 02 Jun 2017 20:49:21
Message-Id: 1496435440.445fe8fce081a12423626ce580531e7d173bd565.polynomial-c@gentoo
1 commit: 445fe8fce081a12423626ce580531e7d173bd565
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jun 1 15:06:05 2017 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Fri Jun 2 20:30:40 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=445fe8fc
7
8 media-libs/fontconfig: Removed old.
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.2
11
12 media-libs/fontconfig/Manifest | 1 -
13 media-libs/fontconfig/fontconfig-2.12.0.ebuild | 157 -------------------------
14 media-libs/fontconfig/fontconfig-2.12.1.ebuild | 157 -------------------------
15 3 files changed, 315 deletions(-)
16
17 diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
18 index fc77b7e3da0..98b93dd7e45 100644
19 --- a/media-libs/fontconfig/Manifest
20 +++ b/media-libs/fontconfig/Manifest
21 @@ -1,4 +1,3 @@
22 DIST fontconfig-2.11.1.tar.bz2 1516095 SHA256 dc62447533bca844463a3c3fd4083b57c90f18a70506e7a9f4936b5a1e516a99 SHA512 acf4e6293e0e5521e4b8f29f4b48860ecd1d39744d0eab21c7332e56bfc3ccc63548e459243c5e425b8e5ef265f2cf065eece02460725e794041219d41188149 WHIRLPOOL 45009a1e0fcbbe2f532c6f642a0d57af35af3f6abfb50098c89fe39c71da96597078eb4babdd80a713ef4456e07481d70def7c1c18b7314452136d5b30a4858b
23 -DIST fontconfig-2.12.0.tar.bz2 1605355 SHA256 b433e4efff1f68fdd8aac221ed1df3ff1e580ffedbada020a703fe64017d8224 SHA512 b8f005d56aa9fe6a756be1cb4d843c69c746915c10fe968393527bd3469e4df0401a10edf5b0a69b0e2732cc07f71ad001c19a07726e5dfa881b9d94bb6935f9 WHIRLPOOL e43670c00b21760fdfdb2e03d7d4a2e49b7300572de81ea8716160a1abf8e63aa7d05d95d53f5e24b8e148eeef88d375bd67edff956224571725b3bd77263ab4
24 DIST fontconfig-2.12.1.tar.bz2 1608901 SHA256 b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3 SHA512 a5ba2c1a52272b39aad20394dcc85c202159af0d3d2c1b34b24cbdbc8babb3157005a79d25c21a9bf6ec0459681b1ab05af102b2c0594f485c49e3b3b531067e WHIRLPOOL 1900e3a48fdf65f762a7e9c138a3ffe716f6db96d808f8b10ebf99e7e20d8b32a042406f3ac43ca947b9710f97b31c5caae0609986b1e41ec8604050d2b37955
25 DIST fontconfig-2.12.3.tar.bz2 1600509 SHA256 bd24bf6602731a11295c025909d918180e98385625182d3b999fd6f1ab34f8bd SHA512 311a3c98a05afbe35c1215b41edb2bbcfe3069f85814c882ef0e40f0404cca4bb59a544b14eee9430ea902fd8bc3bfeccb37e42b9fe3bb3a6c71bb0c5332f2c7 WHIRLPOOL 7b3ec6f364d1b701ae1eb676b3f4cffef91af2d0b3f78719119449dfc6d679d1da20224e9148aa970d60c0d531ee5dfbb3c256ffc18edb142648fa06c0704c93
26
27 diff --git a/media-libs/fontconfig/fontconfig-2.12.0.ebuild b/media-libs/fontconfig/fontconfig-2.12.0.ebuild
28 deleted file mode 100644
29 index dfe7795c437..00000000000
30 --- a/media-libs/fontconfig/fontconfig-2.12.0.ebuild
31 +++ /dev/null
32 @@ -1,157 +0,0 @@
33 -# Copyright 1999-2017 Gentoo Foundation
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=6
37 -
38 -inherit autotools eutils multilib-minimal readme.gentoo-r1
39 -
40 -DESCRIPTION="A library for configuring and customizing font access"
41 -HOMEPAGE="http://fontconfig.org/"
42 -SRC_URI="http://fontconfig.org/release/${P}.tar.bz2"
43 -
44 -LICENSE="MIT"
45 -SLOT="1.0"
46 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
47 -IUSE="doc static-libs"
48 -
49 -# Purposefully dropped the xml USE flag and libxml2 support. Expat is the
50 -# default and used by every distro. See bug #283191.
51 -RDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
52 - >=media-libs/freetype-2.5.3-r1[${MULTILIB_USEDEP}]
53 - abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )"
54 -DEPEND="${RDEPEND}
55 - virtual/pkgconfig
56 - doc? ( =app-text/docbook-sgml-dtd-3.1*
57 - app-text/docbook-sgml-utils[jadetex] )"
58 -PDEPEND="!x86-winnt? ( app-eselect/eselect-fontconfig )
59 - virtual/ttf-fonts"
60 -
61 -PATCHES=(
62 - "${FILESDIR}"/${PN}-2.10.2-docbook.patch # 310157
63 - "${FILESDIR}"/${PN}-2.11.93-latin-update.patch # 130466 + make liberation default
64 -)
65 -
66 -MULTILIB_CHOST_TOOLS=( /usr/bin/fc-cache$(get_exeext) )
67 -
68 -pkg_setup() {
69 - DOC_CONTENTS="Please make fontconfig configuration changes using
70 - \`eselect fontconfig\`. Any changes made to /etc/fonts/fonts.conf will be
71 - overwritten. If you need to reset your configuration to upstream defaults,
72 - delete the directory ${EROOT}etc/fonts/conf.d/ and re-emerge fontconfig."
73 -}
74 -
75 -src_prepare() {
76 - default
77 - eautoreconf
78 -}
79 -
80 -multilib_src_configure() {
81 - local addfonts
82 - # harvest some font locations, such that users can benefit from the
83 - # host OS's installed fonts
84 - case ${CHOST} in
85 - *-darwin*)
86 - addfonts=",/Library/Fonts,/System/Library/Fonts"
87 - ;;
88 - *-solaris*)
89 - [[ -d /usr/X/lib/X11/fonts/TrueType ]] && \
90 - addfonts=",/usr/X/lib/X11/fonts/TrueType"
91 - [[ -d /usr/X/lib/X11/fonts/Type1 ]] && \
92 - addfonts="${addfonts},/usr/X/lib/X11/fonts/Type1"
93 - ;;
94 - *-linux-gnu)
95 - use prefix && [[ -d /usr/share/fonts ]] && \
96 - addfonts=",/usr/share/fonts"
97 - ;;
98 - esac
99 -
100 - local myeconfargs=(
101 - $(use_enable doc docbook)
102 - --enable-docs
103 - --localstatedir="${EPREFIX}"/var
104 - --with-default-fonts="${EPREFIX}"/usr/share/fonts
105 - --with-add-fonts="${EPREFIX}/usr/local/share/fonts${addfonts}" \
106 - --with-templatedir="${EPREFIX}"/etc/fonts/conf.avail
107 - )
108 -
109 - ECONF_SOURCE="${S}" \
110 - econf "${myeconfargs[@]}"
111 -}
112 -
113 -multilib_src_install() {
114 - default
115 -
116 - # avoid calling this multiple times, bug #459210
117 - if multilib_is_native_abi; then
118 - # stuff installed from build-dir
119 - emake -C doc DESTDIR="${D}" install-man
120 -
121 - insinto /etc/fonts
122 - doins fonts.conf
123 - fi
124 -}
125 -
126 -multilib_src_install_all() {
127 - einstalldocs
128 - prune_libtool_files --all
129 -
130 - # fc-lang directory contains language coverage datafiles
131 - # which are needed to test the coverage of fonts.
132 - insinto /usr/share/fc-lang
133 - doins fc-lang/*.orth
134 -
135 - dodoc doc/fontconfig-user.{txt,pdf}
136 -
137 - if [[ -e ${ED}usr/share/doc/fontconfig/ ]]; then
138 - mv "${ED}"usr/share/doc/fontconfig/* "${ED}"/usr/share/doc/${P} || die
139 - rm -rf "${ED}"usr/share/doc/fontconfig
140 - fi
141 -
142 - # Changes should be made to /etc/fonts/local.conf, and as we had
143 - # too much problems with broken fonts.conf we force update it ...
144 - echo 'CONFIG_PROTECT_MASK="/etc/fonts/fonts.conf"' > "${T}"/37fontconfig
145 - doenvd "${T}"/37fontconfig
146 -
147 - # As of fontconfig 2.7, everything sticks their noses in here.
148 - dodir /etc/sandbox.d
149 - echo 'SANDBOX_PREDICT="/var/cache/fontconfig"' > "${ED}"/etc/sandbox.d/37fontconfig
150 -
151 - readme.gentoo_create_doc
152 -}
153 -
154 -pkg_preinst() {
155 - # Bug #193476
156 - # /etc/fonts/conf.d/ contains symlinks to ../conf.avail/ to include various
157 - # config files. If we install as-is, we'll blow away user settings.
158 - ebegin "Syncing fontconfig configuration to system"
159 - if [[ -e ${EROOT}/etc/fonts/conf.d ]]; then
160 - for file in "${EROOT}"/etc/fonts/conf.avail/*; do
161 - f=${file##*/}
162 - if [[ -L ${EROOT}/etc/fonts/conf.d/${f} ]]; then
163 - [[ -f ${ED}etc/fonts/conf.avail/${f} ]] \
164 - && ln -sf ../conf.avail/"${f}" "${ED}"etc/fonts/conf.d/ &>/dev/null
165 - else
166 - [[ -f ${ED}etc/fonts/conf.avail/${f} ]] \
167 - && rm "${ED}"etc/fonts/conf.d/"${f}" &>/dev/null
168 - fi
169 - done
170 - fi
171 - eend $?
172 -}
173 -
174 -pkg_postinst() {
175 - einfo "Cleaning broken symlinks in "${EROOT}"etc/fonts/conf.d/"
176 - find -L "${EROOT}"etc/fonts/conf.d/ -type l -delete
177 -
178 - readme.gentoo_print_elog
179 -
180 - if [[ ${ROOT} = / ]]; then
181 - multilib_pkg_postinst() {
182 - ebegin "Creating global font cache for ${ABI}"
183 - "${EPREFIX}"/usr/bin/${CHOST}-fc-cache -srf
184 - eend $?
185 - }
186 -
187 - multilib_parallel_foreach_abi multilib_pkg_postinst
188 - fi
189 -}
190
191 diff --git a/media-libs/fontconfig/fontconfig-2.12.1.ebuild b/media-libs/fontconfig/fontconfig-2.12.1.ebuild
192 deleted file mode 100644
193 index 4b879f7627d..00000000000
194 --- a/media-libs/fontconfig/fontconfig-2.12.1.ebuild
195 +++ /dev/null
196 @@ -1,157 +0,0 @@
197 -# Copyright 1999-2017 Gentoo Foundation
198 -# Distributed under the terms of the GNU General Public License v2
199 -
200 -EAPI=6
201 -
202 -inherit autotools eutils multilib-minimal readme.gentoo-r1
203 -
204 -DESCRIPTION="A library for configuring and customizing font access"
205 -HOMEPAGE="http://fontconfig.org/"
206 -SRC_URI="http://fontconfig.org/release/${P}.tar.bz2"
207 -
208 -LICENSE="MIT"
209 -SLOT="1.0"
210 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
211 -IUSE="doc static-libs"
212 -
213 -# Purposefully dropped the xml USE flag and libxml2 support. Expat is the
214 -# default and used by every distro. See bug #283191.
215 -RDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
216 - >=media-libs/freetype-2.5.3-r1[${MULTILIB_USEDEP}]
217 - abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )"
218 -DEPEND="${RDEPEND}
219 - virtual/pkgconfig
220 - doc? ( =app-text/docbook-sgml-dtd-3.1*
221 - app-text/docbook-sgml-utils[jadetex] )"
222 -PDEPEND="!x86-winnt? ( app-eselect/eselect-fontconfig )
223 - virtual/ttf-fonts"
224 -
225 -PATCHES=(
226 - "${FILESDIR}"/${PN}-2.10.2-docbook.patch # 310157
227 - "${FILESDIR}"/${PN}-2.11.93-latin-update.patch # 130466 + make liberation default
228 -)
229 -
230 -MULTILIB_CHOST_TOOLS=( /usr/bin/fc-cache$(get_exeext) )
231 -
232 -pkg_setup() {
233 - DOC_CONTENTS="Please make fontconfig configuration changes using
234 - \`eselect fontconfig\`. Any changes made to /etc/fonts/fonts.conf will be
235 - overwritten. If you need to reset your configuration to upstream defaults,
236 - delete the directory ${EROOT}etc/fonts/conf.d/ and re-emerge fontconfig."
237 -}
238 -
239 -src_prepare() {
240 - default
241 - eautoreconf
242 -}
243 -
244 -multilib_src_configure() {
245 - local addfonts
246 - # harvest some font locations, such that users can benefit from the
247 - # host OS's installed fonts
248 - case ${CHOST} in
249 - *-darwin*)
250 - addfonts=",/Library/Fonts,/System/Library/Fonts"
251 - ;;
252 - *-solaris*)
253 - [[ -d /usr/X/lib/X11/fonts/TrueType ]] && \
254 - addfonts=",/usr/X/lib/X11/fonts/TrueType"
255 - [[ -d /usr/X/lib/X11/fonts/Type1 ]] && \
256 - addfonts="${addfonts},/usr/X/lib/X11/fonts/Type1"
257 - ;;
258 - *-linux-gnu)
259 - use prefix && [[ -d /usr/share/fonts ]] && \
260 - addfonts=",/usr/share/fonts"
261 - ;;
262 - esac
263 -
264 - local myeconfargs=(
265 - $(use_enable doc docbook)
266 - --enable-docs
267 - --localstatedir="${EPREFIX}"/var
268 - --with-default-fonts="${EPREFIX}"/usr/share/fonts
269 - --with-add-fonts="${EPREFIX}/usr/local/share/fonts${addfonts}" \
270 - --with-templatedir="${EPREFIX}"/etc/fonts/conf.avail
271 - )
272 -
273 - ECONF_SOURCE="${S}" \
274 - econf "${myeconfargs[@]}"
275 -}
276 -
277 -multilib_src_install() {
278 - default
279 -
280 - # avoid calling this multiple times, bug #459210
281 - if multilib_is_native_abi; then
282 - # stuff installed from build-dir
283 - emake -C doc DESTDIR="${D}" install-man
284 -
285 - insinto /etc/fonts
286 - doins fonts.conf
287 - fi
288 -}
289 -
290 -multilib_src_install_all() {
291 - einstalldocs
292 - prune_libtool_files --all
293 -
294 - # fc-lang directory contains language coverage datafiles
295 - # which are needed to test the coverage of fonts.
296 - insinto /usr/share/fc-lang
297 - doins fc-lang/*.orth
298 -
299 - dodoc doc/fontconfig-user.{txt,pdf}
300 -
301 - if [[ -e ${ED}usr/share/doc/fontconfig/ ]]; then
302 - mv "${ED}"usr/share/doc/fontconfig/* "${ED}"/usr/share/doc/${P} || die
303 - rm -rf "${ED}"usr/share/doc/fontconfig
304 - fi
305 -
306 - # Changes should be made to /etc/fonts/local.conf, and as we had
307 - # too much problems with broken fonts.conf we force update it ...
308 - echo 'CONFIG_PROTECT_MASK="/etc/fonts/fonts.conf"' > "${T}"/37fontconfig
309 - doenvd "${T}"/37fontconfig
310 -
311 - # As of fontconfig 2.7, everything sticks their noses in here.
312 - dodir /etc/sandbox.d
313 - echo 'SANDBOX_PREDICT="/var/cache/fontconfig"' > "${ED}"/etc/sandbox.d/37fontconfig
314 -
315 - readme.gentoo_create_doc
316 -}
317 -
318 -pkg_preinst() {
319 - # Bug #193476
320 - # /etc/fonts/conf.d/ contains symlinks to ../conf.avail/ to include various
321 - # config files. If we install as-is, we'll blow away user settings.
322 - ebegin "Syncing fontconfig configuration to system"
323 - if [[ -e ${EROOT}/etc/fonts/conf.d ]]; then
324 - for file in "${EROOT}"/etc/fonts/conf.avail/*; do
325 - f=${file##*/}
326 - if [[ -L ${EROOT}/etc/fonts/conf.d/${f} ]]; then
327 - [[ -f ${ED}etc/fonts/conf.avail/${f} ]] \
328 - && ln -sf ../conf.avail/"${f}" "${ED}"etc/fonts/conf.d/ &>/dev/null
329 - else
330 - [[ -f ${ED}etc/fonts/conf.avail/${f} ]] \
331 - && rm "${ED}"etc/fonts/conf.d/"${f}" &>/dev/null
332 - fi
333 - done
334 - fi
335 - eend $?
336 -}
337 -
338 -pkg_postinst() {
339 - einfo "Cleaning broken symlinks in "${EROOT}"etc/fonts/conf.d/"
340 - find -L "${EROOT}"etc/fonts/conf.d/ -type l -delete
341 -
342 - readme.gentoo_print_elog
343 -
344 - if [[ ${ROOT} = / ]]; then
345 - multilib_pkg_postinst() {
346 - ebegin "Creating global font cache for ${ABI}"
347 - "${EPREFIX}"/usr/bin/${CHOST}-fc-cache -srf
348 - eend $?
349 - }
350 -
351 - multilib_parallel_foreach_abi multilib_pkg_postinst
352 - fi
353 -}