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

[Alexis Ballier]

commit:     053c3730bc66ddac70d3d3e3a21f8eb4a4312f74
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 15 09:46:52 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Aug 15 09:49:15 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=053c3730

dev-ml/core: convert to opam.eclass and add fix for glibc 2.25

Package-Manager: Portage-2.3.7, Repoman-2.3.3

 dev-ml/core/{core-0.9.1.ebuild => core-0.9.1-r1.ebuild} | 14 ++++----------
 dev-ml/core/files/glibc225.patch                        | 12 ++++++++++++
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/dev-ml/core/core-0.9.1.ebuild b/dev-ml/core/core-0.9.1-r1.ebuild
similarity index 71%
rename from dev-ml/core/core-0.9.1.ebuild
rename to dev-ml/core/core-0.9.1-r1.ebuild
index 64835cb4c69..45cc74eb455 100644
--- a/dev-ml/core/core-0.9.1.ebuild
+++ b/dev-ml/core/core-0.9.1-r1.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=6
 
+inherit opam
+
 DESCRIPTION="Jane Street's alternative to the standard library"
 HOMEPAGE="https://github.com/janestreet/core";
 SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
@@ -13,7 +15,6 @@ KEYWORDS="~amd64"
 IUSE=""
 
 RDEPEND="
-       dev-lang/ocaml:=
        dev-ml/base:=
        dev-ml/configurator:=
        dev-ml/core_kernel:=
@@ -25,12 +26,5 @@ RDEPEND="
        dev-ml/stdio:=
        dev-ml/ocaml-migrate-parsetree:=
 "
-DEPEND="${RDEPEND} dev-ml/opam dev-ml/jbuilder"
-
-src_install() {
-       opam-installer -i \
-               --prefix="${ED}/usr" \
-               --libdir="${D}/$(ocamlc -where)" \
-               --docdir="${ED}/usr/share/doc/${PF}" \
-               ${PN}.install || die
-}
+DEPEND="${RDEPEND} dev-ml/jbuilder"
+PATCHES=( "${FILESDIR}/glibc225.patch" )

diff --git a/dev-ml/core/files/glibc225.patch b/dev-ml/core/files/glibc225.patch
new file mode 100644
index 00000000000..1dd96c8b7b4
--- /dev/null
+++ b/dev-ml/core/files/glibc225.patch
@@ -0,0 +1,12 @@
+Index: core-0.9.1/src/unix_stubs.c
+===================================================================
+--- core-0.9.1.orig/src/unix_stubs.c
++++ core-0.9.1/src/unix_stubs.c
+@@ -40,6 +40,7 @@
+ #include <arpa/inet.h>
+ #include <netdb.h>
+ #include <ifaddrs.h>
++#include <sys/sysmacros.h>
+ 
+ #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+ #define stat64 stat