Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-block/open-isns/
Date: Sun, 02 May 2021 16:12:19
Message-Id: 1619971933.51c9485b0bb0eec9e44908469894f9c57da9f9fb.zlogene@gentoo
1 commit: 51c9485b0bb0eec9e44908469894f9c57da9f9fb
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 2 16:11:53 2021 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Sun May 2 16:12:13 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51c9485b
7
8 sys-block/open-isns: 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 sys-block/open-isns/open-isns-0.100.ebuild | 9 +++------
14 sys-block/open-isns/open-isns-0.101.ebuild | 7 ++-----
15 sys-block/open-isns/open-isns-0.98.ebuild | 7 ++-----
16 sys-block/open-isns/open-isns-0.99.ebuild | 9 +++------
17 4 files changed, 10 insertions(+), 22 deletions(-)
18
19 diff --git a/sys-block/open-isns/open-isns-0.100.ebuild b/sys-block/open-isns/open-isns-0.100.ebuild
20 index 63213dbfd79..fa1351cf05c 100644
21 --- a/sys-block/open-isns/open-isns-0.100.ebuild
22 +++ b/sys-block/open-isns/open-isns-0.100.ebuild
23 @@ -1,4 +1,4 @@
24 -# Copyright 1999-2020 Gentoo Authors
25 +# Copyright 1999-2021 Gentoo Authors
26 # Distributed under the terms of the GNU General Public License v2
27
28 EAPI=7
29 @@ -12,19 +12,16 @@ SRC_URI="https://github.com/open-iscsi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
30 LICENSE="LGPL-2.1"
31 SLOT="0"
32 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
33 -IUSE="debug libressl ssl static"
34 +IUSE="debug ssl static"
35
36 DEPEND="
37 ssl? (
38 - !libressl? ( dev-libs/openssl:0= )
39 - libressl? ( dev-libs/libressl:0= )
40 + dev-libs/openssl:0=
41 )
42 "
43 RDEPEND="${DEPEND}"
44
45 PATCHES=(
46 - "${FILESDIR}/${PN}-0.98-libressl-compatibility.patch"
47 -
48 "${FILESDIR}/${PN}-0.100-respect-AR.patch"
49
50 # Upstream patches (can usually be removed with next version bump)
51
52 diff --git a/sys-block/open-isns/open-isns-0.101.ebuild b/sys-block/open-isns/open-isns-0.101.ebuild
53 index 5f7c4bb83ec..395977907a5 100644
54 --- a/sys-block/open-isns/open-isns-0.101.ebuild
55 +++ b/sys-block/open-isns/open-isns-0.101.ebuild
56 @@ -12,19 +12,16 @@ SRC_URI="https://github.com/open-iscsi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
57 LICENSE="LGPL-2.1"
58 SLOT="0"
59 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
60 -IUSE="debug libressl ssl static"
61 +IUSE="debug ssl static"
62
63 DEPEND="
64 ssl? (
65 - !libressl? ( dev-libs/openssl:0= )
66 - libressl? ( dev-libs/libressl:0= )
67 + dev-libs/openssl:0=
68 )
69 "
70 RDEPEND="${DEPEND}"
71
72 PATCHES=(
73 - "${FILESDIR}/${PN}-0.98-libressl-compatibility.patch"
74 -
75 "${FILESDIR}/${PN}-0.100-respect-AR.patch"
76 )
77
78
79 diff --git a/sys-block/open-isns/open-isns-0.98.ebuild b/sys-block/open-isns/open-isns-0.98.ebuild
80 index 6cf8f4626f7..98e5c2e8a45 100644
81 --- a/sys-block/open-isns/open-isns-0.98.ebuild
82 +++ b/sys-block/open-isns/open-isns-0.98.ebuild
83 @@ -12,18 +12,15 @@ SRC_URI="https://github.com/open-iscsi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
84 LICENSE="LGPL-2.1"
85 SLOT="0"
86 KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
87 -IUSE="debug libressl slp ssl static"
88 +IUSE="debug slp ssl static"
89
90 DEPEND="
91 ssl? (
92 - !libressl? ( dev-libs/openssl:0= )
93 - libressl? ( dev-libs/libressl:0= )
94 + dev-libs/openssl:0=
95 )
96 slp? ( net-libs/openslp )"
97 RDEPEND="${DEPEND}"
98
99 -PATCHES=( "${FILESDIR}/${P}-libressl-compatibility.patch" )
100 -
101 src_configure() {
102 use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI
103 append-lfs-flags
104
105 diff --git a/sys-block/open-isns/open-isns-0.99.ebuild b/sys-block/open-isns/open-isns-0.99.ebuild
106 index e9c2b890b98..e7290c1b77b 100644
107 --- a/sys-block/open-isns/open-isns-0.99.ebuild
108 +++ b/sys-block/open-isns/open-isns-0.99.ebuild
109 @@ -1,4 +1,4 @@
110 -# Copyright 1999-2019 Gentoo Authors
111 +# Copyright 1999-2021 Gentoo Authors
112 # Distributed under the terms of the GNU General Public License v2
113
114 EAPI=7
115 @@ -12,18 +12,15 @@ SRC_URI="https://github.com/open-iscsi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
116 LICENSE="LGPL-2.1"
117 SLOT="0"
118 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
119 -IUSE="debug libressl slp ssl static"
120 +IUSE="debug slp ssl static"
121
122 DEPEND="
123 ssl? (
124 - !libressl? ( dev-libs/openssl:0= )
125 - libressl? ( dev-libs/libressl:0= )
126 + dev-libs/openssl:0=
127 )
128 slp? ( net-libs/openslp )"
129 RDEPEND="${DEPEND}"
130
131 -PATCHES=( "${FILESDIR}/${PN}-0.98-libressl-compatibility.patch" )
132 -
133 src_configure() {
134 use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI
135 append-lfs-flags