media-tv/kodi: Remove the "ssl" USE flag; upstream doesn't support building without ssl

Gentoo-bug: 615386
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/4487

diff --git a/media-tv/kodi/kodi-17.0-r3.ebuild b/media-tv/kodi/kodi-17.0-r4.ebuild
similarity index 96%
rename from media-tv/kodi/kodi-17.0-r3.ebuild
rename to media-tv/kodi/kodi-17.0-r4.ebuild
index 98e105edaf89682cb832c84714ba584ef49fac04..719b9853100e22d055df676c2238344c27925b41 100644 (file)
--- a/media-tv/kodi/kodi-17.0-r3.ebuild
+++ b/media-tv/kodi/kodi-17.0-r4.ebuild
@@ -27,7 +27,7 @@ SLOT="0"
 # use flag is called libusb so that it doesn't fool people in thinking that
 # it is _required_ for USB support. Otherwise they'll disable udev and
 # that's going to be worse.
-IUSE="airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles libressl libusb lirc mysql nfs nonfree +opengl +ssl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf"
+IUSE="airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles libressl libusb lirc mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf"
 REQUIRED_USE="
        ${PYTHON_REQUIRED_USE}
        || ( gles opengl )
@@ -74,10 +74,8 @@ COMMON_DEPEND="${PYTHON_DEPS}
        >=net-misc/curl-7.51.0
        nfs? ( net-fs/libnfs:= )
        opengl? ( media-libs/glu )
-       ssl? (
-               !libressl? ( >=dev-libs/openssl-1.0.2j:0= )
-               libressl? ( dev-libs/libressl:0= )
-       )
+       !libressl? ( >=dev-libs/openssl-1.0.2j:0= )
+       libressl? ( dev-libs/libressl:0= )
        pulseaudio? ( media-sound/pulseaudio )
        samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
        sftp? ( net-libs/libssh[sftp] )
@@ -226,7 +224,7 @@ src_configure() {
                -DENABLE_NONFREE=$(usex nonfree)
                -DENABLE_OPENGLES=$(usex gles)
                -DENABLE_OPENGL=$(usex opengl)
-               -DENABLE_OPENSSL=$(usex ssl)
+               -DENABLE_OPENSSL=ON
                -DENABLE_OPTICAL=$(usex dvd)
                -DENABLE_PLIST=$(usex airplay)
                -DENABLE_PULSEAUDIO=$(usex pulseaudio)

diff --git a/media-tv/kodi/kodi-17.1-r2.ebuild b/media-tv/kodi/kodi-17.1-r3.ebuild
similarity index 96%
rename from media-tv/kodi/kodi-17.1-r2.ebuild
rename to media-tv/kodi/kodi-17.1-r3.ebuild
index 98e105edaf89682cb832c84714ba584ef49fac04..719b9853100e22d055df676c2238344c27925b41 100644 (file)
--- a/media-tv/kodi/kodi-17.1-r2.ebuild
+++ b/media-tv/kodi/kodi-17.1-r3.ebuild
@@ -27,7 +27,7 @@ SLOT="0"
 # use flag is called libusb so that it doesn't fool people in thinking that
 # it is _required_ for USB support. Otherwise they'll disable udev and
 # that's going to be worse.
-IUSE="airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles libressl libusb lirc mysql nfs nonfree +opengl +ssl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf"
+IUSE="airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles libressl libusb lirc mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf"
 REQUIRED_USE="
        ${PYTHON_REQUIRED_USE}
        || ( gles opengl )
@@ -74,10 +74,8 @@ COMMON_DEPEND="${PYTHON_DEPS}
        >=net-misc/curl-7.51.0
        nfs? ( net-fs/libnfs:= )
        opengl? ( media-libs/glu )
-       ssl? (
-               !libressl? ( >=dev-libs/openssl-1.0.2j:0= )
-               libressl? ( dev-libs/libressl:0= )
-       )
+       !libressl? ( >=dev-libs/openssl-1.0.2j:0= )
+       libressl? ( dev-libs/libressl:0= )
        pulseaudio? ( media-sound/pulseaudio )
        samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
        sftp? ( net-libs/libssh[sftp] )
@@ -226,7 +224,7 @@ src_configure() {
                -DENABLE_NONFREE=$(usex nonfree)
                -DENABLE_OPENGLES=$(usex gles)
                -DENABLE_OPENGL=$(usex opengl)
-               -DENABLE_OPENSSL=$(usex ssl)
+               -DENABLE_OPENSSL=ON
                -DENABLE_OPTICAL=$(usex dvd)
                -DENABLE_PLIST=$(usex airplay)
                -DENABLE_PULSEAUDIO=$(usex pulseaudio)

diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index fedde8f344a69124227ae8da173652edb1ef036f..0e7f4c90da4f578d16108890ea607fb404ade9b1 100644 (file)
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -27,7 +27,7 @@ SLOT="0"
 # use flag is called libusb so that it doesn't fool people in thinking that
 # it is _required_ for USB support. Otherwise they'll disable udev and
 # that's going to be worse.
-IUSE="airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles libressl libusb lirc mysql nfs nonfree +opengl +ssl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf"
+IUSE="airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles libressl libusb lirc mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf"
 REQUIRED_USE="
        ${PYTHON_REQUIRED_USE}
        || ( gles opengl )
@@ -74,10 +74,8 @@ COMMON_DEPEND="${PYTHON_DEPS}
        >=net-misc/curl-7.51.0
        nfs? ( net-fs/libnfs:= )
        opengl? ( media-libs/glu )
-       ssl? (
-               !libressl? ( >=dev-libs/openssl-1.0.2j:0= )
-               libressl? ( dev-libs/libressl:0= )
-       )
+       !libressl? ( >=dev-libs/openssl-1.0.2j:0= )
+       libressl? ( dev-libs/libressl:0= )
        pulseaudio? ( media-sound/pulseaudio )
        samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
        sftp? ( net-libs/libssh[sftp] )
@@ -225,7 +223,7 @@ src_configure() {
                -DENABLE_NONFREE=$(usex nonfree)
                -DENABLE_OPENGLES=$(usex gles)
                -DENABLE_OPENGL=$(usex opengl)
-               -DENABLE_OPENSSL=$(usex ssl)
+               -DENABLE_OPENSSL=ON
                -DENABLE_OPTICAL=$(usex dvd)
                -DENABLE_PLIST=$(usex airplay)
                -DENABLE_PULSEAUDIO=$(usex pulseaudio)