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

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

[Alexis Ballier]

commit:     356e2bc4843d9389a662566f39d056b4a7edcc18
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  6 13:09:26 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Oct  6 13:11:15 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=356e2bc4

dev-ml/ocaml-dns: Remove old

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 dev-ml/ocaml-dns/Manifest                |  1 -
 dev-ml/ocaml-dns/files/ipaddr.patch      | 12 ------
 dev-ml/ocaml-dns/files/uri.patch         | 21 ----------
 dev-ml/ocaml-dns/metadata.xml            |  4 --
 dev-ml/ocaml-dns/ocaml-dns-0.20.1.ebuild | 66 --------------------------------
 5 files changed, 104 deletions(-)

diff --git a/dev-ml/ocaml-dns/Manifest b/dev-ml/ocaml-dns/Manifest
index e51eedd1be0..467ed0a3eec 100644
--- a/dev-ml/ocaml-dns/Manifest
+++ b/dev-ml/ocaml-dns/Manifest
@@ -1,2 +1 @@
-DIST ocaml-dns-0.20.1.tar.gz 98673 SHA256 fb28e5e0e4d38ca52b13504f2e2c077f1257c589904f72c1d8bf52e5d7696599 SHA512 646d2620f718911021d3c42aa8bed0f78d20a565f6075cd6acba57ff41fd30e81446e4ebb80b25e9670124f9eda1314286207b1d3d92b335319d333c6728e7fb WHIRLPOOL b9d448bb14b7e284af319b2364b276c807b3bf8af96997b43337b4b0f450966ba95a1614baeec34fc2f91bc2d80e8ff0320af2947e45d9e0f3527f724aad8ce2
 DIST ocaml-dns-1.0.0.tar.gz 99161 SHA256 823410badaf2faf54ca8a59472b0ad82c4db9fe4ef92f6809061baa826851226 SHA512 199653605e985851dcaafc94f1efeba5c261c29cd5e5f8eaebc9f7d25a05c43adcf7620efb291b22f9549f7c05f8ac3f6abfbcf40e0d7762bd2f7cd623ebcb1c WHIRLPOOL e7c26857270d92be2e8e068ac29119ef5d82d52fd739b8304e84c595d6a6e7fc11c22ed98e4a6d99a20f4e9d1d6b28dbc76c333d6b464bbd1dc4d37597cfe66c

diff --git a/dev-ml/ocaml-dns/files/ipaddr.patch b/dev-ml/ocaml-dns/files/ipaddr.patch
deleted file mode 100644
index 9cddbae8351..00000000000
--- a/dev-ml/ocaml-dns/files/ipaddr.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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/files/uri.patch b/dev-ml/ocaml-dns/files/uri.patch
deleted file mode 100644
index 09e50cfc5ea..00000000000
--- a/dev-ml/ocaml-dns/files/uri.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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/metadata.xml b/dev-ml/ocaml-dns/metadata.xml
index 766dc08a812..2f4ef14adaa 100644
--- a/dev-ml/ocaml-dns/metadata.xml
+++ b/dev-ml/ocaml-dns/metadata.xml
@@ -5,10 +5,6 @@
         <email>ml@gentoo.org</email>
         <name>Gentoo ML Project</name>
     </maintainer>
-   <use>
-        <flag name="async">support for asynchronous execution</flag>
-        <flag name="lwt">enable threads via lwt</flag>
-    </use>
     <upstream>
         <remote-id type="github">mirage/ocaml-dns</remote-id>
     </upstream>

diff --git a/dev-ml/ocaml-dns/ocaml-dns-0.20.1.ebuild b/dev-ml/ocaml-dns/ocaml-dns-0.20.1.ebuild
deleted file mode 100644
index b1fe4781774..00000000000
--- a/dev-ml/ocaml-dns/ocaml-dns-0.20.1.ebuild
+++ /dev/null
@@ -1,66 +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/${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}/uri.patch" "${FILESDIR}/ipaddr.patch"
-	default
-}
-
-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
-}