Restrict freetype version on older versions of vlc; fixes bug #505266, reported by Phil Stracchino (alaric).

(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)

8 files changed, 21 insertions, 15 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 735b9dd3f457..2f167581dfb7 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.897 2014/03/26 15:29:51 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.898 2014/03/26 15:50:36 tomwij Exp $
+
+  26 Mar 2014; Tom Wijsman <TomWij@gentoo.org> vlc-2.0.5.ebuild,
+  vlc-2.0.7.ebuild, vlc-2.0.8.ebuild, vlc-2.0.8a.ebuild, vlc-2.0.9.ebuild,
+  vlc-2.0.9999.ebuild, vlc-2.1.0.ebuild:
+  Restrict freetype version on older versions of vlc; fixes bug #505266,
+  reported by Phil Stracchino (alaric).
 
   26 Mar 2014; Tom Wijsman <TomWij@gentoo.org>
   +files/vlc-9999-libva-1.2.1-compat.patch, vlc-9999.ebuild:
diff --git a/media-video/vlc/vlc-2.0.5.ebuild b/media-video/vlc/vlc-2.0.5.ebuild
index e1e4948d3e97..a29a9de72f54 100644
--- a/media-video/vlc/vlc-2.0.5.ebuild
+++ b/media-video/vlc/vlc-2.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.5.ebuild,v 1.12 2014/03/12 16:15:16 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.5.ebuild,v 1.13 2014/03/26 15:50:36 tomwij Exp $
 
 EAPI="5"
 
@@ -132,7 +132,7 @@ RDEPEND="
 		swscale? ( virtual/ffmpeg )
 		taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib )
 		theora? ( >=media-libs/libtheora-1.0_beta3 )
-		truetype? ( media-libs/freetype virtual/ttf-fonts
+		truetype? ( <media-libs/freetype-2.5.3 virtual/ttf-fonts
 			!fontconfig? ( media-fonts/dejavu ) )
 		twolame? ( media-sound/twolame )
 		udev? ( virtual/udev )
diff --git a/media-video/vlc/vlc-2.0.7.ebuild b/media-video/vlc/vlc-2.0.7.ebuild
index 325d1eddebac..dd9bedac3125 100644
--- a/media-video/vlc/vlc-2.0.7.ebuild
+++ b/media-video/vlc/vlc-2.0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.7.ebuild,v 1.11 2014/03/12 16:15:16 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.7.ebuild,v 1.12 2014/03/26 15:50:35 tomwij Exp $
 
 EAPI="5"
 
@@ -132,7 +132,7 @@ RDEPEND="
 		swscale? ( virtual/ffmpeg )
 		taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib )
 		theora? ( >=media-libs/libtheora-1.0_beta3 )
