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

(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 0x2B2474AD43CE296E!)

3 files changed, 12 insertions, 8 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/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 )