6 files changed, 169 insertions, 8 deletions
diff --git a/dev-ruby/mail/Manifest b/dev-ruby/mail/Manifest
index b778f8e08ea0..100437f4c38c 100644
--- a/dev-ruby/mail/Manifest
+++ b/dev-ruby/mail/Manifest
@@ -1,9 +1,11 @@
+AUX mail-2.7.1-psych-4.patch 3853 BLAKE2B 1effb161924ca0726ecc2f7870ff4df5c7d9faf83adfd24df41703a04635b882ec8a2f490d461cbfed2748db3ed994840315dda040e26587fcb1ff601d765216 SHA512 65aeef03f6eb3616fadc40a5343aa2c7bc72d8d5230b1f646ff99009b89fdb560681de1255057696b3d1c0f6f13e6d0e385048f87e61f243376a162ff32d056a
 DIST mail-2.7.1-git.tar.gz 625251 BLAKE2B c1efbb259042155e983c1971fe9821eb0dd850089bd04cb0c74513f6f17dabf8ecc3155d9e5846ae657383f522872323f8fba37d51fba4318ac682d18a6d4c50 SHA512 17c601c86715135331f750048339a11a67a17f34486dbafa3ba7e9af9970d60927a2fa95c72a398418548df1fdf5addb2ed3afe9da7dff1f0bd949438726be1b
 DIST mail-2.8.0-git.tar.gz 620136 BLAKE2B 4c115ddf92ef18c7889d391d264bf4c0be37be4849accf6e4778cc50317a4c0cd5f042c465f4f7862ca33e1de166b35bcb6d6e08e3fe44cce6aecbf1c1f9380e SHA512 ac60d72d16dd75fb5e8474900e069d5f711ce66340582a96d1f79ba582841cb82b212637053f45d1014997776ff411cbc8f9c19e06f024f6aa59b09c50c02583
 DIST mail-2.8.0.1-git.tar.gz 620162 BLAKE2B 92a183df4cec63c194debb5fd1c5194f2fe8d909094f9b79c157c3c004574c78e8b2567c44a7f62f3a91af4689e7e2ca023768f005ff62998d0999a0d46e4bf3 SHA512 d2c84ffec336bb1967107641b741eef06238e37d68704024d3f037893e95fcf9501ffdb34f3f820e1f8df63b4057e0d329d09cd6a96281801ece6fb3d26f1a4d
 DIST mail-2.8.1-git.tar.gz 621412 BLAKE2B f39c3087bf5d064fd9a96b93ccac2fd0060c53a53c900658e3907dce311aabba8136ce96bcd4937f5a9852ed3d046e1354c3c2757330d80f9b3d0542fc27cd12 SHA512 2c176361285b17b10ab3e518502b05ac582f033f81fc45df0b61bfcb5b645ea22139ef3abf67240adb27a39834dfee59bb0777c6de5448c2fe2e52d5dde3465a
-EBUILD mail-2.7.1-r1.ebuild 893 BLAKE2B 5815eaf3478c7b8f0e9a236b4a885af5d6209a9cc25cb7ed2b8ed386abff258f2fec9b92903d66ca25c0701411a81b4e6310f85a6cbf4134e9718898ce71a865 SHA512 5e2d38dafbe411006ddb6fa8216646289801388dd940497972ea3d0a0e910c7ab4700d132396684bc738d6d03cc11eab8dbeea5d56f6be972b1f8e01a058869e
-EBUILD mail-2.8.0.1.ebuild 1014 BLAKE2B f1ba5b7ed87db5fdc1761a518db892e575a96fdd825539961b95fbba8944a1f385a11fdeec13db30dc63e7432f0acd4ca5dc9ba30f74ad201a2e96a2643d462d SHA512 9c75c9fb7355436bbd6c2c057cfdcc0b93c827b0415a72afba3726d78422f41ba904f4a136501e8f0c706c27f8d16681bab252de7db58e42db3d20b9cedb1eba
-EBUILD mail-2.8.0.ebuild 1014 BLAKE2B 327f555e6bb0d597251c99ae609266a2164e31078bf95e549ca58d0b73ef2c70f9160802239591ce72f3e2c7c53142fed732ed9754b0aaf11f655da52783e5d4 SHA512 be895ed118818f065e86aa6d759eb400ca079ebfec3004b1f322b07548357f4d51fe95bda1edf370a82e9635652234398b2a6112113a7859f96ed940ecc374cf
+EBUILD mail-2.7.1-r1.ebuild 900 BLAKE2B 7997703b19354c7ff61cf888f646fcd6ebf1e0d9a585ae9b3690f1c30be21e033b47e811d5a3c1775b1d9563018768e83eb4292b8c15a56675a0063502696394 SHA512 028799c731d25e03c9fa286decce08d3a29ea587a7874d549da7ed709a9b5117fefc51e87a7f26b78807c4a9e54e69562b68bd697c3f5bb9c9777eea6b0fe5e7
+EBUILD mail-2.7.1-r2.ebuild 949 BLAKE2B c82168f20e1eaf3fdfcf937aa90a19f942e95d4e46859ad6d375ba75dce0a8c5b297aa2ef8a9de9a29176536b1f701a1b1af305b267be0476af342ffb08f6bd2 SHA512 c30eaadb411315e5448755c941ce86d1238415abe352d1e7679d9f6cbe744d4f6b5ae0f7c04b94660d7dc5e23d9d791a0311055090ea6923364e032a5c9c063f
+EBUILD mail-2.8.0.1.ebuild 1021 BLAKE2B 492e5b9961e5f97c3eec209b9ea8ad6726550bbeea159a38b22451beaa27dc84cf3c47c1dfab5b5b562fc8aacf479341b173278f29d23ad5bd34abf2e3953239 SHA512 d99141264f04e58f032d4c44cb8117aee8c83a477e161e250a002cf80685712a289e1184722d6f645a858f1d660c18d159f18a6f7b414a572ed4012c3ef9e0a2
+EBUILD mail-2.8.0.ebuild 1021 BLAKE2B 492e5b9961e5f97c3eec209b9ea8ad6726550bbeea159a38b22451beaa27dc84cf3c47c1dfab5b5b562fc8aacf479341b173278f29d23ad5bd34abf2e3953239 SHA512 d99141264f04e58f032d4c44cb8117aee8c83a477e161e250a002cf80685712a289e1184722d6f645a858f1d660c18d159f18a6f7b414a572ed4012c3ef9e0a2
 EBUILD mail-2.8.1.ebuild 1021 BLAKE2B 492e5b9961e5f97c3eec209b9ea8ad6726550bbeea159a38b22451beaa27dc84cf3c47c1dfab5b5b562fc8aacf479341b173278f29d23ad5bd34abf2e3953239 SHA512 d99141264f04e58f032d4c44cb8117aee8c83a477e161e250a002cf80685712a289e1184722d6f645a858f1d660c18d159f18a6f7b414a572ed4012c3ef9e0a2
 MISC metadata.xml 337 BLAKE2B edda3267d35eae7a763cb191424ad231a356da5d17ce213061d0111e9addab8d34ae9bb52e47c0ea05d58258d04befa284aa3930d316429ca4b82c2d676bb61b SHA512 06ff50f20204499fef8bf6eb3af793ec7b471c2d1a29fd30b821086f934344a6251c0304cc52c9b720af5a7b7214831a68813c33f36fe4f679deb8667d3cb7f8
diff --git a/dev-ruby/mail/files/mail-2.7.1-psych-4.patch b/dev-ruby/mail/files/mail-2.7.1-psych-4.patch
new file mode 100644
index 000000000000..ea3dff47910e
--- /dev/null
+++ b/dev-ruby/mail/files/mail-2.7.1-psych-4.patch
@@ -0,0 +1,122 @@
+https://bugs.gentoo.org/835322
+
+https://github.com/mikel/mail/commit/a20fdd591bd5b1596983f5e1ee6ffed4e0b1f5f9
+https://sources.debian.org/patches/ruby-mail/2.7.1%2Bdfsg1-2/0001-Add-Mail-YAML-load-compatible-with-Psych-3.x-and-Psy.patch/
+
+From: =?utf-8?b?Sm9zZWYgxaBpbcOhbmVr?= <josef.simanek@gmail.com>
+Date: Sun, 4 Dec 2022 15:18:33 -0300
+Subject: Add Mail::YAML#load compatible with Psych 3.x and Psych 4.x.
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Co-authored-by: Vít Ondruch <vondruch@redhat.com>
+Backported-by: Antonio Terceiro <terceiro@debian.org>
+Origin: https://github.com/mikel/mail/commit/a20fdd591bd5b1596983f5e1ee6ffed4e0b1f5f9
+--- a/lib/mail/message.rb
++++ b/lib/mail/message.rb
+@@ -1,6 +1,6 @@
+ # encoding: utf-8
+ # frozen_string_literal: true
+-require "yaml"
++require "mail/yaml"
+ 
+ module Mail
+   # The Message class provides a single point of access to all things to do with an
+@@ -1867,7 +1867,7 @@ module Mail
+     end
+ 
+     def self.from_yaml(str)
+-      hash = YAML.load(str)
++      hash = Mail::YAML.load(str)
+       m = self.new(:headers => hash['headers'])
+       hash.delete('headers')
+       hash.each do |k,v|
+--- /dev/null
++++ b/lib/mail/yaml.rb
+@@ -0,0 +1,30 @@
++require 'yaml'
++
++module Mail
++  module YAML
++    def self.load(yaml)
++      permitted_classes = [
++        Symbol,
++
++        Mail::Body,
++
++        # Delivery methods as listed in mail/configuration.rb
++        Mail::SMTP,
++        Mail::Sendmail,
++        Mail::Exim,
++        Mail::FileDelivery,
++        Mail::SMTPConnection,
++        Mail::TestMailer,
++        Mail::LoggerDelivery,
++
++        Mail.delivery_method.class,
++      ]
++
++      if Gem::Version.new(Psych::VERSION) >= Gem::Version.new('3.1.0.pre1')
++        ::YAML.safe_load(yaml, :permitted_classes => permitted_classes)
++      else
++        ::YAML.safe_load(yaml, permitted_classes)
++      end
++    end
++  end
++end
+--- a/spec/mail/message_spec.rb
++++ b/spec/mail/message_spec.rb
+@@ -198,7 +198,7 @@ describe Mail::Message do
+ 
+       it "should serialize the basic information to YAML" do
+         yaml = @yaml_mail.to_yaml
+-        yaml_output = YAML.load(yaml)
++        yaml_output = Mail::YAML.load(yaml)
+         expect(yaml_output['headers']['To']).to       eq "someone@somewhere.com"
+         expect(yaml_output['headers']['Cc']).to       eq "someoneelse@somewhere.com"
+         expect(yaml_output['headers']['Subject']).to  eq "subject"
+@@ -216,7 +216,7 @@ describe Mail::Message do
+       it "should serialize a Message with a custom delivery_handler" do
+         @yaml_mail.delivery_handler = DeliveryAgent
+         yaml = @yaml_mail.to_yaml
+-        yaml_output = YAML.load(yaml)
++        yaml_output = Mail::YAML.load(yaml)
+         expect(yaml_output['delivery_handler']).to eq "DeliveryAgent"
+       end
+ 
+@@ -228,7 +228,7 @@ describe Mail::Message do
+ 
+       it "should not deserialize a delivery_handler that does not exist" do
+         yaml = @yaml_mail.to_yaml
+-        yaml_hash = YAML.load(yaml)
++        yaml_hash = Mail::YAML.load(yaml)
+         yaml_hash['delivery_handler'] = "NotARealClass"
+         deserialized = Mail::Message.from_yaml(yaml_hash.to_yaml)
+         expect(deserialized.delivery_handler).to be_nil
+--- a/spec/mail/parts_list_spec.rb
++++ b/spec/mail/parts_list_spec.rb
+@@ -89,6 +89,6 @@ describe "PartsList" do
+ 
+   it "should have a round-tripping YAML serialization" do
+     p = Mail::PartsList.new([1, 2])
+-    expect(YAML.load(YAML.dump(p))).to eq(p)
++    expect(Mail::YAML.load(YAML.dump(p))).to eq(p)
+   end
+ end
+--- /dev/null
++++ b/spec/mail/yaml_spec.rb
+@@ -0,0 +1,13 @@
++# encoding: utf-8
++# frozen_string_literal: true
++require 'spec_helper'
++
++describe Mail::YAML do
++
++  describe "#load" do
++
++    it 'loads YAML' do
++      expect(Mail::YAML.load('{}')).to eq({})
++    end
++  end
++end
diff --git a/dev-ruby/mail/mail-2.7.1-r1.ebuild b/dev-ruby/mail/mail-2.7.1-r1.ebuild
index 9646b2657694..e137da202092 100644
--- a/dev-ruby/mail/mail-2.7.1-r1.ebuild
+++ b/dev-ruby/mail/mail-2.7.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/mail/mail-2.7.1-r2.ebuild b/dev-ruby/mail/mail-2.7.1-r2.ebuild
new file mode 100644
index 000000000000..aa87cad31b49
--- /dev/null
+++ b/dev-ruby/mail/mail-2.7.1-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.md"
+
+RUBY_FAKEGEM_GEMSPEC="mail.gemspec"
+
+inherit ruby-fakegem
+
+GITHUB_USER="mikel"
+
+DESCRIPTION="An email handling library"
+HOMEPAGE="https://github.com/mikel/mail"
+SRC_URI="https://github.com/${GITHUB_USER}/mail/archive/${PV}.tar.gz -> ${P}-git.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/mini_mime-0.1.1"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-psych-4.patch
+)
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '/[Bb]undle/d' -e '6d' Rakefile || die "Unable to remove Bundler code."
+}
diff --git a/dev-ruby/mail/mail-2.8.0.1.ebuild b/dev-ruby/mail/mail-2.8.0.1.ebuild
index 0dce16387ebe..27ce6a1cead4 100644
--- a/dev-ruby/mail/mail-2.8.0.1.ebuild
+++ b/dev-ruby/mail/mail-2.8.0.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/mail/mail-2.8.0.ebuild b/dev-ruby/mail/mail-2.8.0.ebuild
index 705af4c7621c..27ce6a1cead4 100644
--- a/dev-ruby/mail/mail-2.8.0.ebuild
+++ b/dev-ruby/mail/mail-2.8.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"