19 files changed, 180 insertions, 201 deletions
diff --git a/dev-ruby/bundler/Manifest b/dev-ruby/bundler/Manifest
index 009736c09d3e..90f73d28331c 100644
--- a/dev-ruby/bundler/Manifest
+++ b/dev-ruby/bundler/Manifest
@@ -2,10 +2,12 @@ DIST bundler-1.12.5.tar.gz 371552 SHA256 d4a421ca23fbd87664e7cdf070d6fe404969960
 DIST bundler-1.12.6.tar.gz 371581 SHA256 d87a47940a46d0bae17de1be0fcdf739c5f623943adf6f311ef30180cde8aeb0 SHA512 3015841ec31f06d4cc50d6fdca97efb429cd2ce552907f3e35f0f7b096da0d27752d4a9534dd77377d99e16859b8ef384015a1efe9127d66eccaeede86da3221 WHIRLPOOL 33ef0b7fc5203c056a0530c0eec01710a55242b2356add81b67b7bf69e0a83ec5091742fe4dde07ee9397a717d6c923fc01af7505c7ce325b74ba12fac755e85
 DIST bundler-1.13.7.tar.gz 431233 SHA256 5137107c52a359bc622cb694b17f958144f4af691760f264476b0c88d6b1dda6 SHA512 aa3984591049726f84ed79ca99aaedfa25df551d040d2245a6ecdcc5c3b809d7124ec587081e84cd87edf911744f4ee88c8cde0923a318cbaa2d514de38c85c8 WHIRLPOOL 9c33200b4dc0a2b956fd0b2e3e509532bebaa633183df130ad0567ebaddbca4fb498075a069758a91dc9fe8e30f8ec5d52955c25d771b3d32e931923d8dc5ef3
 DIST bundler-1.14.6.gem 319488 SHA256 f431206d5e89e803b7cf0dd232683eaec769ec168707e9b3d8297dba35137d40 SHA512 cf333e266db0690582252a9248f3579a5be9e753c92c0b92e25d4542ddbbc15bfb7e1571fe9886264c0eba22c4510d118192e8f5f50f647b27eea83d68585238 WHIRLPOOL b1064c6765df9b1dc9a2c4470db7b498a7d4e136f45dcc4c8cf5b2895bbcf6489145fa2872ed21808340eca9653c182bced418faa180e68c874e4ff22f5a74c5
+DIST bundler-1.15.4.gem 337408 SHA256 fad17ea3a1c15df2f2a7fcea052b35ebeab0dc87906cd762470637bef8c98472 SHA512 15736d6bbae792fc029f078705cb2a4eae5f9f78e1219eb3f2d0d0e2c3092df3da97abd3b107c9abbbe680ed99f11d450b0402ab9bf3313cb7aa60e3f631bed8 WHIRLPOOL 1f7567bbacf6ca51a3c644c8100662825c77f23d2a973d696266f49bc1f0017707d8b106643365575731936a5baf68c33aa1c97c2928479644e913cfdada2c65
 EBUILD bundler-1.12.5.ebuild 2232 SHA256 d62043cc3aa7b872b9a964be7d8db34713f78b06d02ed83ba9b9c6f0d8220931 SHA512 f861daa6af6f05fd3885c025af13e6b31a4cbff90a4642e65a1a794bbe08cdbd7bd5d4c7e0e725a0d6f368e0bac62e60ca1adb16a6b70b7470afc28d19a9fdf9 WHIRLPOOL f21c095a09871303fc5d81c13814dc8e7e48a5a91d802a2840d3e9a04725979a07995fa93fe07415aabfa6203ab05a0e22836acd0b80ddb2f53e0ee26d6bd08d
 EBUILD bundler-1.12.6.ebuild 2240 SHA256 041dda2854bdf380d23bdd62759fd83f60525e54ba818307969e0783f2592bd9 SHA512 950bcb579f2f275651cf027ad190226b1ad217847fad00db3600034fe4c0c30f3d0fe47ab71437e84435a8446a44801315aa71c3cc364300a0a701523fd2ffc3 WHIRLPOOL e4ed4e30705ca34be02db6bdaac17d8e7d78ffeff83e2e2c442deeaa3b9deefe170f3459e689672bcd714d865b1c4512d260e9edd1bf26bce5c569992b7e172d
 EBUILD bundler-1.13.7.ebuild 2247 SHA256 5db3fc22313cd4460a18de4cf38155efc10e10535622ee10b9f192e15969ac05 SHA512 b50b829b5660cac8e3ddfa550732da4208345c56d5c39b5dc037ad806e8d8e56b306863e8c3f6c23e2f42d9576ae322273ba9305026dc9fbe36663393e7cc884 WHIRLPOOL 0e35e2130c356c3cabfd5c7385789c97e5efdde9577d61a3ed72aac6036fc716156c02e661a96f794852ed5df8b9ad63e73627e0f467d6f8ee5fc1f203675b52
 EBUILD bundler-1.14.6.ebuild 1048 SHA256 05ad334c343b3dd012561e881290d186f02da48a045b18478f90c6d581cc2ca3 SHA512 db402572fe27778a6f085abc8689eb072ae004eaa4ac825462a0b4ce72635a25ede60225c3f1a937e67743d70d85b35df2c770bb193fed853a7c703fae9bbb30 WHIRLPOOL 363c4c909460e4bc0a2d5cc677e2b4b116f01ec5d767266db27090fbaa8433d9836b05bee65477273cb03dac28ed0dc9b9c235d01a88ab5e5eeda44e5afba560
