* [gentoo-commits] repo/gentoo:master commit in: dev-ml/ocaml-dns/, dev-ml/ocaml-dns/files/
@ 2017-04-12 19:20 Alexis Ballier
0 siblings, 0 replies; 4+ messages in thread
From: Alexis Ballier @ 2017-04-12 19:20 UTC (permalink / raw
To: gentoo-commits
commit: 0d1a0a850438d8304669a1831c1423824e9aba03
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 12 18:27:36 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=0d1a0a85
dev-ml/ocaml-dns: Fix build with lwt3
Package-Manager: Portage-2.3.5, Repoman-2.3.2
dev-ml/ocaml-dns/files/lwt3.patch | 18 ++++++++++++++++++
dev-ml/ocaml-dns/ocaml-dns-0.20.0.ebuild | 8 ++++++--
2 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/dev-ml/ocaml-dns/files/lwt3.patch b/dev-ml/ocaml-dns/files/lwt3.patch
new file mode 100644
index 00000000000..a158d8f7559
--- /dev/null
+++ b/dev-ml/ocaml-dns/files/lwt3.patch
@@ -0,0 +1,18 @@
+Index: ocaml-dns-0.20.0/lwt/dns_server_unix.ml
+===================================================================
+--- ocaml-dns-0.20.0.orig/lwt/dns_server_unix.ml
++++ ocaml-dns-0.20.0/lwt/dns_server_unix.ml
+@@ -31,10 +31,10 @@ let bind_fd ~address ~port =
+ let err = sp "cannot resolve %s: %s" address (Printexc.to_string exn) in
+ Lwt.fail (Failure err))
+ in
+- src >|= fun src ->
++ src >>= fun src ->
+ let fd = Lwt_unix.(socket PF_INET SOCK_DGRAM 0) in
+- let () = Lwt_unix.bind fd src in
+- (fd, src)
++ Lwt_unix.bind fd src >>= fun () ->
++ Lwt.return (fd, src)
+
+ let eventual_process_of_zonefiles zonefiles =
+ Lwt_list.map_s (fun zonefile ->
diff --git a/dev-ml/ocaml-dns/ocaml-dns-0.20.0.ebuild b/dev-ml/ocaml-dns/ocaml-dns-0.20.0.ebuild
index ccfefee54eb..7f438c62e28 100644
--- a/dev-ml/ocaml-dns/ocaml-dns-0.20.0.ebuild
+++ b/dev-ml/ocaml-dns/ocaml-dns-0.20.0.ebuild
@@ -3,7 +3,7 @@
EAPI=5
-inherit findlib
+inherit findlib eutils
DESCRIPTION="A pure OCaml implementation of the DNS protocol"
HOMEPAGE="https://github.com/mirage/ocaml-dns https://mirage.io"
@@ -16,7 +16,7 @@ IUSE="async +lwt +ocamlopt test"
RDEPEND="
async? ( dev-ml/async:= )
- lwt? ( >=dev-ml/lwt-2.4.7:=
+ lwt? ( >=dev-ml/lwt-3:=
dev-ml/ocaml-cstruct:=[lwt(-)] )
>=dev-lang/ocaml-4:=
dev-ml/cmdliner:=
@@ -43,6 +43,10 @@ DEPEND="
# Missing mirage deps
RESTRICT="test"
+src_prepare() {
+ epatch "${FILESDIR}/lwt3.patch"
+}
+
src_compile() {
ocaml pkg/pkg.ml build \
--tests $(usex test true false) \
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ml/ocaml-dns/, dev-ml/ocaml-dns/files/
@ 2017-06-03 15:13 Alexis Ballier
0 siblings, 0 replies; 4+ messages in thread
From: Alexis Ballier @ 2017-06-03 15:13 UTC (permalink / raw
To: gentoo-commits
commit: f0aefa837e2e397bc4678723122de1a27b01a02d
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 2 12:23:57 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sat Jun 3 15:13:26 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0aefa83
dev-ml/ocaml-dns: backport upstream patch to build with latest ocaml-uri
Package-Manager: Portage-2.3.6, Repoman-2.3.2
dev-ml/ocaml-dns/files/uri.patch | 21 +++++++++++++++++++++
dev-ml/ocaml-dns/ocaml-dns-0.20.1.ebuild | 5 +++++
2 files changed, 26 insertions(+)
diff --git a/dev-ml/ocaml-dns/files/uri.patch b/dev-ml/ocaml-dns/files/uri.patch
new file mode 100644
index 00000000000..09e50cfc5ea
--- /dev/null
+++ b/dev-ml/ocaml-dns/files/uri.patch
@@ -0,0 +1,21 @@
+commit 152097361dbe987af5de4efde78ed28c720900a8
+Author: Anil Madhavapeddy <anil@recoil.org>
+Date: Tue May 30 20:45:06 2017 +0100
+
+ zone_parser: explictly depend on uri.services
+
+ This seems to have been pulled in implicitly before, but breaks
+ when compiled with jbuilder
+
+diff --git a/_tags b/_tags
+index b38be12..bb5d5c0 100644
+--- a/_tags
++++ b/_tags
+@@ -9,6 +9,7 @@ true : package(re re.str ipaddr uri base64 hashcons cstruct result)
+ "lwt": include
+ <lwt/*.{ml,mli}>: package(lwt mirage-profile)
+ <lwt/dig_unix.*>: package(cmdliner lwt.unix uri.services ipaddr.unix lwt)
++<lib/zone_parser.*>: package(uri.services)
+ <mirage/*.{ml,mli}>: package(lwt duration mirage-time-lwt)
+ <mirage/*.{ml,mli}>: package(mirage-stack-lwt mirage-kv-lwt)
+
diff --git a/dev-ml/ocaml-dns/ocaml-dns-0.20.1.ebuild b/dev-ml/ocaml-dns/ocaml-dns-0.20.1.ebuild
index 9e32c2f31ec..af628a82870 100644
--- a/dev-ml/ocaml-dns/ocaml-dns-0.20.1.ebuild
+++ b/dev-ml/ocaml-dns/ocaml-dns-0.20.1.ebuild
@@ -43,6 +43,11 @@ DEPEND="
# Missing mirage deps
RESTRICT="test"
+src_prepare() {
+ epatch "${FILESDIR}/uri.patch"
+ default
+}
+
src_compile() {
ocaml pkg/pkg.ml build \
--tests $(usex test true false) \
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ml/ocaml-dns/, dev-ml/ocaml-dns/files/
@ 2017-06-03 15:13 Alexis Ballier
0 siblings, 0 replies; 4+ messages in thread
From: Alexis Ballier @ 2017-06-03 15:13 UTC (permalink / raw
To: gentoo-commits
commit: 54609b55ffd87b3ac3d0f8647b260b1585afa272
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 2 12:21:16 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sat Jun 3 15:13:26 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54609b55
dev-ml/ocaml-dns: remove old
Package-Manager: Portage-2.3.6, Repoman-2.3.2
dev-ml/ocaml-dns/Manifest | 1 -
dev-ml/ocaml-dns/files/lwt3.patch | 18 ---------
dev-ml/ocaml-dns/ocaml-dns-0.20.0.ebuild | 65 --------------------------------
3 files changed, 84 deletions(-)
diff --git a/dev-ml/ocaml-dns/Manifest b/dev-ml/ocaml-dns/Manifest
index 6d074d8b18c..2d4bbf0e0e7 100644
--- a/dev-ml/ocaml-dns/Manifest
+++ b/dev-ml/ocaml-dns/Manifest
@@ -1,2 +1 @@
-DIST ocaml-dns-0.20.0.tar.gz 98660 SHA256 27f83f6ef242df944b8b272eedbad736daa649f3b4efc77abf142ef3a7008e26 SHA512 fbf6bfd580e025454f08dfdfa38c2e2d4a1d6ba35941988ca22fad80c61a58f1124693daabb5b643b12c54aba5a445282ca79c460e9411341dbbccbf6cdb32dc WHIRLPOOL 56784fc226ced8a88807810602000d5956eba39276a2a69b05850ff97d6a624890ec8906b32eaacaaca6a80f784f04ff4947aa4a72a50f707a14e1f9500f4315
DIST ocaml-dns-0.20.1.tar.gz 98673 SHA256 fb28e5e0e4d38ca52b13504f2e2c077f1257c589904f72c1d8bf52e5d7696599 SHA512 646d2620f718911021d3c42aa8bed0f78d20a565f6075cd6acba57ff41fd30e81446e4ebb80b25e9670124f9eda1314286207b1d3d92b335319d333c6728e7fb WHIRLPOOL b9d448bb14b7e284af319b2364b276c807b3bf8af96997b43337b4b0f450966ba95a1614baeec34fc2f91bc2d80e8ff0320af2947e45d9e0f3527f724aad8ce2
diff --git a/dev-ml/ocaml-dns/files/lwt3.patch b/dev-ml/ocaml-dns/files/lwt3.patch
deleted file mode 100644
index a158d8f7559..00000000000
--- a/dev-ml/ocaml-dns/files/lwt3.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: ocaml-dns-0.20.0/lwt/dns_server_unix.ml
-===================================================================
---- ocaml-dns-0.20.0.orig/lwt/dns_server_unix.ml
-+++ ocaml-dns-0.20.0/lwt/dns_server_unix.ml
-@@ -31,10 +31,10 @@ let bind_fd ~address ~port =
- let err = sp "cannot resolve %s: %s" address (Printexc.to_string exn) in
- Lwt.fail (Failure err))
- in
-- src >|= fun src ->
-+ src >>= fun src ->
- let fd = Lwt_unix.(socket PF_INET SOCK_DGRAM 0) in
-- let () = Lwt_unix.bind fd src in
-- (fd, src)
-+ Lwt_unix.bind fd src >>= fun () ->
-+ Lwt.return (fd, src)
-
- let eventual_process_of_zonefiles zonefiles =
- Lwt_list.map_s (fun zonefile ->
diff --git a/dev-ml/ocaml-dns/ocaml-dns-0.20.0.ebuild b/dev-ml/ocaml-dns/ocaml-dns-0.20.0.ebuild
deleted file mode 100644
index 7f438c62e28..00000000000
--- a/dev-ml/ocaml-dns/ocaml-dns-0.20.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib eutils
-
-DESCRIPTION="A pure OCaml implementation of the DNS protocol"
-HOMEPAGE="https://github.com/mirage/ocaml-dns https://mirage.io"
-SRC_URI="https://github.com/mirage/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2 LGPL-2.1-with-linking-exception ISC"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="async +lwt +ocamlopt test"
-
-RDEPEND="
- async? ( dev-ml/async:= )
- lwt? ( >=dev-ml/lwt-3:=
- dev-ml/ocaml-cstruct:=[lwt(-)] )
- >=dev-lang/ocaml-4:=
- dev-ml/cmdliner:=
- dev-ml/mirage-profile:=
- >=dev-ml/ocaml-base64-2.0.0:=
- >=dev-ml/ocaml-cstruct-1.9.0:=
- >=dev-ml/ocaml-ipaddr-2.6.0:=
- dev-ml/ocaml-re:=
- >=dev-ml/ocaml-uri-1.7.0:=
- dev-ml/ocaml-hashcons:=[ocamlopt?]
- dev-lang/ocaml:=[ocamlopt?]
- !<dev-ml/mirage-types-1.2.0
- !dev-ml/odns
-"
-DEPEND="
- test? (
- dev-ml/ounit
- dev-ml/ocaml-pcap
- )
- dev-ml/topkg
- dev-ml/ppx_tools
- ${RDEPEND}
-"
-# Missing mirage deps
-RESTRICT="test"
-
-src_prepare() {
- epatch "${FILESDIR}/lwt3.patch"
-}
-
-src_compile() {
- ocaml pkg/pkg.ml build \
- --tests $(usex test true false) \
- --with-lwt $(usex lwt true false) \
- --with-async $(usex async true false) \
- || die
-}
-
-src_install() {
- opam-installer -i \
- --prefix="${ED}/usr" \
- --libdir="${D}/$(ocamlc -where)" \
- --docdir="${ED}/usr/share/doc/${PF}" \
- dns.install || die
- dodoc CHANGES.md README.md TODO.md
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ml/ocaml-dns/, dev-ml/ocaml-dns/files/
@ 2017-06-05 13:02 Alexis Ballier
0 siblings, 0 replies; 4+ messages in thread
From: Alexis Ballier @ 2017-06-05 13:02 UTC (permalink / raw
To: gentoo-commits
commit: 7b88bb7faa2783b05fbd2fc29875066fbf0fa9cf
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 4 07:58:23 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Mon Jun 5 13:02:43 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b88bb7f
dev-ml/ocaml-dns: fix build with latest ocaml-ipaddr
Package-Manager: Portage-2.3.6, Repoman-2.3.2
dev-ml/ocaml-dns/files/ipaddr.patch | 12 ++++++++++++
dev-ml/ocaml-dns/ocaml-dns-0.20.1.ebuild | 2 +-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/dev-ml/ocaml-dns/files/ipaddr.patch b/dev-ml/ocaml-dns/files/ipaddr.patch
new file mode 100644
index 00000000000..9cddbae8351
--- /dev/null
+++ b/dev-ml/ocaml-dns/files/ipaddr.patch
@@ -0,0 +1,12 @@
+Index: ocaml-dns-0.20.1/_tags
+===================================================================
+--- ocaml-dns-0.20.1.orig/_tags
++++ ocaml-dns-0.20.1/_tags
+@@ -9,6 +9,7 @@ true : package(re re.str ipaddr uri base
+ "lwt": include
+ <lwt/*.{ml,mli}>: package(lwt mirage-profile)
+ <lwt/dig_unix.*>: package(cmdliner lwt.unix uri.services ipaddr.unix lwt)
++<lwt/dns_*_unix.*>: package(ipaddr.unix)
+ <lib/zone_parser.*>: package(uri.services)
+ <mirage/*.{ml,mli}>: package(lwt duration mirage-time-lwt)
+ <mirage/*.{ml,mli}>: package(mirage-stack-lwt mirage-kv-lwt)
diff --git a/dev-ml/ocaml-dns/ocaml-dns-0.20.1.ebuild b/dev-ml/ocaml-dns/ocaml-dns-0.20.1.ebuild
index af628a82870..b1fe4781774 100644
--- a/dev-ml/ocaml-dns/ocaml-dns-0.20.1.ebuild
+++ b/dev-ml/ocaml-dns/ocaml-dns-0.20.1.ebuild
@@ -44,7 +44,7 @@ DEPEND="
RESTRICT="test"
src_prepare() {
- epatch "${FILESDIR}/uri.patch"
+ epatch "${FILESDIR}/uri.patch" "${FILESDIR}/ipaddr.patch"
default
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-06-05 13:02 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-06-05 13:02 [gentoo-commits] repo/gentoo:master commit in: dev-ml/ocaml-dns/, dev-ml/ocaml-dns/files/ Alexis Ballier
-- strict thread matches above, loose matches on Subject: below --
2017-06-03 15:13 Alexis Ballier
2017-06-03 15:13 Alexis Ballier
2017-04-12 19:20 Alexis Ballier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox