gentoo resync : 26.12.2017

3 files changed, 120 insertions, 4 deletions

diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index 6ef70c1d6d35..7392ff4adee5 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -5,6 +5,8 @@ AUX gentoo-defaults.rb 972 BLAKE2B 4353b782296ad04f400fbdbd67dcc2f26b23a9bc4a716
 AUX init.d-gem_server2 503 BLAKE2B 7c602202ba101a5ed7e74a67bc4183085a98fdefb5528afbf975a9f834ce71eb1342bf2ff6206ec6fb8fbb893c908f1aa1cb7a067ec9f161a6205de220ee5259 SHA512 8b9386b93a8ef43fffba5a8c4c5232265a9b0d146d24839e75874721d3377ae0c3d0f52f14592e54c9ee94d26d7a81bb125b25f8c270253cc27e4a76dd64757d
 DIST rubygems-2.6.14.tgz 769418 BLAKE2B 13821b21c7ac4087667c45d7b7e515023e80552072e11bfaa98393f573f361c60bed07bf9aa69d31952deb66e75db3c9b616372203ee7d1fa98a7775eff4c1f5 SHA512 7743845bc5265df3782f85a23896cbb250d8a2bbc9934a27f274b001afa7aa62f7f00f616296f74747ea612d2cb37dd7f533c931aa72550d84c64d2a73d60daf
 DIST rubygems-2.7.3.tgz 849187 BLAKE2B 8e30001f6312fcf3643104530216910c8eed7157e5b74a9f7b047963e7d2ba8e7d429b431474e683dfb3529c2c551a9daf1fc5c19532f67b95542ce26848d9f6 SHA512 2782331b31947a23f85b285a3d5e7b66e34fe5847bc84dca4f1e6bfe33ce187ab0cbc814229de8111aa19490b656ca78b7c821e4ea6b425449991c01371b7565
+DIST rubygems-2.7.4.tgz 908282 BLAKE2B 429d2132c4a4b35a3eb8bca81d1a74eba66a80f399a6b6dddd5b501d86cc37b0359073efe8bbdaa4cba8e88a6029637796046031e0459ff9f8f5158144d427d9 SHA512 90f72a46709ef847666a6a23eecf24521abd5c294b2da8a246bb4c7f85daf4af39a0634fc8093c7bb7ded2ac137ea27fac5ed94af3b70c49e78594285c7a40ce
 EBUILD rubygems-2.6.14.ebuild 4063 BLAKE2B 1ec9da0c225d24faec7dabe1055ead71a31625c7c71981b034761d5cccf4fed8053cbb87312afcb8c439fb805b75af306b7ed5f19d921084ce2616f1a99fc45e SHA512 40ae44ce042618b30297e2495ac5524ad58ab6b3d0b8081bf073707079c819915325940da9ca6ca7163e101b359dc19fee9637a684ca22ed2bb0b1a00d7d01a3
-EBUILD rubygems-2.7.3.ebuild 4133 BLAKE2B 0f6b46c4b3388e40f01ff4691282ff40689cf0fb8e3ae61251a14950530b7b74ce618adb7d3d103436c29ce42f5253778eae02ce428c4d027bf12048f1473b99 SHA512 816399873dd3ba549e8222d377aa800d42be3742c7d64c07c6e513266322bebf7cf922691fc966483a1fd4bbc435839d06b2c2ddea20d718d585c156972cabd0
+EBUILD rubygems-2.7.3.ebuild 4228 BLAKE2B 62a87eba4dae56f581c13830493ccdcee79c7780b825fc0497bf65a10677f74cc00f8045130b4be64f76207b6cbd465d40ef53d5dc1ea8d53a2acdb959ec19fd SHA512 b333c5ff909af5d482f559d508c6b5505df297354332ce739258ff5579f38d5351163ed8a6ffc0ab842d86e06c6cba8d7abe083acd91defe48a346a8160b0ab3
+EBUILD rubygems-2.7.4.ebuild 4228 BLAKE2B 62a87eba4dae56f581c13830493ccdcee79c7780b825fc0497bf65a10677f74cc00f8045130b4be64f76207b6cbd465d40ef53d5dc1ea8d53a2acdb959ec19fd SHA512 b333c5ff909af5d482f559d508c6b5505df297354332ce739258ff5579f38d5351163ed8a6ffc0ab842d86e06c6cba8d7abe083acd91defe48a346a8160b0ab3
 MISC metadata.xml 335 BLAKE2B c86eaf3d37fad025b8f6ca0b03e65b1b472716b4fda4ca4d08b415b29a63405d8e7b2684d309091c90411c5fe809e5129c6e0c0c4e7a982b4aa062ffdd0ca7fb SHA512 fd7bf880ad68fe5f1fe8eb79f9662af87831ed499517d5a97e22f18a4ddafc69d53118f020e15c3b8b171fe144bf6cb0ce799beaa6e4e4bdc01c984ab582388e
diff --git a/dev-ruby/rubygems/rubygems-2.7.3.ebuild b/dev-ruby/rubygems/rubygems-2.7.3.ebuild
index 89904eb2b140..377351f4a71e 100644
--- a/dev-ruby/rubygems/rubygems-2.7.3.ebuild
+++ b/dev-ruby/rubygems/rubygems-2.7.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 inherit ruby-ng prefix
 
@@ -21,6 +21,7 @@ PDEPEND="server? ( >=dev-ruby/builder-2.1 )"
 
 ruby_add_bdepend "
 	test? (
+		dev-ruby/json
 		>=dev-ruby/minitest-4:0
 		dev-ruby/rdoc
 	)"
@@ -67,8 +68,8 @@ each_ruby_test() {
 	#unset RUBYOPT
 
 	if [[ "${EUID}" -ne "0" ]]; then
-		RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} -I.:lib:test \
-			-e 'Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed"
+		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."
diff --git a/dev-ruby/rubygems/rubygems-2.7.4.ebuild b/dev-ruby/rubygems/rubygems-2.7.4.ebuild
new file mode 100644
index 000000000000..377351f4a71e
--- /dev/null
+++ b/dev-ruby/rubygems/rubygems-2.7.4.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+
+inherit ruby-ng prefix
+
+DESCRIPTION="Centralized Ruby extension management system"
+HOMEPAGE="https://rubygems.org/"
+LICENSE="|| ( 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"
+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
+}
+
+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
+}