freetype: drop old version
We have a newer one in chromiumos-overlay that's being used everywhere.
BUG=None
TEST=CQ passes
Change-Id: Iff1aaf01ff61ae8f8d615f44cda8004751a2029a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/portage-stable/+/2566570
Reviewed-by: Sean Kau <skau@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
deleted file mode 100644
index e2926c0..0000000
--- a/media-libs/freetype/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST freetype-2.6.1.tar.bz2 1744692 SHA256 2f6e9a7de3ae8e85bdd2fe237e27d868d3ba7a27495e65906455c27722dd1a17 SHA512 cbc003e8f353d47ddcc2110aa8ecfdc1df53e61698e1ed68ed60afd5fd1d10d921c9719a505196c95865a68482822f9cccf5d131ec36d64c0230def774e7bb4b WHIRLPOOL 6319c8764f8d29669b241f0152338d356761d65a75235544c0c831aa03700e8b663b40b501519e57f09968c98bc8d56d1005ad069c9ee066c679b3400e20779a
diff --git a/media-libs/freetype/files/freetype-2.3.2-enable-valid.patch b/media-libs/freetype/files/freetype-2.3.2-enable-valid.patch
deleted file mode 100644
index 44f3bf6..0000000
--- a/media-libs/freetype/files/freetype-2.3.2-enable-valid.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Enables gxvalid and otvalid modules for use with ftvalid.
-
---- freetype-2.2.1/modules.cfg.orig 2006-07-07 21:01:09.000000000 -0400
-+++ freetype-2.2.1/modules.cfg 2006-07-07 21:01:54.000000000 -0400
-@@ -110,7 +110,7 @@
- AUX_MODULES += cache
-
- # TrueType GX/AAT table validation. Needs ftgxval.c below.
--# AUX_MODULES += gxvalid
-+AUX_MODULES += gxvalid
-
- # Support for streams compressed with gzip (files with suffix .gz).
- #
-@@ -124,7 +124,7 @@
-
- # OpenType table validation. Needs ftotval.c below.
- #
--# AUX_MODULES += otvalid
-+AUX_MODULES += otvalid
-
- # Auxiliary PostScript driver component to share common code.
- #
diff --git a/media-libs/freetype/files/freetype-2.4.11-sizeof-types.patch b/media-libs/freetype/files/freetype-2.4.11-sizeof-types.patch
deleted file mode 100644
index 5be0530..0000000
--- a/media-libs/freetype/files/freetype-2.4.11-sizeof-types.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 8af7b9e403240c2c3ace1005f5a91fa2f1625ac9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Mon, 11 Mar 2013 22:13:34 +0100
-Subject: [PATCH] Prevent apps from using the autoconf sizeof branch.
-
-Use #error to make sure that any app trying to enable that branch fails
-miserably. This guarantees the code to be multilib-friendly and also
-removes the header differences triggering QA errors.
----
- builds/unix/ftconfig.in | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/builds/unix/ftconfig.in b/builds/unix/ftconfig.in
-index 9531afd..457cbfc 100644
---- a/builds/unix/ftconfig.in
-+++ b/builds/unix/ftconfig.in
-@@ -78,10 +78,7 @@ FT_BEGIN_HEADER
- #undef FT_USE_AUTOCONF_SIZEOF_TYPES
- #ifdef FT_USE_AUTOCONF_SIZEOF_TYPES
-
--#undef SIZEOF_INT
--#undef SIZEOF_LONG
--#define FT_SIZEOF_INT SIZEOF_INT
--#define FT_SIZEOF_LONG SIZEOF_LONG
-+#error "Unsupported code branch enabled. Please report a bug to bugs.gentoo.org."
-
- #else /* !FT_USE_AUTOCONF_SIZEOF_TYPES */
-
---
-1.8.1.5
-
diff --git a/media-libs/freetype/files/freetype-2.6.1-bad-shift.patch b/media-libs/freetype/files/freetype-2.6.1-bad-shift.patch
deleted file mode 100644
index c361baf..0000000
--- a/media-libs/freetype/files/freetype-2.6.1-bad-shift.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-taken from upstream
-
-http://savannah.nongnu.org/bugs/?func=detailitem&item_id=46118
-
-From 30fe5e762e062612fdf4b56b50d813525a5aa311 Mon Sep 17 00:00:00 2001
-From: Werner Lemberg <wl@gnu.org>
-Date: Sun, 4 Oct 2015 13:08:08 +0200
-Subject: [PATCH] [base] Replace left shifts with multiplication (#46118).
-
-* src/base/ftglyph.c (ft_bitmap_glyph_bbox, FT_Get_Glyph): Do it.
----
- ChangeLog | 6 ++++++
- src/base/ftglyph.c | 14 +++++++-------
- 2 files changed, 13 insertions(+), 7 deletions(-)
-
-diff --git a/src/base/ftglyph.c b/src/base/ftglyph.c
-index cb7fc37..2778743 100644
---- a/src/base/ftglyph.c
-+++ b/src/base/ftglyph.c
-@@ -125,10 +125,10 @@
- FT_BitmapGlyph glyph = (FT_BitmapGlyph)bitmap_glyph;
-
-
-- cbox->xMin = glyph->left << 6;
-- cbox->xMax = cbox->xMin + (FT_Pos)( glyph->bitmap.width << 6 );
-- cbox->yMax = glyph->top << 6;
-- cbox->yMin = cbox->yMax - (FT_Pos)( glyph->bitmap.rows << 6 );
-+ cbox->xMin = glyph->left * 64;
-+ cbox->xMax = cbox->xMin + (FT_Pos)( glyph->bitmap.width * 64 );
-+ cbox->yMax = glyph->top * 64;
-+ cbox->yMin = cbox->yMax - (FT_Pos)( glyph->bitmap.rows * 64 );
- }
-
-
-@@ -403,9 +403,9 @@
- if ( error )
- goto Exit;
-
-- /* copy advance while converting it to 16.16 format */
-- glyph->advance.x = slot->advance.x << 10;
-- glyph->advance.y = slot->advance.y << 10;
-+ /* copy advance while converting 26.6 to 16.16 format */
-+ glyph->advance.x = slot->advance.x * 1024;
-+ glyph->advance.y = slot->advance.y * 1024;
-
- /* now import the image from the glyph slot */
- error = clazz->glyph_init( glyph, slot );
---
-2.5.2
-
diff --git a/media-libs/freetype/freetype-2.6.1-r1.ebuild b/media-libs/freetype/freetype-2.6.1-r1.ebuild
deleted file mode 100644
index 01c194d..0000000
--- a/media-libs/freetype/freetype-2.6.1-r1.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools-multilib flag-o-matic multilib toolchain-funcs
-
-INFINALITY_PATCH="03-infinality-2.6-2015.10.04.patch"
-
-DESCRIPTION="A high-quality and portable font engine"
-HOMEPAGE="http://www.freetype.org/"
-SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2
- mirror://nongnu/freetype/${P/_/}.tar.bz2
- utils? ( mirror://sourceforge/freetype/ft2demos-${PV}.tar.bz2
- mirror://nongnu/freetype/ft2demos-${PV}.tar.bz2 )
- doc? ( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2
- mirror://nongnu/freetype/${PN}-doc-${PV}.tar.bz2 )
- infinality? ( https://dev.gentoo.org/~polynomial-c/${INFINALITY_PATCH}.xz )"
-
-LICENSE="|| ( FTL GPL-2+ )"
-SLOT="2"
-KEYWORDS="*"
-IUSE="X +adobe-cff bindist bzip2 debug doc fontforge harfbuzz
- infinality png static-libs utils"
-RESTRICT="!bindist? ( bindist )" # bug 541408
-
-CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
- bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
- harfbuzz? ( >=media-libs/harfbuzz-0.9.19[truetype,${MULTILIB_USEDEP}] )
- png? ( >=media-libs/libpng-1.2.51:=[${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="${CDEPEND}
- virtual/pkgconfig"
-RDEPEND="${CDEPEND}
- abi_x86_32? ( utils? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )"
-PDEPEND="infinality? ( media-libs/fontconfig-infinality )"
-
-src_prepare() {
- enable_option() {
- sed -i -e "/#define $1/a #define $1" \
- 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"
- }
-
- # This is the same as the 01 patch from infinality
- epatch "${FILESDIR}"/${PN}-2.3.2-enable-valid.patch
-
- if use infinality; then
- epatch "${WORKDIR}/${INFINALITY_PATCH}"
-
- # FT_CONFIG_OPTION_SUBPIXEL_RENDERING is already enabled in freetype-2.4.11
- enable_option TT_CONFIG_OPTION_SUBPIXEL_HINTING
- fi
-
- 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
-
- epatch "${FILESDIR}"/${PN}-2.4.11-sizeof-types.patch # 459966
- epatch "${FILESDIR}"/${PN}-2.6.1-bad-shift.patch
-
- 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
-
- autotools-utils_src_prepare
-}
-
-multilib_src_configure() {
- append-flags -fno-strict-aliasing
- type -P gmake &> /dev/null && export GNUMAKE=gmake
-
- local myeconfargs=(
- --enable-biarch-config
- $(use_with bzip2)
- $(use_with harfbuzz)
- $(use_with png)
-
- # avoid using libpng-config
- LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)"
- LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)"
- )
-
- autotools-utils_src_configure
-}
-
-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
- 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/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}
- use doc && dohtml -r docs/*
-
- prune_libtool_files --all
-}
diff --git a/media-libs/freetype/metadata.xml b/media-libs/freetype/metadata.xml
deleted file mode 100644
index d93cdef..0000000
--- a/media-libs/freetype/metadata.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>fonts</herd>
- <maintainer>
- <email>yngwin@gentoo.org</email>
- <name>Ben de Groot</name>
- </maintainer>
- <maintainer>
- <email>polynomial-c@gentoo.org</email>
- <name>Lars Wendler</name>
- </maintainer>
- <maintainer>
- <email>multilib@gentoo.org</email>
- <name>gx86-multilib project</name>
- <description>Handling the bugs related to multilib support in the
- package and related changes.</description>
- </maintainer>
- <use>
- <flag name="adobe-cff">Use Adobe CFF as default font-renderer</flag>
- <flag name="auto-hinter">Use the unpatented auto-hinter instead
- of the (recommended) TrueType bytecode interpreter</flag>
- <flag name="bindist">Disable ClearType support (see http://freetype.org/patents.html)</flag>
- <flag name="bzip2">Support bzip2 compressed PCF fonts.</flag>
- <flag name="fontforge">Install internal headers required for TrueType
- debugger in <pkg>media-gfx/fontforge</pkg> (built with
- USE=truetype-debugger)</flag>
- <flag name="harfbuzz">Use <pkg>media-libs/harfbuzz</pkg> for auto-hinting
- OpenType fonts. WARNING: may trigger circular dependencies!</flag>
- <flag name="infinality">Enable infinality options for improved LCD
- filtering</flag>
- <flag name="utils">Install utilities and examples from ft2demos</flag>
- </use>
- <upstream>
- <remote-id type="cpe">cpe:/a:freetype:freetype</remote-id>
- <remote-id type="sourceforge">freetype</remote-id>
- </upstream>
-</pkgmetadata>
