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

[Andreas Sturmlechner]

commit:     e8309a63597a10bf9ccdc097a77cb0ffbc0a5bcd
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 18 09:03:03 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 15 21:45:43 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8309a63

dev-ml/opam: Drop 1.3.1-r2, EAPI5--

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-ml/opam/Manifest             |  1 -
 dev-ml/opam/files/stublibs.patch | 11 --------
 dev-ml/opam/opam-1.3.1-r2.ebuild | 59 ----------------------------------------
 3 files changed, 71 deletions(-)

diff --git a/dev-ml/opam/Manifest b/dev-ml/opam/Manifest
index 4ce56fe2e51..6022b2986d9 100644
--- a/dev-ml/opam/Manifest
+++ b/dev-ml/opam/Manifest
@@ -1,2 +1 @@
-DIST opam-1.3.1.tar.gz 669485 BLAKE2B e1aed54175d46f5dd9fd989e56c25657370356e26df6976c01dd089e381291fa04e25da295104f85d513010cd028276d80ebf7a4a77b38f3e089e52f4e64f43a SHA512 d075c9b2c9670d712f29bd2df34b8020da52041fa2bbef599cb54a81f63554507d78bebece45ecf668d3d1d4ed514e4ab88a1d86b64088d283bca7a8e75ae582
 DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9

diff --git a/dev-ml/opam/files/stublibs.patch b/dev-ml/opam/files/stublibs.patch
deleted file mode 100644
index 69fb02913b5..00000000000
--- a/dev-ml/opam/files/stublibs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/tools/opam_installer.ml
-+++ b/src/tools/opam_installer.ml
-@@ -312,7 +312,7 @@ let options =
-     let mandir = mk_dir mandir in
-     let libdir = mk_dir libdir in
-     let stubsdir = match mk_dir stubsdir, libdir with
--      | None, Some d -> Some OpamFilename.Op.(d / "stubslibs")
-+      | None, Some d -> Some OpamFilename.Op.(d / "stublibs")
-       | d, None | (Some _ as d), _ -> d
-     in
-     let topdir = match mk_dir topdir, libdir with

diff --git a/dev-ml/opam/opam-1.3.1-r2.ebuild b/dev-ml/opam/opam-1.3.1-r2.ebuild
deleted file mode 100644
index e1d225ca5e6..00000000000
--- a/dev-ml/opam/opam-1.3.1-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A source-based package manager for OCaml"
-HOMEPAGE="http://opam.ocaml.org/"
-if [[ ${PV} != 9999 ]] ; then
-	SRC_URI="https://github.com/ocaml/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ocaml/opam.git"
-fi
-
-LICENSE="LGPL-3-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-lang/ocaml:=
-	|| ( net-misc/wget net-misc/curl )
-	dev-ml/extlib:=
-	dev-ml/re:=
-	dev-ml/ocamlgraph:=
-	dev-ml/cmdliner:=
-	dev-ml/cudf:=
-	>=dev-ml/dose3-5:=
-	dev-ml/uutf:=
-	dev-ml/jsonm:=
-"
-DEPEND="${RDEPEND}
-	dev-ml/findlib
-	test? ( dev-vcs/git )
-"
-
-PATCHES=(
-	"${FILESDIR}"/stublibs.patch
-)
-
-src_compile() {
-	emake -j1
-
-	cd doc || die
-	emake man
-}
-
-src_test() {
-	EMAIL=foo@×××.com emake -j1 tests
-}
-
-src_install() {
-	default
-
-	emake \
-		DESTDIR="${D}" \
-		OPAMINSTALLER_FLAGS="--prefix=\"${ED}/usr\" --libdir=\"${D}/$(ocamlc -where)\"" \
-		libinstall
-}