backport upstream patches to build against lwt 2.5

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

6 files changed, 231 insertions, 20 deletions

diff --git a/www-servers/ocsigenserver/ChangeLog b/www-servers/ocsigenserver/ChangeLog
index d0112018e689..fa132f37711f 100644
--- a/www-servers/ocsigenserver/ChangeLog
+++ b/www-servers/ocsigenserver/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-servers/ocsigenserver
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/ocsigenserver/ChangeLog,v 1.9 2014/12/01 10:04:01 aballier Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/ocsigenserver/ChangeLog,v 1.10 2015/07/16 12:51:08 aballier Exp $
+
+*ocsigenserver-2.5-r1 (16 Jul 2015)
+
+  16 Jul 2015; Alexis Ballier <aballier@gentoo.org>
+  +ocsigenserver-2.5-r1.ebuild, +files/lwt.patch, +files/lwt2.patch,
+  +files/lwt3.patch:
+  backport upstream patches to build against lwt 2.5
 
 *ocsigenserver-2.5 (01 Dec 2014)
 
diff --git a/www-servers/ocsigenserver/Manifest b/www-servers/ocsigenserver/Manifest
index bb05cf3f7a88..c26f8471fd41 100644
--- a/www-servers/ocsigenserver/Manifest
+++ b/www-servers/ocsigenserver/Manifest
@@ -1,6 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
+AUX lwt.patch 626 SHA256 269bf056ab0e0e42bfc4d4a448b53c10ba9b3c697ac4703cae0236ce38d092cc SHA512 9b65b186de663480af21344465018491082f777dd4cb8d13fa7ac8cc80f5b912db46ee516e1b85388004232267389bfbfd25dd03bead322b30fdfef71f2fd6e9 WHIRLPOOL 134c46226e6abdf04e32188d51de642cb5d3ac8fe44f6742aafa11d32d3cf52796c739896c8e510ac635f601b1903ddb79d6cc2de7c62c59a7c94eb0ebad9a02
+AUX lwt2.patch 855 SHA256 76e73c9d279cbdd1716ac69d88609ab58fb21ba976d8679d01df003bbe0a4d66 SHA512 3e426969d22e196d4d1885d981c4b25ce76e70d75d7b1c36c826dcfebb9466bb812059339999f42d1fd228d83c22dc28c8f43b8956a613e04e9b085833a996ed WHIRLPOOL d950366679e31925a7b0e2dcbc72f8ed959b97c0a33a23be2f62324ef2581a78887233665ab6f3ee89f456a330867edd713a75fd0aed51d7af276c8e23e815b5
+AUX lwt3.patch 3345 SHA256 6e74985ae6247909ee80546c16a810c10231cd3e3b10350e1e32efe36a205845 SHA512 5bc80aa4fcf247650349dda71280d6be689bcaeb3ac93f6949f722ae66f6a12521c33ab3f9afe8d394faea7e23fc4b77b88049605b28cbd05cd9ff20e6106e8b WHIRLPOOL 72fe01dad55cf0e67c6e3ad09741c2b81c5836639e940790f2caa1375adb93e46da86234c0733e8dd072986fbb9639419dda287f4846ac49794a3c5ef3b0a034
 AUX ocsigenserver.confd 432 SHA256 f128306075b9a1cc062e7b49e79806affc0b11c68f791729c861e1eff9c7bcea SHA512 d460460eef1371ef8df6e236dbb6fb46969c720ece6278983504db1cf6307b114d30353df75d172a78c041090969b30807696b34490b7ae674e5fa6acca05395 WHIRLPOOL fe5564620a04cb5b53e33865e0b71295abd99690806d9c2ee3cdad8a4aefb803e7a5fb92391f30fca8def248cdc91453b7bc06146bbb96f2ca27db454d41a548
 AUX ocsigenserver.initd 882 SHA256 7e8d232d06adce963795bf7bc58f715b5870c72a4a003d43074fee938869fd3c SHA512 89aff58a2427bb1f557796dcd30aebc88d87c604feaf9b8b9d68acb623b49cc0391889cdd468a4b443533d0fe49cd6cf5303cd38ba056e0465f913036d022c7d WHIRLPOOL 4cd19514b4565d9e701a0ff5047ee3e14df834a3064ceb2fac7dd9cf12aa87333ea808499a004dff0e81e117a29d6dbe72f5d0d4b26be6af60c3e6e9e833b1f7
 AUX pcre.patch 1533 SHA256 4c73846375ccfe3b113e649ccbd15239b0967d5ddb3d124cbec27c030f15ff03 SHA512 b9bb25da58dcf4548d2991a3ed446f5b21d2aee84d7829c632900bdb7dbfc65533568ecf2b38f745841c2b3069eee9c6848a6a74dc12a794cda4c5e36d562480 WHIRLPOOL b99b1bd469fc2c340d0cbd92e9fd5901c36eafeb22f4fca17b2be2b1876fe21b21021018d1333b8b4e41c54991d0a13d418796cb7b26e8633826cb4e1fc8bf21
@@ -9,25 +12,14 @@ DIST ocsigenserver-2.3.0.tar.gz 1263133 SHA256 d684dcb2084fc6cc241461b2a5663d5eb
 DIST ocsigenserver-2.5.tar.gz 1259472 SHA256 d9107e0543a286b2264b0f4255886cdc3670196d5453a689da2985c7e5a7df2b SHA512 8d90ce99bdda2fefdc0d22497badfa885ff310801c6cc205e0360e823964b4b01a1fecef8549121647abfd113bfe45a0b6cb306a326b26657bd95fbafaa59e72 WHIRLPOOL 9feac8009a83520d3f82c3e4162d72cdff7e54b5077af63e1b04d63da0364035480de5a30f04f23c6124e0d4dd4c6c885687d2a24e00b1432b23d572bf90f13e
 EBUILD ocsigenserver-2.2.0.ebuild 1961 SHA256 2b51548133e1e15621bdf4ec01ead70a5ef33972a7cbca7ff78253b7d5b6d428 SHA512 b661f62da2cc18f0725987f0796e55e7575ca3950e0fecab3b6b997022518ed5a7b6bc657ed57f4027fb36e02116f6e3a31c6afbbd711695badf4c5153488990 WHIRLPOOL 7bf8af00d929eb6b495c54e52cea8412309e198837052a08de921923d2a7f1903977b485d643758dba836b6c885da7b4323143d8e530e9a8444d806dbaab0a73
 EBUILD ocsigenserver-2.3.0.ebuild 1909 SHA256 47449c7dc2e94869c25800f3f150753f03fb5457951672f3fb48afdeb0b066ef SHA512 8d2c769a160db132b4981e5aaac8ece53001ef7c719521ec6c260e9dbfb1f5b964858c96374436846232a6e5c100c1007ebca7d809ef37c01aaea19364a36fe2 WHIRLPOOL 72c45d2c304e3aa560160fc27f2e329e1de6b5587c9f32a62dee241f5bb91182dec3130ba60c720733bda5c7f20bcfe85316fd42111f2c6dfc0b702cc15d758e
+EBUILD ocsigenserver-2.5-r1.ebuild 2136 SHA256 3851182d5e4588629030733628d3546f7e7db6f5573554b4db9b29d8037330b9 SHA512 0466e45132a997b04249b635be0f4db3aad3a610f4ab1c9f745ee8bb7aff1029e56f601b01a1107786d9326be6f33ee2c9a6b9aa84156a94610a5e44d371b95e WHIRLPOOL b7d6f568575fd7754fa7b687a6945ab41c95ad6279e0026b934e5d86d2eb96fa6c58cc2c73063843977f453e81b184c45847a774e832a36585adfa8c50921e51
 EBUILD ocsigenserver-2.5.ebuild 1997 SHA256 d75460c3ea89e7f2c1abdedef36824e86f7988515f23e558197d48bd8f2f5974 SHA512 95e139d2d0fadbe056a948abff0cd3c1e987774e4b410907749b3b0244a04c3ce04c467b338c6f7423c262b47ce81a8ba39af073a0b75d3ca2d2c428701c595d WHIRLPOOL ee997a912ad6d7810d5ce73d07e1b6f10fd6d07a0f16528845d0b024461f32a08d469afc7a45a683c9d6e2058459239de03f7d9f971dabe7bed2e5583112198d
