gentoo resync : 02.01.2018

6 files changed, 10 insertions, 43 deletions

diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index cb74fc50ef3e..5d9b499e369a 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/curses/Manifest b/dev-ruby/curses/Manifest
index 5c7f81dffb92..62489ed7a4ea 100644
--- a/dev-ruby/curses/Manifest
+++ b/dev-ruby/curses/Manifest
@@ -1,5 +1,3 @@
-DIST curses-1.2.3.gem 35328 BLAKE2B ce62f1073e7700fd25f2360e057c8138b7f06fb17d5f5358800fd7d4af24727bba38fece96d19329649024a855036fb2fcb80a525ee7795e801199d215a6a1c2 SHA512 1fe87cf158ff7f25720096dddfc49fb90105d939a5fe3d405a5467b0afcc559526b1547bd6b84e469aaf5d8e31499f193b07c32bf449bd64a52233b4735f90ee
 DIST curses-1.2.4.gem 35328 BLAKE2B ba84d733a663c27a89be200b95c1e7a72063389190b2f90f0fc1b3a2af60025d926c348a08116734b15c2d494a4431c6e2be78e1f5982c03ee13d69bf7edb96e SHA512 bece3833be353ef8db51717dcdbf060667be5d33d00ce78952c44b3a8c3df082c11649b0a2a30072ce99c6578ffde7dce0c0108e109e55022703cfa1c1861bb9
-EBUILD curses-1.2.3.ebuild 664 BLAKE2B d04dd553220a0afbcdf5f0cd560828d4b72fd564ead048a5d92c573be3961beba530b4ed8e5d6b1fb196757559a0da29d264b16d6fbb0d5e41972ff13e87952a SHA512 876bdad866ec46b6c4b437ae4ad2a63b07b2470b961bb37dfbb5d1fea5da331dc1d55e2599d13669c50694f79dd9e6f288d54d59ed83495bf8c594137256cefa
-EBUILD curses-1.2.4.ebuild 657 BLAKE2B 207a2b63d27a0ece9707e6df61ff9af4f484e7598e69342053d69a2b0d3a5e94bcb6b3f9880008737134c23f86c8fd42d0bddbd9a4ae8e0e4a229ee0e918c39f SHA512 c6decd486f8c816d7cdcce0eabde221f673192a9dd191d9fba7353723f9a01fe149388038efe6880ad02252920951dfbd50619cf8f5d5b8adc82201045a4dddc
+EBUILD curses-1.2.4.ebuild 664 BLAKE2B 59cba296e8e3b7eb8ea4b48a8240c5585ccb71d9fddfe316be56115b43b6221880aad309469d11b500b72a8959d1f031358d3983bd5acedb03cebc06316f9fb4 SHA512 1f0a3db6d6614a4d0fd9db72c3de74a2b9e5dc5d63a89c0e880520f7564efe899a6665e6142e0621107caea3182c09730bb6bd16b4dc2e07bbad1c9308257914
 MISC metadata.xml 337 BLAKE2B f68ad5630ff84b55238f101e480a86102303dceaf6b05716d38966d567dfb894f668acdd0f1178ee61ae550e829c053868867d73e9935cde24677b3e14735277 SHA512 3f64366e00d412b476b81e46f0d9d4144d6f698fdc277f59cbefacbce8d9e35bf9fcd2d45dcfd5ba8a386e5972492004f693976f85a90ad69ebbbcf46542971a
diff --git a/dev-ruby/curses/curses-1.2.3.ebuild b/dev-ruby/curses/curses-1.2.3.ebuild
deleted file mode 100644
index 4f454b976e84..000000000000
--- a/dev-ruby/curses/curses-1.2.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby binding for curses, ncurses, and PDCurses"
-HOMEPAGE="https://github.com/ruby/curses"
-LICENSE="|| ( Ruby BSD-2 )"
-
-KEYWORDS="~amd64 ~x86"
-
-SLOT="1"
-IUSE=""
-
-DEPEND+=" sys-libs/ncurses:0"
-RDEPEND+=" sys-libs/ncurses:0"
-
-each_ruby_configure() {
-	${RUBY} -Cext/curses extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/curses
-	cp ext/curses/curses.so lib/ || die
-}
diff --git a/dev-ruby/curses/curses-1.2.4.ebuild b/dev-ruby/curses/curses-1.2.4.ebuild
index 748a37ce0b2a..c6b36a1ee212 100644
--- a/dev-ruby/curses/curses-1.2.4.ebuild
+++ b/dev-ruby/curses/curses-1.2.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/request_store/Manifest b/dev-ruby/request_store/Manifest
index 310015f25042..f0af042a93b3 100644
--- a/dev-ruby/request_store/Manifest
+++ b/dev-ruby/request_store/Manifest
@@ -1,7 +1,7 @@
 DIST request_store-1.0.5.gem 6656 BLAKE2B 2bd96d3dd40e846e8b36cae338c1f95ec812d6121db332e60c85b4c8e043fe81229e9e2f7f8f3c1ef3d7c592515bb69d5dae3cc4755f181fd29a1eb7e7c6254d SHA512 0d69ebdb8d3f6df11f89780c250b5fcc702258e19d7fbf8e2273614ecc220ee25e059a596a8a7e39bcc426f8d834cab38c161c0c1a800cc7ebdba3daa810e727
-DIST request_store-1.3.1.gem 8704 BLAKE2B 67fd0427e4ad32b97f4c1995284044e2d6a237783e2d85ff0dc88e003a4d42ba435c7666c86b79f1ee2e4303af928b46e5b7f03d3ec33120a5a68e1ba0b0a5ee SHA512 67e3be519e33a58c5bb45437dee3a77ff298cc228066af1b101b72a3ffe95844d065370942db696eeff57a781e0be9eed2d80ac8b99a4d4592eec1b33345ab63
 DIST request_store-1.3.2.gem 7680 BLAKE2B 78825112c3893b631952275885096a0f4475fdd67f5fcf1834c5f7f4c468f79709e60d7f64f68cf13d44e6673c2b555e024a15f0518d083dacc54a40d588867c SHA512 038aad3f71d3e8ac4b13503ac6bb484cc1b85516ecdf618dc5af2c5f906d7f33c2304c3d7ab25b7acaa6210fe8a419ec8bda40e5036f692928a08fc5cca6e40b
+DIST request_store-1.4.0.gem 9216 BLAKE2B 90e4dfa1c43a4c64f17b70dd4b77e2b982f5dc4bf42cd3b26345cf168d1ac8ac750dca75db679fc1c24097638c7dba031f8b29f3f4d9e81fdbcc30dc8dc6e5e0 SHA512 12835dc2f5b4b6a6812adb756ebc45a9f6a0b80e65800a7dabc27c55c359f5090adc9530b17de072d2feb6903ba0f1b075379bef83c7b673a86b1b8ce51447e4
 EBUILD request_store-1.0.5.ebuild 473 BLAKE2B 62fa2961842b571f65ad6e45566255eb9a87cc912fc8a6c8456caabe7f255ed0a08e434c0a6264701e9637db4821775d61bc6d63d53e8cfc43191c5e509d4cb5 SHA512 1dc521601da8da2b5a9892390cf7498db5434cc05b9286ef4bff608bd42dd07a5831d18f983a28487bac49b183b5625b2adfea3c6d7c558d2aad98a0742b8d59
-EBUILD request_store-1.3.1.ebuild 475 BLAKE2B 37ae3e8b59118776a1d660e261291670ada09c08ae6b151305ba7ba8393e34a51eb28e679bc1db1fcb13f80555d37e2a34ce71972d7b7c85de05eccecc38363e SHA512 7acda7891ffe9eb040007c6085d7abe2a68b2abaeee9a154f2f3c45579b026447c525fbe51ee9c3a8f329a6bf3bcd5cc062e36f1b8635925b7a2bfe40e08643d
 EBUILD request_store-1.3.2.ebuild 475 BLAKE2B 90a93951c9907a7c81c4962dfb67e1ee67a5dc32638c6c1dcf76fde0106990059b6c13cc74c54f252e3b264eca0569af79132c32b549c9178b8e5dafa724530f SHA512 6843364d04ad12a77eabb3e02221aa2ee8e1baaac267dd7f7d806c12a4184e4d95e7ee726009fbf3b4578e6bf33deda8be90f080d42894402020e3322ae24c2c
+EBUILD request_store-1.4.0.ebuild 510 BLAKE2B 17629d2258a77d0650d659fad6734b3aa71ada082b9d7390ea1033519aebd5a4912645967d9100c57dbf648b12c4e3896191a1ce707330de68a00958419e47d8 SHA512 31bb957ef46ce5b335fabbd0546132281513aafbea8ecd1e7c6e7de75ad792e27bde41a04f5a81f6866f988c94188e603d75f194b149471061a15a7df2c75c91
 MISC metadata.xml 352 BLAKE2B 96f0c7bc363401045297f0819f643d6bb4673c196b9edc4d40ec6aa3c66b9b4921cfcb0e5d5082778a720a68d7fcc26f6d814843f0177f7f548cc0d1f56f34d6 SHA512 ef219e94da98dce395d21d81db23380925391207d00dd4e39d2000ba841f62b237b13733ded2fcd67c36e3d18e9ba28b33fa3905c7d9cd7466fc8c942d577c39
diff --git a/dev-ruby/request_store/request_store-1.3.1.ebuild b/dev-ruby/request_store/request_store-1.4.0.ebuild
index 75318a12c85e..ab89379ff34b 100644
--- a/dev-ruby/request_store/request_store-1.3.1.ebuild
+++ b/dev-ruby/request_store/request_store-1.4.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.md"
@@ -17,6 +17,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
+ruby_add_rdepend ">=dev-ruby/rack-1.4:*"
+
 all_ruby_prepare() {
 	sed -i -e "/bundler/ s:^:#:" Rakefile || die
 }