[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_h2/, profiles/, www-apache/mod_h2/files/ - gentoo-commits

From:	Mike Frysinger <vapier@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_h2/, profiles/, www-apache/mod_h2/files/
Date:	Wed, 01 Jun 2016 20:26:38
Message-Id:	`1464812768.468a4b50c52428ed43b2a595901339bff5c10dd6.vapier@gentoo`

1

commit:     468a4b50c52428ed43b2a595901339bff5c10dd6

2

Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>

3

AuthorDate: Wed Jun  1 19:49:57 2016 +0000

4

Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>

5

CommitDate: Wed Jun  1 20:26:08 2016 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=468a4b50

7

8

www-apache/mod_h2: update to newer pre-releases

9

10

These are meant to be used in conjunction with newer apache releases

11

so fixes to just the mod_http2 module can be tested.

12

13

 profiles/package.mask                                    |  4 ----

14

 www-apache/mod_h2/Manifest                               |  4 ++--

15

 www-apache/mod_h2/files/mod_h2.conf                      |  8 --------

16

 www-apache/mod_h2/files/mod_http2.conf                   |  8 ++++++++

17

 .../mod_h2/{mod_h2-0.8.3.ebuild => mod_h2-1.4.7.ebuild}  | 16 +++++++++-------

18

 .../mod_h2/{mod_h2-0.8.2.ebuild => mod_h2-1.5.6.ebuild}  | 16 +++++++++-------

19

 www-apache/mod_h2/mod_h2-9999.ebuild                     | 16 +++++++++-------

20

 7 files changed, 37 insertions(+), 35 deletions(-)

21

22

diff --git a/profiles/package.mask b/profiles/package.mask

23

index dab7a2a..9f7f88f 100644

24

--- a/profiles/package.mask

25

+++ b/profiles/package.mask

26

@@ -401,10 +401,6 @@ sys-fs/bedup

27

 # Breaking changes #563540

28

 =app-text/ghostscript-gpl-9.18

29

30

-# Mike Frysinger <vapier@g.o> (18 Oct 2015)

31

-# apache-2.4.17 includes support for http2 now.

32

-www-apache/mod_h2

33

-

34

 # Mike Pagano <mpagano@g.o> (2 Oct 2015)

35

 # A regression in kernel 4.1.9 could lead to a system

36

 # lockup.  This has been fixed in gentoo-sources-4.1.9-r1

37

38

diff --git a/www-apache/mod_h2/Manifest b/www-apache/mod_h2/Manifest

39

index 76bab13..92a0c89 100644

40

--- a/www-apache/mod_h2/Manifest

41

+++ b/www-apache/mod_h2/Manifest

42

@@ -1,2 +1,2 @@

43

-DIST mod_h2-0.8.2.tar.gz 2622925 SHA256 cc4a67a0c994ce7c08319bd10bc92de7d0293ebaa0c2ece0e4cc6bc8351c06aa SHA512 19d55ab28776f551ee2df157a1ab0f72b0c5362210c5da39911e6b2cbdc7079478404e7179128a31d39c393ca32e453ed2a4db310bd4f720287e9e54046c095f WHIRLPOOL 290c368b7e69d214c805e57fc6ef5790a0a4914a71035358a3ebf1cdaf0fc69ce170b2c266a0d2174c9c0e252991aba5a0de5c5aec754bfb79e37b0fd4be57e3

44

-DIST mod_h2-0.8.3.tar.gz 2622525 SHA256 50867947ed80c5c876c95b318b17dcdf3b77b36a80b36ef9f4778005587ac9ed SHA512 45ab6f070189175180511cc2985dcb0ab676225b144e141698baebe53f097c6d451f2c85382f23afd0042aa4703b7f37dcb88fe5a968e3422c91b46fe5526c97 WHIRLPOOL f6b110df1831ecdf849c3c30b9a09b66ef833aa11664f2cc91747ca5a027cac72caeab4dc674f34aa4e5d3e36eafea183f81261479005aeebdb07ab0582c166b

45

+DIST mod_http2-1.4.7.tar.gz 476716 SHA256 0d51a019917aa6bf7866cf23bf837626592ad0e74408eb341d070982cb88380a SHA512 6d91d8f73de4a571dc9ac24328b2f7214afcc9a3a00cbf93a74954533a45b647480f96f0cb1c85d767e980080b21561891a55b16943b0369a0fe2573bba1b54f WHIRLPOOL 0b81b8baf871ff043e972c65c685ae9f18737c0909bff65528a6ea3dd56735a2230c9dda67879a5684e867681fc6487f483ef006611397061b367bc275793ad6

46

+DIST mod_http2-1.5.6.tar.gz 502108 SHA256 73c11780e82e65c11e71e5a44685c22a7d8f07203d55dca094ea61d7a5bbaffc SHA512 8cc8894d56e32489f8e3064145cb527a415723131bdefd99583b6678af5fc50e3d4ebbf59f4734640bef0381ac0f808c780dafb9a3fe6bb45e7af4d595470716 WHIRLPOOL a2f3efb9e7ecf657be61d46a832a1b438cdaab0e44114e8ec717d9b77e8500308e7c904248c195bb55157410a103cffff8714e0378e2d2099ecb7aa7d679a4a7

47

48

diff --git a/www-apache/mod_h2/files/mod_h2.conf b/www-apache/mod_h2/files/mod_h2.conf

49

deleted file mode 100644

50

index 564e97b..0000000

51

--- a/www-apache/mod_h2/files/mod_h2.conf

52

+++ /dev/null

53

@@ -1,8 +0,0 @@

54

-<IfDefine HTTP2>

55

-

56

-LoadModule h2_module modules/mod_h2.so

57

-

58

-# See https://github.com/icing/mod_h2#configuration for more options.

59

-H2Engine on

60

-

61

-</IfDefine>

62

63

diff --git a/www-apache/mod_h2/files/mod_http2.conf b/www-apache/mod_h2/files/mod_http2.conf

64

new file mode 100644

65

index 0000000..aa36a6a

66

--- /dev/null

67

+++ b/www-apache/mod_h2/files/mod_http2.conf

68

@@ -0,0 +1,8 @@

69

+<IfDefine HTTP2>

70

+

71

+LoadModule http2_module modules/mod_http2.so

72

+

73

+# https://httpd.apache.org/docs/2.4/mod/mod_http2.html

74

+Protocols h2 http/1.1

75

+

76

+</IfDefine>

77

78

diff --git a/www-apache/mod_h2/mod_h2-0.8.3.ebuild b/www-apache/mod_h2/mod_h2-1.4.7.ebuild

79

similarity index 73%

80

rename from www-apache/mod_h2/mod_h2-0.8.3.ebuild

81

rename to www-apache/mod_h2/mod_h2-1.4.7.ebuild

82

index 2890e5a..48f0e8e 100644

83

--- a/www-apache/mod_h2/mod_h2-0.8.3.ebuild

84

+++ b/www-apache/mod_h2/mod_h2-1.4.7.ebuild

85

@@ -1,16 +1,17 @@

86

-# Copyright 1999-2015 Gentoo Foundation

87

+# Copyright 1999-2016 Gentoo Foundation

88

 # Distributed under the terms of the GNU General Public License v2

89

-# $Id$

90

91

 EAPI="5"

92

93

 inherit apache-module

94

95

+MY_P="${PN/h2/http2}-${PV}"

96

+

97

 if [[ ${PV} == 9999 ]] ; then

98

 	EGIT_REPO_URI="https://github.com/icing/mod_h2.git"

99

 	inherit git-2

100

 else

101

-	SRC_URI="https://github.com/icing/mod_h2/releases/download/v${PV}/${P}.tar.gz"

102

+	SRC_URI="https://github.com/icing/mod_h2/releases/download/v${PV}/${MY_P}.tar.gz"

103

 	KEYWORDS="~amd64 ~x86"

104

fi

105

106

@@ -22,16 +23,17 @@ SLOT="0"

107

 IUSE="ssl"

108

109

 RDEPEND=">=net-libs/nghttp2-1.0

110

-	ssl? ( www-servers/apache[alpn] )"

111

+	>=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?]"

112

 DEPEND="${RDEPEND}"

113

114

+S="${WORKDIR}/${MY_P}"

115

+

116

 need_apache2_4

117

118

 src_configure() {

119

 	econf \

120

 		--docdir='$(datarootdir)'/doc/${PF} \

121

-		--disable-werror \

122

-		--disable-sandbox

123

+		--disable-werror

124

}

125

126

 src_compile() {

127

@@ -43,5 +45,5 @@ src_install() {

128

129

 	APACHE2_MOD_DEFINE="HTTP2"

130

 	insinto "${APACHE_MODULES_CONFDIR}"

131

-	newins "${FILESDIR}/mod_h2.conf" "75_mod_h2.conf"

132

+	newins "${FILESDIR}/mod_http2.conf" "41_mod_http2.conf"

133

}

134

135

diff --git a/www-apache/mod_h2/mod_h2-0.8.2.ebuild b/www-apache/mod_h2/mod_h2-1.5.6.ebuild

136

similarity index 73%

137

rename from www-apache/mod_h2/mod_h2-0.8.2.ebuild

138

rename to www-apache/mod_h2/mod_h2-1.5.6.ebuild

139

index 2890e5a..48f0e8e 100644

140

--- a/www-apache/mod_h2/mod_h2-0.8.2.ebuild

141

+++ b/www-apache/mod_h2/mod_h2-1.5.6.ebuild

142

@@ -1,16 +1,17 @@

143

-# Copyright 1999-2015 Gentoo Foundation

144

+# Copyright 1999-2016 Gentoo Foundation

145

 # Distributed under the terms of the GNU General Public License v2

146

-# $Id$

147

148

 EAPI="5"

149

150

 inherit apache-module

151

152

+MY_P="${PN/h2/http2}-${PV}"

153

+

154

 if [[ ${PV} == 9999 ]] ; then

155

 	EGIT_REPO_URI="https://github.com/icing/mod_h2.git"

156

 	inherit git-2

157

 else

158

-	SRC_URI="https://github.com/icing/mod_h2/releases/download/v${PV}/${P}.tar.gz"

159

+	SRC_URI="https://github.com/icing/mod_h2/releases/download/v${PV}/${MY_P}.tar.gz"

160

 	KEYWORDS="~amd64 ~x86"

161

fi

162

163

@@ -22,16 +23,17 @@ SLOT="0"

164

 IUSE="ssl"

165

166

 RDEPEND=">=net-libs/nghttp2-1.0

167

-	ssl? ( www-servers/apache[alpn] )"

168

+	>=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?]"

