gentoo resync : 11.05.2018

3 files changed, 238 insertions, 3 deletions

diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index f16bb4478721..dc445109c7bb 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -10,7 +10,8 @@ DIST ft2demos-2.8.tar.bz2 225274 BLAKE2B b8b02b8b03b84709b7d274d1c8dff323051051c
 DIST ft2demos-2.9.1.tar.bz2 233462 BLAKE2B c689942b222b2c600b5ec3963791621ae87acefb9b01caa5dc35af52525d03e3a1094e48c0789d5eaabbce787bddd7c3055e12454e54ea3c7fae92bca47614de SHA512 38bee59184b20c2eb983deaa5c1f241e31c1b4793e47dc06b1b419601489cfece3b11fde4cf4fb6c5af12254ad0c1ce9a1547885c208e8e715655e9c48f22a46
 DIST ft2demos-2.9.tar.bz2 230926 BLAKE2B 8c8e02101243468d52953aeeee7ad985a5aa3fabc82c19a3404ce301348fd32e5f89aa56798613658d5d29a8c3a6c7d4a70eae038ef6095005f8c10354b3f288 SHA512 3dfaf97619d585d6e4db20002c69f9c46cb8991c4faf86d9d92884a80001235ef01010148156cb4879d7869e6121fc27ef03c13288af011df26fe85c3fb7e6a1
 EBUILD freetype-2.8.ebuild 5276 BLAKE2B ab6ab026dec672db2407ace0cb9b3037cee83b2100f3432ee1ec140754f6a204449590a07dc82789d7b53fdb1ca3834852bec506763bc7dcafd852abdbb78889 SHA512 2d38568b0d55fbbb8e54600c5c1ce75088faa47009982840ed5e287b33e3cefe110e7ea3f00e22bee30b348d40af73a30f86724d6e21364aaa9aa1c476831a68
-EBUILD freetype-2.9.1-r1.ebuild 6659 BLAKE2B 0201fee0a5459e361c12bc3d0c67e31ac99c86af837c1d23eee60d00372a54d68a2953d169491267ade78b6a038accc4fdc66e73bf80381c4b2b70738c7af8eb SHA512 826b44091c3bf85f63241a4fe678069a9613c7477b46e377d4d15b55d17d403452ec6aecd851bf4cbb27843c19833397c98b39ba7a5d71d1a3378e02ea6d0f1d
+EBUILD freetype-2.9.1-r1.ebuild 6657 BLAKE2B cc3b2f8bcc0c3c10ce70936d66074654763f290d4a288c8b1a650dedc08b016f70908501ddf5c7a01bab283917e2e524899029c42748aa8133359184c7d5d69e SHA512 660dc53ed5e0e0a723cbff7d3319d3d0b0a3979d2a88ca6ee6f298be51900eb06de8f14dc1e37b06a2f1675f8f69be6a358e08bdf11385c6e623d8290fce5ee2
+EBUILD freetype-2.9.1-r2.ebuild 6659 BLAKE2B 0201fee0a5459e361c12bc3d0c67e31ac99c86af837c1d23eee60d00372a54d68a2953d169491267ade78b6a038accc4fdc66e73bf80381c4b2b70738c7af8eb SHA512 826b44091c3bf85f63241a4fe678069a9613c7477b46e377d4d15b55d17d403452ec6aecd851bf4cbb27843c19833397c98b39ba7a5d71d1a3378e02ea6d0f1d
 EBUILD freetype-2.9.ebuild 5288 BLAKE2B 439147ccd14d1fa1b022c491fbc6233fa86b1f545229b3abb85d2f186f53b26fd8098d228588c843801cb343b9fa3a615f25663a432c0c96a8f1cd4c949b25bf SHA512 47904142a2fd8c80658f18a472f6838926434297d8b39f243e6fa19e9a0f7896130d2e6e7337bb7ad8ad5b71b819b5c6de3cfff7a82d5563985c4c28e0c21b26
 EBUILD freetype-9999.ebuild 6659 BLAKE2B 0201fee0a5459e361c12bc3d0c67e31ac99c86af837c1d23eee60d00372a54d68a2953d169491267ade78b6a038accc4fdc66e73bf80381c4b2b70738c7af8eb SHA512 826b44091c3bf85f63241a4fe678069a9613c7477b46e377d4d15b55d17d403452ec6aecd851bf4cbb27843c19833397c98b39ba7a5d71d1a3378e02ea6d0f1d
 MISC metadata.xml 1363 BLAKE2B 2cadaca7ada476301e4fa15dabaf7e823a9bcf6e59fb018876e3d2ca61c528c7096cb65ac44d8311a8e9a5eada744f41db3ca2960622980a8f5438d2f003202c SHA512 a9272c439ffb4c9ca6597b2ef26e86e99830ff298940abf38fdecf5c8d794ffdb96a212c67e2e23526a0e2686deff48664da4a5af01d2977256038846e7221f8
diff --git a/media-libs/freetype/freetype-2.9.1-r1.ebuild b/media-libs/freetype/freetype-2.9.1-r1.ebuild
index f8e4fb37a31a..af4cd85ca024 100644
--- a/media-libs/freetype/freetype-2.9.1-r1.ebuild
+++ b/media-libs/freetype/freetype-2.9.1-r1.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" != 9999 ]] ; then
 			mirror://nongnu/freetype/ft2demos-${PV}.tar.bz2 )
 		doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2
 			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.bz2 )"
-	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"
+	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"
 else
 	inherit autotools git-r3
@@ -162,8 +162,8 @@ multilib_src_configure() {
 	type -P gmake &> /dev/null && export GNUMAKE=gmake
 
 	local myeconfargs=(
-		--disable-freetype-config
 		--enable-biarch-config
+		--enable-freetype-config
 		--enable-shared
 		$(use_with bzip2)
 		$(use_with harfbuzz)
diff --git a/media-libs/freetype/freetype-2.9.1-r2.ebuild b/media-libs/freetype/freetype-2.9.1-r2.ebuild
new file mode 100644
index 000000000000..f8e4fb37a31a
--- /dev/null
+++ b/media-libs/freetype/freetype-2.9.1-r2.ebuild
@@ -0,0 +1,234 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic libtool multilib 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.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 )"
+	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"
+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}
+	virtual/pkgconfig"
+PDEPEND="infinality? ( media-libs/fontconfig-infinality )"
+
+PATCHES=(
+	# This is the same as the 01 patch from infinality
+	"${FILESDIR}"/${PN}-2.7-enable-valid.patch
+
+	"${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.savannah.gnu.org/r/freetype/freetype2.git"
+		git-r3_src_${phase}
+		if use utils ; then
+			EGIT_REPO_URI="https://git.savannah.gnu.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 fetch
+}
+
+src_unpack() {
+	_egit_repo_handler unpack
+}
+
+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
+
+	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 '*.a' -o -name '*.la' \) -delete || die
+}