commit: d485add3c0c9fb5884649242968418d59c9e8bcb Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> AuthorDate: Tue Jan 24 11:26:28 2017 +0000 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> CommitDate: Tue Jan 24 11:26:28 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d485add3
dev-ml/opam: remove old Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-ml/opam/Manifest | 1 - dev-ml/opam/files/0001-Port-to-Dose3-4.0.1.patch | 77 ------------------------ dev-ml/opam/files/no-insecure.patch | 25 -------- dev-ml/opam/opam-1.2.2-r1.ebuild | 57 ------------------ 4 files changed, 160 deletions(-) diff --git a/dev-ml/opam/Manifest b/dev-ml/opam/Manifest index e8ec3ff..9e786d9 100644 --- a/dev-ml/opam/Manifest +++ b/dev-ml/opam/Manifest @@ -1,2 +1 @@ -DIST opam-1.2.2.tar.gz 648951 SHA256 3e4a05df6ff8deecba019d885ebe902eb933acb6e2fc7784ffee1ee14871e36a SHA512 12105b5219a14d4c4cb29c387dd5af858d2b4a2a1bad7dcd70e4c284fc52848df82933396571b85251d904b3c14cdf02db55060c1ba29dc34b8bab3721d05f54 WHIRLPOOL 97d6ab75620a4ed18b45d80e88e77564af457606cbb8dd4591030574bfdbff5c16d508e81438b78198b87511151b1b030e6a51c2370e3110ae21216846f37836 DIST opam-1.3.0.tar.gz 669389 SHA256 9d50122940f44401c2dcee39b12a4e4afea851b2f2ab47d90b522f7395f10f7a SHA512 290535a1bb2e7eff6ab44126c5070d2bed94e68cee3bd5e47054f91ad81ed92e9a21f7888bd1dafcb397e3ac61589d4eaf7267305ac63d1aee08761701bdf647 WHIRLPOOL 64b8fc334b8dd193af1d4ae0d0bb445554f6afeb3007fefd4048816d1bd90363c7b18c4d44521da8162bc3ae49668d26b75ef811a4de4d5287597024d0b74ddd diff --git a/dev-ml/opam/files/0001-Port-to-Dose3-4.0.1.patch b/dev-ml/opam/files/0001-Port-to-Dose3-4.0.1.patch deleted file mode 100644 index a06733c..00000000 --- a/dev-ml/opam/files/0001-Port-to-Dose3-4.0.1.patch +++ /dev/null @@ -1,77 +0,0 @@ -From: Mehdi Dogguy <[email protected]> -Date: Mon, 14 Sep 2015 23:11:00 +0200 -Subject: Port to Dose3 4.0.1 - ---- - src/core/opamCompiler.ml | 2 +- - src/core/opamFilter.ml | 2 +- - src/core/opamPackage.ml | 2 +- - src/core/opamVersion.ml.in | 2 +- - src/solver/opamCudf.ml | 2 +- - 5 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/core/opamCompiler.ml b/src/core/opamCompiler.ml -index 4178311..c7beb93 100644 ---- a/src/core/opamCompiler.ml -+++ b/src/core/opamCompiler.ml -@@ -30,7 +30,7 @@ module Version = struct - - type constr = (OpamFormula.relop * t) OpamFormula.formula - -- let compare v1 v2 = Debian.Version.compare (to_string v1) (to_string v2) -+ let compare v1 v2 = Versioning.Debian.compare (to_string v1) (to_string v2) - - let eval_relop relop v1 v2 = OpamFormula.check_relop relop (compare v1 v2) - -diff --git a/src/core/opamFilter.ml b/src/core/opamFilter.ml -index 0e919e7..ebce090 100644 ---- a/src/core/opamFilter.ml -+++ b/src/core/opamFilter.ml -@@ -203,7 +203,7 @@ let rec reduce_aux env = function - | FUndef, _ | _, FUndef -> FUndef - | e,f -> - FBool (OpamFormula.check_relop relop -- (Debian.Version.compare (value_string e) (value_string f)))) -+ (Versioning.Debian.compare (value_string e) (value_string f)))) - | FAnd (e,f) -> logop2 (&&) false (reduce env e) (reduce env f) - | FOr (e,f) -> logop2 (||) true (reduce env e) (reduce env f) - | FNot e -> logop1 not (reduce env e) -diff --git a/src/core/opamPackage.ml b/src/core/opamPackage.ml -index 56605bb..8390896 100644 ---- a/src/core/opamPackage.ml -+++ b/src/core/opamPackage.ml -@@ -29,7 +29,7 @@ module Version = struct - - let of_string x = x - -- let compare = Debian.Version.compare -+ let compare = Versioning.Debian.compare - - let to_json x = - `String (to_string x) -diff --git a/src/core/opamVersion.ml.in b/src/core/opamVersion.ml.in -index 3c9fc92..ead47b8 100644 ---- a/src/core/opamVersion.ml.in -+++ b/src/core/opamVersion.ml.in -@@ -27,7 +27,7 @@ let compare v w = - let cut s = match OpamMisc.cut_at s '-' with - | Some (s,_) -> s - | None -> s in -- Debian.Version.compare (cut v) (cut w) -+ Versioning.Debian.compare (cut v) (cut w) - - module O = struct - type t = string -diff --git a/src/solver/opamCudf.ml b/src/solver/opamCudf.ml -index 62ea551..f790352 100644 ---- a/src/solver/opamCudf.ml -+++ b/src/solver/opamCudf.ml -@@ -611,7 +611,7 @@ let check_cudf_version = - `Compat - | s::_ -> - match OpamMisc.split s ' ' with -- | "aspcud"::_::v::_ when Debian.Version.compare v "1.9" >= 0 -> -+ | "aspcud"::_::v::_ when Versioning.Debian.compare v "1.9" >= 0 -> - log "Solver is aspcud > 1.9: using latest version criteria"; - `Latest - | _ -> diff --git a/dev-ml/opam/files/no-insecure.patch b/dev-ml/opam/files/no-insecure.patch deleted file mode 100644 index aebd5b2..00000000 --- a/dev-ml/opam/files/no-insecure.patch +++ /dev/null @@ -1,25 +0,0 @@ -Description: remove insecure / no-check-certificate flags (see mail on opam-devel, #55 #2006) -Author: Hannes Mehnert <[email protected]> -Applied-Upstream: 3d43295df3bb9e67e60801d319bf82c2c8a84d24 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/src/core/opamSystem.ml -+++ b/src/core/opamSystem.ml -@@ -694,7 +694,7 @@ - let retry = string_of_int OpamGlobals.download_retry in - let wget ~compress:_ ?checksum:_ dir src = - let wget_args = [ -- "--content-disposition"; "--no-check-certificate"; -+ "--content-disposition"; - "-t"; retry; - src - ] in -@@ -704,7 +704,7 @@ - in - let curl command ~compress ?checksum:_ dir src = - let curl_args = [ -- "--write-out"; "%{http_code}\\n"; "--insecure"; -+ "--write-out"; "%{http_code}\\n"; - "--retry"; retry; "--retry-delay"; "2"; - ] @ (if compress then ["--compressed"] else []) @ [ - "-OL"; src diff --git a/dev-ml/opam/opam-1.2.2-r1.ebuild b/dev-ml/opam/opam-1.2.2-r1.ebuild deleted file mode 100644 index 2b94b7e..00000000 --- a/dev-ml/opam/opam-1.2.2-r1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils - -DESCRIPTION="A source-based package manager for OCaml" -HOMEPAGE="http://opam.ocaml.org/"; -LICENSE="LGPL-3-with-linking-exception" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -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 - -DEPEND="dev-lang/ocaml:= - || ( net-misc/wget net-misc/curl ) - dev-ml/extlib:= - dev-ml/ocaml-re:= - dev-ml/ocamlgraph:= - dev-ml/cmdliner:= - dev-ml/cudf:= - >=dev-ml/dose3-4:= - dev-ml/uutf:= - dev-ml/jsonm:= -" -RDEPEND="${DEPEND} - dev-ml/findlib -" - -src_prepare() { - epatch \ - "${FILESDIR}/0001-Port-to-Dose3-4.0.1.patch" \ - "${FILESDIR}/no-insecure.patch" -} - -src_compile() { - emake -j1 - cd doc - emake man -} - -src_test() { - [email protected] emake -j1 tests -} - -src_install() { - default - emake DESTDIR="${D}" OPAMINSTALLER_FLAGS="--prefix=\"${ED}/usr\" --libdir=\"${D}/$(ocamlc -where)\"" libinstall -}