-MISC ChangeLog 1760 SHA256 55a8bd8c330c9d7ce9832933fd4680ffad177a325299e3d9af15a3a96fa345f7 SHA512 0c60cc4ed085ca5d61fa1c1d17a09caeb5e00395954b1b6dc97da6b35e3a4ca654a223c3d4691c196aa510b654f522913330b85b200a6fe53a50f393f50aafdb WHIRLPOOL d4da23d4b1fbed9a7630f184bca1dbd0feb517fedf10070dd3ab357b730e3ad20d285589fd28890b0e4d3b07e66fd1e85500b9eaa64a8bfee3914c0c436b65c8
+MISC ChangeLog 1994 SHA256 98bbff4e19f8865337e78bde52ebac6a0809c8b15b1ac93bab9d5df21fc9c235 SHA512 7bb1ee0ff393559785a93a57ed0e38c4de2a98df6129faeefb03a1736705d79c4312d55e76d20529b472bcf0ccdc11ccb2992e819f2d9d7f9dabb398c8d6812b WHIRLPOOL 9ba493d2230f01561b030381aa96dcc6b71ba42233591980bc26896e90c85b4d7dacfdb937dd5f453b43f7e245a2a121a63a952091b9b4eb708d0acf3eea93a0
 MISC metadata.xml 242 SHA256 8ddcb2df52a0c680260c6121bfa4705e7c4f7355022359730f01272fef1bec2a SHA512 b782c7c3ad06bdab455982f32ae8226e92bcdb434d7a7bd65cc13c1fac1036a4a37a00ba5ca8c4a2b15767b023cdeb68ef6773cbba36f487f6c3664edc0a0a48 WHIRLPOOL 4c09451ce37971639c4b0e10b8faa5b266c83d15a8b74e909f555f2a1d1ed5efcec6e1b2748c732ac70302424209bba51a2abe5c96abe086343f38ce1c04a9f4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVfzAhXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmijEIQAIYtNMPVtJyoWITXnaVVoUqz
-0S15KwJD4msBrwml+DXb8aNyERKRGk7aeSh6FjGhtZ1rbaih37xttcKMRX0A9ieP
-5axsEsA+tXQzb7PcIyl4nBf3NXB3n4zljRYHEduT8ezMUIUvmQNs+KSjIq/7/Mza
-6t2TWIcZ1vNNFoJgeWRSKqnGseNA/TUFwIJMKT/OvcfwipTciWxdWucUkL7IyDyM
-3IPBkL3+h3FOA3w0bIYwM/Lr2ID9XxrKLelfMIDkPxKf37UNMsooMZg55cV+KlcC
-A8F7GJ7O7kjQaOJiPPUJMIJdC5i/YhtsPRCVVjp4seCPF/lc9mgyJXuxly6obAem
-p339wzvwkpK6jk1ET4tKc7DLXtWNGOvBXA0J2RKDbiL9SImMi7r1I8xj5A6G/TqN
-Nf3bkSsHFPiOEUO+QLx8EZL/AwAvKPjNxMq3JJc97UCkWAJEUlLSUBR+sqaNedgB
-+BZ5FKQmWcKON4cR/BMXFNvV+bhx2XocUqHVW3iLeJHZwZ3Elh1SJzY1WW7y4XZ5
-UhAe3/7Rt8NaF2/195lP+P5Q0gf0+Jx/FwkvJiOXVW6aiMF0j2HLozxxcgGZEnb1
-0Dw0ElPumx51hMLl0ygTqvZDs1DAQf9QuorEtvhbIuR7z1+DSEmpJJZqjF1IFrnE
-gCacIB1A0tsG4On92FLE
-=3y58
+iEYEAREIAAYFAlWnqL0ACgkQvFcC4BYPU0p9IACgu0YhrbRR+T/ZBHab+dn8+UDi
+7uIAn0gQjP0TOmi7o5MRWhWj4+D31kO1
+=PaRT
 -----END PGP SIGNATURE-----
