media-libs/freetype: Bump to version 2.10.2

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>

diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index 8883fcd75991197efee9c1f0d0c20857c88a0e05..d01f6fcae725c6f06028862175ba65ca01b1b867 100644 (file)
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -1,9 +1,12 @@
 DIST freetype-2.10.0.tar.bz2 2743740 BLAKE2B def3e6393a4a26cd063df1cdfa676677547a9f68a95b8f246c79a7ff88d3da842b214770cd60e359d42692d6c002ba4effab03905034aa67a841af4c5d7a7157 SHA512 dfad66f419ea9577f09932e0730c0c887bdcbdbc8152fa7477a0c39d69a5b68476761deed6864ddcc5cf18d100a7a3f728049768e24afcb04b1a74b25b6acf7e
 DIST freetype-2.10.1.tar.xz 2378784 BLAKE2B 7c177d3ca9ad923dc9534719529686c4242d87d85bfbc32fa8a12d0be87aceb4960ec84b84e433413312de17ac24a8ed2a9d092efa25a39108d28e2051ada574 SHA512 c7a565b0ab3dce81927008a6965d5c7540f0dc973fcefdc1677c2e65add8668b4701c2958d25593cb41f706f4488765365d40b93da71dbfa72907394f28b2650
+DIST freetype-2.10.2.tar.xz 2404456 BLAKE2B 866bd83c460f83fba93f58d0ae2270ac3833d6eb0b087f7eb860bd6e08f40ece1982b70bbd065b8978e47ff6fb2b46398307d461170cd10285d11f74a9fbadaa SHA512 cf45089bd8893d7de2cdcb59d91bbb300e13dd0f0a9ef80ed697464ba7aeaf46a5a81b82b59638e6b21691754d8f300f23e1f0d11683604541d77f0f581affaa
 DIST freetype-2.9.1.tar.bz2 1926385 BLAKE2B f165d638e0f49749a2640aabba96aca20441c76028cc18bb2482fd620a29dd368bc55ea020c1e74fa6effe9fed3c59a53c7fdf2dd6021f445032b7007201948e SHA512 856766e1f3f4c7dc8afb2b5ee991138c8b642c6a6e5e007cd2bc04ae58bde827f082557cf41bf541d97e8485f7fd064d10390d1ee597f19d1daed6c152e27708
 DIST freetype-doc-2.10.0.tar.bz2 2130601 BLAKE2B 7814b8ad53343dc72f0b11b29224f9755686e504d099c53b76faefd9b38d207222c092ea549b25c7842956f13067a09cce460d33cfff1aace537f0044df627ac SHA512 e0902983030b7b67443ca88f29a8bb72662de706ddff81309c66b6738b26c5d11dbd00eb75795851ddcd9f93ce05981623884afad096c0defd08bd544f5266d6
 DIST freetype-doc-2.10.1.tar.xz 2079092 BLAKE2B 7d2b8ccdfeba71f1dab57f31cfb96a21afbf628ad329f798e9ac25f6e57cc662db67040a9f7c63df2d43b1c0a169c37ca0cd82bfa2d95ef382b16066859dc5b3 SHA512 7260d0d6b1bd04f9940b456b20d8d8157fc528f5b6a5c2028fe57008bee3e8d0434bdf89589e2e521b04e3e2c43627155549091d3aaf06384b654f795458991e
+DIST freetype-doc-2.10.2.tar.xz 2078712 BLAKE2B 9d78d5d7c3806d83f5cb91daa88284445d36a75ce7b598177c83a9efc62faf5d8a0003f8cadee37eb6792711c87dc61d937fcb03f3c450c94276dfdf410c0aa1 SHA512 c54956a56920e651102b75c0efa07212e1d95f3bec219b8364b61d9a71171b11da492170cc861c36f3305f32ad1dee46d0d5a561ccdc6ca36591ae3f619a1d67
 DIST freetype-doc-2.9.1.tar.bz2 2130292 BLAKE2B 667032fa447fbc28c0f753df3ade7a07a4f8d4d26cdd00fed2fa0e8098e9d6a083572608b7d06446ea91baa932e3c6d18beb1f86f6b549a8cd2c07a2df567da0 SHA512 1668f02f67e6e047df04e5e2fccb564cd9af780ec9b3c4878109868302a83eaec7b627390ff82c3e875122400e6f20fc690936a1e4964dfa65143e5309fa22d4
 DIST ft2demos-2.10.0.tar.bz2 237599 BLAKE2B 722e586f412059b8b29a26c832037a860dc1b26afed85b8b0aa5fc71245293f45d19b379c54993f64ba4b8de329799834656d00fc4b6f6610ddd0b08cfd05449 SHA512 d48cbabd5cc673e0af2e0c4056dba95cee8e08092f881958c6908ea2d4da7104ca81b701d47a17640ac36cbdfd8aa274cc26353bb43f026f55c00d565f2ad641
 DIST ft2demos-2.10.1.tar.xz 229228 BLAKE2B 015448f3f246fc7772b10f55037450866323e1b7410cf840fa15fa1da3e6a1c980167bfedbe197b6e6637a8e1dcef1f4fd83174e47f33f090d554fab2c40380c SHA512 f1c06fae3d5653d6d8f8d630e531d47b7be4429b122dc826c80791953e61df7374dfc151f90519fe110f78fcbf592d9dbd9e96c83200730a6f04e42760cc3142
