From 80208fb578cf92cc308906660ca6d7860c6b2a1f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 9 Mar 2018 16:53:27 +0000 Subject: gentoo resync : 09.03.2018 --- media-libs/fontconfig/Manifest | 10 +- .../files/fontconfig-2.11.1-fc-cache-r.patch | 26 ---- .../files/fontconfig-2.7.1-latin-reorder.patch | 50 ------- media-libs/fontconfig/fontconfig-2.11.1-r2.ebuild | 159 -------------------- media-libs/fontconfig/fontconfig-2.12.6.ebuild | 4 +- media-libs/fontconfig/fontconfig-2.12.93.ebuild | 162 --------------------- media-libs/fontconfig/fontconfig-2.13.0.ebuild | 162 +++++++++++++++++++++ 7 files changed, 167 insertions(+), 406 deletions(-) delete mode 100644 media-libs/fontconfig/files/fontconfig-2.11.1-fc-cache-r.patch delete mode 100644 media-libs/fontconfig/files/fontconfig-2.7.1-latin-reorder.patch delete mode 100644 media-libs/fontconfig/fontconfig-2.11.1-r2.ebuild delete mode 100644 media-libs/fontconfig/fontconfig-2.12.93.ebuild create mode 100644 media-libs/fontconfig/fontconfig-2.13.0.ebuild (limited to 'media-libs/fontconfig') diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest index 508185a10df8..01627637ad12 100644 --- a/media-libs/fontconfig/Manifest +++ b/media-libs/fontconfig/Manifest @@ -1,14 +1,10 @@ AUX fontconfig-2.10.2-docbook.patch 648 BLAKE2B 70d66ae09a0729b667a4e5e57a7cf86926fb008285f89057bdf35f241bcd047dd8ad47d858d2fad26e67824c01e9f721877bb22afb2f8ffdd5538ed05694948c SHA512 b0adb7c406445c25c96c5dc37af9e6fcc8c75a0752af255465673812bdc332ce43439a100c056744ace0dd5b3350596eedd612489c33d19a6f6cd182c08e2961 -AUX fontconfig-2.11.1-fc-cache-r.patch 854 BLAKE2B e487b86db21d09e9ae83df5efd9a42cd1a7fd06dfb77b3cb97fd1a84576f4ad72637bed9f95a5aaec55d46a77388174446805d52f99592f499e9244fbddc5cc8 SHA512 6f9fc84720fab01dc86ec626501114b5e8ab979e87057c40374afd31deeed4b424e5f576734a0214b666a8b1867294da138f25d8b4fcf39e1bd99ca951ff48a4 AUX fontconfig-2.12.2-gperf31.patch 2076 BLAKE2B 5691870b6f4ff9183403fd54b1a49e514806df92cf2c79f9f1c1c8bae9c71e66b72afc1209e01f1d905bb97707b0db8ce3bdc8934043f97b9094ea4e8e1685ce SHA512 0a88b0e2f7ca0cf934779c7612b87d9a476ab1396a512dafb2e89d26655657b333fb1b442773088ffc559c19782258128f366f5fc8a0e754288a7ea288506a6f AUX fontconfig-2.12.3-latin-update.patch 2049 BLAKE2B 5fdf036d307a09eaa3b475fc9b87d3c927e60f49deced429d41c46c9c677b5f90de12d7f82d55feadc003a8b841456c372084afe1ead3320cdf78d3e7bc474b1 SHA512 24520d40e7049d0fa5c05054dbe6d82149688d3e327b1818c6816bd3315de56969b040c88f8db0cbbf4f377d5ebf77199dbd3af5bc7bcae8bcaea69820d68ce6 -AUX fontconfig-2.7.1-latin-reorder.patch 1701 BLAKE2B 9ac50adca6b257ebd12848ac094d3bcc211a8e326e3b8062784cee117fa90915863c5b8f6f852e67690c7c643b0a68d21959e29b0ede0653caef65d73d6f4133 SHA512 8fc514649e40ecd0c52e4fef9479e0945baa3aaa396335650bf827a983f6d9187b0f66ab97bf5b11b14917518b2e955b0a1bca126a336feafbebf754ff646d5d -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.12.93.tar.bz2 1693157 BLAKE2B 6e2e301690a8ab46024b2e629ac8be99c4af90c535541d6114f217b2ed966e9262d02b5fdb46480443f32be0941e2ab1c398c156c9875374bfb39e7ba959decf SHA512 f7e83707a9f2f134b3d33b43c2b8b274a16cee3c9705a5acf2883355e1c575e50422cf2bd2bd60cb481708f8ed72cc57e80ca616af0f19a9db3f35c30f7ea8f5 -EBUILD fontconfig-2.11.1-r2.ebuild 4770 BLAKE2B f1cc240f9fd3631a484c33cc078c505d4b4af5e8c60baa63b9bb1112bf355e82774372ee26e85b13863c043d64e583d1c26af75fd0948f24b9f8eb6fb88a79ef SHA512 597cbd513b3407a49c40bca4ab879777f761d1ac3bf3091efdf504ce854dfc672d1721e16acc9bf8fce557ffe7f911105ae1dedcbf2ab082848b331e60ccef81 +DIST fontconfig-2.13.0.tar.bz2 1700500 BLAKE2B bf137b27c9f73c5e2763b7a4a443a4aa5016bd3c0e35138249c2cf8841eb364c8e7bbea6495b53b88de26e3d5a429ebfb598a9f4fe7d875028a621df592ff35a SHA512 f0ad8f2542c8b1e900f5c3d213466a31dd3785da726d6eb455b6734c71c6e5751b28172203e2f9668e9c8e1512072235ea46a1a5e6a85ec54ccc332adb4e5fbc EBUILD fontconfig-2.12.4.ebuild 4930 BLAKE2B 40ea1f8710e43736d7da02b1a30df092818cc5ac8d513ec2f09958d0ed6cad7a1446b143279779643229e473b1fadc206387820c8b31755974b5f1d76594ed95 SHA512 46110903d927e176a8346527503431ca66b4a1b08aa3a441e0621ea9c7eec5429b21191c18156c8782013cc0e8dfe7a0ba55acd1d6c9dd92ddee23fe3562d11d -EBUILD fontconfig-2.12.6.ebuild 5004 BLAKE2B de7eb3e6a002694dadcdfe2248f96c1b4eb8a3feae441f0efb0312246b971a0a5830baba612a6f6dc98dcdcfa6b5d9ff1f919450f14be6ffc0302fbecac5b648 SHA512 7389595d6d3b32e549384b77395426cb7dffcc6b0823dafaaa2af8e2cd22b06c4c025b92251a9763eaca2f6d48d69c7e6c421e30d14bc43a8149a26ed32e1e72 -EBUILD fontconfig-2.12.93.ebuild 5073 BLAKE2B f2826657bf7ba5a8319c34bce4c05f85575c41bad341b2b8725ecfaf51b30929e159ea83fd3aff68a1f501a0a9aae4b870a8b07a60d12b8df2f1fd10c2857a0a SHA512 5481e6a6acbdb1a1a50354a2fa34b6f01acc93a6a2ffcc344f94548fe48246c82411a13455fc3f7ba389d1d9f6b5cc1e6f94e7a38ef240a8d4948f29f8c3d1ff +EBUILD fontconfig-2.12.6.ebuild 4999 BLAKE2B 8f0a2d9761644bbf7a3e4f8905ce12435f88cdb97b3bf49709dca9461a0d9efa589cdc385a5075675aa80b2a290f794879130f254428fbd7ea679a421059edc2 SHA512 fe51902cec63b683bf73624090c2f01626e0deeb0ef83fe287f379fc7a2b9c0f5d765df69d42fc541fcb0b67813cff4a3a99b48e70ddda2acb3e7f07fcbc6732 +EBUILD fontconfig-2.13.0.ebuild 4886 BLAKE2B 53afd9c7099bbca51d0b247b7af20ef985c373fe3a4217a58b22b1c27a26e111d171e2907759fb4f7101e319370cea32ab4ee24ed0c99851ed6a1089fffa7331 SHA512 8cddd384732d2115c4476f2d40fd6de6bc4616120fd484adb78e7d77aaaa9927e63b3cbac5e9364bc33870137a11e7c5e1f3ecb4b095903504d3db8757de8fe9 MISC metadata.xml 729 BLAKE2B 3af0a9c7963c02bf886eb9d7522c2f1776b9b241afc05ae8e71f93ed08bfc937061f5ee9402232f317a207db84e4ee0ad0f9b7c8ba4b72b8600ab30c90822197 SHA512 997967959d02a36cf5187ab42649e7fb581331141fb92aa0aeee622a996959553824424837c56ea0a3abd44cc0abc40cca04abe819c0a4261944072f681260bb 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 -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 @@ - - serif - -- Bitstream Vera Serif - DejaVu Serif -+ Bitstream Vera Serif - Times New Roman - Thorndale AMT - Luxi Serif -@@ -16,14 +16,14 @@ - - sans-serif - -- Bitstream Vera Sans - DejaVu Sans -- Verdana -- Arial -- Albany AMT -+ Bitstream Vera Sans - Luxi Sans - Nimbus Sans L -+ Arial -+ Albany AMT - Helvetica -+ Verdana - Lucida Sans Unicode - BPG Glaho International - Tahoma -@@ -32,14 +32,14 @@ - - monospace - -- Bitstream Vera Sans Mono - DejaVu Sans Mono -+ Bitstream Vera Sans Mono - Inconsolata -+ Luxi Mono -+ Nimbus Mono L - Andale Mono - Courier New - Cumberland AMT -- Luxi Mono -- Nimbus Mono L - Courier - - 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 -} diff --git a/media-libs/fontconfig/fontconfig-2.12.6.ebuild b/media-libs/fontconfig/fontconfig-2.12.6.ebuild index b1c9da4e6d5f..9936b119840f 100644 --- a/media-libs/fontconfig/fontconfig-2.12.6.ebuild +++ b/media-libs/fontconfig/fontconfig-2.12.6.ebuild @@ -11,13 +11,13 @@ 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" +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}] + >=media-libs/freetype-2.7.1[${MULTILIB_USEDEP}] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )" DEPEND="${RDEPEND} virtual/pkgconfig diff --git a/media-libs/fontconfig/fontconfig-2.12.93.ebuild b/media-libs/fontconfig/fontconfig-2.12.93.ebuild deleted file mode 100644 index c305817adbd0..000000000000 --- a/media-libs/fontconfig/fontconfig-2.12.93.ebuild +++ /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 ~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}] - 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.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 -} diff --git a/media-libs/fontconfig/fontconfig-2.13.0.ebuild b/media-libs/fontconfig/fontconfig-2.13.0.ebuild new file mode 100644 index 000000000000..731522903e31 --- /dev/null +++ b/media-libs/fontconfig/fontconfig-2.13.0.ebuild @@ -0,0 +1,162 @@ +# 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 +} -- cgit v1.2.3