Version bump. Mostly fixes for regressions in 2.3.6.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.26-rc8 x86_64

3 files changed, 131 insertions, 5 deletions

diff --git a/media-libs/freetype/ChangeLog b/media-libs/freetype/ChangeLog
index f73d4b89ec61..9e03b64fd0da 100644
--- a/media-libs/freetype/ChangeLog
+++ b/media-libs/freetype/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/freetype
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.188 2008/06/29 10:19:09 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.189 2008/06/29 17:50:00 dirtyepic Exp $
+
+*freetype-2.3.7 (29 Jun 2008)
+
+  29 Jun 2008; Ryan Hill <dirtyepic@gentoo.org> +freetype-2.3.7.ebuild:
+  Version bump. Mostly fixes for regressions in 2.3.6.
 
   29 Jun 2008; Torsten Veller <tove@gentoo.org>
   freetype-1.4_pre20080316.ebuild:
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index 0435b0cd7469..8ee3c2ac18de 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -21,24 +21,28 @@ DIST freetype-2.1.10-security_batch-r1.patch.bz2 10300 RMD160 3994ed6bd5fc3c1e09
 DIST freetype-2.1.10.tar.bz2 1037107 RMD160 3d31d548632f14784283c97ece64c7425efc3975 SHA1 f9e5c52e466c3e41483d5d6d44b4f3135a9c4b16 SHA256 fed2ed148d7d105b95493c5e95561c8b05ee7909e00f828f036d8ed1be6a5e53
 DIST freetype-2.3.5.tar.bz2 1279861 RMD160 2a97cb1c3d93572c094d5d2890d12445ef2786d4 SHA1 45695d44c74be31944d807526a7e69a818e4afd2 SHA256 1b357a3a1106c78c80dfd25e3854c3faa9a3dfc7063a4a1e5404e70c241d677e
 DIST freetype-2.3.6.tar.bz2 1305717 RMD160 8047e734804191856a941e19f6acf82047099d66 SHA1 611bae913e8a593449a4dc60e0bf3300abc4f974 SHA256 d5a698c30376d14c1ce6540ed6d5627796421e6e97576620ea4562411a110e77
+DIST freetype-2.3.7.tar.bz2 1310542 RMD160 7333507c5f42d451bf0541f007fe44165f090418 SHA1 f16f849d6e739ce8842008586af36371a32ac064 SHA256 4ecf879eb69fc323669981f02aebff1e3045de415303e86ee67f2080cb3ee888
 DIST freetype-doc-2.1.10.tar.bz2 163725 RMD160 fef03cfdf83c8980a8b16fe7a2b9bb139f6f62a9 SHA1 27dc706f167ba21b9892e7d36b60d5a2764f905a SHA256 2bfdca5fd7bb44fe80c41b12998dc044418038e69c828b0e2c31d79d72d1117c
 DIST freetype-doc-2.3.5.tar.bz2 98644 RMD160 d0a5cbe51eceb6c4a3a8eaaf4e3d99c2ca02266f SHA1 a3edb74195eee9384d0463104edde4881d73a308 SHA256 9c37aee42427feaaec7a276267f8c8ad771cb81033066bdf452c731fa41e4b0b
 DIST freetype-doc-2.3.6.tar.bz2 98645 RMD160 7c8ad54d46a9f22ca04d95a15ee21281451e96f7 SHA1 0129f5ea7a6efe73d74a62f89a89ced17b042806 SHA256 2b5e6f05859b1bdc10d6d660b4bc5dc91cd0c33a258d982ca86ea3284dcfd4af
+DIST freetype-doc-2.3.7.tar.bz2 98646 RMD160 a4a0c92bb85ea9db9cc822a03c6bdbefff1037f9 SHA1 852918fc87dc2a8a8d7fac03ed3ee9750d695bab SHA256 1d57e0b35ecc37828b6326580cb944fa1408b97d16dbbd26d344c48e47222d20
 DIST freetype1-contrib.tar.gz 538248 RMD160 ba2912ed6afb5ddd5fe930ba16d2ef23f87ec092 SHA1 d6198fe70ef16dbe2365d7971bf8a8975dd5b734 SHA256 95f0af3d6c93b061b389f502411ba639623f85b3e8d6bba6bc474ca7372d5812
 DIST ft2demos-2.3.5.tar.bz2 157557 RMD160 7620d829a86d4125bc08d949cee13f8c383f6d88 SHA1 c528287137b534c38d0c2b94d3e76e6f9e8ff915 SHA256 f86d0d2906a2520d70460336002d20346c5013a973f3cedd049246715cef8e9f
 DIST ft2demos-2.3.6.tar.bz2 158332 RMD160 776dbf3eac26e602091bd4e3dfc8b07ca7a52aa0 SHA1 f2b88207c7c2424a315a03f36b6ad52555ef2cfc SHA256 3a232cd0719ad01301eab90fcf05fd4206a32a973a9c7d5b5c6a01dd32fc6cb6
