gentoo auto-resync : 23:08:2023 - 09:48:32

3 files changed, 15 insertions, 13 deletions

diff --git a/dev-ruby/actionmailbox/Manifest b/dev-ruby/actionmailbox/Manifest
index 368b19562de0..7822c546d0a9 100644
--- a/dev-ruby/actionmailbox/Manifest
+++ b/dev-ruby/actionmailbox/Manifest
@@ -1,10 +1,10 @@
 AUX actionmailbox-6.1.7.4-mail28.patch 1675 BLAKE2B 9b97a918a467fa38349e2d84a7845917e4159b8e9eeaf0772ede54465099aa112287ecc7a2c48f593b3076f8c8b0008e02c0ab37ebbefec168c55d82cb9ec4c1 SHA512 c71c257ba08555609649ab153bd43a4c99093c8e56a5d57af8ff0ec36515a4c1174f8209fc37f03bf583f35b37fc3217c708ce94a224d53f6f4cfec572c71c3b
 DIST rails-6.1.7.4.tgz 11038583 BLAKE2B 737044b6f92f2555fd9374e0b0fef7e26e53e2ac2103f1e3d89124929416aeda1295adfa7493471472c6ff0fbb057dea0bd9c184bbb45ae572185b98c399177f SHA512 caa7e2a79f747befb5f6f17adec1cc43530dbb35741775b2ebdcf59476efecd277dad025073a4b519a35754367cca04290c24bb8d8ae4235fda696ead531a94f
-DIST rails-7.0.5.1.tgz 11077848 BLAKE2B 17dc2527b762d242c1cc141b5480c0917c8eafb53c55d3034d5af272e9be5760f6c3e16ce1a60041f11af4f99da23e79ff46e9f9fe88412932f2524bf057c478 SHA512 5053ed666cede0bfeb7a534f248538406a1bf5afe0d5ee9e285b4eeb3158566fdd665c7a20012833e6927e7dbb3d881361a5d7f8ce7e326f8e3faf5d571da3e7
-DIST rails-7.0.6.tgz 11090672 BLAKE2B 87d3c1d37f0af4c6a9590d9e38cf1674c59b01b1e15d9883e4d303935b13c48cf9a53d9b3db63490a515b035ba500c6db9b938c329ee82f3adf9eb5897a69fe7 SHA512 93d91d25117e01460d3bd9bdd21743d19f377487a4cd2d0cd22f4d9deba524451033c83f52515270ff823b6c26306fe30be8c360bb527c59a789c04dd5fc1dac
+DIST rails-6.1.7.6.tgz 11040086 BLAKE2B 8b5311752952403cf8eae31b5d8e8d376c4b449f512e86df66b3e921375ffa3ea11e15f1d74a7f8ec9179ff70c32a6d4f8de75be5f92fe6315ee97164e22d2d0 SHA512 c4163565b2324ce97317d252f3d9e2e673a12b6ae7f54571645c958ce30221f1b357887ade80e46abdd47a422736b9946e49850d52ffd72d8acc87f35224e69f
+DIST rails-7.0.7.2.tgz 11085454 BLAKE2B 05574b6df7e28e409949fb311110fd7137d61c31072b394f950a180135201132f3cf9c5cca8f76c661827d7a5e807bfc4b0c97a449b8941115cbe3a0f2f84f62 SHA512 41fad11bd272ea21f7d15d855da04230f0801d9926f6ce3300754f1b2b9d691f18e55855b1a71e44faaf483b397b02ac11c75eb415b7c8976868bc9aefe5b005
 DIST rails-7.0.7.tgz 11071730 BLAKE2B 215642609be86bd9977dc2cdb09a76c64e99260359d0a60aa411a5df572d7699a5f9959ea8aa0ff116ad75110db060436abcfb17da689b1a6aa819fd56373279 SHA512 75f952dfe4d9abc1473dfb017e42daec6358a45efad14a3b39a1b2dc5fec566757c2225fe920a4e872e896966cfb1d4b6e1c40c93d2043aec3bf5bd25ff7c956
 EBUILD actionmailbox-6.1.7.4.ebuild 2171 BLAKE2B 3e85d2b079c38e5fbb738f80b2ce69a9d75f049a109fef04d0dc72223830b32dee95e9c39f4a260ee0cdd5547398b7b5a3b645498873413a8ed7704c6279e32f SHA512 bb02a0ea0caa82eaed106e0b87de7f3353a2ab1d33ab7cfdcd3f5ed1a58049e79ec047ec49505391e5edf36ffba6b0f656375a6c3d600f13cf5850b32a3b662b
-EBUILD actionmailbox-7.0.5.1.ebuild 2124 BLAKE2B ba48b66bfceca2a402b98c56f92843f992a305847e56473f046b10f5affc83a06608d94f78d99a7cef14d80f8996cc686188f7c7e685e27fdaa915648b200f6e SHA512 2bb785292a639c7b91e3be72a189a03db8856ca6b38e16f3cc45c8c00f11b3601e045a5802e8f9a095ba1122b35a2847208086edd1e446e133e85739a5e4df8c
-EBUILD actionmailbox-7.0.6.ebuild 2109 BLAKE2B be6a3fb6eb2c9b18b6f940ba350aae5fe2d551a0967edd470dda8600eb1234b8be855816658ca8d1eb3511811f04db3c8d9c9a91601c0049ec61048f6e048e18 SHA512 0fc0d5a7ed2a06555a39f01c49c20c7ccf4aab36a28b927ce9ad423cecf02ab3680d54bc9d8d20cb9462168fd4266d3a3f3abd03f08badd45d8658c50b4e0003
+EBUILD actionmailbox-6.1.7.6.ebuild 2173 BLAKE2B 61fcc75daeab7a1a9df77ee19312fc9a451176f27364112c2e811171c985528ac9d00bb0b407697e0b5a75fd05399195b7e971c6a92797e2346e0361a9927130 SHA512 47a7f4687b99fd4504e01afa43f46f4e0958a3be936d5524a78934896a5a6c4e903848f7efb1ccbf552b7d4342b7f381e7a0653edf30dd9f2534de25a173357b
+EBUILD actionmailbox-7.0.7.2.ebuild 2109 BLAKE2B be6a3fb6eb2c9b18b6f940ba350aae5fe2d551a0967edd470dda8600eb1234b8be855816658ca8d1eb3511811f04db3c8d9c9a91601c0049ec61048f6e048e18 SHA512 0fc0d5a7ed2a06555a39f01c49c20c7ccf4aab36a28b927ce9ad423cecf02ab3680d54bc9d8d20cb9462168fd4266d3a3f3abd03f08badd45d8658c50b4e0003
 EBUILD actionmailbox-7.0.7.ebuild 2109 BLAKE2B be6a3fb6eb2c9b18b6f940ba350aae5fe2d551a0967edd470dda8600eb1234b8be855816658ca8d1eb3511811f04db3c8d9c9a91601c0049ec61048f6e048e18 SHA512 0fc0d5a7ed2a06555a39f01c49c20c7ccf4aab36a28b927ce9ad423cecf02ab3680d54bc9d8d20cb9462168fd4266d3a3f3abd03f08badd45d8658c50b4e0003
 MISC metadata.xml 338 BLAKE2B f32f1ecbd729e4e6162f22cdb9bfe1fbb1284c8b7f021d8207a1a54d2543b0e9866e775d550360dd01ef4f4eb92e96064a8416476c7047853034ea05479eb6e7 SHA512 24fd0d8ea6e3cd5514e5049b7e064b7e3e667ea14978cc7cf620e9c1b020bdc7caf7dbec97ccbf92c2f4c657fff3e9151d6f2af103b3d9c3cc5181cb3a81a295
diff --git a/dev-ruby/actionmailbox/actionmailbox-7.0.5.1.ebuild b/dev-ruby/actionmailbox/actionmailbox-6.1.7.6.ebuild
index e27cb2a349cc..90a90bf86e18 100644
--- a/dev-ruby/actionmailbox/actionmailbox-7.0.5.1.ebuild
+++ b/dev-ruby/actionmailbox/actionmailbox-6.1.7.6.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby30 ruby31 ruby32"
+USE_RUBY="ruby31 ruby32"
 
 RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
@@ -20,11 +20,15 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1.7.4-mail28.patch
+)
+
 ruby_add_rdepend "
 	~dev-ruby/actionpack-${PV}
 	~dev-ruby/activejob-${PV}
@@ -32,17 +36,12 @@ ruby_add_rdepend "
 	~dev-ruby/activestorage-${PV}
 	~dev-ruby/activesupport-${PV}
 	>=dev-ruby/mail-2.7.1:*
-	dev-ruby/net-imap
-	dev-ruby/net-pop
-	dev-ruby/net-smtp
 "
 
 ruby_add_bdepend "test? (
 	dev-ruby/bundler
-	dev-ruby/mail
 	<dev-ruby/minitest-5.16
 	dev-ruby/mocha
-	dev-ruby/propshaft
 	dev-ruby/rexml
 	dev-ruby/sqlite3
 	dev-ruby/webmock
@@ -52,12 +51,15 @@ ruby_add_bdepend "test? (
 all_ruby_prepare() {
 	# Remove items from the common Gemfile that we don't need for this
 	# test run. This also requires handling some gemspecs.
-	sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|webrick\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|rack-test\|capybara\|webpacker\|bootsnap\|dalli\|connection_pool\|terser\|cookiejar\|cgi\)/ s:^:#:" \
-		-e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
+	sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|webrick\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|rack-test\|capybara\|webpacker\|bootsnap\|dalli\|connection_pool\)/ s:^:#:" \
 		-e '/group :\(cable\|doc\|job\|rubocop\|storage\|test\)/,/^end/ s:^:#:' \
 		-i ../Gemfile || die
 	rm ../Gemfile.lock || die
 	sed -i -e '/byebug/ s:^:#:' test/test_helper.rb || die
+
+	# Avoid a test failing because the actionmailer part of the tarball
+	# is not patched for ruby32. Fixed in next upstream release.
+	rm -f test/unit/mailbox/bouncing_test.rb || die
 }
 
 each_ruby_prepare() {
diff --git a/dev-ruby/actionmailbox/actionmailbox-7.0.6.ebuild b/dev-ruby/actionmailbox/actionmailbox-7.0.7.2.ebuild
index af4d931f2377..af4d931f2377 100644
--- a/dev-ruby/actionmailbox/actionmailbox-7.0.6.ebuild
+++ b/dev-ruby/actionmailbox/actionmailbox-7.0.7.2.ebuild