Drop deps on freetype:1 in old ebuilds, as it is vulnerable and now masked (bug 412499)

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x2B2474AD43CE296E!

4 files changed, 30 insertions, 24 deletions

diff --git a/app-text/texlive/ChangeLog b/app-text/texlive/ChangeLog
index b1e7b00dd640..e68a694075ea 100644
--- a/app-text/texlive/ChangeLog
+++ b/app-text/texlive/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/texlive
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/texlive/ChangeLog,v 1.128 2013/04/25 21:25:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/texlive/ChangeLog,v 1.129 2013/04/26 14:42:02 yngwin Exp $
+
+  26 Apr 2013; Ben de Groot <yngwin@gentoo.org> texlive-2011-r1.ebuild,
+  texlive-2011.ebuild:
+  Drop deps on freetype:1 in old ebuilds, as it is vulnerable and now masked
+  (bug 412499)
 
   25 Apr 2013; Agostino Sarubbo <ago@gentoo.org> texlive-2012.ebuild:
   Stable for sh, wrt bug #449298
diff --git a/app-text/texlive/Manifest b/app-text/texlive/Manifest
index 83d9a5773285..914ec89349ca 100644
--- a/app-text/texlive/Manifest
+++ b/app-text/texlive/Manifest
@@ -1,25 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-EBUILD texlive-2011-r1.ebuild 9472 SHA256 055abf46492e3d8b062ec2444d5ead373e405bc4620c114f1fc9c3fc279e109f SHA512 300e17dae70e5cff7f6e0477094bd528922b60fca97ae92f0a2000fb5c4682c0cd3d2b3bb5c787dfc35ad811705b1e397b62a14a7d24ee5b056a9c0d0b68b9c6 WHIRLPOOL ad09238ede941fb92276f7ad62f2b3960bdea645ac7701cf0aa605c9f88a1ac538694416533593cee02ed107001eab558f48944bb4c932b6a82db45548e9eb2f
-EBUILD texlive-2011.ebuild 9330 SHA256 8ce20acc4f73760dd8ba3c7e341182f406c33256f0d79ea60af818adb06ce153 SHA512 327977e68bd2cd6d33bfea1ac8d0b2c54ed2843e82fbc3db1f7539bd592c973b386965c90672352ffaf91a00a9fd8505cf7b12af791b3a5cc435965ab6139383 WHIRLPOOL 60bfb94c3be638107d071c15c2e4f80a3496d6dfaa34cb498e7b168d0a4969f4c9cb5e16cfa7fec2d4b9b728dd6d712cf75e9661603e14d411d67162a552865a
+EBUILD texlive-2011-r1.ebuild 9436 SHA256 7a71296528ffa1041d560fb5cbb463d923e7718d986223ebb50aefefe7ea8911 SHA512 58ba1f8eafa6e53b7326dba27d3b5269a9f2d016ba46ae973c4dce75a79283c06ece45b99ed6b8d007ae34505dc070608da8e8f8c055fce4d4d0ec716cf50749 WHIRLPOOL 370e3e9b00df73926e06e072770a2ac069ea50725a39900500c4412527f723c2366128387baf8266000392401423122d7374de807d205dfe340d83ae30cddc42
+EBUILD texlive-2011.ebuild 9277 SHA256 948338fcbb861d6c1e096c0825368389f6c90a60be03e1319d2e4f2a47eb70c0 SHA512 2d90b69b0e63e351919eef97cf6b89058a71a82bb35cb9c7afb6632ecc18c3937e576809d7f56b955e60a9e4deb699f23fa7ea642ea197ac6c6a4484824a183e WHIRLPOOL 4a413749de94f01be78dea6619a56b1a20201f54e3f85bc5c2929d806d3c1d95b30fda44473fe98529c761b12b7b29647bf4e359f00bea15f4685083725bbf11
 EBUILD texlive-2012.ebuild 9456 SHA256 c22ba372b329fe2c8f8a4b736acbcb0cad4a65d582bbb09180b27ddc95a30ce1 SHA512 1361c7d0ff224406b242128b7e09c8c69e5a355b22acd8fa72fba5572fb88e27331ed57f4718b2ed640d6b96513daab3d0189a34794fef617eecf219c2f4b0b1 WHIRLPOOL 013d9d45af0888ce7108e9160be260b000db15df043a8c95c28d123f27a4f99b8ba7664afa096b7e19b1a50d132cc6aa10fd887fdb92eea6c8e1151a1e16bf0d
-MISC ChangeLog 7307 SHA256 27ee22ab47c94efd907180f8b4bca47bdd1f716284b119dc94a485d9c049dce1 SHA512 f0e0f66528aa5338ed3d8b27d3bc0f01fa5519223b68432d7b7fadf8418e9b6f762348e621028a20f8718da4485381730f5d9caed5a09e77891331a957187552 WHIRLPOOL a86e6a0224d210ce06ed4d7362f99c756367330942f723d8c07abcf94c58ca12d385c0d4099b7a8c6743b79d9cacc17ca5e4704aed96840f6e2126016a492a06
+MISC ChangeLog 7498 SHA256 54a61e675163fd35cfa4317a5cbf5589cd329efbc1cfea701622407c49f95d28 SHA512 733cb55d0cbd00de92a7826bfff12a018a79dc0d9bae1926f7e19eb77d18038f2e0d1270b2096539d54e8b0ac7c9e1a1ade4c24139d5f2eb9b3a750a772e6833 WHIRLPOOL e04fba45962f0abf77d385b62b869c21e0802617f71f5863c131adbc2f8817f313198257dcfa3a1c4e6a95b9a78635cdf5eb9bb6695c6cea4fc549915f9b1446
 MISC metadata.xml 2578 SHA256 1463373818e4d32903e07b96e4d292602bf409dc029595b87e020631f4bc14e4 SHA512 1c662185ac278af1b1135629e20cdea2f72e98d7eb99f4d3c932441da99c45f1e828e735a010d7cf52ea86fa0abcdb7a4ab8dbe2bc837a93d45d9124fc45807e WHIRLPOOL dc88681327162f379b27d304d450b1684b08fc0be70258abec057b1674aa73b8e2ba70cd4b70b29762443394eaa3a9df41fd7981553c0910fc8ffda1d6c5d187
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJReZ9aAAoJELp701BxlEWf2u0P/1KBsZVWYJbWux0sIzQcl3Bc
-ByvPgw+j3rWEJREDMfeMeTJb+RM6ZJaDUIIoRHydAIYwXqizlYq9Tqbc8iGKK0IX
-scN+gXUNZ9NkJ3/eZazKJy+NosYyV6LKQMSJxv2h8e5pe6wY+Kwii6Pfr+mxy5ZA
-H42SFKbWy8WWsaICJ1wu/Qj+ds0MQqh79njamu1ZOvlymhWpSj1zypVF+ToA9SEF
-7rqEhIgKDHFk2+laPTPegqhMuLll2eMW1lB1Rs0cuo/Ld++uzysktRnFeUMTuCO+
-7Fe/b7U+gjQuBDbXIvsoobzQGW1UPj/Nrjcqh51IkhzbGAD2IgJaUpUK9bDVHUFa
-6mKB4OTuLi+TPkdgFi+79Jy1D4TCj+OpeCn+/fd2IKK2xYTkErdHGf4+iXnSYRgt
-FxDn0FUTNTzoEjcMEpL4wdQBJYWJjfGiMfFqZGrPMC7mQ8NFdLNrSIylqrVJHxbW
-S/KWUfAfoIvZOcMRElyg8vCNVpkoAPon1qDwW49UHZ/PsRGfnkA6zTNL4clwPwPq
-p4OTKRTYygkMSWnmMC+366JTZvyGafk2oO1wTY/DxzScb5uFjheo+Jjnrs0K1FLv
-r72dQWsssoMFYvKVW32rbOYakYf7b5Q7Hp94CCISvXMZW02R6iOLzt6wqhhUJpx1
-VzTacuUtG6lyzC3YD2Q3
-=33xz
+iQJ8BAEBCABmBQJRepJDXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGODRENkQ2QkI1MzlEMURGNTkyNjYxNjUy
+QjI0NzRBRDQzQ0UyOTZFAAoJECskdK1Dzilu9hIP/i8l2bMhxLp6SNfXt+nD+Gkf
+jjZ9GWAin9nJ+HqPPGlpCOMPbKP0XgG9CLIGKcnZjuD2XBK7D8o9Lj8vMiaVNfKN
+ucSTUtKPG40FiKZ/qRcs3obzPmzRtOb+FkW+JNM/goTzARF32jhGTg70NAW8vrP/
+5k91XKvm/zIx5aCK5W6yaMHQbDc+xs6BJpPHYpAmFmReOCpRJoqZfV28hgHnfBRr
+3ybg4kM7EgnCSHHMimzgF4iBjCLrKyEYZgObimVNG6gVPeni6wYE+n0ZWhEwWVoz
+0gJRA++grgLzE/7q7A2yQkI1iB2cYkC8waVheb5UtY3aZzhIgSbynTN/a1eVdjLI
+r2w/PulqgkQsnsjztDvwL+cMZiTY6ATr+jr7dGh2vX5IDp7lGJf2eAWkCw0xaW2r
+NX57CrXpkcYelRKJz1PcP6VlVVycXtl1u3OVVizlWvxtGQ3XwOE9xyL5zHJTXVEG
+mzX4Ur2WiZ9nbze4WHWods4VwYdodZCNKHMJe0JeyzwkQdKM1ePpOdOkYTCcDwhP
+bpxxEAc9buMNLHZzCG+L8ga109hDbf9tyb2tGgnkgE+kyo6HdZPvqz4bHIoSzeLZ
+H9ybMm6leGrupHv0w4aMjQAnEHvSvpZddogz/S07qqJ5l6usSr9IclnabsEr/hnL
+cJJPBaIWxxef+2jd4plw
+=EvFD
 -----END PGP SIGNATURE-----
