gentoo resync : 18.11.2018

3 files changed, 4 insertions, 96 deletions

diff --git a/dev-ruby/rdoc/Manifest b/dev-ruby/rdoc/Manifest
index 688b24c59088..12a4dbd10dcb 100644
--- a/dev-ruby/rdoc/Manifest
+++ b/dev-ruby/rdoc/Manifest
@@ -1,10 +1,8 @@
 AUX rdoc-3.0.1-bin-require.patch 632 BLAKE2B 9835233574b78ddf5c9e1d60aa4a755928854ade5076141696ebc046ecbfb0ed1a83754454e7cdd6accd42a49bad6cbd23258cd8e4e14a280463fa0e368d62ed SHA512 d8840d320582f1b744597a4a48008508dfcfe7537b24570e977f7e10f1bc6e5955cf9319182d2546db23d96fa31a55320bf54f49d127623c9d9cac9d639c572f
 DIST rdoc-4.3.0.gem 738816 BLAKE2B f705b4fed5a9a7e3a850cacc17b7df3f8fdeb163938ed7d2d29979337cb24bca4a66695643ecc62f811d8e49a931296e1972d5d13366685315649e0ec44ebef7 SHA512 7ec5c8055262300c159ff2dbca3bcd09e169002acad8602db89086d2b9409a096209a1152dca68c79dcd1b5e3c1fdf55e7f89d82b33fa2ce65c816695350b029
 DIST rdoc-5.1.0.tar.gz 702376 BLAKE2B 733d77a341ddad10f5b648b6bb492e0f79daa392e2ca371d38236e4c85a1c409699e35dd3f5bc8bc48551b399603bb0a747cb3c5f7f1fbf4765aabffaad575aa SHA512 cd2ed37e8502a3e9093c88c258ac5e39542a23c3dcaedb9b5eb48ce391a694e5b35fbcfd62f01ec6353ac9c40a4b7043b2ff11bbc403d2e03de9a84c52bcefe7
-DIST rdoc-6.0.1.tar.gz 697323 BLAKE2B 7af4a3189c6680ae3d92b7a0b7764e73a104017b49442d89ffa0e2da2d504e7493b6842a3b5b60326e8f633a10447e2e6efb17ff61da7b6e4e55b52d973fa523 SHA512 43812f068b430d4462821098bca1a1f0fc2adc63c6f358a48b4af94aafb76d33eb494ef06f91aa72065f128fb0d34f53a05cb246f0c4fcc31ce9c1b31658d108
 DIST rdoc-6.0.4.tar.gz 699314 BLAKE2B 37b9c65a55357b9edbf85889c086948a6e80094846434d46e6ffbf17e16eba9e964dc09721f921d5042d6e0c72619fc59d87c8d969490e6af50fddaf49d36556 SHA512 8bf61bda88ea1a85178f5fdd62e87c79c5efd6d6f64d9d8651bbbc37e02da02b7189c7e60e4853a962507cc2ee4c703b6532f28db763202fa24c4b364cee8e28
 EBUILD rdoc-4.3.0.ebuild 2695 BLAKE2B 49ec379de4d303a230b37e7194d07f44c2036d1ffd612f0eee8c5e9877d1023eead430aea666f193509b87d675c89447948d9334c587c8169274ecc164ac56f3 SHA512 24aeb3c3ed906dab7d3c570cc825d1152a769f24c775e529c3ed66160f6a36f211e581dd86aa3efcad5c209e50263a536c0d84067e23e65057f38f975ee5c907
-EBUILD rdoc-5.1.0.ebuild 2568 BLAKE2B 2c2bc3d067b2a5eb6c3f0a176620297ec2409811258ab44dcd8912b9fc9d9dbb104bc7f2608bb33cfeb367a55a0b6aff5c0707fc85e8342bc276a89abcf5ce09 SHA512 445fffe0e53abed82e729ff5cdd322cbed1b485ddf419ced48c1b18035fa42dbb76cb5cceb8d1e604a4737fdab08866a6ffdb691c631c83b2fd58a4265534df3
-EBUILD rdoc-6.0.1.ebuild 2556 BLAKE2B 1007587db7b44f6fbe077215f4a53329f787e0ff2e150f4351e2efb31974101dde55c2e00e4d7bec68eac190ba5987689ef28980f9ca1bbb8eed05ad2525c660 SHA512 5db8d8cd9387c2731b618664cd166950cad142df5994e0f6995574a922dc0ac25746afb3b8108dd40c9f7c514b593e0c22993fd097b9c2d8d4abcd9d805f411b
+EBUILD rdoc-5.1.0.ebuild 2582 BLAKE2B f89fd2f231b5a40e8b151e8d24c7912e771c07a3539c35c3d31f355d682e90a62db64e0de7a90d6263e3b3d682032e09e1410df8c4557b2a35ab8fbef00b77a0 SHA512 8e691d5bf2b48c80ea335259a8d14d039fa1dbf9099afbdca582f1ece8a5f2e30e22e88574ef355a1f811a9510be18174007667c5d636cd0d3af121089cbe09e
 EBUILD rdoc-6.0.4.ebuild 2561 BLAKE2B ebffcb449dc097f3c2d0d46d56e4d95565f2a088124c858b30881e2b01b02762e628a7345918a5c9f6ed5b869c70ef546270e73ecf2ffca1a714fb9c34b1d30f SHA512 27ca6b208c38c08027b7083cf4db6eca4fe814734fb7c3167d13a06a9bea44c4e9477c870b7b6785c9c165730e5c4d50a45b21e8c728c1fbf37c0406e7a7d870
 MISC metadata.xml 335 BLAKE2B 835d498407155ac5295c70af8a671114c777e5f9371b3d47f9f92a6b102b8e1d58755df0737c34820630464772dc001163e83b5d319707a1c630f4cf2f9ef8de SHA512 3421081016cb99570f9ce9f775097669cd40a709efbbb3c76a20947717bc40d886195a5fda889407d1c436a387c126e07def1eeae01edff53c490ea9c630e992
