gentoo resync : 20.03.2021

5 files changed, 2 insertions, 125 deletions

diff --git a/dev-ml/dose3/Manifest b/dev-ml/dose3/Manifest
index b0f8def0507c..2cd8883caf8b 100644
--- a/dev-ml/dose3/Manifest
+++ b/dev-ml/dose3/Manifest
@@ -1,8 +1,4 @@
-AUX ocaml406.patch 1623 BLAKE2B 741d94b936ed59aa3b158cca587ee2aaddb72e06703cbeee13c7aadb1c062d38bdb7a8e06805a7dc4cc6a19cab829702e55797f7434b3aea402c8d8023e36783 SHA512 1ccc378bb32a7ced3b643590a5ebd3b4b5b31f256ba4067f64a1611abb74cba48f0e0da42fb498aa66ee17e3d2446b9683ff5eca64749360af7a147fbf36385b
-AUX unix.patch 406 BLAKE2B 270b1e747ab9f270c49ea2ccfee0734600160f1db2f6ee912467989e1c59b31a0840d3a83fa857000b50a5a61d29422629bc9eb2334c7b08db93ef43d12229f7 SHA512 f6d7a3d100c425767ce304c620376cf815b8de59b04aea7ee439e79159cb7aa96cf1903498173d341fcf8d61391edf0b183ab4cda17ce91f41db9aa25ae8aff5
-DIST dose3-5.0.1.tar.gz 297433 BLAKE2B 74ae954604f26398f091b4f14d2a633132ae62102f52af13284af27e41cd7c47afb1b533b0821a8921ba33fa6658e94b3bb6bf5f104f48881a50e14517cd65e2 SHA512 e66526319446054041f138ee2633043d0832089f6a554cf566a28de899d10383acfb1aa6bf1a368811602939676510933a7d2404fd34dbeba15045b458f5af84
 DIST dose3_5.0.1-16.debian.tar.xz 39448 BLAKE2B a5ae8c74ee1a5a89bf3594cbaf0b37703fcf03a03e336c6b91626fcb6767518c517bf28ec4a24f6cbeb40e1544b34e95855507f39aacca110e8daa6e6e5d3994 SHA512 52d14a45bc0b0a66c4cf3acc05b479b1456c78fa8cb0e453a01dd2f0d849dfcf959bd9e8ff8d505272ad7ad542ff402013746816ead3ccd2dbd0bed572ee2930
 DIST dose3_5.0.1.orig.tar.gz 297433 BLAKE2B 74ae954604f26398f091b4f14d2a633132ae62102f52af13284af27e41cd7c47afb1b533b0821a8921ba33fa6658e94b3bb6bf5f104f48881a50e14517cd65e2 SHA512 e66526319446054041f138ee2633043d0832089f6a554cf566a28de899d10383acfb1aa6bf1a368811602939676510933a7d2404fd34dbeba15045b458f5af84
-EBUILD dose3-5.0.1-r2.ebuild 1702 BLAKE2B 19396715dcca23f347ae34222f16d25050147cff8bbd5e3ff693c8f0ef95d7a22f99c139fcc4aa4065e421826e56d70a9f81953848660eaf5836dc5ef528125d SHA512 06a5b1f09d223a9a39a2bd2dbe338d703b66fd8350527cd37b51df834bbe050d41f0dd70fadb0b3dd5595004c4fc074e92ea08a4914422464e8b9aee28db2604
-EBUILD dose3-5.0.1_p16-r2.ebuild 2266 BLAKE2B 653895b764463f197cdd044fc1e482acdd0613ed6c06d4375ac9ae8189ecaff82b5e4d9c93544399a0b5611ec2db264c565050d34a9b958b3f2087d91c3342b8 SHA512 4c36f120415bb59275540161f4cc7da0d5aedf508c38ab51c67b427af83d6cea04b554f648f13b2ad0680af8747aa0d706f2fcfe5d5a90b223ca6b061bc52e9f
+EBUILD dose3-5.0.1_p16-r2.ebuild 2264 BLAKE2B b91216ce6df7fe918529560c02850505cfcbf1fdbf99ad42ed6ec8b802381b815917cb738ae88b6060f48c3757d458f4a2eef68d808f537f7e0d4b7a3de17e53 SHA512 e989a1397ec4eb4b40d75c46ea2c5227e8589657ecfae2715b15218ba8072807f0b616bec3aa17b0fcfa5fb82fb1db14584027c452c473cd867aeeeb419f82a6
 MISC metadata.xml 567 BLAKE2B edf392175ce748915b9584ba1bb3885338c52f2c85f0beaa7695ecc556319af95d3485ab8bf94d97975e4cea2b30ddd47e31fe5df8a97911ddca0e720903c760 SHA512 254fd968a79b76a7ee792091a1106d20e76d168f57afa415aace3d150c793613c73d3bbd9d8a150d99595445ade1966da0dc059cb61dfae084478a5aeddb7fc8
diff --git a/dev-ml/dose3/dose3-5.0.1-r2.ebuild b/dev-ml/dose3/dose3-5.0.1-r2.ebuild
deleted file mode 100644
index a90a3f4b1e81..000000000000
--- a/dev-ml/dose3/dose3-5.0.1-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${P/_beta/-beta}"
-DESCRIPTION="Library to perform analysis on package repositories"
-HOMEPAGE="http://www.mancoosi.org/software/ https://gforge.inria.fr/projects/dose"
-SRC_URI="https://gforge.inria.fr/frs/download.php/file/36063/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt parmap zip bzip2 xml curl rpm4 test"
-
-RDEPEND="
-	<dev-lang/ocaml-4.09.0:=[ocamlopt=]
-	dev-ml/cudf:=
-	>=dev-ml/extlib-1.7.0:=
-	dev-ml/re:=
-	parmap? ( dev-ml/parmap:= )
-	zip? ( dev-ml/camlzip:= )
-	bzip2? ( dev-ml/camlbz2:= )
-	>=dev-ml/ocamlgraph-1.8.6:=
-	xml? ( dev-ml/ocaml-expat:= dev-ml/xml-light:= )
-	curl? ( dev-ml/ocurl:= )
-	rpm4? ( app-arch/rpm )
-"
-DEPEND="${RDEPEND}
-	dev-ml/findlib
-	dev-ml/ocamlbuild
-	dev-ml/cppo
-	test? ( dev-python/pyyaml[libyaml] )
-"
-# missing test data
-RESTRICT="test"
-
-QA_FLAGS_IGNORED='.*'
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	sed -e 's/INSTALLOPTS=-s/INSTALLOPTS=/' -i Makefile.config.in || die
-	has_version '>=dev-lang/ocaml-4.06_beta' && eapply "${FILESDIR}/ocaml406.patch"
-	eapply "${FILESDIR}/unix.patch"
-}
-
-src_configure() {
-	econf \
-		$(use ocamlopt || echo "--with-bytecodeonly") \
-		$(use parmap && echo "--with-parmap") \
-		$(use zip && echo "--with-zip") \
-		$(use bzip2 && echo "--with-bz2") \
-		$(use xml && echo "--with-xml") \
-		$(use curl && echo "--with-curl") \
-		$(use rpm4 && echo "--with-rpm4")
-}
-
-src_compile() {
-	emake -j1 VERBOSE="-classic-display"
-}
-
-src_install() {
-	emake DESTDIR="${D}" BINDIR="${ED}/usr/bin" install || die
-	dodoc CHANGES CREDITS README.architecture TODO
-}
diff --git a/dev-ml/dose3/dose3-5.0.1_p16-r2.ebuild b/dev-ml/dose3/dose3-5.0.1_p16-r2.ebuild
index 86654782b7e4..e8cf0a7bf4fb 100644
--- a/dev-ml/dose3/dose3-5.0.1_p16-r2.ebuild
+++ b/dev-ml/dose3/dose3-5.0.1_p16-r2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
 
 LICENSE="LGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt parmap zip bzip2 xml curl rpm4 test"
 
 BDEPEND="
diff --git a/dev-ml/dose3/files/ocaml406.patch b/dev-ml/dose3/files/ocaml406.patch
deleted file mode 100644
index 867c2ca4848c..000000000000
--- a/dev-ml/dose3/files/ocaml406.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: dose3-5.0.1/common/criteria_lexer.mll
-===================================================================
---- dose3-5.0.1.orig/common/criteria_lexer.mll
-+++ dose3-5.0.1/common/criteria_lexer.mll
-@@ -18,7 +18,7 @@
-     let c = Lexing.lexeme_char lexbuf 2 in (* the delimiter can be any character *)
-     (* find the terminating delimiter *)
-     let endpos =
--      try String.index_from lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) c with
-+      try Bytes.index_from lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) c with
-       |Invalid_argument _ ->
-           raise (Format822.Syntax_error (
-             Format822.error lexbuf "String too short"))
-@@ -27,9 +27,9 @@
-             Format822.error lexbuf (Printf.sprintf "cannot find: %c" c)))
-     in
-     let len = endpos - (lexbuf.lex_start_pos + 3) in
--    let s = String.sub lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) len in
--    lexbuf.Lexing.lex_curr_pos <- lexbuf.Lexing.lex_start_pos + ((String.length s)+4);
--    s
-+    let s = Bytes.sub lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) len in
-+    lexbuf.Lexing.lex_curr_pos <- lexbuf.Lexing.lex_start_pos + ((Bytes.length s)+4);
-+    Bytes.to_string s
- 
- }
- 
-Index: dose3-5.0.1/common/input.ml
-===================================================================
---- dose3-5.0.1.orig/common/input.ml
-+++ dose3-5.0.1/common/input.ml
-@@ -47,7 +47,7 @@ let bzip_open_file file =
-   in
-   IO.create_in
-   ~read:(fun () -> input_char ch)
--  ~input:(read ch)
-+  ~input:(fun x -> read ch (Bytes.to_string x))
-   ~close:(fun () -> Bz2.close_in ch)
- #else
-     fatal "bzip not supported. re-configure with --with-bz2"
diff --git a/dev-ml/dose3/files/unix.patch b/dev-ml/dose3/files/unix.patch
deleted file mode 100644
index c3dbfabcfbce..000000000000
--- a/dev-ml/dose3/files/unix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: dose3-5.0.1/META.in
-===================================================================
---- dose3-5.0.1.orig/META.in
-+++ dose3-5.0.1/META.in
-@@ -8,7 +8,7 @@ package "common" (
- version = "@PACKAGE_VERSION@"
- archive(byte) = "common.cma"
- archive(native) = "common.cmxa"
--requires = "extlib, re.pcre, cudf, @ZIP@, @BZ2@"
-+requires = "extlib, re.pcre, cudf, unix, @ZIP@, @BZ2@"
- )
- 
- package "algo" (