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

Package-Manager: Portage-2.3.5, Repoman-2.3.2

diff --git a/dev-ml/opam/files/stublibs.patch b/dev-ml/opam/files/stublibs.patch
new file mode 100644 (file)
index 0000000..3cb6188
--- /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 7a59ae2c792bb3f1a96ba7c4d0b89ffb2ed9c1c5..8dcc9ac786d5d72e8f90690c5baa2f2b8d984d35 100644 (file)
--- 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