diff --git a/www-servers/ocsigenserver/files/lwt.patch b/www-servers/ocsigenserver/files/lwt.patch
new file mode 100644
index 000000000000..360b2b06e913
--- /dev/null
+++ b/www-servers/ocsigenserver/files/lwt.patch
@@ -0,0 +1,19 @@
+commit 156f8deaae2a50d8b9614b99488f34b284382eaa
+Author: Drup <drupyog@zoho.com>
+Date:   Thu Dec 11 16:52:33 2014 +0100
+
+    Remove dependency to Lwt_util.
+
+diff --git a/src/server/ocsigen_server.ml b/src/server/ocsigen_server.ml
+index c5563a6..e548f5e 100644
+--- a/src/server/ocsigen_server.ml
++++ b/src/server/ocsigen_server.ml
+@@ -1040,7 +1040,7 @@ let rec wait_connection use_ssl port socket =
+          >>= decr_connected
+        in
+ 
+-       Lwt_util.iter handle_one l >>= fun () ->
++       Lwt_list.iter_p handle_one l >>= fun () ->
+        match e with
+        | Some e -> handle_exn e
+        | None -> Lwt.return ())
diff --git a/www-servers/ocsigenserver/files/lwt2.patch b/www-servers/ocsigenserver/files/lwt2.patch
new file mode 100644
index 000000000000..9b9e1b808853
--- /dev/null
+++ b/www-servers/ocsigenserver/files/lwt2.patch
@@ -0,0 +1,19 @@
+commit faaa943aacaeaee27e5a309bb54bd539ec1a58a2
+Author: Drup <drupyog@zoho.com>
+Date:   Sat Dec 6 05:08:13 2014 +0100
+
+    Replace use of the deprecated `Lwt_event` by `Lwt_react.E`.
+
+diff --git a/src/extensions/ocsigen_comet.ml b/src/extensions/ocsigen_comet.ml
+index ad7d9dd..ccc0719 100644
+--- a/src/extensions/ocsigen_comet.ml
++++ b/src/extensions/ocsigen_comet.ml
+@@ -468,7 +468,7 @@ end = struct
+            Lwt.choose
+              [ (choosed >|= fun x -> Some x);
+                (Lwt_unix.sleep (get_timeout ()) >|= fun () -> None);
+-               (Lwt_event.next Security.kill >>= fun () -> Lwt.fail Kill);
++               (Lwt_react.E.next Security.kill >>= fun () -> Lwt.fail Kill);
+              ] >|= fun x ->
+            List.iter (fun c -> Channels.send_listeners c (-1)) active ;
+            let s = Messages.encode_downgoing ended x in
diff --git a/www-servers/ocsigenserver/files/lwt3.patch b/www-servers/ocsigenserver/files/lwt3.patch
new file mode 100644
index 000000000000..d2a9ca578fe2
--- /dev/null
+++ b/www-servers/ocsigenserver/files/lwt3.patch
@@ -0,0 +1,86 @@
+commit 5b60babe229189c2be999e138c500527334c3415
+Author: pveber <philippe.veber@gmail.com>
+Date:   Fri Feb 27 09:24:50 2015 +0100
+
+    fix configure and Makefiles following lwt.extra deprecation
+    
+    Now that lwt.extra has been deprecated [0], the configure and Makefile
+    scripts should refer directly to lwt.preemptive.
+    
+    [0] https://github.com/ocsigen/lwt/commit/91d549b54397a33ed80de962771d07180c4b8d4e
+
+Index: ocsigenserver-2.5/Makefile.options
+===================================================================
+--- ocsigenserver-2.5.orig/Makefile.options
++++ ocsigenserver-2.5/Makefile.options
+@@ -26,14 +26,14 @@ endif
+ ## but also to generate src/baselib/ocsigen_config.ml and src/files/META
+ 
+ ifeq "$(PREEMPTIVE)" "YES"
+-LWT_EXTRA_PACKAGE:=lwt.extra
++LWT_PREEMPTIVE_PACKAGE:=lwt.preemptive
+ endif
+ 
+ BASE_PACKAGE := lwt ipaddr
+ 
+ SERVER_PACKAGE := lwt.ssl           \
+-	          ${LWT_EXTRA_PACKAGE} \
+-            ipaddr            \
++	          ${LWT_PREEMPTIVE_PACKAGE} \
++                  ipaddr            \
+ 	          netstring         \
+ 	          netstring-pcre    \
+                   findlib           \
+Index: ocsigenserver-2.5/configure
+===================================================================
+--- ocsigenserver-2.5.orig/configure
++++ ocsigenserver-2.5/configure
+@@ -410,7 +410,7 @@ check_library lwt "See: http://ocsigen.o
+ 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.extra "Missing support for 'extra' in lwt."
++check_library lwt.preemptive "Missing support for 'preemptive' in lwt."
+ 
+ check_library netstring \
+     "See ocamlnet: http://projects.camlcity.org/projects/ocamlnet.html"
+@@ -454,12 +454,12 @@ if [ "$with_camlzip" -gt 0 ]; then
+     fi
+ fi
+ 
+-# Check Lwt.extra
++# Check Lwt.preemptive
+ if [ "$with_preempt" -gt 0 ]; then
+-    if test_library lwt.extra; then
++    if test_library lwt.preemptive; then
+ 	echo -n
+     elif [ "$with_preempt" -gt 1 ]; then
+-	fail_library lwt.extra "Missing support for 'extra' in lwt."
++	fail_library lwt.preemptive "Missing support for 'preemptive' in lwt."
+     else
+ 	with_preempt=0
+     fi
+Index: ocsigenserver-2.5/src/baselib/Makefile
+===================================================================
+--- ocsigenserver-2.5.orig/src/baselib/Makefile
++++ ocsigenserver-2.5/src/baselib/Makefile
+@@ -1,6 +1,6 @@
+ include ../../Makefile.config
+ 
+-LIBS     := -package lwt.unix,netstring,netstring-pcre,cryptokit,findlib,tyxml,lwt.syntax,${LWT_EXTRA_PACKAGE},ipaddr
++LIBS     := -package lwt.unix,netstring,netstring-pcre,cryptokit,findlib,tyxml,lwt.syntax,${LWT_PREEMPTIVE_PACKAGE},ipaddr
+ OCAMLC   := $(OCAMLFIND) ocamlc${BYTEDBG} ${THREAD}
+ OCAMLOPT := $(OCAMLFIND) ocamlopt ${OPTDBG} ${THREAD}
+ OCAMLDOC := $(OCAMLFIND) ocamldoc
+Index: ocsigenserver-2.5/src/extensions/ocsipersist-dbm/Makefile
+===================================================================
+--- ocsigenserver-2.5.orig/src/extensions/ocsipersist-dbm/Makefile
++++ ocsigenserver-2.5/src/extensions/ocsipersist-dbm/Makefile
+@@ -1,6 +1,6 @@
+ include ../../../Makefile.config
+ 
+-PACKAGE  := ${LWT_EXTRA_PACKAGE} \
++PACKAGE  := ${LWT_PREEMPTIVE_PACKAGE} \
+ 	    lwt.unix     \
+ 	    tyxml.parser \
+ 	    dbm          \
diff --git a/www-servers/ocsigenserver/ocsigenserver-2.5-r1.ebuild b/www-servers/ocsigenserver/ocsigenserver-2.5-r1.ebuild
new file mode 100644
index 000000000000..09fa604fe0af
--- /dev/null
+++ b/www-servers/ocsigenserver/ocsigenserver-2.5-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/ocsigenserver/ocsigenserver-2.5-r1.ebuild,v 1.1 2015/07/16 12:51:08 aballier Exp $
+
+EAPI=5
+
+inherit eutils multilib findlib user
+
+DESCRIPTION="Ocaml-powered webserver and framework for dynamic web programming"
+HOMEPAGE="http://www.ocsigen.org"
+SRC_URI="https://github.com/ocsigen/ocsigenserver/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="debug doc dbm +ocamlopt +sqlite zlib"
+REQUIRED_USE="|| ( sqlite dbm )"
+RESTRICT="strip installsources"
+
+DEPEND=">=dev-ml/lwt-2.5.0:=[react,ssl]
+		>=dev-ml/react-0.9.3:=
+		zlib? ( >=dev-ml/camlzip-1.03-r1:= )
+		dev-ml/cryptokit:=
+		>=dev-ml/ocamlnet-3.6:=[pcre]
+		>=dev-ml/pcre-ocaml-6.2.5:=
+		>=dev-ml/tyxml-3.3:=
+		>=dev-lang/ocaml-3.12:=[ocamlopt?]
+		dev-ml/ocaml-ipaddr:=
+		dbm? ( || ( dev-ml/camldbm:= >=dev-lang/ocaml-3.12[gdbm] ) )
+		sqlite? ( dev-ml/ocaml-sqlite3:= )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	enewgroup ocsigenserver
+	enewuser ocsigenserver -1 -1 /var/www ocsigenserver
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/lwt.patch"
+	epatch "${FILESDIR}/lwt2.patch"
+	epatch "${FILESDIR}/lwt3.patch"
+}
+
+src_configure() {
+	sh configure \
+		--prefix /usr \
+		--temproot "${ED}" \
+		--bindir /usr/bin \
+		--docdir /usr/share/doc/${PF} \
+		--mandir /usr/share/man/man1 \
+		--libdir /usr/$(get_libdir)/ocaml \
+		$(use_enable debug) \
+		$(use_with zlib camlzip) \
+		$(use_with sqlite) \
+		$(use_with dbm) \
+		--with-preempt \
+		--ocsigen-group ocsigenserver \
+		--ocsigen-user ocsigenserver  \
+		--name ocsigenserver \
+		|| die "Error : configure failed!"
+}
+
+src_compile() {
+	if use ocamlopt; then
+		emake
+	else
+		emake byte
+	fi
+	use doc && emake doc
+}
+
+src_install() {
+	findlib_src_preinst
+	if use ocamlopt; then
+		emake install
+	else
+		emake install.byte
+	fi
+	if use doc ; then
+		emake install.doc
+	fi
+	emake logrotate
+
+	newinitd "${FILESDIR}"/ocsigenserver.initd ocsigenserver || die
+	newconfd "${FILESDIR}"/ocsigenserver.confd ocsigenserver || die
+
+	dodoc README
+}