[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam/, dev-ml/opam/files/

[Alexis Ballier]

commit:     c5c302ab1aa05d71033e5a557114d0501d98372e
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 12 16:56:59 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Apr 12 19:20:25 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5c302ab

dev-ml/opam: Patch default stublibs to match manpage.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-ml/opam/files/stublibs.patch                        | 13 +++++++++++++
 dev-ml/opam/{opam-1.3.1.ebuild => opam-1.3.1-r1.ebuild} |  4 ++++
 2 files changed, 17 insertions(+)

diff --git a/dev-ml/opam/files/stublibs.patch b/dev-ml/opam/files/stublibs.patch
new file mode 100644
index 00000000000..3cb61883233
--- /dev/null
+++ b/dev-ml/opam/files/stublibs.patch
@@ -0,0 +1,13 @@
+Index: opam-1.3.1/src/tools/opam_installer.ml
+===================================================================
+--- opam-1.3.1.orig/src/tools/opam_installer.ml
++++ opam-1.3.1/src/tools/opam_installer.ml
+@@ -312,7 +312,7 @@ let options =
+     let mandir = mk_dir mandir in
+     let libdir = mk_dir libdir in
+     let stubsdir = match mk_dir stubsdir, libdir with
+-      | None, Some d -> Some OpamFilename.Op.(d / "stubslibs")
++      | None, Some d -> Some OpamFilename.Op.(d / "stublibs")
+       | d, None | (Some _ as d), _ -> d
+     in
+     let topdir = match mk_dir topdir, libdir with

diff --git a/dev-ml/opam/opam-1.3.1.ebuild b/dev-ml/opam/opam-1.3.1-r1.ebuild
similarity index 94%
rename from dev-ml/opam/opam-1.3.1.ebuild
rename to dev-ml/opam/opam-1.3.1-r1.ebuild
index 7a59ae2c792..8dcc9ac786d 100644
--- a/dev-ml/opam/opam-1.3.1.ebuild
+++ b/dev-ml/opam/opam-1.3.1-r1.ebuild
@@ -34,6 +34,10 @@ RDEPEND="${DEPEND}
 	dev-ml/findlib
 "
 
+src_prepare() {
+	epatch "${FILESDIR}/stublibs.patch"
+}
+
 src_compile() {
 	emake -j1
 	cd doc