From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/
Date: Thu, 27 Oct 2022 23:46:42 +0000 (UTC) [thread overview]
Message-ID: <1666914333.2cc16a18373ff815d78b47c004cf7ffdf9c932b6.sam@gentoo> (raw)
commit: 2cc16a18373ff815d78b47c004cf7ffdf9c932b6
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 27 23:45:26 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Oct 27 23:45:33 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cc16a18
media-libs/fontconfig: drop 2.13.93
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/fontconfig/Manifest | 1 -
media-libs/fontconfig/fontconfig-2.13.93.ebuild | 198 ------------------------
2 files changed, 199 deletions(-)
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 0ea3b7ff5d5e..cba7bf04f021 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -1,3 +1,2 @@
-DIST fontconfig-2.13.93.tar.xz 1418288 BLAKE2B 2be273c21c16f9bb2dfe618177eaf2de48610a145d402ba53becc1c4c2d0417a9cd0ce969d4521ff00c8c71e4b1d65e4bf945da56e140434244b81e7e24ecb7a SHA512 1ba119ea3faba662e108df6fce22f242eb2b7c5ec087159ca0cb76944991b19563f744c181263343941c50547bc0c73c6437d5380df09b5029facaab80465b58
DIST fontconfig-2.14.0.tar.xz 1431056 BLAKE2B 880f34d33ac30158ea61e922f6635900c5b244c2eb5d259f7947a364df86ee13f6190f651471b0a28bcd3c13f19c970783517903df374839e474921611dff1ff SHA512 a5257249d031b3cd1a7b1521cd58f48d235a970020da4136a727db5407ec98e74a3776bc467d7e39f30ec664f56ff9fe39068317744a5e737a65109f7a005bfc
DIST fontconfig-2.14.1.tar.xz 1447044 BLAKE2B 4bee654f4196922fb07673f588b4bf8a651bbcc8b882b20712814ff253adf6457c3c4b4c2f5549bac37ed3f152e9993988f00d04e2516c911eb13747fc4a1c73 SHA512 ba42e6f90ec92914895d2157c872c373adfc17be791b92253bcc40e85674a84e43c08ab2b37c3ae85b53b2e7bd2a7847abb479043f303b732c08eeac3ee733db
diff --git a/media-libs/fontconfig/fontconfig-2.13.93.ebuild b/media-libs/fontconfig/fontconfig-2.13.93.ebuild
deleted file mode 100644
index 1c12de903df3..000000000000
--- a/media-libs/fontconfig/fontconfig-2.13.93.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal readme.gentoo-r1
-
-DESCRIPTION="A library for configuring and customizing font access"
-HOMEPAGE="https://fontconfig.org/"
-SRC_URI="https://fontconfig.org/release/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="1.0"
-[[ $(ver_cut 3) -ge 90 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="doc static-libs"
-
-# Test test-bz106632 is known to be broken, see bug #751232
-# and would require several backports. It will be fixed in
-# next version.
-# check-missing-doc is known to be broken, see bug #733608
-# because fontconfig-2.13.1-static_build.patch introduces a
-# function FcStrBuildFilename which is lacking documentation.
-# However, backporting isn't worth it. Will be fixed in
-# next version.
-RESTRICT="test"
-
-BDEPEND="dev-util/gperf
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
- doc? (
- =app-text/docbook-sgml-dtd-3.1*
- app-text/docbook-sgml-utils[jadetex]
- )"
-# Purposefully dropped the xml USE flag and libxml2 support. Expat is the
-# default and used by every distro. See bug #283191.
-RDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
- >=media-libs/freetype-2.9[${MULTILIB_USEDEP}]
- !elibc_Darwin? ( !elibc_SunOS? ( sys-apps/util-linux[${MULTILIB_USEDEP}] ) )
- elibc_Darwin? ( sys-libs/native-uuid )
- elibc_SunOS? ( sys-libs/libuuid )
- virtual/libintl[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-PDEPEND="virtual/ttf-fonts"
-# Put the eselect module in BDEPEND until EAPI 8 is ready for IDEPEND, so that
-# it is natively usable in BROOT to update ROOT when cross-compiling.
-BDEPEND+=" !x86-winnt? ( app-eselect/eselect-fontconfig )"
-RDEPEND+=" !x86-winnt? ( app-eselect/eselect-fontconfig )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.10.2-docbook.patch # 310157
- "${FILESDIR}"/${PN}-2.13.93-latin-update.patch # 130466 + make liberation default
-
- # Patches from upstream (can usually be removed with next version bump)
-)
-
-pkg_setup() {
- DOC_CONTENTS="Please make fontconfig configuration changes using
- \`eselect fontconfig\`. Any changes made to /etc/fonts/fonts.conf will be
- overwritten. If you need to reset your configuration to upstream defaults,
- delete the directory ${EROOT}/etc/fonts/conf.d/ and re-emerge fontconfig."
-}
-
-src_prepare() {
- default
- eautoreconf
-
- # https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/272
- # Please remove on next version bump!
- if [[ "${PV}" == 2.13.93 ]] ; then
- local sgmlfile
- for sgmlfile in doc/*.fncs ; do
- touch -r ${sgmlfile} ${sgmlfile//.fncs/.sgml} || die
- done
- else
- die "Forgot to clean up src_prepare()"
- fi
-}
-
-multilib_src_configure() {
- local addfonts
- # harvest some font locations, such that users can benefit from the
- # host OS's installed fonts
- case ${CHOST} in
- *-darwin*)
- addfonts=",/Library/Fonts,/System/Library/Fonts"
- ;;
- *-solaris*)
- [[ -d /usr/X/lib/X11/fonts/TrueType ]] && \
- addfonts=",/usr/X/lib/X11/fonts/TrueType"
- [[ -d /usr/X/lib/X11/fonts/Type1 ]] && \
- addfonts="${addfonts},/usr/X/lib/X11/fonts/Type1"
- ;;
- *-linux-gnu)
- use prefix && [[ -d /usr/share/fonts ]] && \
- addfonts=",/usr/share/fonts"
- ;;
- esac
-
- local myeconfargs=(
- $(multilib_native_use_enable doc docbook)
- $(use_enable static-libs static)
- $(multilib_native_enable docs)
- --localstatedir="${EPREFIX}"/var
- --with-default-fonts="${EPREFIX}"/usr/share/fonts
- --with-add-fonts="${EPREFIX}/usr/local/share/fonts${addfonts}"
- --with-templatedir="${EPREFIX}"/etc/fonts/conf.avail
- )
-
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
- MULTILIB_CHOST_TOOLS=( /usr/bin/fc-cache$(get_exeext) )
-
- default
-
- # avoid calling this multiple times, bug #459210
- if multilib_is_native_abi; then
- # stuff installed from build-dir
- emake -C doc DESTDIR="${D}" install-man
-
- insinto /etc/fonts
- doins fonts.conf
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- find "${ED}" -name "*.la" -delete || die
-
- # fc-lang directory contains language coverage datafiles
- # which are needed to test the coverage of fonts.
- insinto /usr/share/fc-lang
- doins fc-lang/*.orth
-
- dodoc doc/fontconfig-user.{txt,pdf}
-
- if [[ -e ${ED}/usr/share/doc/fontconfig/ ]] ; then
- mv "${ED}"/usr/share/doc/fontconfig/* \
- "${ED}"/usr/share/doc/${P} || die
- rm -rf "${ED}"/usr/share/doc/fontconfig || die
- fi
-
- # Changes should be made to /etc/fonts/local.conf, and as we had
- # too much problems with broken fonts.conf we force update it ...
- echo 'CONFIG_PROTECT_MASK="/etc/fonts/fonts.conf"' \
- > "${T}"/37fontconfig || die
- doenvd "${T}"/37fontconfig
-
- # As of fontconfig 2.7, everything sticks their noses in here.
- dodir /etc/sandbox.d
- echo 'SANDBOX_PREDICT="/var/cache/fontconfig"' \
- > "${ED}"/etc/sandbox.d/37fontconfig || die
-
- readme.gentoo_create_doc
-
- keepdir /var/cache/${PN}
-}
-
-pkg_preinst() {
- # Bug #193476
- # /etc/fonts/conf.d/ contains symlinks to ../conf.avail/ to include various
- # config files. If we install as-is, we'll blow away user settings.
- ebegin "Syncing fontconfig configuration to system"
- if [[ -e ${EROOT}/etc/fonts/conf.d ]] ; then
- local file f
- for file in "${EROOT}"/etc/fonts/conf.avail/* ; do
- f=${file##*/}
- if [[ -L ${EROOT}/etc/fonts/conf.d/${f} ]] ; then
- [[ -f ${ED}/etc/fonts/conf.avail/${f} ]] \
- && ln -sf ../conf.avail/"${f}" \
- "${ED}"/etc/fonts/conf.d/ &>/dev/null
- else
- [[ -f ${ED}/etc/fonts/conf.avail/${f} ]] \
- && rm "${ED}"/etc/fonts/conf.d/"${f}" &>/dev/null
- fi
- done
- fi
- eend $?
-}
-
-pkg_postinst() {
- einfo "Cleaning broken symlinks in ${EROOT}/etc/fonts/conf.d/"
- find -L "${EROOT}"/etc/fonts/conf.d/ -type l -delete
-
- readme.gentoo_print_elog
-
- if [[ -z ${ROOT} ]] ; then
- multilib_pkg_postinst() {
- ebegin "Creating global font cache for ${ABI}"
- "${EPREFIX}"/usr/bin/${CHOST}-fc-cache -srf
- eend $?
- }
-
- multilib_parallel_foreach_abi multilib_pkg_postinst
- fi
-}
next reply other threads:[~2022-10-27 23:46 UTC|newest]
Thread overview: 141+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-27 23:46 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-04-11 8:47 [gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/ Sam James
2025-03-13 12:05 Sam James
2025-02-22 9:38 Ulrich Müller
2025-01-30 0:40 Sam James
2025-01-29 22:40 Sam James
2024-12-06 20:25 Sam James
2024-10-18 19:05 Arthur Zamarin
2024-10-15 12:47 Arthur Zamarin
2024-10-12 23:45 Sam James
2024-10-12 23:35 Sam James
2024-10-12 23:18 Sam James
2024-10-12 23:18 Sam James
2024-10-07 2:52 Sam James
2024-05-28 14:03 Sam James
2024-05-28 12:35 Sam James
2024-05-28 12:29 Michał Górny
2024-05-28 12:04 Michał Górny
2023-12-27 20:57 Sam James
2023-12-27 20:57 Sam James
2023-12-01 16:00 Arthur Zamarin
2023-09-28 9:05 Sam James
2023-09-28 5:12 Sam James
2023-09-28 4:35 Sam James
2023-09-27 7:44 Sam James
2023-09-27 5:23 Sam James
2023-09-27 4:58 Sam James
2023-09-27 4:51 Sam James
2023-06-01 7:56 Sam James
2023-06-01 6:31 Sam James
2023-06-01 6:27 Sam James
2023-06-01 5:28 Sam James
2023-06-01 5:22 Sam James
2023-06-01 5:22 Sam James
2023-05-01 10:32 Sam James
2023-04-27 6:39 Sam James
2023-04-15 5:08 Sam James
2023-03-04 18:23 Arthur Zamarin
2023-03-04 11:48 Arthur Zamarin
2023-03-04 9:26 Arthur Zamarin
2023-03-04 7:57 Arthur Zamarin
2023-03-04 7:56 Arthur Zamarin
2023-03-04 5:50 Arthur Zamarin
2023-03-04 5:39 Arthur Zamarin
2023-03-04 5:32 Arthur Zamarin
2023-01-29 9:04 Sam James
2022-10-29 19:11 Sam James
2022-10-29 19:11 Sam James
2022-10-28 11:25 Sam James
2022-08-30 19:06 Sam James
2022-06-28 19:27 Arthur Zamarin
2022-06-28 19:08 Arthur Zamarin
2022-06-27 7:37 Agostino Sarubbo
2022-06-27 7:34 Agostino Sarubbo
2022-06-26 17:43 Arthur Zamarin
2022-06-26 17:24 Arthur Zamarin
2022-06-26 17:20 Arthur Zamarin
2022-06-26 17:19 Arthur Zamarin
2022-05-07 4:28 WANG Xuerui
2022-04-22 17:43 Sam James
2022-04-02 4:15 Sam James
2022-04-02 3:15 Sam James
2022-04-02 3:07 Sam James
2022-04-02 3:07 Sam James
2022-03-10 22:51 Sam James
2020-12-27 17:47 Fabian Groffen
2020-11-19 11:17 Agostino Sarubbo
2020-11-18 6:55 Agostino Sarubbo
2020-11-17 19:05 Agostino Sarubbo
2020-10-31 11:10 Mikle Kolyada
2020-10-29 22:06 Sergei Trofimovich
2020-10-29 22:06 Sergei Trofimovich
2020-10-28 19:38 Thomas Deutschmann
2020-10-28 19:38 Thomas Deutschmann
2020-10-20 9:49 Sam James
2020-10-20 9:46 Sam James
2018-11-12 20:26 Sergei Trofimovich
2018-10-17 11:18 Mikle Kolyada
2018-09-19 17:41 Markus Meier
2018-09-18 7:16 Lars Wendler
2018-09-18 7:16 Lars Wendler
2018-09-17 21:34 Matt Turner
2018-09-17 21:34 Matt Turner
2018-09-14 8:28 Tobias Klausmann
2018-09-01 23:18 Sergei Trofimovich
2018-08-23 1:41 Thomas Deutschmann
2018-08-22 0:15 Mikle Kolyada
2018-08-21 18:42 Sergei Trofimovich
2018-08-21 8:25 Mart Raudsepp
2018-08-20 17:40 Mart Raudsepp
2018-07-25 8:54 Lars Wendler
2018-06-07 21:16 Mikle Kolyada
2018-06-02 17:25 Fabian Groffen
2018-06-02 14:57 Fabian Groffen
2018-06-02 14:14 Fabian Groffen
2018-05-20 21:38 Robin H. Johnson
2018-04-17 19:22 Michał Górny
2018-04-17 18:20 Thomas Deutschmann
2018-04-07 5:08 Matt Turner
2018-03-31 20:00 Sergei Trofimovich
2018-03-20 20:41 Matt Turner
2018-03-15 16:26 Mikle Kolyada
2018-03-13 20:31 Michał Górny
2018-03-08 18:10 Lars Wendler
2018-03-08 16:17 Lars Wendler
2018-03-08 16:07 Lars Wendler
2018-03-08 10:12 Lars Wendler
2018-03-05 13:57 Tobias Klausmann
2018-03-03 1:43 Mart Raudsepp
2018-02-22 10:27 Lars Wendler
2018-02-19 8:07 Sergei Trofimovich
2018-02-18 21:48 Thomas Deutschmann
2018-02-17 20:46 Sergei Trofimovich
2018-02-15 13:58 Jason Zaman
2018-02-15 9:23 Lars Wendler
2017-12-21 12:37 Lars Wendler
2017-10-05 13:04 Lars Wendler
2017-10-05 12:53 Fabian Groffen
2017-10-02 7:00 Fabian Groffen
2017-09-25 6:55 Fabian Groffen
2017-09-23 22:51 Lars Wendler
2017-09-08 22:49 Sergei Trofimovich
2017-09-08 5:06 Markus Meier
2017-09-04 7:30 Tobias Klausmann
2017-08-29 21:39 Thomas Deutschmann
2017-08-25 21:36 Mikle Kolyada
2017-08-19 15:16 Sergei Trofimovich
2017-08-17 20:18 Sergei Trofimovich
2017-07-24 13:11 Fabian Groffen
2017-07-20 10:23 Lars Wendler
2017-07-20 10:23 Lars Wendler
2017-06-20 12:37 Pacho Ramos
2017-06-03 19:27 Mike Gilbert
2017-06-02 20:49 Lars Wendler
2017-03-28 23:32 Michael Weber
2016-09-15 15:21 Michał Górny
2016-08-10 14:59 Lars Wendler
2016-08-10 14:59 Lars Wendler
2016-07-13 10:16 Lars Wendler
2016-07-13 10:16 Lars Wendler
2016-04-10 17:27 Lars Wendler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1666914333.2cc16a18373ff815d78b47c004cf7ffdf9c932b6.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox