From 8256d9fecf7568df9a7885cb8e6335dd4cb06436 Mon Sep 17 00:00:00 2001
From: talregev <talregev@users.noreply.github.com>
Date: Mon, 17 Jun 2024 21:36:42 +0300
Subject: [PATCH] [Many tests ports] Run format-manifest on test_ports (#39294)

---
 .../vcpkg.json                                |  4 +---
 scripts/test_ports/vcpkg-ci-arrow/vcpkg.json  |  8 +++----
 scripts/test_ports/vcpkg-ci-curl/vcpkg.json   | 22 +++++++++----------
 scripts/test_ports/vcpkg-ci-llvm/vcpkg.json   | 18 +++++++--------
 .../test_ports/vcpkg-ci-nanobind/vcpkg.json   |  1 -
 scripts/test_ports/vcpkg-ci-opencv/vcpkg.json | 20 ++++++++---------
 .../test_ports/vcpkg-ci-paraview/vcpkg.json   | 22 +++++++++----------
 7 files changed, 46 insertions(+), 49 deletions(-)

diff --git a/scripts/test_ports/vcpkg-ci-ankurvdev-embedresource/vcpkg.json b/scripts/test_ports/vcpkg-ci-ankurvdev-embedresource/vcpkg.json
index 1c13e81768..a8267bb005 100644
--- a/scripts/test_ports/vcpkg-ci-ankurvdev-embedresource/vcpkg.json
+++ b/scripts/test_ports/vcpkg-ci-ankurvdev-embedresource/vcpkg.json
@@ -4,9 +4,7 @@
   "description": "Validates ankurvdev-embedresource",
   "license": "BSD-3-Clause",
   "dependencies": [
-    {
-      "name": "ankurvdev-embedresource"
-    },
+    "ankurvdev-embedresource",
     {
       "name": "vcpkg-cmake",
       "host": true
diff --git a/scripts/test_ports/vcpkg-ci-arrow/vcpkg.json b/scripts/test_ports/vcpkg-ci-arrow/vcpkg.json
index b5e4ed3458..8bf9a80286 100644
--- a/scripts/test_ports/vcpkg-ci-arrow/vcpkg.json
+++ b/scripts/test_ports/vcpkg-ci-arrow/vcpkg.json
@@ -4,10 +4,6 @@
   "description": "Builds an example app in order to validate the arrow port.",
   "license": "Apache-2.0",
   "dependencies": [
-    {
-      "name": "vcpkg-cmake",
-      "host": true
-    },
     {
       "name": "arrow",
       "default-features": false,
@@ -15,6 +11,10 @@
         "csv",
         "example"
       ]
+    },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
     }
   ]
 }
diff --git a/scripts/test_ports/vcpkg-ci-curl/vcpkg.json b/scripts/test_ports/vcpkg-ci-curl/vcpkg.json
index 164e251d08..53ec77ec42 100644
--- a/scripts/test_ports/vcpkg-ci-curl/vcpkg.json
+++ b/scripts/test_ports/vcpkg-ci-curl/vcpkg.json
@@ -5,6 +5,12 @@
   "homepage": "https://github.com/microsoft/vcpkg",
   "license": "MIT",
   "dependencies": [
+    {
+      "name": "curl",
+      "features": [
+        "idn"
+      ]
+    },
     {
       "name": "curl",
       "features": [
@@ -23,15 +29,16 @@
     {
       "name": "curl",
       "features": [
-        "idn"
-      ]
+        "psl"
+      ],
+      "platform": "!uwp"
     },
     {
       "name": "curl",
       "features": [
-        "psl"
+        "gssapi"
       ],
-      "platform": "!uwp"
+      "platform": "linux | osx"
     },
     {
       "name": "curl",
@@ -40,13 +47,6 @@
         "tool"
       ],
       "platform": "!android & !uwp"
-    },
-    {
-      "name": "curl",
-      "features": [
-        "gssapi"
-      ],
-      "platform": "linux | osx"
     }
   ]
 }
