Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/
Date: Thu, 29 Apr 2021 19:20:37
Message-Id: 1619724030.a256d1a7cceead701ebca639487e39186a2bb09a.zlogene@gentoo
1 commit: a256d1a7cceead701ebca639487e39186a2bb09a
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Thu Apr 29 19:15:38 2021 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 29 19:20:30 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a256d1a7
7
8 app-admin/apache-tools: 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 app-admin/apache-tools/apache-tools-2.4.46.ebuild | 7 ++-----
14 app-admin/apache-tools/apache-tools-2.4.47.ebuild | 7 ++-----
15 2 files changed, 4 insertions(+), 10 deletions(-)
16
17 diff --git a/app-admin/apache-tools/apache-tools-2.4.46.ebuild b/app-admin/apache-tools/apache-tools-2.4.46.ebuild
18 index 42dcd53ef1e..6e6a05fad33 100644
19 --- a/app-admin/apache-tools/apache-tools-2.4.46.ebuild
20 +++ b/app-admin/apache-tools/apache-tools-2.4.46.ebuild
21 @@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
22 LICENSE="Apache-2.0"
23 SLOT="0"
24 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris"
25 -IUSE="libressl ssl"
26 +IUSE="ssl"
27 RESTRICT="test"
28
29 RDEPEND=">=dev-libs/apr-1.5.0:1=
30 @@ -19,10 +19,7 @@ RDEPEND=">=dev-libs/apr-1.5.0:1=
31 dev-libs/expat
32 dev-libs/libpcre
33 kernel_linux? ( sys-apps/util-linux )
34 - ssl? (
35 - !libressl? ( dev-libs/openssl:0= )
36 - libressl? ( dev-libs/libressl:0= )
37 - )"
38 + ssl? ( dev-libs/openssl:0= )"
39
40 DEPEND="${RDEPEND}
41 sys-devel/libtool"
42
43 diff --git a/app-admin/apache-tools/apache-tools-2.4.47.ebuild b/app-admin/apache-tools/apache-tools-2.4.47.ebuild
44 index d3cd3f78096..7383d8780bb 100644
45 --- a/app-admin/apache-tools/apache-tools-2.4.47.ebuild
46 +++ b/app-admin/apache-tools/apache-tools-2.4.47.ebuild
47 @@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
48 LICENSE="Apache-2.0"
49 SLOT="0"
50 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris"
51 -IUSE="libressl ssl"
52 +IUSE="ssl"
53 RESTRICT="test"
54
55 RDEPEND=">=dev-libs/apr-1.5.0:1=
56 @@ -19,10 +19,7 @@ RDEPEND=">=dev-libs/apr-1.5.0:1=
57 dev-libs/expat
58 dev-libs/libpcre
59 kernel_linux? ( sys-apps/util-linux )
60 - ssl? (
61 - !libressl? ( dev-libs/openssl:0= )
62 - libressl? ( dev-libs/libressl:0= )
63 - )"
64 + ssl? ( dev-libs/openssl:0= )"
65
66 DEPEND="${RDEPEND}
67 sys-devel/libtool"