Version bump.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/media-libs/freetype/ChangeLog b/media-libs/freetype/ChangeLog
index 849949cc7f77cd14ba81b32814999710ec30c7ed..6309a870c28f9e9e9b8bc1ee082e4ca19b72bc45 100644 (file)
--- a/media-libs/freetype/ChangeLog
+++ b/media-libs/freetype/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/freetype
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.253 2010/06/19 17:11:43 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.254 2010/07/15 05:32:36 dirtyepic Exp $
+
+*freetype-2.4.0 (15 Jul 2010)
+
+  15 Jul 2010; Ryan Hill <dirtyepic@gentoo.org> +freetype-2.4.0.ebuild,
+  metadata.xml:
+  Version bump.
 
   19 Jun 2010; Raúl Porcel <armin76@gentoo.org> freetype-2.3.12.ebuild:
   alpha/arm/ia64/m68k/s390/sh/sparc stable wrt #320715

diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index 9cf54a6c19b6babc39299be0de9074734619e5ff..b69d971224a69512f84b41daed4718c5e0d7db31 100644 (file)
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX freetype-1.4-glibc-2.10.patch 2377 RMD160 d975058636f69cf061704a866fc83d5068f8aa79 SHA1 7644c03725bc248d49cfa43ac6d362227b1b79e1 SHA256 60d41048bd11a024c041a24a424c9663b4debe3ab188db400928925b71039d4a
 AUX freetype-1.4_pre-contrib-destdir.patch 3679 RMD160 96f79dbd53bc0b2d24739e87481b27b6247d6d2c SHA1 c9cb6dc45f25d419f3ee0155e564deb1e203cf5b SHA256 8d99ce9264a83033d6df455488e80e763f3774b74a97b27c321b5c018076cad2
 AUX freetype-1.4_pre-malloc.patch 494 RMD160 179fb32b4a0181d453b3773ef97f5224d8e623b0 SHA1 15a6267c3c74a350380a448114ff49787663ff10 SHA256 a69ea481382974172440bc717d29ae3480cf119175c9d2411385118ec5cffde6
@@ -14,15 +17,26 @@ DIST freetype-1.4_pre20080316.tar.bz2 1199805 RMD160 5fb5b0737de968602008991c80d
 DIST freetype-2.3.11.tar.bz2 1446474 RMD160 ac69ed97aa662bc1dfb25422e64fc2afce1f863d SHA1 693e1b4e423557975c2b2aca63559bc592533a0e SHA256 8a033b1e6018a1e9ea381b09b2347b02c6686bdf7e4ee86a6714b6b90f1e2ec9
 DIST freetype-2.3.12.tar.bz2 1453034 RMD160 57437a2bc0d85859cff2ca1253b36e64629397a1 SHA1 ebf0438429c0bedd310059326d91646c3c91016b SHA256 3b96438f016a62b676c1d2089c00ca777f710d19f6aefa66ccf068d360db3e92
 DIST freetype-2.3.9.tar.bz2 1363190 RMD160 c0351c2a3f43e64d26d2a964b1131a3dbf2fa162 SHA1 db08969cb5053879ff9e973fe6dd2c52c7ea2d4e SHA256 51a033bce9904d73e0821e8e2bba24bd319619d7d1b2e9eeccac611580242ab6
+DIST freetype-2.4.0.tar.bz2 1432100 RMD160 f51988f58d882ca213b72492f2033b7e07f82f65 SHA1 4cbb92847b90da5babdaaab260cc09e801a60e74 SHA256 98d64deaa4f4ed743852ad15d31ec2a044dc3e0a425551c10168215088c6d9b3
 DIST freetype-doc-2.3.11.tar.bz2 104260 RMD160 c57fa7ba7a9c3744d7825eb7613507f7cf89d07d SHA1 c0c63423d2316933718d791b5282fc8ba9aa4f58 SHA256 2955083068a410588b84b71c5b393b9b853052bc3ffff0ede07562fe694df860
 DIST freetype-doc-2.3.12.tar.bz2 104320 RMD160 27c3b4f68b9d560060532f1041e9b8c0a574d4f6 SHA1 4f3b2d0f04f23d5430dac4252fc225831c29dd18 SHA256 3c52e4b9c90d67b45fe11a89934ddc2bde44bc8419986583fd1e10acbc21e662
 DIST freetype-doc-2.3.9.tar.bz2 102532 RMD160 4624133b070791ff8dd92cfffb1bb1115393d08d SHA1 ced46581a39f449393bc267f24d0aac08c62559c SHA256 1a06ba5e13c0087cddd1bf0aa7f3622e65389afe3f3beebcd6c76d42b01f8497
+DIST freetype-doc-2.4.0.tar.bz2 104323 RMD160 13a29512f7c26354406c9efe569cd8edda7d1f5f SHA1 f448e48e9791d6e39be6aed86a768e733c504bd2 SHA256 1250165a7b233fb0b54f4e8ed6bb0af7553104c1bcca3df838fb9d75c2f23334
 DIST ft2demos-2.3.11.tar.bz2 159695 RMD160 2fcef4a0f150c5a41c7c0e454543738a468e1b92 SHA1 e4ae1de9419e551291bb9e2d111f574b49bd7c8d SHA256 eefcb3c8886b93f273933d01cf12ac84ac1d9567838b1a9727c72a43e6a314f7
 DIST ft2demos-2.3.12.tar.bz2 159690 RMD160 35654ec57047a46c97e8c14dcda682e40281d998 SHA1 5a50a3f9c0c8f9f5a38c0c9be726631347d6d28f SHA256 f6d588a7ac75823e1e832dfeec65d29d88ec9188db5b45eb1868439a4432b48c
 DIST ft2demos-2.3.9.tar.bz2 159111 RMD160 a2f7bd1d48e087270601d58384e3d5c6c2d39966 SHA1 544572b046965d818826da554a49d13648216008 SHA256 c82dcbdb6581c1b5ab01c166fde238d86c55e457c0bd533f2166b7038639b734
+DIST ft2demos-2.4.0.tar.bz2 160987 RMD160 9073decaf3e1943f72429813e72dd1b8b0dd3c01 SHA1 58993c0bd6f784098252211ee714476678edd492 SHA256 1852cc359e5ac58f516a553a5d049e613340a8da69259aa34eb3802d54113ee6
 EBUILD freetype-1.4_pre20080316-r2.ebuild 3734 RMD160 1ba1368a49c09e720b2ed5256e018f859a84b392 SHA1 2f3125cde9d6d39484faf34e6770bcee4fe442e7 SHA256 3f1825c9d9e28be2d48b566b0407ceda47555bd8528ce60ff6bd927d5af303d2
 EBUILD freetype-2.3.11.ebuild 3473 RMD160 832386fe4e151b01e8344cb9ca7995bdd5599067 SHA1 ae9f0ab514756ff509ef7823b66656dd60997d78 SHA256 cefb7a39316f6e8909cfaba468ca0971bfe238cac8eab850b8c8cadc93cc5c23
 EBUILD freetype-2.3.12.ebuild 3287 RMD160 b3328430a0f7c8c075ededb48ae98ab00e72f8ab SHA1 77c998fe3042e435ed71938546e891061b29b536 SHA256 96acb590afd7c331f19da657976284ac7f322708b827f7ceb8080d08ec4a3e06
 EBUILD freetype-2.3.9-r1.ebuild 3533 RMD160 cdde7d50454b0cf325924fb5cce629e6c5446e3f SHA1 0bdaabeb231824d1d69424b5b65b2024b0593712 SHA256 b50e52c0a1491f492aea371499cb4685645bfc0daa879bbc7dc58f42790fc347