+EBUILD bundler-1.15.4.ebuild 1031 SHA256 46570bf7325af1c7f6bb84b77452c6fb25ff84e2346cb65e6f5c8310fbd3a7b4 SHA512 2bfd35e1a9b84683c2bee05a302b23967c5a5dd051e468ecfe0d22c7aaf7851ec011b8d5a7f25ffa4170249d0be85a224a71e75a623eebcb339d07f598753adc WHIRLPOOL df62d0aa8e33ffd7524ca55ad937d76995bd039c34cb1739d8e44834c0e8b5977b6439074660276f3021b9b89f3a883a9dc5bf52969d13acb7cca83f55906857
 MISC ChangeLog 6053 SHA256 b415300cb2058d90e8108cbf083a14c4e78a59cf4b475bf259fdb8a548f072cf SHA512 869a44e5e2cb44b2ec7dbe4abe348cf497a38a0c10d8868700337ce8f19c2e2bd5978b5d0858e81190bf465158cc5e18d38316fc8984fb67e1dcca85097da364 WHIRLPOOL 0af867da8665c301a6594066487f922ae8feadc0b85d2ddabcdccdec20f5ddc7e93dd565e960de17723f3569b881bc29da0de880f7e615ce521ffd14c0b06589
 MISC ChangeLog-2015 13229 SHA256 d7767c01e0dc5599f1c3d278a55a65105a54c113490d477815d705a90ab1a73a SHA512 9c59e5203509726faea4469b27697ff8df0117c22540f5e424df0c5a82637791f1421554c095f5d447db756adef77aeb1d39c0cdb5b98c7f5a9f3ad753e07f8c WHIRLPOOL 2c149f9a5258d911782332e5278a4ec4668c28b6d39de30dc4df556ffa313aa83c1f959630adba4651de2ace41d98a9a51a307ba6063256ee7657fff9982f9cd
 MISC metadata.xml 342 SHA256 50f61876494622e9373e64d776886714aa8be111f6325426d513978fffb78f75 SHA512 2eb67c3eb94b1d7dfe3e3c818588e6a8b15b375e2e4497afbed91dd0ac28b261cc53e2c04a7f713db710c90566ffea60a0d27acc56893010f9f1b31a6f34cb3e WHIRLPOOL 27037046dfc16a7b91a53337275b4ad179d1e29983c25e06b9fae1c0b5064b3b75a0a45bfe3e6655ac9687f9753f97e85792bf7410302eb32dbc57b8a016f04d
diff --git a/dev-ruby/bundler/bundler-1.15.4.ebuild b/dev-ruby/bundler/bundler-1.15.4.ebuild
new file mode 100644
index 000000000000..520639907a2c
--- /dev/null
+++ b/dev-ruby/bundler/bundler-1.15.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby22 ruby23 ruby24"
+
+# The specs require a number of gems to be installed in a temporary
+# directory, but this requires network access. They also don't work
+# when run with a path that contains "-".
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+# No documentation task
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An easy way to vendor gem dependencies"
+HOMEPAGE="https://github.com/carlhuda/bundler"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+doc test"
+
+ruby_add_rdepend virtual/rubygems
+
+ruby_add_bdepend "doc? ( app-text/ronn )"
+
+RDEPEND+=" dev-vcs/git"
+
+each_ruby_compile() {
+	if use doc ; then
+		${RUBY} -S rake man:build || die
+	fi
+}
diff --git a/dev-ruby/ffi/Manifest b/dev-ruby/ffi/Manifest
index 779d848eb88e..9c3e58d46982 100644
--- a/dev-ruby/ffi/Manifest
+++ b/dev-ruby/ffi/Manifest
@@ -1,6 +1,6 @@
 DIST ffi-git-1.9.18.tgz 901805 SHA256 8daf534dd511fb52a4f73d400b5e6e99c68d07e4a724e02541b06291e87cb08f SHA512 49c52e5e42e436b7969c35a34b28bd7929d75372638ac5373486a1d624026c12dc682009bc101e4a2c8f1442ed6f1ba17b438cda2e02d4256622b489c4bd9945 WHIRLPOOL e409bc63059eb00d8d075ddf0d52a2a16ec49d7149facfc81a0366c62288d8c82c090585c5e0ab42367145c4ddf2bdcf6f25faab93ab1cfe2269915b558f3e4d
 DIST ffi-git-1.9.6.tgz 895468 SHA256 b27a59bf2eddcc17abaf7063a64e527fa892ba95cdb6320aba6fa945c769c9c7 SHA512 4b690b70db41642be679f13b33a67e27e1a4b14ca56d6ce355ea0a300c793a63e1081fb19d4c4bd395c1bea55a1669b96e3405932fffeebd328809a410fe3e8f WHIRLPOOL 7f5ad8d7766b037e24cff4721db02f05b39604c1be5e07ddad9de4a5155124d2a05ebd43209dfc2491cdc50ea08e5cda856f7502bf1c12666fa19b77516c81f7
-EBUILD ffi-1.9.18.ebuild 1538 SHA256 4b5ea2b8de2d1740af5690db82fde903123ea5d9f31aa278944e6f96eb0c8471 SHA512 cde6ce6a05abe7f9a0870b44d4cbdb0fe4a649446550f4b84becbd1b8cb1b980b9bd471dfb92783036027c042131193ac8894cc40cc93e0b07b369fef45e4d13 WHIRLPOOL fa9704ea022cdd562e56376997871685b74b13ea50903583edc8b07dab5806f2a219d725b228f7d174cf5988f441257ef8dc961004eadcf82d8a3f5e72b31588
+EBUILD ffi-1.9.18.ebuild 1536 SHA256 e28cd2f644392914e3554d191b7248f2f07165826a4eb657a0da23d171db6e6d SHA512 5c1d09fa2b548badfef2f1fcadbe00e881eb5e29589c5566624fa6025194c720f9721e721c0fba90d8caf9f908f404b1a8d93c4885d2fe3570b3529554427330 WHIRLPOOL 6078817710376d0d0954f5d8ecda5e49cb5edd67464372090ad40b1463d9c0f08833c153f83f22165da8c4e114a5775ace16a9dd8efb6be23982aec423be2e5c
 EBUILD ffi-1.9.6-r2.ebuild 1559 SHA256 52240738f1bc725ae47638d99a9f723105ffe6c6300980b54b66539aad4679ef SHA512 e57a07581f2a82a0607c44cd98ae70b613856526293f80e906bb17f75e654db3c156a958d74dd3aae361f83b490027c69d58003a10bc97ecdcd469243f36eef4 WHIRLPOOL ba4c8e3a3759e2ca3195e8f51b6299b3661641034c6aa7ed04d6bf32a361930a2519f42049290954b3f9c9ddce07e19851de96a9164086b31835ecd048dfde67
 MISC ChangeLog 4683 SHA256 86870362a94308c1d47550ff809b0447f586c4e760eeeed82ccc9874be312453 SHA512 f9dc6c3755972e0adeacb913ac41ebae23ef257032ca15733a242b8d0b93d71acfa3367525e93660c12561606dd308b40228b2f3da8dc9819719c38ccb3694ca WHIRLPOOL 8c7d531d01583d66d10e3d44180d012952d4763649cde25291f9495f8b39967791aeccca899b500c920bb0f6ec1c378186087dbd62b5f40c58e7ee202b5e37c8
 MISC ChangeLog-2015 13170 SHA256 8e817727910b53e3867d553d49eb9d9a8486435523294e0b42bd103476f8dd68 SHA512 574b1e6ec251da2b4726da0a04a7b963700e5b828a9f04c9ccefe1d9eebbb6b0a7fa5fafe4a9835e4fab6aa45d91d7e50be90c0f31d898a6a58c753bb98fa09e WHIRLPOOL 7ca50df63d77c5401db555fad29b420216dfa6743b00f83dfcc0b1d8df056cf2f854bf9e201b7cc67df953aa9857a97733828937d77ba9acd2487a1d9fb0582c
diff --git a/dev-ruby/ffi/ffi-1.9.18.ebuild b/dev-ruby/ffi/ffi-1.9.18.ebuild
index 75827cd6486b..1600ff6f5b54 100644
--- a/dev-ruby/ffi/ffi-1.9.18.ebuild
+++ b/dev-ruby/ffi/ffi-1.9.18.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${PN}-git-${PV}.
 IUSE=""
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~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 ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND+=" virtual/libffi"
 DEPEND+=" virtual/libffi"
diff --git a/dev-ruby/i18n/Manifest b/dev-ruby/i18n/Manifest
index 9268c4875a8c..3abfa60a00cf 100644
--- a/dev-ruby/i18n/Manifest
+++ b/dev-ruby/i18n/Manifest
@@ -1,16 +1,12 @@
 AUX i18n-0.7.0-frozen-classes.patch 1126 SHA256 6e2660c2d7acb9b8aa68877923e5d306e11de5af43ef4b8fd459021bde4c3426 SHA512 11e1777e991f6273c47a860bc0f4b390052231c9d14fa0f6c51e06b70b09d223e4fdb1e7e76df51abbfe0a957858d086ef58be0e14b09744eb9642697c2caa56 WHIRLPOOL 596fcbc63f078b64ea16692cc18eb7815e29de7ee0732517f14c9859faae06d803971ef68062840acf7b28c3ef9d42f29a055fd10fa0efe23fe1cdfdc233127d
 DIST i18n-0.6.11.gem 61440 SHA256 b37dda25b30484f2674a851e24ae098a38564a61c976fa91a34bf8fceaa3923b SHA512 f3c26c13b333daed69dc044985816d79a27a489c860caaa03cd64b3ff31e3ea65aa850dd581162a264d0b0bb6bc383b12cb96c1a97d5d1d04bee45517a48b721 WHIRLPOOL 67b702b94e3d56331845d8088bce37b7e34ed1a0a035e32ee986054850f205680703f472f3a5f494cda7608bd2db15426e3dcb672f0e8863c5b3b31292f9057c
 DIST i18n-0.7.0.tar.gz 57647 SHA256 8a9ea123661e5da978ecffadc8d1b7ea50ba2d8e9de1455d61e7848cc6c2c855 SHA512 8824feb3fb99bba759963d2ae34555f27b85dbac3d3001168471a27e47fc805e5ffe5c3b4e10d6ca4b2e2524ec16c98260b981ef504f274aab93f912a57d2e14 WHIRLPOOL 0f16ab5f06ae7ec75eefbec985d183dac5a2cd572d6c70fc3de8616bec8834e210a5660a74657ae3397017962253350e6bd926c0d2c9509400ceadc5b365fa9d
-DIST i18n-0.8.1.tar.gz 59341 SHA256 b9eca76e143fea1f427f59471b6f3b018af1291bf8c488e5d937a2cc988f2a0d SHA512 de8ba662ebf6daa255fadd88cec44b0c9a9c54ac912ed85dd9cd180fa08c59b793930a867938a698c9fe306d3b0cf64f7a17dd0aeb0547d8d3ac6a28ebd50dab WHIRLPOOL e1847791193a636fbddabc4f0b483d90771c195e9d7b4b45942e03f311a3b50c8a21aaa2b9d14ab2f303c98d8a0d47da4fa74e3adecc2cddaa78c6543037422e
-DIST i18n-0.8.4.tar.gz 60340 SHA256 1a6f78b39a5604207b9dbba62a79036c24daec2a15bf6526d829efc2f9f73c31 SHA512 f93c648fe62dbf6b6d158a0ecbcbe266d20a9ddc75ab6d81772beb656e4784f9ebc0b81107193acb2576bf9d0282f6a2f1638c7978bbc4d3acdc03f83864fe6e WHIRLPOOL a748dd1aef99170d6c3be5fd835f0fc00d785093745917b45610967fde62e98d446f19640669195f38e706fc62c595fb7bbd463f95e509c0cd6e3560f58fab33
-DIST i18n-0.8.5.tar.gz 59645 SHA256 b33dc1ab057593b819630040235c9a73a4785720d3c618ed59a5802ba4f16caa SHA512 199fef73be60c5e2dc7a2cbd632d87cb9c020b7879df656b2c1267cb8a8f0bcc1b9b1c3bd8c610bffb64796aa8f7c0a77c85f7cc8ad39c4b6ea1626929742683 WHIRLPOOL 13129a0e81afe54c9c1db72d3b963b8e4c335fdcf85b20814fbd123676427ccb2200cc1f39cde2c590683496f3d9e18b6029898c8d7de01d11e0a96125e1d6ff
 DIST i18n-0.8.6.tar.gz 59657 SHA256 cf032a810f5320b7f518ca2fe6fc778a5a59360049e0b150513d5af681ac410e SHA512 fe55729b5d9d2af7112d030c020257a98e7504aa554f691a759f5abe48058949442296ec154060d4a3243cefe0d6d420417f3aa8c857e3616de9bc996decc8cb WHIRLPOOL b113c1b3c47c900ff0a490994033c2dc40d7f2046f102dde6e10d980fd00de4c9dee9f65279e64fcc9f7d0b5746897122719f68e27e28c3cc93177c69268e30a
+DIST i18n-0.9.0.tar.gz 60524 SHA256 9136723a1479e30625b0197319cbf0c2386ec4cbc43676eebeb93d35aa6d092e SHA512 9be199e3cf78879bafa11f80425e5ede710b5df180a81b89aafa56fe74dc9adc209ef021d5e8d4cae8d03478dc19388279316fbcfac366c0d682d41c5727e978 WHIRLPOOL e816e8af9e7b2ba033d20a3f621246371031c7d661a888770f961b5d086eb96a421681e380b2a354ec436e980331279236f1c782c7060d9dbfddf87ef534ec8a
 EBUILD i18n-0.6.11-r1.ebuild 1325 SHA256 3f8648d2e772a1d14597c0524c5e47cf992a3d09e94f6a1ab0027473c1bc5575 SHA512 0497dbca374d5afd9e7064335457fca6fdc8daf2d20bc550bc04603748f3818e9d44799ac510004afc304ecfc1774053d8928d9352da62e5d4197081791010fc WHIRLPOOL 00fad1c260e867533f247143aa08420b78bff18acf2cf587b76f5e1727075495abc46c144934eeb49ca296d43a94274270c71e718dd3020d09422f728881b1b8
 EBUILD i18n-0.7.0-r2.ebuild 1514 SHA256 2e315e5597ae1c3cb301e70b4f10256532fda80505d14d37e547845078ce9cc3 SHA512 fe0eaaeda79550bd120e08fc6adf0a17d6e437e2682578dbd7dad08145e4188b37ea7f0a590d27a3548fc6b2e2989210957e39b94fe2f570234f5d7c06bfeff8 WHIRLPOOL 698af26ec61efadc4695a87516450b26464d73e5cd5c72cd185e774883e796a2a4cf4ee13fed1b4d6576552efd257401fc4eecb34d754c513de3e6b4177f3683
-EBUILD i18n-0.8.1.ebuild 1274 SHA256 a9963e30f687ea30ef4975bdfb4a94972bc2576cda95132bc5dc097673e8b0c7 SHA512 9ebb45fc1a4e050e314b22ec8390079adc1cf1ccb52ac35b7d76d4a07f138aa5051165e2c6a34cc08e3c75abd3807c16df9fbb734f19a29b8e4a8f6f09ab309c WHIRLPOOL 319df6a33402b860bd9a979c4c4c691ec2635eefffbca42eb528a80315bdee135c2b0390e4cf7994c995c2d7c5d1e8fcdf2cfce123db27bbe3d38f84b17b2128
-EBUILD i18n-0.8.4.ebuild 1350 SHA256 d7ddd319e2cb940d36482a9a0ccb870a33abcf5db4049a04d31cd66c3bf2d666 SHA512 6466ad5af282db56c980b065378ce87ad3a6495079d2f0436cdfaf1e77bfb3fc8ed120bc0eefec55d27dbeced6ac1ccb687b53fd02aebe107cb131e8a9f1ae37 WHIRLPOOL ac0411ad34a4f33f822e320655a47c3aae8e7f40eb42cf206eab569fff87a5a834dc62419d81aa5152c6585c81620c811c7bf79ad06095633674853fe0c77110
-EBUILD i18n-0.8.5.ebuild 1350 SHA256 d7ddd319e2cb940d36482a9a0ccb870a33abcf5db4049a04d31cd66c3bf2d666 SHA512 6466ad5af282db56c980b065378ce87ad3a6495079d2f0436cdfaf1e77bfb3fc8ed120bc0eefec55d27dbeced6ac1ccb687b53fd02aebe107cb131e8a9f1ae37 WHIRLPOOL ac0411ad34a4f33f822e320655a47c3aae8e7f40eb42cf206eab569fff87a5a834dc62419d81aa5152c6585c81620c811c7bf79ad06095633674853fe0c77110
 EBUILD i18n-0.8.6.ebuild 1350 SHA256 d7ddd319e2cb940d36482a9a0ccb870a33abcf5db4049a04d31cd66c3bf2d666 SHA512 6466ad5af282db56c980b065378ce87ad3a6495079d2f0436cdfaf1e77bfb3fc8ed120bc0eefec55d27dbeced6ac1ccb687b53fd02aebe107cb131e8a9f1ae37 WHIRLPOOL ac0411ad34a4f33f822e320655a47c3aae8e7f40eb42cf206eab569fff87a5a834dc62419d81aa5152c6585c81620c811c7bf79ad06095633674853fe0c77110
+EBUILD i18n-0.9.0.ebuild 1394 SHA256 2d7b09527e8b73a722cc330b2ce90208732491bbefe33d3ed18a56bdb8ba23c9 SHA512 22ff3a7d472c7a5c2f6917ae61d556c354fad4086163acdb73a765cb48eda312efb49b2627891f86b1a9cb6e3f049a295ab32f1a0566f8bcf0b46775a5fb837d WHIRLPOOL ab724d9f3b255ce30c87d82d81cf67cafeefbc18cc86b1e03da6230d69e73a3a5c2e0d9295958b679e6977e63135f11e6a4666f4de73e8c21eee721c4c83aaa6
 MISC ChangeLog 3882 SHA256 6f0759b048281039880c71c6a4397a47f508ec0491915a3d41317b4dd8447615 SHA512 36ff26f251b426fb83343916cc3585b3838908a5256ecc61751b0a2f89ada1a4b0c02f4073473ede6e7ce1e556bab3b4519db0dcd88a78d4456c47ed82f7c454 WHIRLPOOL 1b4848a082b37e596a249e232eb68432226855d11889bc2f9d831c0f39cb0d9da363ede0779b8e41bb24cf8c3b6aca3945068978a8ff898b5a1d19e2fc536cd8
 MISC ChangeLog-2015 9475 SHA256 10cf2ce9e011489259b52876e0949a20599682f19777d0ef459e825d5b300901 SHA512 f5a103f6a0458fcff3d6eccc0ed38b174e1cb4666b2753bbc057e42d90af6d76c1985035061ff8287b13dcbea0f5c154031b7ff4d0b06853807066d791351711 WHIRLPOOL 6243d1648d9045466e1f9061438a5e190320d1c824c92fd66980af41fc058be39ad3107419123f16d5635e100926171b8bd627716f8aa7db82663714721088ef
 MISC metadata.xml 340 SHA256 50139611a981dafa1d64ccfb5d1bce1c5a5ae6209047a19635a98adad10696cc SHA512 09bf74eefe2371ac635fe302efe1b928e37cf0e1da0979f629085f357bc3e93ea87407781ad172139166f21cb979dbbc7e1bec013f8fe0a760cbbe94ab23ac64 WHIRLPOOL 9e5c2266b9e6f00f42d846eb8ea1cf31e6302ab252e1c3aa7c1e347fefece2bb08ff0423afb9673f9a59c7da68970b9060be42cfe4a67d63982ecd6e73845d3f
