| 1 |
commit: a6edfaa9a8f21f953112b01436bbda5166f29c2e |
| 2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 2 12:26:20 2021 +0000 |
| 4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 2 12:26:20 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6edfaa9 |
| 7 |
|
| 8 |
media-tv/kodi: remove libressl support |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.2 |
| 11 |
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> |
| 12 |
|
| 13 |
media-tv/kodi/kodi-19.0.ebuild | 10 ++++------ |
| 14 |
media-tv/kodi/kodi-19.9999.ebuild | 10 ++++------ |
| 15 |
media-tv/kodi/kodi-9999.ebuild | 10 ++++------ |
| 16 |
3 files changed, 12 insertions(+), 18 deletions(-) |
| 17 |
|
| 18 |
diff --git a/media-tv/kodi/kodi-19.0.ebuild b/media-tv/kodi/kodi-19.0.ebuild |
| 19 |
index a39d3ca1acd..aae8e4ae5e6 100644 |
| 20 |
--- a/media-tv/kodi/kodi-19.0.ebuild |
| 21 |
+++ b/media-tv/kodi/kodi-19.0.ebuild |
| 22 |
@@ -3,7 +3,7 @@ |
| 23 |
|
| 24 |
EAPI=7 |
| 25 |
|
| 26 |
-PYTHON_REQ_USE="libressl?,sqlite,ssl" |
| 27 |
+PYTHON_REQ_USE="sqlite,ssl" |
| 28 |
LIBDVDCSS_VERSION="1.4.2-Leia-Beta-5" |
| 29 |
LIBDVDREAD_VERSION="6.0.0-Leia-Alpha-3" |
| 30 |
LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3" |
| 31 |
@@ -40,7 +40,7 @@ SLOT="0" |
| 32 |
# use flag is called libusb so that it doesn't fool people in thinking that |
| 33 |
# it is _required_ for USB support. Otherwise they'll disable udev and |
| 34 |
# that's going to be worse. |
| 35 |
-IUSE="airplay alsa bluetooth bluray caps cec +css dav1d dbus eventclients gbm gles lcms libressl libusb lirc mariadb mysql nfs +optical power-control pulseaudio raspberry-pi samba +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf" |
| 36 |
+IUSE="airplay alsa bluetooth bluray caps cec +css dav1d dbus eventclients gbm gles lcms libusb lirc mariadb mysql nfs +optical power-control pulseaudio raspberry-pi samba +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf" |
| 37 |
IUSE="${IUSE} cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon" |
| 38 |
REQUIRED_USE=" |
| 39 |
${PYTHON_REQUIRED_USE} |
| 40 |
@@ -108,8 +108,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS} |
| 41 |
>=media-libs/taglib-1.11.1 |
| 42 |
system-ffmpeg? ( |
| 43 |
>=media-video/ffmpeg-${FFMPEG_VERSION}:=[dav1d?,encode,postproc] |
| 44 |
- libressl? ( media-video/ffmpeg[libressl,-openssl] ) |
| 45 |
- !libressl? ( media-video/ffmpeg[-libressl,openssl] ) |
| 46 |
+ media-video/ffmpeg[openssl] |
| 47 |
) |
| 48 |
!system-ffmpeg? ( |
| 49 |
app-arch/bzip2 |
| 50 |
@@ -120,8 +119,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS} |
| 51 |
>=net-misc/curl-7.68.0[http2] |
| 52 |
nfs? ( >=net-fs/libnfs-2.0.0:= ) |
| 53 |
!gles? ( media-libs/glu ) |
| 54 |
- !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) |
| 55 |
- libressl? ( dev-libs/libressl:0= ) |
| 56 |
+ >=dev-libs/openssl-1.0.2l:0= |
| 57 |
raspberry-pi? ( |
| 58 |
|| ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,video_cards_vc4] ) |
| 59 |
) |
| 60 |
|
| 61 |
diff --git a/media-tv/kodi/kodi-19.9999.ebuild b/media-tv/kodi/kodi-19.9999.ebuild |
| 62 |
index e644af36dbd..ef65967b672 100644 |
| 63 |
--- a/media-tv/kodi/kodi-19.9999.ebuild |
| 64 |
+++ b/media-tv/kodi/kodi-19.9999.ebuild |
| 65 |
@@ -3,7 +3,7 @@ |
| 66 |
|
| 67 |
EAPI=7 |
| 68 |
|
| 69 |
-PYTHON_REQ_USE="libressl?,sqlite,ssl" |
| 70 |
+PYTHON_REQ_USE="sqlite,ssl" |
| 71 |
LIBDVDCSS_VERSION="1.4.2-Leia-Beta-5" |
| 72 |
LIBDVDREAD_VERSION="6.0.0-Leia-Alpha-3" |
| 73 |
LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3" |
| 74 |
@@ -40,7 +40,7 @@ SLOT="0" |
| 75 |
# use flag is called libusb so that it doesn't fool people in thinking that |
| 76 |
# it is _required_ for USB support. Otherwise they'll disable udev and |
| 77 |
# that's going to be worse. |
| 78 |
-IUSE="airplay alsa bluetooth bluray caps cec +css dav1d dbus eventclients gbm gles lcms libressl libusb lirc mariadb mysql nfs +optical power-control pulseaudio raspberry-pi samba +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf" |
| 79 |
+IUSE="airplay alsa bluetooth bluray caps cec +css dav1d dbus eventclients gbm gles lcms libusb lirc mariadb mysql nfs +optical power-control pulseaudio raspberry-pi samba +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf" |
| 80 |
IUSE="${IUSE} cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon" |
| 81 |
REQUIRED_USE=" |
| 82 |
${PYTHON_REQUIRED_USE} |
| 83 |
@@ -108,8 +108,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS} |
| 84 |
>=media-libs/taglib-1.11.1 |
| 85 |
system-ffmpeg? ( |
| 86 |
>=media-video/ffmpeg-${FFMPEG_VERSION}:=[dav1d?,encode,postproc] |
| 87 |
- libressl? ( media-video/ffmpeg[libressl,-openssl] ) |
| 88 |
- !libressl? ( media-video/ffmpeg[-libressl,openssl] ) |
| 89 |
+ media-video/ffmpeg[openssl] |
| 90 |
) |
| 91 |
!system-ffmpeg? ( |
| 92 |
app-arch/bzip2 |
| 93 |
@@ -120,8 +119,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS} |
| 94 |
>=net-misc/curl-7.68.0[http2] |
| 95 |
nfs? ( >=net-fs/libnfs-2.0.0:= ) |
| 96 |
!gles? ( media-libs/glu ) |
| 97 |
- !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) |
| 98 |
- libressl? ( dev-libs/libressl:0= ) |
| 99 |
+ >=dev-libs/openssl-1.0.2l:0= |
| 100 |
raspberry-pi? ( |
| 101 |
|| ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,video_cards_vc4] ) |
| 102 |
) |
| 103 |
|
| 104 |
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild |
| 105 |
index ed308818609..e60c2a97fb5 100644 |
| 106 |
--- a/media-tv/kodi/kodi-9999.ebuild |
| 107 |
+++ b/media-tv/kodi/kodi-9999.ebuild |
| 108 |
@@ -3,7 +3,7 @@ |
| 109 |
|
| 110 |
EAPI=7 |
| 111 |
|
| 112 |
-PYTHON_REQ_USE="libressl?,sqlite,ssl" |
| 113 |
+PYTHON_REQ_USE="sqlite,ssl" |
| 114 |
LIBDVDCSS_VERSION="1.4.2-Leia-Beta-5" |
| 115 |
LIBDVDREAD_VERSION="6.0.0-Leia-Alpha-3" |
| 116 |
LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3" |
| 117 |
@@ -39,7 +39,7 @@ SLOT="0" |
| 118 |
# use flag is called libusb so that it doesn't fool people in thinking that |
| 119 |
# it is _required_ for USB support. Otherwise they'll disable udev and |
| 120 |
# that's going to be worse. |
| 121 |
-IUSE="airplay alsa bluetooth bluray caps cec +css dav1d dbus eventclients gbm gles lcms libressl libusb lirc mariadb mysql nfs +optical power-control pulseaudio raspberry-pi samba +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf" |
| 122 |
+IUSE="airplay alsa bluetooth bluray caps cec +css dav1d dbus eventclients gbm gles lcms libusb lirc mariadb mysql nfs +optical power-control pulseaudio raspberry-pi samba +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf" |
| 123 |
IUSE="${IUSE} cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon" |
| 124 |
REQUIRED_USE=" |
| 125 |
${PYTHON_REQUIRED_USE} |
| 126 |
@@ -107,8 +107,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS} |
| 127 |
>=media-libs/taglib-1.11.1 |
| 128 |
system-ffmpeg? ( |
| 129 |
>=media-video/ffmpeg-${FFMPEG_VERSION}:=[dav1d?,encode,postproc] |
| 130 |
- libressl? ( media-video/ffmpeg[libressl,-openssl] ) |
| 131 |
- !libressl? ( media-video/ffmpeg[-libressl,openssl] ) |
| 132 |
+ media-video/ffmpeg[openssl] |
| 133 |
) |
| 134 |
!system-ffmpeg? ( |
| 135 |
app-arch/bzip2 |
| 136 |
@@ -119,8 +118,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS} |
| 137 |
>=net-misc/curl-7.68.0[http2] |
| 138 |
nfs? ( >=net-fs/libnfs-2.0.0:= ) |
| 139 |
!gles? ( media-libs/glu ) |
| 140 |
- !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) |
| 141 |
- libressl? ( dev-libs/libressl:0= ) |
| 142 |
+ >=dev-libs/openssl-1.0.2l:0= |
| 143 |
raspberry-pi? ( |
| 144 |
|| ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,video_cards_vc4] ) |
| 145 |
) |
Archives