commit: aeb712378d4f73e227efa374b1a175e318f4a0f2
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 12 18:31:03 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Apr 12 19:20:25 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aeb71237
www-servers/ocsigenserver: Fix build with lwt3.
Package-Manager: Portage-2.3.5, Repoman-2.3.2
www-servers/ocsigenserver/files/lwt3.patch | 78 ++++++++++++++++++++++
www-servers/ocsigenserver/ocsigenserver-2.8.ebuild | 10 ++-
.../ocsigenserver/ocsigenserver-9999.ebuild | 10 ++-
3 files changed, 94 insertions(+), 4 deletions(-)
diff --git a/www-servers/ocsigenserver/files/lwt3.patch
b/www-servers/ocsigenserver/files/lwt3.patch
new file mode 100644
index 00000000000..3fb6b9d8e7a
--- /dev/null
+++ b/www-servers/ocsigenserver/files/lwt3.patch
@@ -0,0 +1,78 @@
+Index: ocsigenserver-2.8/Makefile.options
+===================================================================
+--- ocsigenserver-2.8.orig/Makefile.options
++++ ocsigenserver-2.8/Makefile.options
+@@ -30,7 +30,7 @@ endif
+
+ BASE_PACKAGE := lwt ipaddr bytes
+
+-SERVER_PACKAGE := lwt.ssl \
++SERVER_PACKAGE := lwt_ssl \
+ bytes \
+ ${LWT_PREEMPTIVE_PACKAGE} \
+ ipaddr \
+Index: ocsigenserver-2.8/configure
+===================================================================
+--- ocsigenserver-2.8.orig/configure
++++ ocsigenserver-2.8/configure
+@@ -410,8 +410,8 @@ check_library ssl "See: http://sourcefor
+
+ check_library lwt "See: http://ocsigen.org/lwt";
+ check_library lwt.unix "Missing support for 'unix' in lwt."
+-check_library lwt.react "Missing support for 'react' in lwt."
+-check_library lwt.ssl "Missing support for 'ssl' in lwt."
++check_library lwt_react "Missing support for 'react' in lwt."
++check_library lwt_ssl "Missing support for 'ssl' in lwt."
+ check_library lwt.preemptive "Missing support for 'preemptive' in lwt."
+
+ check_library netstring \
+Index: ocsigenserver-2.8/src/extensions/Makefile
+===================================================================
+--- ocsigenserver-2.8.orig/src/extensions/Makefile
++++ ocsigenserver-2.8/src/extensions/Makefile
+@@ -4,8 +4,8 @@ PACKAGE := \
+ bytes \
+ lwt.unix \
+ ipaddr \
+- lwt.ssl \
+- lwt.react \
++ lwt_ssl \
++ lwt_react \
+ netstring \
+ netstring-pcre \
+ tyxml.parser
+Index: ocsigenserver-2.8/src/files/META.in
+===================================================================
+--- ocsigenserver-2.8.orig/src/files/META.in
++++ ocsigenserver-2.8/src/files/META.in
+@@ -37,7 +37,7 @@ package "baselib" (
+ )
+
+ package "http" (
+- requires = "%%NAME%%.baselib,lwt.ssl,tyxml"
++ requires = "%%NAME%%.baselib,lwt_ssl,tyxml"
+ version = "[distributed with Ocsigen server]"
+ description = "HTTP library for Ocsigen server"
+ archive(byte) = "http.cma"
+@@ -188,7 +188,7 @@ package "ext" (
+
+ package "comet" (
+ exists_if = "ocsigen_comet.cmo,ocsigen_comet.cmx"
+- requires = "ocsigenserver,lwt.react"
++ requires = "ocsigenserver,lwt_react"
+ version = "[distributed with Ocsigen server]"
+ description = "Comet server-to-client communication"
+ archive(byte) = "ocsigen_comet.cmo"
+Index: ocsigenserver-2.8/src/http/Makefile
+===================================================================
+--- ocsigenserver-2.8.orig/src/http/Makefile
++++ ocsigenserver-2.8/src/http/Makefile
+@@ -3,7 +3,7 @@ PACKAGE := \
+ bytes \
+ netstring \
+ netstring-pcre \
+- lwt.ssl \
++ lwt_ssl \
+ tyxml
+
+ LIBS := -I ../baselib ${addprefix -package ,${PACKAGE}}
diff --git a/www-servers/ocsigenserver/ocsigenserver-2.8.ebuild
b/www-servers/ocsigenserver/ocsigenserver-2.8.ebuild
index 042de975246..6f80dda9a2f 100644
--- a/www-servers/ocsigenserver/ocsigenserver-2.8.ebuild
+++ b/www-servers/ocsigenserver/ocsigenserver-2.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -24,7 +24,9 @@ IUSE="debug doc dbm +ocamlopt +sqlite zlib postgres"
REQUIRED_USE="|| ( sqlite dbm postgres )"
RESTRICT="strip installsources"
-DEPEND=">=dev-ml/lwt-2.5.0:=[react,ssl,camlp4(+)]
+DEPEND=">=dev-ml/lwt-2.5.0:=[camlp4(+)]
+ dev-ml/lwt_react:=
+ dev-ml/lwt_ssl:=
>=dev-ml/react-0.9.3:=
zlib? ( >=dev-ml/camlzip-1.03-r1:= )
dev-ml/cryptokit:=
@@ -43,6 +45,10 @@ pkg_setup() {
enewuser ocsigenserver -1 -1 /var/www ocsigenserver
}
+src_prepare() {
+ epatch "${FILESDIR}/lwt3.patch"
+}
+
src_configure() {
sh configure \
--prefix /usr \
diff --git a/www-servers/ocsigenserver/ocsigenserver-9999.ebuild
b/www-servers/ocsigenserver/ocsigenserver-9999.ebuild
index 042de975246..6f80dda9a2f 100644
--- a/www-servers/ocsigenserver/ocsigenserver-9999.ebuild
+++ b/www-servers/ocsigenserver/ocsigenserver-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -24,7 +24,9 @@ IUSE="debug doc dbm +ocamlopt +sqlite zlib postgres"
REQUIRED_USE="|| ( sqlite dbm postgres )"
RESTRICT="strip installsources"
-DEPEND=">=dev-ml/lwt-2.5.0:=[react,ssl,camlp4(+)]
+DEPEND=">=dev-ml/lwt-2.5.0:=[camlp4(+)]
+ dev-ml/lwt_react:=
+ dev-ml/lwt_ssl:=
>=dev-ml/react-0.9.3:=
zlib? ( >=dev-ml/camlzip-1.03-r1:= )
dev-ml/cryptokit:=
@@ -43,6 +45,10 @@ pkg_setup() {
enewuser ocsigenserver -1 -1 /var/www ocsigenserver
}
+src_prepare() {
+ epatch "${FILESDIR}/lwt3.patch"
+}
+
src_configure() {
sh configure \
--prefix /usr \
