diff --git a/Manifest b/Manifest
index 7b47ea178a45..850d10f89487 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 28826 BLAKE2B 89eae2ab6eba46b1ce459177f350f4457f3a1ad54fdeced8e05a781cd1253ddd795ac0dd5e86cdc3a54bf6ddf902dcaacf340bafef3398c7f6f3a39a7b33d9bc SHA512 c63bd8ec462facce83c2daeb2a10212fa1a6c68d93e14c8de36fe2ae203162066651eab251cced67ad9d207942e340693de62323b4abc351c63da9b372a65859
-TIMESTAMP 2018-06-18T05:08:32Z
+MANIFEST Manifest.files.gz 28823 BLAKE2B 1c0a0e93a527cfc21429bd33c68228af61337aec8f14cac4596f5a2fecbb22a0a2de9a78f3a9cbcca0602fabaa1f809e880ba132d23a3c168520734517239620 SHA512 3973ab7353379d364acd9b80958a43adc12ace2301dbc561198026d801002dab8e4625d9918adf2f23ab656324634c8b8ba408c734d2ba98c23c16e63cef2201
+TIMESTAMP 2018-06-18T07:38:32Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlsnPlBfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlsnYXhfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBl/BAArDUW/BklQ83mOMNgwp7qTFWdWtZYbCMfOjTqa0QW2MktfYb+Ndrlyuxo
-ygprSonWXrwLwhJMXmtW4Qyv1DoqPpsLXzntjAmBzdLlebGPPspbWEQMRyA7JhZK
-f5woEyLlQwE2XhrvxAZDYgyb+PY5vc92/MUEoaH6j8nWbkMiAj40H/hG1JiT+vXL
-suRBWx/EY9nBNOKsGh0pM1nFfZHcRc9g77rQLOU2E6TPJ/PGB6KgjFX0LqsgUmsW
-nb+VYwRKPk4YfNk8gb1ct0V0IBz8lOClHWUtZHQgBJhrVeR2LHbUQTxdnHPq7nwC
-8U70ySQtsUORSvsm6Vjc9RrUkIx1vJA/KGtqLAcfpSm9E9yQGNCoEwgpd4Q95HYz
-LBtXKPhX3ib9EBm9SvWhaWv9aMk/oK2qCfViDOTNZly1Mx3uT7H6tkz9z5o4jAIw
-luZjFovfawMtpH5GNCWM0I35apGt9aj5UdHoWZgMYzvoHppjbV3t/fxuI6MsfRC3
-xexcmDk4STR6vDfSlTbjKHdDXKaCJWiGwvEia1zmrilHuUJM43APUi2DiYtW6Vos
-GxIBQMP5y6MdcnaIjVKbuEwqc3LA2b6cNY9+OrCh7wk5NNQzLsP4UaAd2mNqaHjd
-GQFBTFheC6LxDZG6qjWOV79aG1c/H+OBFH46gMG20/AHQnxY1VM=
-=PPrn
+klBYyQ//YTNQHUdu6Ru5ci6NMPkJN5FTjPlK6UUK3JnkX+WDgLBEatMRVseJCELx
+AIJZaWJfpPBpYJEbYwYCOJzaJw0XsKHfFD+vPay9cwzZT7CkfY4Bya/3J80S4GI+
+CKfrq1hsq6D2xhoREqkMIDVy2VvuY6mfRtSHA0Wuxr1UoAJXoPT5IXb0a2uFs8MA
+VZL99LNlrNWbHNHTXfuvNrYp5xkX8GmBMy1iDd0JbhjZUv/ncX9jIn/1wQUnJ+4/
+eXb1GzhekfqwHXjp+mzpKFe5eLpQEdupKOoMVLI2tiav1psbhp+GRstvLs44rv06
++EpvfPrdt9pwfFiMAAd2w4TnxAIuowWMDh/bKaaO9iN701ilOO4CkLhD+HvsOWVs
+BitYFRvKDJFIGyoGu+nryVtNkF7B4kfxs3009DvUtMfCp0aF/A3r8KwxdcQPg/mN
+65zJMP6kTwpHfp9+mdreHCjddQZFZnmTeYhSZBZKJBjk9lNSoB3EPLEzHjMhjYYz
+CQs2VLeBE9jW2A1dzRBcRP1X6i16tLn0OpLen7nmpklZ0dXbrB2jiZ5Qs2/vpBdH
+GIxP6F6/jnpswUl6kaFIhLhlxx9nAWmsSEqp9947U4SHgXt8B+0H63fQempYkAdJ
+4eUivFkGG2iomOYgtDII2ZvEn0xCSWbfvS/kyGQyz5CSaGkWBto=
+=Qhog
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index e3f15886fb4c..9ae3dd55ffb1 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 2de0fcc5a192..ae52c30930dc 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/reg/Manifest b/app-emulation/reg/Manifest
index 22e3c004eb62..d6360ed42b30 100644
--- a/app-emulation/reg/Manifest
+++ b/app-emulation/reg/Manifest
@@ -1,5 +1,7 @@
 DIST reg-0.13.3.tar.gz 5396000 BLAKE2B c5fa658010cb5c1cc21d7edfc1b18fac8c65cf2bd3c6de213ab238aabcb1377096172b5484a92f18a04f9ef4c01124dcfcfd4e6eabaf9f9a9b272c6f1f1fc482 SHA512 aefe0e5d3b1a02d54e67a4c7892e6b6c7581793f9e45995933200125c275e38701ad25b772c4541714f72ad1b43865e484bd062e40edbb7ed5faf2a572c224a1
 DIST reg-0.13.4.tar.gz 5401627 BLAKE2B 278462ff66917833feb9a660b39f9826afe1b71f7a75dad07f3673bd5ba63496152aa70147649ddf9d2266cbad3903ba3a4bbe4a7def76a932ea45131bdda8c5 SHA512 f8a1a52824b64cc252a5cd4f6c18d8cf73c88170342f0bab61664f5cdb50295510182c3c15afdfa02c1eae8d299e347a78b47d171ca275c01ecfd9228323c872
+DIST reg-0.14.0.tar.gz 5401266 BLAKE2B 029a128b6a999b4ec3a6e25c3104126b6ce8a29d423a27cdfa08d2bfa58d4f8fe979650a1f6150aaf7c64eaa324e8c93d6c1c5d2cb89e29accfcf61b7d9c87cd SHA512 57f2a7146e173338dcd953cc9cbd9c59858c8bb22d1593fabdc8a59084c86d432b70b289925a95f3f0d0bbff7aed5932baac23281d1e83d55d7bc6e9d89455d5
 EBUILD reg-0.13.3.ebuild 806 BLAKE2B 5c3fe5fb410486a9cd0a6cf615c67115d1146e5a0f7f7af893775d33bf2f019688dc3eb34a82536970c586dfc3426f06737dccddfcdf7a725bcd700fb4750524 SHA512 602b21b967133649100f7b45ef634fa6efafcbccc7ccc4e379cf1d1f35b1299f943e1738a5136bbcf34834ba7b7bf9d842ca2eef3517b657006b280d47992ae2
 EBUILD reg-0.13.4.ebuild 806 BLAKE2B ab560a1208b10c2ffcd8a691d86310a3ec29fcc813008524078d7c298dc40591017f80bd05387de0096264dde2e387b09b81797306744d379b7af78eb7ad9e1d SHA512 03748e3f43301af2b5924f65ab19f40a34cd450debbef6f2d92f06b9aeee84fa702ecd3aa93d12ad766fda3dd3526839ff7c3d8895366f88f66ef801bd060eb0
+EBUILD reg-0.14.0.ebuild 806 BLAKE2B 0fdf204ea006e52d58389bfcc6c03b295b4e460c320b7630fbcd30b57e95b1477f2c1eff3f7de69f66bcd3b58b7a59c428811d5fdb5f989c0ab0f007daa2b52c SHA512 cf46c694fff630d861e0ace914da935006c49e7336dab3b9143140d266b491014e911ad21b6443c547fbb64e128f0c8f6998c6f8a1e48525cc3f8b5499e0c2af
 MISC metadata.xml 326 BLAKE2B 82f2440e792104c0c9e1afe4d95b9972efc7b233524637e32f11c2b5746aba7990d88f01a542e25f7a5c9c52aac0c5c1e25bc5703d3e855ea8e8ef4ffe87929c SHA512 9fea1224db7eb9316eff5bd89ebf748cbf35160516b33a9c9a3a07d1db6a2fa64dafcf8623a24af09429f7b76cc94ee02a39145162d0b039cb9d0137bc51a20e
diff --git a/app-emulation/reg/reg-0.14.0.ebuild b/app-emulation/reg/reg-0.14.0.ebuild
new file mode 100644
index 000000000000..5430bbbad80f
--- /dev/null
+++ b/app-emulation/reg/reg-0.14.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/genuinetools/reg"
+EGIT_COMMIT="v${PV}"
+GIT_COMMIT="dc45b9f1b0901983f738f9a8cfeac1f12bd9b136"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Docker registry v2 command line client"
+HOMEPAGE="https://github.com/genuinetools/reg"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" go build -v -ldflags "-X ${EGO_PN}/version.GITCOMMIT=${GIT_COMMIT} -X ${EGO_PN}/version.VERSION=${PV}" -o "${S}"/bin/reg . || die
+	popd || die
+}
+
+src_install() {
+	dobin bin/*
+	dodoc src/${EGO_PN}/README.md
+}
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index c34a6f6b9a6e..f6d8ae171559 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/addressable/Manifest b/dev-ruby/addressable/Manifest
index 25d25b56fb85..60c3978b1a89 100644
--- a/dev-ruby/addressable/Manifest
+++ b/dev-ruby/addressable/Manifest
@@ -1,5 +1,3 @@
-DIST addressable-2.4.0.gem 102400 BLAKE2B b03ab532b2c761b877973381d023c882d4d1e66372bb68425f45debfab3c546845b3535045f6b47d4f7be88c1a2e539b2c1429312147cb4fe3ebdaf90330c86b SHA512 b81fa48e7c4188827c03ac93960b6fd6fb9f5a438f5243cddea39d6820ef756ee7c0086ec330dc4a3538008b3b254757af7d30248624127649cc006a2793eda8
 DIST addressable-2.5.2.gem 103936 BLAKE2B c6677a2b5e9a7a1b279b2e3f1816cda40c0797254970ecaed2350d4d4739dee5a51580a8e2f94fc6bb87b9fe2a535d0a68b62eb672f8e91ff4da02e15e8dffcc SHA512 ddd5aeb4b241efa897a636fd85bd227bd5c6a8ae56129b6bbbdfaad85cdbb74e3d0db4bb6693f7df148b66f68ca1f557ac17a1fb0ea7698d25d883ab0b690bc4
-EBUILD addressable-2.4.0-r1.ebuild 1326 BLAKE2B f6d9e7d1d0c1788ef93c1871eadccf43b2db7628e1606cd0f79f1ac54647d4770425b1bc32579280a7a3de70c93357e56ab4e60b5b14772b1b10f54f491493f6 SHA512 314eeced17e5ed33f52ac50b6326a2eac68c2335e65d9bf2bef4fd14fa7997ab42902d50bc2d8645210a11185dd16f4e3b06ffe07a6bfb23caeafe6584e6aaae
 EBUILD addressable-2.5.2.ebuild 1350 BLAKE2B 7eefb341d4d789de27ac8d9711813764c2c733b8861d8a47a203cdee967281f3f359ee54c9ef612bb3b9b56640dc1cf3f4b1d056982a8ca34f1258872eb5beb9 SHA512 d996e82ed00fb02c139ca3ddba53f54c018568716d3cf9cdc8648028e9ae988efef15c2f4bf33e29069987170f281b395c3b3aa2a424b75c5e6ba1b1c70ab604
 MISC metadata.xml 404 BLAKE2B 4362f3592286dd6cffae99340e1b4437af10ab4dbbe44585d3370b0970e7d02a881853329c9412bfc881c3f040995a204b758aead2c34cba4f9df8104f858479 SHA512 c335566562492b85e491233d4f908fe18c2713ed9ac3afe2cb4d9537d71bdfa1a10bf58f1ca9f29e5a695fde9a4ba0ff9b3c57122afe78907cc0b00b5c307351
diff --git a/dev-ruby/addressable/addressable-2.4.0-r1.ebuild b/dev-ruby/addressable/addressable-2.4.0-r1.ebuild
deleted file mode 100644
index b8d6ed94a790..000000000000
--- a/dev-ruby/addressable/addressable-2.4.0-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_DOC="doc:yard"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RAKE_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A replacement for the URI implementation that is part of Ruby's standard library"
-HOMEPAGE="https://rubygems.org/gems/addressable https://github.com/sporkmonger/addressable"
-
-LICENSE="Apache-2.0"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-ruby_add_bdepend "doc? ( dev-ruby/yard )"
-ruby_add_bdepend "test? ( dev-ruby/rspec-its )"
-
-all_ruby_prepare() {
-	# Remove spec-related tasks so that we don't need to require rspec
-	# just to build the documentation, bug 383611.
-	sed -i -e '/spectask/d' Rakefile || die
-	rm -f tasks/rspec.rake || die
-	sed -i -e '/bundler/ s:^:#:' \
-		-e '/^begin/,/^end/ s:^:#:' \
-		spec/spec_helper.rb || die
-
-	# Remove specs requiring network connectivity
-	rm -f spec/addressable/net_http_compat_spec.rb || die
-
-	# Remove spec that tests against an unreleased github fork
-	rm -f spec/addressable/rack_mount_compat_spec.rb || die
-}
diff --git a/dev-ruby/asciidoctor/Manifest b/dev-ruby/asciidoctor/Manifest
index a8739f9757a1..79b34a4ce1da 100644
--- a/dev-ruby/asciidoctor/Manifest
+++ b/dev-ruby/asciidoctor/Manifest
@@ -1,5 +1,5 @@
 DIST asciidoctor-1.5.5.tar.gz 543437 BLAKE2B ff3530825a495ee222634aa871f828069fd5c1ec1ab3c4513f7b0e74af3c4a78ee4ab0f0764f8d7dc698484d2acb962dc4fa8ae6a2c7f6c365c08a65a3044afa SHA512 6a95c2e48314a1f44d6398d83c490231baeb4ebea8d8c0e0ef361c884251fe054d48afceccadfb6c34947946920731e0194fc3e398b8dd8b8b320ea9d37f1f66
 DIST asciidoctor-1.5.7.1.tar.gz 565182 BLAKE2B c697ea1b371a9ec26ec3277e043275ed3672bad104d34553aa442723797df3cc4e5a48447f806dba53fb3a142760f514bff74b189058260f621c8b63f8ad02b1 SHA512 4819aef93fb301e5378871935370fe37671446ecdedf76853cc0c19a6a5f3f0e2debbf2afb8ba7287f866fb57903abdfe6d845e1ccf24dda4347ec9c92624c3d
 EBUILD asciidoctor-1.5.5-r1.ebuild 942 BLAKE2B 154f852f7422e2751ff609f3dfb3e8a5dcb62eb346a89d4f3a51fd8afe1a9a0d326fd412ed90bbe5bc160c26a0da025d276476a6805059a1fd5381d9bb8f0409 SHA512 13ad9922e3c2d33b800b4c2e3d3dc519c8db6a50df5204061509be75f8a7c33ecb788bcccbfef21f81315f407db1b33caf84490dd634ecc4c4fff61570cf32d4
-EBUILD asciidoctor-1.5.7.1.ebuild 961 BLAKE2B e841b1a080ace304aff529b94d81f973faad1f3be83d5dae85cad65cf9ebb0b841ce45420afbcc1fdda6c3537f1b50e79854741099e320a83fd42bc3b840606b SHA512 e40c5df68af25e7bc86a1c53dc199311a7337d439020004b0751581c8218e7433cb40ae7da7f052274ff75ffa28f372401f259486ba4a5fffb389e51e812a544
+EBUILD asciidoctor-1.5.7.1.ebuild 960 BLAKE2B 2f804e3c5590dd0490028d3f099e5e911862e0290aebae7e14305356be906dc1bc889b74e76116f4d042327457a17fae2e2581d3d3aeb8a7f44ec8b71f0606ac SHA512 57ea6a50e5c4bbdb1a683673f9735dd867f409aad08451ecb53608f5514dffa6bb4bc08c9acd93f0bad49fa9948fd36c050fecc2e1a1943707d732c7091d07f1
 MISC metadata.xml 349 BLAKE2B 65a3f6dbbe523d1017d78e939c291e40edc3429d06ff16bd0f8150f3879e2b0840619653115be43c876d1cfeea8e95a3e29fea7447b18bc28bb0218ac03f11c1 SHA512 e3ed6253349df933eb4656c972f1a6cc71567c27a721195abceac0d28bfbc991cbda8772f661021c3cf954d2a917730bad54982e319655a204b6b30c1c67c6d1
diff --git a/dev-ruby/asciidoctor/asciidoctor-1.5.7.1.ebuild b/dev-ruby/asciidoctor/asciidoctor-1.5.7.1.ebuild
index 748b55d9d334..767cec45dfe0 100644
--- a/dev-ruby/asciidoctor/asciidoctor-1.5.7.1.ebuild
+++ b/dev-ruby/asciidoctor/asciidoctor-1.5.7.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
 IUSE=""
 
 ruby_add_bdepend "test? (
diff --git a/dev-ruby/atomic/Manifest b/dev-ruby/atomic/Manifest
index 967fbd273af2..0149591486d9 100644
--- a/dev-ruby/atomic/Manifest
+++ b/dev-ruby/atomic/Manifest
@@ -2,6 +2,6 @@ DIST atomic-1.1.100.gem 17920 BLAKE2B 47c96c49a572a6d6705b952e419e1a07f3b06de4e0
 DIST atomic-1.1.101.gem 17920 BLAKE2B 50f4efc215293e931380b6307231279b3c5ca055aa8082fee8575963a68b3d54262449bf45fb1a514dab18f53a1dd9e0467a0f7ac67dea7a45fcce09155721dd SHA512 59c82fa5ec984b7ecd97964ea075ea327511fd4e71cc5ac72d3fb573b777c9fb289f462d022ea1e0256b38dc369c9f7fa7a61b7af877bd06ec94252237111e8d
 DIST atomic-1.1.99.gem 17920 BLAKE2B 814406dc3e38a3ec882eb47e20e6153da9f68c4dd6ba3bc3d3869c0542754ba38678512872b25379b12d902ad6f740b1da974680867d492d2c4620091c5a32c9 SHA512 9c7762f6c32d11b2c5b45be68954ca12c753d2b4683167158a037ce791d72b13d940beef5bf6dd445c8b12e358c62d2a9f43a609fb3b7c7357fea4f66316063c
 EBUILD atomic-1.1.100.ebuild 772 BLAKE2B 20b30483123fe5e082f7f6e373e40b04693a5d4f232f956e186559c7fde98d9793ef8b6e293b924e324cc7a0c5370f16c767e056249681b1f75d9a7dfb7a79dd SHA512 7bd017d22401a6c9f5b56943bd9cb5fcb2e175d1f7d4bbb6ac997347c9bad88eba9e587a82d3f48b40030d1680fb47aa5ca763dedffe50b7a7c64362422330a7
-EBUILD atomic-1.1.101.ebuild 764 BLAKE2B 32a82dc32ad0c78ff2331777ca97218e114fefb7bb57d47108cabbb2c3ab2196eb161e37146fd7b1a6a66c52516999226b11bd17aabc224f327e96b2262d7300 SHA512 12a3bc13ce4d08a0ccb1d81c6cb81c6e21f2ba7f2299a72166c897051c595bb5e7c5801b11246b43067a42074afd4cd787e716f8f0bd6884eb5ca3f8b7f29f4f
+EBUILD atomic-1.1.101.ebuild 763 BLAKE2B 7dc17288227f680e717286f252c8bd76cad82c71e14f2e7f887fb33f6786550f1df8626c6399ff233e29a407a96a7e844bb2f5b9bcd50d30f2ade439a0172b89 SHA512 b737757e2dc4da5da292e99e03a4b0f306c36705ae3505e4b2a17707284069810ec85720f6dbf8c781a19ce53a83baeed546350c2ffe1fc1386a8e022e6736bc
 EBUILD atomic-1.1.99.ebuild 769 BLAKE2B 72539198e33799e07965a974e4e96afe6494e749380fa0fd3b9f34b4eae5bbf440b001087c58fc11c9dc222f3427e639e1bbf4afece065f8521fb3577e7d3b51 SHA512 6e33377ff01b28431bdac42ab33a879ef4bb894ede658e4525439dd32031f1594d4b719cf170a35ac153837fe47f083a116a5eecf911352a8c96ca73043f7e2d
 MISC metadata.xml 345 BLAKE2B 64598e451aa2d3e6225aed11977f43d379ad3d26c0f6366dfee9651544e3c4d565a342d61fd1a2f0d176a5cd0e5f97ad1ae5c1150d97a24ff3472e49eb30d446 SHA512 2fc1039a507f87fab12c537d790d538c6e9abada720edcf9de3748e5d81674f4803221ec940a7f3abc6b12f7c9ec009a2960d88e00b45caf2216a23263e03f8f
diff --git a/dev-ruby/atomic/atomic-1.1.101.ebuild b/dev-ruby/atomic/atomic-1.1.101.ebuild
index 9da1f9ae26bd..7a133a5d5bda 100644
--- a/dev-ruby/atomic/atomic-1.1.101.ebuild
+++ b/dev-ruby/atomic/atomic-1.1.101.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/headius/ruby-atomic"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/dbf/Manifest b/dev-ruby/dbf/Manifest
index bfdf5b5018af..6944f1e4aae3 100644
--- a/dev-ruby/dbf/Manifest
+++ b/dev-ruby/dbf/Manifest
@@ -1,7 +1,5 @@
-DIST dbf-3.1.0.gem 126976 BLAKE2B 1ab65d152d7dfcb84a857c21fccc7162a0e35e51cff50f30972bcc109b9d574479507488538b825aa00e94010435494797a650aaa452ffd2c3fa69150328743f SHA512 d09c2c10a4d16774e8c72a3cb11ddbda6f302ed359b234b9d5698571bac4e10fde73d1200083c1cc7044b632ac196f0c59a94ff60c93e4953359030d74b26e3c
 DIST dbf-3.1.1.gem 126976 BLAKE2B 449b70abaa0bdcdf579ee78facbac46d2f97fb99e983b99ef7487c6a78f5d6f8f1c5257e1a490a169b8cb8e9581fb56827d86844d2d2ee9bc0b3326998206f6e SHA512 88aedb43858702ef2f24a2a751ceaeceba7d75ad58a6abdb314219cbb83551165aa7a1973a68e6b4c0da87c9f35c80b2e0650b25f570a76821bbdccb3dbaafb5
 DIST dbf-3.1.2.gem 127488 BLAKE2B c71089220f7b2d57b99ab27881c5f094a753c1a7c5378074f18d4a9fccba26d4ac7e8e563b84c0556aa50db7f39d03697957c10e6528ddaed8bef812cac662f5 SHA512 1e9c809cc03d4ecadaadd5cc754e4fa85961cf675465f950cda1c084e80c32e0a62223494f76b4ba8e26cde61eea8e43414d1b03c95fd36e8994222c3ffcab11
-EBUILD dbf-3.1.0.ebuild 489 BLAKE2B 1a5af7d1f9a99b112dba2f7730148ae8e23f6a348690c78a514f4a141b8aadaa4ef15f064029aad85083372434f7984e99ab9ab72680956b75e80d60ef4254d2 SHA512 06260e05926a1318440c173e76493f0c22d7d72f90ff8852af11b8d40f5f7c7d2bdb09eedba3860e434b2011d48cec8ccff36cb44823abb9690bf289dd9736c9
 EBUILD dbf-3.1.1.ebuild 482 BLAKE2B 738e98ccb96a7a99f2debb2dcb04095da1d6358793b6606c30c3e1af9d9b9f2f537e493840eb173700407ce65552b174a1f452cfeb0a90ee1bad11177f8c5b41 SHA512 13bd7c11b6223c133c0081e1dc8b856051cfd8b8faa8952cc6942585238364e1d007fbc27f01635608527b0ae9fdcd903bbcb5ec8c0fcd7d438212d3741af882
 EBUILD dbf-3.1.2.ebuild 491 BLAKE2B 99af868e61c34c2025a82e6b751888cf31505c892804b1f3af8e3675fb37fb57a84bd91ff2132d6cfe54db426299541186d65cc8b28df1f4675a660468605030 SHA512 ffe6b107766e9abfe7eb4cc705836ba3e42d85e7c6d1c54e631b4cb82131026ceee3cc1dfe38ed8f50fd4cd5af7d73872a4229cb7688e704f30f894343ffeb56
 MISC metadata.xml 473 BLAKE2B d563d50bcc5286aec5a86a72bd5224e9a08d3369030fcdaae80fd3380462cd00e93c613d17552aa35ccf23440e5fbb78ed8ceb9c4f9b3b97af8591a514d5ce9d SHA512 5e46d9be66b6236bacb4089909d40de9b2124dc5fd1e026807c4e6fdbb70e25aa32bfc3fd150b92168bfd7764fa8ff74314e48fa3bad897b34276d7f12722f90
diff --git a/dev-ruby/dbf/dbf-3.1.0.ebuild b/dev-ruby/dbf/dbf-3.1.0.ebuild
deleted file mode 100644
index 3f02e64967e0..000000000000
--- a/dev-ruby/dbf/dbf-3.1.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md docs/*"
-
-inherit ruby-fakegem
-
-DESCRIPTION="a small fast library for reading dBase, xBase, Clipper and FoxPro
-database files"
-HOMEPAGE="https://github.com/infused/dbf"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
diff --git a/dev-ruby/net-http-digest_auth/Manifest b/dev-ruby/net-http-digest_auth/Manifest
index 729f916e9a09..d63ac4441604 100644
--- a/dev-ruby/net-http-digest_auth/Manifest
+++ b/dev-ruby/net-http-digest_auth/Manifest
@@ -1,5 +1,3 @@
 DIST net-http-digest_auth-1.4.1.gem 13824 BLAKE2B 537688c7d83408052d3d5d16d625a51434dbdc452cf36ec5738917b862eab305a85d3f3933d79d878356a76ae698d6eded24249b70e507b2d7131d71b5dcc482 SHA512 db62d49815a96cabde5836b00a1df58d6277f9efafae78e27296b1e2f4410ea613aed2181f8e39f08af5bbf6f5f758d682e1250d0afd4fe8243fb0d5c7fe78b7
-DIST net-http-digest_auth-1.4.gem 13312 BLAKE2B a78d626cc25243d0a1f760aa2ded0071e15ed0ff763f24e9584e31db8087ac24096468de14abc0d10330c6cdfd5d32a99df0a6c5bfb72a0295e6d178b2b91700 SHA512 a743b278bba44541835f28ed86f94a907f7b48e8f314f0cbe6e14888a1d723c0d60cd4bbde5ac02cd263d91a5803021d9fa073d55077ac2b4c2767ebb65624cd
-EBUILD net-http-digest_auth-1.4-r2.ebuild 607 BLAKE2B 6ea53d5e2518e390cd3acdbfe8e0379f94f52498c04a948abe5663bd2e2f24df3f6114f32f05b19a7ed26afbca221b3ede4672be02d41a596346410a8bfbcdbe SHA512 c7c580d783a7e07c47280bc61f5422f07afa745d41a7472fb1ab5458da41618d1ca0589159c6604bd95e81f6ef4130405267934926d7a33a37aabb154f0dbc4b
 EBUILD net-http-digest_auth-1.4.1.ebuild 607 BLAKE2B 346d197291d33ad5972d61885caeb8a3661f6d28c769b216831a3481c5021902516b03c75513a3686bca9b441de76f5f3d23d0e32e2db5d6e3ca5982329d9ea6 SHA512 bdc0b67df6968f4be499d7f6a66c7cc3571c0c6cd25eb3ea74de715ff0a9d88689c5c7dd54a62f2cb632094f924d5a92e338971d2e8f15e1dd014844e190679d
 MISC metadata.xml 354 BLAKE2B 912fe468f23b89ed8692e3978fd9de52071db9870ca8dce72c595bc2058bbbc36fd5913c07c54c816d8633e6ac013d02f73b67f8d29e38dd6265fd1ec537ef88 SHA512 d7ddea8f222b8d515bc33b627acb53d18c54ecd8a1fdf44e5d1c51f0ef633d63e607cd9dccf36cdd94fda819a27785235b43152ddfb94fff615c884013a3f53b
diff --git a/dev-ruby/net-http-digest_auth/net-http-digest_auth-1.4-r2.ebuild b/dev-ruby/net-http-digest_auth/net-http-digest_auth-1.4-r2.ebuild
deleted file mode 100644
index f0e9e6c03b04..000000000000
--- a/dev-ruby/net-http-digest_auth/net-http-digest_auth-1.4-r2.ebuild
+++ /dev/null
@@ -1,23 +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_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_EXTRADOC="History.txt README.txt"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An implementation of RFC 2617 - Digest Access Authentication"
-HOMEPAGE="https://github.com/drbrain/net-http-digest_auth"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-ruby/hoe dev-ruby/minitest )"
diff --git a/dev-ruby/ruby-gettext/Manifest b/dev-ruby/ruby-gettext/Manifest
index 2783bb7a4e63..498e43e165b1 100644
--- a/dev-ruby/ruby-gettext/Manifest
+++ b/dev-ruby/ruby-gettext/Manifest
@@ -1,5 +1,5 @@
 DIST gettext-3.2.2.gem 283648 BLAKE2B d9095e11f3f92ac37f84aad9059e5740af07186caad963b6cbd6081329031122ed2acf402565b5e8bf7c6f51b18d045fab09e6d390effe2f0d7d66981f253efd SHA512 c6806a4f2b9c8519cccdf7651b3482e5938015323648cb1b82acd0632d88ea5c7cdabd925eecb2d4e17d0d396126d4e2ebaac26241c3c7b4f61e187cd4b3133f
 DIST gettext-3.2.9.gem 285696 BLAKE2B a7bc40b2102f5b937d5f0e407dbaa23ead1da59eb9284c10a249c59548d0e2ad5fcd56b8855439893d2d31b57e0109bb6a9d5cc2d24075f5e360dc16b9291137 SHA512 21496c38cfc16a2b280f30bb94ff4560007eaa7f02c2341cb26aca2969a663c0863cdb650b4eadfd262d8585111dfb572e2ebc66a7a879045de50bf9da80a501
 EBUILD ruby-gettext-3.2.2.ebuild 1655 BLAKE2B 7116c8fbe19549b5ff575f328994e768dcd2ee8b4677a7a5229157fe0e16f63b9f0b27171e4e8256a2ddf79afe7c4b1f51d2b5f15ba2abe6cfef59dcc8fc5c14 SHA512 826549c1ab3f856631b2ef339c920810f5644c31b64103e1668ec0d36ff0f88ed6b1de0654602a25c2df74c06444cfa6183515cde2eb54a80dfabd2f46816222
-EBUILD ruby-gettext-3.2.9.ebuild 1669 BLAKE2B c5bb174dd84d0a1f3aef1474cd23695ed8f06ba5e5ba413025d3cdf31d3300149eccd98519695d05aa4c3a21077dcb76a814d3aed92fd05d9c68086ccaee7de0 SHA512 9376461b1f20ce4032357afdb4ee2a7301f16b5660c44e6fac8e2b46a1e3b50aa1472fd80b26e86316639b41624bf3d0733be2e3813fe0f77f8dbedd52aeeb15
+EBUILD ruby-gettext-3.2.9.ebuild 1668 BLAKE2B f38cf7d830a7abb59c97f3214fd0581efe56205c30ceae1c446dcc6cdbe1faa614067142619ce7cc18906224b64b354f8339347a3c84534891c6b6556f479807 SHA512 5f315248eb1c97774b6366f2a68bbae64d22b6e5eeb123978cb816b65a019ddfc5a1431cc2f643accb70fb5701699f63153d1961fabd854593715b7dbdeb8d3d
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/ruby-gettext/ruby-gettext-3.2.9.ebuild b/dev-ruby/ruby-gettext/ruby-gettext-3.2.9.ebuild
index 10aaeeb58327..9fbb1b45ccde 100644
--- a/dev-ruby/ruby-gettext/ruby-gettext-3.2.9.ebuild
+++ b/dev-ruby/ruby-gettext/ruby-gettext-3.2.9.ebuild
@@ -20,7 +20,7 @@ inherit ruby-fakegem
 DESCRIPTION="Native Language Support Library and Tools modeled after GNU gettext package"
 HOMEPAGE="https://ruby-gettext.github.io/"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="doc test"
 SLOT="0"
 LICENSE="|| ( Ruby LGPL-3+ )"
diff --git a/dev-ruby/ruby-termios/Manifest b/dev-ruby/ruby-termios/Manifest
index d5635900aa49..edac70fd4a8f 100644
--- a/dev-ruby/ruby-termios/Manifest
+++ b/dev-ruby/ruby-termios/Manifest
@@ -1,5 +1,3 @@
-DIST ruby-termios-1.0.0.tar.gz 14738 BLAKE2B 61beda48d956a3fb9aa9aad118d1a28576b420e37528c5bf3d8516e0112fd0b648ec2987c8b47048feb50c694ecba6ad0ac27711ea1216b481dffa759b291eda SHA512 16d71a8cf84391da2dc8b138ff381751f5a72d61ce37d2215960d389285dee14862b50cf770d4648b298df093a85005df460ba951c5d7e6fb38e69d8d686599a
 DIST ruby-termios-1.0.2.gem 17408 BLAKE2B f85877dc3c9beb5c8d20e044ef7dfde6a12d540157228c1fdff365f3b662f8c84b9e7460ede985f0d402ec76a1d248fa41d336ac7bd9333222543c6d01748c83 SHA512 e32e899e917eb04e382a02484accf9fea0369de8c1942b445e48e71e9c836305e2d54221c9a044d27ede44a7d5c14f976a8ffda79f79f71b5a121474e759f45d
-EBUILD ruby-termios-1.0.0-r1.ebuild 975 BLAKE2B 1604516e23a132e11decbb53f1ab521b0ed3394dd35b64acb46bfe43efd95959313f7d62d03ad4aa9cee7183de3f3c657a1e117d6b792a7c93837dc4271cd0ab SHA512 bd78505df91239e8a0bf638652537daf075c388ad969dfba80dca5310b9c5d092ec7ac8d93570dcc86f6996661badcfd47405976637fa722b87c7a95fc229887
 EBUILD ruby-termios-1.0.2-r1.ebuild 728 BLAKE2B 40c46c7da5e7523a4e9b6820c635bca48bfff02a2d828a8db427c33a1cc3aead6a6a791bb5ef5b4e0e97c2c771077f43e5c0cf08a30941cd329f11489707ca51 SHA512 ea214f241021a4c25be2c301ddd542671aa1db3c5163034e39ac4f925bb4fbf60182ce272bd01a398b4677a41705419f3abf64a658d8f79153dcd3191e25bebc
 MISC metadata.xml 344 BLAKE2B bea737f016d7562c237c3cd1da976866362b52c33fed4f356becc724318f0d73129d6d67cb1202658495cd3ca337625f218cf3739dcdb19fab7fbf7df87df8bc SHA512 3c6d07c1fb48f63b2e3b11eaa84b24b6f57e1b7ad4146327950c294e0d49521a7dce7cb63c99bd0641c7b330d64b6c85d91ba6feb150282f35902fce8602806c
diff --git a/dev-ruby/ruby-termios/ruby-termios-1.0.0-r1.ebuild b/dev-ruby/ruby-termios/ruby-termios-1.0.0-r1.ebuild
deleted file mode 100644
index a38746917948..000000000000
--- a/dev-ruby/ruby-termios/ruby-termios-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,45 +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"
-
-inherit multilib ruby-ng
-
-DESCRIPTION="A Ruby interface to termios"
-HOMEPAGE="http://arika.org/ruby/termios"
-SRC_URI="https://github.com/arika/ruby-termios/archive/version_${PV//./_}.tar.gz -> ${P}.tar.gz"
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~mips ~ppc x86 ~x86-macos"
-IUSE=""
-
-RUBY_S="${PN}-version_${PV//./_}"
-
-# Tests require a normal TTY, bug 340575. They should all pass when run
-# manually.
-RESTRICT=test
-
-each_ruby_configure() {
-	${RUBY} -Cext extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -Cext V=1
-	cp ext/termios$(get_modname) lib/ || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib test/test0.rb || die "tests failed"
-}
-
-each_ruby_install() {
-	emake V=1 -Cext DESTDIR="${D}" install
-}
-
-all_ruby_install() {
-	dodoc ChangeLog README termios.rd
-
-	insinto /usr/share/doc/${PF}/examples
-	doins examples/*
-}
diff --git a/dev-ruby/rubypants/Manifest b/dev-ruby/rubypants/Manifest
index e3156b953199..9664cf5d0667 100644
--- a/dev-ruby/rubypants/Manifest
+++ b/dev-ruby/rubypants/Manifest
@@ -1,5 +1,3 @@
-DIST rubypants-0.2.0.gem 11264 BLAKE2B cb5e995a6739ea27c94173fc1fb5c525098d71a17a92d09c924cce6803b156a78097def230c9e935bb17d8dac35e86ccfcbbea0e94349804eec170b3646ae8e7 SHA512 f7efe237860e15b2ce164749973d5ef133dce1a6bc5e9429357703b321fb0af8ef4e849f8ed19ed498b6fff13e29da036bb8d379c1220d939c862aba0138a5d6
 DIST rubypants-0.7.0.gem 13824 BLAKE2B c132b3c60390b712c08ec54b10a14255e21d9622399b9ddba8d2359915411c604052569e5713fdb4b1a3fefcc3416f4d5af16baca19063a0b79203838b8f3066 SHA512 cacd05e0cc87389b5513c83fe085db39202c2789b882b564caaded6b84b1ecb1acbde8232462dadf501c68c1c881ee7b7f4e640feec47c9c0f7a08758b5f5724
-EBUILD rubypants-0.2.0-r5.ebuild 827 BLAKE2B 25ce25c6074acdb86a673517ffaa7f4a6f37d2cd7a11698b75b067d8f8fc6f8689397a1fe1ce417ba1ab0d4b7d238279b7fb15d21085196aaf1710e127b9e9ab SHA512 5096c7df18d37d5c95a2c67ea9e3ba676567925e539fae047cee752c2aa5ecd767b4d856756881c0535985f8bc613a5097f9b2b37483a45c04a22d816b033d96
 EBUILD rubypants-0.7.0.ebuild 596 BLAKE2B 4ed94c7d29873f749b392555273aa2fb01bc57f046c82dbfd4ce4e1ccb817a0c85febffe32564184d74dac46d1af634e4f78f637621545a4fb0d44f33eba2c74 SHA512 bfc6644fbe4f8d8f6f21abaa43d1a1c725ef57dcf55b08ea4e6ea1b5cad29af42735d73bbca19685be4c751bd3e34a1a0d39dc3b41eba95a0555bac2a6ce3887
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/rubypants/rubypants-0.2.0-r5.ebuild b/dev-ruby/rubypants/rubypants-0.2.0-r5.ebuild
deleted file mode 100644
index 7296b54c3715..000000000000
--- a/dev-ruby/rubypants/rubypants-0.2.0-r5.ebuild
+++ /dev/null
@@ -1,37 +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_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby port of the SmartyPants PHP library"
-HOMEPAGE="http://chneukirchen.org/repos/rubypants/README"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-all_ruby_prepare() {
-	# the metadata format is ancient, and has quite a bit of trouble,
-	# remove it and let it use a generated one.
-	rm -f ../metadata || die
-}
-
-each_ruby_install() {
-	ruby_fakegem_install_gemspec
-
-	ruby_fakegem_newins rubypants.rb lib/rubypants.rb
-}
-
-each_ruby_test() {
-	# The rakefile doesn't really implement it properly, so simply
-	# replace it here.
-	${RUBY} -I. test_rubypants.rb || die "tests failed"
-}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 86631805157a..d3072fdc9c93 100644
Binary files a/metadata/Manifest.gz and b/metadata/Manifest.gz differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index f34571d038bc..af61bbbc726b 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 18 Jun 2018 05:08:27 +0000
+Mon, 18 Jun 2018 07:38:27 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index e59e62794b41..771d19f5b53e 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 425986 BLAKE2B 7d85d5d425d6a32154acb4a6caf5510b1727824049e4d280e4ce24df212ed1afbd08799a2cc7c144ede280b60154612e1328ddb782e47076fb1ea7af095c3b33 SHA512 e30fd9fcd31461c74df766927e752a6d54f7b8d0fbbb414546d1dea373dbc0058af9ac0adc109de0105cbe98d3ae59802a6ade9f2b520edf7cc1b52ea112c9a9
-TIMESTAMP 2018-06-18T05:08:31Z
+TIMESTAMP 2018-06-18T07:38:31Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlsnPk9fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlsnYXdfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klA8/Q//cD/SuRZomS/iIALigVllW3urX06pUnuB4yVeZfheD0404+ddwzgaJXLH
-FGrHc0Ooxd+r8eWChshDEO3/WIRTsHjNlat4p8ZgLs7cbk8IQ9jiMOWJxHRNnpg9
-etEH2+th54ZcOr6UjEXh3EW6O3vYXxU38AQv4xDbAVQKnD600uZ5wtfE8ZwmUpKl
-xZF48FE1cSsH2Ihpw7NwZNTADkTtYaz91Hbw3qkR3VRK21UNQF6TtSNeYiRqt4Xo
-XlQdlt/C2zaAp2tIPzEkANtdMQB//Z7Y/mZ8pWFyoQxjlczV7RcNVUv8tp2M1AlD
-v+GaNN7mlrmFmLFlHoBjsvFb71c/N854K2RXl+Fx/QDbc6MSSvp0dVqOKOLmt82a
-zQeP7i1zcH1e+vg7d+nj5zBtuT0y6seV92+k3nOob+t7KjeqQ+gQGc6J0HQBuV1u
-vST8azYhl+aAtu/Uy8jgPL6+tjIoHjJqiP/KOEc6DNR1SVRgRsF3CoQ1l/Oz2J5P
-kRuxJgwYDOB7vC3VyLa2qeS2k/SY9L+/W0XB38IiIEn5dz8vO98jzJNM4bt9XwzP
-Y+Bm4ptiHOSnJdeH75x6t9V4A+QsV8rACEcv9kZAabHThOCYpnSspPdW5Q7/CmxQ
-ubDsCUT9vMY87rLoFd3NfiJ5wRJv6/3JgrCEiI12RMMMUHwrJz4=
-=e7VK
+klDAjg/9Fh7FSANTRppfYeL21rmDU1guu7OZavKxaVFLmwMeyb5W5Fg+PRX9F7xL
+EkiIlfDkuo9kqFQBPa5GCJvple2GiRpj6c6MjwvP1Jp++fj6RHY9wayw5lcyzfWv
+T4F7bcQbXJVqCD+X65SSlYbLR8CW2DQb2lqVH9wnO/qmG8z3uQZUtxvzlbTonTjA
+aEYclUny3FJFde8hNd+s5pKXRVLjk1SCprD8JiIfk8yRjMnQ+8U/IqJYoVU+3NRt
+EksPhb1wj2j2gzRXVKTOAlTqIsDw0HFlFCtLchnQ70VmP9+yyD8gG5GBGjGpmbmd
+PPx/ozwOdHYWzxIhxuF0oOAWAW5tcEz5E6R8S9AD9EIcB2AIuil1qesjjf8d+Fa7
+kt5IFSr/ISa1mAiSQXbarmApodLKd4hdcoXNC1ElPTjdhszeMFVEjQsVHbvOGe+4
+tBYP8W3M4zg5Jmb+v1elycwOXcM8W5pSRM+miVqSkLDAb+PxGJhyQwXp2sisLGyL
+0GMtKGl+p/bUvni9365jqDnQo2ffZ6QreT8av/yf6Sd5o2GnCnrF3PAJOAhX9IEn
+36NMDQVkt9GrgnJVVkXVSE3V6ZuIhUoJkjxANKOgfCh/WUk4irNPqnf6fNJ+Tl90
+WjXwZRh7nereJn69cBLzd8CTJtJ9wfJKwPdN3BN5LrCPqPpysjI=
+=zxXg
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index f34571d038bc..af61bbbc726b 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 18 Jun 2018 05:08:27 +0000
+Mon, 18 Jun 2018 07:38:27 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index f7f8128c1915..aafcad4aec76 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 625dc8b7bb1a..5bac3fa18884 100644
Binary files a/metadata/md5-cache/app-emulation/Manifest.gz and b/metadata/md5-cache/app-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emulation/reg-0.14.0 b/metadata/md5-cache/app-emulation/reg-0.14.0
new file mode 100644
index 000000000000..0abae5fc16c6
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/reg-0.14.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=>=dev-lang/go-1.9
+DESCRIPTION=Docker registry v2 command line client
+EAPI=6
+HOMEPAGE=https://github.com/genuinetools/reg
+KEYWORDS=~amd64
+LICENSE=MIT
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/genuinetools/reg/archive/v0.14.0.tar.gz -> reg-0.14.0.tar.gz
+_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_md5_=f464117349259ec67f3ad4058a8401be
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 2e5bc22f8b83..a3ce32c837c2 100644
Binary files a/metadata/md5-cache/dev-ruby/Manifest.gz and b/metadata/md5-cache/dev-ruby/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ruby/addressable-2.4.0-r1 b/metadata/md5-cache/dev-ruby/addressable-2.4.0-r1
deleted file mode 100644
index b2d1cc48ee37..000000000000
--- a/metadata/md5-cache/dev-ruby/addressable-2.4.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=A replacement for the URI implementation that is part of Ruby's standard library
-EAPI=5
-HOMEPAGE=https://rubygems.org/gems/addressable https://github.com/sporkmonger/addressable
-IUSE=doc test elibc_FreeBSD ruby_targets_ruby23 doc test test
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=mirror://rubygems/addressable-2.4.0.gem
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=6e7045ba81d6231d494509776c9e803a
diff --git a/metadata/md5-cache/dev-ruby/asciidoctor-1.5.7.1 b/metadata/md5-cache/dev-ruby/asciidoctor-1.5.7.1
index 339d6027e7fc..a35d139b9087 100644
--- a/metadata/md5-cache/dev-ruby/asciidoctor-1.5.7.1
+++ b/metadata/md5-cache/dev-ruby/asciidoctor-1.5.7.1
@@ -4,11 +4,11 @@ DESCRIPTION=Processor for converting AsciiDoc into HTML 5, DocBook 4.5 and other
 EAPI=6
 HOMEPAGE=https://github.com/asciidoctor/asciidoctor
 IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/asciidoctor/asciidoctor/archive/v1.5.7.1.tar.gz -> asciidoctor-1.5.7.1.tar.gz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=7cf8485ec4249407641f368a049f8810
+_md5_=fe65a13de23a40fe0b40fc541cded32d
diff --git a/metadata/md5-cache/dev-ruby/atomic-1.1.101 b/metadata/md5-cache/dev-ruby/atomic-1.1.101
index 0b4fbaa22127..45c0c8e48d33 100644
--- a/metadata/md5-cache/dev-ruby/atomic-1.1.101
+++ b/metadata/md5-cache/dev-ruby/atomic-1.1.101
@@ -4,11 +4,11 @@ DESCRIPTION=An atomic reference implementation for JRuby, Rubinius, and MRI
 EAPI=5
 HOMEPAGE=https://github.com/headius/ruby-atomic
 IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
 REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/atomic-1.1.101.gem
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c1600ba78a74deb370b41929c496a3c7
+_md5_=2fd798f9791b8a63bb91e0a9557c8033
diff --git a/metadata/md5-cache/dev-ruby/dbf-3.1.0 b/metadata/md5-cache/dev-ruby/dbf-3.1.0
deleted file mode 100644
index 4df992ded914..000000000000
--- a/metadata/md5-cache/dev-ruby/dbf-3.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=a small fast library for reading dBase, xBase, Clipper and FoxPro database files
-EAPI=5
-HOMEPAGE=https://github.com/infused/dbf
-IUSE=elibc_FreeBSD ruby_targets_ruby23 doc test test
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=mirror://rubygems/dbf-3.1.0.gem
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=262dce15616aa2a54cb30727a3aca632
diff --git a/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4-r2 b/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4-r2
deleted file mode 100644
index 2a64a51c24e1..000000000000
--- a/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/hoe[ruby_targets_ruby23] dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=An implementation of RFC 2617 - Digest Access Authentication
-EAPI=5
-HOMEPAGE=https://github.com/drbrain/net-http-digest_auth
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 doc test test
-KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=mirror://rubygems/net-http-digest_auth-1.4.gem
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=0132e2324d395c17aa5b75963595f199
diff --git a/metadata/md5-cache/dev-ruby/ruby-gettext-3.2.9 b/metadata/md5-cache/dev-ruby/ruby-gettext-3.2.9
index 1e491a5a97e7..6eea6c3d7e4f 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gettext-3.2.9
+++ b/metadata/md5-cache/dev-ruby/ruby-gettext-3.2.9
@@ -4,11 +4,11 @@ DESCRIPTION=Native Language Support Library and Tools modeled after GNU gettext
 EAPI=6
 HOMEPAGE=https://ruby-gettext.github.io/
 IUSE=doc test test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=|| ( Ruby LGPL-3+ )
 RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby23] >=dev-ruby/text-1.3.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby24] >=dev-ruby/text-1.3.0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby25] >=dev-ruby/text-1.3.0[ruby_targets_ruby25] ) sys-devel/gettext ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
 REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/gettext-3.2.9.gem
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=2fa80e7120cf20b4156714dffd08064a
+_md5_=5f790cac2ac92edd781c6f193ccffe12
diff --git a/metadata/md5-cache/dev-ruby/ruby-termios-1.0.0-r1 b/metadata/md5-cache/dev-ruby/ruby-termios-1.0.0-r1
deleted file mode 100644
index 38cf647dd87b..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-termios-1.0.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
-DESCRIPTION=A Ruby interface to termios
-EAPI=5
-HOMEPAGE=http://arika.org/ruby/termios
-IUSE=elibc_FreeBSD ruby_targets_ruby23
-KEYWORDS=amd64 ~hppa ~mips ~ppc x86 ~x86-macos
-LICENSE=Ruby
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
-REQUIRED_USE=|| ( ruby_targets_ruby23 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/arika/ruby-termios/archive/version_1_0_0.tar.gz -> ruby-termios-1.0.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=821d9099e0d7ad702af82f7208705712
diff --git a/metadata/md5-cache/dev-ruby/rubypants-0.2.0-r5 b/metadata/md5-cache/dev-ruby/rubypants-0.2.0-r5
deleted file mode 100644
index cd1f49157cf5..000000000000
--- a/metadata/md5-cache/dev-ruby/rubypants-0.2.0-r5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=A Ruby port of the SmartyPants PHP library
-EAPI=5
-HOMEPAGE=http://chneukirchen.org/repos/rubypants/README
-IUSE=elibc_FreeBSD ruby_targets_ruby23 test
-KEYWORDS=amd64 x86
-LICENSE=Ruby
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=mirror://rubygems/rubypants-0.2.0.gem
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=dbbed420df32635afd83b2cd3bf3b756
diff --git a/metadata/md5-cache/www-apache/Manifest.gz b/metadata/md5-cache/www-apache/Manifest.gz
index 101d1e349e03..58ec5dd054a5 100644
Binary files a/metadata/md5-cache/www-apache/Manifest.gz and b/metadata/md5-cache/www-apache/Manifest.gz differ
diff --git a/metadata/md5-cache/www-apache/passenger-5.2.3 b/metadata/md5-cache/www-apache/passenger-5.2.3
deleted file mode 100644
index efca2fe8543b..000000000000
--- a/metadata/md5-cache/www-apache/passenger-5.2.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rake-0.8.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby24] >=dev-ruby/rake-0.8.1[ruby_targets_ruby24] ) ) >=dev-libs/libuv-1.8.0 net-misc/curl[ssl] apache2? ( www-servers/apache[apache2_modules_unixd(+)] ) apache2? ( =www-servers/apache-2* ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
-DESCRIPTION=Passenger makes deployment of Ruby on Rails applications a breeze
-EAPI=6
-HOMEPAGE=https://www.phusionpassenger.com/
-IUSE=apache2 debug test apache2 elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rake-0.8.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby24] >=dev-ruby/rake-0.8.1[ruby_targets_ruby24] ) >=dev-libs/libuv-1.8.0 net-misc/curl[ssl] apache2? ( www-servers/apache[apache2_modules_unixd(+)] ) apache2? ( =www-servers/apache-2* ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=https://s3.amazonaws.com/phusion-passenger/releases/passenger-5.2.3.tar.gz
-_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	0917334d570e07f9743a04ff85b3bf1b	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=60bbd9e83b4c0d60d2974461bbe687ba
diff --git a/metadata/md5-cache/www-apache/passenger-5.3.1 b/metadata/md5-cache/www-apache/passenger-5.3.1
deleted file mode 100644
index 2a5c467b13c4..000000000000
--- a/metadata/md5-cache/www-apache/passenger-5.3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rake[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rake-0.8.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby24] >=dev-ruby/rake-0.8.1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby25] >=dev-ruby/rake-0.8.1[ruby_targets_ruby25] ) ) >=dev-libs/libuv-1.8.0 net-misc/curl[ssl] apache2? ( www-servers/apache[apache2_modules_unixd(+)] ) apache2? ( =www-servers/apache-2* ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
-DESCRIPTION=Passenger makes deployment of Ruby on Rails applications a breeze
-EAPI=6
-HOMEPAGE=https://www.phusionpassenger.com/
-IUSE=apache2 debug test apache2 elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rake-0.8.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby24] >=dev-ruby/rake-0.8.1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby25] >=dev-ruby/rake-0.8.1[ruby_targets_ruby25] ) >=dev-libs/libuv-1.8.0 net-misc/curl[ssl] apache2? ( www-servers/apache[apache2_modules_unixd(+)] ) apache2? ( =www-servers/apache-2* ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=0
-SRC_URI=https://s3.amazonaws.com/phusion-passenger/releases/passenger-5.3.1.tar.gz
-_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	0917334d570e07f9743a04ff85b3bf1b	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f1277bcc09384de2850ef5836b394469
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index b5e3a3848273..d6942b3728a4 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 19761 BLAKE2B 851bd0e17305c38a177a42b80b1a89b0ca99add42dad8fa975ce0752b34aea6ad1a6bad714f0de316d8dd42cd1abbc45a7e7ea98aa182d7c527c7ced227ed9db SHA512 c4661dd0996945ee8bec7e333266902c18e9c534f4e79ebde22e80dffcea1351164ef9712b507585819b758cd1acd788423441e091bdaab31f0b7ee4681eeacd
-TIMESTAMP 2018-06-18T05:08:31Z
+TIMESTAMP 2018-06-18T07:38:31Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlsnPk9fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlsnYXdfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDJYhAAhbZsQOTTDaEUwy7tQ1zsKXqcFjLLALKqin79mGC4qQRDol4BlgBi6knx
-NU+wnUvInvJ90xaV7Eoql6B8Jc1JkXU1QQQRvFvgTLNAz7SGs2jJUvsef3cClu+6
-QQzlzVVCUilAAYUX0yCSjVmYGrmvjjgv79EESrsBOuYp6c408IYpuNxKWqb/24+m
-RH/UicGXUrbAMiqNyhD/gp+XiW6AWxTrwqPbN1LNxIMY5ZOUlLCrILU0dVfCXmyi
-2wF5r8StkdPI/TBoZItonn4CKpmPkFXXBuq3k8CINQhRkPr453A0/n+4cAcNrAxS
-ezBDp10PtT6t0EtDV+1lIUnwVc3PYOdRURM9V5Ey5lkdlSsFLlrKrRSuXZldUoPs
-OEzNgGRUIxVSQ61v7w/ogwoAsZxN5NuqhsYni4+eEAZe1UUGt4tL61CedZnBAZkQ
-T0SchocW5BY/KZiN6F/ajwFkbqal+1eh77MFQpwbXqcePc8lc3FPuoMATkXCGm+l
-S6WkJy3baR8G6vHHJ2WiVoWYjs+hno1g5arfjfwe6L0778scPqoLF4NerX6q3PVf
-DZX47OJhTAR8djaf2G2r7FJZwVB64G8y0qSdhcW3+34lcBKZZg8JzHvoHUWNyUlF
-jtcBYHz7X8JsYRtnHuuXkTD9l3fI0TxLoehFi719h35eFWwC6RE=
-=bLTy
+klCFug//bqwcZMjDXh1MjF/bn1vIDr5MXi+ffzcpaNNNPCP2tk7aoymQ1iPUg8Yf
+MHA1Iyh1zZ/XMA6mobP/crUl8y4ctSyUf7IAxVHFDYA+3aZvbB3wprTvp6h9ljR7
+h81Th3dyBHzEzgb25ppZA6da2qeO1a11mqV/YJeJXjeKyFSEaD//By5rf+3FcfgP
+jZ1SNTQDeG1hht98Q6caMXYhfgUExYhebqmmjkwZYkGXnR4I+VMSQ5zoZZYwtN3L
+sIhGVocyrdCaHk/Hzs67Jo0nvvGti0I0gwmMBz5JRuLDwA2czxlrf0wfhS3mgwKt
+x14xT5RshHwR2iA9pzPW8EZcabBr8uh7/MSNW4S3dhiUd+0OyLDcx/guTNhlO2px
+h7/uUqJiaimBrWIeu8wYZQANIvS2icPYozgJyZQVLA7EyGk0L9YKwnVx3m0MvQy3
+gzhzrrLuV/7QttlCUV9QQinXq+LzZh70ubxzSLIe+FQLNJ1IgMhAH/vWpsp3Ydf2
+2lQ2J/V1h2HxDqI1bjWCL4xc8i+PuymAT9wWxiJWQJ1sTUUpJRONQgEE/xW4HdGx
+y+p7bWy4Buwmfv+PjZN07T0keMJz7Oa8KgCTAW0FsstJZuNJ6G5rpIX8N8eXeFRK
+kwMKLSduDrmSo9UWh5aSkAZwSbUDICr0w/huCUQo0wc+zS9PaW4=
+=IQyi
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index f34571d038bc..af61bbbc726b 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 18 Jun 2018 05:08:27 +0000
+Mon, 18 Jun 2018 07:38:27 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 91cd4e32eb0e..5fa93b277375 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Jun 18 05:08:27 UTC 2018
+Mon Jun 18 07:38:27 UTC 2018
diff --git a/metadata/timestamp.calculate b/metadata/timestamp.calculate
index 669ad0a5fed4..fd419078ff75 100644
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@@ -1970,7 +1970,6 @@
 1803140208 ./dev-ruby/rbnacl/rbnacl-4.0.2.ebuild
 1803140208 ./dev-ruby/rbnacl/rbnacl-5.0.0.ebuild
 1804081238 ./dev-ruby/rbnacl/rbnacl-5.0.0-r1.ebuild
-1705161058 ./dev-ruby/addressable/addressable-2.4.0-r1.ebuild
 1806070309 ./dev-ruby/addressable/addressable-2.5.2.ebuild
 1806030838 ./dev-ruby/mechanize/mechanize-2.7.6.ebuild
 1801212308 ./dev-ruby/mechanize/mechanize-2.7.5-r2.ebuild
@@ -2070,7 +2069,7 @@
 1802192238 ./dev-ruby/state_machine/state_machine-1.2.0.ebuild
 1803252108 ./dev-ruby/sourcemap/sourcemap-0.1.1.ebuild
 1802260938 ./dev-ruby/atomic/atomic-1.1.100.ebuild
-1806180339 ./dev-ruby/atomic/atomic-1.1.101.ebuild
+1806180839 ./dev-ruby/atomic/atomic-1.1.101.ebuild
 1804150838 ./dev-ruby/atomic/atomic-1.1.99.ebuild
 1805030809 ./dev-ruby/log4r/log4r-1.1.10-r2.ebuild
 1804060808 ./dev-ruby/roadie/roadie-3.3.0.ebuild
@@ -2193,7 +2192,6 @@
 1804042138 ./dev-ruby/strptime/strptime-0.2.3.ebuild
 1802031108 ./dev-ruby/deprecated/deprecated-3.0.1-r2.ebuild
 1806070309 ./dev-ruby/dbf/dbf-3.1.1.ebuild
-1710232142 ./dev-ruby/dbf/dbf-3.1.0.ebuild
 1804270909 ./dev-ruby/dbf/dbf-3.1.2.ebuild
 1805050439 ./dev-ruby/hiera/hiera-3.4.2.ebuild
 1805050439 ./dev-ruby/hiera/hiera-3.2.2.ebuild
@@ -2390,7 +2388,7 @@
 1805191109 ./dev-ruby/activerecord/activerecord-5.2.0.ebuild
 1803312138 ./dev-ruby/activerecord/activerecord-5.0.7.ebuild
 1806021708 ./dev-ruby/asciidoctor/asciidoctor-1.5.5-r1.ebuild
-1806180339 ./dev-ruby/asciidoctor/asciidoctor-1.5.7.1.ebuild
+1806180839 ./dev-ruby/asciidoctor/asciidoctor-1.5.7.1.ebuild
 1803052238 ./dev-ruby/sparklines/sparklines-0.5.2-r6.ebuild
 1806040808 ./dev-ruby/rash_alt/rash_alt-0.4.7.ebuild
 1804210808 ./dev-ruby/rash_alt/rash_alt-0.4.6.ebuild
@@ -2444,7 +2442,6 @@
 1803291008 ./dev-ruby/timecop/timecop-0.9.1.ebuild
 1804060808 ./dev-ruby/iobuffer/iobuffer-1.1.2-r3.ebuild
 1704181845 ./dev-ruby/dependor/dependor-1.0.1.ebuild
-1702282250 ./dev-ruby/rubypants/rubypants-0.2.0-r5.ebuild
 1806070309 ./dev-ruby/rubypants/rubypants-0.7.0.ebuild
 1802091008 ./dev-ruby/regexp_parser/regexp_parser-0.4.9.ebuild
 1805150838 ./dev-ruby/regexp_parser/regexp_parser-0.4.13.ebuild
@@ -2460,7 +2457,7 @@
 1803091238 ./dev-ruby/jquery-ui-rails/jquery-ui-rails-6.0.1-r1.ebuild
 1803091238 ./dev-ruby/jquery-ui-rails/jquery-ui-rails-5.0.5-r1.ebuild
 1708142015 ./dev-ruby/ruby-gettext/ruby-gettext-3.2.2.ebuild
-1806180809 ./dev-ruby/ruby-gettext/ruby-gettext-3.2.9.ebuild
+1806181039 ./dev-ruby/ruby-gettext/ruby-gettext-3.2.9.ebuild
 1712091109 ./dev-ruby/metasploit-model/metasploit-model-2.0.3.ebuild
 1803201012 ./dev-ruby/rake-remote_task/rake-remote_task-2.4.3.ebuild
 1705090608 ./dev-ruby/octokit/octokit-4.7.0.ebuild
@@ -2626,7 +2623,6 @@
 1805250809 ./dev-ruby/connection_pool/connection_pool-2.2.2.ebuild
 1801212308 ./dev-ruby/sfl/sfl-2.2-r1.ebuild
 1806070309 ./dev-ruby/net-http-digest_auth/net-http-digest_auth-1.4.1.ebuild
-1702282250 ./dev-ruby/net-http-digest_auth/net-http-digest_auth-1.4-r2.ebuild
 1801110909 ./dev-ruby/bacon/bacon-1.2.0-r2.ebuild
 1804302339 ./dev-ruby/jeweler/jeweler-2.3.9.ebuild
 1803160038 ./dev-ruby/jeweler/jeweler-2.3.7.ebuild
@@ -2662,7 +2658,6 @@
 1708142015 ./dev-ruby/mocha/mocha-1.1.0.ebuild
 1805301938 ./dev-ruby/mocha/mocha-1.4.0.ebuild
 1804070808 ./dev-ruby/mocha/mocha-1.5.0.ebuild
-1702282250 ./dev-ruby/ruby-termios/ruby-termios-1.0.0-r1.ebuild
 1806070309 ./dev-ruby/ruby-termios/ruby-termios-1.0.2-r1.ebuild
 1805270838 ./dev-ruby/websocket/websocket-1.2.8.ebuild
 1711150907 ./dev-ruby/websocket/websocket-1.2.5.ebuild
@@ -18974,8 +18969,6 @@
 1803011838 ./sys-freebsd/freebsd-lib/freebsd-lib-11.1-r1.ebuild
 1801231609 ./sys-freebsd/freebsd-lib/freebsd-lib-9.1-r11.ebuild
 1806130809 ./www-apache/passenger/passenger-5.3.2.ebuild
-1804050908 ./www-apache/passenger/passenger-5.2.3.ebuild
-1805160909 ./www-apache/passenger/passenger-5.3.1.ebuild
 1801271039 ./www-apache/passenger/passenger-5.1.12.ebuild
 1712020139 ./www-apache/mod_xsendfile/mod_xsendfile-1.0_beta1.ebuild
 1805012209 ./www-apache/mod_depends/mod_depends-0.7.0_p200702041.ebuild
@@ -35185,6 +35178,7 @@
 1805012209 ./app-emulation/vov/vov-2.0.0.ebuild
 1806121509 ./app-emulation/reg/reg-0.13.3.ebuild
 1806151739 ./app-emulation/reg/reg-0.13.4.ebuild
+1806181039 ./app-emulation/reg/reg-0.14.0.ebuild
 1702282250 ./app-emulation/ganeti-instance-image/ganeti-instance-image-0.6.ebuild
 1802280138 ./app-emulation/cadvisor/cadvisor-0.29.1.ebuild
 1801252208 ./app-emulation/cadvisor/cadvisor-0.28.3-r1.ebuild
@@ -37567,7 +37561,7 @@
 1806131202 metadata/md5-cache/dev-ruby/listen-3.1.5-r2
 1806131202 metadata/md5-cache/dev-ruby/coffee-script-2.4.1
 1806131202 metadata/md5-cache/dev-ruby/uglifier-4.1.10
-1806180809 metadata/md5-cache/dev-ruby/ruby-gettext-3.2.9
+1806181039 metadata/md5-cache/dev-ruby/ruby-gettext-3.2.9
 1806131202 metadata/md5-cache/dev-ruby/moneta-1.0.0
 1806131202 metadata/md5-cache/dev-ruby/http-1.0.2
 1806131202 metadata/md5-cache/dev-ruby/rgen-0.8.3
@@ -37934,7 +37928,6 @@
 1806131202 metadata/md5-cache/dev-ruby/test-unit-3.1.9
 1806131202 metadata/md5-cache/dev-ruby/aws-sigv4-1.0.0
 1806131202 metadata/md5-cache/dev-ruby/ruby-oci8-2.2.5.1
-1806131202 metadata/md5-cache/dev-ruby/rubypants-0.2.0-r5
 1806131202 metadata/md5-cache/dev-ruby/coolio-1.5.3
 1806131202 metadata/md5-cache/dev-ruby/faraday_middleware-multi_json-0.0.6-r1
 1806131202 metadata/md5-cache/dev-ruby/nenv-0.3.0
@@ -37950,7 +37943,6 @@
 1806131202 metadata/md5-cache/dev-ruby/bundler-1.12.5
 1806131202 metadata/md5-cache/dev-ruby/dbf-3.1.2
 1806131202 metadata/md5-cache/dev-ruby/flickraw-0.9.9
-1806131202 metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4-r2
 1806131202 metadata/md5-cache/dev-ruby/cri-2.7.1
 1806131202 metadata/md5-cache/dev-ruby/mime-types-2.99.2
 1806131202 metadata/md5-cache/dev-ruby/web-console-3.6.2
@@ -38011,7 +38003,6 @@
 1806131202 metadata/md5-cache/dev-ruby/chunky_png-1.3.8
 1806131202 metadata/md5-cache/dev-ruby/best_in_place-3.1.1
 1806131202 metadata/md5-cache/dev-ruby/sass-3.5.5
-1806131202 metadata/md5-cache/dev-ruby/addressable-2.4.0-r1
 1806131202 metadata/md5-cache/dev-ruby/sigar-0.7.3
 1806131202 metadata/md5-cache/dev-ruby/GeoRuby-2.5.2
 1806131202 metadata/md5-cache/dev-ruby/astrolabe-1.3.1
@@ -38035,7 +38026,7 @@
 1806131202 metadata/md5-cache/dev-ruby/dalli-2.7.7
 1806131202 metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r2
 1806131202 metadata/md5-cache/dev-ruby/vcr-1.11.3
-1806180809 metadata/md5-cache/dev-ruby/Manifest.gz
+1806181039 metadata/md5-cache/dev-ruby/Manifest.gz
 1806131202 metadata/md5-cache/dev-ruby/bunny-2.8.1
 1806131202 metadata/md5-cache/dev-ruby/cmdparse-3.0.3
 1806131202 metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r2
@@ -38113,7 +38104,7 @@
 1806131202 metadata/md5-cache/dev-ruby/async_sinatra-1.3.0
 1806131202 metadata/md5-cache/dev-ruby/rex-nop-0.1.1
 1806131202 metadata/md5-cache/dev-ruby/rack-attack-5.2.0
-1806180339 metadata/md5-cache/dev-ruby/atomic-1.1.101
+1806180839 metadata/md5-cache/dev-ruby/atomic-1.1.101
 1806131202 metadata/md5-cache/dev-ruby/meterpreter_bins-0.0.22
 1806131202 metadata/md5-cache/dev-ruby/mab-0.0.3
 1806131202 metadata/md5-cache/dev-ruby/rex-socket-0.1.14
@@ -38156,7 +38147,6 @@
 1806131202 metadata/md5-cache/dev-ruby/activemodel-5.1.4
 1806131202 metadata/md5-cache/dev-ruby/allison-2.0.3-r3
 1806131202 metadata/md5-cache/dev-ruby/minitest-5.9.1
-1806131202 metadata/md5-cache/dev-ruby/ruby-termios-1.0.0-r1
 1806131202 metadata/md5-cache/dev-ruby/jquery-rails-4.3.1-r1
 1806131202 metadata/md5-cache/dev-ruby/elasticsearch-5.0.4
 1806131202 metadata/md5-cache/dev-ruby/ruby2ruby-2.3.2
@@ -38521,7 +38511,7 @@
 1806131202 metadata/md5-cache/dev-ruby/rex-ole-0.1.6
 1806131202 metadata/md5-cache/dev-ruby/rspec-expectations-3.6.0
 1806131202 metadata/md5-cache/dev-ruby/lockfile-2.1.3
-1806180339 metadata/md5-cache/dev-ruby/asciidoctor-1.5.7.1
+1806180839 metadata/md5-cache/dev-ruby/asciidoctor-1.5.7.1
 1806131202 metadata/md5-cache/dev-ruby/sawyer-0.8.1
 1806131202 metadata/md5-cache/dev-ruby/xpath-3.1.0
 1806131202 metadata/md5-cache/dev-ruby/faraday-0.15.2
@@ -38530,7 +38520,6 @@
 1806131202 metadata/md5-cache/dev-ruby/ddplugin-1.0.2
 1806131202 metadata/md5-cache/dev-ruby/mime-types-2.6.2
 1806131202 metadata/md5-cache/dev-ruby/mini_mime-1.0.0
-1806131202 metadata/md5-cache/dev-ruby/dbf-3.1.0
 1806131202 metadata/md5-cache/dev-ruby/activeldap-4.0.6
 1806131202 metadata/md5-cache/dev-ruby/sqlite3-1.3.11
 1806131202 metadata/md5-cache/dev-ruby/jwt-1.5.6
@@ -54539,7 +54528,7 @@
 1806131202 metadata/md5-cache/sys-freebsd/freebsd-pf-11.1
 1806131202 metadata/md5-cache/sys-freebsd/freebsd-mk-defs-11.1
 1806131202 metadata/md5-cache/sys-freebsd/freebsd-usbin-11.1
-1806180809 metadata/md5-cache/Manifest.gz
+1806181039 metadata/md5-cache/Manifest.gz
 1805270804 metadata/md5-cache/www-apache/mod_macro-1.1.10
 1806131202 metadata/md5-cache/www-apache/mod_wsgi-4.5.17
 1806131202 metadata/md5-cache/www-apache/mod_perl-2.0.10
@@ -54566,15 +54555,13 @@
 1806131202 metadata/md5-cache/www-apache/mod_auth_xradius-0.4.6
 1806131202 metadata/md5-cache/www-apache/mod_fcgid-2.3.9-r1
 1806131202 metadata/md5-cache/www-apache/mod_auth_xradius-0.4.6-r1
-1806131202 metadata/md5-cache/www-apache/passenger-5.3.1
 1806131202 metadata/md5-cache/www-apache/pwauth-2.3.10
 1805270804 metadata/md5-cache/www-apache/mod_gnutls-0.8.2-r1
 1805270804 metadata/md5-cache/www-apache/mod_extract_forwarded-2.0.3_pre2015052015
 1805270804 metadata/md5-cache/www-apache/mod_xml2enc-1.0.3
 1708072039 metadata/md5-cache/www-apache/mod_h2-1.10.10
 1805270804 metadata/md5-cache/www-apache/mod_macro-1.2.1
-1806131202 metadata/md5-cache/www-apache/Manifest.gz
-1806131202 metadata/md5-cache/www-apache/passenger-5.2.3
+1806180839 metadata/md5-cache/www-apache/Manifest.gz
 1806131202 metadata/md5-cache/www-apache/mod_log_rotate-1.00
 1805270804 metadata/md5-cache/www-apache/mod_vhost_ldap-2.4.0-r1
 1806131202 metadata/md5-cache/www-apache/mod_nss-1.0.12-r1
@@ -70837,7 +70824,7 @@
 1806042238 metadata/md5-cache/app-emulation/runc-1.0.0_rc5-r1
 1806131202 metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.12
 1806131202 metadata/md5-cache/app-emulation/virtualbox-additions-5.2.10-r1
-1806180809 metadata/md5-cache/app-emulation/Manifest.gz
+1806181039 metadata/md5-cache/app-emulation/Manifest.gz
 1806131202 metadata/md5-cache/app-emulation/libvirt-glib-1.0.0
 1806131202 metadata/md5-cache/app-emulation/qemu-guest-agent-2.11.1
 1806131110 metadata/md5-cache/app-emulation/docker-gc-9999
@@ -70898,6 +70885,7 @@
 1806131202 metadata/md5-cache/app-emulation/docker-compose-1.21.2
 1806131202 metadata/md5-cache/app-emulation/ganeti-instance-debootstrap-0.12
 1806131202 metadata/md5-cache/app-emulation/xe-guest-utilities-5.6.0_p595
+1806181039 metadata/md5-cache/app-emulation/reg-0.14.0
 1806131202 metadata/md5-cache/app-emulation/cloud-init-9999
 1806121509 metadata/md5-cache/app-emulation/img-0.4.5
 1801191240 metadata/md5-cache/app-emulation/libguestfs-appliance-1.28.1
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 71ab5ec7bba8..b5774e5b8b5d 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 18 Jun 2018 05:30:01 +0000
+Mon, 18 Jun 2018 08:00:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 1edcc57d32a5..c2b85c37107f 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-69a05ce83cc9e04ddba18bcbdb8355e734013ee6 1529297973 2018-06-18T04:59:33+00:00
+8fab4152cca901e61aee7a6cf945fa3705be4b1f 1529306249 2018-06-18T07:17:29+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index e618488c2e51..2067058418b5 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1529298301 Mon 18 Jun 2018 05:05:01 AM UTC
+1529307301 Mon 18 Jun 2018 07:35:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index f34571d038bc..af61bbbc726b 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 18 Jun 2018 05:08:27 +0000
+Mon, 18 Jun 2018 07:38:27 +0000
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index e33230ff8f55..1ed0b76c768d 100644
Binary files a/www-apache/Manifest.gz and b/www-apache/Manifest.gz differ
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index b6786ca40490..ae640e2325b2 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -2,11 +2,7 @@ AUX 30_mod_passenger-5.0.0.conf 2737 BLAKE2B 781ffa4831313356b6caa493fc94a784f6b
 AUX passenger-5.1.1-isnan.patch 1155 BLAKE2B bb11276f94f4be93a7ef089e09079d36971ca028df4f8962e4220880361b96c3640475ac537f62d5e7ad198fdfb477fe15f34dbd86db4143b24246d11278eb58 SHA512 a80a9a229f1eeb34780236d0b2418fe5d2f57b9ae8c3c4ccdec729806f4afad8979de4ab3ea0834cdb76218192825ee4bfaf02b48f3bda240c2db441bcc870d9
 AUX passenger-5.1.11-gentoo.patch 1064 BLAKE2B f62d689d7425e11609917506b1c19e15f9eebd5255c3b16f89d98ed44493af7dd0b7e5576430b2c603af29f51ea1ee2c82c34b83d6042c0419db2069740183e2 SHA512 7aa098e4c2d4958deaf1369c0570e5f0c5661739047982d428555e5136dc9d5414ce575b3236b30223f14178dd2a4262f62f129d1d383f5c0c78312e80634670
 DIST passenger-5.1.12.tar.gz 4245993 BLAKE2B 4f5808bcb373a85fbe2e160d9bd993fdff32a78f5083f5b5ff38112a4d3ca906a18a241cef6744350c0f33ef357dfda7a2cd5af875223a082a19b4e99cba4aeb SHA512 7ecdf0be306a3c4b842c8497861dbc072fc87f5601840678fe1125b77d50e683003b49616397d39b34705c967f604f5193be173c52a9c5ab235ef4e6e43f2f4a
-DIST passenger-5.2.3.tar.gz 6956101 BLAKE2B c2c5448f330e0bd90b5378e9868c18999263428df0a396595f4793979d3961282743b04eaec78b2cf5a0ebdb6a8183b798c2ae244b8a033edf14f5b8837225ca SHA512 fcd2244a30ce633f83448ff2fe3eea4d2215aa061aaf66de2dcd27f0b440b782d051f0f1ca49d6db673871e31518dc95cc6ffbd48a020f8ffe927d3b5969ef97
-DIST passenger-5.3.1.tar.gz 7033258 BLAKE2B 74269e06fefdc597344ddd5f11fb800df9beba7f59bfb3d0b43069f941d82db09cc6129bafdefd2175bf231ed496e7eb0298e500b27129da1ee07a04d054a8ad SHA512 973338f934a1fc484058cf15748695129ab7ddb8c0d4d8527100fefd111a0b794d60b2e59f8f494c4ef5703c72c7ebfeef5539ed9b4a6e736114e2077e83ccdd
 DIST passenger-5.3.2.tar.gz 7039759 BLAKE2B be10b368530b8560d7d93664bbf91711ace0cadb0d1e15a978c0a52311a626ea2e1c6d05e507ef488b384e4a7ccc4b02da35bd5bd5878788b036401e06a33b5f SHA512 97900a0e0de67cc3c3770c291c85c6fe937fceab5632c9832bc5c461d3b4e586a47c9733a1a50a805834f591e5af90651789ed74bf74e0eed4d6ce8084c51967
 EBUILD passenger-5.1.12.ebuild 3980 BLAKE2B 53fb3918d8368e51347ec18fa073916e79952ff432e279ab2007523a87bd1012f5833e354ecbc57e6595a4f0fdf0ef5288fe8141fa4e3c67494ef37e57171ef8 SHA512 09185eead6e3b933713f2b1538ae55bae0ed6457bc723f52cad69948c3c7cca3b3091b2fbf4ac71f5d57c3437db03392b67b0a5560e953e3339aebec5cc1cefc
-EBUILD passenger-5.2.3.ebuild 3982 BLAKE2B dee480b9113b7c5bbe7e739d270033b207eef046ef8b929b68d05d934a800f7595bc036411322c2af605798c28390bfade42e9bdbee22ec0909129c0ddcc0051 SHA512 331ef6f0de2fb54632564b2c161287a0a9164d44c809b26015a2b25221cb6fcc0147577212897ffa7be871e55bb57c2b51aba045a39f41ea4a08cae6ff9eeb99
-EBUILD passenger-5.3.1.ebuild 3982 BLAKE2B 89e14bf8db6ed5f52a9b7ac08ca58977e1b7d8afd492bbfd67dec1174046c030168cbc2462db0e8eefdb90c1f11f64c311b75dfc5988d2259f09f65536454912 SHA512 2fb7572a1c84e6d28a73ec33da00dfdf484bc8152018d5a713b096631e704b4b32947cb901809adf5ad46ba9a765dd410f1ab251fc0c78ebeb0b4ef3a60f7c05
 EBUILD passenger-5.3.2.ebuild 3982 BLAKE2B 89e14bf8db6ed5f52a9b7ac08ca58977e1b7d8afd492bbfd67dec1174046c030168cbc2462db0e8eefdb90c1f11f64c311b75dfc5988d2259f09f65536454912 SHA512 2fb7572a1c84e6d28a73ec33da00dfdf484bc8152018d5a713b096631e704b4b32947cb901809adf5ad46ba9a765dd410f1ab251fc0c78ebeb0b4ef3a60f7c05
 MISC metadata.xml 330 BLAKE2B 80067f262ce3e04098eaab92ec2420a879014d624fa6c230f57daf871ac33b77fcd786868ec508236c62623f2c81dc86573875a42993604896745524d7220fc7 SHA512 5ea7e5026084dedcd363bb79076763cca7d66bb08411d5e2dc56ade23bfdbd522a8db13db9c0b8f50163f130f28c784b622d9639cb3dd33aa810dda3d2577db8
diff --git a/www-apache/passenger/passenger-5.2.3.ebuild b/www-apache/passenger/passenger-5.2.3.ebuild
deleted file mode 100644
index 1833c88aa150..000000000000
--- a/www-apache/passenger/passenger-5.2.3.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
-
-inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs
-
-DESCRIPTION="Passenger makes deployment of Ruby on Rails applications a breeze"
-HOMEPAGE="https://www.phusionpassenger.com/"
-SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="apache2 debug"
-
-ruby_add_bdepend "dev-ruby/rake"
-
-ruby_add_rdepend "
-	>=dev-ruby/rack-1.0.0:*
-	>=dev-ruby/rake-0.8.1"
-
-# libev is bundled but with adapations that do not seem to be accepted
-# upstream, so we must use the bundled version :-(
-CDEPEND="
-	>=dev-libs/libuv-1.8.0
-	net-misc/curl[ssl]
-	apache2? ( www-servers/apache[apache2_modules_unixd(+)] )"
-
-RDEPEND="${RDEPEND} ${CDEPEND}"
-DEPEND="${DEPEND} ${CDEPEND}"
-
-APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}"
-APACHE2_MOD_DEFINE="PASSENGER"
-
-want_apache2
-
-pkg_setup() {
-	use debug && append-flags -DPASSENGER_DEBUG
-	depend.apache_pkg_setup
-}
-
-all_ruby_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.1.11-gentoo.patch
-	epatch "${FILESDIR}"/${PN}-5.1.1-isnan.patch
-
-	# Change these with sed instead of a patch so that we can easily use
-	# the toolchain-funcs methods.
-	sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \
-		-e "/^CXX\s/ s/=.*$/= '$(tc-getCXX)'/" \
-		-e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die
-
-	# Avoid fixed debugging CFLAGs.
-	sed -e '/debugging_cflags/areturn ""' -i src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb || die
-
-	# Use sed here so that we can dynamically set the documentation directory.
-	sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \
-		-e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \
-		src/ruby_supportlib/phusion_passenger.rb || die
-	sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" src/cxx_supportlib/ResourceLocator.h || die
-
-	# Don't install a tool that won't work in our setup.
-	sed -i -e '/passenger-install-apache2-module/d' src/ruby_supportlib/phusion_passenger/packaging.rb || die
-	rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script."
-
-	# Make sure we use the system-provided version where possible
-	rm -rf src/cxx_supportlib/vendor-copy/libuv || die "Unable to remove vendored code."
-
-	# Avoid building documentation to avoid a dependency on mizuho.
-	#sed -i -e 's/, :doc//' build/packaging.rb || die
-	touch doc/*.html || die
-
-	# Fix hard-coded use of AR
-	sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/support/cplusplus.rb || die
-
-	# Make sure apache support is not attempted with -apache2
-	if ! use apache2 ; then
-		sed -i -e '/fakeroot/ s/:apache2, //' build/packaging.rb || die
-	fi
-}
-
-all_ruby_compile() {
-	if use apache2 ; then
-		V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
-		 APXS2="${APXS}" \
-		 HTTPD="${APACHE_BIN}" \
-		 FS_LIBDIR='/usr/'$(get_libdir) \
-		 USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
-		 ruby -S rake apache2 || die "rake failed"
-	fi
-}
-
-each_ruby_compile() {
-	append-flags -fno-strict-aliasing
-
-	V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
-	APXS2="${APXS}" \
-	HTTPD="${APACHE_BIN}" \
-	FS_LIBDIR='/usr/'$(get_libdir) \
-	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
-	${RUBY} -S rake native_support || die "rake failed"
-}
-
-all_ruby_install() {
-	if use apache2 ; then
-		APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so"
-		apache-module_src_install
-
-		# Patch in the correct libdir
-		sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die
-	fi
-
-	dodoc CHANGELOG README.md
-}
-
-each_ruby_install() {
-	DISTDIR="${D}" \
-	RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \
-	RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \
-	APXS2="${APXS}" \
-	HTTPD="${APACHE_BIN}" \
-	FS_LIBDIR='/usr/'$(get_libdir) \
-	EXTRA_LDFLAGS="${LDFLAGS}" \
-	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
-	${RUBY} -S rake fakeroot || die "rake failed"
-}
diff --git a/www-apache/passenger/passenger-5.3.1.ebuild b/www-apache/passenger/passenger-5.3.1.ebuild
deleted file mode 100644
index 7a2b4ba69962..000000000000
--- a/www-apache/passenger/passenger-5.3.1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
-
-inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs
-
-DESCRIPTION="Passenger makes deployment of Ruby on Rails applications a breeze"
-HOMEPAGE="https://www.phusionpassenger.com/"
-SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="apache2 debug"
-
-ruby_add_bdepend "dev-ruby/rake"
-
-ruby_add_rdepend "
-	>=dev-ruby/rack-1.0.0:*
-	>=dev-ruby/rake-0.8.1"
-
-# libev is bundled but with adapations that do not seem to be accepted
-# upstream, so we must use the bundled version :-(
-CDEPEND="
-	>=dev-libs/libuv-1.8.0
-	net-misc/curl[ssl]
-	apache2? ( www-servers/apache[apache2_modules_unixd(+)] )"
-
-RDEPEND="${RDEPEND} ${CDEPEND}"
-DEPEND="${DEPEND} ${CDEPEND}"
-
-APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}"
-APACHE2_MOD_DEFINE="PASSENGER"
-
-want_apache2
-
-pkg_setup() {
-	use debug && append-flags -DPASSENGER_DEBUG
-	depend.apache_pkg_setup
-}
-
-all_ruby_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.1.11-gentoo.patch
-	eapply "${FILESDIR}"/${PN}-5.1.1-isnan.patch
-
-	# Change these with sed instead of a patch so that we can easily use
-	# the toolchain-funcs methods.
-	sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \
-		-e "/^CXX\s/ s/=.*$/= '$(tc-getCXX)'/" \
-		-e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die
-
-	# Avoid fixed debugging CFLAGs.
-	sed -e '/debugging_cflags/areturn ""' -i src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb || die
-
-	# Use sed here so that we can dynamically set the documentation directory.
-	sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \
-		-e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \
-		src/ruby_supportlib/phusion_passenger.rb || die
-	sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" src/cxx_supportlib/ResourceLocator.h || die
-
-	# Don't install a tool that won't work in our setup.
-	sed -i -e '/passenger-install-apache2-module/d' src/ruby_supportlib/phusion_passenger/packaging.rb || die
-	rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script."
-
-	# Make sure we use the system-provided version where possible
-	rm -rf src/cxx_supportlib/vendor-copy/libuv || die "Unable to remove vendored code."
-
-	# Avoid building documentation to avoid a dependency on mizuho.
-	#sed -i -e 's/, :doc//' build/packaging.rb || die
-	touch doc/*.html || die
-
-	# Fix hard-coded use of AR
-	sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/support/cplusplus.rb || die
-
-	# Make sure apache support is not attempted with -apache2
-	if ! use apache2 ; then
-		sed -i -e '/fakeroot/ s/:apache2, //' build/packaging.rb || die
-	fi
-}
-
-all_ruby_compile() {
-	if use apache2 ; then
-		V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
-		 APXS2="${APXS}" \
-		 HTTPD="${APACHE_BIN}" \
-		 FS_LIBDIR='/usr/'$(get_libdir) \
-		 USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
-		 ruby -S rake apache2 || die "rake failed"
-	fi
-}
-
-each_ruby_compile() {
-	append-flags -fno-strict-aliasing
-
-	V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
-	APXS2="${APXS}" \
-	HTTPD="${APACHE_BIN}" \
-	FS_LIBDIR='/usr/'$(get_libdir) \
-	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
-	${RUBY} -S rake native_support || die "rake failed"
-}
-
-all_ruby_install() {
-	if use apache2 ; then
-		APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so"
-		apache-module_src_install
-
-		# Patch in the correct libdir
-		sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die
-	fi
-
-	dodoc CHANGELOG README.md
-}
-
-each_ruby_install() {
-	DISTDIR="${D}" \
-	RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \
-	RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \
-	APXS2="${APXS}" \
-	HTTPD="${APACHE_BIN}" \
-	FS_LIBDIR='/usr/'$(get_libdir) \
-	EXTRA_LDFLAGS="${LDFLAGS}" \
-	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
-	${RUBY} -S rake fakeroot || die "rake failed"
-}