diff options
| -rw-r--r-- | www-servers/ocsigenserver/Manifest | 1 | ||||
| -rw-r--r-- | www-servers/ocsigenserver/files/tyxml.patch | 104 | ||||
| -rw-r--r-- | www-servers/ocsigenserver/ocsigenserver-2.7-r1.ebuild | 89 |
3 files changed, 0 insertions, 194 deletions
diff --git a/www-servers/ocsigenserver/Manifest b/www-servers/ocsigenserver/Manifest index 029b681406ab..61447e432df7 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 f9aff48750af..000000000000 --- 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 311e804d25c9..000000000000 --- 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 -} |