commit: b1a6529fd18f74cc1301bf9c14d30e9f2f4729b0 Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> AuthorDate: Sat Apr 16 13:22:12 2022 +0000 Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> CommitDate: Sat Apr 16 16:20:06 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b1a6529f
dev-ml/uri: update HOMEPAGE Closes: https://bugs.gentoo.org/838790 Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com> dev-ml/uri/files/uri-4.2.0-ounit2.patch | 95 +++++++++++++++++++++++++++++++++ dev-ml/uri/uri-4.2.0.ebuild | 22 ++++---- 2 files changed, 107 insertions(+), 10 deletions(-) diff --git a/dev-ml/uri/files/uri-4.2.0-ounit2.patch b/dev-ml/uri/files/uri-4.2.0-ounit2.patch new file mode 100644 index 000000000..6703ce1d3 --- /dev/null +++ b/dev-ml/uri/files/uri-4.2.0-ounit2.patch @@ -0,0 +1,95 @@ +From 73e4b497b3afa6530fabb1d445d0d4285fa302b5 Mon Sep 17 00:00:00 2001 +From: Alessandro Barbieri <[email protected]> +Date: Sat, 16 Apr 2022 15:16:33 +0200 +Subject: [PATCH 1/4] use ounit2 + +--- + lib_test/dune | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib_test/dune b/lib_test/dune +index ba44355..f61938d 100644 +--- a/lib_test/dune ++++ b/lib_test/dune +@@ -2,10 +2,10 @@ + (name test_runner) + (package uri) + (modules test_runner) +- (libraries uri uri.services oUnit)) ++ (libraries uri uri.services ounit2)) + + (test + (name test_runner_sexp) + (package uri-sexp) + (modules test_runner_sexp) +- (libraries uri uri.services uri-sexp oUnit)) ++ (libraries uri uri.services uri-sexp ounit2)) + +From e40a51aec751ff397c94cbde8faa7fc01141a281 Mon Sep 17 00:00:00 2001 +From: Alessandro Barbieri <[email protected]> +Date: Sat, 16 Apr 2022 15:17:15 +0200 +Subject: [PATCH 2/4] depend on ounit2 + +--- + uri-sexp.opam | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/uri-sexp.opam b/uri-sexp.opam +index d4b2e44..fb249a5 100644 +--- a/uri-sexp.opam ++++ b/uri-sexp.opam +@@ -16,7 +16,7 @@ depends: [ + "dune" {>= "1.2.0"} + "ppx_sexp_conv" {>= "v0.13.0"} + "sexplib0" +- "ounit" {with-test} ++ "ounit2" {with-test} + ] + build: [ + ["dune" "subst"] {pinned} + +From 2615ace2358efc166f49b6dbc7167232086cadde Mon Sep 17 00:00:00 2001 +From: Alessandro Barbieri <[email protected]> +Date: Sat, 16 Apr 2022 15:17:48 +0200 +Subject: [PATCH 3/4] depend on ounit2 + +--- + uri-re.opam | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/uri-re.opam b/uri-re.opam +index 3d525a0..3d34e3e 100644 +--- a/uri-re.opam ++++ b/uri-re.opam +@@ -15,7 +15,7 @@ for parsing URI or URLs. + depends: [ + "ocaml" {>= "4.04.0"} + "dune" {>= "1.2.0"} +- "ounit" {with-test & >= "1.0.2"} ++ "ounit2" {with-test & >= "1.0.2"} + "ppx_sexp_conv" {with-test & >= "v0.9.0"} + "re" {>= "1.9.0"} + "stringext" {>= "1.4.0"} + +From a3b57ec4b8582b73b49bd95c163b44b885fe582f Mon Sep 17 00:00:00 2001 +From: Alessandro Barbieri <[email protected]> +Date: Sat, 16 Apr 2022 15:18:10 +0200 +Subject: [PATCH 4/4] depend on ounit2 + +--- + uri.opam | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/uri.opam b/uri.opam +index ab1cbf6..78d08b0 100644 +--- a/uri.opam ++++ b/uri.opam +@@ -15,7 +15,7 @@ for parsing URI or URLs. + depends: [ + "ocaml" {>= "4.04.0"} + "dune" {>= "1.2.0"} +- "ounit" {with-test & >= "1.0.2"} ++ "ounit2" {with-test & >= "1.0.2"} + "ppx_sexp_conv" {with-test & >= "v0.9.0"} + "stringext" {>= "1.4.0"} + "angstrom" {>= "0.14.0"} diff --git a/dev-ml/uri/uri-4.2.0.ebuild b/dev-ml/uri/uri-4.2.0.ebuild index afff9437d..4f5d62e81 100644 --- a/dev-ml/uri/uri-4.2.0.ebuild +++ b/dev-ml/uri/uri-4.2.0.ebuild @@ -6,7 +6,10 @@ EAPI=8 inherit dune multiprocessing DESCRIPTION="RFC3986 URI parsing library for OCaml" -HOMEPAGE="https://github.com/mirage/ocaml-uri"; +HOMEPAGE=" + https://github.com/mirage/ocaml-uri + https://opam.ocaml.org/packages/uri/ +" SRC_URI="https://github.com/mirage/ocaml-uri/archive/v${PV}.tar.gz -> ocaml-${P}.tar.gz" S="${WORKDIR}/ocaml-${P}" @@ -16,26 +19,25 @@ KEYWORDS="~amd64" IUSE="ocamlopt re sexp test" RDEPEND=" - dev-ml/angstrom - dev-ml/stringext + >=dev-ml/angstrom-0.14.0:= + >=dev-ml/stringext-1.4.0:= - re? ( - dev-ml/re - ) + re? ( >=dev-ml/re-1.9.0:= ) sexp? ( - dev-ml/ppx_sexp_conv - dev-ml/sexplib0 + >=dev-ml/ppx_sexp_conv-0.13.0:= + dev-ml/sexplib0:= ) " DEPEND=" ${RDEPEND} test? ( - dev-ml/ounit - dev-ml/ppx_sexp_conv + dev-ml/ounit2 + >=dev-ml/ppx_sexp_conv-0.9.0 ) " RESTRICT="!test? ( test )" +PATCHES="${FILESDIR}/${P}-ounit2.patch" src_compile() { local pkgs="uri"