+DIST ft2demos-2.3.7.tar.bz2 158328 RMD160 a68483711d1ef1867361fe7f74745df982cdbf09 SHA1 e7c7f2a2077b055d0ad11bdc90bc2ebd0d879b5e SHA256 944f0d24df4706c8a077c5d184a42822aaa0a2fbb8b67abe7c0d6920317cd499
 EBUILD freetype-1.3.1-r5.ebuild 3271 RMD160 1d83221c1d429da9d3f32c1c103cf11a21c9d35a SHA1 87c9404f6f2ef07a87dc3948d88bf3346b829259 SHA256 4a6887774ec8cfee8a27000696a7219819e23e36580c6efc840b563b72af3e98
 EBUILD freetype-1.4_pre20080316.ebuild 3200 RMD160 00a80ba92a5dd60c7e05ed4c280a62d2d30f1bf2 SHA1 0caf0e716ec4d822993b0448e2da79acb540079b SHA256 7b993b75483603ec0889dfb2b6da67e68a807d0dafbbc9de99ffc1f361661360
 EBUILD freetype-2.1.10-r3.ebuild 2304 RMD160 ef35e9ca9caa02fb428c0df72e56d57770e48f3b SHA1 6d9c672fdcc174f362338dd12e5e1a60f223af46 SHA256 6a2a0e3d214755a501ccab1f94950ec3624b50fdd614168a80a85a632e16dbe9
 EBUILD freetype-2.3.5-r2.ebuild 3259 RMD160 a3f00c95b97eea8930bb107a076a52299c30007e SHA1 8586435b258e455c0a9f5eef85932f380ab97ba7 SHA256 35b7a4eb11c52ddd7297e031ae09e681fb08974a8885800c2a0f00249c0a5a2d
 EBUILD freetype-2.3.6-r1.ebuild 3257 RMD160 027fe955a3374bacfba6a3601063210d0db76ba1 SHA1 fec92632a2d8795215dd6670688959f6a57a910f SHA256 19a47d3aa6ec9bac56f8a6d8e2c7454b72d51ff757e9bdf214f0efdc13eaec40
 EBUILD freetype-2.3.6.ebuild 3198 RMD160 6015bef3b39a3875e835e2a281db299d9f44b601 SHA1 6c781e5470b8369e6e07187b044cedd703f5aac4 SHA256 1fa9eedee51da5992ba7ed2564efcb64884826bd6faa4facd124e647b49eec33
-MISC ChangeLog 28707 RMD160 6dd4bd05f79746b93d88422d7a683e6eb670081a SHA1 0e93e06e266598b7e64f4d0ef8745598606f9a27 SHA256 71d1ffb8fc174618c2ef6430215c1f925cbf815abffd4d2222ee228bbebaa1bd
+EBUILD freetype-2.3.7.ebuild 3205 RMD160 cfea71c3444f31a9a3381ddb7e9c8848c02f32a3 SHA1 aa6fb00b6ec440a77fedcc9d363d836f0ae5eb80 SHA256 d08bf5a047071ec66d400d823726bd6a417377243f88bab4d0a1eb040da862b9
+MISC ChangeLog 28871 RMD160 ec2ea1bb05d9c43cb2c6db8b74185801d6205362 SHA1 24b8e32251383cf596843f62c7d13bfc2c33eac3 SHA256 24362e91b5869d356dd16c3e47e18cea7853acf6ac5f7cef318005c5fed410d0
 MISC metadata.xml 294 RMD160 bdd1ff0021461f60ca339328cbf2f5d6e43dfab1 SHA1 06b1fc585d6f6b8653d51f820bb053af86201c66 SHA256 257ee4e67ab59aceaa72c8eafe7c7722368c3e90f766a94efc0db3d39808ec6d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhnYaQACgkQV3J2n04EauyUgACfb7+AIVf6+ueaArKJA4tj+sSZ
-1BkAn16mBwemmYJL+4ezM62pPwIZNfc0
-=ufhE
+iEYEARECAAYFAkhny1YACgkQiqiDRvmkBmKnzACaAo5UHzatUnz4CeHv1hYXuNIx
+1JAAoIrfYKVh5XbcqfA3+13NaQSuoNVs
+=V0Mj
 -----END PGP SIGNATURE-----
diff --git a/media-libs/freetype/freetype-2.3.7.ebuild b/media-libs/freetype/freetype-2.3.7.ebuild
new file mode 100644
index 000000000000..3f39934221b2
--- /dev/null
+++ b/media-libs/freetype/freetype-2.3.7.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.3.7.ebuild,v 1.1 2008/06/29 17:50:00 dirtyepic 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"
+
+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 || die "econf failed"
+	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
+}
+
+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
+}