gentoo resync : 15.12.2019

6 files changed, 25 insertions, 139 deletions

diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index 77eb4dc6a79f..ee10b0c77c00 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -5,13 +5,11 @@ AUX gentoo-defaults-3.rb 1899 BLAKE2B 5a0d83e40bae62ce76e1caf609cc931aaa6cd40ff4
 AUX gentoo-defaults.rb 972 BLAKE2B 4353b782296ad04f400fbdbd67dcc2f26b23a9bc4a716d107a8f98c5058676c675eb42e1d5e0a7214cd74df9148d54220c0202189938c45f4000301e52a3a73f SHA512 fd5a33c433041efeefba4bb8d550b8db66f31d4c0966188f07943f4f575ee9e13da6ef6fd66f89a4b3b979c5b310d96e2876407b79aee6ed404ca3027859160c
 AUX init.d-gem_server2 505 BLAKE2B ea5807a1c8ffdaa61bf37315c71d910bbf2bf4b0b4c62e3cef3b76176e9cc1fc39272f59bd46e55e17427f730315e2c691fa3f471c1cbf697073c45c0c7589a2 SHA512 fc2c57f4deebf479a36e69c3507f109abeda9f73b22bb2e617f56e6be0069af075fa6d66708d7324922f3d8bfaa96bd8c71292d9e388e27217cc7687ab4004e1
 DIST rubygems-2.7.10.tgz 863618 BLAKE2B 26a453d2808cbf03caa6f2ef4a829418de58f4ed0c7584935a0ad5fc722d7fbdf9f442261f96fdca4b6975b62608965d2f0053d3046da59771be373bed21154a SHA512 48a18c0f202f463c38cf5dafecfbc7cc39245e63c7a059ef2cefadda478483794a929ea6b7e0ef062dd4423230746f1f09d7bec06a97fe3ceccc3325397a3e71
-DIST rubygems-2.7.9.tgz 862854 BLAKE2B 7bccb1fe1ce11b33501f881d01b8b0159e6b3c0a434fa100b98490cd1813b5309610e8ef5d1a2c5ab23c22bf0cd55ace7b055ee57f9057398662276128b3e949 SHA512 5f699f47bc24d8ffd4f8f44a509a9df71fcd945ca2574dc9d5050bfe06a44830a368f45d204112d7a4f1877e1600a6fe4d1b6b68f9a55288664667b4220a7d72
 DIST rubygems-3.0.3.tgz 904175 BLAKE2B d99de4bdd51779ab214bc4a81f55483341a2c193d4304b8eeb6105cb95877e0a33fe03d93c47433ad3c6bdc8d3e453e33ffb799fd36164feac31616f95eeced4 SHA512 1dd585243341901c7b4cc60a4902000c10ce57fe2cc9c28e27e274a2e6029f936cde1c99d7097c93c2c5b2c8bcee5d692c8fe5cc00c996a040e4954b674e330e
 DIST rubygems-3.0.4.tgz 883664 BLAKE2B d5ec493657c055561aa9c0c09719529857706db197bf266ef4c51e48e6f97c08d85a8923b0c6fd72b3fd6ecb584533ff8ca56515c555e9c5b786b0d99ad2a16e SHA512 887c64226ec0b32d33f2ea331936683406d54dc74d19e658a23521e25ab50aa23534fe9eecaf696154247ad1df1d24c233d8900b9aabc79096eebd6afef3f775
 DIST rubygems-3.0.6.tgz 887156 BLAKE2B 685cfb108cc684ecbbcee6fe341baa429ac28f331b3db444c5ed3557bc169147dddc8d226780a85842bf1de2e24f6a60b0464820afa2a6838221c22543a36daa SHA512 1ef1822a2b19790a36a6d242b7d4584222617baa27787ec58961a9cfeb2733f19f9085490ffc72ee375d3153c7114e050c42e68fc8039e727fe5961b09365ee5
