[gentoo-commits] repo/gentoo:master commit in: net-libs/neon/ - gentoo-commits

From:	Mikle Kolyada <zlogene@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: net-libs/neon/
Date:	Mon, 03 May 2021 08:51:54
Message-Id:	`1620031879.629d3356501ab24dd091a47d713f1724912a6831.zlogene@gentoo`

1

commit:     629d3356501ab24dd091a47d713f1724912a6831

2

Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>

3

AuthorDate: Mon May  3 08:51:19 2021 +0000

4

Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>

5

CommitDate: Mon May  3 08:51:19 2021 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=629d3356

7

8

net-libs/neon: 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

 net-libs/neon/neon-0.30.2.ebuild | 12 ++----------

14

 net-libs/neon/neon-0.31.0.ebuild | 12 ++----------

15

 net-libs/neon/neon-0.31.1.ebuild | 12 ++----------

16

 net-libs/neon/neon-0.31.2.ebuild | 12 ++----------

17

 4 files changed, 8 insertions(+), 40 deletions(-)

18

19

diff --git a/net-libs/neon/neon-0.30.2.ebuild b/net-libs/neon/neon-0.30.2.ebuild

20

index 863f2e38958..0579d7c523d 100644

21

--- a/net-libs/neon/neon-0.30.2.ebuild

22

+++ b/net-libs/neon/neon-0.30.2.ebuild

23

@@ -12,7 +12,7 @@ SRC_URI="http://webdav.org/neon/${P}.tar.gz"

24

 LICENSE="GPL-2"

25

 SLOT="0/27"

26

 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"

27

-IUSE="doc expat gnutls kerberos libproxy libressl nls pkcs11 ssl static-libs zlib"

28

+IUSE="doc expat gnutls kerberos libproxy nls pkcs11 ssl static-libs zlib"

29

 RESTRICT="test"

30

31

 RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] )

32

@@ -26,8 +26,7 @@ RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] )

33

 			net-libs/gnutls:0=[${MULTILIB_USEDEP}]

34

)

35

 		!gnutls? (

36

-			libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )

37

-			!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )

38

+			dev-libs/openssl:0=[${MULTILIB_USEDEP}]

39

)

40

 		pkcs11? ( dev-libs/pakchois:0=[${MULTILIB_USEDEP}] )

41

)

42

@@ -46,13 +45,6 @@ src_prepare() {

43

 	# Fix compatibility with OpenSSL >=1.1.

44

 	sed -e "s/RSA_F_RSA_PRIVATE_ENCRYPT/RSA_F_RSA_OSSL_PRIVATE_ENCRYPT/" -i src/ne_pkcs11.c || die "sed failed"

45

46

-	if has_version "<dev-libs/libressl-3.0.0"; then

47

-		# Support LibreSSL.

48

-		# Functions RSA_meth_get0_app_data() and RSA_meth_set0_app_data() are not implemented in LibreSSL 2.9.2.

49

-		sed -e "1202s/#if OPENSSL_VERSION_NUMBER < 0x10100000L/& || defined(LIBRESSL_VERSION_NUMBER)/" -i src/ne_openssl.c || die "sed failed"

50

-		sed -e "97a #if defined(LIBRESSL_VERSION_NUMBER)\nstatic void *RSA_meth_get0_app_data(const RSA_METHOD *meth)\n{\n    return meth->app_data;\n}\nstatic int RSA_meth_set0_app_data(RSA_METHOD *meth, void *app_data)\n{\n    meth->app_data = app_data;\n    return 1;\n}\n#endif" -i src/ne_pkcs11.c || die "sed failed"

51

-	fi

52

-

53

 	eapply_user

54

55

 	AT_M4DIR="macros" eautoreconf

56

57

diff --git a/net-libs/neon/neon-0.31.0.ebuild b/net-libs/neon/neon-0.31.0.ebuild

58

index 1a5b84fea67..adbc8e2dcc7 100644

59

--- a/net-libs/neon/neon-0.31.0.ebuild

60

+++ b/net-libs/neon/neon-0.31.0.ebuild

61

@@ -12,7 +12,7 @@ SRC_URI="http://webdav.org/neon/${P}.tar.gz"

62

 LICENSE="GPL-2"

63

 SLOT="0/27"

64

 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"

65

-IUSE="doc expat gnutls kerberos libproxy libressl nls pkcs11 ssl static-libs zlib"

66

+IUSE="doc expat gnutls kerberos libproxy nls pkcs11 ssl static-libs zlib"

67

 RESTRICT="test"

68

69

 RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] )

70

@@ -26,8 +26,7 @@ RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] )

