From 00cffb0c9a7ab4bc72c2d0c800a0bf96f725b912 Mon Sep 17 00:00:00 2001
From: Anton Bolshakov <blshkv@gmail.com>
Date: Thu, 1 Feb 2024 10:06:31 +0800
Subject: [PATCH] bundler: make 2.4.x stable

---
 dev-ruby/bundler/Manifest                     |  2 --
 dev-ruby/bundler/bundler-2.2.33-r1.ebuild     | 32 -------------------
 dev-ruby/bundler/bundler-2.3.26-r1.ebuild     | 32 -------------------
 dev-ruby/bundler/files/nosudo.patch           | 13 --------
 dev-ruby/bundler/metadata.xml                 | 11 -------
 .../base/package.accept_keywords/dev-ruby     |  3 ++
 profiles/pentoo/base/package.mask             |  4 ---
 7 files changed, 3 insertions(+), 94 deletions(-)
 delete mode 100644 dev-ruby/bundler/Manifest
 delete mode 100644 dev-ruby/bundler/bundler-2.2.33-r1.ebuild
 delete mode 100644 dev-ruby/bundler/bundler-2.3.26-r1.ebuild
 delete mode 100644 dev-ruby/bundler/files/nosudo.patch
 delete mode 100644 dev-ruby/bundler/metadata.xml

diff --git a/dev-ruby/bundler/Manifest b/dev-ruby/bundler/Manifest
deleted file mode 100644
index 1fef95788..000000000
--- a/dev-ruby/bundler/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST bundler-2.2.33.gem 401920 BLAKE2B bfdb62c86449683d479f735ff6d65d33576ff03f1d67f6001c46839111ee3c1307db86c9d02f050c2290b1d2e3133da1010ab9d1012aa0ee4c207148ff913aac SHA512 8ac6bc00eb7a206fbd4e0d0de5d636583f48006b51352e50896230afba1098aeae2418694c8592f73af02612fe8e10dacd71b79804b724fad7633b23c81f1d14
-DIST bundler-2.3.26.gem 411648 BLAKE2B 5ea0ff86e0e09bf0466e4bb21502a13519515f312b3df62024f0d293a51237eb30a5b3c349fb867e9b8dbf0e50ede5bc12b14c5cc6014a717d55534bf46d18f5 SHA512 03c6310c63ec4d313d48ecb15e784ae9cb2d2cb2cefc75752bbb7c018eeec45d534259646d525e486cd746ee8c179312c167338875e13f826994617622d2330d
diff --git a/dev-ruby/bundler/bundler-2.2.33-r1.ebuild b/dev-ruby/bundler/bundler-2.2.33-r1.ebuild
deleted file mode 100644
index 144ac9fd7..000000000
--- a/dev-ruby/bundler/bundler-2.2.33-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby31 ruby32"
-
-# The specs require a number of gems to be installed in a temporary
-# directory, but this requires network access. They also don't work
-# when run with a path that contains "-".
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-# No documentation task
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An easy way to vendor gem dependencies"
-HOMEPAGE="https://github.com/carlhuda/bundler"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-ruby_add_rdepend virtual/rubygems
-
-RDEPEND+=" dev-vcs/git !<dev-ruby/bundler-1.17.3-r1:0"
-
-PATCHES=("${FILESDIR}/nosudo.patch")
diff --git a/dev-ruby/bundler/bundler-2.3.26-r1.ebuild b/dev-ruby/bundler/bundler-2.3.26-r1.ebuild
deleted file mode 100644
index 9b341410d..000000000
--- a/dev-ruby/bundler/bundler-2.3.26-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby31 ruby32"
-
-# The specs require a number of gems to be installed in a temporary
-# directory, but this requires network access. They also don't work
-# when run with a path that contains "-".
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-# No documentation task
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An easy way to vendor gem dependencies"
-HOMEPAGE="https://github.com/carlhuda/bundler"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc test"
-
-ruby_add_rdepend virtual/rubygems
-
-RDEPEND+=" dev-vcs/git"
-
-PATCHES=("${FILESDIR}/nosudo.patch")
diff --git a/dev-ruby/bundler/files/nosudo.patch b/dev-ruby/bundler/files/nosudo.patch
deleted file mode 100644
index 2c430302e..000000000
--- a/dev-ruby/bundler/files/nosudo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/lib/bundler/settings.rb.orig	2021-06-06 07:55:24.585385160 +0800
-+++ b/lib/bundler/settings.rb	2021-06-06 08:02:30.405361977 +0800
-@@ -265,9 +265,7 @@
-     end
- 
-     def allow_sudo?
--      key = key_for(:path)
--      path_configured = @temporary.key?(key) || @local_config.key?(key)
--      !path_configured
-+      false
-     end
- 
-     def ignore_config?
diff --git a/dev-ruby/bundler/metadata.xml b/dev-ruby/bundler/metadata.xml
deleted file mode 100644
index bdb962a84..000000000
--- a/dev-ruby/bundler/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">carlhuda/bundler</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/profiles/pentoo/base/package.accept_keywords/dev-ruby b/profiles/pentoo/base/package.accept_keywords/dev-ruby
index a3f2dccee..37f35ed56 100644
--- a/profiles/pentoo/base/package.accept_keywords/dev-ruby
+++ b/profiles/pentoo/base/package.accept_keywords/dev-ruby
@@ -270,3 +270,6 @@ dev-ruby/sprockets:4
 
 #required by whatweb
 =dev-ruby/ipaddr-1.2*
+
+#use 2.4.x with no auto_sudo malicious feature
+~dev-ruby/bundler-2.4.6
diff --git a/profiles/pentoo/base/package.mask b/profiles/pentoo/base/package.mask
index e1cd6df1b..5dd0f748e 100644
--- a/profiles/pentoo/base/package.mask
+++ b/profiles/pentoo/base/package.mask
@@ -55,10 +55,6 @@ dev-lang/ruby:2.5
 # must match rails:6.1 and dev-ruby/act*:6.1
 #dev-ruby/activesupport:6.1
 
-#disable sudo
-# https://github.com/rubygems/rubygems/issues/4031
->dev-ruby/bundler-2.3.26-r1
-
 #transition from pycrypto to pycryptodome
 dev-python/pycrypto