-EBUILD rubygems-2.7.10.ebuild 4572 BLAKE2B b2108cbcb0c788a2cccfcbfba252aa6c1c94200272ab0df4c7ce6f6a3325dcd1330266922525c1e144fb029dba4b55c68318909ddcf93e1a6fa1fdb66a8540f2 SHA512 2bed7d6211a815947b0cbc1460a338f8b76fcefa2b860c74f77abbb7d8cf8bdf7f7a4248b0b9729717fc3ea54ec3a0ef3ddb14c30df755af6582920c183a6ce7
-EBUILD rubygems-2.7.9.ebuild 4375 BLAKE2B 13cc784bd4c1386982574711380edbefa3b82247e42e207458ea453e1ed51c905cf3705ead887523795ef530aaea60a0937987a545c79c877b38546df3cd2171 SHA512 296602c64e742b72b4f19be573a56afc54679e5704ed832df197f80e16e9808481f94b6180b30864fafabc8ae8e3076bda018a292aa57c26676c383b5c0a69f6
-EBUILD rubygems-3.0.3.ebuild 4711 BLAKE2B e12430fd64cdf214d0a302f379a57a654ae0657e5c36f2d11ed1b0faaa8ddf2299b67f1b8bc6f85fc930522ec742cb512a79c1cd85788c9d169d559d64fe25de SHA512 97a2a82b935087a6f3983f3129f329ca27b4cb28528fdbfd6209b199569ca8f8e0a7d1618060f3eaae689dd293f12ca2e23cb97ed5a52fae8db7cdf3e47284fe
-EBUILD rubygems-3.0.4-r1.ebuild 2566 BLAKE2B 166be3ad490288af506b7abab69913a89e82560310d5ec3ad94213dd53feec34683c8e6a3363c8a97fd7014796338951f345ed97565a3a4d0da59433736a643e SHA512 d2269a3e3db9cdd1ba770a044d4e47ca15706c157228ed3dcd75ed8a2654d6c1c5063419792f41633719b3c0b6b89e6fe1cdb9a0649452a2927e54b2b14f1470
-EBUILD rubygems-3.0.6.ebuild 2567 BLAKE2B 1bdef361333e50ab4c45b68e45639692fa7c482f8a5c63a24367e117c44992ca678a4a1476b7ea8162628f781d426546ea2b9633c4dd4f78c04a3d8df72641b9 SHA512 d6bc0c4187acd88c0694af6c6e6a1f8e5e761649daf14050faa3d9ecd51afb726ef9a1efcf218b3d72612e34ffadfcd6ff22985cc83a908aaac7a9f402ca55d0
+EBUILD rubygems-2.7.10.ebuild 4531 BLAKE2B c3417b9d7419ac2aa79a94891af32db6c4381e07099e8560b69ad7e08784c129ba6531e3450cc962b0a4378a7b308dfb738b5c3ecb22a3abb3f36174fc095bf7 SHA512 7be0c80531ab067ff6aaa5306c9b35a43feba0ef1d4785ba770ccccbc4d68d18c0cf91e635dc666575fd7a46c1e04882cd724c8efba6348f28dcf301c4754089
+EBUILD rubygems-3.0.3.ebuild 4674 BLAKE2B 836befdf9cf603635699fd75566d2158776b4921001706a7697df8889dc5e666ee24a29c5f5cae7db9d51d7a0b6980fb5ef30c3b6347b343ea7bdca6ead2fc78 SHA512 0918075a568834cc55bc616b147eb08926de6e28aed916f06eee857788eebf5912bee6fc76f510ca8d4d0d1b99f51af365f22853c81a22a5acc55c7e640c55a2
+EBUILD rubygems-3.0.4-r1.ebuild 2529 BLAKE2B 9097b5cc04d2fa5b22a30e7dfd7135eca6731aa98a76081165f8d0d39ab6d8a03013615cdb362ad4031c90680729bbaecac9d6b65d429796023e1b2b402a2a7c SHA512 b206a48a22c249e9b1f8212866c9ca989999c7a5460ab6ed0e8d5974e724270ed5defa7fcf284e6794ddba347ec28e1ec985561b04f73e638a02b368fe35bd59
+EBUILD rubygems-3.0.6.ebuild 2530 BLAKE2B f1ae60373637d6bf8033da863f78a144228b37362355916fda7efff53011adff3c230f2431daeab2f712bb5568f3b9f7ecca87a5c6852150e0233fc34c5f42c1 SHA512 8be7c73d249ff534b601b301108007e1ee172ade982bd4c66bae551684b97d07f424b2ad646f5f663deba44b8cbc22e82ef9864604a7925e5d0bdaea356c7b49
 MISC metadata.xml 335 BLAKE2B c86eaf3d37fad025b8f6ca0b03e65b1b472716b4fda4ca4d08b415b29a63405d8e7b2684d309091c90411c5fe809e5129c6e0c0c4e7a982b4aa062ffdd0ca7fb SHA512 fd7bf880ad68fe5f1fe8eb79f9662af87831ed499517d5a97e22f18a4ddafc69d53118f020e15c3b8b171fe144bf6cb0ce799beaa6e4e4bdc01c984ab582388e
diff --git a/dev-ruby/rubygems/rubygems-2.7.10.ebuild b/dev-ruby/rubygems/rubygems-2.7.10.ebuild
index 2abea0e5ee4a..d207ee81a257 100644
--- a/dev-ruby/rubygems/rubygems-2.7.10.ebuild
+++ b/dev-ruby/rubygems/rubygems-2.7.10.ebuild
@@ -13,9 +13,10 @@ 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-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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="server test"
+RESTRICT="!test? ( test )"
 
 PDEPEND="server? ( >=dev-ruby/builder-2.1 )"
 
@@ -92,17 +93,17 @@ each_ruby_install() {
 
 	local sld=$(ruby_rbconfig_value 'sitelibdir')
 	insinto "${sld#${EPREFIX}}"  # bug #320813
-	newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb || die
+	newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb
 
-	newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:') || die
+	newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:' || die)
 }
 
 all_ruby_install() {
 	dodoc History.txt README.md
 
 	if use server; then
-		newinitd "${FILESDIR}/init.d-gem_server2" gem_server || die "newinitd failed"
-		newconfd "${FILESDIR}/conf.d-gem_server" gem_server || die "newconfd failed"
+		newinitd "${FILESDIR}/init.d-gem_server2" gem_server
+		newconfd "${FILESDIR}/conf.d-gem_server" gem_server
 	fi
 }
 
diff --git a/dev-ruby/rubygems/rubygems-2.7.9.ebuild b/dev-ruby/rubygems/rubygems-2.7.9.ebuild
deleted file mode 100644
index 2f8d1b24d392..000000000000
--- a/dev-ruby/rubygems/rubygems-2.7.9.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-inherit ruby-ng prefix
-
-DESCRIPTION="Centralized Ruby extension management system"
-HOMEPAGE="https://rubygems.org/"
-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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="server test"
-
-PDEPEND="server? ( >=dev-ruby/builder-2.1 )"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/json
-		>=dev-ruby/minitest-4:0
-		dev-ruby/rdoc
-	)"
-
-all_ruby_prepare() {
-
-	mkdir -p lib/rubygems/defaults || die
-	cp "${FILESDIR}/gentoo-defaults.rb" lib/rubygems/defaults/operating_system.rb || die
-
-	eprefixify lib/rubygems/defaults/operating_system.rb
-
-	# Disable broken tests when changing default values:
-	sed -i -e '/test_default_path/,/^  end/ s:^:#:' 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
-	sed -i -e '/test_execute_ignore_default_gem_verbose/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_cleanup_command.rb || die
-	sed -i -e '/test_execute_default_gem/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_contents_command.rb test/rubygems/test_gem_commands_pristine_command.rb || die
-	sed -i -e '/test_execute_\(default_details\|show_default_gems\)/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_query_command.rb || die
-	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_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
-	rm -f test/rubygems/test_gem_commands_setup_command.rb || die
-
-	# Avoid tests playing tricks with ruby engine that don't seem to
-	# work for us.
-	rm test/rubygems/test_gem_request_set_gem_dependency_api.rb || die
-
-	# Avoid test requiring network access
-	sed -i -e '/test_download_to_cache/askip "requires network access"' test/rubygems/test_gem_remote_fetcher.rb || die
-
-	# 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
-}
-
-each_ruby_compile() {
-	# Not really a build but...
-	sed -i -e 's:#!.*:#!'"${RUBY}"':' bin/gem
-}
-
-each_ruby_test() {
-	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
-	#unset RUBYOPT
-
-	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"
-	else
-		ewarn "The userpriv feature must be enabled to run tests, bug 408951."
-		eerror "Testsuite will not be run."
-	fi
-}
-
-each_ruby_install() {
-	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
-	unset RUBYOPT
-	export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
-
-	pushd lib &>/dev/null
-	doruby -r *
-	popd &>/dev/null
-
-	local sld=$(ruby_rbconfig_value 'sitelibdir')
-	insinto "${sld#${EPREFIX}}"  # bug #320813
-	newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb || die
-
-	newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:') || die
-}
-
-all_ruby_install() {
-	dodoc History.txt README.md
-
-	if use server; then
-		newinitd "${FILESDIR}/init.d-gem_server2" gem_server || die "newinitd failed"
-		newconfd "${FILESDIR}/conf.d-gem_server" gem_server || die "newconfd failed"
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"usr/bin/gem) ]] ; then
-		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
-	fi
-
-	ewarn
-	ewarn "To switch between available Ruby profiles, execute as root:"
-	ewarn "\teselect ruby set ruby(23|24|...)"
-	ewarn
-}
diff --git a/dev-ruby/rubygems/rubygems-3.0.3.ebuild b/dev-ruby/rubygems/rubygems-3.0.3.ebuild
index 487d9b16695f..ad752396332e 100644
--- a/dev-ruby/rubygems/rubygems-3.0.3.ebuild
+++ b/dev-ruby/rubygems/rubygems-3.0.3.ebuild
@@ -16,6 +16,7 @@ SRC_URI="https://rubygems.org/rubygems/${P}.tgz"
 KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="server test"
