Revert "zen-repo EASTL"

This reverts commit ae50f63f30450f258478c83dbac5af0031a93cf0.

6 files changed, 4 insertions, 59 deletions

diff --git a/repo/packages/e/eabase/xmake.lua b/repo/packages/e/eabase/xmake.lua
deleted file mode 100644
index fce7e356f..000000000
--- a/repo/packages/e/eabase/xmake.lua
+++ /dev/null
@@ -1,18 +0,0 @@
-package("eabase")
-    set_kind("library", {headeronly = true})
-    set_homepage("https://github.com/electronicarts/EABase")
-    set_description("EABase is a small set of header files that define platform-independent data types and platform feature macros.")
-    set_license("BSD-3-Clause")
-
-    add_urls("https://github.com/electronicarts/EABase/archive/$(version).tar.gz")
-    add_versions("2.09.05", "f85b98c96f1976aa013c8d6016c5e37a409633ac3fce843cd4ec0b89c67e6b7a")
-
-    on_install("windows", "linux", "macosx", function (package)
-        os.cp("include/Common/EABase", package:installdir("include"))
-    end)
-
-
-    on_test(function (package)
-        assert(package:has_cxxfuncs("EA_LIMITS_DIGITS_U(int)",
-            {configs = {languages = "c++17"}, includes = "EABase/eabase.h"}))
-    end)
diff --git a/repo/packages/e/eastl/xmake.lua b/repo/packages/e/eastl/xmake.lua
deleted file mode 100644
index 9ba0a0bd1..000000000
--- a/repo/packages/e/eastl/xmake.lua
+++ /dev/null
@@ -1,37 +0,0 @@
-package("eastl")
-
-    set_homepage("https://github.com/electronicarts/EASTL")
-    set_description("EASTL stands for Electronic Arts Standard Template Library.")
-    set_license("BSD-3-Clause")
-
-    set_urls("https://github.com/electronicarts/EASTL/archive/refs/tags/$(version).tar.gz",
-             "https://github.com/electronicarts/EASTL.git")
-    add_versions("3.17.03", "50a072066e30fda364d482df6733572d8ca440a33825d81254b59a6ca9f4375a")
-    add_versions("3.17.06", "9ebeef26cdf091877ee348450d2711cd0bb60ae435309126c0adf8fec9a01ea5")
-    add_versions("3.18.00", "a3c5b970684be02e81fb16fbf92ed2584e055898704fde87c72d0331afdea12b")
-    add_versions("3.21.12", "2a4d77e5eda23ec52fea8b22abbf2ea8002f38396d2a3beddda3ff2e17f7db2e")
---    add_versions("3.21.23", "2bcb48f88f7daf9f91c165aae751c10d11d6959b6e10f2dda8f1db893e684022")
-
-    add_deps("cmake")
-    add_deps("eabase")
-
-    on_install("windows", "linux", "macosx", function (package)
-        io.replace("CMakeLists.txt", "add_subdirectory(test/packages/EABase)", "", {plain = true})
-        io.replace("CMakeLists.txt", "target_link_libraries(EASTL EABase)", "", {plain = true})
-        local configs = {"-DEASTL_BUILD_TESTS=OFF", "-DEASTL_BUILD_BENCHMARK=OFF"}
-        table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))
-        if not package:is_plat("windows") then
-            table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF"))
-        end
-        import("package.tools.cmake").install(package, configs, {packagedeps = "eabase"})
-        os.cp("include/EASTL", package:installdir("include"))
-    end)
-
-
-    on_test(function (package)
-        assert(package:check_cxxsnippets({test = [[
-            void test() {
-                eastl::vector<int> testInt{};
-            }
-        ]]},{configs = {languages = "c++17"}, includes = "EASTL/vector.h"}))
-    end)
diff --git a/src/zencore/xmake.lua b/src/zencore/xmake.lua
index 74102b3ac..a95473340 100644
--- a/src/zencore/xmake.lua
+++ b/src/zencore/xmake.lua
@@ -41,7 +41,7 @@ target('zencore')
         )
 
     add_packages(
-        "eastl",
+        "vcpkg::eastl",
         "vcpkg::fmt",
         "vcpkg::gsl-lite", 
         "vcpkg::lz4",
diff --git a/src/zenremotestore/xmake.lua b/src/zenremotestore/xmake.lua
index bf3deb5a1..35d554710 100644
--- a/src/zenremotestore/xmake.lua
+++ b/src/zenremotestore/xmake.lua
@@ -8,4 +8,4 @@ target('zenremotestore')
     add_includedirs("include", {public=true})
     add_deps("zencore", "zenstore", "zenutil")
     add_packages("vcpkg::robin-map")
-    add_packages("eastl", {public=true});
+    add_packages("vcpkg::eastl", {public=true});
diff --git a/src/zenstore/xmake.lua b/src/zenstore/xmake.lua
index 6b1e9bb5d..cf5f30d09 100644
--- a/src/zenstore/xmake.lua
+++ b/src/zenstore/xmake.lua
@@ -8,4 +8,4 @@ target('zenstore')
     add_includedirs("include", {public=true})
     add_deps("zencore", "zenutil", "zenvfs")
     add_packages("vcpkg::robin-map")
-    add_packages("eastl", {public=true});
+    add_packages("vcpkg::eastl", {public=true});
diff --git a/xmake.lua b/xmake.lua
index 95094f097..2f661f221 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -5,10 +5,10 @@ set_configvar("ZEN_SCHEMA_VERSION", 5) -- force state wipe after 0.2.31 causing
 add_repositories("zen-repo repo")
 
 add_requires("xxhash 0.8.2", {system = false})
-add_requires("eastl", {system = false})
 
 add_requires(
     "vcpkg::curl",
+    "vcpkg::eastl",
     "vcpkg::fmt",
     "vcpkg::gsl-lite",
     "vcpkg::http-parser",