From a243805af87c28592dadb7239cda13d4eff8fb14 Mon Sep 17 00:00:00 2001
From: Kate <kit-ty-kate@outlook.com>
Date: Wed, 24 Jul 2024 17:12:51 +0100
Subject: [PATCH] Remove the meta opam packages opam and opam-admin

---
 dune-project      | 13 +++++++++++++
 master_changes.md |  1 +
 opam-admin.opam   | 25 -------------------------
 opam.opam         | 25 -------------------------
 4 files changed, 14 insertions(+), 50 deletions(-)
 delete mode 100644 opam-admin.opam
 delete mode 100644 opam.opam

diff --git a/dune-project b/dune-project
index 9efdaf3e86f..dc537179296 100644
--- a/dune-project
+++ b/dune-project
@@ -2,3 +2,16 @@
 (name opam)
 
 (implicit_transitive_deps true)
+
+(package (name opam-core))
+(package (name opam-format))
+(package (name opam-repository))
+(package (name opam-state))
+(package (name opam-solver))
+(package (name opam-client))
+(package (name opam-devel))
+(package (name opam-installer))
+
+; Meta packages
+(package (name opam))
+(package (name opam-admin))
diff --git a/master_changes.md b/master_changes.md
index 342b8cc201a..24356311550 100644
--- a/master_changes.md
+++ b/master_changes.md
@@ -112,6 +112,7 @@ users)
 
 ## Internal
   * Stop using polymorphic comparison when comparing `OpamTypes.switch_selections` [#6102 @kit-ty-kate]
+  * Remove the meta opam packages opam and opam-admin [#6115 @kit-ty-kate]
 
 ## Internal: Windows
 
diff --git a/opam-admin.opam b/opam-admin.opam
deleted file mode 100644
index 4a4e68b3be6..00000000000
--- a/opam-admin.opam
+++ /dev/null
@@ -1,25 +0,0 @@
-opam-version: "2.0"
-synopsis: "Meta-package for Dune"
-maintainer: "opam-devel@lists.ocaml.org"
-authors: [
-  "David Allsopp <david@tarides.com>"
-  "Vincent Bernardoff <vb@luminar.eu.org>"
-  "Raja Boujbel <raja.boujbel@ocamlpro.com>"
-  "Kate Deplaix <kit-ty-kate@outlook.com>"
-  "Roberto Di Cosmo <roberto@dicosmo.org>"
-  "Thomas Gazagnaire <thomas@gazagnaire.org>"
-  "Louis Gesbert <louis.gesbert@ocamlpro.com>"
-  "Fabrice Le Fessant <Fabrice.Le_fessant@inria.fr>"
-  "Anil Madhavapeddy <anil@recoil.org>"
-  "Guillem Rieu <guillem.rieu@ocamlpro.com>"
-  "Ralf Treinen <ralf.treinen@pps.jussieu.fr>"
-  "Frederic Tuong <tuong@users.gforge.inria.fr>"
-]
-homepage: "https://opam.ocaml.org/"
-bug-reports: "https://github.com/ocaml/opam/issues"
-license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
-depends: [
-  "dune" {>= "2.0.0"}
-  "re" {>= "1.9.0"}
-  "opam-file-format" {>= "2.1.4"}
-]
diff --git a/opam.opam b/opam.opam
deleted file mode 100644
index 961863fc7c4..00000000000
--- a/opam.opam
+++ /dev/null
@@ -1,25 +0,0 @@
-opam-version: "2.0"
-version: "2.3.0~alpha~dev"
-synopsis: "Meta-package for Dune"
-maintainer: "opam-devel@lists.ocaml.org"
-authors: [
-  "David Allsopp <david@tarides.com>"
-  "Vincent Bernardoff <vb@luminar.eu.org>"
-  "Raja Boujbel <raja.boujbel@ocamlpro.com>"
-  "Kate Deplaix <kit-ty-kate@outlook.com>"
-  "Roberto Di Cosmo <roberto@dicosmo.org>"
-  "Thomas Gazagnaire <thomas@gazagnaire.org>"
-  "Louis Gesbert <louis.gesbert@ocamlpro.com>"
-  "Fabrice Le Fessant <Fabrice.Le_fessant@inria.fr>"
-  "Anil Madhavapeddy <anil@recoil.org>"
-  "Guillem Rieu <guillem.rieu@ocamlpro.com>"
-  "Ralf Treinen <ralf.treinen@pps.jussieu.fr>"
-  "Frederic Tuong <tuong@users.gforge.inria.fr>"
-]
-homepage: "https://opam.ocaml.org/"
-bug-reports: "https://github.com/ocaml/opam/issues"
-license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
-depends: [
-  "dune" {>= "2.0.0"}
-  "opam-client" {= version}
-]