gentoo auto-resync : 22:09:2023 - 17:17:39

3 files changed, 21 insertions, 46 deletions

diff --git a/dev-ml/uucp/Manifest b/dev-ml/uucp/Manifest
index 0a6975119ad0..b812268a21bb 100644
--- a/dev-ml/uucp/Manifest
+++ b/dev-ml/uucp/Manifest
@@ -1,7 +1,5 @@
-DIST uucp-13.0.0.tbz 466488 BLAKE2B 90b62446ed069f95b0ca8bbad8273b215f0a66f6a3d19639d60a73f440268e9274d4e98e7ac8a534bbb6a34ab485e989432894f22f2f5c1303ca49f828efe859 SHA512 24d0fc75ba337115fd6445d3c3dfa60fe5f6920b227cd8360cd60ad51b652ccc2129a47f195f7559d99635367e64855343dc03de1109987f296a280e0fefff4d
-DIST uucp-14.0.0.tbz 476162 BLAKE2B 1c75b7bf98858bc60dee12bebfa99556afd6b344b65b12a4eafcbd39c57e2359f1a47aa0f28c5450f078db95d78ab545eecf84d0d5dbadb2bf1705c17e7179a4 SHA512 2d0224aed5d5accbb121624898f08598e8c74a2415942f159a54221c0cdac62ed64fc70a039c833e50110cefce77754ada9ac2d58f79a6fc9331135326fe6899
 DIST uucp-15.0.0.tbz 481932 BLAKE2B f8f23b8233e65b77dbea5defb968d253a022556b11f0276094fcdebe010fe5de99c36f581fee6aa3e54afadff62345fa5a3d6951ba0baba394f4ddae4175ba1c SHA512 ee4acff5666961766321e85e287fb9d5b8d50533319f22bf6f4eceb943242df2d0e0f4e775c4a140f68ca142837938eaa5926e22362215a3365ffe7f8768923b
-EBUILD uucp-13.0.0-r2.ebuild 605 BLAKE2B 1474526e0e1a8d6a1229525c04328cd10a9712a36b74a7a1d9979218368e775fbb2581c965e78999a567e77feac2c144fb17422a651d36efd19e9aaba95c2105 SHA512 58cd2ea713961be9ee31e7e1d768997d3fb7386b46c8fba99b4b46acd45a2439c58d388f0982d414e5acb33a4465c808754deed68045e42842bb53198de63f1b
-EBUILD uucp-14.0.0.ebuild 597 BLAKE2B 8807cbebd1668c2f089443840be042ee0bb7ef94f67e64951a71dde769a03ed767879fe9a9342e1847f2d81b604614870018d610f61558da1f03f8ac37c6475e SHA512 7ed492b4ace7e2a9b1b4312221b345a44bc8236fdb7c5db71e9d86a9c947273cf15dcd90af3365543bce02da9fa34e1c77a12fcdddc480e7b67ac842ad73d47e
+DIST uucp-15.1.0.tbz 499248 BLAKE2B 33dc1de451565b216445ead78c66c60e93a8853f27b3ab26a9fe9a71ee0b0f2b12c0ef964e0386eef1a2fb61ee6c03ce90feb970373990bc58ec1a111a734cd1 SHA512 998f94fadb72357b15a3042a3d11c31b3e16f281822673f2defdd515cd1394d55de1817628be8bd5c030175f9e62c53630d4139a1c0253800f9fb898b0f11364
 EBUILD uucp-15.0.0.ebuild 597 BLAKE2B f65e0738d6e51e58635383f303dc7df1cf742500fe9c5e0a6c9195f6047e7356d7a9f78ce609b43329f887aeefe018d4ef83277d5d37e95e07bc2585d95c8eca SHA512 f33774c9c74a6f8d31ebeef9164e35b526c303633581a0d5fe08959cb0ee0df9c002206175e55608754c95002e52e2f86c94daff2253ae02b0476c195b0374d4
+EBUILD uucp-15.1.0.ebuild 648 BLAKE2B cd5f17e3cc1118a27ce0a0b7d876fe2ffb47951ccf4a2bd58d2444f1a5b61bd31b0247477f18f118c0487ada28c92de445d4c2789002bbfb8a3119636e9b578c SHA512 b4b0698d56b33444f24a72d4088d6c0514162fcb6f63b6ece0384abe3c787295a524b602c001a4796fe3f3515ca30546b3d0652165924764e3f4ab22f2d9688c
 MISC metadata.xml 311 BLAKE2B a76d9caedb7c1705259a0b1e462b017a72d6704d937134f3b412dfbab5edad0dd301c0099286616863e8c2ebfea4152702e708c6ce60b15dca195ddb4e1888bc SHA512 fbb904d6b4a2fe7e080c66b76934ca3ef6c1ef0da78fb198d54700e03c4cc1a47a2978d79210dd153b630666c154511742d580fe3e5b1d840b7ee0b24cf215d8
diff --git a/dev-ml/uucp/uucp-14.0.0.ebuild b/dev-ml/uucp/uucp-14.0.0.ebuild
deleted file mode 100644
index c66d847e4131..000000000000
--- a/dev-ml/uucp/uucp-14.0.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit opam
-
-DESCRIPTION="Unicode character properties for OCaml"
-HOMEPAGE="https://erratique.ch/software/uucp https://github.com/dbuenzli/uucp"
-SRC_URI="https://erratique.ch/software/uucp/releases/${P}.tbz"
-
-LICENSE="ISC"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-
-DEPEND="dev-ml/topkg
-	dev-ml/findlib"
-RDEPEND="${DEPEND}"
-BDEPEND="dev-ml/ocamlbuild"
-OPAM_FILE=opam
-
-src_compile() {
-	ocaml pkg/pkg.ml build \
-		--with-uutf true \
-		--with-uunf false \
-		--with-cmdliner true \
-		|| die
-}
diff --git a/dev-ml/uucp/uucp-13.0.0-r2.ebuild b/dev-ml/uucp/uucp-15.1.0.ebuild
index c962b6b160fe..598da94d237f 100644
--- a/dev-ml/uucp/uucp-13.0.0-r2.ebuild
+++ b/dev-ml/uucp/uucp-15.1.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit opam
 
@@ -11,19 +11,24 @@ SRC_URI="https://erratique.ch/software/uucp/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
+KEYWORDS="~amd64 ~x86"
 
-DEPEND="dev-ml/topkg
-	dev-ml/findlib"
-RDEPEND="${DEPEND}"
-BDEPEND="dev-ml/ocamlbuild"
-OPAM_FILE=opam
+DEPEND="
+	dev-ml/topkg
+	dev-ml/findlib
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-ml/ocamlbuild
+"
+
+OPAM_FILE="opam"
 
 src_compile() {
-	ocaml pkg/pkg.ml build \
-		--with-uutf true \
-		--with-uunf false \
-		--with-cmdliner true \
-		|| die
+	ocaml pkg/pkg.ml build		\
+		--with-uunf false		\
+		--with-cmdliner true	\
+		|| die "failed to run the pkg/pkg.ml ocaml compilation script"
 }