media-libs/fontconfig: Removed old.
authorLars Wendler <polynomial-c@gentoo.org>
Fri, 20 Apr 2018 11:11:49 +0000 (13:11 +0200)
committerLars Wendler <polynomial-c@gentoo.org>
Fri, 20 Apr 2018 11:11:49 +0000 (13:11 +0200)
Package-Manager: Portage-2.3.31, Repoman-2.3.9

media-libs/fontconfig/Manifest
media-libs/fontconfig/files/fontconfig-2.12.2-gperf31.patch [deleted file]
media-libs/fontconfig/fontconfig-2.12.4.ebuild [deleted file]
media-libs/fontconfig/fontconfig-2.13.0.ebuild [deleted file]

index 0ab2d6c2885a248819d0e281b3506f530eb77c19..de6fde79604d3bd9d041fe00f88dee09ffa45f8b 100644 (file)
@@ -1,3 +1,2 @@
-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.12.2-gperf31.patch b/media-libs/fontconfig/files/fontconfig-2.12.2-gperf31.patch
deleted file mode 100644 (file)
index ce90c45..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-From 9878b306f6c673d3d6cd9db487f67eb426cc03df Mon Sep 17 00:00:00 2001
-From: Akira TAGOH <akira@tagoh.org>
-Date: Thu, 23 Feb 2017 21:39:10 +0900
-Subject: Fix the build issue with gperf 3.1
-
-To support the one of changes in gperf 3.1:
-* The 'len' parameter of the hash function and of the lookup function is now
-  of type 'size_t' instead of 'unsigned int'. This makes it safe to call these
-  functions with strings of length > 4 GB, on 64-bit machines.
-
-diff --git a/configure.ac b/configure.ac
-index 4948816..8fbf3d3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -193,6 +193,26 @@ fi
- AC_CHECK_MEMBERS([struct dirent.d_type],,,
-       [#include <dirent.h>])
-+# Check the argument type of the gperf hash/lookup function
-+AC_MSG_CHECKING([The type of len parameter of gperf hash/lookup function])
-+fc_gperf_test="$(echo 'foo' | gperf -L ANSI-C)"
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-+      #include <string.h>
-+
-+      const char *in_word_set(register const char *, register size_t);
-+      $fc_gperf_test
-+      ]])], [FC_GPERF_SIZE_T=size_t],
-+      [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-+              #include <string.h>
-+
-+              const char *in_word_set(register const char *, register unsigned int);
-+              $fc_gperf_test
-+      ]])], [FC_GPERF_SIZE_T="unsigned int"],
-+      [AC_MSG_ERROR([Unable to determine the type of the len parameter of the gperf hash/lookup function])]
-+)])
-+AC_DEFINE_UNQUOTED(FC_GPERF_SIZE_T, $FC_GPERF_SIZE_T, [The type of len parameter of the gperf hash/lookup function])
-+AC_MSG_RESULT($FC_GPERF_SIZE_T)
-+
- #
- # Checks for iconv
- #
-diff --git a/src/fcobjs.c b/src/fcobjs.c
-index 16ff31c..33bba8d 100644
---- a/src/fcobjs.c
-+++ b/src/fcobjs.c
-@@ -25,10 +25,10 @@
- #include "fcint.h"
- static unsigned int
--FcObjectTypeHash (register const char *str, register unsigned int len);
-+FcObjectTypeHash (register const char *str, register FC_GPERF_SIZE_T len);
- static const struct FcObjectTypeInfo *
--FcObjectTypeLookup (register const char *str, register unsigned int len);
-+FcObjectTypeLookup (register const char *str, register FC_GPERF_SIZE_T len);
- #include "fcobjshash.h"
--- 
-cgit v0.10.2
-
diff --git a/media-libs/fontconfig/fontconfig-2.12.4.ebuild b/media-libs/fontconfig/fontconfig-2.12.4.ebuild
deleted file mode 100644 (file)
index 154f235..0000000
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib-minimal readme.gentoo-r1
-
-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 ~x64-cygwin ~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}]"
-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.10.2-docbook.patch # 310157
-       "${FILESDIR}"/${PN}-2.12.3-latin-update.patch # 130466 + make liberation default
-)
-
-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_prepare() {
-       default
-
-       # Revert gperf-3.1 fix as it breaks compilation
-       eapply -R "${FILESDIR}"/${PN}-2.12.2-gperf31.patch
-       export GPERF=$(type -P true)
-
-       eautoreconf
-}
-
-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=(
-               $(use_enable doc docbook)
-               $(use_enable static-libs static)
-               --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() {
-       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
-       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
-}
diff --git a/media-libs/fontconfig/fontconfig-2.13.0.ebuild b/media-libs/fontconfig/fontconfig-2.13.0.ebuild
deleted file mode 100644 (file)
index 7315229..0000000
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib-minimal readme.gentoo-r1 versionator
-
-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"
-[[ "$(get_version_component_range 3)" -ge 90 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
-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.8.1[${MULTILIB_USEDEP}]
-       sys-apps/util-linux[${MULTILIB_USEDEP}]"
-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.10.2-docbook.patch # 310157
-       "${FILESDIR}"/${PN}-2.12.3-latin-update.patch # 130466 + make liberation default
-)
-
-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_prepare() {
-       default
-       export GPERF=$(type -P true)  # avoid dependency on gperf, #631980
-       sed -i -e 's/FC_GPERF_SIZE_T="unsigned int"/FC_GPERF_SIZE_T=size_t/' \
-               configure.ac || die # rest of gperf dependency fix, #631920
-       eautoreconf
-}
-
-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=(
-               $(use_enable doc docbook)
-               $(use_enable static-libs static)
-               --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() {
-       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
-       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
-}