commit: a177ca08f459b9deeb3ff3c4c112821017083439 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> AuthorDate: Wed Jan 4 11:38:26 2017 +0000 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> CommitDate: Wed Jan 4 11:58:30 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a177ca08
dev-ml/ocsigen-start: add missing dep on ocaml-imagemagick and drop now useless patch Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-ml/ocsigen-start/files/magick.patch | 13 ------------- dev-ml/ocsigen-start/ocsigen-start-0.99.ebuild | 9 +++------ dev-ml/ocsigen-start/ocsigen-start-9999.ebuild | 9 +++------ 3 files changed, 6 insertions(+), 25 deletions(-) diff --git a/dev-ml/ocsigen-start/files/magick.patch b/dev-ml/ocsigen-start/files/magick.patch deleted file mode 100644 index ee4f068..00000000 --- a/dev-ml/ocsigen-start/files/magick.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: ocsigen-start-9999/Makefile.options -=================================================================== ---- ocsigen-start-9999.orig/Makefile.options -+++ ocsigen-start-9999/Makefile.options -@@ -39,7 +39,7 @@ TEMPLATE_NAME := os.pgocaml - - # OCamlfind packages for the server - SERVER_PACKAGES := lwt.ppx js_of_ocaml.deriving.ppx calendar safepass \ -- ocsigen-toolkit.server magick yojson -+ ocsigen-toolkit.server libMagick yojson - - SERVER_DB_PACKAGES := pgocaml pgocaml.syntax macaque.syntax calendar safepass - diff --git a/dev-ml/ocsigen-start/ocsigen-start-0.99.ebuild b/dev-ml/ocsigen-start/ocsigen-start-0.99.ebuild index 3439208..40c33e6 100644 --- a/dev-ml/ocsigen-start/ocsigen-start-0.99.ebuild +++ b/dev-ml/ocsigen-start/ocsigen-start-0.99.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -inherit findlib eutils +inherit findlib DESCRIPTION="Eliom Base Application with users, (pre)registration, notifications, etc." HOMEPAGE="https://github.com/ocsigen/ocsigen-start"; @@ -31,13 +31,10 @@ RDEPEND="dev-lang/ocaml:= dev-ml/ocsigen-toolkit:= dev-ml/ppx_deriving:= dev-ml/yojson:= + dev-ml/OCaml-ImageMagick:= " DEPEND="${RDEPEND}" -src_prepare() { - epatch "${FILESDIR}/magick.patch" -} - src_install() { findlib_src_preinst DESTDIR="${ED}" OCAMLPATH="${OCAMLFIND_DESTDIR}" emake install diff --git a/dev-ml/ocsigen-start/ocsigen-start-9999.ebuild b/dev-ml/ocsigen-start/ocsigen-start-9999.ebuild index 3439208..40c33e6 100644 --- a/dev-ml/ocsigen-start/ocsigen-start-9999.ebuild +++ b/dev-ml/ocsigen-start/ocsigen-start-9999.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -inherit findlib eutils +inherit findlib DESCRIPTION="Eliom Base Application with users, (pre)registration, notifications, etc." HOMEPAGE="https://github.com/ocsigen/ocsigen-start"; @@ -31,13 +31,10 @@ RDEPEND="dev-lang/ocaml:= dev-ml/ocsigen-toolkit:= dev-ml/ppx_deriving:= dev-ml/yojson:= + dev-ml/OCaml-ImageMagick:= " DEPEND="${RDEPEND}" -src_prepare() { - epatch "${FILESDIR}/magick.patch" -} - src_install() { findlib_src_preinst DESTDIR="${ED}" OCAMLPATH="${OCAMLFIND_DESTDIR}" emake install