-MISC ChangeLog 38693 RMD160 8fad144fd27c7107aa16cd4fbc697124a05e6299 SHA1 df508583e35cb1fb9367a924d9ea60a1b3fc9e36 SHA256 418713eee34cbb005b270771bbb90dd2b1badf95dce0d7bd2f8a9cc24f6b3e7b
-MISC metadata.xml 483 RMD160 db6b81d684455265c4cf65b0fe5c476ee541a64a SHA1 762e737e04734ed701f40944db1a2f684ed343a1 SHA256 caeb92a6881e5a2389a3aec153f9f049f1c25abb5d98d0e428d691517a2c84ff
+EBUILD freetype-2.4.0.ebuild 3299 RMD160 635fab59c9779ce7cfb657f0b5d26f8630ae623a SHA1 bdcf39d12ebb2d7d6d892fafe5fd1a40260a9a8b SHA256 11715555f38a174f8879a12bd8a2c8ffe4205b85c8c7bf88cb6b8e198634f056
+MISC ChangeLog 38831 RMD160 f5244e0fd6aed9bff4b47f06bca36983fd3ad956 SHA1 9e0dae36dbccfe2679828a1ac5dc46eb30039745 SHA256 747224ea0c0226def7654e73b31191c5921444afa3197d23d128a20bf59611df
+MISC metadata.xml 607 RMD160 876e7ed36a36576541170c5648230f8ed33c5c92 SHA1 32f2a18811819f1810f97665005964f805893eeb SHA256 88c9bca38a1cf56277afdd823aed27d2ef3746cb79f2e55e3cc88d33ee729e72
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkw+nlkACgkQiqiDRvmkBmJrgwCgyS757H/o3W8CNgpK821sHa/E
+bd8AoJmVPU/gg+Rt/U17yl7wMFhhWz9O
+=1dl1
+-----END PGP SIGNATURE-----

diff --git a/media-libs/freetype/freetype-2.4.0.ebuild b/media-libs/freetype/freetype-2.4.0.ebuild
new file mode 100644 (file)
index 0000000..0eddf72
--- /dev/null
+++ b/media-libs/freetype/freetype-2.4.0.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.4.0.ebuild,v 1.1 2010/07/15 05:32:36 dirtyepic Exp $
+
+EAPI="2"
+
+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 ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="X auto-hinter bindist debug doc utils fontforge"
+
+DEPEND="sys-libs/zlib
+       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_ERROR
+               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
+               # Disable tests needing X11 when USE="-X". (bug #177597)
+               if ! use X; then
+                       sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile
+               fi
+       fi
+
+       elibtoolize
+       epunt_cxx
+}
+
+src_configure() {
+       append-flags -fno-strict-aliasing
+       type -P gmake &> /dev/null && export GNUMAKE=gmake
+       econf
+}
+
+src_compile() {
+       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,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" \
+                               "${D}"/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 "${D}/usr/include/freetype2/internal4fontforge/$(dirname ${header})"
+                       cp ${header} "${D}/usr/include/freetype2/internal4fontforge/$(dirname ${header})"
+               done
+       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."
+}

diff --git a/media-libs/freetype/metadata.xml b/media-libs/freetype/metadata.xml
index dc64edaafeb4fe55b412132017df526678296ff9..6e85317f21bea68f8989d651bea39cd940c870b4 100644 (file)
--- a/media-libs/freetype/metadata.xml
+++ b/media-libs/freetype/metadata.xml
@@ -3,7 +3,9 @@
 <pkgmetadata>
   <herd>fonts</herd>
   <use>
-       <flag name="fontforge">Install internal headers required for truetype
+       <flag name="auto-hinter">Use the unpatented auto-hinter instead of the
+       (recommended) TrueType bytecode interpreter</flag>
+       <flag name="fontforge">Install internal headers required for TrueType
        debugger in <pkg>media-gfx/fontforge</pkg> (built with
        USE=truetype-debugger)</flag>
     <flag name="kpathsea">Enable TeX support (ttf2pk and ttf2pfb)</flag>