Add harfbuzz useflag to prevent circular dep (bug #504544)

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x0F9C590B7FF324F6!

4 files changed, 193 insertions, 18 deletions

diff --git a/media-libs/freetype/ChangeLog b/media-libs/freetype/ChangeLog
index f36d2b22cd31..70e115f41a72 100644
--- a/media-libs/freetype/ChangeLog
+++ b/media-libs/freetype/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/freetype
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.390 2014/03/12 09:55:55 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.391 2014/03/16 10:38:24 yngwin Exp $
+
+*freetype-2.5.3-r1 (16 Mar 2014)
+
+  16 Mar 2014; Ben de Groot <yngwin@gentoo.org> +freetype-2.5.3-r1.ebuild,
+  metadata.xml:
+  Add harfbuzz useflag to prevent circular dep (bug #504544)
 
   12 Mar 2014; Ben de Groot <yngwin@gentoo.org> -freetype-2.4.11-r2.ebuild,
   -freetype-2.4.12.ebuild, -freetype-2.5.2-r1.ebuild:
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index b100e9ac027f..46129dffc3ab 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -24,25 +24,26 @@ DIST ft2demos-2.5.0.tar.bz2 172671 SHA256 490c3487561119c60b874ae2df5c27fedce320
 DIST ft2demos-2.5.3.tar.bz2 186773 SHA256 e6c9d0b344b88ff5ab25f20640cf78e2ec56bb81a89d1cd1716839357f646c8a SHA512 b239d6b7c1f4c0fa4137a97ab27834f296572a1d086247f1cb8ed01c7d1b3f54137ebfce1eea6f4a209079460ae2686d743097be5ab01e5bb108cf0d55361f4d WHIRLPOOL 0ceb42eca210814286a84cf0f066483ada3c7a9f97310051c5dfb1f1f6249608444c5d16400f5ce781073a303f70299226e9e8554882bd65ceb436b2f80ece2c
 EBUILD freetype-2.4.11.ebuild 4184 SHA256 c7a637f1161d606ec42332d888e67b6fa813ade4c863e7ef85beddb404bca6f5 SHA512 7232602852711d59ec4d8a719d4c57836400fd04b86b07e37860a51c62b624dbd734b593f37a8784df74de7aea39a639cba3d783f4fd8f8be7286946fab2d53b WHIRLPOOL 449e1643be0c3776bf7b415664192436cd996b7dbac3a07b17274aeec6555453c1c6301d23587ebbf676ffb08ac3bb4bb90750de91439d5da0bf9879bbc8709a
 EBUILD freetype-2.5.0.1.ebuild 5086 SHA256 ec3fb8395cdfe31952fbb34022af99da9e7597b35400d1bd893dcfc8b1b4ed54 SHA512 9bea80feaa79ab35349a9804da379040e0e574ee7184061cce37f9e8576aef4acec4d29909ee3ca8fb66f41bf45ef3d19ffeeac3605a6acc43d2645fe1859957 WHIRLPOOL 6981017c06d31c3a107fc0dd838fd6dfa7807ab8b5e5efb00448a114bec7c4ac1648761b639dd130517cce3028e4053a3140c655af0dcab6a3aa2ca2cc79af75
+EBUILD freetype-2.5.3-r1.ebuild 5169 SHA256 4656347b02af4950deace7db09c810839aaa4089e4af845c7b274391520b61e6 SHA512 56f070919ecb63edac7bbf0ddeb40b656bc363a90e57f0c09a6833ec07eac6abb18e2ad83531de78c58c72a0f4d4b56b90c82c32fb6b557590c1e7c90c27b045 WHIRLPOOL 911ff23831579c3aa4d5d05db885bd47a1d4d3d0549cf6ff3ce16dee14f7b962dc83c2406abb994787a671e911d000d8fe96f3d03bdced5fa0161abb613dbf80
 EBUILD freetype-2.5.3.ebuild 4733 SHA256 b2d07fbc6d39b99e00e1ef80a3589c003bf53192647e9a8435d31fddbda90f14 SHA512 5b539efa1e8a5660b6f5281e77f056ab4563d2234299ef97388d389016688924c39046f9acd9b83f8564db946e70eff7f2a8ba0ea8b32b089ed7017d6e3d0a2d WHIRLPOOL 7a091412282627dbdaf35acc449583e8d01ab02d1977747386727c4bda1d3cde950912e08d705395fedd4c04af8b800004bec56fb546ea5bed56f4da242bed80
-MISC ChangeLog 59091 SHA256 d33d61890e653c96146e4b6979e69c7090d9490635897a084f2198eca106dd5b SHA512 b06c6ee0a4a8cc97a0f4a4cc48bb4a9bd17e6e804c4f71beccae6978924c7032175d55fb6fe659e098168457d2bc623364e7e229c289ab8366041d839bd8de56 WHIRLPOOL 1e7abba5757e5aaaa713801a2717acf516f8b58e97a0e0c450374102708ba5da8c0d79f25b0ea161862df140d5401c51e48a89ca6d9a55fb494c0c499de8ef90
-MISC metadata.xml 1251 SHA256 e6e1c72eb60cdd358b3828e219bfa28004e1f22adcbeefe86c550d4bf4665c3a SHA512 f409e8f5e4736f5b4e874c64072d276ac685ab356e1a096bac43586a7c090ebb48a0aa4976901fd9956dd58ed8bd75f3d260ce7ed4dd443f283e2cf3e89af2ab WHIRLPOOL 500f61d34b636d15ad16ae1e459105b1cbad6286d81109441356b76163fad39509010654460eda819725e1972d8e997115975ef79c712671125f6822043d597c
+MISC ChangeLog 59278 SHA256 25e341c30bcf916f0a4c9e8c3a9f0d3672e0d296a8ed167c61d56f13121e7b29 SHA512 b4b9c6dbd2e2b1fd2342d17c3215c3afd57dd52a972cba808ac68f1edb9e5b1d5a41307e905a338d0c4c7301ee8b0b1f4151d0d6aae8a86019e3a58568a19409 WHIRLPOOL 5aced28af1a251848536121e827998308be0b13f5ec0ad34b06be51c369c8033ddf048264cceca2bb86186f85043c3254d73d0572e69e89bd6b9ac8ba5d6adfd
+MISC metadata.xml 1400 SHA256 65a92662484be603be8adae907f727219ca78e4cb042350d2741c2fa03fde8a7 SHA512 e3052be471b660ff82261b8cf055a2ae20421d51c0ecdbc31a777aabab3708578012682e01b8b7d200cdd53bf980b4515de68196aac5711a2fd4a8799c1051a9 WHIRLPOOL 3bb9331dde6579280d3b673b62d6086f142a23210f40ab2c3a0cedfed39b067c5d2bf5eed3055f03071e650822723ce919d6a938ada5276c38d05265d71dc828
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTIC8zXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTJX8mXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyOTZFRkUxOEEyRDM1Qzc2QTY0M0Y2QjQw
-RjlDNTkwQjdGRjMyNEY2AAoJEA+cWQt/8yT24oMP/1ldma4T7eiH8YW0s2Y+eyBH
-TG662+VLSRdR7/T8UAY7jstSwaWjI+xwH4t6iq436Tcw+7APjmQMpABN5Duu/RO/
-IMngY61tVqU3DG+FLft31LSspznZ05Fi9zNa3UFHExPQN7+OfFA1xQVJajJFW/9S
-Npaxo7UVhjJBCShIMfnxHj8K2ItxOPXuYk6nNXZmRBM+cwap8dtfSZPlzERULGQ2
-69h1lZQfDJ+ehsynsfVEQArMp/JYqWQ8mwl78MADh+jpg3aKxiuY6lw3hdhK8K7d
-0gssZ4jN0UDnB1q5Lq+OrVd5gI/zX5/fwwCyCtQQ4PfgvdCOO6/Lgfs2Md1mHeCa
-gSbAqipf2XMSgoT/WBF3sQx7gWKdV2+miPOwxnnOF+Sm4vqEm402eUqYbGPVX5yv
-koQcOeoUP8ovMeJ99UQ2glOBpt5ZB1oPwZR+pX8ML1152nFNdBFHCYrvsVQof0cI
-K937ggI3+X23Twuu+ZYStzXMi6vwbdqzRL9ur7WaMkS+ptx9EtTpORKkpKgBVlR1
-gVtDWe2kUleC3FWxIDqQbCr99708atxSQfIbn7LoKQl4o9AdMS8uW2fFO/6PRWcH
-8s69/EZZegemOYoqK52VjOxgckjrVEdwUhWLHYS2aX/hid+Ylf/HtnNAUaGGkOQZ
-JGKuN+yyVtY+HwkeaF3h
-=4n1N
+RjlDNTkwQjdGRjMyNEY2AAoJEA+cWQt/8yT2rlgP/1ORHCGJ3wf3DXAUv5BslaDW
+j5nqvBAUK/1B9UPpYoPXHra4Q1ulMtvPKmUbqdNInVPG5Ii8nSsi8Y4NWIS06dSx
+pA/uOe/RCPBMcxSQ7sOXI0MQs/NnfKbIPlGKZQ27Stt2GLW1gYUz7SS8y7nn1OeS
+yEmM/5tAArpjqOl4B5bEPU4LBa0Ymxw7mknUws8rcuN1rGvswujEn7X8rZfB34sm
+3D1sQ6Js8Pg0uFMDS8uO0Q0dHa/2/EnI0hCN3+XqSoEZXSmFj3CwYlY0JHHCvsq6
+RwEs8HaocWEiv02J/QgFXEE9lYb7QU4R8fYOAcSjTiAYaVNgxYYug/oJkwZYjo/4
+ZqWl5dtEhBWMTfAU3iUQ4T5K16u9emFzx9eYQdcs4Pu5RrbEnv8qD0UIUQ6uIfEA
+MAWTX8KdYbbAuhniW+9dYGL+ngZ2ZkEStpOrErepom8iS9F6iI9RvAqWxtQpQAz0
+63Vb8wzGC8HehnV/UFL498mIYcS0kR1p1H/BHFkCQ8VuqP+q3skLdnlU+D5JeR6D
+BxD/5rmKFeNuK8mh0T4jIfOl2vGhhnSwZNs5jshXnRwbUCMp+k0YlIeH3wy/5Za9
+rZGeZvhKfdWjXgU+1kUrf6KJUQPauFGmwTE+tSDbMuieHRS8AEVgD6vQ8tVa2ZYs
+zbXQBY9XEaLoh3lMtsZv
+=igzB
 -----END PGP SIGNATURE-----
diff --git a/media-libs/freetype/freetype-2.5.3-r1.ebuild b/media-libs/freetype/freetype-2.5.3-r1.ebuild
new file mode 100644
index 000000000000..b79b598d0b33
--- /dev/null
+++ b/media-libs/freetype/freetype-2.5.3-r1.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.5.3-r1.ebuild,v 1.1 2014/03/16 10:38:24 yngwin Exp $
+
+EAPI=5
+
+inherit autotools-multilib flag-o-matic multilib toolchain-funcs
+
+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 )
+	infinality? ( https://raw.github.com/bohoomil/fontconfig-ultimate/ddda669247330d1a1b8c9473cfe5052d42e1b313/01_lib32-freetype2-iu-2.5.1-2/infinality-2.5.1.patch -> ${PN}-2.5.1-infinality.patch )"
+
+LICENSE="|| ( FTL GPL-2+ )"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~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="X +adobe-cff auto-hinter bindist bzip2 debug doc fontforge harfbuzz
+	infinality png static-libs utils"
+REQUIRED_USE="harfbuzz? ( auto-hinter )"
+
+DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]
+	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+	harfbuzz? ( media-libs/harfbuzz[truetype] )
+	png? ( media-libs/libpng[${MULTILIB_USEDEP}] )
+	X?	( x11-libs/libX11[${MULTILIB_USEDEP}]
+		  x11-libs/libXau[${MULTILIB_USEDEP}]
+		  x11-libs/libXdmcp[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}
+	infinality? ( media-libs/fontconfig-infinality )
+	abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )"
+
+src_prepare() {
+	enable_option() {
+		sed -i -e "/#define $1/a #define $1" \
+			include/config/ftoption.h \
+			|| die "unable to enable option $1"
+	}
+
+	disable_option() {
+		sed -i -e "/#define $1/ { s:^:/*:; s:$:*/: }" \
+			include/config/ftoption.h \
+			|| die "unable to disable option $1"
+	}
+
+	if use infinality; then
+		epatch "${DISTDIR}/${PN}-2.5.1-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 auto-hinter; then
+		disable_option TT_CONFIG_OPTION_BYTECODE_INTERPRETER
+		enable_option TT_CONFIG_OPTION_UNPATENTED_HINTING
+	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.3.2-enable-valid.patch
+
+	epatch "${FILESDIR}"/${PN}-2.4.11-sizeof-types.patch # 459966
+
+	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
+	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_build_binaries && 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_build_binaries && 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/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}
+	use doc && dohtml -r docs/*
+
+	prune_libtool_files --all
+}
+
+pkg_postinst() {
+	if use auto-hinter && ! use harfbuzz; then
+		elog "To improve OpenType font hinting with the auto-hinter, the harfbuzz"
+		elog "useflag needs to be enabled for ${CATEGORY}/${PN}."
+		elog "See the INSTALL.UNIX file in the doc directory of this package for"
+		elog "more information."
+	fi
+}
diff --git a/media-libs/freetype/metadata.xml b/media-libs/freetype/metadata.xml
index 8ae3853b3034..28c85b3d1ee3 100644
--- a/media-libs/freetype/metadata.xml
+++ b/media-libs/freetype/metadata.xml
@@ -13,7 +13,8 @@
 	<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>
+		<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>
@@ -23,6 +24,8 @@
 		<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>