summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2018-03-08 11:11:27 +0100
committerLars Wendler <polynomial-c@gentoo.org>2018-03-08 11:11:59 +0100
commit01d8b1b08bcc63d3cfe209ab11b2942f8a32dd1f (patch)
tree37269ad33f695da22b118451e4bd869ee51e8a9b
parentmedia-libs/fontconfig: Bump to version 2.13.0 (diff)
downloadgentoo-01d8b1b08bcc63d3cfe209ab11b2942f8a32dd1f.tar.gz
gentoo-01d8b1b08bcc63d3cfe209ab11b2942f8a32dd1f.tar.bz2
gentoo-01d8b1b08bcc63d3cfe209ab11b2942f8a32dd1f.zip
media-libs/fontconfig: Removed old.
Package-Manager: Portage-2.3.24, Repoman-2.3.6
-rw-r--r--media-libs/fontconfig/Manifest1
-rw-r--r--media-libs/fontconfig/files/fontconfig-2.11.1-fc-cache-r.patch26
-rw-r--r--media-libs/fontconfig/files/fontconfig-2.7.1-latin-reorder.patch50
-rw-r--r--media-libs/fontconfig/fontconfig-2.11.1-r2.ebuild159
4 files changed, 0 insertions, 236 deletions
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 01e04578f42b..0ab2d6c2885a 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -1,4 +1,3 @@
-DIST fontconfig-2.11.1.tar.bz2 1516095 BLAKE2B 4f78c606d198c4d721dd7fe61181f4433a562fee7f69372e64b661e4aac7750928bc158691fdbaf5ae932bda373d007f95a6d0089cda2eb50f15f599c4eb9d6f SHA512 acf4e6293e0e5521e4b8f29f4b48860ecd1d39744d0eab21c7332e56bfc3ccc63548e459243c5e425b8e5ef265f2cf065eece02460725e794041219d41188149
DIST fontconfig-2.12.4.tar.bz2 1613580 BLAKE2B 9d6b0d5d7bc61cd3dbab2ad769df3aa33c1b38d6c55e02e18aee875a1bef4162a5bba0b9bf8f09c0f94d63c64c3f6bf6f3c5d993f210f74076f861c696f5262c SHA512 f336e9220afe738e0bf7186d87a5eb09842342ad99ca2102c69820a1f0b232e15c61ef72ae3f5d56503f5be32557d09180a80e05690e85b4eb13ed88f5cece81
DIST fontconfig-2.12.6.tar.bz2 1624683 BLAKE2B 48432f3d3cc90240ec19dffb6714e7f780eb6b401693b40e2efa2bb593bc89c42b03c99fce8f2ceb7c108da254dc248d91a790849d22feaa50a725338b80fd1f SHA512 2a1d3e62cae2bfcae2e67e9cb75ab6534a35bda4215f1ad4b8bf757e77e7d9d609c016562f5288fd10046a0e94655a807f6dd044d7868ed81a146c4275c4dd06
DIST fontconfig-2.13.0.tar.bz2 1700500 BLAKE2B bf137b27c9f73c5e2763b7a4a443a4aa5016bd3c0e35138249c2cf8841eb364c8e7bbea6495b53b88de26e3d5a429ebfb598a9f4fe7d875028a621df592ff35a SHA512 f0ad8f2542c8b1e900f5c3d213466a31dd3785da726d6eb455b6734c71c6e5751b28172203e2f9668e9c8e1512072235ea46a1a5e6a85ec54ccc332adb4e5fbc
diff --git a/media-libs/fontconfig/files/fontconfig-2.11.1-fc-cache-r.patch b/media-libs/fontconfig/files/fontconfig-2.11.1-fc-cache-r.patch
deleted file mode 100644
index 48f67f12974d..000000000000
--- a/media-libs/fontconfig/files/fontconfig-2.11.1-fc-cache-r.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From f44157c809d280e2a0ce87fb078fc4b278d24a67 Mon Sep 17 00:00:00 2001
-From: Akira TAGOH <akira@tagoh.org>
-Date: Thu, 10 Apr 2014 19:27:55 +0900
-Subject: Fix fc-cache fail with -r
-
-Do not unlink the cache even if --really-force is given.
-because re-scanning process expects the cache exists.
-
-https://bugs.freedesktop.org/show_bug.cgi?id=77252
-
-diff --git a/fc-cache/fc-cache.c b/fc-cache/fc-cache.c
-index 99e0e9f..90ebad3 100644
---- a/fc-cache/fc-cache.c
-+++ b/fc-cache/fc-cache.c
-@@ -388,7 +388,7 @@ main (int argc, char **argv)
- list = FcStrListCreate (updateDirs);
- if (list)
- {
-- ret += scanDirs (list, config, FcTrue, really_force, verbose, FcFalse, &changed, NULL);
-+ ret += scanDirs (list, config, FcTrue, FcFalse, verbose, FcFalse, &changed, NULL);
- FcStrListDone (list);
- }
- FcStrSetDestroy (updateDirs);
---
-cgit v0.10.2
-
diff --git a/media-libs/fontconfig/files/fontconfig-2.7.1-latin-reorder.patch b/media-libs/fontconfig/files/fontconfig-2.7.1-latin-reorder.patch
deleted file mode 100644
index 6ecf6cb9df6e..000000000000
--- a/media-libs/fontconfig/files/fontconfig-2.7.1-latin-reorder.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -Naurp fontconfig-2.7.1-orig/conf.d/60-latin.conf fontconfig-2.7.1/conf.d/60-latin.conf
---- fontconfig-2.7.1-orig/conf.d/60-latin.conf 2009-07-10 11:09:33.000000000 -0600
-+++ fontconfig-2.7.1/conf.d/60-latin.conf 2009-08-16 15:25:38.347701112 -0600
-@@ -4,8 +4,8 @@
- <alias>
- <family>serif</family>
- <prefer>
-- <family>Bitstream Vera Serif</family>
- <family>DejaVu Serif</family>
-+ <family>Bitstream Vera Serif</family>
- <family>Times New Roman</family>
- <family>Thorndale AMT</family>
- <family>Luxi Serif</family>
-@@ -16,14 +16,14 @@
- <alias>
- <family>sans-serif</family>
- <prefer>
-- <family>Bitstream Vera Sans</family>
- <family>DejaVu Sans</family>
-- <family>Verdana</family>
-- <family>Arial</family>
-- <family>Albany AMT</family>
-+ <family>Bitstream Vera Sans</family>
- <family>Luxi Sans</family>
- <family>Nimbus Sans L</family>
-+ <family>Arial</family>
-+ <family>Albany AMT</family>
- <family>Helvetica</family>
-+ <family>Verdana</family>
- <family>Lucida Sans Unicode</family>
- <family>BPG Glaho International</family> <!-- lat,cyr,arab,geor -->
- <family>Tahoma</family> <!-- lat,cyr,greek,heb,arab,thai -->
-@@ -32,14 +32,14 @@
- <alias>
- <family>monospace</family>
- <prefer>
-- <family>Bitstream Vera Sans Mono</family>
- <family>DejaVu Sans Mono</family>
-+ <family>Bitstream Vera Sans Mono</family>
- <family>Inconsolata</family>
-+ <family>Luxi Mono</family>
-+ <family>Nimbus Mono L</family>
- <family>Andale Mono</family>
- <family>Courier New</family>
- <family>Cumberland AMT</family>
-- <family>Luxi Mono</family>
-- <family>Nimbus Mono L</family>
- <family>Courier</family>
- </prefer>
- </alias>
diff --git a/media-libs/fontconfig/fontconfig-2.11.1-r2.ebuild b/media-libs/fontconfig/fontconfig-2.11.1-r2.ebuild
deleted file mode 100644
index 4c6d46f88446..000000000000
--- a/media-libs/fontconfig/fontconfig-2.11.1-r2.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-AUTOTOOLS_AUTORECONF=yes
-
-inherit eutils readme.gentoo autotools-multilib
-
-DESCRIPTION="A library for configuring and customizing font access"
-HOMEPAGE="http://fontconfig.org/"
-SRC_URI="http://fontconfig.org/release/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="1.0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-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"
-IUSE="doc static-libs"
-
-# 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.5.3-r1[${MULTILIB_USEDEP}]
- abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? (
- =app-text/docbook-sgml-dtd-3.1*
- app-text/docbook-sgml-utils[jadetex]
- )"
-PDEPEND="!x86-winnt? ( app-eselect/eselect-fontconfig )
- virtual/ttf-fonts"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.7.1-latin-reorder.patch # 130466
- "${FILESDIR}"/${PN}-2.10.2-docbook.patch # 310157
- "${FILESDIR}"/${PN}-2.11.1-fc-cache-r.patch # 531748
-)
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/fc-cache$(get_exeext)
-)
-
-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_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=(
- $(use_enable doc docbook)
- # always enable docs to install manpages
- --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
- )
-
- autotools-multilib_src_configure
-}
-
-multilib_src_install() {
- default
-
- # XXX: 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
- prune_libtool_files --all
-
- #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
- 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
- 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
-
- readme.gentoo_create_doc
-}
-
-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
- 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 [[ ${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
-}