diff --git a/scripts/test_ports/vcpkg-ci-llvm/vcpkg.json b/scripts/test_ports/vcpkg-ci-llvm/vcpkg.json
index e5c34eae89..ec09695384 100644
--- a/scripts/test_ports/vcpkg-ci-llvm/vcpkg.json
+++ b/scripts/test_ports/vcpkg-ci-llvm/vcpkg.json
@@ -23,6 +23,15 @@
         "tools"
       ]
     },
+    {
+      "$comment": "Platform restriction due to CI artifact upload quirks; libc",
+      "name": "llvm",
+      "default-features": false,
+      "features": [
+        "libc"
+      ],
+      "platform": "linux"
+    },
     {
       "$comment": "Platform restriction due to CI artifact upload quirks; features which need utils",
       "name": "llvm",
@@ -34,15 +43,6 @@
         "utils"
       ],
       "platform": "!static & !x86"
-    },
-    {
-      "$comment": "Platform restriction due to CI artifact upload quirks; libc",
-      "name": "llvm",
-      "default-features": false,
-      "features": [
-        "libc"
-      ],
-      "platform": "linux"
     }
   ]
 }
diff --git a/scripts/test_ports/vcpkg-ci-nanobind/vcpkg.json b/scripts/test_ports/vcpkg-ci-nanobind/vcpkg.json
index 5cd7db5522..947690d3fa 100644
--- a/scripts/test_ports/vcpkg-ci-nanobind/vcpkg.json
+++ b/scripts/test_ports/vcpkg-ci-nanobind/vcpkg.json
@@ -12,4 +12,3 @@
     }
   ]
 }
-
diff --git a/scripts/test_ports/vcpkg-ci-opencv/vcpkg.json b/scripts/test_ports/vcpkg-ci-opencv/vcpkg.json
index 9eea154ce3..6cb18e7173 100644
--- a/scripts/test_ports/vcpkg-ci-opencv/vcpkg.json
+++ b/scripts/test_ports/vcpkg-ci-opencv/vcpkg.json
@@ -26,11 +26,19 @@
       "name": "opencv",
       "default-features": false,
       "features": [
-        "gtk",
-        "dc1394"
+        "dc1394",
+        "gtk"
       ],
       "platform": "linux"
     },
+    {
+      "name": "opencv",
+      "default-features": false,
+      "features": [
+        "python"
+      ],
+      "platform": "!uwp & !(windows & static)"
+    },
     {
       "name": "opencv",
       "default-features": false,
@@ -60,14 +68,6 @@
         "vtk"
       ],
       "platform": "!uwp & !(windows & (arm | arm64))"
-    },
-    {
-      "name": "opencv",
-      "default-features": false,
-      "features": [
-        "python"
-      ],
-      "platform": "!uwp & !(windows & static)"
     }
   ]
 }
diff --git a/scripts/test_ports/vcpkg-ci-paraview/vcpkg.json b/scripts/test_ports/vcpkg-ci-paraview/vcpkg.json
index d0c7c1bcc2..a455c8b00b 100644
--- a/scripts/test_ports/vcpkg-ci-paraview/vcpkg.json
+++ b/scripts/test_ports/vcpkg-ci-paraview/vcpkg.json
@@ -17,8 +17,17 @@
       "name": "paraview",
       "default-features": false,
       "features": [
-        "python",
-        "mpi"
+        "tools",
+        "vtkm"
+      ],
+      "platform": "!(x86 & windows)"
+    },
+    {
+      "name": "paraview",
+      "default-features": false,
+      "features": [
+        "mpi",
+        "python"
       ],
       "platform": "!(windows & static) & !x86"
     },
@@ -38,15 +47,6 @@
         "openvr"
       ],
       "platform": "!osx & !(windows & staticcrt)"
-    },
-    {
-      "name": "paraview",
-      "default-features": false,
-      "features": [
-        "tools",
-        "vtkm"
-      ],
-      "platform": "!(x86 & windows)"
     }
   ]
 }