1 |
commit: aeb712378d4f73e227efa374b1a175e318f4a0f2 |
2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Apr 12 18:31:03 2017 +0000 |
4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Apr 12 19:20:25 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aeb71237 |
7 |
|
8 |
www-servers/ocsigenserver: Fix build with lwt3. |
9 |
|
10 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
11 |
|
12 |
www-servers/ocsigenserver/files/lwt3.patch | 78 ++++++++++++++++++++++ |
13 |
www-servers/ocsigenserver/ocsigenserver-2.8.ebuild | 10 ++- |
14 |
.../ocsigenserver/ocsigenserver-9999.ebuild | 10 ++- |
15 |
3 files changed, 94 insertions(+), 4 deletions(-) |
16 |
|
17 |
diff --git a/www-servers/ocsigenserver/files/lwt3.patch b/www-servers/ocsigenserver/files/lwt3.patch |
18 |
new file mode 100644 |
19 |
index 00000000000..3fb6b9d8e7a |
20 |
--- /dev/null |
21 |
+++ b/www-servers/ocsigenserver/files/lwt3.patch |
22 |
@@ -0,0 +1,78 @@ |
23 |
+Index: ocsigenserver-2.8/Makefile.options |
24 |
+=================================================================== |
25 |
+--- ocsigenserver-2.8.orig/Makefile.options |
26 |
++++ ocsigenserver-2.8/Makefile.options |
27 |
+@@ -30,7 +30,7 @@ endif |
28 |
+ |
29 |
+ BASE_PACKAGE := lwt ipaddr bytes |
30 |
+ |
31 |
+-SERVER_PACKAGE := lwt.ssl \ |
32 |
++SERVER_PACKAGE := lwt_ssl \ |
33 |
+ bytes \ |
34 |
+ ${LWT_PREEMPTIVE_PACKAGE} \ |
35 |
+ ipaddr \ |
36 |
+Index: ocsigenserver-2.8/configure |
37 |
+=================================================================== |
38 |
+--- ocsigenserver-2.8.orig/configure |
39 |
++++ ocsigenserver-2.8/configure |
40 |
+@@ -410,8 +410,8 @@ check_library ssl "See: http://sourcefor |
41 |
+ |
42 |
+ check_library lwt "See: http://ocsigen.org/lwt" |
43 |
+ check_library lwt.unix "Missing support for 'unix' in lwt." |
44 |
+-check_library lwt.react "Missing support for 'react' in lwt." |
45 |
+-check_library lwt.ssl "Missing support for 'ssl' in lwt." |
46 |
++check_library lwt_react "Missing support for 'react' in lwt." |
47 |
++check_library lwt_ssl "Missing support for 'ssl' in lwt." |
48 |
+ check_library lwt.preemptive "Missing support for 'preemptive' in lwt." |
49 |
+ |
50 |
+ check_library netstring \ |
51 |
+Index: ocsigenserver-2.8/src/extensions/Makefile |
52 |
+=================================================================== |
53 |
+--- ocsigenserver-2.8.orig/src/extensions/Makefile |
54 |
++++ ocsigenserver-2.8/src/extensions/Makefile |
55 |
+@@ -4,8 +4,8 @@ PACKAGE := \ |
56 |
+ bytes \ |
57 |
+ lwt.unix \ |
58 |
+ ipaddr \ |
59 |
+- lwt.ssl \ |
60 |
+- lwt.react \ |
61 |
++ lwt_ssl \ |
62 |
++ lwt_react \ |
63 |
+ netstring \ |
64 |
+ netstring-pcre \ |
65 |
+ tyxml.parser |
66 |
+Index: ocsigenserver-2.8/src/files/META.in |
67 |
+=================================================================== |
68 |
+--- ocsigenserver-2.8.orig/src/files/META.in |
69 |
++++ ocsigenserver-2.8/src/files/META.in |
70 |
+@@ -37,7 +37,7 @@ package "baselib" ( |
71 |
+ ) |
72 |
+ |
73 |
+ package "http" ( |
74 |
+- requires = "%%NAME%%.baselib,lwt.ssl,tyxml" |
75 |
++ requires = "%%NAME%%.baselib,lwt_ssl,tyxml" |
76 |
+ version = "[distributed with Ocsigen server]" |
77 |
+ description = "HTTP library for Ocsigen server" |
78 |
+ archive(byte) = "http.cma" |
79 |
+@@ -188,7 +188,7 @@ package "ext" ( |
80 |
+ |
81 |
+ package "comet" ( |
82 |
+ exists_if = "ocsigen_comet.cmo,ocsigen_comet.cmx" |
83 |
+- requires = "ocsigenserver,lwt.react" |
84 |
++ requires = "ocsigenserver,lwt_react" |
85 |
+ version = "[distributed with Ocsigen server]" |
86 |
+ description = "Comet server-to-client communication" |
87 |
+ archive(byte) = "ocsigen_comet.cmo" |
88 |
+Index: ocsigenserver-2.8/src/http/Makefile |
89 |
+=================================================================== |
90 |
+--- ocsigenserver-2.8.orig/src/http/Makefile |
91 |
++++ ocsigenserver-2.8/src/http/Makefile |
92 |
+@@ -3,7 +3,7 @@ PACKAGE := \ |
93 |
+ bytes \ |
94 |
+ netstring \ |
95 |
+ netstring-pcre \ |
96 |
+- lwt.ssl \ |
97 |
++ lwt_ssl \ |
98 |
+ tyxml |
99 |
+ |
100 |
+ LIBS := -I ../baselib ${addprefix -package ,${PACKAGE}} |
101 |
|
102 |
diff --git a/www-servers/ocsigenserver/ocsigenserver-2.8.ebuild b/www-servers/ocsigenserver/ocsigenserver-2.8.ebuild |
103 |
index 042de975246..6f80dda9a2f 100644 |
104 |
--- a/www-servers/ocsigenserver/ocsigenserver-2.8.ebuild |
105 |
+++ b/www-servers/ocsigenserver/ocsigenserver-2.8.ebuild |
106 |
@@ -1,4 +1,4 @@ |
107 |
-# Copyright 1999-2016 Gentoo Foundation |
108 |
+# Copyright 1999-2017 Gentoo Foundation |
109 |
# Distributed under the terms of the GNU General Public License v2 |
110 |
|
111 |
EAPI=5 |
112 |
@@ -24,7 +24,9 @@ IUSE="debug doc dbm +ocamlopt +sqlite zlib postgres" |
113 |
REQUIRED_USE="|| ( sqlite dbm postgres )" |
114 |
RESTRICT="strip installsources" |
115 |
|
116 |
-DEPEND=">=dev-ml/lwt-2.5.0:=[react,ssl,camlp4(+)] |
117 |
+DEPEND=">=dev-ml/lwt-2.5.0:=[camlp4(+)] |
118 |
+ dev-ml/lwt_react:= |
119 |
+ dev-ml/lwt_ssl:= |
120 |
>=dev-ml/react-0.9.3:= |
121 |
zlib? ( >=dev-ml/camlzip-1.03-r1:= ) |
122 |
dev-ml/cryptokit:= |
123 |
@@ -43,6 +45,10 @@ pkg_setup() { |
124 |
enewuser ocsigenserver -1 -1 /var/www ocsigenserver |
125 |
} |
126 |
|
127 |
+src_prepare() { |
128 |
+ epatch "${FILESDIR}/lwt3.patch" |
129 |
+} |
130 |
+ |
131 |
src_configure() { |
132 |
sh configure \ |
133 |
--prefix /usr \ |
134 |
|
135 |
diff --git a/www-servers/ocsigenserver/ocsigenserver-9999.ebuild b/www-servers/ocsigenserver/ocsigenserver-9999.ebuild |
136 |
index 042de975246..6f80dda9a2f 100644 |
137 |
--- a/www-servers/ocsigenserver/ocsigenserver-9999.ebuild |
138 |
+++ b/www-servers/ocsigenserver/ocsigenserver-9999.ebuild |
139 |
@@ -1,4 +1,4 @@ |
140 |
-# Copyright 1999-2016 Gentoo Foundation |
141 |
+# Copyright 1999-2017 Gentoo Foundation |
142 |
# Distributed under the terms of the GNU General Public License v2 |
143 |
|
144 |
EAPI=5 |
145 |
@@ -24,7 +24,9 @@ IUSE="debug doc dbm +ocamlopt +sqlite zlib postgres" |
146 |
REQUIRED_USE="|| ( sqlite dbm postgres )" |
147 |
RESTRICT="strip installsources" |
148 |
|
149 |
-DEPEND=">=dev-ml/lwt-2.5.0:=[react,ssl,camlp4(+)] |
150 |
+DEPEND=">=dev-ml/lwt-2.5.0:=[camlp4(+)] |
151 |
+ dev-ml/lwt_react:= |
152 |
+ dev-ml/lwt_ssl:= |
153 |
>=dev-ml/react-0.9.3:= |
154 |
zlib? ( >=dev-ml/camlzip-1.03-r1:= ) |
155 |
dev-ml/cryptokit:= |
156 |
@@ -43,6 +45,10 @@ pkg_setup() { |
157 |
enewuser ocsigenserver -1 -1 /var/www ocsigenserver |
158 |
} |
159 |
|
160 |
+src_prepare() { |
161 |
+ epatch "${FILESDIR}/lwt3.patch" |
162 |
+} |
163 |
+ |
164 |
src_configure() { |
165 |
sh configure \ |
166 |
--prefix /usr \ |