media-libs/mlt: 6.6.0: USE=sdl2 switches to libsdl2 instead-of libsdl

Next version bump should drop sdl.

Closes: https://bugs.gentoo.org/656904
Package-Manager: Portage-2.3.43, Repoman-2.3.10

diff --git a/media-libs/mlt/mlt-6.6.0-r1.ebuild b/media-libs/mlt/mlt-6.6.0-r1.ebuild
index 0b4ce6cd3fb1240c531be43f3932e47de00d6773..6d779bafb86c2b05a339ae4bdd57e58dfe5258d8 100644 (file)
--- a/media-libs/mlt/mlt-6.6.0-r1.ebuild
+++ b/media-libs/mlt/mlt-6.6.0-r1.ebuild
@@ -22,7 +22,7 @@ gtk jack kdenlive libav libsamplerate lua melt opencv opengl python qt5 rtaudio
 # java perl php tcl vidstab
 IUSE="${IUSE} kernel_linux"
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) sdl2? ( sdl )"
 
 #rtaudio will use OSS on non linux OSes
 COMMON_DEPEND="
@@ -63,12 +63,14 @@ COMMON_DEPEND="
        )
        ruby? ( ${RUBY_DEPS} )
        sdl? (
-               >=media-libs/libsdl-1.2.10[X,opengl,video]
-               >=media-libs/sdl-image-1.2.4
-       )
-       sdl2? (
-               media-libs/libsdl2[X,opengl,video]
-               media-libs/sdl2-image
+               sdl2? (
+                       media-libs/libsdl2[X,opengl,video]
+                       media-libs/sdl2-image
+               )
+               !sdl2? (
+                       >=media-libs/libsdl-1.2.10[X,opengl,video]
+                       >=media-libs/sdl-image-1.2.4
+               )
        )
        xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 )
        xml? ( >=dev-libs/libxml2-2.5 )"
@@ -137,8 +139,6 @@ src_configure() {
                $(use_enable cpu_flags_x86_sse sse)
                $(use_enable cpu_flags_x86_sse2 sse2)
                $(use_enable gtk gtk2)
-               $(use_enable sdl)
-               $(use_enable sdl2)
                $(use_enable jack jackrack)
                $(use_enable ffmpeg avformat)
                $(use ffmpeg && echo ' --avformat-swscale')
@@ -167,6 +167,14 @@ src_configure() {
                myconf+=( --disable-qt )
        fi
 
+       if use sdl ; then
+               if use sdl2 ; then
+                       myconf+=( --enable-sdl2 --disable-sdl )
+               else
+                       myconf+=( --enable-sdl --disable-sdl2 )
+               fi
+       fi
+
        if use x86 || use amd64 ; then
                myconf+=( $(use_enable cpu_flags_x86_mmx mmx) )
        else