[gentoo-commits] repo/gentoo:master commit in: app-crypt/trousers/

[Mikle Kolyada]

commit:     13d175f6711be71122d984fd96dea7e7f3edf759
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun May  2 16:37:31 2021 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun May  2 16:40:49 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13d175f6

app-crypt/trousers: remove libressl support

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

 app-crypt/trousers/trousers-0.3.14-r3.ebuild | 9 ++++-----
 app-crypt/trousers/trousers-0.3.15.ebuild    | 9 ++++-----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/app-crypt/trousers/trousers-0.3.14-r3.ebuild 
b/app-crypt/trousers/trousers-0.3.14-r3.ebuild
index 70af34e9a2e..72418a365fc 100644
--- a/app-crypt/trousers/trousers-0.3.14-r3.ebuild
+++ b/app-crypt/trousers/trousers-0.3.14-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
 LICENSE="CPL-1.0 GPL-2"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ~m68k ~ppc ppc64 ~s390 x86"
-IUSE="doc libressl selinux" # gtk
+IUSE="doc selinux" # gtk
 
 # gtk support presently does NOT compile.
 #      gtk? ( >=x11-libs/gtk+-2 )
@@ -20,15 +20,14 @@ IUSE="doc libressl selinux" # gtk
 DEPEND="acct-group/tss
        acct-user/tss
        >=dev-libs/glib-2
-       !libressl? ( >=dev-libs/openssl-0.9.7:0= )
-       libressl? ( dev-libs/libressl:0= )"
+       >=dev-libs/openssl-0.9.7:0=
+       "
 RDEPEND="${DEPEND}
        selinux? ( sec-policy/selinux-tcsd )"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
        "${FILESDIR}/${PN}-0.3.13-nouseradd.patch"
-       "${FILESDIR}/${P}-libressl.patch"
        "${FILESDIR}/${P}-fno-common.patch"
        "${FILESDIR}/${P}-Makefile.am-Mark-tddl.a-nodist.patch"
        "${FILESDIR}/${P}-tcsd-fixes.patch"

diff --git a/app-crypt/trousers/trousers-0.3.15.ebuild 
b/app-crypt/trousers/trousers-0.3.15.ebuild
index 041250710cb..103c18d5498 100644
--- a/app-crypt/trousers/trousers-0.3.15.ebuild
+++ b/app-crypt/trousers/trousers-0.3.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
 LICENSE="CPL-1.0 GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~ppc ~ppc64 ~s390 ~x86"
-IUSE="doc libressl selinux" # gtk
+IUSE="doc selinux" # gtk
 
 # gtk support presently does NOT compile.
 #      gtk? ( >=x11-libs/gtk+-2 )
@@ -20,8 +20,8 @@ IUSE="doc libressl selinux" # gtk
 DEPEND="acct-group/tss
        acct-user/tss
        >=dev-libs/glib-2
-       !libressl? ( >=dev-libs/openssl-0.9.7:0= )
-       libressl? ( dev-libs/libressl:0= )"
+       >=dev-libs/openssl-0.9.7:0=
+       "
 RDEPEND="${DEPEND}
        selinux? ( sec-policy/selinux-tcsd )"
 BDEPEND="virtual/pkgconfig"
@@ -29,7 +29,6 @@ BDEPEND="virtual/pkgconfig"
 PATCHES=(
        "${FILESDIR}/${PN}-0.3.13-nouseradd.patch"
        "${FILESDIR}/${PN}-0.3.14-Makefile.am-Mark-tddl.a-nodist.patch"
-       "${FILESDIR}/${P}-libressl.patch"
 )
 
 DOCS="AUTHORS ChangeLog NICETOHAVES README TODO"