commit:     7bbd254b0f09122aed6f60e3bffec7f77818ee36
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 29 19:12:57 2021 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Thu Apr 29 19:20:30 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bbd254b

x11-base/xorg-server: remove libressl support

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 x11-base/xorg-server/xorg-server-1.20.10-r2.ebuild | 5 ++---
 x11-base/xorg-server/xorg-server-1.20.10-r3.ebuild | 5 ++---
 x11-base/xorg-server/xorg-server-1.20.11.ebuild    | 5 ++---
 x11-base/xorg-server/xorg-server-9999.ebuild       | 5 ++---
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/x11-base/xorg-server/xorg-server-1.20.10-r2.ebuild 
b/x11-base/xorg-server/xorg-server-1.20.10-r2.ebuild
index b1ac96ca735..42c430c43f2 100644
--- a/x11-base/xorg-server/xorg-server-1.20.10-r2.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.10-r2.ebuild
@@ -14,13 +14,12 @@ if [[ ${PV} != 9999* ]]; then
 fi
 
 IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} debug +elogind ipv6 libressl minimal selinux suid 
systemd test +udev unwind xcsecurity"
+IUSE="${IUSE_SERVERS} debug +elogind ipv6 minimal selinux suid systemd test 
+udev unwind xcsecurity"
 RESTRICT="!test? ( test )"
 
 CDEPEND="
        media-libs/libglvnd[X]
-       !libressl? ( dev-libs/openssl:0= )
-       libressl? ( dev-libs/libressl:0= )
+       dev-libs/openssl:0=
        >=x11-apps/iceauth-1.0.2
        >=x11-apps/rgb-1.0.3
        >=x11-apps/xauth-1.0.3

diff --git a/x11-base/xorg-server/xorg-server-1.20.10-r3.ebuild 
b/x11-base/xorg-server/xorg-server-1.20.10-r3.ebuild
index d7f946f1e64..241f73b55e2 100644
--- a/x11-base/xorg-server/xorg-server-1.20.10-r3.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.10-r3.ebuild
@@ -14,13 +14,12 @@ if [[ ${PV} != 9999* ]]; then
 fi
 
 IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} debug +elogind ipv6 libressl minimal selinux suid 
systemd test +udev unwind xcsecurity"
+IUSE="${IUSE_SERVERS} debug +elogind ipv6 minimal selinux suid systemd test 
+udev unwind xcsecurity"
 RESTRICT="!test? ( test )"
 
 CDEPEND="
        media-libs/libglvnd[X]
-       !libressl? ( dev-libs/openssl:0= )
-       libressl? ( dev-libs/libressl:0= )
+       dev-libs/openssl:0=
        >=x11-apps/iceauth-1.0.2
        >=x11-apps/rgb-1.0.3
        >=x11-apps/xauth-1.0.3

diff --git a/x11-base/xorg-server/xorg-server-1.20.11.ebuild 
b/x11-base/xorg-server/xorg-server-1.20.11.ebuild
index d7f946f1e64..241f73b55e2 100644
--- a/x11-base/xorg-server/xorg-server-1.20.11.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.11.ebuild
@@ -14,13 +14,12 @@ if [[ ${PV} != 9999* ]]; then
 fi
 
 IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} debug +elogind ipv6 libressl minimal selinux suid 
systemd test +udev unwind xcsecurity"
+IUSE="${IUSE_SERVERS} debug +elogind ipv6 minimal selinux suid systemd test 
+udev unwind xcsecurity"
 RESTRICT="!test? ( test )"
 
 CDEPEND="
        media-libs/libglvnd[X]
-       !libressl? ( dev-libs/openssl:0= )
-       libressl? ( dev-libs/libressl:0= )
+       dev-libs/openssl:0=
        >=x11-apps/iceauth-1.0.2
        >=x11-apps/rgb-1.0.3
        >=x11-apps/xauth-1.0.3

diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild 
b/x11-base/xorg-server/xorg-server-9999.ebuild
index 7b4a9180cd7..c6ec9c9033a 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -15,13 +15,12 @@ if [[ ${PV} != 9999* ]]; then
 fi
 
 IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} debug +elogind ipv6 libressl minimal selinux suid 
systemd test +udev unwind xcsecurity"
+IUSE="${IUSE_SERVERS} debug +elogind ipv6 minimal selinux suid systemd test 
+udev unwind xcsecurity"
 RESTRICT="!test? ( test )"
 
 CDEPEND="
        media-libs/libglvnd[X]
-       !libressl? ( dev-libs/openssl:0= )
-       libressl? ( dev-libs/libressl:0= )
+       dev-libs/openssl:0=
        >=x11-apps/iceauth-1.0.2
        >=x11-apps/rgb-1.0.3
        >=x11-apps/xauth-1.0.3

Reply via email to