Skip to content

Commit

Permalink
media-tv/kodi: Remove the "ssl" USE flag; upstream doesn't support bu…
Browse files Browse the repository at this point in the history
…ilding without ssl

Gentoo-bug: 615386
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Closes: gentoo#4487
  • Loading branch information
candrews authored and SoapGentoo committed Apr 24, 2017
1 parent 6c6bf2c commit 93997c2
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 18 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down Expand Up @@ -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] )
Expand Down Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down Expand Up @@ -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] )
Expand Down Expand Up @@ -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)
Expand Down
10 changes: 4 additions & 6 deletions media-tv/kodi/kodi-9999.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down Expand Up @@ -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] )
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 93997c2

Please sign in to comment.