media-video/vlc: Move x11-libs/libX11 behind qt5+X

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 4f5f388c87935de1455c5b10a277aaae18192f5b..e6c57fbcdd773352194f67184211e3e3d9ef4014 100644 (file)
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -134,10 +134,7 @@ RDEPEND="
        nfs? ( >=net-fs/libnfs-0.10.0:= )
        ogg? ( media-libs/libogg:0 )
        opencv? ( media-libs/opencv:0= )
-       opengl? (
-               virtual/opengl:0
-               x11-libs/libX11:0
-       )
+       opengl? ( virtual/opengl )
        opus? ( >=media-libs/opus-1.0.3:0 )
        png? ( media-libs/libpng:0= )
        postproc? (
@@ -154,7 +151,10 @@ RDEPEND="
                dev-qt/qtgui:5
                dev-qt/qtsvg:5
                dev-qt/qtwidgets:5
-               X? ( dev-qt/qtx11extras:5 )
+               X? (
+                       dev-qt/qtx11extras:5
+                       x11-libs/libX11
+               )
        )
        rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] )
        samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )

diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 258add63ec2937f16ed28f3d10c15374f4b5733f..01717ed6bdca3c5c1e222c88bc52d231331928a1 100644 (file)
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -134,10 +134,7 @@ RDEPEND="
        nfs? ( >=net-fs/libnfs-0.10.0:= )
        ogg? ( media-libs/libogg:0 )
        opencv? ( media-libs/opencv:0= )
-       opengl? (
-               virtual/opengl:0
-               x11-libs/libX11:0
-       )
+       opengl? ( virtual/opengl )
        opus? ( >=media-libs/opus-1.0.3:0 )
        png? ( media-libs/libpng:0= )
        postproc? (
@@ -154,7 +151,10 @@ RDEPEND="
                dev-qt/qtgui:5
                dev-qt/qtsvg:5
                dev-qt/qtwidgets:5
-               X? ( dev-qt/qtx11extras:5 )
+               X? (
+                       dev-qt/qtx11extras:5
+                       x11-libs/libX11
+               )
        )
        rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] )
        samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )