Version bump. Added fontforge USE flag to install internal headers.

(Portage version: 2.2_rc23/cvs/Linux i686)

3 files changed, 136 insertions, 1 deletions

diff --git a/media-libs/freetype/ChangeLog b/media-libs/freetype/ChangeLog
index d425868eccd2..6370921b1166 100644
--- a/media-libs/freetype/ChangeLog
+++ b/media-libs/freetype/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/freetype
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.205 2009/01/06 19:09:04 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.206 2009/01/21 16:06:10 pva Exp $
+
+*freetype-2.3.8 (21 Jan 2009)
+
+  21 Jan 2009; Peter Volkov <pva@gentoo.org> metadata.xml,
+  +freetype-2.3.8.ebuild:
+  Version bump. Added fontforge USE flag to install internal headers.
 
   06 Jan 2009; Ryan Hill <dirtyepic@gentoo.org> metadata.xml:
   Remove myself from metadata.xml. It's actively maintained now and any
diff --git a/media-libs/freetype/freetype-2.3.8.ebuild b/media-libs/freetype/freetype-2.3.8.ebuild
new file mode 100644
index 000000000000..bfb0f1c88e7c
--- /dev/null
+++ b/media-libs/freetype/freetype-2.3.8.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.3.8.ebuild,v 1.1 2009/01/21 16:06:10 pva Exp $
+
+inherit eutils flag-o-matic libtool
+
+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 ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="X bindist debug doc utils fontforge"
+
+DEPEND="X?	( x11-libs/libX11
+			  x11-libs/libXau
+			  x11-libs/libXdmcp )"
+
+# We also need a recent fontconfig version to prevent segfaults. #166029
+# July 3 2007 dirtyepic
+RDEPEND="${DEPEND}
+		!<media-libs/fontconfig-2.3.2-r2"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	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
+		# Bytecodes and subpixel hinting supports are patented
+		# in United States; for safety, disable them while building
+		# binaries, so that no risky code is distributed.
+		# See http://freetype.org/patents.html
+
+		enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING
+		enable_option TT_CONFIG_OPTION_BYTECODE_INTERPRETER
+		disable_option TT_CONFIG_OPTION_UNPATENTED_HINTING
+	fi
+
+	if use debug; then
+		enable_option FT_DEBUG_LEVEL_ERROR
+		enable_option FT_DEBUG_MEMORY
+	fi
+
+	enable_option FT_CONFIG_OPTION_INCREMENTAL
+	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
+
+		# Disable tests needing X11 when USE="-X". (bug #177597)
+		if ! use X; then
+			sed -i -e "/EXES\ +=\ ftview/ s:^:#:" Makefile
+		fi
+	fi
+
+	elibtoolize
+	epunt_cxx
+}
+
+src_compile() {
+	append-flags -fno-strict-aliasing
+
+	type -P gmake &> /dev/null && export GNUMAKE=gmake
+	econf
+	emake || die "emake failed"
+
+	if use utils; then
+		cd "${WORKDIR}"/ft2demos-${PV}
+		emake || die "ft2demos emake failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc ChangeLog README
+	dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,*.txt,PATENTS,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" \
+				"${D}"/usr/bin
+		done
+	fi
+	# Probably fontforge needs less but this way makes things simplier...
+	if use fontforge; then
+		einfo "Installing internal headers required for fontforge"
+		find src/truetype include/freetype/internal -name '*.h' | \
+		while read header; do
+			mkdir -p "${D}/usr/include/freetype2/internal4fontforge/$(dirname ${header})"
+			cp ${header} "${D}/usr/include/freetype2/internal4fontforge/$(dirname ${header})"
+		done
+	fi
+}
+
+pkg_postinst() {
+	echo
+	ewarn "After upgrading to freetype-2.3.5, it is necessary to rebuild"
+	ewarn "libXfont to avoid build errors in some packages."
+	echo
+	elog "The utilities and demos previously bundled with freetype are now"
+	elog "optional.  Enable the utils USE flag if you would like them"
+	elog "to be installed."
+	echo
+}
diff --git a/media-libs/freetype/metadata.xml b/media-libs/freetype/metadata.xml
index 053f22d29830..9be40677c940 100644
--- a/media-libs/freetype/metadata.xml
+++ b/media-libs/freetype/metadata.xml
@@ -3,6 +3,9 @@
 <pkgmetadata>
   <herd>fonts</herd>
   <use>
+	<flag name="fontforge">Install internal headers required for truetype
+	debugger in <pkg>media-gfx/fontforge</pkg> (built with
+	USE=fontforge-debugger)</flag>
     <flag name="kpathsea">Enable TeX support (ttf2pk and ttf2pfb)</flag>
     <flag name="utils">Install utilities and examples from ft2demos</flag>
   </use>