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

Package-Manager: portage-2.1.12.13/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

4 files changed, 19 insertions, 17 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/Manifest b/media-libs/avidemux-plugins/Manifest
index 056f3cbe109e..d6bbb8eeb647 100644
--- a/media-libs/avidemux-plugins/Manifest
+++ b/media-libs/avidemux-plugins/Manifest
@@ -7,18 +7,18 @@ DIST avidemux_2.6.3.tar.gz 17025710 SHA256 78972b46c6ef1eb52fc012cafdeb2b6275913
 DIST avidemux_2.6.4.tar.gz 17109929 SHA256 2937c6c09248445942ac7e71b100ff8f7e272c4ad9c38e7d8c519ce4a11cec44 SHA512 1b80f65ac5a1da844b521a82bab8976d01c81923460004dc76ed0f6994f95da0ad9a836c90ffa1595ad060f0d6f27ce30add0204ca9d5295084a62e79dd484c9 WHIRLPOOL a1cbfcfeafa163ed24881edb085126a69eca3e0e8eaee50091ceadb993105a0cb43068b7725fa54871bc04b20ca5b51650ac536688b1d1f8d5b0a2d7356459ef
 EBUILD avidemux-plugins-2.6.2-r2.ebuild 2819 SHA256 b8c9abaa39d61935b1d160d727faea686336f8733cb24e37be38b0705f06acaf SHA512 6d93ac535f168d241a9fa86627b154d828ea836ab057578edf3d434934106108aad1246ea1676236b2647241ddcb7878771f8b48718a84524b9dcda525cf1647 WHIRLPOOL 0f7af0fac61957dda46bdb61d04f8a727f8fa6bc8a5032b417a8ccf97202db0df75fe0b5c32fc35ae0a3928e610fe6c3c094a479b441737ce7ebed5237d2001f
 EBUILD avidemux-plugins-2.6.3.ebuild 3634 SHA256 e17913ab59b4c8140152826803a2c8f56a8b7421da0dedadd6edc26c96e02631 SHA512 00c841f1a37264ea9b128aa3fa8c58242cafe8d3f7856a70a940ed07d030ba6361d1b107a73bac5290d3ae39e04cd736afecd669d98906c85b1fbbaaa306c89d WHIRLPOOL 128d382992298f16c88fdcbef2c9960387f330d5356e6ceefda6e44b16d836489a31955e20001c4843edd71979164bb7e36ec82ef4aeac32e2ad579bd62e5470
-EBUILD avidemux-plugins-2.6.4-r1.ebuild 4120 SHA256 083058508669fd6d7b4b9f66eaad669dada52df0b2a83cd290e1c4082278d385 SHA512 22b4be0e8b7496a1fd47c3e8ce04ea2e2115576222da322fc7d958844e27e1d89ed820e104520cc1d48cd84db3d4b23fa61461d9f37f07b4cab55ee2c5b7258f WHIRLPOOL 90bfcf3e844977d1738d4531c9694648fe650b6f47a1d868a42f5a2beb0b28a39f0224ff1908f5d7fe373a786ace8baf3788c1ca9fdf231a591d3cdb43181006
+EBUILD avidemux-plugins-2.6.4-r1.ebuild 4025 SHA256 f0db26e1cd5ef1dad03de2b388542f6189883d7e2765e2db24f48500061971ee SHA512 14fe3aa27fe36c02ee0c07ee56617b41e37dd23edacba7e0b8fba7d0a5384886a49b809ef100408ded93f5a1d4a2384eea35d0a95a3273c438952e05a4f4264b WHIRLPOOL aa12f0c348a56247022017fc3f2ad2a81fa0a2b144c5917d113bed33d5027f84bc63c8f1839f3be8d631a2f077eed6c9809ea3bc8b12709a02c4e16eebc875f0
 EBUILD avidemux-plugins-2.6.4.ebuild 3634 SHA256 1e4d21304f8290116f57d4255ad9ca48517561d34880cc8fb4ef9277d33677af SHA512 4ca0796ebe87e72d00fece8f3933d12a73708cd26aba648f3244a9f49736213b54090679e3f12e994ee95cf52223bef721ed492b2931a3e4c13f6c58c37ff6ea WHIRLPOOL 03d11ee54a8dbdce4f0c9cb7e24e7225656faba76aefaceb70a5c432ecab43637ebaf48aa6678bcd1c3ed397014773da5bb674cbda06e0d7aa52d3421471c2d3