169

 DEPEND="${RDEPEND}"

170

171

+S="${WORKDIR}/${MY_P}"

172

+

173

 need_apache2_4

174

175

 src_configure() {

176

 	econf \

177

 		--docdir='$(datarootdir)'/doc/${PF} \

178

-		--disable-werror \

179

-		--disable-sandbox

180

+		--disable-werror

181

}

182

183

 src_compile() {

184

@@ -43,5 +45,5 @@ src_install() {

185

186

 	APACHE2_MOD_DEFINE="HTTP2"

187

 	insinto "${APACHE_MODULES_CONFDIR}"

188

-	newins "${FILESDIR}/mod_h2.conf" "75_mod_h2.conf"

189

+	newins "${FILESDIR}/mod_http2.conf" "41_mod_http2.conf"

190

}

191

192

diff --git a/www-apache/mod_h2/mod_h2-9999.ebuild b/www-apache/mod_h2/mod_h2-9999.ebuild

193

index 2890e5a..48f0e8e 100644

194

--- a/www-apache/mod_h2/mod_h2-9999.ebuild

195

+++ b/www-apache/mod_h2/mod_h2-9999.ebuild

196

@@ -1,16 +1,17 @@

197

-# Copyright 1999-2015 Gentoo Foundation

198

+# Copyright 1999-2016 Gentoo Foundation

199

 # Distributed under the terms of the GNU General Public License v2

200

-# $Id$

201

202

 EAPI="5"

203

204

 inherit apache-module

205

206

+MY_P="${PN/h2/http2}-${PV}"

207

+

208

 if [[ ${PV} == 9999 ]] ; then

209

 	EGIT_REPO_URI="https://github.com/icing/mod_h2.git"

210

 	inherit git-2

211

 else

212

-	SRC_URI="https://github.com/icing/mod_h2/releases/download/v${PV}/${P}.tar.gz"

213

+	SRC_URI="https://github.com/icing/mod_h2/releases/download/v${PV}/${MY_P}.tar.gz"

214

 	KEYWORDS="~amd64 ~x86"

215

fi

216

217

@@ -22,16 +23,17 @@ SLOT="0"

218

 IUSE="ssl"

219

220

 RDEPEND=">=net-libs/nghttp2-1.0

221

-	ssl? ( www-servers/apache[alpn] )"

222

+	>=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?]"