71

 			net-libs/gnutls:0=[${MULTILIB_USEDEP}]

72

)

73

 		!gnutls? (

74

-			libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )

75

-			!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )

76

+			dev-libs/openssl:0=[${MULTILIB_USEDEP}]

77

)

78

 		pkcs11? ( dev-libs/pakchois:0=[${MULTILIB_USEDEP}] )

79

)

80

@@ -46,13 +45,6 @@ src_prepare() {

81

 	# Fix compatibility with OpenSSL >=1.1.

82

 	sed -e "s/RSA_F_RSA_PRIVATE_ENCRYPT/RSA_F_RSA_OSSL_PRIVATE_ENCRYPT/" -i src/ne_pkcs11.c || die "sed failed"

83

84

-	if has_version "<dev-libs/libressl-3.0.0"; then

85

-		# Support LibreSSL.

86

-		# Functions RSA_meth_get0_app_data() and RSA_meth_set0_app_data() are not implemented in LibreSSL 2.9.2.

87

-		sed -e "1202s/#if OPENSSL_VERSION_NUMBER < 0x10100000L/& || defined(LIBRESSL_VERSION_NUMBER)/" -i src/ne_openssl.c || die "sed failed"

88

-		sed -e "97a #if defined(LIBRESSL_VERSION_NUMBER)\nstatic void *RSA_meth_get0_app_data(const RSA_METHOD *meth)\n{\n    return meth->app_data;\n}\nstatic int RSA_meth_set0_app_data(RSA_METHOD *meth, void *app_data)\n{\n    meth->app_data = app_data;\n    return 1;\n}\n#endif" -i src/ne_pkcs11.c || die "sed failed"

89

-	fi

90

-

91

 	eapply_user

92

93

 	AT_M4DIR="macros" eautoreconf

94

95

diff --git a/net-libs/neon/neon-0.31.1.ebuild b/net-libs/neon/neon-0.31.1.ebuild

96

index 06d89576f8d..a6ad1025fb5 100644

97

--- a/net-libs/neon/neon-0.31.1.ebuild

98

+++ b/net-libs/neon/neon-0.31.1.ebuild

99

@@ -12,7 +12,7 @@ SRC_URI="https://notroj.github.io/neon/${P}.tar.gz"

100

 LICENSE="GPL-2"

101

 SLOT="0/27"

102

 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"

103

-IUSE="doc expat gnutls kerberos libproxy libressl nls pkcs11 ssl static-libs zlib"

104

+IUSE="doc expat gnutls kerberos libproxy nls pkcs11 ssl static-libs zlib"

105

 RESTRICT="test"

106

107

 RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] )

108

@@ -26,8 +26,7 @@ RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] )

109

 			net-libs/gnutls:0=[${MULTILIB_USEDEP}]

110

)

111

 		!gnutls? (

112

-			libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )

113

-			!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )

114

+			dev-libs/openssl:0=[${MULTILIB_USEDEP}]

115

)

116

 		pkcs11? ( dev-libs/pakchois:0=[${MULTILIB_USEDEP}] )

117

)

118

@@ -46,13 +45,6 @@ src_prepare() {

119

 	# Fix compatibility with OpenSSL >=1.1.

120

 	sed -e "s/RSA_F_RSA_PRIVATE_ENCRYPT/RSA_F_RSA_OSSL_PRIVATE_ENCRYPT/" -i src/ne_pkcs11.c || die "sed failed"

121

122

-	if has_version "<dev-libs/libressl-3.0.0"; then

123

-		# Support LibreSSL.

124

-		# Functions RSA_meth_get0_app_data() and RSA_meth_set0_app_data() are not implemented in LibreSSL 2.9.2.

125

-		sed -e "1202s/#if OPENSSL_VERSION_NUMBER < 0x10100000L/& || defined(LIBRESSL_VERSION_NUMBER)/" -i src/ne_openssl.c || die "sed failed"

126

-		sed -e "97a #if defined(LIBRESSL_VERSION_NUMBER)\nstatic void *RSA_meth_get0_app_data(const RSA_METHOD *meth)\n{\n    return meth->app_data;\n}\nstatic int RSA_meth_set0_app_data(RSA_METHOD *meth, void *app_data)\n{\n    meth->app_data = app_data;\n    return 1;\n}\n#endif" -i src/ne_pkcs11.c || die "sed failed"

127

-	fi

128

-

129

 	eapply_user

130

131

 	AT_M4DIR="macros" eautoreconf

132

133

diff --git a/net-libs/neon/neon-0.31.2.ebuild b/net-libs/neon/neon-0.31.2.ebuild

134

index 0cfe9882b5e..27109c64f22 100644

135

--- a/net-libs/neon/neon-0.31.2.ebuild

136

+++ b/net-libs/neon/neon-0.31.2.ebuild

137

@@ -12,7 +12,7 @@ SRC_URI="https://notroj.github.io/neon/${P}.tar.gz"

138

 LICENSE="GPL-2"

139

 SLOT="0/27"

140

 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"

141

-IUSE="doc expat gnutls kerberos libproxy libressl nls pkcs11 ssl static-libs zlib"

142

+IUSE="doc expat gnutls kerberos libproxy nls pkcs11 ssl static-libs zlib"

143

 RESTRICT="test"

144

145

 RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] )

