upstream-extra: sync contents with upstream repository

Signed-off-by: Pau Ruiz Safont <[email protected]>

packages/upstream-extra/bechamel-notty.0.3.0/opam

@@ -1,27 +1,28 @@
 opam-version: "2.0"
-maintainer:   "Romain Calascibetta <[email protected]>"
-authors:      "Romain Calascibetta <[email protected]>"
-homepage:     "https://github.com/mirage/bechamel"
-bug-reports:  "https://github.com/mirage/bechamel/issues"
-dev-repo:     "git+https://github.com/mirage/bechamel.git"
-doc:          "https://mirage.github.io/bechamel/"
-license:      "MIT"
-synopsis:     "CLI generator for bechamel's output"
-description: """A simple tool to generate a CLI output with notty
+name: "bechamel-notty"
+version: "0.3.0"
+synopsis: "CLI generator for bechamel's output"
+description: """\
+A simple tool to generate a CLI output with notty
 which shows results from bechamel's benchmarks (as core_bench)."""
-
-build: [
-  [ "dune" "build" "-p" name "-j" jobs ]
-  [ "dune" "runtest" "-p" name "-j" jobs ] {with-test}
-]
-
+maintainer: "Romain Calascibetta <[email protected]>"
+authors: "Romain Calascibetta <[email protected]>"
+license: "MIT"
+homepage: "https://github.com/mirage/bechamel"
+doc: "https://mirage.github.io/bechamel/"
+bug-reports: "https://github.com/mirage/bechamel/issues"
 depends: [
-  "ocaml"      {>= "4.08.0"}
-  "dune"       {>= "2.0.0"}
-  "bechamel"   {= version}
+  "ocaml" {>= "4.08.0"}
+  "dune" {>= "2.0.0"}
+  "bechamel" {= version}
   "notty"
-  "fmt"        {>= "0.9.0"}
+  "fmt" {>= "0.9.0"}
+]
+build: [
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
+dev-repo: "git+https://github.com/mirage/bechamel.git"
 url {
   src:
     "https://github.com/mirage/bechamel/releases/download/v0.3.0/bechamel-0.3.0.tbz"

packages/upstream-extra/bechamel.0.3.0/opam

@@ -1,28 +1,29 @@
 opam-version: "2.0"
-maintainer:   "Romain Calascibetta <[email protected]>"
-authors:      "Romain Calascibetta <[email protected]>"
-homepage:     "https://github.com/mirage/bechamel"
-bug-reports:  "https://github.com/mirage/bechamel/issues"
-dev-repo:     "git+https://github.com/mirage/bechamel.git"
-doc:          "https://mirage.github.io/bechamel/"
-license:      "MIT"
-synopsis:     "Yet Another Benchmark in OCaml"
-description: """BEnchmark for a CHAMEL/camel/caml which
+name: "bechamel"
+version: "0.3.0"
+synopsis: "Yet Another Benchmark in OCaml"
+description: """\
+BEnchmark for a CHAMEL/camel/caml which
 is agnostic to the system. It's a micro-benchmark tool
 which lets the user to re-analyzes and prints samples."""
-
-build: [
-  [ "dune" "build" "-p" name "-j" jobs ]
-  [ "dune" "runtest" "-p" name "-j" jobs ] {with-test}
-]
-
+maintainer: "Romain Calascibetta <[email protected]>"
+authors: "Romain Calascibetta <[email protected]>"
+license: "MIT"
+homepage: "https://github.com/mirage/bechamel"
+doc: "https://mirage.github.io/bechamel/"
+bug-reports: "https://github.com/mirage/bechamel/issues"
 depends: [
-  "ocaml"      {>= "4.08.0"}
-  "dune"       {>= "2.0.0"}
-  "fmt"        {>= "0.9.0"}
+  "ocaml" {>= "4.08.0"}
+  "dune" {>= "2.0.0"}
+  "fmt" {>= "0.9.0"}
   "base-bytes"
   "stdlib-shims"
 ]
+build: [
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
+]
+dev-repo: "git+https://github.com/mirage/bechamel.git"
 url {
   src:
     "https://github.com/mirage/bechamel/releases/download/v0.3.0/bechamel-0.3.0.tbz"

packages/upstream-extra/calendar.2.04/opam

@@ -8,7 +8,7 @@ license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 homepage: "http://calendar.forge.ocamlcore.org/"
 bug-reports: "https://github.com/ocaml-community/calendar/issues"
 depends: [
-  "ocaml" {>= "3.09"}
+  "ocaml" {>= "3.09" & < "5.0"}
   "ocamlfind" {build}
 ]
 flags: light-uninstall

packages/upstream-extra/cinaps.v0.15.1/opam

@@ -1,32 +1,30 @@
 opam-version: "2.0"
+name: "cinaps"
+version: "v0.15.1"
+synopsis: "Trivial metaprogramming tool"
+description: """\
+Cinaps is a trivial Metaprogramming tool using the OCaml toplevel.  It
+is based on the same idea as expectation tests. The user write some
+OCaml code inside special comments and cinaps make sure that what
+follows is what is printed by the OCaml code."""
 maintainer: "Jane Street developers"
-authors: ["Jane Street Group, LLC"]
+authors: "Jane Street Group, LLC"
+license: "MIT"
 homepage: "https://github.com/ocaml-ppx/cinaps"
 bug-reports: "https://github.com/ocaml-ppx/cinaps/issues"
-dev-repo: "git+https://github.com/ocaml-ppx/cinaps.git"
-license: "MIT"
-build: [
-  ["dune" "build" "-p" name "-j" jobs]
-]
 depends: [
   "ocaml" {>= "4.04"}
   "dune" {>= "2.0.0"}
-  "re"   {>= "1.8.0"}
+  "re" {>= "1.8.0"}
   "base-unix"
 ]
-synopsis: "Trivial metaprogramming tool"
-description: "
-Cinaps is a trivial Metaprogramming tool using the OCaml toplevel.  It
-is based on the same idea as expectation tests. The user write some
-OCaml code inside special comments and cinaps make sure that what
-follows is what is printed by the OCaml code.
-"
-x-commit-hash: "86f2f05c4605572022cdb794c5542d220fb14be5"
+build: ["dune" "build" "-p" name "-j" jobs]
+dev-repo: "git+https://github.com/ocaml-ppx/cinaps.git"
 url {
-  src:
-    "https://github.com/ocaml-ppx/cinaps/archive/v0.15.1.tar.gz"
+  src: "https://github.com/ocaml-ppx/cinaps/archive/v0.15.1.tar.gz"
   checksum: [
     "sha256=1be18e70f5d8a6b03566c3619b62836a26094fc7208fde46ab7b32ee64116170"
     "sha512=ca53a9da8aa71ce7cddf7e24778e9c4d3f3e5784209da85a5a6b2d5af83cd8ad769fbe3009d2757ebf4a25ca39d76af00ebc693b1b01c3b53c8775ea479123a5"
   ]
 }
+x-commit-hash: "86f2f05c4605572022cdb794c5542d220fb14be5"

packages/upstream-extra/conf-jq.1/opam

@@ -17,7 +17,7 @@ depexts: [
   ["jq"] {os-distribution = "rhel"}
   ["epel-release" "jq"] {os-distribution = "centos"}
   ["jq"] {os-distribution = "alpine"}
-  ["jq"] {os-family = "suse"}
+  ["jq"] {os-family = "suse" | os-family = "opensuse"}
   ["jq"] {os-distribution = "ol"}
   ["jq"] {os-distribution = "arch"}
   ["jq"] {os = "freebsd"}

packages/upstream-extra/conf-xen.1/opam

@@ -6,7 +6,7 @@ description:
   "This package can only install if the Xen headers are installed on the system."
 maintainer: "[email protected]"
 authors: "[email protected]"
-license: "GPL-2.0-only AND LGPL-3.0-only"
+license: ["GPL-2.0-only" "LGPL-3.0-only"]
 homepage: "https://xenproject.org/"
 bug-reports: "https://github.com/ocaml/opam-repository/issues"
 available: os != "macos"
@@ -19,7 +19,7 @@ depexts: [
   ["xen-devel"] {os-distribution = "fedora"}
   ["xen-devel"] {os-distribution = "rhel"}
   ["xen-devel"] {os-distribution = "ol"}
-  ["xen-devel"] {os-family = "suse"}
+  ["xen-devel"] {os-family = "suse" | os-family = "opensuse"}
   ["xen-dom0-libs-devel" "xen-libs-devel"] {os = "xenserver"}
   ["xenstore"] {os-distribution = "arch"}
   ["xen-tools"] {os = "freebsd"}

packages/upstream-extra/notty.0.2.3/opam

@@ -1,29 +1,32 @@
 opam-version: "2.0"
-homepage:     "https://github.com/pqwy/notty"
-dev-repo:     "git+https://github.com/pqwy/notty.git"
-bug-reports:  "https://github.com/pqwy/notty/issues"
-doc:          "https://pqwy.github.io/notty/doc"
-maintainer:   "David Kaloper <[email protected]>"
-license:      "ISC"
-synopsis:     "Declaring terminals"
-description:
-  "Notty is a declarative terminal library for OCaml structured around a notion
+name: "notty"
+version: "0.2.3"
+synopsis: "Declaring terminals"
+description: """\
+Notty is a declarative terminal library for OCaml structured around a notion
   of composable images. It tries to abstract away the basic terminal programming
-  model, providing something simpler and more expressive."
-
-build: [ [ "dune" "subst" ] {dev}
-         [ "dune" "build" "-p" name "-j" jobs ] ]
+  model, providing something simpler and more expressive."""
+maintainer: "David Kaloper <[email protected]>"
+authors: "David Kaloper <[email protected]>"
+license: "ISC"
+homepage: "https://github.com/pqwy/notty"
+doc: "https://pqwy.github.io/notty/doc"
+bug-reports: "https://github.com/pqwy/notty/issues"
 depends: [
   "ocaml" {>= "4.08.0"}
   "dune" {>= "1.7"}
   "cppo" {build & >= "1.1.0"}
   "uutf" {>= "1.0.0"}
 ]
-depopts: [ "lwt" ]
+depopts: ["lwt"]
 conflicts: [
-  "lwt" {<"2.6.0"}
+  "lwt" {< "2.6.0"}
 ]
-authors: "David Kaloper <[email protected]>"
+build: [
+  ["dune" "subst"] {dev}
+  ["dune" "build" "-p" name "-j" jobs]
+]
+dev-repo: "git+https://github.com/pqwy/notty.git"
 url {
   src:
     "https://github.com/pqwy/notty/releases/download/v0.2.3/notty-0.2.3.tbz"

packages/upstream-extra/odoc.2.1.1/opam

@@ -26,7 +26,7 @@ depends: [
   "cppo" {build & >= "1.1.0"}
   "dune" {>= "2.9.1"}
   "fpath"
-  "ocaml" {>= "4.02.0"}
+  "ocaml" {>= "4.02.0" & < "5.1"}
   "result"
   "tyxml" {>= "4.3.0"}
   "fmt"

packages/upstream-extra/opam-file-format.2.0.0/opam

@@ -7,7 +7,9 @@ authors: "Louis Gesbert <[email protected]>"
 license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 homepage: "https://opam.ocaml.org"
 bug-reports: "https://github.com/ocaml/opam-file-format/issues"
-depends: ["ocaml"]
+depends: [
+  "ocaml" {< "5.0.0"}
+]
 flags: light-uninstall
 build: [
   make