From 053c3730bc66ddac70d3d3e3a21f8eb4a4312f74 Mon Sep 17 00:00:00 2001
From: Alexis Ballier <aballier@gentoo.org>
Date: Tue, 15 Aug 2017 11:46:52 +0200
Subject: 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-r1.ebuild | 30 ++++++++++++++++++++++++++++++
 dev-ml/core/core-0.9.1.ebuild    | 36 ------------------------------------
 dev-ml/core/files/glibc225.patch | 12 ++++++++++++
 3 files changed, 42 insertions(+), 36 deletions(-)
 create mode 100644 dev-ml/core/core-0.9.1-r1.ebuild
 delete mode 100644 dev-ml/core/core-0.9.1.ebuild
 create mode 100644 dev-ml/core/files/glibc225.patch

(limited to 'dev-ml/core')

diff --git a/dev-ml/core/core-0.9.1-r1.ebuild b/dev-ml/core/core-0.9.1-r1.ebuild
new file mode 100644
index 000000000000..45cc74eb4553
--- /dev/null
+++ b/dev-ml/core/core-0.9.1-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	dev-ml/base:=
+	dev-ml/configurator:=
+	dev-ml/core_kernel:=
+	dev-ml/ppx_assert:=
+	dev-ml/ppx_driver:=
+	dev-ml/ppx_jane:=
+	dev-ml/sexplib:=
+	dev-ml/spawn:=
+	dev-ml/stdio:=
+	dev-ml/ocaml-migrate-parsetree:=
+"
+DEPEND="${RDEPEND} dev-ml/jbuilder"
+PATCHES=( "${FILESDIR}/glibc225.patch" )
diff --git a/dev-ml/core/core-0.9.1.ebuild b/dev-ml/core/core-0.9.1.ebuild
deleted file mode 100644
index 64835cb4c69c..000000000000
--- a/dev-ml/core/core-0.9.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	dev-lang/ocaml:=
-	dev-ml/base:=
-	dev-ml/configurator:=
-	dev-ml/core_kernel:=
-	dev-ml/ppx_assert:=
-	dev-ml/ppx_driver:=
-	dev-ml/ppx_jane:=
-	dev-ml/sexplib:=
-	dev-ml/spawn:=
-	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
-}
diff --git a/dev-ml/core/files/glibc225.patch b/dev-ml/core/files/glibc225.patch
new file mode 100644
index 000000000000..1dd96c8b7b4b
--- /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
-- 
cgit v1.2.3-65-gdbad