gentoo resync : 14.07.2018

5 files changed, 199 insertions, 0 deletions

diff --git a/dev-ml/eliom/Manifest b/dev-ml/eliom/Manifest
new file mode 100644
index 000000000000..1ab33d849e1e
--- /dev/null
+++ b/dev-ml/eliom/Manifest
@@ -0,0 +1,5 @@
+AUX lwt3.patch 1654 BLAKE2B 12f4072a740da3fa29070005634197ce2b442dab48ccb1f78e7b48076d5b9363fe0d669afe4578eab7fc684461cfa0539436f1a6710d924fd712330a777921cd SHA512 14b521b8622c07d472211af1e50b4a880ffa28ac18c3fb04d459a3302f22346ae31e1c76f9ace728d2ba6383c7222a3a1dcb7896552e5bdf3251b2db1878217b
+DIST eliom-6.2.0.tar.gz 724359 BLAKE2B f52805c83f71eb76e3a183637d9800690714dbe07cbe82ad1bac09ea02ac286cbae541b22dea73592bd8cfa095700264c2a8903ead5fae498e847c4f6bdc8d47 SHA512 02ea52c78470f222297dd9f82218e82427ea2d2d0c9f261d1a9c2decbe7644c0bf583b77b8cef2577d5662d363efd276755f400e7a4c29c89a2265e49ca850db
+EBUILD eliom-6.2.0.ebuild 1560 BLAKE2B a2465f81aead3b6f26a3e9eeb30f8f1f288d2d5fca2e0a2be18df606f19124d530b9f06844e0e152b44e8e89c3838ab17eace30bb4d7f555bb50556b81abb1ce SHA512 1c379215726329124bbaba467566ae228e6567fd615e313c8356e3501153cd9ed1c32674772eadf0f91220b674ea1002c77bdc47720847eeef83c46ae79428e9
+EBUILD eliom-9999.ebuild 1508 BLAKE2B 5efc3090fcb70bded4d7b703fa8b1e0a4b3229c2d30ae344d75c8d4614d7438f090d198be1adb7fc9a85571806c153237f36be72f884fb8a446cad2aa7793107 SHA512 dc07ae8e778ee456d0f89c7fd50bcf0a0ae8b1d692db7bd87c7568e4bc647b59bae38aa4019bdca53a0e107883c2c9d7b9e5e5876d7a187775d03f4fa8b68028
+MISC metadata.xml 403 BLAKE2B 4de6194854dc1b806bdf3aec3e4353dd1b8776c20fa423f4db50cce981b0859bc68db75df71cff4d505c0f78531ea42c7f28f4097b7aeaae6d11b89e172e5ecd SHA512 3fc7557229857dbfdd5d0e98fd43c35f81c4faa8099b1c4e31c1e347e3b6657457681b0bc143d6526ab25bfc7bcb26e731f8e8390c9749da3dad0c9ae1876002
diff --git a/dev-ml/eliom/eliom-6.2.0.ebuild b/dev-ml/eliom/eliom-6.2.0.ebuild
new file mode 100644
index 000000000000..b97e4135966f
--- /dev/null
+++ b/dev-ml/eliom/eliom-6.2.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib findlib
+
+DESCRIPTION="A web framework to program client/server applications"
+HOMEPAGE="http://ocsigen.org/eliom/"
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/ocsigen/eliom"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/ocsigen/eliom/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+IUSE="doc +ocamlopt +ppx"
+
+RDEPEND=">=dev-lang/ocaml-4.03:=[ocamlopt?]
+	>=dev-ml/js_of_ocaml-2.8.2:=[xml]
+	>=www-servers/ocsigenserver-2.8:=
+	>=dev-ml/tyxml-4:=
+	>=dev-ml/deriving-0.6:=
+	>=dev-ml/reactiveData-0.2.1:=
+	dev-ml/ocaml-ipaddr:=
+	dev-ml/react:=
+	dev-ml/ocaml-ssl:=
+	>=dev-ml/lwt-2.5.0:=
+	dev-ml/lwt_react:=
+	dev-ml/camlp4:=
+	ppx? ( >=dev-ml/ppx_tools-0.99.3:= )"
+DEPEND="${RDEPEND}
+	dev-ml/ocamlbuild
+	dev-ml/opam"
+
+src_prepare() {
+	epatch "${FILESDIR}/lwt3.patch"
+}
+
+src_compile() {
+	if use ocamlopt ; then
+		emake PPX=$(usex ppx true false) all
+	else
+		emake PPX=$(usex ppx true false) byte
+	fi
+	use doc && emake doc
+	emake man
+}
+
+src_install() {
+	opam-installer \
+		--prefix="${ED}/usr" \
+		--libdir="${D}/$(ocamlc -where)" \
+		--docdir="${ED}/usr/share/doc/${PF}" \
+		--mandir="${ED}/usr/share/man" \
+		|| die
+	dodoc CHANGES README.md
+	if use doc ; then
+		docinto client/html
+		dodoc -r _build/src/lib/client/api.docdir/*
+		docinto server/html
+		dodoc -r _build/src/lib/server/api.docdir/*
+	fi
+}
diff --git a/dev-ml/eliom/eliom-9999.ebuild b/dev-ml/eliom/eliom-9999.ebuild
new file mode 100644
index 000000000000..cffa1b2c77a6
--- /dev/null
+++ b/dev-ml/eliom/eliom-9999.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib findlib
+
+DESCRIPTION="A web framework to program client/server applications"
+HOMEPAGE="http://ocsigen.org/eliom/"
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/ocsigen/eliom"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/ocsigen/eliom/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+IUSE="doc +ocamlopt +ppx"
+
+RDEPEND=">=dev-lang/ocaml-4.03:=[ocamlopt?]
+	>=dev-ml/js_of_ocaml-2.8.2:=[xml]
+	>=www-servers/ocsigenserver-2.8:=
+	>=dev-ml/tyxml-4:=
+	>=dev-ml/deriving-0.6:=
+	>=dev-ml/reactiveData-0.2.1:=
+	dev-ml/ocaml-ipaddr:=
+	dev-ml/react:=
+	dev-ml/ocaml-ssl:=
+	>=dev-ml/lwt-2.5.0:=
+	dev-ml/lwt_react:=
+	dev-ml/camlp4:=
+	ppx? ( >=dev-ml/ppx_tools-0.99.3:= )"
+DEPEND="${RDEPEND}
+	dev-ml/ocamlbuild
+	dev-ml/opam"
+
+src_compile() {
+	if use ocamlopt ; then
+		emake PPX=$(usex ppx true false) all
+	else
+		emake PPX=$(usex ppx true false) byte
+	fi
+	use doc && emake doc
+	emake man
+}
+
+src_install() {
+	opam-installer \
+		--prefix="${ED}/usr" \
+		--libdir="${D}/$(ocamlc -where)" \
+		--docdir="${ED}/usr/share/doc/${PF}" \
+		--mandir="${ED}/usr/share/man" \
+		|| die
+	dodoc CHANGES README.md
+	if use doc ; then
+		docinto client/html
+		dodoc -r _build/src/lib/client/api.docdir/*
+		docinto server/html
+		dodoc -r _build/src/lib/server/api.docdir/*
+	fi
+}
diff --git a/dev-ml/eliom/files/lwt3.patch b/dev-ml/eliom/files/lwt3.patch
new file mode 100644
index 000000000000..6b8d993fb687
--- /dev/null
+++ b/dev-ml/eliom/files/lwt3.patch
@@ -0,0 +1,44 @@
+Index: eliom-6.2.0/pkg/META
+===================================================================
+--- eliom-6.2.0.orig/pkg/META
++++ eliom-6.2.0/pkg/META
+@@ -13,7 +13,7 @@ package "server" (
+               react,
+               reactiveData,
+               tyxml,
+-              lwt.react,
++              lwt_react,
+               cryptokit,
+               reactiveData"
+   archive(byte) = "server.cma"
+@@ -49,7 +49,7 @@ package "client" (
+               js_of_ocaml.tyxml,
+               js_of_ocaml.log,
+               js_of_ocaml.weak,
+-              lwt.react,
++              lwt_react,
+               react,
+               reactiveData,
+               tyxml.functor"
+Index: eliom-6.2.0/src/_tags
+===================================================================
+--- eliom-6.2.0.orig/src/_tags
++++ eliom-6.2.0/src/_tags
+@@ -11,7 +11,7 @@ true:keep_locs
+ 
+ <lib/server/*.ml{,i}>:thread
+ <lib/server/*.ml{,i}>:package(lwt,ocsigenserver,ocsigenserver.ext,tyxml.functor)
+-<lib/server/*.ml{,i}>:package(react,js_of_ocaml)
++<lib/server/*.ml{,i}>:package(lwt_react,react,js_of_ocaml)
+ 
+ <lib/server/*.ml{,i}>:package(js_of_ocaml.deriving.ppx)
+ 
+@@ -24,7 +24,7 @@ true:keep_locs
+ <lib/client/*.ml{,i}>: eliom_ppx
+ <lib/client/*.ml{,i}>:package(ocsigenserver.cookies,ocsigenserver.polytables,ocsigenserver.baselib.base)
+ <lib/client/*.ml{,i}>:package(deriving.runtime,js_of_ocaml.deriving)
+-<lib/client/*.ml{,i}>:package(lwt.react,tyxml.functor,js_of_ocaml.tyxml)
++<lib/client/*.ml{,i}>:package(lwt_react,tyxml.functor,js_of_ocaml.tyxml)
+ <lib/client/*.ml{,i}>:package(react,js_of_ocaml,reactiveData)
+ 
+ <lib/client/*.ml{,i}>:package(js_of_ocaml.deriving.ppx)
diff --git a/dev-ml/eliom/metadata.xml b/dev-ml/eliom/metadata.xml
new file mode 100644
index 000000000000..8cff44a8f0c9
--- /dev/null
+++ b/dev-ml/eliom/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ocsigen/eliom</remote-id>
+	</upstream>
+	<use>
+		<flag name="ppx">Enable PPX syntax extension support.</flag>
+	</use>
+</pkgmetadata>