146

@@ -26,8 +26,7 @@ RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] )

147

 			net-libs/gnutls:0=[${MULTILIB_USEDEP}]

148

)

149

 		!gnutls? (

150

-			libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )

151

-			!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )

152

+			dev-libs/openssl:0=[${MULTILIB_USEDEP}]

153

)

154

 		pkcs11? ( dev-libs/pakchois:0=[${MULTILIB_USEDEP}] )

155

)

156

@@ -46,13 +45,6 @@ src_prepare() {

157

 	# Fix compatibility with OpenSSL >=1.1.

158

 	sed -e "s/RSA_F_RSA_PRIVATE_ENCRYPT/RSA_F_RSA_OSSL_PRIVATE_ENCRYPT/" -i src/ne_pkcs11.c || die "sed failed"

159

160

-	if has_version "<dev-libs/libressl-3.0.0"; then

161

-		# Support LibreSSL.

162

-		# Functions RSA_meth_get0_app_data() and RSA_meth_set0_app_data() are not implemented in LibreSSL 2.9.2.

163

-		sed -e "1202s/#if OPENSSL_VERSION_NUMBER < 0x10100000L/& || defined(LIBRESSL_VERSION_NUMBER)/" -i src/ne_openssl.c || die "sed failed"

164

-		sed -e "97a #if defined(LIBRESSL_VERSION_NUMBER)\nstatic void *RSA_meth_get0_app_data(const RSA_METHOD *meth)\n{\n    return meth->app_data;\n}\nstatic int RSA_meth_set0_app_data(RSA_METHOD *meth, void *app_data)\n{\n    meth->app_data = app_data;\n    return 1;\n}\n#endif" -i src/ne_pkcs11.c || die "sed failed"

165

-	fi

166

-

167

 	eapply_user

168

169

 	AT_M4DIR="macros" eautoreconf

1	commit: 629d3356501ab24dd091a47d713f1724912a6831
2	Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3	AuthorDate: Mon May 3 08:51:19 2021 +0000
4	Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5	CommitDate: Mon May 3 08:51:19 2021 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=629d3356
7
8	net-libs/neon: 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	net-libs/neon/neon-0.30.2.ebuild \| 12 ++----------
14	net-libs/neon/neon-0.31.0.ebuild \| 12 ++----------
15	net-libs/neon/neon-0.31.1.ebuild \| 12 ++----------
16	net-libs/neon/neon-0.31.2.ebuild \| 12 ++----------
17	4 files changed, 8 insertions(+), 40 deletions(-)
18
19	diff --git a/net-libs/neon/neon-0.30.2.ebuild b/net-libs/neon/neon-0.30.2.ebuild
20	index 863f2e38958..0579d7c523d 100644
21	--- a/net-libs/neon/neon-0.30.2.ebuild
22	+++ b/net-libs/neon/neon-0.30.2.ebuild
23	@@ -12,7 +12,7 @@ SRC_URI="http://webdav.org/neon/${P}.tar.gz"
24	LICENSE="GPL-2"
25	SLOT="0/27"
26	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
27	-IUSE="doc expat gnutls kerberos libproxy libressl nls pkcs11 ssl static-libs zlib"
28	+IUSE="doc expat gnutls kerberos libproxy nls pkcs11 ssl static-libs zlib"
29	RESTRICT="test"
30
31	RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] )
32	@@ -26,8 +26,7 @@ RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] )
33	net-libs/gnutls:0=[${MULTILIB_USEDEP}]
34	)
35	!gnutls? (
36	- libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
37	- !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
38	+ dev-libs/openssl:0=[${MULTILIB_USEDEP}]
39	)
40	pkcs11? ( dev-libs/pakchois:0=[${MULTILIB_USEDEP}] )
41	)
42	@@ -46,13 +45,6 @@ src_prepare() {
43	# Fix compatibility with OpenSSL >=1.1.
44	sed -e "s/RSA_F_RSA_PRIVATE_ENCRYPT/RSA_F_RSA_OSSL_PRIVATE_ENCRYPT/" -i src/ne_pkcs11.c \|\| die "sed failed"
45
46	- if has_version "<dev-libs/libressl-3.0.0"; then
47	- # Support LibreSSL.
48	- # Functions RSA_meth_get0_app_data() and RSA_meth_set0_app_data() are not implemented in LibreSSL 2.9.2.
49	- sed -e "1202s/#if OPENSSL_VERSION_NUMBER < 0x10100000L/& \|\| defined(LIBRESSL_VERSION_NUMBER)/" -i src/ne_openssl.c \|\| die "sed failed"
50	- sed -e "97a #if defined(LIBRESSL_VERSION_NUMBER)\nstatic void RSA_meth_get0_app_data(const RSA_METHOD meth)\n{\n return meth->app_data;\n}\nstatic int RSA_meth_set0_app_data(RSA_METHOD meth, void app_data)\n{\n meth->app_data = app_data;\n return 1;\n}\n#endif" -i src/ne_pkcs11.c \|\| die "sed failed"
51	- fi
52	-
53	eapply_user
54
55	AT_M4DIR="macros" eautoreconf
56
57	diff --git a/net-libs/neon/neon-0.31.0.ebuild b/net-libs/neon/neon-0.31.0.ebuild
58	index 1a5b84fea67..adbc8e2dcc7 100644
59	--- a/net-libs/neon/neon-0.31.0.ebuild
60	+++ b/net-libs/neon/neon-0.31.0.ebuild
61	@@ -12,7 +12,7 @@ SRC_URI="http://webdav.org/neon/${P}.tar.gz"
62	LICENSE="GPL-2"
63	SLOT="0/27"
64	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
65	-IUSE="doc expat gnutls kerberos libproxy libressl nls pkcs11 ssl static-libs zlib"
66	+IUSE="doc expat gnutls kerberos libproxy nls pkcs11 ssl static-libs zlib"
67	RESTRICT="test"
68
69	RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] )
70	@@ -26,8 +26,7 @@ RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] )
71	net-libs/gnutls:0=[${MULTILIB_USEDEP}]
72	)
73	!gnutls? (
74	- libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
75	- !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
76	+ dev-libs/openssl:0=[${MULTILIB_USEDEP}]
77	)
78	pkcs11? ( dev-libs/pakchois:0=[${MULTILIB_USEDEP}] )
79	)
80	@@ -46,13 +45,6 @@ src_prepare() {
81	# Fix compatibility with OpenSSL >=1.1.
82	sed -e "s/RSA_F_RSA_PRIVATE_ENCRYPT/RSA_F_RSA_OSSL_PRIVATE_ENCRYPT/" -i src/ne_pkcs11.c \|\| die "sed failed"
83
84	- if has_version "<dev-libs/libressl-3.0.0"; then
85	- # Support LibreSSL.
86	- # Functions RSA_meth_get0_app_data() and RSA_meth_set0_app_data() are not implemented in LibreSSL 2.9.2.
87	- sed -e "1202s/#if OPENSSL_VERSION_NUMBER < 0x10100000L/& \|\| defined(LIBRESSL_VERSION_NUMBER)/" -i src/ne_openssl.c \|\| die "sed failed"
88	- sed -e "97a #if defined(LIBRESSL_VERSION_NUMBER)\nstatic void RSA_meth_get0_app_data(const RSA_METHOD meth)\n{\n return meth->app_data;\n}\nstatic int RSA_meth_set0_app_data(RSA_METHOD meth, void app_data)\n{\n meth->app_data = app_data;\n return 1;\n}\n#endif" -i src/ne_pkcs11.c \|\| die "sed failed"
89	- fi
90	-
91	eapply_user
92
93	AT_M4DIR="macros" eautoreconf
94
95	diff --git a/net-libs/neon/neon-0.31.1.ebuild b/net-libs/neon/neon-0.31.1.ebuild
96	index 06d89576f8d..a6ad1025fb5 100644
97	--- a/net-libs/neon/neon-0.31.1.ebuild
98	+++ b/net-libs/neon/neon-0.31.1.ebuild
99	@@ -12,7 +12,7 @@ SRC_URI="https://notroj.github.io/neon/${P}.tar.gz"
100	LICENSE="GPL-2"
101	SLOT="0/27"
102	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
103	-IUSE="doc expat gnutls kerberos libproxy libressl nls pkcs11 ssl static-libs zlib"
104	+IUSE="doc expat gnutls kerberos libproxy nls pkcs11 ssl static-libs zlib"
105	RESTRICT="test"
106
107	RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] )
108	@@ -26,8 +26,7 @@ RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] )
109	net-libs/gnutls:0=[${MULTILIB_USEDEP}]
110	)
111	!gnutls? (
112	- libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
113	- !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
114	+ dev-libs/openssl:0=[${MULTILIB_USEDEP}]
115	)
116	pkcs11? ( dev-libs/pakchois:0=[${MULTILIB_USEDEP}] )
117	)
118	@@ -46,13 +45,6 @@ src_prepare() {
119	# Fix compatibility with OpenSSL >=1.1.
120	sed -e "s/RSA_F_RSA_PRIVATE_ENCRYPT/RSA_F_RSA_OSSL_PRIVATE_ENCRYPT/" -i src/ne_pkcs11.c \|\| die "sed failed"
121
122	- if has_version "<dev-libs/libressl-3.0.0"; then
123	- # Support LibreSSL.
124	- # Functions RSA_meth_get0_app_data() and RSA_meth_set0_app_data() are not implemented in LibreSSL 2.9.2.
125	- sed -e "1202s/#if OPENSSL_VERSION_NUMBER < 0x10100000L/& \|\| defined(LIBRESSL_VERSION_NUMBER)/" -i src/ne_openssl.c \|\| die "sed failed"
126	- sed -e "97a #if defined(LIBRESSL_VERSION_NUMBER)\nstatic void RSA_meth_get0_app_data(const RSA_METHOD meth)\n{\n return meth->app_data;\n}\nstatic int RSA_meth_set0_app_data(RSA_METHOD meth, void app_data)\n{\n meth->app_data = app_data;\n return 1;\n}\n#endif" -i src/ne_pkcs11.c \|\| die "sed failed"
127	- fi
128	-
129	eapply_user
130
131	AT_M4DIR="macros" eautoreconf
132
133	diff --git a/net-libs/neon/neon-0.31.2.ebuild b/net-libs/neon/neon-0.31.2.ebuild
134	index 0cfe9882b5e..27109c64f22 100644
135	--- a/net-libs/neon/neon-0.31.2.ebuild
136	+++ b/net-libs/neon/neon-0.31.2.ebuild
137	@@ -12,7 +12,7 @@ SRC_URI="https://notroj.github.io/neon/${P}.tar.gz"
138	LICENSE="GPL-2"
139	SLOT="0/27"
140	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
141	-IUSE="doc expat gnutls kerberos libproxy libressl nls pkcs11 ssl static-libs zlib"
142	+IUSE="doc expat gnutls kerberos libproxy nls pkcs11 ssl static-libs zlib"
143	RESTRICT="test"
144
145	RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] )
146	@@ -26,8 +26,7 @@ RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] )
147	net-libs/gnutls:0=[${MULTILIB_USEDEP}]
148	)
149	!gnutls? (
150	- libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
151	- !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
152	+ dev-libs/openssl:0=[${MULTILIB_USEDEP}]
153	)
154	pkcs11? ( dev-libs/pakchois:0=[${MULTILIB_USEDEP}] )
155	)
156	@@ -46,13 +45,6 @@ src_prepare() {
157	# Fix compatibility with OpenSSL >=1.1.
158	sed -e "s/RSA_F_RSA_PRIVATE_ENCRYPT/RSA_F_RSA_OSSL_PRIVATE_ENCRYPT/" -i src/ne_pkcs11.c \|\| die "sed failed"
159
160	- if has_version "<dev-libs/libressl-3.0.0"; then
161	- # Support LibreSSL.
162	- # Functions RSA_meth_get0_app_data() and RSA_meth_set0_app_data() are not implemented in LibreSSL 2.9.2.
163	- sed -e "1202s/#if OPENSSL_VERSION_NUMBER < 0x10100000L/& \|\| defined(LIBRESSL_VERSION_NUMBER)/" -i src/ne_openssl.c \|\| die "sed failed"
164	- sed -e "97a #if defined(LIBRESSL_VERSION_NUMBER)\nstatic void RSA_meth_get0_app_data(const RSA_METHOD meth)\n{\n return meth->app_data;\n}\nstatic int RSA_meth_set0_app_data(RSA_METHOD meth, void app_data)\n{\n meth->app_data = app_data;\n return 1;\n}\n#endif" -i src/ne_pkcs11.c \|\| die "sed failed"
165	- fi
166	-
167	eapply_user
168
169	AT_M4DIR="macros" eautoreconf

Gentoo Archives: gentoo-commits