Removed freetype2 USE flag because there is truetype already; which is the global USE flag to be used for freetype. Thanks to Nikoli.

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

3 files changed, 9 insertions, 7 deletions

diff --git a/media-libs/avidemux-plugins/ChangeLog b/media-libs/avidemux-plugins/ChangeLog
index 6d05a2306a4a..2d3f84899717 100644
--- a/media-libs/avidemux-plugins/ChangeLog
+++ b/media-libs/avidemux-plugins/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/avidemux-plugins
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-plugins/ChangeLog,v 1.8 2013/07/12 18:53:50 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-plugins/ChangeLog,v 1.9 2013/07/12 20:49:43 tomwij Exp $
+
+  12 Jul 2013; Tom Wijsman <TomWij@gentoo.org> avidemux-plugins-2.6.4-r1.ebuild,
+  metadata.xml:
+  Removed freetype2 USE flag because there is truetype already; which is the
+  global USE flag to be used for freetype. Thanks to Nikoli.
 
 *avidemux-plugins-2.6.4-r1 (12 Jul 2013)
 
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.6.4-r1.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.6.4-r1.ebuild
index 17db187e2c5f..ecfedd6b0627 100644
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.6.4-r1.ebuild
+++ b/media-libs/avidemux-plugins/avidemux-plugins-2.6.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-plugins/avidemux-plugins-2.6.4-r1.ebuild,v 1.1 2013/07/12 18:53:50 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-plugins/avidemux-plugins-2.6.4-r1.ebuild,v 1.2 2013/07/12 20:49:43 tomwij Exp $
 
 EAPI="5"
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/${MY_PN}/${PV}/${MY_P}.tar.gz"
 # Multiple licenses because of all the bundled stuff.
 LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
 KEYWORDS="~amd64 ~x86"
-IUSE="aften a52 alsa amr debug dts faac faad fontconfig freetype2 fribidi jack lame libsamplerate mmx opengl oss pulseaudio qt4 vorbis truetype twolame xvid x264 vpx"
+IUSE="aften a52 alsa amr debug dts faac faad fontconfig fribidi jack lame libsamplerate mmx opengl oss pulseaudio qt4 vorbis truetype twolame xvid x264 vpx"
 
 DEPEND="
 	=media-video/avidemux-${PV}[opengl?,qt4?]
@@ -33,7 +33,6 @@ DEPEND="
 	faac? ( media-libs/faac )
 	faad? ( media-libs/faad2 )
 	fontconfig? ( media-libs/fontconfig )
-	freetype2? ( media-libs/freetype:2 )
 	fribidi? ( dev-libs/fribidi )
 	jack? (
 		media-sound/jack-audio-connection-kit
@@ -42,7 +41,7 @@ DEPEND="
 	lame? ( media-sound/lame )
 	oss? ( virtual/os-headers )
 	pulseaudio? ( media-sound/pulseaudio )
-	truetype? ( >=media-libs/freetype-2.1.5 )
+	truetype? ( media-libs/freetype:2 )
 	twolame? ( media-sound/twolame )
 	x264? ( media-libs/x264:= )
 	xvid? ( media-libs/xvid )
@@ -74,7 +73,6 @@ src_configure() {
 		$(cmake-utils_use faad FAAC)
 		$(cmake-utils_use faad FAAD)
 		$(cmake-utils_use fontconfig FONTCONFIG)
-		$(cmake-utils_use freetype2 FREETYPE2)
 		$(cmake-utils_use jack JACK)
 		$(cmake-utils_use lame LAME)
 		$(cmake-utils_use oss OSS)
diff --git a/media-libs/avidemux-plugins/metadata.xml b/media-libs/avidemux-plugins/metadata.xml
index 9060db157e32..f726581edae9 100644
--- a/media-libs/avidemux-plugins/metadata.xml
+++ b/media-libs/avidemux-plugins/metadata.xml
@@ -11,7 +11,6 @@
     <flag name="amr">Enable Adaptive Multi-Rate format support via <pkg>media-libs/opencore-amr</pkg>.</flag>
     <flag name="faac">Enable free MPEG-4 audio codecs support via <pkg>media-libs/faac</pkg>.</flag>
     <flag name="faad">Enable AAC audio decoding library support via <pkg>media-libs/faad2</pkg>.</flag>
-    <flag name="freetype2">Enable FreeType2 support via <pkg>media-libs/freetype</pkg>.</flag>
     <flag name="fribidi">Enable unicode bidirectional algorithm support via <pkg>dev-libs/fribidi</pkg>.</flag>
     <flag name="twolame">Enable TwoLAME support via <pkg>media-sound/twolame</pkg>, an optimised MPEG Audio Layer 2 (MP2) encoder.</flag>
     <flag name="vpx">Enable WebM VP8 Codec SDK support via <pkg>media-libs/libvpx</pkg>.</flag>