+RESTRICT="!test? ( test )"
 
 PDEPEND="server? ( =dev-ruby/builder-3* )"
 
@@ -94,17 +95,17 @@ each_ruby_install() {
 
 	local sld=$(ruby_rbconfig_value 'sitelibdir')
 	insinto "${sld#${EPREFIX}}"  # bug #320813
-	newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb || die
+	newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb
 
-	newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:') || die
+	newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:')
 }
 
 all_ruby_install() {
 	dodoc History.txt README.md
 
 	if use server; then
-		newinitd "${FILESDIR}/init.d-gem_server2" gem_server || die "newinitd failed"
-		newconfd "${FILESDIR}/conf.d-gem_server" gem_server || die "newconfd failed"
+		newinitd "${FILESDIR}/init.d-gem_server2" gem_server
+		newconfd "${FILESDIR}/conf.d-gem_server" gem_server
 	fi
 }
 
diff --git a/dev-ruby/rubygems/rubygems-3.0.4-r1.ebuild b/dev-ruby/rubygems/rubygems-3.0.4-r1.ebuild
index 434413cd6d88..26cc98a87d52 100644
--- a/dev-ruby/rubygems/rubygems-3.0.4-r1.ebuild
+++ b/dev-ruby/rubygems/rubygems-3.0.4-r1.ebuild
@@ -16,6 +16,7 @@ SRC_URI="https://rubygems.org/rubygems/${P}.tgz"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="server test"
+RESTRICT="!test? ( test )"
 
 PDEPEND="server? ( =dev-ruby/builder-3* )"
 
@@ -66,17 +67,17 @@ each_ruby_install() {
 
 	local sld=$(ruby_rbconfig_value 'sitelibdir')
 	insinto "${sld#${EPREFIX}}"  # bug #320813
-	newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb || die
+	newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb
 
-	newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:') || die
+	newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:')
 }
 
 all_ruby_install() {
 	dodoc History.txt README.md
 
 	if use server; then
-		newinitd "${FILESDIR}/init.d-gem_server2" gem_server || die "newinitd failed"
-		newconfd "${FILESDIR}/conf.d-gem_server" gem_server || die "newconfd failed"
+		newinitd "${FILESDIR}/init.d-gem_server2" gem_server
+		newconfd "${FILESDIR}/conf.d-gem_server" gem_server
 	fi
 }
 
diff --git a/dev-ruby/rubygems/rubygems-3.0.6.ebuild b/dev-ruby/rubygems/rubygems-3.0.6.ebuild
index 1f974d767941..e4bbbd3eb423 100644
--- a/dev-ruby/rubygems/rubygems-3.0.6.ebuild
+++ b/dev-ruby/rubygems/rubygems-3.0.6.ebuild
@@ -16,6 +16,7 @@ SRC_URI="https://rubygems.org/rubygems/${P}.tgz"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="server test"
+RESTRICT="!test? ( test )"
 
 PDEPEND="server? ( =dev-ruby/builder-3* )"
 
@@ -66,17 +67,17 @@ each_ruby_install() {
 
 	local sld=$(ruby_rbconfig_value 'sitelibdir')
 	insinto "${sld#${EPREFIX}}"  # bug #320813
-	newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb || die
+	newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb
 
-	newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:') || die
+	newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:')
 }
 
 all_ruby_install() {
 	dodoc History.txt README.md
 
 	if use server; then
-		newinitd "${FILESDIR}/init.d-gem_server2" gem_server || die "newinitd failed"
-		newconfd "${FILESDIR}/conf.d-gem_server" gem_server || die "newconfd failed"
+		newinitd "${FILESDIR}/init.d-gem_server2" gem_server
+		newconfd "${FILESDIR}/conf.d-gem_server" gem_server
 	fi
 }