media-video/vlc: Drop USE=bidi from REQUIRED_USE

Package-Manager: Portage-2.3.24, Repoman-2.3.6

diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index 248cb95f3cdaa31a3731b47843723aa76e419054..6c691145bec27f062571d3eb97e0e66f43b2ce12 100644 (file)
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -40,7 +40,6 @@ IUSE="a52 alsa altivec aom archive bidi bluray cddb chromaprint chromecast dbus
        x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse
 "
 REQUIRED_USE="
-       bidi? ( truetype )
        chromecast? ( encode )
        directx? ( ffmpeg )
        fontconfig? ( truetype )
@@ -62,7 +61,11 @@ RDEPEND="
        alsa? ( media-libs/alsa-lib:0 )
        aom? ( media-libs/libaom:= )
        archive? ( app-arch/libarchive:= )
-       bidi? ( dev-libs/fribidi:0 )
+       bidi? (
+               dev-libs/fribidi:0
+               media-libs/freetype:2
+               virtual/ttf-fonts:0
+       )
        bluray? ( media-libs/libbluray:0= )
        cddb? ( media-libs/libcddb:0 )
        chromaprint? ( media-libs/chromaprint:0= )
@@ -355,7 +358,6 @@ src_configure() {
                $(use_enable taglib)
                $(use_enable theora)
                $(use_enable tremor)
-               $(use_enable truetype freetype)
                $(use_enable twolame)
                $(use_enable udev)
                $(use_enable upnp)
@@ -421,7 +423,13 @@ src_configure() {
 
        xdg_environment_reset # bug 608256
 
-       if use truetype || use projectm ; then
+       if use truetype || use bidi; then
+               myeconfargs+=( --enable-freetype )
+       else
+               myeconfargs+=( --disable-freetype )
+       fi
+
+       if use truetype || use projectm; then
                local dejavu="/usr/share/fonts/dejavu/"
                myeconfargs+=(
                        --with-default-font=${dejavu}/DejaVuSans.ttf

diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 0de960bb6575f0b347b3e012e111db0bdf063c3d..9fcb8c7bb6b83dfc543560b083017ff2689fc5e1 100644 (file)
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -40,7 +40,6 @@ IUSE="a52 alsa altivec aom archive bidi bluray cddb chromaprint chromecast dbus
        x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse
 "
 REQUIRED_USE="
-       bidi? ( truetype )
        chromecast? ( encode )
        directx? ( ffmpeg )
        fontconfig? ( truetype )
@@ -62,7 +61,11 @@ RDEPEND="
        alsa? ( media-libs/alsa-lib:0 )
        aom? ( media-libs/libaom:= )
        archive? ( app-arch/libarchive:= )
-       bidi? ( dev-libs/fribidi:0 )
+       bidi? (
+               dev-libs/fribidi:0
+               media-libs/freetype:2
+               virtual/ttf-fonts:0
+       )
        bluray? ( media-libs/libbluray:0= )
        cddb? ( media-libs/libcddb:0 )
        chromaprint? ( media-libs/chromaprint:0= )
@@ -354,7 +357,6 @@ src_configure() {
                $(use_enable taglib)
                $(use_enable theora)
                $(use_enable tremor)
-               $(use_enable truetype freetype)
                $(use_enable twolame)
                $(use_enable udev)
                $(use_enable upnp)
@@ -420,7 +422,13 @@ src_configure() {
 
        xdg_environment_reset # bug 608256
 
-       if use truetype || use projectm ; then
+       if use truetype || use bidi; then
+               myeconfargs+=( --enable-freetype )
+       else
+               myeconfargs+=( --disable-freetype )
+       fi
+
+       if use truetype || use projectm; then
                local dejavu="/usr/share/fonts/dejavu/"
                myeconfargs+=(
                        --with-default-font=${dejavu}/DejaVuSans.ttf