gentoo resync : 19.03.2019

3 files changed, 17 insertions, 13 deletions

diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index 02bb93749d09..d0ff756dfb9f 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -4,11 +4,11 @@ AUX conf.d-gem_server 81 BLAKE2B 2019f1b5085a824e1a9e0551a8b224391b1db777f15aea7
 AUX gentoo-defaults.rb 972 BLAKE2B 4353b782296ad04f400fbdbd67dcc2f26b23a9bc4a716d107a8f98c5058676c675eb42e1d5e0a7214cd74df9148d54220c0202189938c45f4000301e52a3a73f SHA512 fd5a33c433041efeefba4bb8d550b8db66f31d4c0966188f07943f4f575ee9e13da6ef6fd66f89a4b3b979c5b310d96e2876407b79aee6ed404ca3027859160c
 AUX init.d-gem_server2 505 BLAKE2B ea5807a1c8ffdaa61bf37315c71d910bbf2bf4b0b4c62e3cef3b76176e9cc1fc39272f59bd46e55e17427f730315e2c691fa3f471c1cbf697073c45c0c7589a2 SHA512 fc2c57f4deebf479a36e69c3507f109abeda9f73b22bb2e617f56e6be0069af075fa6d66708d7324922f3d8bfaa96bd8c71292d9e388e27217cc7687ab4004e1
 DIST rubygems-2.7.6.tgz 852486 BLAKE2B b2c7cf7f2ce5a27beff846d85a3ca2867a4bbadd5bc76af0df76e774c239979bc4b3fac406a65c45444c9f401f92cd1058b45c8b3750c1ee5477cd2b4b513709 SHA512 bc168afc40c974dbc7c37eb5678432ba2ed7469c3f007a159699467ff2cff5205c508237193ee8becaa6eb555b043969cc5f92b2aaa6bf7c958dd7c187e258a7
-DIST rubygems-2.7.7.tgz 915847 BLAKE2B a7a2ae2b88d7e6bfc68c298802dd29d6dd0c76573e39a3088ba06b112761059f6bbbe4565e7e7e22fb1121fc597c2139dc8a80ae1555ab15713cb2ebc50f5710 SHA512 f93b7eacf5ef8725c40d618daf9deabc7e9eed74b3b7f13ecd16f89205fe24958e782314c52f8a8fe3205b93e20b830b4fbf7ff8944ff1cf56feb7de2d773252
-DIST rubygems-2.7.8.tgz 920781 BLAKE2B a7552177c4bb54f7728e5fec1d7ead19fe8af3253c1f09d1a180ca9a1b853983b66e90b3220b603f13d100029878a4cac834149495e417d0b230d25f361a925d SHA512 3d1cf68377dfcf102028342258aaff5a7257d2d2b34a80508c85aa258d810add46e65a157f902c271b0b7b568c437372d17246e89cd88f8500e47c008d17f1a6
+DIST rubygems-2.7.9.tgz 862854 BLAKE2B 7bccb1fe1ce11b33501f881d01b8b0159e6b3c0a434fa100b98490cd1813b5309610e8ef5d1a2c5ab23c22bf0cd55ace7b055ee57f9057398662276128b3e949 SHA512 5f699f47bc24d8ffd4f8f44a509a9df71fcd945ca2574dc9d5050bfe06a44830a368f45d204112d7a4f1877e1600a6fe4d1b6b68f9a55288664667b4220a7d72
 DIST rubygems-3.0.1.tgz 937709 BLAKE2B 23efa0c2a4af48c81877027cc38929320b4c16f5fdc2f7003616e50fa24eaf1895cc9a1786ba91ea42eddee6c85a433edbbcfd06e9f0f04912d045d9bc437c12 SHA512 dc29ad51ec67b1dca82a23973ea92153482788964d0755bdcd3c650116915c461c6e5fb1c826be3ee04a497fec4ac2826904bd406f24611e77cd8c9eaf4d8729
+DIST rubygems-3.0.3.tgz 904175 BLAKE2B d99de4bdd51779ab214bc4a81f55483341a2c193d4304b8eeb6105cb95877e0a33fe03d93c47433ad3c6bdc8d3e453e33ffb799fd36164feac31616f95eeced4 SHA512 1dd585243341901c7b4cc60a4902000c10ce57fe2cc9c28e27e274a2e6029f936cde1c99d7097c93c2c5b2c8bcee5d692c8fe5cc00c996a040e4954b674e330e
 EBUILD rubygems-2.7.6-r1.ebuild 4404 BLAKE2B 03899672172afb204d77faea7ae59161ee2670f0cdb4f573b13af46a222e9d8f2dc6d268de8e975a8dc0fbee708f26b96fb53c7399def2de7cbad51132c2e67f SHA512 2e42d2dcd01aa6c778bc88dc68be3c9f84b6e0e03b3c646ae98ec379277d9e7643313f7615d2886615a23f2892a165351a143b646d236535f4c46e18f8ffe4b8
-EBUILD rubygems-2.7.7-r1.ebuild 4417 BLAKE2B 527b3bd24cc99b8419e01e4a1fbdd6e73e8c9af327230cc7b8c6648790c13a49ded339aef76de71e6611504c48b3b45e9a17d10c8b358e45b309715c18684cde SHA512 00529429e5e0301507bdf9eaa1938abd230c594cbaed66092afe81a6423a3c1457732f7c6d0f3dd6acf58ef0c4eacc32e33425c0c22680ce157d6f537810657f
-EBUILD rubygems-2.7.8.ebuild 4414 BLAKE2B 082a93817e060e0c32e12086ce3c198f02ffea76e9e7463aa43c014ca499a963d90d9a71eb8bb2c37540f7f0c3469efe6c30f9b45e13ba5d15d3f1bf6101fc0b SHA512 79d783802f02dfc599e2e2c737df6c05588b02031e1dcc133e99e260f36f7c35e44f55db6fe6e0221e49917b756894dff06ef08b629ad12d249c09fccc7f0077
+EBUILD rubygems-2.7.9.ebuild 4399 BLAKE2B c1bae16b5e28fba4fe0e4662376363afd115313b9876f9681edd205cda337a8983f80a6e2e8d4212a29095b8868d8a14d3b28b19d347f4aa81e851e1df71e89c SHA512 9527037de5c2f724f60add2cc97adc48c6c5cb9efa91b566c3d9e91bc87575e5ad6dd719f4ba3f7380f1597b50515262722c1eec8b0129c57f744fee77e017f6
 EBUILD rubygems-3.0.1.ebuild 4536 BLAKE2B 4963fb6ebd2862bc83ab52c94ca290661f6ac7142ddd461aacb244710148e06130700795e810167d8733423b29f154c5c9d207daca527d1d501b9fa6058019cb SHA512 7258c99bf3b61d95dbf50c2bc98b30c4d7668ffbf2c6d1f23979b9b55ecdd8aee656085ec299dfff2e858e4ec41820f2753dbc6f585507e1fd4bac6b687f2f57
+EBUILD rubygems-3.0.3.ebuild 4734 BLAKE2B 74d8204180a252dbb4f585fc8d854c318e8229213753c76a31a0e9f46d83a63d6f42ec0f761f44f6c64c95725d24e8d61a2db957f757461fc8aed7ea04444356 SHA512 25cdbdfd184fbf443523a5a4ca2bdb3ba1f1f942859298d8cad8bc586a8608fb814c0afe37c6092845c2e6185375e013edf171613b99f0d34e1c9f93bfc7fb94
 MISC metadata.xml 335 BLAKE2B c86eaf3d37fad025b8f6ca0b03e65b1b472716b4fda4ca4d08b415b29a63405d8e7b2684d309091c90411c5fe809e5129c6e0c0c4e7a982b4aa062ffdd0ca7fb SHA512 fd7bf880ad68fe5f1fe8eb79f9662af87831ed499517d5a97e22f18a4ddafc69d53118f020e15c3b8b171fe144bf6cb0ce799beaa6e4e4bdc01c984ab582388e
diff --git a/dev-ruby/rubygems/rubygems-2.7.8.ebuild b/dev-ruby/rubygems/rubygems-2.7.9.ebuild
index bf538ae5ec1c..85f2ffde9567 100644
--- a/dev-ruby/rubygems/rubygems-2.7.8.ebuild
+++ b/dev-ruby/rubygems/rubygems-2.7.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 inherit ruby-ng prefix
 
@@ -13,7 +13,7 @@ LICENSE="GPL-2 || ( Ruby MIT )"
 
 SRC_URI="https://rubygems.org/rubygems/${P}.tgz"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="server test"
 
diff --git a/dev-ruby/rubygems/rubygems-2.7.7-r1.ebuild b/dev-ruby/rubygems/rubygems-3.0.3.ebuild
index c04b117ed93a..7dba497b77ba 100644
--- a/dev-ruby/rubygems/rubygems-2.7.7-r1.ebuild
+++ b/dev-ruby/rubygems/rubygems-3.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 inherit ruby-ng prefix
 
@@ -17,12 +17,12 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 SLOT="0"
 IUSE="server test"
 
-PDEPEND="server? ( >=dev-ruby/builder-2.1 )"
+PDEPEND="server? ( =dev-ruby/builder-3* )"
 
 ruby_add_bdepend "
 	test? (
 		dev-ruby/json
-		>=dev-ruby/minitest-4:0
+		dev-ruby/minitest:5
 		dev-ruby/rdoc
 	)"
 
@@ -35,6 +35,7 @@ all_ruby_prepare() {
 
 	# Disable broken tests when changing default values:
 	sed -i -e '/test_default_path/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
+	sed -i -e '/assert_self_install_permissions/,/^  end/ s/^.*RUBY_INSTALL_NAME.*//' test/rubygems/test_gem.rb || die
 
 	# Skip tests for default gems that all fail
 	sed -i -e '/test_default_gems_use_full_paths/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
@@ -44,7 +45,7 @@ all_ruby_prepare() {
 	sed -i -e '/test_execute_all/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_uninstall_command.rb || die
 	sed -i -e '/\(test_default_gem\|test_check_executable_overwrite\|test_require_works_after_cleanup\)/,/^  end/ s:^:#:' \
 		test/rubygems/test_{gem_installer,require}.rb || die
-	sed -i -e '/test_\(load_default_gem\|default_spec_stub\)/,/^  end/ s:^:#:' test/rubygems/test_gem_specification.rb || die
+	sed -i -e '/test_\(load_default_gem\|default_spec_stub\|self_stubs\)/,/^  end/ s:^:#:' test/rubygems/test_gem_specification.rb || die
 	sed -i -e '/test_uninstall_default_gem/,/^  end/ s:^:#:' test/rubygems/test_gem_uninstaller.rb || die
 	rm -f test/rubygems/test_gem_indexer.rb || die
 	sed -i -e '/test_\(require_when_gem_defined\|realworld_default_gem\)/,/^  end/ s:^:#:' test/rubygems/test_require.rb || die
@@ -59,6 +60,9 @@ all_ruby_prepare() {
 
 	# Avoid test requiring file system permission changes
 	sed -i -e '/test_traverse_parents_does_not_crash_on_permissions_error/,/^  end/ s:^:#:' test/rubygems/test_gem_util.rb || die
+
+	# Avoid uninvestigated test failure in favor of security release
+	sed -i -e '/test_self_install_permissions_with_format_executable/askip "uninvestigated failure"' test/rubygems/test_gem.rb || die
 }
 
 each_ruby_compile() {
@@ -72,7 +76,7 @@ each_ruby_test() {
 
 	if [[ "${EUID}" -ne "0" ]]; then
 		RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} --disable-gems -I.:lib:test:bundler/lib \
-			-e 'require "rubygems"; gem "minitest", "~>4.0"; Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed"
+			-e 'require "rubygems"; gem "minitest", "~>5.0"; Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed"
 	else
 		ewarn "The userpriv feature must be enabled to run tests, bug 408951."
 		eerror "Testsuite will not be run."