Adding metadata

6 files changed, 14 insertions, 262 deletions

diff --git a/dev-ml/cstruct/Manifest b/dev-ml/cstruct/Manifest
index 81ece4a90c58..d7d4adfc959d 100644
--- a/dev-ml/cstruct/Manifest
+++ b/dev-ml/cstruct/Manifest
@@ -1,3 +1 @@
-DIST cstruct-6.0.1.tar.gz 243082 BLAKE2B 874ba34583bbc8b53c5b50ba038e2aa423fd704711194dcf99899239015d5fb383242b1d4654c1be2705fd80465e6da7e8eaa5265eceebca7b09dc036d4ebf40 SHA512 2f696b9dca1426d57f60fd4e997ee0c89b1af1a49e186e08c16911ceb03e9f89518a63faf4407b4a7e3c5f391d51979019e47a77f33961624d767a9e36146ca4
-DIST cstruct-6.1.0.tar.gz 242509 BLAKE2B b41eb9b86830b7aef775f9bbfd0f08c29b495a032351ec38dd4553fb944e67a4875b7c2b7175761d78336a20782812148fd473075f4a3519b019f37a2c2ea7dc SHA512 eb1bcb6a35650f726f888c396f3ca64796ad16c1a7146130f8826004c3cac7e5bef2453821ca95844eaef4b4beab25e3db713e6a1a93f86986fb526f75a4e245
-DIST cstruct-6.2.0.tar.gz 244005 BLAKE2B bf6f63250eae360b842cbaa02ab23c287a2e44442cfc2a9cee69acc272cad16c23232375579e1123d46d389c627a995f8d04af56774cb91a7908b3b80d9ccb03 SHA512 064ea4a0ae039b9d177223e2bc886d6d3b16ab8e03a5cba3ef5f4d441bb2ef8e652971a467e592120a1bcb0a3fb74e1429664ee5017d707300a5723ba51d050f
+DIST cstruct-6.2.0.tbz 241841 BLAKE2B 9a662bf1208e80afda486dd46169b281e838e49666aca01a9ad57b9516fa055af315ea12d5e5bb8994df67eb2f6edabe544a89a2a2a370249e5b72e109f01b1a SHA512 8d33fe6b3707a3994d0225cd33cadde0bb2ca834ef01096e3df33a08e4a8c6d02ebccddf558a73988b8a5595b65fdc10de61efbf872c6c9e55c719c7e19c463d
diff --git a/dev-ml/cstruct/cstruct-6.0.1.ebuild b/dev-ml/cstruct/cstruct-6.0.1.ebuild
deleted file mode 100644
index d470ca4ec952..000000000000
--- a/dev-ml/cstruct/cstruct-6.0.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune multiprocessing
-
-DESCRIPTION="Map OCaml arrays onto C-like structs"
-HOMEPAGE="
-	https://github.com/mirage/ocaml-cstruct
-	https://opam.ocaml.org/packages/cstruct/
-"
-SRC_URI="https://github.com/mirage/ocaml-cstruct/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/ocaml-${P}"
-
-LICENSE="ISC"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="async lwt ocamlopt ppx sexp test unix"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.08.0:=[ocamlopt?]
-	>=dev-ml/fmt-0.8.9:=
-
-	async? (
-		dev-ml/async:=
-		dev-ml/async_unix:=
-		dev-ml/core:=
-	)
-	lwt? ( dev-ml/lwt:= )
-	ppx? (
-		dev-ml/ppxlib:=
-		dev-ml/stdlib-shims:=
-	)
-	sexp? ( dev-ml/sexplib:= )
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		dev-ml/alcotest
-		dev-ml/crowbar
-		dev-ml/ocaml-migrate-parsetree
-		dev-ml/ppx_sexp_conv
-		dev-ml/cppo
-		dev-ml/lwt
-	)
-"
-
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	ppx? ( sexp )
-	test? ( sexp ppx )
-"
-
-src_compile() {
-	local pkgs="cstruct"
-	use ppx && pkgs="${pkgs},ppx_cstruct"
-	for u in async lwt sexp unix ; do
-		if use ${u} ; then
-			pkgs="${pkgs},cstruct-${u}"
-		fi
-	done
-	dune build -p "${pkgs}" -j $(makeopts_jobs) || die
-}
-
-src_install() {
-	dune_src_install cstruct
-	use async && dune_src_install cstruct-async
-	use lwt && dune_src_install cstruct-lwt
-	use sexp && dune_src_install cstruct-sexp
-	use unix && dune_src_install cstruct-unix
-	use ppx && dune_src_install ppx_cstruct
-}
diff --git a/dev-ml/cstruct/cstruct-6.1.0.ebuild b/dev-ml/cstruct/cstruct-6.1.0.ebuild
deleted file mode 100644
index 8bdc43c7724e..000000000000
--- a/dev-ml/cstruct/cstruct-6.1.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune multiprocessing
-
-DESCRIPTION="Map OCaml arrays onto C-like structs"
-HOMEPAGE="
-	https://github.com/mirage/ocaml-cstruct
-	https://opam.ocaml.org/packages/cstruct/
-"
-SRC_URI="https://github.com/mirage/ocaml-cstruct/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/ocaml-${P}"
-
-LICENSE="ISC"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="async lwt ocamlopt ppx sexp test unix"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.08.0:=[ocamlopt?]
-	>=dev-ml/fmt-0.8.9:=
-
-	async? (
-		>=dev-ml/async-0.9.0:=
-		>=dev-ml/async_unix-0.9.0:=
-		>=dev-ml/core-0.9.0:=
-	)
-	lwt? ( dev-ml/lwt:= )
-	ppx? (
-		>=dev-ml/ppxlib-0.16.0:=
-		dev-ml/stdlib-shims:=
-	)
-	sexp? ( >=dev-ml/sexplib-0.9.0:= )
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		dev-ml/alcotest
-		dev-ml/crowbar
-		>=dev-ml/ocaml-migrate-parsetree-2.1.0
-		dev-ml/ppx_sexp_conv
-		dev-ml/cppo
-		>=dev-ml/lwt-2.0.2
-	)
-"
-
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	ppx? ( sexp )
-	test? ( sexp ppx )
-"
-
-src_compile() {
-	local pkgs="cstruct"
-	use ppx && pkgs="${pkgs},ppx_cstruct"
-	for u in async lwt sexp unix ; do
-		if use ${u} ; then
-			pkgs="${pkgs},cstruct-${u}"
-		fi
-	done
-	dune build -p "${pkgs}" -j $(makeopts_jobs) || die
-}
-
-src_install() {
-	dune_src_install cstruct
-	use async && dune_src_install cstruct-async
-	use lwt && dune_src_install cstruct-lwt
-	use sexp && dune_src_install cstruct-sexp
-	use unix && dune_src_install cstruct-unix
-	use ppx && dune_src_install ppx_cstruct
-}
diff --git a/dev-ml/cstruct/cstruct-6.2.0.ebuild b/dev-ml/cstruct/cstruct-6.2.0.ebuild
index 070bd7937f5e..6d78859ac5fc 100644
--- a/dev-ml/cstruct/cstruct-6.2.0.ebuild
+++ b/dev-ml/cstruct/cstruct-6.2.0.ebuild
@@ -1,77 +1,19 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit dune multiprocessing
+inherit dune
 
