[gentoo-commits] repo/gentoo:master commit in: dev-ml/OCaml-ImageMagick/

[Alexis Ballier]

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
 }