diff --git a/dev-ruby/rdoc/rdoc-5.1.0.ebuild b/dev-ruby/rdoc/rdoc-5.1.0.ebuild
index b701fb53afb1..83a1d350e168 100644
--- a/dev-ruby/rdoc/rdoc-5.1.0.ebuild
+++ b/dev-ruby/rdoc/rdoc-5.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/rdoc/rdoc/"
 SRC_URI="https://github.com/rdoc/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Ruby MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
@@ -28,6 +28,7 @@ ruby_add_bdepend "
 	dev-ruby/kpeg
 	dev-ruby/racc
 	test? (
+		dev-ruby/bundler
 		>=dev-ruby/minitest-5.8:5
 	)"
 
diff --git a/dev-ruby/rdoc/rdoc-6.0.1.ebuild b/dev-ruby/rdoc/rdoc-6.0.1.ebuild
deleted file mode 100644
index a9d943d4e523..000000000000
--- a/dev-ruby/rdoc/rdoc-6.0.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc RI.rdoc TODO.rdoc"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_BINDIR="exe"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="An extended version of the RDoc library from Ruby 1.8"
-HOMEPAGE="https://github.com/ruby/rdoc/"
-SRC_URI="https://github.com/ruby/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Ruby MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-RDEPEND+=">=app-eselect/eselect-ruby-20161226"
-
-ruby_add_bdepend "
-	>=dev-ruby/kpeg-1.1.0-r1
-	>dev-ruby/racc-1.4.10
-	test? (
-		dev-ruby/bundler
-		>=dev-ruby/minitest-5.8:5
-	)"
-
-all_ruby_prepare() {
-	# Other packages also have use for a nonexistent directory, bug 321059
-	sed -i -e 's#/nonexistent#/nonexistent_rdoc_tests#g' test/test_rdoc*.rb || die
-
-	# Avoid unneeded dependency on bundler, bug 603696
-	sed -i -e '/bundler/ s:^:#:' \
-		-e 's/Bundler::GemHelper.gemspec.full_name/"rdoc"/' Rakefile || die
-
-	# Remove test that is depending on the locale, which we can't garantuee.
-	sed -i -e '/def test_encode_with/,/^  end/ s:^:#:' test/test_rdoc_options.rb || die
-
-	# Remove test depending on FEATURES=userpriv, bug 361959
-	sed -i -e '/def test_check_files/,/^  end/ s:^:#:' test/test_rdoc_options.rb || die
-
-	# Remove tests for code that is not included and not listed in Manifest.txt
-	rm -f test/test_rdoc_i18n_{locale,text}.rb \
-	   test/test_rdoc_generator_pot* || die
-}
-
-all_ruby_compile() {
-	all_fakegem_compile
-
-	if use doc ; then
-		ruby -Ilib -S exe/rdoc || die
-	fi
-}
-
-each_ruby_compile() {
-	${RUBY} -S rake generate || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	for bin in rdoc ri; do
-		ruby_fakegem_binwrapper $bin /usr/bin/$bin-2
-
-		for version in ${USE_RUBY}; do
-			version=`echo ${version} | cut -c 5-`
-			if use ruby_targets_ruby${version}; then
-				ruby_fakegem_binwrapper $bin /usr/bin/${bin}${version}
-				sed -i -e "1s/env ruby/ruby${version}/" \
-					"${ED}/usr/bin/${bin}${version}" || die
-			fi
-		done
-	done
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"usr/bin/rdoc) ]] ; then
-		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
-	fi
-}