-DESCRIPTION="Map OCaml arrays onto C-like structs"
-HOMEPAGE="
-	https://github.com/mirage/ocaml-cstruct
-	https://opam.ocaml.org/packages/cstruct/
-"
-SRC_URI="https://github.com/mirage/ocaml-cstruct/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/ocaml-${P}"
+DESCRIPTION="Access C-like structures directly from OCaml"
+HOMEPAGE="https://github.com/mirage/ocaml-cstruct"
+SRC_URI="https://github.com/mirage/ocaml-cstruct/releases/download/v${PV}/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="async lwt ocamlopt ppx sexp test unix"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.08.0:=[ocamlopt?]
-	>=dev-ml/fmt-0.8.9:=
-
-	async? (
-		>=dev-ml/async-0.9.0:=
-		>=dev-ml/async_unix-0.9.0:=
-		>=dev-ml/core-0.9.0:=
-	)
-	lwt? ( dev-ml/lwt:= )
-	ppx? (
-		>=dev-ml/ppxlib-0.16.0:=
-		dev-ml/stdlib-shims:=
-	)
-	sexp? ( >=dev-ml/sexplib-0.9.0:= )
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		dev-ml/alcotest
-		dev-ml/crowbar
-		dev-ml/ppx_sexp_conv
-		dev-ml/cppo
-		>=dev-ml/lwt-2.0.2
-	)
-"
-
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	ppx? ( sexp )
-	test? ( sexp ppx )
-"
-
-PATCHES=(
-	"${FILESDIR}/6.2-ocaml-5.1.patch"
-)
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64"
+IUSE="+ocamlopt"
 
 src_compile() {
-	local pkgs="cstruct"
-	use ppx && pkgs="${pkgs},ppx_cstruct"
-	for u in async lwt sexp unix ; do
-		if use ${u} ; then
-			pkgs="${pkgs},cstruct-${u}"
-		fi
-	done
-	dune build -p "${pkgs}" -j $(makeopts_jobs) || die
-}
-
-src_install() {
-	dune_src_install cstruct
-	for u in async lwt sexp unix ; do
-		if use ${u} ; then
-			dune_src_install "cstruct-${u}"
-		fi
-	done
-	use ppx && dune_src_install ppx_cstruct
+	dune-compile ${PN}
 }