diff --git a/dev-ruby/i18n/i18n-0.8.1.ebuild b/dev-ruby/i18n/i18n-0.8.1.ebuild
deleted file mode 100644
index 649ede7fcb00..000000000000
--- a/dev-ruby/i18n/i18n-0.8.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="test"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Add Internationalization support to your Ruby application"
-HOMEPAGE="http://rails-i18n.org/"
-SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/activesupport-4.2
-	dev-ruby/bundler
-	>=dev-ruby/mocha-0.13
-	dev-ruby/test_declarative )"
-
-each_ruby_test() {
-	case ${RUBY} in
-		*ruby22|*ruby23)
-			versions="4.2 5.0"
-			;;
-		*)
-			versions="4.2"
-			;;
-	esac
-
-	for version in ${versions} ; do
-		if has_version "dev-ruby/activesupport:${version}" ; then
-			einfo "Running tests with activesupport ${version}"
-			BUNDLE_GEMFILE="${S}/gemfiles/Gemfile.rails-${version}.x" ${RUBY} -S bundle exec ${RUBY} -S rake test || die
-		fi
-	done
-}
diff --git a/dev-ruby/i18n/i18n-0.8.5.ebuild b/dev-ruby/i18n/i18n-0.8.5.ebuild
deleted file mode 100644
index 6487e0644887..000000000000
--- a/dev-ruby/i18n/i18n-0.8.5.ebuild
+++ /dev/null
@@ -1,51 +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_TEST="test"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Add Internationalization support to your Ruby application"
-HOMEPAGE="http://rails-i18n.org/"
-SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/activesupport-4.2
-	dev-ruby/bundler
-	>=dev-ruby/mocha-0.13
-	dev-ruby/test_declarative )"
-
-all_ruby_prepare() {
-	rm -f gemfiles/*.lock || die
-}
-
-each_ruby_test() {
-	case ${RUBY} in
-		*ruby22|*ruby23|*ruby24)
-			versions="4.2 5.0"
-			;;
-		*)
-			versions="4.2"
-			;;
-	esac
-
-	for version in ${versions} ; do
-		if has_version "dev-ruby/activesupport:${version}" ; then
-			einfo "Running tests with activesupport ${version}"
-			BUNDLE_GEMFILE="${S}/gemfiles/Gemfile.rails-${version}.x" ${RUBY} -S bundle exec ${RUBY} -S rake test || die
-		fi
-	done
-}
diff --git a/dev-ruby/i18n/i18n-0.8.4.ebuild b/dev-ruby/i18n/i18n-0.9.0.ebuild
index 6487e0644887..fd42d43ee0c1 100644
--- a/dev-ruby/i18n/i18n-0.8.4.ebuild
+++ b/dev-ruby/i18n/i18n-0.9.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_TEST="test"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
@@ -22,6 +22,8 @@ SLOT="$(get_version_component_range 1-2)"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
+ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
+
 ruby_add_bdepend "test? (
 	>=dev-ruby/activesupport-4.2
 	dev-ruby/bundler
@@ -35,7 +37,7 @@ all_ruby_prepare() {
 each_ruby_test() {
 	case ${RUBY} in
 		*ruby22|*ruby23|*ruby24)
-			versions="4.2 5.0"
+			versions="4.2 5.0 5.1"
 			;;
 		*)
 			versions="4.2"
diff --git a/dev-ruby/paramesan/Manifest b/dev-ruby/paramesan/Manifest
index 2d59f337511b..78f7e77b105f 100644
--- a/dev-ruby/paramesan/Manifest
+++ b/dev-ruby/paramesan/Manifest
@@ -1,3 +1,3 @@
 DIST paramesan-0.1.1.tgz 4064 SHA256 7ce7b803371660a80218971f7766ed9339dd0597de37ad888ae98380ae5eaf57 SHA512 927595ed9686fb8833beaabf4421cb2c4908bf6e2e1c656034a79c839c292b503ca0ae211f8bdd3916501a281eb2f0b374fc5f4c90615629170e1ba767f0e7fc WHIRLPOOL fc7ef48203852cafb9b2e94884f3cabfbc9520c7b389ec6254ba40e10e6f29653e822e4d4f22ab05a20eed22b433e688ea609b1a330eadc6827ab5b9690480c4
-EBUILD paramesan-0.1.1.ebuild 521 SHA256 ac9788baf151956f77aa4130b4b539e99524f8f27d7faed475194c1a9eb4049c SHA512 f5f829659552acfe22a88ac8be054c94694b25e8dce1af97c7cb8f08a0790c2b79bf10461c75deb885115522092720f7d67cd5a8857242f9327ba5cb040b9cfb WHIRLPOOL f6002d639e937ea314d8ae6fa0da0da02ea33467964965a706eabea84a734e2842e342d4d3b0c5d1e8a3b7ef260bc82fd3a54fb9f9f0b97c5ddcdc777328b4a3
+EBUILD paramesan-0.1.1.ebuild 623 SHA256 faa7caf22c3f977f55ee3e04ecc307177d12c5ee45000e514c7d1903c07f8ff2 SHA512 fbcd150ff53d7f7949c4eaa4b92c9b64691d42d571b631924ff0e86848623b5070d27468dd3bc42367c501d1381e9fde84fa4cc85f63bd7460e6351aee75873c WHIRLPOOL 531713a11f4bf4111799a3ca487b756e52277258c28ca7df226833308a569e7f8796717a53d4935c9e35486f4ff838052e43a7a162ad9f34699a41692be214d0
 MISC metadata.xml 336 SHA256 252d0c19d3e28b68d7dfe2470a3ea23c3b1385f09c702e5cc33a230702875558 SHA512 9ff8be1939525ea473bc5b870130a9bc0ac3bdd8c1ca8578ae476c71f6829f1698f646e5661c10a5fa55f6ed0608f7369acf8de24036ed98f5ae9e55c63eef44 WHIRLPOOL 21b9672a24e63c9a7c56c458811d2550ee79251baba15c77c472c41d196d397dd59438fa93eb342f0cca9fd22dc777c99d462bb074032de1dbf9eba45074d507
diff --git a/dev-ruby/paramesan/paramesan-0.1.1.ebuild b/dev-ruby/paramesan/paramesan-0.1.1.ebuild
index 18a2cb2cead8..3310ceb93daf 100644
--- a/dev-ruby/paramesan/paramesan-0.1.1.ebuild
+++ b/dev-ruby/paramesan/paramesan-0.1.1.ebuild
@@ -22,3 +22,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/rcairo/Manifest b/dev-ruby/rcairo/Manifest
index 247ee71503ee..dcafed4ec831 100644
--- a/dev-ruby/rcairo/Manifest
+++ b/dev-ruby/rcairo/Manifest
@@ -1,6 +1,8 @@
 DIST cairo-1.14.3.gem 97792 SHA256 e3a31ef8097c0b16f2ad71561dca37b4564ae3003838a82805aadeceb69d03b6 SHA512 aba56403ca813bdcc56c01fed76642e4115a683ed3e3d056675195d2d86fc7dfa44f0077ca47407eeea27789824171251222e6300f3f3c395bc186afb616c772 WHIRLPOOL 724d072ad881f54cdcdc631399f99e6bdc563bc78f70c611bdeb3ddc659de78e4ce75c1ec51ac6659542e9ab8ae9c138caa610f97e37a6a1d69440313b69e6a9
+DIST cairo-1.15.10.gem 102912 SHA256 ec7076193db97bea42515aa737ea4574f2353375965f34dcf99219c94e0116b8 SHA512 af3cec5bf03022a5049922aaa0366b7330ec0e2003734ee855d1d9632d2027be6e08efd8b67c02bf3d006d11d8a7e28ac3d23ce9591940dc92442c7552858907 WHIRLPOOL 84ff6c49552615ff34726911d3523370b46af4be1ae89853350a7feab7797f9e26f90cab616034102b32c000d1c058b3efce4ea05c5d1f77a83e72be54dd0600
 DIST cairo-1.15.9.gem 102400 SHA256 579727200f724a4da0c259e59bb79289de35ede0668dbe4b08883cc8e3b35325 SHA512 f934a0ad283145bb4710374ccb1b149c6f6bcdc69978cbcd45de8a9da319a4611249262b6ca4f8bd5ef3955739c54b24bb278e36c421cd0af91ed14a43eb7e98 WHIRLPOOL 619fb1d76958876d51e17db68c0931cdb7886b9afaa34589d605e3e598dd3e63c49f5df12b98aa348e4af52c11c7672ed5244db0a914b37391e94d1562c34d3b
 EBUILD rcairo-1.14.3.ebuild 1587 SHA256 84803409737895d642b598b11f671c5f865842278b4fc024ad44c0e5260f274f SHA512 2ca8fcf937bff16ef641d7f7f84452c63612d3a66b6352ba06beff3d3b32b3708a55c96b10764ac6382ffb2c5fb4a9cfd0be9f0c188f943db70d5968ea516535 WHIRLPOOL ed6f54e58e4d57751fcd0a979131eaebde19b2c83e4fa0781326d6a9a4b4a7fe862415e325d25397e6d6ae68538d0b56d18d168a5a9d0a50a84dda4d1f1f26e4
+EBUILD rcairo-1.15.10.ebuild 1876 SHA256 d957f14b62d7a151a160d8d4dfd42462c184979335768a7a09724274cdd46ffb SHA512 abf1a78cadd60b72fe156782aa906b0a64885b94464b44d1daf82ee322cec7238814896aa82482dff85703e40c07230e97e8fe5cb4ec8e3cbbdad3cd2b5a3fd6 WHIRLPOOL 282b573a8c00de92e5656829ee518fd390b402d3c44cf02d40559bb7f53bed9d3dca89257659b12020730b6a751be349f67f744d687e8252f98ac46ff0d8bf24
 EBUILD rcairo-1.15.9-r1.ebuild 1882 SHA256 cd619b0f14687da106b051cc739e7cb6b7f44bb18cf5d6a07d8b2dd0444bfeb1 SHA512 2aaaa43aa0c2fd3021434cfebddb2c6af209433c798fa5c011081195fe7ab545a2ee6e919500ac55eb604442545d3111a57e7cf37fa73bf88e293b2b398b3097 WHIRLPOOL b281f7f3f541575f1b2f309636301b523f821b0f7360f41f2f90e5ab080efc22e41b6deaa8a8439d196c3be5ce57c1eb3e80ab717c75864155a24cf49c366480
 MISC ChangeLog 3432 SHA256 9615f713be20e79889d51abd44b3ea629a58aebc2ff8944d8e51037223d2f5a0 SHA512 0fb863029093adf6e1c42dd6f0a181a7d3a8cccf7a1ac0d16938825f17547176e09c98ccf865361a39d42899600622d20fa14ccbffc4c56cf3c81f06b4cc78f2 WHIRLPOOL 390d72dcbd9f3e3e0f23c49f9d213446b38446d00c10e26f8899f99cd31dc481f5195ba595dae350b73ba9922db939fab9823e0cc5074a6f011f56ce0c33c20e
 MISC ChangeLog-2015 13356 SHA256 47dc515898ad4d2507c3cf9085e01f74039fad7a04eea717383d668ce4cd424a SHA512 303c5686f1a72a2a132ba13ac652252a6757eed33e6a7c2a99ec18d383d6a07abaa47eae9236ead67dcbd4ada5344e3ad9faedff23d4a709c5f69c1da55a43b0 WHIRLPOOL a8eaf18dfb87bc0b0e28094ae007f5ed8945d73dfa759f6d1009fef92e5510e62c710ede255799ac6356f638376026842b1a5baf289f5003c00851529598aaad
diff --git a/dev-ruby/rcairo/rcairo-1.15.10.ebuild b/dev-ruby/rcairo/rcairo-1.15.10.ebuild
new file mode 100644
index 000000000000..cbd3a06cc2d8
--- /dev/null
+++ b/dev-ruby/rcairo/rcairo-1.15.10.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_NAME="cairo"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_EXTRADOC="AUTHORS NEWS"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="Ruby bindings for cairo"
+HOMEPAGE="https://cairographics.org/rcairo/"
+
+IUSE=""
+
+SLOT="0"
+LICENSE="|| ( Ruby GPL-2 )"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="${RDEPEND}
+	>=x11-libs/cairo-1.2.0[svg]"
+DEPEND="${DEPEND}
+	>=x11-libs/cairo-1.2.0[svg]"
+
+ruby_add_bdepend "
+	>=dev-ruby/pkg-config-1.1.5
+	dev-ruby/ruby-glib2
+	test? ( >=dev-ruby/test-unit-2.1.0-r1:2 )"
+
+all_ruby_prepare() {
+	# Avoid development dependency.
+	sed -i -e '/notify/ s:^:#:' test/cairo-test-utils.rb || die
+
+	# Avoid unneeded dependency
+	sed -i -e '/native-package-installer/ s:^:#:' ext/cairo/extconf.rb || die
+	sed -i -e '/native-package-installer/,/Gem::Dependency/ d' ../metadata || die
+
+	# Avoid test that requires unpackaged fixture
+	sed -i -e '/sub_test_case..FreeTypeFontFace/,/^  end/ s:^:#:' test/test_font_face.rb || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/cairo extconf.rb || die "extconf failed"
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/cairo
+
+	# again, try to make it more standard, to install it more easily.
+	cp ext/cairo/cairo$(get_modname) lib/ || die
+}
+
+each_ruby_test() {
+	# don't rely on the Rakefile because it's a mess to load with
+	# their hierarchy, do it manually.
+	${RUBY} -Ilib -r ./test/cairo-test-utils.rb \
+		-e 'gem "test-unit"; require "test/unit"; Dir.glob("test/**/test_*.rb") {|f| load f}' || die "tests failed"
+}
+
+each_ruby_install() {
+	each_fakegem_install
+
+	insinto $(ruby_get_hdrdir)
+	doins ext/cairo/rb_cairo.h
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	insinto /usr/share/doc/${PF}/samples
+	doins -r samples/*
+}
diff --git a/dev-ruby/rspec-core/Manifest b/dev-ruby/rspec-core/Manifest
index 7a8d25b7882f..bccff51cdba2 100644
--- a/dev-ruby/rspec-core/Manifest
+++ b/dev-ruby/rspec-core/Manifest
@@ -5,7 +5,6 @@ DIST rspec-core-3.5.3-git.tgz 368960 SHA256 26a5788977ba1ce6889924e6e944d1a08bec
 DIST rspec-core-3.5.4-git.tgz 369170 SHA256 6e7f0cbccf13f774936b25100f743682bb4359040f926a7aa83dce9d7e80209e SHA512 c672381e9233b6f8c6e92ed70d084ff7a558edd6ca7d5a09a28fff1554975b952b6fab94483324b5bd6a62ff7aac576e7a216dbb3972749ef0210fe1cd05411d WHIRLPOOL 816b9dc1648afd11965457b147a5748ea50fd9cef8b5e266a83131b532642f5882bde9099e037ee9f5bea2fa2bc2bca1140494d33f252ea7819b033a4b8dda99
 DIST rspec-core-3.6.0-git.tgz 375590 SHA256 8994ff9ef23e11262d2c0cc7c54ffaa3ce73c3d2fd01fc0c089f46a31e7667fa SHA512 cecd3885652e18ba1ffed45e40d12c932ba0d880e96b2f1d264709f55dbda8d6b0c78c3bf4bb940d246b84261d1b80038618735f65302ff62646165b2e932be1 WHIRLPOOL 7923ccf7959f5fdc23f27ba0a4619b582a6a16ff20dc27eee82a17436ba9c278eaf996f4e851fac8c9a2802cda30ef1928ab5a4bc20269fe66ac4df540d6b827
 EBUILD rspec-core-2.14.8-r4.ebuild 2978 SHA256 2f120a8e6fd50a479e31f636baec14ad3647d2d56c1f19a4b93e71d875dbceb7 SHA512 77b23547500eb43368b2733f78c5b157a489302ee115a54ebcc8bf469d1d86633f1bed20d653bff59f1ad5004c464c59d9898d4d536025069cd68b2341661025 WHIRLPOOL 6eecd1392a11c150921bef0740ea00c4e87d93e8e9c39b9b20147ff9f980f258cadc42961019f684909b24ef71944f4b1874ee93bf217ad7898db4e3a4d9b5d2
-EBUILD rspec-core-2.99.2-r1.ebuild 2609 SHA256 71e839a523841a1f7090432183892a0e64c910ccbdca0e82892cb71e5f188efc SHA512 b20e657d6d316d017216d29764b2ac0a4e013e912ae14930798b75d020eebfe2f904b6c989c368dcd0a9ae5807f897933df00d48d5820753aa6c42d71d753e4c WHIRLPOOL b4f87c6b1284366721fb28da6406296409e63bd2958955ab1abca5e2ce068c34ec8b1e4615abc83ef3aa18eecad1cd41e2953f1193a7eadac7a0444177745e33
 EBUILD rspec-core-2.99.2-r2.ebuild 3057 SHA256 410c2fb8aceba3be7e34050ed03063c971a1f3e964c92d31d2a484166a39f015 SHA512 70f3a86e914788235e045d4e2efc2e862e80c407256ecfed75c09d121b8e51f78e59719a0a8a4dc224c9b3815664b16ec8b4ca29240860f3890100f5189e8ac6 WHIRLPOOL d42f73c27561f14a8dee82e2b5004c63593d7821568b3e392eba0ee856dd542ab55d31c1efba4fa2c65e7931dddaa894ae0199abf976734b95e43fd38a5e6e10
 EBUILD rspec-core-3.3.2-r1.ebuild 2903 SHA256 aacac231cfe68a02837360207aa39fc7fcbb783730b0eca3c614a1946935e190 SHA512 776100a89ec88881475d1cb584262a02067a8ac54413cd2cdaa768af1cfbc0b5a00bd5d26287225bba69cf457afc6a1e41291abfdb376a47fc57d45f5a8a0b55 WHIRLPOOL 24cbf36cc8833d59500939ab26f154983e8443cd2bc48502e72b7e4b8ed828b80be0991bdbedcce4f12c235ed024313d9088155f5684974cc6bb68afc5a4131c
 EBUILD rspec-core-3.3.2.ebuild 3044 SHA256 d705906495247456425351fb8d2e48937dd24dded70d40abbdac9e48b3117d6b SHA512 fcd6ffab8f1df675d54f7d72ec6efe9ccdd15c4a06ef5f13133d2004e0bce587b467e7a61330d102498ada2eca529aa7f4b05b77c990b8a91da07cf0b8195f8a WHIRLPOOL b9e747ccf85673170633817305600d3e9eada1cbec3c05a78c331c0ef659578c3b9a94b977ba0856ee836506245a94e4f80204ebbbc6a51a85c4891b82786798
diff --git a/dev-ruby/rspec-core/rspec-core-2.99.2-r1.ebuild b/dev-ruby/rspec-core/rspec-core-2.99.2-r1.ebuild
deleted file mode 100644
index bb7d59ccedd1..000000000000
--- a/dev-ruby/rspec-core/rspec-core-2.99.2-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-RUBY_FAKEGEM_TASK_DOC="none"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-# Also install this custom path since internal paths depend on it.
-RUBY_FAKEGEM_EXTRAINSTALL="exe"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-core"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? (
-		>=dev-ruby/nokogiri-1.5.2
-		dev-ruby/syntax
-		>=dev-ruby/zentest-4.6.2
-		>=dev-ruby/rspec-expectations-2.14.0:2
-		>=dev-ruby/rspec-mocks-2.99.0:2
-	)"
-
-# Skip yard for ruby21 for now since we don't support ruby21 eselected
-# yet and we can't bootstrap otherwise.
-USE_RUBY=${USE_RUBY/ruby21 ruby22 ruby23/} ruby_add_bdepend "doc? ( dev-ruby/yard )"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Avoid dependency on cucumber since we can't run the features anyway.
-	sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die
-
-	# Duplicate exe also in bin. We can't change it since internal stuff
-	# also depends on this and fixing that is going to be fragile. This
-	# way we can at least install proper bin scripts.
-	cp -R exe bin || die
-
-	# Avoid unneeded dependency on git.
-	sed -i -e '/git ls-files/ s:^:#:' rspec-core.gemspec || die
-
-	# Avoid aruba dependency so that we don't end up in dependency hell.
-	sed -i -e '/aruba/ s:^:#:' -e '/Aruba/,/}/ s:^:#:' spec/spec_helper.rb || die
-	rm spec/command_line/order_spec.rb || die
-
-	# Avoid testing issues with rspec 3 installed
-	sed -i -e '2igem "rspec", "~> 2.0"' bin/rspec || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
-
-	case ${RUBY} in
-		*ruby23)
-			sed -i -e 's/SAFE = 3/SAFE = 1/' spec/support/helper_methods.rb || die
-			;;
-	esac
-}
-
-all_ruby_compile() {
-	if use doc ; then
-		yardoc || die
-	fi
-}
-
-each_ruby_test() {
-	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rspec /usr/bin/rspec-2 'gem "rspec", "~>2.0"'
-}
diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index 4ec8bdee7fef..463ede458203 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -6,7 +6,7 @@ AUX init.d-gem_server2 503 SHA256 f2b2aaa83e69482e1dd6b71c0c0c4b82375029d4e23f63
 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 4072 SHA256 1384a76321fd12de801e86100e47e240507df9d16205e121d6c71e20ef15b2a9 SHA512 ad9ca3b5c9b7d2233d331e5fd6eb2391e83a9bec95ef1447bc0d45e175ffcd286d1c89af15509cae8706da7bbbad07ac4f4c2c5d3f8c7697c3d92f036da146b9 WHIRLPOOL e2d5a939e2aae5208b3a1f9f115be8717cbd90429070fcda0e5cee8cda14421efa38ebc740f858a56789428548d385fb952b8df783e7490c36519dabc8c7691a
+EBUILD rubygems-2.6.14.ebuild 4067 SHA256 a54b02d982d9b650e56448881fb790b53c1c12c3103b7cbd9bd26f08f293d74e SHA512 79c288d9652136615e0a426434ee62796ce2b77d4b229eb64756fe2c02a0f59eee99fdb6b5e8e72cd6c25df9dfa2db125da5701fb4a056ab7722dbe1edb64e21 WHIRLPOOL a4a542caab456b7ecc06b5220f4acab919fe42cacc8b5ce27151f168c88dc3fc753bcf93053165598a9b34e5df0b09cb0a08d6ed4c75f61fd29132d851789e08
 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.14.ebuild b/dev-ruby/rubygems/rubygems-2.6.14.ebuild
index 6360b68c8e9c..762b4f535df2 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"
 
diff --git a/dev-ruby/sinatra-partial/Manifest b/dev-ruby/sinatra-partial/Manifest
new file mode 100644
index 000000000000..db709dac6950
--- /dev/null
+++ b/dev-ruby/sinatra-partial/Manifest
@@ -0,0 +1,3 @@
+DIST sinatra-partial-1.0.1.gem 16384 SHA256 205ac4dfd3d427c88ec21b72ac49b3d38f03c599a1d81be60881178fb5b79f3f SHA512 04fb0826cdc9f6d8ce6ae8d80a9eafb3b0b37136fcecfb3f5e45a1bac101dac0486168473ff66de75979a5153d4efbdce17b63d774f5ddcd0e7fa251df0da1bd WHIRLPOOL 4a2c483d374016189261c7185fb8e6cc33c845cd9bc1ed5851da677cc514ea3b027b99e0c1cbdc639524e348a140eceadac3b276992feab3d419c831bb22a613
+EBUILD sinatra-partial-1.0.1.ebuild 749 SHA256 3420ae66a13f9adedf041b9e9369b4d2c7a4ce0c384d6f1ca6117cfb7233153e SHA512 e479eba9ad3c27aff52f2579037b47458ad24217873c8bc271eec7f726a41deaa74994ba498599f1912ca7bbc918755aef365a756d1482743494e3f741817cd7 WHIRLPOOL a2a2f508986d2855a2b043fd273bfe1a48f5f6ccb63a7a421da4f8704c2af3348e4ee0fa430007d7867a2ee4cd7555079d607ea8733bda5156f8173e8fa0d6f7
+MISC metadata.xml 247 SHA256 1236c1552dc683658bd5bc3c5f880b71d9dfa13025edab4a0f8973f9eaa6bcf5 SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09 WHIRLPOOL c1aa829db3553d79fe71a8bf79fd6ea24e9fff4e591a4ade3c05e2a97b0df352170fbce76450c0402ec6d8998951c2f3eb3e198ac4638c0e0882208b9f4d8fc8
diff --git a/dev-ruby/sinatra-partial/metadata.xml b/dev-ruby/sinatra-partial/metadata.xml
new file mode 100644
index 000000000000..28ab0c15f206
--- /dev/null
+++ b/dev-ruby/sinatra-partial/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-ruby/sinatra-partial/sinatra-partial-1.0.1.ebuild b/dev-ruby/sinatra-partial/sinatra-partial-1.0.1.ebuild
new file mode 100644
index 000000000000..85cf4bfcb40a
--- /dev/null
+++ b/dev-ruby/sinatra-partial/sinatra-partial-1.0.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGES.markdown README.markdown"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Just the partials helper in a gem"
+HOMEPAGE="https://github.com/yb66/Sinatra-Partial"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/sinatra-1.4"
+
+ruby_add_bdepend "test? ( dev-ruby/haml dev-ruby/rack-test dev-ruby/rspec-its dev-ruby/timecop )"
+
+all_ruby_prepare() {
+	# Use a rack version consistent with sinatra
+	sed -i -e '2igem "rack", "~>1.0"' \
+		-e '/simplecov/,/^end/ s:^:#:' spec/spec_helper.rb || die
+}