-		truetype? ( media-libs/freetype virtual/ttf-fonts
+		truetype? ( <media-libs/freetype-2.5.3 virtual/ttf-fonts
 			!fontconfig? ( media-fonts/dejavu ) )
 		twolame? ( media-sound/twolame )
 		udev? ( virtual/udev )
diff --git a/media-video/vlc/vlc-2.0.8.ebuild b/media-video/vlc/vlc-2.0.8.ebuild
index 8c33784f162b..13bf53833929 100644
--- a/media-video/vlc/vlc-2.0.8.ebuild
+++ b/media-video/vlc/vlc-2.0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.8.ebuild,v 1.9 2014/03/12 16:15:16 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.8.ebuild,v 1.10 2014/03/26 15:50:35 tomwij Exp $
 
 EAPI="5"
 
@@ -133,7 +133,7 @@ RDEPEND="
 		taglib? ( >=media-libs/taglib-1.5:0 sys-libs/zlib:0 )
 		theora? ( >=media-libs/libtheora-1.0_beta3:0 )
 		tremor? ( media-libs/tremor:0 )
-		truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0
+		truetype? ( <media-libs/freetype-2.5.3:2 virtual/ttf-fonts:0
 			!fontconfig? ( media-fonts/dejavu:0 ) )
 		twolame? ( media-sound/twolame:0 )
 		udev? ( virtual/udev:0 )
diff --git a/media-video/vlc/vlc-2.0.8a.ebuild b/media-video/vlc/vlc-2.0.8a.ebuild
index effa7773489b..9661891aee76 100644
--- a/media-video/vlc/vlc-2.0.8a.ebuild
+++ b/media-video/vlc/vlc-2.0.8a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.8a.ebuild,v 1.9 2014/03/12 16:15:16 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.8a.ebuild,v 1.10 2014/03/26 15:50:35 tomwij Exp $
 
 EAPI="5"
 
@@ -133,7 +133,7 @@ RDEPEND="
 		taglib? ( >=media-libs/taglib-1.5:0 sys-libs/zlib:0 )
 		theora? ( >=media-libs/libtheora-1.0_beta3:0 )
 		tremor? ( media-libs/tremor:0 )
-		truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0
+		truetype? ( <media-libs/freetype-2.5.3:2 virtual/ttf-fonts:0
 			!fontconfig? ( media-fonts/dejavu:0 ) )
 		twolame? ( media-sound/twolame:0 )
 		udev? ( virtual/udev:0 )
diff --git a/media-video/vlc/vlc-2.0.9.ebuild b/media-video/vlc/vlc-2.0.9.ebuild
index cd62765f4dde..90282252e4d4 100644
--- a/media-video/vlc/vlc-2.0.9.ebuild
+++ b/media-video/vlc/vlc-2.0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.9.ebuild,v 1.10 2014/03/19 07:57:21 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.9.ebuild,v 1.11 2014/03/26 15:50:36 tomwij Exp $
 
 EAPI="5"
 
@@ -133,7 +133,7 @@ RDEPEND="
 		taglib? ( >=media-libs/taglib-1.5:0 sys-libs/zlib:0 )
 		theora? ( >=media-libs/libtheora-1.0_beta3:0 )
 		tremor? ( media-libs/tremor:0 )
-		truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0
+		truetype? ( <media-libs/freetype-2.5.3:2 virtual/ttf-fonts:0
 			!fontconfig? ( media-fonts/dejavu:0 ) )
 		twolame? ( media-sound/twolame:0 )
 		udev? ( virtual/udev:0 )
diff --git a/media-video/vlc/vlc-2.0.9999.ebuild b/media-video/vlc/vlc-2.0.9999.ebuild
index ae17e9c7254d..35eaeff3d3f0 100644
--- a/media-video/vlc/vlc-2.0.9999.ebuild
+++ b/media-video/vlc/vlc-2.0.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.9999.ebuild,v 1.37 2014/03/12 16:15:16 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.9999.ebuild,v 1.38 2014/03/26 15:50:35 tomwij Exp $
 
 EAPI="5"
 
@@ -133,7 +133,7 @@ RDEPEND="
 		taglib? ( >=media-libs/taglib-1.5:0 sys-libs/zlib:0 )
 		theora? ( >=media-libs/libtheora-1.0_beta3:0 )
 		tremor? ( media-libs/tremor:0 )
-		truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0
+		truetype? ( <media-libs/freetype-2.5.3:2 virtual/ttf-fonts:0
 			!fontconfig? ( media-fonts/dejavu:0 ) )
 		twolame? ( media-sound/twolame:0 )
 		udev? ( virtual/udev:0 )
diff --git a/media-video/vlc/vlc-2.1.0.ebuild b/media-video/vlc/vlc-2.1.0.ebuild
index 20a62b374611..f25308af7c5c 100644
--- a/media-video/vlc/vlc-2.1.0.ebuild
+++ b/media-video/vlc/vlc-2.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.0.ebuild,v 1.15 2014/03/12 16:15:16 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.0.ebuild,v 1.16 2014/03/26 15:50:35 tomwij Exp $
 
 EAPI="5"
 
@@ -135,7 +135,7 @@ RDEPEND="
 		taglib? ( >=media-libs/taglib-1.6.1:0 sys-libs/zlib:0 )
 		theora? ( >=media-libs/libtheora-1.0_beta3:0 )
 		tremor? ( media-libs/tremor:0 )
-		truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0
+		truetype? ( <media-libs/freetype-2.5.3:2 virtual/ttf-fonts:0
 			!fontconfig? ( media-fonts/dejavu:0 ) )
 		twolame? ( media-sound/twolame:0 )
 		udev? ( >=virtual/udev-142:0 )