diff --git a/dev-ml/cstruct/files/6.2-ocaml-5.1.patch b/dev-ml/cstruct/files/6.2-ocaml-5.1.patch
deleted file mode 100644
index ad0f08521eba..000000000000
--- a/dev-ml/cstruct/files/6.2-ocaml-5.1.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/ppx_cstruct.opam b/ppx_cstruct.opam
-index 264ad41..5c622fc 100644
---- a/ppx_cstruct.opam
-+++ b/ppx_cstruct.opam
-@@ -26,7 +26,6 @@ depends: [
-   "cstruct-sexp" {with-test}
-   "cppo" {with-test}
-   "cstruct-unix" {with-test & =version}
--  "ocaml-migrate-parsetree" {>= "2.1.0" & with-test}
-   "lwt_ppx" {>= "2.0.2" & with-test}
- ]
- synopsis: "Access C-like structures directly from OCaml"
-diff --git a/ppx_test/errors/dune b/ppx_test/errors/dune
-index ed51ce0..0712dc9 100644
---- a/ppx_test/errors/dune
-+++ b/ppx_test/errors/dune
-@@ -4,7 +4,7 @@
-  (preprocess
-   (action
-    (run %{bin:cppo} -V OCAML:%{ocaml_version} %{input-file})))
-- (libraries ppx_cstruct ocaml-migrate-parsetree))
-+ (libraries ppx_cstruct))
- 
- (executable
-  (name gen_tests)
diff --git a/dev-ml/cstruct/metadata.xml b/dev-ml/cstruct/metadata.xml
index b5116608e64d..4f0aab5e579a 100644
--- a/dev-ml/cstruct/metadata.xml
+++ b/dev-ml/cstruct/metadata.xml
@@ -1,27 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="person">
-  <email>fogti@ytrizja.de</email>
-  <name>Alain Emilia Anna Zscheile</name>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
  </maintainer>
- <longdescription lang="en">Cstruct is a library and syntax extension to make it easier to access C-like
-structures directly from OCaml.	It supports both reading and writing to these
-structures, and they are accessed via the `Bigarray` module.</longdescription>
- <upstream>
-  <maintainer>
-   <email>anil@recoil.org</email>
-   <name>Anil Madhavapeddy</name>
-  </maintainer>
-  <bugs-to>https://github.com/mirage/ocaml-cstruct/issues</bugs-to>
-  <doc>https://mirage.github.io/ocaml-cstruct/</doc>
- </upstream>
- <use>
-  <flag name="async">provide Async Pipe and Bigstring support</flag>
-  <flag name="lwt">provide Lwt variants of read/write functions</flag>
-  <flag name="ppx">a PPX syntax extension</flag>
-  <flag name="sexp">serialisers into s-expression format of Cstructs</flag>
-  <flag name="unix">provide Unix variations of the read/write functions using file descriptors</flag>
- </use>
- <origin>gentoo-guru-overlay</origin>
+ 
+ <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file