* [gentoo-commits] repo/gentoo:master commit in: www-servers/ocsigenserver/files/, www-servers/ocsigenserver/
@ 2016-06-21 14:21 Alexis Ballier
0 siblings, 0 replies; 3+ messages in thread
From: Alexis Ballier @ 2016-06-21 14:21 UTC (permalink / raw
To: gentoo-commits
commit: 0c38e408eae1c6fc11d1e4851c3b33d26b708bd7
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 21 12:12:47 2016 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Jun 21 14:21:30 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c38e408
www-servers/ocsigenserver: backport upstream fix for tyxml-4
Package-Manager: portage-2.3.0_rc1
www-servers/ocsigenserver/files/tyxml.patch | 104 +++++++++++++++++++++
www-servers/ocsigenserver/ocsigenserver-2.7.ebuild | 4 +
2 files changed, 108 insertions(+)
diff --git a/www-servers/ocsigenserver/files/tyxml.patch b/www-servers/ocsigenserver/files/tyxml.patch
new file mode 100644
index 0000000..f9aff48
--- /dev/null
+++ b/www-servers/ocsigenserver/files/tyxml.patch
@@ -0,0 +1,104 @@
+commit 556a155376669aba34f1e93a88a9b308107af8be
+Author: Vasilis Papavasileiou <git@vasilis.airpost.net>
+Date: Mon Apr 11 12:31:21 2016 +0000
+
+ Catch up with Tyxml
+
+ - Html5.M -> Tyxml.Html
+ - Bump-up dependency constraint
+
+diff --git a/.jenkins.sh b/.jenkins.sh
+index 0865cba..1c40a09 100644
+--- a/.jenkins.sh
++++ b/.jenkins.sh
+@@ -1,5 +1,6 @@
+ opam pin add --no-action ocsigenserver .
+ opam install camlzip
++opam pin add tyxml --dev-repo
+ opam install --deps-only ocsigenserver
+ opam install --verbose ocsigenserver
+
+diff --git a/opam b/opam
+index 9537632..82b1860 100644
+--- a/opam
++++ b/opam
+@@ -27,7 +27,7 @@ depends: [
+ "ocamlnet" {>= "4.0.2"}
+ "pcre"
+ "cryptokit"
+- "tyxml" {>= "3.4.0"}
++ "tyxml" {> "3.6.0"}
+ ("dbm" | "sqlite3")
+ "ipaddr" {>= "2.1"}
+ "camlp4"
+diff --git a/src/http/ocsigen_senders.ml b/src/http/ocsigen_senders.ml
+index 708b6a8..bf7c30c 100644
+--- a/src/http/ocsigen_senders.ml
++++ b/src/http/ocsigen_senders.ml
+@@ -77,7 +77,7 @@ module Make_XML_Content(Xml : Xml_sigs.Iterable)
+ ~stream:(x, None) ())
+ end
+
+-module Html5_content = Make_XML_Content(Xml)(Html5.M)
++module Html_content = Make_XML_Content(Tyxml.Xml)(Tyxml.Html)
+
+
+ (*****************************************************************************)
+@@ -473,11 +473,11 @@ struct
+ let get_etag ?options c = None
+
+ let error_page s msg c =
+- Html5.M.html
+- (Html5.M.head (Html5.M.title (Html5.M.pcdata s)) [])
+- (Html5.M.body
+- (Html5.M.h1 [Html5.M.pcdata msg]::
+- Html5.M.p [Html5.M.pcdata s]::
++ Tyxml.Html.html
++ (Tyxml.Html.head (Tyxml.Html.title (Tyxml.Html.pcdata s)) [])
++ (Tyxml.Html.body
++ (Tyxml.Html.h1 [Tyxml.Html.pcdata msg]::
++ Tyxml.Html.p [Tyxml.Html.pcdata s]::
+ c)
+ )
+
+@@ -512,11 +512,11 @@ struct
+ error_page
+ ("Error "^str_code)
+ error_msg
+- [Html5.M.p
+- [Html5.M.pcdata (Printexc.to_string exn);
+- Html5.M.br ();
+- Html5.M.em
+- [Html5.M.pcdata "(Ocsigen running in debug mode)"]
++ [Tyxml.Html.p
++ [Tyxml.Html.pcdata (Printexc.to_string exn);
++ Tyxml.Html.br ();
++ Tyxml.Html.em
++ [Tyxml.Html.pcdata "(Ocsigen running in debug mode)"]
+ ]]
+ | _ ->
+ error_page
+@@ -524,7 +524,7 @@ struct
+ error_msg
+ []
+ in
+- Html5_content.result_of_content err_page >>= fun r ->
++ Html_content.result_of_content err_page >>= fun r ->
+ Lwt.return
+ (Result.update r
+ ~cookies:cookies_to_set
+diff --git a/src/http/ocsigen_senders.mli b/src/http/ocsigen_senders.mli
+index b6d956f..54364b0 100644
+--- a/src/http/ocsigen_senders.mli
++++ b/src/http/ocsigen_senders.mli
+@@ -23,8 +23,8 @@ module File_content : Ocsigen_http_frame.HTTP_CONTENT
+ with type t =
+ string * Ocsigen_charset_mime.charset_assoc * Ocsigen_charset_mime.mime_assoc
+
+-module Html5_content :
+- Ocsigen_http_frame.HTTP_CONTENT with type t = Html5.M.doc
++module Html_content :
++ Ocsigen_http_frame.HTTP_CONTENT with type t = Tyxml.Html.doc
+
+ module Make_XML_Content(Xml : Xml_sigs.Iterable)
+ (Typed_xml : Xml_sigs.Typed_xml with module Xml := Xml) :
diff --git a/www-servers/ocsigenserver/ocsigenserver-2.7.ebuild b/www-servers/ocsigenserver/ocsigenserver-2.7.ebuild
index 0c79158..e9144bb 100644
--- a/www-servers/ocsigenserver/ocsigenserver-2.7.ebuild
+++ b/www-servers/ocsigenserver/ocsigenserver-2.7.ebuild
@@ -35,6 +35,10 @@ pkg_setup() {
enewuser ocsigenserver -1 -1 /var/www ocsigenserver
}
+src_prepare() {
+ has_version '>=dev-ml/tyxml-4' && epatch "${FILESDIR}/tyxml.patch"
+}
+
src_configure() {
sh configure \
--prefix /usr \
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/ocsigenserver/files/, www-servers/ocsigenserver/
@ 2016-06-21 14:21 Alexis Ballier
0 siblings, 0 replies; 3+ messages in thread
From: Alexis Ballier @ 2016-06-21 14:21 UTC (permalink / raw
To: gentoo-commits
commit: 54aa8ce1a5e3f5116186dcb254ee2003c52ab920
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 21 12:10:47 2016 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Jun 21 14:21:30 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54aa8ce1
www-servers/ocsigenserver: remove old
Package-Manager: portage-2.3.0_rc1
www-servers/ocsigenserver/Manifest | 2 -
www-servers/ocsigenserver/files/lwt.patch | 19 -----
www-servers/ocsigenserver/files/lwt2.patch | 19 -----
www-servers/ocsigenserver/files/lwt3.patch | 86 --------------------
.../ocsigenserver/ocsigenserver-2.5-r2.ebuild | 91 ----------------------
www-servers/ocsigenserver/ocsigenserver-2.6.ebuild | 85 --------------------
6 files changed, 302 deletions(-)
diff --git a/www-servers/ocsigenserver/Manifest b/www-servers/ocsigenserver/Manifest
index 7a6b192..3508f47 100644
--- a/www-servers/ocsigenserver/Manifest
+++ b/www-servers/ocsigenserver/Manifest
@@ -1,3 +1 @@
-DIST ocsigenserver-2.5.tar.gz 1259472 SHA256 d9107e0543a286b2264b0f4255886cdc3670196d5453a689da2985c7e5a7df2b SHA512 8d90ce99bdda2fefdc0d22497badfa885ff310801c6cc205e0360e823964b4b01a1fecef8549121647abfd113bfe45a0b6cb306a326b26657bd95fbafaa59e72 WHIRLPOOL 9feac8009a83520d3f82c3e4162d72cdff7e54b5077af63e1b04d63da0364035480de5a30f04f23c6124e0d4dd4c6c885687d2a24e00b1432b23d572bf90f13e
-DIST ocsigenserver-2.6.tar.gz 1261542 SHA256 f70751f1a1dcc9b9021f0773e92347bdbdb50f7c90b79a95dc5a6b90e9ee6818 SHA512 56805378d375de7e7653f74b3681fe21c798df2c50ee6889bd238df8f64aa053dfdbd1df2b6396b2f8c9ed8547b8176ef9498ccbf19df4bf111469353a6d9434 WHIRLPOOL 5128a3a429db49a5f8161cf008c91020c0e40e5bd58716adeee5580222bae0393dfdd73ffa01f167626f46e699ffff3e76b1aa0fb8c91d53889dc6e15cbe1ea9
DIST ocsigenserver-2.7.tar.gz 1262049 SHA256 01a477b180588fe0ac553177e84832448e02405bc73e432024e7a7ae21b3693f SHA512 e31fa428e1d86232e4066a93fc948b592e80bb3e8374efee4f40d02c53e8a713ade8aa9904623c1129c892557ac4a451928278b808abe190bb254e6e43aab256 WHIRLPOOL 1b55034d364da40b4bb0931b15da1a1c4c47f9133f1fd6099bfad57e6a43e5ce990a1a08295c740883b82f951cf3db9ad34ea1f70a818bd8296a678dc6b9b097
diff --git a/www-servers/ocsigenserver/files/lwt.patch b/www-servers/ocsigenserver/files/lwt.patch
deleted file mode 100644
index 360b2b0..0000000
--- a/www-servers/ocsigenserver/files/lwt.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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
deleted file mode 100644
index 9b9e1b8..0000000
--- a/www-servers/ocsigenserver/files/lwt2.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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
deleted file mode 100644
index d2a9ca5..0000000
--- a/www-servers/ocsigenserver/files/lwt3.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-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-r2.ebuild b/www-servers/ocsigenserver/ocsigenserver-2.5-r2.ebuild
deleted file mode 100644
index b2a3ba4..0000000
--- a/www-servers/ocsigenserver/ocsigenserver-2.5-r2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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
-
- # We create it at runtime
- rm -f "${ED}/var/run/ocsigenserver_command" || die
-}
diff --git a/www-servers/ocsigenserver/ocsigenserver-2.6.ebuild b/www-servers/ocsigenserver/ocsigenserver-2.6.ebuild
deleted file mode 100644
index b5ef6ae..0000000
--- a/www-servers/ocsigenserver/ocsigenserver-2.6.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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_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.md
-
- # We create it at runtime
- rm -f "${ED}/var/run/ocsigenserver_command" || die
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/ocsigenserver/files/, www-servers/ocsigenserver/
@ 2016-12-07 19:33 Alexis Ballier
0 siblings, 0 replies; 3+ messages in thread
From: Alexis Ballier @ 2016-12-07 19:33 UTC (permalink / raw
To: gentoo-commits
commit: a77b78a3b56cd37b25fc3d864aa1f6ebbe0c7a8a
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 7 17:22:37 2016 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Dec 7 19:31:39 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a77b78a3
www-servers/ocsigenserver: remove old
Package-Manager: portage-2.3.3
www-servers/ocsigenserver/Manifest | 1 -
www-servers/ocsigenserver/files/tyxml.patch | 104 ---------------------
.../ocsigenserver/ocsigenserver-2.7-r1.ebuild | 89 ------------------
3 files changed, 194 deletions(-)
diff --git a/www-servers/ocsigenserver/Manifest b/www-servers/ocsigenserver/Manifest
index 029b681..61447e4 100644
--- a/www-servers/ocsigenserver/Manifest
+++ b/www-servers/ocsigenserver/Manifest
@@ -1,2 +1 @@
-DIST ocsigenserver-2.7.tar.gz 1262049 SHA256 01a477b180588fe0ac553177e84832448e02405bc73e432024e7a7ae21b3693f SHA512 e31fa428e1d86232e4066a93fc948b592e80bb3e8374efee4f40d02c53e8a713ade8aa9904623c1129c892557ac4a451928278b808abe190bb254e6e43aab256 WHIRLPOOL 1b55034d364da40b4bb0931b15da1a1c4c47f9133f1fd6099bfad57e6a43e5ce990a1a08295c740883b82f951cf3db9ad34ea1f70a818bd8296a678dc6b9b097
DIST ocsigenserver-2.8.tar.gz 1265240 SHA256 5e9766089c23397a9af60642d80f6d9a2be722fe9f426f230ef1b41ec5c684ec SHA512 80d5125a93239c73756b03a0f50d83e691810f93a15525daef2f7ccd69279e348f03486c26319a9511c1a746f375317082a89ba37ce0ba22872d6db7d3fddf1b WHIRLPOOL d56d62e7effc94e5e5477e7b2d8de0733a74348a10f14473e47314d4fdcdce0f4ff47458e4a817e43de4269b72a6bd1171a4eb1570d7ef4c7e86a8c02e7afe1d
diff --git a/www-servers/ocsigenserver/files/tyxml.patch b/www-servers/ocsigenserver/files/tyxml.patch
deleted file mode 100644
index f9aff48..00000000
--- a/www-servers/ocsigenserver/files/tyxml.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-commit 556a155376669aba34f1e93a88a9b308107af8be
-Author: Vasilis Papavasileiou <git@vasilis.airpost.net>
-Date: Mon Apr 11 12:31:21 2016 +0000
-
- Catch up with Tyxml
-
- - Html5.M -> Tyxml.Html
- - Bump-up dependency constraint
-
-diff --git a/.jenkins.sh b/.jenkins.sh
-index 0865cba..1c40a09 100644
---- a/.jenkins.sh
-+++ b/.jenkins.sh
-@@ -1,5 +1,6 @@
- opam pin add --no-action ocsigenserver .
- opam install camlzip
-+opam pin add tyxml --dev-repo
- opam install --deps-only ocsigenserver
- opam install --verbose ocsigenserver
-
-diff --git a/opam b/opam
-index 9537632..82b1860 100644
---- a/opam
-+++ b/opam
-@@ -27,7 +27,7 @@ depends: [
- "ocamlnet" {>= "4.0.2"}
- "pcre"
- "cryptokit"
-- "tyxml" {>= "3.4.0"}
-+ "tyxml" {> "3.6.0"}
- ("dbm" | "sqlite3")
- "ipaddr" {>= "2.1"}
- "camlp4"
-diff --git a/src/http/ocsigen_senders.ml b/src/http/ocsigen_senders.ml
-index 708b6a8..bf7c30c 100644
---- a/src/http/ocsigen_senders.ml
-+++ b/src/http/ocsigen_senders.ml
-@@ -77,7 +77,7 @@ module Make_XML_Content(Xml : Xml_sigs.Iterable)
- ~stream:(x, None) ())
- end
-
--module Html5_content = Make_XML_Content(Xml)(Html5.M)
-+module Html_content = Make_XML_Content(Tyxml.Xml)(Tyxml.Html)
-
-
- (*****************************************************************************)
-@@ -473,11 +473,11 @@ struct
- let get_etag ?options c = None
-
- let error_page s msg c =
-- Html5.M.html
-- (Html5.M.head (Html5.M.title (Html5.M.pcdata s)) [])
-- (Html5.M.body
-- (Html5.M.h1 [Html5.M.pcdata msg]::
-- Html5.M.p [Html5.M.pcdata s]::
-+ Tyxml.Html.html
-+ (Tyxml.Html.head (Tyxml.Html.title (Tyxml.Html.pcdata s)) [])
-+ (Tyxml.Html.body
-+ (Tyxml.Html.h1 [Tyxml.Html.pcdata msg]::
-+ Tyxml.Html.p [Tyxml.Html.pcdata s]::
- c)
- )
-
-@@ -512,11 +512,11 @@ struct
- error_page
- ("Error "^str_code)
- error_msg
-- [Html5.M.p
-- [Html5.M.pcdata (Printexc.to_string exn);
-- Html5.M.br ();
-- Html5.M.em
-- [Html5.M.pcdata "(Ocsigen running in debug mode)"]
-+ [Tyxml.Html.p
-+ [Tyxml.Html.pcdata (Printexc.to_string exn);
-+ Tyxml.Html.br ();
-+ Tyxml.Html.em
-+ [Tyxml.Html.pcdata "(Ocsigen running in debug mode)"]
- ]]
- | _ ->
- error_page
-@@ -524,7 +524,7 @@ struct
- error_msg
- []
- in
-- Html5_content.result_of_content err_page >>= fun r ->
-+ Html_content.result_of_content err_page >>= fun r ->
- Lwt.return
- (Result.update r
- ~cookies:cookies_to_set
-diff --git a/src/http/ocsigen_senders.mli b/src/http/ocsigen_senders.mli
-index b6d956f..54364b0 100644
---- a/src/http/ocsigen_senders.mli
-+++ b/src/http/ocsigen_senders.mli
-@@ -23,8 +23,8 @@ module File_content : Ocsigen_http_frame.HTTP_CONTENT
- with type t =
- string * Ocsigen_charset_mime.charset_assoc * Ocsigen_charset_mime.mime_assoc
-
--module Html5_content :
-- Ocsigen_http_frame.HTTP_CONTENT with type t = Html5.M.doc
-+module Html_content :
-+ Ocsigen_http_frame.HTTP_CONTENT with type t = Tyxml.Html.doc
-
- module Make_XML_Content(Xml : Xml_sigs.Iterable)
- (Typed_xml : Xml_sigs.Typed_xml with module Xml := Xml) :
diff --git a/www-servers/ocsigenserver/ocsigenserver-2.7-r1.ebuild b/www-servers/ocsigenserver/ocsigenserver-2.7-r1.ebuild
deleted file mode 100644
index 311e804..00000000
--- a/www-servers/ocsigenserver/ocsigenserver-2.7-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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:=[camlp4(+)]
- >=dev-lang/ocaml-3.12:=[ocamlopt?]
- dev-ml/ocaml-ipaddr:=
- dbm? ( dev-ml/camldbm:= )
- sqlite? ( dev-ml/ocaml-sqlite3:= )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- enewgroup ocsigenserver
- enewuser ocsigenserver -1 -1 /var/www ocsigenserver
-}
-
-src_prepare() {
- has_version '>=dev-ml/tyxml-4' && epatch "${FILESDIR}/tyxml.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.md
-
- # We create it at runtime
- rm -f "${ED}/var/run/ocsigenserver_command" || die
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-12-07 19:33 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-21 14:21 [gentoo-commits] repo/gentoo:master commit in: www-servers/ocsigenserver/files/, www-servers/ocsigenserver/ Alexis Ballier
-- strict thread matches above, loose matches on Subject: below --
2016-12-07 19:33 Alexis Ballier
2016-06-21 14:21 Alexis Ballier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox