gentoo resync : 29.10.2017

3 files changed, 2 insertions, 115 deletions

diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index cd75612396d0..3843812e785b 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -3,10 +3,8 @@ AUX auto_gem.rb.ruby19 509 SHA256 f0f7f61b110955325be52d278fcc1d3f3ea395cd9523db
 AUX conf.d-gem_server 81 SHA256 aa850780bebe0e31da9732d8707a748567ca72716fd91e294dc712e71f82db2f SHA512 71630a0530ec62f4024d9bfc4e6afe1f409f3bcb5d71ee5876d1e190c9e69016571ca8f500fcc7ffea6cbc36a8dab5eef2d0c61f72de99f2776c9137010b9ccd WHIRLPOOL a99d35afa6955ad585d5e2433648130ea50065dd1f2cd1bc3763390bd20740ecd6e144a056da5067190048a9a47de20b6156e6b70c64348663f13391974978ae
 AUX gentoo-defaults.rb 972 SHA256 c0f821041391c262754a5caf7314562137218119eb3510b7edfc070462c3ca57 SHA512 fd5a33c433041efeefba4bb8d550b8db66f31d4c0966188f07943f4f575ee9e13da6ef6fd66f89a4b3b979c5b310d96e2876407b79aee6ed404ca3027859160c WHIRLPOOL f31f380016108649bcf64feff752a02f1c464990cee97f89f1bb4017225968d04d684c24142c4123d2ee987783189d318c444b80953f80504c5857b939e88ae4
 AUX init.d-gem_server2 503 SHA256 f2b2aaa83e69482e1dd6b71c0c0c4b82375029d4e23f6347e8c5560b62840579 SHA512 8b9386b93a8ef43fffba5a8c4c5232265a9b0d146d24839e75874721d3377ae0c3d0f52f14592e54c9ee94d26d7a81bb125b25f8c270253cc27e4a76dd64757d WHIRLPOOL f900230bc3a753d764347e209b937c91bfca456d36416468dbdc91b7e6056444f8de4cceb2c89a1b501db0dda1e3941ccc04953c2b9dcb16e9e4608032e568f2
-DIST rubygems-2.6.13.tgz 768906 SHA256 d041502ae77e8d49e0a436483fb91f9ad6cc1489e49e0735e7c4a7cf10e728c9 SHA512 c952b6061a9a0778db304c3aa5bea693e71ae2564abfb19f8b123eef66eb1e3877fc7c36f4f1527da97bb320870cbfd4574ac57ad88e850a44fadd67ebdac152 WHIRLPOOL b03b7fcc9b4e84f1692afcc5d7111e75ade5fe777ec73f6006580e65be1f23101f0c29b9d2e9f9af5d66bb5f46ab3919cd11e37126758e9edd66609a47085739
 DIST rubygems-2.6.14.tgz 769418 SHA256 406a45d258707f52241843e9c7902bbdcf00e7edc3e88cdb79c46659b47851ec SHA512 7743845bc5265df3782f85a23896cbb250d8a2bbc9934a27f274b001afa7aa62f7f00f616296f74747ea612d2cb37dd7f533c931aa72550d84c64d2a73d60daf WHIRLPOOL 61f64c4172d33f63a12ddcb08a331fba55d33cdee2ad75e4307d94979df46e8235b96944217f7d3316abf59b06927d12ea206d14b058f9a4993609cd912eaeb3
-EBUILD rubygems-2.6.13.ebuild 4064 SHA256 8a7338cb8c4b8997eaa754e8adc841ccea1fc015346f9759268cc5f1b20100e4 SHA512 c8671ca33ba19c8629914e0743bef1b5ba3e0d09dd094463586e99659d99419bbb13202a12d2a9c69998102a2a6e314cb7aeabeae4840a89ed315cba4af50fbd WHIRLPOOL b2c77bee1d1dd051cb74e444b46bf6bb021269c7e7d0add53eb101728f8e1695ecb5cc76faa09ae51ef40128000f4dbd2c80b8e290552ee78375dae53a2fdbc4
-EBUILD rubygems-2.6.14.ebuild 4066 SHA256 16f2e2270d6e5cdb515254d6ffcecc97dcf92fc4a202e689083ff57a49cbe269 SHA512 3c03a1f98ad959e7e813b43adde18253a018d3ebff4ba6cf4433ddde5f05e0f6b6f29eb52da4ba19c0f7e4c4a7b41a6ac486f5cc6ff562962cb0afa0b59622d4 WHIRLPOOL f0ffab4480a525eb1347cf44e8643eaf477940221b766f16fa8b34d27f626831a973ff878af46bd0e094fd87a15be48a911f06a20c858febf88f421e21c6fa03
+EBUILD rubygems-2.6.14.ebuild 4064 SHA256 8a7338cb8c4b8997eaa754e8adc841ccea1fc015346f9759268cc5f1b20100e4 SHA512 c8671ca33ba19c8629914e0743bef1b5ba3e0d09dd094463586e99659d99419bbb13202a12d2a9c69998102a2a6e314cb7aeabeae4840a89ed315cba4af50fbd WHIRLPOOL b2c77bee1d1dd051cb74e444b46bf6bb021269c7e7d0add53eb101728f8e1695ecb5cc76faa09ae51ef40128000f4dbd2c80b8e290552ee78375dae53a2fdbc4
 MISC ChangeLog 7072 SHA256 bd2bc7bccd485cebf61f987e368bd367082f05f4d0de7eef72268a17a37f9ff0 SHA512 a5b6e17113533e24f48757d1c02cd7a9c95c209a01d49c5ccc00b4e51ca90bc33a7c645aef0d43ca92b3db182b91fc823bd2e3068b112fa9744b78937cf72fc0 WHIRLPOOL 2d1853337f923ad73b3e30304013b9a169299cbb4df69863d18adb30fb506b386973d327688b87340f64566f3a468ddd7dbacc25662733c9c758038376c07b9f
 MISC ChangeLog-2015 41896 SHA256 305d77cfe24e0470947e40901d582b1a2973e1f7f37777730f655f4576cec23f SHA512 bc2cdc365c3dc0efac2e30a02e9d9d6333fc2fd023c27ee038e1614c076c10abe2890265a62c93763794971ff9821fdf2cdd1d62bf8514c2bb29118b671cd61b WHIRLPOOL c91c086363e286572b483c5a9612b75a69351cdcaa651612b26341c0c795602e7c8dfbf1df66661f6f410d0b67f0b6eece369742fdc5a80ca837fd9c7c9410ee
 MISC metadata.xml 335 SHA256 bab66dededb00ca646623a09584d00c8639c00aa41c8827b5990358cd023e6e9 SHA512 fd7bf880ad68fe5f1fe8eb79f9662af87831ed499517d5a97e22f18a4ddafc69d53118f020e15c3b8b171fe144bf6cb0ce799beaa6e4e4bdc01c984ab582388e WHIRLPOOL 660543fa0d7e9aea36220a8f98a9e7f39ecd180533cf712c101766adc45bea546431287af302737383337c32d597efe7983db6500453b109ffa51dc13093042b
diff --git a/dev-ruby/rubygems/rubygems-2.6.13.ebuild b/dev-ruby/rubygems/rubygems-2.6.13.ebuild
deleted file mode 100644
index 1740977337c5..000000000000
--- a/dev-ruby/rubygems/rubygems-2.6.13.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby22 ruby23 ruby24"
-
-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/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
-
-	# 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} -I.:lib:test \
-			-e '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.rdoc
-
-	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(21|22|...)"
-	ewarn
-}
diff --git a/dev-ruby/rubygems/rubygems-2.6.14.ebuild b/dev-ruby/rubygems/rubygems-2.6.14.ebuild
index 3910d2646da9..1740977337c5 100644
--- a/dev-ruby/rubygems/rubygems-2.6.14.ebuild
+++ b/dev-ruby/rubygems/rubygems-2.6.14.ebuild
@@ -13,7 +13,7 @@ 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"
+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"