security bump (bug #448550)

Package-Manager: portage-2.2.0_alpha160/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

4 files changed, 174 insertions, 7 deletions

diff --git a/media-libs/freetype/ChangeLog b/media-libs/freetype/ChangeLog
index 0aa14ea4694c..0010e25f43d1 100644
--- a/media-libs/freetype/ChangeLog
+++ b/media-libs/freetype/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/freetype
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.345 2012/07/30 05:35:32 yngwin Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.346 2013/01/24 15:25:13 polynomial-c Exp $
+
+*freetype-2.4.11 (24 Jan 2013)
+
+  24 Jan 2013; Lars Wendler <polynomial-c@gentoo.org> +freetype-2.4.11.ebuild:
+  non-maintainer commit: security bump (bug #448550).
 
   30 Jul 2012; Ben de Groot <yngwin@gentoo.org> freetype-2.4.10-r1.ebuild,
   metadata.xml:
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index 6aea42a23cc0..fd32a494b59d 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX freetype-1.4-glibc-2.10.patch 2377 SHA256 60d41048bd11a024c041a24a424c9663b4debe3ab188db400928925b71039d4a SHA512 ff86986d7ac58832cd6ebc2371a81ee9610451677f0f5806d3db1c2e97b282c10b641142b3b23bc57d8aa3b21e214b1581536824df69367a701903cb073591b0 WHIRLPOOL 671b3126b2f7e15dd69f1a4c7e2eec160097516c0e07f1bcc3c359315e108b8fff2f4b7879545e9b3ac48eece621a9829a66beff06f8886d89e6c7859f365217
 AUX freetype-1.4_pre-contrib-destdir.patch 3679 SHA256 8d99ce9264a83033d6df455488e80e763f3774b74a97b27c321b5c018076cad2 SHA512 146258f9d820fb2a0f9f7c880909a9ceb08da7e2e6bc1df591178857b9cf42e0c2940feca947864be9ef671988b787404ecba4bce40d7eeebf58f0d25249df7f WHIRLPOOL c5ad3e01d7c6e5ee7348a66ae2559a9ae6fa36bdde8613874108365b695ac07b401befbae6e20c1c58da82bd5260e54f3560bf4c1ca5e349ab0e188ec722f401
 AUX freetype-1.4_pre-malloc.patch 494 SHA256 a69ea481382974172440bc717d29ae3480cf119175c9d2411385118ec5cffde6 SHA512 4a477291fa9fb32a77dec252aedc3fbdd473f309c86732d9a92ab1c8ace56e30eb11e467e25e77285b5836f5ed4ef24a712f748c7adfa553a48b5722185b8e68 WHIRLPOOL 509eba126805bf6791cb5e3c13843101656df837d5e8788824b6f27d5ed87a485bc9d24edf7b92acd8a71bb444874c24d028586afd15f7a458a74bd244b94beb
@@ -14,14 +17,36 @@ AUX freetype-2.4.9-type1-incremental.patch 3213 SHA256 a41b8a606ab53ff84d96e6390
 DIST freetype-1.4_pre20080316.tar.bz2 1199805 SHA256 b88e8827dfeebcd0c663cac19c798acbd2f1129eaf89172eb26c3594700316a2 SHA512 196d9f4f11e4a613e0e59de131cd143ec9bc6d07cef870b6652e204c94d31986b31286819cd0a34b7d01afc9269f3447b346e2f7c6cf4a60d993e1f2d240e5f7 WHIRLPOOL 8eab54dc5d41362c379e0b2bdbeed026bab387de00b779e9b50c97717be429bae18896d6d4a5b58e2cb1462cbf0150ab77429c05a290bb3eef1ee14d65e7b540
 DIST freetype-2.4.10-infinality-patches.tar.xz 43264 SHA256 b8bedfba61fcf8f20a700d76e1ad0b0322efefb901bad47b6dcf90c4d158658e SHA512 e4c00f4290aeb5d70d07edd2993dee180d7413765cca7e41cfb585fbdca27be3e94624fe088a03f19c6ce4390cafb2e6f922541e64dac49d39ffc0199ea340ce WHIRLPOOL e69de0560d8829a3ca50d5c929e312baf85c5306178952fdcfd94d1f22a5795172ad7afa2ad82b8a75d25b5bd5320bed2c8c20a9a6ef9e707a43c46934006b73
 DIST freetype-2.4.10.tar.bz2 1508927 SHA256 0c8e242c33c45928de560d7d595db06feb41d1b22167e37260ceabe72f9e992f SHA512 41547dba00a949792b44f42a8b5a69fb6dd4c6f3d454221a0b20ac6eaedd938465922197ccdd49bdff4c03e85ab4d38a77d3c48a597e3c69790ebeba359a0107 WHIRLPOOL 455efafdc97677bec9ee234d3aedde0945123587a788e483bfeb9c1a1d00a121e2921632145678d439fbd497c96191b053143247fb31ed039ad5984d0be47eef
+DIST freetype-2.4.11-infinality-patches.tar.xz 27968 SHA256 e61c205646ea29776f28bf4e79591fdd0c7e5294508fc88b7fbbe68b70dabfd0 SHA512 38b2bd4465887d2c233ade8034542058a1c2a6d398668189d4d7420cf710482967bec535c525e044e9452796151f18ae96d5b37f37e5965060150eaed395c825 WHIRLPOOL 79fc5ee2149546bfdc079963ad704e3ab8c5c642f3e2950ad3e8cb0ce1cf7671beaa2a62c8a554b7fc038b9723aa011edd11be205fbb6adb98f3f529404b2cf5
+DIST freetype-2.4.11.tar.bz2 1546087 SHA256 ef9d0bcb64647d9e5125dc7534d7ca371c98310fec87677c410f397f71ffbe3f SHA512 a858395f48b435ff7469592c397634806debf1250a6f7344871acbfcd6e0f2d658fc7fb80c302cde7f3fd29d9f14c6c0e1248a65660e3a96c0dfad3cef697979 WHIRLPOOL 499b010555730c3558362ec306716f3b7dabcdba85e9dfdb2fc98fdfb8062c11002507ce44c8ad0e1967b4f27dfa2b6e8d65c3b5824c29036c4473a5b7ac0f49
 DIST freetype-2.4.9.tar.bz2 1504819 SHA256 c4204ac1d48e99d4375a2f32bf4f3f92780a9d9f015e64e57e852f6c004859b9 SHA512 30f388c7c0cf00deacffcb402ac97682f7957365d9eb94ba1c20d1c6f1ff1163b6a1d88a833edc9cd274bb21c9b87f5403f2c465c042bbaf599971074ac040f7 WHIRLPOOL e9fd9217cec39243409818b104918ca578c3b4bc750d1795ac6bcd78b98bd68f1f6a09549ee697fee785e4b731f77203886ae30234b7ca1909d13bfae6ea4706
 DIST freetype-doc-2.4.10.tar.bz2 106697 SHA256 b83b46fd02d00c256eea12bddf598454f95858dbeaa853b76dac5974f0321fd8
+DIST freetype-doc-2.4.11.tar.bz2 106643 SHA256 e80082d8594300d2cc1f1c315179006012fa4ded7acb4b6a1f7b43b5b19dcb51 SHA512 f3db6826c179409db92ac2e7bdded9244a7bb18fec45062bdbc712352b29a1b2de33ea20c8ac3f54cd0b59caf9a5b9df6537e3dc83e32999921df00747a69813 WHIRLPOOL d61d88b52f8244e4053b4f0f86efd35d89561d6831535219902fbf58deac656935455d18775c7ad3be6b6c558ea52db7ddc4425964f8259da2bb51731e69ff5d
 DIST freetype-doc-2.4.9.tar.bz2 106690 SHA256 138ec5c5081c2c0d1d4624e83bf3797a27271fdb5218deff6599f2d23b66438a
 DIST ft2demos-2.4.10.tar.bz2 163949 SHA256 3fb7e97f35c0f59ecd967577a3e77fbcca10d84c00129a74e5da45bf3625cc45
+DIST ft2demos-2.4.11.tar.bz2 164608 SHA256 49cc6c45542cc39cca0d9135b865fab428b1f9805b46c22fd848528f51c76075 SHA512 35c907ce5cd8a5e7381a259d734d2c56641c8fd08ef3ba4fe6a87ae9daf2ce4dd68cfeb3e6459cbed043832157db7918e3a66ac5102b4d48be0bbf39942f57ed WHIRLPOOL 9e85b6b9db845aeb3ead65975fc81e058f25cfdb637a3958b727449ed738f738022729c30be6ea0da72129f5f298b66c28d806ee56eb2b25e0d1abb130d35476
 DIST ft2demos-2.4.9.tar.bz2 163748 SHA256 7a67ac6dff11078464c5b9dc68fa2f62c8f05067e0fd15645f5cb7efb05413f9
-EBUILD freetype-1.4_pre20080316-r2.ebuild 3846 SHA256 9e98e088897e55eac345a5d2ce45a780f35536a350dd9a7dc9787ee29fc01c9b SHA512 96169067fa60fa63767eaf6ef84124d7dcd313a484072e23f762a59208f552ba7a9866db5c465a9be5da8f597e65d52af3839f055276523cd661914af4c5fb2c WHIRLPOOL 1593de4680354e01b9af9d2bcc3656cf56d7f6c6d6e72bfc988d138a8c6fb7dce78c56d6e04832d7e3473bf591e67fb8208103443a946eb9b54b520e8282e1f7
+EBUILD freetype-1.4_pre20080316-r2.ebuild 3854 SHA256 e3a3348226db846e90adf4b398fad65b575defdfb11308a7f90ca7fa51f0148f SHA512 ed64b41ae24e4265a08f02e50d78a3e61a43f5f0fe26226b546025956582a1bbb8de72ec5980b063f66f2f605e08deafa41bab31eeae9400cc10909b06c2fa2e WHIRLPOOL be6e0b903a1019250963fe3a62e6850df7cdf0ee7497297ce3be334591d770f1d53ec55b03fa7f7be00cfa9fa6fa9a1a7df9af6edce6044f2802963119873d3e
 EBUILD freetype-2.4.10-r1.ebuild 4045 SHA256 30a87ba7755b3f02cfc513a9b1188c70b00e487e384a1852b193bcbc73416343 SHA512 39cc3fd2b0938c63949deac4365e25ad1ef2436727c9a7f5c4f40a0bbec2e11e59143438a4df2a38e5ea542014852f1b71af1126c6d939e27d51070d64e08dd4 WHIRLPOOL 4d5e6a076208d413ad449bb4ec9ca528395c9021e9a2007de15898d97c28a28b63325f84cd6398d2d9c4c097dcdbf56d509315d62779b7edea0a9dce31fbdcaf
 EBUILD freetype-2.4.10.ebuild 3612 SHA256 9e24924973b0e84ca36f7ed247f92bea8a9a20575bcadc4d1795911bdbf5e951 SHA512 320f0d1921b1d38ab70a4976246541e6f284d13c088e908bb7f3673c10b827bd6fcf8c55f5c9b63cef1e59b00f3c69c9e8d0d06d5b7b138bc410c231a946f3a3 WHIRLPOOL c77139cc1dab9e5a8661b9584d02045017b0860325b3befb365ad12663bb582a3b77a1d2dc01b9abdb4c2207adadfce70fc02828c87e60be6055d03646163eb3
+EBUILD freetype-2.4.11.ebuild 4047 SHA256 4c38e54aba10540a5d0a47eb0be14f02674d531f117db9ebc7b4065f792cdd6d SHA512 e13df63e1d1f91a3f2e869c813f8468c7317ffe7708e09a727bd3eead62a988c79c648883bd6882d3ccd7c172ca666512577b9218c41234e3408d79ff7134f3f WHIRLPOOL 40d21dd160c85777143632c95de72f26e4b50e65dd25c32dc4ecfbc6cbdc5156fde12faaadb12498c5abb381a894fc48c2e00212685e2c6d1c09601a34c808ad
 EBUILD freetype-2.4.9-r1.ebuild 4090 SHA256 acc8d99ed4a440c4c6e1b8b2ed9041841a3f843a608ff95a185a9f7121a87265 SHA512 05c0a5e632b49dfe7b5183e3c1cdfea7fc0a0e885fbb8d0e1c704060d35311b32af6d0de5aaeedb1e71b3e97a200c31546120e22fa414c14f7d1b54ef8ed7f83 WHIRLPOOL f257e0aff41e32ac769989ec2c087ecec0ce0602adaca058e99c6466a0aba98b8a985003b7ee81086237129cf2853e76b4ebee8a4bfc97b80596715a376a662c
-MISC ChangeLog 51802 SHA256 a41bd04164db1d9489b3481bcec90a66736625b54a822c3dd609a291b33cc72c SHA512 fcfa6f0faadf9be910e1e7df9774d3de17b076ad7319695672d8074e073b743e41e02f6d70f424fa8e0c1e45f44da4a2a555d762554814ce14f54504661e63b5 WHIRLPOOL 7297c6cca84ca724d9b4a889f3e60218bf124c84edfd3913df497be5450c8bff37df84269d8279b47f6d1e8a1c7851ff28b07d6a73028c3d3db65a78a4cb7006
+MISC ChangeLog 51974 SHA256 045ce5fb6ca42b41e64ebc0e8a7504b9b7aefef467ae139b70202988ca418ffa SHA512 be87634409430d42dca2a4731bc92aeb4c8503149f1cf6c2a80a60c111ede7b0edc9f9d051ae1f92fc76853cc198fde4beb9216ca86913d2353e6f37909d8504 WHIRLPOOL be5e59e330e7469e453374c1b9dc912b54b94525176ad58f3686bc8e920dd4f7b443d4537f8f299dc15fab1a08239445c269dd4cdd2b429dd8efbd67924adbc8
 MISC metadata.xml 755 SHA256 41325a5176c6bd7106a560701e384843fe5e1bd36725311ca3f4b3f886ad6bee SHA512 180d59a66c633c7620da99411e0af3b63184c9732e3584083c5cbd0f63b467dabf6491990a9379a28b45a1f288ddd29800982a97612f7b8fb62dcd45ddca2ebe WHIRLPOOL e3382c8a10d33dd7415db13d6d0b11a65d63450f4b4589af7000d95b51cbdb90a860bc3c6fda41fee93bb93de057a78ee913ece775d81a1d0c7dfedbecd6b3f8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJRAVJaAAoJEPiazRVxLXTFhQcP/25c+TjbOPGcnvjBKfFEHV9L
+4BxKSLtJdYIkQm4rAoCngecqZzuSVZMUpWCJK83g8kH4WgsXnvnEBO/UUVFSzKdI
+xH+YOadlbwmpEHePVhYvbfnjsLqzJCIMRXjOltxa2/O0bo4r52lf8HimY42/JVjr
+uoY53OPts/Uwvs+1xEXNBVUL2eFFFlrYvz5Y8fUy3m0kooWZ8xfl18eqAQj7ULwO
+ein+YxlC0Wg07CKKIN+wjx8s7RqZdXdhAc6I7kJ89Izet9q0ZoVO8ORyRxproYmA
+CTA34pqhqy+JCrr3PeiJWNHpE/ItEe7/TCqYAIHgDsnfvB4K7qv2RjRGB5dVTjje
+MorB1Na/f2YzLmNE8SffaogpyzogldnU3p7iq6a5bW+9MrORed4ZhtMUjbv+kZbG
+YM2QOZxSMt2enzEsu+BzPPb5h/7U9rVL3Gfm8Q6L+o8CvgH03MKq2a27nNRF3wXC
+4rQt5V4oehccBJVZOsaitkHsrb2XFHWj3jIjcAGUwGto9EHmQ8pcw++nhkRmZGAh
+jaxRL5q7xTK71gdbdOWmVdJJWGzf/f8Uitm/oC/sRJGncxqD7TWYNuPDW4MraGZV
+rLclduk4x+7aTPcojjPYoidxPlubT4Bp+jeLVWlEUKYOVX91sC3OBT9wYmjH0/RX
+jLWnSKPqyaYNvBZ0onvI
+=TT1q
+-----END PGP SIGNATURE-----
diff --git a/media-libs/freetype/freetype-1.4_pre20080316-r2.ebuild b/media-libs/freetype/freetype-1.4_pre20080316-r2.ebuild
index 742f49616591..58b79acbe2d0 100644
--- a/media-libs/freetype/freetype-1.4_pre20080316-r2.ebuild
+++ b/media-libs/freetype/freetype-1.4_pre20080316-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-1.4_pre20080316-r2.ebuild,v 1.11 2012/05/20 12:45:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-1.4_pre20080316-r2.ebuild,v 1.12 2013/01/24 15:25:13 polynomial-c Exp $
 
 inherit autotools eutils libtool multilib
 
@@ -91,7 +91,7 @@ src_compile() {
 }
 
 src_install() {
-	use prefix || ED=${D}
+	use prefix || ED="${D}"
 	dodoc announce PATENTS README docs/*.txt docs/FAQ
 	use doc && dohtml -r docs
 
diff --git a/media-libs/freetype/freetype-2.4.11.ebuild b/media-libs/freetype/freetype-2.4.11.ebuild
new file mode 100644
index 000000000000..b9bbeb7383cf
--- /dev/null
+++ b/media-libs/freetype/freetype-2.4.11.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.4.11.ebuild,v 1.1 2013/01/24 15:25:13 polynomial-c Exp $
+
+EAPI="4"
+
+inherit eutils flag-o-matic libtool multilib
+
+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? ( http://dev.gentoo.org/~polynomial-c/${P}-infinality-patches.tar.xz )"
+
+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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="X auto-hinter bindist bzip2 debug doc fontforge infinality static-libs utils"
+
+DEPEND="sys-libs/zlib
+	bzip2? ( app-arch/bzip2 )
+	X?	( x11-libs/libX11
+		  x11-libs/libXau
+		  x11-libs/libXdmcp )"
+RDEPEND="${DEPEND}
+	infinality? ( media-libs/fontconfig-infinality )"
+
+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_TRACE
+		enable_option FT_DEBUG_MEMORY
+	fi
+
+	disable_option FT_CONFIG_OPTION_OLD_INTERNALS
+
+	if use infinality; then
+		epatch "${WORKDIR}"/patches/freetype-enable-subpixel-hinting-infinality.patch
+		epatch "${WORKDIR}"/patches/freetype-entire-infinality-patchset.patch
+
+		enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING
+		enable_option TT_CONFIG_OPTION_SUBPIXEL_HINTING
+	fi
+
+	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 || die
+		# Disable tests needing X11 when USE="-X". (bug #177597)
+		if ! use X; then
+			sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die
+		fi
+	fi
+
+	elibtoolize
+	epunt_cxx
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+	type -P gmake &> /dev/null && export GNUMAKE=gmake
+
+	# we need non-/bin/sh to run configure
+	[[ -n ${CONFIG_SHELL} ]] && \
+		sed -i -e "1s:^#![[:space:]]*/bin/sh:#!$CONFIG_SHELL:" \
+			"${S}"/builds/unix/configure
+
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with bzip2)
+}
+
+src_compile() {
+	emake
+
+	if use utils; then
+		einfo "Building utils"
+		cd "${WORKDIR}/ft2demos-${PV}"
+		# fix for Prefix, bug #339334
+		emake X11_PATH="${EPREFIX}/usr/$(get_libdir)"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	if use utils; then
+		einfo "Installing utils"
+		rm "${WORKDIR}"/ft2demos-${PV}/bin/README
+		for ft2demo in ../ft2demos-${PV}/bin/*; do
+			./builds/unix/libtool --mode=install $(type -P install) -m 755 "$ft2demo" \
+				"${ED}"/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 "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})"
+			cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})"
+		done
+	fi
+
+	prune_libtool_files
+
+	dodoc ChangeLog README
+	dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,*.txt,PROBLEMS,TODO}
+
+	use doc && dohtml -r docs/*
+
+}