-MISC ChangeLog 2598 SHA256 7550a392250840bf269685eb02b9f5bdc010ffaded1a11e3cb1a581ca52a06c0 SHA512 5c53758e65126d95faf838443c532f6f44163d1b2838207e2ba0a5fd7e87540af5d294c38d7c1114aa1d2a08478ed927b64b452ed8800223bab1962f69556f83 WHIRLPOOL d64b7f71e4e86cea5389a32b7f5334fab297b1aba0a360ad6d1c2406e62b5ffaa93f27633fde524e790157000b5bdcec074b4ff9369894f0ad45307f33a5cbb4
-MISC metadata.xml 1102 SHA256 59cb0db3f9cf5d6738ffdab76c56d587fe1aa4695b371c19784b7e6b067efe1e SHA512 ecbe5c59191bfb0dad30b0904100144b3224bfa0041d1fecc9f53ade4f94a3d9145b1667d01278a09f15127043e76c82c3a426c506b7e428cf156eae4130a9db WHIRLPOOL 1118520528d4712b626da02667e66fcf3a29c994b129391e984fad24529f15825a519faafa0df1bd66d4fabd5270e971e229026ba83e94f60bf649aa6c107be1
+MISC ChangeLog 2834 SHA256 9a4cb1a9c2f90e847056959f8e95ca45c75f4c2e31298b6003da83b816918f03 SHA512 0e510718d588db36c1dfa2ccf83918eec97e023a30f8e630cefe213448c2ef91a1d1525fc24476da0dd0e262d67350e2f2058998b1ad409f2c42832df8c89d03 WHIRLPOOL b4a178b2f78172f615bc7df28a14a8eabbe7e2033505035fcbf097fd6349bd70635d44b9c3b4bd90e39dc474c5f7da88dc0902ee99afe9d3d8c35de2b94d4b20
+MISC metadata.xml 1007 SHA256 1a4c911a631fca3bcc61f79eec9ea93c8a66390bfeca32ae4f06ab1f7707bf4a SHA512 1ebcd623ab08176143226f9544005953e2a7a08ca457f378bd083f0eaeef2d2f64f6c5e2d321ba4f67e34720804e03136d6749a2254ab2b92b2145604637adbd WHIRLPOOL 7da1e5d6ab98313b0dd79ec3f9a1e7c7699fbaecbbe8c4a938fcba8b3805337ed5605b71a586794f5b6bc231a0e6be3c182cc40216db2eeaf9c0f87e80e1f991
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR4E/8AAoJEJWyH81tNOV9DFIH/jEfvxR9V8Zl4v23RehP5xTx
-XGd7L0KIISCwPy2PVAWIY94g64aVv2d48jI3Q5atlY8zlHcCLXbmEw+Cr6lD/5Nf
-9RS+RJzd51pHmtJ2vHJ9cuW+Uk/6DzgQggK5tA+gvFhhhLqiPbHk6sOvry+on36W
-krq2uG7VdVyFTnAUH+4FE3i4UrbJ/phXAcRKy8J7OHL1b9EVSccEzCAZRTl8+nPa
-ayTeSWzCV9DuEuWa+Uh8u16l8idHogRAR8iGJGrHLReM+CGg9FIPeRR7TPLrNtki
-d+LHxLLK7sXS9yXFLgAv+sbYPL9FYd5ME7ZOcKlHxNLNVRwPsBSpHOL+5gzQq20=
-=Lv3V
+iQEcBAEBCAAGBQJR4GsmAAoJEJWyH81tNOV9QTkH/3q5ZF7RS1351nJ0BLjN0nOh
+dQX2SXreDwRkVEo2iNLGHIaeM85zfsPm61EvWCbdA7dMuiJbksOrpJJHbbJnesow
+GEgM1IrA6rWkZj4YQteKD/M4RMXi3P994w3DN/5Txsi/pUty6JzLmlMe6mi8sz7Y
+xi6Sk4/EQsHLboPJmWGUlSIiJdH1UE2ITAKXkxHMeOaFyVupYZt92SlktyrXB2UO
+yohgCfDN1KYwNighd3NGpExG0bJ3tv/H97fbHS3luUq17+L38hE09J0HAnJc7jV6
+SsALx++LrsoquuI5h5862VUhEqIItuEDST2I1EupI+Wvdyh4F6pOqt8Hlg7BrcU=
+=aOmQ
 -----END PGP SIGNATURE-----
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>