| 1 |
commit: a177ca08f459b9deeb3ff3c4c112821017083439 |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jan 4 11:38:26 2017 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jan 4 11:58:30 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a177ca08 |
| 7 |
|
| 8 |
dev-ml/ocsigen-start: add missing dep on ocaml-imagemagick and drop now useless patch |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 11 |
|
| 12 |
dev-ml/ocsigen-start/files/magick.patch | 13 ------------- |
| 13 |
dev-ml/ocsigen-start/ocsigen-start-0.99.ebuild | 9 +++------ |
| 14 |
dev-ml/ocsigen-start/ocsigen-start-9999.ebuild | 9 +++------ |
| 15 |
3 files changed, 6 insertions(+), 25 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-ml/ocsigen-start/files/magick.patch b/dev-ml/ocsigen-start/files/magick.patch |
| 18 |
deleted file mode 100644 |
| 19 |
index ee4f068..00000000 |
| 20 |
--- a/dev-ml/ocsigen-start/files/magick.patch |
| 21 |
+++ /dev/null |
| 22 |
@@ -1,13 +0,0 @@ |
| 23 |
-Index: ocsigen-start-9999/Makefile.options |
| 24 |
-=================================================================== |
| 25 |
---- ocsigen-start-9999.orig/Makefile.options |
| 26 |
-+++ ocsigen-start-9999/Makefile.options |
| 27 |
-@@ -39,7 +39,7 @@ TEMPLATE_NAME := os.pgocaml |
| 28 |
- |
| 29 |
- # OCamlfind packages for the server |
| 30 |
- SERVER_PACKAGES := lwt.ppx js_of_ocaml.deriving.ppx calendar safepass \ |
| 31 |
-- ocsigen-toolkit.server magick yojson |
| 32 |
-+ ocsigen-toolkit.server libMagick yojson |
| 33 |
- |
| 34 |
- SERVER_DB_PACKAGES := pgocaml pgocaml.syntax macaque.syntax calendar safepass |
| 35 |
- |
| 36 |
|
| 37 |
diff --git a/dev-ml/ocsigen-start/ocsigen-start-0.99.ebuild b/dev-ml/ocsigen-start/ocsigen-start-0.99.ebuild |
| 38 |
index 3439208..40c33e6 100644 |
| 39 |
--- a/dev-ml/ocsigen-start/ocsigen-start-0.99.ebuild |
| 40 |
+++ b/dev-ml/ocsigen-start/ocsigen-start-0.99.ebuild |
| 41 |
@@ -1,10 +1,10 @@ |
| 42 |
-# Copyright 1999-2016 Gentoo Foundation |
| 43 |
+# Copyright 1999-2017 Gentoo Foundation |
| 44 |
# Distributed under the terms of the GNU General Public License v2 |
| 45 |
# $Id$ |
| 46 |
|
| 47 |
EAPI=5 |
| 48 |
|
| 49 |
-inherit findlib eutils |
| 50 |
+inherit findlib |
| 51 |
|
| 52 |
DESCRIPTION="Eliom Base Application with users, (pre)registration, notifications, etc." |
| 53 |
HOMEPAGE="https://github.com/ocsigen/ocsigen-start" |
| 54 |
@@ -31,13 +31,10 @@ RDEPEND="dev-lang/ocaml:= |
| 55 |
dev-ml/ocsigen-toolkit:= |
| 56 |
dev-ml/ppx_deriving:= |
| 57 |
dev-ml/yojson:= |
| 58 |
+ dev-ml/OCaml-ImageMagick:= |
| 59 |
" |
| 60 |
DEPEND="${RDEPEND}" |
| 61 |
|
| 62 |
-src_prepare() { |
| 63 |
- epatch "${FILESDIR}/magick.patch" |
| 64 |
-} |
| 65 |
- |
| 66 |
src_install() { |
| 67 |
findlib_src_preinst |
| 68 |
DESTDIR="${ED}" OCAMLPATH="${OCAMLFIND_DESTDIR}" emake install |
| 69 |
|
| 70 |
diff --git a/dev-ml/ocsigen-start/ocsigen-start-9999.ebuild b/dev-ml/ocsigen-start/ocsigen-start-9999.ebuild |
| 71 |
index 3439208..40c33e6 100644 |
| 72 |
--- a/dev-ml/ocsigen-start/ocsigen-start-9999.ebuild |
| 73 |
+++ b/dev-ml/ocsigen-start/ocsigen-start-9999.ebuild |
| 74 |
@@ -1,10 +1,10 @@ |
| 75 |
-# Copyright 1999-2016 Gentoo Foundation |
| 76 |
+# Copyright 1999-2017 Gentoo Foundation |
| 77 |
# Distributed under the terms of the GNU General Public License v2 |
| 78 |
# $Id$ |
| 79 |
|
| 80 |
EAPI=5 |
| 81 |
|
| 82 |
-inherit findlib eutils |
| 83 |
+inherit findlib |
| 84 |
|
| 85 |
DESCRIPTION="Eliom Base Application with users, (pre)registration, notifications, etc." |
| 86 |
HOMEPAGE="https://github.com/ocsigen/ocsigen-start" |
| 87 |
@@ -31,13 +31,10 @@ RDEPEND="dev-lang/ocaml:= |
| 88 |
dev-ml/ocsigen-toolkit:= |
| 89 |
dev-ml/ppx_deriving:= |
| 90 |
dev-ml/yojson:= |
| 91 |
+ dev-ml/OCaml-ImageMagick:= |
| 92 |
" |
| 93 |
DEPEND="${RDEPEND}" |
| 94 |
|
| 95 |
-src_prepare() { |
| 96 |
- epatch "${FILESDIR}/magick.patch" |
| 97 |
-} |
| 98 |
- |
| 99 |
src_install() { |
| 100 |
findlib_src_preinst |
| 101 |
DESTDIR="${ED}" OCAMLPATH="${OCAMLFIND_DESTDIR}" emake install |
Archives