+DIST ft2demos-2.10.2.tar.xz 230672 BLAKE2B dd81e72bb1360f6a952874c183598fffe3eddb4bed4d07715a75810d2e81623b94082b1274f916bf7550615a66ba7a327c5413fca9d470111aeb1fa31ce4dd73 SHA512 912e3c3cbcdfd30fd918897d28240e04eb7248d130fc519e7d1613873a11d275d658ff247c6d517ebecf7a09de0d05f3dc10631411226015e1b147cba9a8a438
 DIST ft2demos-2.9.1.tar.bz2 233462 BLAKE2B c689942b222b2c600b5ec3963791621ae87acefb9b01caa5dc35af52525d03e3a1094e48c0789d5eaabbce787bddd7c3055e12454e54ea3c7fae92bca47614de SHA512 38bee59184b20c2eb983deaa5c1f241e31c1b4793e47dc06b1b419601489cfece3b11fde4cf4fb6c5af12254ad0c1ce9a1547885c208e8e715655e9c48f22a46

diff --git a/media-libs/freetype/freetype-2.10.2.ebuild b/media-libs/freetype/freetype-2.10.2.ebuild
new file mode 100644 (file)
index 0000000..d6f5e68
--- /dev/null
+++ b/media-libs/freetype/freetype-2.10.2.ebuild
@@ -0,0 +1,240 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs
+
+DESCRIPTION="A high-quality and portable font engine"
+HOMEPAGE="https://www.freetype.org/"
+IUSE="X +adobe-cff bindist bzip2 +cleartype_hinting debug fontforge harfbuzz infinality png static-libs utils"
+
+if [[ "${PV}" != 9999 ]] ; then
+       SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.xz
+               mirror://nongnu/freetype/${P/_/}.tar.xz
+               utils?  ( mirror://sourceforge/freetype/ft2demos-${PV}.tar.xz
+                       mirror://nongnu/freetype/ft2demos-${PV}.tar.xz )
+               doc?    ( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.xz
+                       mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz )"
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+       IUSE+=" doc"
+else
+       inherit autotools git-r3
+fi
+
+LICENSE="|| ( FTL GPL-2+ )"
+SLOT="2"
+RESTRICT="!bindist? ( bindist )" # bug 541408
+
+RDEPEND="
+       >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+       bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+       harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,${MULTILIB_USEDEP}] )
+       png? ( >=media-libs/libpng-1.2.51:0=[${MULTILIB_USEDEP}] )
+       utils? (
+               X? (
+                       >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+                       >=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
+                       >=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]
+               )
+       )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+       virtual/pkgconfig
+"
+PDEPEND="infinality? ( media-libs/fontconfig-infinality )"
+
+PATCHES=(
+       "${FILESDIR}"/${PN}-2.4.11-sizeof-types.patch # 459966
+)
+
+_egit_repo_handler() {
+       if [[ "${PV}" == 9999 ]] ; then
+               local phase="${1}"
+               case ${phase} in
+                       fetch|unpack)
+                               :;
+                       ;;
+                       *)
+                               die "Please use this function with either \"fetch\" or \"unpack\""
+                       ;;
+               esac
+
+               local EGIT_REPO_URI
+               EGIT_REPO_URI="https://git.sv.nongnu.org/r/freetype/freetype2.git"
+               git-r3_src_${phase}
+               if use utils ; then
+                       EGIT_REPO_URI="https://git.sv.nongnu.org/r/freetype/freetype2-demos.git"
+                       local EGIT_CHECKOUT_DIR="${WORKDIR}/ft2demos-${PV}"
+                       git-r3_src_${phase}
+               fi
+       else
+               default
+       fi
+}
+
+src_fetch() {
+       _egit_repo_handler ${EBUILD_PHASE}
+}
+
+src_unpack() {
+       _egit_repo_handler ${EBUILD_PHASE}
+}
+
+src_prepare() {
+       if [[ "${PV}" == 9999 ]] ; then
+               # inspired by shipped autogen.sh script
+               eval $(sed -nf version.sed include/freetype/freetype.h)
+               pushd builds/unix &>/dev/null || die
+               sed -e "s;@VERSION@;$freetype_major$freetype_minor$freetype_patch;" \
+                       < configure.raw > configure.ac || die
+               # eautoheader produces broken ftconfig.in
+               eautoheader() { return 0 ; }
+               AT_M4DIR="." eautoreconf
+               unset freetype_major freetype_minor freetype_patch
+               popd &>/dev/null || die
+       fi
+
+       default
+
+       # This is the same as the 01 patch from infinality
+       sed '/AUX_MODULES += \(gx\|ot\)valid/s@^# @@' -i modules.cfg || die
+
+       enable_option() {
+               sed -i -e "/#define $1/ { s:/\* ::; s: \*/:: }" \
+                       include/${PN}/config/ftoption.h \
+                       || die "unable to enable option $1"
+       }
+
+       disable_option() {
+               sed -i -e "/#define $1/ { s:^:/* :; s:$: */: }" \
+                       include/${PN}/config/ftoption.h \
+                       || die "unable to disable option $1"
+       }
+
+       # Will be the new default for >=freetype-2.7.0
+       disable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  2"
+
+       if use infinality && use cleartype_hinting; then
+               enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  ( 1 | 2 )"
+       elif use infinality; then
+               enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  1"
+       elif use cleartype_hinting; then
+               enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  2"
+       fi
+
+       # Can be disabled with FREETYPE_PROPERTIES="pcf:no-long-family-names=1"
+       # via environment (new since v2.8)
+       enable_option PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
+
+       if ! use bindist; then
+               # See http://freetype.org/patents.html
+               # ClearType is covered by several Microsoft patents in the US
+               enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING
+       fi
+
+       if ! use adobe-cff; then
+               enable_option CFF_CONFIG_OPTION_OLD_ENGINE
+       fi
+
+       if use debug; then
+               enable_option FT_DEBUG_LEVEL_TRACE
+               enable_option FT_DEBUG_MEMORY
+       fi
+
+       if use utils; then
+               cd "${WORKDIR}/ft2demos-${PV}" || die
+               # Disable tests needing X11 when USE="-X". (bug #177597)
+               if ! use X; then
+                       sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die
+               fi
+               cd "${S}" || die
+       fi
+
+       # we need non-/bin/sh to run configure
+       if [[ -n ${CONFIG_SHELL} ]] ; then
+               sed -i -e "1s:^#![[:space:]]*/bin/sh:#!${CONFIG_SHELL}:" \
+                       "${S}"/builds/unix/configure || die
+       fi
+
+       elibtoolize --patch-only
+}
+
+multilib_src_configure() {
+       append-flags -fno-strict-aliasing
+       type -P gmake &> /dev/null && export GNUMAKE=gmake
+
+       local myeconfargs=(
+               --disable-freetype-config
+               --enable-biarch-config
+               --enable-shared
+               $(use_with bzip2)
+               $(use_with harfbuzz)
+               $(use_with png)
+               $(use_enable static-libs static)
+
+               # avoid using libpng-config
+               LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)"
+               LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)"
+       )
+
+       case ${CHOST} in
+               mingw*|*-mingw*) ;;
+               # Workaround windows mis-detection: bug #654712
+               # Have to do it for both ${CHOST}-windres and windres
+               *) myeconfargs+=( ac_cv_prog_RC= ac_cv_prog_ac_ct_RC= ) ;;
+       esac
+
+       ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+       default
+
+       if multilib_is_native_abi && use utils; then
+               einfo "Building utils"
+               # fix for Prefix, bug #339334
+               emake \
+                       X11_PATH="${EPREFIX}/usr/$(get_libdir)" \
+                       FT2DEMOS=1 TOP_DIR_2="${WORKDIR}/ft2demos-${PV}"
+       fi
+}
+
+multilib_src_install() {
+       default
+
+       if multilib_is_native_abi && use utils; then
+               einfo "Installing utils"
+               rm "${WORKDIR}"/ft2demos-${PV}/bin/README || die
+               dodir /usr/bin #654780
+               local ft2demo
+               for ft2demo in ../ft2demos-${PV}/bin/*; do
+                       ./libtool --mode=install $(type -P install) -m 755 "${ft2demo}" \
+                               "${ED}"/usr/bin || die
+               done
+       fi
+}
+
+multilib_src_install_all() {
+       if use fontforge; then
+               # Probably fontforge needs less but this way makes things simplier...
+               einfo "Installing internal headers required for fontforge"
+               local header
+               find src/truetype include/freetype/internal -name '*.h' | \
+               while read header; do
+                       mkdir -p "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
+                       cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
+               done
+       fi
+
+       dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,INSTALL.UNIX,*.txt,PROBLEMS,TODO}
+       if [[ "${PV}" != 9999 ]] && use doc ; then
+               docinto html
+               dodoc -r docs/*
+       fi
+
+       find "${ED}" -name '*.la' -delete || die
+       if ! use static-libs ; then
+               find "${ED}" -name '*.a' -delete || die
+       fi
+}