From 587f4d68dc70a7c0d30f4fa27ce441d372518d4c Mon Sep 17 00:00:00 2001
From: Alex Genco <alexgenco@gmail.com>
Date: Sun, 22 Feb 2026 08:55:28 -0800
Subject: [PATCH 1/2] Remove vim-flavor dependency

vim-flavor is not compatible with ruby 4. It's only used to install
`vim-themis`, which we can just clone manually.
---
 .github/workflows/tests.yml | 1 -
 .gitignore                  | 2 --
 Flavorfile                  | 1 -
 Flavorfile.lock             | 1 -
 Rakefile                    | 8 +++++---
 neovim.gemspec              | 1 -
 script/run_acceptance.rb    | 2 +-
 7 files changed, 6 insertions(+), 10 deletions(-)
 delete mode 100644 Flavorfile
 delete mode 100644 Flavorfile.lock

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index f14d1d41..5d9dfd7b 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -57,6 +57,5 @@ jobs:
           args: install neovim -fy --ignore-dependencies --ignore-checksums
       - name: Run tests
         env:
-          VIM_FLAVOR_HOME: 'D:\'
           NVIM_EXECUTABLE: 'C:\tools\neovim\nvim-win64\bin\nvim'
         run: bundle exec rake spec
diff --git a/.gitignore b/.gitignore
index 6cb96833..bdadc0d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,6 @@
 .config
 .yardoc
 Gemfile.lock
-VimFlavor.lock
 InstalledFiles
 _yardoc
 coverage
@@ -22,4 +21,3 @@ spec/acceptance/runtime/pack
 spec/acceptance/runtime/rplugin_manifest.vim
 vendor/bundle
 bin
-.vim-flavor
diff --git a/Flavorfile b/Flavorfile
deleted file mode 100644
index 19062b92..00000000
--- a/Flavorfile
+++ /dev/null
@@ -1 +0,0 @@
-flavor "thinca/vim-themis", branch: "master"
diff --git a/Flavorfile.lock b/Flavorfile.lock
deleted file mode 100644
index cc225b67..00000000
--- a/Flavorfile.lock
+++ /dev/null
@@ -1 +0,0 @@
-thinca/vim-themis (c1f4d465ce7dd23735513551b5c4c918d9c1bab1 at master)
diff --git a/Rakefile b/Rakefile
index 85f8e5c1..eec33d21 100644
--- a/Rakefile
+++ b/Rakefile
@@ -3,19 +3,21 @@ require "rspec/core/rake_task"
 
 Bundler.setup
 
+THEMIS_DIR = "spec/acceptance/runtime/pack/deps/start/vim-themis"
+
 namespace :spec do
   desc "Run functional specs"
   RSpec::Core::RakeTask.new(:functional)
 
   desc "Run acceptance specs"
-  task acceptance: "acceptance:deps" do
+  task acceptance: THEMIS_DIR do
     run_script("run_acceptance.rb", "--reporter", "dot", "spec/acceptance")
   end
 
   namespace :acceptance do
     desc "Install acceptance spec dependencies"
-    task :deps do
-      sh "vim-flavor update --vimfiles-path=spec/acceptance/runtime"
+    directory THEMIS_DIR do
+      sh "git clone git@github.com:thinca/vim-themis.git #{THEMIS_DIR}"
     end
   end
 end
diff --git a/neovim.gemspec b/neovim.gemspec
index d3e197fb..8f184969 100644
--- a/neovim.gemspec
+++ b/neovim.gemspec
@@ -28,5 +28,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "vim-flavor"
 end
diff --git a/script/run_acceptance.rb b/script/run_acceptance.rb
index 4f6ba89c..1955ff78 100755
--- a/script/run_acceptance.rb
+++ b/script/run_acceptance.rb
@@ -8,7 +8,7 @@
 root = File.expand_path("..", __dir__)
 acceptance_root = File.join(root, "spec/acceptance")
 themis_rtp = File.join(acceptance_root, "runtime")
-themis_home = File.join(themis_rtp, "pack/flavors/start/thinca_vim-themis")
+themis_home = File.join(themis_rtp, "pack/deps/start/vim-themis")
 manifest = File.join(themis_rtp, "rplugin_manifest.vim")
 vimrc = File.join(themis_rtp, "init.vim")
 nvim = ENV.fetch("NVIM_EXECUTABLE", "nvim")

From 083a6d14b6b68f02054dd55f38b3c3fb8c1da19b Mon Sep 17 00:00:00 2001
From: Alex Genco <alexgenco@gmail.com>
Date: Sun, 22 Feb 2026 09:03:03 -0800
Subject: [PATCH 2/2] fixup! Remove vim-flavor dependency

checkout with github action
---
 .github/workflows/tests.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 5d9dfd7b..4d9d056b 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -21,6 +21,10 @@ jobs:
       - uses: actions/checkout@v2
         with:
           repository: neovim/neovim-ruby
+      - uses: actions/checkout@v2
+        with:
+          repository: thinca/vim-themis
+          path: spec/acceptance/runtime/pack/deps/start/vim-themis
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
@@ -47,6 +51,10 @@ jobs:
       - uses: actions/checkout@v2
         with:
           repository: neovim/neovim-ruby
+      - uses: actions/checkout@v2
+        with:
+          repository: thinca/vim-themis
+          path: spec/acceptance/runtime/pack/deps/start/vim-themis
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ruby