223

 DEPEND="${RDEPEND}"

224

225

+S="${WORKDIR}/${MY_P}"

226

+

227

 need_apache2_4

228

229

 src_configure() {

230

 	econf \

231

 		--docdir='$(datarootdir)'/doc/${PF} \

232

-		--disable-werror \

233

-		--disable-sandbox

234

+		--disable-werror

235

}

236

237

 src_compile() {

238

@@ -43,5 +45,5 @@ src_install() {

239

240

 	APACHE2_MOD_DEFINE="HTTP2"

241

 	insinto "${APACHE_MODULES_CONFDIR}"

242

-	newins "${FILESDIR}/mod_h2.conf" "75_mod_h2.conf"

243

+	newins "${FILESDIR}/mod_http2.conf" "41_mod_http2.conf"

244

}

1	commit: 468a4b50c52428ed43b2a595901339bff5c10dd6
2	Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
3	AuthorDate: Wed Jun 1 19:49:57 2016 +0000
4	Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
5	CommitDate: Wed Jun 1 20:26:08 2016 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=468a4b50
7
8	www-apache/mod_h2: update to newer pre-releases
9
10	These are meant to be used in conjunction with newer apache releases
11	so fixes to just the mod_http2 module can be tested.
12
13	profiles/package.mask \| 4 ----
14	www-apache/mod_h2/Manifest \| 4 ++--
15	www-apache/mod_h2/files/mod_h2.conf \| 8 --------
16	www-apache/mod_h2/files/mod_http2.conf \| 8 ++++++++
17	.../mod_h2/{mod_h2-0.8.3.ebuild => mod_h2-1.4.7.ebuild} \| 16 +++++++++-------
18	.../mod_h2/{mod_h2-0.8.2.ebuild => mod_h2-1.5.6.ebuild} \| 16 +++++++++-------
19	www-apache/mod_h2/mod_h2-9999.ebuild \| 16 +++++++++-------
20	7 files changed, 37 insertions(+), 35 deletions(-)
21
22	diff --git a/profiles/package.mask b/profiles/package.mask
23	index dab7a2a..9f7f88f 100644
24	--- a/profiles/package.mask
25	+++ b/profiles/package.mask
26	@@ -401,10 +401,6 @@ sys-fs/bedup
27	# Breaking changes #563540
28	=app-text/ghostscript-gpl-9.18
29
30	-# Mike Frysinger <vapier@g.o> (18 Oct 2015)
31	-# apache-2.4.17 includes support for http2 now.
32	-www-apache/mod_h2
33	-
34	# Mike Pagano <mpagano@g.o> (2 Oct 2015)
35	# A regression in kernel 4.1.9 could lead to a system
36	# lockup. This has been fixed in gentoo-sources-4.1.9-r1
37
38	diff --git a/www-apache/mod_h2/Manifest b/www-apache/mod_h2/Manifest
39	index 76bab13..92a0c89 100644
40	--- a/www-apache/mod_h2/Manifest
41	+++ b/www-apache/mod_h2/Manifest
42	@@ -1,2 +1,2 @@
43	-DIST mod_h2-0.8.2.tar.gz 2622925 SHA256 cc4a67a0c994ce7c08319bd10bc92de7d0293ebaa0c2ece0e4cc6bc8351c06aa SHA512 19d55ab28776f551ee2df157a1ab0f72b0c5362210c5da39911e6b2cbdc7079478404e7179128a31d39c393ca32e453ed2a4db310bd4f720287e9e54046c095f WHIRLPOOL 290c368b7e69d214c805e57fc6ef5790a0a4914a71035358a3ebf1cdaf0fc69ce170b2c266a0d2174c9c0e252991aba5a0de5c5aec754bfb79e37b0fd4be57e3
44	-DIST mod_h2-0.8.3.tar.gz 2622525 SHA256 50867947ed80c5c876c95b318b17dcdf3b77b36a80b36ef9f4778005587ac9ed SHA512 45ab6f070189175180511cc2985dcb0ab676225b144e141698baebe53f097c6d451f2c85382f23afd0042aa4703b7f37dcb88fe5a968e3422c91b46fe5526c97 WHIRLPOOL f6b110df1831ecdf849c3c30b9a09b66ef833aa11664f2cc91747ca5a027cac72caeab4dc674f34aa4e5d3e36eafea183f81261479005aeebdb07ab0582c166b
45	+DIST mod_http2-1.4.7.tar.gz 476716 SHA256 0d51a019917aa6bf7866cf23bf837626592ad0e74408eb341d070982cb88380a SHA512 6d91d8f73de4a571dc9ac24328b2f7214afcc9a3a00cbf93a74954533a45b647480f96f0cb1c85d767e980080b21561891a55b16943b0369a0fe2573bba1b54f WHIRLPOOL 0b81b8baf871ff043e972c65c685ae9f18737c0909bff65528a6ea3dd56735a2230c9dda67879a5684e867681fc6487f483ef006611397061b367bc275793ad6
46	+DIST mod_http2-1.5.6.tar.gz 502108 SHA256 73c11780e82e65c11e71e5a44685c22a7d8f07203d55dca094ea61d7a5bbaffc SHA512 8cc8894d56e32489f8e3064145cb527a415723131bdefd99583b6678af5fc50e3d4ebbf59f4734640bef0381ac0f808c780dafb9a3fe6bb45e7af4d595470716 WHIRLPOOL a2f3efb9e7ecf657be61d46a832a1b438cdaab0e44114e8ec717d9b77e8500308e7c904248c195bb55157410a103cffff8714e0378e2d2099ecb7aa7d679a4a7
47
48	diff --git a/www-apache/mod_h2/files/mod_h2.conf b/www-apache/mod_h2/files/mod_h2.conf
49	deleted file mode 100644
50	index 564e97b..0000000
51	--- a/www-apache/mod_h2/files/mod_h2.conf
52	+++ /dev/null
53	@@ -1,8 +0,0 @@
54	-<IfDefine HTTP2>
55	-
56	-LoadModule h2_module modules/mod_h2.so
57	-
58	-# See https://github.com/icing/mod_h2#configuration for more options.
59	-H2Engine on
60	-
61	-</IfDefine>
62
63	diff --git a/www-apache/mod_h2/files/mod_http2.conf b/www-apache/mod_h2/files/mod_http2.conf
64	new file mode 100644
65	index 0000000..aa36a6a
66	--- /dev/null
67	+++ b/www-apache/mod_h2/files/mod_http2.conf
68	@@ -0,0 +1,8 @@
69	+<IfDefine HTTP2>
70	+
71	+LoadModule http2_module modules/mod_http2.so
72	+
73	+# https://httpd.apache.org/docs/2.4/mod/mod_http2.html
74	+Protocols h2 http/1.1
75	+
76	+</IfDefine>
77
78	diff --git a/www-apache/mod_h2/mod_h2-0.8.3.ebuild b/www-apache/mod_h2/mod_h2-1.4.7.ebuild
79	similarity index 73%
80	rename from www-apache/mod_h2/mod_h2-0.8.3.ebuild
81	rename to www-apache/mod_h2/mod_h2-1.4.7.ebuild
82	index 2890e5a..48f0e8e 100644
83	--- a/www-apache/mod_h2/mod_h2-0.8.3.ebuild
84	+++ b/www-apache/mod_h2/mod_h2-1.4.7.ebuild
85	@@ -1,16 +1,17 @@
86	-# Copyright 1999-2015 Gentoo Foundation
87	+# Copyright 1999-2016 Gentoo Foundation
88	# Distributed under the terms of the GNU General Public License v2
89	-# $Id$
90
91	EAPI="5"
92
93	inherit apache-module
94
95	+MY_P="${PN/h2/http2}-${PV}"
96	+
97	if [[ ${PV} == 9999 ]] ; then
98	EGIT_REPO_URI="https://github.com/icing/mod_h2.git"
99	inherit git-2
100	else
101	- SRC_URI="https://github.com/icing/mod_h2/releases/download/v${PV}/${P}.tar.gz"
102	+ SRC_URI="https://github.com/icing/mod_h2/releases/download/v${PV}/${MY_P}.tar.gz"
103	KEYWORDS="~amd64 ~x86"
104	fi
105
106	@@ -22,16 +23,17 @@ SLOT="0"
107	IUSE="ssl"
108
109	RDEPEND=">=net-libs/nghttp2-1.0
110	- ssl? ( www-servers/apache[alpn] )"
111	+ >=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?]"
112	DEPEND="${RDEPEND}"
113
114	+S="${WORKDIR}/${MY_P}"
115	+
116	need_apache2_4
117
118	src_configure() {
119	econf \
120	--docdir='$(datarootdir)'/doc/${PF} \
121	- --disable-werror \
122	- --disable-sandbox
123	+ --disable-werror
124	}
125
126	src_compile() {
127	@@ -43,5 +45,5 @@ src_install() {
128
129	APACHE2_MOD_DEFINE="HTTP2"
130	insinto "${APACHE_MODULES_CONFDIR}"
131	- newins "${FILESDIR}/mod_h2.conf" "75_mod_h2.conf"
132	+ newins "${FILESDIR}/mod_http2.conf" "41_mod_http2.conf"
133	}
134
135	diff --git a/www-apache/mod_h2/mod_h2-0.8.2.ebuild b/www-apache/mod_h2/mod_h2-1.5.6.ebuild
136	similarity index 73%
137	rename from www-apache/mod_h2/mod_h2-0.8.2.ebuild
138	rename to www-apache/mod_h2/mod_h2-1.5.6.ebuild
139	index 2890e5a..48f0e8e 100644
140	--- a/www-apache/mod_h2/mod_h2-0.8.2.ebuild
141	+++ b/www-apache/mod_h2/mod_h2-1.5.6.ebuild
142	@@ -1,16 +1,17 @@
143	-# Copyright 1999-2015 Gentoo Foundation
144	+# Copyright 1999-2016 Gentoo Foundation
145	# Distributed under the terms of the GNU General Public License v2
146	-# $Id$
147
148	EAPI="5"
149
150	inherit apache-module
151
152	+MY_P="${PN/h2/http2}-${PV}"
153	+
154	if [[ ${PV} == 9999 ]] ; then
155	EGIT_REPO_URI="https://github.com/icing/mod_h2.git"
156	inherit git-2
157	else
158	- SRC_URI="https://github.com/icing/mod_h2/releases/download/v${PV}/${P}.tar.gz"
159	+ SRC_URI="https://github.com/icing/mod_h2/releases/download/v${PV}/${MY_P}.tar.gz"
160	KEYWORDS="~amd64 ~x86"
161	fi
162
163	@@ -22,16 +23,17 @@ SLOT="0"
164	IUSE="ssl"
165
166	RDEPEND=">=net-libs/nghttp2-1.0
167	- ssl? ( www-servers/apache[alpn] )"
168	+ >=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?]"
169	DEPEND="${RDEPEND}"
170
171	+S="${WORKDIR}/${MY_P}"
172	+
173	need_apache2_4
174
175	src_configure() {
176	econf \
177	--docdir='$(datarootdir)'/doc/${PF} \
178	- --disable-werror \
179	- --disable-sandbox
180	+ --disable-werror
181	}
182
183	src_compile() {
184	@@ -43,5 +45,5 @@ src_install() {
185
186	APACHE2_MOD_DEFINE="HTTP2"
187	insinto "${APACHE_MODULES_CONFDIR}"
188	- newins "${FILESDIR}/mod_h2.conf" "75_mod_h2.conf"
189	+ newins "${FILESDIR}/mod_http2.conf" "41_mod_http2.conf"
190	}
191
192	diff --git a/www-apache/mod_h2/mod_h2-9999.ebuild b/www-apache/mod_h2/mod_h2-9999.ebuild
193	index 2890e5a..48f0e8e 100644
194	--- a/www-apache/mod_h2/mod_h2-9999.ebuild
195	+++ b/www-apache/mod_h2/mod_h2-9999.ebuild
196	@@ -1,16 +1,17 @@
197	-# Copyright 1999-2015 Gentoo Foundation
198	+# Copyright 1999-2016 Gentoo Foundation
199	# Distributed under the terms of the GNU General Public License v2
200	-# $Id$
201
202	EAPI="5"
203
204	inherit apache-module
205
206	+MY_P="${PN/h2/http2}-${PV}"
207	+
208	if [[ ${PV} == 9999 ]] ; then
209	EGIT_REPO_URI="https://github.com/icing/mod_h2.git"
210	inherit git-2
211	else
212	- SRC_URI="https://github.com/icing/mod_h2/releases/download/v${PV}/${P}.tar.gz"
213	+ SRC_URI="https://github.com/icing/mod_h2/releases/download/v${PV}/${MY_P}.tar.gz"
214	KEYWORDS="~amd64 ~x86"
215	fi
216
217	@@ -22,16 +23,17 @@ SLOT="0"
218	IUSE="ssl"
219
220	RDEPEND=">=net-libs/nghttp2-1.0
221	- ssl? ( www-servers/apache[alpn] )"
222	+ >=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?]"
223	DEPEND="${RDEPEND}"
224
225	+S="${WORKDIR}/${MY_P}"
226	+
227	need_apache2_4
228
229	src_configure() {
230	econf \
231	--docdir='$(datarootdir)'/doc/${PF} \
232	- --disable-werror \
233	- --disable-sandbox
234	+ --disable-werror
235	}
236
237	src_compile() {
238	@@ -43,5 +45,5 @@ src_install() {
239
240	APACHE2_MOD_DEFINE="HTTP2"
241	insinto "${APACHE_MODULES_CONFDIR}"
242	- newins "${FILESDIR}/mod_h2.conf" "75_mod_h2.conf"
243	+ newins "${FILESDIR}/mod_http2.conf" "41_mod_http2.conf"
244	}

Gentoo Archives: gentoo-commits