* [gentoo-commits] repo/gentoo:master commit in: dev-ml/OCaml-ImageMagick/
@ 2016-09-06 9:47 Alexis Ballier
0 siblings, 0 replies; 4+ messages in thread
From: Alexis Ballier @ 2016-09-06 9:47 UTC (permalink / raw
To: gentoo-commits
commit: ee89471f247912349e2fc151e90d3534396f61e3
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 6 09:47:19 2016 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Sep 6 09:47:29 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee89471f
dev-ml/OCaml-ImageMagick: initial import; ebuild by me
Package-Manager: portage-2.3.0
dev-ml/OCaml-ImageMagick/Manifest | 1 +
.../OCaml-ImageMagick-0.34.ebuild | 25 ++++++++++++++++++++++
dev-ml/OCaml-ImageMagick/metadata.xml | 8 +++++++
3 files changed, 34 insertions(+)
diff --git a/dev-ml/OCaml-ImageMagick/Manifest b/dev-ml/OCaml-ImageMagick/Manifest
new file mode 100644
index 00000000..61f860f
--- /dev/null
+++ b/dev-ml/OCaml-ImageMagick/Manifest
@@ -0,0 +1 @@
+DIST OCaml-ImageMagick-0.34.tgz 64219 SHA256 7840f72b07d17756bdc12b1792e915ebc6197a2aab0a86baf0eba1dcb0a0c93e SHA512 cf1f979aed0aad1fb27dd6817adbc22c2f7c0d6d8c96a48d9532ce89c128b046ea7ac38ad96a5267a5920fccd0cd3631844e428e933143a405522ed5ebcbee39 WHIRLPOOL 2f861c9be8f587d7caf7181cef248e509ea8db10bcb6ff67b179d9dee1c0f53c1b61ae5b8b3122cc0fa279a8cc47478fdc570fb8ab05db6928f7ceaec54f8a44
diff --git a/dev-ml/OCaml-ImageMagick/OCaml-ImageMagick-0.34.ebuild b/dev-ml/OCaml-ImageMagick/OCaml-ImageMagick-0.34.ebuild
new file mode 100644
index 00000000..e93cb0e
--- /dev/null
+++ b/dev-ml/OCaml-ImageMagick/OCaml-ImageMagick-0.34.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Provide the ImageMagick methods to OCaml"
+HOMEPAGE="http://www.linux-nantes.org/~fmonnier/OCaml/ImageMagick/"
+SRC_URI="http://www.linux-nantes.org/~fmonnier/OCaml/ImageMagick/ImageMagick/${P}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+# interactive tests
+RESTRICT="test"
+
+DEPEND="media-gfx/imagemagick:=
+ dev-lang/ocaml:=[ocamlopt]"
+RDEPEND="${DEPEND}"
+
+src_install() {
+ emake OCAML_DIR="${D}/$(ocamlc -where)" install
+ dodoc README.txt
+}
diff --git a/dev-ml/OCaml-ImageMagick/metadata.xml b/dev-ml/OCaml-ImageMagick/metadata.xml
new file mode 100644
index 00000000..ffac4d7
--- /dev/null
+++ b/dev-ml/OCaml-ImageMagick/metadata.xml
@@ -0,0 +1,8 @@
+<?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>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ml/OCaml-ImageMagick/
@ 2017-01-04 11:58 Alexis Ballier
0 siblings, 0 replies; 4+ messages in thread
From: Alexis Ballier @ 2017-01-04 11:58 UTC (permalink / raw
To: gentoo-commits
commit: 5ccd993f781d4d7b439caf3503b0f9e257139b02
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 4 11:35:58 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=5ccd993f
dev-ml/OCaml-ImageMagick: Use find_install target for installing so that it gets installed under proper name.
Add proper subslot.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
...-ImageMagick-0.34.ebuild => OCaml-ImageMagick-0.34-r1.ebuild} | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/dev-ml/OCaml-ImageMagick/OCaml-ImageMagick-0.34.ebuild b/dev-ml/OCaml-ImageMagick/OCaml-ImageMagick-0.34-r1.ebuild
similarity index 81%
rename from dev-ml/OCaml-ImageMagick/OCaml-ImageMagick-0.34.ebuild
rename to dev-ml/OCaml-ImageMagick/OCaml-ImageMagick-0.34-r1.ebuild
index e93cb0e..59805bd 100644
--- a/dev-ml/OCaml-ImageMagick/OCaml-ImageMagick-0.34.ebuild
+++ b/dev-ml/OCaml-ImageMagick/OCaml-ImageMagick-0.34-r1.ebuild
@@ -1,15 +1,17 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
+inherit findlib
+
DESCRIPTION="Provide the ImageMagick methods to OCaml"
HOMEPAGE="http://www.linux-nantes.org/~fmonnier/OCaml/ImageMagick/"
SRC_URI="http://www.linux-nantes.org/~fmonnier/OCaml/ImageMagick/ImageMagick/${P}.tgz"
LICENSE="MIT"
-SLOT="0"
+SLOT="0/${PV}"
KEYWORDS="~amd64"
IUSE=""
# interactive tests
@@ -20,6 +22,7 @@ DEPEND="media-gfx/imagemagick:=
RDEPEND="${DEPEND}"
src_install() {
- emake OCAML_DIR="${D}/$(ocamlc -where)" install
+ findlib_src_preinst
+ emake find_install
dodoc README.txt
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ml/OCaml-ImageMagick/
@ 2017-03-28 22:18 Alexis Ballier
0 siblings, 0 replies; 4+ messages in thread
From: Alexis Ballier @ 2017-03-28 22:18 UTC (permalink / raw
To: gentoo-commits
commit: 6e71ae0d3076e9daf8d4ef721a76573e7ca6d6ca
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 27 16:21:11 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Mar 28 22:18:21 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e71ae0d
dev-ml/OCaml-ImageMagick: Honour CC
Package-Manager: Portage-2.3.5, Repoman-2.3.2
dev-ml/OCaml-ImageMagick/OCaml-ImageMagick-0.34-r1.ebuild | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/dev-ml/OCaml-ImageMagick/OCaml-ImageMagick-0.34-r1.ebuild b/dev-ml/OCaml-ImageMagick/OCaml-ImageMagick-0.34-r1.ebuild
index f33b2771db5..c52f9249f0d 100644
--- a/dev-ml/OCaml-ImageMagick/OCaml-ImageMagick-0.34-r1.ebuild
+++ b/dev-ml/OCaml-ImageMagick/OCaml-ImageMagick-0.34-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit findlib
+inherit findlib toolchain-funcs
DESCRIPTION="Provide the ImageMagick methods to OCaml"
HOMEPAGE="http://www.linux-nantes.org/~fmonnier/OCaml/ImageMagick/"
@@ -20,6 +20,10 @@ DEPEND="media-gfx/imagemagick:=
dev-lang/ocaml:=[ocamlopt]"
RDEPEND="${DEPEND}"
+src_configure() {
+ sed -e "s/gcc/$(tc-getCC)/" -i Makefile || die
+}
+
src_install() {
findlib_src_preinst
emake find_install
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ml/OCaml-ImageMagick/
@ 2017-06-25 14:42 Alexis Ballier
0 siblings, 0 replies; 4+ messages in thread
From: Alexis Ballier @ 2017-06-25 14:42 UTC (permalink / raw
To: gentoo-commits
commit: 5044ec43b601355520587f483adf5ea81e35b3c4
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 24 19:22:06 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sun Jun 25 14:42:40 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5044ec43
dev-ml/OCaml-ImageMagick: Fix build with image magick 7.
Package-Manager: Portage-2.3.6, Repoman-2.3.2
dev-ml/OCaml-ImageMagick/Manifest | 1 +
dev-ml/OCaml-ImageMagick/OCaml-ImageMagick-0.34-r1.ebuild | 15 +++++++++++----
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/dev-ml/OCaml-ImageMagick/Manifest b/dev-ml/OCaml-ImageMagick/Manifest
index 61f860f174e..fbc7c20d3a7 100644
--- a/dev-ml/OCaml-ImageMagick/Manifest
+++ b/dev-ml/OCaml-ImageMagick/Manifest
@@ -1 +1,2 @@
+DIST OCaml-ImageMagick-0.34-imagemagick7.patch.bz2 15950 SHA256 aec6a6bb1382a6c0513b14dcb93ddb923f52bb5a3d54139edd10e42a834d0793 SHA512 a5d1eb7baa001144cc618532b6446cae30974ee7f95455fb18de287731f1867ba767812a876510c0fc7944aa5259f4e60e9f68fa1364fac3a2dfb8f8c1f6a219 WHIRLPOOL 94147da60f7680bc3cd21c0a5290fe80c708dc3488db9ef7a0e7609a53a976ed94971e5a5c302fde592896d2e05e3c669c914925df53165b27e5ed39d68e13b0
DIST OCaml-ImageMagick-0.34.tgz 64219 SHA256 7840f72b07d17756bdc12b1792e915ebc6197a2aab0a86baf0eba1dcb0a0c93e SHA512 cf1f979aed0aad1fb27dd6817adbc22c2f7c0d6d8c96a48d9532ce89c128b046ea7ac38ad96a5267a5920fccd0cd3631844e428e933143a405522ed5ebcbee39 WHIRLPOOL 2f861c9be8f587d7caf7181cef248e509ea8db10bcb6ff67b179d9dee1c0f53c1b61ae5b8b3122cc0fa279a8cc47478fdc570fb8ab05db6928f7ceaec54f8a44
diff --git a/dev-ml/OCaml-ImageMagick/OCaml-ImageMagick-0.34-r1.ebuild b/dev-ml/OCaml-ImageMagick/OCaml-ImageMagick-0.34-r1.ebuild
index c52f9249f0d..e779844d33b 100644
--- a/dev-ml/OCaml-ImageMagick/OCaml-ImageMagick-0.34-r1.ebuild
+++ b/dev-ml/OCaml-ImageMagick/OCaml-ImageMagick-0.34-r1.ebuild
@@ -3,23 +3,30 @@
EAPI=6
-inherit findlib toolchain-funcs
+inherit findlib toolchain-funcs eutils
DESCRIPTION="Provide the ImageMagick methods to OCaml"
HOMEPAGE="http://www.linux-nantes.org/~fmonnier/OCaml/ImageMagick/"
-SRC_URI="http://www.linux-nantes.org/~fmonnier/OCaml/ImageMagick/ImageMagick/${P}.tgz"
+SRC_URI="http://www.linux-nantes.org/~fmonnier/OCaml/ImageMagick/ImageMagick/${P}.tgz
+ mirror://gentoo/${P}-imagemagick7.patch.bz2
+"
LICENSE="MIT"
-SLOT="0/${PV}"
+SLOT="0/7${PV}"
KEYWORDS="~amd64"
IUSE=""
# interactive tests
RESTRICT="test"
-DEPEND="media-gfx/imagemagick:=
+DEPEND=">=media-gfx/imagemagick-7:=
dev-lang/ocaml:=[ocamlopt]"
RDEPEND="${DEPEND}"
+src_prepare() {
+ epatch "${WORKDIR}/${P}-imagemagick7.patch"
+ default
+}
+
src_configure() {
sed -e "s/gcc/$(tc-getCC)/" -i Makefile || die
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-06-25 14:43 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-28 22:18 [gentoo-commits] repo/gentoo:master commit in: dev-ml/OCaml-ImageMagick/ Alexis Ballier
-- strict thread matches above, loose matches on Subject: below --
2017-06-25 14:42 Alexis Ballier
2017-01-04 11:58 Alexis Ballier
2016-09-06 9:47 Alexis Ballier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox