diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r173.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r174.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r173.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r174.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild index ef70748646..e6456faffc 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild @@ -53,7 +53,6 @@ RDEPEND="${RDEPEND} dev-libs/protobuf dev-python/cherrypy dev-python/ctypesgen - dev-python/imaging dev-python/m2crypto dev-python/mako dev-python/netifaces @@ -74,7 +73,6 @@ RDEPEND="${RDEPEND} >=dev-vcs/git-1.7.2 dev-vcs/mercurial dev-vcs/subversion[-dso] - >=media-libs/freetype-2.2.1 net-misc/gsutil sys-apps/usbutils sys-apps/systemd diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/freetype/Manifest b/sdk_container/src/third_party/coreos-overlay/media-libs/freetype/Manifest deleted file mode 100644 index 47a2141c06..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/media-libs/freetype/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST freetype-2.4.11.tar.bz2 1546087 SHA256 ef9d0bcb64647d9e5125dc7534d7ca371c98310fec87677c410f397f71ffbe3f SHA512 a858395f48b435ff7469592c397634806debf1250a6f7344871acbfcd6e0f2d658fc7fb80c302cde7f3fd29d9f14c6c0e1248a65660e3a96c0dfad3cef697979 WHIRLPOOL 499b010555730c3558362ec306716f3b7dabcdba85e9dfdb2fc98fdfb8062c11002507ce44c8ad0e1967b4f27dfa2b6e8d65c3b5824c29036c4473a5b7ac0f49 -DIST freetype-doc-2.4.11.tar.bz2 106643 SHA256 e80082d8594300d2cc1f1c315179006012fa4ded7acb4b6a1f7b43b5b19dcb51 SHA512 f3db6826c179409db92ac2e7bdded9244a7bb18fec45062bdbc712352b29a1b2de33ea20c8ac3f54cd0b59caf9a5b9df6537e3dc83e32999921df00747a69813 WHIRLPOOL d61d88b52f8244e4053b4f0f86efd35d89561d6831535219902fbf58deac656935455d18775c7ad3be6b6c558ea52db7ddc4425964f8259da2bb51731e69ff5d -DIST ft2demos-2.4.11.tar.bz2 164608 SHA256 49cc6c45542cc39cca0d9135b865fab428b1f9805b46c22fd848528f51c76075 SHA512 35c907ce5cd8a5e7381a259d734d2c56641c8fd08ef3ba4fe6a87ae9daf2ce4dd68cfeb3e6459cbed043832157db7918e3a66ac5102b4d48be0bbf39942f57ed WHIRLPOOL 9e85b6b9db845aeb3ead65975fc81e058f25cfdb637a3958b727449ed738f738022729c30be6ea0da72129f5f298b66c28d806ee56eb2b25e0d1abb130d35476 diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/freetype/files/freetype-2.3.2-enable-valid.patch b/sdk_container/src/third_party/coreos-overlay/media-libs/freetype/files/freetype-2.3.2-enable-valid.patch deleted file mode 100644 index 44f3bf6e1c..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/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/sdk_container/src/third_party/coreos-overlay/media-libs/freetype/freetype-2.4.11.ebuild b/sdk_container/src/third_party/coreos-overlay/media-libs/freetype/freetype-2.4.11.ebuild deleted file mode 100644 index 8eb81e3053..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/media-libs/freetype/freetype-2.4.11.ebuild +++ /dev/null @@ -1,138 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.4.6.ebuild,v 1.11 2011/08/31 08:35:05 mduft Exp $ - -EAPI="4" - -inherit autotools autotools-utils eutils flag-o-matic libtool multilib - -DESCRIPTION="A high-quality and portable font engine" -HOMEPAGE="http://www.freetype.org/" -SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2 - utils? ( mirror://sourceforge/freetype/ft2demos-${PV}.tar.bz2 ) - doc? ( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2 )" - -LICENSE="FTL GPL-2" -SLOT="2" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~ppc-aix ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="X auto-hinter bindist bzip2 debug doc fontforge static-libs utils" - -DEPEND="sys-libs/zlib - bzip2? ( app-arch/bzip2 ) - X? ( x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp )" - -RDEPEND="${DEPEND}" - -src_prepare() { - enable_option() { - sed -i -e "/#define $1/a #define $1" \ - include/freetype/config/ftoption.h \ - || die "unable to enable option $1" - } - - disable_option() { - sed -i -e "/#define $1/ { s:^:/*:; s:$:*/: }" \ - include/freetype/config/ftoption.h \ - || die "unable to disable option $1" - } - - 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 auto-hinter; then - disable_option TT_CONFIG_OPTION_BYTECODE_INTERPRETER - enable_option TT_CONFIG_OPTION_UNPATENTED_HINTING - fi - - if use debug; then - enable_option FT_DEBUG_LEVEL_TRACE - enable_option FT_DEBUG_MEMORY - fi - - disable_option FT_CONFIG_OPTION_OLD_INTERNALS - - epatch "${FILESDIR}"/${PN}-2.3.2-enable-valid.patch - - if use utils; then - cd "${WORKDIR}/ft2demos-${PV}" - sed -i -e "s:\.\.\/freetype2$:../freetype-${PV}:" Makefile || die - # Disable tests needing X11 when USE="-X". (bug #177597) - if ! use X; then - sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die - fi - fi - - if use prefix; then - cd "${S}"/builds/unix - eautoreconf - else - elibtoolize - fi - epunt_cxx -} - -src_configure() { - append-flags -fno-strict-aliasing - type -P gmake &> /dev/null && export GNUMAKE=gmake - - # we need non-/bin/sh to run configure - [[ -n ${CONFIG_SHELL} ]] && \ - sed -i -e "1s:^#![[:space:]]*/bin/sh:#!$CONFIG_SHELL:" \ - "${S}"/builds/unix/configure - - econf \ - $(use_enable static-libs static) \ - $(use_with bzip2) -} - -src_compile() { - emake - - if use utils; then - cd "${WORKDIR}/ft2demos-${PV}" - # fix for Prefix, bug #339334 - emake X11_PATH="${EPREFIX}/usr/$(get_libdir)" - fi -} - -src_install() { - emake DESTDIR="${D}" install - - dodoc ChangeLog README - dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,*.txt,PROBLEMS,TODO} - - use doc && dohtml -r docs/* - - if use utils; then - rm "${WORKDIR}"/ft2demos-${PV}/bin/README - for ft2demo in ../ft2demos-${PV}/bin/*; do - ./builds/unix/libtool --mode=install $(type -P install) -m 755 "$ft2demo" \ - "${ED}"/usr/bin - done - fi - - if use fontforge; then - # Probably fontforge needs less but this way makes things simplier... - einfo "Installing internal headers required for fontforge" - find src/truetype include/freetype/internal -name '*.h' | \ - while read header; do - mkdir -p "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" - cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" - done - fi - - if ! use static-libs; then - remove_libtool_files || die "failed removing libtool files" - fi -} - -pkg_postinst() { - elog "The TrueType bytecode interpreter is no longer patented and thus no" - elog "longer controlled by the bindist USE flag. Enable the auto-hinter" - elog "USE flag if you want the old USE="bindist" hinting behavior." -}