diff --git a/app-text/texlive/texlive-2011-r1.ebuild b/app-text/texlive/texlive-2011-r1.ebuild
index db4325238c6e..7c554d8ba6bb 100644
--- a/app-text/texlive/texlive-2011-r1.ebuild
+++ b/app-text/texlive/texlive-2011-r1.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/app-text/texlive/texlive-2011-r1.ebuild,v 1.10 2012/10/07 10:07:23 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/texlive/texlive-2011-r1.ebuild,v 1.11 2013/04/26 14:42:02 yngwin Exp $
 
 EAPI="2"
 
@@ -35,7 +35,7 @@ RDEPEND="${DEPEND}
 	>=${TEXLIVE_CAT}/texlive-texinfo-${PV}
 	app-text/t1utils
 	>=app-text/lcdf-typetools-2.69[kpathsea]
-	truetype? ( || ( app-text/ttf2pk2 media-libs/freetype:1[kpathsea] ) )
+	truetype? ( app-text/ttf2pk2 )
 	detex? ( dev-tex/detex )
 	app-text/ps2eps
 	dvipdfm? ( >=app-text/dvipdfm-0.13.2d )
diff --git a/app-text/texlive/texlive-2011.ebuild b/app-text/texlive/texlive-2011.ebuild
index a49f6df38735..a12fff1fa285 100644
--- a/app-text/texlive/texlive-2011.ebuild
+++ b/app-text/texlive/texlive-2011.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/app-text/texlive/texlive-2011.ebuild,v 1.12 2012/10/07 10:07:23 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/texlive/texlive-2011.ebuild,v 1.13 2013/04/26 14:42:02 yngwin Exp $
 
 EAPI="2"
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="cjk context detex doc dvi2tty dvipdfm extra games graphics
 	humanities jadetex luatex music omega pdfannotextractor png pstricks publishers science tex4ht
-	truetype xetex xindy xml X"
+	xetex xindy xml X"
 
 LANGS="af ar as bg bn bo ca cs cy da de el en en_GB eo es et eu fa fi fr ga gl
 	gu he hi hr hsb hu hy ia id is it ja ko kn la lo lt lv ml mn mr nb nl nn no
@@ -35,7 +35,6 @@ RDEPEND="${DEPEND}
 	>=${TEXLIVE_CAT}/texlive-texinfo-${PV}
 	app-text/t1utils
 	>=app-text/lcdf-typetools-2.69[kpathsea]
-	truetype? ( media-libs/freetype:1[kpathsea] )
 	detex? ( dev-tex/detex )
 	app-text/ps2eps
 	dvipdfm? ( >=app-text/dvipdfm-0.13.2d )