gentoo resync : 27.01.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-01-27 18:07:28 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-01-27 18:07:28 +0000
commit: 67f76a858f1ac826bd8a550d756d9ec6e340ed4f (patch)
tree: 45f4ada6be05bc180a14e017c9d5c6b58a0eec6e
parent: 38b7258d086dd5e263c3bbe3880c8c956676bc71 (diff)
1225 files changed, 7410 insertions, 11244 deletions
diff --git a/Manifest b/Manifest
index 02bea165eba7..308e8f70931c 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 28817 BLAKE2B 74f7fb0ac4f05cd6153e6104aaaad327988fdb3b0d87e9ab531cccb4b806ac1bab5ecd599cd31c1c1b61cfc372f39db9a6d3cdb13db48e0677fb42ad58e41234 SHA512 bb06dc9a18ca8ec14c0b33100fd18ba385c5c0eeefe7869b9c2423b597e14aa89800aa5ef501972a82e33d703d75840d2f955d192e7e7b3c133c4da0fa929c5d
-TIMESTAMP 2018-01-26T14:38:31Z
+MANIFEST Manifest.files.gz 28830 BLAKE2B da45c84354b99b99463de5b585d372028f3a029fff1991d453768715f706eb760fd38883649b9b90c63b19eca8d4ef490dde9924e105c5d9a5fbae4b963c4899 SHA512 0fc534c6254bb4bbeec3f23872def4ebe01312a1fa447096edf938aa65ae1f8662058b3a2e96422297c950a7e3d2788d7f675a0aaaf3167411bd16a0fb0f0046
+TIMESTAMP 2018-01-27T17:08:32Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlprPWdfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlpsshBfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDCjQ//UCoJCl4laSwcz0SNJ+4GZWS43u/WxtXvAB+ce8c/eYMRVdNEd3vGsDIj
-jE7v7i3fU1nOxbndCRT2dI8sJKF/T5Vi/WbbS75jl3wDo8GdsBNh1cHgTPM0UdRu
-nCoCydLHiNkBPyLMmnhL736CknYc8AUErfRcITIcnavuawMkcxYmvMuzOLTNrgph
-5aRsOXV+798ZpX9HQhsWcgEyO4q3PMIxPjJPu6nYV7QiCqkSHXJs56Mhekut+i0I
-9zMZw/QL3yfprn3lRKKWC6uf2rkEyBs/ULjOdc478+dzwD4OvMSsDLj08pvmua0C
-Zp0UhXhULLW2ZSFoKc6xBd+HM+LoaKJC3Pvu0AD+MkD9HR8D2yi4YHD8l9GZMFHq
-GH1O5s30Ir14idplMPT84YELXY4qTZiW7gXC3A3QvGp39HrD2NkhX6rF6LiR//EP
-8Gz2bXMviYKg5jCjzZ0XvSRHZvpp8YES9czi8cIBNEtRoq2ITXOZtA90y+ERR4pO
-/6vizBKSRSy5t1yjBrcP80qiFd+1zO3CNXMXgH7jKvl7hx1aoVovck/AKfIo/plJ
-0tyjsjmzIPSRTMHYI1NcBRjDRSr6tv5u/zLEYqV1ktOxkG9yI23gH1ME4f9zpyWK
-mQazJJu3ACf2TmSKCvfinnTApiU7Jp7zxBSU+itjpBRXLJKuXNw=
-=bhYp
+klBr6g/8Dtp9LZeH2ALiUbsxgJSSMwhoGakO1EExqyorsTX3+Ej100xWvLXJqbja
+rXTAKI2Yg6+PuOHMt0kcSiHMgDfAeX/AEV6nhiWFzLD4slu0v4Hqi+zdZVGXKo5U
+84PDDos/sPNsTr1TD7Tl8GeByY+OQANUQI+VL6ar+Gqbsg0RIyrjQv5OEVgqwiwS
+3gfpv8z9F53r+pL/vBvOcAbIciFjP3mVvsMVvL7RbzOVKSNfAFyFmCiBvYdXYXhQ
+LKiN9bNTq4yzd14WUbokFsxrZce0lLlfVZDEPC+hj2DRuPUtOg4bprEZpycH49yF
+HzGbEgVVOTkH2mv9I7UP1UFzAKfJ+NdXSd0aJCY07IEbBANrVAvENhU1edA/lzK+
+hD/X0FP/HMbSOjJ/p5pPXd4bs71ydWpC80zUozFeY97wVIXpulPYwdvBCyadl+uX
+Z68BT22y8St1eSns2P3wJPXf7LteG1izLkL/wIRnw5Vw/uyTFr4FImyp799MwddC
+yMDBaX50ubev6ies9kXcBpnzaF/e1/xheagiI7jK+MLGSt9PFRr6k5Abw5vFup42
+rljTjQDOAROvR/kiY1LANXDzToKCvhQRFw4jwfVLG1LKvJkj1BDNaU+VPDMnbXmL
+BAL7fkauhDXjul0GjA2iAA5VdsByhS6wH4se6JYoNevp3Z9wULA=
+=qU+v
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 515e546eda1c..f38dabeacae1 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index c0f21149722c..3020842167f4 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/at-spi2-atk/Manifest b/app-accessibility/at-spi2-atk/Manifest
index 110393131296..e0c46741edcf 100644
--- a/app-accessibility/at-spi2-atk/Manifest
+++ b/app-accessibility/at-spi2-atk/Manifest
@@ -10,5 +10,5 @@ AUX at-spi2-atk-2.20.0-tests-data/test-value.xml 289 BLAKE2B 0d8a8421e4443aab9a9
 DIST at-spi2-atk-2.22.0.tar.xz 306148 BLAKE2B 3606f96ca89dcc23700c2aaa67da9daf51709113b5d5a15d4864e565dd559e4136007f125801de08e9c6bc6c14d7b1c39e8307340c1758a6145aeb0caeb0a5c9 SHA512 9b815eecbe01164df8a3341a3b0e1fe57a4f333964a0836f89f54712512a32d69c333c0c099eb194716d081f5460bb6e6d2c852f7218df51549e88e75880f284
 DIST at-spi2-atk-2.24.1.tar.xz 308576 BLAKE2B 92b96c54cd5a2dbd8a3dddbaa3188b3396ef8e4631cc9438e4ba57da27672d509babae3415c66d2c6afc74855ff0536d4cc6f24a8cecf66478021d350b3572a1 SHA512 5dbc186c7ea4f7f34aa0acaf90f683e549162caa274ba5b5818ae9992b52f1b475923d9818870978e87e3dacdf1018db31810d2d53b39bb4f068bcb64a423f23
 EBUILD at-spi2-atk-2.22.0.ebuild 1305 BLAKE2B 5eb5cf35564ecdf2dc0bed7bcdfb0f7cea1a89d9ff7d0aa711a6b0eb257350c54ec16380d121c12c69df23d9b064f2eb77b61d7da58dce4e888963566cf4bac4 SHA512 e9a31fbdabb3ed984bb7909faa53c4ea34915d551b2e24791282610819989168da73215586d470b4862620d334b68b0bd8832370c6a1b36b0482bdbbbdd225cf
-EBUILD at-spi2-atk-2.24.1.ebuild 1312 BLAKE2B a5cfd0297a942ba7d87ff802f4257a24fec10333959e88efca5eeaf678ad75a4d840299e039fc560a9b1072ff54a9061280428e1764c612b34c302869654aff5 SHA512 c5c14de85c8fe215f90c5b4b39a912454e72ee61ba80ecfa779da4405b6342cad1034bef991d678454f590e5709c99bf896cee8ab8dd93fe6d72ce5d9605bbd7
+EBUILD at-spi2-atk-2.24.1.ebuild 1311 BLAKE2B 5433b18bbc4d895558230bc13e4503add6e19f4ec57f93f8a66fe1a5d6ded72f44f300fdddc07e9386588caca295e1dd4108503e409595ad264d9cb1a0336b7b SHA512 f4797f3ed3a61d81019ff3480e65085ea4de8d580a6acbac5bd6830545070e218f0d3125e00fd63b8d048ff7b4cd188ef1ec55b1687b47ca8203defcdaf94823
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.24.1.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.24.1.ebuild
index f2597579eed1..12901e3743ce 100644
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.24.1.ebuild
+++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.24.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
 
 COMMON_DEPEND="
diff --git a/app-accessibility/at-spi2-core/Manifest b/app-accessibility/at-spi2-core/Manifest
index 89e2105f4143..e9c0e4b4845c 100644
--- a/app-accessibility/at-spi2-core/Manifest
+++ b/app-accessibility/at-spi2-core/Manifest
@@ -2,5 +2,5 @@ AUX at-spi2-core-2.0.2-disable-teamspaces-test.patch 302 BLAKE2B 4165c68b7e8d983
 DIST at-spi2-core-2.22.1.tar.xz 454048 BLAKE2B 5ee4cdb83815258d9be8b81870b590b2f85311acf75e3c830c00092cbe5dd66a07f933318ce7d4bc308308f6f87e46579b30948b67b8b7f753adc5e10589246b SHA512 2376b57ce744351ed09a13cd02f0c02264c0998860710cfcdac59f0efb78061512986f5d7305a2f6c594d70213722f81795620e8cd2c6587c6d3f1335477171f
 DIST at-spi2-core-2.24.1.tar.xz 452440 BLAKE2B 2e3e262d507dadbdb8fc5bb1bd60d3dbe8a9c2946228b6dc551d0a9564684d96b1b6cbe29849c1d846b3106b5444a2c6880a10825ba20cca87893f6a52815023 SHA512 e7f354a90204f12d4e464a6b4e4cb27141af3715d7c5ec253bdd2ebe65bc7d191ae7b775c45470a1bd1fe2c0accdd4e84feeb5e1eb1a6c05f3e5e734371027be
 EBUILD at-spi2-core-2.22.1.ebuild 1771 BLAKE2B e401dfb647adf50ce166d5871393ef12af00af92d26e0c1d735cbe3ed927ef9b2bd9a63438e7ffa7736a9d61940c8783d6b31307bd2c0ef7aacb12cb7c05ee95 SHA512 824732f4a7c7fc484fb591a7862d8a18a5326ad58150e3c23befb8f23d089d5a5fe7cd71ac7914877aff6015b99b10c086bc4a3cf6fb9b1ad71ab8085e9ba722
-EBUILD at-spi2-core-2.24.1.ebuild 1778 BLAKE2B d670cb6c23acc8b23d493134131563b90cc00162de843eea47c3eea42396259c116a48f550f6947592545589bd9312230f32677d2286a28f4ee12f562d77b57d SHA512 dc5e9fd75014220da71473187c895a3d3b96638702c84ebb2c7a94771bf01b81e2870ee171f6a8d0eeee646b3234932953f06b6c788e2c8f45996a9fa0e56cc0
+EBUILD at-spi2-core-2.24.1.ebuild 1777 BLAKE2B aa2934177bf330ad39f8b10030f551d9bd2bedc5625f192dba43221ee3db6f337ee1fb1f158bed6372f2ed9784e24de24c7facbb62d1e1f1855e92e62c389d3a SHA512 0ecb092eed838bd3572f34048477cd36f8a111f71c92c036ed61401113cc1d02b68ceb169e4962a43cba645f4cda129ddd26b4752eaa6360d6deafb687185b20
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.24.1.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.24.1.ebuild
index 810008febb56..427cbb90ec77 100644
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.24.1.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.24.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 LICENSE="LGPL-2+"
 SLOT="2"
 IUSE="X +introspection"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 
 # x11-libs/libSM is needed until upstream #719808 is solved either
 # making the dep unneeded or fixing their configure
diff --git a/app-accessibility/orca/Manifest b/app-accessibility/orca/Manifest
index d602256f5e03..5353f3f146a9 100644
--- a/app-accessibility/orca/Manifest
+++ b/app-accessibility/orca/Manifest
@@ -1,5 +1,3 @@
-DIST orca-3.22.2.tar.xz 2345292 BLAKE2B 86a0d0ab6d7ea7e0d25100e9a3eb525ca8981270648849594ce53257b098dcfec49eaccc4922fcc701418e57a91603796a20f1727b0020b359500662bdadc860 SHA512 0c4f3055509fd983da1081c4e33a4675ca498e75a8f2701318c000810cf691758eaded01969a6b56a2c25cf507bc4cb7e099f8498d1a0f6fa739d074a23528c5
 DIST orca-3.24.0.tar.xz 2391740 BLAKE2B 1f294bc8e1c593690c511f0d7d660230c420b33de59c8b1e78ee8d7b16f973b9fff9ce4d656de7202ffd5789ae3604d030c442e8c35eecfd5c5dca058031e996 SHA512 9aa65b534f69bb4a1b800e715776416843ac3756ec1267feca3c66476e34e54f6744f70c0f8ac8868a009d38b6cc165267268491a9ad29ebbd3601dba09d424c
-EBUILD orca-3.22.2.ebuild 1876 BLAKE2B ff412f58015b0e8fb63e529ae0b719cb3b33d74c95f40cf8fd4c478984d39d95a27b413531c8f7bf9090e5563752543df1e1511ca2ed7393b0d5c20d9bb8a66a SHA512 5d2b5d9997fc9693636eac17f1c447a22f09522932b38e47df89914465a908d68a1795fe4fdd887665f14084e60773c4a1996233ae3823bc31c25c17a2d23061
-EBUILD orca-3.24.0.ebuild 1879 BLAKE2B d4a95e255e6de4b00afeed3f470db2298238f7bd3baa7507af1788f1ff56f951a686ab871b7054f6247f2b9094cf7b198c396895c1c7c435951971f2268c9f5a SHA512 c770c0e71d49de68ea259bf16dbe237a8ccd5450afba9d5dc644f27aa285c4dae208a6d2de4011e0aa3badb4f04e2bc5140f7449a6d432ba874c33b299aa0508
+EBUILD orca-3.24.0.ebuild 1878 BLAKE2B f3831feb7b8d95a3c4291b0a97048f58baea95ffb94793de3c25b8ff5ae4944c5a42297efb3b6802cda6e8ccdd29f15855a8520b8b3a847cf95f34d835a9470c SHA512 6437a256bf980f50cc766029959400c829b6a48f8c10b89a377b42e98cac3cade2022d7dba836512dc7af00a702d0b69b92eae21adbec53a03c05f0744adb01f
 MISC metadata.xml 640 BLAKE2B 490290dba5378d6599afa55e56780f99333b32ce71d0ca17f241c9e87c9d7ae19f3e0656c059bb841dd707df66b330da7ff860f3c0b1eb221de552227ba4ca06 SHA512 6fd5af9a57c21a72a37740f458947dce9a54e378ce5b602c9443d954ed536792cfa74299a69d02a2b0d81905a892d5b2d43f93678367ce7e039aa350c882cbb8
diff --git a/app-accessibility/orca/orca-3.22.2.ebuild b/app-accessibility/orca/orca-3.22.2.ebuild
deleted file mode 100644
index 5fef8aef7e15..000000000000
--- a/app-accessibility/orca/orca-3.22.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{4,5} )
-PYTHON_REQ_USE="threads"
-
-inherit gnome2 python-r1
-
-DESCRIPTION="Extensible screen reader that provides access to the desktop"
-HOMEPAGE="https://wiki.gnome.org/Projects/Orca"
-
-LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-
-IUSE="+braille"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-accessibility/at-spi2-atk-2.12:2
-	>=app-accessibility/at-spi2-core-2.12:2[introspection]
-	>=dev-libs/atk-2.10
-	>=dev-libs/glib-2.28:2
-	dev-python/gst-python:1.0[${PYTHON_USEDEP}]
-	>=dev-python/pygobject-3.10:3[${PYTHON_USEDEP}]
-	media-libs/gstreamer:1.0[introspection]
-	>=x11-libs/gtk+-3.6.2:3[introspection]
-	braille? (
-		>=app-accessibility/brltty-5.0-r3[python,${PYTHON_USEDEP}]
-		dev-libs/liblouis[python,${PYTHON_USEDEP}] )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=app-accessibility/speech-dispatcher-0.8[python,${PYTHON_USEDEP}]
-	dev-libs/atk[introspection]
-	dev-python/pyatspi[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	x11-libs/libwnck:3[introspection]
-	x11-libs/pango[introspection]
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50
-	dev-util/itstool
-	virtual/pkgconfig
-"
-#	app-text/yelp-tools
-
-src_prepare() {
-	gnome2_src_prepare
-	python_copy_sources
-}
-
-src_configure() {
-	python_foreach_impl run_in_build_dir gnome2_src_configure \
-		$(use_with braille liblouis)
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_install() {
-	installing() {
-		gnome2_src_install
-		# Massage shebang to make python_doscript happy
-		sed -e 's:#!'"${PYTHON}:#!/usr/bin/python:" \
-			-i src/orca/orca || die
-		python_doscript src/orca/orca
-	}
-	python_foreach_impl run_in_build_dir installing
-}
diff --git a/app-accessibility/orca/orca-3.24.0.ebuild b/app-accessibility/orca/orca-3.24.0.ebuild
index 80423afe0ace..216575e26152 100644
--- a/app-accessibility/orca/orca-3.24.0.ebuild
+++ b/app-accessibility/orca/orca-3.24.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Orca"
 
 LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 
 IUSE="+braille"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-accessibility/speech-dispatcher/Manifest b/app-accessibility/speech-dispatcher/Manifest
index d88cf3a8566d..ffb381db5375 100644
--- a/app-accessibility/speech-dispatcher/Manifest
+++ b/app-accessibility/speech-dispatcher/Manifest
@@ -3,5 +3,5 @@ DIST speech-dispatcher-0.8.3.tar.gz 1292321 BLAKE2B a9a69734b9aa3c38041ea2872fa8
 DIST speech-dispatcher-0.8.7.tar.gz 1333677 BLAKE2B 0b08f1a1228fe1240e14b3d52913f8fa64a1f2ee9b563294b49ea8d3e5cfd3041aa5572ec72354b360dabd2d263deb79e418b95b6174a5b89ee541e9fd23c7e2 SHA512 0e7af02e8521aa8d397ea4d0329f9a8d56970beed645456dfedc738ececd2ccd8ecfdf66e92ae852878a473ba991175e1d4dc2b8b0148c958163682b49678375
 EBUILD speech-dispatcher-0.8.1.ebuild 2645 BLAKE2B a6d970c44f8c1a1217de41fb6d78644ec3bccf0043116c6bd57a13fefa66927b93a84d45cf886946ea4b708cab1e49ff3ed59d886e790357980925741297f507 SHA512 7b9ada7edd6d2ccf949805c743f68848dbb35b8a3c4714e33b7a1c4248770165c77405214d24d38549d89309a85cc2233311b74594e9c0b21dcbc3390ab388a4
 EBUILD speech-dispatcher-0.8.3.ebuild 2626 BLAKE2B 357703a8a6f4417843ddbcd85954b50d957f68a633a38c1f26b4e95dd73328fbf1fef1ed8192e6013e9bce2c54647f1609cb12a1c26f7aee48f6a8a6bbf46017 SHA512 1556ab61c84259db988c92d9ad9f0d02d647872c97bfc04f59be31cadec4a9aa42a7eed3197bd3c6812daa330a7bb5075ed98cac9e1a8d743d784700ad7d53a3
-EBUILD speech-dispatcher-0.8.7.ebuild 2629 BLAKE2B 543780c27aad4bf58d931866a0164cbe19a1ebc5b83f7dd162ae656733fa17c78743a0960e0c65f32929ef24be128d361fc1f3714778fbd78bc380ea079f17ca SHA512 ebfe2e2d8110eaf09c542bf4b14f95d0a87512ea45ee2772e5ef1d295af168e01b014188f9ba0c8e2a820516a2f461da4ae21c38295e9867211347aefb084fde
+EBUILD speech-dispatcher-0.8.7.ebuild 2628 BLAKE2B 936b5c6baa6167235128487bffa00db655234c739f2b93f0f7f2e589244d02307ae3047789f6422bd74511583cae53c50dc2f9c46a23cda1cf4bceceac48bcbf SHA512 f412adbf33413dd77381b02ac819742315a7c7318a32dbb69ad0e90b5a1283f4af2bd0358a34c9ba54a69d02f1e31fabd2915b46d7cf030132a71723972726ac
 MISC metadata.xml 632 BLAKE2B 2a60d2e822db36bf3f0547d97ccaad05d6bcce11afa71534b108358f1d71f857f200907f01c31c3083a5196e43eb681c06e2991a086c91731daced3f56282c2d SHA512 db94cba99bd2c9bbfe98b1647ac53a3861cbd697df791bea025e2a713a5991ca6929f2bc82a985ba38eef4a2571515d96aac6558fe143b68e24713490c12dd0a
diff --git a/app-accessibility/speech-dispatcher/speech-dispatcher-0.8.7.ebuild b/app-accessibility/speech-dispatcher/speech-dispatcher-0.8.7.ebuild
index 3b4218835527..22d52defd6d6 100644
--- a/app-accessibility/speech-dispatcher/speech-dispatcher-0.8.7.ebuild
+++ b/app-accessibility/speech-dispatcher/speech-dispatcher-0.8.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.freebsoft.org/pub/projects/speechd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="alsa ao +espeak flite nas pulseaudio python static-libs"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 79175d05f91f..40d42c467ab0 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/checksec/Manifest b/app-admin/checksec/Manifest
index a6c852ed3976..0f2ff44fba01 100644
--- a/app-admin/checksec/Manifest
+++ b/app-admin/checksec/Manifest
@@ -1,10 +1,6 @@
 AUX checksec-1.7.2-path.patch 510 BLAKE2B d17d260f41cf0c7e71accfa4b728a9c35511d1d1a90726bbd3a7fbbc401b69e6245f596c62d323013d29142d256eca6d792c6256f4b5d752bf55e64f96e7798a SHA512 5a5af3c35f8e8ca0ef0c44bc84ea3108bdd96c7ee98c3bda31a0f5308fd843c47a0d825fdff39e1995260391a7a747187ef804250fd0da6ccad5f93b3595a706
-DIST checksec-1.7.2.tar.gz 16717 BLAKE2B e89c07819677e7a4f7fa388b5b644613d5e391fa4b31d97b791f7f8e7076a58790f72155ff4f55e1d87003ed9487268e6b0c304bab29673220d0dad55dbf186e SHA512 1f1c1867b889266c0d035c3f7b028e61ed2cf3413caa789dfb8589b56834194e3367b3868a80984242dadb7629a9a5a7563376a2f37e3971899e2ecc319ee2f1
-DIST checksec-1.7.3.tar.gz 49136 BLAKE2B f5202c00c17a0b356f558f309cd17cc878893878ca340c464826de38404cb4a6940267b5b3e14df146f6446aaa4a49516713f05e69dbcbe2562c702712213f3f SHA512 daf311cceb1a2132e87169b3c7a1254a2be418e7274ea9dda0aa7a1a6dbf72aa7531a7d157cd0a776fd7076e75db91ba5fc901fa94ab49d97f9ff7e4c2a56806
-DIST checksec-1.7.4.tar.gz 51677 BLAKE2B 1dd20b4ed57d1c114b2b968653027346e445225359fcf0db849bc4b4687b62b414b837468a7cfebe5d40f35a7a3d4d61fd25842fc24d60de00809224343daf68 SHA512 ed14f5f8917983a10faa06a2659ccea3256799bc2a4a151ad06ca7b1a984b70673b4fd10191be7c97bbdf9e5def64161b00434b84130ae0464610afec8754e69
 DIST checksec-1.7.5.tar.gz 51266 BLAKE2B a77e6d0bf52bc8a0ec18c0f1ffe883b68acccaaee6fd0d1714d456c31c3004b5d9279c3926885be168befba1dc7a75b1269dac5cb5847c247470e765601f08e6 SHA512 7269fb3628907f6fe4e8b720d2dcbd5bf8586e1821bd758533dff6255c6a52be9146b58f60abea798ee92471c3d5ad9e867fa7ad4b8e5ea2d8aa03d5a3b83098
-EBUILD checksec-1.7.2.ebuild 607 BLAKE2B 3c6de19091e9a7ca6854ea3d372106a7cd62d7d18dfc1d388d72ac3a61973fb7072ee3f08424f0aa669c823622fe789bfc846a207e4dca2d7d02923fd3fd615c SHA512 58c91a1218b6660faf0b536f103412ae4cf7a28a5afab72221370d56b9f0630904a0f8e2231278a9f0d1655af17de1b6522617e71795f7e724450e55ec83a072
-EBUILD checksec-1.7.3.ebuild 614 BLAKE2B 368c33e8e2066b9ef45bab01321e6b093bae8fb347448bf648fc0118ff846e06d3bc48631073048ddaa7d167e9ca3551e19286f62554af034b2e86457c4cad7e SHA512 4aaed544ea5ef48ca40f0972b37a7d54dbb2cd6e839fa2b76da661a0f376d87a92d1bf0cbdc54a08eb92349454e94e1b743352aebcccab83b7da783866320e4d
-EBUILD checksec-1.7.4.ebuild 763 BLAKE2B d2beb672d649fe1aeafddf618c18d4c49c78c5dfe4107d020a41e230db80c1cb5218b75b49c927b69746b3f427db2adb9cc0aebe3400dc47943f1c5af73c8672 SHA512 adac799af1ba012b1c16cdc3d9ceb4a7d69742cdb4550b30bae5d8abcc1df73166c4eff4340a7a60ef80c34c15a84f39bc722bf3e9bfdac884386853511583c0
+DIST checksec-1.8.0.tar.gz 52391 BLAKE2B 3720e4faae5aa82172c673ce7ddc662db1433b82d25f25be4c219f1664da8af687d2a5ee9c05703e9f151a998be9226e896e125b7cff05d3881e61e8a9f5c918 SHA512 0236e40ba8b4f7c13ebd3b51f22dd05e6c4442e8646b5a1ee814556d9a6ca19f9bae638af33a6bfec2f8ef95567d222a20dcdcd9eae6ffb7ea5261919f020283
 EBUILD checksec-1.7.5.ebuild 761 BLAKE2B 928d7f91b7ac04ac04a9bcfaa14f8ea781eaaf2be75182d7b8d0f3cf63e0bdf9178d03da87732da11286ba172e2368eb5fa490021c3d5d71f3419d426b7b911d SHA512 5a15da1104314647688e68017189e1b661f0efd58d3a7ad5a788ab2cdda79249dce9c07e9db48d775ace6d8fb8679f2cb6669c1f16758f9c6e736e9eca2d57ba
+EBUILD checksec-1.8.0.ebuild 763 BLAKE2B 3456a3d42a58795e00cf46689bc60a99357dfec5a8ea7c43841584c10d4fe8bceb3d3c0e3a4965cd38e7c718b6c716a36cdbf895635a458122aaa34324f13600 SHA512 dd2af6317e19baef0e21112b6a64783dd1ccffaf2f0f2d80acf802b4ee14b021be23548375c9c86c8a073da38bbe4f1c58c533cb5b16cf60e082f8164dc84738
 MISC metadata.xml 334 BLAKE2B 96b933c9475a18c3957d46b58c41162e396f27ff7c53eaf4ba5be2a24e22e8a136a0814cce5c0d3c113e5d18a286fdd34a1b3cd46e509a7eec986f82d7d8ea9c SHA512 dd9373f93f165e576bd930ae4a49019d0c53359c4ef288c5d1ed5fc1033b82afff7d0421551eb9518bbfb3f25bc7cdab09cf89b1e0bd9c1ffe0137432d70b716
diff --git a/app-admin/checksec/checksec-1.7.2.ebuild b/app-admin/checksec/checksec-1.7.2.ebuild
deleted file mode 100644
index 8945352cbd14..000000000000
--- a/app-admin/checksec/checksec-1.7.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-MY_PN=${PN}.sh
-DESCRIPTION="Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)"
-HOMEPAGE="https://github.com/slimm609/checksec.sh"
-SRC_URI="https://github.com/slimm609/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
-IUSE=""
-
-S="${WORKDIR}"/${MY_PN}-${PV}
-
-DOCS=( ChangeLog README.md )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-path.patch
-}
-
-src_install() {
-	default
-	dobin ${PN}
-}
diff --git a/app-admin/checksec/checksec-1.7.3.ebuild b/app-admin/checksec/checksec-1.7.3.ebuild
deleted file mode 100644
index e88dfd5d8fa1..000000000000
--- a/app-admin/checksec/checksec-1.7.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-MY_PN=${PN}.sh
-DESCRIPTION="Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)"
-HOMEPAGE="https://github.com/slimm609/checksec.sh"
-SRC_URI="https://github.com/slimm609/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
-IUSE=""
-
-S="${WORKDIR}"/${MY_PN}-${PV}
-
-DOCS=( ChangeLog README.md )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.7.2-path.patch
-}
-
-src_install() {
-	default
-	dobin ${PN}
-}
diff --git a/app-admin/checksec/checksec-1.7.4.ebuild b/app-admin/checksec/checksec-1.8.0.ebuild
index eda9b9a0226d..eb85bc06b860 100644
--- a/app-admin/checksec/checksec-1.7.4.ebuild
+++ b/app-admin/checksec/checksec-1.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 45d2f5355362..9eba7e5f034e 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -4,10 +4,12 @@ AUX conky-1.10.6-fix-text-shades.patch 401 BLAKE2B 2ea47d75e5b706f9af50fd0acbf56
 AUX conky-1.10.6-gcc-7.patch 279 BLAKE2B 139c76201d947c19a2fdde3e192611192475f7e2cd3d0501e6de00ff99cf12eb4a4d0f032540e05a5bd3815c384d45cd8059b27962ff373b1a97b24333696ed9 SHA512 a9a7b358af47cbb1366c29f2af669efec927ed61b3d0d5595ac95a8d316a98b1761ee0875cb06230d5e456aceefc7912438b0fad90b145fe07d6a71cfd13e592
 AUX conky-1.10.6-new_graph-oor.patch 1312 BLAKE2B 6afc8d2e72797155123d28081e7c8a1bea7b85a9cd22cc45f9dda802949de27c567db3afd4927d18ea45ea1fa1ad3e9a07bd2ac2a1a44ba9aa87fdd5d7ee4e8e SHA512 ef7e15601251b846766dacad6bf1ff6f8d66b6c8fec2c40222ea7f072679ecacbceac297d516f0764aa9b4e9caac7f1deeea0b4365e89ba5733f7c8412658ec1
 AUX conky-1.10.7-cpu-hotplug.patch 464 BLAKE2B 7a36582e08d919bf589a7f6ad83867636f1c58fc4472c3455e287a2bbbe34f1960632c6e3377e02091811c8fdaa36ad667396cded5b8d41d11973e21c8a668fa SHA512 abafa1ed19b5aa4855958d0bd204c36ec7bbb06f8f5d3303348e8beb437312137b94583613007b79259159f2fc3c4c42577bca3ccbb53340c44e11715b703f8f
+AUX conky-1.10.7-out_to_x-segfault.patch 1769 BLAKE2B c9669f325c7ed4bddf2761d8246f317da7c01942a859dca3ff2e829c7d2adfecc4d38887a3fa1f215a9d7efd9251a118b820da42e251f27e4195dcc20fc8b543 SHA512 804bac365e54ee3ca817062eb29aeca5538d2ac651c6446154fd63c8e668aa15cf97e1c8c1e8898632ab77cb7aebd5ffe30d9effb78465128decd956af814c66
 DIST conky-1.10.4.tar.gz 365145 BLAKE2B 60f6f53ef67a9958d4dd4c3f1ab53886235927ed457ad3e98d2f6f61568a14baa7cd2afa0d3ddde9ed5e16aae17891213d906f49c308269f678adf37ea627329 SHA512 665a3c2a9b150576d7c29964dafb7030f5aa5955530142cf0d00f0f49f4a3b320924d389b3a833ef6eb18468000f5c62d918e8f067c7b40cd9e205d0bf0d8e0c
 DIST conky-1.10.6.tar.gz 365669 BLAKE2B 4f072b950083a1352904e9fbc2de016dbb3af93291e308ad2db799381f14880da4e32fa1da5ea1dab568bb782352c249d6200d581916ef3174e222f7a8294cc1 SHA512 ddd0b087e89654f8dace7d9682935a802b3bb22b7e65acd25dcc0f06e90b46bee695502d78b6e40a409f8eaffcd65a78d5f861ee6dbcbff6e48f88c2f20319c9
 DIST conky-1.10.7.tar.gz 371881 BLAKE2B f1a1dd0d67efe1658d3a3da7ddb121c31ae34c347f7bce7fcecb57d7311ddcf80fb391055fefb92fd235b702c3e5b17362821565aba7a911931542ea714d8d76 SHA512 4da501c7c7613e8b9b26a691a1c0118c05cec818e944d4a30e250ecba26956d6f3103ec5731f082a095173dbfe0713137ded92043cc4c1eb3821c0943f1744f4
 EBUILD conky-1.10.4.ebuild 4850 BLAKE2B 4d7e00ca639cfc5eed0b80f2ddb473e2979014e2564c684a07e0d4647612ee53c0cee16e6d2806e25a70c0725521678a04d5e43cc3544d4612fee749bbf50510 SHA512 612694ed4db70e8198f6a5b4110f972ab09dff8e3f8619367db3e2697dce97d22fae09b971b3c7800b150f744e86a3268c0999f4e1f3ed3f3041bb32dbbb7663
 EBUILD conky-1.10.6-r6.ebuild 5075 BLAKE2B 2faac63d87f6c12e9077f2915b9d451b02b7f014de627d7a7881f837cfac9e3280bd1f0eb744437023c4247f3959ad87ec8cbc183736d68015d51842f298d492 SHA512 011b6142f50f1cd9addd30df888e7186ff370c6c5046091998af61e7aa1ddf8f7f18f1469c6f9ceb5795c803b26513cf01c0e8dfcd1637ab3a2ecc84ac37fa22
+EBUILD conky-1.10.7-r1.ebuild 5006 BLAKE2B 858f732901802c8c35ac47f05b9e80ede6b9a4a3176e2333b98d6abf07944413764f238ff0b8cb9673388488793d0b4e2fe8018d64298a42e0d0067676263ac4 SHA512 a8af114c309b2b42e36b6b582336012dee9589c08c881f198765d5007022c5a91a3a7ea683179e66bf96b4a4df19cbc1304d9d5b9bb904a154a9c36bf33ab57b
 EBUILD conky-1.10.7.ebuild 4962 BLAKE2B f73d4b96e9eb983194f599fcfa1e4b81b2bba17d5ec28d841df8b1c0b24b66bab768438b0328e57b16cb80bf83c154c735faffec7e750251d049fc0fed037b77 SHA512 bae107f0e3b506778dc16f0ed34aaddf9487210cd137f7a304ea9a8938a3a1bcffd74d6ea8d0eee288df32b9687553b3166ac63b86fd14f2e4997bbc6b3905a8
 MISC metadata.xml 2525 BLAKE2B 805fd872d69f00911fa599d87f2c638b1126c438fd0c8ccdda84ff5cbddecbca882b74fa1828e703c32a4035a4223606a1da75bb27cc63ac19b8dd61f5f90b42 SHA512 ccfe5718005f521aa00e7a66429493ea1301f7691acf0cca2faa5372c5f1349ba62d5046b85059f395fe51b30130a06f6867e0736b80cf4b76f9388b05fa76bb
diff --git a/app-admin/conky/conky-1.10.7-r1.ebuild b/app-admin/conky/conky-1.10.7-r1.ebuild
new file mode 100644
index 000000000000..249fdc2045b8
--- /dev/null
+++ b/app-admin/conky/conky-1.10.7-r1.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils linux-info readme.gentoo-r1
+
+DESCRIPTION="An advanced, highly configurable system monitor for X"
+HOMEPAGE="https://github.com/brndnmtthws/conky"
+SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3 BSD LGPL-2.1 MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="apcupsd audacious cmus curl eve hddtemp ical iconv imlib iostats ipv6 irc
+	lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax ncurses
+	nvidia +portmon pulseaudio rss systemd thinkpad truetype vim-syntax
+	weather-metar weather-xoap webserver wifi X xmms2"
+
+DEPEND_COMMON="
+	X? (
+		imlib? ( media-libs/imlib2[X] )
+		lua-cairo? (
+			>=dev-lua/toluapp-1.0.93
+			x11-libs/cairo[X] )
+		lua-imlib? (
+			>=dev-lua/toluapp-1.0.93
+			media-libs/imlib2[X] )
+		lua-rsvg? (
+			>=dev-lua/toluapp-1.0.93
+			gnome-base/librsvg )
+		nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) )
+		truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
+		x11-libs/libX11
+		x11-libs/libXdamage
+		x11-libs/libXinerama
+		x11-libs/libXfixes
+		x11-libs/libXext
+		audacious? ( >=media-sound/audacious-1.5 dev-libs/glib:2 )
+		xmms2? ( media-sound/xmms2 )
+	)
+	cmus? ( media-sound/cmus )
+	curl? ( net-misc/curl )
+	eve? ( net-misc/curl dev-libs/libxml2 )
+	ical? ( dev-libs/libical )
+	iconv? ( virtual/libiconv )
+	irc? ( net-libs/libircclient )
+	mysql? ( >=virtual/mysql-5.0 )
+	ncurses? ( sys-libs/ncurses:= )
+	pulseaudio? ( media-sound/pulseaudio )
+	rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 )
+	systemd? ( sys-apps/systemd )
+	wifi? ( net-wireless/wireless-tools )
+	weather-metar? ( net-misc/curl )
+	weather-xoap? ( dev-libs/libxml2 net-misc/curl )
+	webserver? ( net-libs/libmicrohttpd )
+	>=dev-lang/lua-5.1.4-r8:0
+	"
+RDEPEND="
+	${DEPEND_COMMON}
+	apcupsd? ( sys-power/apcupsd )
+	hddtemp? ( app-admin/hddtemp )
+	moc? ( media-sound/moc )
+	nano-syntax? ( app-editors/nano )
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+	"
+DEPEND="
+	${DEPEND_COMMON}
+	app-text/docbook2X
+	"
+
+CONFIG_CHECK=~IPV6
+
+DOCS=( README.md TODO ChangeLog NEWS AUTHORS )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cpu-hotplug.patch
+	"${FILESDIR}"/${P}-out_to_x-segfault.patch
+)
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="You can find sample configurations at ${ROOT%/}/usr/share/doc/${PF}.
+To customize, copy to ${XDG_CONFIG_HOME}/conky/conky.conf
+and edit it to your liking.
+
+There are pretty html docs available at the conky homepage
+or in ${ROOT%/}/usr/share/doc/${PF}/html.
+
+Also see https://wiki.gentoo.org/wiki/Conky/HOWTO"
+
+pkg_setup() {
+	use ipv6 && linux-info_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -i -e "s|find_program(APP_MAN man)|set(APP_MAN $(which man) CACHE FILEPATH MAN_BINARY)|" \
+		cmake/ConkyPlatformChecks.cmake || die
+}
+
+src_configure() {
+	local mycmakeargs
+
+	if use X; then
+		mycmakeargs=(
+			-DBUILD_X11=ON
+			-DOWN_WINDOW=ON
+			-DBUILD_XDAMAGE=ON
+			-DBUILD_XINERAMA=ON
+			-DBUILD_XDBE=ON
+			-DBUILD_XFT=$(usex truetype)
+			-DBUILD_IMLIB2=$(usex imlib)
+			-DBUILD_XSHAPE=ON
+			-DBUILD_ARGB=ON
+			-DBUILD_LUA_CAIRO=$(usex lua-cairo)
+			-DBUILD_LUA_IMLIB2=$(usex lua-imlib)
+			-DBUILD_LUA_RSVG=$(usex lua-rsvg)
+			-DBUILD_NVIDIA=$(usex nvidia)
+			-DBUILD_AUDACIOUS=$(usex audacious)
+			-DBUILD_XMMS2=$(usex xmms2)
+		)
+	else
+		mycmakeargs=(
+			-DBUILD_X11=OFF
+			-DBUILD_NVIDIA=OFF
+			-DBUILD_LUA_CAIRO=OFF
+			-DBUILD_LUA_IMLIB2=OFF
+			-DBUILD_LUA_RSVG=OFF
+			-DBUILD_AUDACIOUS=OFF
+			-DBUILD_XMMS2=OFF
+		)
+	fi
+
+	mycmakeargs+=(
+		-DBUILD_APCUPSD=$(usex apcupsd)
+		-DBUILD_CMUS=$(usex cmus)
+		-DBUILD_CURL=$(usex curl)
+		-DBUILD_EVE=$(usex eve)
+		-DBUILD_HDDTEMP=$(usex hddtemp)
+		-DBUILD_IOSTATS=$(usex iostats)
+		-DBUILD_ICAL=$(usex ical)
+		-DBUILD_ICONV=$(usex iconv)
+		-DBUILD_IPV6=$(usex ipv6)
+		-DBUILD_IRC=$(usex irc)
+		-DBUILD_MATH=$(usex math)
+		-DBUILD_MOC=$(usex moc)
+		-DBUILD_MPD=$(usex mpd)
+		-DBUILD_MYSQL=$(usex mysql)
+		-DBUILD_NCURSES=$(usex ncurses)
+		-DBUILD_PORT_MONITORS=$(usex portmon)
+		-DBUILD_PULSEAUDIO=$(usex pulseaudio)
+		-DBUILD_RSS=$(usex rss)
+		-DBUILD_JOURNAL=$(usex systemd)
+		-DBUILD_IBM=$(usex thinkpad)
+		-DBUILD_WEATHER_METAR=$(usex weather-metar)
+		-DBUILD_WEATHER_XOAP=$(usex weather-xoap)
+		-DBUILD_HTTP=$(usex webserver)
+		-DBUILD_WLAN=$(usex wifi)
+		-DBUILD_BUILTIN_CONFIG=ON
+		-DBUILD_OLD_CONFIG=OFF
+		-DBUILD_I18N=ON
+		-DMAINTAINER_MODE=ON
+		-DRELEASE=ON
+		-DBUILD_BMPX=OFF
+		-DDOC_PATH=/usr/share/doc/${PF}
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${S}"/extras/vim/ftdetect/conkyrc.vim
+
+		insinto /usr/share/vim/vimfiles/syntax
+		doins "${S}"/extras/vim/syntax/conkyrc.vim
+	fi
+
+	if use nano-syntax; then
+		insinto /usr/share/nano/
+		doins "${S}"/extras/nano/conky.nanorc
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-admin/conky/files/conky-1.10.7-out_to_x-segfault.patch b/app-admin/conky/files/conky-1.10.7-out_to_x-segfault.patch
new file mode 100644
index 000000000000..fef22ac46e50
--- /dev/null
+++ b/app-admin/conky/files/conky-1.10.7-out_to_x-segfault.patch
@@ -0,0 +1,49 @@
+From 562c7375883445acb58388ff16d9eb126b7e12a1 Mon Sep 17 00:00:00 2001
+From: Brenden Matthews <brenden@diddyinc.com>
+Date: Tue, 23 Jan 2018 13:52:11 -0500
+Subject: [PATCH] Fix segfault when out_to_x = false. (#455)
+
+This resolves #454.
+---
+ src/conky.cc | 24 ++++++++++++++----------
+ 1 file changed, 14 insertions(+), 10 deletions(-)
+
+diff --git a/src/conky.cc b/src/conky.cc
+index 48256ecc..f10d08fb 100644
+--- a/src/conky.cc
++++ b/src/conky.cc
+@@ -2076,20 +2076,24 @@ static void main_loop(void)
+ 	sigaddset(&newmask, SIGUSR1);
+ #endif
+ 
++#ifdef BUILD_X11
+ #ifdef BUILD_XSHAPE
+-	/* allow only decorated windows to be given mouse input */
+-	int major_version, minor_version;
+-	if (!XShapeQueryVersion(display, &major_version, &minor_version)) {
+-		NORM_ERR("Input shapes are not supported");
+-	} else {
+-		if (own_window.get(*state) &&
+-		    (own_window_type.get(*state) != TYPE_NORMAL ||
+-		     (TEST_HINT(own_window_hints.get(*state), HINT_UNDECORATED)))) {
+-			XShapeCombineRectangles(display, window.window, ShapeInput, 0, 0,
+-			   NULL, 0, ShapeSet, Unsorted);
++	if (out_to_x.get(*state)) {
++		/* allow only decorated windows to be given mouse input */
++		int major_version, minor_version;
++		if (!XShapeQueryVersion(display, &major_version, &minor_version)) {
++			NORM_ERR("Input shapes are not supported");
++		} else {
++			if (own_window.get(*state) &&
++					(own_window_type.get(*state) != TYPE_NORMAL ||
++					 (TEST_HINT(own_window_hints.get(*state), HINT_UNDECORATED)))) {
++				XShapeCombineRectangles(display, window.window, ShapeInput, 0, 0,
++						NULL, 0, ShapeSet, Unsorted);
++			}
+ 		}
+ 	}
+ #endif /* BUILD_XSHAPE */
++#endif /* BUILD_X11 */
+ 
+ 	last_update_time = 0.0;
+ 	next_update_time = get_time() - fmod(get_time(), active_update_interval());
diff --git a/app-admin/filebeat/Manifest b/app-admin/filebeat/Manifest
index 7b39bac16143..61853747cca4 100644
--- a/app-admin/filebeat/Manifest
+++ b/app-admin/filebeat/Manifest
@@ -4,7 +4,9 @@ AUX filebeat.initd.1 1388 BLAKE2B 6ca4f3f4d50bba2a036a35b8e74bfa92d5b03ccaf8548d
 DIST filebeat-5.5.2.tar.gz 18075191 BLAKE2B 9786cb8f3db003c86e4bc6d56fcac660b615e7e6ad82d0912f70c545f2af3caab605be739481355466438a1769c20b28db576d208af6b0af9620ce6408068215 SHA512 ad92b41a9ceaad6c6e6fc80d0adccd7fe03a7056d121484bcf35c6a46b2061a5ef6d32121dd12d59b51e7678769da5c405b1d549fa130631ae3f1989b78fba48
 DIST filebeat-5.6.5.tar.gz 18145468 BLAKE2B 57f3320012d8c17b7b961dd6d843e982e3cc5fe0f39658ca5ccc2fb9056c8dd4527306b7cfe483d3fa39bef5892dd22c4f07f24aad1e804bd76cdda94b56a3e8 SHA512 f1c8ffa2521e0e15a14850199c3da83d8f8489d5f97364b205ee8120b56e2ae47055c78ed6a5ef2d0296f449339efa05f2d7bce7282b1e7f2e044d7ed3244d4c
 DIST filebeat-6.0.1.tar.gz 15150919 BLAKE2B 40149de3257d78a737d71f59f8be91a3bd60185f716ecc89dbe373283ab6481afe709ff573efb8b1079f2c571c6de036bd705dd082c3cba1eda44d282409247c SHA512 baf21acf38409b398f261509d25d2b009342fdde1fcd824c99d16cc279355ae5eb029699a5a7e3b6e58abdbed4ef5fda1b4058ed94b807fd5964ad24828585e2
+DIST filebeat-6.1.1.tar.gz 17061456 BLAKE2B 5a5d23618f8140f3815c499305d99ae3dc4c4caa49535043040387922f924ee49a9494b5139f34a70d74173d97332b92909fc74e2f91a2fc0f288ef5d1493ade SHA512 54e85cfce58ba724f6b2892f115ac9ef5b1bb89ce8dc6f2a977e50ccfc07cf95fc578e46e0cadd96acd90c59f4b01446851b93c519afa094ff6dcdb7e716219a
 EBUILD filebeat-5.5.2.ebuild 1646 BLAKE2B 37f6ac540ed27b471021be5666233d00ceacdcbdf6a32954c5987fa85c957223d84536dd5c0e93bf6acd988b01a061008cffff005806d8b2d8cee7f722884f33 SHA512 4b36e36a4f95c893bca863c4510e903f6265e4950fa000cae61896915c558beb4d8c4b10d8aa78d154bef7eb67886628f499153f988ff66e5b1066cb949b2029
 EBUILD filebeat-5.6.5.ebuild 1647 BLAKE2B de539c0afa664ffb179608e02a73dd75837afdc5564879653b1a5d41c0362dca5b65e5c7b891a3209fb1ecb18b126fa03a4da55ed8287196b2bf14b461999643 SHA512 eae4bdcb37e0ebce86ea8425cacc4289ba311e3f66c50e79b09d3625052f671d24f60fba7dc0be9d8a1758124552cec573b9c843874a0c2e77582c9863d1358c
 EBUILD filebeat-6.0.1.ebuild 1276 BLAKE2B d77562bb3fad920f86ae8a8c155ce161c59f07972c39b546eee8fc723e85ac3943a76fed6a9e6c8ba15926759125f6199a8bc99faddfbc3970c71b35296b96d2 SHA512 d369a624fd8c417059e45ed1b56a848fa8ed1b06d1917f23f251480a29b83847d1f45357e9e7c7b10c592bb94b4d6dead91c98a80d485c3a59acdc8eaa563185
+EBUILD filebeat-6.1.1.ebuild 1304 BLAKE2B 51f498a4fa30d0cb85b1638617f53ba37db3a1d8006476c8820523349b7f484b8b35d30f140b5e6f087483307c0849fa9cbff62552660c88f37a16f8b392b518 SHA512 2f815fff238a665f005be4e741c1c6e128a38d0fb1da3af296a4f38c0c85cbab517bf1aacc8b2161d626ca9094903b35763ace6671a759ec48df882e1602e407
 MISC metadata.xml 461 BLAKE2B 8bd064daf5ee2d3fe746a73bf36f01926fee1f9796b29499a7fb1db844aface3be7dfd137ed31f606e78834c1d7a135d0119f400244ba33ce3feb81fa792eb6e SHA512 903c43c9cf4b371e34afffd0b425086d5fba6f37af0d761fc0065d114dc843ea0dcdd439682e48749bdf2f9138bfc3dc6cfcc6490503daeb7a71ce5706a779d8
diff --git a/app-admin/filebeat/filebeat-6.1.1.ebuild b/app-admin/filebeat/filebeat-6.1.1.ebuild
new file mode 100644
index 000000000000..086d5c7ed5cc
--- /dev/null
+++ b/app-admin/filebeat/filebeat-6.1.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit versionator
+
+DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch"
+HOMEPAGE="https://www.elastic.co/products/beats"
+SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+
+DEPEND=">=dev-lang/go-1.9.2"
+RDEPEND="!app-admin/filebeat-bin"
+
+ELASTIC="${WORKDIR}/src/github.com/elastic"
+BEATS="${ELASTIC}/beats"
+S="${BEATS}"
+
+src_unpack() {
+	mkdir -p "${ELASTIC}" || die
+	unpack ${P}.tar.gz
+	mv beats-${PV} "${BEATS}" || die
+}
+
+src_compile() {
+	cd ${BEATS}/filebeat || die
+	GOPATH="${WORKDIR}" emake
+}
+
+src_install() {
+	keepdir /var/{lib,log}/${PN}
+
+	fperms 0750 /var/{lib,log}/${PN}
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd.1" ${PN}
+
+	docinto examples
+	dodoc ${PN}/{filebeat.yml,filebeat.reference.yml}
+
+	dobin filebeat/filebeat
+}
+
+pkg_postinst() {
+	if [[ -n "${REPLACING_VERSIONS}" ]]; then
+		elog "Please read the migration guide at:"
+		elog "https://www.elastic.co/guide/en/beats/libbeat/$(get_version_component_range 1-2)/upgrading.html"
+		elog ""
+	fi
+
+	elog "Example configurations:"
+	elog "${EROOT%/}/usr/share/doc/${PF}/examples"
+}
diff --git a/app-admin/mongo-tools/Manifest b/app-admin/mongo-tools/Manifest
index 93b4a471c3cc..c7c8fbcb13f9 100644
--- a/app-admin/mongo-tools/Manifest
+++ b/app-admin/mongo-tools/Manifest
@@ -13,6 +13,6 @@ EBUILD mongo-tools-3.2.12.ebuild 1198 BLAKE2B 3db31f3d6fde60f2f482a92415c93bfbb8
 EBUILD mongo-tools-3.2.13.ebuild 1198 BLAKE2B 3db31f3d6fde60f2f482a92415c93bfbb8f964e140353ad7ac025a5105e84f88688785b8777787abca5fd99c7358bd7395742f8340323bf4f918aee47543ca55 SHA512 f71ff59918d4d8278bae4408ff7649fdda928980d1cc08ab169391c5adbabed4e2d1ba0f4cfd23a8b0f05be1850c2037b971f99fd2ee2557ae76dfdae89e2d15
 EBUILD mongo-tools-3.2.16.ebuild 1198 BLAKE2B 3db31f3d6fde60f2f482a92415c93bfbb8f964e140353ad7ac025a5105e84f88688785b8777787abca5fd99c7358bd7395742f8340323bf4f918aee47543ca55 SHA512 f71ff59918d4d8278bae4408ff7649fdda928980d1cc08ab169391c5adbabed4e2d1ba0f4cfd23a8b0f05be1850c2037b971f99fd2ee2557ae76dfdae89e2d15
 EBUILD mongo-tools-3.2.17.ebuild 1221 BLAKE2B 7943f052ee8a6b2fefb1c84233d87f7b3189ba6eee59d764cd2af46d9350d697ee3379405b40be77cc751fdcfccbf0f3aa61640d0e5fd0aafbfe5bac34ae7519 SHA512 1bb25c1e8c72fcc6fe0374ea3469634dfbdf3fa37d41a91bf9e562d16031a23ec227d3a402a0eeb1e66742773db983e823f68f7334c734638620f1040cefe87f
-EBUILD mongo-tools-3.4.10.ebuild 1238 BLAKE2B cefa920eea7240d51bf726c4717c7400556e76e63534566825625a842373a72a80e0a843f92574964199710fbc2c1b4522e52bdbc9bd1324288570aa318aac86 SHA512 c37664f0902b8a763181af85dbc2e20a0f2e0d63610fb83cb7f75fe3892b7ef265c2be8341635e052aa723de741872c5dc880672f8b3d1216e7ea5917e1cb13e
+EBUILD mongo-tools-3.4.10.ebuild 1237 BLAKE2B 27690fa59a8165db8200ec332171396d23ab2084a4b42382b592622030e6b4a9e148b652b412448a1897b90beab3c684aeb570b7facac3d1f6047063b8f29312 SHA512 252ec56015e29597eb8f5cd1c5b63939276734f0459ed6b16fba1faf3eb82b4a88d707324c8010453c791b911a2bdfe14325b4604d6ddcd4259e160d0677dbd8
 EBUILD mongo-tools-3.6.2.ebuild 1257 BLAKE2B c9f6bf6e4e5aaf602e65f9dae6dc406506e4d590e392bc96cba776eaed1c4053e596ed6b1f55664b474e7b302d2032a9627fcf01b237ce06ec214275715d9fc2 SHA512 12eca5b3936d64a8cf0252c3cfa10594be9a7c5bfb22b4734c0ebbd9782e13249a9b389fd2e5d338cef721b4b1cf90c15237b8fda37b1e7e5a58a423a26af97c
 MISC metadata.xml 463 BLAKE2B 1e4d37c222538ce5d55e6f5c05ecbe85f57ac74eacaf5935540797f03c4c069b2ce2bd0cbb6b433eb86de9b2480058013759db3d504982df908c2ba9e1b4d2ec SHA512 f09474b3932dd6ae36da20c64a394acf65ad1e3a875e7ca743efa22db8b7e3109c9ebe4c489e62eda12c5bdd4d689ede61eca8a4cc89c42d0a08a270f041fcdc
diff --git a/app-admin/mongo-tools/mongo-tools-3.4.10.ebuild b/app-admin/mongo-tools/mongo-tools-3.4.10.ebuild
index ba96c8cbca32..0fd4699fdadb 100644
--- a/app-admin/mongo-tools/mongo-tools-3.4.10.ebuild
+++ b/app-admin/mongo-tools/mongo-tools-3.4.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mong
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="sasl ssl"
 
 RDEPEND="!<dev-db/mongodb-3.0.0"
diff --git a/app-admin/packagekit-base/Manifest b/app-admin/packagekit-base/Manifest
index f63ffd6a2085..ccbda20f8282 100644
--- a/app-admin/packagekit-base/Manifest
+++ b/app-admin/packagekit-base/Manifest
@@ -10,5 +10,5 @@ EBUILD packagekit-base-1.0.11.ebuild 2897 BLAKE2B 273c57376ea2e7a4ac18b78e1b3a22
 EBUILD packagekit-base-1.1.1.ebuild 3338 BLAKE2B 82a68620c4e6e9ff616dfce5b579eb3742e609e169b2cd3a133a8079f791e55efb85391a2b3e7af43ca12200d0a963fb3ef1701a3c6dc25f00ae064559172606 SHA512 95e673821d137a33e1622e1cad241bf9649ad1368ac4c27178643d40f39f3bc8408546f5f545dc325ca72be0586ee5dadc7f33af0c1d98acc7ec748eb305fc22
 EBUILD packagekit-base-1.1.4.ebuild 3372 BLAKE2B bac2e0a5ff37132fbf315e0958fec7237f0059191f0074169e1eaa53cda2338f408dff543325e859e6f20e0d8d900cf470e563196506fbc99af7cbcb2e4dcb36 SHA512 44ccfdf2114a4d2d0d90ce39e7b18ce8adebac5f423fda4661c0e848d39efd7a9dba12a54022e77e6171aa44037cb65b6a6c584346d1181c0ddfe18212354046
 EBUILD packagekit-base-1.1.5-r2.ebuild 3769 BLAKE2B 0f492fd80c02c3e057d862061f39b058ea403d56c6f453f4d824b5df7b884a3c4996113419fee66c2fcaffd1403e4d86dc05e4bdafdf4ac7ea9483344daad4c9 SHA512 a750ec8210a7b052452b5f8cae6f5a21fd2123225a92ad610b757368123235c048f8022f0609971b092b038493538a078db0f00655dd159e830383a49bad7c90
-EBUILD packagekit-base-1.1.7.ebuild 3601 BLAKE2B a0a2cf69859fe0f5642d04c5d4c2b6916877964bd3d6701cc29d6c1cf71cb59bafce3a95f86bb12d19e392bae683742cba6f39a4a5e2c755999ede4f877bfe8d SHA512 5af3df06412386f8d89c2dee5c2039d248b3c262afdec1806edf265c2682acdb448d44be838c556445f336811f0034975609c33797d6c100bb672fc3ae575525
+EBUILD packagekit-base-1.1.7.ebuild 3600 BLAKE2B 4972be8607c5f37249007eaef0dbc37cc5063604fdc5ba7ef056ce3bf90b2518ea1011799365ced8c2396bdfa9d35d04d9ebe539ca342290b0cda30e83d1ab25 SHA512 6e8900312b7b0b8a5710433d92fad6a31448be49a6f219d4cb326bceaaad292fe2f028d6998e2a730c2f95d776af941592886dc38cfb0f3666e2601007b0aea1
 MISC metadata.xml 860 BLAKE2B 03ddffc3bdd260e7ad8a2e47ccba37b9e381d543e7a0736d00deff87db86e2718af2b00e00092ef98b38b28456c995e1c70a8d190ff38c868a732dcd37300fe4 SHA512 db5ce7f7b361c9e742413bbb222fc3dfdd2747716e5d59a71dba5c14073a6bb18e1949d0247478a0652e6011af338e74ac790503773a2bc1d60693856b6f8650
diff --git a/app-admin/packagekit-base/packagekit-base-1.1.7.ebuild b/app-admin/packagekit-base/packagekit-base-1.1.7.ebuild
index 4a61ad552f37..ce330bee7541 100644
--- a/app-admin/packagekit-base/packagekit-base-1.1.7.ebuild
+++ b/app-admin/packagekit-base/packagekit-base-1.1.7.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://www.freedesktop.org/software/${MY_PN}/releases/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/18"
-KEYWORDS="~alpha amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~mips ~ppc ~ppc64 x86"
 IUSE="cron command-not-found elogind +introspection entropy systemd test vala"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
diff --git a/app-admin/su-exec/Manifest b/app-admin/su-exec/Manifest
new file mode 100644
index 000000000000..f52e708876e5
--- /dev/null
+++ b/app-admin/su-exec/Manifest
@@ -0,0 +1,3 @@
+DIST su-exec-0.2.tar.gz 2426 BLAKE2B 79eda06463a238371e35dcc7acf2df9e8a7696a531a5dc9d0e9650219a5c72d71cf0e368f2178f83e949cf0f05fbc01e7023085fa2cffebcd8b78e82ab9756e2 SHA512 68155a06c716b362aee1214f22cd325b3e934c05b653d3b084a720458fb04207c0681d218b72adfd5ae8fab0262f7ab90e49eb2e218d1b0d7d7af7911715d4e1
+EBUILD su-exec-0.2.ebuild 522 BLAKE2B d7e5de3abe8ea11cb7ed2cb5a5f2271862c4bb1e649a626d59f07b309f715d2c3e047863e20b0ff0f1f10d182a80596f1dcea219a97433de384a62e95d4bf710 SHA512 3d11459e325685a3dd5e4247f0abc4561b467bad45d087f417153bbceecd867404652a5d4564ba762de7e0fa058f425e311d21748768ad952f325e0cc55da03b
+MISC metadata.xml 323 BLAKE2B 56dfb262d3d2714721cbd8436aaaa6628ca11013bc801a7d9a18fa5a87d4e20e41d98584f344a98b8f697ad6427f6641bba7090b562594b08995e8b31d4d2292 SHA512 3eadc250f3acadea3d3b3f29ef78380ed153b12b34b5e752dd088470949dec3590889b8daa6db37472ed043a10f14f5bf2e8c280fae7efd3ee398fa5d88b0caf
diff --git a/app-admin/su-exec/metadata.xml b/app-admin/su-exec/metadata.xml
new file mode 100644
index 000000000000..662615bdd73c
--- /dev/null
+++ b/app-admin/su-exec/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ncopa/su-exec</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/su-exec/su-exec-0.2.ebuild b/app-admin/su-exec/su-exec-0.2.ebuild
new file mode 100644
index 000000000000..4a1e1f1eab69
--- /dev/null
+++ b/app-admin/su-exec/su-exec-0.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Switch user and group id and exec"
+HOMEPAGE="https://github.com/ncopa/su-exec"
+SRC_URI="https://github.com/ncopa/su-exec/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+src_prepare() {
+	default
+	sed -i -e "s/-Werror//" Makefile || die
+}
+
+src_compile() {
+	CC=$(tc-getCC) emake
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc README.md
+}
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 3c3264222250..68b376054133 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,8 +1,8 @@
 DIST sudo-1.8.20p2.tar.gz 2930769 BLAKE2B 90338e7d436683f94a9e13e9f0da668f2bbbf2184530feb63166186309881b737b783d2be80f935e5d64fd2a4264928423d2b754121be5caf07acbacbe2a6d42 SHA512 8bf67e687f7a84605fdef8d547b5cd661141b6c8fd25820c33c7e37e97ca7f21f564c3bae691f8a8cd08df7d80338e36a8f06bb5086cc104509d71d6ab1bceda
 DIST sudo-1.8.21p2.tar.gz 2976081 BLAKE2B c0b555879ddb6832c6396b557793f5d4783481fca5d721901c7ef81c1856c1cf7630fddd09bbb42207c27d51892a79c2bf5c653b5b5091ebc84f2d59981207b7 SHA512 f04bbff54ad74ba73c078e15c75d2f41332d4912078ed66157ba7346b7fff914bd0747460cb4cd0c472af2d3b344fa72f5c62c95169df68a9cac74d7245c720c
 DIST sudo-1.8.22.tar.gz 3029051 BLAKE2B c77e05b6e9cee738902d6289327fb5d34d19833d96597f983d8af01434d224dd698f9257b0965a0e480e8d19eb38eef0c8216942ca5217c3fe7516cdf397f7b7 SHA512 5ce10a9302d25bb726e347499d26a0b3697446cfcdf0fd9094ee35198db7b023d5250a53fdcb4184d1a09f5fd2a78fc645bc8e80f265666b05a91f62f49b0695
-EBUILD sudo-1.8.20_p2.ebuild 5737 BLAKE2B e2685da19a459bffe137754830be471fa1a10379e615746f059f2bb0c8593841be7063f99aa98c1d452d45b007fea65dd9fd361ddf6a022ac8d3ec4937817dfe SHA512 5a5ce8f6a6e0faea0dcaef046fb3111947a5da95eea6841ec48ea2585e2565e142999b49e3f61d0dac3f26310adf02d00c501a9ec1a060f0943fceb1db88d98d
-EBUILD sudo-1.8.21_p2.ebuild 5807 BLAKE2B e9bc6bc8a27731b06b5dcc786181b875d93c2d8fc78432aac8b71afad59f11e77c548dafdd8c0e2e1269fecb30b209473148648b1d2e271bbfab40abe99659ef SHA512 84cfdeb689f245581062db02accb6d8f37482ecf66fd2f9218cf20b353f7f44d6a7c095443fa353b784b9315476f22bf518cbb9828801dd26226765956190432
-EBUILD sudo-1.8.22.ebuild 5807 BLAKE2B e9bc6bc8a27731b06b5dcc786181b875d93c2d8fc78432aac8b71afad59f11e77c548dafdd8c0e2e1269fecb30b209473148648b1d2e271bbfab40abe99659ef SHA512 84cfdeb689f245581062db02accb6d8f37482ecf66fd2f9218cf20b353f7f44d6a7c095443fa353b784b9315476f22bf518cbb9828801dd26226765956190432
-EBUILD sudo-9999.ebuild 5947 BLAKE2B 3d3f920ed83db07c59bfcd8667cc3c21a5d81a604db33ce65c1b3c1003eadd04def54dc49463d1c698ad3e42fe82c5bfa4b578da1a6a45d232fc512266323024 SHA512 9d27074ca8a0e3f5c18cc820c4fc6640ff19946ea0e68b04a0cb3edc5f6b54f77030b09208099d93fb61f9915c3e6e8fd4cd40c5380f40143dcf1bc419731649
+EBUILD sudo-1.8.20_p2.ebuild 5739 BLAKE2B bd58250f5cf45c9a6480152ac0ceb11b628c5c6e05ba663b9c277c8f082b48de4be179a437e43de2f8c81d191a98840757387e655b0c2a04d4aec2827188be0e SHA512 cce6c399221a53baba5ab12c83c833c3a350ded0ca0a7144fb46b34bccaf323368408f6b4c05b3b1d7cf01563d0f53ff241f15fd553f0cb64c3164bdea052ac6
+EBUILD sudo-1.8.21_p2.ebuild 5809 BLAKE2B 06a01d30fb9642371be1a050d768eb42b011e1eb4f86238a96bfa7187025413badde2d92294411b6622ea55406f3d9aaa1492883706abbd999f42ae8a666ebdf SHA512 2847d70298fae4993128794f4b47dc093f3571f01ba5b1c60d221031b16385ab070b44c7c81dcea862e046bc5f390cda1f9af933c6ec196f7b198a4e7c36fe07
+EBUILD sudo-1.8.22.ebuild 5809 BLAKE2B 06a01d30fb9642371be1a050d768eb42b011e1eb4f86238a96bfa7187025413badde2d92294411b6622ea55406f3d9aaa1492883706abbd999f42ae8a666ebdf SHA512 2847d70298fae4993128794f4b47dc093f3571f01ba5b1c60d221031b16385ab070b44c7c81dcea862e046bc5f390cda1f9af933c6ec196f7b198a4e7c36fe07
+EBUILD sudo-9999.ebuild 5950 BLAKE2B a836f5a946b28a52efa978412f005cc5107406256237e8c3a6167cc8c0e6e3d33c5cb8e372a2bf9a7a04661a5caa9b93089ff0ea55d84af8d3d6eccc19d571a7 SHA512 9f73f6cf213d811978a86bb3e4c8ddd6dd1d4b8de2cb549308d55bfc9651062118514f5d381c2d7d0986908ad4b3fca4bd7b78ce157fd57d75e0eaf9377b9940
 MISC metadata.xml 989 BLAKE2B c7f7d49fda7750b172dd4b2e5c3fc5f1f3dd602b6347479834bf6444c9311738bcd10fbbba100cee45c97bb899e53f3c113abc61ee89b3353b50876c30966589 SHA512 bc9addd017e474acbc753d6d2cce5d77281a3c1f0857de538168eb1a7b80e0d0b313ad2b03cc710b483cc9588dcaf0208a5b8aaccea18e2ca51b567020bea9ec
diff --git a/app-admin/sudo/sudo-1.8.20_p2.ebuild b/app-admin/sudo/sudo-1.8.20_p2.ebuild
index 3c316a222879..256026257b1c 100644
--- a/app-admin/sudo/sudo-1.8.20_p2.ebuild
+++ b/app-admin/sudo/sudo-1.8.20_p2.ebuild
@@ -14,8 +14,8 @@ case ${P} in
 esac
 
 DESCRIPTION="Allows users or groups to run commands as other users"
-HOMEPAGE="http://www.sudo.ws/"
-SRC_URI="http://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
+HOMEPAGE="https://www.sudo.ws/"
+SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
 	ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
 
 # Basic license is ISC-style as-is, some files are released under
diff --git a/app-admin/sudo/sudo-1.8.21_p2.ebuild b/app-admin/sudo/sudo-1.8.21_p2.ebuild
index 2587ef0f43f2..81a7dffe1216 100644
--- a/app-admin/sudo/sudo-1.8.21_p2.ebuild
+++ b/app-admin/sudo/sudo-1.8.21_p2.ebuild
@@ -14,8 +14,8 @@ case ${P} in
 esac
 
 DESCRIPTION="Allows users or groups to run commands as other users"
-HOMEPAGE="http://www.sudo.ws/"
-SRC_URI="http://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
+HOMEPAGE="https://www.sudo.ws/"
+SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
 	ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
 
 # Basic license is ISC-style as-is, some files are released under
diff --git a/app-admin/sudo/sudo-1.8.22.ebuild b/app-admin/sudo/sudo-1.8.22.ebuild
index 2587ef0f43f2..81a7dffe1216 100644
--- a/app-admin/sudo/sudo-1.8.22.ebuild
+++ b/app-admin/sudo/sudo-1.8.22.ebuild
@@ -14,8 +14,8 @@ case ${P} in
 esac
 
 DESCRIPTION="Allows users or groups to run commands as other users"
-HOMEPAGE="http://www.sudo.ws/"
-SRC_URI="http://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
+HOMEPAGE="https://www.sudo.ws/"
+SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
 	ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
 
 # Basic license is ISC-style as-is, some files are released under
diff --git a/app-admin/sudo/sudo-9999.ebuild b/app-admin/sudo/sudo-9999.ebuild
index 7f82a2652767..8897a7115582 100644
--- a/app-admin/sudo/sudo-9999.ebuild
+++ b/app-admin/sudo/sudo-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 inherit eutils pam multilib libtool
 if [[ ${PV} == "9999" ]] ; then
-	EHG_REPO_URI="http://www.sudo.ws/repos/sudo"
+	EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
 	inherit mercurial
 fi
 
@@ -18,9 +18,9 @@ case ${P} in
 esac
 
 DESCRIPTION="Allows users or groups to run commands as other users"
-HOMEPAGE="http://www.sudo.ws/"
+HOMEPAGE="https://www.sudo.ws/"
 if [[ ${PV} != "9999" ]] ; then
-	SRC_URI="http://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
+	SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
 		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
 	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
 		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
diff --git a/app-admin/tenshi/Manifest b/app-admin/tenshi/Manifest
index 69c0769ee90b..ab0a2bbbce78 100644
--- a/app-admin/tenshi/Manifest
+++ b/app-admin/tenshi/Manifest
@@ -10,5 +10,5 @@ EBUILD tenshi-0.12.ebuild 1342 BLAKE2B c5fb552dbf0ecb866a993cdd2c2fc9fdd80d4d2c7
 EBUILD tenshi-0.14.ebuild 1185 BLAKE2B f17ca46a042bd6f0514135a9cf528854cc6173d1c959929618f50c87075075d6703cae63c16fb0f787af1cfefd9776202a386683c8c137c75f6adcfac60cac26 SHA512 53b7df0fc590a83cd12d8ba0c6c5404941f71ab1e81787b8ce924a0baaee2c8162a7abaf3b1d36e6f634bb16520aec29ab3ff7ea1efeace731b676f167335331
 EBUILD tenshi-0.15.ebuild 1186 BLAKE2B 20916392433c56dfe9af50ffb4b46a9f112c28c836d18c7cf28c8ed7a0663f65f0daa494e8dc4b21d00735b5ce9b8f2bf8ec39e05e294624bb853d1eb09dfd16 SHA512 eaffd6c1308d4c8111f443008eb7a2ec8bae686460b91509834c68801719d277f334660ae1330b6215959e6be8fa7349229e0ad214af593fb8a22d756120e769
 EBUILD tenshi-0.16-r1.ebuild 1201 BLAKE2B 39b1532683d3e310c36594ce0843b5ff29f6a3b754a2ed33ddfbbfcc2158667954a748ab5da3f989e4f1caf7ef019b9c99a193190861942f6913a839d8a5159f SHA512 f344b3f8b6d1a3e61d4a5a1f819d2cc787b20a23d310b4c7545bcbc0593d6b14572c0697659f21d083aee2387dad7e1847b5cac0cfe2052fc83f786cb540fd3d
-EBUILD tenshi-0.17.ebuild 1201 BLAKE2B cb842d255208587f3c9b9cfb5bb9195e3a08521827357a1e5cc6e3a519e13962f5098489f33700cd33286beba0a27cc85b88124456a42688c868533a19464fd3 SHA512 3a8daa84c56a5905347f597c62c48b901815d5eb924147b85734acbe882e97de43b60da9ca8e2c54975d9ca85674b0cb49ab94c4e78610fcd5c721ae4b9215ef
+EBUILD tenshi-0.17.ebuild 1200 BLAKE2B ae65e3eb0b2a4cf068c62b1da33bbdb54029092677a2280482d3c642d1a3516630b21b3d62b8f996f1d30356cd25f169e23606189813572122f106db5e9a9ff8 SHA512 c553e7a6d998224d35fc4c868850f7a74f5c5f29c9c5598a4538cde7b65bc7ff8f78b1c71b378ea37b666aff57ca6c6ca8a13ec09f29b2fa67694c3220bac63a
 MISC metadata.xml 616 BLAKE2B 82a12864f809b2c5f87fd5741c1b7723e311b2fc1261c51fdf24bb0ef0ee30e6f5684f12a438c3d86f961dd9299f962d6b08e7302ebdf137259d8e6884c7c62d SHA512 aecc34001ab636a20f6431410c9b96b157c581abebbcd38e61f121472d458e1211cd6fc70f90e50ea1b50d3eda3f151d39a2345c1e6510a8c067f90402ab43b7
diff --git a/app-admin/tenshi/tenshi-0.17.ebuild b/app-admin/tenshi/tenshi-0.17.ebuild
index 29c2bc70bbf8..5c5c80c067cc 100644
--- a/app-admin/tenshi/tenshi-0.17.ebuild
+++ b/app-admin/tenshi/tenshi-0.17.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/inversepath/${PN}/archive/${PV}.tar.gz
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND="dev-lang/perl
diff --git a/app-antivirus/Manifest.gz b/app-antivirus/Manifest.gz
index 1223027e41de..b118aa9341f0 100644
--- a/app-antivirus/Manifest.gz
+++ b/app-antivirus/Manifest.gz
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index ad3b444ab928..5e5207943c1a 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -3,6 +3,7 @@ AUX clamav-0.99.2-bytecode_api.patch 1531 BLAKE2B 50a70cf6e6cf206ec5e427e3b724c2
 AUX clamav-0.99.2-gcc-6.patch 4476 BLAKE2B 9ef285f83665cb9cd41f1fe94a64805fc6413c66909be2ae93efb9e342beda0fbd7db81691506c8aa1cbf9bde4e0e74efbdadc0ba2e459479ada35266638ad7e SHA512 b30ed8b888af3697294c1a2aa96a335b3b1035f4f76e3bcf6c243dca7bdc5921a9bb182fbfd5e0e7f1bb9dce93b2312927e28f78edae466d31200a2be50f3a85
 AUX clamav-0.99.2-pcre2-compile-erroffset.patch 540 BLAKE2B 77ad84cedb05329024226fffed554fce3005a678471117c9a9db54221d6d7458e6318b5b150c70e7f64cf16ad47d2093e40a67de0e9af024eb9bf6ed73b6c9f3 SHA512 6f2dd207accbc409c7e7155e3c04cf50255d4b6683ada24a559c23375ec4fa333f93118a25c8275cd8d6be7f950200c3730fd8174cc4a0450fe2160f2b86b536
 AUX clamav-0.99.2-tinfo.patch 656 BLAKE2B be926db8e63458f0ef9d6d5b6f26058c2100881997cd97b03cf2f893f0d0ef2b18ebc25e1f38f2a1df5aef3a7f647eb1cec66c0cc173175976048ca5ad57e782 SHA512 33e375e8f4e74f284e9d14adaa8ef095bdb67b2f62e4b7c5e9c38a3c5f955106173e402859fabf44ada40ae08cceb3fca79322f8854f47d850816064641f4451
+AUX clamav-0.99.3-fix-fd-leaks-in-cli_scanscript.patch 3554 BLAKE2B 36ce8580da5abc310caa29ae87478b811f2db9403cb79b01efb9394b3d19ced2be3dbf66a1ad2ea06c660156a03879ba3dbca4329569e349d7a70c12f034d237 SHA512 e0dfecff8adb1e30f4c7a20271fd8731ebbb20449a532d70977f7491d8539fc8ed74f851f6903f6265a2e660f9471341e68cc0651e5f94356179ff1f328ada0c
 AUX clamav-milter.README.gentoo 1124 BLAKE2B 41713f9ddd22b39748e812a03d5746d48b44f0506bd6e46886fd64233aedad0a7c4b2f8f7a3b0b1d14f831521c423ed5909eb9d9bc419540684fba065c3b9927 SHA512 1c6160e48eddd28f83ec5f24757f788781cef55789d1934dfccc12c7c5e5635a226d26b0983cab7344c142f5a2f1db172640b1d0e6c840a6fa83abed9be1211a
 AUX clamav-milter.service 284 BLAKE2B 7fbdce10ffa1d85aa671616f17ad45683177916269b434283582ecb53000f7a9a8978119e6a8170ddad8f7c0f14f09398fd7b893aad5d718083b002f6371ff21 SHA512 442148ac3c42ecbb893de5c6edde337b72a745d20f6c5ffa33131f9a0b2daadcffac39b686ada986a5ab500ea7b9153c448abc1b819e15fef488da1812bb0cee
 AUX clamav-milter.service-r1 303 BLAKE2B 55253d9a660699411e352bc80837add840dc6740afed4fe64a86def84610cad836ea3ea620664f540f242b917aab560201cca9c33b9fbc9b1cef2c8b29bfce36 SHA512 5dc30e3c57d9bff6595155e8299336c579c713aed429ab770f10d7678dd74691a135aa2070a825ddb726fdabcb001c19caeb993c1cd9a6fcf95d1d47f7160540
@@ -15,6 +16,8 @@ AUX clamd_at.service 228 BLAKE2B 85181b02329a86495d0737308417dd873424da0bb1cd376
 AUX freshclamd.service 191 BLAKE2B 5b517bf15d008454052bd0f7d5a10fb89284a5b64d1cd11570981ca07d70d4dbab6739175ef7434c5c16625fc4f342d21fe6c67970ebac9e64dc8c08732ab68e SHA512 aaf78e763d2aa9c17fc95edb1550547b6681a91fd239a86535e5193d36ff0e152c51c3a3957542f80d5b170805f296159958ac347886981ddd324bec4237da92
 AUX tmpfiles.d/clamav.conf 33 BLAKE2B 447c5ad4ad79bc70fc386833fa763451d30bf30f1ae26434039a3926ca5aae9734e0152c83b5b9aa5bed87b17c1b685c4ea9f41c9cb6b3197b1e78e800b71fd9 SHA512 eabe5a94c2679b82ea3e29272eb448b47e60b271381d3e97f3970b1a9e086d61662aff2d29887950a911025294aa7cea8bfd9003d257963566b251bcaeb5f6b2
 DIST clamav-0.99.2.tar.gz 16067497 BLAKE2B 4155e3125ccc45cc6828033f207b6b8d3514253dfb8156428ad4096c0901d5a8500f9dd253b8f40afdc49a6039b647627868f75d51829ab7bd247ada5f3b8383 SHA512 7744ba8a344b163cf98e9737cddfd25d2120b34ee9c4518380e028c9ec3cd50127b198b0dfa9fde30f5ce9aab0c0e6384712fbc11287e77d16ce052fd7b6ac44
+DIST clamav-0.99.3.tar.gz 16082645 BLAKE2B 3be06e563f17a07e4c7e95eb3efbb61e80858bcb3dffc584f13ec30dc2ef9c5257aec78605f1c03e183b4b7ed5b08343a25b579b2b12e54458694eff624aa01e SHA512 0d3c75d571ed4aa4937ef2b743a39a9a144f5adfd6f56f71046e5a8387b8ed7c3c4d9a4196aa85750f9ec4dc545720fdd659289d0cce086ab13a7cc505a0ab3e
 EBUILD clamav-0.99.2-r1.ebuild 5125 BLAKE2B 330ee8e4625368933a519481a204839153e6a08cf1480f0622a2632d470f9b44cda9a4f68919f356c5a8b95b81b87912e1c64d3b6e3c66fa9e1b122b2863b06e SHA512 96b2ff17e272cef6a23bfa4357b7a84a509a6e6e105439e70cc8db99b75a61a5732f7257cf494a19d48998c4d84c2d19213d48bf6104cf372eb77c41c5506908
 EBUILD clamav-0.99.2-r3.ebuild 5182 BLAKE2B d635013b30e5ec0ea2ec7a9329d1534595bbbb51b0bd79c3d1e0e545993223dfc384cc28bf907f478f8ae354b8b3543df1c2f8bafd4a89d01d3fa5c6bbdd4099 SHA512 754c23b5f2dd0d664f79ad07d0dbf1944a58418f36c9d2e01f8fbf88eb6f883bf825cd16a43ca3916417a3dc4e0de8dda49f345a002e74f2caaa1b1e1da3fd97
+EBUILD clamav-0.99.3-r1.ebuild 5242 BLAKE2B d5ae07aae6184ef54dfc5541fbbefbbba2c7c358e3a2629151358b14cfd70d4efc12e823477bb1465d55f835e795b4c1ef6732f3b3c852a9deb41851da3caa42 SHA512 2ee488313470d23234f32ec9ac60e16483a5246d27413b81cde5302edc55d60aabcfc5d00ea24e7d1b18a2a022d06e171129d66b32b8d907cda64c3cfe1f259f
 MISC metadata.xml 740 BLAKE2B 2cc1cd27896d7a032b476bbbe6a1b176c95657de5267cc77f6fc1ce1758603d9cf0caa0f3a614bc4a366695a089833474c30afc607ba1dee2caaff1dfc9e6c48 SHA512 baff0fa3285a5bfd17b408dc88ad573df07ec4de5e2827d352465347c5ebceb466172c4f369dac5680c927cad3a887a60721358e43b26e8cd7eaf3cebcaba832
diff --git a/app-antivirus/clamav/clamav-0.99.3-r1.ebuild b/app-antivirus/clamav/clamav-0.99.3-r1.ebuild
new file mode 100644
index 000000000000..35df578ab6bd
--- /dev/null
+++ b/app-antivirus/clamav/clamav-0.99.3-r1.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils flag-o-matic user systemd
+
+DESCRIPTION="Clam Anti-Virus Scanner"
+HOMEPAGE="http://www.clamav.net/"
+SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="bzip2 clamdtop iconv ipv6 libressl milter metadata-analysis-api selinux static-libs uclibc"
+
+CDEPEND="bzip2? ( app-arch/bzip2 )
+	clamdtop? ( sys-libs/ncurses:0 )
+	iconv? ( virtual/libiconv )
+	metadata-analysis-api? ( dev-libs/json-c:= )
+	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
+	dev-libs/libtommath
+	>=sys-libs/zlib-1.2.2:=
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sys-devel/libtool
+	|| ( dev-libs/libpcre2 >dev-libs/libpcre-6 )
+	!!<app-antivirus/clamav-0.99"
+# hard block clamav < 0.99 due to linking problems Bug #567680
+# openssl is now *required* see this link as to why
+# http://blog.clamav.net/2014/02/introducing-openssl-as-dependency-to.html
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-clamav )"
+
+DOCS=( AUTHORS BUGS ChangeLog FAQ INSTALL NEWS README UPGRADE )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.99.2-gcc-6.patch
+	"${FILESDIR}"/${PN}-0.99.2-tinfo.patch
+	"${FILESDIR}"/${PN}-0.99.2-bytecode_api.patch
+	"${FILESDIR}"/${PN}-0.99.2-pcre2-compile-erroffset.patch
+	"${FILESDIR}"/${PN}-0.99.3-fix-fd-leaks-in-cli_scanscript.patch
+)
+
+pkg_setup() {
+	enewgroup clamav
+	enewuser clamav -1 -1 /dev/null clamav
+}
+
+src_prepare() {
+	default
+
+	eautoconf
+}
+
+src_configure() {
+	use ppc64 && append-flags -mminimal-toc
+	use uclibc && export ac_cv_type_error_t=yes
+
+	econf \
+		$(use_enable bzip2) \
+		$(use_enable clamdtop) \
+		$(use_enable ipv6) \
+		$(use_enable milter) \
+		$(use_enable static-libs static) \
+		$(use_with iconv) \
+		$(use_with metadata-analysis-api libjson /usr) \
+		--cache-file="${S}"/config.cache \
+		--disable-experimental \
+		--disable-gcc-vcheck \
+		--disable-zlib-vcheck \
+		--enable-id-check \
+		--with-dbdir="${EPREFIX}"/var/lib/clamav \
+		--with-system-tommath \
+		--with-zlib="${EPREFIX}"/usr
+}
+
+src_install() {
+	default
+
+	rm -rf "${ED}"/var/lib/clamav
+	newinitd "${FILESDIR}"/clamd.initd-r6 clamd
+	newconfd "${FILESDIR}"/clamd.conf-r1 clamd
+
+	systemd_dotmpfilesd "${FILESDIR}/tmpfiles.d/clamav.conf"
+	systemd_newunit "${FILESDIR}/clamd_at.service" "clamd@.service"
+	systemd_dounit "${FILESDIR}/clamd.service"
+	systemd_dounit "${FILESDIR}/freshclamd.service"
+
+	keepdir /var/lib/clamav
+	fowners clamav:clamav /var/lib/clamav
+	keepdir /var/log/clamav
+	fowners clamav:clamav /var/log/clamav
+
+	dodir /etc/logrotate.d
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/clamav.logrotate clamav
+
+	# Modify /etc/{clamd,freshclam}.conf to be usable out of the box
+	sed -i -e "s:^\(Example\):\# \1:" \
+		-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/clamd.pid:" \
+		-e "s:.*\(LocalSocket\) .*:\1 ${EPREFIX}/var/run/clamav/clamd.sock:" \
+		-e "s:.*\(User\) .*:\1 clamav:" \
+		-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamd.log:" \
+		-e "s:^\#\(LogTime\).*:\1 yes:" \
+		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
+		"${ED}"/etc/clamd.conf.sample || die
+	sed -i -e "s:^\(Example\):\# \1:" \
+		-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/freshclam.pid:" \
+		-e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \
+		-e "s:^\#\(UpdateLogFile\) .*:\1 ${EPREFIX}/var/log/clamav/freshclam.log:" \
+		-e "s:^\#\(NotifyClamd\).*:\1 ${EPREFIX}/etc/clamd.conf:" \
+		-e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
+		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
+		"${ED}"/etc/freshclam.conf.sample || die
+
+	if use milter ; then
+		# MilterSocket one to include ' /' because there is a 2nd line for
+		# inet: which we want to leave
+		dodoc "${FILESDIR}"/clamav-milter.README.gentoo
+		sed -i -e "s:^\(Example\):\# \1:" \
+			-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/clamav-milter.pid:" \
+			-e "s+^\#\(ClamdSocket\) .*+\1 unix:${EPREFIX}/var/run/clamav/clamd.sock+" \
+			-e "s:.*\(User\) .*:\1 clamav:" \
+			-e "s+^\#\(MilterSocket\) /.*+\1 unix:${EPREFIX}/var/run/clamav/clamav-milter.sock+" \
+			-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
+			-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamav-milter.log:" \
+			"${ED}"/etc/clamav-milter.conf.sample || die
+		cat >> "${ED}"/etc/conf.d/clamd <<-EOF
+			MILTER_NICELEVEL=19
+			START_MILTER=no
+		EOF
+
+		systemd_newunit "${FILESDIR}/clamav-milter.service-r1" clamav-milter.service
+	fi
+
+	for i in clamd freshclam clamav-milter
+	do
+		[[ -f "${D}"/etc/"${i}".conf.sample ]] && mv "${D}"/etc/"${i}".conf{.sample,}
+	done
+
+	prune_libtool_files --all
+}
+
+src_test() {
+	emake quick-check
+}
+
+pkg_postinst() {
+	if use milter ; then
+		elog "For simple instructions how to setup the clamav-milter read the"
+		elog "clamav-milter.README.gentoo in /usr/share/doc/${PF}"
+	fi
+	if test -z $(find "${ROOT}"var/lib/clamav -maxdepth 1 -name 'main.c*' -print -quit) ; then
+		ewarn "You must run freshclam manually to populate the virus database files"
+		ewarn "before starting clamav for the first time.\n"
+	fi
+}
diff --git a/app-antivirus/clamav/files/clamav-0.99.3-fix-fd-leaks-in-cli_scanscript.patch b/app-antivirus/clamav/files/clamav-0.99.3-fix-fd-leaks-in-cli_scanscript.patch
new file mode 100644
index 000000000000..a457a71758c6
--- /dev/null
+++ b/app-antivirus/clamav/files/clamav-0.99.3-fix-fd-leaks-in-cli_scanscript.patch
@@ -0,0 +1,132 @@
+Author: Manuel Mausz <manuel-clamav@mausz.at>
+
+http://lists.clamav.net/pipermail/clamav-users/2018-January/005687.html
+
+--- clamav-0.99.3/libclamav/scanners.c.orig	2018-01-26 14:35:23.299386703 +0100
++++ clamav-0.99.3/libclamav/scanners.c	2018-01-26 14:47:44.422451335 +0100
+@@ -1342,39 +1342,35 @@
+ 		return CL_CLEAN;
+ 	}
+ 
+-	/* dump to disk only if explicitly asked to
+-	 * or if necessary to check relative offsets,
+-	 * otherwise we can process just in-memory */
+-	if(ctx->engine->keeptmp || (troot && troot->ac_reloff_num > 0)) {
+-		if((ret = cli_gentempfd(ctx->engine->tmpdir, &tmpname, &ofd))) {
+-			cli_dbgmsg("cli_scanscript: Can't generate temporary file/descriptor\n");
+-			return ret;
+-		}
+-		if (ctx->engine->keeptmp)
+-			cli_dbgmsg("cli_scanscript: saving normalized file to %s\n", tmpname);
+-	}
+-
+ 	if(!(normalized = cli_malloc(SCANBUFF + maxpatlen))) {
+ 		cli_dbgmsg("cli_scanscript: Unable to malloc %u bytes\n", SCANBUFF);
+-		free(tmpname);
+ 		return CL_EMEM;
+ 	}
+-
+ 	text_normalize_init(&state, normalized, SCANBUFF + maxpatlen);
+-	ret = CL_CLEAN;
+-
+ 
+ 	if ((ret = cli_ac_initdata(&tmdata, troot?troot->ac_partsigs:0, troot?troot->ac_lsigs:0, troot?troot->ac_reloff_num:0, CLI_DEFAULT_AC_TRACKLEN))) {
+-		free(tmpname);
++		free(normalized);
+ 		return ret;
+ 	}
+ 
+ 	if ((ret = cli_ac_initdata(&gmdata, groot->ac_partsigs, groot->ac_lsigs, groot->ac_reloff_num, CLI_DEFAULT_AC_TRACKLEN))) {
+ 		cli_ac_freedata(&tmdata);
+-		free(tmpname);
++		free(normalized);
+ 		return ret;
+ 	}
+ 
++	/* dump to disk only if explicitly asked to
++	 * or if necessary to check relative offsets,
++	 * otherwise we can process just in-memory */
++	if(ctx->engine->keeptmp || (troot && troot->ac_reloff_num > 0)) {
++		if((ret = cli_gentempfd(ctx->engine->tmpdir, &tmpname, &ofd))) {
++			cli_dbgmsg("cli_scanscript: Can't generate temporary file/descriptor\n");
++			goto done;
++		}
++		if (ctx->engine->keeptmp)
++			cli_dbgmsg("cli_scanscript: saving normalized file to %s\n", tmpname);
++	}
++
+ 	mdata[0] = &tmdata;
+ 	mdata[1] = &gmdata; 
+ 
+@@ -1388,9 +1384,8 @@
+ 
+ 			if  (write(ofd, state.out, state.out_pos) == -1) {
+ 				cli_errmsg("cli_scanscript: can't write to file %s\n",tmpname);
+-				close(ofd);
+-				free(tmpname);
+-				return CL_EWRITE;
++				ret = CL_EWRITE;
++				goto done;
+ 			}
+ 			text_normalize_reset(&state);
+ 		}
+@@ -1409,11 +1404,6 @@
+ 			funmap(*ctx->fmap);
+ 		}
+ 		*ctx->fmap = map;
+-
+-		/* If we aren't keeping temps, delete the normalized file after scan. */
+-		if(!(ctx->engine->keeptmp))
+-			if (cli_unlink(tmpname)) ret = CL_EUNLINK;
+-
+ 	} else {
+ 		/* Since the above is moderately costly all in all,
+ 		 * do the old stuff if there's no relative offsets. */
+@@ -1421,11 +1411,8 @@
+ 		if (troot) {
+ 			cli_targetinfo(&info, 7, map);
+ 			ret = cli_ac_caloff(troot, &tmdata, &info);
+-			if (ret) {
+-				cli_ac_freedata(&tmdata);
+-				free(tmpname);
+-				return ret;
+-			}
++			if (ret)
++				goto done;
+ 		}
+ 
+ 		while(1) {
+@@ -1466,13 +1453,6 @@
+ 
+ 	}
+ 
+-	if(ctx->engine->keeptmp) {
+-		free(tmpname);
+-		if (ofd >= 0)
+-			close(ofd);
+-	}
+-	free(normalized);
+-
+ 	if(ret != CL_VIRUS || SCAN_ALL)  {
+ 		if ((ret = cli_exp_eval(ctx, troot, &tmdata, NULL, NULL)) == CL_VIRUS)
+ 			viruses_found++;
+@@ -1481,9 +1461,19 @@
+ 				viruses_found++;
+ 	}
+ 
++done:
++	free(normalized);
+ 	cli_ac_freedata(&tmdata);
+ 	cli_ac_freedata(&gmdata);
+ 
++	if (ofd != -1)
++		close(ofd);
++	if (tmpname != NULL) {
++		if (!ctx->engine->keeptmp)
++			if (cli_unlink(tmpname)) ret = CL_EUNLINK;
++		free(tmpname);
++	}
++
+ 	if (SCAN_ALL && viruses_found)
+ 		return CL_VIRUS;
+ 
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index edb58fc7b9f5..915721addefc 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/file-roller/Manifest b/app-arch/file-roller/Manifest
index 0d882ae2071d..7812d2061e03 100644
--- a/app-arch/file-roller/Manifest
+++ b/app-arch/file-roller/Manifest
@@ -1,6 +1,4 @@
 AUX 3.22-packages.match 589 BLAKE2B b53cde8851c08d4f538397d72d5e904b6862a091ca1c6b82c255bd79f91917953b7a87b534ef71488f0a93e18a181f554a5477c606be7a429f7c574a62f8e198 SHA512 b96be2502b2ee56fb234af547a045cfed2c5e8bd7290876db641bb1f895ea6a796e50f2e2e066fc80b42fa58eab740a5519c0f2ad78f2787f55d1077b183ee62
-DIST file-roller-3.22.3.tar.xz 1423048 BLAKE2B 75caad8a215737256595a44d7599f581d60636c7c2eeaaa9a0c5c5ace583725ac22a9502311aed672f2f935c9372e2689ed0bcf867f6dadc538919c4d4b68f87 SHA512 f234388686cf539fc085866322083199176f94043e4c2c888d5806a2efa0dfcf5a090f64240a3d08aae39ed3d34d6b281e1a06d748c56b0f80508a01fac40b28
 DIST file-roller-3.24.1.tar.xz 1428216 BLAKE2B 7a74ac56fba36a60ba1f7cc0fb905b92336a349f786963a65ea2442fb078704c6e00b46686334f56cf270c861abe7ca252e0ee39f66349f6a4cc3b769a9e7dde SHA512 bd8750b8ffe3e7d3c74492e2ffdde519e7879d46f16c559d06042bac60c8ee63f492aeeaa66b4aff7c997150f4f2955e02a3b0565edf4bd7641a089ed052f268
-EBUILD file-roller-3.22.3.ebuild 2126 BLAKE2B 46cbdf6491e29575a790fc73a1818f327b23690ee21317d554bee67c5dc96b68e164e6f2eb634a48e32912f9305a047e47633dccaf71979f39c628ed186be174 SHA512 c223592cde7621cf2cbf619a38c3b39f2ea0447a28c8dcb5db6de560487dfe00fe9b148bb784aa423a3a54f7485474b7e12b005f91ac6d60b25bc49fb8e17fd7
-EBUILD file-roller-3.24.1.ebuild 2224 BLAKE2B 3644bb9683335e67c346027d7c3cdcf8bfa693e06b98a101ef76520d4523f86bd356371dc195e1c76f03d9774b576016bdea22feb139ad85b601c08e1eed8277 SHA512 56e89e704ab105c8dd57c1c086fb1468e6057ce30abdec50f39badea6cfb21c3174e50c1acd9a2330f344cbc9be8bbe45164892cfad840064be4a44f81bd3f1d
+EBUILD file-roller-3.24.1.ebuild 2223 BLAKE2B a1d82e9e382095697fd75e0d180c8629fd64f27b7fb18a7ddf38912018e2856f05251aee55962e9212965d4bfd9fb307627f4895350cafd67b7afe5b16e96594 SHA512 d1ffae59e371bc1f01f7e487039a13437e3afaec545e69266693c05a2b0219d5075af9c9111ace747eef1029c8d6fd3fb824f6c378a4b4678be6cad59f872b85
 MISC metadata.xml 648 BLAKE2B 8fc7347f0812f1b899096670b3ed809dd577e8173f8d7dac8175fbc6eb2939157d1a6100bcc39f15d22e8058e1daba2b4ac7b678baa83f1d24c1f14d77d2e989 SHA512 ea1b782f93ef9397e798d7f6cdd1e650ae95dcad71f439ec518a9e79ebc83a176c9876e85b9930d691e818f5b1efa636f5165d690cfd63b4c7ff9700ba2f956f
diff --git a/app-arch/file-roller/file-roller-3.22.3.ebuild b/app-arch/file-roller/file-roller-3.22.3.ebuild
deleted file mode 100644
index 277c112093cf..000000000000
--- a/app-arch/file-roller/file-roller-3.22.3.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2 readme.gentoo-r1
-
-DESCRIPTION="Archive manager for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/FileRoller"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-IUSE="libnotify packagekit"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-# gdk-pixbuf used extensively in the source
-# cairo used in eggtreemultidnd.c
-# pango used in fr-window
-RDEPEND="
-	>=app-arch/libarchive-3:=
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/json-glib-0.14
-	>=x11-libs/gtk+-3.13.2:3
-	sys-apps/file
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/pango
-	libnotify? ( >=x11-libs/libnotify-0.4.3:= )
-	packagekit? ( app-admin/packagekit-base )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.50.1
-	dev-util/itstool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-# eautoreconf needs:
-#	gnome-base/gnome-common
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-${PN} is a frontend for several archiving utilities. If you want a
-particular archive format support, see ${HOMEPAGE}
-and install the relevant package. For example:
-7-zip   - app-arch/p7zip
-ace     - app-arch/unace
-arj     - app-arch/arj
-cpio    - app-arch/cpio
-deb     - app-arch/dpkg
-iso     - app-cdr/cdrtools
-jar,zip - app-arch/zip and app-arch/unzip
-lha     - app-arch/lha
-lzop    - app-arch/lzop
-lz4     - app-arch/lz4
-rar     - app-arch/unrar or app-arch/unar
-rpm     - app-arch/rpm
-unstuff - app-arch/stuffit
-zoo     - app-arch/zoo"
-
-src_prepare() {
-	# File providing Gentoo package names for various archivers
-	cp -f "${FILESDIR}"/3.22-packages.match data/packages.match || die
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# --disable-debug because enabling it adds -O0 to CFLAGS
-	gnome2_src_configure \
-		--disable-run-in-place \
-		--disable-static \
-		--disable-debug \
-		--enable-magic \
-		--enable-libarchive \
-		$(use_enable libnotify notification) \
-		$(use_enable packagekit)
-}
-
-src_install() {
-	gnome2_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/app-arch/file-roller/file-roller-3.24.1.ebuild b/app-arch/file-roller/file-roller-3.24.1.ebuild
index 6882288bc377..61e1a7c6e37d 100644
--- a/app-arch/file-roller/file-roller-3.24.1.ebuild
+++ b/app-arch/file-roller/file-roller-3.24.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/FileRoller"
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
 IUSE="libnotify nautilus packagekit"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 # gdk-pixbuf used extensively in the source
 # cairo used in eggtreemultidnd.c
diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index a06667888d5d..8c3a00cecd0a 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -1,6 +1,6 @@
 DIST xz-5.2.2.tar.gz 1464228 BLAKE2B aea079d094ad23e305eb273c4b126816d36ec3b92e6d626bdf6cb6903bb49183c764b97a85eda52dfe5fb5ebc9bb87913a8caa0523a00acc2d2f4edf70b1418f SHA512 8d6249f93c5c43e1c8eeb21f93b22330fd54575e20bbb4af3d06721192d9f0ca3351878964c9640238ac410b7dd9f16329793c7be7355c7ca0db92c6db6ab813
 DIST xz-5.2.3.tar.gz 1490665 BLAKE2B 470791a67fe635165559b0364c9c0e968f3fc32ba7af53d0173d620ca65c68428e0d4d18ada341a063ea3eabb1b51a71cf873218ca0622fd41e01c20a6f04078 SHA512 a5eb4f707cf31579d166a6f95dbac45cf7ea181036d1632b4f123a4072f502f8d57cd6e7d0588f0bf831a07b8fc4065d26589a25c399b95ddcf5f73435163da6
-EBUILD xz-utils-5.2.2.ebuild 2088 BLAKE2B 4c13f34abc9997f4a71c95c945844c5c68a5616c09ed8f3cdfe1f89ce52637b17fbb54936a108b5df309c05989c1a29aaaf1de1212f3653220a3feb51527cece SHA512 89d9d8991e512aedba675c07e4a128983fc90297b06ad67d381b4e255d3c8252f3795ff64e0d33da5a67a9273815e85b42a18e10c8e63579a42a8a9a9fb12498
-EBUILD xz-utils-5.2.3.ebuild 2596 BLAKE2B e37e98c9637b64103188c4621fb2ec9b83f79a2114a092bcecd8936b0b44a5983c5784166eddb145aae162efd1ea14a7fd329aa09c6a10b28b7455304dbf2b9a SHA512 6c912647db1d496728082b4e47b0864af679662f8c0783f0c18f117c2770e98c7fec20e9751ec4cc7bec7e6028ecd8cd61873620724df402554b84488f8d76f8
-EBUILD xz-utils-9999.ebuild 2593 BLAKE2B f3a1ce1e744ebdf07c8b9af28c9591950b650cf3c893db6ebddcc06f260a5430090319a3429b628fc9319faab411dd09bc15aa4296802fec6d163d9a91fba52b SHA512 f33d375ac506d6d421fd4f0a27c6a3e4e735293ff7b24027d95735496841532fb2fe9ca1599e696e46925596179c9317d53522f35a493a1adfe7a5c6d6a48398
+EBUILD xz-utils-5.2.2.ebuild 2089 BLAKE2B 0c68b78919f7d14466656ddf055c791ecc0c9237792b6083995ceb7fa6d8d98196435fc036b9cb09864590b2a7d2268321592f3060bfa9c97ddc120f1793b4dc SHA512 f4eb3ae00c16f8ce2933d1a0bb6e6e5b09fada4b671a27bcf6e0bb669000f449f54cc4d977543d9daacfe678386799a3c1d3c2f96a3b7426f342dad5733b8a97
+EBUILD xz-utils-5.2.3.ebuild 2597 BLAKE2B 5315c9bd41ebe1c6a8b59faefc7446931d6b13270c320d5e45404becad60a649b2438813deaad55beca07fe50c6d4cec123fe54787fb30f6f2c3a4f1bb6da093 SHA512 396641b18da127285a11dd4ea74c0279a38f6a297196b32f2e667b358ba94edd0b7d3d93e69861265209dec847d230ea443e392db64373f7ed86f75f55bfda65
+EBUILD xz-utils-9999.ebuild 2594 BLAKE2B 75fe6db86dbe267353f4843d743a88097951575d2cf1396f8307aee097b4a72237bc709dc66208504337aed13eb54f1b98487b116c6c51e78e535a9bcc6dde48 SHA512 7c5dcf80d5bdf042304c4bfde56b12e6138769191a23436fd52268d361dedab49df0658d6f95b90055445f6309889ebdad1764a147242b9b477663a1032bdca5
 MISC metadata.xml 462 BLAKE2B 66d5625b239d042389ce8fef820efdc3ce3b5cbf21f6d0aedc4874d450ea1897dc8438575f3efc5a491ea857a8b990e6a51b16d0ff0b4982b41307bb52535cf1 SHA512 8f4ca7b987587a240f932ff1719f096de148db6e11c4e0af5f2f55552cab5d0af1256be337dbe8493b584d2c25a70a308dc28b90712078fb58f40cae37cfe5b1
diff --git a/app-arch/xz-utils/xz-utils-5.2.2.ebuild b/app-arch/xz-utils/xz-utils-5.2.2.ebuild
index 56a375592e4a..727c5970e60f 100644
--- a/app-arch/xz-utils/xz-utils-5.2.2.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.2.ebuild
@@ -22,7 +22,7 @@ else
 fi
 
 DESCRIPTION="utils for managing LZMA compressed files"
-HOMEPAGE="http://tukaani.org/xz/"
+HOMEPAGE="https://tukaani.org/xz/"
 
 # See top-level COPYING file as it outlines the various pieces and their licenses.
 LICENSE="public-domain LGPL-2.1+ GPL-2+"
diff --git a/app-arch/xz-utils/xz-utils-5.2.3.ebuild b/app-arch/xz-utils/xz-utils-5.2.3.ebuild
index c50acecfe5ec..516ab9467936 100644
--- a/app-arch/xz-utils/xz-utils-5.2.3.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.3.ebuild
@@ -22,7 +22,7 @@ else
 fi
 
 DESCRIPTION="utils for managing LZMA compressed files"
-HOMEPAGE="http://tukaani.org/xz/"
+HOMEPAGE="https://tukaani.org/xz/"
 
 # See top-level COPYING file as it outlines the various pieces and their licenses.
 LICENSE="public-domain LGPL-2.1+ GPL-2+"
diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild
index 14f09f4bd5d2..e770562d7a4c 100644
--- a/app-arch/xz-utils/xz-utils-9999.ebuild
+++ b/app-arch/xz-utils/xz-utils-9999.ebuild
@@ -22,7 +22,7 @@ else
 fi
 
 DESCRIPTION="utils for managing LZMA compressed files"
-HOMEPAGE="http://tukaani.org/xz/"
+HOMEPAGE="https://tukaani.org/xz/"
 
 # See top-level COPYING file as it outlines the various pieces and their licenses.
 LICENSE="public-domain LGPL-2.1+ GPL-2+"
diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index d78ea33f7864..dc02594c4ed6 100644
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
diff --git a/app-benchmarks/sysbench/Manifest b/app-benchmarks/sysbench/Manifest
index 0c63c0395411..d9afdc086ef9 100644
--- a/app-benchmarks/sysbench/Manifest
+++ b/app-benchmarks/sysbench/Manifest
@@ -1,6 +1,9 @@
+AUX sysbench-1.0.12-htmldir-fix.patch 647 BLAKE2B c3d61f9c370b6e29d2f7c2b039c2292a4368f84021410b8c2132cb64f6809180ce91ca1138816ca2aa38c07cf2d7c3a66244f4b9fb6afd5424f0ab4843b4b144 SHA512 1a9af5fee72e3dd08089fce64836ea9af18348176435cc0ef0283cbd4d22ff790c953ccef1f3d91794b4c17221a6b837714dbcfb53adefccef6d1b88013cf43e
 DIST sysbench-1.0.10.tar.gz 1496937 BLAKE2B d2cf3283a2e2cac89a54e51e975eecec4b5514c08b14fe81138dc36b077e82de54cb3c5d218e1cc00dc6bff66319d780c69249c49c93e810d3ebde3c0b36b656 SHA512 3e2c9597538c9b71a50a0fb0e198f8852206fc609b0968253ee6b12f652fd56f1b2c6e7a4c93161b725e5c56193f7ce9d5cf58c4882839a4c1055c539861d16d
+DIST sysbench-1.0.12.tar.gz 1506013 BLAKE2B 940e2978b81362d66cf0de31b9a0a5a844fd31e19cad47a7538f8f2e2f0a46b08c0d5b80a334da277f0558aaf8316b2a2b91753f30163362c6b6bc25e556e88b SHA512 e4f9d909ac3df31b128fc1ddc4b55cb62c579205439c806d2bfe2579641a9d5e94f159d99cfc8e84680aca1c6af0769f838792dc4b37c57b1e03943ea8211bec
 DIST sysbench-1.0.7.tar.gz 1494571 BLAKE2B 56b351cbc1af687b48cce0a98e07301c0d8d35104199adb1e05076091e06e363fd465caec14eb3b1572297f97d35e8fc5eb23eab5ecb70bb4bdb2b2886bc77e2 SHA512 0b32ad27180ab02df9c2e5e85a8b9bec231338cfb20d7337dd80f1e0628b48bae480fde9d69cd21730aa0ab7c65fecbede9c10cd4b96d0dcf44cd012afa10d65
 EBUILD sysbench-1.0.10.ebuild 1256 BLAKE2B d5d726931e768d61f947772ec53c65502f5b4e47a606645d865eb2a5a8d4a87d882d9fe6c5e1a561185a5e5e20efc7685b80916ad780b2ffe0f4511691927e18 SHA512 8f1e1da773fcf7ed68d8e5467de91096eb8f70ec63a58111acbf6caf8682863f2b09e17a7cc024256853a68fad2849927b0a9329f680f935dcd77ad5dcff03b8
+EBUILD sysbench-1.0.12.ebuild 1202 BLAKE2B 52222cae7301fc80cd764d416710dfaa8085c9634ad5c9b9d07c48e1b99b1f6168a8ea5ccea2e5a3f76b86d94b9b332a235f91ae2281ca8f25d9a5d0b9109e68 SHA512 f302988d844de77138e31c5edde0db0ce958e75bfe4f8e5a2e4ba22de58a662650e255fd8d3163b846b8daa6e89004f8bc5fe40131cbce7e8e03109f709b8762
 EBUILD sysbench-1.0.7.ebuild 1255 BLAKE2B 0999b1d683b47e6e3958f8a80e5faa10e9de052242e9bd2480363d0a31bb438db32b993b38dbc59ae5ee346f9cf5478f5a6ef7aa9593b1f31aa069f98e04efeb SHA512 4ca05385888089b471af38ea33861ff0b275494ccfafa090c8ae6893c206f842139aa2ce2be51f091eb0a16f903ea4c4a67ea55351bfc2702ca5a3fe9a7be88d
 EBUILD sysbench-9999.ebuild 1079 BLAKE2B dbf775776602edaff8ea8b12e1e1f895e7334c352be5ec6fec17400142a8e5dff1b3e3fbc89a19dad0ba86ea84a613b3d080261dafa8317471c1ce25603584ec SHA512 9bc554eaf47f3ddb41d8aa0590d686f9fd724dcf98445610a7bebe6fbd8f0b40a815c0cf5c4f0378a6424c1222ba117163c1c7e27bf5c7e717d3825aaa8193a2
 MISC metadata.xml 512 BLAKE2B c696a3f13c62ecdb93f09f486e27dce240ad3875bea3edf21a1cc74738b3e0cc293e4d5c42dd0175a3ae709d9d8f197aa06a8f5423d4b9b617ba4cac88cba3cb SHA512 8187049c2a67b1219cde6ababe233df864380dcb4adf9e5b3144f0fe488eb79d39739b80017ab47b0400c81b8c0d1f247de95e9dd0ef4c50b2a0d8a322ae81fd
diff --git a/app-benchmarks/sysbench/files/sysbench-1.0.12-htmldir-fix.patch b/app-benchmarks/sysbench/files/sysbench-1.0.12-htmldir-fix.patch
new file mode 100644
index 000000000000..00022f271577
--- /dev/null
+++ b/app-benchmarks/sysbench/files/sysbench-1.0.12-htmldir-fix.patch
@@ -0,0 +1,21 @@
+From c4ddab7660e2a26a6fdb333db8f4b5bb7aad66ca Mon Sep 17 00:00:00 2001
+From: Tomas Mozes <tmozes@sygic.com>
+Date: Wed, 17 Jan 2018 13:29:34 +0100
+Subject: [PATCH] Drop htmldir as it defaults to docdir if unset.
+
+---
+ doc/Makefile.am | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 100a4012..fe441467 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -4,7 +4,6 @@ XHTML_STYLESHEET=$(srcdir)/xsl/xhtml.xsl
+ CHUNK_XHTML_STYLESHEET=$(srcdir)/xsl/xhtml-chunk.xsl
+ XML_CATALOG_FILES=$(srcdir)/xsl/catalog.xml
+ 
+-htmldir = $(prefix)/share/doc/sysbench
+ dist_html_DATA = manual.html
+ 
+ EXTRA_DIST=manual.xml
diff --git a/app-benchmarks/sysbench/sysbench-1.0.12.ebuild b/app-benchmarks/sysbench/sysbench-1.0.12.ebuild
new file mode 100644
index 000000000000..e3972cf8d005
--- /dev/null
+++ b/app-benchmarks/sysbench/sysbench-1.0.12.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools pax-utils
+
+DESCRIPTION="System performance benchmark"
+HOMEPAGE="https://github.com/akopytov/sysbench"
+SRC_URI="https://github.com/akopytov/sysbench/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aio mysql postgres test"
+
+RDEPEND="aio? ( dev-libs/libaio )
+	mysql? ( virtual/libmysqlclient )
+	postgres? ( dev-db/postgresql:= )"
+DEPEND="${RDEPEND}
+	dev-lang/luajit:=
+	dev-libs/concurrencykit
+	dev-libs/libxslt
+	sys-devel/libtool:=
+	virtual/pkgconfig
+	test? ( dev-util/cram )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-htmldir-fix.patch"
+)
+
+src_prepare() {
+	default
+
+	# remove bundled libs
+	rm -r third_party/luajit/luajit third_party/concurrency_kit/ck third_party/cram || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable aio)
+		$(use_with mysql)
+		$(use_with postgres pgsql)
+		--without-attachsql
+		--without-drizzle
+		--without-oracle
+		--with-system-luajit
+		--with-system-ck
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	emake check test
+}
+
+src_install() {
+	default
+
+	pax-mark m "${ED%/}"/usr/bin/${PN}
+}
diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index ecdf8e7d0865..38aef8c753aa 100644
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
diff --git a/app-cdr/brasero/Manifest b/app-cdr/brasero/Manifest
index 6060eb9b4124..a4cad08c5d58 100644
--- a/app-cdr/brasero/Manifest
+++ b/app-cdr/brasero/Manifest
@@ -1,4 +1,3 @@
 DIST brasero-3.12.2.tar.xz 3742120 BLAKE2B 42cc60d3f4e26e948321c34f2514172aeac5a1b2624e6b23f27cc9725efd5cf0844a54175161b4c94601bbd5c4a6f18ccdd62353e862eddaab17e0d164f4694c SHA512 14886e772123f179f79d3172b59e21ced990fd8834cd27e8717eb635a75163c44c1d5084818b53da559a0c2ef25e7c0da4a3a7d3781e2ea74b59cfe98987384f
-EBUILD brasero-3.12.2-r1.ebuild 1942 BLAKE2B 3d52980e681a513a87e55724772493d65818c7e8e6e4126e6934425ca57a92cc26cc1a5ec32131dc2b5ca15983a8cf88e05d4fb235394665b13ec7635de9f53d SHA512 fed34099dc0a9993af541c22c69ac5f89d7f0b0336d29fccce7520affcd43db57e340e0dc7816a17bf28d9e218cc5f91bbf1916999f0e7afb6e716aee43bd24e
-EBUILD brasero-3.12.2.ebuild 2015 BLAKE2B 0227e0e8b1b99d0c49d492a91bba02b9d51df3cca0896ca6c1d6a39d4d65d57401a3436b90dc9a48c2c42b6c41f4240c840c8733b201e2f7ed2be9639a37a4fb SHA512 c9669c20fd70f869ab1a2fe5eef6924553940e7638a32691cdd5427b472cf3d4272548115c2b71c1efb9b72786658c542760d9ed06c5aee14f9bae7ef0bee9f7
+EBUILD brasero-3.12.2-r1.ebuild 1941 BLAKE2B b1f42dfcba6bf95f087e33547098d17fd41a7f6b32fa52832fe31f977fe8eb299fd7f039eb8eefc33799ebba1f591a106f5016f930d5d2ac28e36537f900e514 SHA512 7cc760921823d55eeb3701709d599f5ac0f1231bef71872b151c1c5b6b75f0188d191d6d76f3643bcb5b146b238c5fb8f3e971c59e12cd4597275bf47bd0bca6
 MISC metadata.xml 767 BLAKE2B 731778f406b9adbdf563315ce4e978a567f7c762b2a1659df6ead92cb610fdaf9dffb220ea54988bed0970b9b3cf0330afb390c802627930bbb450e11f8d7db6 SHA512 d5eff95f93edce1d592b2d8b383e04d0f96c92374d8077709d4e8404060e9eefcba9dc16f741651ebb5323f7692b07462ded60c7e6f638be3334fa04740da381
diff --git a/app-cdr/brasero/brasero-3.12.2-r1.ebuild b/app-cdr/brasero/brasero-3.12.2-r1.ebuild
index 49ce08f543b5..76fc53b6fbc7 100644
--- a/app-cdr/brasero/brasero-3.12.2-r1.ebuild
+++ b/app-cdr/brasero/brasero-3.12.2-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Brasero"
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0/3.1" # subslot is 3.suffix of libbrasero-burn3
 IUSE="+css +introspection +libburn mp3 nautilus packagekit playlist test tracker"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.29.14:2
diff --git a/app-cdr/brasero/brasero-3.12.2.ebuild b/app-cdr/brasero/brasero-3.12.2.ebuild
deleted file mode 100644
index e4bd68e08c0a..000000000000
--- a/app-cdr/brasero/brasero-3.12.2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="CD/DVD burning application for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Apps/Brasero"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0/3.1" # subslot is 3.suffix of libbrasero-burn3
-IUSE="+css +introspection +libburn mp3 nautilus packagekit playlist test tracker"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.29.14:2
-	>=x11-libs/gtk+-3:3[introspection?]
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	>=dev-libs/libxml2-2.6:2
-	>=x11-libs/libnotify-0.6.1:=
-
-	media-libs/libcanberra[gtk3]
-	x11-libs/libICE
-	x11-libs/libSM
-
-	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
-	libburn? (
-		>=dev-libs/libburn-0.4:=
-		>=dev-libs/libisofs-0.6.4:= )
-	nautilus? ( >=gnome-base/nautilus-2.91.90 )
-	playlist? ( >=dev-libs/totem-pl-parser-2.29.1:= )
-	tracker? ( >=app-misc/tracker-1:0= )
-"
-RDEPEND="${COMMON_DEPEND}
-	media-libs/gst-plugins-good:1.0
-	media-plugins/gst-plugins-meta:1.0
-	x11-themes/hicolor-icon-theme
-	css? ( media-libs/libdvdcss:1.2 )
-	!libburn? (
-		app-cdr/cdrdao
-		app-cdr/dvd+rw-tools
-		virtual/cdrtools )
-	mp3? (
-		media-libs/gst-plugins-ugly:1.0
-		media-plugins/gst-plugins-mad:1.0 )
-	packagekit? ( app-admin/packagekit-base )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50
-	dev-util/itstool
-	>=dev-util/gtk-doc-am-1.12
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( app-text/docbook-xml-dtd:4.3 )
-"
-# eautoreconf deps
-#	app-text/yelp-tools
-#	gnome-base/gnome-common
-
-PDEPEND="gnome-base/gvfs"
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-caches \
-		$(use_enable !libburn cdrtools) \
-		$(use_enable !libburn cdrkit) \
-		$(use_enable !libburn cdrdao) \
-		$(use_enable !libburn growisofs) \
-		$(use_enable introspection) \
-		$(use_enable libburn libburnia) \
-		$(use_enable nautilus) \
-		$(use_enable playlist) \
-		$(use_enable tracker search)
-}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index ffb647189df0..091a414e4771 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index 5447a61d8fe0..0a83262de950 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -6,11 +6,18 @@ AUX mit-krb5-1.15.2-fix-pkinit.patch 3196 BLAKE2B 6fdf17bb1ad096bc2745c3c908fbc9
 AUX mit-krb5-config_LDFLAGS.patch 466 BLAKE2B 2dd4f1cfc20bea229d08201d66e3de71472dccfa45dee9b260c51578187e706b864c0b4ff81c0c5a09fd29401c2abdbe334441ca075208299b02d5e1d49aff94 SHA512 9a1ca9b33e7708346eda78d199fdc51f0d7bd08d3d65ea15a19955a6155ab71b8ee0c8989859d6dff293a141f197ea19394a91b3b641181140a289b743e0f0e7
 AUX mit-krb5kadmind.confd 76 BLAKE2B ca69357a77ddaf67e2f9c104b17d49af5da9891b13bd855f8b04d54bfb6ccf07ae8c5cb694f65a47646675c844c8f8c7224e8487081df678c73c554498259516 SHA512 dbf968800959f0463899031e823f003e9ece90132f452ebf03df08caf0e6a6e6ca2cfdee91491d269cfa24bef19e72dd33c7d818a4bb13ef85edfb6f0e8299f3
 AUX mit-krb5kadmind.initd-r2 612 BLAKE2B ba2a70a7c123d63b9c58f4ec31c3c2366949e6971ff4f203cb38e1efb5a69991533291e118066e680d880c5221168c8eb5b047ec70dac857888330978d1e5a9b SHA512 3791af603380277a9d2632a01a86f96f68c9eb38a2c9574cca462fe9a01bef60f24785051d0215a8d71dd5022f1404e281929278e2bfd31603a0415dd9df6a98
+AUX mit-krb5kadmind.service 137 BLAKE2B fcbb450a9bd39407801c93d7ffe050eadb27adbfe3165f27fe9a6ad1b18464153109bdab61a85a6a908dbb8e57b14d577165d9144a6f311d90167d01a92de748 SHA512 65a507b84e8280a9e417e32f8667941f52802f1afe9de513718db5a414ba84569b95a5c4d84eb9d39c232901c4ae1f674e6c95ea2c6895dc0c495b78ec04a026
 AUX mit-krb5kdc.confd 54 BLAKE2B d8cbcf8dfb6e9d249b1990587f7e5880f32f3e69df2b44d7e973adcf3809185de76f0c2a12d3c4c4ff590c26b2e3fcd69aedd3881ef23b0216e5bff57993c62b SHA512 bd51139b644350f464fe4d254cc5036e96a7f5b0156033e1fdeed1acee6867052bddfe3495893295e83f56dfdff1c30a606bd64faeba58cc9a5bcd6cde5c6b9c
 AUX mit-krb5kdc.initd-r2 572 BLAKE2B f9115cc452891e1267268df6d4beb7eeb69ec27edc924744a6cee957ec8e3d9e1b062fc6a86f83692d95163419f80e1a7c781afd373cd3c135227ede2ebf7f1a SHA512 42cbc315a4e28a78cd29ee6f9aa9401ac6185cc78d39528f0c498d6b04a8edba7b7efadaaeae52ac2c4f89faa846787da9aee645f9ef0bdb79cd6289454586a3
+AUX mit-krb5kdc.service 129 BLAKE2B f1cfb303cfef67c138e04bb2a7e2b61755370819a5dd4cb921ac7590df9c6c9934d49ac719784743c691c93f78b96d8b63609e3dc4c9eb3142451ee6f30f7c87 SHA512 0b4d41f658769b0134764dafeab9008fa0a5916adc9bd9362dfda6f92681d8a8cc4c6b78058b2c2ec6e6e3d991e2de3d883dac1813530ce791cd8df2b73c9658
 AUX mit-krb5kpropd.confd 84 BLAKE2B e3f47a3c520af14794c2fe11368651ba56e8aa059babb91b3112af9682403a6409b3fb39ed6313f9cd87169c3754e4c4fc17bc24b0b773cfdf01e7df3eb03490 SHA512 afd1cf21a6afd3bc73b1ef3cb0a26ec3420b26ed31196f8c092ae880b235043273c95e2ecb3b88e65ea008cd8ea6a10553d1966f45646cf5993d5752dfc945ac
 AUX mit-krb5kpropd.initd-r2 608 BLAKE2B 9737f5ff711b8e30444c14ca871e01f2c45e9aecdab99d3dcfd8c16bae65ed05fc732f2007c65f0abfab10cf766035c03c557d217f750ab06f804b639722b27e SHA512 28b9d9bc9d132d8bd87d5fd9e74103d4772f26cba48d28ad53f40ade037a5ac91e07c01aa3180d50c3624673bf4e534f76689b03feb4888cdd9198755576b6a7
+AUX mit-krb5kpropd.service 128 BLAKE2B 31d002c16987bd6fc42e22e64dd9bd1f9db36655dd5170a4f9f16c6a889a4303a4dc276aca09b3a213a1de3e6ab759c66790141708ec95c4393bbbe79e8fb16f SHA512 b7419d1c728eda86fbab2fbf83794ae754e3cdaec7dcdc12c2105e3a75f9903c25fe8fee48f57acf6f0a8c62d27f7934fae81c0cbd67b997541aef7060a4de46
+AUX mit-krb5kpropd.socket 122 BLAKE2B 2ce51e67b909c6955d9796f80f7985c9209af398ad2a60beebe83bd766d42261bd44c712df14608a1e5e922715780a6c4aa8ad294c34ba4e8fc336a24d038fd3 SHA512 4e7ae175425e0787a1d5ff959471a88bf5af4cd6e213dc6d4048902fab7547c1186a082370b523f9549f5096acfab1fb03b4839e42bd80dc539130ae4bb3ea55
+AUX mit-krb5kpropd_at.service 162 BLAKE2B ccd1dea2419656a95ea1e5068457ea45a765a831f36e7abe3e27cdd9b42f2b703cd6ddad1ac60d75feff4d74bf31dbf146ee2cbfdd34ac38c11908d44162e77a SHA512 4b7121da07b11fa65db4edc185c57197ebb25ed5c49797e36bc31b8b7bbb22a6f512f4a986c8430dfc31b1b8fcfba66dcfe154cd6eeb8b4bb445d5006fff3802
 DIST krb5-1.15.2.tar.gz 9380755 BLAKE2B 3f5d00a70bf44ef077872bde282e4753e82acb70632e136b8f9f8d3a192e3e7b692840803e5a3f67ddb202d53631767ea9eb8b7615d45a3479389a01a6390ac4 SHA512 e5814bb66384b13637c37918df694c6b9933c29c2d952da0ed0dcd2e623b269060b4c16b6c02162039dadebdab99ff1085e37e7621ae4748dafb036424e612c2
+DIST krb5-1.16.tar.gz 9474479 BLAKE2B 0c5caa0a0d2308a447d47ab94d7b8dc92a67ad78b3bac1678c3f3ece3905f27feda5a23d28b3c13ebd64d1760726888c759fb19da82ad960c6f84a433b753873 SHA512 7e162467b95dad2b6aaa11686d08a00f1cc4eb08247fca8f0e5a8bcaa5f9f7b42cdf00db69c5c6111bdf9eb8063d53cef3bb207ce5d6a287615ca10b710153f9
 EBUILD mit-krb5-1.15.2-r1.ebuild 3912 BLAKE2B f8535a0393e382dc8bdeb1ecc6b02ec03eebf9dd414ff0631cf94d5a2051d57e2b1c77512cfd97ea8dba04e4c81fbe1842a0299c358c0c4a3473be0f9b5b5478 SHA512 6ebb8098d502afa28695cd934497db9c177ac8eb16941cccb88ec5622bc8eec1cfed3689c1d2204581ea3568d25522400772044538e6b5dba9686d857e4b4bcb
 EBUILD mit-krb5-1.15.2.ebuild 3855 BLAKE2B fa45466eeb8cc35048b654d10a997fb85d35a004e51de910a6ce2b0c239c88b9048837ce81abf8a00b867d6278cb7f6f082fc9c63ffe9e74522668e79c664c64 SHA512 e80bd080eea92ccdc0c475bdc02fc5eed67af1168c98095782233a55524404e0e210c598bf19f999777a334682b717b76e767c11954d7710c405434d5154a927
+EBUILD mit-krb5-1.16.ebuild 4196 BLAKE2B 2280554276b85039a858ec39658360a7db0c8662560eb594c7a3d48924ea7094d2b30d214af94a267f418f0ecdb9a7ccda01f31f5bd6aaa3d7260cdfae0a98f2 SHA512 1491def82cd8885cdcb2dbe723082076147cd64c01d4c8e183c9355a0e25c6b3cbfd58657f5a332c641904cd177de169096f534637ec8f18950f99db820f321c
 MISC metadata.xml 828 BLAKE2B f317440eac9d164e0640cb059dee0c3bdcfeaeb2d0e346d962f09b7152224efc10084611768663b84c67fdf73c9d89481370fe0b70ffe14aa10a360f60bd00f6 SHA512 c0f45699280d49b91eab24de6cbb28900170c3c4526b8c6ef0f6a996d3e53abd49911ce4f6ce7b28c69d37e86cc9e5b830977b9640809734e7fccf078886685c
diff --git a/app-crypt/mit-krb5/files/mit-krb5kadmind.service b/app-crypt/mit-krb5/files/mit-krb5kadmind.service
new file mode 100644
index 000000000000..f3836c89862d
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5kadmind.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Kerberos 5 administration server
+
+[Service]
+ExecStart=/usr/sbin/kadmind -nofork
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-crypt/mit-krb5/files/mit-krb5kdc.service b/app-crypt/mit-krb5/files/mit-krb5kdc.service
new file mode 100644
index 000000000000..6ec93bb7232b
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5kdc.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Kerberos 5 KDC
+
+[Service]
+ExecStart=/usr/sbin/krb5kdc -n
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-crypt/mit-krb5/files/mit-krb5kpropd.service b/app-crypt/mit-krb5/files/mit-krb5kpropd.service
new file mode 100644
index 000000000000..a7c5b579d2b9
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5kpropd.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Kerberos 5 propagation server
+
+[Service]
+ExecStart=/usr/sbin/kpropd -S
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-crypt/mit-krb5/files/mit-krb5kpropd.socket b/app-crypt/mit-krb5/files/mit-krb5kpropd.socket
new file mode 100644
index 000000000000..4389290c0b16
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5kpropd.socket
@@ -0,0 +1,9 @@
+[Unit]
+Description=Kerberos 5 propagation server
+
+[Socket]
+ListenStream=754
+Accept=yes
+
+[Install]
+WantedBy=sockets.target
diff --git a/app-crypt/mit-krb5/files/mit-krb5kpropd_at.service b/app-crypt/mit-krb5/files/mit-krb5kpropd_at.service
new file mode 100644
index 000000000000..f826eb33cb33
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5kpropd_at.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Kerberos 5 propagation server
+Conflicts=mit-krb5kpropd.service
+
+[Service]
+ExecStart=/usr/sbin/kpropd
+StandardInput=socket
+StandardError=syslog
diff --git a/app-crypt/mit-krb5/mit-krb5-1.16.ebuild b/app-crypt/mit-krb5/mit-krb5-1.16.ebuild
new file mode 100644
index 000000000000..acd4a3ed3b71
--- /dev/null
+++ b/app-crypt/mit-krb5/mit-krb5-1.16.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit autotools flag-o-matic multilib-minimal python-any-r1 systemd versionator
+
+MY_P="${P/mit-}"
+P_DIR=$(get_version_component_range 1-2)
+DESCRIPTION="MIT Kerberos V"
+HOMEPAGE="https://web.mit.edu/kerberos/www/"
+SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
+
+LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="doc +keyutils libressl nls openldap +pkinit selinux +threads test xinetd"
+
+# Test suite require network access
+RESTRICT="test"
+
+CDEPEND="
+	!!app-crypt/heimdal
+	>=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
+	|| (
+		>=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
+		>=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
+		>=dev-libs/libverto-0.2.5[tevent,${MULTILIB_USEDEP}]
+	)
+	keyutils? ( >=sys-apps/keyutils-1.5.8[${MULTILIB_USEDEP}] )
+	openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
+	pkinit? (
+		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+	)
+	xinetd? ( sys-apps/xinetd )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r1
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+DEPEND="${CDEPEND}
+	${PYTHON_DEPS}
+	virtual/yacc
+	doc? ( virtual/latex-base )
+	test? (
+		${PYTHON_DEPS}
+		dev-lang/tcl:0
+		dev-util/dejagnu
+	)"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-kerberos )"
+
+S=${WORKDIR}/${MY_P}/src
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/krb5-config
+)
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-1.12_warn_cflags.patch"
+	eapply -p2 "${FILESDIR}/${PN}-config_LDFLAGS.patch"
+
+	# Make sure we always use the system copies.
+	rm -rf util/{et,ss,verto}
+	sed -i 's:^[[:space:]]*util/verto$::' configure.in || die
+
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	# QA
+	append-flags -fno-strict-aliasing
+	append-flags -fno-strict-overflow
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	use keyutils || export ac_cv_header_keyutils_h=no
+	ECONF_SOURCE=${S} \
+	WARN_CFLAGS="set" \
+	econf \
+		$(use_with openldap ldap) \
+		"$(multilib_native_use_with test tcl "${EPREFIX}/usr")" \
+		$(use_enable nls) \
+		$(use_enable pkinit) \
+		$(use_enable threads thread-support) \
+		--without-hesiod \
+		--enable-shared \
+		--with-system-et \
+		--with-system-ss \
+		--enable-dns-for-realm \
+		--enable-kdc-lookaside-cache \
+		--with-system-verto \
+		--disable-rpath
+}
+
+multilib_src_compile() {
+	emake -j1
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && emake -j1 check
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
+		install
+}
+
+multilib_src_install_all() {
+	# default database dir
+	keepdir /var/lib/krb5kdc
+
+	cd ..
+	dodoc README
+
+	if use doc; then
+		dodoc -r doc/html
+		docinto pdf
+		dodoc doc/pdf/*.pdf
+	fi
+
+	newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r2 mit-krb5kadmind
+	newinitd "${FILESDIR}"/mit-krb5kdc.initd-r2 mit-krb5kdc
+	newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r2 mit-krb5kpropd
+	newconfd "${FILESDIR}"/mit-krb5kadmind.confd mit-krb5kadmind
+	newconfd "${FILESDIR}"/mit-krb5kdc.confd mit-krb5kdc
+	newconfd "${FILESDIR}"/mit-krb5kpropd.confd mit-krb5kpropd
+
+	systemd_newunit "${FILESDIR}"/mit-krb5kadmind.service mit-krb5kadmind.service
+	systemd_newunit "${FILESDIR}"/mit-krb5kdc.service mit-krb5kdc.service
+	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.service mit-krb5kpropd.service
+	systemd_newunit "${FILESDIR}"/mit-krb5kpropd_at.service "mit-krb5kpropd@.service"
+	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.socket mit-krb5kpropd.socket
+
+	insinto /etc
+	newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
+	insinto /var/lib/krb5kdc
+	newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
+
+	if use openldap ; then
+		insinto /etc/openldap/schema
+		doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/kpropd.xinetd" kpropd
+	fi
+}
diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index d08081e675c3..e08eabad173b 100644
--- a/app-dicts/Manifest.gz
+++ b/app-dicts/Manifest.gz
diff --git a/app-dicts/gnome-dictionary/Manifest b/app-dicts/gnome-dictionary/Manifest
index 419f57e12b0b..8439ad190093 100644
--- a/app-dicts/gnome-dictionary/Manifest
+++ b/app-dicts/gnome-dictionary/Manifest
@@ -1,7 +1,3 @@
-DIST gnome-dictionary-3.20.0.tar.xz 871916 BLAKE2B 8f2c2ad2f93c8d6f97b3609427923352c975c5a35899b645683cbda13f5eb4b1b7630f05ff95a0a42ecaef8227c21ab3cab8c637b6d1172d46d60f5c637e9170 SHA512 9be2564b5bf543e80afdb946c16b16e2daf6c31875e352b7c2d7e34436791fc9470eadb42eba3a4c1893e2f2568e6bb88d19ea4a0b8dbb2eca2dd4c95aeaf229
-DIST gnome-dictionary-3.24.0.tar.xz 878756 BLAKE2B c6e7d16965147eea44b2fe438f94c31488cd3b6edeb9e815d5a9314ca46de793596844cc8fae5daa77110011549ed598924591a6ef4c675e6c7d743ed660d3e6 SHA512 1c31149b02978a1840563941767e3ce2be4f6a5e790eb9126c0f0c50d932987f46447fe3bac0e2eb8ce87be1521d13e56d8a14e86407e367a6dd76cd5a77de30
 DIST gnome-dictionary-3.24.1.tar.xz 880500 BLAKE2B f730276612d2578e7b25121b49be9639cf7a9fc67bda9687285f6d3873d3b825301246447d968b24ed29240a1b0e7fc48d63c8454e704b799eebdf340f5f6da2 SHA512 b3ee838888a97e914add58dd4b61fa096b9488aab360815f2e7b674e7a57b237849a1ccaf107c1e94968e534b24ee24d827c42a3a1b0dfd8c5ef25eeb90456d3
-EBUILD gnome-dictionary-3.20.0.ebuild 1030 BLAKE2B f4fee35b925276939363fb807b65f38336c43a7311fe2ff943c4c3249190ba32957bef6959ce32e2c529d10ac83904e081af32faef5867e6f98083e3f05d86e9 SHA512 a8ea676441356eb5ffd912efaafcff2f4d50fcf8b2dee05b529ff86d9f3fb3db73e4aefb2d5f6fa875c10c840bb6318d8484140cb6f3100d450b8cf4509386e9
-EBUILD gnome-dictionary-3.24.0.ebuild 1034 BLAKE2B 6f704cfd5338f3291e1fc6d4e43b32eb7fc1679fd3474d952d6d9d13781d1f22f7b0704907eb7a61503049631d11bccf90163d799c23ac4c67c24f5c43a7ac0a SHA512 290457aea7645de74718303621508627c8efd80892216c63bce1579633fb1a0be0616c185fbf86124ba7dc38c39c44ae0b6e8ebf230f160735517228017a16b4
-EBUILD gnome-dictionary-3.24.1.ebuild 1033 BLAKE2B 0e1610560faa36ed8b31c232e09133e4533eeffef8ca78188b61626a2ab4c7a3dcb4bcf58a7a6b95111c9371a16448ad9135fe9ed0168ea332c357f712fe4b5c SHA512 67acdd2a67cdba1512829e51942f56322168600bf457c9d3d89c4ddadbaf772bc015d7f2204a811597b45e493c50e5312459eeba17710547bb08d4ac776c4514
+EBUILD gnome-dictionary-3.24.1.ebuild 1032 BLAKE2B 226863b951121fe5190d892b087237493ce32c83869bb7402026afba37de83c09fa3e0d6b016374194f0a412be7a7dda402af4520ac485d1c6ebcacb3a0fed35 SHA512 0650e59d1c2cdaf26f2c2617b886e80a9118fbb2337c3a1acef5445e0f64327ed87939739821fdbf21fde6c2f594a868a88e12e71a7a7e4bc49a8a7a1068f39d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-dicts/gnome-dictionary/gnome-dictionary-3.20.0.ebuild b/app-dicts/gnome-dictionary/gnome-dictionary-3.20.0.ebuild
deleted file mode 100644
index 4842fb16fbb3..000000000000
--- a/app-dicts/gnome-dictionary/gnome-dictionary-3.20.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Dictionary utility for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Dictionary"
-
-LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
-SLOT="0/10" # subslot = suffix of libgdict-1.0.so
-IUSE="debug +introspection ipv6"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.39:2[dbus]
-	x11-libs/cairo:=
-	>=x11-libs/gtk+-3.20:3
-	x11-libs/pango
-	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gsettings-desktop-schemas
-	!<gnome-extra/gnome-utils-3.4
-"
-# ${PN} was part of gnome-utils before 3.4
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-doc-am-1.15
-	>=dev-util/intltool-0.40
-	dev-util/itstool
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable introspection) \
-		$(use_enable ipv6)
-}
diff --git a/app-dicts/gnome-dictionary/gnome-dictionary-3.24.0.ebuild b/app-dicts/gnome-dictionary/gnome-dictionary-3.24.0.ebuild
deleted file mode 100644
index 72899df9509a..000000000000
--- a/app-dicts/gnome-dictionary/gnome-dictionary-3.24.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Dictionary utility for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Dictionary"
-
-LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
-SLOT="0/10" # subslot = suffix of libgdict-1.0.so
-IUSE="debug +introspection ipv6"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.42:2[dbus]
-	x11-libs/cairo:=
-	>=x11-libs/gtk+-3.21.1:3
-	x11-libs/pango
-	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gsettings-desktop-schemas
-	!<gnome-extra/gnome-utils-3.4
-"
-# ${PN} was part of gnome-utils before 3.4
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-doc-am-1.15
-	>=dev-util/intltool-0.40
-	dev-util/itstool
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable introspection) \
-		$(use_enable ipv6)
-}
diff --git a/app-dicts/gnome-dictionary/gnome-dictionary-3.24.1.ebuild b/app-dicts/gnome-dictionary/gnome-dictionary-3.24.1.ebuild
index fa621b0bcda8..21f7fccae549 100644
--- a/app-dicts/gnome-dictionary/gnome-dictionary-3.24.1.ebuild
+++ b/app-dicts/gnome-dictionary/gnome-dictionary-3.24.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Dictionary"
 LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
 SLOT="0/10" # subslot = suffix of libgdict-1.0.so
 IUSE="debug +introspection ipv6"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.42:2[dbus]
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index bafab2577eb5..6be743d57edb 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
diff --git a/app-doc/podbrowser/Manifest b/app-doc/podbrowser/Manifest
deleted file mode 100644
index 4d7762a23b71..000000000000
--- a/app-doc/podbrowser/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX Makefile.new 982 BLAKE2B ee29611faf928960b04b8119b31c3775e409853a25613915779923e585eb09f69d5f29f8cbeb172a3941acb664a38bbebe21fa0e18047b2a1e6c959cf05f99ba SHA512 2d63df991fb0e23e36b08703b50f13e165ed059b22688197cb6816a7199915c7b3e46ce0b3aaf22e4c6e169a46a77b3ecf9cb8f516f42a65fc84ac16514f528d
-AUX missing_icon.patch 1975 BLAKE2B 9f434ede8f020825e9b2705ad37d89e3ae7fb07ec75f68b6144a856ce9215e2386f3f7d43fde7e1f064da55345ed748f1de5dc823be6be6af29eb5c2d1b13d0c SHA512 1266f6cbed7d8bc2dcee9c39fb1259a6a78d676117b695cdd28be6f3c54ca520e33d4e42cf302cfe3c3b2c22ccde8a50f1d15275ffa9dde30e3448982c6c6ebd
-DIST podbrowser-0.12.tar.gz 81394 BLAKE2B 14729238bbdd95dbe1c27c3de5067132b9b6c1b1df80bbc8be334afb4c02324629824d63e3870adbe26a8e2dd78c8cd68c3a04be8b9d12570e67060b32d7bf34 SHA512 ff6a734f2df8bb0913c9030fd103490e59178bc672ac1c152eb9a0c2aece82c293615cbfcc7cf99dcfe2c448bdc35d2c6fdcb9b106e958d3ffb62b2eb9372c77
-EBUILD podbrowser-0.12-r3.ebuild 1011 BLAKE2B 6ace95dfa6c80563dfb220942d5709e859fc4f8a3a567653355e32585c9dbc949fcac6cda97c5a51c13d452bc6a2b8c3293014540032ed09ee745bf07b48dfe0 SHA512 0c5a13f51e7d5fde069cc88d9dd2567fa7b4952664050773fb5e9712807f745ea06ca3d674c1b3ca9f6a2e2caf2bb87d37946a3115a7b3ea2f341e936d7b06d1
-MISC metadata.xml 247 BLAKE2B d94a568c950df425b54d5f8ce29c206c221f01e64654597f2d4a0f7bc86ea508797045e3fb6eb14bb8a2aadec08995d877434d85dc9e622fc6207d2df28b23c2 SHA512 9bd9ddeb07e0644027c9a1dca33f0704de6062bc6b17333adde82a177991f35265f90e1b623e3a6288fedd729597921f48e4fda17fb8d402b1b2f3fc73c6d693
diff --git a/app-doc/podbrowser/files/Makefile.new b/app-doc/podbrowser/files/Makefile.new
deleted file mode 100644
index 877b2c9a9233..000000000000
--- a/app-doc/podbrowser/files/Makefile.new
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: Makefile,v 1.4 2005/10/05 10:07:40 jodrell Exp $
-NAME=podbrowser
-PREFIX=/usr/local
-BINDIR=$(PREFIX)/bin
-DATADIR=$(PREFIX)/share
-ICONDIR=$(DATADIR)/icons/hicolor/48x48/apps
-MANDIR=$(DATADIR)/man/man1
-DESTDIR=
-
-all: podbrowser
-
-podbrowser:
-	@mkdir -p build
-
-	perl -ne 's!\@PREFIX\@!$(PREFIX)!g ; s!\@LIBDIR\@!$(LIBDIR)!g ; print' < $(NAME).pl > build/$(NAME)
-	pod2man $(NAME).pl | gzip -c > build/$(NAME).1.gz
-
-install:
-	mkdir -p	$(DESTDIR)/$(BINDIR) \
-			$(DESTDIR)/$(DATADIR)/$(NAME) \
-			$(DESTDIR)/$(DATADIR)/applications \
-			$(DESTDIR)/$(ICONDIR) \
-			$(DESTDIR)/$(MANDIR)
-	install -m 0644 $(NAME).glade		$(DESTDIR)/$(DATADIR)/$(NAME)/
-	install -m 0644 $(NAME).png		$(DESTDIR)/$(ICONDIR)/
-	install -m 0644 $(NAME).desktop		$(DESTDIR)/$(DATADIR)/applications/
-	install -m 0644 build/$(NAME).1.gz	$(DESTDIR)/$(MANDIR)/
-	install -m 0755 build/$(NAME)		$(DESTDIR)/$(BINDIR)/$(NAME)
-	install -m 0755 html2ps-$(NAME)		$(DESTDIR)/$(BINDIR)/html2ps-$(NAME)
-
-clean:
-	rm -rf build
diff --git a/app-doc/podbrowser/files/missing_icon.patch b/app-doc/podbrowser/files/missing_icon.patch
deleted file mode 100644
index 55ec1223bf24..000000000000
--- a/app-doc/podbrowser/files/missing_icon.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-X-Description: Provide alternative icons if those expected not in current theme
-X-Author:      Jeffrey Ratcliffe <Jeffrey.Ratcliffe@gmail.com>
-X-Bugs-Gentoo: https://bugs.gentoo.org/319573
-
---- podbrowser-0.12/podbrowser.pl
-+++ podbrowser-0.12/podbrowser.pl
-@@ -60,9 +60,22 @@
- my $APP			= Gtk2::GladeXML->new($GLADE_FILE);
- my $THEME		= get_an_icon_theme();
- my $TIPS		= Gtk2::Tooltips->new;
--my $IDX_PBF		= Gtk2::Gdk::Pixbuf->new_from_file($THEME->lookup_icon('stock_bookmark', 16, 'force-svg')->get_filename)->scale_simple(16, 16, 'bilinear');
--my $PAGE_PBF		= Gtk2::Gdk::Pixbuf->new_from_file($THEME->lookup_icon('stock_new-text', 16, 'force-svg')->get_filename)->scale_simple(16, 16, 'bilinear');
--my $FOLDER_PBF		= Gtk2::Gdk::Pixbuf->new_from_file($THEME->lookup_icon('gnome-fs-directory', 16, 'force-svg')->get_filename)->scale_simple(16, 16, 'bilinear');
-+my ( $IDX_PBF, $PAGE_PBF, $FOLDER_PBF );
-+if ($THEME->lookup_icon('stock_bookmark', 16, 'force-svg')) {
-+  $IDX_PBF		= Gtk2::Gdk::Pixbuf->new_from_file($THEME->lookup_icon('stock_bookmark', 16, 'force-svg')->get_filename)->scale_simple(16, 16, 'bilinear');
-+} else {
-+  $IDX_PBF              = Gtk2::Image->new->render_icon( 'gtk-index', 'menu' );
-+}
-+if ($THEME->lookup_icon('stock_new-text', 16, 'force-svg')) {
-+  $PAGE_PBF		= Gtk2::Gdk::Pixbuf->new_from_file($THEME->lookup_icon('stock_new-text', 16, 'force-svg')->get_filename)->scale_simple(16, 16, 'bilinear');
-+} else {
-+  $PAGE_PBF            = Gtk2::Image->new->render_icon( 'gtk-new', 'menu' );
-+}
-+if ($THEME->lookup_icon('gnome-fs-directory', 16, 'force-svg')) {
-+  $FOLDER_PBF		= Gtk2::Gdk::Pixbuf->new_from_file($THEME->lookup_icon('gnome-fs-directory', 16, 'force-svg')->get_filename)->scale_simple(16, 16, 'bilinear');
-+} else {
-+  $FOLDER_PBF          = Gtk2::Image->new->render_icon( 'gtk-directory', 'menu' );
-+}
- my $NORMAL_CURSOR	= Gtk2::Gdk::Cursor->new('left_ptr');
- my $BUSY_CURSOR		= Gtk2::Gdk::Cursor->new('watch');
- my $ITEMS		= {};
diff --git a/app-doc/podbrowser/metadata.xml b/app-doc/podbrowser/metadata.xml
deleted file mode 100644
index 7faa8dfe9af4..000000000000
--- a/app-doc/podbrowser/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>perl@gentoo.org</email>
-	<name>Gentoo Perl Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-doc/podbrowser/podbrowser-0.12-r3.ebuild b/app-doc/podbrowser/podbrowser-0.12-r3.ebuild
deleted file mode 100644
index 1c3aa499abcb..000000000000
--- a/app-doc/podbrowser/podbrowser-0.12-r3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="PodBrowser is a documentation browser for Perl"
-HOMEPAGE="http://jodrell.net/projects/podbrowser"
-SRC_URI="http://jodrell.net/files/podbrowser/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-SRC_TEST="do"
-
-RDEPEND="dev-perl/gtk2-gladexml
-	dev-perl/Gtk2
-	dev-perl/HTML-Parser
-	dev-perl/Locale-gettext
-	virtual/perl-Pod-Simple
-	dev-perl/URI
-	dev-perl/Gtk2-Ex-PodViewer
-	dev-perl/Gtk2-Ex-PrintDialog
-	dev-perl/Gtk2-Ex-Simple-List
-	|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
-	>=x11-libs/gtk+-2.6.0:2
-	>=x11-themes/gnome-icon-theme-2.10.0
-	>=gnome-base/libglade-2:2.0"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-src_prepare() {
-	epatch "${FILESDIR}"/missing_icon.patch
-	cp "${FILESDIR}"/Makefile.new "${S}"/Makefile || die
-}
-
-src_compile() {
-	emake DESTDIR="${D}" PREFIX=/usr
-}
-
-src_install() {
-	emake PREFIX=/usr DESTDIR="${D}" install
-}
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 1fc6d1337ffb..e774ad50ec64 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 1991ab700294..a3baec563849 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -5,12 +5,9 @@ DIST emacs-23.4-patches-21.tar.xz 19604 BLAKE2B 97327f2079c496c28122203d233a1219
 DIST emacs-23.4.tar.bz2 38646508 BLAKE2B 33dac5d27a63b7aab6b4053964a0ecf7f7939c7aea5af15103f2da7bd34fbb18dba7a1bf44cc4fcc2e3fb1439cdf7085d8dfc4b0005f5485748996e75ca6872d SHA512 def7a95ecaefae24d8102b96b1d575a23def1b11a8f0bb17b68f7913bd118e2ea4449a8feee76c1bd649f099b70419f0d494ddd9bb32b26f92720cda842b0296
 DIST emacs-24.5-patches-4.tar.xz 13632 BLAKE2B 99e70f4ee32c1ba3a66b934de692437aaf0b83eb6fa841ce4569bc58e2bd12802890c2a8496375280c0ce8fa56515918dfdcbc958f349bc2472104e37ad1fcd1 SHA512 569c3a55aaf1102c0bae4ab25ee06372763cd2de8a54e26b3eefd54e585cf90b53c8ffe1ca48eb4fd312a340380fd3f2fcdb584697814bf429129b48fa56ffb5
 DIST emacs-24.5.tar.xz 39759804 BLAKE2B aec253528038686822d1f8ed9a52dff276789ef7744053fc9b6176fceba4d4d8684fe979cf97e756b3feaf734d2377baef81f5efaa5450930a4e94d9f3bca355 SHA512 89dee4c3aadb6e505c523f84c65b5e40e5bf28a586cc8a4518a59581c22972f942bb6f3c772df0d5b2685c3e78247c545c6bb2576e981d1ef0f9298c18ad1677
-DIST emacs-25.2-patches-1.tar.xz 2104 BLAKE2B deae1dcaf5c32dcdab365ffab53976158148a125deff2a0373c7da5696c48c36f87f8388fc8f64ab08b3bfcbf694011b58235e972d4bc0e101ca6bbcec779abf SHA512 45c666ba6332c8fb60a925c6af9c0da113f46055159d931feddb99ce19b2a03e0101b3a4d671fe699cd5f33fd58a25791bfb8b16e20f463e5d304902ee24854a
-DIST emacs-25.2.tar.xz 46900336 BLAKE2B 4bcb1dbf1647e1abd1006f586f5e465fa9ced78a87a3bc6edd7de7adb3b4145830b9cd7d889811882603a6f4be74e38626a80ab7d097d3331f42e811f3a93710 SHA512 2485d5ccd58ecc953cbd2458bdfa45e3c9a6ddfdb1b93c72b957a0da2460d4e42092905e039e8f5bac337ea1ecb9ac404b28702a363323ee5813b30032ebf00c
 DIST emacs-25.3.tar.xz 42854740 BLAKE2B 4f4e2572bbef48b75c561497fc22046081e56099b6174725d79b15a5b16d5c886eaf8ff3f75cf561e989ebb092ab9e98ba7503e720a9db7560758b30d5116f23 SHA512 1cce656451b6ca8502ebb229e88bd3ef48b7f9444a10eeac4ea43bd5491b2efacd641dfa35227a33362c3866493d3449cf1df81606563eef44bba0ed668e457f
 EBUILD emacs-18.59-r11.ebuild 4230 BLAKE2B fc6f41ecbacf7318de3db12189406d00a2a652c8c10f638a667ba83214f6d7ebf8b78e79c1bb1d04b5ea861001e57ef1d6dd29411f9f660528170c119c55e461 SHA512 686d67d281bc9e39087e2d804e9f9db578293ebb52f9730ac971fa3b938e1310923e78b488e4a97d0e6432d10ee7bcf4338ee7190763a1e03792c4105923beaf
 EBUILD emacs-23.4-r16.ebuild 11264 BLAKE2B 5d6c8a786435acc3f0311951741b895ed426305444efe9f0c83166576f984c51266e42d8502f03338bdcfeeb9b3c3aa34068485beb6e10a8138eaf1315e734cc SHA512 fdff9e3bf6839e7caf6ecbd841ed6d332173aeb46550a652dea8975fe92d8b3174045170a9b8e8ce898e3853e8620b7c3d90c93ad76d2cd35014b3a0257f2f1a
 EBUILD emacs-24.5-r4.ebuild 11095 BLAKE2B bf769253d5791e01441f4f55fb3a00c0187b22c05ff8c7a8a9fae5a23fe9861fe44b0ffc23d4be6c623ed837451781a70f1e6af326c03858ddc0bffc09534b20 SHA512 ce02df6231626e4edceb9e2e693f2006446b62f09c553d1ed0c028f1cfa255a0d9abec16de717ac4c18f78511f087ebceab2bbcc11c6b452d7d0bcd43c87586a
-EBUILD emacs-25.2-r1.ebuild 11534 BLAKE2B defa0b46ed5ede9eca8a4edb7e3dd06fab21fdd53c854faca88c105c58fa5bf65145ebaef656f59da6ec128d33cf5799adcef33a94421e683f9b8c710a9ab932 SHA512 e29e7e2c3f8987843203799620099f3da70f89d7e44ad606f2b7f4ff7077333c7e783c3b327d735165b6d9e38e8f22a8eb635b8f412c53a7c9946e81467bf2e2
-EBUILD emacs-25.3.ebuild 11454 BLAKE2B e2d7e31c2131cdf0ad2188b3f30bad9be18333650edebd5b0436a15411e5df372f1c09d7a0d401454a1d40bc0f1f2868ab570d8df775281aa23490e83d71fd19 SHA512 823acc7c1b5990566a4c6f41d4aa508c624bac290bfc30929e1a6899c405749e5abb4152da570b873c057d3cbfd3ce409113a117d8c520647c8e5036a16acb03
-MISC metadata.xml 2759 BLAKE2B 6054420573e7ff20ec4e946e666de88e5e925edf36a2b86ff4f6f1f179c3a4d82e62b5e824b154b8f68d98cefad3831bec4f3a1b4e92c34b2c8ffc76254a3b1f SHA512 748620c7f63f55d74bd758fbe21d3762d23e97b362aa356ea30e42efb5f297b1e1abf6b43f6ff1239db0d1732f0d514d49f354a3792d839437f7b29f5ea23b42
+EBUILD emacs-25.3.ebuild 11361 BLAKE2B 44eca337c724e3a5de4925d451d225ee01b7bf69c6779997d758210d1974b642e3e6bfe294b093ccce2575be6132d8cdf2c9e99983671f7ca215d6eb5c4e228e SHA512 f8c2b572a91c6a287f7a94468bf568cf91b4d86650e53850b505261b4be40767b01679ae9711ece1642a696ce1228a4b3b3ebb80bf928895c044e3dd8e33ecfb
+MISC metadata.xml 2764 BLAKE2B 07a117a3c5b6b04f34c4e390de8af8dcda3d4068d5139607790282740bd71dc11f06138be0cfb2871b167f9dee4320b8bff6894c10ac40d5df8fc2a3cb2a4dcf SHA512 7e115d381271b2e3a6e8de9a0590f3f5c41318ae814c71b6c85be6a24f234179d691d7eb9e9f19c148716d1090d18abe2e874b8772d3987791f9612b0f2eeb59
diff --git a/app-editors/emacs/emacs-25.2-r1.ebuild b/app-editors/emacs/emacs-25.2-r1.ebuild
deleted file mode 100644
index b2ad0adcb12d..000000000000
--- a/app-editors/emacs/emacs-25.2-r1.ebuild
+++ /dev/null
@@ -1,358 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit elisp-common flag-o-matic multilib readme.gentoo-r1
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/"
-SRC_URI="mirror://gnu/emacs/${P}.tar.xz
-	https://dev.gentoo.org/~ulm/emacs/${P}-patches-1.tar.xz"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="25"
-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"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
-REQUIRED_USE="?? ( aqua X )"
-
-RDEPEND="sys-libs/ncurses:0=
-	>=app-eselect/eselect-emacs-1.16
-	>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
-	net-libs/liblockfile
-	acl? ( virtual/acl )
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	gpm? ( sys-libs/gpm )
-	hesiod? ( net-dns/hesiod )
-	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
-	kerberos? ( virtual/krb5 )
-	libxml2? ( >=dev-libs/libxml2-2.2.0 )
-	selinux? ( sys-libs/libselinux )
-	ssl? ( net-libs/gnutls:0= )
-	zlib? ( sys-libs/zlib )
-	X? (
-		x11-libs/libXmu
-		x11-libs/libXt
-		x11-misc/xbitmaps
-		gconf? ( >=gnome-base/gconf-2.26.2 )
-		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib:0= )
-		jpeg? ( virtual/jpeg:0= )
-		png? ( >=media-libs/libpng-1.4:0= )
-		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff:0 )
-		xpm? ( x11-libs/libXpm )
-		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
-		xft? (
-			media-libs/fontconfig
-			media-libs/freetype
-			x11-libs/libXft
-			cairo? ( >=x11-libs/cairo-1.12.18 )
-			m17n-lib? (
-				>=dev-libs/libotf-0.9.4
-				>=dev-libs/m17n-lib-1.5.1
-			)
-		)
-		gtk? (
-			xwidgets? (
-				x11-libs/gtk+:3
-				net-libs/webkit-gtk:3=
-			)
-			!xwidgets? (
-				gtk3? ( x11-libs/gtk+:3 )
-				!gtk3? ( x11-libs/gtk+:2 )
-			)
-		)
-		!gtk? (
-			motif? ( >=x11-libs/motif-2.3:0 )
-			!motif? (
-				Xaw3d? ( x11-libs/libXaw3d )
-				!Xaw3d? ( athena? ( x11-libs/libXaw ) )
-			)
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )
-	pax_kernel? ( sys-apps/attr )"
-
-RDEPEND="${RDEPEND}
-	!<app-editors/emacs-vcs-${PV}"
-
-EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
-# FULL_VERSION keeps the full version number, which is needed in
-# order to determine some path information correctly for copy/move
-# operations later on
-FULL_VERSION="${PV%%_*}"
-S="${WORKDIR}/emacs-${FULL_VERSION}"
-
-src_prepare() {
-	eapply ../patch
-	eapply_user
-
-	# Fix filename reference in redirected man page
-	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
-		|| die "unable to sed ctags.1"
-
-	#AT_M4DIR=m4 eautoreconf
-	#touch src/stamp-h.in || die
-}
-
-src_configure() {
-	strip-flags
-	filter-flags -pie					#526948
-
-	if use sh; then
-		replace-flags "-O[1-9]" -O0		#262359
-	elif use ia64; then
-		replace-flags "-O[2-9]" -O1		#325373
-	else
-		replace-flags "-O[3-9]" -O2
-	fi
-
-	local myconf
-
-	if use alsa; then
-		use sound || ewarn \
-			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
-		myconf+=" --with-sound=alsa"
-	else
-		myconf+=" --with-sound=$(usex sound oss)"
-	fi
-
-	if use X; then
-		myconf+=" --with-x --without-ns"
-		myconf+=" $(use_with gconf)"
-		myconf+=" $(use_with gsettings)"
-		myconf+=" $(use_with toolkit-scroll-bars)"
-		myconf+=" $(use_with gif)"
-		myconf+=" $(use_with jpeg)"
-		myconf+=" $(use_with png)"
-		myconf+=" $(use_with svg rsvg)"
-		myconf+=" $(use_with tiff)"
-		myconf+=" $(use_with xpm)"
-		myconf+=" $(use_with imagemagick)"
-
-		if use xft; then
-			myconf+=" --with-xft"
-			myconf+=" $(use_with cairo)"
-			myconf+=" $(use_with m17n-lib libotf)"
-			myconf+=" $(use_with m17n-lib m17n-flt)"
-		else
-			myconf+=" --without-xft"
-			myconf+=" --without-cairo"
-			myconf+=" --without-libotf --without-m17n-flt"
-			use cairo && ewarn \
-				"USE flag \"cairo\" has no effect if \"xft\" is not set."
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-		fi
-
-		local f line
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			while read line; do ewarn "${line}"; done <<-EOF
-				Your version of GTK+ will have problems with closing open
-				displays. This is no problem if you just use one display, but
-				if you use more than one and close one of them Emacs may crash.
-				See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>.
-				If you intend to use more than one display, then it is strongly
-				recommended that you compile Emacs with the Athena/Lucid or the
-				Motif toolkit instead.
-			EOF
-			if use xwidgets; then
-				myconf+=" --with-x-toolkit=gtk3 --with-xwidgets"
-			else
-				myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
-				myconf+=" --without-xwidgets"
-			fi
-			for f in motif Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"gtk\" is set."
-			done
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf+=" --with-x-toolkit=motif"
-			for f in Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"motif\" is set."
-			done
-		elif use athena || use Xaw3d; then
-			einfo "Configuring to build with Athena/Lucid toolkit"
-			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf+=" --with-x-toolkit=no"
-		fi
-		! use gtk && use xwidgets && ewarn \
-			"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
-	elif use aqua; then
-		einfo "Configuring to build with Nextstep (Cocoa) support"
-		myconf+=" --with-ns --disable-ns-self-contained"
-		myconf+=" --without-x"
-	else
-		myconf+=" --without-x --without-ns"
-	fi
-
-	# Save version information in the Emacs binary. It will be available
-	# in variable "system-configuration-options".
-	myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
-
-	econf \
-		--program-suffix="-${EMACS_SUFFIX}" \
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-		--localstatedir="${EPREFIX}"/var \
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-		--with-gameuser=":gamestat" \
-		--without-compress-install \
-		--with-file-notification=$(usev inotify || usev gfile || echo no) \
-		$(use_enable acl) \
-		$(use_with dbus) \
-		$(use_with dynamic-loading modules) \
-		$(use_with gpm) \
-		$(use_with hesiod) \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		$(use_with libxml2 xml2) \
-		$(use_with selinux) \
-		$(use_with ssl gnutls) \
-		$(use_with wide-int) \
-		$(use_with zlib) \
-		${myconf}
-}
-
-src_compile() {
-	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	emake
-}
-
-src_install () {
-	emake DESTDIR="${D}" NO_BIN_LINK=t install
-
-	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
-		|| die "moving emacs executable failed"
-	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
-		|| die "moving emacs man page failed"
-
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
-		|| die "moving info dir failed"
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
-	rm -rf "${ED}"/usr/share/{appdata,applications,icons}
-	rm -rf "${ED}"/var
-
-	# remove unused <version>/site-lisp dir
-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
-
-	# remove COPYING file (except for etc/COPYING used by describe-copying)
-	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
-
-	if use gzip-el; then
-		# compress .el files when a corresponding .elc exists
-		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
-			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
-		assert "gzip .el failed"
-	fi
-
-	local cdir
-	if use source; then
-		cdir="/usr/share/emacs/${FULL_VERSION}/src"
-		insinto "${cdir}"
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.{c,h,m}
-	elif has installsources ${FEATURES}; then
-		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
-	fi
-
-	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
-	X
-	;;; ${PN}-${SLOT} site-lisp configuration
-	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-	Y  (setq find-function-C-source-directory
-	Y	"${EPREFIX}${cdir}")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
-	X	(re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share/info
-	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
-	X	   (while (and (cdr q) (not (string-match re (cadr q))))
-	X	     (setq q (cdr q)))
-	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
-	EOF
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-
-	dodoc README BUGS CONTRIBUTE
-
-	if use aqua; then
-		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
-		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
-	fi
-
-	DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
-		through the Emacs eselect module, which also redirects man and info
-		pages. Therefore, several Emacs versions can be installed at the
-		same time. \"man emacs.eselect\" for details.
-		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
-		strongly recommended that you use app-admin/emacs-updater to rebuild
-		all byte-compiled elisp files of the installed Emacs packages."
-	use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-		machine would satisfy basic Emacs requirements under X11.
-		See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-		for how to enable anti-aliased fonts."
-	use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
-		\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
-		it into /Applications by yourself."
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# move Info dir file to correct name
-	local infodir=/usr/share/info/${EMACS_SUFFIX} f
-	if [[ -f ${ED}${infodir}/dir.orig ]]; then
-		mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
-	elif [[ -d "${ED}"${infodir} ]]; then
-		# this should not happen in EAPI 4
-		ewarn "Regenerating Info directory index in ${infodir} ..."
-		rm -f "${ED}"${infodir}/dir{,.*}
-		for f in "${ED}"${infodir}/*; do
-			if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
-				install-info --info-dir="${ED}"${infodir} "${f}" \
-					|| die "install-info failed"
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	readme.gentoo_print_elog
-
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
-		# refresh symlinks in case any installed files have changed
-		eselect emacs set ${EMACS_SUFFIX}
-	else
-		eselect emacs update ifunset
-	fi
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}
diff --git a/app-editors/emacs/emacs-25.3.ebuild b/app-editors/emacs/emacs-25.3.ebuild
index e5ff6db30523..6be101976949 100644
--- a/app-editors/emacs/emacs-25.3.ebuild
+++ b/app-editors/emacs/emacs-25.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="25"
 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"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
 REQUIRED_USE="?? ( aqua X )"
 
 RDEPEND="sys-libs/ncurses:0=
@@ -54,14 +54,8 @@ RDEPEND="sys-libs/ncurses:0=
 			)
 		)
 		gtk? (
-			xwidgets? (
-				x11-libs/gtk+:3
-				net-libs/webkit-gtk:3=
-			)
-			!xwidgets? (
-				gtk3? ( x11-libs/gtk+:3 )
-				!gtk3? ( x11-libs/gtk+:2 )
-			)
+			gtk3? ( x11-libs/gtk+:3 )
+			!gtk3? ( x11-libs/gtk+:2 )
 		)
 		!gtk? (
 			motif? ( >=x11-libs/motif-2.3:0 )
@@ -161,12 +155,12 @@ src_configure() {
 				recommended that you compile Emacs with the Athena/Lucid or the
 				Motif toolkit instead.
 			EOF
-			if use xwidgets; then
-				myconf+=" --with-x-toolkit=gtk3 --with-xwidgets"
-			else
+			#if use xwidgets; then
+			#	myconf+=" --with-x-toolkit=gtk3 --with-xwidgets"
+			#else
 				myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
 				myconf+=" --without-xwidgets"
-			fi
+			#fi
 			for f in motif Xaw3d athena; do
 				use ${f} && ewarn \
 					"USE flag \"${f}\" has no effect if \"gtk\" is set."
@@ -185,8 +179,8 @@ src_configure() {
 			einfo "Configuring to build with no toolkit"
 			myconf+=" --with-x-toolkit=no"
 		fi
-		! use gtk && use xwidgets && ewarn \
-			"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
+		#! use gtk && use xwidgets && ewarn \
+		#	"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
 	elif use aqua; then
 		einfo "Configuring to build with Nextstep (Cocoa) support"
 		myconf+=" --with-ns --disable-ns-self-contained"
diff --git a/app-editors/emacs/metadata.xml b/app-editors/emacs/metadata.xml
index 61b88217833d..64c34d30c315 100644
--- a/app-editors/emacs/metadata.xml
+++ b/app-editors/emacs/metadata.xml
@@ -47,7 +47,7 @@
   <flag name="wide-int">Prefer wide Emacs integers (typically 62-bit).
     This option has an effect only on architectures where "long" and
     "long long" types have different size.</flag>
-  <flag name='xwidgets'>Enable use of GTK widgets in Emacs buffers
-    (requires GTK3)</flag>
+  <!--flag name='xwidgets'>Enable use of GTK widgets in Emacs buffers
+    (requires GTK3)</flag-->
 </use>
 </pkgmetadata>
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index c3d50160fbf2..023eae40a12b 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index dbcd5f467bdd..060a4ff1490b 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -3,11 +3,8 @@ AUX lxd-2.14-fix-fr-po.patch 388 BLAKE2B 21fc34b14f026cfd654b57d87be18dac3641322
 AUX lxd-2.14.confd 589 BLAKE2B a4ee8e9643f7add254baf2f83900e15029577b69460818640220197af8ad56862c9c96b82d6a0c38bbe7023893a787b3eeda80e64359ed44863e9aa4c61cc07a SHA512 14892b2efa96f4938497a7ea0b7b2b7ab630b287c8444b666d24b4aa4fd7af265d2dcb91b4defdfa0b33da610cdc04dc3c8751f00df9209a7933bf30ea9f0790
 AUX lxd-2.14.initd 852 BLAKE2B 3e5c53ffe4e478bb6e170055f637dc4d95c20ab72ef0fbd3281d939fca476ae317adf519f43564563bee9234079948cf8b944a2964d881fff0a2dafd504b4782 SHA512 ee3a83960d52a956a638f741289ad32e98a1687248d1c3d26f035cfdda55bdcdbc4a7d91d8258dc8e93671a89ddd97c6d1f65de5237a03c6a3fb92bb02387b73
 AUX lxd-2.14.service 174 BLAKE2B 8686d57a79fbc3a9ec2e1a3197012599a5d6b81b62188e779cdb9a86f9f413fa485090c79dab8c4aa8891e0e35604b85fb1cdb1da313918b34a974b61699b24a SHA512 6f9d71d5c08c49653f28511bc793d1365604af6bf105789caea27f4685d721fbb283f888e3b7310997b73ff2fc5bb1a47e7500c4678cb3d39124cab723523140
-AUX lxd-2.18-dont-go-get.patch 428 BLAKE2B fef476db95d5e3a2730d718b72725e5af86581dc0c25dc8665fdbf6c2914c056224f4f45318eea873f9ecb95ee33b0195f19b1d203fbce3bf8e1b8e7ced13b30 SHA512 eff965ddc918da9bf2bb9293b08a1aad33f1f7a69027767a74f8872a8eb045ef2a002536329c3cbd6730f1710ebb6f5e7e5c284121157e824a1aabef3a0de8b8
-AUX lxd-2.18.confd 589 BLAKE2B a4ee8e9643f7add254baf2f83900e15029577b69460818640220197af8ad56862c9c96b82d6a0c38bbe7023893a787b3eeda80e64359ed44863e9aa4c61cc07a SHA512 14892b2efa96f4938497a7ea0b7b2b7ab630b287c8444b666d24b4aa4fd7af265d2dcb91b4defdfa0b33da610cdc04dc3c8751f00df9209a7933bf30ea9f0790
-AUX lxd-2.18.initd 853 BLAKE2B 0b48de1a596767db356850adcb5682c5c351e7477b0d49d81aebf857a01e4eb75067087d323ba4b5d6fbf8765a76cf161ad2cfaa0eba480fb86e91fdb95b0e79 SHA512 960aceb2845cc3b454b2f916c73273f4b1ec6f87e5d569c27c8c58e0db153c084e03addbdcc91dc8761fc6f0e306261d87db73f8610fda197e55f9ec6756fd56
-AUX lxd-2.18.service 174 BLAKE2B 8686d57a79fbc3a9ec2e1a3197012599a5d6b81b62188e779cdb9a86f9f413fa485090c79dab8c4aa8891e0e35604b85fb1cdb1da313918b34a974b61699b24a SHA512 6f9d71d5c08c49653f28511bc793d1365604af6bf105789caea27f4685d721fbb283f888e3b7310997b73ff2fc5bb1a47e7500c4678cb3d39124cab723523140
 AUX lxd-2.19-dont-go-get.patch 428 BLAKE2B fef476db95d5e3a2730d718b72725e5af86581dc0c25dc8665fdbf6c2914c056224f4f45318eea873f9ecb95ee33b0195f19b1d203fbce3bf8e1b8e7ced13b30 SHA512 eff965ddc918da9bf2bb9293b08a1aad33f1f7a69027767a74f8872a8eb045ef2a002536329c3cbd6730f1710ebb6f5e7e5c284121157e824a1aabef3a0de8b8
+AUX lxd-dont-go-get.patch 428 BLAKE2B fef476db95d5e3a2730d718b72725e5af86581dc0c25dc8665fdbf6c2914c056224f4f45318eea873f9ecb95ee33b0195f19b1d203fbce3bf8e1b8e7ced13b30 SHA512 eff965ddc918da9bf2bb9293b08a1aad33f1f7a69027767a74f8872a8eb045ef2a002536329c3cbd6730f1710ebb6f5e7e5c284121157e824a1aabef3a0de8b8
 AUX lxd.confd 589 BLAKE2B a4ee8e9643f7add254baf2f83900e15029577b69460818640220197af8ad56862c9c96b82d6a0c38bbe7023893a787b3eeda80e64359ed44863e9aa4c61cc07a SHA512 14892b2efa96f4938497a7ea0b7b2b7ab630b287c8444b666d24b4aa4fd7af265d2dcb91b4defdfa0b33da610cdc04dc3c8751f00df9209a7933bf30ea9f0790
 AUX lxd.initd 853 BLAKE2B 0b48de1a596767db356850adcb5682c5c351e7477b0d49d81aebf857a01e4eb75067087d323ba4b5d6fbf8765a76cf161ad2cfaa0eba480fb86e91fdb95b0e79 SHA512 960aceb2845cc3b454b2f916c73273f4b1ec6f87e5d569c27c8c58e0db153c084e03addbdcc91dc8761fc6f0e306261d87db73f8610fda197e55f9ec6756fd56
 AUX lxd.service 174 BLAKE2B 8686d57a79fbc3a9ec2e1a3197012599a5d6b81b62188e779cdb9a86f9f413fa485090c79dab8c4aa8891e0e35604b85fb1cdb1da313918b34a974b61699b24a SHA512 6f9d71d5c08c49653f28511bc793d1365604af6bf105789caea27f4685d721fbb283f888e3b7310997b73ff2fc5bb1a47e7500c4678cb3d39124cab723523140
@@ -15,67 +12,88 @@ DIST github.com-dustinkirkland-golang-petname-1f4996aa8aa05ee066aaf9e3179d340b48
 DIST github.com-dustinkirkland-golang-petname-d3c2ba80e75eeef10c5cf2fc76d2c809637376b3.tar.gz 15127 BLAKE2B 06338b4364d9554a1334c04bd9ea81df7539641ef5ce41d681670b7b65c06160ef67e4bd3ad2529dc7864537d5be6a91be53c5e96335f5dfcab198a8bcae9a9b SHA512 0f63f01857c30fdb179400b80e4391a12675ed17a981e9f55273fcd44e06df3bbecc127cf80bfd73afe1d4c30cf37638d0b581b2dde787abe2c8835dca8dbc2d
 DIST github.com-flosch-pongo2-5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9.tar.gz 59915 BLAKE2B 763403cec3bcb27acd6654e7d2d57d198862b0d16c242ec975b46a7cca95560505b3373e8c4b7a53e7fc025523845bee16b90311f8bd341c0d2bfc28987ae0d4 SHA512 c40fc45b7a781067cc80a616b5a843977ff29071f7b36400631a7445d6fd8530144e73ecc1f406b2315be0725a214c62bfafb44f904b76d83384d8df488380ee
 DIST github.com-go-check-check-20d25e2804050c1cd24a7eea1e7a6447dd0e74ec.tar.gz 30367 BLAKE2B c18a0f1aff1bde8e6fc533ea627377ca4de4830d84289355f68163855ec97ac47f537b3b2627568c31714ac3a7672ebf86d60452269c75c80c2cd7565d7c97a0 SHA512 94342de3aad4db1c4442062f4cf4e57c723a43bbcb0069a8bed3b719e3864eef7500a24c9c99c755114708d6822e9b23f296b6d0b2b46f32cc6ffc65944d1729
+DIST github.com-go-errgo-errgo-442357a80af5c6bf9b6d51ae791a39c3421004f3.tar.gz 7453 BLAKE2B 9f231836718860c023a487d0971e152656e0ff39dcd5efdfda8c62577dbf4ae82335bada308d44a4d0af5ec951e5608f40bb9e0a7567c1edce35664c98596744 SHA512 f54cdf5089b7e46f08f75f7f1b0bfb893b1cd0a36d08b925d5ba04d2fa6021e85fe0625235a9e712b09099e2f5cce46aa1700d12c12b0c54ab59c8d13030e820
+DIST github.com-go-httprequest-httprequest-fdaf1bffa25560ba0920e3e29aae85d3677ab32e.tar.gz 52964 BLAKE2B f0dddcd38b9f8ac75a3e45473e22cfab1db88bef19f90431b16d1a3699ab56ef7f0d038ce837c0305600d69bc5ba64dffd344143cd0bc4a10aa5093ca32b0771 SHA512 60688f2e320afaeaeb824226bd586b9e9d7ccde00d9585401ac328d83195a23dc3e4e26b1848bc9998023b732a559963920860f21056416161c31304388aad4d
+DIST github.com-go-macaroon-bakery-macaroon-bakery-ec9d2ad6796100720c154f614b6dea8798ec1181.tar.gz 124110 BLAKE2B c05d59504f7cd2d0cdb913b1d06898375fce112e71a1db0c1752628bc9939003a92ad608463cd0e1fa8d75945b9b5a76c0710ebb3ea126cfd67ea01b46229bff SHA512 2965b6441df2790e0378b962fb66672e2316902620223e4ca3a8ddf1ef38e2a76b9cda2a5013e664ef49073aed8f424e1713538626f6ce1929e81e3bacbef45f
+DIST github.com-go-macaroon-macaroon-bed2a428da6e56d950bed5b41fcbae3141e5b0d0.tar.gz 22383 BLAKE2B b2d89ccdf4ad0a8c29f44895697a9921d40b9316879f477f608fc5f59683f825a66357e5587d654a55ea80f0c79d6680f5dbb45590b2fea051fca4a7f23a9eb8 SHA512 7ec072cec42266cf8cdd44819c653b8d09b58622fdfa42fb12422c9727e6eb7326519fbeb247fa4840d8c87a5357ae0acd028a8d5757acedc3582810a5cc467b
+DIST github.com-go-mgo-mgo-3f83fa5005286a7fe593b055f0d7771a7dce4655.tar.gz 376880 BLAKE2B 800038e0870d8b943604bc5edf9ba566d20fed75f445834801955a19da6add891f96cbf5e19a93d520d90ccc4e9da911ab02cccb710fee67b3fe60e4409a717f SHA512 f0e7948d4672d29d3d0a741961ff8a75d30c556e157698118a32de10e2af8eb2ae6a61feea1c93aff313596d285a048a70dae7339c66760ebb91a1aecfb05845
+DIST github.com-go-retry-retry-01631078ef2fdce601e38cfe5f527fab24c9a6d2.tar.gz 9318 BLAKE2B d5eb408e4c4acf0c2304d951705a1f39f2b2663357f04402f5ee47bfc79182511e3a29568846bb902887aa5efb149ac6a4cf32ecae07a183f845ad8886fe0377 SHA512 71956a468472754313830a7f1afc844020e5ffc8bac4464e369562bde8c1cf5e11814fc110dcb00d243cbc6c13fe7a0423d29b73f0f420df8313666e645a7a24
 DIST github.com-go-stack-stack-817915b46b97fd7bb80e8ab6b69f01a53ac3eebf.tar.gz 6476 BLAKE2B 4d218f2e10d4e03476116012e5dc000b590786808b4679c170622d9d58ad79fa6794c3dcdded6cb878b346b3bacff16772f4778ea061c713595791345e7cbb29 SHA512 cbbdd7066249a571cc4d052e7907150f575e18c078078199b18f7557e3b12fc7c6969e6fe55773c951f3f954d296707d9e4c74ce26e3b6f408263774b0315a52
 DIST github.com-go-tomb-tomb-d5d1b5820637886def9eef33e03a27a9f166942c.tar.gz 5515 BLAKE2B 9ae2c00b43da5958392e0817f448d01374712ce7552c07be0de8204a7f16a7442b195695d51782a375da7aaa83019446438d52a8768317216a7812380be8c1b1 SHA512 03ac20f7608db7c4ce54cc1ad9dfa62d770c32e1806a131909cb5c1ca4a9708b482e58d0e1bda0dbaff56ed36558a96ce2d4453566813967a32eef5245012a8d
+DIST github.com-go-yaml-yaml-287cf08546ab5e7e37d55a84f7ed3fd1db036de5.tar.gz 64826 BLAKE2B 47e9182124037317bdfc31137a2715db979146688e637a586f5a7c4a12250d0fcffdbbaa8793e189421d189b1071f48d8588cfda9ac1f3e297bfc244f30bcae7 SHA512 429256bb847defb53dee5c960edc726455397045e7dc2e4833e0e9088f9ec11452e2198961080dc00b8eff9d165df5e0377f4039932df0e46cd960827b8f800d
 DIST github.com-go-yaml-yaml-cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b.tar.gz 60805 BLAKE2B 1345bfb7c006a423513ca6d51d3a34360212b48e92e9902f7f32054e80706c8f8a2dfffbd7a290dd4bca5a31ccec9a5ec50fc8b8314e53711a339e248c646a48 SHA512 268498022f34c4b59b5b75443ee10fd4273203f4b77bfa11b08a792c004cf13e3010c34b4c15cee2b4e7f3c910648d9897700f60ab00b327d78c49e97497fe2b
 DIST github.com-go-yaml-yaml-eb3733d160e74a9c7e442f435eb3bea458e1d19f.tar.gz 64789 BLAKE2B a59db73ba751c932695913770550e115d46df28c4cff402325cf5324c97069e3acccb9faf39826a5da416f8c5b0cc69377cef41a6b1451afa82c7ae8bd620544 SHA512 9e34c34c907d1177e072eb5f3b421b8a3af0e68b490508691d745cdcf1145d9bcfd2592d909a4b05e7f12bfb62355d49861f6d2e1bd29b69cf026ef631965289
 DIST github.com-golang-crypto-2509b142fb2b797aa7587dad548f113b2c0f20ce.tar.gz 1435354 BLAKE2B ed4ead7ed45530a5d819a91d74a52f047fe6408ffa4720afd895bbc3df6bbdd6c9466259e7c141e72c827dce882bdedb9dac868e196407ab16ec8302898f6759 SHA512 5936b8fc25728b041d086bde5002f4d9fe1d8a55995df27e8efeff795ff980da55b42fe254c638c95ff0c80b9b659753786d32836d2124bcab30f63f80767c9d
-DIST github.com-golang-crypto-7d9177d70076375b9a59c8fde23d52d9c4a7ecd5.tar.gz 1432665 BLAKE2B 079d62ef81bdaa0566bc996707c1aa45681f51c49d5cd6692c956989b18385f13df657fcbd33103c24030732a8925bf14175342a37c6cc13656c4f7d7d50c048 SHA512 d107abb176bf37a0a5a2487cb00b5d12e2247d41524a0651860c0a0b41b2b80926af024b78cc12aacafe254a1b8245980ab219a8357c8c2e17e9245f9027e570
+DIST github.com-golang-crypto-d585fd2cc9195196078f516b69daff6744ef5e84.tar.gz 1443268 BLAKE2B 19bb8d2861225a14ba3f19b2ae96c6640833fea7da52228480634e715b7690afc94e605a5be1b70b263bb3045a0fbcf9f78211c431836d077cca7d076fec1686 SHA512 e82f87394d2a8d96779cc69c8803555b5d23eb02f3d38101ccb9142a892280c32b8123d61a309a041cf5034282b5269ea38b5d29e03c85ca3c62c4fc0802502e
 DIST github.com-golang-crypto-e1a4589e7d3ea14a3352255d04b6f1a418845e5e.tar.gz 1336856 BLAKE2B 076239faa59c88b8eab873097dea87dd579a4bb65a6b3a9f19ddacc0a6c05dac2a17917547ef8fabb46fbc5b56262b81330fc1281fb42d72107bf6df69edfc2c SHA512 c22fc86fbc22d6ec8157f89c075f07db8b72bf63ff97e06c907f555bf865cb77414c4fa2b9974407e43fa4f74b77710d3be9d2646f929fcfd5269b0ffc379914
-DIST github.com-golang-net-0744d001aa8470aaa53df28d32e5ceeb8af9bd70.tar.gz 920361 BLAKE2B 3d658829656b6089eed9584a6fddf8aaae824275228f470263235fe697158a3f98a9bd15bbcb11eed9480ed95396787edc5370cb41a464b789219f282de9191b SHA512 d308b4f872612287c29b815b6ac0c4c3efbda4c641940ed8553851b1e93c6654bf443367b5ec96166d68fc2759d7e90e46fd6f148f0a6d535bf057bb785627d7
 DIST github.com-golang-net-c73622c77280266305273cb545f54516ced95b93.tar.gz 926104 BLAKE2B c5b31791af99bfd82edcf233dd9291df58102383786b77dd131af858e5f7868dfb4faa63de5c85218b2458fc9dd9f8a0d735aaf28b4f6f2a1835201ce0f93b3a SHA512 ce014933d3b8a30057c99bca54e9ba630e1940d1afbba3b9c7ef9d4f3e78d2ad26fa5ea9f0cbb0ada877d651b67d449e099d287b4af1d320fbf0b9d50d8d169a
+DIST github.com-golang-net-d866cfc389cec985d6fda2859936a575a55a3ab6.tar.gz 930024 BLAKE2B 9ab7175433046805426177276d963bdc356d488672e97cbd696e7d73f376af50a71ed5e8ba8c57e57ad0c6aa091bc8a54b1e67f09cf0085211363f4c33f077c5 SHA512 c841b5ab218f1ea6c8743264c72506ffa90372a7c8dc0fa1b1c22c965bf56e715ecf688acd22b5ecf747b7ded51f2f48fcdc859e4ce9d30911f48e3a6055d599
 DIST github.com-golang-net-e4fa1c5465ad6111f206fc92186b8c83d64adbe1.tar.gz 899910 BLAKE2B b28a878b9f0ff30ae9a0c73f11aed9de2f6dd000651c2e83c7d902c044c0741e90dd4f695356f6342aa100c8ee5b5d7d928de4ce7530de53d089e9c773112c09 SHA512 0a582e9aa0ecee1c881771715970129d8af5975cccbb797f1e2eeeea7989b17448b26c000ef49fc7a1ae02eddebdfbc52dd2cd9a82b0b3b667b4ee7f62346052
-DIST github.com-golang-protobuf-130e6b02ab059e7b717a096f397c5b60111cae74.tar.gz 268449 BLAKE2B 62093b872113d758eceac36f6e422c28a1133638ea70aa270deb0a58f1a504902f469125453e962053a4a5eeea4f0e11c1d116e61fa94c4ea84cab47208e032e SHA512 3caefc21de9d57ee484e32d831997efe1e086af652fbbff210c2097db03f933be78446ceea9d004200939b6d48737d716fae0674e1e142179e8ccd1827f3a228
 DIST github.com-golang-protobuf-1643683e1b54a9e88ad26d98f81400c8c9d9f4f9.tar.gz 268489 BLAKE2B 76035d1202d11428885d94937f1616e62441f83a3af46de0c0b8a17227b9e6a04fa8161269ffd1894992e6b5a914848dda66f1b7f9f91d5f1a4a8b45ecd08fb7 SHA512 adb706f73ce1a0a9d369a556258494913f1760c2ffb509797330768d112fb4f70b55d80db59d41c933b27aa862a6c044a9d6d2c5de95f540b86a46a0eec99901
+DIST github.com-golang-protobuf-1e59b77b52bf8e4b449a57e6f79f21226d571845.tar.gz 268477 BLAKE2B af1775f715a7c8434fe46872d8edf75241c851fb93e1e3f888c5fa1b603397e68c3878c9c69afe618ff1b7ae3d0c219ec96b8648af2fd2c2c9424a33f1710a2e SHA512 07de72078a66528d864da78c88be36351cf79be5235ec9f4ed1d71061a56b9b216fd29984ccfb2a610223a86b80aba2b9ca28a0d36fc2346b23070e25e72e29b
 DIST github.com-golang-protobuf-5a0f697c9ed9d68fef0116532c6e05cfeae00e55.tar.gz 252930 BLAKE2B 8530a1c609a62d423e51cde6f2b07a3e779cde62cd6dddd2c39cfc25be81ccf909c6f2b2c66a1cabfc87560b05d5c4b2af4e6a4880a6f4ed9490518e01e3fe8a SHA512 ac284034ee27b275df8adb83ecf4eb85977cc9cf5266384a080df2beb2fdcb84af7e166cabaf76881b95eab4812997ab435adf0abd6068ed967f609b1747b6a7
 DIST github.com-golang-sync-8e0aa688b654ef28caa72506fa5ec8dba9fc7690.tar.gz 15564 BLAKE2B bee2981275544d8a0d7d466e7929615c6b5b82c9ae362d0fac871d6c16440eaf2586d603713e2163a0ca911c7d3a9035b9751d52a84f7fd1640bd7cd29693657 SHA512 f0886e671ef90cca524df16e5836e1beabcf1cda42d2445323b3ace61982454e105dd6d686ede44b758d4765cb834802bd44082fb6a497d393986d91690a651e
 DIST github.com-golang-sync-f52d1811a62927559de87708c8913c1650ce4f26.tar.gz 15326 BLAKE2B e7c7fb054b028989ef1a0f09ce32ae0fcb4444e61de08e12609112363ad33c7aa3742cfdcba1bb7d6674267c21f74dda0594c655da77ec8fdc5667fd300287e8 SHA512 912a5afe25c6854e14d72d9d0a897808ab9b67ba4f8428cd04fe7bb3ca815f1bd1b78667587fcd74967f88f44ea591b77616955dd130cc2f98eea922fdbacf61
-DIST github.com-golang-sys-429f518978ab01db8bb6f44b66785088e7fba58b.tar.gz 769610 BLAKE2B 475a01338b048ce68bb5dbe265d324cfbd7cc25f8f754d0a1a2c4a52a270651eb35a02a9ae31c21141e0fd86d2246bea5d46ad0ab2586bed25e55e44a972873f SHA512 d3713f07cabdd7d25516a25ef4428de9bb5384970c28706887a952bc73fa7f99e6cb2b3a057195670b29fe447dffb3796e23e4863d5e28778609a799dffc1347
+DIST github.com-golang-sys-571f7bbbe08da2a8955aed9d4db316e78630e9a3.tar.gz 789287 BLAKE2B 65b5dea36632e0521d0bb8fb73ae69b89eb533628081f966da956d5f572d9611e817202675aaeefc69492428401067094e1c07cd038cba91bea7e50649b95fce SHA512 7fa096e1a1282155b614c02d3d190fdd94096d2e51447b4dca59dba255edc9316835036e0cc91aa7439047c17e63faf279018e0f6c9e8d2b0b9a12c7e553a93c
 DIST github.com-golang-sys-661970f62f5897bc0cd5fdca7e087ba8a98a8fa1.tar.gz 777769 BLAKE2B dd1733e9a5a5e8d4e1caef13b29827fde9e3f5fa5b0119e29cf4a0566affa8ed277e652e996b043e434d6d58cd500873ad4f53a2b4f094626e3f615db9b0af92 SHA512 44bd9dcefdd2ca5ec2bd89631d02ac870a3f05744f85016a6e6d7129a50b7c4ae5175be7098478256ee52a7a854e7fdb743bef8dc5b978c0a1d93205bdf39d0e
-DIST github.com-golang-text-1cbadb444a806fd9430d14ad08967ed91da4fa0a.tar.gz 4624392 BLAKE2B 514ee46b5316566cbae7fdcae0155ed273455f7514485c6e64833082bbee98893ea61e4aab74e5ad77f2781dbf3fe7211c3c584afb21bc90544616dadc7289ec SHA512 c37cc66e33e89d23a2fa4b707589316f9e28fe1d7131bb6208c0dcbd514f879dfff78328b871eb6d3ea1610f8b3f1d8c3061d94f88bc658d7bd8df2a19851c45
 DIST github.com-golang-text-6eab0e8f74e86c598ec3b6fad4888e0c11482d48.tar.gz 4625238 BLAKE2B a6bcc608bcbe42e03b19c2e8777623088fce206d2595444ad756f34982f50eb884aa87c92d7f23816b91d4e1b3f86e4d638c47866152f385674c7186debdcc67 SHA512 98c651a37fd60e62109d0eac3fe2a21473d7f270ec7a941f4a84485d3276da84b526d406baa185360ac842348320e9f373c124f9d88675e34d8126e71a9e8de9
 DIST github.com-golang-text-ccbd3f7822129ff389f8ca4858a9b9d4d910531c.tar.gz 4549711 BLAKE2B 4b6dc9e2f7b2d5d7cdbeb6e59ddcb76166b0decf04d304f9b815ff53e83c5d08ae95d5ebdd5103b6b048aa4e3e5b27111be28132c6f35ee8dfbbaa330958771e SHA512 78941350134b98f0dd72b0397796106b309cc50e34d0741bb1b4e8795a653f6364e35061b1f36def969ab81a2b07ef80fa135baca3054116d58358d53dea282b
 DIST github.com-golang-tools-2a5864fcfb595b4ee9a7607f1beb25778cf64c6e.tar.gz 2224136 BLAKE2B e40d7dd5f8411ff0c6eacf1e9d1b7b81d650050cd3f0df5e9ffb759091c8b06eea1459ee46e58299ec2ea1f197ae0ac1040ca6f8079a85df1adb0951e9678952 SHA512 dc36f88d348ae5c299c4909120caecab35964dbb85529e6e735bd507155173ab86b134cd39a1fdfc50b7f1f55345175604f29027b0b3e1acd7f3b312303aef70
 DIST github.com-golang-tools-9b61fcc4c548d69663d915801fc4b42a43b6cd9c.tar.gz 2246761 BLAKE2B 5cdd372a395a6de8e71cff04bfc9a59b4092dd1bea418eed005e17053a28aee31f5efedeca5c595978879e91d9338cdc85b4e0a9fadf6b5e7c244efa9b5b3d9f SHA512 4c2ab3079c149432fcaff400dbc6ad60f18e646f7ab21c2651fb1ca7d84f1adaa638de2e1f7d22f3d5c2715872843214f215b8e8b86b1c8da30d8723310db629
-DIST github.com-golang-tools-e531a2a1c15f94033f6fa87666caeb19a688175f.tar.gz 2246266 BLAKE2B 02081db992153adaacf66d2173a877fba8d4fe9703e99038cc76b4787efebc4592735ecd6afe21197a4afccda6efe812577c7d7435196baaea93ba53a18c72d5 SHA512 5cfaa76a4d5a8fb35c7c39dc2a9f323e1d5a61fe21819eaf89dffc5f033f4d18c0a65255bcd8b35699f6a39bfc7411dcb7a42af9a043dc5a72d81d36f69f8f58
 DIST github.com-gorilla-mux-18fca31550181693b3a834a15b74b564b3605876.tar.gz 29433 BLAKE2B ded39fe2133e5ee0b50d70fb3290b222d0e7ffb20a30124897ac44f5829080a2d237ba938af42f66f782371aa6e8b4aa7f8bf70bcb0050f87c11cb4e6c08ac6c SHA512 5bf7e9a6e8b01b235f5a9e697b5749d5655e62816d74b2173b123814f70aa92c5e0bc84cf40f643905354374efdcf1ffe8838d3a55d7e3abec29fd12a2e0239e
-DIST github.com-gorilla-mux-3f19343c7d9ce75569b952758bd236af94956061.tar.gz 30094 BLAKE2B aacd86fce2763726cf1edbf5bc445a493dc0f7f8e5d6545cf3f962342e6eddf5d375b2587d543ecf501a16d5476c1d6435a6b3ba04637a5eb35c1e034fde47ff SHA512 51d40186c3f216e27c487ea856d03047c89a21ed71819aaa8be366aa116e4227bd9db24293b7564ad5bd01799f275cf2d00f66cac9bf4162e9661c6ee91609d9
+DIST github.com-gorilla-mux-5ab525f4fb1678e197ae59401e9050fa0b6cb5fd.tar.gz 33298 BLAKE2B 06f86b8f5a2794ac62a8088495ea7f62fc2e1afbed94d9c700be7ca00ab13fcce092b83e456a022893c46e7447e36f210189ed136271e34028829cac01058713 SHA512 a0e920b3aef17e2c81861343f41f26fe1f579a6589abac89fe00cdd2167f5f1a6fc0e2a1b2dbd69d0b3ea7e08f3c50297f0b7c952043259a220ec95b2ceb30f5
 DIST github.com-gorilla-mux-7625a85c14e615274a4ee4bc8654f72310a563e4.tar.gz 30474 BLAKE2B 07af8c5d7254305d9af846fd10577e03022074a15dd34fb493a3c7cfbbd87d44e2495c4bc52b612380b51bc2ad19d160ff6c1328efc62eba1f43ad390042628d SHA512 3f12ae4ee55ec8711781d83d8048a4900fef774e3328f9bd9f276cb765687224373149ddadafa70a9267257cc2c49f75f42963a2dcc8796a9fb4ba75952e0574
-DIST github.com-gorilla-websocket-6f34763140ed8887aed6a044912009832b4733d7.tar.gz 42985 BLAKE2B b1c7708427735ed426e28271b7d560e4e2d2c8e99384fa57fc0d6fc518a14a81ed1efdc999a070a971d89e506257af779bd741c806902495d52cc9b6083ef525 SHA512 aee494082f7d32a9c1d49c9975a8aaf9881ab57a917fc810f759ba79f038fadab564d2f6016a2f23a3f21798250a4b9a79cbeda600376eebdde2425d10bb77a3
 DIST github.com-gorilla-websocket-71fa72d4842364bc5f74185f4161e0099ea3624a.tar.gz 42507 BLAKE2B 93da9f2c64c52cbf63355de54b46ee81525370b9ed24fa276da1d7a111f9053c6d66fef58429a6ab3ff86db00476d0c2ada890baa3c07034fda1b0d6e88422e8 SHA512 208c98effbcfbd96497d4affb9f11f9aba97d20a784515f43aef5378c32250109372919ae45aebffa8bdf3aec08b36a70578a81a68f329bd5be69ee3630445ec
 DIST github.com-gorilla-websocket-a91eba7f97777409bc2c443f5534d41dd20c5720.tar.gz 42927 BLAKE2B 1bc3f7d80918bf1d3dbd3e5ecd857ce751d5bb4e4b97d2b871ccddbd0d0aa640bf07c699a19998ef22caf41b3fc0c5b211a30432de9d7d51eabd7db8c09b086f SHA512 651d017498aca3fed375996a4cd77a5128396a14aaca4485e5480937f85d1ea8a734ec607d1658601ec6eb9b0b1e9a4756a0264c4dd86ac6bf2de556daa6693c
+DIST github.com-gorilla-websocket-cdedf21e585dae942951e34d6defc3215b4280fa.tar.gz 47287 BLAKE2B bc5baecc1779e821841c2b784aa7f43ee9e7a41ca2079c79538447a7645fbf5e87ae981b744ec973345da351114ea133f219d9ac1af5accfe470e8cdf1fca169 SHA512 88b7c5dacff563d88d3d4e06f57e2552ce10108beb239844323f58ff7829c9b717a8023e45805c5a9f649bfbf513d0384e0fab722968936deddc236048306686
 DIST github.com-gosexy-gettext-74466a0a0c4a62fea38f44aa161d4bbfbe79dd6b.tar.gz 9682 BLAKE2B 2f8f662b5cfcfc00361a1aa1e658bb077da7dc42b220288691c92a9ca6555425a13f15b8fd8575e88ba8081e873687fc87b3a39c33efc80757323f7e70de17b5 SHA512 99a00ecfeb4226bba01dbef615f02b22f54959252c9fb99ed55f8c040026305fa54256f78eceb5c02ac6a77842c72fda43d1790590adfdcf3202095ad836a198
 DIST github.com-inconshreveable-log15-0decfc6c20d9ca0ad143b0e89dcaa20f810b4fb3.tar.gz 23111 BLAKE2B d6f267e62433424ac8bb9816b1290bc91b940584a88f1cdd42bcb8b9b7e46a0e0a9247ebbd73b338354befec3a05f7791b886a23d0db780059a8d5ee3aea1bfb SHA512 bdc21cacdf56c5e4e9b03dae107f646a25f1e757b4e1bd57d24bca92f7c4574f8b716e3f3a3ac756e77100e61688e743ffcc5388989268a95028060db9449cc7
 DIST github.com-inconshreveable-log15-b105bd37f74e5d9dc7b6ad7806715c7a2b83fd3f.tar.gz 24466 BLAKE2B ddc8701c45bbf21e845ceedb21a59a52c8124f8bf4773623734e98bd2b2d257623729ea6c20488ec6568382484f1901f169af6c44d9084a2d4b5f8a7924ce7b6 SHA512 f5add63516e3d4a0797cda4fde3568aefd392a2986186cdca8c060ca51a8d5d09d3ba990578942c6ebf0441f94b9f042f7379c5c3897b4210ab861998a597088
 DIST github.com-jessevdk-go-flags-5695738f733662da3e9afc2283bba6f3c879002d.tar.gz 54989 BLAKE2B 04f28a18f4541de0b80df2b33ef3364b5d01cd56ace7a492ca8b98789732ce667c5a79070536222b09de04dbeeb437da71456625ed5b851866dc53ae9183a74c SHA512 9f117c43a41ee7b8753ba8bcb9ad49ad5106ce01b3be617921ed9d1208bd5bc1c4c155d797f2b1f7134955b16f3d82e46de2b0a45e5e8808199e0173687719b1
-DIST github.com-jessevdk-go-flags-6cf8f02b4ae8ba723ddc64dcfd403e530c06d927.tar.gz 55513 BLAKE2B cf940830e0c42502458f862f9cf70aef05d1c9a16ce33f920d937b5d67c5f4c09fca8bfa36b8d00f2eb91cf6ffa78c536b397051ca480a100bb111f4d26b65df SHA512 cf4c45b2a0f314874dc4bd2cbedddfd6f46ed71d6b51198365db17d4a4fc6b2ecce000968b62d6c883f596bd8847f0429f3fbbfddb0ab7369a3a6b78d83c48c8
 DIST github.com-jessevdk-go-flags-f88afde2fa19a30cf50ba4b05b3d13bc6bae3079.tar.gz 55513 BLAKE2B d90a23d54b7557e9686fb303da0a8bd08fd173697631df1e9eeb13b18afb9eba180754a7213d9cc50754bb03dfc0f8d2660c7779e5a06a175113916607bd0eec SHA512 386a0fcd1029b6c4055e8cbef535344e2508e4d6eeb7cec2c9e9d0f1a080ad86eae0a8f13ebe65b056be941af5170feb41a1798c6065bf781b6dba71bcb2c567
+DIST github.com-juju-environschema-7359fc7857abe2b11b5b3e23811a9c64cb6b01e0.tar.gz 17589 BLAKE2B 9c5bda709623cf05123ec0435af3be8017f2d1b2a296e1be3a1a98eac410bc38ab3c3d98848725707cc407b1c42a48f784bf69433854191a83bbaddac356f0c8 SHA512 ffc9d445c01c3b4d810320b3ff230226f6de1beda50660b3ead7eb2b5a0098661aaa4c929bd36b1acdc442d4504dea6c1b12ad94b5a8d0c1e7f79bdfb2abe4d9
 DIST github.com-juju-errors-c7d06af17c68cd34c835053720b21f6549d9b0ee.tar.gz 16210 BLAKE2B 7202acb00a3126943989fd276b9991122895dcb99a5b6e6a966f58e634b037447bbf49316c6c59e98aa9183b77aa07d9b4c4c7ad758ade2704cc3cdcac84a9c7 SHA512 04dfe2f155724d98c31fa2d274a13e77efc34364ffae172fffbc8e14b72f68a6301e6f582c1ff9f37cb105d11a7b3197e2ffa635f410ffb64d54e7c6fd1b9d1a
+DIST github.com-juju-go4-40d72ab9641a2a8c36a9c46a51e28367115c8e59.tar.gz 49363 BLAKE2B c037d267cef945e9760cfb8fcfb366553e850423bf98610db03b51154455dd5c6d2d3de91bf37956249f4ffc1ed5fb850b0438fcdea2891929ab4e7de73be989 SHA512 aca20234f5693a48f5cca41eb59e8e2b1320feec05a7961a950e596d9bcc14ed86786d815e0372cced669548cfa9386e9bcf0eb774a42954fd7a2fd095e9890b
+DIST github.com-juju-gomaasapi-663f786f595ba1707f56f62f7f4f2284c47c0f1d.tar.gz 101563 BLAKE2B 5ea442af00c6a30ad54e2f75eb2da41c29fb24364b00ab8bd8995f1b4ca2205b32e1d90fcfe03c7517884b4ef830c471e03a118b89f65c21388332027fd8e0a6 SHA512 edca0adf9f48f1c656236203c8686b67f5926f736725a7d910a47804f5005aa642bf1cc8e5a9079c5c50a3cfe6d0c735a645e52a1aa1da5380735f76be9b1436
+DIST github.com-juju-httprequest-77d36ac4b71a6095506c0617d5881846478558cb.tar.gz 49764 BLAKE2B 98a666f5477f9cd46baa13b19918cd07c5b9f8f94390d87a67230331ffd292de99a430ecb5588de045cc2573c7dbfae0c40fe043778d6917f4dcfbcf25cc8961 SHA512 9ab66aebaa650c7d67accf9261f4eaf2ba28ff37846350719b0d83774502b29fd4b179913669f0b833b99142905b4892b71ea76d368c707567e8b4b01378d27f
+DIST github.com-juju-idmclient-15392b0e99abe5983297959c737b8d000e43b34c.tar.gz 28723 BLAKE2B a15138e673a26600fbcd8c36a34bcd3e7e904b3afa306fde7d59eb72fc454be797d27f0c05221d290aebc09c5db5f80b458d9a85cfb68358ad17d834b694abc5 SHA512 65d5e8af7873f856250843fd43b14ba8c8ebc114a8fe9734d4073db5dc046079c7fbed9cc3c78aad4c74f886aeb9009c00a009bc6e683f6b5f8162e25a7af7d3
+DIST github.com-juju-loggo-8232ab8918d91c72af1a9fb94d3edbe31d88b790.tar.gz 22060 BLAKE2B 9e6c4cc2ab50ea43f5471510d67f0f134bc2046c3524d571bf4c884a4c09f5df160f4013cf8e05939cddf039c687b3dce512408f7305f320f4b1d17cf209609a SHA512 74ccd8f6f8600a38154d6a12436566111f4073fbbcfa5f0eb57a1813ddd97398d6e906f0b9be09a4304f677870ee70127f4906e9902dd6d767e3ef467e224883
+DIST github.com-juju-names-54f00845ae470a362430a966fe17f35f8784ac92.tar.gz 26092 BLAKE2B ad9f347ad1e2315f40e39ff0601e425dd4567ae53a71884e851a954d08e67df586469e489645951b6c6058a9c4be053089c3c74d3f63208a70862f269261a7de SHA512 de1a6d8cdf82cf19f11354e98a69d1580f4717c92479445f750ac06ef918804e1d35d994e480bdca64b1ecdca91533ec4961dc057bee0d886759f1ade0e87d07
+DIST github.com-juju-persistent-cookiejar-d5e5a8405ef9633c84af42fbcc734ec8dd73c198.tar.gz 23237 BLAKE2B 16eca916ba084dacf905d61f66f9d6ca4f5041a49b3d8849bf2c3f5182db89f29ea9de5fcbde45d8fffd54699c150710447216db0d356cd51eaf784290429ebd SHA512 4e534e305b9433974fc3b5fac6aadad9430ca5b8905c733913360b2a7ee37aa504a546fc1413d43af4938143132618db9890cbd1d22b3a5b91475680a4af84ca
+DIST github.com-juju-schema-e4e05803c9a103fdfa880476044100ac17e54830.tar.gz 11859 BLAKE2B 86ac989a6426f3faf791494b319668c2cc86a82ae645301ca6855b50f9a26ff3ccbc241d6d1be261c5d2548952479c9b8ce1ff2db2a335e7b8f71539d42a7a0c SHA512 b9097f06b220c7db1b2fc4305ee28540dc66ff4b8eff7e16186c241430264fb4dd6e190c90fef91543072bfcb6681a5ec8215e890c522297dbbf25aabfacb154
+DIST github.com-juju-utils-4d9b38694f1e441c16421e2320f2b2fbd97fa597.tar.gz 207854 BLAKE2B 284c0990484e76ecca5feba7e40700bb0315e855618554068f9bd5606372242ac49123c5f5f7b4c59e6c16331b07157aba3eec1e7d2589e70a1fe11f24c5cb45 SHA512 5ba34b5804f661c56b8ea94dcf17099f77c061559e859cc0dba057f7aede0998ae55cdf77abb0693b6d44eb7de8dcf1449a7cc4f644d03f3649e5e8575d297eb
+DIST github.com-juju-version-1f41e27e54f21acccf9b2dddae063a782a8a7ceb.tar.gz 6965 BLAKE2B d90780eed7a910c07d33e4debc5e877599935d6e377bc19560aeb46c83f93fe90fa323b9712a23b6ae4e4e78fba5c4b1aa9b2be308527b265493d8e25f363605 SHA512 80406755558ad1d1101ae93db00405d8305ad5bddbf3124f86e955ab351d3e7882588b7d13dc605f04413fc961f4fde5fe228058d178bcd666b377c9066f17ff
+DIST github.com-juju-webbrowser-54b8c57083b4afb7dc75da7f13e2967b2606a507.tar.gz 3930 BLAKE2B 58b8a759379dd8bd25805c41813d8ac6dff16253ec8ca063a7d93eeeaf7741451d08cebcd323299a8f828de7e87b2db3df63f3f31188eabd6862ab9cad4cde65 SHA512 ac04ae3adaa95fbd3278019629dd6ed12070a93697217098b1755998cbc6143c606e8176c172883fd27d55cea35b9877877b88a7fa5dd6dd4106477744c0b013
+DIST github.com-julienschmidt-httprouter-e1b9828bc9e5904baec057a154c09ca40fe7fae0.tar.gz 22461 BLAKE2B 159deb9cb8fe32f165bf96b9240f68c0fbf35873b6fe9f05c351f690e8a3713eed8a048fe2d917dc0f3622d0c4b84509771f20c9d4eeff8d380bd8b841d19748 SHA512 a8e1610caa188bcde29a603c05e2cc6914949637d17d4f8d7d0efa51edc4c348767af7fdf3072365ed2f26e0947112a5521a88fec383697243a85061b741462c
 DIST github.com-lxc-go-lxc-74fb852c18ea4341f85e49bb6f33635946aabda7.tar.gz 37089 BLAKE2B 340ab5b57141d0a2f2b313f048c93a0f0010f257747026b1b787a662d4fdf148ec1edf6378a59aaa00dcb05c151f000a3096b55494ee9dde88eb74b383ffa079 SHA512 260ced6801464464652f07b747e452b4b72e4ee0d318c82cce6a64673c34ea1844650a7c3c90a6391c58b7ba8c11ee7345564e2436a79b7014124f063a3bacbb
-DIST github.com-lxc-go-lxc-89b06ca6fad6daea5a72a1f47e69e39716c46198.tar.gz 36894 BLAKE2B 55bfb2e022934beb0cd90daa8ae45bad0df79fd02558659eb8c64d39dfbac074d6d4b3823c7e6636f65e78967c32f4b60beb5bd989ac382e5a3df38e116bfcdd SHA512 145168fb3defcc57785ae0b08d5386c098e6682fab2c48357a0e4dbdf4839ce1dc76a6818d77e620f542f452e31d075d817950a814c4e6d78781aae912587d96
+DIST github.com-lxc-go-lxc-a7d112aed2f5f57f565d6e557671eeef7e76811c.tar.gz 38226 BLAKE2B 62ad90e0a0ae511b8b94857ad8be761f3d8fb0678ee67321934a2be6a931b6623822c51a4f304e59127008d75f5d44a7dd897d35591e6414b906a16c45232466 SHA512 7c2fffc303e4c8f89676e9a704f64698f2c7e35bcdb7376a9917d89e611dba06a8a42267edd58ad8ca099f43cbde41c0c6a99b6950c0bbcdb9f49296ded4da50
 DIST github.com-lxc-go-lxc-de2c8bfd65a78752d6a70b4ad99114c6969363b0.tar.gz 36156 BLAKE2B fa61c104fea008df7cd4de6a7c62d60cdacee0b1a2e49300a4ccf6d94537d7ce0eea89fb54840d93916e0112e7b699e2cf249fd1c22a61510bb6f8e93ee17665 SHA512 57e84c66b8c8260e3d2631b37e5dabcaf5136e47ed4233489f8fd3b2cc8796c495dbc78390e4372b0cc54ee5920d1f469579f77de1c0291c3ae31dfd6b628dbb
+DIST github.com-lxc-lxd-a324ad91230e5353fe746d06636dc59211122e6c.tar.gz 883109 BLAKE2B 9f4b7cf665fe693addbc56b721e0a02e8f64002e7e8bfa2d9a084590f7076c6e991db22a60d4b4070cece7f223fefa5f8ca35a68121edee8fbc9bb1437fb9c7f SHA512 ae1f43fef4a33e48f9c2a002a5e32dd7177eda78449180e147b2b23c8442bc5ad3def120caf2a4e494b4e4b6f1415c51af999fa7c838e3710ce046e3f653b03b
+DIST github.com-mattn-go-colorable-6fcc0c1fd9b620311d821b106a400b35dc95c497.tar.gz 8152 BLAKE2B 1bf8a085568b775c6aba6ef292be680e0ac522434b8563936f3061e8d44096b7a17e813b6b9818ecc3e5b3478259c1f364a48182cf46906336fea852e345d45f SHA512 da35fd75832c039baeb089dab06565ea7bda0eaddc14188a1ad21306b268322fd53f01cd48c652a0bae947139d8c8eb0086740edfa1ce7463625a9c9b2d9180b
 DIST github.com-mattn-go-colorable-ad5389df28cdac544c99bd7b9161a0b5b6ca9d1b.tar.gz 8089 BLAKE2B 315c9f5338909f59c10492e9a86bea26d6d039bf251657caffd998d07b4e3de5961d9d73b7f8b177af733207d149723578e61f93b1b8f72b186cb6c3cbae0e55 SHA512 0f458e6acfec266b58cd458bd05bc04617df0ef223ffa6a6c374decd29555a78441f3a17df7b5f782d96a25f56bcece061407e9778e25ceafeedafa014a45bb4
 DIST github.com-mattn-go-colorable-ded68f7a9561c023e790de24279db7ebf473ea80.tar.gz 7522 BLAKE2B 03acc68ae0f4faf3ff4f3e4afb4b77a1b40457e121483e37ad9b07efa72ed509b287299859ea516e05af5d537eae9df5e7ad43ebfca2a96ae32c738680c7d029 SHA512 ae09fd28e2aae98d0b73bf71ee7496d8d53e20232428d09e021ee8571ca7e990e85c0d9613c89851e2025624d317a26e1768f4e7af12294eb1a189a241bd8daf
+DIST github.com-mattn-go-isatty-6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c.tar.gz 3383 BLAKE2B 2034048312c4abc88a813d8ad83013f57e9a23477ecd847e92c3cf30e909e209f9a65acacf41d80b3569770c1400e338115c42fd48d358b66f68ccde69a9008d SHA512 1714a9e9ac7ad2ff30825328723b4c9a5c5f7544e876c6fe79b84c72ba1dd9bfcd6ded2308f6fcae8f1c893d22b84d6c72dfd30742edaa2a5b0d8e88eee27421
 DIST github.com-mattn-go-isatty-a5cdd64afdee435007ee3e9f6ed4684af949d568.tar.gz 3367 BLAKE2B 8b59d5944dfcceee679de77bed4533be45b7d5a23fecc1b2cc2ebac19da37e0caef51c58c9922a0c8fd9793a45fab9e7e10a1fbc0d3cc1bb92267720cbdd899f SHA512 16ccc654b77fbc405f7a72d6613376af53d18884288a070ec096df14e332ed387b81fc63daa2fe0d2b6e7a428fc00ab6da7da441f56a076d03b3327aacd0cee0
-DIST github.com-mattn-go-isatty-fc9e8d8ef48496124e79ae0df75490096eccf6fe.tar.gz 3262 BLAKE2B 6b64f8ae69fdd8beb3cb783a80bfc827af3797903065de3bc3253c90fbf0a2b706c3a5bd63560b19d765d6a9e0b19413436a9f999ac3c483075e9431e0971eab SHA512 8627d22f5ee5a087744bbf4dd391f8f87ebabe8940564206935dec9e406e40a98976479ea973e61afeb1774df211992cd61c67ee198d546e22fbf60826b64ac9
 DIST github.com-mattn-go-runewidth-97311d9f7767e3d6f422ea06661bc2c7a19e8a5d.tar.gz 22406 BLAKE2B e9f1d0da4d69c110a9b9ef0ec640dcb53bcc101288b15411367760b5710808f64eb8fe6f0d61f77ba89cad2f965da2d4f72d92e42a07986e1cc39777a050a8f8 SHA512 0452fbc64250169ea99fe4eb4e2ef4f81c7bce5b77572789186f749c9c502c29c7146f7ef57971b6b78db0abe33e9926931719dd610f59925e31e6dd6c0b8d70
-DIST github.com-mattn-go-sqlite3-05548ff55570cdb9ac72ff4a25a3b5e77a6fb7e5.tar.gz 2030395 BLAKE2B 4503ca9d406cff857639b488da345aa9cd841acd6f41bfa97c25b97b494dee972f00d88ab77b3bb3c7013de6a216afd2912008afc503924c4d2c98e03f318807 SHA512 0899042c28f4dec19f830155d1da03830ddf6c03c96fc10190184f1ad2ed5eb2d69b5b989c40f489846201ba664ed80554f76a03c9e1e291d7fb9636967aba52
 DIST github.com-mattn-go-sqlite3-615c193e01d8d462eef7ee390171506f531a1c9a.tar.gz 2030347 BLAKE2B 4b5c242f0eafc5a229e6198cb5c696beebb345c5a50cdd0b59ea0ea85b58972c8c3dcbbabfdd1e70d70a959f05783e8a0d21140b96c4dfeb0157386939cc2b72 SHA512 ee5ec75c9e1ac8ba5b21d4221af754055fb7f8fedca8c4a53b72c16a216eea570ecb436b14a3632cf5541b2053874d82898e601f27bbdaf97f2b230e64ee822b
 DIST github.com-mattn-go-sqlite3-83772a7051f5e30d8e59746a9e43dfa706b72f3b.tar.gz 2027317 BLAKE2B 527d5d7d938523993379e3e32cdd8186143676b42cff36ce944ab368e0761e042eb8484f743636eef5f023e5712307bbb3042731dc13537b1b38c9123a56b7ce SHA512 687b1c9f7b2f27be4ef0d924f691f17251fb84522647436d3e6d1ba5946208618156663d817d146f954ea07d31619c446a3023f9a811f113a3761cda0daebdec
-DIST github.com-olekukonko-tablewriter-0fd34425a5aee40ff3f260b34e6c3b0d59f58c66.tar.gz 14765 BLAKE2B e56af20311ae38815ffb7f370009d0cc585f4e7647ddf5bba32dd29c5e7f16f85bde0afbe7bca95f5a9bd4049b9d8d8a5a3ad61a9d599750ed7e1eca0b393e84 SHA512 8006135ecba382466b8a283f1520ef052a909dacf7e4fc68f48549239675fc6225ee0382ef8008b051ac269eb827978dbd5a7e2391ad9f2cab99118189cf90f8
+DIST github.com-mattn-go-sqlite3-d5ffb5c0cca8778699a929b236766f4a7af674e8.tar.gz 2071644 BLAKE2B e2aecc6c65f68120682afec947740c4c04dc464d09b19f92bcbe1660cc854be721d8b73734eb5aea701426336c88194768dd28b83ce96b4cdb1d1343105d5bda SHA512 daba1d9cfbed25f92fcedeae7588f31bfe8ad1eea30ae7e24fa4a83dee015f06858b05d6ead61d5a22cbf477070a275767132c030eb4697640cd8acd99816fe9
+DIST github.com-mpvl-subtest-f6e4cfd4b9ea1beb9fb5d53afba8c30804a02ae7.tar.gz 1066 BLAKE2B 15c502a85587ed58eb293667116bea860d9ac4986f3b0f13c695cf7de922a1cb1f574c4ae036e63e9caa56d93ba84055ce44eff862a8671d70a35ca681032970 SHA512 12668278478ea7e321ddaf46beb766d5607a9446a108550400c129754f7a701673e4331dc47336d75dab3d403d371656e72ce80555adc36d5ca708420fdb72c4
+DIST github.com-olekukonko-tablewriter-65fec0d89a572b4367094e2058d3ebe667de3b60.tar.gz 15185 BLAKE2B ba0e6cb42e67fddde9d4454c5757128842290daf6356bf44e05112d3759ef9373ae6ac7b82909f3cef7a31ac2b2612fc222861ca3f65190b24f80da9e2e0fa8e SHA512 48aa8d3e5795dc1d16486a1c418b60e51da254091081bc82116a66a7eac277c34814e0d8e598a7946dfbbc851b94a31d6d7e8032eb427bd858a5c3f56d3edbfd
 DIST github.com-olekukonko-tablewriter-a7a4c189eb47ed33ce7b35f2880070a0c82a67d4.tar.gz 15206 BLAKE2B 2048e228a2c9f24fb99cd9117cc90696589db657730d2f2866a629e6d8e9e31933659be3c250bed4d892d2660b9c3973819c7e1a0cbe5cddfb409a8e4d70228c SHA512 38bdb92ea0444dd0e32869f0d4f7f96c19997ef3382e9eb7a2eb0bf9475f8640e8d4f6639cbd48a7f12e90743b53a9c8bcbb0b6bc3e749f956446c6dfc6fc544
 DIST github.com-olekukonko-tablewriter-febf2d34b54a69ce7530036c7503b1c9fbfdf0bb.tar.gz 11822 BLAKE2B 89fad2365491ade50f4b309a598574bbbe4f3dc4140b37788d966983b3580ad5d682d4fe18c2059a5c29a24b232352683b4ea4a24cb8affa5df7078d2a6dcc1d SHA512 bfccf8eacd32840ec195c0e69d141fc24ca55d9f0832b38ad87e0c2292c61f5ff0731e83a19045ddebde4db8b9cd77b0b84214c5442f4cd4f8a892e77efce758
 DIST github.com-pborman-uuid-1b00554d822231195d1babd97ff4a781231955c9.tar.gz 12808 BLAKE2B e737f7b681ddf3a51949d16deda2c4abd062fc3247aab9835d5fb636eef0ec7f56b63c44da675fccb493798aeaf94115c2c5dbe25f84789ba52b419d5080328a SHA512 c332bd39781e7a3bd7125bbf26e62da2aca24bb89975491a4165a17580f3ffb99587e4620a9c9c17afff5d34865ae0b86065e1516ca325d0edc4dd84be269283
+DIST github.com-pborman-uuid-e533369306653d193b93dae055f6083cbf8ba54f.tar.gz 13157 BLAKE2B cc68f4a5f2d1e753d9aa471a4f5cde6dc38cc88b8e4558068701415d89cb7410b79ebd39a77152848b4f30d6af05dbb07c5a9b0c469822ef703d7419c9281b7a SHA512 e1142c36ee10c31c35dd82fec40376f83540cd2b30a0e250e83fcc1aa2f4133cd13c76338c82e6619760fada05be5b62b87ac7958bdcca736459dbb77535a4d0
 DIST github.com-pborman-uuid-e790cca94e6cc75c7064b1332e63811d4aae1a53.tar.gz 12805 BLAKE2B 8edb8dfbe4c1b57d3a4aea5134889949c3679b61813d70e210ef337bc5c8e25c95af56bb8fa4dad1a513d4ef88fb6ff9984dcfcb504bb0c55ae8526118feda93 SHA512 ab27b50c06384f20637e628d7e7289ff4b9f00f2fdb5e650aa7f4bf19bcd54cdd1b83fd9e3c45eede2ba8f35af9b177972597205ea29570b129f9a97e6c63c0e
+DIST github.com-rogpeppe-fastuuid-6724a57986aff9bff1a1770e9347036def7c89f6.tar.gz 2506 BLAKE2B 457d346a717b9ca9b5374369810a11d5e298949d6681e28a0e8cffca1e3e7d160eb67c3d607aae224f0865ec4ed4b0b21c11d9f316295f31efdf21cf4f70bf8a SHA512 ab6c7d2e32d9b72b4495e9465c03b0b97e1a869f464eb49f3eb522cb04f65b2a45f5359a52ce71af2f59cfd986e0d58a0a76dc02c2583ac46eb0e33efd425dd7
 DIST github.com-stretchr-testify-2aa2c176b9dab406a6970f6a55f513e8a8c8b18f.tar.gz 94502 BLAKE2B 11d7fda9655c364de7c05a1ff0a2ead4b18261b016be89d66f118c6afdba7795bf55b54af64090121a0f789ce8708a85000298a5f032d3d578c36483bf64ae03 SHA512 b54e5d558d8419f1a5110c9803d8d120056264b4ccf0119207c1461a650c1a48fad35b4a6fdb681459be51f8bd6a728097e6c7c86bce0c0d828234aea6953ee0
-DIST github.com-stretchr-testify-890a5c3458b43e6104ff5da8dfa139d013d77544.tar.gz 94296 BLAKE2B c80c48fd950005afd06268d63b6b537dfa3ab6f903672e10e22af7ed82501be8fec0ce2daa418000b086917b0fb50c933b616d4edcdf296cccdebf481dbd56c0 SHA512 7cdc1bdd6711496280aae5ad5efb51bf9d6f9a271e89ab7c2af4a94d6bccf67958ef00d1805b9278903309dab20aa0d5b15105a7284a940b1e0ebfd78901ecb0
 DIST github.com-stretchr-testify-f6abca593680b2315d2075e0f5e2a9751e3f431a.tar.gz 94237 BLAKE2B f23b1195bc4cc30e676f9388fac02d7aae93201f76c4e257ad95e5f20c0f5b160daec0072efaaea23a0d9ab8207ee94675f7126ab5dee9f37b26daba68826aa9 SHA512 3aaa245f70dcee49b08e5f677dfa2137b00cc0cbc18cd52d773722b951ec579e3f4e146f951de51973630488a9d9efc7c54462842c6fe5987cc099a44f04a03f
 DIST github.com-syndtr-gocapability-db04d3cc01c8b54962a58ec7e491717d06cfcc16.tar.gz 9899 BLAKE2B 584e75a9c47d28498aedb5c85b3409c79c84ec9fc47a5a9dc77aa117b4e48f681f72a12a03fafa566a405def40b4961bb7343cad0c6ecb3cd9da883a51ed20d6 SHA512 fdd8a3cc1add7570269df6ad8867fd9d2da7bbf751416a5376ff123dcf959be13912b766f5214123e20fabd242a629e02f3bdaf0680782805afb81f6f08a78ae
 DIST github.com-syndtr-gocapability-e7cb7fa329f456b3855136a2642b197bad7366ba.tar.gz 9894 BLAKE2B 02035226b535d3e029c421b1a3489160a23f474be970652fc153c5066ca50d6cdfc2cee8d3b120fd246a0af0b9a914b4f7a6f00801e20cdc5fca8d2d6bb8a1bf SHA512 ee2de5568b76b87723e80e081e16094093f09a6be68dd0920793e007d4b705808ec1eac7a15b4c0ce7ed20aff04978f4ade264ab5bf5bdc5e2fdc46db2f4116c
 DIST lxd-2.14.tar.gz 629982 BLAKE2B a55ec6c762e0a4769ec2be3d063a82d8f6b36af8d4997891d1b51fbf2eb181b5ee86dfbd9e494a0d7393a76062d8fcbbdc7aaefb9b37503357639f6fee4faf76 SHA512 a1b6d7eb055a29ba3c28f9184e6dbac5f279332a6445347bbf8f946ab23b0afb353ac146b379f22922fe678ce034c18dc9d5d2f2dd7704b8cce1730c29dfa9c3
-DIST lxd-2.18.tar.gz 725957 BLAKE2B f8d442e7b10d507e180c7be6d10517a29ac15fef44624a60fa94ddbe5d3c7d1406938d97756ad8ad301bcf2fd04e85e62041a7dec65b95c16b91a570330bcc04 SHA512 51116a41c4c13c85729e36047a9c36a997fb79abd383ecf2490be3160a39b90b05042aa0f4c979849c255b9630b03ed2c7acb92c26aed3c20aacce65ef0c70c5
 DIST lxd-2.19.tar.gz 756698 BLAKE2B 71c6d829735255cf6ac0e76db1157374bcc8f8138b1847eebe0b17fc38060572e860179d943e5538e6df13267c429da6c295357eebfa81f265a930fe43feb82b SHA512 18461bc5decacdb39ebf7839a376da9a02af428a324bd5642c2bc6f1bb2e5d5b3e03af1d4be333348b0f001f0ebb08e7d36bdcc1d2f928c6e588a8751c29e981
+DIST lxd-2.21.tar.gz 882352 BLAKE2B 80542bcc03c05667ee0207dfbfd2bf41c5a6ef69178aec06ad62fe3521ed012ed9b82c68c0254e0299e8e1dfd274a0622f32bde730480a950ab6ba15ddae5f4b SHA512 9a8ec3a97e4c861a80311dbdecbf5a485c0af85d6ba6b20680ca17e6ac877de3f27cfdcf0a111ba0db2b7c562dfe2f41336b562b7c13350c4543505b3c17357e
 EBUILD lxd-2.14-r1.ebuild 6704 BLAKE2B 99a46d88f25e2c7d090278e12c680f81242fea55aad14643964c6cc41bf03de1ccb3f467de82ab9cbef0b01d616bfdb6b1f6a73d89c9bdda037641bd3bdd554d SHA512 be9283675d4a47dbe425a449d331918121fd5b5da60a1797020e89053089757da7c637cdb0db2967565d1440018db19c705d5fd8112a9208905f50c99ca2b66c
-EBUILD lxd-2.18.ebuild 6471 BLAKE2B 26ef1758858b21af7faefc092ee430a26725c402b0326d4e4098ff18a2049f4dbef3f3952429c5fff04e77332537eda02b45907480ab564dc0d5f987e40f8db8 SHA512 a783705e98da19c3c59e2d9dbb3f7c1afb44116434276de45b7de13e4dfb171cbf982f0153b9ec40f030f8ca4d47f1aa92801a195cc0d858b3bc6ad0b3172e3f
 EBUILD lxd-2.19.ebuild 6605 BLAKE2B c39104cd32ac100377c6486219af4c7c8e448594501991f89314f9b6275a83080fa5adf956794efc3e36ab72205a42b8c642f04800f09a5995b3db4a391d4206 SHA512 45388ffb9cf442c6a0eb645f5302e48cce7aa721d6e016b953c730e63a1b2769cce2975f2edfb9162afaa196045363027e51bb09759428f0be0233d4260a7dff
+EBUILD lxd-2.21.ebuild 7884 BLAKE2B cf447bd093ccc4bd67d09ef4010461e2449d0cfbb3c62ed0023de38343fe90f10765ca44d7f684e5613f5f036cc0b560bc24b5ea786b959b2e79dab08f0186db SHA512 b68848e6e2673f4fc293634311db928c936ef1013fdc2d89313282a2f0a7407271ce732289d28bf8b2e660fd849fc20b226ea073773ef15e80b4a18d6a99b072
 MISC metadata.xml 952 BLAKE2B 1d16ed30ed5222c36a5ccd6355ad5f036fad77152533d8c0fb66fd2a43ad34c8136cb8044f9b5d2c8806d08711b20f7dcd883db57fde229c869382775a5bddff SHA512 962339d8aff6dd9c44e7642449468ffff20dccbdc45bdb614199d576ed4595edac356dd216ebaac50290ca7383630ab8e5355eeb05a76d91ad542cab7cd8a456
diff --git a/app-emulation/lxd/files/lxd-2.18.confd b/app-emulation/lxd/files/lxd-2.18.confd
deleted file mode 100644
index 3d553276a5e3..000000000000
--- a/app-emulation/lxd/files/lxd-2.18.confd
+++ /dev/null
@@ -1,27 +0,0 @@
-# Group which owns the shared socket
-LXD_OPTIONS+=" --group lxd"
-
-
-
-# Enable cpu profiling into the specified file
-#LXD_OPTIONS+=" --cpuprofile /tmp/lxc_cpu_profile"
-
-# Enable memory profiling into the specified file
-#LXD_OPTIONS+=" --memprofile /tmp/lxc_mem_profile"
-
-
-
-# Enables debug mode
-#LXD_OPTIONS+=" --debug"
-
-# For debugging, print a complete stack trace every n seconds
-#LXD_OPTIONS+=" --print-goroutines-every 5"
-
-# Enables verbose mode
-#LXD_OPTIONS+=" -v"
-
-# Logfile to log to
-#LXD_OPTIONS+=" --logfile /var/log/lxd/lxd.log"
-
-# Enables syslog logging
-#LXD_OPTIONS+=" --syslog"
diff --git a/app-emulation/lxd/files/lxd-2.18.initd b/app-emulation/lxd/files/lxd-2.18.initd
deleted file mode 100644
index b1fa7caac546..000000000000
--- a/app-emulation/lxd/files/lxd-2.18.initd
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DAEMON=/usr/sbin/lxd
-PIDFILE=/run/lxd.pid
-
-extra_commands="stopall"
-
-depend() {
-    need net
-    use lxcfs
-}
-
-start() {
-    ebegin "Starting lxd service"
-
-    start-stop-daemon --start \
-		      --pidfile ${PIDFILE} \
-		      --exec ${DAEMON} \
-		      --background \
-		      --make-pidfile \
-		      -- \
-		      ${LXD_OPTIONS}
-
-    eend $?
-}
-
-stop() {
-    if [ "$RC_GOINGDOWN" = "YES" ] || [ "$RC_REBOOT" = "YES" ]; then
-	stopall
-    else
-	ebegin "Stopping lxd service (but not containers)"
-	start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
-	eend $?
-    fi
-}
-
-stopall() {
-    ebegin "Stopping lxd service and containers"
-    if "${DAEMON}" shutdown; then
-	/etc/init.d/lxd zap
-	rm -f ${PIDFILE}
-    fi
-    eend $?
-}
diff --git a/app-emulation/lxd/files/lxd-2.18.service b/app-emulation/lxd/files/lxd-2.18.service
deleted file mode 100644
index d00635fbcdd9..000000000000
--- a/app-emulation/lxd/files/lxd-2.18.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Container hypervisor based on LXC
-
-[Service]
-ExecStart=/usr/sbin/lxd --group lxd
-KillMode=process
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
diff --git a/app-emulation/lxd/files/lxd-2.18-dont-go-get.patch b/app-emulation/lxd/files/lxd-dont-go-get.patch
index a6e25e325b95..a6e25e325b95 100644
--- a/app-emulation/lxd/files/lxd-2.18-dont-go-get.patch
+++ b/app-emulation/lxd/files/lxd-dont-go-get.patch
diff --git a/app-emulation/lxd/lxd-2.18.ebuild b/app-emulation/lxd/lxd-2.21.ebuild
index cfc21bd24259..02be044835f8 100644
--- a/app-emulation/lxd/lxd-2.18.ebuild
+++ b/app-emulation/lxd/lxd-2.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,35 +9,51 @@ EGO_PN_PARENT="github.com/lxc"
 EGO_PN="${EGO_PN_PARENT}/lxd"
 
 # Maintained with https://github.com/hsoft/gentoo-ego-vendor-update
+# The "# branch" comments are there for the script, they're important.
 EGO_VENDOR=(
+	"github.com/syndtr/gocapability db04d3cc01c8b54962a58ec7e491717d06cfcc16"
 	"github.com/dustinkirkland/golang-petname d3c2ba80e75eeef10c5cf2fc76d2c809637376b3"
-	"github.com/golang/protobuf 130e6b02ab059e7b717a096f397c5b60111cae74"
-	"github.com/gorilla/mux 3f19343c7d9ce75569b952758bd236af94956061"
-	"github.com/gorilla/websocket 6f34763140ed8887aed6a044912009832b4733d7"
+	"github.com/juju/gomaasapi 663f786f595ba1707f56f62f7f4f2284c47c0f1d"
+	"github.com/juju/loggo 8232ab8918d91c72af1a9fb94d3edbe31d88b790"
+	"github.com/juju/persistent-cookiejar d5e5a8405ef9633c84af42fbcc734ec8dd73c198"
+	"github.com/juju/utils 4d9b38694f1e441c16421e2320f2b2fbd97fa597"
+	"github.com/juju/idmclient 15392b0e99abe5983297959c737b8d000e43b34c"
+	"github.com/juju/errors c7d06af17c68cd34c835053720b21f6549d9b0ee"
+	"github.com/juju/go4 40d72ab9641a2a8c36a9c46a51e28367115c8e59"
+	"github.com/juju/httprequest 77d36ac4b71a6095506c0617d5881846478558cb"
+	"github.com/juju/version 1f41e27e54f21acccf9b2dddae063a782a8a7ceb"
+	"github.com/juju/webbrowser 54b8c57083b4afb7dc75da7f13e2967b2606a507"
+	"github.com/juju/schema e4e05803c9a103fdfa880476044100ac17e54830"
+	"github.com/gorilla/websocket cdedf21e585dae942951e34d6defc3215b4280fa"
+	"github.com/gorilla/mux 5ab525f4fb1678e197ae59401e9050fa0b6cb5fd"
+	"github.com/mpvl/subtest f6e4cfd4b9ea1beb9fb5d53afba8c30804a02ae7"
+	"github.com/olekukonko/tablewriter 65fec0d89a572b4367094e2058d3ebe667de3b60"
+	"github.com/golang/protobuf 1e59b77b52bf8e4b449a57e6f79f21226d571845"
+	"github.com/julienschmidt/httprouter e1b9828bc9e5904baec057a154c09ca40fe7fae0"
 	"github.com/gosexy/gettext 74466a0a0c4a62fea38f44aa161d4bbfbe79dd6b"
-	"github.com/jessevdk/go-flags 6cf8f02b4ae8ba723ddc64dcfd403e530c06d927"
-	"github.com/mattn/go-colorable ad5389df28cdac544c99bd7b9161a0b5b6ca9d1b"
+	"github.com/stretchr/testify 2aa2c176b9dab406a6970f6a55f513e8a8c8b18f"
 	"github.com/mattn/go-runewidth 97311d9f7767e3d6f422ea06661bc2c7a19e8a5d"
-	"github.com/mattn/go-sqlite3 05548ff55570cdb9ac72ff4a25a3b5e77a6fb7e5"
-	"github.com/olekukonko/tablewriter 0fd34425a5aee40ff3f260b34e6c3b0d59f58c66"
-	"github.com/pborman/uuid e790cca94e6cc75c7064b1332e63811d4aae1a53"
-	"github.com/stretchr/testify 890a5c3458b43e6104ff5da8dfa139d013d77544"
-	"github.com/syndtr/gocapability db04d3cc01c8b54962a58ec7e491717d06cfcc16"
-	"github.com/go-stack/stack 817915b46b97fd7bb80e8ab6b69f01a53ac3eebf"
-	"github.com/mattn/go-isatty fc9e8d8ef48496124e79ae0df75490096eccf6fe"
-	"github.com/juju/errors c7d06af17c68cd34c835053720b21f6549d9b0ee"
-	"golang.org/x/crypto 7d9177d70076375b9a59c8fde23d52d9c4a7ecd5 github.com/golang/crypto"
-	"golang.org/x/net 0744d001aa8470aaa53df28d32e5ceeb8af9bd70 github.com/golang/net"
-	"golang.org/x/sync f52d1811a62927559de87708c8913c1650ce4f26 github.com/golang/sync"
-	"golang.org/x/text 1cbadb444a806fd9430d14ad08967ed91da4fa0a github.com/golang/text"
-	"golang.org/x/tools e531a2a1c15f94033f6fa87666caeb19a688175f github.com/golang/tools"
-	"golang.org/x/sys 429f518978ab01db8bb6f44b66785088e7fba58b github.com/golang/sys"
-	"gopkg.in/check.v1 20d25e2804050c1cd24a7eea1e7a6447dd0e74ec github.com/go-check/check"
-	"gopkg.in/flosch/pongo2.v3 5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9 github.com/flosch/pongo2"
-	"gopkg.in/inconshreveable/log15.v2 b105bd37f74e5d9dc7b6ad7806715c7a2b83fd3f github.com/inconshreveable/log15"
-	"gopkg.in/lxc/go-lxc.v2 89b06ca6fad6daea5a72a1f47e69e39716c46198 github.com/lxc/go-lxc"
-	"gopkg.in/tomb.v2 d5d1b5820637886def9eef33e03a27a9f166942c github.com/go-tomb/tomb"
-	"gopkg.in/yaml.v2 eb3733d160e74a9c7e442f435eb3bea458e1d19f github.com/go-yaml/yaml"
+	"github.com/mattn/go-isatty 6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c"
+	"github.com/mattn/go-colorable 6fcc0c1fd9b620311d821b106a400b35dc95c497"
+	"github.com/mattn/go-sqlite3 d5ffb5c0cca8778699a929b236766f4a7af674e8"
+	"github.com/rogpeppe/fastuuid 6724a57986aff9bff1a1770e9347036def7c89f6"
+	"github.com/pborman/uuid e533369306653d193b93dae055f6083cbf8ba54f"
+	"github.com/lxc/lxd a324ad91230e5353fe746d06636dc59211122e6c"
+	"golang.org/x/crypto d585fd2cc9195196078f516b69daff6744ef5e84 github.com/golang/crypto"
+	"golang.org/x/net d866cfc389cec985d6fda2859936a575a55a3ab6 github.com/golang/net"
+	"golang.org/x/sys 571f7bbbe08da2a8955aed9d4db316e78630e9a3 github.com/golang/sys"
+	"gopkg.in/retry.v1 01631078ef2fdce601e38cfe5f527fab24c9a6d2 github.com/go-retry/retry" # branch v1
+	"gopkg.in/macaroon.v2 bed2a428da6e56d950bed5b41fcbae3141e5b0d0 github.com/go-macaroon/macaroon" # branch v2
+	"gopkg.in/yaml.v2 287cf08546ab5e7e37d55a84f7ed3fd1db036de5 github.com/go-yaml/yaml" # branch v2
+	"gopkg.in/juju/names.v2 54f00845ae470a362430a966fe17f35f8784ac92 github.com/juju/names" # branch v2
+	"gopkg.in/juju/environschema.v1 7359fc7857abe2b11b5b3e23811a9c64cb6b01e0 github.com/juju/environschema" # branch v1
+	"gopkg.in/macaroon-bakery.v2 ec9d2ad6796100720c154f614b6dea8798ec1181 github.com/go-macaroon-bakery/macaroon-bakery" # branch v2
+	"gopkg.in/httprequest.v1 fdaf1bffa25560ba0920e3e29aae85d3677ab32e github.com/go-httprequest/httprequest" # branch v1
+	"gopkg.in/flosch/pongo2.v3 5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9 github.com/flosch/pongo2" # branch v3.0
+	"gopkg.in/mgo.v2 3f83fa5005286a7fe593b055f0d7771a7dce4655 github.com/go-mgo/mgo" # branch v2
+	"gopkg.in/tomb.v2 d5d1b5820637886def9eef33e03a27a9f166942c github.com/go-tomb/tomb" # branch v2
+	"gopkg.in/errgo.v1 442357a80af5c6bf9b6d51ae791a39c3421004f3 github.com/go-errgo/errgo" # branch v1
+	"gopkg.in/lxc/go-lxc.v2 a7d112aed2f5f57f565d6e557671eeef7e76811c github.com/lxc/go-lxc" # branch v2
 )
 
 ARCHIVE_URI="https://${EGO_PN}/archive/${P}.tar.gz -> ${P}.tar.gz"
@@ -113,7 +129,7 @@ ERROR_NF_NAT_MASQUERADE_IPV6="NF_NAT_MASQUERADE_IPV6: needed for network command
 ERROR_VXLAN="VXLAN: needed for network commands"
 
 PATCHES=(
-	"${FILESDIR}/${P}-dont-go-get.patch"
+	"${FILESDIR}/${PN}-dont-go-get.patch"
 )
 
 src_prepare() {
@@ -146,6 +162,8 @@ src_test() {
 		cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
 
 		emake check
+	else
+		einfo "No tests to run for client-only builds"
 	fi
 }
 
@@ -163,15 +181,15 @@ src_install() {
 	fi
 
 	if use daemon; then
-		newinitd "${FILESDIR}"/${P}.initd lxd
-		newconfd "${FILESDIR}"/${P}.confd lxd
+		newinitd "${FILESDIR}"/${PN}.initd lxd
+		newconfd "${FILESDIR}"/${PN}.confd lxd
 
-		systemd_newunit "${FILESDIR}"/${P}.service ${PN}.service
+		systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
 	fi
 
 	newbashcomp config/bash/lxd-client lxc
 
-	dodoc AUTHORS CONTRIBUTING.md README.md doc/*
+	dodoc AUTHORS README.md doc/*
 }
 
 pkg_postinst() {
diff --git a/app-emulation/punes/Manifest b/app-emulation/punes/Manifest
new file mode 100644
index 000000000000..d46e4a186f53
--- /dev/null
+++ b/app-emulation/punes/Manifest
@@ -0,0 +1,3 @@
+DIST punes-0.102.tar.gz 4670534 BLAKE2B 04576110e4fcd9aeaa3dfb6812ab7a21305200c82651be00defcb59b91374b155b279818f2e09d217841aa8567c41e06067252538fb68b7b907d5ab29b02c678 SHA512 dff95b25f64ed03060b6dd187d7a283acfddb6bea4168df5be4d309bd6aabdcaa5d0ea0312d0824205bf134cd0ddabf014e82a81c8a901a59258475ec24bd394
+EBUILD punes-0.102.ebuild 998 BLAKE2B a62f3eb9ca0c2aa2d992aebffc3d299bec9b0c9112421820013d2292fe54c677b43be307456ee2e2936af0c308745f1ced8ea20c55bd6d39a27319c9048fa45c SHA512 95a359fa66d6087eb886c425ee853f048aa948579500e9e2a5908d4e57804b3b1faaaf7a6ad92074b86b9581bc61386ebce6c92e9ee2786fb022e3e6c1fc30bb
+MISC metadata.xml 625 BLAKE2B 3ae9de8ff12a46dd98f0132843cf2fe0f7be77d33497fc2a97b026adba711f2bafd04f71140bf4cddaf6242dc4a9b85ea26f8ec905f0325041dc10b0afa85e4b SHA512 d93f23a57d82c716a4b25526ba184ab135fdd81de106e90b7ba2589607d42f16c28b326e257345f34a85f7cda09cd90cda4dc6989b02b46de6350e343c71c2f6
diff --git a/app-emulation/punes/metadata.xml b/app-emulation/punes/metadata.xml
new file mode 100644
index 000000000000..c8d6de050519
--- /dev/null
+++ b/app-emulation/punes/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>azamat.hackimov@gmail.com</email>
+		<name>Azamat H. Hackimov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		Nintendo Entertainment System (NES) emulator
+	</longdescription>
+	<use>
+		<flag name="cg">Add support for Nvidia CG Toolkit</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">punesemu/puNES</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-emulation/punes/punes-0.102.ebuild b/app-emulation/punes/punes-0.102.ebuild
new file mode 100644
index 000000000000..cb13a8549234
--- /dev/null
+++ b/app-emulation/punes/punes-0.102.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools xdg-utils
+
+DESCRIPTION="Nintendo Entertainment System (NES) emulator"
+HOMEPAGE="https://github.com/punesemu/puNES"
+SRC_URI="https://github.com/punesemu/puNES/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cg"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	cg? ( media-gfx/nvidia-cg-toolkit )
+	media-libs/alsa-lib
+	media-libs/libsdl[opengl]
+	virtual/opengl"
+
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/puNES-${PV}"
+
+src_prepare() {
+	default
+
+	sed -i "/update-desktop-database/d" misc/Makefile.am || die
+	eautoreconf
+	# FIXME why eautoreconf can't handle this?
+	cd "src/extra/lib7zip-1.6.5" || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-qt5 \
+		$(use_with cg opengl-nvidia-cg)
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 457c9ad682af..0fe61831da36 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/gcal/Manifest b/app-misc/gcal/Manifest
index c1255c15e122..8c619d122a49 100644
--- a/app-misc/gcal/Manifest
+++ b/app-misc/gcal/Manifest
@@ -1,3 +1,5 @@
 DIST gcal-3.6.3.tar.xz 1640172 BLAKE2B 322a3bf34a389ab92daa0262b8b36f99b585c7f76e46e5a921a5e23ced74ae98bf09446e02988c98c29ecadf631b6624cb43e76c8da736a185e52ed34441c334 SHA512 9be7d6e58a55fbb7531f91bd2a6fa51e8d62364636c31d8d65f6ac24415ac2de8af5eaab8496e155c2820b7480ecf926c4395114ff4363deb21bd268dec44963
+DIST gcal-4.1.tar.xz 1658948 BLAKE2B 980b509923d7e3afbd391f1129a77e647f61e09d68aec29490bc16041260e56082097732f015260515036a4560bee18391c8f6aaa5eaff69740f18a37a44d8f2 SHA512 24b9ee87c3dbfd3231b2017fd0a3030cc5b7c7fde032ea1fcf816b0f10dc40d808c646aa8ece86651da4f3928fecf35f84f4c68c0bfdb8cf63e3ecc189d2074d
 EBUILD gcal-3.6.3.ebuild 754 BLAKE2B 1b246ad82eafd5eae92372c6a4135d1bd4cdbb9217c399e200713c4888ef4b1a0ade87cdbaa6bef9a437e7e545c2e2cab7be0f26df69b6f93b9d67f491097ccb SHA512 67c6ce485011bc233e014305a3a2a5c5f721fcd5f6e35505e8d0282deb14a633219037e2b13d104abbf6fc7ef79ae630bb0ccdf8981f683ea77aa7f1c90fddc7
+EBUILD gcal-4.1.ebuild 758 BLAKE2B f271e00dda5a0bf25cae855833c05c3a0062ae1e52985ec730f3fe5caa7ab28a465ddb2cbffbb14fb1c0f61bbf78d50945a59e81eeaec42664da517fb2cc7f3d SHA512 3685267017698d218cd46fde8318f43cd33be38bd6727c8f56ab59d481ef82812bc99c0a6a2a0cd0f23194389a7b8ce240e0a59009862b60012927ce2e41dd61
 MISC metadata.xml 1018 BLAKE2B cb75f985009092bb5b22cc15d4ad11da0f049d6b4fe1ac02479a73d5333102a0abe0a80f7673b408d6991b9c1c862706279a25abbd071f9faf3c1d012d69ecc1 SHA512 44362e0e9926b26bab6a3eef736bb8e6c1d76e33f94ec546a97bde251a5e03d8102d3f17ea48a20f18da957c325b766647e3574bd8e13f0f070a15b105d07ea3
diff --git a/app-misc/gcal/gcal-4.1.ebuild b/app-misc/gcal/gcal-4.1.ebuild
new file mode 100644
index 000000000000..da50405b5703
--- /dev/null
+++ b/app-misc/gcal/gcal-4.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="The GNU Calendar - a replacement for cal"
+HOMEPAGE="https://www.gnu.org/software/gcal/"
+SRC_URI="mirror://gnu/gcal/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="ncurses nls unicode"
+
+DEPEND="
+	app-arch/xz-utils
+	nls? ( >=sys-devel/gettext-0.17 )"
+
+RDEPEND="nls? ( virtual/libintl )"
+
+DOCS=( BUGS LIMITATIONS NEWS README THANKS TODO )
+
+src_configure() {
+	tc-export CC
+	append-cppflags -D_GNU_SOURCE
+	econf \
+		--disable-rpath \
+		$(use_enable nls) \
+		$(use_enable ncurses term) \
+		$(use_enable unicode)
+}
diff --git a/app-misc/gnote/Manifest b/app-misc/gnote/Manifest
index d40925dc11b5..e7efdbb20dc9 100644
--- a/app-misc/gnote/Manifest
+++ b/app-misc/gnote/Manifest
@@ -1,7 +1,3 @@
-DIST gnote-3.22.1.tar.xz 3309984 BLAKE2B 0d8efac1e58a931682da5d2b10e2ed58df43a581aac428cb93f6f208be1e888c41f5f6a9595305a3f16ec95a1b2f33a11a0800a1ba3ac641d6ac31129ec9a3f8 SHA512 0bbf89b39699294fe5a373decf10bcd7f3a86a20c49b9d82699fb758c7cd27b6939764236a1a7ffe21964a2ae196780d0861123776b1568344935e0b649e2f5f
-DIST gnote-3.24.0.tar.xz 3307940 BLAKE2B 2f0ef3649b9fd998a03e18959612ef87be0e36e9f2e65c2562b891c1f8baf529f1b7186ef1bb077bfc85b5cbb8a0686110ec09a189dc06d4fb78327696fa4d09 SHA512 640f24d1829a546e53eb2d269f965daafa651e141566fd2f7a4572245b309c06259f548fa38c86c55954f2d0f8f98c48b7da2ed982864ae6ffbcac4b5d64aecb
 DIST gnote-3.24.1.tar.xz 3310012 BLAKE2B b6167dbb2461e574e4f21b2f227eb9a3c89708ddd15a561146faa044130e5c9ccc6d64b4923c30726160ee35d4ab5a0ae04b1593e74af2fa6566582af9bc1f18 SHA512 759fb2984312a3e3d5aed9b79f2309021b69df57b820d34814a5d3d9b5c9201abc6e50d83bf64f30974991d779b0b85e599435a24ee1326b867a2a4be8e0f37e
-EBUILD gnote-3.22.1.ebuild 1501 BLAKE2B bb2686d46b78aaf97d6e31da957f61b31708b2521df8661a7a2b242d957107cdd8dd402c35fde4bba12e2bfe3c99274a87698d06b6cf300c8ecf542ff948b6d9 SHA512 7e69f8606e62d3383d24c9ae5ed5026eadddd0f579bfff8c0fcea512116cb549ebab11505097214fb77db203889eef3c5da16452d9a46b5f7fb9efa3411c804e
-EBUILD gnote-3.24.0.ebuild 1549 BLAKE2B 1130bcb2ac9fa49c110672fb95ddd2b96bf074a693bf5ca0f91fd528f5c847fa83511e34713f2638278cf2506cc402fe65079e1a4bfc005c9c1853434169fedb SHA512 255c4a96c1728b559531727acc1b70be827bf985ca0522729bb03944ee24b090574db64baff4a16788edcaed435c6a39aa08fdbf5f70acddbdc63a3fcfe5b7ea
-EBUILD gnote-3.24.1.ebuild 1548 BLAKE2B e8c43e30230e3e8f7ff211f8aa02abb663f2f4146ee07518aa916de429b0009c4db9a366c577039ae28fc1afc443422f340a3d3b3e68054119a878a41d922400 SHA512 7283941fa353f66dbcb321d776d6b8c01c40165ac1ab982ec7489aa818973915525280a57400731e1590b00d3c01493c475408334cd8b9d2f3a767c711b4ab2f
+EBUILD gnote-3.24.1.ebuild 1547 BLAKE2B 8a0e15ea352c054b0d777386d798334f921e5778c462822e932a5f21f0442b7bd71738f4ebc91ada4f6eb58c60af5d4876bc0265d0d283fcbe925cc4c8ce2bd7 SHA512 6144bccd5cd942f967729912371ff82622874cde18bfda99f905322a9fa16d3e52d0d973d17d4b2da5c92d93ada3eadd19f9f90db57bdddfa2b03cbeb12aff7d
 MISC metadata.xml 342 BLAKE2B 51d98560833845aa6d1f2b9f4c85021fd317434efcd81ba31d106c7b4945acd23cfefc2de2a601ffef3d330adcf93ec0377f69107fa37771d80f7dff056d32ff SHA512 c68c058e279222cc9293a5b97fbf450f95a940a70a32b1adcac3e6276783d2bcc545f39895e92e7bd62c9ac5dc98139dc9800513c2a828895ba1fcf023227d21
diff --git a/app-misc/gnote/gnote-3.22.1.ebuild b/app-misc/gnote/gnote-3.22.1.ebuild
deleted file mode 100644
index 26e294954bc2..000000000000
--- a/app-misc/gnote/gnote-3.22.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 readme.gentoo-r1
-
-DESCRIPTION="Desktop note-taking application"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gnote"
-
-LICENSE="GPL-3+ FDL-1.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-# Automagic glib-2.32 dep
-COMMON_DEPEND="
-	>=app-crypt/libsecret-0.8
-	>=app-text/gtkspell-3.0:3
-	>=dev-cpp/glibmm-2.32:2
-	>=dev-cpp/gtkmm-3.18:3.0
-	>=dev-libs/boost-1.34:=
-	>=dev-libs/glib-2.32:2[dbus]
-	>=dev-libs/libxml2-2:2
-	dev-libs/libxslt
-	>=sys-apps/util-linux-2.16:=
-	>=x11-libs/gtk+-3.20:3
-"
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gsettings-desktop-schemas
-"
-DEPEND="${DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	>=dev-util/intltool-0.35.0
-	dev-util/itstool
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Do not alter CFLAGS
-	sed 's/-DDEBUG -g/-DDEBUG/' -i configure.ac configure || die
-
-	gnome2_src_prepare
-
-	if has_version net-fs/wdfs; then
-		DOC_CONTENTS="You have net-fs/wdfs installed. app-misc/gnote will use it to
-		synchronize notes."
-	else
-		DOC_CONTENTS="Gnote can use net-fs/wdfs to synchronize notes.
-		If you want to use that functionality just emerge net-fs/wdfs.
-		Gnote will automatically detect that you did and let you use it."
-	fi
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable debug)
-}
-
-src_install() {
-	gnome2_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/app-misc/gnote/gnote-3.24.0.ebuild b/app-misc/gnote/gnote-3.24.0.ebuild
deleted file mode 100644
index b0b68f6acf71..000000000000
--- a/app-misc/gnote/gnote-3.24.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 readme.gentoo-r1
-
-DESCRIPTION="Desktop note-taking application"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gnote"
-
-LICENSE="GPL-3+ FDL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-# Automagic:
-# glib-2.32 dep
-# >=dev-libs/unittest++-1.5.1 (but not detected due to missing .pc)
-COMMON_DEPEND="
-	>=app-crypt/libsecret-0.8
-	>=app-text/gtkspell-3.0:3
-	>=dev-cpp/glibmm-2.32:2
-	>=dev-cpp/gtkmm-3.18:3.0
-	>=dev-libs/glib-2.32:2[dbus]
-	>=dev-libs/libxml2-2:2
-	dev-libs/libxslt
-	>=sys-apps/util-linux-2.16:=
-	>=x11-libs/gtk+-3.20:3
-"
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gsettings-desktop-schemas
-"
-DEPEND="${DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	>=dev-util/intltool-0.35.0
-	dev-util/itstool
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Do not alter CFLAGS
-	sed 's/-DDEBUG -g/-DDEBUG/' -i configure.ac configure || die
-
-	gnome2_src_prepare
-
-	if has_version net-fs/wdfs; then
-		DOC_CONTENTS="You have net-fs/wdfs installed. app-misc/gnote will use it to
-		synchronize notes."
-	else
-		DOC_CONTENTS="Gnote can use net-fs/wdfs to synchronize notes.
-		If you want to use that functionality just emerge net-fs/wdfs.
-		Gnote will automatically detect that you did and let you use it."
-	fi
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable debug)
-}
-
-src_install() {
-	gnome2_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/app-misc/gnote/gnote-3.24.1.ebuild b/app-misc/gnote/gnote-3.24.1.ebuild
index f9c8ea235ec6..efeb2abea8e1 100644
--- a/app-misc/gnote/gnote-3.24.1.ebuild
+++ b/app-misc/gnote/gnote-3.24.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gnote"
 
 LICENSE="GPL-3+ FDL-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 # Automagic:
diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index d2416912faac..09251f980f46 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -1,5 +1,6 @@
 AUX tmux-2.0-flags.patch 584 BLAKE2B 3202e29756f9cc3f7f7538f11ddefdf795af316af71cd2a0b7c043223a424181b929d5cc58c05c31412503fd053cff6fe9a096d49412b6860adb363df4ac0b03 SHA512 029a29182f5998c19883f24eab980d16f2e89c72f4150354e0a1101f9092491e836952fb9442e511508f47fd701c8cc8171f29c6ff097248894b6696d108f6dd
 AUX tmux-2.3-flags.patch 438 BLAKE2B 9f2b67ddfbd13c25830f95272053935d669252f746dabd30db5c4e01b148c22d2e848e09062058c71bc93d1a83f77f8e1bb2fbcb92f61cd35a4ff2305e92edca SHA512 2fed56091a92ba4e4c9e49144099d8a9dbdd2f157562f65b547a5ae864d82e7123acba46dd380bb9d470a5cb5f681702f5b6bdf230f411ed727095c0b9c38bfa
+AUX tmux-2.3-pipe_pane-fix.patch 208 BLAKE2B 08eb18d22eff0bcfc97f0656d5d2c8395ce9d4d61ba140d6b0006ec01c544ec0bbf9018a5b6e08dba5a66085921d5df87eee0b606614f7d810901ff50e99438d SHA512 bd2376434f6e7dd344587363d0d788559e24cfbfed96def3331d79e9830916b8a7882e62ac9838caafb132fb88e56a2587e50a93eaa22444542bb8e381da2d23
 AUX tmux-2.3-screen_write_copy-fix.patch 1955 BLAKE2B bb7796c21165d99fa0348ae8970a548a6fc34966b1b2ea896a8af48631b367e29e5c3ac2b6da45e4bd1c639f072b3390369c98ba47920b234ff9535133fc16eb SHA512 c4ad6ce33dbf7ce47a811da1172a5c29475a7e2479f8e662d263a6206ff73781cce99018c976d151e8dec25e7f1cf07fa0c93bf0634f35484651d2ee17efaea8
 AUX tmux-2.4-flags.patch 456 BLAKE2B df85b32486894e8e3c5531937461ad46ca5effc5dd4d31b4f7a3f9bcf8d3dfa38fc186a603a90fe734b25781b9d517115c2b089648c29e4605fa9610f6dc311a SHA512 505d5ec4fa1d7844870c67aedccac3a147db1971464fc21d19319bb343fb6fd73b696e85298f8592e46900774b35b250cc53841b05514333c44c3e973bcdb860
 AUX tmux.vim 55 BLAKE2B 91b883af5b048d04637a893d11615af24c02671ce45b9d114939cef3b8e76f5f826646e10bc68dd7c92af96ddb9ef0bf7bc25b976e645b9b8bb3eb2c8db47f55 SHA512 5307bf7d27209ce143d7a57856440ba0462783f5b047b00ec5a5046f1b72110e62ef8bca47b67807cb9e9ffcede06c512f6136d825260f735cc32a63706c9e5e
@@ -11,6 +12,7 @@ DIST tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b 458 BLAKE2B 0
 DIST tmux.vim-95f6126c187667cc7f9c573c45c3b356cf69f4ca 5626 BLAKE2B dd22713fee56e3dadd573c888ab17561879f756df369cdbe552e052842f527c5310c6cd46342ccd3e3e01835d0f616f4ecb202567674dc4809bc08253ad66bea SHA512 956b2c1ca08e3c92aa39c9df54fbe1c661d0e076c91628c4b88f81f97104241b6505412fa0e21a681adc231eb2e6e7feee850474d4277812d186548bbb05f6d1
 EBUILD tmux-2.2.ebuild 2126 BLAKE2B 08176ade022eab5db71d0e371a8b668dd8565b7f5056ed12ae644e93bdd6f518de0275fd64043221639ee0d4638eeeafd3a1dee7e5c34df007b4bb4ac9c1bec2 SHA512 cd6f0142fefd2f72d92ed12a68f812e8fec73254c1e729edf4fc9326f85e5f8be6b1253b88a5e927d6633dcd1f828385e10b643818f167319cc073276be5dec5
 EBUILD tmux-2.3-r1.ebuild 2234 BLAKE2B 3bb0de689495b69f479ad605480a0c93a13cbdbd526bd5121f158af133f382a25fed90ae83cd10c733e3bd120fe899d91cfe5b7a93b89d349d0adf1a6ce4157e SHA512 2dd1c25573817c6ea2bb2667a0f9f3fb63d46ce547e0a3487dd62c7bcdfbd5cb1cc610d9d324e816eeed8ffa5d66212b80a1a5caaa477ee7baa6fa2b629342c0
+EBUILD tmux-2.3-r2.ebuild 2242 BLAKE2B 75da9813dc3ab1ecb854a15c8c06e84b88feb51bf21f876eaf385040ef07071be1dff7f34c6f9b62402a85f042f0088c4da088b1b882fbafbe292c4d7ec01d1f SHA512 ac9454dafba18b5f76c0f77a620ece677b8d195cb6f50fc57116bea4985e7c01e692d758ac42eb3a20d7c2c18f73c8bfcc2460f9535fc2c80180d3efb1462e6e
 EBUILD tmux-2.5-r2.ebuild 2073 BLAKE2B 1c3ee0f7eb1e2a26f5c7a0bc73442dcdd160d1bdd9a7bdad62a2397854b8ad08b4c055b985df9d8ba3d1bcf49033c30ff28443f8f7abbae55b54a622035c13d0 SHA512 fa557f19858c312918d6190cbd029dcbfec05a494236027e3be78bd8be8843823f5112150387986709881577b0bb3fc66bba42a4001729456136dd89739844d5
 EBUILD tmux-2.5.ebuild 2263 BLAKE2B f03e993159487bd92fe3e328d5f79d7bb3bc6b75ab3ecabae51dc64b156db260c7e2242a173e77a32a16dc14ab6276feec77cf7d94f2145c98d6209e9a8fed4d SHA512 d5abbfd108431a47bab4195e9397d0b2748fd59c0036c0c71caa34b741069eb0a5a3d14fe98d0874d312e740a5831a7df3aecc0de2eb3163842663a94638a389
 EBUILD tmux-2.6.ebuild 2148 BLAKE2B cb0d599dc13da996d17024010625bed7a90234246a3b14cc47600e2bf584763cb024536c962f7d2c37901c763e58ca99e6ce71fa728fded3d8aa6d2ded016b58 SHA512 46b4fc09f9ca6c65cf50c3940ade441e0adbadc72fd3a06d617af996d1f6ee3017b04c89682dd69eeb6091d4ad614b53723f7b71ba16bfac4e4d5be374a1c9c3
diff --git a/app-misc/tmux/files/tmux-2.3-pipe_pane-fix.patch b/app-misc/tmux/files/tmux-2.3-pipe_pane-fix.patch
new file mode 100644
index 000000000000..65dd2f3c1bc9
--- /dev/null
+++ b/app-misc/tmux/files/tmux-2.3-pipe_pane-fix.patch
@@ -0,0 +1,9 @@
+--- a/window.c	2016-09-29 05:31:24.000000000 +0800
++++ b/window.c	2017-12-22 09:38:43.709617000 +0800
+@@ -981,7 +981,7 @@
+
+ 	input_parse(wp);
+
+-	wp->pipe_off = size;
++	wp->pipe_off = EVBUFFER_LENGTH(evb);
+ }
diff --git a/app-misc/tmux/tmux-2.3-r2.ebuild b/app-misc/tmux/tmux-2.3-r2.ebuild
new file mode 100644
index 000000000000..3bed9128b2f8
--- /dev/null
+++ b/app-misc/tmux/tmux-2.3-r2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic versionator
+
+DESCRIPTION="Terminal multiplexer"
+HOMEPAGE="http://tmux.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+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"
+IUSE="debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux"
+
+CDEPEND="
+	>=dev-libs/libevent-2.1.5-r4:=
+	utempter? (
+		kernel_linux? ( sys-libs/libutempter )
+		kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) )
+	)
+	sys-libs/ncurses:0="
+
+DEPEND="
+	${CDEPEND}
+	virtual/pkgconfig"
+
+RDEPEND="
+	${CDEPEND}
+	selinux? ( sec-policy/selinux-screen )
+	vim-syntax? (
+		|| (
+			app-editors/vim
+			app-editors/gvim
+		)
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3-flags.patch
+
+	# usptream fixes (can be removed with next version bump)
+	"${FILESDIR}"/${P}-screen_write_copy-fix.patch
+	"${FILESDIR}"/${P}-pipe_pane-fix.patch
+)
+
+src_prepare() {
+	default
+
+	# regenerate aclocal.m4 to support earlier automake versions
+	rm aclocal.m4 || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# bug 438558
+	# 1.7 segfaults when entering copy mode if compiled with -Os
+	replace-flags -Os -O2
+
+	econf \
+		--sysconfdir="${EPREFIX}"/etc \
+		$(use_enable debug) \
+		$(use_enable utempter)
+}
+
+src_install() {
+	default
+
+	dodoc example_tmux.conf
+	docompress -x /usr/share/doc/${PF}/example_tmux.conf
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${FILESDIR}"/tmux.vim
+	fi
+}
+
+pkg_postinst() {
+	if ! version_is_at_least 1.9a ${REPLACING_VERSIONS:-1.9a}; then
+		ewarn
+		ewarn "Some configuration options changed in this release."
+		ewarn "Please read the CHANGES file in /usr/share/doc/${PF}/"
+		ewarn
+		ewarn "WARNING: After updating to ${P} you will _not_ be able to connect to any"
+		ewarn "older, running tmux server instances. You'll have to use an existing client to"
+		ewarn "end your old sessions or kill the old server instances. Otherwise you'll have"
+		ewarn "to temporarily downgrade to access them."
+		ewarn
+	fi
+}
diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index c8e55b568b0d..0b81af2a95a1 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -1,5 +1,3 @@
-DIST tracker-1.12.3.tar.xz 5053768 BLAKE2B e67054e8a9f61c7342ae05136aef20589efb59991b5222d046359f936eb1b1bd970d00ec21f3e749aeaa22df58115f89085197a0fd7abd910e1fbfcbea19211b SHA512 4c2155a295bc431740e52394885edfa2fd8487ef2f4b6749b9392a82ac355a440fb34381267a8793414fe750501fed7e1b1d0c5b06a766282513de78adde41d3
 DIST tracker-1.12.4.tar.xz 5051884 BLAKE2B 99cc85fc4d49691eb0a73e4f1776d9971b5cbe5844478825e473137b4d7b13e2578065be497da57285abc2d3cf4c6d1ed1b077a01cd68dc093e18ddd7674c1f1 SHA512 e81af22733c7d80535c79e23a4b3edbbcf888eede1dff071d466518054e90d4c207af76bcb4d8c73dc20729ae2eab60444ca91ee7ae09e96c0da2fdab97752c1
-EBUILD tracker-1.12.3.ebuild 7607 BLAKE2B 1ed9f194bb63add1ecd39ecc1e5604b099db855f75364a8c49bcf6db33c7a8ea0a2a5b1c253546dcc2cbe40b94481cdff3265c6df27aacf8a2f3ffb2b1761b14 SHA512 19477ec52dfa0eb0d28db6ca9db4c77589b4b6881ca9ea10dbe7657f4577a616189dc4daf02fd2a1f3fe25416419dd57801322fa999975d3c507ca7c9e241971
-EBUILD tracker-1.12.4.ebuild 7608 BLAKE2B 3b78019d7f58c828602fd5e3490fcc19ccd4ed69a8bdca3c95a8687d6f806d718d09fc308deebf74c56c8ca883dd105dbbe984916b0498e9b09dde685f7e6969 SHA512 ece269e4ac1b9dc8550d99e0b024a7c97adf134ac401f493fbabeae411011a3f28c78047d131539b60b7b25b155f721e7828c4a4d8f62be0b45e01dd2c6a3ea0
+EBUILD tracker-1.12.4.ebuild 7607 BLAKE2B 81fad33e737d27d9c27f4f9817a5f38a96d51e8d56f03e04da8b5ad4a131bd73243a2046cf2401bfbdcadaa6058da9fcf3305a816cd975f4134db06245a9b121 SHA512 cf76e06d94b6d64930ffdf04e9aa9f660f294a2ed7360f8a99fdd220747e08d376eb44c4b46194dd599357f2ef3e0abf56d21dbfd69ad366ace1c0172447fca3
 MISC metadata.xml 1561 BLAKE2B ce0e9984983c7e0f249af4d375361f64236fb38d105b9ce2cee6c12519c70d4e8c7801a6000adfe777b2f9bb787c47779246b148dbbb5ec6fb6e94356413d8d3 SHA512 89deedce6c26547cdc8a2b3ff1880662125b73f490293156904a942acf632e1325dbc3657cdd6a1ca53cdb7556adbd96fea2705759a0a5503e80ae95d90045c4
diff --git a/app-misc/tracker/tracker-1.12.3.ebuild b/app-misc/tracker/tracker-1.12.3.ebuild
deleted file mode 100644
index 6537b5cf23ad..000000000000
--- a/app-misc/tracker/tracker-1.12.3.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools bash-completion-r1 eutils gnome2 linux-info multilib python-any-r1 vala versionator virtualx
-
-DESCRIPTION="A tagging metadata database, search tool and indexer"
-HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/100"
-IUSE="cue elibc_glibc exif ffmpeg firefox-bookmarks flac gif gsf gstreamer
-gtk iptc +iso +jpeg libav +miner-fs mp3 nautilus networkmanager pdf playlist
-rss seccomp stemmer test thunderbird +tiff upnp-av upower +vorbis +xml xmp xps"
-
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-REQUIRED_USE="
-	?? ( gstreamer ffmpeg )
-	cue? ( gstreamer )
-	upnp-av? ( gstreamer )
-	!miner-fs? ( !cue !exif !flac !gif !gsf !iptc !iso !jpeg !mp3 !pdf !playlist !tiff !vorbis !xml !xmp !xps )
-"
-
-# According to NEWS, introspection is non-optional
-# glibc-2.12 needed for SCHED_IDLE (see bug #385003)
-# seccomp is automagic, though we want to use it whenever possible (linux)
-# >=media-libs/libmediaart-1.9:2.0 is suggested to be disabled for 1.10 for security;
-# It is disable in configure in 1.12; revisit for 1.14/2 (configure flag)
-RDEPEND="
-	>=app-i18n/enca-1.9
-	>=dev-db/sqlite-3.20:=
-	>=dev-libs/glib-2.44:2
-	>=dev-libs/gobject-introspection-0.9.5:=
-	>=dev-libs/icu-4.8.1.1:=
-	>=dev-libs/json-glib-1.0
-	>=media-libs/libpng-1.2:0=
-	>=net-libs/libsoup-2.40:2.4
-	>=x11-libs/pango-1:=
-	sys-apps/util-linux
-	virtual/imagemagick-tools[png,jpeg?]
-
-	cue? ( media-libs/libcue )
-	elibc_glibc? ( >=sys-libs/glibc-2.12 )
-	exif? ( >=media-libs/libexif-0.6 )
-	ffmpeg? (
-		libav? ( media-video/libav:= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-	firefox-bookmarks? ( || (
-		>=www-client/firefox-4.0
-		>=www-client/firefox-bin-4.0 ) )
-	flac? ( >=media-libs/flac-1.2.1 )
-	gif? ( media-libs/giflib:= )
-	gsf? ( >=gnome-extra/libgsf-1.14.24 )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0 )
-	gtk? (
-		>=x11-libs/gtk+-3:3 )
-	iptc? ( media-libs/libiptcdata )
-	iso? ( >=sys-libs/libosinfo-0.2.9:= )
-	jpeg? ( virtual/jpeg:0 )
-	upower? ( || ( >=sys-power/upower-0.9 sys-power/upower-pm-utils ) )
-	mp3? ( >=media-libs/taglib-1.6 )
-	networkmanager? ( >=net-misc/networkmanager-0.8:= )
-	pdf? (
-		>=x11-libs/cairo-1:=
-		>=app-text/poppler-0.16[cairo,utils]
-		>=x11-libs/gtk+-2.12:2 )
-	playlist? ( >=dev-libs/totem-pl-parser-3 )
-	rss? ( >=net-libs/libgrss-0.7:0 )
-	stemmer? ( dev-libs/snowball-stemmer )
-	thunderbird? ( || (
-		>=mail-client/thunderbird-5.0
-		>=mail-client/thunderbird-bin-5.0 ) )
-	tiff? ( media-libs/tiff:0 )
-	upnp-av? ( >=media-libs/gupnp-dlna-0.9.4:2.0 )
-	vorbis? ( >=media-libs/libvorbis-0.22 )
-	xml? ( >=dev-libs/libxml2-2.6 )
-	xmp? ( >=media-libs/exempi-2.1 )
-	xps? ( app-text/libgxps )
-	!gstreamer? ( !ffmpeg? ( || ( media-video/totem media-video/mplayer ) ) )
-	seccomp? ( >=sys-libs/libseccomp-2.0 )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	$(vala_depend)
-	dev-util/gdbus-codegen
-	>=dev-util/gtk-doc-am-1.8
-	>=dev-util/intltool-0.40.0
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	test? (
-		>=dev-libs/dbus-glib-0.82-r1
-		>=sys-apps/dbus-1.3.1[X] )
-"
-PDEPEND="nautilus? ( ~gnome-extra/nautilus-tracker-tags-${PV} )"
-
-function inotify_enabled() {
-	if linux_config_exists; then
-		if ! linux_chkconfig_present INOTIFY_USER; then
-			ewarn "You should enable the INOTIFY support in your kernel."
-			ewarn "Check the 'Inotify support for userland' under the 'File systems'"
-			ewarn "option. It is marked as CONFIG_INOTIFY_USER in the config"
-			die 'missing CONFIG_INOTIFY'
-		fi
-	else
-		einfo "Could not check for INOTIFY support in your kernel."
-	fi
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-	inotify_enabled
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Don't run 'firefox --version' or 'thunderbird --version'; it results in
-	# access violations on some setups (bug #385347, #385495).
-	create_version_script "www-client/firefox" "Mozilla Firefox" firefox-version.sh
-	create_version_script "mail-client/thunderbird" "Mozilla Thunderbird" thunderbird-version.sh
-
-	eautoreconf # See bug #367975
-	gnome2_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	local myconf=""
-
-	if use gstreamer ; then
-		myconf="${myconf} --enable-generic-media-extractor=gstreamer"
-		if use upnp-av; then
-			myconf="${myconf} --with-gstreamer-backend=gupnp-dlna"
-		else
-			myconf="${myconf} --with-gstreamer-backend=discoverer"
-		fi
-	elif use ffmpeg ; then
-		myconf="${myconf} --enable-generic-media-extractor=libav"
-	else
-		myconf="${myconf} --enable-generic-media-extractor=external"
-	fi
-
-	# unicode-support: libunistring, libicu or glib ?
-	# According to NEWS, introspection is required
-	# is not being generated
-	# nautilus extension is in a separate package, nautilus-tracker-tags
-	# miner-evolution disabled as it's incompatible with current eds
-	gnome2_src_configure \
-		--disable-hal \
-		--disable-miner-evolution \
-		--disable-nautilus-extension \
-		--disable-static \
-		--enable-abiword \
-		--enable-artwork \
-		--enable-dvi \
-		--enable-enca \
-		--enable-guarantee-metadata \
-		--enable-icon \
-		--enable-introspection \
-		--disable-libmediaart \
-		--enable-libpng \
-		--enable-miner-apps \
-		--enable-miner-user-guides \
-		--enable-ps \
-		--enable-text \
-		--enable-tracker-fts \
-		--enable-tracker-writeback \
-		--with-unicode-support=libicu \
-		--with-bash-completion-dir="$(get_bashcompdir)" \
-		$(use_enable cue libcue) \
-		$(use_enable exif libexif) \
-		$(use_enable firefox-bookmarks miner-firefox) \
-		$(use_with firefox-bookmarks firefox-plugin-dir "${EPREFIX}"/usr/$(get_libdir)/firefox/extensions) \
-		FIREFOX="${S}"/firefox-version.sh \
-		$(use_enable flac libflac) \
-		$(use_enable gif libgif) \
-		$(use_enable gsf libgsf) \
-		$(use_enable gtk tracker-needle) \
-		$(use_enable gtk tracker-preferences) \
-		$(use_enable iptc libiptcdata) \
-		$(use_enable iso libosinfo) \
-		$(use_enable jpeg libjpeg) \
-		$(use_enable upower upower) \
-		$(use_enable miner-fs) \
-		$(use_enable mp3 taglib) \
-		$(use_enable mp3) \
-		$(use_enable networkmanager network-manager) \
-		$(use_enable pdf poppler) \
-		$(use_enable playlist) \
-		$(use_enable rss miner-rss) \
-		$(use_enable stemmer libstemmer) \
-		$(use_enable test functional-tests) \
-		$(use_enable test unit-tests) \
-		$(use_enable thunderbird miner-thunderbird) \
-		$(use_with thunderbird thunderbird-plugin-dir "${EPREFIX}"/usr/$(get_libdir)/thunderbird/extensions) \
-		THUNDERBIRD="${S}"/thunderbird-version.sh \
-		$(use_enable tiff libtiff) \
-		$(use_enable vorbis libvorbis) \
-		$(use_enable xml libxml2) \
-		$(use_enable xmp exempi) \
-		$(use_enable xps libgxps) \
-		${myconf}
-}
-
-src_test() {
-	# G_MESSAGES_DEBUG, upstream bug #699401#c1
-	virtx emake check TESTS_ENVIRONMENT="dbus-run-session" G_MESSAGES_DEBUG="all"
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Manually symlink extensions for {firefox,thunderbird}-bin
-	if use firefox-bookmarks; then
-		dosym ../../../share/xul-ext/trackerfox \
-			/usr/$(get_libdir)/firefox-bin/extensions/trackerfox@bustany.org
-	fi
-
-	if use thunderbird; then
-		dosym ../../../share/xul-ext/trackerbird \
-			/usr/$(get_libdir)/thunderbird-bin/extensions/trackerbird@bustany.org
-	fi
-}
-
-create_version_script() {
-	# Create script $3 that prints "$2 MAX(VERSION($1), VERSION($1-bin))"
-
-	local v=$(best_version ${1})
-	v=${v#${1}-}
-	local vbin=$(best_version ${1}-bin)
-	vbin=${vbin#${1}-bin-}
-
-	if [[ -z ${v} ]]; then
-		v=${vbin}
-	else
-		version_compare ${v} ${vbin}
-		[[ $? -eq 1 ]] && v=${vbin}
-	fi
-
-	echo -e "#!/bin/sh\necho $2 $v" > "$3" || die
-	chmod +x "$3" || die
-}
diff --git a/app-misc/tracker/tracker-1.12.4.ebuild b/app-misc/tracker/tracker-1.12.4.ebuild
index c6627f0fdf76..0cc6d681e2d8 100644
--- a/app-misc/tracker/tracker-1.12.4.ebuild
+++ b/app-misc/tracker/tracker-1.12.4.ebuild
@@ -16,7 +16,7 @@ IUSE="cue elibc_glibc exif ffmpeg firefox-bookmarks flac gif gsf gstreamer
 gtk iptc +iso +jpeg libav +miner-fs mp3 nautilus networkmanager pdf playlist
 rss seccomp stemmer test thunderbird +tiff upnp-av upower +vorbis +xml xmp xps"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 REQUIRED_USE="
 	?? ( gstreamer ffmpeg )
diff --git a/app-mobilephone/Manifest.gz b/app-mobilephone/Manifest.gz
index 7297fd576205..8ea4edb0644c 100644
--- a/app-mobilephone/Manifest.gz
+++ b/app-mobilephone/Manifest.gz
diff --git a/app-mobilephone/gammu/Manifest b/app-mobilephone/gammu/Manifest
index f2d1492572c2..c6154ec8d926 100644
--- a/app-mobilephone/gammu/Manifest
+++ b/app-mobilephone/gammu/Manifest
@@ -9,5 +9,5 @@ DIST gammu-1.38.5.tar.bz2 2138742 BLAKE2B 7a72a7b67475f73dc3580d618dee379893dc82
 EBUILD gammu-1.33.0-r1.ebuild 2270 BLAKE2B 6eef098acf0508c5b9b18ed0f309f035de0b10108899762a377fd385871eafaa248bac6f0213c5d90655ff5414a95bbd48055680be89e8014945af4c8ce80fcd SHA512 1c95ed281b6fdfee455398bbf9a4032a10d742362d3063fb6532a2863995dac5ca7016d49b2c0003c1b3a9e00f5820d562b38199c9b34b133f05e2da89e0aa6f
 EBUILD gammu-1.36.8.ebuild 1912 BLAKE2B 83e6abe718efd33889357315945fe3883b7bea5c5b90df3c3a9c2d0c28918a7d8eb49cd4f4d5023b232a960f175cf6b65f711cb8255b6aefef18b030f513b07a SHA512 10b381df708e852bd14f34caf6a6af9090387602f8173e299d5ca1c7b37bd751a9343fa761c1005ff33b7fe9ae63ba10249b3e2af93ecbddcf4355ab42c5461c
 EBUILD gammu-1.38.4.ebuild 1423 BLAKE2B 981a3c92cc9e1a98037cd97302d104ae239e66e3fd54f1050099619b199e46eb6d460d9aa713edbfe1a4677fab13c9f2a31ab28123f6696fa1e0a0b872fc3821 SHA512 9c3934d7c2ebd9132da1f5c5719206f24f4a07bdda3b61600b03c1ed6e9bf9013486800d04c92fd56cef5fd94510efa2d07b1a7b537ae9eb6b693077f3df70b5
-EBUILD gammu-1.38.5.ebuild 1372 BLAKE2B ba3de529a6a705efcc6402ade24eadaee9efcad06257f395ef31ec04a15c43a62c645ad6b5c02b2a51d2e428d29c29ac546e2ab5a20429b6e215b8c3390102a2 SHA512 5d9f020a52ff488f42e50880e7b1ee00c436a7ebbb3d3708219781e4ad377868d49e222237b0ad55942ba038b83565900eb14ad0440cdbe2d109d1716c2c7064
+EBUILD gammu-1.38.5.ebuild 1371 BLAKE2B 81330b9cfe100d4cc7aa555edc72eb889fd8c0e95d9d14c825429d1848581d104226cb327a8bdac7ff6bb38a534335c9da3a2353828b20ce5726f6f4e5caf251 SHA512 a6d9b16fe17baed705dfe892a27f8f690878c70e34d232f4b60071e7b20d7cafa85b0a23687493be055028e8d53803d5839382057543473ff8804bb1f8326d9b
 MISC metadata.xml 981 BLAKE2B 6918eb352c71db64a9ca356408687888123437160f3cf190e0fca10aa31e614b67aad461884fe7f562a036e8ffe500c49e78afa2ab9070e2a32141adf9a55d21 SHA512 9e50aa06f539259b2f8e5eb8c2b8114435e37a4d84965b86c0629d4933d4dd6a3c1e4e62b7dc5c0e653e3194d5ac0fe50bc7b95b26d0ccea5c02e79d19163595
diff --git a/app-mobilephone/gammu/gammu-1.38.5.ebuild b/app-mobilephone/gammu/gammu-1.38.5.ebuild
index a7cde61cf98c..fcce0ea30dbd 100644
--- a/app-mobilephone/gammu/gammu-1.38.5.ebuild
+++ b/app-mobilephone/gammu/gammu-1.38.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://dl.cihar.com/${PN}/releases/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="bluetooth curl dbi debug irda mysql nls odbc postgres usb"
 
 COMMON_DEPEND="
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 03b389c5fb5a..77c148853948 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/kmymoney/Manifest b/app-office/kmymoney/Manifest
index b994c3696a20..6374489d62b7 100644
--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@@ -1,13 +1,3 @@
-AUX kmymoney-4.8.0-alkimia-detect.patch 1172 BLAKE2B bc55436f74249fb8e3e0ebd63933c50940f69317b282b02cea6d318f77859b7a68d71f3aa523258cfe4490a3b6b62da2a32e879f7866b68f831b8ad9df15451e SHA512 7e7cd092d460bf462fd46ee9003dcbf60ec3525bf1bfadac97d440688e5835737862cdc0f8275559d2e516a05ac25566faf037ac2e2bdac8b5f41e975f05c2c3
-AUX kmymoney-4.8.0-cmake-3.9.patch 1657 BLAKE2B 4743890d12e113f53efff83547bbe26f1abe326fdc48acc3edb3b5780ee44d607b7b8fbb3ed4edcfe2a80537e076e577e9e3ac566f74839ba77fb1baadd89c28 SHA512 6acb4354c08b551fd290e2943e85436b74a809f8681dc8fdaaff7d54912332dff22ddef7b57a03292a936645d5baf0bbc2cc94cf23c565cb939639fd9bb912ff
-AUX kmymoney-4.8.0-drop-national-onlinetasks.patch 12078 BLAKE2B 3cc2838b5deb24f85f087f875b574e9a77357c2c01a2278551eaa00f7eb2cffd44a500acdd7da9a28eec7a7894e8b120d3367710aa979697aec1939fe97baf99 SHA512 7db0358ccdc55bf12ffe11fd765acd93d2493036177f379bf30996b11b51feb2188343fcedc88b5784a67b0cfd61b2c77c83c582c3cfe793c37e8461ec312781
-AUX kmymoney-4.8.0-fix-csvdialog.patch 626 BLAKE2B 62a0f9e4accd7d72afeafbeb60e1d54ff3b70a3dc98f47e053d9ddf31ddfee38b2e25fda55408bdc63caab9e14ea72f85d66cb3a552f51d94aecfbe6773a96d2 SHA512 7a26265cd16e194113bc50935204f0c2709b7d6be49ec42cd3ee908e237f2172245c5d49094b6fabe82bef2e6b3e54cd4f74ed6dc577927b62dd50f8b822d20b
-AUX kmymoney-4.8.0-gpgmepp.patch 2446 BLAKE2B f2a85b8662e51ab0635cef73356d03f75f7818fa591c8452163c2085b1288ede5557ade965350cda9d8fdd5a1a2879a357b9948f914d4e00a4ececb9d9a5e3a4 SHA512 7c77b7994c7bf94746df182e44b980f6344bb3483363c306c4c6deb8e1eb154d2a058c0314fe1e7c9e9501da4f8c9816d980afcec7bd6ca25aaf333f5e572c55
-AUX kmymoney-4.8.0-kdepimlibs-optional.patch 5262 BLAKE2B 767b89b2dfe3b7bb6634be50406059748aed1d0d23b778acdc51ac09aaa4b41da4c9c7777fa207045d5fe5c5fe4fc72f5f7261124ec14134308e823d864933d8 SHA512 89670941602b83a24b8825a99a6ba59a3e27fa8a1ab7d49c477c413c1603d8a8a61a8cc9516402058d9424dbbe0e545a2c4f6c912cc8f9aee51654a807ec7432
-AUX kmymoney-4.8.0-soversion.patch 870 BLAKE2B 69a04e29456b6623c3fc3070ac1da51915f756194ff9678e03d32cb7867861a9f387d179f303a2cd14315fe1e6f9732a1e8a79b50d6388975c7248070b4ffc8d SHA512 b1687ddf582e2ed2ca2b26b4bd39428a69fee6469fbdba6b1f7575f433db822eaf9ef96d57c2b35a0bbe22e4fa140438e7005bab4953035ba5adfc853ef98070
-AUX kmymoney-4.8.0-tests.patch 7303 BLAKE2B 9af6e4438ddd5f0a992744f9b063a3b5e4d161f3b7740121071e947d7e34d60a3ef72b0fc718d9fca24653e9382d29e721a6fe6ee509ff562f3dac9dec98658e SHA512 e7f8cd817eee087faa02b7ca4320a2df0a3c52f4db2dfe8ce32314d2abb8572f0f2caa8b0f96e4a43be3fab3dff76e5211e693cfa6105ee85d1252cc6e3bcfbb
-DIST kmymoney-4.8.0.tar.xz 20785888 BLAKE2B 23819f5ef4f1ec0951f8b598041b7516efae94ccc6677404b133039023e6141e078226938d2c6d6fa6332803d4ee23d1c855e4db1945ada3d02d8302103876d0 SHA512 883635a94333341cbe3d6c835fe1dbc1cc5ed5cc834f76c945030ec680aee4fc6ceb367fdde811672a392eb5cd7b735c858e0be5a7f7964a4ccf5f9ba8865381
 DIST kmymoney-4.8.1.1.tar.xz 20963444 BLAKE2B d2be72a1c7dc41f48405ee406c419b9eb74cc02a80949965b8241331c00fbec23c32177aea0a401a76ef64a97e25e9e532c28e4f29bf88c9c2fd04f608790df6 SHA512 1f730f7db9117469aebaab33891f6064f648fa0ad25afff9ac1fab8d638c376d8e1f013401512c4be060436d6bbdfdacad6427b1e0911ac6b46288db1e242783
-EBUILD kmymoney-4.8.0-r3.ebuild 2080 BLAKE2B 47916c64c9bc3f9fcc906d11c2e1a02df5224f40297454ab228b99f8a5d8ca4df5dd068052fccc0a218efe3bcf9e8b16f53bad2b0d691acf0a0357d12dda9362 SHA512 f74c37356f2059c14c224aa600af5fc0b6cb6217be1ce431bf57223d93299ca515ecdd1801487c06502703b61bb81faa42be6358e3cda17c4099335d6c19dfaf
-EBUILD kmymoney-4.8.1.1-r1.ebuild 3311 BLAKE2B 7ea9f95e3b07439bb0745d7fdc8e783f82343747c5c601c19ccdd7723fed22b23aff47a3f245d69496fe107287853360f319f4eee5e898234e801a2e6318e325 SHA512 bc5b019ba2ab8c5871e86cf30cf7090b687052ca66ba3ed5dda8645f7c1290f875b5a3ad2d39c9e2bb3f236fda243ad4f8087ef719dde904ce79fafd8d43fa23
+EBUILD kmymoney-4.8.1.1-r1.ebuild 3540 BLAKE2B c414fcdb2e15c26e6c0f8c741ed4660f56ce9f353f3ec57b94a99eb52f686bb57126a9e8ffd23629322cb62f1d244558e28866cc29824573652827cfd62bd65a SHA512 9fd06bd1b03a78612d7db3b71507464ab86055693c66913f947dfa6cb14fdf79d0b380a1bd4c0b4bfea2760eda918700c2229b282af6e5648fd189087209cbfb
 MISC metadata.xml 607 BLAKE2B 3c2d771c20d49a41fef17d5b82bb7530f7db7611f19fa708045a81c55392cb06c0a82df7c0e9c80f8f2fb089e9233ea5a570700c37d3f0ca8782505ddf5216df SHA512 53ff98b9a6a419763e03670c0f6b5da707ff0b17f9f6ac8c03df46502599225d8780c099627fe8bc1c35f13452b80deb88d6fd0da450634f42a9aed827d256e1
diff --git a/app-office/kmymoney/files/kmymoney-4.8.0-alkimia-detect.patch b/app-office/kmymoney/files/kmymoney-4.8.0-alkimia-detect.patch
deleted file mode 100644
index 628e7c87538e..000000000000
--- a/app-office/kmymoney/files/kmymoney-4.8.0-alkimia-detect.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Some 8 cmake patches were necessary to get libalkimia detection right.
-This just copies the current state of 4.8 branch.
-
---- a/CMakeLists.txt	2016-10-26 12:17:23.390317411 +0200
-+++ b/CMakeLists.txt	2016-10-26 12:17:53.750544101 +0200
-@@ -110,14 +110,21 @@
-   add_custom_target(apidoc ${DOXYGEN} ${CMAKE_CURRENT_BINARY_DIR}/kmymoney.doxygen)
- endif(DOXYGEN_FOUND)
- 
--find_package(LibAlkimia 4.3.2 REQUIRED)
-+find_package(LibAlkimia REQUIRED)
- #TODO: remove when LibAlkimia minimum version will be raised
- if (NOT LIBALKIMIA_LIBRARIES AND LIBALKIMIA_LIBRARY)
-   # LibAlkimia 4.3.2 does not properly define LIBALKIMIA_LIBRARIES
-   find_package(GMP REQUIRED)
-   set(LIBALKIMIA_LIBRARIES ${GMP_LIBRARIES} ${LIBALKIMIA_LIBRARY} )
- endif()
--
-+# make sure we have the matching version of LibAlkimia (not too new)
-+if(${LibAlkimia_FOUND})
-+    if (DEFINED ${LibAlkimia_VERSION})
-+        if (NOT "${LibAlkimia_VERSION}" VERSION_LESS "6.0.0")
-+            message(FATAL_ERROR "This version of KMyMoney requires LibAlkimia < 6.0.0 and does not work with the installed version of LibAlkimia")
-+        endif()
-+    endif()
-+endif()
- # check for PkgConfig
- find_package(PkgConfig)
- 
diff --git a/app-office/kmymoney/files/kmymoney-4.8.0-cmake-3.9.patch b/app-office/kmymoney/files/kmymoney-4.8.0-cmake-3.9.patch
deleted file mode 100644
index 93e8809d824a..000000000000
--- a/app-office/kmymoney/files/kmymoney-4.8.0-cmake-3.9.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From b0a68ca075928aa29ee1e0007bfb14d714f5a948 Mon Sep 17 00:00:00 2001
-From: Ralf Habacker <ralf.habacker@freenet.de>
-Date: Thu, 10 Aug 2017 13:45:04 +0200
-Subject: Fix 'Compile error on Fedora 26'
-
-CMake build system used some outdated variables which has been replaced
-by cmake build in variables to fix the issue.
-
-FIXED-IN:4.8.1
-BUG:383351
----
- kmymoney/dialogs/settings/CMakeLists.txt | 9 ++++-----
- 1 file changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/kmymoney/dialogs/settings/CMakeLists.txt b/kmymoney/dialogs/settings/CMakeLists.txt
-index 5aacbea..b007dfb 100644
---- a/kmymoney/dialogs/settings/CMakeLists.txt
-+++ b/kmymoney/dialogs/settings/CMakeLists.txt
-@@ -1,12 +1,11 @@
- add_custom_command(
--  OUTPUT ${KMyMoney2_BINARY_DIR}/kmymoneysettings.h  ${KMyMoney2_BINARY_DIR}/kmymoneysettings.cpp
--  DEPENDS ${KMyMoney2_SOURCE_DIR}/kmymoney.kcfg ${KMyMoney2_SOURCE_DIR}/kmymoneysettings.kcfgc
--  COMMAND ${KDE4_KCFGC_EXECUTABLE} -d ${KMyMoney2_BINARY_DIR}/ ${KMyMoney2_SOURCE_DIR}/kmymoney.kcfg ${KMyMoney2_SOURCE_DIR}/kmymoneysettings.kcfgc
-+  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kmymoneysettings.h  ${CMAKE_CURRENT_BINARY_DIR}/kmymoneysettings.cpp
-+  DEPENDS ${CMAKE_SOURCE_DIR}/kmymoney/kmymoney.kcfg ${CMAKE_SOURCE_DIR}/kmymoney/kmymoneysettings.kcfgc
-+  COMMAND ${KDE4_KCFGC_EXECUTABLE} -d ${CMAKE_CURRENT_BINARY_DIR}/ ${CMAKE_SOURCE_DIR}/kmymoney/kmymoney.kcfg ${CMAKE_SOURCE_DIR}/kmymoney/kmymoneysettings.kcfgc
-   )
- 
--
- set (libsettings_a_SOURCES
--  ${KMyMoney2_BINARY_DIR}/kmymoneysettings.h
-+  ${CMAKE_CURRENT_BINARY_DIR}/kmymoneysettings.cpp
-   ksettingscolors.cpp
-   ksettingsfonts.cpp
-   ksettingsforecast.cpp
--- 
-cgit v0.11.2
-
diff --git a/app-office/kmymoney/files/kmymoney-4.8.0-drop-national-onlinetasks.patch b/app-office/kmymoney/files/kmymoney-4.8.0-drop-national-onlinetasks.patch
deleted file mode 100644
index abcffed02275..000000000000
--- a/app-office/kmymoney/files/kmymoney-4.8.0-drop-national-onlinetasks.patch
+++ /dev/null
@@ -1,289 +0,0 @@
-commit 5979b1e92d67124591d10b18b173852882f077e7
-Author: Christian Dávid <christian-david@web.de>
-Date:   Mon Jun 13 00:05:27 2016 +0200
-
-    Removed national credit transfers
-    
-    They are not supported by the banks anymore. So they can be removed.
-    
-    Unfortunately they contained the only example for a task converter.
-    Due to the removed plugin the CMakeLists.txt for sepa could be
-    simplified.
-    
-    Cherry-picked from d514e650
-
-diff --git a/kmymoney/plugins/kbanking/aqbankingkmmoperators.cpp b/kmymoney/plugins/kbanking/aqbankingkmmoperators.cpp
-index 6c2b5d8a..8b67bcbb 100644
---- a/kmymoney/plugins/kbanking/aqbankingkmmoperators.cpp
-+++ b/kmymoney/plugins/kbanking/aqbankingkmmoperators.cpp
-@@ -24,9 +24,9 @@
- #include <aqbanking/value.h>
- 
- #include "payeeidentifier/payeeidentifiertyped.h"
-+#include "payeeidentifier/nationalaccount/nationalaccount.h"
- #include "tasksettings/credittransfersettingsbase.h"
- #include "onlinetasks/sepa/tasks/sepaonlinetransfer.h"
--#include "onlinetasks/national/tasks/germanonlinetransfer.h"
- #include "gwenhywfarqtoperators.h"
- 
- /**
-@@ -49,40 +49,6 @@ static const QString dtausChars = QString::fromUtf8("0123456789ABCDEFGHIJKLMNOPQ
-  */
- static const QString sepaChars = QString("0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz':?.,- (+)/");
- 
--QSharedPointer<germanOnlineTransfer::settings> AB_TransactionLimits_toGermanOnlineTaskSettings(const AB_TRANSACTION_LIMITS* aqlimits)
--{
--  Q_CHECK_PTR(aqlimits);
--
--  QSharedPointer<creditTransferSettingsBase> settings(new creditTransferSettingsBase);
--
--  // AqBanking returns 0 as min length even if it requires one
--  int minLength = AB_TransactionLimits_GetMinLenPurpose(aqlimits);
--  if (minLength == 0)
--    minLength = 1;
--  settings->setPurposeLimits(AB_TransactionLimits_GetMaxLinesPurpose(aqlimits),
--                             AB_TransactionLimits_GetMaxLenPurpose(aqlimits),
--                             minLength
--                            );
--
--  // AqBanking returns 0 as min length even if it requires one
--  minLength = AB_TransactionLimits_GetMinLenRemoteName(aqlimits);
--  if (minLength == 0)
--    minLength = 1;
--  settings->setRecipientNameLimits(AB_TransactionLimits_GetMaxLinesRemoteName(aqlimits),
--                                   AB_TransactionLimits_GetMaxLenRemoteName(aqlimits),
--                                   minLength
--                                  );
--
--  minLength = AB_TransactionLimits_GetMinLenLocalName(aqlimits);
--  if (minLength == 0)
--    minLength = 1;
--  settings->setPayeeNameLimits(1, AB_TransactionLimits_GetMaxLenLocalName(aqlimits), minLength);
--
--  settings->setAllowedChars(dtausChars);
--
--  return settings.dynamicCast<germanOnlineTransfer::settings>();
--}
--
- /** @todo Check if AB_TransactionLimits_GetMaxLenCustomerReference really is the limit for the sepa reference */
- QSharedPointer<sepaOnlineTransfer::settings> AB_TransactionLimits_toSepaOnlineTaskSettings(const AB_TRANSACTION_LIMITS* aqlimits)
- {
-diff --git a/kmymoney/plugins/kbanking/aqbankingkmmoperators.h b/kmymoney/plugins/kbanking/aqbankingkmmoperators.h
-index a314cd72..5205a884 100644
---- a/kmymoney/plugins/kbanking/aqbankingkmmoperators.h
-+++ b/kmymoney/plugins/kbanking/aqbankingkmmoperators.h
-@@ -29,7 +29,6 @@
- 
- #include "onlinetasks/interfaces/tasks/ionlinetasksettings.h"
- #include "onlinetasks/sepa/tasks/sepaonlinetransfer.h"
--#include "onlinetasks/national/tasks/germanonlinetransfer.h"
- 
- class AB_ACCOUNT;
- class AB_TRANSACTION_LIMITS;
-@@ -43,12 +42,6 @@ class nationalAccount;
- }
- 
- /**
-- * @brief AB_TransactionLimits_toGermanOnlineTaskSettings
-- * @param aqlimits IN
-- */
--QSharedPointer<germanOnlineTransfer::settings> AB_TransactionLimits_toGermanOnlineTaskSettings(const AB_TRANSACTION_LIMITS* aqlimits);
--
--/**
-  * @brief AB_TransactionLimits_toSepaOnlineTaskSettings
-  * @param aqlimits IN
-  */
-diff --git a/kmymoney/plugins/kbanking/mymoneybanking.cpp b/kmymoney/plugins/kbanking/mymoneybanking.cpp
-index d8c4a571..a64eaf61 100644
---- a/kmymoney/plugins/kbanking/mymoneybanking.cpp
-+++ b/kmymoney/plugins/kbanking/mymoneybanking.cpp
-@@ -598,11 +598,7 @@ void KBankingPlugin::sendOnlineJob(QList<onlineJob>& jobs)
- 
-   if (!jobs.isEmpty()) {
-     foreach (onlineJob job, jobs) {
--      if (germanOnlineTransfer::name() == job.task()->taskName()) {
--        onlineJobTyped<germanOnlineTransfer> typedJob(job);
--        enqueTransaction(typedJob);
--        job = typedJob;
--      } else if (sepaOnlineTransfer::name() == job.task()->taskName()) {
-+      if (sepaOnlineTransfer::name() == job.task()->taskName()) {
-         onlineJobTyped<sepaOnlineTransfer> typedJob(job);
-         enqueTransaction(typedJob);
-         job = typedJob;
-@@ -646,14 +642,8 @@ QStringList KBankingPlugin::availableJobs(QString accountId)
- 
-   // Check availableJobs
- 
--  // national transfer
--  AB_JOB *abJob = AB_JobSingleTransfer_new(abAccount);
--  if (AB_Job_CheckAvailability(abJob) == 0)
--    list.append(germanOnlineTransfer::name());
--  AB_Job_free(abJob);
--
-   // sepa transfer
--  abJob = AB_JobSepaTransfer_new(abAccount);
-+  AB_JOB* abJob = AB_JobSepaTransfer_new(abAccount);
-   if (AB_Job_CheckAvailability(abJob) == 0)
-     list.append(sepaOnlineTransfer::name());
-   AB_Job_free(abJob);
-@@ -686,17 +676,7 @@ IonlineTaskSettings::ptr KBankingPlugin::settings(QString accountId, QString tas
-   if (abAcc == 0)
-     return IonlineTaskSettings::ptr();
- 
--  if (germanOnlineTransfer::name() == taskName) {
--    // Get Limits for germanOnlineTransfer
--    QScopedPointer<AB_JOB, QScopedPointerAbJobDeleter> abJob(AB_JobSingleTransfer_new(abAcc));
--    if (AB_Job_CheckAvailability(abJob.data()) != 0)
--      return IonlineTaskSettings::ptr();
--
--    const AB_TRANSACTION_LIMITS* limits = AB_Job_GetFieldLimits(abJob.data());
--    return AB_TransactionLimits_toGermanOnlineTaskSettings(limits).dynamicCast<IonlineTaskSettings>();
--    //! @todo needs free? because that is not possible with const AB_TRANSACTION_LIMITS*
--    // AB_TransactionLimits_free( limits );
--  } else if (sepaOnlineTransfer::name() == taskName) {
-+  if (sepaOnlineTransfer::name() == taskName) {
-     // Get limits for sepaonlinetransfer
-     QScopedPointer<AB_JOB, QScopedPointerAbJobDeleter> abJob(AB_JobSepaTransfer_new(abAcc));
-     if (AB_Job_CheckAvailability(abJob.data()) != 0)
-@@ -707,62 +687,6 @@ IonlineTaskSettings::ptr KBankingPlugin::settings(QString accountId, QString tas
-   return IonlineTaskSettings::ptr();
- }
- 
--bool KBankingPlugin::enqueTransaction(onlineJobTyped<germanOnlineTransfer>& job)
--{
--  /* get AqBanking account */
--  QString accId = job.constTask()->responsibleAccount();
--  AB_ACCOUNT *abAccount = aqbAccount(accId);
--  if (!abAccount) {
--    job.addJobMessage(onlineJobMessage(onlineJobMessage::warning, "KBanking", i18n("<qt>"
--                                       "The given application account <b>%1</b> "
--                                       "has not been mapped to an online "
--                                       "account."
--                                       "</qt>",
--                                       MyMoneyFile::instance()->account(accId).name())));
--    return false;
--  }
--  //setupAccountReference(acc, ba); // needed?
--
--  AB_JOB *abJob = AB_JobSingleTransfer_new(abAccount);
--  int rv = AB_Job_CheckAvailability(abJob);
--  if (rv) {
--    qDebug("AB_ERROR_OFFSET is %i", AB_ERROR_OFFSET);
--    job.addJobMessage(onlineJobMessage::error, "AqBanking",
--                      QString("National credit transfers for account \"%1\" are not available, error code %2.").arg(MyMoneyFile::instance()->account(accId).name(), rv),
--                      QString::number(rv)
--                     );
--    return false;
--  }
--  AB_TRANSACTION *abTransaction = AB_Transaction_new();
--
--  // Recipient
--  payeeIdentifiers::nationalAccount beneficiaryAcc = job.task()->beneficiaryTyped();
--  AB_Transaction_SetRemoteAccount(abTransaction, beneficiaryAcc);
--
--  // Origin Account
--  AB_Transaction_SetLocalAccount(abTransaction, abAccount);
--
--  // Purpose
--  QStringList qPurpose = job.task()->purpose().split('\n', QString::SkipEmptyParts);
--  GWEN_STRINGLIST *purpose = GWEN_StringList_fromQStringList(qPurpose);
--  AB_Transaction_SetPurpose(abTransaction, purpose);
--  GWEN_StringList_free(purpose);
--
--  // Other
--  AB_Transaction_SetTextKey(abTransaction, job.task()->textKey());
--  AB_Transaction_SetValue(abTransaction, AB_Value_fromMyMoneyMoney(job.task()->value()));
--
--  /** @todo LOW remove Debug info */
--  qDebug() << "SetTransaction: " << AB_Job_SetTransaction(abJob, abTransaction);
--
--  GWEN_DB_NODE *gwenNode = AB_Job_GetAppData(abJob);
--  GWEN_DB_SetCharValue(gwenNode, GWEN_DB_FLAGS_DEFAULT, "kmmOnlineJobId", m_kbanking->mappingId(job).toLatin1().constData());
--
--  qDebug() << "Enqueue: " << m_kbanking->enqueueJob(abJob);
--  //delete localAcc;
--  return true;
--}
--
- bool KBankingPlugin::enqueTransaction(onlineJobTyped<sepaOnlineTransfer>& job)
- {
-   /* get AqBanking account */
-diff --git a/kmymoney/plugins/kbanking/mymoneybanking.h b/kmymoney/plugins/kbanking/mymoneybanking.h
-index c2559ae7..7936704e 100644
---- a/kmymoney/plugins/kbanking/mymoneybanking.h
-+++ b/kmymoney/plugins/kbanking/mymoneybanking.h
-@@ -64,7 +64,6 @@ class KBAccountSettings;
- 
- #include "mymoney/onlinejobtyped.h"
- #include "onlinetasks/sepa/tasks/sepaonlinetransfer.h"
--#include "onlinetasks/national/tasks/germanonlinetransfer.h"
- 
- /**
-   * This class represents the KBanking plugin towards KMymoney.
-@@ -184,7 +183,6 @@ private:
-     */
-   void startPasswordTimer();
- 
--  bool enqueTransaction(onlineJobTyped<germanOnlineTransfer>& job);
-   bool enqueTransaction(onlineJobTyped<sepaOnlineTransfer>& job);
- 
- 
-diff --git a/kmymoney/plugins/kbanking/tasksettings/credittransfersettingsbase.h b/kmymoney/plugins/kbanking/tasksettings/credittransfersettingsbase.h
-index 28d55a06..3bac6ce8 100644
---- a/kmymoney/plugins/kbanking/tasksettings/credittransfersettingsbase.h
-+++ b/kmymoney/plugins/kbanking/tasksettings/credittransfersettingsbase.h
-@@ -20,14 +20,13 @@
- #define CREDITTRANSFERSETTINGSBASE_H
- 
- #include "onlinetasks/sepa/tasks/sepaonlinetransfer.h"
--#include "onlinetasks/national/tasks/germanonlinetransfer.h"
- 
- /**
-  * @brief Base class for sepaCreditTransfer and germanCreditTransfer settings
-  *
-  * @internal Both credit transfers have similar fields
-  */
--class creditTransferSettingsBase : public sepaOnlineTransfer::settings, public germanOnlineTransfer::settings
-+class creditTransferSettingsBase : public sepaOnlineTransfer::settings
- {
- public:
-   creditTransferSettingsBase()
-diff --git a/kmymoney/plugins/onlinetasks/CMakeLists.txt b/kmymoney/plugins/onlinetasks/CMakeLists.txt
-index 7be53137..2e57b214 100644
---- a/kmymoney/plugins/onlinetasks/CMakeLists.txt
-+++ b/kmymoney/plugins/onlinetasks/CMakeLists.txt
-@@ -1,5 +1,4 @@
- 
- add_subdirectory(interfaces)
- add_subdirectory(sepa)
--add_subdirectory(national)
- add_subdirectory(unavailabletask)
-diff --git a/kmymoney/plugins/onlinetasks/sepa/CMakeLists.txt b/kmymoney/plugins/onlinetasks/sepa/CMakeLists.txt
-index 3c2d9db1..e3962d7a 100644
---- a/kmymoney/plugins/onlinetasks/sepa/CMakeLists.txt
-+++ b/kmymoney/plugins/onlinetasks/sepa/CMakeLists.txt
-@@ -2,6 +2,7 @@ set( sepaOnlineTasks_SRCS
-   tasks/sepaonlinetransferimpl.cpp
-   ui/sepacredittransferedit.cpp
-   sepastorageplugin.cpp
-+  sepaonlinetasksloader.cpp
- )
- 
- set( sepaOnlineTasks_HEADER
-@@ -12,14 +13,8 @@ kde4_add_ui_files( sepaOnlineTasks_SRCS
-   ui/sepacredittransferedit.ui
- )
- 
--automoc4( konlinetasks_sepa_OBJECTS sepaOnlineTasks_SRCS)
--add_library( konlinetasks_sepa_OBJECTS OBJECT ${sepaOnlineTasks_SRCS} )
--
--# Add actual plugin here it is not part of the objects
--# needed if multiple plugins are linked (needed for unit tests)
--kde4_add_plugin(konlinetasks_sepa
--  $<TARGET_OBJECTS:konlinetasks_sepa_OBJECTS>
--  sepaonlinetasksloader.cpp
-+add_library(konlinetasks_sepa MODULE
-+  ${sepaOnlineTasks_SRCS}
- )
- 
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/kmymoney-sepaorders.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/kmymoney-sepaorders.desktop)
diff --git a/app-office/kmymoney/files/kmymoney-4.8.0-fix-csvdialog.patch b/app-office/kmymoney/files/kmymoney-4.8.0-fix-csvdialog.patch
deleted file mode 100644
index 4f84a17f5b57..000000000000
--- a/app-office/kmymoney/files/kmymoney-4.8.0-fix-csvdialog.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Łukasz Wojniłowicz <lukasz.wojnilowicz@gmail.com>
-Date: Sat, 06 Aug 2016 11:14:18 +0000
-Subject: Remove Qt::WindowStaysOnTopHint from CSV dialog
-X-Git-Url: http://quickgit.kde.org/?p=kmymoney.git&a=commitdiff&h=d129b22e2da6e7972008f2b5ef3eccc95d758201
----
-Remove Qt::WindowStaysOnTopHint from CSV dialog
-
-BUG: 363429
----
-
-
---- a/kmymoney/plugins/csvimport/csvdialog.cpp
-+++ b/kmymoney/plugins/csvimport/csvdialog.cpp
-@@ -224,7 +224,6 @@
- 
-   m_investmentDlg->init();
-   Qt::WindowFlags eFlags = windowFlags();
--  eFlags |= Qt::WindowStaysOnTopHint;
-   m_wiz->setWindowFlags(eFlags);
-   m_wiz->show();
- }//  CSVDialog
-
diff --git a/app-office/kmymoney/files/kmymoney-4.8.0-gpgmepp.patch b/app-office/kmymoney/files/kmymoney-4.8.0-gpgmepp.patch
deleted file mode 100644
index 7b76eb1358c6..000000000000
--- a/app-office/kmymoney/files/kmymoney-4.8.0-gpgmepp.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From cddb71b5bbe0c7d73877f0308ad0ac64d9f99c20 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Thu, 10 Nov 2016 15:53:32 +0100
-Subject: [PATCH 1/2] Use GpgME++ if possible, QGpgme from kdepimlibs-4 as
- fallback
-
-Remove bogus qgpgme include.
-
-REVIEW: 129371
----
- CMakeLists.txt                             | 9 ++++++++-
- libkdchart/kdablibfakes/src/KDABLibFakes.h | 3 +++
- libkgpgfile/CMakeLists.txt                 | 2 +-
- libkgpgfile/kgpgfile.cpp                   | 1 -
- 4 files changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2251518..5a01673 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -76,7 +76,14 @@ else (WIN32)
-   find_package(Boost "1.33.1" COMPONENTS graph)
- endif (WIN32)
- # needed by libkgpgfile
--find_package(QGpgme REQUIRED)
-+find_package(Gpgmepp 1.7.0)
-+set(GPGMEPP_LIBS Gpgmepp)
-+if (NOT Gpgmepp_FOUND)
-+  find_package(QGpgme REQUIRED)
-+  set(GPGMEPP_LIBS ${QGPGME_LIBRARIES})
-+else (NOT Gpgmepp_FOUND)
-+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
-+endif (NOT Gpgmepp_FOUND)
- find_package(KdepimLibs REQUIRED)
- find_package(SharedMimeInfo REQUIRED)
- 
-diff --git a/libkdchart/kdablibfakes/src/KDABLibFakes.h b/libkdchart/kdablibfakes/src/KDABLibFakes.h
-index f47ec24..b998723 100644
---- a/libkdchart/kdablibfakes/src/KDABLibFakes.h
-+++ b/libkdchart/kdablibfakes/src/KDABLibFakes.h
-@@ -59,6 +59,9 @@
- #elif defined (Q_OS_DARWIN) || defined (Q_OS_CYGWIN)
- #define ISNAN(x) std::isnan(x)
- #define ISINF(x) std::isinf(x)
-+#elif defined (__GXX_EXPERIMENTAL_CXX0X) || __cplusplus >= 201103L
-+#define ISNAN(x) std::isnan(x)
-+#define ISINF(x) std::isinf(x)
- #else
- #define ISNAN(x) isnan(x)
- #define ISINF(x) isinf(x)
-diff --git a/libkgpgfile/CMakeLists.txt b/libkgpgfile/CMakeLists.txt
-index a41a6a4..a7c982e 100644
---- a/libkgpgfile/CMakeLists.txt
-+++ b/libkgpgfile/CMakeLists.txt
-@@ -7,6 +7,6 @@ set(kgpgfile_STAT_SRCS
-    )
- 
- kde4_add_library(kgpgfile STATIC ${kgpgfile_STAT_SRCS})
--target_link_libraries(kgpgfile ${QGPGME_LIBRARIES})
-+target_link_libraries(kgpgfile ${GPGMEPP_LIBS})
- 
- 
-diff --git a/libkgpgfile/kgpgfile.cpp b/libkgpgfile/kgpgfile.cpp
-index b1870be..a5d3d4e 100644
---- a/libkgpgfile/kgpgfile.cpp
-+++ b/libkgpgfile/kgpgfile.cpp
-@@ -47,7 +47,6 @@
- #include <gpgme++/keylistresult.h>
- #include <gpgme++/key.h>
- #include <gpgme++/data.h>
--#include <qgpgme/dataprovider.h>
- 
- class KGPGFile::Private
- {
--- 
-2.7.3
-
diff --git a/app-office/kmymoney/files/kmymoney-4.8.0-kdepimlibs-optional.patch b/app-office/kmymoney/files/kmymoney-4.8.0-kdepimlibs-optional.patch
deleted file mode 100644
index 30b416868cf6..000000000000
--- a/app-office/kmymoney/files/kmymoney-4.8.0-kdepimlibs-optional.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-From c66ab47628ad0cf76cc63de0bdf1ed578e4138ed Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Thu, 10 Nov 2016 16:18:42 +0100
-Subject: [PATCH 2/2] Make kdepimlibs optional
-
-Based on b5de50ccaa1571c4feb0c17ea8016554e3b822d7 from master.
-
-REVIEW: 129371
----
- CMakeLists.txt                                   |  5 ++++-
- kmymoney/dialogs/settings/ksettingsschedules.cpp |  5 ++++-
- kmymoney/kmymoney.cpp                            | 20 +++++++++++++++++++-
- 3 files changed, 27 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5a01673..6662521 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -84,7 +84,7 @@ if (NOT Gpgmepp_FOUND)
- else (NOT Gpgmepp_FOUND)
-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
- endif (NOT Gpgmepp_FOUND)
--find_package(KdepimLibs REQUIRED)
-+find_package(KdepimLibs)
- find_package(SharedMimeInfo REQUIRED)
- 
- # set the configuration switch signaling that KDE PIM libraries were found
-@@ -417,6 +417,7 @@ macro(nice_yesno _varname)
-   endif(${_varname})
- endmacro(nice_yesno _varname)
- 
-+nice_yesno("KdepimLibs_FOUND")
- nice_yesno("LIBOFX_FOUND")
- nice_yesno("LIBOFX_HAVE_CLIENTUID")
- nice_yesno("KBANKING_FOUND")
-@@ -433,6 +434,8 @@ message("
- 
- Configure results (user options):
- --------------------------------------------
-+KDE PIM holidays:                        ${nice_KdepimLibs_FOUND}
-+
- OFX plugin:                              ${nice_LIBOFX_FOUND}
- OFX clientuid support                    ${nice_LIBOFX_HAVE_CLIENTUID}
- 
-diff --git a/kmymoney/dialogs/settings/ksettingsschedules.cpp b/kmymoney/dialogs/settings/ksettingsschedules.cpp
-index da138a7..1f0d16f 100644
---- a/kmymoney/dialogs/settings/ksettingsschedules.cpp
-+++ b/kmymoney/dialogs/settings/ksettingsschedules.cpp
-@@ -24,8 +24,10 @@
- 
- #include <kdeversion.h>
- #include <KStandardDirs>
-+#ifdef HAVE_KDEPIMLIBS
- #include <KHolidays/Holidays>
- using namespace KHolidays;
-+#endif
- 
- // ----------------------------------------------------------------------------
- // Project Includes
-@@ -50,6 +52,7 @@ KSettingsSchedules::KSettingsSchedules(QWidget* parent) :
- void KSettingsSchedules::loadList()
- {
-   QStringList regions;
-+#ifdef HAVE_KDEPIMLIBS
-   QStringList regionCodes = HolidayRegion::regionCodes();
- 
-   foreach (const QString &regionCode, regionCodes) {
-@@ -65,7 +68,7 @@ void KSettingsSchedules::loadList()
-     regions << region;
-   }
-   regions.sort();
--
-+#endif
-   m_regionMap[m_holidayRegion->itemText(0)] = "";
-   m_holidayRegion->insertItems(1, regions);
- }
-diff --git a/kmymoney/kmymoney.cpp b/kmymoney/kmymoney.cpp
-index a4251f0..0bd2d3b 100644
---- a/kmymoney/kmymoney.cpp
-+++ b/kmymoney/kmymoney.cpp
-@@ -89,7 +89,9 @@
- #include <kinputdialog.h>
- #include <kxmlguifactory.h>
- #include <krecentfilesaction.h>
-+#ifdef HAVE_KDEPIMLIBS
- #include <KHolidays/Holidays>
-+#endif
- 
- // ----------------------------------------------------------------------------
- // Project Includes
-@@ -221,7 +223,9 @@ public:
-       m_additionalKeyLabel(0),
-       m_additionalKeyButton(0),
-       m_recentFiles(0),
-+#ifdef HAVE_KDEPIMLIBS
-       m_holidayRegion(0),
-+#endif
-       m_applicationIsReady(true) {
-     // since the days of the week are from 1 to 7,
-     // and a day of the week is used to index this bit array,
-@@ -343,9 +347,10 @@ public:
-   KPushButton*          m_additionalKeyButton;
- 
-   KRecentFilesAction*   m_recentFiles;
--
-+#ifdef HAVE_KDEPIMLIBS
-   // used by the calendar interface for schedules
-   KHolidays::HolidayRegion* m_holidayRegion;
-+#endif
-   QBitArray             m_processingDays;
-   QMap<QDate, bool>     m_holidayMap;
-   QStringList           m_consistencyCheckResult;
-@@ -455,7 +460,9 @@ KMyMoneyApp::~KMyMoneyApp()
-   delete d->m_transactionEditor;
-   delete d->m_endingBalanceDlg;
-   delete d->m_moveToAccountSelector;
-+#ifdef HAVE_KDEPIMLIBS
-   delete d->m_holidayRegion;
-+#endif
-   delete d;
- }
- 
-@@ -7732,6 +7739,7 @@ void KMyMoneyApp::slotOnlineJobLog(const QStringList& onlineJobIds)
- 
- void KMyMoneyApp::setHolidayRegion(const QString& holidayRegion)
- {
-+#ifdef HAVE_KDEPIMLIBS
-   //since the cost of updating the cache is now not negligible
-   //check whether the region has been modified
-   if (!d->m_holidayRegion || d->m_holidayRegion->regionCode() != holidayRegion) {
-@@ -7743,10 +7751,14 @@ void KMyMoneyApp::setHolidayRegion(const QString& holidayRegion)
-     //clear and update the holiday cache
-     preloadHolidays();
-   }
-+#else
-+  Q_UNUSED(holidayRegion);
-+#endif
- }
- 
- bool KMyMoneyApp::isProcessingDate(const QDate& date) const
- {
-+#ifdef HAVE_KDEPIMLIBS
-   if (!d->m_processingDays.testBit(date.dayOfWeek()))
-     return false;
-   if (!d->m_holidayRegion || !d->m_holidayRegion->isValid())
-@@ -7760,10 +7772,15 @@ bool KMyMoneyApp::isProcessingDate(const QDate& date) const
-     d->m_holidayMap.insert(date, processingDay);
-     return processingDay;
-   }
-+#else
-+  Q_UNUSED(date);
-+  return true;
-+#endif
- }
- 
- void KMyMoneyApp::preloadHolidays()
- {
-+#ifdef HAVE_KDEPIMLIBS
-   //clear the cache before loading
-   d->m_holidayMap.clear();
-   //only do this if it is a valid region
-@@ -7792,6 +7809,7 @@ void KMyMoneyApp::preloadHolidays()
-       }
-     }
-   }
-+#endif
- }
- 
- KMStatus::KMStatus(const QString &text)
--- 
-2.7.3
-
diff --git a/app-office/kmymoney/files/kmymoney-4.8.0-soversion.patch b/app-office/kmymoney/files/kmymoney-4.8.0-soversion.patch
deleted file mode 100644
index f1154908cdec..000000000000
--- a/app-office/kmymoney/files/kmymoney-4.8.0-soversion.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Thomas Baumgart <thb@net-bembel.de>
-Date: Wed, 13 Jul 2016 05:48:46 +0000
-Subject: Added versioning to kmm_payeeidentifier library
-X-Git-Url: http://quickgit.kde.org/?p=kmymoney.git&a=commitdiff&h=1b818335b4242ad5096489ab4f8e3e7c3fc62d55
----
-Added versioning to kmm_payeeidentifier library
-
-The missing version caused incorrect naming of the library.
-
-Modified version of patch provided by Christian Dávid in commit
-4a0fed749df71bb2acfc15bd6c0bff4806927f01
-BUG: 364387
-FIXED-IN: 4.8.1
----
-
-
---- a/kmymoney/mymoney/payeeidentifier/CMakeLists.txt
-+++ b/kmymoney/mymoney/payeeidentifier/CMakeLists.txt
-@@ -11,6 +11,8 @@
- add_library( kmm_payeeidentifier SHARED
-   ${PAYEEIDENTIFIER_SCRS}
- )
-+
-+set_target_properties(kmm_payeeidentifier PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
- 
- generate_export_header( kmm_payeeidentifier )
- 
-
diff --git a/app-office/kmymoney/files/kmymoney-4.8.0-tests.patch b/app-office/kmymoney/files/kmymoney-4.8.0-tests.patch
deleted file mode 100644
index 1b71180096a3..000000000000
--- a/app-office/kmymoney/files/kmymoney-4.8.0-tests.patch
+++ /dev/null
@@ -1,210 +0,0 @@
-From: Cristian Oneț <onet.cristian@gmail.com>
-Date: Thu, 16 Jun 2016 07:06:32 +0000
-Subject: Fix the tests of the 4.8 build.
-X-Git-Url: http://quickgit.kde.org/?p=kmymoney.git&a=commitdiff&h=29ab40829f86f6bd32229ededcc09bf2736e67bd
----
-Fix the tests of the 4.8 build.
-
-Do this by backporting the change that is already in frameworks in commit 77085ff468336f26f6bcf5f2a1a08e16409172e6. Did not use cherry pick because the testfile was moved in frameworks.
-
-BUG: 364355
----
-
-
---- a/kmymoney/mymoney/storage/mymoneymap.h
-+++ b/kmymoney/mymoney/storage/mymoneymap.h
-@@ -195,7 +195,7 @@
-     that = *(dynamic_cast<QMap<Key, T>* >(const_cast<MyMoneyMap<Key, T>* >(this)));
-   }
- 
--  inline size_t count(void) const {
-+  inline int count(void) const {
-     return QMap<Key, T>::count();
-   }
- 
-
---- a/kmymoney/mymoney/storage/mymoneyseqaccessmgrtest.cpp
-+++ b/kmymoney/mymoney/storage/mymoneyseqaccessmgrtest.cpp
-@@ -58,13 +58,13 @@
-   QCOMPARE(m->m_nextPayeeID, 0ul);
-   QCOMPARE(m->m_nextScheduleID, 0ul);
-   QCOMPARE(m->m_nextReportID, 0ul);
--  QCOMPARE(m->m_institutionList.count(), 0ul);
--  QCOMPARE(m->m_accountList.count(), 5ul);
--  QCOMPARE(m->m_transactionList.count(), 0ul);
--  QCOMPARE(m->m_transactionKeys.count(), 0ul);
--  QCOMPARE(m->m_payeeList.count(), 0ul);
--  QCOMPARE(m->m_tagList.count(), 0ul);
--  QCOMPARE(m->m_scheduleList.count(), 0ul);
-+  QCOMPARE(m->m_institutionList.count(), 0);
-+  QCOMPARE(m->m_accountList.count(), 5);
-+  QCOMPARE(m->m_transactionList.count(), 0);
-+  QCOMPARE(m->m_transactionKeys.count(), 0);
-+  QCOMPARE(m->m_payeeList.count(), 0);
-+  QCOMPARE(m->m_tagList.count(), 0);
-+  QCOMPARE(m->m_scheduleList.count(), 0);
- 
-   QCOMPARE(m->m_dirty, false);
-   QCOMPARE(m->m_creationDate, QDate::currentDate());
-@@ -187,7 +187,7 @@
- 
-   QCOMPARE(m->m_nextAccountID, 1ul);
-   QCOMPARE(m->dirty(), true);
--  QCOMPARE(m->m_accountList.count(), static_cast<std::size_t>(6));
-+  QCOMPARE(m->m_accountList.count(), 6);
-   QCOMPARE(m->m_accountList["A000001"].name(), QLatin1String("AccountName"));
- }
- 
-@@ -235,7 +235,7 @@
-   m->m_dirty = false;
- 
-   QCOMPARE(m->m_nextAccountID, 2ul);
--  QCOMPARE(m->m_accountList.count(), static_cast<std::size_t>(7));
-+  QCOMPARE(m->m_accountList.count(), 7);
- 
-   // try to add account to undefined account
-   try {
-@@ -271,7 +271,7 @@
-   i.setName("Inst Name");
- 
-   m->addInstitution(i);
--  QCOMPARE(m->m_institutionList.count(), static_cast<std::size_t>(1));
-+  QCOMPARE(m->m_institutionList.count(), 1);
-   QCOMPARE(m->m_nextInstitutionID, 1ul);
-   QCOMPARE(m->m_institutionList["I000001"].name(), QLatin1String("Inst Name"));
- }
-@@ -950,11 +950,11 @@
-   // check that we can remove an unreferenced payee
-   MyMoneyPayee p = m->payee("P000001");
-   try {
--    QCOMPARE(m->m_payeeList.count(), static_cast<std::size_t>(1));
-+    QCOMPARE(m->m_payeeList.count(), 1);
-     m->removePayee(p);
-     m->commitTransaction();
-     m->startTransaction();
--    QCOMPARE(m->m_payeeList.count(), static_cast<std::size_t>(0));
-+    QCOMPARE(m->m_payeeList.count(), 0);
-     QCOMPARE(m->dirty(), true);
-   } catch (const MyMoneyException &) {
-     QFAIL("Unexpected exception");
-@@ -996,7 +996,7 @@
-     QFAIL("Expected exception");
-   } catch (const MyMoneyException &) {
-   }
--  QCOMPARE(m->m_payeeList.count(), static_cast<std::size_t>(1));
-+  QCOMPARE(m->m_payeeList.count(), 1);
- }
- 
- void MyMoneySeqAccessMgrTest::testAddTag()
-@@ -1046,11 +1046,11 @@
-   // check that we can remove an unreferenced tag
-   MyMoneyTag ta = m->tag("G000001");
-   try {
--    QCOMPARE(m->m_tagList.count(), static_cast<std::size_t>(1));
-+    QCOMPARE(m->m_tagList.count(), 1);
-     m->removeTag(ta);
-     m->commitTransaction();
-     m->startTransaction();
--    QCOMPARE(m->m_tagList.count(), static_cast<std::size_t>(0));
-+    QCOMPARE(m->m_tagList.count(), 0);
-     QCOMPARE(m->dirty(), true);
-   } catch (const MyMoneyException &) {
-     QFAIL("Unexpected exception");
-@@ -1094,7 +1094,7 @@
-     QFAIL("Expected exception");
-   } catch (const MyMoneyException &) {
-   }
--  QCOMPARE(m->m_tagList.count(), static_cast<std::size_t>(1));
-+  QCOMPARE(m->m_tagList.count(), 1);
- }
- 
- void MyMoneySeqAccessMgrTest::testRemoveAccountFromTree()
-@@ -1267,7 +1267,7 @@
- 
- 
-   try {
--    QCOMPARE(m->m_scheduleList.count(), static_cast<std::size_t>(0));
-+    QCOMPARE(m->m_scheduleList.count(), 0);
-     MyMoneyTransaction t1;
-     MyMoneySplit s1, s2;
-     s1.setAccountId("A000001");
-@@ -1287,7 +1287,7 @@
- 
-     m->addSchedule(schedule);
- 
--    QCOMPARE(m->m_scheduleList.count(), static_cast<std::size_t>(1));
-+    QCOMPARE(m->m_scheduleList.count(), 1);
-     QCOMPARE(schedule.id(), QLatin1String("SCH000001"));
-     QCOMPARE(m->m_scheduleList["SCH000001"].id(), QLatin1String("SCH000001"));
-   } catch (const MyMoneyException &) {
-@@ -1342,7 +1342,7 @@
-   sched.setName("New Sched-Name");
-   try {
-     m->modifySchedule(sched);
--    QCOMPARE(m->m_scheduleList.count(), static_cast<std::size_t>(1));
-+    QCOMPARE(m->m_scheduleList.count(), 1);
-     QCOMPARE(m->m_scheduleList["SCH000001"].name(), QLatin1String("New Sched-Name"));
- 
-   } catch (const MyMoneyException &) {
-@@ -1373,7 +1373,7 @@
-   try {
-     m->removeSchedule(sched);
-     m->commitTransaction();
--    QCOMPARE(m->m_scheduleList.count(), static_cast<std::size_t>(0));
-+    QCOMPARE(m->m_scheduleList.count(), 0);
- 
-   } catch (const MyMoneyException &) {
-     m->rollbackTransaction();
-@@ -1548,13 +1548,13 @@
- void MyMoneySeqAccessMgrTest::testAddCurrency()
- {
-   MyMoneySecurity curr("EUR", "Euro", "?", 100, 100);
--  QCOMPARE(m->m_currencyList.count(), static_cast<std::size_t>(0));
-+  QCOMPARE(m->m_currencyList.count(), 0);
-   m->m_dirty = false;
-   try {
-     m->addCurrency(curr);
-     m->commitTransaction();
-     m->startTransaction();
--    QCOMPARE(m->m_currencyList.count(), static_cast<std::size_t>(1));
-+    QCOMPARE(m->m_currencyList.count(), 1);
-     QCOMPARE(m->m_currencyList["EUR"].name(), QLatin1String("Euro"));
-     QCOMPARE(m->dirty(), true);
-   } catch (const MyMoneyException &) {
-@@ -1582,7 +1582,7 @@
-     m->modifyCurrency(curr);
-     m->commitTransaction();
-     m->startTransaction();
--    QCOMPARE(m->m_currencyList.count(), static_cast<std::size_t>(1));
-+    QCOMPARE(m->m_currencyList.count(), 1);
-     QCOMPARE(m->m_currencyList["EUR"].name(), QLatin1String("EURO"));
-     QCOMPARE(m->dirty(), true);
-   } catch (const MyMoneyException &) {
-@@ -1611,7 +1611,7 @@
-     m->removeCurrency(curr);
-     m->commitTransaction();
-     m->startTransaction();
--    QCOMPARE(m->m_currencyList.count(), static_cast<std::size_t>(0));
-+    QCOMPARE(m->m_currencyList.count(), 0);
-     QCOMPARE(m->dirty(), true);
-   } catch (const MyMoneyException &) {
-     QFAIL("Unexpected exception");
-@@ -1668,7 +1668,7 @@
-   try {
-     m->addCurrency(unknownCurr);
-     m->m_dirty = false;
--    QCOMPARE(m->m_currencyList.count(), static_cast<std::size_t>(2));
-+    QCOMPARE(m->m_currencyList.count(), 2);
-     QCOMPARE(m->currencyList().count(), 2);
-     QCOMPARE(m->dirty(), false);
-   } catch (const MyMoneyException &) {
-@@ -1797,7 +1797,7 @@
- 
-   QCOMPARE(m->m_nextOnlineJobID, 1ul);
-   QCOMPARE(m->dirty(), true);
--  QCOMPARE(m->m_onlineJobList.count(), static_cast<std::size_t>(1));
-+  QCOMPARE(m->m_onlineJobList.count(), 1);
-   QVERIFY(! m->m_onlineJobList["O000001"].isNull());
- 
- }
-
diff --git a/app-office/kmymoney/kmymoney-4.8.0-r3.ebuild b/app-office/kmymoney/kmymoney-4.8.0-r3.ebuild
deleted file mode 100644
index b61523303b5c..000000000000
--- a/app-office/kmymoney/kmymoney-4.8.0-r3.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-SQL_REQUIRED="always"
-VIRTUALX_REQUIRED="test"
-VIRTUALDBUS_TEST="true"
-inherit kde4-base
-
-DESCRIPTION="Personal finance manager by KDE"
-HOMEPAGE="https://kmymoney.org/"
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-fi
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE="calendar debug doc hbci ofx quotes weboob"
-
-COMMON_DEPEND="
-	>=app-crypt/gpgme-1.7.0[cxx]
-	<app-office/libalkimia-6.0.0
-	dev-libs/gmp:0=
-	dev-libs/libgpg-error
-	x11-misc/shared-mime-info
-	calendar? ( dev-libs/libical:= )
-	hbci? (
-		>=net-libs/aqbanking-5.5.1
-		>=sys-libs/gwenhywfar-4.15.3[qt4]
-	)
-	ofx? ( >=dev-libs/libofx-0.9.4 )
-	weboob? ( www-client/weboob )
-"
-RDEPEND="${COMMON_DEPEND}
-	quotes? ( dev-perl/Finance-Quote )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-tests.patch"
-	"${FILESDIR}/${P}-alkimia-detect.patch"
-	"${FILESDIR}/${P}-fix-csvdialog.patch"
-	"${FILESDIR}/${P}-soversion.patch"
-	"${FILESDIR}/${P}-gpgmepp.patch"
-	"${FILESDIR}/${P}-kdepimlibs-optional.patch"
-	"${FILESDIR}/${P}-drop-national-onlinetasks.patch"
-	"${FILESDIR}/${P}-cmake-3.9.patch"
-)
-
-src_prepare() {
-	kde4-base_src_prepare
-
-	# don't install as executable
-	sed -i kmymoney/CMakeLists.txt \
-		-e "/install.*kmymoney.appdata/ s/PROGRAMS/FILES/" || die
-
-	# bug #617636, complement to drop-national-onlinetasks.patch
-	rm -r kmymoney/plugins/onlinetasks/national || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_QT_DESIGNER=OFF
-		-DENABLE_LIBICAL=$(usex calendar)
-		-DUSE_DEVELOPER_DOC=$(usex doc)
-		-DENABLE_KBANKING=$(usex hbci)
-		-DENABLE_LIBOFX=$(usex ofx)
-		-DCMAKE_DISABLE_FIND_PACKAGE_KdepimLibs=ON
-		-DENABLE_WEBOOB=$(usex weboob)
-	)
-	kde4-base_src_configure
-}
-
-src_compile() {
-	kde4-base_src_compile
-	use doc && kde4-base_src_compile apidoc
-}
-
-src_install() {
-	use doc && HTML_DOCS=("${BUILD_DIR}/apidocs/html/")
-	kde4-base_src_install
-}
diff --git a/app-office/kmymoney/kmymoney-4.8.1.1-r1.ebuild b/app-office/kmymoney/kmymoney-4.8.1.1-r1.ebuild
index 612279679a18..34a425616785 100644
--- a/app-office/kmymoney/kmymoney-4.8.1.1-r1.ebuild
+++ b/app-office/kmymoney/kmymoney-4.8.1.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit cmake-utils flag-o-matic virtualx
+inherit cmake-utils flag-o-matic gnome2-utils virtualx xdg-utils
 
 DESCRIPTION="Personal finance manager by KDE"
 HOMEPAGE="https://kmymoney.org/"
@@ -11,7 +11,7 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="calendar debug doc +handbook hbci ofx quotes test weboob"
 
 COMMON_DEPEND="
@@ -145,3 +145,15 @@ src_install() {
 	[[ -d ${ED%/}/usr/share/doc/HTML ]] &&
 		docompress -x /usr/share/doc/HTML
 }
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-officeext/Manifest.gz b/app-officeext/Manifest.gz
index cdcc3207525a..452b16fb71e7 100644
--- a/app-officeext/Manifest.gz
+++ b/app-officeext/Manifest.gz
diff --git a/app-officeext/ooofbtools/Manifest b/app-officeext/ooofbtools/Manifest
index 1935d7976863..1e6984825df0 100644
--- a/app-officeext/ooofbtools/Manifest
+++ b/app-officeext/ooofbtools/Manifest
@@ -4,6 +4,6 @@ DIST OOoFBTools-2.51.zip 5632570 BLAKE2B ec6c8a2b19a8a53d22fc725533669d3bfd69d03
 DIST OOoFBTools-2.52.zip 5650498 BLAKE2B 57a068f1098278bc65d056a98c9047d3391cd732180fb02279d854d10215fec8ef60aa5024e837646738c5ca4f6c60f2205d2311da68eb755ef3427b79c697de SHA512 3da09160422f81be2871e294ddc9397267bf158a6304d23cfa125756c75266d21bb6a6dc5b5ef5feb7afde2979484fd092c555bf14460b43ce215b6c91007e61
 EBUILD ooofbtools-2.48.ebuild 761 BLAKE2B 8126207fe93fd83520b829025d2336265d5a0d466509cb7db95cded083bff141af2a1f581f8584c9b13ec5f43e76f982f95c3ae7b036c505706e6234ed41d37a SHA512 6e1c9f67f25ade0249c5636740d5ae4a166694082a1a6c884b9b0b52d3d1089327728865d9bd80d8d9f69b1b6388f5970c08eced0f59ac2d1d62018c912062b1
 EBUILD ooofbtools-2.50.ebuild 763 BLAKE2B b510068451179d28a58bfcd8b1e68351efc12e01fad3fa2ac10f204556ad95787402544ab9ec5abc60f1dfbc1452f576ed34ae27a3936f02f32db36b7499d3d5 SHA512 e4e989bd44bf1893171de1c605dcb6e27b893dd062dacb959e7a8a32677e807df94ffc6e9e2cca64c09fb9d1e3b3a5462669be4ba5d128090159686680ceaf1a
-EBUILD ooofbtools-2.51.ebuild 777 BLAKE2B b07f45363639828357bd5bf717c95d435d1c46ff28635b7d1ff7467fa928ae957b30f0c6bf1b23e474ef149feccb1cec786918dca41efa1ea753c05856537adb SHA512 420f21979e0ecec9a287cb389407e12f7ef7823ffb7b36c88c6c7c79f7e4e020768e0d5ecaee0cbd1539e1922a9aa5f1df8382dfdc7fa92d51699b6986b081b4
+EBUILD ooofbtools-2.51.ebuild 776 BLAKE2B a46b2eaced520a6dccf4f22e928121aa30c56af5a48cde7c5b82fa7b8b0948351aa087d954c4760f093befaea631e4a4d4a21074979269daa6033e40a03e8199 SHA512 4fa0d51fd22e6f6bf63cb451efbc1e212b447fe4dce8ac1f4d4df1ae2d3bc661395e3986c9f05f17d676540016c325aaecaec64849e5299cd66b23d3afb4d9dc
 EBUILD ooofbtools-2.52.ebuild 777 BLAKE2B 8eec84f111cf368dc3980484abee3c753ab10e5c3dc9931f833b10facb4b77a51832d75348efe22e538326af44d4a7bd5d81d7628eea09426dde263a000e5d66 SHA512 acca4b5a9f0c4deed3a069296ce58e8fe94c44410c242b818bbc01f6609fc322bd96a317122a6993d1f6b4f6db665d82d88b54f22bc5e2dd8f894a683d66c784
 MISC metadata.xml 626 BLAKE2B f26bc34c348b65f52d6c9e3d550c798d892b52f6d0b196ee35b37ee659320db69263f5b27b3e66a312919bbac58994f4051f37679ab6e0da1a97744c7309c937 SHA512 a43a53dec993fe904b3b17322daa0d15d5956a8399cedd54b0b64404070b65a68a8d1d8b68ba66c91daad8db893e688abe7f4db1aea8818ad4971271f9531c88
diff --git a/app-officeext/ooofbtools/ooofbtools-2.51.ebuild b/app-officeext/ooofbtools/ooofbtools-2.51.ebuild
index 0c5234aaa3d0..5cea90c2d8d3 100644
--- a/app-officeext/ooofbtools/ooofbtools-2.51.ebuild
+++ b/app-officeext/ooofbtools/ooofbtools-2.51.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/fbtools/files/release/${MY_PN}-${PV}.zip"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 RDEPEND="dev-libs/libxml2
 	app-arch/zip"
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 081594cd7124..97a8577ca99d 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/mpv-bash-completion/Manifest b/app-shells/mpv-bash-completion/Manifest
index 52abebeca599..8ce3579ae862 100644
--- a/app-shells/mpv-bash-completion/Manifest
+++ b/app-shells/mpv-bash-completion/Manifest
@@ -3,5 +3,5 @@ DIST mpv-bash-completion-3.3.15.tar.gz 19830 BLAKE2B 95b61e10dcf37c688a789fc1d5d
 DIST mpv-bash-completion-3.3.16.tar.gz 20125 BLAKE2B 1350445ea05474e553ade334c1f11e97828df11143021920a25787a295d6e870595e35dda6ccd048ed4e01e0e85443a5902893fed1aa1525e875649a93ef632d SHA512 d962cc911d571b0345ddee22ecae6faef307f2da44642d6db5223fb0e51d2b2087b038e1964cf8f1ed683bb95a3268a8ffc1fff2759561100b23921406a0e31f
 EBUILD mpv-bash-completion-3.3.12.ebuild 1011 BLAKE2B 9dd8d7252321818c92e132604912840037566a2055956530149876914c4c65f59c19fab6399a8e719abe4cbaaa662a2ecf9176664f9a1f2063cab79eda01bbfc SHA512 4a32d4d8cc9fe52735bacba4b351522b702a7daf01eb74662f2c935952d1d005f1c3c7be1229bc183d477fa12071ef6688b80061d03ea2e7b98a495ea78479f6
 EBUILD mpv-bash-completion-3.3.15.ebuild 1012 BLAKE2B d69ab34e57f3d3dd9e772051ab8a3a8ca83bb6bb74d450a5c641577e927e87b70dd18da6b583c850ca2a738072f00cd992f2ac8004cf25e6e68a36efd308b885 SHA512 612b2af3a767013de5cd392be076fe6cf70e3863928b5048ef60faba7edd7ccbacc3e40ef568206a6e9065d9309f6af723d18c84d3ef4ef3cd424fe62c7ebbaa
-EBUILD mpv-bash-completion-3.3.16.ebuild 1012 BLAKE2B d69ab34e57f3d3dd9e772051ab8a3a8ca83bb6bb74d450a5c641577e927e87b70dd18da6b583c850ca2a738072f00cd992f2ac8004cf25e6e68a36efd308b885 SHA512 612b2af3a767013de5cd392be076fe6cf70e3863928b5048ef60faba7edd7ccbacc3e40ef568206a6e9065d9309f6af723d18c84d3ef4ef3cd424fe62c7ebbaa
+EBUILD mpv-bash-completion-3.3.16.ebuild 1011 BLAKE2B 662cef51d4b5849a97323b301ff69536a162d3bdab937bc68a126616eb4dd627eff22ad580aae3418fbcdc4bbb9f7edebebe1fb216cc499b2d3e2f9c4dd252bf SHA512 2a46ad7794718a676c8b20fd7bfc35710f9d2908ab7e1821e44dade6c2a43dc540b76c1acfd5756b1bc19547e32c122ba64cf370792774890a02af5462e28fb5
 MISC metadata.xml 643 BLAKE2B 94c8ac2a90c9662ad1a887b4824b7976b135aa182bddb84c00701ec07f5a3526e95c45976802b57e4855c1001c696dfa49d3b3beb5aedca5aa469cc21a74e2a5 SHA512 8f27bb84763dbeb1b45290b6a0ff6ede7d5a3e15513d1ccbdbb544bf20a324c8cd687a517b50823320f5f0ddc7b8a71efe7cadb29ed3ca1fa4a1c43500f6ca76
diff --git a/app-shells/mpv-bash-completion/mpv-bash-completion-3.3.16.ebuild b/app-shells/mpv-bash-completion/mpv-bash-completion-3.3.16.ebuild
index cc0b326cb44d..eb8e758b29fb 100644
--- a/app-shells/mpv-bash-completion/mpv-bash-completion-3.3.16.ebuild
+++ b/app-shells/mpv-bash-completion/mpv-bash-completion-3.3.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/2ion/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="luajit"
 
 COMMON_DEPEND=">=media-video/mpv-0.25.0[cli]"
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 3e1c00631a7f..435692019f34 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index 4f035caeddd8..0ebf023881fc 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -1,6 +1,3 @@
-AUX 3.22.1-CVE-2017-1000083.patch 5157 BLAKE2B b3ad8e49ba4dde21b7f3a198297443b24637592b7abefc1521a3ef226bc884dbe87a5a268a93939ffb95ea3db807d7cf8215175861a4530b70ac98e77965bec5 SHA512 f7bf0a0015191d4994d7e6a40a8a3bc4b8b2ec18ad04ca8fc46cca455709955d9f13d7ab2a0f419faca55a85064c4fe9c9f57ac4d9683f0c3fb61331996eb921
-DIST evince-3.22.1.tar.xz 3365004 BLAKE2B 89d909d6ce4bf5c370ca1777993855b70e924108aab4f1f467601165545ae74647ce77c9ba9cb7145e30d1dff00749f41df5fd461be84e51db5f01a293c68294 SHA512 c36a90bf98f25b4f9f05536f1a09c38be30b814529e17a4ab159ba7c1e952402a211f335d4cdf1928ace8a5b46d6d019fbbd457ce11c2ffa264d8bb7c32d5a18
 DIST evince-3.24.2.tar.xz 3509216 BLAKE2B 3bcb9e15a6576650d17d6ea1df638c4b16759ddd2353ca47b425c1fec04f90b85ff7f338472e5e18defc01ab066ef241eff40e8f493fa2238814933703636e7b SHA512 77e099ff60188f982a49f5c8287eb2ed8d42402a15a54ccf8367b3814e7e16ba31354363d3f101117153792daa96f653f24bb06193b5e749d0ebfaac7d7c1e0f
-EBUILD evince-3.22.1-r1.ebuild 2874 BLAKE2B 29b8d97ac57f0b97bf12d8dde902a8bdf8f06a3a16d4179054c57bde113f3bdff70c6073d1e7b5515588ef063d266f1483c715b423f8e6e4aede7650ec9a309b SHA512 0b41b16686f158123aebc9cd939186524c6c0c84bb2e8dd043620538f2d283ebdf98fcdedadb713adc8f969403bf29b42b0c4854ad7ee043ac68e721d6aab075
-EBUILD evince-3.24.2.ebuild 2818 BLAKE2B ae723379376aaf03fe7d74e0f32db1154e4bba04a4990cd3c1b156827089b2ea8b6dfbcd3b441a0266a75d4ad5a52adbfa08c569de279e57ff52f11546369041 SHA512 3c49964d69701e110c069d2fff8a67fc634b57280be4c073c5a7a83e604a69962452927abcb8798f50a143260ced9b34f61bb007e35ac8eca5605617955eff0c
+EBUILD evince-3.24.2.ebuild 2817 BLAKE2B de7e0a0d79c45ec1c49c81c3c2a15dc3f26c3e2bcdc8d5d9c50112ed5ae6ef97140f846ce417d493c3249bcab11772cc3b702512f4a2efd0cecc1ef352d8912c SHA512 fc749377496ba1e0a22cd50960ddd15f111db660ccdf7ae06893a437c3b6b128321dd465846f47ca92811160e88e8f9b3fa9cae83da2adba101ee22e166d435b
 MISC metadata.xml 612 BLAKE2B 2736a02dc43835f7db7b02a3ffcd2c2e25a81971a61a008f67497612ce8f9c78b6641e110a00dacf5f158cf5a87104171c5aea7f82be241ee0b966bb802e78eb SHA512 a9ce7d786d979e14c852b0fe3f722b346dce2f1f52b8f9ab272a1f2291ce88adba78c5d347e3e33a3bb0a58f46d77d20febc92516a4c12bc9f987cccd7aa977c
diff --git a/app-text/evince/evince-3.22.1-r1.ebuild b/app-text/evince/evince-3.22.1-r1.ebuild
deleted file mode 100644
index 7ce30ec41a4e..000000000000
--- a/app-text/evince/evince-3.22.1-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 systemd
-
-DESCRIPTION="Simple document viewer for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evince"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
-SLOT="0/evd3.4-evv3.3"
-IUSE="djvu dvi gstreamer gnome gnome-keyring +introspection nautilus nsplugin +postscript t1lib tiff xps"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
-
-# atk used in libview
-# gdk-pixbuf used all over the place
-COMMON_DEPEND="
-	dev-libs/atk
-	>=dev-libs/glib-2.36:2[dbus]
-	>=dev-libs/libxml2-2.5:2
-	sys-libs/zlib:=
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.16.0:3[introspection?]
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/cairo-1.10:=
-	>=app-text/poppler-0.33[cairo]
-	djvu? ( >=app-text/djvu-3.5.22:= )
-	dvi? (
-		virtual/tex-base
-		dev-libs/kpathsea:=
-		t1lib? ( >=media-libs/t1lib-5:= ) )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-libs/gst-plugins-good:1.0 )
-	gnome? ( gnome-base/gnome-desktop:3= )
-	gnome-keyring? ( >=app-crypt/libsecret-0.5 )
-	introspection? ( >=dev-libs/gobject-introspection-1:= )
-	nautilus? ( >=gnome-base/nautilus-2.91.4[introspection?] )
-	postscript? ( >=app-text/libspectre-0.2:= )
-	tiff? ( >=media-libs/tiff-3.6:0= )
-	xps? ( >=app-text/libgxps-0.2.1:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gvfs
-	gnome-base/librsvg
-	|| (
-		>=x11-themes/adwaita-icon-theme-2.17.1
-		>=x11-themes/hicolor-icon-theme-0.10 )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.3
-	app-text/yelp-tools
-	dev-util/gdbus-codegen
-	>=dev-util/gtk-doc-am-1.13
-	>=dev-util/intltool-0.35
-	dev-util/itstool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-# eautoreconf needs:
-#  app-text/yelp-tools
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-CVE-2017-1000083.patch
-)
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Do not depend on adwaita-icon-theme, bug #326855, #391859
-	# https://bugs.freedesktop.org/show_bug.cgi?id=29942
-	sed -e 's/adwaita-icon-theme >= $ADWAITA_ICON_THEME_REQUIRED//g' \
-		-i configure || die "sed failed"
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--enable-pdf \
-		--enable-comics \
-		--enable-thumbnailer \
-		--with-platform=gnome \
-		--enable-dbus \
-		$(use_enable djvu) \
-		$(use_enable dvi) \
-		$(use_enable gstreamer multimedia) \
-		$(use_enable gnome libgnome-desktop) \
-		$(use_with gnome-keyring keyring) \
-		$(use_enable introspection) \
-		$(use_enable nautilus) \
-		$(use_enable nsplugin browser-plugin) \
-		$(use_enable postscript ps) \
-		$(use_enable t1lib) \
-		$(use_enable tiff) \
-		$(use_enable xps) \
-		BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins \
-		--with-systemduserunitdir="$(systemd_get_userunitdir)"
-}
diff --git a/app-text/evince/evince-3.24.2.ebuild b/app-text/evince/evince-3.24.2.ebuild
index 584a95adcec8..376adc725d22 100644
--- a/app-text/evince/evince-3.24.2.ebuild
+++ b/app-text/evince/evince-3.24.2.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2+ CC-BY-SA-3.0"
 # subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
 SLOT="0/evd3.4-evv3.3"
 IUSE="djvu dvi gstreamer gnome gnome-keyring +introspection nautilus nsplugin +postscript t1lib tiff xps"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
 
 # atk used in libview
 # gdk-pixbuf used all over the place
diff --git a/app-text/evince/files/3.22.1-CVE-2017-1000083.patch b/app-text/evince/files/3.22.1-CVE-2017-1000083.patch
deleted file mode 100644
index 9164c618145a..000000000000
--- a/app-text/evince/files/3.22.1-CVE-2017-1000083.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-From: Bastien Nocera
-Date: Thu, 6 Jul 2017 20:02:00 +0200
-Subject: comics: Remove support for tar and tar-like commands
-
-When handling tar files, or using a command with tar-compatible syntax,
-to open comic-book archives, both the archive name (the name of the
-comics file) and the filename (the name of a page within the archive)
-are quoted to not be interpreted by the shell.
-
-But the filename is completely with the attacker's control and can start
-with "--" which leads to tar interpreting it as a command line flag.
-
-This can be exploited by creating a CBT file (a tar archive with the
-.cbt suffix) with an embedded file named something like this:
-"--checkpoint-action=exec=bash -c 'touch ~/hacked;'.jpg"
-
-CBT files are infinitely rare (CBZ is usually used for DRM-free
-commercial releases, CBR for those from more dubious provenance), so
-removing support is the easiest way to avoid the bug triggering. All
-this code was rewritten in the development release for GNOME 3.26 to not
-shell out to any command, closing off this particular attack vector.
-
-This also removes the ability to use libarchive's bsdtar-compatible
-binary for CBZ (ZIP), CB7 (7zip), and CBR (RAR) formats. The first two
-are already supported by unzip and 7zip respectively. libarchive's RAR
-support is limited, so unrar is a requirement anyway.
-
-Discovered by Felix Wilhelm from the Google Security Team.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=784630
----
- backend/comics/comics-document.c | 40 +---------------------------------------
- configure.ac                     |  2 +-
- 2 files changed, 2 insertions(+), 40 deletions(-)
-
-diff --git a/backend/comics/comics-document.c b/backend/comics/comics-document.c
-index 96ed26e..3af119a 100644
---- a/backend/comics/comics-document.c
-+++ b/backend/comics/comics-document.c
-@@ -56,8 +56,7 @@ typedef enum
- 	RARLABS,
- 	GNAUNRAR,
- 	UNZIP,
--	P7ZIP,
--	TAR
-+	P7ZIP
- } ComicBookDecompressType;
- 
- typedef struct _ComicsDocumentClass ComicsDocumentClass;
-@@ -117,9 +116,6 @@ static const ComicBookDecompressCommand command_usage_def[] = {
- 
-         /* 7zip */
- 	{NULL               , "%s l -- %s"     , "%s x -y %s -o%s", FALSE, OFFSET_7Z},
--
--        /* tar */
--	{"%s -xOf"          , "%s -tf %s"      , NULL             , FALSE, NO_OFFSET}
- };
- 
- static GSList*    get_supported_image_extensions (void);
-@@ -364,13 +360,6 @@ comics_check_decompress_command	(gchar          *mime_type,
- 			comics_document->command_usage = GNAUNRAR;
- 			return TRUE;
- 		}
--		comics_document->selected_command =
--				g_find_program_in_path ("bsdtar");
--		if (comics_document->selected_command) {
--			comics_document->command_usage = TAR;
--			return TRUE;
--		}
--
- 	} else if (g_content_type_is_a (mime_type, "application/x-cbz") ||
- 		   g_content_type_is_a (mime_type, "application/zip")) {
- 		/* InfoZIP's unzip program */
-@@ -396,12 +385,6 @@ comics_check_decompress_command	(gchar          *mime_type,
- 			comics_document->command_usage = P7ZIP;
- 			return TRUE;
- 		}
--		comics_document->selected_command =
--				g_find_program_in_path ("bsdtar");
--		if (comics_document->selected_command) {
--			comics_document->command_usage = TAR;
--			return TRUE;
--		}
- 
- 	} else if (g_content_type_is_a (mime_type, "application/x-cb7") ||
- 		   g_content_type_is_a (mime_type, "application/x-7z-compressed")) {
-@@ -425,27 +408,6 @@ comics_check_decompress_command	(gchar          *mime_type,
- 			comics_document->command_usage = P7ZIP;
- 			return TRUE;
- 		}
--		comics_document->selected_command =
--				g_find_program_in_path ("bsdtar");
--		if (comics_document->selected_command) {
--			comics_document->command_usage = TAR;
--			return TRUE;
--		}
--	} else if (g_content_type_is_a (mime_type, "application/x-cbt") ||
--		   g_content_type_is_a (mime_type, "application/x-tar")) {
--		/* tar utility (Tape ARchive) */
--		comics_document->selected_command =
--				g_find_program_in_path ("tar");
--		if (comics_document->selected_command) {
--			comics_document->command_usage = TAR;
--			return TRUE;
--		}
--		comics_document->selected_command =
--				g_find_program_in_path ("bsdtar");
--		if (comics_document->selected_command) {
--			comics_document->command_usage = TAR;
--			return TRUE;
--		}
- 	} else {
- 		g_set_error (error,
- 			     EV_DOCUMENT_ERROR,
-diff --git a/configure.ac b/configure.ac
-index 36e866a..26a1a7d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -795,7 +795,7 @@ AC_SUBST(TIFF_MIME_TYPES)
- AC_SUBST(APPDATA_TIFF_MIME_TYPES)
- AM_SUBST_NOTMAKE(APPDATA_TIFF_MIME_TYPES)
- if test "x$enable_comics" = "xyes"; then
--        COMICS_MIME_TYPES="application/x-cbr;application/x-cbz;application/x-cb7;application/x-cbt;application/x-ext-cbr;application/x-ext-cbz;application/vnd.comicbook+zip;application/x-ext-cb7;application/x-ext-cbt"
-+        COMICS_MIME_TYPES="application/x-cbr;application/x-cbz;application/x-cb7;application/x-ext-cbr;application/x-ext-cbz;application/vnd.comicbook+zip;application/x-ext-cb7;"
-         APPDATA_COMICS_MIME_TYPES=$(echo "<mimetype>$COMICS_MIME_TYPES</mimetype>" | sed -e 's/;/<\/mimetype>\n    <mimetype>/g')
-         if test -z "$EVINCE_MIME_TYPES"; then
-            EVINCE_MIME_TYPES="${COMICS_MIME_TYPES}"
--- 
-cgit v0.12
-
diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest
index cb3e6b790704..f3d78f03c391 100644
--- a/app-text/iso-codes/Manifest
+++ b/app-text/iso-codes/Manifest
@@ -1,5 +1,5 @@
 DIST iso-codes-3.75.tar.xz 3461424 BLAKE2B 5548307415b45d2a149fa3868521a464522c9a34e19607faea64aec3e2ff68d331872ff7de3c5807f7ae431a489fede42b6b59f068c5f22132aad4a0f1de8f87 SHA512 157899048cec091864ad8a7723314e28a0ccc4a0e1a5c2101bb630baf1a034bf117e38263e3c95e0135ba9d3a4d76635c8201c50a54e25f6af24c87253b8b40e
 DIST iso-codes-3.76.tar.xz 3474728 BLAKE2B b418b7b80d1926e765b65aad4edbd74ad8d37251fda14e3ab0e222095762d54e358de6f8d4a08fde8ae14460fd975a2a541ca6a5a4cf8ef1d777719462b0f991 SHA512 a0f6714a79a52b5dab82a268e85cb2d019ff5255744b88d088dcd7d5a15eb9710876a338a0a5d0f5659b4146bc6cc53d6d3474d621b3dcca7c47afabfc7e0dfa
 EBUILD iso-codes-3.75.ebuild 2426 BLAKE2B e95562582a1d3db51a6d395ab95dd0c3ce2b41f1792b94554ca5aea406e5d44a0dc5e963e5b1b44f4f7e11fa1ec305f5d5337491458c39902599df675b798181 SHA512 51bae9c45a1aa31d5b94326a69f0391825ef558236589122725260e2d61b89bc8a72ebfb512d297bb0e8dca1af44a2aec3597d7ed86ed284d03b291d14aa6858
-EBUILD iso-codes-3.76.ebuild 2433 BLAKE2B 6220a709b5a2d3d9ce9ef04d86a43a6bf3b1a9ba228b6917ecd32847e839314be587ba3e0bcc810817f092036d46b00da35797b2147f79ac6c2ea1578aecc8b1 SHA512 5be4c86f67c99ad852ae9247afcfa4df8a7c904716fc63cfa22ca28b023571cf4f02758393eab9344854c05b750ba9fe504bfeadd96876f2193dcd421b630b3d
+EBUILD iso-codes-3.76.ebuild 2432 BLAKE2B f600e4b4e9c6e7599ce95a7d04574be2f222287993437b7e8a1ff3dcc0ea534e63c3480be2cb587f9808640abcc66d676ff7c4777e7225642bd271e5defd2e40 SHA512 56a2772a4ec75bcd97845dd7dc31602178053119eec74d3734cd36ccae66f6e79da66ca624c2ceccc1587ae8ccbb335b3cfbed5b655cc83e994ec4143b0bbecd
 MISC metadata.xml 480 BLAKE2B 3aefef945cb111095839e8fa8b84757e7f51a9aa8848806911d8c01763ab2d2f1d0c5b31c042f6ee307756e007893f6559c54d74a104caa612c9a6d39b2eea7e SHA512 5729ca31911ea7dad748e9f3afdd1f45f9034d783b56a75609101bfdb0a204bda8a078e7d251e89731091726062c4ac962e000ec7a898cb66ff787c8f2308d4c
diff --git a/app-text/iso-codes/iso-codes-3.76.ebuild b/app-text/iso-codes/iso-codes-3.76.ebuild
index 637b939ba5fa..f1abe31cefff 100644
--- a/app-text/iso-codes/iso-codes-3.76.ebuild
+++ b/app-text/iso-codes/iso-codes-3.76.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://pkg-isocodes.alioth.debian.org/downloads/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index bbe6af4c6029..533c8098515d 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/catch/Manifest b/dev-cpp/catch/Manifest
index a31db67d6434..6e37ad1c0270 100644
--- a/dev-cpp/catch/Manifest
+++ b/dev-cpp/catch/Manifest
@@ -1,9 +1,7 @@
 DIST Catch-1.11.0.tar.gz 376132 BLAKE2B 23a1a6292dd91ec1c71923b4902b42b59ff6be5227b666f68ef0dc33756a58a63edd70a9b139dda0b1860c2b7a0cfec7ab9262e6447eff3184cfe28ea9b0aa77 SHA512 33085c2671f78c7562eace909564b2730eabcaf4490cd463402e66ab4ac2be1fe4fe360916c11aa589ba4a010622444126ee2ae747783b5869b5d7276361f132
-DIST Catch2-2.0.1.tar.gz 397154 BLAKE2B e41cb3afb706ebed5742b2639cbba9a3468b6325788c6928f8c4e307cd0b11a5fda6aa91def709536ec56412010c0865589999f1cb270630372ba3275bd36fbf SHA512 df6dc480aa208c6c39c8b36d06295883345f925b7ec579e9f0f7a68c816b90dbc3c2ece32926a6458646f7412027212f1b4c3cb28f217f411d3a56580f6edc32
-DIST Catch2-2.1.0.tar.gz 475638 BLAKE2B 66c48b7fe551f066e43870465e0fb58b966243d00cfe78c22389af45cf1cf97d6b3c192cdbf6aec4046ff3744a03e0125ca3b66f7c2a47d17f5a6ce538ad8959 SHA512 1fa0d1cb607fcb8dec37437fa788868324b0ded8e929138f4167d57bafa567b64955546142699a3e3bd2aeb7d36b7c2c7c426aaf3d68b94bddd43b2f78026fc8
+DIST Catch2-2.1.1.tar.gz 481236 BLAKE2B 8a8110611aaf4ea913462884d8293bcae7d0abf3075253a26385a56b2cb5bf50b769e2117430c9712e4644f430cc16461fabfef921c5fbfceb82effb0da74e93 SHA512 64947672e614301a45efd812eb3eef98d871c9719005a441b6f6bb1dc26820bd9643ba285bcc0eaef9b212c5ab6ada4a875433c47a020ce436bcc411cdc8ad72
 EBUILD catch-1.11.0.ebuild 725 BLAKE2B 49c5034310812a931d9155d0aa3d791c30ab1f381c14bf102a26e23cd7c24ca97c4d4b7b11c8c859e665fdbd7beea44416e193ec06ad1d8e883f7459023ce3d6 SHA512 e7fa7e70cb02ab499606e656650d4ddb0c11c4990c720457dc0e21ebcee4a44e67356dfc89d3bdd0caf5e943fb5b59b5fa4ff9f2bd1963b6db20f362c1725560
 EBUILD catch-1.9999.ebuild 558 BLAKE2B bafe5cb18017202bd684d631b8839caab6bb128d8fc42d7772dd74aa91dcd99b139393fa22463536924da114fc508a92d5b49639590933397a57cab9f2159ac0 SHA512 1952c96b2fa49e674a32466f2ec709b2f92c8e2502eecb1f25c24d81d11c73e8c28cfbb1da5b7e322bbebd28d6ade06f6b157e07f47f1a06ad258c30efc118f0
-EBUILD catch-2.0.1.ebuild 600 BLAKE2B 57c2684c149adea28cf80122023e3a8140ef92e82e9523726c4377f13992f8d0c4ef812687ac2727496c8062269d1299dd12f3d3111295eb0acd551e04c2a8dc SHA512 dfad28f7a5d5379253e50ea2b7db60e9e560ace137fd28c188570b9e61d669706f6f97a0218d7ffeb6c8fe01baf52bc79855ff19fdc83f528fe437390f1bdcdb
-EBUILD catch-2.1.0.ebuild 600 BLAKE2B 57c2684c149adea28cf80122023e3a8140ef92e82e9523726c4377f13992f8d0c4ef812687ac2727496c8062269d1299dd12f3d3111295eb0acd551e04c2a8dc SHA512 dfad28f7a5d5379253e50ea2b7db60e9e560ace137fd28c188570b9e61d669706f6f97a0218d7ffeb6c8fe01baf52bc79855ff19fdc83f528fe437390f1bdcdb
-EBUILD catch-9999.ebuild 709 BLAKE2B 11ec1e0c1ada1bac5716b706d6eeec4dc14af052c275ea7fa51a5e11e5d030e77e27663cd572d620039d324aeb46d121d9c322425944cdad6665696e66a2809c SHA512 db3a518f4fc19be0ffda3cf37de7c34a785049a63b52030b7e915affa74f5995a59cc01abe90a3e2b583ceba59e0d108e775faa46bb9b642061074b7f12002a8
+EBUILD catch-2.1.1.ebuild 789 BLAKE2B 1eefb971644a62d137bd3af77bd3155fe82382f1520e5da503ad80bb4ace697ce461f5d3c6311ac0b241224f6df603b87ec00f5c9225d8d6bb6c7a6ecf9bb303 SHA512 930839ea809a06dcb8f66ade29cf3e5b109327ceaef66da33c55fc958974b2489bfb003238b560189868bc08246ca4ddb7b5f239ff0b804973c6fab50ab4b4b0
+EBUILD catch-9999.ebuild 789 BLAKE2B 1eefb971644a62d137bd3af77bd3155fe82382f1520e5da503ad80bb4ace697ce461f5d3c6311ac0b241224f6df603b87ec00f5c9225d8d6bb6c7a6ecf9bb303 SHA512 930839ea809a06dcb8f66ade29cf3e5b109327ceaef66da33c55fc958974b2489bfb003238b560189868bc08246ca4ddb7b5f239ff0b804973c6fab50ab4b4b0
 MISC metadata.xml 324 BLAKE2B e32ed47ddce7e517244ff26e70d1bd31cdaa33bef0bf4a6cf4284f3688745760a9538f9bf6d9d25a9fabd3f5f6901a1b91c76d2fe290427a55bcc74d4f17be7b SHA512 094af03b1e2befa015f1faaca9ecf4158fffedfe7ef8a2873e9e6cd6e4e7d26f276e357ac1989c2809702abc3ada590668adc37c9d804cee31ae564f88c3315f
diff --git a/dev-cpp/catch/catch-2.0.1.ebuild b/dev-cpp/catch/catch-2.0.1.ebuild
deleted file mode 100644
index ac2dfcb10a67..000000000000
--- a/dev-cpp/catch/catch-2.0.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-MY_P=${PN^}2-${PV}
-
-DESCRIPTION="Modern C++ header-only framework for unit-tests"
-HOMEPAGE="https://github.com/catchorg/Catch2"
-SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	local mycmakeargs=(
-		-DNO_SELFTEST=$(usex !test)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc -r docs/.
-}
diff --git a/dev-cpp/catch/catch-2.1.0.ebuild b/dev-cpp/catch/catch-2.1.0.ebuild
deleted file mode 100644
index ac2dfcb10a67..000000000000
--- a/dev-cpp/catch/catch-2.1.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-MY_P=${PN^}2-${PV}
-
-DESCRIPTION="Modern C++ header-only framework for unit-tests"
-HOMEPAGE="https://github.com/catchorg/Catch2"
-SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	local mycmakeargs=(
-		-DNO_SELFTEST=$(usex !test)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc -r docs/.
-}
diff --git a/dev-cpp/catch/catch-2.1.1.ebuild b/dev-cpp/catch/catch-2.1.1.ebuild
new file mode 100644
index 000000000000..d7763c4ccaa9
--- /dev/null
+++ b/dev-cpp/catch/catch-2.1.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+inherit cmake-utils
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/catchorg/Catch2.git"
+else
+	MY_P=${PN^}2-${PV}
+	SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+
+	S=${WORKDIR}/${MY_P}
+fi
+
+DESCRIPTION="Modern C++ header-only framework for unit-tests"
+HOMEPAGE="https://github.com/catchorg/Catch2"
+
+LICENSE="Boost-1.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCATCH_ENABLE_WERROR=OFF
+		-DBUILD_TESTING=$(usex test)
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-cpp/catch/catch-9999.ebuild b/dev-cpp/catch/catch-9999.ebuild
index e24ac4a8a034..d7763c4ccaa9 100644
--- a/dev-cpp/catch/catch-9999.ebuild
+++ b/dev-cpp/catch/catch-9999.ebuild
@@ -3,14 +3,18 @@
 
 EAPI=6
 
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
 inherit cmake-utils
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/catchorg/Catch2.git"
 else
+	MY_P=${PN^}2-${PV}
 	SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
+
+	S=${WORKDIR}/${MY_P}
 fi
 
 DESCRIPTION="Modern C++ header-only framework for unit-tests"
diff --git a/dev-cpp/glibmm/Manifest b/dev-cpp/glibmm/Manifest
index fba9f4150e9f..201f3e6a7448 100644
--- a/dev-cpp/glibmm/Manifest
+++ b/dev-cpp/glibmm/Manifest
@@ -3,5 +3,5 @@ DIST glibmm-2.52.0.tar.xz 6450592 BLAKE2B 2ea123bd193c7a745f52b2357c620fdaaef34c
 DIST glibmm-2.52.1.tar.xz 6451164 BLAKE2B 740178b51a2263ecc4778833fa6f2fd3913cdfc4e93b1a732a1b0ec9d43eb4ed60ab6bea48e02081d75a3ec1f98a149ebff47ced54dcce07e7ae011b2d20452d SHA512 702158762cb28972b315ab98dc00a62e532bda08b6e76dc2a2556e8cb381c2021290891887a4af2fbff5a62bab4d50581be73037dc8e0dc47d5febd6cbeb7bda
 EBUILD glibmm-2.50.1.ebuild 1636 BLAKE2B cedaf300eff88a5df1e9b758ba425ad29547642a5c345715a5196b8904f1f5dba0b5c85fd7d5424c2044c9832cf817758cb0086d9deb92484484c1316a4f417b SHA512 d8c11ace8919ff16e950798269d88f83bdde55377f66ba34e47947acbb856273b42bae549393055997ce02077aaf281b1238f6a2a2d4c706d24293d9b64317d3
 EBUILD glibmm-2.52.0.ebuild 1645 BLAKE2B 8698e80fbb0f777d63f2d6b6a4fbd9b80d3b6d014c53bb43984562bc583e32971a4ae4d6caac344b7ffac37e48847a9a61d4db98ef5d227741f95bca09e1cdae SHA512 903a9087feab8a973851471b0dbfbe485b2b1f7e208982c8113980b5f33fbef8b47a2aaf2a3999404c7a80ed2f95664ca0a57f873da0bda97fe3ee1c0b10762a
-EBUILD glibmm-2.52.1.ebuild 1643 BLAKE2B 64974e2975c04304ee7dff8e99e4f6a6d9fdb6014b9fc3f64db6ccde8bbc1b33c2f59c5cb1cf7ff10bef48aa7b648a0a5f32b641054008abd62c48b79cb72157 SHA512 fc98b88024c8605613410980fd1d78a14eb16a6f356312ac03aa3cb7ce10bdccc6292f5bc67e0d00f54243be1272e1c9797a9d2423f3a200eac847cfcea667b8
+EBUILD glibmm-2.52.1.ebuild 1642 BLAKE2B 344bbf55ebf3dfed41c7f58da95f97f0f3ae3e50410dec96c63b8068b277bd9b375ea2febf21621eb16df91fe474904872f162fc3c100a44db9cdb0ebbab6db8 SHA512 b7c6b3aed26c8dcd6e30773498a7799a4d70f46953deaa6516f9aac7e8f81d6fff6b9447a7e18bd4f7f8a0d1e1639d561285c37cc81b50721dcad953ccfdb632
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/glibmm/glibmm-2.52.1.ebuild b/dev-cpp/glibmm/glibmm-2.52.1.ebuild
index 4e9d4282a802..b0366f96b3e8 100644
--- a/dev-cpp/glibmm/glibmm-2.52.1.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.52.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc debug test"
 
 RDEPEND="
diff --git a/dev-cpp/pficommon/Manifest b/dev-cpp/pficommon/Manifest
deleted file mode 100644
index c0cdd75c694b..000000000000
--- a/dev-cpp/pficommon/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX pficommon-1.3.1.0-gcc-4.7.patch 1265 BLAKE2B bdb7c1a2a4c8ed42f4fb972f82ef869361ea9e1482a8581a29830ce120d15e940f417e3963d8cf197dad5466e4bb20d48135d292777cf954e56e897f921588ba SHA512 9bb02df4886683be46ccc162d2ba9ed975d30ed64f1c32223b3180ae27dae9f5685e27e2ac978939dd9521f94a304275077889a88941e733c237a95235c082cd
-AUX pficommon-1.3.1.0-gcc6.patch 11289 BLAKE2B 2a3262bdacf067c669b61ec3168d43ef9fb8b621d0540f377a5dc10f7f7f9950985bd7803717b3d094a7702ed9bd6604d3dc484bd120c8d8df02608795bc6981 SHA512 cec3f6bcce48a5e118c1544980d493a0c379da89e4ccde0dffe5e634f6a20be6d074155fa29954edcbadae1f8a3b2c8ca6dd52ce44fc617ac8dfe346b8859423
-AUX pficommon-1.3.1.0-libdir.patch 1171 BLAKE2B d0a4fc9d861788227303ef697474e1f69b1f92dbb231ea6c5dd1ffdd23dabdf5a4a3f79a8f884a279e5ca898af78bc7b069a35a28c4e8f0a9281dfc48f239d42 SHA512 bac09b89992bc171e30607c4c3a59467d780d151b8135217bdaa76d852988adeed10cda7506b876b6481261193d5a9c0a80e7405ba4073786577b423f5c3e0dc
-AUX pficommon-1.3.1.0-postgresql.patch 613 BLAKE2B 38e980d59dad832b0145669f90df9d2c45ecf4f2fb948d2ded7d9eb7abf4fe477d15880fe1468a079892834212bc36d90579367a5eb148c1aa960d648f064e01 SHA512 9fe2f56f076d9b04fbfed4964d2e5884f793c2b1a3b6e0f37391a34eaf40a0274fdd0243c93fc9a44c6be6d0071b4381fca0dc6cd19546234f36f649d1c6357f
-AUX pficommon-1.3.1.0-soname.patch 6221 BLAKE2B c5415811cb17bc7f98aed586d8b80f8b00326dbab614769bd26c9c7c48649586b8dfe9e8e8a4959ec01a5c61c79a87c439f7b5ff046558190df8fbe7a36367b6 SHA512 36b9a3dc3b081fc7f85e4275532deb377963b5e70ce92027c3c013465a96b2da6b228ba79e8d87bd2c93d1efeb183185562e27656da4a4f05fbf15219adb568a
-DIST pficommon-1.3.1.0.tar.gz 441406 BLAKE2B 647fd263392db90725609248a684295b207f68701c668c569ce85859796f719963e14fdf51ad93841d6e540df63197b586d0a13aace3c23ddb26a129dacf2fff SHA512 95ef445c2f004c0921bdcae7ee50fc3a744d4960f9bc76c13254394c4ae41fad11ea200002b9fde3e099ef509ffe9ba9ea21d69ba1123699ab3338d7afbcf420
-EBUILD pficommon-1.3.1.0.ebuild 1356 BLAKE2B 822c1d9ed88d3fdccd8877ab58aa8b6284338ad85eb9d6cfeaaf25273eceb42bd5803cc496a24e36a7302b11e9c7ac131215045c98a81e82ecf95a347be697ab SHA512 e0afa58fc14c40726882b72ffa288d581e7b77475c6c6928eb743e41a7cf2e869c0e44ce7537ea8f9bb21238d0e1a6192f97388104e11a6e726e0e64dc2ac284
-MISC metadata.xml 427 BLAKE2B d65aeb104584bbf790bcb73162a5f9dc1f7351011a22540f228edde336cbe90ca686d75402f4111888a8cd8ed642ce1b0339cfb21411d76cdd4a901fb56ade29 SHA512 eff07fc3d7064437d8397fb012e44b213850ef21e3fe54496511139d27c705764912693160a63b1c45722b8947063631e9d839076554fbcba175f27ff34ae141
diff --git a/dev-cpp/pficommon/files/pficommon-1.3.1.0-gcc-4.7.patch b/dev-cpp/pficommon/files/pficommon-1.3.1.0-gcc-4.7.patch
deleted file mode 100644
index 283ef2d7da90..000000000000
--- a/dev-cpp/pficommon/files/pficommon-1.3.1.0-gcc-4.7.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 5669e7ea665323ee774eda9c77206102fa499453 Mon Sep 17 00:00:00 2001
-From: Hideyuki Tanaka <tanaka.hideyuki@gmail.com>
-Date: Mon, 21 May 2012 17:21:34 +0900
-Subject: [PATCH] add include <unistd.h> (for gcc-4.7.0)
-
----
- src/network/socket.cpp |    1 +
- src/system/mmapper.cpp |    1 +
- tools/genrpc/main.cpp  |    1 +
- 3 files changed, 3 insertions(+)
-
-diff --git a/src/network/socket.cpp b/src/network/socket.cpp
-index b5c50e4..1fba6e6 100644
---- a/src/network/socket.cpp
-+++ b/src/network/socket.cpp
-@@ -40,6 +40,7 @@
- #include <netinet/in.h>
- #include <netinet/tcp.h>
- #include <arpa/inet.h>
-+#include <unistd.h>
- 
- #include "dns.h"
- #include "../system/syscall.h"
-diff --git a/src/system/mmapper.cpp b/src/system/mmapper.cpp
-index 90eb7b8..e963fd8 100644
---- a/src/system/mmapper.cpp
-+++ b/src/system/mmapper.cpp
-@@ -35,6 +35,7 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <sys/mman.h>
-+#include <unistd.h>
- 
- #include "syscall.h"
- 
-diff --git a/tools/genrpc/main.cpp b/tools/genrpc/main.cpp
-index 100ea4e..3e5ef16 100644
---- a/tools/genrpc/main.cpp
-+++ b/tools/genrpc/main.cpp
-@@ -4,6 +4,7 @@
- #include <cctype>
- #include <cstring>
- #include <cstdio>
-+#include <unistd.h>
- using namespace std;
- 
- #include "../../src/lang/shared_ptr.h"
--- 
-1.7.10
-
diff --git a/dev-cpp/pficommon/files/pficommon-1.3.1.0-gcc6.patch b/dev-cpp/pficommon/files/pficommon-1.3.1.0-gcc6.patch
deleted file mode 100644
index 623738389195..000000000000
--- a/dev-cpp/pficommon/files/pficommon-1.3.1.0-gcc6.patch
+++ /dev/null
@@ -1,350 +0,0 @@
---- a/src/network/cgi/inserter.cpp
-+++ b/src/network/cgi/inserter.cpp
-@@ -50,8 +50,8 @@
- 
- tag_inserter::~tag_inserter()
- {
--  shared_ptr<tag_elem> elem(new tag_elem(name, attrs));
--  vector<shared_ptr<html_elem> > children=b.leave();
-+  pfi::lang::shared_ptr<tag_elem> elem(new tag_elem(name, attrs));
-+  vector<pfi::lang::shared_ptr<html_elem> > children=b.leave();
-   for (int i=0;i<(int)children.size();i++)
-     elem->add_child(children[i]);
-   b.push(elem);
-@@ -59,12 +59,12 @@
- 
- text_inserter::text_inserter(const string &text, xhtml_builder &b)
- {
--  b.push(shared_ptr<html_elem>(new text_elem(text)));
-+  b.push(pfi::lang::shared_ptr<html_elem>(new text_elem(text)));
- }
- 
- prim_inserter::prim_inserter(const string &text, xhtml_builder &b)
- {
--  b.push(shared_ptr<html_elem>(new prim_elem(text)));
-+  b.push(pfi::lang::shared_ptr<html_elem>(new prim_elem(text)));
- }
- 
- } // cgi
---- a/src/network/cgi/server.cpp
-+++ b/src/network/cgi/server.cpp
-@@ -161,12 +161,12 @@
-       <<", thread-num="<<thread_num
-       <<", timeout="<<ssock->timeout()<<endl;
- 
--  ths=vector<shared_ptr<thread> >(thread_num);
--  vector<shared_ptr<cgi, threading_model::multi_thread> > cgis(thread_num);
-+  ths=vector<pfi::lang::shared_ptr<thread> >(thread_num);
-+  vector<pfi::lang::shared_ptr<cgi, threading_model::multi_thread> > cgis(thread_num);
- 
-   for (int i=0; i<thread_num; i++){
--    cgis[i]=shared_ptr<cgi, threading_model::multi_thread>(dynamic_cast<cgi*>(c.clone()));
--    ths[i]=shared_ptr<thread>(new thread(bind(&run_server::process, this, ssock, cgis[i])));
-+    cgis[i]=pfi::lang::shared_ptr<cgi, threading_model::multi_thread>(dynamic_cast<cgi*>(c.clone()));
-+    ths[i]=pfi::lang::shared_ptr<thread>(new thread(bind(&run_server::process, this, ssock, cgis[i])));
-     if (!ths[i]->start()){
-       ostringstream oss;
-       oss<<"unable to start thread"<<endl;
-@@ -185,7 +185,7 @@
-   ths.clear();
- }
- 
--static shared_ptr<http::response> gen_resp(stringstream &ss)
-+static pfi::lang::shared_ptr<http::response> gen_resp(stringstream &ss)
- {
-   http::header head(ss);
- 
-@@ -210,7 +210,7 @@
-     head.erase("status");
-   }
-   
--  shared_ptr<http::response> resp(new http::response(code, reason));
-+  pfi::lang::shared_ptr<http::response> resp(new http::response(code, reason));
- 
-   head["Content-Type"]=content_type;
- 
-@@ -232,10 +232,10 @@
- }
- 
- void run_server::process(socket_type ssock,
--			 shared_ptr<cgi, threading_model::multi_thread> cc)
-+			 pfi::lang::shared_ptr<cgi, threading_model::multi_thread> cc)
- {
-   for (;;){
--    shared_ptr<stream_socket> sock(ssock->accept());
-+    pfi::lang::shared_ptr<stream_socket> sock(ssock->accept());
-     if (!sock) continue;
- 
-     if (ssock->timeout()>0 && !sock->set_timeout(ssock->timeout()))
-@@ -272,7 +272,7 @@
- 
-       cc->exec(req.body(), sout, cerr, env);
- 
--      shared_ptr<http::response> resp=gen_resp(sout);
-+      pfi::lang::shared_ptr<http::response> resp=gen_resp(sout);
-       resp->send(sock);
-     }
-     catch(const exception &e){
---- a/src/network/http/base.cpp
-+++ b/src/network/http/base.cpp
-@@ -61,7 +61,7 @@
- {
- }
- 
--void header::read_header(function<bool(string*)> f)
-+void header::read_header(pfi::lang::function<bool(string*)> f)
- {
-   string line, key, val;
-   if (!f(&line))
-@@ -124,7 +124,7 @@
-   return sock->getline(*str, line_limit);
- }
- 
--header::header(shared_ptr<stream_socket> sock)
-+header::header(pfi::lang::shared_ptr<stream_socket> sock)
- {
-   read_header(bind(&socket_getline, sock.get(), _1, line_limit));
- }
-@@ -211,7 +211,7 @@
-   return dat.end();
- }
- 
--void header::send(shared_ptr<stream_socket> sock)
-+void header::send(pfi::lang::shared_ptr<stream_socket> sock)
- {
-   for (int i=0;i<(int)dat.size();i++){
-     string line=dat[i].first+": "+dat[i].second+"\r\n";
-@@ -228,7 +228,7 @@
- public:
-   typedef C char_type;
- 
--  basic_httpbody_chunked_streambuf(shared_ptr<stream_socket> sock)
-+  basic_httpbody_chunked_streambuf(pfi::lang::shared_ptr<stream_socket> sock)
-     : sock(sock)
-     , chunk_rest(0)
-     , buf(buf_size)
-@@ -321,7 +321,7 @@
-     iss>>hex>>chunk_rest;
-   }
- 
--  shared_ptr<stream_socket> sock;
-+  pfi::lang::shared_ptr<stream_socket> sock;
- 
-   int chunk_rest;
- 
-@@ -334,7 +334,7 @@
- public:
-   typedef C char_type;
- 
--  basic_httpbody_streambuf(shared_ptr<stream_socket> sock, int length)
-+  basic_httpbody_streambuf(pfi::lang::shared_ptr<stream_socket> sock, int length)
-     : sock(sock)
-     , rest(length)
-     , buf(T::eof()){
-@@ -359,7 +359,7 @@
-   }
- 
- private:
--  shared_ptr<stream_socket> sock;
-+  pfi::lang::shared_ptr<stream_socket> sock;
- 
-   int rest;
-   int buf;
-@@ -368,7 +368,7 @@
- template <class C, class T=char_traits<C> >
- class basic_httpbody_chunked_stream : public basic_iostream<C,T>{
- public:
--  basic_httpbody_chunked_stream(shared_ptr<stream_socket> sock)
-+  basic_httpbody_chunked_stream(pfi::lang::shared_ptr<stream_socket> sock)
-     : basic_iostream<C,T>()
-     , buf(sock){
-     this->init(&buf);
-@@ -380,7 +380,7 @@
- template <class C, class T=char_traits<C> >
- class basic_httpbody_stream : public basic_iostream<C,T>{
- public:
--  basic_httpbody_stream(shared_ptr<stream_socket> sock, int len)
-+  basic_httpbody_stream(pfi::lang::shared_ptr<stream_socket> sock, int len)
-     : basic_iostream<C,T>()
-     , buf(sock, len){
-     this->init(&buf);
-@@ -406,7 +406,7 @@
- {
- }
- 
--request::request(shared_ptr<stream_socket> sock)
-+request::request(pfi::lang::shared_ptr<stream_socket> sock)
-   : method_("")
-   , uri_("/")
-   , version_(1,1)
-@@ -438,11 +438,11 @@
- 
-   // body
-   if (cicmp(header_["Transfer-Encoding"],"chunked"))
--    stream=shared_ptr<iostream>(new basic_httpbody_chunked_stream<char>(sock));
-+    stream=pfi::lang::shared_ptr<iostream>(new basic_httpbody_chunked_stream<char>(sock));
-   else if (header_["Content-Length"]!="")
--    stream=shared_ptr<iostream>(new basic_httpbody_stream<char>(sock, lexical_cast<int>(header_["Content-Length"])));
-+    stream=pfi::lang::shared_ptr<iostream>(new basic_httpbody_stream<char>(sock, lexical_cast<int>(header_["Content-Length"])));
-   else
--    stream=shared_ptr<iostream>(new socketstream(sock));
-+    stream=pfi::lang::shared_ptr<iostream>(new socketstream(sock));
- }
- 
- request::~request()
-@@ -474,7 +474,7 @@
-   return *stream;
- }
- 
--void request::send(shared_ptr<stream_socket> sock)
-+void request::send(pfi::lang::shared_ptr<stream_socket> sock)
- {
-   stringstream *ss=dynamic_cast<stringstream*>(stream.get());
-   if (!ss) throw http_exception("body is not stringstream");
-@@ -499,7 +499,7 @@
-   if (sock->flush()>=0)
-     throw http_exception("flush failed");
-   if (dat.length()==0)
--    stream=shared_ptr<iostream>(new socketstream(sock));
-+    stream=pfi::lang::shared_ptr<iostream>(new socketstream(sock));
- }
- 
- response::response()
-@@ -518,7 +518,7 @@
- {
- }
- 
--response::response(shared_ptr<stream_socket> sock)
-+response::response(pfi::lang::shared_ptr<stream_socket> sock)
- {
-   // status-line
-   {
-@@ -546,11 +546,11 @@
- 
-   // body
-   if (cicmp(header_["Transfer-Encoding"],"chunked"))
--    stream=shared_ptr<iostream>(new basic_httpbody_chunked_stream<char>(sock));
-+    stream=pfi::lang::shared_ptr<iostream>(new basic_httpbody_chunked_stream<char>(sock));
-   else if (header_["Content-Length"]!="")
--    stream=shared_ptr<iostream>(new basic_httpbody_stream<char>(sock, lexical_cast<int>(header_["Content-Length"])));
-+    stream=pfi::lang::shared_ptr<iostream>(new basic_httpbody_stream<char>(sock, lexical_cast<int>(header_["Content-Length"])));
-   else
--    stream=shared_ptr<iostream>(new socketstream(sock));
-+    stream=pfi::lang::shared_ptr<iostream>(new socketstream(sock));
- }
- 
- response::~response()
-@@ -582,7 +582,7 @@
-   return *stream;
- }
- 
--void response::send(shared_ptr<stream_socket> sock)
-+void response::send(pfi::lang::shared_ptr<stream_socket> sock)
- {
-   stringstream *ss=dynamic_cast<stringstream*>(stream.get());
-   if (!ss) throw http_exception("body is not stringstream");
-@@ -607,7 +607,7 @@
-   if (sock->flush()>=0)
-     throw http_exception("flush failed");
-   if (dat.length()==0)
--    stream=shared_ptr<iostream>(new socketstream(sock));
-+    stream=pfi::lang::shared_ptr<iostream>(new socketstream(sock));
- }
- 
- } // http
---- a/src/network/rpc/base.cpp
-+++ b/src/network/rpc/base.cpp
-@@ -59,20 +59,20 @@
- {
- }
- 
--void rpc_server::add(const string &name, shared_ptr<invoker_base> invoker)
-+void rpc_server::add(const string &name, pfi::lang::shared_ptr<invoker_base> invoker)
- {
-   funcs[name]=invoker;
- }
- 
- bool rpc_server::serv(uint16_t port, int nthreads)
- {
--  shared_ptr<server_socket, threading_model::multi_thread> ssock(new server_socket());
-+  pfi::lang::shared_ptr<server_socket, threading_model::multi_thread> ssock(new server_socket());
-   if (!ssock->create(port))
-     return false;
- 
--  vector<shared_ptr<thread> > ths(nthreads);
-+  vector<pfi::lang::shared_ptr<thread> > ths(nthreads);
-   for (int i=0; i<nthreads; i++){
--    ths[i]=shared_ptr<thread>(new thread(bind(&rpc_server::process, this, ssock)));
-+    ths[i]=pfi::lang::shared_ptr<thread>(new thread(bind(&rpc_server::process, this, ssock)));
-     if (!ths[i]->start()) return false;
-   }
-   for (int i=0; i<nthreads; i++)
-@@ -80,10 +80,10 @@
-   return true;
- }
- 
--void rpc_server::process(shared_ptr<server_socket, threading_model::multi_thread> ssock)
-+void rpc_server::process(pfi::lang::shared_ptr<server_socket, threading_model::multi_thread> ssock)
- {
-   for (;;){
--    shared_ptr<stream_socket> sock(ssock->accept());
-+    pfi::lang::shared_ptr<stream_socket> sock(ssock->accept());
-     if (!sock) continue;
-     sock->set_nodelay(true);
- 
-@@ -139,11 +139,11 @@
- {
- }
- 
--shared_ptr<socketstream> rpc_client::get_connection()
-+pfi::lang::shared_ptr<socketstream> rpc_client::get_connection()
- {
-   for (int i=0;i<2;i++){
-     if (!ss || !(*ss)){
--      ss=shared_ptr<socketstream>(new socketstream(host, port));
-+      ss=pfi::lang::shared_ptr<socketstream>(new socketstream(host, port));
-       if (!(*ss)){
- 	ss.reset();
- 	continue;
-@@ -180,7 +180,7 @@
-   return ss;
- }
- 
--void rpc_client::return_connection(shared_ptr<socketstream> css)
-+void rpc_client::return_connection(pfi::lang::shared_ptr<socketstream> css)
- {
-   ss=css;
- }
---- a/src/network/socket.cpp
-+++ b/src/network/socket.cpp
-@@ -58,7 +58,7 @@
- namespace pfi{
- namespace network{
- 
--shared_ptr<dns_resolver, threading_model::multi_thread> stream_socket::resolver;
-+pfi::lang::shared_ptr<dns_resolver, threading_model::multi_thread> stream_socket::resolver;
- r_mutex stream_socket::resolver_m;
- 
- class sigign{
-@@ -88,7 +88,7 @@
-   close();
- }
- 
--void stream_socket::set_dns_resolver(shared_ptr<dns_resolver, threading_model::multi_thread> r)
-+void stream_socket::set_dns_resolver(pfi::lang::shared_ptr<dns_resolver, threading_model::multi_thread> r)
- {
-   synchronized(resolver_m)
-     resolver=r;
-@@ -106,10 +106,10 @@
-       return false;
-   }
- 
--  shared_ptr<dns_resolver, threading_model::multi_thread> res;
-+  pfi::lang::shared_ptr<dns_resolver, threading_model::multi_thread> res;
-   synchronized(resolver_m){
-     if (!resolver)
--      set_dns_resolver(shared_ptr<dns_resolver, threading_model::multi_thread>
-+      set_dns_resolver(pfi::lang::shared_ptr<dns_resolver, threading_model::multi_thread>
- 		       (new normal_dns_resolver()));
-     res=resolver;
-   }
diff --git a/dev-cpp/pficommon/files/pficommon-1.3.1.0-libdir.patch b/dev-cpp/pficommon/files/pficommon-1.3.1.0-libdir.patch
deleted file mode 100644
index 9bd0e4bf560d..000000000000
--- a/dev-cpp/pficommon/files/pficommon-1.3.1.0-libdir.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --git a/wscript b/wscript
-index dc1866e..c5b800c 100644
---- a/wscript
-+++ b/wscript
-@@ -6,18 +6,21 @@ out = 'build'
- 
- import Options
- import sys
-+import os
- 
- subdirs = 'src tools'
- 
- def options(opt):
-   opt.load('compiler_cxx')
-   opt.load('unittest_gtest')
-+  opt.load('gnu_dirs')
-   
-   opt.recurse(subdirs)
- 
- def configure(conf):
-   conf.check_tool('compiler_cxx')
-   conf.check_tool('unittest_gtest')
-+  conf.check_tool('gnu_dirs')
- 
-   conf.env.append_unique(
-     'CXXFLAGS',
-@@ -28,6 +31,8 @@ def configure(conf):
-   conf.recurse(subdirs)
- 
-   conf.define('PFICOMMON_VERSION', VERSION)
-+
-+  conf.env['VERSION'] = VERSION
-   
-   conf.write_config_header('src/pfi-config.h')
-   
-@@ -72,11 +77,11 @@ def build(bld):
-   bld(source = 'pficommon.pc.in',
-       prefix = bld.env['PREFIX'],
-       exec_prefix = '${prefix}',
--      libdir = '${prefix}/lib',
-+      libdir = bld.env['LIBDIR'],
-       includedir = '${prefix}/include',
-       PACKAGE = APPNAME,
-       VERSION = VERSION)
- 
--  bld.install_files('${PREFIX}/lib/pkgconfig', 'pficommon.pc')
-+  bld.install_files(os.path.join(bld.env['LIBDIR'], 'pkgconfig'), 'pficommon.pc')
-   
-   bld.recurse(subdirs)
diff --git a/dev-cpp/pficommon/files/pficommon-1.3.1.0-postgresql.patch b/dev-cpp/pficommon/files/pficommon-1.3.1.0-postgresql.patch
deleted file mode 100644
index 0bf7096ad94f..000000000000
--- a/dev-cpp/pficommon/files/pficommon-1.3.1.0-postgresql.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/database/wscript b/src/database/wscript
-index 8eca1d0..3916a7d 100644
---- a/src/database/wscript
-+++ b/src/database/wscript
-@@ -20,7 +20,7 @@ def configure(conf):
-   conf.env.BUILD_PGSQL = False
-   if not Options.options.disable_database:
-     try:
--      incdir = subprocess.check_output(['pg_config', '--includedir-server']).decode()
-+      incdir = subprocess.check_output(['pg_config', '--includedir-server']).decode('utf-8')
-       libdir = subprocess.check_output(['pg_config', '--libdir']).decode()
-       if conf.check_cxx(lib = 'pq',
-                         header_name = 'postgres.h',
diff --git a/dev-cpp/pficommon/files/pficommon-1.3.1.0-soname.patch b/dev-cpp/pficommon/files/pficommon-1.3.1.0-soname.patch
deleted file mode 100644
index 040fb259bc7d..000000000000
--- a/dev-cpp/pficommon/files/pficommon-1.3.1.0-soname.patch
+++ /dev/null
@@ -1,200 +0,0 @@
-diff --git a/src/concurrent/wscript b/src/concurrent/wscript
-index 5aeb5ab..8700d68 100644
---- a/src/concurrent/wscript
-+++ b/src/concurrent/wscript
-@@ -19,6 +19,7 @@ def build(bld):
-     source = 'thread.cpp mutex.cpp rwmutex.cpp condition.cpp internal.cpp',
-     target = 'pficommon_concurrent',
-     includes = '.',
-+    vnum = bld.env['VERSION'],
-     use = 'pficommon_system PTHREAD')
- 
-   bld.program(
-diff --git a/src/data/wscript b/src/data/wscript
-index e99c7c3..df47caf 100644
---- a/src/data/wscript
-+++ b/src/data/wscript
-@@ -61,6 +61,7 @@ def build(bld):
-       ],
-     target = 'pficommon_data',
-     includes = incdirs,
-+    vnum = bld.env['VERSION'],
-     use = 'pficommon_system')
- 
-   def t(src):
-diff --git a/src/database/mysql/wscript b/src/database/mysql/wscript
-index 79d5a23..5407091 100644
---- a/src/database/mysql/wscript
-+++ b/src/database/mysql/wscript
-@@ -7,4 +7,5 @@ def build(bld):
-     source = 'connection.cpp statement.cpp value.cpp',
-     target = 'pficommon_database_mysql',
-     includes = '. ..',
-+    vnum = bld.env['VERSION'],
-     use = 'pficommon_concurrent MYSQL')
-diff --git a/src/database/postgresql/wscript b/src/database/postgresql/wscript
-index 9b834f8..5040a69 100644
---- a/src/database/postgresql/wscript
-+++ b/src/database/postgresql/wscript
-@@ -7,4 +7,5 @@ def build(bld):
-     source = 'connection.cpp statement.cpp result.cpp value.cpp',
-     target = 'pficommon_database_postgresql',
-     includes = '. ..',
-+    vnum = bld.env['VERSION'],
-     use = 'PGSQL')
-diff --git a/src/database/wscript b/src/database/wscript
-index b491d4f..3916a7d 100644
---- a/src/database/wscript
-+++ b/src/database/wscript
-@@ -44,6 +44,7 @@ def build(bld):
-   t = bld.shlib(
-     source = '',
-     target = 'pficommon_database',
-+    vnum = bld.env['VERSION'],
-     use = [])
-   
-   if bld.env.BUILD_MYSQL:
-diff --git a/src/lang/wscript b/src/lang/wscript
-index e5538d9..e0ad364 100644
---- a/src/lang/wscript
-+++ b/src/lang/wscript
-@@ -20,6 +20,7 @@ def build(bld):
- 
-   bld.shlib(
-     source = 'empty.cpp',
-+    vnum = bld.env['VERSION'],
-     target = 'pficommon_lang')
- 
-   bld.program(
-diff --git a/src/math/wscript b/src/math/wscript
-index 8e8e271..f855b3a 100644
---- a/src/math/wscript
-+++ b/src/math/wscript
-@@ -14,6 +14,7 @@ def build(bld):
-   bld.shlib(
-     source = 'random/mersenne_twister.cpp',
-     target = 'pficommon_math',
-+    vnum = bld.env['VERSION'],
-     includes = '.')
-   
-   def t(src):
-diff --git a/src/network/wscript b/src/network/wscript
-index 4b0873c..d5a9aee 100644
---- a/src/network/wscript
-+++ b/src/network/wscript
-@@ -56,11 +56,13 @@ def build(bld):
-     source = 'socket.cpp ipv4.cpp dns.cpp uri.cpp',
-     target = 'pficommon_network_base',
-     includes = '.',
-+    vnum = bld.env['VERSION'],
-     use = 'pficommon_concurrent')
-   
-   pfin = bld.shlib(
-     source = '',
-     target = 'pficommon_network',
-+    vnum = bld.env['VERSION'],
-     use = [
-       'pficommon_network_base',
-       'pficommon_network_http',
-diff --git a/src/system/wscript b/src/system/wscript
-index 4068967..a6fc70c 100644
---- a/src/system/wscript
-+++ b/src/system/wscript
-@@ -21,6 +21,7 @@ def build(bld):
-       'sysstat.cpp',
-       'mmapper.cpp'],
-     target = 'pficommon_system',
-+    vnum = bld.env['VERSION'],
-     includes = '.')
- 
-   bld.program(
-diff --git a/src/text/wscript b/src/text/wscript
-index 2cb54df..e18310c 100644
---- a/src/text/wscript
-+++ b/src/text/wscript
-@@ -16,6 +16,7 @@ def build(bld):
-     source = 'xhtml.cpp csv.cpp json/parser.cpp',
-     target = 'pficommon_text',
-     includes = '. json',
-+    vnum = bld.env['VERSION'],
-     use = 'pficommon_data pficommon_system')
-   
-   bld.program(
-diff --git a/src/util/wscript b/src/util/wscript
-index c971da4..7ed427f 100644
---- a/src/util/wscript
-+++ b/src/util/wscript
-@@ -8,6 +8,7 @@ def build(bld):
-   
-   bld.shlib(
-     source = '',
-+    vnum = bld.env['VERSION'],
-     target = 'pficommon_util')
-   
-   bld(features = 'cxx cprogram gtest',
-diff --git a/src/visualization/wscript b/src/visualization/wscript
-index bf0500a..04469a1 100644
---- a/src/visualization/wscript
-+++ b/src/visualization/wscript
-@@ -27,6 +27,7 @@ def build(bld):
-   v = bld.shlib(
-     source = ['empty.cpp'],
-     target = 'pficommon_visualization',
-+    vnum = bld.env['VERSION'],
-     use =  [])
-   
-   bld.program(
-diff --git a/src/wscript b/src/wscript
-index 8dfd9e8..4af7585 100644
---- a/src/wscript
-+++ b/src/wscript
-@@ -26,6 +26,7 @@ def build(bld):
-   b = bld.shlib(
-     source = 'empty.cpp',
-     target = 'pficommon',
-+    vnum = bld.env['VERSION'],
-     use = [
-       'pficommon_concurrent',
-       'pficommon_data',
-diff --git a/src/network/cgi/wscript b/src/network/cgi/wscript
-index 29c44fa..1863394 100644
---- a/src/network/cgi/wscript
-+++ b/src/network/cgi/wscript
-@@ -47,6 +47,7 @@ def build(bld):
-     source = 'base.cpp xhtml_cgi.cpp xhtml_builder.cpp inserter.cpp cgi.cpp server.cpp util.cpp',
-     target = 'pficommon_network_cgi',
-     includes = '. ..',
-+    vnum = bld.env['VERSION'],
-     use = 'pficommon_text pficommon_concurrent pficommon_network_http PTHREAD')
- 
-   if bld.env.BUILD_FCGI:
-diff --git a/src/network/http/wscript b/src/network/http/wscript
-index 7e2bbbe..dbfe480 100644
---- a/src/network/http/wscript
-+++ b/src/network/http/wscript
-@@ -14,4 +14,5 @@ def build(bld):
-     source = 'base.cpp',
-     target = 'pficommon_network_http',
-     includes = '. ..',
-+    vnum = bld.env['VERSION'],
-     use = 'pficommon_network_base')
-diff --git a/src/network/mprpc/wscript b/src/network/mprpc/wscript
-index 940bdd4..0e093f6 100644
---- a/src/network/mprpc/wscript
-+++ b/src/network/mprpc/wscript
-@@ -21,4 +21,5 @@ def build(bld):
-       'socket.cpp'
-       ],
-     target = 'pficommon_network_mprpc',
-+    vnum = bld.env['VERSION'],
-     use = 'pficommon_concurrent pficommon_network_base MSGPACK')
-diff --git a/src/network/rpc/wscript b/src/network/rpc/wscript
-index 74c006c..46121d6 100644
---- a/src/network/rpc/wscript
-+++ b/src/network/rpc/wscript
-@@ -17,4 +17,5 @@ def build(bld):
-     source = 'base.cpp',
-     target = 'pficommon_network_rpc',
-     includes = '. ..',
-+    vnum = bld.env['VERSION'],
-     use = 'pficommon_network_base pficommon_concurrent pficommon_system')
diff --git a/dev-cpp/pficommon/metadata.xml b/dev-cpp/pficommon/metadata.xml
deleted file mode 100644
index 0f0b8821e971..000000000000
--- a/dev-cpp/pficommon/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>naota@gentoo.org</email>
-  </maintainer>
-  <use>
-    <flag name="fcgi">Build FCGI feature</flag>
-    <flag name="mprpc">Build MessagePack RPC feature</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">pfi/pficommon</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-cpp/pficommon/pficommon-1.3.1.0.ebuild b/dev-cpp/pficommon/pficommon-1.3.1.0.ebuild
deleted file mode 100644
index db9afe674b6f..000000000000
--- a/dev-cpp/pficommon/pficommon-1.3.1.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-inherit python-any-r1 waf-utils eutils
-
-DESCRIPTION="General purpose C++ library for PFI"
-HOMEPAGE="https://github.com/pfi/pficommon"
-SRC_URI="https://github.com/pfi/pficommon/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="fcgi imagemagick mprpc mysql postgres test"
-
-RDEPEND="fcgi? ( dev-libs/fcgi )
-	imagemagick? (
-		media-libs/lcms
-		media-gfx/imagemagick[cxx]
-		sys-devel/libtool
-	)
-	mprpc? ( dev-libs/msgpack )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql )
-	"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	test? ( dev-cpp/gtest )"
-
-src_unpack() {
-	unpack ${A}
-	mv pfi-pficommon-* "${S}"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-libdir.patch \
-		"${FILESDIR}"/${P}-soname.patch \
-		"${FILESDIR}"/${P}-postgresql.patch \
-		"${FILESDIR}"/${P}-gcc-4.7.patch \
-		"${FILESDIR}"/${P}-gcc6.patch
-}
-
-src_configure() {
-	if use fcgi; then
-		myconf="${myconf} --with-fcgi=/usr"
-	else
-		myconf="${myconf} --disable-fcgi"
-	fi
-	use imagemagick || myconf="${myconf} --disable-magickpp"
-	use mprpc || myconf="${myconf} --disable-mprpc"
-	if ! use mysql && ! use postgres; then
-		myconf="${myconf} --disable-database"
-	fi
-	waf-utils_src_configure ${myconf}
-}
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 6e009cea3163..a48a0ce876c9 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 64c67c07e1b8..c01004cb2ce7 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -35,6 +35,6 @@ EBUILD mongodb-3.2.12.ebuild 5129 BLAKE2B 5587e9f109bc55d58d5157aed301fb61c8bc08
 EBUILD mongodb-3.2.13.ebuild 5129 BLAKE2B 5587e9f109bc55d58d5157aed301fb61c8bc088d7bad7fc386d9e34b228f05a6fcdc79f4d2201ded1de0d178eb721600322992b6f0e4ec174cc85ac44decf81a SHA512 28de831886c3531c441658cdc7a29cea3b20f6aa9208c5658d4ad71269b6ff359954118810a9e845d567f54a54449ebc20a446f46da3d4694b5395fdf9f822dd
 EBUILD mongodb-3.2.16.ebuild 5180 BLAKE2B 79f825055c4491535e1e4405af86b58650443885a6ac7e65e53f6739465be60bca9abba10ccc803cecfe93b1bf2645970f9a4e97b5dec72309ed12ddd4f1f350 SHA512 9d0a8bac5e2aed1803df8d23ccf126a56194d03f715e86adb4fda36a82fd176617c5c599c1ac7fbfdbdfb8d6c7c63496e34400a9dc5ed75cd6d84ca023d58ee1
 EBUILD mongodb-3.2.17.ebuild 5338 BLAKE2B fd327b1c5bb85e833782839e07b3379a103f0545fb9852cb06d7f6f0b3548b921dfce227d1882a1e448a533c043718c778e9141ec5715805a24c9e2fbf199fa1 SHA512 a439c32b20a81d1c8e199c8a6928aa75479562e6b33c0d7b50797181226a093f571a1caaab102569a9a308db18a73c51558657ccd4bcb1d7e137eb22fb363c4e
-EBUILD mongodb-3.4.10.ebuild 5240 BLAKE2B 1e1897fe9f4d929a7ae9b720aad33819cee29776b5ed34c502e421b3454daedd11bb009437e5316cfb0bf5f3d2d3f563f5c34ce946ebab26030ef96e91b1602a SHA512 001ea14c326133a4d462ce4b25db9318376f86279cdcd9edf7ce6e9f8ee4ed642576e4a0a622cda55fd31360912fdc2aa3a77068503b7dc039ca05b7abd9aa89
+EBUILD mongodb-3.4.10.ebuild 5239 BLAKE2B 83a24b15947daed30ccfcc4e6d48a99125deb35c33b1feffe2c82ba6baca02ce53e442ad5d0a5790de0e412b349102ef0d55d83abe639cf9094ccbfd7863a709 SHA512 40fb7e4363121c59c689bee8f4ce737e024fa12c48169ca0cc19410692ec72944b0bfeabfc064adefce96a964b889bfbb1197dcce18591afec9a52a37b7df28d
 EBUILD mongodb-3.6.2.ebuild 4442 BLAKE2B b62187502656f26136a95ec54db456e87cb2149305c4c5f6c0e4fe4f988c847b3909855d7f536093e7d4d4eb304d5e0322a25fff54d51a378511bbb95040e749 SHA512 3da494650e9126d3287b8dc04876bc8f8b95e49cba2ea3dc7dcad7016e43bc6062f64552e223c88c274312304b98526161151d2bf0e93a8701e6706324da8b0b
 MISC metadata.xml 1112 BLAKE2B 59da7a768ae87cb8ea3a539b40c27707b8aca5bdfd6f3acfcddca4d27a354aa5ffb13b68b7d69b57553d26d3b47860e186c5c43a38122df4712d0cc98ec1f690 SHA512 39b9bd8afc1c79382130c691154eac4338810fb4069406482648d32fd2aefd5d3697c272321d300154be2e4d37ac10f1372c62687d9c41ca0d3682b0152a53c4
diff --git a/dev-db/mongodb/mongodb-3.4.10.ebuild b/dev-db/mongodb/mongodb-3.4.10.ebuild
index 16546b1e3ff0..ecee64cbdd86 100644
--- a/dev-db/mongodb/mongodb-3.4.10.ebuild
+++ b/dev-db/mongodb/mongodb-3.4.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
 
 LICENSE="AGPL-3 Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug kerberos libressl mms-agent ssl test +tools"
 
 RDEPEND=">=app-arch/snappy-1.1.3
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index c47f42ba3088..cbbfa8e7b2c2 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -24,6 +24,7 @@ DIST redis-3.2.8.tar.gz 1547237 BLAKE2B fb03e263ad7b135dff38e018d9b830c4992cf331
 DIST redis-4.0.1.tar.gz 1711660 BLAKE2B 0b8881baa78908df4adcc1aabfa0ea9554900f8b54d204ffa054752ba4355da2b56408501ede81a69cc1f34ebbb9fc984335738ea9f343ddcd4e9fb9a0d64c8e SHA512 62dec537aebd12340b9642f5f8b07fd98757c9e648dcd539a0411f207db3495923c5a6a9941036c56b2d574ee38b46d08558668111e322345ef549f93fada26f
 DIST redis-4.0.2.tar.gz 1713990 BLAKE2B 307ab76b336f7520e14a23a1577c46e1b63cc5a5a5b6afb725cb87934fbcb62107085671fd1072d1142ce8e92f069e6b6064c9f4468335bc6997897c8f494471 SHA512 1458909c6fc16cff8ca5e6dddff23b988ee1e447f2d0bccf5941553b22bab6abb851732b3fe53dafb8a69d6c0939c3ce7e0686d51e03be720fb018c038d3b1b4
 DIST redis-4.0.6.tar.gz 1723533 BLAKE2B 94c2a9b7eeaa676efaac75cd5c143b0f4b02440b5a21ecc9b2a68cc27ad4abc1fc4d7dbc903dea5d956ce737ca434ea5b5bdde4a35df3a3689da60c5fb0bddf1 SHA512 784aad612664df666c36f969cb6a9ab794f004abcf9aa761bd1f5f0f8fdb248d5b38f48a59b68c2de7d2a344755f1537efc9d5847de0d662302699ed94d40813
+DIST redis-4.0.7.tar.gz 1729488 BLAKE2B 7a5337b868e4da4a7387b31bc9d6bd4c86abd701b9ba999f64296ed5188cbba7208ced466973a500730ca03e70a9a85fbab2fb4700fdc977e58defc0126487d1 SHA512 6f317d9e76224b2a2b047dc8f56b126ea85ee5c6112c4c6238cb5cdfa3a83756bff3a82b106b00d1124a93d210a900d836587b8d9563916f19274de0e84c4c6b
 EBUILD redis-3.0.7-r1.ebuild 3312 BLAKE2B f7eb238c4cfb353330436453849d12ef8c1e0d083f7af2a7a7813cf5db478281499dc36757a3f1bad06e65cfc7decd604edeb087b02485e6922ddf30bc13e88f SHA512 de42869cd28e6b9f7ce63ef0baaa64acc0b5465d2bb2a0c23013a42c0a00059a18620ab428eae88b33f4d6a3b37b2e6cc0dc71135af807dbd9d524908d1d80fb
 EBUILD redis-3.0.7.ebuild 3312 BLAKE2B f7eb238c4cfb353330436453849d12ef8c1e0d083f7af2a7a7813cf5db478281499dc36757a3f1bad06e65cfc7decd604edeb087b02485e6922ddf30bc13e88f SHA512 de42869cd28e6b9f7ce63ef0baaa64acc0b5465d2bb2a0c23013a42c0a00059a18620ab428eae88b33f4d6a3b37b2e6cc0dc71135af807dbd9d524908d1d80fb
 EBUILD redis-3.2.5.ebuild 3578 BLAKE2B 140d00e2acb3c78d6f089689b911e77df1a0b4cac32dfac312040639fc1935a8a08fdf97be95fbbe83862de22ef43d08d137e58716db1523b57ac5d90122a64e SHA512 72d8563a1eee0e62d34a3c04583c210a95c0fdd306512f63714324ac6e1302f5a06debb56bae083f9102eef9cade1674f6d5dd746ca7ab796e70592aef659021
@@ -33,4 +34,5 @@ EBUILD redis-4.0.1-r1.ebuild 3722 BLAKE2B 9f99ed17dbac2e4249e425293b769b87bbce62
 EBUILD redis-4.0.1.ebuild 3507 BLAKE2B 4418b445f34274ae86edd3033552935fd8e740ab0c1029cdf9f43f2fcc7bf0e1fdaf0fa07d6504af4c4975af09fe2ea808ce0e515d8f5a4809cb84b664f6672c SHA512 e0a258e5e2333d9c88d5ebba37f52cb772bb17d77b719edc0ce443a3a2ac09cd064766fcf7541503fe656ca2f77d890ae911f518b2552e2673f650cc8bd4d13d
 EBUILD redis-4.0.2-r1.ebuild 3811 BLAKE2B 682e3b620d22745548e4a59e2cc98d1824f810ff599ee03aa6f3e875cd7e553f3d7396eb39794277f131ee42305676e44eda1154aaeb0a3a613efab80f93e8de SHA512 97a989279fa570cfae86f50c177cac18f78ab9bde12696e8e2b903ee9f80573ee4a017d4f8cf1fb90c5197badc10f995992e61999890e434fb8c5b7b50c2c010
 EBUILD redis-4.0.6.ebuild 4074 BLAKE2B 8c650824c8216e360014750cfe64d205dc02d33b6997b31f4e1a282836c670e97c2c4158818b226a98a3b0cb1954def0ac356c5f154e93e6d41356fb68ec6550 SHA512 f864f88c8ce91cfb73448e4427b82d7a76276dfad851004e9b13f96c395e369a101d878cfba65f277aae878885b58202d0b52c0d37a160419aa55904ad8cb7f7
+EBUILD redis-4.0.7.ebuild 4074 BLAKE2B a6190e8b3223f516c48889f5bd455e7c94c1c68e0f142f8370fc74931d7b9fb79621bae4a080956eb8cc9cf00ece885535c2e3a17e717d1c2c069e61bed479ee SHA512 aafbb4f1a85133e3baf0b73f026281c6dba2cd2146c9d3a9e5fa610e5e1ca5a9ea8458b9b031345f7346b74e42fc2a238f3824ddf12ec7d83ba571ebe7d18e3d
 MISC metadata.xml 632 BLAKE2B a81542eb7374b9e3ca2c963586f330ee2f5fa5ef39ebef21baadd9bcc65c1edd285485982ff87da6132960930faa1d9c6d7b0b49f9e6d02f273c71c8468d8612 SHA512 a032eb7204137f8c5e7b75f8b214b0b6fd7f2a119b261a3da2e0cf8979fda5a5f25643870515a8e8d821ff63df3d17808a6e3189cc16a0f87c88f479571e8ef5
diff --git a/dev-db/redis/redis-4.0.7.ebuild b/dev-db/redis/redis-4.0.7.ebuild
new file mode 100644
index 000000000000..c7f8131160d1
--- /dev/null
+++ b/dev-db/redis/redis-4.0.7.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils flag-o-matic systemd toolchain-funcs user
+
+DESCRIPTION="A persistent caching system, key-value and data structures database"
+HOMEPAGE="http://redis.io/"
+SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+IUSE="+jemalloc tcmalloc luajit test"
+SLOT="0"
+
+# Redis does NOT build with Lua 5.2 or newer at this time.
+# This should link correctly with both unslotted & slotted Lua, without
+# changes.
+RDEPEND="
+	luajit? ( dev-lang/luajit:2 )
+	!luajit? ( || ( dev-lang/lua:5.1 =dev-lang/lua-5.1*:0 ) )
+	tcmalloc? ( dev-util/google-perftools )
+	jemalloc? ( >=dev-libs/jemalloc-3.2 )"
+
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	>=sys-devel/autoconf-2.63
+	test? ( dev-lang/tcl:0= )"
+
+REQUIRED_USE="?? ( tcmalloc jemalloc )"
+
+S="${WORKDIR}/${PN}-${PV/_/-}"
+
+pkg_setup() {
+	enewgroup redis 75
+	enewuser redis 75 -1 /var/lib/redis redis
+}
+
+src_prepare() {
+	eapply \
+		"${FILESDIR}"/${PN}-3.2.3-config.patch \
+		"${FILESDIR}"/${PN}-4.0.1-shared.patch \
+		"${FILESDIR}"/${PN}-4.0.1-sharedlua.patch \
+		"${FILESDIR}"/${PN}-sentinel-4.0.6-config.patch
+	eapply_user
+
+	# Copy lua modules into build dir
+	cp "${S}"/deps/lua/src/{fpconv,lua_bit,lua_cjson,lua_cmsgpack,lua_struct,strbuf}.c "${S}"/src || die
+	cp "${S}"/deps/lua/src/{fpconv,strbuf}.h "${S}"/src || die
+	# Append cflag for lua_cjson
+	# https://github.com/antirez/redis/commit/4fdcd213#diff-3ba529ae517f6b57803af0502f52a40bL61
+	append-cflags "-DENABLE_CJSON_GLOBAL"
+
+	# now we will rewrite present Makefiles
+	local makefiles="" MKF
+	for MKF in $(find -name 'Makefile' | cut -b 3-); do
+		mv "${MKF}" "${MKF}.in"
+		sed -i	-e 's:$(CC):@CC@:g' \
+			-e 's:$(CFLAGS):@AM_CFLAGS@:g' \
+			-e 's: $(DEBUG)::g' \
+			-e 's:$(OBJARCH)::g' \
+			-e 's:ARCH:TARCH:g' \
+			-e '/^CCOPT=/s:$: $(LDFLAGS):g' \
+			"${MKF}.in" \
+		|| die "Sed failed for ${MKF}"
+		makefiles+=" ${MKF}"
+	done
+	# autodetection of compiler and settings; generates the modified Makefiles
+	cp "${FILESDIR}"/configure.ac-3.2 configure.ac || die
+
+	# Use the correct pkgconfig name for Lua
+	has_version 'dev-lang/lua:5.1' \
+		&& LUAPKGCONFIG=lua5.1 \
+		|| LUAPKGCONFIG=lua
+	sed -i	\
+		-e "/^AC_INIT/s|, [0-9].+, |, $PV, |" \
+		-e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \
+		-e "/PKG_CHECK_MODULES.*\<LUA\>/s,lua5.1,${LUAPKGCONFIG},g" \
+		configure.ac || die "Sed failed for configure.ac"
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with luajit)
+
+	# Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164
+	# also, don't define ANSI/c99 for lua twice
+	sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die
+}
+
+src_compile() {
+	tc-export CC AR RANLIB
+
+	local myconf=""
+
+	if use tcmalloc; then
+		myconf="${myconf} USE_TCMALLOC=yes"
+	elif use jemalloc; then
+		myconf="${myconf} JEMALLOC_SHARED=yes"
+	else
+		myconf="${myconf} MALLOC=yes"
+	fi
+
+	emake ${myconf} V=1 CC="${CC}" AR="${AR} rcu" RANLIB="${RANLIB}"
+}
+
+src_install() {
+	insinto /etc/
+	doins redis.conf sentinel.conf
+	use prefix || fowners redis:redis /etc/{redis,sentinel}.conf
+	fperms 0644 /etc/{redis,sentinel}.conf
+
+	newconfd "${FILESDIR}/redis.confd-r1" redis
+	newinitd "${FILESDIR}/redis.initd-5" redis
+
+	systemd_newunit "${FILESDIR}/redis.service-2" redis.service
+	systemd_newtmpfilesd "${FILESDIR}/redis.tmpfiles" redis.conf
+
+	newconfd "${FILESDIR}/redis-sentinel.confd" redis-sentinel
+	newinitd "${FILESDIR}/redis-sentinel.initd" redis-sentinel
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README.md
+
+	dobin src/redis-cli
+	dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-rdb
+	fperms 0750 /usr/sbin/redis-benchmark
+	dosym redis-server /usr/sbin/redis-sentinel
+
+	if use prefix; then
+		diropts -m0750
+	else
+		diropts -m0750 -o redis -g redis
+	fi
+	keepdir /var/{log,lib}/redis
+}
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index 79724f7327ed..079d99baade5 100644
--- a/dev-haskell/Manifest.gz
+++ b/dev-haskell/Manifest.gz
diff --git a/dev-haskell/hashtables/Manifest b/dev-haskell/hashtables/Manifest
index bef12e752ae9..075465897d91 100644
--- a/dev-haskell/hashtables/Manifest
+++ b/dev-haskell/hashtables/Manifest
@@ -2,4 +2,4 @@ DIST hashtables-1.1.2.1.tar.gz 48553 BLAKE2B eff3d256a6e0bbf3ac31e6d26c43efce9bc
 DIST hashtables-1.2.1.0.tar.gz 53706 BLAKE2B 5bc1d17fdf80f561fa7d6e9a9010025098579694356484bdaf41ebf6e5e2a03dd6983cb653eef553fb41be99aaa3ce11b2004efe62a585b0ec34f7c4fa12cefe SHA512 2c6cd17434402ff963a1b3357e58dfab3d4b60f5a2848b5433dcbbc1705d24707eacfc36af5dfb461ab03ce678c0736f3277292677e8ab297b306bd14e797e64
 EBUILD hashtables-1.1.2.1.ebuild 1054 BLAKE2B 83ff3b4f17499c59b477e7c939d411e1c8d00a7887453672b6345809b716a5674c369eeed4e29cdda599e3e8853ccf7e4527def3b92b2c59d5a13bd85eb99d05 SHA512 04d535bb5650c804188b04f54828fa01bbcac42d5eab49ac1f32e36f8479be018546a415d1c289cb51858f42c0818be71a01396dad2fb16579c76f5646ce339b
 EBUILD hashtables-1.2.1.0.ebuild 1103 BLAKE2B ea5c6826e271c0e4bf22e89fe08d902d0e87be8d8cbc4796c396986adc50bcd03529c2fca333f64f341f803ca803930fe57c121785fb66439fab3aa24d225a40 SHA512 5e92d70af6adcf221f166e4644ea54287494e882b2699aacc297b835f880a3faf22a52b21285fb61ed4a99e7390ea2e64678e19bf5a19cecddf12f8976bbad7f
-MISC metadata.xml 4876 BLAKE2B 50a6f667d10e19c2e4649528b7e05ec4efc08c6d6ff2dd60dbe1a09ec90d4cba43170c857c4337c95e9c313011337526aff1795fb50fc037c5e74608c1e9793d SHA512 d175f516d895b4fa0453185a03741c33e3f01b461b1f2717208ebdeac9d9abd4bb0896c923c30698d9e66672844a58866cd4eb2eb36ab4f9b1e0c60e70facef2
+MISC metadata.xml 4879 BLAKE2B 598ddf899f47f5ad42df5aaa560fa82be7abdc74addb41ccb98593b78a079ec4d4c99df0bf92f43bb550f993276948514f0ff0eaae01b299751a87662cf754d8 SHA512 1e2c0ad46c2da83689d968382e45a4b0d600dffbd73c1e817e95eb6bcedf4c8a352343753163fe83692a5b96afa00eac94e4d80819a2e6b04613363b0289ef9b
diff --git a/dev-haskell/hashtables/metadata.xml b/dev-haskell/hashtables/metadata.xml
index 9e68dbf75d7c..7443663f12a1 100644
--- a/dev-haskell/hashtables/metadata.xml
+++ b/dev-haskell/hashtables/metadata.xml
@@ -24,7 +24,7 @@
 		
 		2. "Data.HashTable.ST.Cuckoo" contains an implementation of \"cuckoo
 		hashing\" as introduced by Pagh and Rodler in 2001 (see
-		&lt;http://en.wikipedia.org/wiki/Cuckoo_hashing&gt;). Cuckoo hashing has
+		&lt;https://en.wikipedia.org/wiki/Cuckoo_hashing&gt;). Cuckoo hashing has
 		worst-case /O(1)/ lookups and can reach a high \"load factor\", in which
 		the table can perform acceptably well even when more than 90% full.
 		Randomized testing shows this implementation of cuckoo hashing to be
@@ -35,7 +35,7 @@
 		when the table is resized.
 		
 		3. "Data.HashTable.ST.Linear" contains a linear hash table (see
-		&lt;http://en.wikipedia.org/wiki/Linear_hashing&gt;), which trades some insert
+		&lt;https://en.wikipedia.org/wiki/Linear_hashing&gt;), which trades some insert
 		and lookup performance for higher space efficiency and much shorter
 		delays when expanding the table. In most cases, benchmarks show this
 		table to be currently slightly faster than @Data.HashTable@ from the
@@ -70,7 +70,7 @@
 		incompatible with HPC code coverage reports.
 		
 		* @sse41@, default /OFF/. If this flag is enabled, we use some SSE 4.1
-		instructions (see &lt;http://en.wikipedia.org/wiki/SSE4&gt;, first available on
+		instructions (see &lt;https://en.wikipedia.org/wiki/SSE4&gt;, first available on
 		Intel Core 2 processors) to speed up cache-line searches for cuckoo
 		hashing.
 		
diff --git a/dev-haskell/psqueues/Manifest b/dev-haskell/psqueues/Manifest
index 770913678181..e3170cbbf7c0 100644
--- a/dev-haskell/psqueues/Manifest
+++ b/dev-haskell/psqueues/Manifest
@@ -6,4 +6,4 @@ EBUILD psqueues-0.2.0.3.ebuild 1008 BLAKE2B b9d2bb0a3eb0e1fb826b53ce187a6ba18858
 EBUILD psqueues-0.2.2.1.ebuild 1008 BLAKE2B 9f3c8883f1e990fb395d893d0a5d4ee1fc2e96eff6f669c549d278eb85ad4be81d7e106b61bc0616189e4bbf7a92d92ea848b1770f3738f35c755b522d453114 SHA512 7201de6d4128d4bac6bd665b7f56d7a0cfc27f7ff749e7777aad9fc5369f3f1e0b37f774a54bda6c0166401753a6482f7e55e6adb7cad2fe1b0031010243e391
 EBUILD psqueues-0.2.2.2.ebuild 1007 BLAKE2B c3e141dc612f0807e648e98deb53783b9a48e4a3957fa7b7b424bf8e0eef294aa2f374379300db9ccd640d3789dde58be9a0a252944700ba0263b1f8830666f5 SHA512 bd6710f18808f77aff86d61b7c05ceee8a29056b1599c357051bc0c0774e4615b25ec8a7743f3347b0a7bd4ceb340a4636146ae89bb9f120fc9b065fa3bbd498
 EBUILD psqueues-0.2.2.3.ebuild 1009 BLAKE2B cfddbb094d61fffbe11dbe26c5743b0131aa42349e6b3297c40f051e9cfa7026b51da51f8ae899766bd9b7abf0312e75d48a12466d8d3a5cd8d9ca18bd659780 SHA512 35f7dbab9286175c5984da3ecaa2be75d8f20027463226a3d15ed673da5455b25b9b6a08a14dcd7369b5394e9ffdcb6d5d16f752ef2faed7af81466eeead8c23
-MISC metadata.xml 2187 BLAKE2B a5309a8aee4e168fe3f25e11d53e2f0634d428c4aaf05cd954dfd79618ede65e7c315a1a4bd97f1248611d53bcd986a3bf7f6d5bbeb58b6e39403680517ca6f7 SHA512 88fce8e1f3b6872a37b9f7d6abff158850061fdddca62fb48d74911d0db3035adab6021721ce720f5a84c950d7c6dc55ef6d6d472f542f1fde74c6a0546d61c3
+MISC metadata.xml 2189 BLAKE2B c4e3a8a4a791e9cff160cccefd6332348afcc9faae5c08dde60d07a3fe34952769a9999f091eff52e50d1581ee3df4d50b30855c1bad7b472490e37d9581f7aa SHA512 ba3919a870ed42a1a440995a6337247f6c984d67f3065371eb72c6301a1e316b39fda29cef5814628e54921a849bbc27033ddf7c2f3fc1bd7d3750da993ed94e
diff --git a/dev-haskell/psqueues/metadata.xml b/dev-haskell/psqueues/metadata.xml
index 2237d4004fe0..4860915e4a9d 100644
--- a/dev-haskell/psqueues/metadata.xml
+++ b/dev-haskell/psqueues/metadata.xml
@@ -7,7 +7,7 @@
 	</maintainer>
 	<longdescription>
 		The psqueues package provides
-		&lt;http://en.wikipedia.org/wiki/Priority_queue Priority Search Queues&gt; in
+		&lt;https://en.wikipedia.org/wiki/Priority_queue Priority Search Queues&gt; in
 		three different flavors.
 		
 		* @OrdPSQ k p v@, which uses the @Ord k@ instance to provide fast insertion,
@@ -18,7 +18,7 @@
 		considerably faster and provides a slightly different API.
 		
 		* @IntPSQ p v@ is a far more efficient implementation. It fixes the key type
-		to @Int@ and uses a &lt;http://en.wikipedia.org/wiki/Radix_tree radix tree&gt;
+		to @Int@ and uses a &lt;https://en.wikipedia.org/wiki/Radix_tree radix tree&gt;
 		(like @IntMap@) with an additional min-heap property.
 		
 		* @HashPSQ k p v@ is a fairly straightforward extension of @IntPSQ@: it
diff --git a/dev-haskell/uuid-types/Manifest b/dev-haskell/uuid-types/Manifest
index 37e5d3989bb4..d5c64cc6f36c 100644
--- a/dev-haskell/uuid-types/Manifest
+++ b/dev-haskell/uuid-types/Manifest
@@ -1,3 +1,3 @@
 DIST uuid-types-1.0.3.tar.gz 11999 BLAKE2B 71941bf6abf554e2fa4fb64ae2cc5d61354643c07fe757920c19b60f762a7ffdce87c222d1f1a4a993b50f95e58ac4a011e2ae10c73108a6b71f65ebff209600 SHA512 039bccea9ee22388a50e3e233c95afdd3a59f01aa5f552dcd8e8c1ded8f9da210933c58a4d9cc0913c768b587c24ee27fa0eed15e531846ea841b666f513df9e
 EBUILD uuid-types-1.0.3.ebuild 1233 BLAKE2B 54930a7253fcd8624a11398cec46b16170903ace19a1a5670cd1a35dbd931571e4c31354ff0bc0633057fbb5ee6613369aa5bc59fccc928811bb0a02356b66a1 SHA512 29e510ec72d268fe2ea0c26d8edb7751f552535be43f6bd8d1ed7f4e1218cb74bae1edc31f6b274a70f0f2313311ad68b346f1880b44488909a25bb7b70beb9c
-MISC metadata.xml 546 BLAKE2B 9ae3607ef81de0634aed9c0dc7680cbbed8a4b29e7c4453a4c833cd83b6344ca7536373e15a93dea4981bc92171030c4d75d23213144540b1e124e8e8f9dc617 SHA512 06320c4097ad417d7cc0b9a33d27aca2b1276e8301482603a0e9bc469a281e5ae60d01086f5bd4bb7751e9e27903e9303eec55d61f7a2337b4dff4d84bf2bd5e
+MISC metadata.xml 547 BLAKE2B d688b78a2d939de354f5691e59416d43eca488e1737cf2ea4dd577a9aa985e38bbfc464f5b3e1d5b586df990204b384897d34b0816c8b23877e43a70acfb81b7 SHA512 00ed619a88824b0a64195d255528cb6e4e2e6578feafdc2b6b2f38d1ff630f0469b2f16a922477cde922c9f7474ce6f16f6bb68e0350c7563e3671ddaaf64917
diff --git a/dev-haskell/uuid-types/metadata.xml b/dev-haskell/uuid-types/metadata.xml
index 8b381ac50b6a..6ed8d01282ae 100644
--- a/dev-haskell/uuid-types/metadata.xml
+++ b/dev-haskell/uuid-types/metadata.xml
@@ -8,7 +8,7 @@
 	<longdescription>
 		This library contains type definitions for Universally Unique Identifiers
 		and basic conversion functions.
-		See &lt;http://en.wikipedia.org/wiki/UUID&gt; for the general idea.
+		See &lt;https://en.wikipedia.org/wiki/UUID&gt; for the general idea.
 	</longdescription>
 	<upstream>
 		<remote-id type="github">aslatter/uuid</remote-id>
diff --git a/dev-haskell/uuid/Manifest b/dev-haskell/uuid/Manifest
index 6579397a820e..7c097bd4a9e5 100644
--- a/dev-haskell/uuid/Manifest
+++ b/dev-haskell/uuid/Manifest
@@ -2,4 +2,4 @@ DIST uuid-1.3.11.tar.gz 8578 BLAKE2B ab865736dda4ca4188b9b21b06649fde81d8de1ef49
 DIST uuid-1.3.12.tar.gz 8738 BLAKE2B a6e8fe96d6c20b9294c1535d367ad3ce0a91dfec4c9cd408d5b7e2ec0988326721db3d7a6ea3addded81c12f86692ed898e14612c20fcaf16f0ea6be6f2ef21c SHA512 53d1a9e69dbc3ce2cb2e35aeca9b116e5fbf176fe048d4afaaff1bfaae80445da8e3d53c4652ada41791fb3e237e2cd24d3ac15e6a786242844fdf076588dae9
 EBUILD uuid-1.3.11-r2.ebuild 1426 BLAKE2B 5f66a85c5a55e29b1a56b3ec26892d4e793de6a65bebfa334ea0e324ffbc9e8f0e1a556a04c1c276fa229a9a9fd906c6bea33ef0d63679665422134524974c7c SHA512 b32a34fcdecc7398bc15cf24b2cf5aaa204780f73b3e6cc4b66a26f40d25ed3e897dd55874c2c352dda67ad6fc29f56406a26dadf4cddd66a2f3a36db7c60853
 EBUILD uuid-1.3.12.ebuild 1402 BLAKE2B 8ef15b537d8b5cf13325518f383b49ee0aad3fe9bc5d095eb7facd0769c2603d2f0d24d9a0c037baab3b197b335798ffda07a8bc2155cca0d61e7c9729ab7598 SHA512 1d4eebd9532a0ee3932e8cc4bc2be536d9345e367c38676f5457bc88ae885f59bdc60f40fbb936754093e1d8503f3098145da1c564c611d244e10a648eb4b83f
-MISC metadata.xml 541 BLAKE2B c6a355b5f66a76afef16e8988214b6e4d12863bfb86fd0ccfd1f85a2110d08823c2fea4a8d8676612f1d209ded95aa9d4d53ab0bae3305a3228096b13629eedc SHA512 a49a2cdf898050a1617e37baba936b36d0064242eda702d5f790bc330d985b927ffcb805423b590b6c15a47a5d62e2ab2164da43dd7a5081ee187e68c3d2c340
+MISC metadata.xml 542 BLAKE2B 043a99892b12c9c72f1f89226f5e82edf49ae91fa5f9c4fad7c15d06893266f9ce1bff7acaa06f83e62c3639116e23dbf9c67daba5791673b4c349e79393a370 SHA512 8088a28c040b916c0aa47ca6a1e05dae3b834da258a747c2d4836d8d1b44cb6ac85ebf3c6c88b948e08ff6baff09002c5dda486b1553e5f416f17949e0b571e3
diff --git a/dev-haskell/uuid/metadata.xml b/dev-haskell/uuid/metadata.xml
index f78941807853..7c9c76c8d405 100644
--- a/dev-haskell/uuid/metadata.xml
+++ b/dev-haskell/uuid/metadata.xml
@@ -8,7 +8,7 @@
 	<longdescription>
 		This library is useful for creating, comparing, parsing and
 		printing Universally Unique Identifiers.
-		See &lt;http://en.wikipedia.org/wiki/UUID&gt; for the general idea.
+		See &lt;https://en.wikipedia.org/wiki/UUID&gt; for the general idea.
 	</longdescription>
 	<upstream>
 		<remote-id type="github">aslatter/uuid</remote-id>
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index a0f8c9ef52f0..1da4a3d72fda 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/jikes/Manifest b/dev-java/jikes/Manifest
deleted file mode 100644
index c30696fa5615..000000000000
--- a/dev-java/jikes/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX compiler-settings 148 BLAKE2B 132318f6994b0ac49f67f404c76ad9253e4284bb18e3f3a8cb3dbce0549519cd9d156dbfa5073212effb142f34ff62c63d347d586484cdd91619ce1187824f71 SHA512 65694da1b1520b062761da80a225e3a37117c981302b98f294686d0fc8b13e163416dae36e5db4eabf3af0e735edeced0c19b93f9bf9b0ca66f5900143044ef9
-AUX deprecated.patch 995 BLAKE2B ce8856e45ecab3dd69c5a044bdc966f00c3b5764f7ea42b7c542985168d36b0cff3fb436a93f5b63a9a6bd99fc3ea513e1016e9a337e6188b1a3d4a4b111c265 SHA512 a99d25d3cb588677695d5ce549ef476b3bededd8ea2e84835fb9e3af57c182fc2a87ca539991e963a9aae22ff437e453a8e2e20f15e08dbcdfbf83a44d084a18
-AUX jikes 381 BLAKE2B 1a3ff7622099bfeee86fe45befff225bf6f985c9182205f32ee21244153cd4eff68846ffb3220d41da597bf82617e4c8151d8c508662f02496dc5d1394323560 SHA512 9d55888ab0b372357ed549b16cd16f7592d34caf32fe3bd9f599fb8bdfcdbec184c1ca86be799b696e1dd131da9646cad09b82fa920430e8f0db65c0d3f1efc3
-DIST jikes-1.22.tar.bz2 616655 BLAKE2B a4b69c014394c511aab2b52284eeae5d2ec3209d4edc315102f233d1053ced214612d7c8879c4c88140b26e7be852736c69b8a699c8ce831cd579d8ee8fea56e SHA512 6b318f49f075da0cf0558512748bd77072f5b5b0428160538bcba01201c94719ec0f4b0cd0159ddb04fb3a86c323c8f11f09dc4b31cf880fb94e00c1ee0bbc58
-EBUILD jikes-1.22-r13.ebuild 872 BLAKE2B 85816462159accd68b74a484ee42a70ce5e36329e7ce493306bf137183ded933a78ee952929e15f8528b1a12b0e7833d5809f545a225ff911f14f72cfb5811f6 SHA512 31ce33225ad05d1e6f3031619310d4562ca00866eb2d7f8076449d944eedda78292f381e28f8c3f613d32f54a2d21d6d7681f57500a058ed7b76242eee88efbb
-MISC metadata.xml 311 BLAKE2B 060172b24b087f76c25d14b568d3c0faf080f819a450a102b2414470bb6700a3a95326fbb09fb913b4c7aceb4f5a2dcb46a4c31176dbf210370b8c2a1dc4bc11 SHA512 bba5366ad9a24c0531133a800ad83a2e7738cbb302ea5fbff4296c0e2943e8b6b86854499ddf0b536b1e82594d351335bb034c46d8c2d60c3a7f2b8c2a43b481
diff --git a/dev-java/jikes/files/compiler-settings b/dev-java/jikes/files/compiler-settings
deleted file mode 100644
index 0e50102cd2ef..000000000000
--- a/dev-java/jikes/files/compiler-settings
+++ /dev/null
@@ -1,6 +0,0 @@
-JAVAC=/usr/bin/jikes
-PACKAGE=dev-java/jikes
-SUPPORTED_TARGET="1.1 1.2 1.3 1.4"
-SUPPORTED_SOURCE="1.3 1.4"
-ANT_BUILD_COMPILER="jikes"
-GENERATION="2"
diff --git a/dev-java/jikes/files/deprecated.patch b/dev-java/jikes/files/deprecated.patch
deleted file mode 100644
index 0fd05253a6df..000000000000
--- a/dev-java/jikes/files/deprecated.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/decl.cpp 2004/09/26 22:40:411.144
-+++ src/decl.cpp 2004/10/09 18:04:501.145
-@@ -2596,7 +2596,9 @@
-     //
-     if (control.option.deprecation &&
-         hidden_method -> IsDeprecated() &&
--        ! method -> containing_type -> file_symbol -> IsClassOnly())
-+        ! method -> containing_type -> file_symbol -> IsClassOnly() &&
-+        ! method -> IsDeprecated() &&
-+        ! InDeprecatedContext())
-     {
-         ReportSemError(SemanticError::DEPRECATED_METHOD_OVERRIDE,
-                        left_tok, right_tok, method -> Header(),
-
-diff -u -r1.159 -r1.160
---- src/error.cpp 2004/09/26 22:40:411.159
-+++ src/error.cpp 2004/10/10 02:59:401.160
-@@ -513,6 +513,7 @@
-     warning[DEPRECATED_FIELD] = WEAK_WARNING;
-     warning[DEPRECATED_METHOD] = WEAK_WARNING;
-     warning[DEPRECATED_CONSTRUCTOR] = WEAK_WARNING;
-+    warning[DEPRECATED_METHOD_OVERRIDE] = WEAK_WARNING;
- 
-     warning[UNNECESSARY_TYPE_IMPORT] = WEAK_WARNING;
-     warning[MULTIPLE_PUBLIC_TYPES] = WEAK_WARNING;
diff --git a/dev-java/jikes/files/jikes b/dev-java/jikes/files/jikes
deleted file mode 100644
index e80c048614df..000000000000
--- a/dev-java/jikes/files/jikes
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2005, Thomas Matthijs <axxo@gentoo.org>
-# Copyright (c) 2005, Gentoo Foundation
-#
-# Licensed under the GNU General Public License, v2.
-#
-
-[[ -z ${BOOTCLASSPATH} ]] && export BOOTCLASSPATH=$(java-config-2 --runtime)
-
-if [[ -z "${BOOTCLASSPATH}" ]]; then
-	echo "!!! Could not find runtime classes" > /dev/stderr
-	exit 2
-fi
-
-exec /usr/bin/jikes-bin "$@"
diff --git a/dev-java/jikes/jikes-1.22-r13.ebuild b/dev-java/jikes/jikes-1.22-r13.ebuild
deleted file mode 100644
index e6f424f95dde..000000000000
--- a/dev-java/jikes/jikes-1.22-r13.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="IBM's open source, high performance Java compiler"
-HOMEPAGE="http://jikes.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-LICENSE="IBM"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86 ~x86-fbsd"
-IUSE=""
-DEPEND=""
-RDEPEND=">=dev-java/java-config-2.0.0"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/deprecated.patch
-}
-
-src_compile() {
-	filter-flags "-fno-rtti"
-	econf || die "configure problem"
-	emake || die "compile problem"
-}
-
-src_install () {
-	make DESTDIR="${D}" install || die "install problem"
-	dodoc ChangeLog AUTHORS README TODO NEWS
-
-	mv "${D}"/usr/bin/jikes{,-bin}
-	dobin "${FILESDIR}"/jikes
-
-	insinto /usr/share/java-config-2/compiler
-	newins "${FILESDIR}"/compiler-settings jikes
-}
diff --git a/dev-java/jikes/metadata.xml b/dev-java/jikes/metadata.xml
deleted file mode 100644
index 4841c1e936ca..000000000000
--- a/dev-java/jikes/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">jikes</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 54583606263d..c9727f83905d 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/qu-prolog/Manifest b/dev-lang/qu-prolog/Manifest
index 58ea3f0df856..408f0488d1ca 100644
--- a/dev-lang/qu-prolog/Manifest
+++ b/dev-lang/qu-prolog/Manifest
@@ -1,6 +1,8 @@
 AUX qu-prolog-10.0-associated-item.patch 335 BLAKE2B f80af03e270ca823452a8fe88e83d915d394d9ba7d043d3afdee5bdb7bfdce1bdb1b268a13b65c024f75005b78126f1f0ae04c6eda7aba234acc47fd51a64298 SHA512 3b4cefaecacb1e1fb8df8804f198563e99ee69b2ffbdc421e56fb34faeb5ed1a87809b4acf917999ac5e25982e522c8b08775cf9bcf1c01675a77521d372913f
 AUX qu-prolog-10.0-configure.patch 518 BLAKE2B f63f876b8b3048e74092bf398df89f951e976019e548e3563506c20aa69e9a08bd7d21a8a13240c7416a0b5edd592c8d86b43e13586acaa2366770729cf578b7 SHA512 85e484b8086054166740dd757b95547179afa5c199c240b43dcef531aeedd812f4fcb35003a888708c90db5d7bb1ffd22cf9bef1fd31f339ec0894ddde365cd9
 AUX qu-prolog-10.0-gcc6.patch 906 BLAKE2B 5d1e1b7632faa993c2a0bfc087cce0d73ed33e65997615aec0c053dbf2905e58506fbeed3934a4944ad0309bfbffc748285a75095ef5483703e33250cb617cc1 SHA512 bbf5a1d5749964bc5c0e8e530de3729bf1666e541f908ddc66debc696a6b6b4dc55373ef788348f02e33aa58afa5a350f7be866bfb1e4c31c917f334e9dc9ca6
+AUX qu-prolog-10.0-qt5.patch 1037 BLAKE2B d66f62aee4ad43eb400d33895c5222b6ccaa407dbb33d44326f7d29375b57ee846d90d48708915a31a9586481f354e65c93b2f7da06ccd2e49ab984850ec74e7 SHA512 8c82d180adfc290885273dd4dafbbb7cdcca3c2854854401f1123dd562699490c8fd77a54a5707425c852871091074ed4bbefa96b53782dbb06b6c1c57dfce53
 DIST qp10.0.tar.gz 1521469 BLAKE2B ab293e5b14529c3714ba123c5f37f7fe2ac4f6238ebaca00fa7781407ccf7df67515b1b6b3c80a358fae5988c799bf16b8f02eb52a9b3a690b155a150ac90063 SHA512 491ef9cc01f0d34163d47163b3103dcbd52cc5672f64057b898c2d234384ac2e3b64b4e59a1795765ff92de4c97ebdb11a82d394213685c387e4dd7d598c5c60
+EBUILD qu-prolog-10.0-r1.ebuild 2063 BLAKE2B e686b14f280fd667722380b9be0b911db3fc1abb6181483039c79ed2f180e362dc7481f00f20ee54683e127a3af9a76153fe9a86238205a6cef048de0325e8ca SHA512 48bde9e0be2710e5242484df5b47362253e63e3a5b6cd4e616e42c88d247cbc3d7e2e269296c4ffc90b3b061930e061b38191e4ee34741b6fdbca6ce1eb06608
 EBUILD qu-prolog-10.0.ebuild 1998 BLAKE2B 44c493fba0a005cbb8ba8c6fab3fb1678f684a8da8ac7d828828193c685b315d217adacc292bc1bb692253a2d087efe057f27c1b4c9ec57aad7b7bf7f2d4cedf SHA512 0df66e1f943662396070621cac0adbf8cd2f6e9109b5e1c231281708eead667da180e04a022dc8329bae408ec4862fa7a239c3478c0120d75d4dab66c59cd2cf
 MISC metadata.xml 347 BLAKE2B d0d2ead501a46ff84953eceee649d58e406ebf5a83e7b7862b9501b2e665ad71b5c9c31f4790161074debb7b86ce7e53ff8d0904c39c37ddcac6250668685aca SHA512 7a7bb3ccaa42fa120c3702d963719d5fdfcf0a413685cad98bd34a515a4cc83a213a71e7f3b6b0ce67947fa347229caecf699879192f0d930c9c6577e0ce59cc
diff --git a/dev-lang/qu-prolog/files/qu-prolog-10.0-qt5.patch b/dev-lang/qu-prolog/files/qu-prolog-10.0-qt5.patch
new file mode 100644
index 000000000000..d82e78cada16
--- /dev/null
+++ b/dev-lang/qu-prolog/files/qu-prolog-10.0-qt5.patch
@@ -0,0 +1,35 @@
+diff -ur qp10.0.orig/src/xqp/term.cc qp10.0/src/xqp/term.cc
+--- qp10.0.orig/src/xqp/term.cc	2008-07-09 07:32:37.000000000 +0200
++++ qp10.0/src/xqp/term.cc	2018-01-27 14:06:54.101545854 +0100
+@@ -38,7 +38,7 @@
+ 
+ bool graphic_char(QChar c)
+ {
+-    switch (c.toAscii())
++    switch (c.toLatin1())
+     {
+        case '-':
+        case '/':
+diff -ur qp10.0.orig/src/xqp/xqp.cc qp10.0/src/xqp/xqp.cc
+--- qp10.0.orig/src/xqp/xqp.cc	2011-07-14 01:08:42.000000000 +0200
++++ qp10.0/src/xqp/xqp.cc	2018-01-27 14:07:53.902543353 +0100
+@@ -167,7 +167,7 @@
+ 
+ void Xqp::send_cmd_to_qp(QString cmd)
+ {
+-   write(qp_stdin, cmd.toAscii(), cmd.length());
++   write(qp_stdin, cmd.toLatin1(), cmd.length());
+ }
+ 
+   
+diff -ur qp10.0.orig/src/xqp/xqp.pro qp10.0/src/xqp/xqp.pro
+--- qp10.0.orig/src/xqp/xqp.pro	2008-07-09 07:32:37.000000000 +0200
++++ qp10.0/src/xqp/xqp.pro	2018-01-27 14:01:24.764559627 +0100
+@@ -4,6 +4,7 @@
+ 
+ TEMPLATE = app
+ INCLUDEPATH += .
++QT += widgets
+ 
+ # Input
+ HEADERS += interact.h qpconfig.h qthelp.h term.h xqp.h xqpqueries.h
diff --git a/dev-lang/qu-prolog/qu-prolog-10.0-r1.ebuild b/dev-lang/qu-prolog/qu-prolog-10.0-r1.ebuild
new file mode 100644
index 000000000000..bb5af2782e14
--- /dev/null
+++ b/dev-lang/qu-prolog/qu-prolog-10.0-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib qmake-utils
+
+MY_P=qp${PV}
+
+DESCRIPTION="Extended Prolog supporting quantifiers, object-variables and substitutions"
+HOMEPAGE="http://www.itee.uq.edu.au/~pjr/HomePages/QuPrologHome.html"
+SRC_URI="http://www.itee.uq.edu.au/~pjr/HomePages/QPFiles/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug doc examples pedro qt5 readline threads"
+
+RDEPEND="
+	!dev-util/mpatch
+	!dev-util/rej
+	!games-rpg/kqlives
+	qt5? (
+		dev-qt/qtwidgets:5
+		dev-qt/qtgui:5
+	 )
+	pedro? ( net-misc/pedro )
+	readline? ( app-misc/rlwrap )"
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-configure.patch
+	epatch "${FILESDIR}"/${P}-associated-item.patch
+	epatch "${FILESDIR}"/${P}-gcc6.patch
+	epatch "${FILESDIR}"/${P}-qt5.patch
+}
+
+src_configure() {
+	econf \
+		--libdir=/usr/$(get_libdir) \
+		$(use_enable debug) \
+		$(use_enable threads multiple-threads)
+
+	if use qt5; then
+		cd "${S}"/src/xqp || die
+		eqmake5 xqp.pro
+	fi
+}
+
+src_compile() {
+	emake OPTIMISATION="${CXXFLAGS}"
+
+	if use qt5; then
+		cd "${S}"/src/xqp || die
+		emake
+	fi
+}
+
+src_install() {
+	sed \
+		-e "s|${S}|/usr/$(get_libdir)/qu-prolog|g" \
+		-i bin/qc bin/qc1.qup bin/qecat bin/qg bin/qp || die
+
+	dobin bin/{qc,qecat,qp,kq}
+
+	use qt5 && dobin src/xqp/xqp
+
+	into /usr/$(get_libdir)/${PN}
+	dobin bin/{qa,qc1.qup,qdeal,qem,qg,ql,qppp}
+
+	insinto /usr/$(get_libdir)/${PN}/bin
+	doins bin/rl_commands
+	doins bin/{qc1.qup,qecat,qg,qp}.qx
+
+	insinto /usr/$(get_libdir)/${PN}/library
+	doins prolog/library/*.qo
+
+	insinto /usr/$(get_libdir)/${PN}/compiler
+	doins prolog/compiler/*.qo
+
+	doman doc/man/man1/*.1
+
+	dodoc README
+
+	if use doc ; then
+		docinto reference-manual
+		dodoc doc/manual/*.html
+		docinto user-guide
+		dodoc doc/user/main.pdf
+	fi
+
+	if use examples ; then
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/*.ql
+		docinto examples
+		newdoc examples/README README.examples
+	fi
+}
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index 687e38caa169..af03111d09c4 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -1,3 +1,4 @@
+AUX 1.23.0-separate-libdir.patch 7268 BLAKE2B 9bd685bb53a98329826da86335bc9524c8969b8bc529eb98c14889d42edc32fd7ac85446f5a6dc68c4262461c32d01f11d093945833714a93376c5acab9000c0 SHA512 7bb0975706f6b6e47a3145bee895bd3ef648c2478f265e82dfccb745d968277dc499ec480ccf29d99093f395d48cd86d55dd15fe613fb73a062c5f3836893634
 DIST cargo-0.19.0-i686-unknown-linux-gnu.tar.gz 5068212 BLAKE2B 4fd16e33b220ae496603cd5a16055557d96cbbf04943040c36f6121eb3b7e53d5644a6e0cd8794d3485bb323f0a719e921be8a944f466cd4dc317d82b1b8deea SHA512 bfe5df682eb566c91995b8c00b5e8edb5d2c3410d1baa5be2ede2e39260b653d34b7723c6c3e8f07d8102ffab50b13e62f9f2d816dad8fba9f39b7bec984181e
 DIST cargo-0.19.0-x86_64-unknown-linux-gnu.tar.gz 5133993 BLAKE2B 39eed4905b06a9f28340b1ca0362dd9d592b5ab6a11ceb8a749069827b65b25c34b8020ca434b3174733dcdda2c38b460c7c0d9b877ff2fed1a790f5f70d9c5a SHA512 6fedb8f83d70dc4fb93a29d400577a5578ceed1448f4e85e8a9509b98b037a125532ebfb6a7e6bc9411501ea74774d2c47ac7e2bcb7ac82baeb925abc46609e8
 DIST rust-1.22.0-i686-unknown-linux-gnu.tar.gz 151889962 BLAKE2B cf2f30fdc01cbcf45de427b5a5a226b8482f3fc13e122cc4f021a75f648678b23a789706b54b6425346bdba57224898809102d97bfee8b143f90763ea985b6c3 SHA512 b46eb37f918833f1dbf3700fe156f26eff19dc90534434add5aa2d86b8ccc02aef273cba6a8291deaa89d27d2bd4af1529655b6463f44736a9f521a67cccc4f0
@@ -17,5 +18,6 @@ DIST rustc-1.23.0-src.tar.gz 60010149 BLAKE2B 64bba97fd1a16d3162b65b0d8dd2024ca0
 EBUILD rust-1.15.1.ebuild 3984 BLAKE2B 282c07c0a78dcac9e862dc2c8788c3231d93a64e6276569ef4a609b155e30917d0412b9603a245fa818807d1726941a11ee335e15f17fbfe1e8f1d94e8d0d8de SHA512 a6b14e295a562308f5d9bfa2e5087c5ede31c93a99cc41b37fcabca42042ed958384660e51486372127d2262feb1071e3ffd386c974d86ad7647eb9c0ef8648d
 EBUILD rust-1.16.0.ebuild 3840 BLAKE2B 163ebba85b39e44406fd8b7dc9e5c1f9e929702a167f8ccb00605dd7e97f3e57101bc04ceb13887c3bfe1a79bd80f52f26f9f98727b1b2ceddb7a69bfd0c7924 SHA512 8c661074f6a53f6d8397d712c8236dfc34f18c386e699a1ab1db9a9eceba9e776c09c733ad615a1897916f1268c46e58a56c5f80cd2efe787fca5f8fdc8591e4
 EBUILD rust-1.19.0.ebuild 4145 BLAKE2B 0a8abe73955900466c432df65d77d18bc7d01fa570f5b3c7876f4cf465f2c1cc5821d554352343a62fd0e1330cb97735665821ed8cc8223d98667292e05a00d0 SHA512 0da72a60a704d7215a3dea336e780c81473253ea3ccbfc41c1cef4cf2b2f86a791a41f42356a8958088d6522e6c3a917cfa196d14556feef5f56667b92012739
+EBUILD rust-1.23.0-r1.ebuild 4433 BLAKE2B 486915352c87a05677f58b9b0a87a8ec3cf956176db7cb34adbff4c86d9548bbf0d6a95e2ab5e7bf75f715ca1f307496e83bc07773a0e27a9cfc8a7386f052c9 SHA512 3d7db4d28f5fa66e8909be2d5deda2a09e45d97f4ef5d318e3b35650e0a768b278115a0c2624cfaff9b8e86504f9d3db5dc31633884736dbbfb444e591bda4e9
 EBUILD rust-1.23.0.ebuild 4494 BLAKE2B 10bb2d2bf83471ef0e78887265ec8fed165decf68034a1760d8ae6400dc93c8eb02d7e5cd36c096e1b11ee63eeca672fe4d609f49941fe42e4e8a72e0a549b8e SHA512 07dddcee213e0c655e4308f7702b9e8f447ae91fa9dfc5e2ecbaa0cd5c9dc2ebe9ec8406d553f33940ad09fb7bc7a122e385916e273e25b170ce6a11e419fb0c
-MISC metadata.xml 681 BLAKE2B 7d0307b56ec14694217b342794496b44a8b74cde85b710c7dddaa157d6553764b46d1c090921d25a62fc45adac8ee20042d423e24a575ac5771d695e6db5cec3 SHA512 c9afbd24ea1d2f1d68ef15d7fa1443b71bc396691bcd3e724ef74a84bb346145d236e7021e9beb9df512c859cae9bf741bfd6e7582b0a7df273ba05a8774d999
+MISC metadata.xml 793 BLAKE2B fbeeb3bb440bfb25a146d8bfc6de612acfec8400b911d444b1f70a161bee6c8cbbe66ccfa161421dfa03c7f1697e9658a3b592ca79647e3cc891fab8bcd60666 SHA512 fc98caa78085b3d35c5ccb31c339e893e422cc9a9c7a2e4d50c9c88d7670311db4125420cd483e7c468179a11962700ad9038ebd054039fce74adb4c8ab058c0
diff --git a/dev-lang/rust/files/1.23.0-separate-libdir.patch b/dev-lang/rust/files/1.23.0-separate-libdir.patch
new file mode 100644
index 000000000000..dcf1762d2fa5
--- /dev/null
+++ b/dev-lang/rust/files/1.23.0-separate-libdir.patch
@@ -0,0 +1,180 @@
+From c520b2dd277f13dc09e8e72c486e5c58fb97017d Mon Sep 17 00:00:00 2001
+From: O01eg <o01eg@yandex.ru>
+Date: Wed, 29 Nov 2017 12:32:03 +0300
+Subject: [PATCH] Fix #45345.
+
+Re-implement
+
+```bash
+CFG_LIBDIR_RELATIVE=`echo ${CFG_LIBDIR} | cut -c$((${#CFG_PREFIX}+${CAT_INC}))-`
+```
+
+from old `configure` script.
+
+Accept verbosity in rustdoc.
+
+Stage 1 and later use relative libdir.
+
+Build all stages with relative libdirs.
+
+Add library path for real rustdoc with `RUSTDOC_LIBDIR` environment variable.
+
+Remove unused argument `rustc_cargo`.
+
+Remove unused configuration parameter `libdir_relative`.
+---
+ src/bootstrap/bin/rustdoc.rs | 13 ++++++++++++-
+ src/bootstrap/builder.rs     |  9 ++++++---
+ src/bootstrap/check.rs       |  2 +-
+ src/bootstrap/compile.rs     | 13 ++++---------
+ src/bootstrap/config.rs      |  1 -
+ src/bootstrap/doc.rs         |  2 +-
+ 6 files changed, 24 insertions(+), 16 deletions(-)
+
+diff --git a/src/bootstrap/bin/rustdoc.rs b/src/bootstrap/bin/rustdoc.rs
+index 4e975adc97..24312b50ec 100644
+--- a/src/bootstrap/bin/rustdoc.rs
++++ b/src/bootstrap/bin/rustdoc.rs
+@@ -23,10 +23,17 @@ use std::path::PathBuf;
+ fn main() {
+     let args = env::args_os().skip(1).collect::<Vec<_>>();
+     let rustdoc = env::var_os("RUSTDOC_REAL").expect("RUSTDOC_REAL was not set");
+-    let libdir = env::var_os("RUSTC_LIBDIR").expect("RUSTC_LIBDIR was not set");
++    let libdir = env::var_os("RUSTDOC_LIBDIR").expect("RUSTDOC_LIBDIR was not set");
+     let stage = env::var("RUSTC_STAGE").expect("RUSTC_STAGE was not set");
+     let sysroot = env::var_os("RUSTC_SYSROOT").expect("RUSTC_SYSROOT was not set");
+ 
++    use std::str::FromStr;
++
++    let verbose = match env::var("RUSTC_VERBOSE") {
++        Ok(s) => usize::from_str(&s).expect("RUSTC_VERBOSE should be an integer"),
++        Err(_) => 0,
++    };
++
+     let mut dylib_path = bootstrap::util::dylib_path();
+     dylib_path.insert(0, PathBuf::from(libdir));
+ 
+@@ -59,6 +66,10 @@ fn main() {
+            .arg("--crate-version").arg(version);
+     }
+ 
++    if verbose > 1 {
++        eprintln!("rustdoc command: {:?}", cmd);
++    }
++
+     std::process::exit(match cmd.status() {
+         Ok(s) => s.code().unwrap_or(1),
+         Err(e) => panic!("\n\nfailed to run {:?}: {}\n\n", cmd, e),
+diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
+index c76900882b..1927a604c5 100644
+--- a/src/bootstrap/builder.rs
++++ b/src/bootstrap/builder.rs
+@@ -357,8 +357,8 @@ impl<'a> Builder<'a> {
+ 
+             fn run(self, builder: &Builder) -> Interned<PathBuf> {
+                 let compiler = self.compiler;
+-                let lib = if compiler.stage >= 2 && builder.build.config.libdir_relative.is_some() {
+-                    builder.build.config.libdir_relative.clone().unwrap()
++                let lib = if compiler.stage >= 1 && builder.build.config.libdir.is_some() {
++                    builder.build.config.libdir.clone().unwrap()
+                 } else {
+                     PathBuf::from("lib")
+                 };
+@@ -416,7 +416,7 @@ impl<'a> Builder<'a> {
+         let compiler = self.compiler(self.top_stage, host);
+         cmd.env("RUSTC_STAGE", compiler.stage.to_string())
+            .env("RUSTC_SYSROOT", self.sysroot(compiler))
+-           .env("RUSTC_LIBDIR", self.sysroot_libdir(compiler, self.build.build))
++           .env("RUSTDOC_LIBDIR", self.sysroot_libdir(compiler, self.build.build))
+            .env("CFG_RELEASE_CHANNEL", &self.build.config.channel)
+            .env("RUSTDOC_REAL", self.rustdoc(host))
+            .env("RUSTDOC_CRATE_VERSION", self.build.rust_version())
+@@ -496,6 +496,9 @@ impl<'a> Builder<'a> {
+         if let Some(target_linker) = self.build.linker(target) {
+             cargo.env("RUSTC_TARGET_LINKER", target_linker);
+         }
++        if cmd != "build" {
++            cargo.env("RUSTDOC_LIBDIR", self.rustc_libdir(self.compiler(2, self.build.build)));
++        }
+ 
+         if mode != Mode::Tool {
+             // Tools don't get debuginfo right now, e.g. cargo and rls don't
+diff --git a/src/bootstrap/check.rs b/src/bootstrap/check.rs
+index 4d69b19c73..d926c2b901 100644
+--- a/src/bootstrap/check.rs
++++ b/src/bootstrap/check.rs
+@@ -1171,7 +1171,7 @@ impl Step for Crate {
+             }
+             Mode::Librustc => {
+                 builder.ensure(compile::Rustc { compiler, target });
+-                compile::rustc_cargo(build, &compiler, target, &mut cargo);
++                compile::rustc_cargo(build, target, &mut cargo);
+                 ("librustc", "rustc-main")
+             }
+             _ => panic!("can only test libraries"),
+diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
+index db013691bb..d60feb1aff 100644
+--- a/src/bootstrap/compile.rs
++++ b/src/bootstrap/compile.rs
+@@ -485,7 +485,7 @@ impl Step for Rustc {
+         build.clear_if_dirty(&stage_out, &libtest_stamp(build, compiler, target));
+ 
+         let mut cargo = builder.cargo(compiler, Mode::Librustc, target, "build");
+-        rustc_cargo(build, &compiler, target, &mut cargo);
++        rustc_cargo(build, target, &mut cargo);
+         run_cargo(build,
+                   &mut cargo,
+                   &librustc_stamp(build, compiler, target));
+@@ -500,7 +500,6 @@ impl Step for Rustc {
+ 
+ /// Same as `std_cargo`, but for libtest
+ pub fn rustc_cargo(build: &Build,
+-                   compiler: &Compiler,
+                    target: Interned<String>,
+                    cargo: &mut Command) {
+     cargo.arg("--features").arg(build.rustc_features())
+@@ -514,13 +513,9 @@ pub fn rustc_cargo(build: &Build,
+          .env("CFG_VERSION", build.rust_version())
+          .env("CFG_PREFIX", build.config.prefix.clone().unwrap_or_default());
+ 
+-    if compiler.stage == 0 {
+-        cargo.env("CFG_LIBDIR_RELATIVE", "lib");
+-    } else {
+-        let libdir_relative =
+-            build.config.libdir_relative.clone().unwrap_or(PathBuf::from("lib"));
+-        cargo.env("CFG_LIBDIR_RELATIVE", libdir_relative);
+-    }
++    let libdir_relative =
++        build.config.libdir.clone().unwrap_or(PathBuf::from("lib"));
++    cargo.env("CFG_LIBDIR_RELATIVE", libdir_relative);
+ 
+     // If we're not building a compiler with debugging information then remove
+     // these two env vars which would be set otherwise.
+diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
+index 35e62f17f2..1ca19187cf 100644
+--- a/src/bootstrap/config.rs
++++ b/src/bootstrap/config.rs
+@@ -119,7 +119,6 @@ pub struct Config {
+     pub docdir: Option<PathBuf>,
+     pub bindir: Option<PathBuf>,
+     pub libdir: Option<PathBuf>,
+-    pub libdir_relative: Option<PathBuf>,
+     pub mandir: Option<PathBuf>,
+     pub codegen_tests: bool,
+     pub nodejs: Option<PathBuf>,
+diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs
+index 3c12cfc4c7..1314d967d8 100644
+--- a/src/bootstrap/doc.rs
++++ b/src/bootstrap/doc.rs
+@@ -616,7 +616,7 @@ impl Step for Rustc {
+         t!(symlink_dir_force(&my_out, &out_dir));
+ 
+         let mut cargo = builder.cargo(compiler, Mode::Librustc, target, "doc");
+-        compile::rustc_cargo(build, &compiler, target, &mut cargo);
++        compile::rustc_cargo(build, target, &mut cargo);
+ 
+         if build.config.compiler_docs {
+             // src/rustc/Cargo.toml contains a bin crate called rustc which
+-- 
+2.13.6
+
diff --git a/dev-lang/rust/metadata.xml b/dev-lang/rust/metadata.xml
index 050e235f7195..c1882e581cf9 100644
--- a/dev-lang/rust/metadata.xml
+++ b/dev-lang/rust/metadata.xml
@@ -7,6 +7,8 @@
   </maintainer>
   <use>
     <flag name="clang">Use <pkg>sys-devel/clang</pkg> for building</flag>
+    <flag name="extended">Build and install rls, rustfmt and cargo
+    alongside the compiler and stdlib</flag>
     <flag name="libcxx">Use <pkg>sys-libs/libcxx</pkg> as standard
     library when building with <pkg>sys-devel/clang</pkg></flag>
     <flag name="system-llvm">Use system <pkg>sys-devel/llvm</pkg> in
diff --git a/dev-lang/rust/rust-1.23.0-r1.ebuild b/dev-lang/rust/rust-1.23.0-r1.ebuild
new file mode 100644
index 000000000000..0f20423bb664
--- /dev/null
+++ b/dev-lang/rust/rust-1.23.0-r1.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-any-r1 versionator toolchain-funcs
+
+if [[ ${PV} = *beta* ]]; then
+	betaver=${PV//*beta}
+	BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
+	MY_P="rustc-beta"
+	SLOT="beta/${PV}"
+	SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.gz"
+	KEYWORDS=""
+else
+	ABI_VER="$(get_version_component_range 1-2)"
+	SLOT="stable/${ABI_VER}"
+	MY_P="rustc-${PV}"
+	SRC="${MY_P}-src.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+CHOST_amd64=x86_64-unknown-linux-gnu
+CHOST_x86=i686-unknown-linux-gnu
+
+RUST_STAGE0_VERSION="1.$(($(get_version_component_range 2) - 1)).0"
+RUST_STAGE0_amd64="rust-${RUST_STAGE0_VERSION}-${CHOST_amd64}"
+RUST_STAGE0_x86="rust-${RUST_STAGE0_VERSION}-${CHOST_x86}"
+
+CARGO_DEPEND_VERSION="0.$(($(get_version_component_range 2) + 1)).0"
+
+DESCRIPTION="Systems programming language from Mozilla"
+HOMEPAGE="http://www.rust-lang.org/"
+
+SRC_URI="https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.gz
+	amd64? ( https://static.rust-lang.org/dist/${RUST_STAGE0_amd64}.tar.gz )
+	x86? ( https://static.rust-lang.org/dist/${RUST_STAGE0_x86}.tar.gz )
+"
+
+LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
+
+IUSE="debug doc extended +jemalloc"
+
+RDEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
+		jemalloc? ( dev-libs/jemalloc )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	|| (
+		>=sys-devel/gcc-4.7
+		>=sys-devel/clang-3.5
+	)
+	dev-util/cmake
+"
+PDEPEND="!extended? ( >=dev-util/cargo-${CARGO_DEPEND_VERSION} )"
+
+PATCHES=( "${FILESDIR}/1.23.0-separate-libdir.patch" )
+
+S="${WORKDIR}/${MY_P}-src"
+
+toml_usex() {
+	usex "$1" true false
+}
+
+src_prepare() {
+	local rust_stage0_root="${WORKDIR}"/rust-stage0
+
+	local rust_stage0_name="RUST_STAGE0_${ARCH}"
+	local rust_stage0="${!rust_stage0_name}"
+
+	"${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig --destdir="${rust_stage0_root}" --prefix=/ || die
+
+	default
+}
+
+src_configure() {
+	local rust_stage0_root="${WORKDIR}"/rust-stage0
+
+	local rust_target_name="CHOST_${ARCH}"
+	local rust_target="${!rust_target_name}"
+
+	cat <<- EOF > "${S}"/config.toml
+		[llvm]
+		optimize = $(toml_usex !debug)
+		release-debuginfo = $(toml_usex debug)
+		assertions = $(toml_usex debug)
+		[build]
+		build = "${rust_target}"
+		host = ["${rust_target}"]
+		target = ["${rust_target}"]
+		cargo = "${rust_stage0_root}/bin/cargo"
+		rustc = "${rust_stage0_root}/bin/rustc"
+		docs = $(toml_usex doc)
+		submodules = false
+		python = "${EPYTHON}"
+		locked-deps = true
+		vendor = true
+		verbose = 2
+		extended = $(toml_usex extended)
+		[install]
+		prefix = "${EPREFIX}/usr"
+		libdir = "$(get_libdir)"
+		docdir = "share/doc/${P}"
+		mandir = "share/${P}/man"
+		[rust]
+		optimize = $(toml_usex !debug)
+		debuginfo = $(toml_usex debug)
+		debug-assertions = $(toml_usex debug)
+		use-jemalloc = $(toml_usex jemalloc)
+		default-linker = "$(tc-getCC)"
+		rpath = false
+		[target.${rust_target}]
+		cc = "$(tc-getBUILD_CC)"
+		cxx = "$(tc-getBUILD_CXX)"
+		linker = "$(tc-getCC)"
+		ar = "$(tc-getAR)"
+	EOF
+}
+
+src_compile() {
+	./x.py build --verbose --config="${S}"/config.toml || die
+}
+
+src_install() {
+	env DESTDIR="${D}" ./x.py install || die
+
+	mv "${D}/usr/bin/rustc" "${D}/usr/bin/rustc-${PV}" || die
+	mv "${D}/usr/bin/rustdoc" "${D}/usr/bin/rustdoc-${PV}" || die
+	mv "${D}/usr/bin/rust-gdb" "${D}/usr/bin/rust-gdb-${PV}" || die
+	mv "${D}/usr/bin/rust-lldb" "${D}/usr/bin/rust-lldb-${PV}" || die
+
+	dodoc COPYRIGHT
+
+	cat <<-EOF > "${T}"/50${P}
+		LDPATH="/usr/$(get_libdir)/${P}"
+		MANPATH="/usr/share/${P}/man"
+	EOF
+	doenvd "${T}"/50${P}
+
+	cat <<-EOF > "${T}/provider-${P}"
+		/usr/bin/rustdoc
+		/usr/bin/rust-gdb
+		/usr/bin/rust-lldb
+	EOF
+	dodir /etc/env.d/rust
+	insinto /etc/env.d/rust
+	doins "${T}/provider-${P}"
+}
+
+pkg_postinst() {
+	eselect rust update --if-unset
+
+	elog "Rust installs a helper script for calling GDB and LLDB,"
+	elog "for your convenience it is installed under /usr/bin/rust-{gdb,lldb}-${PV}."
+
+	if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then
+		elog "install app-emacs/rust-mode to get emacs support for rust."
+	fi
+
+	if has_version app-editors/gvim || has_version app-editors/vim; then
+		elog "install app-vim/rust-vim to get vim support for rust."
+	fi
+
+	if has_version 'app-shells/zsh'; then
+		elog "install app-shells/rust-zshcomp to get zsh completion for rust."
+	fi
+}
+
+pkg_postrm() {
+	eselect rust unset --if-invalid
+}
diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index d7aea25643a8..4796e4c9a589 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -9,8 +9,10 @@ DIST swipl-7.6.0.tar.gz 16763479 BLAKE2B 6262f213a918bea1f2ea250df791db4b0675b08
 DIST swipl-7.6.1.tar.gz 16764536 BLAKE2B a493b103d9d6206db5a6c895ec1ff6237a122dd611a79803218a46e5611812fcdcf794b887018d4f7bea4d03315581234f99e8cb1a57d11ca502454666b418c4 SHA512 60b6f37b7449941b31ea1ca20372dadcd27585611c8040bb9155fd0c2e3802c554039135e3a084ed56ff9b20842ee607dcaa425afe55421bba00ee1c6cd169a4
 DIST swipl-7.6.2.tar.gz 16765119 BLAKE2B 242d093d7525aa9beeab28ca5cd10080490a93ecc18b62ff945b9d59266aa8bc31a66065b1742b76f336ee5af33994a3c41b0009665f2e29d83efa03fc5d3041 SHA512 9d93cdf44bbb9628cee42eae562ee945202ed0d454f9e433247a0b9b49eee070d3a76f7ceff002c4d13d15720e40e6860adc19581906b8b8ecaac3094192ab5a
 DIST swipl-7.6.3.tar.gz 16772590 BLAKE2B 644be801e290ec9d949a9b7462256a35e11cf9afd62d0b62c315e3620a3943809f58698a23f279454e00299f7b7f7b91e8d9694a139e8c424cb2f83a4efc7a52 SHA512 d84af1a565935af9934c6b75192bb2dd87388ee8fe793ade35d5549a95ec5eb83da6b10508766e795f88393fededea4ec7a3a0c2f0f685d96ab615e171d7d1f4
+DIST swipl-7.6.4.tar.gz 16777875 BLAKE2B 94409966362e649f4748b94b4ec25415bb827c7742aa39453d8e37db4ce992a65ad2d054ded4e651f2a9abe3a9438285bc9c9c895437c087ae6cf88f4afae9ca SHA512 f0ed16e4f1436115651c38a0bb37008d0dadad5a19b0f09894fcfc51dd3d429f86488e89cce00788c3c36cc2f0cd2957f92df47d5441133a6f8ea9d91ca5470f
 DIST swipl-7.7.6.tar.gz 16788781 BLAKE2B 2c6547bcf5b12909bb51d968677635e711612eb41363c637d60ca58bc85a3a24e9486b4aee1c7c727765076615d0f914351ef6bd6bee1fb138d4be32436c34af SHA512 578145b5cd5d64817e5376703b34f3d2d6a53b93de7dea7e9afa32ed075b3913d6610745a80b338cdcddc4580133c73333f60ee9738c61c128e06bd5db0dc7bb
 DIST swipl-7.7.7.tar.gz 16790338 BLAKE2B d91a11c4c33a47d1bcdf40e7df77fe22b2b7dc3029208fc988f4a63c2f304ada059bc0aaf27d879b4406a7ae0f512faf73c837edff9beee60c54ec2006c2e3bb SHA512 225c4b83070dee4bb8d9646ed2be2955f08e1fdd5693c5e842882706698d3dc7c848cd970b3064ea3ad15e58badabe715cb693409b46d1cd9620ad0007c19c76
+DIST swipl-7.7.8.tar.gz 16791278 BLAKE2B 6a2f27c02c5f2a4247b44961eb438e579be901a8badac3cf238adb63fdd1b13bf2400993bac1af1e509476b40b158a0aa6d66e4e0440eb67f745a33580266b47 SHA512 007b683d56d1ee3d5f5637819879141bae9d5a8738a613ed93a3a62a7a43674de39d0e1a3c1f6112fd6f9ab998e5f4bfed8b1abba7d95ceec16eaba73a627dee
 EBUILD swi-prolog-6.6.6.ebuild 2799 BLAKE2B 47c0d56dae0ce19be9efd09122ef8e6e3655abd3459cd25a9a0cf4734fbb132b8725c79775942da8cb2c5eb40bc35f4c0b5a39064a5e41387d4480379fd71435 SHA512 1d30fcb84653a0cdf7cf4f5a78898d5fb29f939095d19a21324a9587ee6ca98543ae16d564ff8880cdf99c6d5a091c2f0e5dc79074ceadc5a7cd3fe340609d22
 EBUILD swi-prolog-7.2.3-r1.ebuild 3170 BLAKE2B ca7604653a23dbc9158e96e54684482fd1c82e6bea8f9753e73c91d46df95a105d70114c0aae8c86e8b9ef45debf97116755b4fc48ecdae95680045ae60035ba SHA512 fe35661ef51094ddf0aff61659f33de5be0252216b94f45e658215146dd53379881f7077c20ace1ef67b70ad9d7128ccd26e122392a1100ab8db195c9324867a
 EBUILD swi-prolog-7.4.1.ebuild 3337 BLAKE2B 6ec047c27c5f76f8cf1fe29e6c8f45d051f1b7d565217af160a022d0b3b45ecd4c18506348ec2d1d19d498953185b22941814a05559b7fa20b3666f48ede932c SHA512 d3b2fb20a92a39d5b4927cc4e2056a1ba3c66978467050817e84cfe46d795989d7d64721bb3b64a8b632dfa359e308d60db7b2c83efc2298c8318ef6314f08e9
@@ -19,6 +21,8 @@ EBUILD swi-prolog-7.6.0.ebuild 3392 BLAKE2B 77fca0aec35200f39f2dd60fccd13c9d6fbe
 EBUILD swi-prolog-7.6.1.ebuild 3392 BLAKE2B 77fca0aec35200f39f2dd60fccd13c9d6fbe78f14c03c0f57a5d42e9b280285b497e612d364352eb763850b38bc7af626172e76752211f195f2fa54f5d8157e9 SHA512 486bc74f0e77862452cf7bc63687cb1ba1395b9d10a2bb50dcb6334ad986d09153595a325703dc9413a2b22675aa838c66c94b5fe4ca582e1418701a31da002a
 EBUILD swi-prolog-7.6.2.ebuild 3392 BLAKE2B 77fca0aec35200f39f2dd60fccd13c9d6fbe78f14c03c0f57a5d42e9b280285b497e612d364352eb763850b38bc7af626172e76752211f195f2fa54f5d8157e9 SHA512 486bc74f0e77862452cf7bc63687cb1ba1395b9d10a2bb50dcb6334ad986d09153595a325703dc9413a2b22675aa838c66c94b5fe4ca582e1418701a31da002a
 EBUILD swi-prolog-7.6.3.ebuild 3392 BLAKE2B 77fca0aec35200f39f2dd60fccd13c9d6fbe78f14c03c0f57a5d42e9b280285b497e612d364352eb763850b38bc7af626172e76752211f195f2fa54f5d8157e9 SHA512 486bc74f0e77862452cf7bc63687cb1ba1395b9d10a2bb50dcb6334ad986d09153595a325703dc9413a2b22675aa838c66c94b5fe4ca582e1418701a31da002a
+EBUILD swi-prolog-7.6.4.ebuild 3392 BLAKE2B 1754139d8ff2862994d2908e2ce845c3c197b74c14522e971ad91b3199ed84f42daf83280287ac51eb03bb53408f1cabfc955bfeb5146918ae51ea4efadca070 SHA512 038d4077bf8733bb57fe8cda0dac04a194f6aac809b30adc21d0b2010750faba4e1db368aff83a766cad6b76853e772b426b9bd76a71ef846964777e90a90c10
 EBUILD swi-prolog-7.7.6.ebuild 3391 BLAKE2B 0593fc8bdac10ee84400ed3e3504e28ac352134adff0344047c5244b11caab0cf04f53e091566c4ba107abb2095d4696966403e2b2427bde48f41e54ee4ea986 SHA512 00971bbad1e54e00f995bbf76839463dfb38e72ec9daa8c16701c47ceacda7a0760d31b8086a14f9c4e52c258f454ab1b1ce9af68bb3cf95f133f8a5cbdce997
 EBUILD swi-prolog-7.7.7.ebuild 3391 BLAKE2B 0593fc8bdac10ee84400ed3e3504e28ac352134adff0344047c5244b11caab0cf04f53e091566c4ba107abb2095d4696966403e2b2427bde48f41e54ee4ea986 SHA512 00971bbad1e54e00f995bbf76839463dfb38e72ec9daa8c16701c47ceacda7a0760d31b8086a14f9c4e52c258f454ab1b1ce9af68bb3cf95f133f8a5cbdce997
+EBUILD swi-prolog-7.7.8.ebuild 3391 BLAKE2B 0593fc8bdac10ee84400ed3e3504e28ac352134adff0344047c5244b11caab0cf04f53e091566c4ba107abb2095d4696966403e2b2427bde48f41e54ee4ea986 SHA512 00971bbad1e54e00f995bbf76839463dfb38e72ec9daa8c16701c47ceacda7a0760d31b8086a14f9c4e52c258f454ab1b1ce9af68bb3cf95f133f8a5cbdce997
 MISC metadata.xml 367 BLAKE2B 07c7ff161f07b547325566650cd882c90dbe98ac5afc0015d68bc0338cebd678ac82c3a45edd3e4f7e613d5d493324899dc8e3b4ca448f447744f439e60458fd SHA512 bacbb17fc3518d3bf845d097d17dba772a745fd7343ab6e8c751a417a540c8c003f29b86c66374bee538d7a5d96ab95e67b1c619d47f80d0e332482daabee74a
diff --git a/dev-lang/swi-prolog/swi-prolog-7.6.4.ebuild b/dev-lang/swi-prolog/swi-prolog-7.6.4.ebuild
new file mode 100644
index 000000000000..c714e15e3b0a
--- /dev/null
+++ b/dev-lang/swi-prolog/swi-prolog-7.6.4.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic java-pkg-opt-2 multilib
+
+PATCHSET_VER="0"
+
+DESCRIPTION="free, small, and standard compliant Prolog compiler"
+HOMEPAGE="http://www.swi-prolog.org/"
+SRC_URI="http://www.swi-prolog.org/download/stable/src/swipl-${PV}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="archive berkdb debug doc +gmp hardened java +libedit libressl minimal odbc pcre readline ssl static-libs test uuid zlib X"
+
+RDEPEND="sys-libs/ncurses:=
+	archive? ( app-arch/libarchive )
+	berkdb? ( >=sys-libs/db-4:= )
+	zlib? ( sys-libs/zlib )
+	odbc? ( dev-db/unixODBC )
+	pcre? ( dev-libs/libpcre )
+	readline? ( sys-libs/readline:= )
+	libedit? ( dev-libs/libedit )
+	gmp? ( dev-libs/gmp:0 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)
+	java? ( >=virtual/jdk-1.7:= )
+	uuid? ( dev-libs/ossp-uuid )
+	X? (
+		virtual/jpeg:0
+		x11-libs/libX11
+		x11-libs/libXft
+		x11-libs/libXpm
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM )"
+
+DEPEND="${RDEPEND}
+	X? ( x11-proto/xproto )
+	java? ( test? ( =dev-java/junit-3.8* ) )"
+
+S="${WORKDIR}/swipl-${PV}"
+
+src_prepare() {
+	EPATCH_FORCE=yes
+	EPATCH_SUFFIX=patch
+	if [[ -d "${WORKDIR}"/${PV} ]] ; then
+		epatch "${WORKDIR}"/${PV}
+	fi
+
+	if ! use uuid; then
+		mv packages/clib/uuid.pl packages/clib/uuid.pl.unused || die
+	fi
+
+	# OSX/Intel ld doesn't like an archive without table of contents
+	sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+	use ppc && append-flags -mno-altivec
+	use hardened && append-flags -fno-unit-at-a-time
+	use debug && append-flags -DO_DEBUG
+
+	# ARCH is used in the configure script to figure out host and target
+	# specific stuff
+	export ARCH=${CHOST}
+
+	export CC_FOR_BUILD=$(tc-getBUILD_CC)
+
+	cd "${S}"/src || die
+	econf \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		$(use_enable gmp) \
+		$(use_enable static-libs static) \
+		--enable-shared \
+		--enable-custom-flags COFLAGS="${CFLAGS}"
+
+	if ! use minimal ; then
+		local jpltestconf
+		if use java && use test ; then
+			jpltestconf="--with-junit=$(java-config --classpath junit)"
+		fi
+
+		cd "${S}/packages" || die
+		econf \
+			--libdir="${EPREFIX}"/usr/$(get_libdir) \
+			$(use_with archive) \
+			$(use_with berkdb bdb ) \
+			$(use_with java jpl) \
+			${jpltestconf} \
+			$(use_with libedit) \
+			$(use_with pcre) \
+			$(use_with odbc) \
+			$(use_with readline) \
+			$(use_with ssl) \
+			$(use_with X xpce) \
+			$(use_with zlib) \
+			COFLAGS='"${CFLAGS}"'
+	fi
+}
+
+src_compile() {
+	cd "${S}"/src || die
+	emake
+
+	if ! use minimal ; then
+		cd "${S}/packages" || die
+		emake
+		./report-failed || die "Cannot report failed packages"
+	fi
+}
+
+src_test() {
+	cd "${S}/src" || die
+	emake check
+
+	if ! use minimal ; then
+		unset DISPLAY
+		cd "${S}/packages" || die
+		emake \
+			USE_PUBLIC_NETWORK_TESTS=false \
+			USE_ODBC_TESTS=false \
+			check
+		./report-failed || die
+	fi
+}
+
+src_install() {
+	emake -C src DESTDIR="${D}" install
+
+	if ! use minimal ; then
+		emake -C packages DESTDIR="${D}" install
+		if use doc ; then
+			emake -C packages DESTDIR="${D}" html-install
+		fi
+		./packages/report-failed || die "Cannot report failed packages"
+	fi
+
+	dodoc ReleaseNotes/relnotes-5.10 INSTALL README.md VERSION
+}
diff --git a/dev-lang/swi-prolog/swi-prolog-7.7.8.ebuild b/dev-lang/swi-prolog/swi-prolog-7.7.8.ebuild
new file mode 100644
index 000000000000..b3c8e67bc2e8
--- /dev/null
+++ b/dev-lang/swi-prolog/swi-prolog-7.7.8.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic java-pkg-opt-2 multilib
+
+PATCHSET_VER="0"
+
+DESCRIPTION="free, small, and standard compliant Prolog compiler"
+HOMEPAGE="http://www.swi-prolog.org/"
+SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="archive berkdb debug doc +gmp hardened java +libedit libressl minimal odbc pcre readline ssl static-libs test uuid zlib X"
+
+RDEPEND="sys-libs/ncurses:=
+	archive? ( app-arch/libarchive )
+	berkdb? ( >=sys-libs/db-4:= )
+	zlib? ( sys-libs/zlib )
+	odbc? ( dev-db/unixODBC )
+	pcre? ( dev-libs/libpcre )
+	readline? ( sys-libs/readline:= )
+	libedit? ( dev-libs/libedit )
+	gmp? ( dev-libs/gmp:0 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)
+	java? ( >=virtual/jdk-1.7:= )
+	uuid? ( dev-libs/ossp-uuid )
+	X? (
+		virtual/jpeg:0
+		x11-libs/libX11
+		x11-libs/libXft
+		x11-libs/libXpm
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM )"
+
+DEPEND="${RDEPEND}
+	X? ( x11-proto/xproto )
+	java? ( test? ( =dev-java/junit-3.8* ) )"
+
+S="${WORKDIR}/swipl-${PV}"
+
+src_prepare() {
+	EPATCH_FORCE=yes
+	EPATCH_SUFFIX=patch
+	if [[ -d "${WORKDIR}"/${PV} ]] ; then
+		epatch "${WORKDIR}"/${PV}
+	fi
+
+	if ! use uuid; then
+		mv packages/clib/uuid.pl packages/clib/uuid.pl.unused || die
+	fi
+
+	# OSX/Intel ld doesn't like an archive without table of contents
+	sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+	use ppc && append-flags -mno-altivec
+	use hardened && append-flags -fno-unit-at-a-time
+	use debug && append-flags -DO_DEBUG
+
+	# ARCH is used in the configure script to figure out host and target
+	# specific stuff
+	export ARCH=${CHOST}
+
+	export CC_FOR_BUILD=$(tc-getBUILD_CC)
+
+	cd "${S}"/src || die
+	econf \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		$(use_enable gmp) \
+		$(use_enable static-libs static) \
+		--enable-shared \
+		--enable-custom-flags COFLAGS="${CFLAGS}"
+
+	if ! use minimal ; then
+		local jpltestconf
+		if use java && use test ; then
+			jpltestconf="--with-junit=$(java-config --classpath junit)"
+		fi
+
+		cd "${S}/packages" || die
+		econf \
+			--libdir="${EPREFIX}"/usr/$(get_libdir) \
+			$(use_with archive) \
+			$(use_with berkdb bdb ) \
+			$(use_with java jpl) \
+			${jpltestconf} \
+			$(use_with libedit) \
+			$(use_with pcre) \
+			$(use_with odbc) \
+			$(use_with readline) \
+			$(use_with ssl) \
+			$(use_with X xpce) \
+			$(use_with zlib) \
+			COFLAGS='"${CFLAGS}"'
+	fi
+}
+
+src_compile() {
+	cd "${S}"/src || die
+	emake
+
+	if ! use minimal ; then
+		cd "${S}/packages" || die
+		emake
+		./report-failed || die "Cannot report failed packages"
+	fi
+}
+
+src_test() {
+	cd "${S}/src" || die
+	emake check
+
+	if ! use minimal ; then
+		unset DISPLAY
+		cd "${S}/packages" || die
+		emake \
+			USE_PUBLIC_NETWORK_TESTS=false \
+			USE_ODBC_TESTS=false \
+			check
+		./report-failed || die
+	fi
+}
+
+src_install() {
+	emake -C src DESTDIR="${D}" install
+
+	if ! use minimal ; then
+		emake -C packages DESTDIR="${D}" install
+		if use doc ; then
+			emake -C packages DESTDIR="${D}" html-install
+		fi
+		./packages/report-failed || die "Cannot report failed packages"
+	fi
+
+	dodoc ReleaseNotes/relnotes-5.10 INSTALL README.md VERSION
+}
diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest
index 4ecd6d7c9bca..087141f57006 100644
--- a/dev-lang/vala/Manifest
+++ b/dev-lang/vala/Manifest
@@ -3,5 +3,5 @@ DIST vala-0.34.9.tar.xz 2783952 BLAKE2B e90728075ac546e8abc125886182abd5fc357be5
 DIST vala-0.36.7.tar.xz 2854668 BLAKE2B 2fcb528b26a56ee9f9d362ec1891c873ee26580132c052554a3d021fea32c0cee6dc6e8c6419f88798f5066a70d54084757893b2d46e3b286b441a51a4169c92 SHA512 7a6daac5be72240ae998b2c26e240a8b6bbc44c8bb6a036357fc0419cd7b40e14ea76c8125eb49a8d252627425613512410ba7868eb579b13d299e2ff0f4082b
 EBUILD vala-0.32.1.ebuild 730 BLAKE2B 9450d1f91714a86dedd803aafcfbb5aa744416e3c65792b566975b654cd96c9537be76c72c40ce041c38c01a4733abd4859274f0f56c5895efb37297c168aff3 SHA512 398bbcbedcce2e1dabd2c86d0c770f78bd380833e117d07196872e732a7763213747996ef5a44a68d4bac52f0a30de6f4361620acfaf3e87b1278771d02cfbbd
 EBUILD vala-0.34.9.ebuild 730 BLAKE2B 4103e7fb4100c296d33f2d101a9abde439f055937a6198517626f2f2c2c1acf73dc4b495f23d71b4130ae561c1b1a5930b87aa3abd99f1d95b1c3d0ef02754ca SHA512 c8b77206bb700f239dd7900b2dcba92be66a817292945f5e4c497e60eff6560ab12236f5ade4ffa4d868f9292b709e782de16d3ee7b890d8fe4ce3ceafd062b8
-EBUILD vala-0.36.7.ebuild 820 BLAKE2B 9ab3732e1b538016dd5534a717ee896c159c3176919147c05091311074fd84555288f91756ff3a22dd08390c02c71cdd061ffa7e0a8d1232dc13b3f2ef7bada4 SHA512 72696c145af836c45675953123f1b945ed0716d1ef94a280750e3ac8257640e4c9c03980964fca16a2386dae550f40ff364a9dcae57de6b1c29f98cbc02e8004
+EBUILD vala-0.36.7.ebuild 819 BLAKE2B d358dcaca2a9571bec84b2c6364b4f66a7bb8372dad53bc78c85cf6f3cd9a4f48c9d7d9d2514c433a48207fc1ccea9c0c7d2709f86977fd2b1243867f5f9b0fc SHA512 12d78ef0ed12c1609728a1f2dbf5ff1d6c52593ab480e214fd286f5d28ef0e899500bf744072ea08614117f4decee804310b3e42e120659b8ba03b4b943ecc2f
 MISC metadata.xml 255 BLAKE2B 51dc9e0030d68ac68f075bb4a7b4c5f42122c16f354e10463d7338e652b272b26fa1eb12a144ed4a00d29a020af4df19029d909b4591162347184b1684402c94 SHA512 1970039db79f50391650a9fea933485c6102d1165946ab8efe9395403a02f49d4b17c2942795282469ac7c0306e7353002dcbaa797fb1060982b31ea3540b98b
diff --git a/dev-lang/vala/vala-0.36.7.ebuild b/dev-lang/vala/vala-0.36.7.ebuild
index 34f8a833715a..391db3d48641 100644
--- a/dev-lang/vala/vala-0.36.7.ebuild
+++ b/dev-lang/vala/vala-0.36.7.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1"
 SLOT="0.36"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 94cb9679222f..06a275527be9 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/atk/Manifest b/dev-libs/atk/Manifest
index 733741ec3948..fd7485bddfe6 100644
--- a/dev-libs/atk/Manifest
+++ b/dev-libs/atk/Manifest
@@ -1,5 +1,5 @@
 DIST atk-2.22.0.tar.xz 745572 BLAKE2B 4764a6044446de8e08b54c47400727268ca68e676aa36c01877f2b3f973614a40f209406b649f0e96f4a5b75be883ce67ac3fbf20ac0c58adfbaf3509caac312 SHA512 af3f6197eb97de869ee706f19564449b02c1444c413e5418323e4bf4c8cf1d98c7c8baa25189f6879d63606d4bc75f33799cb901f4697c087e868bb9a5643cba
 DIST atk-2.24.0.tar.xz 748972 BLAKE2B f9db7e35322cf4a1df5171c812c83eb935ba44b0167b20ca9a951109c00911392a48db88fac02a12074de4d9f458656f946e8bb7611e1d11cc0de841986f8cc7 SHA512 3ae0a4d5f28d5619d465135c685161f690732053bcb70a47669c951fbf389b5d2ccc5c7c73d4ee8c5a3b2df14e2f5b082e812a215f10a79b27b412d077f5e962
 EBUILD atk-2.22.0.ebuild 1428 BLAKE2B 09fcdbf9c0360b4028be8ffca418f4e83a839fade16e3d1a67f34b9a43ae87ab6f4b44e6f5c363f6fef074ea2d822ed3bb14b58c656dc294426c82d968db98c8 SHA512 64ed9a17da2175f795a0abce2ef28d246f242990962fef66002fab227d5553bc89ca4dbdb779c2a29a1c59e34f3f04260f8669405a9cdd166b76cf2dd9ae6652
-EBUILD atk-2.24.0.ebuild 1435 BLAKE2B 5dd041158b598c6b16672725d56d8d0609440ac041b1382194794ad8141b4dff52d714264562f39661e821cca73c4ad146cd59b080d43bb0518aeaa4dc4e6220 SHA512 a0ff4d016848e499eec7fa70dd1d96d8f8762d69f0932a4c0813a1ca721b1f0b8fc6e3cecbf2e722afbb8da306bca3bde05116da074ebadaf45daa4760644f13
+EBUILD atk-2.24.0.ebuild 1434 BLAKE2B dbb2779389b69136ff1f43ac63e7a1daf79eaec6d075a436999ec8997681085a295588647a7b6012525c74e88b6769b28a47210ea80e874db000cef1a607a238 SHA512 9e51a1a837a32de09211914351d23e19383e7e03d1ea9cd6a7b14f1a36d954ef32e0c10ffe4df93ec02a2c56133a5cf4b29e5b75d4e161dbddd2774b4438af3a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/atk/atk-2.24.0.ebuild b/dev-libs/atk/atk-2.24.0.ebuild
index 47e0f1ae6593..30b5b0e68229 100644
--- a/dev-libs/atk/atk-2.24.0.ebuild
+++ b/dev-libs/atk/atk-2.24.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="+introspection nls test"
 
 RDEPEND="
diff --git a/dev-libs/boehm-gc/Manifest b/dev-libs/boehm-gc/Manifest
index 04f6e4177c33..f9fc10fdaf1b 100644
--- a/dev-libs/boehm-gc/Manifest
+++ b/dev-libs/boehm-gc/Manifest
@@ -10,14 +10,16 @@ DIST gc-7.4.0.tar.gz 1060884 BLAKE2B 66bcf7b42591c0899d069c475e0278792173a157c44
 DIST gc-7.4.2.tar.gz 1082597 BLAKE2B 5ca30e786a995941fdf2d803d201e7263bdd7d9974a71f672ff259c75ee36dc5d499a614334e570100ddbcb25fd06176f48429b64bad95fb218c35ba584ad4c6 SHA512 2e21516addf268780641ee55c0cb3ecc2d96fa963faffee5beadcade9c6bf1ee49ee1a75b076b5d49ddde7c839fb94f4c3623ca8412d14c2a5bf6ca30d424a72
 DIST gc-7.6.0.tar.gz 1111751 BLAKE2B 84780ffbd087aeddfbab7b5c9de05aac18f8e3ebbc174e3a0ffec295d8288ecce33f1ca6a44eaef168e1433d696a38a664fd6abecae006e8179bc453b278f5c3 SHA512 511e8c01287b1ee9dbec87f0573377de77038b7af053a3f33afed9b3ffa30e2402d6a9bb0ca4f4b81cd808209b47b5718d498cff3de6632a057fe03fad51fc43
 DIST gc-7.6.2.tar.gz 1119725 BLAKE2B d74fbabcc298e7673ba4d23df9fa7a8cd2895b0925dd26a2b2090d7fef0044af4dcb693357de8cb30ff7e4b9708c00259224f40baac13ac178adf44c09c0dd17 SHA512 7b54812903929b0d5d1d696beac54629a7667997b41ef45299373bc18b2153d5755286b25e11cc90ffc572239e52a02900927bc60b0ad3593162b8c8e259fd50
+DIST gc-7.6.4.tar.gz 1120784 BLAKE2B e7cad27d2144fd37aebad44093e1a0814fe9a1cc887701e485681cdd01f3ea4477150697d535d0873a1255abff0765084119096c7ed61d3caeda439cf2a7644f SHA512 2c85be3e24b85732b3dc6f08fe98cf1a82b6fb2a22ec73090f80920721c737ef92cee8f0cd7ea7228d686005d164e7da54ce3907c3a1ba5eefa43355a472085e
 DIST gc6.8.tar.gz 756879 BLAKE2B 8a56c4f7b23e79862aaa6fc505a56ea9a8ed53b9f3aedc8cbb57c37f0fabe040abe22096a8893b7f7b1ff1267bff37101e3dfbbcedab380afe0abff02b98fe14 SHA512 69a9554d2d213392512d4ce41ec8c4993557e65c2b3dc4f568ac18695421cc08b7677c25f9a0ce03e94fb5e68a298fcac7ed09fb90007a2c998ff6ef78d3c651
 EBUILD boehm-gc-6.8.ebuild 1090 BLAKE2B 8aeb1528915bd4c1f78f058590e0c55284bd6e0c188dcf47dc52aa05fd68af9505972885c0f09ef972ff2c0ad8710f68ac2fc41980c7048cda715ca059690b99 SHA512 912df525bfaaa5b767e5774e68f059058d50a060a02a99605d5a204153c22610ba872334e93eee64281c68582aa1fa54e2da1d72d6a82c0d83d89e61062939f3
 EBUILD boehm-gc-7.1-r1.ebuild 1148 BLAKE2B 7b832a50dc99f3451af49eaa91b8d9d0b488bde2e451383df22b4a2556bf587503551784e0346f376116399610a3682702f4376d6d92e4db6f03f447caeffb22 SHA512 0f9e1d20c7de2df47ccbe487fd94ce674ea34b41edb089bb6d746e5de2c3e4ae16efb5900f02b1b477380917f274d946c3d1f7e70150bbf803b1e69bf615cd04
 EBUILD boehm-gc-7.2d-r1.ebuild 1349 BLAKE2B 0644e1fc5701c878d79a91a38a51e759f0ee8b1e6a7bd8d9a761eaa05017dcb3663ca0fa89f670cd4e5e6b622ab2edcb9674e8c8952a6fb51e4d8b3db88433fb SHA512 c1c894f4d19d231fda3317cb6cdc8d9abc131f4d91c4a642c866e5330a0f7d4ec1bc8dead617038ae06894a66e285877ae050e45d64320f1d5b133843e15b855
 EBUILD boehm-gc-7.2d.ebuild 1486 BLAKE2B 98845f2548951a450cbcbaabba2174c06b6c33452856e7de7fd3fb2a83738227b48f423be48fe5d067dddf75a983dfca95fac37018c111f468cfdc6b71b958b4 SHA512 1cb254b75abe1073626affc0e7360e0d2e68295feba697286540cc832cf8ef4ef6a989237ee77a7d378c342ad1c8be36a1f55c774c625a139662d3d5404fd564
 EBUILD boehm-gc-7.2e.ebuild 1333 BLAKE2B 398be6ccb9df21a385df0bc45f0502db6e2f09849543d8b91c76451fc59ceaa0d6e7c430689163b9696bf2fa92aef1eae2c555083d5cfa76f0824a428a71b315 SHA512 e0fee4afc7b0f8b00df366d2856c3355e4832ebd1952f3ad3e23231dc7f34dc5471ced41624593690edc39b47a06274ca82c5dc90efc6181b50fa6a2e94b11b3
-EBUILD boehm-gc-7.4.0.ebuild 1226 BLAKE2B 0702a307fb72a751d6592505dcf17a6595f5d18b5b986600a2bc98441e742c47b4ea9c42028ee6e83ba695875322b3f9cef787f526153a0a91327001fb0fb26a SHA512 346a736512c86d9d07aa35aeca5a56e5958dd6af7614b6f3fa475bc4db51cf2dda42e5ba7b392e61d0f89b12d8ca1048e71da5e4b4047390be15682f34e720a3
-EBUILD boehm-gc-7.4.2.ebuild 1200 BLAKE2B 0962764eb6158acf2106131b136860b6e02f6aaefd1ca19436d21c4d3a9e2e3c6e37b77a7db3fe11d4fa009b9f461cccba28d19d22196cc5eb89e5dacb31cb7e SHA512 d90be5a47509d83927c355c44f79e301f1fc62b198e984d132ca385519f33ab2aa5e8cb1b0e6964d3312ad0e27d49b9b8c68cec639d0a231b092461f0f85112b
-EBUILD boehm-gc-7.6.0.ebuild 1245 BLAKE2B e3d6bfd09f64e71463de90fbbd0cf27f5746c75e8e616315d044b44b5eee79b42d8ce23a0e9e582d702cfb2b8c13414054cddafcd6e7e873cb695bed21f5f97f SHA512 ec4606af16ad4332a5260506c773dcdf8384580cf9aaab4b59758fb9886164fed65f763d527b54f6b23b331b86952ab0f153a7705348c6b46264007dd410d53e
-EBUILD boehm-gc-7.6.2.ebuild 1266 BLAKE2B a28c5effa656c6f93f8c7133e11a70538b02040f623041259b6ba22e868112b2aa580015a98366d4c0f7c0eeec867be42b7227cbae0aa944cdb2fb64eb76a5a6 SHA512 645884c81bca9022e8bf1278eef66af48cc062dbe3abce8c4000ebc10b3474b88ecceff1379c54676a8210078dc39ea7f6c0552372c229804a55088f63426a76
+EBUILD boehm-gc-7.4.0.ebuild 1274 BLAKE2B 037fc951992b725e4cdac5a39d74f7abd39cc5158f24fb7fe83a1b3dd6bd03431350aa3ad62ea1cf1fad25a4735eb18b591ee49d4dd681840a081112b84b80c8 SHA512 e20bd3633ce966c3aff767496bd8f8ec2d8a95799e2f41afffe67bee86191545ee226366e12af21d796c0103776d72bc2aa189ea73878bf141a07330aca38504
+EBUILD boehm-gc-7.4.2.ebuild 1248 BLAKE2B dfc41bb8278e4dc25ce02f6ee6c48d741119043762409acfe37ca3a3475bf0d38f88b3cbdb58143d7f8a7036c4e3cd591b83fbfdf107d14dc5fbad6dd47d0b4b SHA512 68df71e5393048b52929dd73a60cf8cb5b980dfddf854aaa842c78d2d8a077f6c8fb235ab507f38c0f1c8045342492834433dd77264450114d7439b4457cc806
+EBUILD boehm-gc-7.6.0.ebuild 1223 BLAKE2B affc1265ed9b4ba1689a1ca051031ae98c7b24667f5e289ea504b0ed84c120c951bab3869608d7d474f0973f30febad8c9ba83b9a9a85682b9d03c7dbadf44a1 SHA512 2f49c9aff361715e294fd9fd5db5fc23d67a83cb9b3cf756448ef65e3407e9a95669ac525f192a4c13fdefc754549ef156d76af9eae6b46dd7786483a7800fb2
+EBUILD boehm-gc-7.6.2.ebuild 1244 BLAKE2B 2af182dc75c6a4a4b63a8faa542dd92b0e34f551291bffebe494f6ec4c5a44d27b539033f3923ee5ebf0f93bb8ed4ca0a092415453b8878619c61b729959275e SHA512 4218ce6637e7ab888481d972014c54cd066a86e422332bf4eeadc08f357ea5ff89d60de8f3e4215a70271b3305c6c9572a79a379f6782d4edab3349923af520d
+EBUILD boehm-gc-7.6.4.ebuild 1349 BLAKE2B 6c745c979ef52d76cbefe42c6e8caaf79a3e57d3a47135082941203f3eb70b4216d5e8d11734627fd890dd8e5d7672d41156828b3be34434e0a11c07225bcbd5 SHA512 f91db1b5b041308d6db4fa5589a324d388c8d659eed2516f1991849a04e83ccf0c526caa952e60af7fab276a79d9fbc50ef5e3844e7c74b28d9e4cd994ae1669
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/dev-libs/boehm-gc/boehm-gc-7.4.0.ebuild b/dev-libs/boehm-gc/boehm-gc-7.4.0.ebuild
index 49e885406659..dcdf93aaa2c2 100644
--- a/dev-libs/boehm-gc/boehm-gc-7.4.0.ebuild
+++ b/dev-libs/boehm-gc/boehm-gc-7.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-inherit eutils
+inherit eutils libtool
 
 MY_P="gc-${PV}"
 
@@ -21,6 +21,10 @@ DEPEND=">=dev-libs/libatomic_ops-7.4
 
 S="${WORKDIR}/${MY_P}"
 
+src_prepare() {
+	elibtoolize #594754
+}
+
 src_configure() {
 	local config=(
 		--with-libatomic-ops
diff --git a/dev-libs/boehm-gc/boehm-gc-7.4.2.ebuild b/dev-libs/boehm-gc/boehm-gc-7.4.2.ebuild
index ce85bb396f05..6a945b47e50e 100644
--- a/dev-libs/boehm-gc/boehm-gc-7.4.2.ebuild
+++ b/dev-libs/boehm-gc/boehm-gc-7.4.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-inherit eutils
+inherit eutils libtool
 
 MY_P="gc-${PV}"
 
@@ -21,6 +21,10 @@ DEPEND=">=dev-libs/libatomic_ops-7.4
 
 S="${WORKDIR}/${MY_P}"
 
+src_prepare() {
+	elibtoolize #594754
+}
+
 src_configure() {
 	local config=(
 		--with-libatomic-ops
diff --git a/dev-libs/boehm-gc/boehm-gc-7.6.0.ebuild b/dev-libs/boehm-gc/boehm-gc-7.6.0.ebuild
index 7fc4ca03479f..3eb610321297 100644
--- a/dev-libs/boehm-gc/boehm-gc-7.6.0.ebuild
+++ b/dev-libs/boehm-gc/boehm-gc-7.6.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit multilib-minimal
+inherit multilib-minimal libtool
 
 MY_P="gc-${PV}"
 
@@ -22,6 +22,11 @@ DEPEND="
 
 S="${WORKDIR}/${MY_P}"
 
+src_prepare() {
+	default
+	elibtoolize #594754
+}
+
 multilib_src_configure() {
 	local config=(
 		--with-libatomic-ops
@@ -33,11 +38,6 @@ multilib_src_configure() {
 	ECONF_SOURCE=${S} econf "${config[@]}"
 }
 
-multilib_src_compile() {
-	use sparc && emake src/sparc_mach_dep.lo
-	default
-}
-
 multilib_src_install_all() {
 	local HTML_DOCS=( doc/*.html )
 	einstalldocs
diff --git a/dev-libs/boehm-gc/boehm-gc-7.6.2.ebuild b/dev-libs/boehm-gc/boehm-gc-7.6.2.ebuild
index 53b5655f24f9..e6156a40adab 100644
--- a/dev-libs/boehm-gc/boehm-gc-7.6.2.ebuild
+++ b/dev-libs/boehm-gc/boehm-gc-7.6.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit multilib-minimal
+inherit multilib-minimal libtool
 
 MY_P="gc-${PV}"
 
@@ -23,6 +23,11 @@ DEPEND="
 
 S="${WORKDIR}/${MY_P}"
 
+src_prepare() {
+	default
+	elibtoolize #594754
+}
+
 multilib_src_configure() {
 	local config=(
 		--disable-docs
@@ -35,11 +40,6 @@ multilib_src_configure() {
 	ECONF_SOURCE=${S} econf "${config[@]}"
 }
 
-multilib_src_compile() {
-	use sparc && emake src/sparc_mach_dep.lo
-	default
-}
-
 multilib_src_install_all() {
 	local HTML_DOCS=( doc/*.html )
 	einstalldocs
diff --git a/dev-libs/boehm-gc/boehm-gc-7.6.4.ebuild b/dev-libs/boehm-gc/boehm-gc-7.6.4.ebuild
new file mode 100644
index 000000000000..138b14036e50
--- /dev/null
+++ b/dev-libs/boehm-gc/boehm-gc-7.6.4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit multilib-minimal libtool
+
+MY_P="gc-${PV}"
+
+DESCRIPTION="The Boehm-Demers-Weiser conservative garbage collector"
+HOMEPAGE="http://www.hboehm.info/gc/ https://github.com/ivmai/bdwgc/"
+SRC_URI="https://github.com/ivmai/bdwgc/releases/download/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="boehm-gc"
+# SONAME: libgc.so.1 libgccpp.so.1
+# We've been using subslot 0 for these instead of "1.1".
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="cxx static-libs threads"
+
+DEPEND="
+	>=dev-libs/libatomic_ops-7.4[${MULTILIB_USEDEP}]
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	elibtoolize #594754
+}
+
+multilib_src_configure() {
+	local config=(
+		--disable-docs
+		--with-libatomic-ops
+		$(use_enable cxx cplusplus)
+		$(use_enable static-libs static)
+		$(use threads || echo --disable-threads)
+	)
+
+	ECONF_SOURCE=${S} econf "${config[@]}"
+}
+
+multilib_src_install_all() {
+	local HTML_DOCS=( doc/*.html )
+	einstalldocs
+	dodoc doc/README{.environment,.linux,.macros}
+
+	# package provides .pc files
+	find "${ED}" -name '*.la' -delete || die
+
+	newman doc/gc.man GC_malloc.1
+}
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index 575cce811d7b..8ff3e5fdc611 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -4,5 +4,5 @@ AUX gjs-1.43.3-disable-unittest-2.patch 1119 BLAKE2B 8ab995513b63faee201f84ec45f
 DIST gjs-1.46.0.tar.xz 490812 BLAKE2B d7b71d6c611404d9313cdd19959e2a0cb7f035bbd2528db77ccb0030e685019b756216bfbc64885b3641c14cab2f29110492c87047c3ceb1a627765857b19a95 SHA512 14af40668e95d269ac87556c75cf45680c41bc8246f04c46726d34bd80e9344045c0a510567f156c2c25c1f10dd474dc38bd50581d1b2e5abe0daa0cf570e2bc
 DIST gjs-1.48.7.tar.xz 595324 BLAKE2B eac8b5b2f7e909e94e3fb305cac443da3f433047ee07fa8fbd15905890f77d57449c8689867df61f1ac849b8b4bddc089a9b1ddc3aa79d4b3d054226c58fa909 SHA512 b8c58e068eaecfca2fa40cebe209fa8058e603809be4307099a0f3dbd561752a540d587d546ffa74aef0268a111f2b2846a1e0febda1adcefdac8c02e716e2dd
 EBUILD gjs-1.46.0.ebuild 1559 BLAKE2B 8e46f9f4a7f06ed43132e023b25203eef301345e8de0d52183edb25c07b79fc1dec1c2285ea5b4b57b4923092e165901ebba049362cbce73c50a377b4a7e5d0e SHA512 083fd06684cd111f77b35f251c9d1418614550947366e838408daa2f214204d530273a2954304f6e3aba092c8160dec9ae581d7422f033cbf3aaaf72ec99ccae
-EBUILD gjs-1.48.7.ebuild 1556 BLAKE2B 0a24b1d51b69cdb55aeb636a6729d574aa3c1b55aa26abe364b735587bb129539eacc6865269d852efe5e5317875bb74969f3b4a71cd1fa302ed7cb5a14d9342 SHA512 2cd56b0fa45e8b0d655f04e3e7cf13da8f4bf320b0fb1ae2b1d0cf72194e137db54a25134ecc0399e435b3c17a59bef4edf225105a78fc66c971920b4f66a557
+EBUILD gjs-1.48.7.ebuild 1555 BLAKE2B ed42086c7f958195ae96510def217549ece3365c0d15b44deb6c250e45981f1268bf1ce2b9a7b86492daa2f7bc490d138833a25223090361897c6695001a4ba4 SHA512 31daa4e59311f8a986ea06f8a4e0ec04863ca679e51a68996bc27c8fab47b5d3542d05f18207c016ab4a9ba8627ed9261951833dd8b7cc9faaf6b536737ffd23
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/dev-libs/gjs/gjs-1.48.7.ebuild b/dev-libs/gjs/gjs-1.48.7.ebuild
index 6222f907f987..cdd5dd4ec7f6 100644
--- a/dev-libs/gjs/gjs-1.48.7.ebuild
+++ b/dev-libs/gjs/gjs-1.48.7.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
 LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
 IUSE="+cairo examples gtk test"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.52.1
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 05ea552ff3c3..e2ec7abbc738 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -4,5 +4,5 @@ DIST glib-2.50.3.tar.xz 7589284 BLAKE2B 8648e5d9e8f4c943ca3ec5a5ec01f380f55f7655
 DIST glib-2.52.3.tar.xz 7679972 BLAKE2B 8d9f6b714571bd04ab9717fbf9ded8556664e43dcdb7dd59436b8b7f1a8a5cdf98e9ce60ca1ead941af1d57688044fefb6c749fa735084622a3482b058864ff6 SHA512 a068f2519cfb82de8d4b7f004e7c1f15e841cad4046430a83b02b359d011e0c4077cdff447a1687ed7c68f1a11b4cf66b9ed9fc23ab5f0c7c6be84eb0ddc3017
 DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
 EBUILD glib-2.50.3-r1.ebuild 9645 BLAKE2B 14c0111687ec100a63f69ccca1f3e09da4e5bdd19ecf28382dd754cb199bf71cb798858b14f21e1ecbbd720a8682de42df0903f1feab3ba920bff76d40ae8137 SHA512 867357f01c61921249afe92cbf868f457fcf5e29fcf6e7667ad7390dc9456a5d558d5fab46acc0bcf66c7d13d4a0895ac127eb37068ab32011b4b1048703ac3b
-EBUILD glib-2.52.3.ebuild 9556 BLAKE2B 1ffea920d71e5bcd5047eeffc1ef611774befce3832864a3a0d0b19e544e1dd6e2a83383e7fa7ac5a33fc7d74abd9cfe9d26066c935518454c5f60d10825ed74 SHA512 a3c54c848b5e2fac4737ae00fc0c57a5bf2bf5aa56ed1d9ab906a639fdfa84ccc43724e0fedeae291671e720cc92b6ab1dba46d3d4a3c734aa409939edb83005
+EBUILD glib-2.52.3.ebuild 9555 BLAKE2B 0060f05d4d90d457a90a079e017b8329746ac6e665d63d83f3929b03a40466832820e794f43a5c76d8ba5313f1dd70219a9a5c348c6c7eeb90135ce99a851b9f SHA512 e30922cdfabaf0858981480b1cf6f22369716c45124ba8e34b896d15b0bf58eadbf79a2b566a2aecde1a6841b438607d5f79c5b28cdf41b3789e710d76d5cc1c
 MISC metadata.xml 978 BLAKE2B 75f0c12ff1628b7c345b1e85c6baa041973f11555aa520348ca6f347d2241ee0fc9bc26891b25bd34ae512dbaf761b5382d93f094dc0c4ff9a76c3ec852c9583 SHA512 8087f80cbbffb14930b50178559cc4dbde999d4e123475beb04e2d0a25e64b24ee5ab8523f1df1839e82f74272b40cd9a57b78acf34fd64f8b4723bed26573c8
diff --git a/dev-libs/glib/glib-2.52.3.ebuild b/dev-libs/glib/glib-2.52.3.ebuild
index 02b2415fb4d4..eb8bcdff7d3c 100644
--- a/dev-libs/glib/glib-2.52.3.ebuild
+++ b/dev-libs/glib/glib-2.52.3.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
 	test? ( ${PYTHON_REQUIRED_USE} )
 "
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 
 # Added util-linux multilib dependency to have libmount support (which
 # is always turned on on linux systems, unless explicitly disabled, but
diff --git a/dev-libs/gmime/Manifest b/dev-libs/gmime/Manifest
index ccb88bdaf6a1..27a02a88dd3a 100644
--- a/dev-libs/gmime/Manifest
+++ b/dev-libs/gmime/Manifest
@@ -5,5 +5,5 @@ DIST gmime-3.0.5.tar.xz 764188 BLAKE2B 71daa5703c7a3e0e209a35908ef9fee40d494a5d2
 EBUILD gmime-2.6.23.ebuild 1735 BLAKE2B 53f9f6f52467235a3de521c880fcf55a6a9f3498000c52557fcac809d7ae118640c35204a61c2f69ac2d99db68b3232c6a672b99dbe658a0d5eac299ea987fa9 SHA512 2fbc586acb1dea60334039199a75f796bdd222ac5451c47ab76b2f8453adb4a2850d52dabb0c9d30af9a31332d5804bcc7891ceff5c58b78a61b2b54d0dd0354
 EBUILD gmime-3.0.2.ebuild 1565 BLAKE2B 7cb85de4a7f06d7e58df10f0c6ee060894c3bea4addea13fc977be57884c42b0c117171b421d7e7b8597882ac2f037a6238c69536ba9f2c3e523201c1f68a80e SHA512 5c887be7059c20a2166771651d5b221e0a228f9b12f0b0f38f1fdf83b00ad3c3d8e94f072c0d00bbff0ee0aef448922acb333b123b5e69f16de75d034eeb8ea3
 EBUILD gmime-3.0.3.ebuild 1565 BLAKE2B 7cb85de4a7f06d7e58df10f0c6ee060894c3bea4addea13fc977be57884c42b0c117171b421d7e7b8597882ac2f037a6238c69536ba9f2c3e523201c1f68a80e SHA512 5c887be7059c20a2166771651d5b221e0a228f9b12f0b0f38f1fdf83b00ad3c3d8e94f072c0d00bbff0ee0aef448922acb333b123b5e69f16de75d034eeb8ea3
-EBUILD gmime-3.0.5.ebuild 1564 BLAKE2B 616a2c5d5172daa31cf032b0806b4af160f702d3333f0d76837587d200bda1baf7d5f58b5469aceba705866539f9abc6dbfeb0c89ede4f438ffab2270925dc31 SHA512 5c166031fea9b8b20cb8d6c6348414669d9eabe8716f84417a4a4b8b453ec17c7bd739301fe255d454956d7826afd18ee8ddd68a108ff8c6efd9e027d2c9a09c
+EBUILD gmime-3.0.5.ebuild 1563 BLAKE2B 679f860c55235c49f5a92e5ec36edd7ce2c73bb90453bee7779d9af86f388b68300413b7358bc5f6499b72eef5875dc1c7fc60a2089af50f5956e81dfc0a196b SHA512 5718c00a118e590b92bc9d1bee24304f1da5eb29330d1062e8e87d2c6f262a5d14f810d9726a60ea91c2674286e20b8521f9ead1d9061974074eaf7c2cd0f7b9
 MISC metadata.xml 407 BLAKE2B 6079e838028f6063248e1dfe1b1b720c2bde65fe73512d4749aeda39aa9bd01b5bd047217e51be2ec6ab1050551f6e2f1c1d7162400261c841be312f8538df6e SHA512 0567710e8d8d0a61a0828325440aa243d8517d94767069d165c106fc5d1b96e5f952738874772ef9f28d1a391d3c47939a2ee32ecf3f8321ec00ee81d646d502
diff --git a/dev-libs/gmime/gmime-3.0.5.ebuild b/dev-libs/gmime/gmime-3.0.5.ebuild
index 3390d8e3e175..418fab9362eb 100644
--- a/dev-libs/gmime/gmime-3.0.5.ebuild
+++ b/dev-libs/gmime/gmime-3.0.5.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://spruce.sourceforge.net/gmime/ https://developer.gnome.org/gmime
 
 SLOT="3.0"
 LICENSE="LGPL-2.1"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="crypt doc idn static-libs test vala"
 
 RDEPEND="
diff --git a/dev-libs/gobject-introspection-common/Manifest b/dev-libs/gobject-introspection-common/Manifest
index fb50aa2aac40..396994ec405b 100644
--- a/dev-libs/gobject-introspection-common/Manifest
+++ b/dev-libs/gobject-introspection-common/Manifest
@@ -1,5 +1,5 @@
 DIST gobject-introspection-1.50.0.tar.xz 1415700 BLAKE2B 7707d0affc35e60d272312debd429a96a578cc6ea4e889244a0a1dc34f23e3b686cea06076427575fa620f570141e173990ed12649cb669808141dab1fdffb19 SHA512 cb108cf3d49743e1686fe4ae99f2360799bc8825ad97bf0b97e097b3f89e2771079593de0f497a9e5b9cff892f6fbf870834a6c4d13f11bcde99162e9388ecfa
 DIST gobject-introspection-1.52.1.tar.xz 1384292 BLAKE2B e1176bff177d7b6deee3e93159425a176d8056fbac2af5038950b7bc4486785ca988fc4c8c4d6a069b2bf623092e57f096aea37bbb9a767adaa695ec8f0db4e6 SHA512 878653ffa80c064c73453ea2878a977e52f0d6a0b2123bee8c3429379366f9da3e9fd991fad0dda170d74e4241314ea6c5120f5988e68fad4bfe9c333d11389f
 EBUILD gobject-introspection-common-1.50.0.ebuild 1032 BLAKE2B 88bf89cee40bdfe0e69efe0126f65dca0133903ae4756c336494799c7a3a1b8093f7f2483560c627482d0a5dae7ec41872969c1322c0dc117df389f4e74c3424 SHA512 2f026c9d91e6300594e43499235d9fc563bbffc967cd91ebe7c7582ce173d717d10bc18a906086ac57eb82e5446c18288f091daf8a622b2e5a5bc033c70b5058
-EBUILD gobject-introspection-common-1.52.1.ebuild 1042 BLAKE2B 543a80129e25d7808136cd2f7ec533970db99891e2ae016557cfbc5923524e64178aa40632ca405302032c82de8a4deaa47525961aab756a7dd038393a06e3bb SHA512 21a23d12fffb1672f951234ffedd8412d883a83952d27d3af7c31b5e4f058ceca9e27a98078b2e64534bbe367437028bc4a0370b34ac4fbb8f981212c54dc1f2
+EBUILD gobject-introspection-common-1.52.1.ebuild 1041 BLAKE2B 68d36a75cc5dde974245ba00c8d5b879ac62dc16758f668cd432c652abf5b90f87b90e88d8ec0e823b5090c386ccbe7a0c7e17e2cdea58b7ffa8063845b9a7dd SHA512 d4a95ca53639257bf355150718c09ec935a0586991f54042426676506af014ed96cad68602a082750a5db29e429d7d92324b050f92ec4fbf6d9935082fa3738b
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.52.1.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.52.1.ebuild
index d17b390cdb5f..6f9995ea762e 100644
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.52.1.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.52.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="!<${CATEGORY}/${PN/-common}-${PV}"
diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
index 38c8aaeb445e..b952e61f442c 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -1,5 +1,5 @@
 DIST gobject-introspection-1.50.0.tar.xz 1415700 BLAKE2B 7707d0affc35e60d272312debd429a96a578cc6ea4e889244a0a1dc34f23e3b686cea06076427575fa620f570141e173990ed12649cb669808141dab1fdffb19 SHA512 cb108cf3d49743e1686fe4ae99f2360799bc8825ad97bf0b97e097b3f89e2771079593de0f497a9e5b9cff892f6fbf870834a6c4d13f11bcde99162e9388ecfa
 DIST gobject-introspection-1.52.1.tar.xz 1384292 BLAKE2B e1176bff177d7b6deee3e93159425a176d8056fbac2af5038950b7bc4486785ca988fc4c8c4d6a069b2bf623092e57f096aea37bbb9a767adaa695ec8f0db4e6 SHA512 878653ffa80c064c73453ea2878a977e52f0d6a0b2123bee8c3429379366f9da3e9fd991fad0dda170d74e4241314ea6c5120f5988e68fad4bfe9c333d11389f
 EBUILD gobject-introspection-1.50.0.ebuild 2092 BLAKE2B 92e733407ea06a272049437950950d24f42a90757c4368a4e634833df2b3502c1ebc9c57297fe9b7972d2d96fc57b0b247afd624d6468a697d59bd53fbde958d SHA512 559b28837ba8826dba5b258cd3c6a1723174fbf2ec2609c002677aee0fb2bfde431fc9f18b20f888c483fd4f4980b386bebd7888f5eda1c150b2f80b002297d8
-EBUILD gobject-introspection-1.52.1.ebuild 2107 BLAKE2B 457e0c35efdc3dce072d373d4e04095ed4b3687c2fa27dd04a338b76dbaf1fd3adecd04c832a747a5d111af47cb49758b16720f28370b8dcbed40bed558b5f80 SHA512 411f8364f098c63081fe04c6b52f4ba0d37fcef3f6f923ad2c5a416740210e7410facbc411c42089acd344e79bb6dcaf77efa4f6ce9ecc4ed39c968101597b73
+EBUILD gobject-introspection-1.52.1.ebuild 2106 BLAKE2B 8a535c64d07df61a7f071382b4e5ec109afa764db65b17ed12a1e693737077d0db8dc072ec2ed0b2e7b71dfb2a80a9e17da6f5c5d41e4d660f3eee920bded1f3 SHA512 c25853e088f930aa9a17ae5ecd3a076ad5243f1a12a915e39ef310a0043c8e13d1a3b8d47635506b1604829b7419fdd76988eccb370bb1ba5b5d9e28d1443479
 MISC metadata.xml 367 BLAKE2B b69aefd2ddda2f8e216d449de9ca13a5a8c473353b291bc5093ec2f6f3ac3346dc9fa25c85a64f15950813d9d6dfafd356a234c748436edb7639f37e95c71151 SHA512 1430924bf7430f4a409d6c3335a52b59567d5972440068e53e637d6c71486ef3e606ed9043184dfc168d731909e11c769042d2846e137312cd0ee0ce6f52e431
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.52.1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.52.1.ebuild
index fca0dd8c3081..711c5dddee13 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.52.1.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.52.1.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	test? ( cairo )
 "
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # virtual/pkgconfig needed at runtime, bug #505408
 # We force glib and g-i to be in sync by this way as explained in bug #518424
diff --git a/dev-libs/libebml/Manifest b/dev-libs/libebml/Manifest
index df90819a2742..4c2e2f8b9e67 100644
--- a/dev-libs/libebml/Manifest
+++ b/dev-libs/libebml/Manifest
@@ -1,5 +1,5 @@
 DIST libebml-1.3.4.tar.bz2 606205 BLAKE2B d13c33777e9afbc4d370e0b8e68fdcb42597fbd62f61197a4aa72e2b229ef06819efc0864f9783c87c90f8fcfa572b02d9b1767b57c31c6bc22a020b9eace94e SHA512 ebf5b71afe725e40ee6415463e51ca14810eecc2fef186caacd0269077f5febeb62623fd48674b21ea732f43a620d0c91603fa48d3f8d163284d1cf204642194
 DIST libebml-1.3.5.tar.xz 274184 BLAKE2B 954411bba6fc9ff3893a17a5147babff18352ac2c436523eecafac8e2921dd968e83f5672428f4f22e61cee97f7ce1a4f905781b4468cfd9f3ea7d8cd15d961f SHA512 cdf05015724919b19281bf99c562bb7e0bdf16990da274010f664ff316b6ce95ecbeaa1e479f03505281a7f45d5796aee6e7750a9e1c0596b630911d220dca24
 EBUILD libebml-1.3.4.ebuild 834 BLAKE2B 11fe2d8ebf1fa93a7fd9c866a9bd556d00ce6da0553be6e39b85c61e711a8277eb3f27e212c00609cb092f16e7fb403285ad29623f7e8941a7bc7c96443becd7 SHA512 edc8bf5f0137d8fb44335b0ceb64a66c98d2eb88bde15b93f7350fdc2b80077006c5e31c8ea567b0ef6050f08789a1566ccdeafb8f6ef98e3559d344f85047b4
-EBUILD libebml-1.3.5.ebuild 842 BLAKE2B 58d56eb6b6cc5fc6a2297c3886fc1ef9bc8d3d4aff0cb92c9f5ad4c8c74129f97561a040e5939d9a1bb9ec485197504dbd59ffffcf488713277307168bcd6a50 SHA512 a221aba1226cd9722d1edc205e9edd586125d8cfd6d795292b23a003c86c13a55930136a8bb539c07a43e0d408b167af8349d1d4c34e25e60a6a86a86f33ba85
+EBUILD libebml-1.3.5.ebuild 841 BLAKE2B 8225594201028e9bc9c8e2bd8b03d06f76e9cd66d6e4cf09bf4da555e33563d825e3940aaa6d8bbc70f8470e407964fef719a1afb0e85e5652d231643f37b69a SHA512 44b0b9e74cfdd0ad4ddde85c1a4ab380aaa2f40ddf9f251f5ee77268eb0cf2718872ca7bf0a615d95218acf4c56889d84917d76cd4fe66b4b24d3029560fa615
 MISC metadata.xml 316 BLAKE2B d9c2545fc8f21819157e2c492aaf9d0af904896735cfc7899efceb4f14d56aa205a946a28cad171dd2d5e19c9e6dd7fb380d29a788d7c231e3b7120de4f8ec65 SHA512 e134cb7e80fb4da27ef695d9ac26d13850df19cd37116fd069ab33cb91a380c322c8087d50c8040ea2a776903e9bc59fd825eb65593b0c3215c316a819f0fb22
diff --git a/dev-libs/libebml/libebml-1.3.5.ebuild b/dev-libs/libebml/libebml-1.3.5.ebuild
index 637d22891b84..ecc1cd998b6d 100644
--- a/dev-libs/libebml/libebml-1.3.5.ebuild
+++ b/dev-libs/libebml/libebml-1.3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://dl.matroska.org/downloads/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/4" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="debug static-libs"
 
 src_prepare() {
diff --git a/dev-libs/libgit2-glib/Manifest b/dev-libs/libgit2-glib/Manifest
index 17a24ba546b4..8b1d18bc6f44 100644
--- a/dev-libs/libgit2-glib/Manifest
+++ b/dev-libs/libgit2-glib/Manifest
@@ -3,5 +3,5 @@ DIST libgit2-glib-0.25.0.tar.xz 420500 BLAKE2B 7522417cd9f5249e108c39c3bef820f19
 DIST libgit2-glib-0.26.2.tar.xz 421956 BLAKE2B d38698f00d85b484d17078e78ad051a4c068b87df73fcf4d7b852dc6966628580cc4e5b3899a6edd5dc29fb47ef97ebe2c458992701b7642549f3e411d917dc5 SHA512 35fb3ec7a3757212f53cc884760f69725beff8462018b8e716fad389ba57d1acba99ece0fcd148ff40dc63e1fc7e7d566fe84759bd88d3a0ff9fdf970b0a5563
 EBUILD libgit2-glib-0.24.4.ebuild 1302 BLAKE2B 76dd86570dfbf545750175058f4bf04732791e3260e3cce80ee90519b93a1e18c4d48b9e0024bc6db08cbe0033e339fc548637626ba57306bc76f6150a6bf951 SHA512 168f01747fb30312bfd7f68b7dfc0d7a9ad35a6ce53a01d8a076af910a956c0add62bbaaace1bb48b6e816cdaae0ef82fdc1fc30ce21579eb638e2dc7536624f
 EBUILD libgit2-glib-0.25.0.ebuild 1265 BLAKE2B 3e1c7c29740795a9c495ddc27a12cd1226facb351975884507a1a39c364c7ef22d3a4e59439b95112ba11bcc4803bae0724aec80ef7b5c72dfa077b279c7935c SHA512 793aa9f92833a29e865826ef0267d40c0478e017102bcbff1233e49eddd6c7037874a916cf33722ac9ffce1573cabdf9e4abb3977d073fb48596ecc6f8d7e0f0
-EBUILD libgit2-glib-0.26.2.ebuild 1285 BLAKE2B ea14277646056ef9e7bcb3070be2d02092df48b8ff8cb5480ba3491f12d720d48c62b515a1f1d3a93b998286bb259faa4fc44230bd0d13af70edd0eff0d1bbb3 SHA512 1b28fa0cb24aadfb5da8ee6ceb2d27621fc52706d1f096d4d8e6963061a755a822fdf79930cb835b12001bf697c06600bb6bcb3b8247550295732df7a9640174
+EBUILD libgit2-glib-0.26.2.ebuild 1284 BLAKE2B e23614ab7917fa606ed6fb2ed37bc4c83dd68f3aa7791844f5596f0d27d0b791233c83c36a5999452c9d7cb9af388fb6f64ed95943eab9a38ce363541d87c4f2 SHA512 287fd70922a80f0950b3e968ac262820566b32abdf45ff7a6a83763cd02cb939acb1b9157cdaa21a2096ffb975d0680a2b26b565c14877d88faba5d5aa9a99f9
 MISC metadata.xml 431 BLAKE2B b9cd78ab798b15be24933f218649464c25a768b6fda11d29190a18d49d2d5b2011555ee047a6b6d14df94cde89dd6bd83a85cf525215ff84ccaa2c8b5d64bbc4 SHA512 7ec17f350ff55331f7c502957be11244f629201769446e9900660f1573872a4425036feee58a9c82f05ed16d7e36820719818b7cf29bff4c37ab944c4c19c970
diff --git a/dev-libs/libgit2-glib/libgit2-glib-0.26.2.ebuild b/dev-libs/libgit2-glib/libgit2-glib-0.26.2.ebuild
index 2a3ed8af6ae2..6af02cf13eac 100644
--- a/dev-libs/libgit2-glib/libgit2-glib-0.26.2.ebuild
+++ b/dev-libs/libgit2-glib/libgit2-glib-0.26.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 IUSE="python +ssh +vala"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index e2864c438573..5f8cc947fabc 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -3,6 +3,6 @@ DIST libgit2-0.25.1.tar.gz 4252130 BLAKE2B d5e6270ef8967d36094182eafe68673a07c66
 DIST libgit2-0.26.0.tar.gz 4697149 BLAKE2B 468e679bd7093004fb19a7947102d09bb90c653f3957615ce5468fe4c602f61804877072445a90447d83c70277529d02762cd3f35d0879708ea8355c44fe3456 SHA512 988c616c99637f2c1f80c498de34820296b78c0601669475eba9d194490cfd2047131987e63a799599277893e5741f9bcc226ffa594327356047ed563f07d346
 EBUILD libgit2-0.24.6.ebuild 1739 BLAKE2B 25f74413e54c17fc7655e2ceff27dbe20568c57bec92f096c0dbafd381bd683e840d883635a7774d1774fd4cef8dcb4c9eba94746355beeb64fd265fa69fd4a7 SHA512 ee096a2b92942dcf44c060e48de92adf454d2d83f3f068835d06e7a37f77aed0ba00f8c706c578e276425725bf522e2f596da6c493c69335dde63aff1233f27a
 EBUILD libgit2-0.25.1.ebuild 1741 BLAKE2B f2cb4c25cebbdb212d25d1538b40f3217d36fd2da4cbacbf8c370d0b460da2f6596f9343a0c5139823830a64852a30cb482e1fe80714bc2e17fc4789afe537f8 SHA512 d0ca8c242677e113287d8ec34e3fc39818390061d113e8e8d20762c817223659579e85f6ed31f6c35dafaf61ca6058b082f52eed063e52df9399da1bc70d170b
-EBUILD libgit2-0.26.0.ebuild 1750 BLAKE2B 1ae8ce701365c9ad24516656efaa2dc3a5cd6895f4435d002da5cc6535f82cf0084e641b0ad8ebd1faf7c3a711ec6710d232fc4dc716e6b292dc5f49e0a6a055 SHA512 fbdd070e25dbecf026cfd0106bf6253a29e75456bd2f9d75493c1013871e533da9bda26aade344dfc4e9dcf43657376523cb5e8e079fd49c5f26961465bf6e39
+EBUILD libgit2-0.26.0.ebuild 1749 BLAKE2B b66057b11dfa04eb676bf0ae6a7a8f4aadab4b6c526ffa795b37df6528e50b61731297171c684600437ee9961426d6e35e11c131ed909d20bbeadfa7080b8fd6 SHA512 40746557a1c6489cc863cf27c7256fe1e3e37e0dcd3b9d6e1307525daf4ea2ba96e1b8a383e7c5f02b3e1f2fc641a0901349ad2941674fd49a13049f283b5505
 EBUILD libgit2-9999.ebuild 1750 BLAKE2B 1ae8ce701365c9ad24516656efaa2dc3a5cd6895f4435d002da5cc6535f82cf0084e641b0ad8ebd1faf7c3a711ec6710d232fc4dc716e6b292dc5f49e0a6a055 SHA512 fbdd070e25dbecf026cfd0106bf6253a29e75456bd2f9d75493c1013871e533da9bda26aade344dfc4e9dcf43657376523cb5e8e079fd49c5f26961465bf6e39
 MISC metadata.xml 915 BLAKE2B 1882bdcfaee50de784b4aebeaaad4f04ff3f2385721b354ed685f3353ea92b83344559905cff5a9adc2a316b684079b64d9930f14081c257c8066dd7d4c89a33 SHA512 5b6f2239f656f490b0961788f8047662fc00ee10bc5ad9ee3a326313285cd29514c1eda54d17b878abef3d73034f997aa814a64ff496dcbe9f05ef4708825c35
diff --git a/dev-libs/libgit2/libgit2-0.26.0.ebuild b/dev-libs/libgit2/libgit2-0.26.0.ebuild
index 899540f73af0..91ef9bb94123 100644
--- a/dev-libs/libgit2/libgit2-0.26.0.ebuild
+++ b/dev-libs/libgit2/libgit2-0.26.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~ppc-macos"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86 ~ppc-macos"
 fi
 
 DESCRIPTION="A linkable library for Git"
diff --git a/dev-libs/libgweather/Manifest b/dev-libs/libgweather/Manifest
index 88f2b15c48c1..5074b9d998f8 100644
--- a/dev-libs/libgweather/Manifest
+++ b/dev-libs/libgweather/Manifest
@@ -1,5 +1,5 @@
 DIST libgweather-3.20.4.tar.xz 3342220 BLAKE2B e9f58b508e67eae0f76849b37cc7ff955a512852d911dfb473b1f28f14112ec21bbbc7910efd39d3752a473774b6fc04fa5de135903882883e3aeb7a0edf5bbb SHA512 65b28a2bf8e9e7d8b02972d1d2f701ac8668b1e91154ba7ee94e9a08bb98d28ce44e88842e2fe78a13ce9f942d79fd2950d8de266dae28bb262c5fc11328ada9
 DIST libgweather-3.24.1.tar.xz 3350680 BLAKE2B 9265cb3c280446d5f380f62b60efb5578a7a401e3291d12e3824d8e7eacc582761226b0aaebb0439318bd48b9ad5429a1b6d89eb0220a82650c43be8aa337e2d SHA512 564464d7a18a8e0320871ea418b1163163941c950c5acea5ee65a087e44c4d81e019e2e3e4cb6751989f823cbb7c5691713d3dcef72aeaf6ff264e61b6f7b4b4
 EBUILD libgweather-3.20.4.ebuild 1304 BLAKE2B 39cbd9270ef604a4c52a70e76374a004a92b952a7ac91463d015228ba8123f382cad9ca71d80d747345ee38ea228498a2aaf94103aa28d131672bc3882c235a0 SHA512 ab933db3ab16ad69d22d2ac2cad259dfc1ea51d9c9c7c87d9ab3eb49a88bfd13eaac9f895752b63de766d1301b1b67d066c1812ee64a25703e0eb8528a99d403
-EBUILD libgweather-3.24.1.ebuild 1305 BLAKE2B bc1cae75e7b62e9e2e160507b1ae5fe9fa4f981ae5261dbced6668069f0d3d252c63f92ef5c386ae5cd690e8b7c9fbab709b0104c026b457e1d880cf4e497c40 SHA512 6c3a37502479305bb375be8f89b2f7b0e08e56a223f048a7e1dba968465dedaf1ace7949a56571679560a467ed49c350e3aa1d6d097528abee98eeb269eacd10
+EBUILD libgweather-3.24.1.ebuild 1304 BLAKE2B e7ef00a8d93612dffc721875d07ec588f21a70a41b55dd6684106300d9e73a838d39a4670d9d096879e026ca4357aa6726578b50acba76a0fb903bc117408723 SHA512 cc354dae7c6e20c66781a972dd224bc65404ee144ac4133c449a34e9ea68e6c89fc9182492ef9d66f7c72ed3bd6c56223274abe4e315fbbb6af70aadefd5a319
 MISC metadata.xml 349 BLAKE2B 5467cd4402c0ec93c36f4cde26afe4ff2cf88d31227d8fbd22cabf50b4521c4634dba856a531da5f0054ad208daa8b178c9fad63b72dea6bbdeac13fa2f67bff SHA512 56d547e8cc66f19d606374f64c25546a687f3d199b083e406b871231a53362c0fdbcdf0a1c4f41810a2eb719e1bbab1c1589d7abeeb5630e1e04c20748b0df5f
diff --git a/dev-libs/libgweather/libgweather-3.24.1.ebuild b/dev-libs/libgweather/libgweather-3.24.1.ebuild
index dafeb739d3fe..30745aa57e2c 100644
--- a/dev-libs/libgweather/libgweather-3.24.1.ebuild
+++ b/dev-libs/libgweather/libgweather-3.24.1.ebuild
@@ -15,7 +15,7 @@ SLOT="2/3-6" # subslot = 3-(libgweather-3 soname suffix)
 IUSE="glade +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 
 COMMON_DEPEND="
 	>=x11-libs/gtk+-3.13.5:3[introspection?]
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 6d9afd22b8b6..bc166e09de21 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -3,5 +3,5 @@ DIST libinput-1.8.3.tar.xz 941832 BLAKE2B cf6464d68387cca23d0f70eaceeec8b453c53f
 DIST libinput-1.9.4.tar.xz 472636 BLAKE2B 692a23047cb0b54d14763b34ce3ce1414101d0097dce10d237ec32a67f29c31cbf2928681084f7561e072e555c932f0e3bc54cfb0ecbcdd0d823426806e357b6 SHA512 302f9497ea9ffb2163c643e9ca2f0a773ea141f6fe0a3aa3d8e86eb11a5d11e75d858b1e679ebfd3f913c645beac059cfd356b37c4ea17a8853068f79a740a4b
 EBUILD libinput-1.7.3.ebuild 1535 BLAKE2B 6d99e610dda382651bed647c29ee8073d14879ec2fa83f22e724ff294018cecc78f16799802974aac29153924c15f922d42d188e9199eaee60a81282be840d0d SHA512 00505995c95da87e936d1473548efb1d52fd1a593e659aec308e38f937fa391a3a092f2b7e2c1c564e9be9ce506cc021f1c3f590bc5bc39623dabd1e6758187c
 EBUILD libinput-1.8.3.ebuild 1544 BLAKE2B d2fe752951be5a015ec92f907c7cf5ac2739f35c51bafcf26e2381f3d22e8a14a6bc21c3697f02e0a0684c27dc1cd4379b5390d1df9b8a083b7405f7b31b2c5c SHA512 a0a3a0aaab446d72eda57a04d8af10d5d35f54f4c47e6ee5f9c209fac3682d3d83392ef546255026b5ce774d76d33d06bf940c55da4ade4fe33ae10e9dc0968a
-EBUILD libinput-1.9.4.ebuild 1442 BLAKE2B 45678345a0ee58962f78dfd9fde7a46228a5f7a6674518907ded13e05efb8e13d82048cdf57c54ba32c8c1fcbce7b8ea4a00de4b0255ebad7227dbb8d344a511 SHA512 592c7f374a7adb853b24ecb502b0f6b83c3f446e4a9217064686f855988536404cfb4d1a47a78e0e4326a1aad318bb0bb6cc54510d6bca2fa911659f3a4eb8b4
+EBUILD libinput-1.9.4.ebuild 1441 BLAKE2B 8a836146a0e384130f4f6584064b68bbc92a72e96ce0f952287278510c3b227b2cc8b1539b274e662d62107a43ff5797493091ae94a74567acf26c0e9599d549 SHA512 a7d4aa9e144f2c08e201f01436e9bbd8f9eaf96d88b614117a79e96f71316b28b054871b4bea81d77151f410c0c115c4311151c1dff712d2e1fb37b2d010125d
 MISC metadata.xml 340 BLAKE2B b555474c5acc545a4a81d86b590620ed4eab35e091d012d740f3d0f08add99bc0b5d09db251c03e1191df719135c92251d98849944fe41f76336526a96f9ae7a SHA512 04b1dc52c0db95a09aeb061ea0bc579f83ad5971dcdb20cf61bb08ed37bf56999f784db75e6ec2b6cd47e57976c7e0651ffb040b052dd0f5ac8e1a679bee8c09
diff --git a/dev-libs/libinput/libinput-1.9.4.ebuild b/dev-libs/libinput/libinput-1.9.4.ebuild
index 06fc074c0486..dd988be4dd9d 100644
--- a/dev-libs/libinput/libinput-1.9.4.ebuild
+++ b/dev-libs/libinput/libinput-1.9.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0/10"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
 IUSE="doc input_devices_wacom test"
 # Tests require write access to udev rules directory which is a no-no for live system.
 # Other tests are just about logs, exported symbols and autotest of the test library.
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 4618f58e4da6..e6476b15524f 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -24,5 +24,5 @@ DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862f
 DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe
 EBUILD libxml2-2.9.4-r1.ebuild 6633 BLAKE2B 50f83c85bfafdbb20cd5831ad5152b2aaebcbdd8151a0aa796f6ca533f77dcb0ca3b892133ad111e9f9e55113dd47be6ea081220c10632968a186a5ff3bb4a9d SHA512 a125ae03d58a0ca08c4493e22b50d337fcb5ff9c015d6051adb3aac78d71e2bdf6e1bc0e2138675365af224dd147a6de1c88880da42f715ae6c04f913edf5a9b
 EBUILD libxml2-2.9.6.ebuild 6366 BLAKE2B 30e0fc36c5ef4383cc69af26fdd8a087e058485cae8e51d4fa66ef01b0b0a635137710931396121c7dca8141e272a5dda8f5328023b4aa74f7b76b40f2348e45 SHA512 01e661ff5ce990d43f45d5ed1b0d5090f1de474bc009daa00bd43c8487b3348016a0e81fbd14f02cdcdaa395199aef9aba335682edb2ac6e03f07c3f085201c4
-EBUILD libxml2-2.9.7.ebuild 6364 BLAKE2B 0c1bcf8c26f9b865a968c98297c25cb6200727ef997444e7811eb7478dd290d6e0ecbd2dcd16628b18348ab1d8ebd277700970826869d71bba1d289b31fe47ec SHA512 9723a5d83bab7fd76a4b825ef462463f151b97f6607b7145c76e4e010c5bb546e950b3a84ccc3b70e778fa91333d9a10f90be0049f9f2ff8527d4b47e90c3306
+EBUILD libxml2-2.9.7.ebuild 6363 BLAKE2B 0b75f81ed6e595d79a9ac3537f7821222836f3e9eaf9232158a2ca73330722f6987b40324ca3f07ad542794f1fe98166205c9e7fa10e915bdb14da720772810b SHA512 115d92a551dd19bcdeea2dcb002a6cdf779d0b5418b30e2e06223a55911c264b6a1045d550edcfd9ffafb8d0db08fcde50f326dcf133741ffe100c8ee15aa11a
 MISC metadata.xml 347 BLAKE2B 0593bb4362c2ed60dbe07c41872832992f9b993a4c155cddf82ce362f1ddd4c8eb9fa00e5b4457e9a24b22b697d92ef55dde231918fa0e6bdac0a736fce37f66 SHA512 6a094316da6ea1fb160b539788923a2dc01d7ef6304f924f628a438714663a51c8d1adaa97800516a64055a8adf6999ae2899b5a976db680967dcc298e22444d
diff --git a/dev-libs/libxml2/libxml2-2.9.7.ebuild b/dev-libs/libxml2/libxml2-2.9.7.ebuild
index d6f152f66952..4f52a314ab52 100644
--- a/dev-libs/libxml2/libxml2-2.9.7.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.7.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.xmlsoft.org/"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug examples icu ipv6 lzma python readline static-libs test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index 8d6845b29e51..1ddc28b15aef 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -1,5 +1,5 @@
 DIST vala-0.34.9.tar.xz 2783952 BLAKE2B e90728075ac546e8abc125886182abd5fc357be5138bfea1ed058f41bf07968e55e032469cc068cefdb6a4d53f1c029ca7e728c57b00f6b9845e32c4410e8258 SHA512 8128dfbb50d0db2317feb4a358310de972ecb6f4dccaceb4d55cf3a024f4d83422e3137c92238e1a0a0b4766367ad307909a1310445017c71944ac30fc68d01f
 DIST vala-0.36.7.tar.xz 2854668 BLAKE2B 2fcb528b26a56ee9f9d362ec1891c873ee26580132c052554a3d021fea32c0cee6dc6e8c6419f88798f5066a70d54084757893b2d46e3b286b441a51a4169c92 SHA512 7a6daac5be72240ae998b2c26e240a8b6bbc44c8bb6a036357fc0419cd7b40e14ea76c8125eb49a8d252627425613512410ba7868eb579b13d299e2ff0f4082b
 EBUILD vala-common-0.34.9.ebuild 2533 BLAKE2B 6cd8150927a49de7daa2d3a6394b72ad7e06b33a1459eea21b52e1fb751b7095d5b731930af9d22647e5767bebd5d028b3aadbdb9d6c6e097999c1c17e566907 SHA512 798a4ab1f0d5b22ee2a3cd259e89a52ef6b122bb9605f1cbcf346f8aba5bdfad4c49d9ac1c19127e3244b011ad914173123a3418121a7c2ece32c8970169c9de
-EBUILD vala-common-0.36.7.ebuild 2540 BLAKE2B d9ed2c1cf9e64306dcf0b097d2af345c409269c0b6ed4be1d7650b9ed2ff3e4a9fdb570ac076d2172e734d0d85f170617bed79ac0fdf9c6a7bd1b9470532859a SHA512 616f29815e98d40af6ca9b88683d151eb861cd7ea3f1a13294bb5efdd589bcf111bda81cb6c5b26d1e4ba40abc5d2a03857868dac0bba9505dcde9266da41b9f
+EBUILD vala-common-0.36.7.ebuild 2539 BLAKE2B 5141b025143a19c4f746c3465846fff98da80f20a04fc3334ad32b8b055fab458ec76c75041831ba22f82597abe8237a72f17b3fab4c2ddae0f08bfe0eefffe3 SHA512 bbf2bdef6c1d2d7a1a25b2a66234f08dca17f5f917248ee57227d896dad30f03a78f7048fb4d029b9b9586130002b35147eb01e8bf31400965af47940175e6b8
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/vala-common/vala-common-0.36.7.ebuild b/dev-libs/vala-common/vala-common-0.36.7.ebuild
index e2caedfcaba6..bbdbfd335d97 100644
--- a/dev-libs/vala-common/vala-common-0.36.7.ebuild
+++ b/dev-libs/vala-common/vala-common-0.36.7.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 # Previously ${PN} was part of dev-lang/vala
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 8b6c85dd508a..d14411fb534d 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/PEAR-Exception/Manifest b/dev-php/PEAR-Exception/Manifest
index 88e0cab5a811..3f3a33e01246 100644
--- a/dev-php/PEAR-Exception/Manifest
+++ b/dev-php/PEAR-Exception/Manifest
@@ -1,3 +1,3 @@
 DIST PEAR_Exception-1.0.0.tgz 5270 BLAKE2B f6f6874083fcef2453e1d07e1ee3e900e4f7d18eca8e9a9eda9891492dd3fc1e31eb13944031e82044f976f1070463a3b099a8223d2dabb2da109bb123997f5a SHA512 f2078186fdad6c6ca59ac462a24f7f9689bea08d30f786acb7779d52cd433e490c752ba0a263067d869151b0c051cded327cb3477a039c5de68c854bff002b58
-EBUILD PEAR-Exception-1.0.0.ebuild 651 BLAKE2B f1ff0892ce6a3742f475490e4ba28777b88c5052bfbd2bff1c6930be12fc10b60e861f6ac25c5e0380132c3c93524e4d02188234a2c22fd00b18268cb3569088 SHA512 e60fa118d14002d9553fc0f0e1fc305c09416381f30c008bbec1745dcc62e967475c20213aa04e007760964b2efbf98daa73c3a0ea1c27bc4ef04fee3c6566d6
+EBUILD PEAR-Exception-1.0.0.ebuild 654 BLAKE2B b037951a5d5fbfd25883481b9832b89b6502886287c5b014e95af1f73f5946f4d0a38168e2b9d5e45399a3f16eb975e65bf2574b9e03772ae24a9cb22fd85326 SHA512 4471169353b1dc3ac45b513a5e268c4525d9ec5ebecda2d21e1a9434faef9368f705edbe41c1ee73e74b22f375f09574995f4a390f8422fa2b50b71fd56ef514
 MISC metadata.xml 387 BLAKE2B 889a6e870f53bbaf7ea5d86dbddd30c85bbab181886d5eed8b8d05d4b744ed5b1152773a158f7ace3b3bf037d0dc6d5631d5e951a12f4c7a16d05a66156513ba SHA512 c3c5a2c8f8f1696240e9631e2e29d5f0780c856ad92067b24bafdf2325170b24177dd2b0ef6dba4582ec517e64f98019e9c4b823a045c9f65dd5606f0bc29e62
diff --git a/dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild b/dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild
index 6c3b38353d20..1a4d317b5dde 100644
--- a/dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild
+++ b/dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://pear.php.net/package/${MY_PN}"
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="test"
 RDEPEND="dev-lang/php:*
 	!<=dev-php/PEAR-PEAR-1.10.3-r1"
diff --git a/dev-php/PEAR-PEAR/Manifest b/dev-php/PEAR-PEAR/Manifest
index 90a35776ecb2..e83c5ee539c8 100644
--- a/dev-php/PEAR-PEAR/Manifest
+++ b/dev-php/PEAR-PEAR/Manifest
@@ -1,7 +1,5 @@
 AUX gentoo-libtool-mismatch-fix-v2.patch 510 BLAKE2B 59571998b848501efcdd4c304dc48e4950560f2f4d08add530d078787519b1c33dd511e92914208342011bd727e0fca12974b92a46b6a6bc9a66cbca061c9495 SHA512 03848aa6447c2969715e872481e17f7a6dbe7df9e42a13305fdbcfaf09505de40ed6d91c9c93f11a944adc94389472f04eac2b656f08dbdd9d1c3a1d07946ff4
 AUX pear.conf-r2 379 BLAKE2B fe57574f4e4ce095f7ddd9bc26606181a86e67f6c8e6dad57a713e187175b711d50d90c346759d430c32da0a740e7f79cffc7ccedc3b719d04dcd1792a9309f6 SHA512 81e4c95ccfd1a50d30d6e9db90fa099f3dd098bf4fa2c023f5369d0e96a197da91d2572ff3785bcfc83dba82abeca3932431083b5aa2aed155336697764666be
-DIST PEAR-1.10.1.tgz 291167 BLAKE2B 27bb792db46e560fc8ba7daccc4a8a4d6580193bcaecab11548e10cadfa66a56242b125594b88d58a86974c2d82330d4cdd6ede491f3dbc2040efb3c646745d3 SHA512 df5f09a92d211a09dae147af474399171aed46e0536c091468b73b43ba4acdbdbf7b5cbdd17ef48b7d36d7b9dd23187dc6c75733731c267768d49c89698b0ef2
 DIST PEAR-1.10.5.tgz 291151 BLAKE2B b9095e6e488348917846693769f075c898271f2b65fbc69781247e8f46bf41afa4dfeb98d66c1aabce884e24c91bda50af3766745c3b8b5101aa54595e53c796 SHA512 c310fa8ec72ba201313dc03953ec1eba82daa137b27eac880fd5388dce72d38e6aa40737da43c3ad41db4df0d6717c7d77cf477d64b29245854ae95d2a94c364
-EBUILD PEAR-PEAR-1.10.1-r1.ebuild 5088 BLAKE2B 4ad309d5296c0456ff1ea7ac531543bc98f6867e2ed5fbded5fcbbfb03ec82f4eae6639ad2be55731ce8803f2b6e44a399da873b979fce22cb7632975f7356db SHA512 a709a4874155a1095a390e159d77e797fc0cdca1b59929851a07e752d32648a27d36abc755c49a23fc6cc349dc0ef1a3f0012ba67c92b69c8c3c56b5394db22f
-EBUILD PEAR-PEAR-1.10.5.ebuild 5887 BLAKE2B fb0d7fe43b72121e0a3e30cb2879d20abac0e0eb43c8384e187e82f0dc244c07e7aefe255704afd88d7f4e927bd2ab995d8837457c14585af73cb872f7204a3b SHA512 5a0643d8a0cc37d3ecfd0c1c2637e60ee3df6e6efeca3be3b53aa8998260e15cecae14678b13e59fe47ede3e8587f6141d8b212ff505138e53154f0242ca6b36
+EBUILD PEAR-PEAR-1.10.5.ebuild 5890 BLAKE2B 4e34fc9a6e0069e9589c32fe17b7bafc334dbd1db76f02fdb085511c4542e7fe7f5dd4cb10dd826401c9ae9de059e534f25693f1168cd969f5d14ff736c6bf0d SHA512 75f0d4d550c573b1fc184128f401357837f120eb7cab088b78aa40c46e89035ea84ac85a0b39b8518e6f000fa93de4508fd3e82aa061a6f54d47ddf19fe01dea
 MISC metadata.xml 306 BLAKE2B fdddffeab9925e2296436f14f6224e0cbdbe2d386e863de68a555cf8b1e5434409af998a4b73c9380d2118db0a021401b23034895038e31559e0de0919a8c597 SHA512 2e46d7a6fcadfed2ff7be17a5f0a82b5cbf6184b50384f868a6ad8821746badfe126279ef9c114ef9d9a42374931193dba4b84483d437797636b95e6e97247fa
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.1-r1.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.1-r1.ebuild
deleted file mode 100644
index c31bf073b186..000000000000
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.1-r1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="${PN/PEAR-/}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="PEAR Base System"
-HOMEPAGE="http://pear.php.net/package/${MY_PN}"
-SRC_URI="http://pear.php.net/get/${MY_P}.tgz"
-LICENSE="MIT"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-lang/php:*[cli,xml,zlib]
-	>=dev-php/PEAR-Archive_Tar-1.4.0
-	>=dev-php/PEAR-Console_Getopt-1.4.1
-	>=dev-php/PEAR-Structures_Graph-1.1.0
-	>=dev-php/PEAR-XML_Util-1.3.0"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/gentoo-libtool-mismatch-fix-v2.patch" )
-
-pkg_setup() {
-	[[ -z "${PEAR_CACHEDIR}" ]] && PEAR_CACHEDIR="${EPREFIX}/var/cache/pear"
-	[[ -z "${PEAR_DOWNLOADDIR}" ]] && PEAR_DOWNLOADDIR="${EPREFIX}/var/tmp/pear"
-	[[ -z "${PEAR_TEMPDIR}" ]] && PEAR_TEMPDIR="${EPREFIX}/tmp"
-
-	elog
-	elog "cache_dir is set to: ${PEAR_CACHEDIR}"
-	elog "download_dir is set to: ${PEAR_DOWNLOADDIR}"
-	elog "temp_dir is set to: ${PEAR_TEMPDIR}"
-	elog
-	elog "If you want to change the above values, you need to set"
-	elog "PEAR_CACHEDIR, PEAR_DOWNLOADDIR and PEAR_TEMPDIR variable(s)"
-	elog "accordingly in /etc/portage/make.conf and re-emerge ${PN}."
-	elog
-}
-
-src_install() {
-	insinto /usr/share/php
-	doins -r PEAR/
-	doins -r OS/
-	doins PEAR.php System.php
-	doins scripts/pearcmd.php
-	doins scripts/peclcmd.php
-
-	newbin scripts/pear.sh pear
-	newbin scripts/peardev.sh peardev
-	newbin scripts/pecl.sh pecl
-
-	# adjust some scripts for current version
-	for i in pearcmd.php peclcmd.php ; do
-		sed "s:@pear_version@:${PEAR}:g" -i "${D}/usr/share/php/${i}" \
-			|| die "failed to sed pear_version"
-	done
-
-	for i in pear peardev pecl ; do
-		sed "s:@bin_dir@:${EPREFIX}/usr/bin:g" -i "${D}/usr/bin/${i}" \
-			|| die "failed to sed @bin_dir@ in ${i}"
-		sed "s:@php_dir@:${EPREFIX}/usr/share/php:g" -i "${D}/usr/bin/${i}" \
-			|| die "failed to sed @php_dir@ in ${i}"
-	done
-
-	sed "s:-d output_buffering=1:-d output_buffering=1 -d memory_limit=32M:g" \
-		-i "${D}/usr/bin/pear" \
-		|| die "failed to set PHP ini values in pear executable"
-
-	sed "s:@package_version@:${PEAR}:g" \
-		-i "${D}/usr/share/php/PEAR/Command/Package.php" \
-		|| die "failed to sed @package_version@"
-
-	sed "s:@PEAR-VER@:${PEAR}:g" \
-		-i "${D}/usr/share/php/PEAR/Dependency2.php" \
-		|| die "failed to sed @PEAR-VER@ in Dependency2.php"
-
-	sed "s:@PEAR-VER@:${PEAR}:g" \
-		-i "${D}/usr/share/php/PEAR/PackageFile/Parser/v1.php" \
-		|| die "failed to sed @PEAR-VER@ in v1.php"
-
-	sed "s:@PEAR-VER@:${PEAR}:g" \
-		-i "${D}/usr/share/php/PEAR/PackageFile/Parser/v2.php" \
-		|| die "failed to sed @PEAR-VER@ in v2.php"
-
-	# finalize install
-	insinto /etc
-	newins "${FILESDIR}"/pear.conf-r2 pear.conf
-
-	sed "s|s:PHPCLILEN:\"PHPCLI\"|s:${#PHPCLI}:\"${PHPCLI}\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed PHPCLILEN in pear.conf"
-
-	sed "s|s:CACHEDIRLEN:\"CACHEDIR\"|s:${#PEAR_CACHEDIR}:\"${PEAR_CACHEDIR}\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed CACHEDIRLEN in pear.conf"
-
-	sed "s|s:DOWNLOADDIRLEN:\"DOWNLOADDIR\"|s:${#PEAR_DOWNLOADDIR}:\"${PEAR_DOWNLOADDIR}\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed DOWNLOADDIRLEN in pear.conf"
-
-	sed "s|s:TEMPDIRLEN:\"TEMPDIR\"|s:${#PEAR_TEMPDIR}:\"${PEAR_TEMPDIR}\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed TEMPDIRLEN in pear.conf"
-
-	# Change the paths for eprefix!
-	sed "s|s:19:\"/usr/share/php/docs\"|s:$(( ${#EPREFIX}+19 )):\"${EPREFIX}/usr/share/php/docs\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed the docs path (prefix) in pear.conf"
-
-	sed "s|s:19:\"/usr/share/php/data\"|s:$(( ${#EPREFIX}+19 )):\"${EPREFIX}/usr/share/php/data\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed the data path (prefix) in pear.conf"
-
-	sed "s|s:20:\"/usr/share/php/tests\"|s:$(( ${#EPREFIX}+20 )):\"${EPREFIX}/usr/share/php/tests\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed the tests path (prefix) in pear.conf"
-
-	sed "s|s:14:\"/usr/share/php\"|s:$(( ${#EPREFIX}+14 )):\"${EPREFIX}/usr/share/php\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed the PHP include path (prefix) in pear.conf"
-
-	sed "s|s:8:\"/usr/bin\"|s:$(( ${#EPREFIX}+8 )):\"${EPREFIX}/usr/bin\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed the bin path (prefix) in pear.conf"
-
-	[[ "${PEAR_TEMPDIR}" != "/tmp" ]] && keepdir "${PEAR_TEMPDIR#${EPREFIX}}"
-	keepdir "${PEAR_CACHEDIR#${EPREFIX}}"
-	diropts -m1777
-	keepdir "${PEAR_DOWNLOADDIR#${EPREFIX}}"
-}
-
-pkg_postinst() {
-	pear clear-cache || die "failed to clear PEAR cache"
-
-	# Update PEAR/PECL channels as needed, add new ones to the list if needed
-	elog "Updating PEAR/PECL channels"
-	local pearchans="pear.php.net pecl.php.net pear.phing.info "
-	pearchans+="pear.symfony-project.com"
-
-	for chan in ${pearchans} ; do
-		# The first command may fail if, for example, the channels have
-		# already been initialized.
-		pear channel-discover ${chan}
-		pear channel-update ${chan} || die "failed to update channels: ${chan}"
-	done
-}
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.5.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.5.ebuild
index 100194043803..d22b143ae103 100644
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.5.ebuild
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.5.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="PEAR Base System"
 HOMEPAGE="http://pear.php.net/package/${MY_PN}"
 SRC_URI="http://pear.php.net/get/${MY_P}.tgz"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index a31ed05b184f..a6fa802ac536 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/compizconfig-python/Manifest b/dev-python/compizconfig-python/Manifest
deleted file mode 100644
index 25e3c9992b0f..000000000000
--- a/dev-python/compizconfig-python/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST compizconfig-python-0.8.4.tar.bz2 269812 BLAKE2B 3e3b9b6d3c794bb04106a3363f6252b4adfd8085e3beb6ddab166e1dfd366ee7a6e0c3b110599f6b1e521e66273773210c04e54498be479ac4bc715bd529da15 SHA512 3cd20014a7d0b186c9659ce104576d8e08e9e9f1f60bed4b7f4097c12ca4c49392621d2328abb50017c7d9f86af5b43675468b1cd4b5d128e23c24371c4af9ef
-EBUILD compizconfig-python-0.8.4-r5.ebuild 884 BLAKE2B 7f962527166b311105621b19787d75b930104fd5bc61fd100640f3b14698875ac41ef042cd91cc9ca1e480c7c8025049f354ec2484cc52079b3f1a0e9e2b8fbc SHA512 accbdb988081170a31608d41e754ac2c7937018d5836e49a222546b952b572956163316f4eacfa313f9160c8e8084aec3dc3f9ee6008eb80ca1b40f082022181
-MISC metadata.xml 250 BLAKE2B d2c79c7eb788faa71a101f477664cbd7799e0b156eb854492de6e2f50416fa19cbfd70344b4f2351fe0afa3fa816e8ef7452aeaa4e8cf49c0a608ccc0c2b2ea1 SHA512 2cd5f332f8267721b0daa24b3a1fdab910067f557f4c75b3daff53feae330215b28f7b3763b7c14821c058e72d9c914ab4a069b7f16c2309a07dccf52ef80d76
diff --git a/dev-python/compizconfig-python/compizconfig-python-0.8.4-r5.ebuild b/dev-python/compizconfig-python/compizconfig-python-0.8.4-r5.ebuild
deleted file mode 100644
index bb7fa86eca1d..000000000000
--- a/dev-python/compizconfig-python/compizconfig-python-0.8.4-r5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils autotools-utils python-r1
-
-DESCRIPTION="Compizconfig Python Bindings"
-HOMEPAGE="http://www.compiz.org/"
-SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.6
-	>=x11-libs/libcompizconfig-${PV}"
-
-DEPEND="${RDEPEND}
-	dev-python/pyrex[${PYTHON_USEDEP}]
-	virtual/pkgconfig"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_configure() {
-	local myeconfargs=(
-		--enable-fast-install
-		--disable-static
-	)
-	python_foreach_impl autotools-utils_src_configure
-}
-
-src_compile() {
-	python_foreach_impl autotools-utils_src_compile
-}
-
-src_install() {
-	python_foreach_impl autotools-utils_src_install
-	prune_libtool_files --modules
-}
diff --git a/dev-python/compizconfig-python/metadata.xml b/dev-python/compizconfig-python/metadata.xml
deleted file mode 100644
index e24b832e3550..000000000000
--- a/dev-python/compizconfig-python/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">Python bindings for libcompizconfig.</longdescription>
-</pkgmetadata>
diff --git a/dev-python/dbusmock/Manifest b/dev-python/dbusmock/Manifest
index 0cc30b1987dd..12ed764c2c40 100644
--- a/dev-python/dbusmock/Manifest
+++ b/dev-python/dbusmock/Manifest
@@ -4,5 +4,5 @@ AUX 0.16.9-replace-dbus-launch.patch 2851 BLAKE2B ddbfe3ffb7a5b55af448e5312340a8
 DIST dbusmock-0.16.7.tar.gz 70544 BLAKE2B 4b7bcf4207362b61cdabce7752db07e76f8ab1e2ac96d1c9415a143ba6e8f8cfd51ff1bb0d051d58df5f7fddd96c6b871c10e377f975984cd83f2e2f9c7efdac SHA512 749728b966b1e067a0a8bd61ee64c1c7ff22751ccb48e15096d041e78c6e779d787160ee191e90daa3177b92c0ee45c66af74b2dd4e4bcb570892b431ec13467
 DIST dbusmock-0.16.9.tar.gz 71014 BLAKE2B d1c0853cfd06848f1d10afdd8de764814054a44080b44e1ac2ef3a1658a538f1e4c7f5936d65658c16da33ccbc2e94f35d2746f200fc6791f645e1eccc55f6fd SHA512 3aa91f6ede054ed3d3a69f68f3886094e881d266a8f09c7d08a34d10b080a77facde8aae01e75232472c2e643574fe897dae2c3588f5ad9ecf4ec4e67f404f54
 EBUILD dbusmock-0.16.7.ebuild 1009 BLAKE2B dc8525d7f369fc1a3b06f308c2721a3c121b71379533e9b990098da9ff4339f528f9b728c0e20ddb600b6a07b1d0fed82b33004eb9e01bd26b48ddfd4415409c SHA512 2ea59870f377a3c5f0c4cd126ead42275356a576f88e7512ba045dc2258fb37d22bb0df8dd0be0f7d62316e919c31661cde9406a1df56d30b2d43ee8771f90ae
-EBUILD dbusmock-0.16.9.ebuild 1067 BLAKE2B ab702e7bb246203750ef74a517af4bf769037cb5305ad4cf0cee3520c47cede97ddbbd2e0d78aef25dc8726a5c423abe77a5cf3b3e888f37081ad1ad60ca8b1c SHA512 e6ac62ca36c70d816cf1f0e6bb00c9a965cccbbe519e137636fc23d9571be7c29d67a1fa257a516229ce2d6cb4e6f0dc3a7cad90cd60071f4837ac790304a9ac
+EBUILD dbusmock-0.16.9.ebuild 1066 BLAKE2B bc2813677add4c33c6590393cb5654f21c9dc6dace277ccaee32713cd59a442e9c1afe578921a72b64430a7d07bdb80f07403aba81821b20485c0e599c365463 SHA512 cb190d5a95fa4cf872e0db606839dfcac7044440571ffa41dd952af4b67b9a469228750c9cd86a8aed38a1cc97c1aa4590f4b882e6358b85f97f704cc27885eb
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/dev-python/dbusmock/dbusmock-0.16.9.ebuild b/dev-python/dbusmock/dbusmock-0.16.9.ebuild
index 38eab4f4ee8b..3d453c5c560d 100644
--- a/dev-python/dbusmock/dbusmock-0.16.9.ebuild
+++ b/dev-python/dbusmock/dbusmock-0.16.9.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pyatspi/Manifest b/dev-python/pyatspi/Manifest
index 12246b093e7c..25cdb158b78f 100644
--- a/dev-python/pyatspi/Manifest
+++ b/dev-python/pyatspi/Manifest
@@ -2,5 +2,5 @@ AUX pyatspi-2.6.0-examples-python3.patch 791 BLAKE2B ad8130ef64605915b3124dd268b
 DIST pyatspi-2.20.3.tar.xz 297368 BLAKE2B 47b82bc5fffd513eb9c9be608172df2b434c6696567a7fb9b78393e5e591a88ffedb8d398bc8fc537ec0d8d1e693ce06e9b9f45bd89e3a5465e18ba09fe83224 SHA512 87f9dccb0be1b85ed850abaf28270c2fd5e52a43dcd94e452f650d6aea8a52bb59d9b9e9d4312bd0fe88d549812c1ddbbceb05955687134613ecd6e1b7af4ace
 DIST pyatspi-2.24.0.tar.xz 298228 BLAKE2B a1c989df5431a9fdf0b35c5fa75a12b9c083c6a979052e3a621685feada611f4322195b30bc1f4f56cd35f305087756cded31a445cca07e74262ecd807926239 SHA512 ea0c3e5a5a417c4d494cfe33ccfcca1996f417e51f5ccd3508372a0df636fb186b9940d7832681af9b353aa50a9aabd64c5477fdabbc5016794a502396b3d67a
 EBUILD pyatspi-2.20.3.ebuild 1297 BLAKE2B 3ccef24a4bc566a5c0067ab60a13a484bfb06dc758f365f0910a28d04423d4d4e86b1685ec6c55b7509dbd542ed05011939da2b4cd6c86811b4d294789306be0 SHA512 5dd9c223ad665b88ce9e07cb52d07c5249746a52e702194fcb8a337aae4defcb18899a3a4ba589a93dab5c75c925aea43cb2f635c84a5a30a1a9ef9adc00d97a
-EBUILD pyatspi-2.24.0.ebuild 1298 BLAKE2B 9f1ba086ddd69562bcb9e506865fa67b47a6cc1d7a516f50a4e2b2ea11d5a66f0fd39e465e91302d7d272787a08f8c837ca6cb517993e6aabe18c346753f2ab5 SHA512 6c0b9ed9efa0462e26dc98074129c9ba69b17b650d35a482fc87eca0e019058e20dfa947f19d20406775a19c0695a30506b8ef98f797e3ef25620df3293541f1
+EBUILD pyatspi-2.24.0.ebuild 1297 BLAKE2B 232974954d137d16728d738e2ed0e4f3c206ba1c608a1e5997e9868f02a4cc6e9d825480bec8b1d3af7a9961a101f2e2514eb51ed5687dfae3369ca11a94ed5e SHA512 07a7cba527f24318267f80964953cdf5201a202db70dc096e117249cdb562a64e854056c90915ba473867443c7e94931834217c7f0fc7d21608da8cfa56ef15d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-python/pyatspi/pyatspi-2.24.0.ebuild b/dev-python/pyatspi/pyatspi-2.24.0.ebuild
index 9a6773172014..347a19895d37 100644
--- a/dev-python/pyatspi/pyatspi-2.24.0.ebuild
+++ b/dev-python/pyatspi/pyatspi-2.24.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 # Note: only some of the tests are GPL-licensed, everything else is LGPL
 LICENSE="LGPL-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 
 IUSE="" # test
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index cb8ab9d9e836..fa965e77a3a3 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -1,3 +1,3 @@
 DIST pygit2-0.26.3.tar.gz 462080 BLAKE2B b3c4b9b8a6aeba22a70a8d2ef1393dace3a065a3625ee3574058e333bca4ba1d60223939f412eecf5ae9d93a81fb81c4a536af46aa047c2c82a48bd81afe4cf9 SHA512 6f727686221d4e8c348f836b7ad278b48a4b971a121b9953c2cf7163bf093936d838aaf83e9edb8628757624ab27e8345a2fb29eb1a79a30e06c0ab0a77e4cc6
-EBUILD pygit2-0.26.3.ebuild 631 BLAKE2B 0f4903e3613c3ce410c919c17c0a7686996c408e29519a505fa38825bfdbfcbf777c8c419288441801ca6a5123d9c5e9e185ff9fa7945ce58144afded00b5dcb SHA512 b07ec6e01ef855ade0bff6848224e278cd30a991f9c15bba5e9ae2476791a5f941cdd5d51294d412ea1186cc2748fe2a13a3233e01ff54cda88fc5c72ec2d927
+EBUILD pygit2-0.26.3.ebuild 630 BLAKE2B 257b172b057c36ca25be404be401c0b1dd01e008b8970e17120b91e91f9241ffd5f0386b097ca0ade67cccb9ac079838ea749ca23bc8d8663d381e483d2ed9b7 SHA512 3c63269c8bb92d03e55869aab50e7634ffffe448e0ac7188375ebd39c27f6264e942055f8fc1b6131bb4e404deddc533f834e107ed67e09b8d82f792be8a56f6
 MISC metadata.xml 489 BLAKE2B 3733ff314640ab2cbfa07e0ea67041ddb3635b51d339070abe97c95b5b358851b412cca5d8996dc1f25abb986a03095f19e8a50cbaeab7eb156c6b9107108cf6 SHA512 d20b7ebbdb3ea2ec72c3c5ded9874b7506b3ddabb43dbf329891478fcf5d7c4b9487ab0675d735733f463dd897dd5cdcc28080ad597f4f838bbcaa565c26915e
diff --git a/dev-python/pygit2/pygit2-0.26.3.ebuild b/dev-python/pygit2/pygit2-0.26.3.ebuild
index 145de65074a1..dac403869def 100644
--- a/dev-python/pygit2/pygit2-0.26.3.ebuild
+++ b/dev-python/pygit2/pygit2-0.26.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	=dev-libs/libgit2-$(ver_cut 1-2)*
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index 72df470394e2..43cf5295c301 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -11,5 +11,5 @@ DIST pygobject-3.22.0.tar.xz 756820 BLAKE2B 2030b9106c082bbec4418c97945df68e20f4
 DIST pygobject-3.24.1.tar.xz 758648 BLAKE2B 95e3bc6d022b70053549f8a780aa372d8964477e881b825299ca82a7328bbdab58b037a92d36578915ac622b7c223d47cc1c35fccd3ea70d7840841eaec6860d SHA512 f35968ab12b872c85af6b2410cadedcf9fa7e17352a40f3dc557c86203aa1c38753710aab9ce55e986ee2c98b64e14123c65083655445e993d0b53431db6dc93
 EBUILD pygobject-2.28.6-r55.ebuild 3541 BLAKE2B 7d20bfad727c2f1e56b28a2d01ac354c3becd1529019eaaaeccb35083c74b8932ee14f061b249d8c02f601f880a8455c3064cd89e2be137e9eeb0bcd3f2a2799 SHA512 d4c7e7a96b5151472b20bb1663b94383acaa526c5df4d545289ca9fe0cc18889238df8b1aeaddf19a1a46cd046b43c46268a65b0e820dc7ebe403d05d664b64b
 EBUILD pygobject-3.22.0.ebuild 2940 BLAKE2B 3a5281e9483d976dec0854b885695e6b612782a4f0c1766ce416b0d1ea8d0c27b00853e71d9ae87c7c96d4ee82f94e3d9c657932f1f87231b3768f5a1c9e28f9 SHA512 999d60141ed662a29b0a8f28c57b4bf3e2dbb2770cb82d573553ab18cc7e45587989b99d740bcba4908724f9c2095fc8665b3a24c1bc1185a20b334cb431bf48
-EBUILD pygobject-3.24.1.ebuild 3165 BLAKE2B 414917f74374f062bd31d3f7f0517ead72b7a018abff29c4bc75a124306b75f931b807aa2ada214dbe8992ba3fd5ed6267b3c8b2d25686115a3011af79ded13f SHA512 264ad33c257518c6eaa3e1d0ca2b736a0e3eb341a7699ce75df057a368bf89e76cd0aea04ad6098a7ab0f064a2219e91429e6cd6ff66f847338e3c8468c6f897
+EBUILD pygobject-3.24.1.ebuild 3164 BLAKE2B e09c6b4f844f4dc53adadade8fcf60ea18e720c37c8777d87a991304384f2678415b542de77315be0de517a86a088852f7c0621d84187463244dc338f3516beb SHA512 fde0fc51da7b1886c85e76422dc5c4428d24006c983cc58587488e443447e887899a7c5247ed470626e30976443fd91f9e06c57301b0a53be19795972cd54b5c
 MISC metadata.xml 353 BLAKE2B 20a18942138d7ceab468b01a639f92248bf94f0e6a015a0c6c34872cf60ab56ef91d9b36eebc74b3d3133ecbc6cfbf2aedbc24369165d0fe9a4e832394beb022 SHA512 abcb7bb015ebb246584f60f388837ed0638040f730111831b52716cbc5a9c4ab0c422397702e1d87e56b2947108d5cfa5aeac7489bcd6f89db480c68c572bcdc
diff --git a/dev-python/pygobject/pygobject-3.24.1.ebuild b/dev-python/pygobject/pygobject-3.24.1.ebuild
index 81e5ffe4a484..95b3f2c04ce7 100644
--- a/dev-python/pygobject/pygobject-3.24.1.ebuild
+++ b/dev-python/pygobject/pygobject-3.24.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/PyGObject"
 
 LICENSE="LGPL-2.1+"
 SLOT="3"
-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 ~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 ~x64-solaris ~x86-solaris"
 IUSE="+cairo examples test +threads"
 
 REQUIRED_USE="
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 9fc3ff695f59..813247206003 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/ae/Manifest b/dev-ruby/ae/Manifest
index 823f5361866e..8cc6baefd1d5 100644
--- a/dev-ruby/ae/Manifest
+++ b/dev-ruby/ae/Manifest
@@ -1,3 +1,3 @@
 DIST ae-1.8.2.gem 29696 BLAKE2B 123e9840e3fba850bccd1dbd1b9acab0b736395ef4ea3e48558aa168e96bae108762782fbc79ad2ab579d7e61d554f4bab92e06c54a7dd2623f4e0a8260e3cb4 SHA512 4a01c294ebfe8bf0064fa1496804e44999d0f78b2951d23fe0c5bda8a3220ff8225a895fc119f2a282802fbcd87b24769bf1ab46afc0d4ca0b5a885f75371967
-EBUILD ae-1.8.2.ebuild 569 BLAKE2B 328716bdcc654e683d7aec81a8ecd290ea63f46c9a7fe839accc2fc557bee38e5baf0dfde55cfa1926f86997244d39888c7655d40b3f747651aa0ffda6e0d4b2 SHA512 d94014138c1060243c6ef67e3d75330f88d144af880c455daa6b4eb2dec10fcce7c29e920e41d6c8be01e2c01e913e8ba9bfef23c808920135b972a8d54579ab
+EBUILD ae-1.8.2.ebuild 569 BLAKE2B 1648a9e068b6e2f60d267f305913e9165dcc41b7105b0f605476c4511d4bd3e2f4be365284ae37f5f8576d57dcd8559ccbbaa024b8040b8de4c527167dfd7d34 SHA512 c1ae74a9589d1593abd8de7f01ee4bc3fbf3300b26572964792a2a1c7e855640d51c76dac527d7d0e8326b069a9589d3d23fc4e25e7d4e7ab008a90acd0dcfd9
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/ae/ae-1.8.2.ebuild b/dev-ruby/ae/ae-1.8.2.ebuild
index 169b855dbccb..317ac1b9aecd 100644
--- a/dev-ruby/ae/ae-1.8.2.ebuild
+++ b/dev-ruby/ae/ae-1.8.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
diff --git a/dev-ruby/asciidoctor-diagram/Manifest b/dev-ruby/asciidoctor-diagram/Manifest
index b62c4ad84343..10da71832222 100644
--- a/dev-ruby/asciidoctor-diagram/Manifest
+++ b/dev-ruby/asciidoctor-diagram/Manifest
@@ -1,5 +1,7 @@
 DIST asciidoctor-diagram-1.5.4.tar.gz 5203713 BLAKE2B f36fc51119fb6340f23b2c71e47675aaba0ce8e6df44c1fb629627e80bd63e925fad085ca36db22334d4849fefd5525bf595098e6f91c51fcd95843c6a876b3a SHA512 1c75d0633235a50daf1ed7514d59df0d33272086b278dbcf75b9be641834a2569d2ee56e41cdc3abc66d3c6b1631dfc1f6483e36f6041824ca5f8ec41821c5d2
 DIST asciidoctor-diagram-1.5.5.tar.gz 9061248 BLAKE2B 101cecb12d7fadbe538fcd57b7f6631b25eb68a71dd477e370f6a76f28de6a755521e9b70e3a09bf6aeb5735f8aa28f2f30403cde9e36aa91de73e9cacf21525 SHA512 e3d27496ee0c9a245e3672c278b5da690a9c9d7052c5e162190028e4aed71e370ed30b48e174e3298705551b9f265172593d5d3403eea0f9e4f4cad80b7357f4
+DIST asciidoctor-diagram-1.5.7.tar.gz 10500954 BLAKE2B e257bd92b8a75cf9061254a0f6dc5ba2b9dae6e1f7b7c9e9d69449d16b52894bb22a022d411cce848b5313de73b40f3c2e28744217a394345ded06cc9f587639 SHA512 bb6e7f036e4e4075686b9852aeb5ead592dc3ed7853f80b042a696abe267255f536247e44309086c8fab1ea91f7ac48c059b1641d0ebc84263442a73951beba4
 EBUILD asciidoctor-diagram-1.5.4.ebuild 869 BLAKE2B 72c41e1c8a91b89f4fa7e32d9ddb8fb60a864fd6541732cff89a18bc0a5144c9d45fc57e0634bb80c5b7052090a45bf45d964a571f047c5799c07ed20cd8e92c SHA512 a9abead089fb4cc1cd13c747d8e7686bd1a36c58de9d47edbfa4059e199f3c69cde63e418394efc253e2c984d52a030d54231a41fad644b6cfb69950f8ee396b
 EBUILD asciidoctor-diagram-1.5.5.ebuild 928 BLAKE2B 75c3c282785ec684f25ec23e9ff1bdc1101246d77e25d52538e968349fecc0bc492e745ebbe143a5a4ee6c7115ffded9a368db9c0a1cc2680ba5341f648283d2 SHA512 686fc67dbc69f271e6765bdd61b6796c9eadb861704b443db8d9c17be7742035c7238817b1dd9ca42313ba2cbdcb183687803734dbee8e6135c8e3bcb3327976
+EBUILD asciidoctor-diagram-1.5.7.ebuild 940 BLAKE2B f19f656089e5efa91789465abb5b849fad7cc43b40f0e0faf6d076e24f7c5489a616ecca4d96f675cadd4b39987452129c5fa74d314c9285b808c5542cb3c5f5 SHA512 9240d0077e95907f6fa69f843135ace22274e9c429d87a3a12bd033cb864aa376353e137083768fa29bbe7f036202a183c22bc230754595a387d4ab563b48662
 MISC metadata.xml 357 BLAKE2B 967e1f1518c38ff81d15df5b62943b278acf74a80938d488cca0d2489f268ba0d41ad74e78b7b53bc1fd4ed646880ed36defc9c110d5af3535970c364d8c923b SHA512 711af8ceb9724236076e02a077672296a835981c7a78e4f5f5976dc190b2df640d24933cc2d92e81f84e695f473d187a7e83d2b60c3573a675ba30b01be85db8
diff --git a/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-1.5.7.ebuild b/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-1.5.7.ebuild
new file mode 100644
index 000000000000..3089e4219daa
--- /dev/null
+++ b/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-1.5.7.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 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="CHANGELOG.adoc LICENSE.txt README.adoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="A set of Asciidoctor extensions that enable you to add diagrams"
+HOMEPAGE="https://github.com/asciidoctor/asciidoctor-diagram"
+SRC_URI="https://github.com/asciidoctor/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "=dev-ruby/asciidoctor-1.5*"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '/c.formatter/ s:^:#:' spec/test_helper.rb || die
+
+	# Avoid specs for unpackaged tools
+	rm -f spec/{blockdiag,erd,mermaid,msc,shaape,svgbob,syntrax,umlet,wavedrom}_spec.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+}
diff --git a/dev-ruby/asciidoctor/Manifest b/dev-ruby/asciidoctor/Manifest
index b6a1cd99802c..63e079625549 100644
--- a/dev-ruby/asciidoctor/Manifest
+++ b/dev-ruby/asciidoctor/Manifest
@@ -2,6 +2,6 @@ DIST asciidoctor-1.5.5.tar.gz 543437 BLAKE2B ff3530825a495ee222634aa871f828069fd
 DIST asciidoctor-1.5.6.1.tar.gz 528614 BLAKE2B acca343f39143b6a9b0dd84ebb1e356f7dcb960154cec4524778e37aac6aabcfdb2c4952cdfaf0aa065203c91188ac006555bebab22d46b75b2705155038ddb4 SHA512 ed700f8ae7ca04700cb1814f819c0f29098266e0b457edb0ade413ae231388f7d217f929e6dff26daaafd6ad8d4c2f1de5debb49cd841fc493aa9d94a9069549
 DIST asciidoctor-1.5.6.tar.gz 527048 BLAKE2B c74d5474727ee9fa91e21a03bc647a951b7b0ff2158a9dc5cfc063a4b16fa8c991315bb0d6eb127452be66f508c1818d37563927e65bbe5fe650a344a6ec3f70 SHA512 a9ceb4d75173141d0997bd64b06a7fddfbe79da3dd3c63d9507ef6955c1bec2a1f51fbba06173fb878e22e13ae3945bf7acd7f4fad9b15e8ed689f84bc9f6e46
 EBUILD asciidoctor-1.5.5-r1.ebuild 937 BLAKE2B efd41ad8c7e485a473077dfd74a3ce79fcf98e7cb6b6bc1b33f02d4bb9f7ab2f51aa7742ba3631afb617214f275a15600f6503b5acca1561ac66819245fe7061 SHA512 a530080c415465bb1e76245eae7bacba587365d34916d6f7683b7fabc94435294f21ffbbae189771088b296aba1dfee38a6ca4c6d4b5c3120f6bbe85c8bb0ba9
-EBUILD asciidoctor-1.5.6.1.ebuild 941 BLAKE2B 572e3cdb7f05c4b0c4157af265343dc7279bb2dd2692069dd9bc5683f6d82dc24f1c00a39e8df5b681a9892912202884301a8896f2e922132d6ab45fa11f14d6 SHA512 e8210333c529bb2e5deb8ed766112ef80af34ec7cdb68e6d0efad175b370e5c3c277c5baf8a9c59ba98eba3e90149f85bdf22f12ed9e948be3358571a5b725bf
+EBUILD asciidoctor-1.5.6.1.ebuild 941 BLAKE2B a604ba719bd42ad0ef9978a8f419263a2660da905777e2fe37587057f83adaf22c8159383ee30485e6a1cd4f3174c3720b209bc8a7ed32e8f773e57234e3d12c SHA512 0f2fd930cb0abde9a2418f2225d2269fd747fb8fd977491b28fb9bade8d02087dc71aac0f53b454fd1b99c5c0e28b79465c76424aba002e4d691f6ae068348e1
 EBUILD asciidoctor-1.5.6.ebuild 941 BLAKE2B 572e3cdb7f05c4b0c4157af265343dc7279bb2dd2692069dd9bc5683f6d82dc24f1c00a39e8df5b681a9892912202884301a8896f2e922132d6ab45fa11f14d6 SHA512 e8210333c529bb2e5deb8ed766112ef80af34ec7cdb68e6d0efad175b370e5c3c277c5baf8a9c59ba98eba3e90149f85bdf22f12ed9e948be3358571a5b725bf
 MISC metadata.xml 349 BLAKE2B 65a3f6dbbe523d1017d78e939c291e40edc3429d06ff16bd0f8150f3879e2b0840619653115be43c876d1cfeea8e95a3e29fea7447b18bc28bb0218ac03f11c1 SHA512 e3ed6253349df933eb4656c972f1a6cc71567c27a721195abceac0d28bfbc991cbda8772f661021c3cf954d2a917730bad54982e319655a204b6b30c1c67c6d1
diff --git a/dev-ruby/asciidoctor/asciidoctor-1.5.6.1.ebuild b/dev-ruby/asciidoctor/asciidoctor-1.5.6.1.ebuild
index 08ca4230b02d..35c0a56220c2 100644
--- a/dev-ruby/asciidoctor/asciidoctor-1.5.6.1.ebuild
+++ b/dev-ruby/asciidoctor/asciidoctor-1.5.6.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_TASK_TEST="test features"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
diff --git a/dev-ruby/atomic/Manifest b/dev-ruby/atomic/Manifest
index ac20adfad196..335b1934a226 100644
--- a/dev-ruby/atomic/Manifest
+++ b/dev-ruby/atomic/Manifest
@@ -1,3 +1,3 @@
 DIST atomic-1.1.99.gem 17920 BLAKE2B 814406dc3e38a3ec882eb47e20e6153da9f68c4dd6ba3bc3d3869c0542754ba38678512872b25379b12d902ad6f740b1da974680867d492d2c4620091c5a32c9 SHA512 9c7762f6c32d11b2c5b45be68954ca12c753d2b4683167158a037ce791d72b13d940beef5bf6dd445c8b12e358c62d2a9f43a609fb3b7c7357fea4f66316063c
-EBUILD atomic-1.1.99.ebuild 771 BLAKE2B a34a3a3faacfadb485ac793509f691c84380bc11d80b835361a11ec49ab2c213cda8a571907e07d61bc3d8302f9f223c817e42f889dcd92fd4c40d98379e3f68 SHA512 1cf6817f0fea8f18cefd66d7b11b6288fddca6013c3cb5c28bebb353181308744d1783c49df670921fbc33b0f443ab8de26a52068339243c41388890eb5fe590
+EBUILD atomic-1.1.99.ebuild 770 BLAKE2B 652295073c23241c6804c081155732ae44aa4b3eb10cbb583d511f3934d78217bbdda40a00f4b95b9ed7bc979dbb3febe91f90a4e0ee44a9efac98c00636fc3a SHA512 02d735bb3dde0340ab7ece220f11ce5a1ee2dffc0897541367f76dc5524b15418f1e9c4d71cf25710f4f58c6734635ea0a3d09e37353fd2102c741445275ee0c
 MISC metadata.xml 345 BLAKE2B 64598e451aa2d3e6225aed11977f43d379ad3d26c0f6366dfee9651544e3c4d565a342d61fd1a2f0d176a5cd0e5f97ad1ae5c1150d97a24ff3472e49eb30d446 SHA512 2fc1039a507f87fab12c537d790d538c6e9abada720edcf9de3748e5d81674f4803221ec940a7f3abc6b12f7c9ec009a2960d88e00b45caf2216a23263e03f8f
diff --git a/dev-ruby/atomic/atomic-1.1.99.ebuild b/dev-ruby/atomic/atomic-1.1.99.ebuild
index a11c8ef258bf..74370c81d517 100644
--- a/dev-ruby/atomic/atomic-1.1.99.ebuild
+++ b/dev-ruby/atomic/atomic-1.1.99.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/brass/Manifest b/dev-ruby/brass/Manifest
index b7f2ec886b3c..23462b583942 100644
--- a/dev-ruby/brass/Manifest
+++ b/dev-ruby/brass/Manifest
@@ -1,3 +1,3 @@
 DIST brass-1.2.1.gem 8704 BLAKE2B 4a0af72ad5ea91fb9c59fdad83745b92c712a858cc4d0ea1b1c0066174cbd40e0e3e1f2ce88be7032d78299a4832be99eb54759cf5e722526543bcec231efdec SHA512 8afb72d3123ca0d582adf11d4c7d86f1ee3b9e9b7cf1544fd4bd2d87891748b5ec5d88d2721763dfdc89cdea3fa1b94bf62e884c4b108d60dcca430f5a03bedd
-EBUILD brass-1.2.1.ebuild 488 BLAKE2B 3c226123ecc9bd0a852276ea97f5e43287e80037b1189f1b4637f01d44f66fc6d9ed1384e260bdfe16afb4c1c197d90699e69ded091a45bf66fa3721ce2a48ff SHA512 4191be5ba5c599ef54ff5c04339667ee40484ac03d8c080a53bb9859085f39e27dbd5dd1e5c2336b33b2ebfcfbe4b61e755437b6d5707675145e78c82ffc2c40
+EBUILD brass-1.2.1.ebuild 488 BLAKE2B 1665a08bd0ccd76198e14fc37c50e67c325db86b04919a0fd88fa1fbb45bec07cc3cd2a0ed9abac73314ec7952fd58f8c7a5b0c88f58edee5bff63be1eb7efa4 SHA512 bda33a5ccfdb26bf2e024012d69e92a5e333d03027c22adbe064d6229ef6b53b12d1117e398d642e9a11797166921a7b4b19e17737a11d7fa17df9df7752b4df
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/brass/brass-1.2.1.ebuild b/dev-ruby/brass/brass-1.2.1.ebuild
index 37024628c56c..7c3f05431ebe 100644
--- a/dev-ruby/brass/brass-1.2.1.ebuild
+++ b/dev-ruby/brass/brass-1.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
diff --git a/dev-ruby/maxitest/Manifest b/dev-ruby/maxitest/Manifest
index ab0f97116d7b..548bd17d5d52 100644
--- a/dev-ruby/maxitest/Manifest
+++ b/dev-ruby/maxitest/Manifest
@@ -1,5 +1,7 @@
 DIST maxitest-2.4.0.tar.gz 15370 BLAKE2B 1645e818c06c42590e919f73c581407aa38dc4f1ff58fe06c7a5a734c3570a4342c7952cbf5130ca9db66f081a3e4c5d32ca2166d6ed5937474a3bbc093ab13c SHA512 41fc6e8eaaebad76278e19574c48e5192363ef466327e83cfd5a3490b98d157bb736556cde57c01180a353ac383e583fed6433443e24a5a5fb6159ed9821a323
 DIST maxitest-2.4.1.tar.gz 59653 BLAKE2B 8bdaea5ad48d30cef9c07947634b05f6e5cc8f8e74f985321b1878e26cc36680cf6f6c2d069e947342a5f0e2f2346347952e6121198b0b74af31b0d58bef4070 SHA512 b1c1faeda4c670083d3564a0763ccb4005954e018aed4a574fb4ddcba16c943b1da8ae471d8df5aca9c1010a19605d55609186b4ab56c13b033ad67ed6c9eb27
+DIST maxitest-2.5.0.tar.gz 59771 BLAKE2B 53fe709a89d33dabd3230ab40a3d85582d2bd918a7e33ffe65c9787707858227c9de6698a0ddd0774d2a04591af46aca19fb043bb740af3197dcf65645d4e722 SHA512 9afca516047ba2261770f497f6be2363dfe2476816295e35eccb4ee36830f3aad373a20dcb10ade7fb36285cc99d11ccd4b4928583183deadb087ea1cf32f181
 EBUILD maxitest-2.4.0.ebuild 1309 BLAKE2B 9cbf011c54cb4c8d5fb9d167cc95ca509a60a534ffe399229a15b719ebd28264c123fb0c6fb4c57be4c45a3326207f7adad88a75e485961f782e4071e1663ea6 SHA512 4f6602f895c2b8b6674afdd48ab80457efe781e31c19ebc6a6645e3ec282fe9051d6a64e42cd4aaa3147056c0ed2b496000dd52965be880a4ea288b155653dc9
 EBUILD maxitest-2.4.1.ebuild 1303 BLAKE2B 425fa63a294a2294a5b16e35f7723804d2db864cfcbff3ead296d0f76ffeb72e3784d944bab085ab2d3a34b6eefeec0de420629d86d7fc08e04f280f1b81dd5e SHA512 99f4dabba47c74759643688119b9c538e25861a6549643edcbba2eedae4b543717edc4b0ed2554fba3eb027c3321af9e85bfaffea6c000fc6401df9993820a7f
+EBUILD maxitest-2.5.0.ebuild 1303 BLAKE2B 425fa63a294a2294a5b16e35f7723804d2db864cfcbff3ead296d0f76ffeb72e3784d944bab085ab2d3a34b6eefeec0de420629d86d7fc08e04f280f1b81dd5e SHA512 99f4dabba47c74759643688119b9c538e25861a6549643edcbba2eedae4b543717edc4b0ed2554fba3eb027c3321af9e85bfaffea6c000fc6401df9993820a7f
 MISC metadata.xml 332 BLAKE2B cdef4488ce14b1d8addc2b3f23fa74aa64022d4ed2dfea7a84c85122e357806dd3a466ec2f4fb0fd486373055a78ae579c0f68c90a22b8940499e1ae29c29ded SHA512 ad86da72b8bc8895b0e09bc9e435eefec9ca1738e8b34aceaa959b2431b35c2732c704bd68a02d02c3c88912c20395f8601e2d42ec26f5d15c064893c0ceff0e
diff --git a/dev-ruby/maxitest/maxitest-2.5.0.ebuild b/dev-ruby/maxitest/maxitest-2.5.0.ebuild
new file mode 100644
index 000000000000..8430d280fdfe
--- /dev/null
+++ b/dev-ruby/maxitest/maxitest-2.5.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="Readme.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit versionator ruby-fakegem
+
+DESCRIPTION="Minitest + all the features you always wanted"
+HOMEPAGE="https://github.com/grosser/maxitest"
+SRC_URI="https://github.com/grosser/maxitest/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~arm64 ~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/minitest-5.12:5"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler )"
+
+all_ruby_prepare() {
+	rm -f Gemfile.lock || die
+	# Remove developer-only gems from the gemspec and avoid git issues
+	sed -i -e '/\(bump\|wwtd\)/ s:^:#:' \
+		-e 's/git ls-files/find/' \
+		${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/byebug/ s:^:#:' Gemfile || die
+
+}
+
+each_ruby_prepare() {
+	# Use the correct target
+	sed -i -e '/sh/ s:ruby:'${RUBY}':' \
+		-e '/sh/ s:mtest:'${RUBY}' -S mtest:' \
+		spec/maxitest_spec.rb || die
+}
+
+each_ruby_test() {
+	PATH="${S}/bin:${PATH}" RSPEC_VERSION=3 ruby-ng_rspec spec
+}
diff --git a/dev-ruby/minitest/Manifest b/dev-ruby/minitest/Manifest
index ceedd80b1e95..55b3e233f204 100644
--- a/dev-ruby/minitest/Manifest
+++ b/dev-ruby/minitest/Manifest
@@ -2,6 +2,7 @@ DIST minitest-4.7.5.gem 57856 BLAKE2B d0ecb0a0693c35ebbda52e9c755b72f07e38d6ccc2
 DIST minitest-5.10.2.gem 75264 BLAKE2B a8967591bc590e839d1186e787c5d925b67d8a12f5b49dbcf04f653f53945aadae9b2bf93a432e67c3f7eb2c99d25d9730ee4530d189c059eeee9e46f4bc6ac8 SHA512 f2a0ee13166cd6cb2cebc1f075347f205ac14e03943b2cccff7eadd34d09f2fb8ea0a6c764f20a84efef6463f4101a998110809c81c385225b4f72eb5da687d2
 DIST minitest-5.10.3.gem 76288 BLAKE2B 2c4fa5bca17e8a6270923225cd91fa9b6374d2a00b278906faf4e3ead0baf5fb1572a3c75322befc35ad0016d86f49c905e7de0283b07c60585c4c0348d69701 SHA512 6a3b1c86471fd7bb6ca078de9f253aeb9533f8da027998c34cd7fb8165a1d3bb565c1f8df958bb0eef6b7e22658894175c5f54f475585f2c05bb667e812b7aa3
 DIST minitest-5.11.1.gem 79360 BLAKE2B 97066b398d04a840327bbcc0cfdf71d7945450f979ff70824f9d455de05a0931d8d4d6cdfd4a0ccb65443fba4a4e6378d74277748f4f41beb6e552b1caa83792 SHA512 b25a7f3952f546fe2ab7a87f3fa6d1980e3642b25e7c7b6bfbd94cf2063458613f0a73e71e773323e0277b375827ffe629701d0a17fbb30c6bd00095eda447c0
+DIST minitest-5.11.3.gem 79360 BLAKE2B c348957e094bd91e88c6dace522b8e88c37ec435d58b4f6f8c8b458cfd26b789cb00cd43fa9d515112a8f3c9a736756d59c46f4117d1c1948d08cab0a5eed6aa SHA512 387537aff51f8e8f9cc2feddadf6813d11f0ba623ae3d5929d7b7a88e180b60c961dfa1d2ba0f3a4ad7d2c1af250245376fa62b23f68c8b57812c7e86efba0c7
 DIST minitest-5.3.3.gem 67072 BLAKE2B 58511cd3cf5e8cadc78427a4818f973aa59873cd35bf553874cfa3e785a6c3d427d3c8b7e5f5f915842ca2b4b2ce594f847873536b49b8860cbfb3812dd58908 SHA512 e1ea2cea5b61231b3074aea1dfb15b104a4e8a6b361d274194b6876401c29f839be618eb7c0448a42bc51ce57f0c2fcd84a72d1b0e0ba034ec5ffe6fbf2ae509
 DIST minitest-5.8.4.gem 72192 BLAKE2B 364cd5da716e33b9c4a6e0b1e249864445205a759b289f940379db033c25edda776177bb2435df75d30b51602193a1f039e72bf3515cfcc4cdbcc83e5a7815e6 SHA512 92569e41e334f209260ac77f9157f1dac8824111c6a810d954f7c66d24cf7a16d7d874186288580bf1f800889d8bdfc80437691d91208990878c295e14c1f906
 DIST minitest-5.9.1.gem 73216 BLAKE2B 553143159ddc688ee0961a1714aded658dea3b6d5823bfa1555e96d25506eed2a789ad0b31939da1947e3e1d21fa9b4a9f59f3b429354283baa8c28fcda1a444 SHA512 4b02ea62297ad5be8bbc8d541405b0d73668ec7fe0f78318fb85fcc35321d934285df13aac2f3e5c4f9cb303b2689bca36a13bf1f8359486f9c66d4ca2fc6e72
@@ -9,6 +10,7 @@ EBUILD minitest-4.7.5-r2.ebuild 951 BLAKE2B 378b2e1f8b34403503cac08066cf9b1bd17c
 EBUILD minitest-5.10.2.ebuild 806 BLAKE2B 38d0fe4a589a70a3002d54f7faf8d9252fc988746bb55b1d8ee2318770e77b8cd32bd3d9b298b1b4629181f58b84612d125f0b67d50bed37a3be77ed89756d10 SHA512 5c6c2c91f11eeafe874fb60b3c351ad304cfd81cbacec656aba32b27b549f9e5d21cfd486b6e2a90cfbf1c1cfab6cc8ab654fa82f3b0149328e6e72ccade4084
 EBUILD minitest-5.10.3.ebuild 806 BLAKE2B ba232bd0de4eecddba4e56dd4254a594e379f8cae03fa9f503665d898cc2ee395ea75dfd69ae45c41439bfee275b883e0160b71cba71702b8282384c2245ad36 SHA512 e61c3fc6f57eadaa35bd70dd8539f6445a66867d129ef960c77a6a4c996c57f81c861aa9b93afa447a9fd0c0446104d795bddbd4a18c95a73fcde552d9f9bbd9
 EBUILD minitest-5.11.1.ebuild 806 BLAKE2B 396d4f18c587cdfee04ba8092487f3e8f593bb994a4490827750e943f888b02a713ed34c0ee32488ceea6d77a682627032b3b1637d99bcab38a377881241ee8f SHA512 bbfa20031a7580e63616d78bbd2bbae0137b5478216e151f9d977aaf77ec797c74c3a3fcd318cd440849872665d16e89cd5112607691f0e92e38e7525a94d65e
+EBUILD minitest-5.11.3.ebuild 806 BLAKE2B 396d4f18c587cdfee04ba8092487f3e8f593bb994a4490827750e943f888b02a713ed34c0ee32488ceea6d77a682627032b3b1637d99bcab38a377881241ee8f SHA512 bbfa20031a7580e63616d78bbd2bbae0137b5478216e151f9d977aaf77ec797c74c3a3fcd318cd440849872665d16e89cd5112607691f0e92e38e7525a94d65e
 EBUILD minitest-5.3.3-r1.ebuild 817 BLAKE2B a2173c0cb66ae8fbce47f13b0afd04f78ffff56c246670462f7cee90a73b6f26435c4489f3dcc4a35bcacba892a752c8681341ad896425565890c21b2c162737 SHA512 b96a9b0b391626ec3579314fb4d5e4d2635a8b78bdc3acec904519c78c87b633e5ed015fed19f7bba04a47adb7d2808495354e7ae378847c88cd4fcff3d84c53
 EBUILD minitest-5.8.4.ebuild 796 BLAKE2B 6e7708f2fc1cd4bd22980dae3c7306945c18ad9c112390e3d3325d84a2387c7726e22f69de3137c338933831e1a0420675acfbde440555d5e46badf5886544bd SHA512 e2958bf4b1822b12a1d1f957f81f2b01be96ee60454ad0f523d2d8aed04c74d0366f5d7fdca03493c0958a1772d0c6fb9fb6e2a32d1ca8f4f424b626ce0514c8
 EBUILD minitest-5.9.1.ebuild 797 BLAKE2B 3b9cd0b577f21c21ec180ad7e48a3dc73b585ca319a396fcf4fd98131c4309a3eb38856c53792a4a1895c3355feac2414803be081fe5f122ef825f17e9a4b7fb SHA512 ee2593712316571c86e9c6f3564c449af05126b2a58db37c1827fa532e63beb2887563d70b6e38036541e4ba0a28130bdb016c2f99975d570ef966ac4740438c
diff --git a/dev-ruby/minitest/minitest-5.11.3.ebuild b/dev-ruby/minitest/minitest-5.11.3.ebuild
new file mode 100644
index 000000000000..b79c3ae574c7
--- /dev/null
+++ b/dev-ruby/minitest/minitest-5.11.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="minitest/unit is a small and fast replacement for ruby's huge and slow test/unit"
+HOMEPAGE="https://github.com/seattlerb/minitest"
+
+LICENSE="MIT"
+SLOT="5"
+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"
+IUSE="doc test"
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e "Dir['**/test_*.rb'].each{|f| require f}" || die "Tests failed"
+}
diff --git a/dev-ruby/qed/Manifest b/dev-ruby/qed/Manifest
index 9432f50a1b4b..ee591c402186 100644
--- a/dev-ruby/qed/Manifest
+++ b/dev-ruby/qed/Manifest
@@ -1,3 +1,3 @@
 DIST qed-2.9.2.gem 71168 BLAKE2B 9df41a665d7a01f5a31a6a1ff5d6bf17ed6869b97a15cd142b5baedf9a5578b530691db084a420619091d11f116cf369e789058e474f2ffc65e02c55cd035e3e SHA512 e922f981eaaa852fc44eba998b20f3d2310dbda5a06eee252d401f6e1ffeee1435aca9618fa7f8982cee575d52c3ee9aa9d3705639106421db0c2daba9c5d1b5
-EBUILD qed-2.9.2.ebuild 654 BLAKE2B 04eb8d4d0023dbca9e36ba0e63c5b4c99dab63b0ce55fa6465d07518edc31970336de8ab66af8514615e5b7827fd7263d5ef627f306efc9f88263a15e6c84742 SHA512 287e3d94e08f4e64529567351d42de0fd22e9968331fe534cbc6b2335a93af9618eb90c7dc0e1af9c14918120354a2cd1050de150e9fa0e9846acb862fc278fb
+EBUILD qed-2.9.2.ebuild 647 BLAKE2B 65dbce3e6d1b8859c58cbc1926d8e5db85174e6d96df91fa737ed93e12120dafa449f44cb422e013bc714045981a94bfe0313a3eb5218fe6823e1f081c0d043b SHA512 598b6fa6869baf9c30e275d07fa248a37a7d8ca6e49fecdd7be93385c0f455d411e707e97b60cc4912dbd63e7c821749c65e6f0bf016d4033e0c8c88ae2fa058
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/qed/qed-2.9.2.ebuild b/dev-ruby/qed/qed-2.9.2.ebuild
index 5b9b5be84ee6..8410c868d931 100644
--- a/dev-ruby/qed/qed-2.9.2.ebuild
+++ b/dev-ruby/qed/qed-2.9.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_RECIPE_DOC="yard"
diff --git a/dev-ruby/spring/Manifest b/dev-ruby/spring/Manifest
index d511dd23bd3e..8356b9023125 100644
--- a/dev-ruby/spring/Manifest
+++ b/dev-ruby/spring/Manifest
@@ -3,5 +3,5 @@ DIST spring-2.0.1.tar.gz 42129 BLAKE2B 6be76b0cb5f103f0bab0c5335d28d329a0c80b7dc
 DIST spring-2.0.2.tar.gz 43318 BLAKE2B 91c032b6e4573721de559f7cdd7013656fd39b71b7d0776b0518ead3730044b6fb25b2900931023a920f1afdf555c2856e4748f052856515ad5fca83df356659 SHA512 73d6eb241807dd9bd20e0e393773da77fa22e07c72cd8d909e7ef1330a6c3d1e5ae483d2a10bff5d99f57214a96f87da2eb784c8532ed9e680c1d679dbf4bc0c
 EBUILD spring-1.7.2.ebuild 836 BLAKE2B a03582f96aac6f13853a663c936d43f4380e946f41578547ebf4cd99e1b64a30bb8a7d81128ed1f1582ba58b125dab76e26a15d1406f52ab45f8e5c99db22757 SHA512 0463dd9a4575a517638f229261e0e95545787f5cc4ccd2005b0a592c84180e2a7e3e0e5ace09b5747f293328636c49b172a934607b61cc9f2c93a8eaf04f6b12
 EBUILD spring-2.0.1.ebuild 834 BLAKE2B ac74feb5d4b0920d539d17623a925f3e36e627ff3832af27cd14aac680efc0f23b6e0965c9d3e1a4b9313812c6eece1f90f0e84dde6d19acde1368c4b27e6a4a SHA512 e729ff9e17b0c88d28c69b471a05697751732dc4a1af441b3b07918ccc074f175d5edf0a55d3f4e9de339a30090fa9951aa09ed3714b7ea26a21a7c1ff044347
-EBUILD spring-2.0.2.ebuild 834 BLAKE2B 078bf3cb4f6b00a72e7414947c05ac298ae89dc74a6dce89c0f47be05104439ff621149bffca26a125f5817f91ae76c1061e7d25532a578508a77c030704e47f SHA512 2caf1f2ac209fcaeff9f6831cb4d3428d04cbd531ef32b42c437e5ed94365c0d6b7ffa25313fa1be5f2dd7737cd91ec9066103b2679aed05ad6d740adced4f12
+EBUILD spring-2.0.2.ebuild 834 BLAKE2B 2419853f5567c53eef3f42e2ebf5d6639acfacbcb8c03e893ab7d9c1bbacdc8ce370bc1908598dfb656181ba79e76a1af5f7cb30ee881ed8c0629e659c540ed1 SHA512 494ce4b017f2b1d8ca108d35813615d57d73357c5e690321d61d4a705f054b55365f039c60df7ec10c726b026e3018105d446d88c27862a94fa72f8969975ce4
 MISC metadata.xml 338 BLAKE2B 6800daa1cad935214edb5051dac7470efb061ef6fc0ad534b8e52d024ffc8474fe3a04a329de4394b7ce673a9e8bae71aee52fee2fc4def484c287085ae51c5b SHA512 ed274c75491299ebefa755f0776c8895c7640101c22652f92defadb839d0a476a0e00ad407d1769a62f20d56da532f750bf639e7f5d75831c50f2957c17cc9c8
diff --git a/dev-ruby/spring/spring-2.0.2.ebuild b/dev-ruby/spring/spring-2.0.2.ebuild
index d43cbe123c54..76d4f71c7e65 100644
--- a/dev-ruby/spring/spring-2.0.2.ebuild
+++ b/dev-ruby/spring/spring-2.0.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
diff --git a/dev-ruby/thread_safe/Manifest b/dev-ruby/thread_safe/Manifest
index 9f294ac89b83..55cd938bb875 100644
--- a/dev-ruby/thread_safe/Manifest
+++ b/dev-ruby/thread_safe/Manifest
@@ -1,3 +1,3 @@
 DIST thread_safe-0.3.6.gem 120832 BLAKE2B 0e3a1aec1d34119dc1f673acdc3d2e18b8c5f970bf79726e4729a806a52ce6ab265fd713972065011e8a04cf2776dda871d3d747eec77b0e94235de776d0cb2d SHA512 a11808576392c068e1cb31faad706be2b1bbfa4837c655c2ab1d5a235b62b25ece62065de6b65bd25496fa827ed89eb0796b90467107df255825e01316ff1805
-EBUILD thread_safe-0.3.6.ebuild 1090 BLAKE2B 4402cbde21ec4c8b65baf664693cef6be389d838da2aa0b25d31fb6120a947e9a1724950a12b75480bb786ed41c49f04e5ef7a9d5c1b3ea7e54d1668e426b412 SHA512 baf2161a18d0eef55284e4ba289bcc6f736d18749965001af65dcec80ca6f72e95a313fd0d751a6eed605b0b125eaad1b61d95e641b7be5f3f3fb40373c7c03e
+EBUILD thread_safe-0.3.6.ebuild 1089 BLAKE2B 6911e4b005c146865caf055e6add292b05186aa12279fbcfa29ad69dad3288c82c84c34a21cc1b457187684049ee4148b01b262f85f7fc1453dc48cfc8731199 SHA512 7488b665d1bcdf313dca7708a9eacfa657d9b885683b1c36bb82f9ad5789cfc0fd2c75072165e71a2a802dde8594d028f9ec5ac0845d7f5e31d245278daa2170
 MISC metadata.xml 354 BLAKE2B 00b77e62b42483c496a99390ca3e024b0d26e0a3f40275299401aa9f587e8bd3e5495522ab91a00c5a785f61759493ca0bcaf7f2a7ea71adb1c7790e669e7e4a SHA512 07164e076aa4dd3def9a69d2690b5044359562184040f63a2f09476771eddcd77d2723179c91173f877b99a23c9e24d2b6e959482ae83458c4d71cd099c1ab01
diff --git a/dev-ruby/thread_safe/thread_safe-0.3.6.ebuild b/dev-ruby/thread_safe/thread_safe-0.3.6.ebuild
index b8a4bc2e5bb5..3969b0073350 100644
--- a/dev-ruby/thread_safe/thread_safe-0.3.6.ebuild
+++ b/dev-ruby/thread_safe/thread_safe-0.3.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/ruby-concurrency/thread_safe"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # Higher atomic dependency since earlier versions crash on ruby20 while
diff --git a/dev-ruby/tzinfo/Manifest b/dev-ruby/tzinfo/Manifest
index a7f90a719929..d51a9e84ef60 100644
--- a/dev-ruby/tzinfo/Manifest
+++ b/dev-ruby/tzinfo/Manifest
@@ -1,5 +1,5 @@
 DIST tzinfo-0.3.53.gem 301056 BLAKE2B bc1c2da47f1acb1931ef578f757f1ce1d574ddb113f2967171e7f530781431ac11e47c2d02edeb5bf378b817f5e08fa1fde3e3bd36309c0887c45bcd271bc36a SHA512 f5a0119c04852845f1e4c8db36a2a374f2886ee5a14eee74ecacf19bc60bdf3e65197ee2ad1fe4fee56ac882b2e7cf17dcb4fef593767675e1fdb3da33b31b24
 DIST tzinfo-1.2.4.gem 152576 BLAKE2B c6815fc7277153c5e00ea2359845df25affab5a08f9274729254662e056de702613f4b8ca5b4f2ddcd756d86ae12e534a4e2a5a4661f361ef1d59cb3d7f07bfa SHA512 0b983aa6b4fdbb3c49329bb51394f1edbeb6f4d216d108448aa9dce751dbc2e348d58032cb41df78a3d249611770e9e345a4d0041597ceadf052b863c3e6d1ab
 EBUILD tzinfo-0.3.53.ebuild 1036 BLAKE2B 1c5292ee6c8baa81b4fa14e40000d8df527853c703edd231eec048ff123169a94132f969f7e81d054296e124a4600d9a4ed9419c9954c93101516ba1d1fa1f47 SHA512 c9b199a435560e3b821071bb38ba999020b941d4db295740fbb80f7c6e3cc43fa80429145c7ea9cd3c36981a08ad188c189cf83ceab563f38590e4669d12552e
-EBUILD tzinfo-1.2.4.ebuild 911 BLAKE2B 4e898c532146d2e6fda9ab642e55b28d6df67cbc747dada84c08554208da301d51ad2275c3f74bba892b8eb30f4d77200c38a884f788086e68ff106b1ffff783 SHA512 f09fc5f30da8b7c0fd4bcac4af7848f62b8bb8fce30fe4fbbeabab5ec268ac61e3ac24f8401b862bbc523e0548de4eddcc826fc7a70afbcf71714e620fc12e61
+EBUILD tzinfo-1.2.4.ebuild 910 BLAKE2B c45b5f955e9498760ec05f6663fd32216750e4e618a2fb5edf6a79dd869148a354bf6e51fb7c7efc39839ff93cf04e5c989c226ad9dd1af3002c7379aa1c0f4e SHA512 8967d89d0963a89652ca30b35342c2a5a9f16a2ff17ba604e16163572ed22a8de5b8eb7bcaf7483fd3257321225e3bd1fa18a71a8d1963263c48aedf72baca32
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/tzinfo/tzinfo-1.2.4.ebuild b/dev-ruby/tzinfo/tzinfo-1.2.4.ebuild
index 350b5d60fb43..2c7a36e12f31 100644
--- a/dev-ruby/tzinfo/tzinfo-1.2.4.ebuild
+++ b/dev-ruby/tzinfo/tzinfo-1.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ HOMEPAGE="https://tzinfo.github.io/"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="sys-libs/timezone-data"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 69288bd0aff8..c798f72e6073 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index f509ab9e2010..b341ba014ca2 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -1,3 +1,5 @@
+AUX android-tools-8.1.0_p1-build.patch 545 BLAKE2B 27b2adf298df89972eac73349118378c5210e9a1d4177292eff44a587627a9f16c8ad0eaca075b4f924e4e7733f73afc954ee10eeed3d465262102bbd012f313 SHA512 67d4f7a772ae48d23f253a385575203ff50d2559ba784832b177bbd9adbda614a7f868a3362e564af98ca840297213446a0c808b380e0ff7cce4cca78437f623
+AUX make-tarballs.sh 3176 BLAKE2B 7438c5dc63c355f1789309b5e825373396788808223f64718da227066a3b870fdb0fdcc827d0dbefd56d8d72fa6740a8b8c64e75b58dcda1a79eddebb064f001 SHA512 aebcc6e6c336932b4c9770ff21bb2ee3beff6947a04e88904b6ac1d1475c0c1e0eb5ccd774d9cc07aef6a9f849bd8dcf5b344012cec9c9b595d1aff916fc30c3
 DIST android-tools-5.1.1_r13-arch.tar.gz 4078 BLAKE2B 718f94b0854189533f11545a8962c2cc85bc01797057a77525babd7f5e01c76f12764cab0da30cf8abe364c0ec757193cc8c49bef3278925076efd3633fc5fcf SHA512 e38e0d1c966b569defc6df185c0e2b35b3766a7f89bcc3f60cea9b536f37b5b6b76f40457735b509d806c4c5b24f6b3805b51b85ffeb4d04fc14a731f81414c3
 DIST android-tools-5.1.1_r13-core.tar.gz 1210720 BLAKE2B 0ec56b07c206ab122d1286dfa55424c3ffa4382cbe3f55f6ca351ca9e4555537e9404a5ee239adb90667d91c9212de85c8c264662489b69d3b7846c4b4bcd80d SHA512 2ce2f03193840bd894cb4638bd23a321e53c6185e9816729193714b9e2d068f5ca4ebcee4edc7febaa4ea1ee3621aa6977217a5a84d2f116f35b000969a4af15
 DIST android-tools-5.1.1_r13-extras.tar.gz 282690 BLAKE2B b0be4168ca4cdf6c7ed359f01104b2b20cf36678153bae00ffb8cdc9d79e0518f850d9f1ad3eb3a2f998418a6fcd1c54cf4199a2ae37c696e5f657bbed8c778c SHA512 322d45be02d3d5a5bf677e3a38a44085258ee7b9a8c0a7bc08ddb4104168170d5969699ee54e19009a2bd0d7e0ac6ad7971ccc67e2a0311c6f1ba7fb76cfce83
@@ -8,6 +10,14 @@ DIST android-tools-6.0.1_r79-core.tar.gz 1186562 BLAKE2B 473454d340e65f98201508c
 DIST android-tools-6.0.1_r79-extras.tar.gz 648657 BLAKE2B 4582ddd57b729492e08987e17304c62778504ffc316ab26df8c83fff1aed33226106474131d5ad0e3e302b577c83a2b78d0be04fef9711e39861a223580ab1b9 SHA512 e10694737c518f591eff4e808bb826c83bf45dc44c5c1ee8a4082a6e0653350ffe2986e299348cb4a1219203192d01546a05e9354ce05e29897f856c147de8c3
 DIST android-tools-6.0.1_r79-f2fs-tools.tar.gz 70255 BLAKE2B ab9ce3efd33c28a1a0a9cb8a5415057498dd493e059183cc9d3fcc9de1b5ca4d7488c75695c94700fc6a4e5503beb8647576c7096fa50229f98485d2983ce152 SHA512 0871f99f78006028889b42668ec627b6515bb812ad3ec4a489f62187a79f64d2a74f66556698a5f05fc99932f75fefd8810dedceeab744b212beb764e97b82c8
 DIST android-tools-6.0.1_r79-libselinux.tar.gz 50814 BLAKE2B f09f26c801be83bc97f4b18606f513ce0fae791126a30c90067e3b2066c991fa1390ab2d0fac2475f755f3245179718204d5014f47ece46801dc0f80caf9758b SHA512 686557271271c4d59fb968c5aa76b433955009733f3151c4c86faa996ce846088d6632b0969b23699822b7a6f09eae60abedba6abb0edc9d444159bbdb5c6f91
+DIST android-tools-8.1.0_r1-arch.tar.gz 6250 BLAKE2B 65447517a33438c8531a9d707c6107703eaccb558e505e51a88ef51e70f83488620f76eb0240dc0899211cf120e9e1ffbea041086f1d8133f30b56358aba76d6 SHA512 5746e0b2f6aae37ebe60b7b1e939699a11de2f44286497f77d700c3896e02559d55002f036ecdc1c412844bfce4ab245b9086193dc982e6be74bcaea61010c5c
+DIST android-tools-8.1.0_r1-core.tar.gz 5227179 BLAKE2B afb280d67fe1b926e1f1ad68409584ad0209eb48921542e2bd490448c888cdf4bf6fb4c6f9552d580c7a396e79c2c85019e79a9a6c9881ea962c2f1064c33d82 SHA512 2c8e67232ca6348a4fd4b5d7077715491d2168c46fc8e336635a961bbbed156ef480718ee58393501196e9315c6c1bda807f8966944e3bc209dd5a0f7088642e
+DIST android-tools-8.1.0_r1-extras.tar.xz 275952 BLAKE2B 0fd3c536fee6ffbe2cdd4321604d32dc3a2b48a1b3edcb9121e83ceea760e491b47b301c3d8126565efd6b11adabd4f89c79bbe8731585660ce395af9e643fe7 SHA512 bfe3af89eadf38ce6805637e41f3fb15feb85455902f6a43e52a2f95dd1595cc896a9f46ccc82ab8db433f56a05f2f4c0ba85b77f40b03d5d69c8fec4082a2da
+DIST android-tools-8.1.0_r1-f2fs-tools.tar.xz 93924 BLAKE2B b8b6c7ba4c3f5309bfcfc91bd57d018d7af66f8dd25590207fd545f0dba02961826bf9963a56c7994feea5db8f9caedfe4fe62870420d9544283f87ec337cfb8 SHA512 de726be0691c58a5093098bd30cfc06c4312c44bec040cbecd594694cb7b38742dafd1f00b08c18f1b70abf56571738eb3e85e612f082e09e51a98980444e069
+DIST android-tools-8.1.0_r1-selinux.tar.xz 3188060 BLAKE2B 8c513d858e8dcaed705975ad61f362d7b1c2252685a63a1ad6035f36b0b402f1857ac5d2635d35ffa10f05b4a2605f30f27dcc5e9d91930eb0656f3ce2da036d SHA512 8799f10b4dba840ecea8f6abb8166c2e137eb3f0d9c5cfb132c661cf17800f2eeaafb1b4ec9e8974fc3324fae99e3654e52397c987faf1d48ab6148152d84f11
+DIST android-tools-8.1.0_r1.ninja.xz 2740 BLAKE2B 34473e33970cefdaf82bbe4524665fd50e6617cf867757ca07cdccc2e7356f43ef4bb455080ef4bac516ddba3c4e4120f0b27306e84725f8d5738a81800e3a53 SHA512 707e0e1c53832a42384e93d363f80007b76f18166b9f3f7d516431410b05319b1acc804daa1fddc218e11feb48de48683efb5203f4fa6d80646dcb1a2953139f
+DIST boringssl-14308731e5446a73ac2258688a9688b524483cb6.tar.gz 13030361 BLAKE2B 6982416b6e193e7faccd41fff3bd35f80b11d7495251d876e6b081bd94a887ec3c6bf5b7852d9595594fc2bdc57353f268272ef01fb79f7c93b52d46cbda69ac SHA512 171b524b0452a48853b2c8010ff5e14d5d720e69eeaf1d3b79f675838f3afa94aee9de2f47b37303feb2d92cbf77639efe585786625b7b37b8cc2ba727c37fdc
 EBUILD android-tools-5.1.1_p13.ebuild 2088 BLAKE2B 5cb17a2be1150d399d12624525cdf1aabdc3ee4f775194c3c8a4aa1554e09fb8f3d3ceaa91469cd9fd576b292c69eb1b224c5980051d56b619fbd28daf99a955 SHA512 a557d31b6488a3a96164339f9e2508cfd71c6f749e5b3f7829b79bcba85ef75985e1865a9ce528556ef0976ebc1e2f52ae8c1368bc6f75bf78c7e70649327dcc
 EBUILD android-tools-6.0.1_p79.ebuild 2831 BLAKE2B 751d21e94536b18ba028038e264515b4e6c9ea89d94ea5a1350cfabb8f693380cd2940eac9f0acea3bca8d5d071c8621e9bd31308ce385055b47a674b4d767bc SHA512 034baa131865bfbcc2bd8d8eb894ecd62b2ee5535b29c2541e151705dca29a1e457bbbfbb5590faa927d3007e0358a79c496a985fb815baa46ca17cb55c4eb8e
+EBUILD android-tools-8.1.0_p1.ebuild 3980 BLAKE2B 74f5792d1fb1ea62086a0b3257a232c98afcf0ec6d17ad795c01d85edaf5a9fba478884b78c81b1a82a2ed01e23fa2e29db2801e30665b3ad63ae0573aa80555 SHA512 2fc66d84f177b009bf97889dc452d709fa59ceddc539204532d45b9365153428a184f18b3980982e1fde80e10d07fa652ecf764398bcddbb2e6f9f9b678fef3d
 MISC metadata.xml 643 BLAKE2B 99ac01fb57cc1d2908955720cd2fee6e97f98a19d9fe9bbbb07e0f9f915b7efca184a75c5f5eb5372b9c21d3ba7db542d061de47ac6f89e6c58fa3dc886d4f21 SHA512 51ee41cf77548eb1ce543b2c1f5f37e9634250c2fa42b36a8128b4a80a73a270b90b9e9e1c2c58d7aeb6dee85238ec73345f1a3a4ac398a4f7b2cd8e8c6e84ee
diff --git a/dev-util/android-tools/android-tools-8.1.0_p1.ebuild b/dev-util/android-tools/android-tools-8.1.0_p1.ebuild
new file mode 100644
index 000000000000..a1e81887fcd1
--- /dev/null
+++ b/dev-util/android-tools/android-tools-8.1.0_p1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+CMAKE_MAKEFILE_GENERATOR="ninja"
+
+inherit flag-o-matic bash-completion-r1 ninja-utils toolchain-funcs cmake-utils python-r1 python-utils-r1
+
+MY_PV="${PV/_p/_r}"
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)"
+HOMEPAGE="https://android.googlesource.com/platform/system/core.git/"
+# See helper scripts in files/ for creating these tarballs and getting this hash.
+BORINGSSL_SHA1="14308731e5446a73ac2258688a9688b524483cb6"
+# The ninja file was created by running the ruby script from archlinux by hand and fixing the build vars.
+# No point in depending on something large/uncommon like ruby just to generate a ninja file.
+SRC_URI="https://git.archlinux.org/svntogit/community.git/snapshot/community-2b7f9774cc468205fec145e64e9103aee8e5c6f9.tar.gz -> ${MY_P}-arch.tar.gz
+	https://github.com/android/platform_system_core/archive/android-${MY_PV}.tar.gz -> ${MY_P}-core.tar.gz
+	https://github.com/google/boringssl/archive/${BORINGSSL_SHA1}.tar.gz -> boringssl-${BORINGSSL_SHA1}.tar.gz
+	mirror://gentoo/${MY_P}-extras.tar.xz https://dev.gentoo.org/~vapier/dist/${MY_P}-extras.tar.xz
+	mirror://gentoo/${MY_P}-selinux.tar.xz https://dev.gentoo.org/~vapier/dist/${MY_P}-selinux.tar.xz
+	mirror://gentoo/${MY_P}-f2fs-tools.tar.xz https://dev.gentoo.org/~vapier/dist/${MY_P}-f2fs-tools.tar.xz
+	mirror://gentoo/${MY_P}.ninja.xz https://dev.gentoo.org/~vapier/dist/${MY_P}.ninja.xz"
+
+# The entire source code is Apache-2.0, except for fastboot which is BSD-2.
+LICENSE="Apache-2.0 BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~arm-linux ~x86-linux"
+IUSE="python"
+
+DEPEND="sys-libs/zlib:=
+	dev-libs/libpcre2:=
+	virtual/libusb:1="
+RDEPEND="${DEPEND}
+	python? ( ${PYTHON_DEPS} )"
+DEPEND+="
+	dev-lang/go"
+
+S=${WORKDIR}
+CMAKE_USE_DIR="${S}/boringssl"
+
+unpack_into() {
+	local archive="$1"
+	local dir="$2"
+
+	mkdir -p "${dir}"
+	pushd "${dir}" >/dev/null || die
+	unpack "${archive}"
+	if [[ ${dir} != ./* ]] ; then
+		mv */* ./ || die
+	fi
+	popd >/dev/null
+}
+
+src_unpack() {
+	unpack_into "${MY_P}-arch.tar.gz" arch
+	unpack_into "${MY_P}-core.tar.gz" core
+	unpack_into "${MY_P}-extras.tar.xz" extras
+	unpack_into "${MY_P}-f2fs-tools.tar.xz" ./f2fs-tools
+	unpack_into "${MY_P}-selinux.tar.xz" ./selinux
+	unpack_into boringssl-${BORINGSSL_SHA1}.tar.gz boringssl
+
+	unpack "${MY_P}.ninja.xz"
+	mv "${MY_P}.ninja" "build.ninja" || die
+
+	# Avoid depending on gtest just for its prod headers when boringssl bundles it.
+	ln -s ../../boringssl/third_party/googletest/include/gtest core/include/ || die
+}
+
+src_prepare() {
+	cd "${S}"/core
+	eapply "${WORKDIR}"/arch/trunk/fix_build_core.patch
+	eapply "${FILESDIR}"/${P}-build.patch
+	sed -i '1i#include <sys/sysmacros.h>' adb/client/usb_linux.cpp || die #616508
+
+	cd "${S}"/selinux
+	eapply "${WORKDIR}"/arch/trunk/fix_build_selinux.patch
+
+	cd "${S}"/extras
+	sed -e 's|^#include <sys/cdefs.h>$|/*\0*/|' \
+		-e 's|^__BEGIN_DECLS$|#ifdef __cplusplus\nextern "C" {\n#endif|' \
+		-e 's|^__END_DECLS$|#ifdef __cplusplus\n}\n#endif|' \
+		-i ext4_utils/sha1.{c,h} || die #580686
+
+	cd "${S}"
+	default
+
+	# The pregenerated ninja file expects the build/ dir.
+	BUILD_DIR="${CMAKE_USE_DIR}/build"
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	append-lfs-flags
+
+	cmake-utils_src_configure
+
+	sed -i \
+		-e "s:@CC@:$(tc-getCC):g" \
+		-e "s:@CXX@:$(tc-getCXX):g" \
+		-e "s:@CFLAGS@:${CFLAGS}:g" \
+		-e "s:@CPPFLAGS@:${CPPFLAGS}:g" \
+		-e "s:@CXXFLAGS@:${CXXFLAGS}:g" \
+		-e "s:@LDFLAGS@:${LDFLAGS}:g" \
+		-e "s:@PV@:${PV}:g" \
+		build.ninja || die
+}
+
+src_compile() {
+	# We only need a few libs from boringssl.
+	cmake-utils_src_compile libcrypto.a libssl.a
+
+	eninja
+}
+
+src_install() {
+	dobin adb fastboot
+	dodoc core/adb/*.{txt,TXT} core/fastboot/README.md
+	use python && python_foreach_impl python_doexe core/mkbootimg/mkbootimg
+	newbashcomp arch/trunk/bash_completion.fastboot fastboot
+}
diff --git a/dev-util/android-tools/files/android-tools-8.1.0_p1-build.patch b/dev-util/android-tools/files/android-tools-8.1.0_p1-build.patch
new file mode 100644
index 000000000000..f3d664ef70a3
--- /dev/null
+++ b/dev-util/android-tools/files/android-tools-8.1.0_p1-build.patch
@@ -0,0 +1,30 @@
+--- a/adb/sysdeps.h
++++ b/adb/sysdeps.h
+@@ -66,6 +66,11 @@
+ #endif
+ #endif
+ 
++#ifndef __clang__
++#define _Nonnull
++#define _Nullable
++#endif
++
+ #ifdef _WIN32
+ 
+ // Clang-only nullability specifiers
+--- a/libcutils/include/cutils/trace.h
++++ b/libcutils/include/cutils/trace.h
+@@ -18,7 +18,13 @@
+ #define _LIBS_CUTILS_TRACE_H
+ 
+ #include <inttypes.h>
++// https://gcc.gnu.org/PR60932
++#ifdef __cplusplus
++#include <atomic>
++using namespace std;
++#else
+ #include <stdatomic.h>
++#endif
+ #include <stdbool.h>
+ #include <stdint.h>
+ #include <stdio.h>
diff --git a/dev-util/android-tools/files/make-tarballs.sh b/dev-util/android-tools/files/make-tarballs.sh
new file mode 100755
index 000000000000..5a0a775c1290
--- /dev/null
+++ b/dev-util/android-tools/files/make-tarballs.sh
@@ -0,0 +1,128 @@
+#!/bin/bash
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Create the various tarballs we need.  GoB does not provide stable archives (unlike github),
+# and some repos are uselessly fat, so we have to create things by hand.  Fun times.
+
+set -e
+
+die() {
+	echo "error: $*" >&2
+	exit 1
+}
+
+fetch_boringssl() {
+	local ver=$1 tag=$2
+	local content hash
+
+	echo "checking boringssl in ${tag}"
+	content=$(wget -nv "https://android.googlesource.com/platform/external/boringssl/+/${tag}/BORINGSSL_REVISION?format=TEXT" -O -)
+	hash=$(echo "${content}" | base64 -d)
+	echo "using boringssl ${hash}"
+
+	local tar="${DISTDIR}/boringssl-${hash}.tar.gz"
+	if [[ ! -e ${tar} ]] ; then
+		# We use github as it provides stable tarballs.  GoB does not (includes timestamps).
+		# https://boringssl.googlesource.com/boringssl/+archive/${hash}.tar.gz
+		wget -c "https://github.com/google/boringssl/archive/${hash}.tar.gz" -O "${tar}"
+	fi
+
+	du -h "${tar}"
+}
+
+# The extras repo has ballooned to ~200MB, so we have to strip the large useless
+# files and random binaries.
+fetch_extras() {
+	local ver=$1 tag=$2
+	local tar="${DISTDIR}/android-tools-${ver}-extras.tar.xz"
+
+	if [[ ! -e ${tar} ]] ; then
+		local prune=(
+			ioshark
+			memory_replay
+			perfprofd
+			simpleperf
+		)
+		local dir="${tag}-extras"
+		rm -rf "${dir}"
+		mkdir "${dir}"
+		cd "${dir}"
+
+		wget "https://android.googlesource.com/platform/system/extras/+archive/${tag}.tar.gz" -O extras.tar.gz
+		tar xf extras.tar.gz
+		rm -rf "${prune[@]}" extras.tar.gz
+
+		cd ..
+		tar cf - "${dir}" | xz -9 > "${dir}.tar.xz"
+		rm -rf "${dir}"
+
+		mv "${dir}.tar.xz" "${tar}"
+	fi
+
+	du -h "${tar}"
+}
+
+# Since the GoB archive is unstable, we might as well rewrite it into xz to shrink.
+fetch_selinux() {
+	local ver=$1 tag=$2
+	local tar="${DISTDIR}/android-tools-${ver}-selinux.tar.xz"
+
+	if [[ ! -e ${tar} ]] ; then
+		wget "https://android.googlesource.com/platform/external/selinux/+archive/${tag}.tar.gz" -O - | zcat | xz > "${tar}"
+	fi
+
+	du -h "${tar}"
+}
+
+# Since the GoB archive is unstable, we might as well rewrite it into xz to shrink.
+fetch_f2fs() {
+	local ver=$1 tag=$2
+	local tar="${DISTDIR}/android-tools-${ver}-f2fs-tools.tar.xz"
+
+	if [[ ! -e ${tar} ]] ; then
+		wget "https://android.googlesource.com/platform/external/f2fs-tools/+archive/${tag}.tar.gz" -O - | zcat | xz > "${tar}"
+	fi
+
+	du -h "${tar}"
+}
+
+usage() {
+	local status=$1
+
+	[[ ${status} -eq 1 ]] && exec 1>&2
+
+	cat <<-EOF
+	Usage: $0 <android version>
+
+	To find the next available version, consult:
+	https://git.archlinux.org/svntogit/community.git/log/trunk?h=packages/android-tools
+
+	They have some helper scripts for building the files directly.
+
+	Example:
+	$0 android-8.1.0_r1
+	EOF
+
+	exit ${status}
+}
+
+main() {
+	[[ $# -ne 1 ]] && usage 1
+	[[ $1 == "-h" || $1 == "--help" ]] && usage 0
+
+	if [[ -z ${DISTDIR} ]] ; then
+		eval $(portageq -v envvar DISTDIR)
+	fi
+	if [[ -z ${DISTDIR} ]] ; then
+		die "Please set \$DISTDIR first"
+	fi
+
+	local ver="${1#android-}"
+	local tag="android-${ver}"
+	fetch_boringssl "${ver}" "${tag}"
+	fetch_extras "${ver}" "${tag}"
+	fetch_selinux "${ver}" "${tag}"
+	fetch_f2fs "${ver}" "${tag}"
+}
+main "$@"
diff --git a/dev-util/bitcoin-tx/Manifest b/dev-util/bitcoin-tx/Manifest
index d71b798de1e0..94a39905b926 100644
--- a/dev-util/bitcoin-tx/Manifest
+++ b/dev-util/bitcoin-tx/Manifest
@@ -9,5 +9,5 @@ DIST bitcoin-v0.15.1.tar.gz 7550228 BLAKE2B 0cbb7d0e9d0e5e8eb33502a28289c3f9c86b
 EBUILD bitcoin-tx-0.13.0.ebuild 528 BLAKE2B 60a0d9c8a7f9e3fb5d8133bbc3901d66c926462d17934c154be41526b055c63d81f375bf8cb0088eb5cbd647dbbbdfcdd6f8607d69fcfc23dfb0c61cdda6dcfd SHA512 42d7da959153cee964d123c71bf1e208efa2c659962e3aff3bf4a3870bdfdf60d7ead83f406cb34c2f0c000647c1bf253fddecd44a2367e66ad98af4505d1f0e
 EBUILD bitcoin-tx-0.13.1.ebuild 528 BLAKE2B 6bafef6268bc694a82b9876d4ea579e21bbdb22d468b914c96782256ecf9279c77ccfc94a0a8f61aa5ebe272126586023e908e2e0a2a790bc15e05ea17340a00 SHA512 023bcfe09bd579348696e3ff8633ec7632154fbb1e6e7f00cc95fb3dba78c010bffc94df563bada1a5261d409fcc1c373d60a078d4421db1d0c0974a07f1df98
 EBUILD bitcoin-tx-0.13.2.ebuild 530 BLAKE2B c888139f668f5ebc58b08e868d14d5678532d0bf099921625651a7bdf61028883717f14e457eeab996352e435485e8c67c4a8acf2666b4897b132b6b6f773906 SHA512 ce2ecc28c077fdd95022ac4783deea341a756cfc7061923ad3046cc620699b42407e57a350c4faa7b52c8818eea0bb2a9cb834920961987edf5e83123748344a
-EBUILD bitcoin-tx-0.15.1.ebuild 2469 BLAKE2B 7ad5eb31dac6a0d63e5f42d4a6dc87136f82dd586a90ce36df0e8320d01328a277f18a7cabae659594248ca679b8bd15809a0ca5a1214d1cf39b67be886624dd SHA512 d103ec9b73e80796e71c074c9b68dc602711fbd18c2f992c09c1efe23ebbf80c20bf730dc5d3cf6512b85e5fd0b06d29edde33c95b625dc3ab611531bd43e0ef
+EBUILD bitcoin-tx-0.15.1.ebuild 2468 BLAKE2B 56f856df813286c940e8f94ec6b31931940d971e735d7a9de28cb0324f77f2e1ed7dbc817d4a25efdcf5d3aafefa9adf0570c25620364b685561dd927e157379 SHA512 b1c9487a4801fcbb154b0e41f3ca563fb2adcdc0c29f55f8f9eca1f0c1f0279683ecbe21c4d42886d957360606c7db638bb608bcd8af28d8cea935276a6ccd03
 MISC metadata.xml 675 BLAKE2B 7b92bc182ba751e03f1c39d2c03ff0d585f9bbca06f73056cb033d449b492baa521e41f2aba0cd333f91769c859f0ce0c8060c5147f1cb7a33dffd60201ef13e SHA512 88cc1fd8dbecc4c30c96680e2d38a8f870ff9ff3ab21003fc00bf159ed105ab606d5abd5242456c3776f2d3af6c860f9f622c117afd6f0d79bdc0b80931863b4
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.15.1.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-0.15.1.ebuild
index 0fc227141642..d5c34e353b89 100644
--- a/dev-util/bitcoin-tx/bitcoin-tx-0.15.1.ebuild
+++ b/dev-util/bitcoin-tx/bitcoin-tx-0.15.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2010-2017 Gentoo Foundation
+# Copyright 2010-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ DESCRIPTION="Command-line Bitcoin transaction tool"
 HOMEPAGE="http://bitcoincore.org/ http://bitcoinknots.org/"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc x86 ~amd64-linux ~x86-linux"
 
 SRC_URI="
 	https://github.com/${MyPN}/${MyPN}/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> ${MyPN}-v${PV}.tar.gz
diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest
index 40e407e1b7c1..c2f3d947bbae 100644
--- a/dev-util/devhelp/Manifest
+++ b/dev-util/devhelp/Manifest
@@ -1,5 +1,5 @@
 DIST devhelp-3.22.0.tar.xz 491908 BLAKE2B ef10aa5030aeac01458e4762694bb7e9d51d2ca1b086de52a4c62b604a437c67eafab63f3b336fc8f0102b4eb0806a31f0bc0a48a4e70f06b15eb95576e881e5 SHA512 16d9853c4514d7b28381e3755e34682a2e9d64d666bb7d39094289d4990eb981efac041b7bf7f8beef5a018cab71c461ecd4e7b7a099fbc132f5b8f7b79749dc
 DIST devhelp-3.24.0.tar.xz 615460 BLAKE2B b81ac9b1453c0edff45fa746a556343345a150c6436d68db4d51f716704eca70e7aa1af4f3deb5b5c2747db65de619be119f36af807490aa8f95fd070c68cc39 SHA512 56b1eeaf9d3c3357d3140002bed5c29bf7b21953d964405190a1c9cad69d08000efa0220bbc36c67db4151b15ee37c37e061e6fa63c8a79f626e1ec0ce386062
 EBUILD devhelp-3.22.0.ebuild 1455 BLAKE2B 9e2e0eb968f08fdcc02a739f59a9c860d834d3a3a1494f37c77a77edb31a73b80d3ed2f48527605283b644250a092b6865cc626c1ecd406b8e03fa9f1517c264 SHA512 3f5d630349d6eaadb41b14b3069dca5d87ac480758624844f56ff30a62172f37e6baf2dac562fea76aaf3a1b88fbc9d6249e997378894a8404c655533617a7ed
-EBUILD devhelp-3.24.0.ebuild 1621 BLAKE2B fe2152f1f9433b4b6cb4edc1c09b7d56d012a5308f80e1f504ac237c3f10a592a7869c4f5bf8fc4d1fde282dc4b6da262d5741ae34c5199d3c11c4c892cbcfe9 SHA512 71e806fa0afce6c15ccf06eb67be10e2d5fba99b9b3da6bec84415a34f97d3cca883dc0831341461136d4b79988795124f10e953e1ec47cf620123c6e09db4d8
+EBUILD devhelp-3.24.0.ebuild 1620 BLAKE2B 3109dbca3591f2b8f5a3ff5bfeb8389bc91a0e07519892f900d68810f2a4780ffacd473f48e8fd79a6b21780da592a815504aa73cf0981f89a64c426770a2974 SHA512 886e1203fd56a94d812e5c870841b2e0078738299860fe70b861a6b9e0a7d4b9787242967c8fab66ac745f1a7b32d8bcce8add9f6e44cddcc636c8df7b525663
 MISC metadata.xml 337 BLAKE2B b031370d8a469a93790b021e5d5f1bbd368ad0c13b144e4fb593d0abbe04d2408f6a7083ae1a1580ef5fdeaf26c59bcbcfcc0d5731f2fd42bde769cf1fb1ece2 SHA512 76931a5e5bff4c6f32aa55e27ff6ef6e320f79c21f1e3c3b3af4733dc0c141a7b782dfa38227fca4d6d50b763dcc3fd191581862ada051951b3185c596ca6753
diff --git a/dev-util/devhelp/devhelp-3.24.0.ebuild b/dev-util/devhelp/devhelp-3.24.0.ebuild
index 26458feb0dca..ea0598606290 100644
--- a/dev-util/devhelp/devhelp-3.24.0.ebuild
+++ b/dev-util/devhelp/devhelp-3.24.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Devhelp"
 
 LICENSE="GPL-2+"
 SLOT="0/3-3" # subslot = 3-(libdevhelp-3 soname version)
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="gedit +introspection"
 REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 690584c6f2d0..454939d9cf96 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -3,5 +3,5 @@ AUX setup.py-2.32.4 192 BLAKE2B 574320d89095d1452a3eee4404b5ebb19fbed32febf2a154
 DIST glib-2.50.3.tar.xz 7589284 BLAKE2B 8648e5d9e8f4c943ca3ec5a5ec01f380f55f76555bf4ec731e211b33d0e23c29ea2a9323e2e839f35f89f292863df76d4e8c622fc44c0e5905eb904576618dbd SHA512 ef35806c15170b6608445f255136c0bebd2d433adf903c2af2865f6a57b4f2fcfc1e4a7cea1a0dac48ff5fe26248fbf7886dba4a8d209506f0a94160df8fb7af
 DIST glib-2.52.3.tar.xz 7679972 BLAKE2B 8d9f6b714571bd04ab9717fbf9ded8556664e43dcdb7dd59436b8b7f1a8a5cdf98e9ce60ca1ead941af1d57688044fefb6c749fa735084622a3482b058864ff6 SHA512 a068f2519cfb82de8d4b7f004e7c1f15e841cad4046430a83b02b359d011e0c4077cdff447a1687ed7c68f1a11b4cf66b9ed9fc23ab5f0c7c6be84eb0ddc3017
 EBUILD gdbus-codegen-2.50.3.ebuild 1305 BLAKE2B 5aecff45e4829b32d3404c81f664620a54a2127bf066ef3af51e9be9ec3b70d4f5b18c674bec23d1b061f32af4d4346bef508ec0cf9111c94ebb7f2c7b01cd0d SHA512 cb018c694e4639888ff696c72b9df895de46946a0849668b3ccce9d6dcdae8193bc84cbf7ff2a0ccdd75108c8b4358d76cfe547dc8849cfa22c69ee42f8d3223
-EBUILD gdbus-codegen-2.52.3.ebuild 1320 BLAKE2B 3a1f923eb21e502e26d38c7b7e78c61e75097f0c08d316806a2b30dec20ceafa5d31a01ba1030e3537b5bcdfeac9b5a3098f1a266f53eaeb52d5006e79cedfee SHA512 71725b4e73bdf125d18a534f43425ddad78960d207f78a36c511bac90e1d3e1ea70a46560dec2444aa23ca0805a6990ddb8ec5f92a55ea52d97f2b4c1c5a2363
+EBUILD gdbus-codegen-2.52.3.ebuild 1319 BLAKE2B e71c33e97b5fb23efafa306fd2e785586802337d8329806d13482b0766e220c692ca5d69d463a6b57bef1b97999ef8923ad8b14c15b48aded45dfd9e02b665c4 SHA512 1c699710ba623fe1ca352762b47bb772c3a5831bb128cdc059648b446f9d247af9449387dc09121479825fcd594792134a1a5fe26f338fc6a44dc4562124e47e
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.52.3.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.52.3.ebuild
index 4cbb142890ca..6832845178cc 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.52.3.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.52.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest
index 39fdc9b2faea..4188bbbe4c6f 100644
--- a/dev-util/glade/Manifest
+++ b/dev-util/glade/Manifest
@@ -2,5 +2,5 @@ AUX glade-3.14.1-doc-version.patch 853 BLAKE2B b7cad3cc9d49cfe24189ba21bffaec2c5
 DIST glade-3.20.0.tar.xz 3492928 BLAKE2B bab8682ec83a98f7f405a667e9fc9ad4b0fa334e0f1f3b1ba5bd8e17af1c61c65031ebe2fe56b8321df142f5a4d8dec348793bba0fc3c195c6722d635d52a291 SHA512 58c8da3522c75470f5b42492bddd83f61d828fa2a3fb8a78d15813f6d1f1df22bd808f25ae7228bf2e821bacdcc5665b889bac3ea8364c4dac288f95e817e98a
 DIST glade-3.20.2.tar.xz 3535064 BLAKE2B 33e5e9477556ac5f645cf13658ff1eebdaf046c1bbbcf5ac528c00f9b5f76943ede8140cc6a3b73dc27ed96c363208700031306f19478ba0e9e2fbae8319f500 SHA512 45f850ed4d409aaf11153da45398e7974d7b85235bf5d5043bc11755c3e4d1201f59ed854786162a7414f0521c818982560d4e226f93625b9253dc598793118a
 EBUILD glade-3.20.0.ebuild 2390 BLAKE2B 22cd5f2417192d963cbb2ff1376d9fa4b5eb44aba78f53c233dc5fd159fb93fa2c03096d71a35cd89321dd2d1f28092a503a4fd0f5cc8883da76854d9a470292 SHA512 98673ca19010e2a63c5c7c9c79dbfdb65939324004c7be6d8b846684411af444ef1fc499234296bfff24d5f8e03842781378d6099356af8b6dc236e757bdf047
-EBUILD glade-3.20.2.ebuild 2396 BLAKE2B 237aaf54a619ab8e545ad4c56be27561c21b4c8e9cb1204a56b1a751cb1700b33a2859c36b5d5697240b13c3ad0861f37f9cf82f525a934f4c4542d5a9315adf SHA512 4876debc51b547a7076d2e9fd2f34d5719537ba1807257be46e11691d5485a4108cb5bbe0a65ecb23fa472ed8be8cee01cecdddc2d8175c4ee2001b15ca14736
+EBUILD glade-3.20.2.ebuild 2395 BLAKE2B c0c5d6234b71bd1c0100462faf14c5c4d9a3fa6db3469e114ec3a9fe37ab2b3f705378e53f624ffe2c8cfbbdda3d8d02a6fc854289bc2000195033652130c1cf SHA512 717c6e8b931132af9aa2a36262212d732d7971927a889379b389a95dcec5fab8d844a2cd0ca4cba58605530bdbe1e06b519f500c7b08f0b0297b96c2461ac51c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/glade/glade-3.20.2.ebuild b/dev-util/glade/glade-3.20.2.ebuild
index d99a8af28dc4..2d2aaacb86eb 100644
--- a/dev-util/glade/glade-3.20.2.ebuild
+++ b/dev-util/glade/glade-3.20.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://glade.gnome.org/"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="3.10/6" # subslot = suffix of libgladeui-2.so
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 IUSE="debug +introspection python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-util/nvidia-cuda-sdk/Manifest b/dev-util/nvidia-cuda-sdk/Manifest
index 641bebb73f7e..6b798970d9bb 100644
--- a/dev-util/nvidia-cuda-sdk/Manifest
+++ b/dev-util/nvidia-cuda-sdk/Manifest
@@ -4,9 +4,11 @@ DIST cuda_7.5.18_linux.run 1195424633 BLAKE2B 35933c3c3355231cd59e579e6ac6a30cca
 DIST cuda_8.0.44_linux.run 1457082926 BLAKE2B a6408ddf8984dc4b0725cc4f53549c4d4fc4b3bd4de2771896953dbe023aa6d04ad38f5d6bf1ab3ff5752d2c18b400f478c9dbb263755267836c5de79e4f8f51 SHA512 1bf9d8e6b853c2a971b8d908a043adc5b11ec7033faed04a773c42680882753f98bc33b46f6b301c24c0f780f74bc237dce5766fc857f1a905e6c1f200728d86
 DIST cuda_8.0.61_375.26_linux.run 1465528129 BLAKE2B d52ddf1dcf5246f230f210d10d1f6e7b540c892dea5a8cd770f0d062b30b01f5c8467d930430b383464d40a9b4a14eaaf22a365e081955e4452ec4f55e08da0b SHA512 d22303719a9feff64f95bf6a966f1caa2bf0cf8c955e475ce08ce54faa5e098d336c2db223ef0185c1f23b9c52b7d2f81a63515485219cfc016d72bda979248b
 DIST cuda_9.0.176_384.81_linux.run 1643293725 BLAKE2B 4155de544f877f6c420c2463bc68679cc89774f0516d1885d5c3f483ad86e7f25ecf6042b8240431b814230136f3026196a013bb18184fa2ec9af555bb7ea723 SHA512 00e24638c02d049c575732dee5237db21f7c451b606f37cf95e44e89d47d0cb055255e9f70dc013298c9e0d224147f239488558904556b68572e3f31935489a9
+DIST cuda_9.1.85_387.26_linux.run 1639829845 BLAKE2B c9f6544893b8e4d0b4c51d66f1cf17a593e65af6e7748e2994abda8ffcb839a7bb19cb0eebfbc52347293296025f000241d1c9842af0c41d31928770c4639b79 SHA512 492a5fa58fc93ac718ca093f24bb5e74dd2586338c42f2e11e328c7f16756e3511a1c555b12cb1990bb782d0d1600976f4c9e5b3d4857e371b0431daf06b2827
 EBUILD nvidia-cuda-sdk-6.5.19.ebuild 3992 BLAKE2B 3cd45f806009b7ef888c59c566af037109d20a6a4f5306ff6a6187266cfba019575f94c35df3780377a437074d630edcc88e3c4c3510a2511a27808f4d7d1012 SHA512 367460c2bc89549774ead4cde22c875ed3df9f8002fdd6666289649c6749295389204a11cd0cd6ab201cb2eed1e43d1cda45aea42b9864c9a7fb5ba813aaa04e
 EBUILD nvidia-cuda-sdk-7.5.18.ebuild 3568 BLAKE2B 45c89d2ea4116aa687ea797997cdf03bd7f14626ef49e505144ef9864aa88c7130878dee1896e0b0fbffec5b7815a4f753c1b5a71e4582676efb03aa62c0663a SHA512 199004e748db588de447c71ac2bddb08fdfbbc099a335ecbcd7e57978cc3cbb9cfdd6a87765c6b315cfac067248c133eeff1a98fc2e9d331a138ccb5266a1f7e
 EBUILD nvidia-cuda-sdk-8.0.44-r1.ebuild 3757 BLAKE2B 2a63de4062e746841c0e975aa68a5e40b358267b7682ca54bcad4c4b97ca3a1ac463c98ce081138d56013945cd22e9ff818d9b4391f8f6e15c1ddb8f4813aa70 SHA512 b2270c56dc77e85db6963c01965afb4a85b7acf3790630d955adf0d64d2ca09203c9423285684c99432037c8378dd5856c5ccf4b91a0b364f54c282765c149d9
 EBUILD nvidia-cuda-sdk-8.0.61.ebuild 3803 BLAKE2B bb1f549d41e64984e8b3ae629461f3bc616bb776324fd2d29e529a66453bb2304c8ad6d397e7c5b790d759455869b88f9796bf12f760a2816e651caa85226480 SHA512 91ed589b1841b6069e24ea8fd12fc55d73c7bca0b33cd6b7b37746fbd3c896ce8224a5622b7750720595d1f36a7daecc3661612148f58e6e6e79028b2a0333fa
 EBUILD nvidia-cuda-sdk-9.0.176.ebuild 3803 BLAKE2B af3448e2d60b3f1ba82594628a783d17fab1d5de9a45eb1a8974ad6b233a41ca447a38a593e88bb63ffacf67fda7b554b2fba5a77a326987c7755265004f5a49 SHA512 22d346ee211e410d74b110d62252e1299f4eb77a51295e329fd757a73010732d9d32c1c68f51b3b6e81af1e34207b3a74419e8df9a20e20632ca681ecc98cbf4
+EBUILD nvidia-cuda-sdk-9.1.85.ebuild 3798 BLAKE2B c10c6cd7aaef1b99089f36d319f7f5375fb117c3f8840fc367c44368a7cac7366d54f377c9d775207dec61d0ca67885ef2ba61a70daee4d5326453dc7e831f71 SHA512 e5c37b2319ffd7d91b4d24721ffbd4617aec28924ebef86ffd44d7a3de2eeebf726a6bf518cad195261e485f7fc8d4850565ba83186026962ca9d49e49bfdddb
 MISC metadata.xml 366 BLAKE2B 379204c3535fb9e98e2026ae695a62618006c42a590b13803db1990c07119a3a40e7bb4474c73f3717340987fc3ed2829dc9d6b0774103a2b4f6c0726bdf58d2 SHA512 174f0718320ba2b8c7b427d43ed2b35f781313cc97397958c5c4c49163ef6d02eae5658071238d764392905c403d13094c898f95f22e1a0360a24ae2a7d08459
diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-9.1.85.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-9.1.85.ebuild
new file mode 100644
index 000000000000..1f648f706dc4
--- /dev/null
+++ b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-9.1.85.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cuda flag-o-matic portability toolchain-funcs unpacker versionator
+
+MYD=$(get_version_component_range 1-2)
+DRIVER_PV="387.26"
+
+DESCRIPTION="NVIDIA CUDA Software Development Kit"
+HOMEPAGE="https://developer.nvidia.com/cuda-zone"
+SRC_URI="https://developer.nvidia.com/compute/cuda/${MYD}/Prod2/local_installers/cuda_${PV}_${DRIVER_PV}_linux -> cuda_${PV}_${DRIVER_PV}_linux.run"
+
+LICENSE="CUDPP"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux"
+IUSE="+cuda debug +doc +examples opencl mpi"
+
+RDEPEND="
+	~dev-util/nvidia-cuda-toolkit-${PV}
+	media-libs/freeglut
+	examples? (
+		media-libs/freeimage
+		media-libs/glew:0=
+		>=x11-drivers/nvidia-drivers-${DRIVER_PV}[uvm]
+		mpi? ( virtual/mpi )
+		)"
+DEPEND="${RDEPEND}"
+
+RESTRICT="test"
+
+S=${WORKDIR}/samples
+
+QA_EXECSTACK=(
+	opt/cuda/sdk/0_Simple/cdpSimplePrint/cdpSimplePrint
+	opt/cuda/sdk/0_Simple/cdpSimpleQuicksort/cdpSimpleQuicksort
+	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimplePrint
+	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimpleQuicksort
+	)
+
+src_unpack() {
+	# We first need to unpack the cuda_${PV}_linux.run file
+	# which includes the cuda-samples*run file.
+	unpacker
+	unpacker run_files/cuda-samples*run
+}
+
+pkg_setup() {
+	if use cuda || use opencl; then
+		cuda_pkg_setup
+	fi
+}
+
+src_prepare() {
+	export RAWLDFLAGS="$(raw-ldflags)"
+#	epatch "${FILESDIR}"/${P}-asneeded.patch
+
+	local file
+	while IFS="" read -d $'\0' -r file; do
+		sed \
+			-e 's:-O[23]::g' \
+			-e "/LINK/s:gcc:$(tc-getCC) ${LDFLAGS}:g" \
+			-e "/LINK/s:g++:$(tc-getCXX) ${LDFLAGS}:g" \
+			-e "/CC/s:gcc:$(tc-getCC):g" \
+			-e "/GCC/s:g++:$(tc-getCXX):g" \
+			-e "/NVCC /s|\(:=\).*|:= ${EPREFIX}/opt/cuda/bin/nvcc|g" \
+			-e "/ CFLAGS/s|\(:=\)|\1 ${CFLAGS}|g" \
+			-e "/ CXXFLAGS/s|\(:=\)|\1 ${CXXFLAGS}|g" \
+			-e "/NVCCFLAGS/s|\(:=\)|\1 ${NVCCFLAGS} |g" \
+			-e 's:-Wimplicit::g' \
+			-e "s|../../common/lib/linux/\$(OS_ARCH)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
+			-e "s|../../common/lib/\$(OSLOWER)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
+			-e "s|../../common/lib/\$(OSLOWER)/\$(OS_ARCH)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
+			-i "${file}" || die
+			# -e "/ALL_LDFLAGS/s|:=|:= ${RAWLDFLAGS} |g" \
+	done < <(find . -type f -name 'Makefile' -print0)
+
+	rm -rf common/inc/GL || die
+	find . -type f -name '*.a' -delete || die
+
+	eapply_user
+}
+
+src_compile() {
+	use examples || return
+	local myopts=("verbose=1")
+	use debug && myopts+=("dbg=1")
+	export FAKEROOTKEY=1 # Workaround sandbox issue in #462602
+	emake \
+		cuda-install="${EPREFIX}/opt/cuda" \
+		CUDA_PATH="${EPREFIX}/opt/cuda/" \
+		MPI_GCC=10 \
+		"${myopts[@]}"
+}
+
+src_test() {
+	addwrite /dev/nvidiactl
+	addwrite /dev/nvidia0
+
+	local i
+	for i in {0..9}*/*; do
+		emake -C "${i}" run
+	done
+}
+
+src_install() {
+	local f t crap=( *.txt Samples.htm* )
+
+	if use doc; then
+		ebegin "Installing docs ..."
+			while IFS="" read -d $'\0' -r f; do
+				treecopy "${f}" "${ED%/}"/usr/share/doc/${PF}/
+			done < <(find -type f \( -name 'readme.txt' -o -name '*.pdf' \) -print0)
+
+			while IFS="" read -d $'\0' -r f; do
+				docompress -x "${f#${ED%/}}"
+			done < <(find "${ED%/}"/usr/share/doc/${PF}/ -type f -name 'readme.txt' -print0)
+		eend
+	fi
+
+	ebegin "Cleaning before installation..."
+		for f in "${crap[@]}"; do
+			rm -f "${f}" || die
+		done
+		find -type f \( -name '*.o' -o -name '*.pdf' -o -name 'readme.txt' \) -delete || die
+	eend
+
+	ebegin "Moving files..."
+		while IFS="" read -d $'\0' -r f; do
+			t="$(dirname ${f})"
+			if [[ ${t/obj\/} != ${t} || ${t##*.} == a ]]; then
+				continue
+			fi
+			if [[ -x ${f} ]]; then
+				exeinto /opt/cuda/sdk/"${t}"
+				doexe "${f}"
+			else
+				insinto /opt/cuda/sdk/"${t}"
+				doins "${f}"
+			fi
+		done < <(find . -type f -print0)
+	eend
+}
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index 129f93408e31..1604b38184c3 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -7,10 +7,12 @@ DIST cuda_7.5.18_linux.run 1195424633 BLAKE2B 35933c3c3355231cd59e579e6ac6a30cca
 DIST cuda_8.0.44_linux.run 1457082926 BLAKE2B a6408ddf8984dc4b0725cc4f53549c4d4fc4b3bd4de2771896953dbe023aa6d04ad38f5d6bf1ab3ff5752d2c18b400f478c9dbb263755267836c5de79e4f8f51 SHA512 1bf9d8e6b853c2a971b8d908a043adc5b11ec7033faed04a773c42680882753f98bc33b46f6b301c24c0f780f74bc237dce5766fc857f1a905e6c1f200728d86
 DIST cuda_8.0.61_375.26_linux.run 1465528129 BLAKE2B d52ddf1dcf5246f230f210d10d1f6e7b540c892dea5a8cd770f0d062b30b01f5c8467d930430b383464d40a9b4a14eaaf22a365e081955e4452ec4f55e08da0b SHA512 d22303719a9feff64f95bf6a966f1caa2bf0cf8c955e475ce08ce54faa5e098d336c2db223ef0185c1f23b9c52b7d2f81a63515485219cfc016d72bda979248b
 DIST cuda_9.0.176_384.81_linux.run 1643293725 BLAKE2B 4155de544f877f6c420c2463bc68679cc89774f0516d1885d5c3f483ad86e7f25ecf6042b8240431b814230136f3026196a013bb18184fa2ec9af555bb7ea723 SHA512 00e24638c02d049c575732dee5237db21f7c451b606f37cf95e44e89d47d0cb055255e9f70dc013298c9e0d224147f239488558904556b68572e3f31935489a9
+DIST cuda_9.1.85_387.26_linux.run 1639829845 BLAKE2B c9f6544893b8e4d0b4c51d66f1cf17a593e65af6e7748e2994abda8ffcb839a7bb19cb0eebfbc52347293296025f000241d1c9842af0c41d31928770c4639b79 SHA512 492a5fa58fc93ac718ca093f24bb5e74dd2586338c42f2e11e328c7f16756e3511a1c555b12cb1990bb782d0d1600976f4c9e5b3d4857e371b0431daf06b2827
 EBUILD nvidia-cuda-toolkit-6.5.14.ebuild 3818 BLAKE2B e368a3fa7258a86f920f53da56039b940cc84e551265d458e1a3c7bc7b9321c4020e5ada9b56fc588ef4708acc4cfe9a8d2e259ad12b0c71fb57635b05b873bf SHA512 7f73c4e321234f6a19166e6e28719f6c98cecb809f9878ee1182b812e18fcc6f8c29fb2ebd0ed520847f38bfddd6a0bc60fae6b711b75f563ab39a9b322468b2
 EBUILD nvidia-cuda-toolkit-6.5.19-r1.ebuild 3844 BLAKE2B 42603527c1f012d49c98026d3f96f5ecd832cc4f31fd1afcf6738dd4e3e2aeee0ac55beeae994bbff4f48562adfe11b72270e516f8fb70d32cf00ae59f55bd78 SHA512 f40103348972041a9d6c09a8c129b68603ce0fafa29df1fdf6b13014bb97156a44881161d4668beef8af9b77adea9df8034c88d6413a6ac2ad709285f785df79
 EBUILD nvidia-cuda-toolkit-7.5.18-r2.ebuild 3355 BLAKE2B 07076b6506902bcadb8f7b6430db04beb380b76da35c5745e313910518855bb7e4c5d746d880bf7f3bbd07fc06cbb17f0d7d76bb267f9679c3d8099e398f7d35 SHA512 4e8070e399766796b1589329db4de04fc0fda0cbd1dc8ec1984b8550f1bc10d490fed7b085066f4419d5cbdf98ea2ae8202b29a9d360fe3b2a3be6e20bc802be
 EBUILD nvidia-cuda-toolkit-8.0.44.ebuild 3311 BLAKE2B f9dc70a5ed6c7ba920d07e4b3213babb2d4f4c5991c8fb343563728e4b3bd2ebe0ca53f97f867c493d67e7a15f33683aa6dabb7fe13b2832dd12a617dd26948c SHA512 807ac67b141dd390d78ec4e764dc939e993aa3b23c6469dde9e29c62a0ac7bbbd3be4d2425e3a1a9863a813c88c5fe0da37f07d1bb2fc91c0593cab99f8e8a8b
 EBUILD nvidia-cuda-toolkit-8.0.61.ebuild 3361 BLAKE2B d43051ae9eed5138e952b22159035f8557e8b5cfe0b7c0bdc411b389e60a0db9ad1f890e5c8a0159689aaa1fa06abb7a8c843c6973cd2204a6fcbebd8a0f89f0 SHA512 b98d5b85eb4405ba749061b7d228f3e86057592283a36f189eda2f1d859b2e1e55c9c6c1444e9521ac699ab8bb7b6f87a8e2457a5fe5ca85cc13043e59cdeb33
 EBUILD nvidia-cuda-toolkit-9.0.176.ebuild 3368 BLAKE2B 8782b66dd08834300b4f3935544d9e3263725b3e04774bce75c55c174052d0203cef71a94df974b1cf0fa943da76137931d443e20d9f0a733db9cec18d6f3aeb SHA512 719b65770838e7497abcd39f318773d049339cd5e1335a58a7d873c4112edf85c670ddfd9544bbaa1a6f31501e1c0e699f88b9ad3d6f0409990ed7b7ce803c4c
+EBUILD nvidia-cuda-toolkit-9.1.85.ebuild 3345 BLAKE2B af1bdce7f452973e1addfd4881abf937dbb17e8ac946e496148805dd8407b3f3485ced3487334779d6d536fedb294a3eb9241f90920bce4529256bb94f4987ab SHA512 9adef55be28117a0875704cbffb4975ac99674b3dc608909e7c5978b53f558c21049454589a5e8624ca12d6ffe4308cdf1839380ad1569955902659d0ffab7a9
 MISC metadata.xml 456 BLAKE2B 9c2baf84429d6969aad82a907a25acb5080bcfb3a5eb996f235ad05ed6ef5345df1c268bee9398c105f5926184f6179f46f98b396397266eef82ee9f6e7db470 SHA512 7745eb56d4a3a9a7d01e3143e807f2018d288c00bcc6c3bd0624c989d4e15ac5521dc087553cd643ff04392c1ac9964578fe03d05947eb2ed4cae21bceb9c67c
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.1.85.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.1.85.ebuild
new file mode 100644
index 000000000000..e7f7fb9df63d
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.1.85.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit check-reqs cuda toolchain-funcs unpacker versionator
+
+MYD=$(get_version_component_range 1-2)
+DRIVER_PV="387.26"
+
+DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
+HOMEPAGE="https://developer.nvidia.com/cuda-zone"
+SRC_URI="https://developer.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_${DRIVER_PV}_linux -> cuda_${PV}_${DRIVER_PV}_linux.run"
+
+LICENSE="NVIDIA-CUDA"
+SLOT="0/${PV}"
+KEYWORDS="-* ~amd64 ~amd64-linux"
+IUSE="debugger doc eclipse profiler"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	<sys-devel/gcc-7[cxx]
+	>=x11-drivers/nvidia-drivers-${DRIVER_PV}[X,uvm]
+	debugger? (
+		sys-libs/libtermcap-compat
+		sys-libs/ncurses:5/5[tinfo]
+		)
+	eclipse? ( >=virtual/jre-1.6 )
+	profiler? ( >=virtual/jre-1.6 )"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="opt/cuda/*"
+
+CHECKREQS_DISK_BUILD="3500M"
+
+pkg_setup() {
+	# We don't like to run cuda_pkg_setup as it depends on us
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	unpacker
+	unpacker run_files/cuda-linux*.run
+}
+
+src_prepare() {
+	local cuda_supported_gcc
+
+	cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4 6.3 6.4"
+
+	sed \
+		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
+		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
+
+	default
+}
+
+src_install() {
+	local i remove=( doc jre run_files install-linux.pl cuda-installer.pl )
+	local cudadir=/opt/cuda
+	local ecudadir="${EPREFIX}${cudadir}"
+
+	if use doc; then
+		DOCS+=( doc/pdf/. )
+		HTML_DOCS+=( doc/html/. )
+	fi
+	einstalldocs
+
+	mv doc/man/man3/{,cuda-}deprecated.3 || die
+	doman doc/man/man*/*
+
+	use debugger || remove+=( bin/cuda-gdb extras/Debugger extras/cuda-gdb-${PV}.src.tar.gz )
+
+	if use profiler; then
+		# hack found in install-linux.pl
+		for i in nvvp nsight; do
+			cat > bin/${i} <<- EOF || die
+				#!/usr/bin/env sh
+				LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \
+					UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \
+					${ecudadir}/lib${i}/${i} -vm ${EPREFIX}/usr/bin/java
+			EOF
+			chmod a+x bin/${i} || die
+		done
+	else
+		use eclipse || remove+=( libnvvp libnsight )
+		remove+=( extras/CUPTI )
+	fi
+
+	for i in "${remove[@]}"; do
+		ebegin "Cleaning ${i}..."
+		rm -rf "${i}" || die
+		eend
+	done
+
+	dodir ${cudadir}
+	mv * "${ED%/}${cudadir}" || die
+
+	cat > "${T}"/99cuda <<- EOF || die
+		PATH=${ecudadir}/bin$(usex profiler ":${ecudadir}/libnvvp" "")
+		ROOTPATH=${ecudadir}/bin
+		LDPATH=${ecudadir}/lib64:${ecudadir}/lib:${ecudadir}/nvvm/lib64
+	EOF
+	doenvd "${T}"/99cuda
+
+	use profiler && \
+		make_wrapper nvprof "${ecudadir}/bin/nvprof" "." "${ecudadir}/lib64:${ecudadir}/lib"
+
+	dobin "${T}"/cuda-config
+}
+
+pkg_postinst_check() {
+	local a b
+	a="$(version_sort $(cuda-config -s))"; a=( $a )
+	# greatest supported version
+	b="${a[${#a[@]}-1]}"
+
+	# if gcc and if not gcc-version is at least greatest supported
+	if tc-is-gcc && \
+		! version_is_at_least gcc-version ${b}; then
+			ewarn ""
+			ewarn "gcc >= ${b} will not work with CUDA"
+			ewarn "Make sure you set an earlier version of gcc with gcc-config"
+			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
+			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
+			ewarn "to the nvcc compiler flags"
+			ewarn ""
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		pkg_postinst_check
+	fi
+}
diff --git a/dev-util/pycharm-community/Manifest b/dev-util/pycharm-community/Manifest
index 14906b1441f1..49be2da653c2 100644
--- a/dev-util/pycharm-community/Manifest
+++ b/dev-util/pycharm-community/Manifest
@@ -1,6 +1,8 @@
 AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73156f63892b1e126ac068d5b2f271d1b71a77486205848cce72452d671692418b6e09e8e25da60e SHA512 a0254552b98b6ec8dadd91ed7df35bf990d08025d8352366f58ecabe94cdde2df64d8665447d0a2ffc1edacdeb05124c2a82722d5ad70b614d90bb0ae38544d2
 DIST pycharm-community-2017.3.1.tar.gz 279798932 BLAKE2B e442ffb2445915a14408a7a7221bfd256a4ca13a654db91dad5f267304fff666238b624c0448ff80b620bb73b2839093d7df678745715feba49941907030024a SHA512 0fe8a80751954e9cd9b6cae63e16b75f22095cddd784f9adfe1073ee62ec1aecf8f60ba2c332a575e70f2c0d312150f8d5129a9d1c539b541ccc6b0b8a37961a
+DIST pycharm-community-2017.3.3.tar.gz 279677180 BLAKE2B 373276332c918a325290e9ca0fa37ac7512025e0c0ee8149c3c08321b0477a0a5263fc24dece443c471f2a96a1b147153b0952466e374acf62389e1c49a1f114 SHA512 d4e9dffa7d2abef825fdbe7ce2665e2d249b18d81f7dab5051a0a2fda7896e5df7cce16e19518225dd23205c346df8fc5c5b3cb39280886004340cba60aeacd4
 DIST pycharm-community-2017.3.tar.gz 282451011 BLAKE2B 250265d7cb0cb3ba94733c9404f6bc1c6e4f62207721011e9eec65780f9e4c92148626065051a1e875124d013cff488c8d7ab9861c094bf4a33c0b8596e717e9 SHA512 4e835f671971171966f52a4219f47fda2675b2fcf38f0f91ff90b1aa00508ed3b5445a488750c6e9d82515780e9f190201da918230c0b80d869d6b16ab352cc6
 EBUILD pycharm-community-2017.3.1.ebuild 1066 BLAKE2B fd3cedb8558e565838e32d1311b9cc158e52203a498255511b251fdafe08b2648cf5ff7f9f3b24967cea500f80b4361194be63f410989bb6aae5c063be7455e3 SHA512 0ec2532598c20f9bdd3f462bfff2b70b893c62b0979f094c69e8aa1bf124a62e16657f141b3f153486addf009c7ef7c3c80a3d5411a3bdb6539ccc97bbe86c3e
+EBUILD pycharm-community-2017.3.3.ebuild 1048 BLAKE2B 3c4cffd33ec2c9251d572b22770dd0e6e166373546d5b3712fe98bb9d86aa5200711fee48eaf49e877d2e3bfb94f264c7a02a9a7c388de271717132ccfa86f84 SHA512 1fbdf07d28786955d015e1005c5652c6de63e9d4f548fcf37cd6f18f18cbd0690e7e590003db7fd073595dbcdf2121f92a2b3e7563428b6f8bd14e480891171f
 EBUILD pycharm-community-2017.3.ebuild 1094 BLAKE2B 251c4ba36753fc2cf04b36835e99d8f1ad190693377701d673e3ca4189d58802e7781d7d905800964310f0b269d9d63fdd90201c50269e87223af5330cec6b1c SHA512 20468f06fac62a49a9a950276aaed0105ad839d405230d1040f9bea6ec0ce5f68d53eb7b0d291a340bac008d4778be87287c36e270612ef6e42fd2b5e8a43f6f
 MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/dev-util/pycharm-community/pycharm-community-2017.3.3.ebuild b/dev-util/pycharm-community/pycharm-community-2017.3.3.ebuild
new file mode 100644
index 000000000000..4cba69da5984
--- /dev/null
+++ b/dev-util/pycharm-community/pycharm-community-2017.3.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils readme.gentoo-r1 xdg
+
+DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
+HOMEPAGE="http://www.jetbrains.com/pycharm/"
+SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/${PN}/bin/fsnotifier
+	opt/${PN}/bin/fsnotifier64
+	opt/${PN}/bin/fsnotifier-arm"
+
+MY_PN=${PN/-community/}
+
+src_prepare() {
+	default
+
+	rm -rf jre || die
+}
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r *
+
+	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
+
+	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
+	newicon bin/${MY_PN}.png ${PN}.png
+	make_desktop_entry ${PN} ${PN} ${PN}
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/dev-util/pycharm-professional/Manifest b/dev-util/pycharm-professional/Manifest
index 42191e721fee..d097f1b6a2e0 100644
--- a/dev-util/pycharm-professional/Manifest
+++ b/dev-util/pycharm-professional/Manifest
@@ -1,6 +1,8 @@
 AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73156f63892b1e126ac068d5b2f271d1b71a77486205848cce72452d671692418b6e09e8e25da60e SHA512 a0254552b98b6ec8dadd91ed7df35bf990d08025d8352366f58ecabe94cdde2df64d8665447d0a2ffc1edacdeb05124c2a82722d5ad70b614d90bb0ae38544d2
 DIST pycharm-professional-2017.3.1.tar.gz 355985604 BLAKE2B 9a1739972ce6d7a68f6f49554f62f20be3804fab24ceb7b0561ff0c4882f943e8373d38c3245030841ec3345b13dbf22a5fade66a07fae382a4dd5c29597c3cf SHA512 23d4a85714cca1763a987780eb20f5519a07ef1997e85c09b8ea57674bf6666f3ccedcd8c4d558813c44de397a4d8331e2fa9a357e056d4f3eea6b2b32195a62
+DIST pycharm-professional-2017.3.3.tar.gz 356063034 BLAKE2B afe45081582983c05590602ed10b66ee687bd3ef4995bb0ae0404dddefe795ff8e93af2ac384ffa37600f2eebc882fa1bc6de8b6831341957ea69bda4e4632c3 SHA512 1e6d9fc1de13ecea5f4a2cf5bd9f2d7116a40802c24cf21ac731183d4b20aab480e34e039f1ca2fa36b4d873c85204febea975392d73da5a32f239037c7bd59e
 DIST pycharm-professional-2017.3.tar.gz 358504339 BLAKE2B 4ac1eb3feed289326a0122e3e4f869d7be740db1fd8d1c5f5c80400a8d8aa2daa444d4fa279c33865aecec4af4a28999e10b100714a44aa1d772d7f598ac05f4 SHA512 b7a085eda5d3e4ca8a918009f80cd7d90a281f2e522718211b4813f199a9c3a8f38f9742600336c09db479691c789d852ddc1d99e9ee2b11876e85728ae51b44
 EBUILD pycharm-professional-2017.3.1.ebuild 1227 BLAKE2B 9d8c803c956dd600e5504da8557ca4bcdf7dd8ed0cdee18e118b38defc06b94363a422d759c6814758b319c9654b9eb86108ce52e8a97783870c0ba6b7e56ee0 SHA512 3600bff6ac964bc1735f4304cac2b4c31cf6a705d1e6df1625a4d0fa50298f57687c7619da56c1556be4a80e3a20f5a35df546a4c040867d2acb9477d457fc7e
+EBUILD pycharm-professional-2017.3.3.ebuild 1209 BLAKE2B a0865f4184edbdec76451a2cc5078df72fec809af6ce933e1d41d6b2e99d9be3df11633f4553e9fa71f7e7b6ad87c37fd5bdb1cbf617f896d7eff9337be98a95 SHA512 6d7575cd6e83c452dd8c2de8a0b0f6cdb0e458e6dda8adf4280f4df23768c7306ab45c671783dd7a023ca4f8baf8035d95b8d51fe894e125e50c0067c417ce75
 EBUILD pycharm-professional-2017.3.ebuild 1255 BLAKE2B 562fb3468298c372f2fd5d5492a8a882315d7159c7e743de76219b1e7f45989f186807495e07370c5b5d7e35f6c200eac5e73d567f5db754bab448c4dc57bd6f SHA512 908869fbce14f4d7c1b4dc44fc39f1c82eb11663d8a3164e684a2fff659c9eb15b87eb6e5e62befc5af73dc1a65f3fc0f5ea4a5baabfc5bf740f3fba91ad67ea
 MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/dev-util/pycharm-professional/pycharm-professional-2017.3.3.ebuild b/dev-util/pycharm-professional/pycharm-professional-2017.3.3.ebuild
new file mode 100644
index 000000000000..5dc7e67e051f
--- /dev/null
+++ b/dev-util/pycharm-professional/pycharm-professional-2017.3.3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils readme.gentoo-r1 xdg
+
+DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
+HOMEPAGE="http://www.jetbrains.com/pycharm/"
+SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+
+LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8
+	 dev-python/pip"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/${PN}/bin/fsnotifier
+	opt/${PN}/bin/fsnotifier64
+	opt/${PN}/bin/fsnotifier-arm
+	opt/${PN}/bin/libyjpagent-linux.so
+	opt/${PN}/bin/libyjpagent-linux64.so"
+
+MY_PN=${PN/-professional/}
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	default
+
+	rm -rf jre || die
+}
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r *
+
+	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
+
+	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
+	newicon bin/${MY_PN}.png ${PN}.png
+	make_desktop_entry ${PN} ${PN} ${PN}
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/dev-util/sysprof/Manifest b/dev-util/sysprof/Manifest
index ec265f6f4cfe..3700ae897315 100644
--- a/dev-util/sysprof/Manifest
+++ b/dev-util/sysprof/Manifest
@@ -1,5 +1,5 @@
 DIST sysprof-3.22.2.tar.xz 581864 BLAKE2B 9a5c3a6fed2b5aaff8edddf9d3405840510b5d0a3f9eaa619e5e8d5be5bf900b15bc528e0702426840d1be91cb203c318d6b4737c78e8010dc76263363d6a427 SHA512 601e83f8809bfc970b87a8cbecfc868e957d992aa554316e80b44f21c97a58ef0a236e0b0bda6accc01d5d551f7fca76b4882863a9ea498578731b49dc75322c
 DIST sysprof-3.24.1.tar.xz 595920 BLAKE2B 90582eab3fc12a0169c151ce0fad20b839841f77a31e5858f8d660f9b0f2630396bec3b239dd88baa3f6e3dd936bdd6d63a652e491a1d32f966a755f9099f160 SHA512 5d323bcb9923c511065132711963dc8856c4d837b4d7ccfae5cc5794be5ac8ad1dc42504025469199f4bfd6a6fad4d8f49b7b21cab6f0c9a954820182e75c7d0
 EBUILD sysprof-3.22.2.ebuild 1679 BLAKE2B 1e8864bb2ef5c7711397eeac0b391784f1c078fd0f7c1e89cbcb88ecea8607ba5def2879776ba6e4a29e4396b5bdb6523bed257d9589dc0b61639d22b26eabc7 SHA512 a24e95b2cfd651ff4772e3f8556696ec099dcb8dc59fa961539251de23cf531c705eba1515d0b9f32e04d5d2479b2199d46f6776b2bc0c596617ad46df67001c
-EBUILD sysprof-3.24.1.ebuild 1764 BLAKE2B ae665b8cdedf4b43bcd7d9946c93c10078da5e677dd5c622d00438ab4c8d4190124e081a5c772b2226dc4a05cfb8ee4151e67abbc7c48bddd02d20e39655a439 SHA512 8ba4c47314e0a39d8e15a9afa3fcbced60180860bc75d1a4d3feb2b27a593778dd8ead96a1a3ccc86f5b50b5f75b6cdd4b62f5c403bf3e5ad7d8a1248e072b03
+EBUILD sysprof-3.24.1.ebuild 1763 BLAKE2B c81164fc3edc01f4de0aea00f4e0b16271969602df89e36e8ecda44c0c88f94b330ddbeab3adf56815cd4c5a7e758cf00d589e7ab3b070eb9f52604ba4b302bb SHA512 8d21fda2b5848b33e7bfee6e7bf9a919a82b0a190fa005750e618802267ef476d34e1629617c338f30fb55baef86065f11888b037253851a1fa5934a79bbe1cd
 MISC metadata.xml 833 BLAKE2B dbfc3237b83c6440d8f02dd72be458a0a6fb3d40ad609cfd454561650f0f5e60d8b1486696e84d1ee29faffaffa0dfb909df4f24492facf7cb88668c43ac48b7 SHA512 190e4b54bedcffac3323133feb1fd48b0ff81df3fafd647b3761fb8aa7d31abccba2fd720f3aa1af37a515c48ad3159f30e0609d287db091647b07a935853aec
diff --git a/dev-util/sysprof/sysprof-3.24.1.ebuild b/dev-util/sysprof/sysprof-3.24.1.ebuild
index bc46f88d4238..af910f73b7a0 100644
--- a/dev-util/sysprof/sysprof-3.24.1.ebuild
+++ b/dev-util/sysprof/sysprof-3.24.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="http://sysprof.com/"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug gtk systemd"
 
 RDEPEND="
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index fbd902c0072f..aa97fdd39774 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/archway/Manifest b/dev-vcs/archway/Manifest
deleted file mode 100644
index dd1b17458751..000000000000
--- a/dev-vcs/archway/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST archway-0.2.1.tar.gz 384389 BLAKE2B 1cfa7e601cb75018d0f0f8ba2230d90e90ef8d0469e84863b4e1cd56dec11a81304be29783070a1162f7edf87b23198359ed2d291ac0287fd42d5c048d33769b SHA512 52a9a5c3ced55dd50e996c75b7973c0d8e57a1b4f2094c8be598f8cb6f4b291c7d6c8ad79b447a32aa0a4f73263d65409d9b0c8ea8ef505e71e73d03fbb92a7d
-EBUILD archway-0.2.1.ebuild 646 BLAKE2B 4d7a139a50482dd6ffb34580600ea4a9446c68d264cc8be87bb4952955f6cccfc9a547c82a6dbdb9f6fdf66586065e2796c9bc22ca66b9a57a8db99fdc54e02c SHA512 0dd7ebff47e518dc9c4e477fc149646b85c430d859bba6c5c1b4a493cbcdda4f5264489916b68a656dcb873e6dc935f3cb3edc4cc7afb2c197305daada1c476c
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-vcs/archway/archway-0.2.1.ebuild b/dev-vcs/archway/archway-0.2.1.ebuild
deleted file mode 100644
index 3b5bdcd11259..000000000000
--- a/dev-vcs/archway/archway-0.2.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-inherit eutils
-
-DESCRIPTION="A GUI for GNU Arch"
-HOMEPAGE="http://www.nongnu.org/archway/"
-SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-#"ArchWay requires gtk-2.4 and gtk2-perl." -$HOMEPAGE
-#DEPEND=">=dev-util/tla-1.1
-#	>=dev-lang/perl-5.8.0
-#	>=dev-perl/Gtk2-1.040
-#	>=dev-perl/glib-perl-1.040
-#	>=x11-libs/gtk+-2.4.0"
-
-DEPEND=""
-RDEPEND="x11-libs/gtk+:2
-	>=dev-perl/Gtk2-1.040"
-
-src_install() {
-	emake DESTDIR="${D}" prefix=/usr install || die
-}
diff --git a/dev-vcs/archway/metadata.xml b/dev-vcs/archway/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-vcs/archway/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/dev-vcs/bzr-gtk/Manifest b/dev-vcs/bzr-gtk/Manifest
deleted file mode 100644
index 9577dfa02d96..000000000000
--- a/dev-vcs/bzr-gtk/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX credits.pickle 3540 BLAKE2B dee4f58ec7f27414937ef49e6c235553c72f823f80a1e44c41cc3956c90e3b6cbf86924d3327c8ee0641ddaa1ac03534ce906f6e536edbed52b8aad059d7db4d SHA512 9d308f4e870436a56049c6a4963ac6d4d366b0f6c5367990d940daa3ea900f601a2d8aaa03084f1ca7ad3f826a358b15295ca97753ea98c2b295be508eb5e100
-DIST bzr-gtk-0.104.0.tar.gz 218863 BLAKE2B 3e58368e2a97f0cf7b83f6175ac8d9ddfd733d66852f9ca5f7b62d0c492ec22fb12401cfa0f5afa436e81028b93727d8d49b9f83f58913381f4ebd2464d5e707 SHA512 d39a1303570dd7504cad9211f3b1c86d3e6f022535c262b7b5f7b19899b362ff7b01d9f19e557cb4391d7ccf1470635ebc5d5380d2d5216b6610c4e8e1b7b6a3
-EBUILD bzr-gtk-0.104.0-r1.ebuild 1470 BLAKE2B 40ab5bb68cb0e85dfe7c010137933fc26efe557168680916688840252f9cc5d9780625ba1036f9eda2b859583176be8bd1016fa2cb223451667fe18b36eab9c3 SHA512 1f6891ec28932a54060de3ccca6cdbc053038dd876ed55d41995546a5f4e09f56d5851624e1abd9780eaf6157cfb0a1891d3e5beb9289127fa6118f9301de873
-MISC metadata.xml 676 BLAKE2B daacabc6a172a887888f59e3b4f161439a09c74cc5aaece2fb1fa8848f21088a7e4a0566a19477e8a34a4adb7253269026c80f1568818a90d3c4cbd25586377d SHA512 ff938ff9e51e7534691fc41ae8f6d35ced9dbf55af2305992aaea6607a57dd1a65fa614d52fac52b2a8d2295a75142c19073889ab13e568b62a5ca077af21f76
diff --git a/dev-vcs/bzr-gtk/bzr-gtk-0.104.0-r1.ebuild b/dev-vcs/bzr-gtk/bzr-gtk-0.104.0-r1.ebuild
deleted file mode 100644
index be54ead86506..000000000000
--- a/dev-vcs/bzr-gtk/bzr-gtk-0.104.0-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_P="/${P/_rc/rc}"
-
-DESCRIPTION="A GTK+ interfaces to most Bazaar operations"
-HOMEPAGE="http://bazaar-vcs.org/bzr-gtk"
-SRC_URI="https://launchpad.net/${PN}/gtk3/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnome-keyring gpg nautilus"
-
-DEPEND=">=dev-vcs/bzr-1.6_rc1[${PYTHON_USEDEP}]
-	dev-python/pygobject[${PYTHON_USEDEP}]
-	dev-python/notify-python[${PYTHON_USEDEP}]
-	>=dev-python/pycairo-1.0[${PYTHON_USEDEP}]
-	nautilus? (
-		>=dev-python/nautilus-python-1.0[${PYTHON_USEDEP}]
-		virtual/pkgconfig
-	)"
-RDEPEND="${DEPEND}
-	nautilus? ( >=dev-python/nautilus-python-1.0[${PYTHON_USEDEP}] )
-	dev-python/notify-python[${PYTHON_USEDEP}]
-	gnome-keyring? ( dev-python/gnome-keyring-python[${PYTHON_USEDEP}] )
-	gpg? ( app-crypt/seahorse )"
-
-S="${WORKDIR}/${MY_P}"
-
-#TODO: src_test
-
-python_prepare_all() {
-	cp "${FILESDIR}"/credits.pickle "${S}"/credits.pickle || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	if ! use nautilus; then
-		# automagic dep
-		rm -rf "${D%/}"/usr/$(get_libdir)/nautilus/ || die
-		rm -rf "${D%/}"$(python_get_sitedir)/bzrlib/plugins/gtk/nautilus-bzr.py* || die
-	fi
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /etc/xdg/autostart
-	doins bzr-notify.desktop
-}
diff --git a/dev-vcs/bzr-gtk/files/credits.pickle b/dev-vcs/bzr-gtk/files/credits.pickle
deleted file mode 100644
index fc0e9deceaec..000000000000
--- a/dev-vcs/bzr-gtk/files/credits.pickle
+++ /dev/null
@@ -1,193 +0,0 @@
-((lp0
-VJelmer Vernooij <jelmer@samba.org>
-p1
-aVDaniel Schierbeck <daniel.schierbeck@gmail.com>
-p2
-aVSzilveszter Farkas (Phanatic) <Szilveszter.Farkas@gmail.com>
-p3
-aVGary van der Merwe <garyvdm@gmail.com>
-p4
-aVJasper Groenewegen <colbrac@xs4all.nl>
-p5
-aVVincent Ladeuil <v.ladeuil+lp@free.fr>
-p6
-aVJohn Arbash Meinel <john@arbash-meinel.com>
-p7
-aVAaron Bentley <abentley@panoramicfeedback.com>
-p8
-aVAaron Bentley <aaron@aaronbentley.com>
-p9
-aVAlexander Belchenko <bialix@ukr.net>
-p10
-aVDavid Allouche <david.allouche@canonical.com>
-p11
-aVDan Loda <danloda@gmail.com>
-p12
-aVAaron Bentley <aaron.bentley@utoronto.ca>
-p13
-aVScott James Remnant <scott@netsplit.com>
-p14
-aVScott Scriven <ubuntu@toykeeper.net>
-p15
-aVMateusz Korniak <matkor@laptop-hp>
-p16
-aVRobert Collins <robertc@robertcollins.net>
-p17
-aVSzilveszter Farkas (Phanatic) <szilveszter.farkas@gmail.com>
-p18
-aVMartin Albisetti <argentina@gmail.com>
-p19
-aVSabin Iacob (m0n5t3r) <iacobs@m0n5t3r.info>
-p20
-aVJavier Derderian <javierder@gmail.com>
-p21
-aVjbailey@ubuntu.com
-p22
-aVGary van der Merwe <garyvdm@garyvdm-desktop>
-p23
-aVRichard Ferguson <ubuntu@fergusnet.com>
-p24
-aVMartin Pool <mbp@canonical.com>
-p25
-aVElliot Murphy <elliot@elliotmurphy.com>
-p26
-aVAdeodato Sim� <dato@net.com.org.es>
-p27
-aVv.ladeuil+lp@free.fr
-p28
-aVSzilveszter Farkas <szilveszter.farkas@gmail.com>
-p29
-aVWouter van Heyst <larstiq@larstiq.dyndns.org>
-p30
-aVTorsten Landschoff <torsten@debian.org>
-p31
-aVJamie Wilkinson <jaq@spacepants.org>
-p32
-aVGediminas Paulauskas <menesis@pov.lt>
-p33
-aVAli Sabil <ali.sabil@gmail.com>
-p34
-aVAdrian Wilkins <adrian.wilkins@gmail.com>
-p35
-aVMichael Ellerman <michael@ellerman.id.au>
-p36
-aVMateusz Korniak (matkor@laptop-hp)
-p37
-aVJelmer Vernooij <Jelmer Vernooij@LENOVO-C29B82CD>
-p38
-aVFarkas Szilveszter <szilveszter@szilveszter-desktop>
-p39
-aVDaniel Sch�mer <daniel.schoemer@gmx.net>
-p40
-aVChris Lamb <chris@chris-lamb.co.uk>
-p41
-aVChad MILLER <chad@mysql.com>
-p42
-aVrodney.dawes@canonical.com
-p43
-aVmatkor <matkor@laptop-hp>
-p44
-aVklight@walkertechnical.com
-p45
-aVklight <klight@X111>
-p46
-aVVincent Geddes <vincent.geddes@gmail.com>
-p47
-aVToshio Kuratomi <toshio@fedoraproject.org>
-p48
-aVTom Badran <tom@badrunner.net>
-p49
-aVSzilveszter Farkas <szilveszter@MacBookPro.local>
-p50
-aVSt�phane Raimbault <stephane.raimbault@gmail.com>
-p51
-aVScott James Remnant <scott@ubuntu.com>
-p52
-aVRuss Brown <pickscrape@gmail.com>
-p53
-aVRichard Ferguson <fergus@fergusnet.com>
-p54
-aVRene Huber <rhuber@ubuntu>
-p55
-aVPelle Johansson <pelle@blocket.se>
-p56
-aVMichael Vogt <michael.vogt@ubuntu.com>
-p57
-aVMathias Brodala <info@noctus.net>
-p58
-aVMarkus Korn <thekorn@gmx.de>
-p59
-aVMario Danic  <mario.danic@gmail.com>
-p60
-aVLucas Shrewsbury <rollbak@gmail.com>
-p61
-aVKevin Light <klight@walkertechnical.com>
-p62
-aVJohn Szakmeister <john@szakmeister.net>
-p63
-aVJean-Fran�ois Fortin Tam <jeff@ecchi.ca>
-p64
-aVJasper Groenewegen <colbrac@xs4al.nl>
-p65
-aVJames Westby <jw+debian@jameswestby.net>
-p66
-aVJames Henstridge <james@jamesh.id.au>
-p67
-aVErik Bagfors <erik@bagfors.nu>
-p68
-aVDennis Miller <millerdl@telusplanet.net>
-p69
-aVAndrew Starr-Bochicchio <a.starr.b@gmail.com>
-p70
-aVAndrew Bennetts <andrew@puzzling.org>
-p71
-aVAlexandre D�fossez <alexandre.defossez@gmail.com>
-p72
-aVAdrian Room <ingolemo@gmail.com>
-p73
-a(lp74
-g1
-ag3
-ag6
-ag2
-ag12
-ag4
-ag27
-ag50
-ag29
-ag15
-ag14
-ag66
-ag44
-ag22
-ag49
-aVSense Hofstede <qense@ubuntu.com>
-p75
-ag52
-ag53
-ag17
-ag16
-ag25
-ag19
-ag61
-aVKiddo <nekohayo@gmail.com>
-p76
-ag62
-ag63
-ag38
-ag5
-ag23
-ag11
-ag8
-a(lp77
-g3
-ag2
-ag19
-ag61
-ag1
-a(lp78
-g3
-ag18
-ag51
-atp79
-.
-\ No newline at end of file
diff --git a/dev-vcs/bzr-gtk/metadata.xml b/dev-vcs/bzr-gtk/metadata.xml
deleted file mode 100644
index d167356cecbd..000000000000
--- a/dev-vcs/bzr-gtk/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription lang="en">
-    GTK+ Frontends to various Bazaar commands. Currently contains
-    dialogs for almost all common operations, including annotate and
-    visualise (log). Olive, the integrated version control application
-    is also part of bzr-gtk.
-  </longdescription>
-  <use>
-    <flag name="gpg">Support signing with GnuPG.</flag>
-    <flag name="nautilus">Integrate with Nautilus file manager</flag>
-  </use>
-  <upstream>
-    <remote-id type="launchpad">bzr-gtk</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-vcs/gitg/Manifest b/dev-vcs/gitg/Manifest
index 88feb569ac36..50f9fe40d8f7 100644
--- a/dev-vcs/gitg/Manifest
+++ b/dev-vcs/gitg/Manifest
@@ -3,5 +3,5 @@ DIST gitg-3.24.0.tar.xz 1703132 BLAKE2B 98f57e80d8775c2c4b7c55bd5888daf7d0fdb79a
 DIST gitg-3.26.0.tar.xz 1551308 BLAKE2B 45a9fd3df8eb891c4e07eefb6cf8f9b517c78dccc63dd08498b4c847614e164472e0605a01c81515ea349366e56c21c99a4558e73b6548b18bb94f578c0fc9bd SHA512 782aa02e2f0f4d8c86ad726045502d545877d835f0449d2ec646d93a78bbfa50f84662d3a437c922eb168b2737c00ec088dc2c73487742f332e3910f041b519d
 EBUILD gitg-3.22.0.ebuild 1927 BLAKE2B 869538a8e5a2d880bda6140dda4fb74312939f534edebdcac73cf83a258da107e24f6eb2093f094521c3130b8c7abef38ce0f32ca0fbb755fe02b1fb4aa44404 SHA512 acdb0e281c3554fc82d5b7f85830fff6c733b515f748c6458ed047b3b0f1ff4de705337c8364269f09fe140f05d8839d0c013146c6a449f38b97a0b5cfce9cd9
 EBUILD gitg-3.24.0.ebuild 1929 BLAKE2B fbd3fee32abb5536cd427ca61ee597651d334013ab8ab922ff9644ab74b7681979bba5fd9bdff9077cf77524598068053f164a011dfd5f69c670971c84d2426f SHA512 9eb75f76ff51e575168f148bcc8067bf50df010d1915056362b6b63fa8ecafcff88b75f8018e3df10a734dd2c50ccf3d3e10f27edb371043744b871fdf50cffc
-EBUILD gitg-3.26.0.ebuild 1929 BLAKE2B 7809b1f5eb0fb7d6bb607ea7b30b76046be671ac858ef50d93854cf8716c6dec2cedf0f83697a1d57e72489cf8138a497335a347c4a092382e35e0b1fab0218c SHA512 c375ec93d31682ed043767704419198a3350c141942230cadf6322e5dde7f5bf9858053d037d63e1c18a065ec432bd7f8d925280fe5aa429d992a6c85f33fa26
+EBUILD gitg-3.26.0.ebuild 1928 BLAKE2B 0253ad287f4b1f9487cb57c2707e99fe83b64242ee04c53232dc58fd99fc4b214e716e56af1239f2ad01990d321231a7fbbd523a212cd48a980f99473a8660db SHA512 246c9a8430f47da6e617417eab32969c3b481a029f71e8b922cb91ab0319b49cc7e3bb8b88e14f4d42f084d44dd8799d792a1a8a0edffd3fc164520661346b56
 MISC metadata.xml 700 BLAKE2B f8330088988ad7eecd0dd8fa3f92fa9a22647e5c3a410051e0623124d2ab2bdc140b5330661124638bb2fe2d7c43b272004f07ce0bc344dd42a563b38ff1c15e SHA512 f5277e8ce7d17576ab50cbc5dd7694a9adcff03340029156915a085ada0bcc34e0366fbefdc9f4de0030694c8ce48d2d1baef62ead4650309c2af2def0309d3e
diff --git a/dev-vcs/gitg/gitg-3.26.0.ebuild b/dev-vcs/gitg/gitg-3.26.0.ebuild
index d2f5cf8684e8..5c5196587a39 100644
--- a/dev-vcs/gitg/gitg-3.26.0.ebuild
+++ b/dev-vcs/gitg/gitg-3.26.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gitg"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 
 IUSE="glade +python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index b304303e9de0..93d2dbcb0463 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/enlightenment.eclass b/eclass/enlightenment.eclass
index ae7bb396590c..8e4cc5a7a241 100644
--- a/eclass/enlightenment.eclass
+++ b/eclass/enlightenment.eclass
@@ -37,7 +37,7 @@ E_ECONF=()
 #
 #	live         $PV has a 9999 marker
 #		KEYWORDS ""
-#		SRC_URI  svn/etc... up
+#		SRC_URI  git/etc... up
 #		S        $WORKDIR/$E_S_APPEND
 #
 # Overrides:
@@ -45,8 +45,7 @@ E_ECONF=()
 #	SRC_URI     EURI_STATE
 #	S           EURI_STATE
 
-E_LIVE_SERVER_DEFAULT_SVN="http://svn.enlightenment.org/svn/e/trunk"
-E_LIVE_SERVER_DEFAULT_GIT="git://git.enlightenment.org"
+E_LIVE_SERVER_DEFAULT_GIT="https://git.enlightenment.org"
 
 E_STATE="release"
 if [[ ${PV} == *9999* ]] ; then
@@ -58,15 +57,6 @@ if [[ ${PV} == *9999* ]] ; then
 		E_S_APPEND=${EGIT_URI_APPEND}
 		E_LIVE_SOURCE="git"
 		inherit git-2
-	else
-		E_LIVE_SERVER=${E_LIVE_SERVER:-${E_LIVE_SERVER_DEFAULT_SVN}}
-
-		ESVN_URI_APPEND=${ESVN_URI_APPEND:-${PN}}
-		ESVN_PROJECT="enlightenment/${ESVN_SUB_PROJECT}"
-		ESVN_REPO_URI=${ESVN_SERVER:-${E_LIVE_SERVER_DEFAULT_SVN}}/${ESVN_SUB_PROJECT}/${ESVN_URI_APPEND}
-		E_S_APPEND=${ESVN_URI_APPEND}
-		E_LIVE_SOURCE="svn"
-		inherit subversion
 	fi
 	E_STATE="live"
 	WANT_AUTOTOOLS="yes"
@@ -98,8 +88,8 @@ case "${EAPI:-0}" in
 esac
 EXPORT_FUNCTIONS ${ENLIGHTENMENT_EXPF}
 
-DESCRIPTION="A DR17 production"
-HOMEPAGE="http://www.enlightenment.org/"
+DESCRIPTION="An Enlightenment Foundation production"
+HOMEPAGE="https://www.enlightenment.org"
 if [[ -z ${SRC_URI} ]] ; then
 	case ${EURI_STATE:-${E_STATE}} in
 	release) SRC_URI="mirror://sourceforge/enlightenment/${P}.tar.gz";;
@@ -126,7 +116,6 @@ esac
 enlightenment_src_unpack() {
 	if [[ ${E_STATE} == "live" ]] ; then
 		case ${E_LIVE_SOURCE} in
-			svn) subversion_src_unpack;;
 			git) git-2_src_unpack;;
 			*)   die "eek!";;
 		esac
@@ -147,7 +136,6 @@ enlightenment_src_prepare() {
 		# autotools require README, when README.in is around, but README
 		# is created later in configure step
 		[[ -f README.in ]] && touch README
-		export SVN_REPO_PATH=${ESVN_WC_PATH}
 		eautoreconf
 	fi
 	epunt_cxx
@@ -178,7 +166,7 @@ enlightenment_src_compile() {
 
 enlightenment_src_install() {
 	V=1 emake install DESTDIR="${D}" || die
-	find "${D}" '(' -name CVS -o -name .svn -o -name .git ')' -type d -exec rm -rf '{}' \; 2>/dev/null
+	find "${D}" '(' -name CVS -o -name -o -name .git ')' -type d -exec rm -rf '{}' \; 2>/dev/null
 	for d in AUTHORS ChangeLog NEWS README TODO ${EDOCS}; do
 		[[ -f ${d} ]] && dodoc ${d}
 	done
diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index 9db5901b3ce2..b6d0902b5d0a 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/gnome-nibbles/Manifest b/games-arcade/gnome-nibbles/Manifest
index 751cb3179c4f..4862eaa4d55c 100644
--- a/games-arcade/gnome-nibbles/Manifest
+++ b/games-arcade/gnome-nibbles/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-nibbles-3.22.2.2.tar.xz 1594596 BLAKE2B 9bdf1aba88e5d0307e748b3a267a2043c52aeb8d027b89d3249c95c2fbb6e29a7a9817655323a4922f16f1f77c59e095c311c3dee2987ab80021850c766c35b8 SHA512 2cbe56dbbe40393cd233f0c2d9cb7327eafa7e837d194970490752ed1525e512efccd6b41b27dbf49b8b29ba9caa788fd5b44554b114eefbf5eed7187e073cbf
 DIST gnome-nibbles-3.24.0.tar.xz 1614604 BLAKE2B 04ba4f761bf21af466cb7761a8d7ac511f92871548df9e8ff8950efe6ea95c3674e00360dc9c3e02ce670dc66ae7639094c9c8c53fe0a0134089db976976ce99 SHA512 716a79541fa8dd0f86cce5bc211574d4ad50f762bb2b74a2881ad4adcdde47520784f67672e2da3fb33fbc60928d710a2afebb8997d6dd10f633289e0d8163b7
 EBUILD gnome-nibbles-3.22.2.2.ebuild 753 BLAKE2B 1f8c87d7f7c020263fcde8ebdeb6da0de2e3e607edab4ed214bdc1c83cc135d6ca69a264c1c57076f66aeb1aafca872c702829f5be5a42a2ee880b14a8e1beea SHA512 71d5fa29853d62f9bd334996726a7ffef786733c35037c479a739531162082020f7ccab570a0759f74792cf8535351dfc1586fa73f12e4816168fb357b97e287
-EBUILD gnome-nibbles-3.24.0.ebuild 754 BLAKE2B f80a57749f7478ac31d00e257a0666c97c1dbea2ee6ee32b2346a75125d2909d8344589a258b21046796dbc443b8440dd645fa8e5a8e5ee119bb41fb5c1103b6 SHA512 0612b57233976a81a4d3a3113862d2cf8a15110905b98d33d10126fc673c7fa5dffff2bdee0163b1649d713086c6f3eb051909fde60f982b1edc00050db35e51
+EBUILD gnome-nibbles-3.24.0.ebuild 753 BLAKE2B 565574cace28e1371697bd7feae61748410817f7429efef86021708a04237e6ac697b15a90f9649a96a68646628d76861e20d580124e0aba772b4d05a1079a5a SHA512 9025a2dc26d2e6ffb63803b89a9a632dc6d79f77ce69fba88d8bdcf3d0e9179bbc4266958cc32d7ae2c05e4f8f893d40b733ff563786f30b5e2655ad9b4a22b4
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-arcade/gnome-nibbles/gnome-nibbles-3.24.0.ebuild b/games-arcade/gnome-nibbles/gnome-nibbles-3.24.0.ebuild
index e5c666e0265f..73d8d93cec93 100644
--- a/games-arcade/gnome-nibbles/gnome-nibbles-3.24.0.ebuild
+++ b/games-arcade/gnome-nibbles/gnome-nibbles-3.24.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Nibbles"
 
 LICENSE="GPL-3+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index 8ccde2b3da4b..1a9f157d230d 100644
--- a/games-board/Manifest.gz
+++ b/games-board/Manifest.gz
diff --git a/games-board/gnome-chess/Manifest b/games-board/gnome-chess/Manifest
index 2937117e6917..bc6d58e08110 100644
--- a/games-board/gnome-chess/Manifest
+++ b/games-board/gnome-chess/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-chess-3.22.2.tar.xz 2774176 BLAKE2B 58f01b71cd59001601dcd29894051c90421b0c12e8c2f6e6b18d72838cb59f0be3eef271528ab27bf33f1f7a8f7addd9fa6fa7d09a5e783c79ca5d2c869aa88e SHA512 ae939c5a79b4f0ae24a8a5b4a3efa0620aaf913ef46d944abad7f638477b0d711e6ca6b7c1e593a67100ad1ae4b423c7d87c51808911cc38e6022a3fbeafb47e
 DIST gnome-chess-3.24.1.tar.xz 2808208 BLAKE2B 6b6eefb8de8e7b91b23752d78d00704546566f060c8971c4fb17b26a28ca44b659891e036f5cc1f42bbfca41d1aaaca153758115eafb4456a3ddb45fe4caf1a8 SHA512 738bae74a547ccf9f0f3dcccaf164af785086ab54190094d602effae0f3f7c07fb6be4eba4aa8706045f70cb12c407a5151bc836d784c0cd254b1c371670e559
 EBUILD gnome-chess-3.22.2.ebuild 902 BLAKE2B 8e526191c677cf3d481f1f1f0ede729e985acfe7129740911d7930dd9bce8099aabb2bc47b61e0f859c4af7539533fc55066ec6eb77e8f78abfad8d989278931 SHA512 91d08b2329c354fa14a7bd7ed6df17ff54ced6891a65d0be51cd2d43d14a845b4d9ba0cfb3c504bbb8fa4063988480ce9d63896e0ef8ef2ac20cee274b63ae85
-EBUILD gnome-chess-3.24.1.ebuild 903 BLAKE2B 84c02dbc1c2839334ef0159f33eae371c4db58f9557d3f04169232bbd5af34d10f2cb8b726a0e3ae26f756a1b8874c578ea8dacd76f58d466819fb6017c04a40 SHA512 8b36403593ac067764ed01a9dbbcc5b11aad082d72dc24d4a07583d42e3f1f4b9d94609a0ebee6624ac5d69af9f175ea445aaf932868b969089107aed40b0101
+EBUILD gnome-chess-3.24.1.ebuild 902 BLAKE2B 848f9c4ecfb05c94f03ce66d22e7b4541931b2751cad353cf931459e19c7a959dc9da5d0769d3dddec46cdf3ed982a40101b2e722715ac5d09c72b7c5f8ce9de SHA512 170391ed43fa640321a36bbea5a2fec6d035583fd6035f801610fe23a868734c8c5a0a6f55c77b8caeb73ef944da2fffdb8d0a4055bb932c639eee75a21b4b07
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-board/gnome-chess/gnome-chess-3.24.1.ebuild b/games-board/gnome-chess/gnome-chess-3.24.1.ebuild
index b5b9ee2a561e..bb10dc861113 100644
--- a/games-board/gnome-chess/gnome-chess-3.24.1.ebuild
+++ b/games-board/gnome-chess/gnome-chess-3.24.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Chess"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-board/gnome-mines/Manifest b/games-board/gnome-mines/Manifest
index 30e2456fc605..2cb0247cce6e 100644
--- a/games-board/gnome-mines/Manifest
+++ b/games-board/gnome-mines/Manifest
@@ -3,5 +3,5 @@ DIST gnome-mines-3.22.2.tar.xz 3138168 BLAKE2B d08cd9b5a6c4da3f8ed4b5a431a853c2e
 DIST gnome-mines-3.24.0.tar.xz 3145152 BLAKE2B e3867ccadb3966e86075d7fbfa1e4ccbf262e5fb3ae0edf8eb162a6bbb411e4cafb9fd7599156153fc0b10a486e3731beb862299586f31df2393049d3e5bac36 SHA512 6975bd0b60160843441f6143f86e55d732be31583c09f17878d7d09199370b65c42e34d61cf447751de686978eb3fd1dbc74ffcec2dca1adc5ab4ceb208af2c0
 EBUILD gnome-mines-3.20.1.ebuild 689 BLAKE2B 206f912abc192a345aac4c0f8edd7f30e07ee1f6df499803cf03102af2c424006e9d089ef91edb71d3d707288c8b58ae3c0b24b9fe6002a59af3ea6be32b9c05 SHA512 15fd8c2465405beb5f33a850ebd96ee94be75aa83ae8486cc723506a5102cace778ba005379da61d583c6b5ae0eaba43cc8055ef4822a910c6d73467df8aa773
 EBUILD gnome-mines-3.22.2.ebuild 712 BLAKE2B d3f8a1b0e7cc245d5be898a4eb89b610262be29d4185c3331400317aa26ddd7c93a712c4c9b3f05fc554162bde799842db92ec8ed69b94f27e4c998996d4549a SHA512 162ec599eb4e0b0b735bda81b9348c13d33a5f5777a09e6e600ef56a58aee552ff337c0a26950896d6752e84956a68182d7431d1a8835d653396749c7dd81193
-EBUILD gnome-mines-3.24.0.ebuild 713 BLAKE2B a72659666f0449e49654b474dcc1580709b864822560911fcd87b28cffb85b291448121c0393d634854821b5fbbbfcc1cd111e5d86df27657d20c205f697ca4e SHA512 cc1a94b437bf27f6aed9a6a92d889583c0318fc223a6128a45876d3d0ec245608b28e4ebcc7070254a12dc2d2cc23533d140ff9766c018a1ff8ad91d7686be4c
+EBUILD gnome-mines-3.24.0.ebuild 712 BLAKE2B 5779dfe1a6f9c8c2453a6cda669b9d4fae5d79065c8f0d9fe99164b8dd2e16a378eb45af903364e7557047226dac55b6343ba4810ea7ed91a30d0abf416486f2 SHA512 521d4c00fc00fe81130e1104ced511ca0ca9f8750a3f962b22152f202af9bd9bab04a2d2741c2ae63877b60e32353afb1a37fa2182e1d0e92b4c0f1d9a8b7ad3
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-board/gnome-mines/gnome-mines-3.24.0.ebuild b/games-board/gnome-mines/gnome-mines-3.24.0.ebuild
index ab0be4e6a517..8dd488ac7daf 100644
--- a/games-board/gnome-mines/gnome-mines-3.24.0.ebuild
+++ b/games-board/gnome-mines/gnome-mines-3.24.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Mines"
 
 LICENSE="GPL-3+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 0ebc77cae879..83a67a93bf4e 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/gxmame/Manifest b/games-emulation/gxmame/Manifest
deleted file mode 100644
index 337a61260bf5..000000000000
--- a/games-emulation/gxmame/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX gxmame-0.35_beta2-glib-single-include.patch 367 BLAKE2B 3811541ba63a5ad1f1011438751d6512126c2b77431eee238dd53fd0ee46232e692885825d60495886d99cf93ee8e4df1fa1b469a258c12a5800ebbd9e1d519f SHA512 def963684ed246027dbb2613be4960ad103bd539ac8e8bdccfdea65899198be3052d7f8f89ade363a3d53e184ec0ea0d110f0d988bad5d5ec0cb54e159040319
-AUX gxmame-0.35_beta2-ovflfix.patch 1488 BLAKE2B dbc65e23b851e4120a33fd74b0df6fd003467f8e12d3ecccf00cf2e2350a8962ac846ef6364c508c0aa52589b39b1add8f555c29bbf6d42e154fa758e0202be7 SHA512 3c13151fbb1c285dc819413be3e049f089bc246bded77df02aafa950a1822d1f84e24206b07934fda079fd6f5ecc316335daee3b5516f2a8d87791bdd04eab40
-DIST gxmame-0.35beta2.tar.gz 697013 BLAKE2B 8c7396d716d6fded1c2bd3efbc5a90fc8c1835221c208f0e807b50044a2d9d6b392fa27349d9a7a51bcedf20544ff87940a2866fe4d6d6644c80d33aaa56bbe2 SHA512 c2b47c1f3f76d86846302754b31954b81d5b7165f5778153c6e6285bdcc6040c5479009cd70dcf32c86afa245ae8b6fe98af781f0d51acfcb76c8deb76422fe2
-EBUILD gxmame-0.35_beta2.ebuild 1829 BLAKE2B 6c402e94ecbac97a3d7492ddf8c0d2f2ec5e2e8d0668a7e05ab1df60145e1fda237e7e98e889a5f1eab6d2302edb775a4cf7477c5b793840a2a648d82243fa3d SHA512 9c13972407c7b9e4f1c8f109e4fd298c29f9ab7723c30ae70979de86cb4f8b56b88ecec47ea1bea3fb5ced55c900ab4bb5e54fb00b3bbe2f38e045f63f9e5267
-MISC metadata.xml 329 BLAKE2B 1111e8ca24c449b67e5eff40b4ace3df1caa88ae21795adcdad2dc5bcaf79f1e922cf68168818c3b388f7e716a68ba1150c3d2daaedcb1ab3ef47de2ab6a0ae6 SHA512 313bc1d6e61d610abbdd7e7a95826005e6160e5ea7dc4ca3fa58b9811fbd77cf33e33221526871bc2ac383f90d8676f2264629e4898fe92d1d26b5d84c878527
diff --git a/games-emulation/gxmame/files/gxmame-0.35_beta2-glib-single-include.patch b/games-emulation/gxmame/files/gxmame-0.35_beta2-glib-single-include.patch
deleted file mode 100644
index 83ef4aa075e5..000000000000
--- a/games-emulation/gxmame/files/gxmame-0.35_beta2-glib-single-include.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gxmame-0.35beta2/src/gxmame.c
-===================================================================
---- gxmame-0.35beta2.orig/src/gxmame.c
-+++ gxmame-0.35beta2/src/gxmame.c
-@@ -31,7 +31,7 @@
- #include <unistd.h>
- #include <signal.h>
- #include <glib/gprintf.h>
--#include <glib/gutils.h>
-+#include <glib.h>
- #include <gtk/gtkmain.h>
- #include <gtk/gtkfilesel.h>
- 
diff --git a/games-emulation/gxmame/files/gxmame-0.35_beta2-ovflfix.patch b/games-emulation/gxmame/files/gxmame-0.35_beta2-ovflfix.patch
deleted file mode 100644
index 8831a3e09b61..000000000000
--- a/games-emulation/gxmame/files/gxmame-0.35_beta2-ovflfix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/options.c.old	2010-12-01 10:48:45.000000000 +0100
-+++ src/options.c	2010-12-01 10:53:55.000000000 +0100
-@@ -4245,7 +4245,7 @@
- 		case XMAME_EXEC_SVGAFX:
- 			target->fxgkeepaspect = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (fxgkeepaspect_checkbutton));
- 			used_text = gtk_editable_get_chars (GTK_EDITABLE (fx_entry), 0, -1);
--			strncpy (target->resolution, used_text, 20);
-+			strncpy (target->resolution, used_text, sizeof(target->resolution));
- 			g_free (used_text);
- 			break;
- 
-@@ -4330,7 +4330,7 @@
- 	}
- 
- 	used_text = gtk_editable_get_chars (GTK_EDITABLE (soundfile_entry), 0, -1);
--	strncpy (target->soundfile, used_text, 50);
-+	strncpy (target->soundfile, used_text, sizeof(target->soundfile));
- 	g_free (used_text);
- 			
- 	target->timer = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (timer_checkbutton));
-@@ -4465,7 +4465,7 @@
- 	target->skip_disclaimer = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (disclaimer_checkbutton));
- 	target->skip_gameinfo = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gameinfo_checkbutton));
- 	used_text = gtk_editable_get_chars (GTK_EDITABLE (debug_size_combo_entry), 0, -1);
--	strncpy (target->debug_size, used_text, 20);
-+	strncpy (target->debug_size, used_text, sizeof(target->debug_size));
- 	g_free (used_text);
- 	target->use_additional_options = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (additional_options_checkbutton));
- 	/* here I'm using directly the additional option because I don't know its length */
diff --git a/games-emulation/gxmame/gxmame-0.35_beta2.ebuild b/games-emulation/gxmame/gxmame-0.35_beta2.ebuild
deleted file mode 100644
index 58080b943381..000000000000
--- a/games-emulation/gxmame/gxmame-0.35_beta2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-MY_P="${PN}-${PV/_beta/beta}"
-DESCRIPTION="frontend for XMame using the GTK library"
-HOMEPAGE="http://gxmame.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gxmame/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls joystick"
-
-RDEPEND="dev-libs/expat
-	>=x11-libs/gtk+-2.4:2
-	>=dev-libs/glib-2.4:2
-	x11-themes/gnome-icon-theme
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-glib-single-include.patch \
-		"${FILESDIR}"/${P}-ovflfix.patch
-	sed -i \
-		-e "s:-O2 -fomit-frame-pointer -ffast-math:${CFLAGS}:" \
-		-e "s:-O2:${CFLAGS}:" \
-		configure || die
-	sed -i \
-		-e '/Icon/s/\.png//' \
-		-e '/Categories/s/Application;//' \
-		gxmame.desktop.in || die
-	sed -i \
-		-e 's:COPYING::' \
-		-e "s:^docdir = .*:docdir = /usr/share/doc/${PF}:" \
-		-e "s:^htmldir = .*:htmldir = /usr/share/doc/${PF}/html:" \
-		-e "s:^icondir = .*:icondir = /usr/share/icons:" \
-		-e "s:^pixmapdir = .*:pixmapdir = /usr/share/pixmaps:" \
-		-e "s:^gnulocaledir = .*:gnulocaledir = /usr/share/locale:" \
-		-e "s:^icon2dir = .*:icon2dir = /usr/share/icons/mini:" \
-		-e "s:^Graphicsdir = .*:Graphicsdir = /usr/share/applications:" \
-		-e "/DDATADIR/s:\$(datadir):/usr/share/pixmaps:" \
-		-e "/DPACKAGE_LOCALE_DIR/s:\$(datadir):/usr/share:" \
-		Makefile.in html/Makefile.in src/Makefile.in po/Makefile.in.in || die
-	sed -i -e 's/"gxmame"/""/' src/gui.c || die
-}
-
-src_configure() {
-	egamesconf \
-		--with-xmame-dir="${GAMES_DATADIR}"/xmame \
-		$(use_enable nls) \
-		$(use_enable joystick)
-}
-
-src_install() {
-	DOCS="AUTHORS BUGS ChangeLog NEWS README TODO" \
-		default
-	prepgamesdirs
-}
diff --git a/games-emulation/gxmame/metadata.xml b/games-emulation/gxmame/metadata.xml
deleted file mode 100644
index e5c3f321f04a..000000000000
--- a/games-emulation/gxmame/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">gxmame</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-emulation/higan/Manifest b/games-emulation/higan/Manifest
index 185cf6b091f5..486176ae50fc 100644
--- a/games-emulation/higan/Manifest
+++ b/games-emulation/higan/Manifest
@@ -6,5 +6,5 @@ AUX higan-wrapper 124 BLAKE2B 3b87ba7212551d8c5b4814ff41e2ecd647589dafe8abfac6f3
 DIST higan-106_p1.tar.bz2 954533 BLAKE2B e7ea44f97f7e2c3ce86b57b853aa59c4372f37185846f8a928ba659b525965aed39f7859721394a776990e53e2f671fc0e7071d17f9397973343d9a7adcf70ac SHA512 f4d8dbfacaa20b948bd382fd0ef48e89cbb21a0569a70b6a4beca6c0a2ba404efc4c28d14bfd3df14d4fd76c763ca1537166bb24d765a8da33423bbea32df4c3
 DIST higan_v099-source.7z 1012348 BLAKE2B db3eb7b8819532786e6f2dd664225abddc49d12cf5c525862578523240c76ab3ac2680537e04b347130ae7e821d1d98e6c4bf25cf47449567afd90887989aa0e SHA512 567f0c9841fb3fed1c78f2afcd9865cbfe06d04b995d4dc468269e459249b758daed949b461b5b8645ebab40edc1f4f28a566de5795325dae4f604190ca9eae6
 EBUILD higan-099.ebuild 3081 BLAKE2B ff75470da256db5e49f8313d87135af2def1d6bd185effa328bb49b97c783d23cc517e46160888707724a56c73ec1303fd2fd98638197e8f62c28f95ffac6e3b SHA512 3e7eff25fc8649bf2181eba3f383e824230c4d574643c5ef0c986fadcd1464f2db0c5db0b3fcb22ae2d26ebdc5504b24916ee5f91025d7fcdc2e0c9ba64f35d9
-EBUILD higan-106_p1.ebuild 3097 BLAKE2B 5805587f88044b44b3d6858c049a5e3769d786db5e00522c88bb7a40bf73d63a5eb9f3c40f0600b2160b7273de90c7f199bb52c88565fee2515e203435fd06f8 SHA512 1208b4d5283bb8deb64b77bf8bf0dd8afb536475a0ff489ec83a8c3def50239e62d0ec9f3d264e20552f4ce899c00ae16c481078932bd9ba5dd92aae47c56061
+EBUILD higan-106_p1-r1.ebuild 3213 BLAKE2B 0b7dfc5a07055b96c3d8cbd4c936acf6137bcc77d6f906c675910f3e426c169636752d1f9cf33452af2156d345976e4003168377bca172302624d253db7e8519 SHA512 ac879d774978c2804c067e2434296e6d9ed42da7d37dbd2c332506c5eded6cbabe6bd8fe3b07597036bcd3fe784b463442e53d3d389758c0af9f43ed108d7a96
 MISC metadata.xml 377 BLAKE2B aefc33327d342c730de8b2bdd95c2299692c894fd67a3f43d378964e7b776e467d2a4644777e7c8a1eb94b41ee300a65cad084decf64fc02abbac8c02de509c1 SHA512 2faa3ffcca01d5740a5ca1c4f554c51e90e81c6c19cde15cf817c448debb5585e09a1b784d94e3ecd06321ed28a740ce846f1afbd149bce590ca69ef5b1ce9f4
diff --git a/games-emulation/higan/higan-106_p1.ebuild b/games-emulation/higan/higan-106_p1-r1.ebuild
index c0d5d2586aea..a39e0db7e729 100644
--- a/games-emulation/higan/higan-106_p1.ebuild
+++ b/games-emulation/higan/higan-106_p1-r1.ebuild
@@ -86,6 +86,10 @@ src_compile() {
 
 	mytoolkit="gtk"
 
+	# Needed for fluent audio (even on i5 hardware)
+	export CFLAGS="${CFLAGS} -O3"
+	export CXXFLAGS="${CXXFLAGS} -O3"
+
 	if use icarus; then
 		cd "${S}/icarus" || die
 		emake \
diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 2bbab6941cbd..a43f787cced5 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
diff --git a/games-fps/quake1-demodata/Manifest b/games-fps/quake1-demodata/Manifest
index 14ef9de5f13e..42a818047274 100644
--- a/games-fps/quake1-demodata/Manifest
+++ b/games-fps/quake1-demodata/Manifest
@@ -1,3 +1,3 @@
 DIST quake106.zip 9094045 BLAKE2B 39d639a7c4daf48bacfed3d8f7488131cabd61eba3d1969b23958f4f35ac7f693a165500a4a1cf2b917bb8d363d360a402c7100ba8f6b7083c7eaba1fe16756a SHA512 8960c48d9c3c8bb142fd812968d29f05304384bd559b5cdb1d2cb8b6faac84d30ebf9cdf5e5e4eb3739907d9b599ca2ba34035647c58a8ed1874bdc7f0b75e1d
-EBUILD quake1-demodata-1.06.ebuild 1648 BLAKE2B 03c1cd8a982b0ee7af65eb7bf15a8bfd70007dd33ebd7f50a1ceaedc2b1786d8c6d3a98d380a23e2852e5016c82bae25b25fde8fdcc4fb11cbb1595173d87357 SHA512 b344dedbf568fc1644d93e2c3afe9eff37a8fe71ce2fe4a033d770e7beade9d7970892bc22e66aefc0dbdb80e1ee86deded9e7a7222e3b2ca039403373ca5678
+EBUILD quake1-demodata-1.06.ebuild 1649 BLAKE2B 0cb318c5343cec04bc601b03b08ce00c31f28ea67757e6ea066a1786b30399ebe0e5ad1f4df8ebb0f260b0d9fd63f204f5813676900cb93841022f73b3a787d7 SHA512 5e54e5e87fbe59ba0a08ffdeea300958ec4c7246fc984ef72e565028c328a4420ec4a51f55e181755e28a8f1572182a4a77badd225b04f45ca6b3dcafe88e98b
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/quake1-demodata/quake1-demodata-1.06.ebuild b/games-fps/quake1-demodata/quake1-demodata-1.06.ebuild
index da7c8282e831..7b8a34815e89 100644
--- a/games-fps/quake1-demodata/quake1-demodata-1.06.ebuild
+++ b/games-fps/quake1-demodata/quake1-demodata-1.06.ebuild
@@ -8,7 +8,7 @@ MY_PV=$(delete_all_version_separators)
 MY_PN="quake"
 
 DESCRIPTION="Demo data for Quake 1"
-HOMEPAGE="http://en.wikipedia.org/wiki/Quake_I"
+HOMEPAGE="https://en.wikipedia.org/wiki/Quake_I"
 SRC_URI="mirror://idsoftware/${MY_PN}/${MY_PN}${MY_PV}.zip"
 
 # See licinfo.txt
diff --git a/games-fps/quake2-demodata/Manifest b/games-fps/quake2-demodata/Manifest
index b708bf35c807..52965c85ea5e 100644
--- a/games-fps/quake2-demodata/Manifest
+++ b/games-fps/quake2-demodata/Manifest
@@ -1,3 +1,3 @@
 DIST q2-314-demo-x86.exe 39015499 BLAKE2B 1259d8e2481e5667a1a458e356593b026619a16d8dff32b664143121481f61b5e29129aac6b1aee0c0f0f12eee0f254965355f265c6c66d0ba3acab6e1b5983d SHA512 9aa5123807a64a6e3e3b113b582efd353f176f093fd0aae6bd01d9cff397374c06948a7147f59748b3aa6f4251769e409fae838157edb66429c9d41381b3df86
-EBUILD quake2-demodata-3.14.ebuild 1311 BLAKE2B 8f9edbdbfd4c9b7fdcb3685607d455d0365dddf888601654570ae2d1500a559860245a06fe08c4196b13a29b9e9cba746a0db2dfa1d7a20baa213163c77addca SHA512 d48575fc5ccb69c2fdf9a901da5fd0060802b50e6d2cd73915574609108950da4ad6b22d04a9101f4e0b366f3a7d27f68b27a8550f1d1369417e561a182c5623
+EBUILD quake2-demodata-3.14.ebuild 1312 BLAKE2B fde56c8e7c52375e09293e8014aad9cff9044fb5fa5f05cc4fc5baf75e33d7862035144f1019777dd62224dd3a10c59330bf92a5b920cc9fb3a9759638641f1e SHA512 66d0d393d270e6364a58ee26ac9e7e26404431248483248915d557492230f29f8f1ed2cf9141dd4e78c49f8d63a9e091fdf7e0fa8fbb5cd1d5030c02551d700c
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/quake2-demodata/quake2-demodata-3.14.ebuild b/games-fps/quake2-demodata/quake2-demodata-3.14.ebuild
index 03f9521ff9f0..cd68c344cd8a 100644
--- a/games-fps/quake2-demodata/quake2-demodata-3.14.ebuild
+++ b/games-fps/quake2-demodata/quake2-demodata-3.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ MY_PN="quake2"
 FILE="q2-${MY_PV}-demo-x86.exe"
 
 DESCRIPTION="Demo data for Quake 2"
-HOMEPAGE="http://en.wikipedia.org/wiki/Quake_II"
+HOMEPAGE="https://en.wikipedia.org/wiki/Quake_II"
 SRC_URI="mirror://idsoftware/${MY_PN}/${FILE}"
 
 # See license.txt - it's a bit different to Q2EULA in Portage
diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index acd17d74d78f..257c5f887f97 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
diff --git a/games-puzzle/gnome-sudoku/Manifest b/games-puzzle/gnome-sudoku/Manifest
index 9890b9389c9a..1cf2962a4f14 100644
--- a/games-puzzle/gnome-sudoku/Manifest
+++ b/games-puzzle/gnome-sudoku/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-sudoku-3.22.2.tar.xz 2884852 BLAKE2B 69efa4d81c42b39847160038abf7c39fa9473fa7ff65dd4b4189551663ea2a1f215d017f61c2f0db7b081fa80a5dfbc020fb457e1293470bff108fbc6bb63d44 SHA512 4f25848490d3ca1c9a777f7eaf183797c2cff9159851145520ea68d280e46743f5a0f24d5e7290c45d5d5b272ed7cd4d4748116bc573bd117638b620981f6069
 DIST gnome-sudoku-3.24.0.tar.xz 2890256 BLAKE2B 81e8c2cf8df3a441979dfcd6d5726439231d9c4175be1fc765f02aef5bd13bee3675708cd33694f1c2a3a0097e35a83023b6add3bfe7930c4289be576fbfbf2f SHA512 3e00726be6ceebe6107f0e7c1100e1072f815dcaf0f4d5f2ce5cf75ae0393457aead001fe8b43420d20ef6e09bc8a7d6fd79d8aaa72a87c21e7c9f8d18ee0809
 EBUILD gnome-sudoku-3.22.2.ebuild 772 BLAKE2B 5d35e2faf37c16095a88c82e6110c82dbb2455b2a077d63045c6c9d40a44fda04cff6450571d44e7380f26799a4ec596af408f279e4c4c74f2e67eeb21fdf1fe SHA512 d9ccd40508c807d91a5b77c9bb3e7699d36cd06b299889d0d546a4e7175e2062a730e15712ac31de96d0c5837887398ad33ef44cc06e36ea0a30615ecdd5ff4e
-EBUILD gnome-sudoku-3.24.0.ebuild 773 BLAKE2B 7bcbc3dfe77e8c493adf2a5eca0ea3c97d08d236b15073432b7e592be42564dff8ca3d92fd0426e8dbdee5264d8e229dd943399281e42900d0002b99d1d1865c SHA512 c6b5a64474178578b0a81cc801bd8b40c4032e7914f857809ce4ba8b7c76970d5baf676cd7f1882c219d741d01d8076fdb30ae67b86640ecca407be30d35ba23
+EBUILD gnome-sudoku-3.24.0.ebuild 772 BLAKE2B 7716caf3d721948cba678ee7e260aacb2defb1839c990a81d1686fcd211d48b3ff89f989e702938325a3967f8fc888af543a27fb4fe40538b2101fb2e7eed072 SHA512 b940bda715837ad7814a04e13ac1526cdd42a0c4673524783519d15e7eb91a29d0a45f5e76ec49e4b82227972f6200b1ecbf1172588fcec24bef3f9b3a58d8d5
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/gnome-sudoku/gnome-sudoku-3.24.0.ebuild b/games-puzzle/gnome-sudoku/gnome-sudoku-3.24.0.ebuild
index 954b8764ee76..0da196bf2483 100644
--- a/games-puzzle/gnome-sudoku/gnome-sudoku-3.24.0.ebuild
+++ b/games-puzzle/gnome-sudoku/gnome-sudoku-3.24.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Sudoku"
 
 LICENSE="GPL-3+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-puzzle/lightsoff/Manifest b/games-puzzle/lightsoff/Manifest
index 2551ccdb8c50..1934f575af09 100644
--- a/games-puzzle/lightsoff/Manifest
+++ b/games-puzzle/lightsoff/Manifest
@@ -1,5 +1,5 @@
 DIST lightsoff-3.22.2.tar.xz 1930644 BLAKE2B 6f9a4ed9ce49a978a68606e672f9f71d0e046141be2e8f5bcbfbb51036fc71953744a6da578de0a9ace3fb3e1a45e9ad10e6fb4b79383186e670338c8bc13705 SHA512 7ea73db9199f1db0d321a10540a15db245684284fc7a5f7860770f01ffe1a5febb287b2d597d1e1a03e1a2bb917ec58df318caca0a6622215469a2e76a2fc05a
 DIST lightsoff-3.24.0.tar.xz 1943672 BLAKE2B fc6c8643e791a7b6e3e1183ea9678138d53aab5ba7234c4c6417b576dda571a741c3eeb8fab36ae5a00b25420fcc1269e412800a4a5c56efc16943905d6002f5 SHA512 ef036512b3c4e60b4419005864c3f6f4f9447af2e4d12fac1df7603f5837adf2cbe0f41f6089d3e683c3606d021d35e0cc41589938054988506aef3881936e6a
 EBUILD lightsoff-3.22.2.ebuild 660 BLAKE2B a261eabe3c7d4975d7c431400b80f0a4de9bbd4b01dc99429c39ed3904e149b02412fa5aa6279b4355dd8422683867b47aa51b285b52a06cdef8b9697a189cb1 SHA512 e2a845b1d957011faa8c3824cb2aae5bfedc9866dbb231b278c44d2a00d8b71d7cd401b0714a08ac75689c9826f32628be6773e14ca12a254b5fe3d115da0ac7
-EBUILD lightsoff-3.24.0.ebuild 661 BLAKE2B a3e44914d1f579211c3e28fc23687d51c669161f0017f4ea0303cc285481b19978134ecb852229599807e1e582c6804f320aa451b8ef3cc9ee466dae51f18328 SHA512 f2d37f5ffdf686731af69490ad59e13c80ce30c8fa4393fbfb7b59426e5b2afdd7f04820ca81a5bf01846abafb3bd9cf709a7e8de89475ce4fec21a648854b3b
+EBUILD lightsoff-3.24.0.ebuild 660 BLAKE2B 4dbace47d031bc653108e807136c5541794358b6140a92ba5b5f9a8d2925599020fe1401828a2e1175d03311ee030a149c80ff8583457803ea7ce2a10e431886 SHA512 f7631fa627778f32c69cb79091b20f4fdf11e6fdfb771a81b0fdea79de7345ad3e5c48234f8532290b06729e9558eefb8c98ff08d187eda8446fc9e0a3ec95cd
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/lightsoff/lightsoff-3.24.0.ebuild b/games-puzzle/lightsoff/lightsoff-3.24.0.ebuild
index 91b1c32dcd6f..065214d72703 100644
--- a/games-puzzle/lightsoff/lightsoff-3.24.0.ebuild
+++ b/games-puzzle/lightsoff/lightsoff-3.24.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Lightsoff"
 
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-puzzle/swell-foop/Manifest b/games-puzzle/swell-foop/Manifest
index 3535b1f6591c..f187046afcb0 100644
--- a/games-puzzle/swell-foop/Manifest
+++ b/games-puzzle/swell-foop/Manifest
@@ -1,5 +1,5 @@
 DIST swell-foop-3.22.2.tar.xz 2294160 BLAKE2B 1bff0a03149e26b00bfda88e58529d4e59a5b68bc3c0891c4337602f88abec810c6de65ad605e3d0e56b24ad8ed6ce701d656d719fca865898122f3a18a400ae SHA512 ada002a883c274cd834db825879cd5c16b222df39212843b0718f953256838af8689bec10a02133dcb140f3567b1a9203c73e1e0c6530469630df6dfdaf7167f
 DIST swell-foop-3.24.0.tar.xz 2313656 BLAKE2B 2a52751eb1390a7bff7956ed21058fef913e5b125f04f6415ccb9aef28cd5517d1c4683318379dafa820c8124d7798ed2142c4ed1277234d70c1b9dfe8403b86 SHA512 470bcf9715e280b9cc7bba79d1d50e924416b6d29058ba0105aee48d30ee58971262e2304610334f92f2f6a9fc6983898047d3ad05443a2cb062e15564388ab0
 EBUILD swell-foop-3.22.2.ebuild 666 BLAKE2B f5a30f8634167ce452c96284393e7e632766275d7e0c1091c62aa9d6f71c8112b63f3a496348f3629f8747ee87d81a7c14d7acea8753f6fcd63e4f457c1ea2a1 SHA512 e7730dbb331706d762d06dcc2d7fb57b07aac42ecb183040d6e4ae6867495d6ea76fdcc330f8068ba62d3ffb8aac4b01bfc1a883f22d5320ba65be0630a82352
-EBUILD swell-foop-3.24.0.ebuild 667 BLAKE2B 20bf1598a2d4f8ccffc544aa8cf2189bbb50751073c1e2b2ce055e87c5f1d7284c7923182ec4e8514c42ac82f2351ee4b983632a90e21261d578c63134f218df SHA512 b9535617a2057eeadc2a951899527791aa08ce1b21bb2f73cb934655a411748c316eb9d946fe8a9cd5769cb1e8dc49f722a68b4b7eb5c962a39c5b908627599e
+EBUILD swell-foop-3.24.0.ebuild 666 BLAKE2B 6813c366536c6a35d6b47417d8474922ac41371d1646989393ce5ab9eb335092f79ba0c6e27cf0b4e46b1af0d41f8d3f3982c607dd9bbd33191a1add264a2a8b SHA512 195d833ba4322ebcc2c6f8a1f1bfd2e871961b8f533eebf280a14730d1eb303b6c72a1545ead8356187322d40cf55ed2447c3dc9b56267c647ad2ec5ad53b174
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/swell-foop/swell-foop-3.24.0.ebuild b/games-puzzle/swell-foop/swell-foop-3.24.0.ebuild
index c1e93fbfcbf8..d0c5883d967d 100644
--- a/games-puzzle/swell-foop/swell-foop-3.24.0.ebuild
+++ b/games-puzzle/swell-foop/swell-foop-3.24.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Swell%20Foop"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-rpg/Manifest.gz b/games-rpg/Manifest.gz
index a9af87657025..c615dd736037 100644
--- a/games-rpg/Manifest.gz
+++ b/games-rpg/Manifest.gz
diff --git a/games-rpg/bass/Manifest b/games-rpg/bass/Manifest
index f95b72ab6587..eb5f1fdf0696 100644
--- a/games-rpg/bass/Manifest
+++ b/games-rpg/bass/Manifest
@@ -1,5 +1,5 @@
 AUX scummvmGetLang.sh 358 BLAKE2B 9d3490611c16757979cc57901d178e616e9739cfc80bad26a9b2150610c3555159854e8b42446f570e33accd26f215b1b5be9b05f7eca1d37b64fb6703a2bfb5 SHA512 9fc219a8096f0aa0182d752fb362796bacd3837b7368e1132c570d28757f316393163088b790b386211cf9a17cf21302cba0812940afd927e0123b10ad2cd23d
 DIST bass-cd-1.2.zip 69377781 BLAKE2B 7eb59b78eda2ab1385f742189f420706aac3364dabb9263729341d1973e93b27c0509e7d22b5eb3a228400a398a82cc074adb9a601e93cfa7d7dca1f51e9d68e SHA512 ff896e723b4dbf2cc52851ee1260c1006aa285b768a727974719d63509bdac1c65be9ea565eb037d5e9e1c8fd8fd76a8c04776bcde46616ca9ccce18ea498d64
 DIST bass.png 27613 BLAKE2B 1bc440055d4cfd3115e3b2768f5b88fa49eaed3f3d957b436e1e0df236fb0bc968ced18962ff9833962a1ab8a8b544e57ea10c679eb6d434c633f27956fdc489 SHA512 c0f62257f025970f51f32a7f3284cf117a091d40bbcd6c7503e8f0e8e98954cf96e35a04a4e633a04a721ff01beb7a6e0f4c883e286e477c3e065d411db4c87e
-EBUILD bass-1.2-r1.ebuild 912 BLAKE2B e3991d850f74b94ee4081929135b82bda7489e99d7edb284a06a0c02ddcb5e68d62a55f5710e1fc9706764219a7d1ef27bc5a4e9857c276af869f71dad165b9c SHA512 c00cdeda1e6d9ec76d0e10759a21cac55be9d13a17cc2bbe49db007ddaa232541d6427fd67ae81abad65c91e91e7252c6b3dfb85022fa2125be0fbb6c2d6ce7f
+EBUILD bass-1.2-r1.ebuild 913 BLAKE2B 0f4d2ba0477ade9bb51efe8a501f4265e9dd200a8d1a5cb7cb06d15a2bbf70f0e6cb1d0e8bfa2f42e9f2dd7939f306a4724e4f2b585d9a36a801afaa32f0daf7 SHA512 92cd863a4fa5fe11ddd4ea1a5e6b6ee2677f73a926774ee4f7eb6aeb1fa927abf2a5cc16f5d2ced8c109dff7d15aa2bc906f3093843d67f5a3e5bea9242dfa78
 MISC metadata.xml 330 BLAKE2B 4f070e6c8bc4c2f6b4efb4f0eb84ea861773fba85acda1f4dec223a6594e2cdf4ac90c895a98819e2fab2ba2cd30081aee591554d2e932025a9da6d3c16a275b SHA512 4541c93daab84bd6d0764adccf44bb4986ba02303e731b5b9a7a8060bb88a32c1cef91e2b2910e15915b67cf3ea2b5f31b4e637909d1d0b7c3b627f1134206dc
diff --git a/games-rpg/bass/bass-1.2-r1.ebuild b/games-rpg/bass/bass-1.2-r1.ebuild
index 6336e5e98a0e..1e217f1dd025 100644
--- a/games-rpg/bass/bass-1.2-r1.ebuild
+++ b/games-rpg/bass/bass-1.2-r1.ebuild
@@ -6,7 +6,7 @@ inherit eutils games
 
 DESCRIPTION="Beneath a Steel Sky: a SciFi thriller set in a bleak vision of the future"
 #HOMEPAGE="http://www.revgames.com/_display.php?id=16"
-HOMEPAGE="http://en.wikipedia.org/wiki/Beneath_a_Steel_Sky"
+HOMEPAGE="https://en.wikipedia.org/wiki/Beneath_a_Steel_Sky"
 SRC_URI="mirror://sourceforge/scummvm/bass-cd-${PV}.zip
 	mirror://gentoo/${PN}.png"
 
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 82edd5e3ee4d..3257ddf02eee 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/wargus-data/Manifest b/games-strategy/wargus-data/Manifest
index cfcc0da92b37..b8fac46763ef 100644
--- a/games-strategy/wargus-data/Manifest
+++ b/games-strategy/wargus-data/Manifest
@@ -1,2 +1,3 @@
+EBUILD wargus-data-0-r1.ebuild 951 BLAKE2B e03d8ca96a4dc70886269ef8ae36c33e73924cb45c80fdf49f62bb51847645d557f0d2ed1df298f70371d8a7b9351b25bf9e28114e5f1744a383b1315b734fc3 SHA512 dc3e4e3e44073d25236761b605ac892e513681d4088f8f202a02dede6559a59a68ab1e207f23b17d7bef01c1f44b54cd5108399e32e3503ecfcf672704801268
 EBUILD wargus-data-0.ebuild 987 BLAKE2B 9655d9c60b952a470638b35df1527f7f8baf7f1f5045c21fb3383a74bd019dac7c5bafbcda4b1c2bc085af636b29081a41eef6ff2767386e93b5d6cac7036dd4 SHA512 8e82be7c2e65e9223c43cbdde33f74707c4132d94d4305354a29550cb87d2db896895a4ccffc0e5f9194517368b5937867a748a237e9dc82c1916813ddc2940f
 MISC metadata.xml 329 BLAKE2B aad962070eacf1667ce2bed4939e290802eadb53bbb1e8ffe8ca13f9c006c45818f9dda522e6ba0d92d1404c8691a7d76a2636caee3657cd6ac3d947f0df2449 SHA512 fedeb73a5c2116db0073c51166b5c3fcf1c5667f5bb0db1b21f7643a6a8f247624738c883af3e457d6a6a7c2b5d39da6c26ffb2cecc847e64501bd659f1f119e
diff --git a/games-strategy/wargus-data/wargus-data-0-r1.ebuild b/games-strategy/wargus-data/wargus-data-0-r1.ebuild
new file mode 100644
index 000000000000..9636a8e03f33
--- /dev/null
+++ b/games-strategy/wargus-data/wargus-data-0-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cdrom
+
+DESCRIPTION="Warcraft II data for wargus (needs DOS CD)"
+HOMEPAGE="http://wargus.sourceforge.net/"
+SRC_URI=""
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# wargus is needed for wartool (bug #578340)
+DEPEND="
+	games-strategy/wargus
+	media-sound/cdparanoia
+	media-sound/timidity++
+	media-video/ffmpeg2theora"
+# wrt bug #419331
+RESTRICT="userpriv"
+
+S=${WORKDIR}
+
+src_configure() {
+	export CDROM_NAME="WARCRAFT2"
+	cdrom_get_cds data/rezdat.war
+}
+
+src_compile() {
+	# cdparanoia needs write acces to the cdrom device
+	# this fixes sandbox violation wrt #418051
+	local save_sandbox_write=${SANDBOX_WRITE}
+	addwrite /dev
+	"${EPREFIX}"/usr/bin/wartool -v -r "${CDROM_ROOT}"/data "${S}"/ || die
+	SANDBOX_WRITE=${save_sandbox_write}
+}
+
+src_install() {
+	insinto /usr/share/stratagus/wargus
+	doins -r .
+}
diff --git a/games-strategy/wargus/Manifest b/games-strategy/wargus/Manifest
index e5e2362cb4a7..e34efe01e034 100644
--- a/games-strategy/wargus/Manifest
+++ b/games-strategy/wargus/Manifest
@@ -1,3 +1,5 @@
+DIST wargus-2.4.1.tar.gz 45981981 BLAKE2B 8d80e5d781a1be1edf602f13d77b84e85fe2592fb0a784f1b25b5c9656eaf10a11c3241dfa71388c9a01a9e8fad15b1805a67ddb3157c2a0e86d967f3852869a SHA512 d468d9ad08907fbbfd02af0bca069d6a95d5303cd4f3d838c12bbfe6af0d48f695f9f49d446dbddeae2a91deb1eaa17875954eefdfbe5e25cd840c4454dc6ea0
 DIST wargus_2.3.0.orig.tar.gz 45006918 BLAKE2B b952d4b93a6aed22c201ce6caa2398a8d2ac60366882dd091c861733bf9f6baca409fcb4f0fd59a1c8673744c80b154cd6053ab81a89afef6e95737766c41e88 SHA512 79dbef5f86fafe7357c2911a16655c29bccef71dad39bfe6e02866c1734ee1598bb29a9005c8fa7c73d6f64e13fb7cdd3962214921b0b18c3868cb5abb2a0a87
 EBUILD wargus-2.3.0.ebuild 1189 BLAKE2B 03c7cd0de8e239f74f3397cdd50d03583166ceba3344bf07648be8283fbc8f81cbe583e3662a7df25c8edac53f01ef211cfb6d41257c64fc75c1cf1321b109d7 SHA512 2f792f0179cda44947ac9e8091d01384fbbaafc0e9f3f896232e641a29d185e0b8f4d36089d41f21bfefeecfb7600cf7d5435ae9dd048536d41060e42ce12169
+EBUILD wargus-2.4.1.ebuild 1015 BLAKE2B 2ec460a15d26df522ead61b9863618d24057da3b48e73eedb8888017369b94458e87e4792f05d6eb965412c3fee8b21a8fbaf8868065d46948e1e8acfdc0f793 SHA512 4b5b967cfbd52156e3fbe32eb75829ef627ef69534fb5994ad3d0a76ad4280cb89026eed1a5eef643c198865781a32eccb3d9308b356b3b00ae936fe736fd9f8
 MISC metadata.xml 378 BLAKE2B ea732d1cff85972c33a4fef5281b71f5e3bcf7663e864b00891802ee353fab9b33bd93fc6e76ff8123ba4dd8e77dc4889f3a8d044d7c664782c07629b2f942e6 SHA512 ccc5c5ce04783ccd03e482797fd8941fae5c1ba32936641b762595a03606996157637f5155a80eb7284fa2f290b8883b12a1b9b9ba83cf2693876f3cd269617f
diff --git a/games-strategy/wargus/wargus-2.4.1.ebuild b/games-strategy/wargus/wargus-2.4.1.ebuild
new file mode 100644
index 000000000000..e88a97f6bba3
--- /dev/null
+++ b/games-strategy/wargus/wargus-2.4.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils
+
+DESCRIPTION="Warcraft II for the Stratagus game engine"
+HOMEPAGE="http://wargus.sourceforge.net/"
+SRC_URI="https://github.com/Wargus/wargus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	=games-engines/stratagus-${PV}*[theora]
+	media-libs/libpng:0=
+	sys-libs/zlib:=
+	x11-libs/gtk+:2
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+PDEPEND="games-strategy/wargus-data"
+
+src_configure() {
+	local mycmakeargs=(
+		-DGAMEDIR="${EPREFIX}/usr/bin"
+		-DBINDIR="${EPREFIX}/usr/bin"
+		-DSTRATAGUS="${EPREFIX}/usr/bin"/stratagus
+		-DICONDIR=/usr/share/icons/hicolor/64x64/apps
+	)
+	cmake-utils_src_configure
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	elog "Enabling OpenGL in-game seems to cause segfaults/crashes."
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index b787271378f2..6be376cd2f2f 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/dconf-editor/Manifest b/gnome-base/dconf-editor/Manifest
index e33c4a44e134..9fb48265a8c2 100644
--- a/gnome-base/dconf-editor/Manifest
+++ b/gnome-base/dconf-editor/Manifest
@@ -1,5 +1,5 @@
 DIST dconf-editor-3.22.3.tar.xz 394760 BLAKE2B 9270d75f64bb0426de2667f7f40d6ec862c3486cc25df7f5103fc3ca4ab6692aaa41b18434a77c7dcb26b0cff4d65f73a0ebb15b07aa48e7e3eb21924a8cf8c6 SHA512 0e1ddce6e970ea23329c6233ed87e6d4541b6f1e991e3159bda44c43b8092a4d983acbca18bbedb88304ac1afb541a15073a261dab9ffe94c94cfd06e3e412dc
 DIST dconf-editor-3.24.3.tar.xz 503520 BLAKE2B 57b0b0de36e2bb5cef33e0171e77f506f16f240d5ab4ab79d7689b7541ce445bce4d87753f312cf9353b2aa44d5cb2f7c734050a5f57ba2b7eae9894fb74d0e3 SHA512 10c98df210cd465e21601342963a19cd5a255abfaa6e96c833070db52d13531288237a129471bf9424d7ea8fef4c2cd4954652850bbb57dd161ce9cf99265361
 EBUILD dconf-editor-3.22.3.ebuild 737 BLAKE2B 08a39097a3b99a70c08f8ab13ab956d3b482d7c513256e31feb003f10f1869864dd65d86a7235fa00616cc054275287b93c2ccf4368bbb4a60619aa7bc25b767 SHA512 98c32c0c2d72a9ee208bccb0c8ed6b0896b2a84d0931d4fd4819271892b74332c98ff0e62bacdc62bfbe32d87bd028f767a1699818ec4828489af7315fb83d54
-EBUILD dconf-editor-3.24.3.ebuild 721 BLAKE2B ca971806c6e939fb5a5bc9fb6351522c28d3940a88b365c779ceceaecb9fb35ee245154197ad6c7905f7d42ad8c8b2cc2d95fe56ead56fdc47ed05ccaf839663 SHA512 a0380765afea7cf8880feffb435c3d4e0777b697194da057fd501a475f5d34084f7d85f5fa564c95476e961cd3d1b173f2ec825c284b3e60a16fddcb708e1cd8
+EBUILD dconf-editor-3.24.3.ebuild 720 BLAKE2B e172d4b725df1313465113df6b9c3e2a3147c751b80546ed76bb5d895799ce6e6ed8d747cc268bb6cfb80977edf30f21587b169bee7e1fc53bb8b3fb5c584577 SHA512 8092ff30e165e70ce074f3cd5ca08b6a8bb5f1717bdc467ab498a8716c59c750a5c968e99e0b876cc1ae829636a30f15567e7cf9543f5d6fa67835f7b3aef1fb
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/dconf-editor/dconf-editor-3.24.3.ebuild b/gnome-base/dconf-editor/dconf-editor-3.24.3.ebuild
index 67cf903c3dc7..26ce95003d67 100644
--- a/gnome-base/dconf-editor/dconf-editor-3.24.3.ebuild
+++ b/gnome-base/dconf-editor/dconf-editor-3.24.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://git.gnome.org/browse/dconf-editor"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~arm-linux ~x86-linux"
 
 COMMON_DEPEND="
 	dev-libs/appstream-glib
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index a1bcd6a655ff..6d86b280c590 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -10,5 +10,5 @@ DIST gdm-3.24.3.tar.xz 1113992 BLAKE2B 79ae5ccf0477779bdb05cea4f0e8b2766caee0552
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
 EBUILD gdm-3.22.3-r1.ebuild 6173 BLAKE2B 7da9f2ced8335995dfbf121d4be3225405fd9d02590a8bbed1aa7243ea345c78995beab829b65be26ad6042c2e92ea87e360600e25058b05e89922fc168bcffc SHA512 8bb19f74b768ae4a03da42d0bceb9c9d61ecab486419ffae552d6976c5177d0764318d4f5361b024322725f26367edd5f4147a570f7fbfd6d09a194faeca3756
 EBUILD gdm-3.24.2.ebuild 6053 BLAKE2B ce39f0c78046843ab811cf7925d74dc3d58e793bd5fc87492835cc5f6c4a1148c790a63fa38c502e2d34dee1c6060d1f90d65859fb55522b55a5e00517012fe6 SHA512 2c8f15ea34137391cbc33e580f348d43cb50b56cefb58eb2e0b0d643e3c1b1141fc00d985bcb32513fceb0d76274696f66955d6ddf843044f87ae1700c2b4a8e
-EBUILD gdm-3.24.3.ebuild 6052 BLAKE2B 2c006c603515631b19ec4962969c4fc1010e97237638dfe14d4a2848ac79c40e2ed4b9c12a18d6c860a1b3e343d43a097cf0808e19ab05fc8f212d434c5d4322 SHA512 0ff59565e59c22684b16c5cea42f5f7724d272251e5aa5658e35517bb58ff249a1a35dabb419d5e45fe9bb3eceaf3cf4f441cf358f121c580493ea15f025f6af
+EBUILD gdm-3.24.3.ebuild 6051 BLAKE2B b90e06dadb05634f0afe218571c2ebcabc611f6f41ca01a8d40cfea2c35f17457f4181ec6c6a158a7f7c81acadbfc577661285b70ee40cc168d56b2c4dc4ad42 SHA512 b147cc536c6cc94513af5e57422e322a77453225f66b0b9deae9c0ef70a4622f818efa2e53e6d7ba09ffc05c598ded4a608466ff32c56d858aa8fb033fad0997
 MISC metadata.xml 477 BLAKE2B 29eb8d343cd5195f35dc73d07c695dd3090f8f8ea436b88c8a8fb7f15beac82aaeb2b83215443851866e7fcec51aa14ff19c30597a74cd9a73b384ee801b16f0 SHA512 4da6d5a4f518596834d4138db716bf58d2b2f28f07fed6379a6f0d8bdecb6b803fb3b24880dfcb93ff5aac03f512bf08af7f9742d01a497dd4fc6d7a74d1a844
diff --git a/gnome-base/gdm/gdm-3.24.3.ebuild b/gnome-base/gdm/gdm-3.24.3.ebuild
index 1ea2b82ef03d..468dfb481a95 100644
--- a/gnome-base/gdm/gdm-3.24.3.ebuild
+++ b/gnome-base/gdm/gdm-3.24.3.ebuild
@@ -22,7 +22,7 @@ SLOT="0"
 
 IUSE="accessibility audit branding fprint +introspection ipv6 plymouth selinux smartcard tcpd test wayland xinerama"
 
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh x86"
 
 # NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686
 # nspr used by smartcard extension
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index e458b644d078..f8cc3f75d6c1 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -5,5 +5,5 @@ DIST gnome-control-center-3.24.2.tar.xz 7269112 BLAKE2B 41049a7176eb3de146d8ac80
 DIST gnome-control-center-3.24.3.tar.xz 7302120 BLAKE2B 026ad3bb34c2bfc2f7a6d398a3c47bc3f620a3f947a0cb43336b437b4926e7a360e287d6020dc0e82eda43955cfb38ffcd7ed94593adac119d7413f63bc437c8 SHA512 70b827f70fb95e8db0ee01e3ba80242dfdb0f90e31c391ca470c372cb6c8626f054e1e5b79e954935e9b567564129b80957091039e16e921e1c93b3d584c71cb
 EBUILD gnome-control-center-3.22.2-r1.ebuild 5245 BLAKE2B 141297b816965b48778e6bf62ef84e395fd3c3075bfbd5d11c97e4e98840792f4e6841dc577a34c14cb43c788993d8389d662aa7fe4102e450c6f1e37fd32c5b SHA512 44612716ac751b1e73f9fc7526c93e154843bfe78f5a302bcc9ef7f881c94535f02e39b38dbd0d4bc9f970554f51bbc76a61fcf42f4278e90671fcae11a0c39b
 EBUILD gnome-control-center-3.24.2.ebuild 5309 BLAKE2B cd087cde303cf9255f6086831cae71725954b3836ae3e910ff844f3ade9c42c4953299d2b4fb2b5e199cb65dc2c33e29e2d97f1ddb0a07aaa355d5b67ecf4c41 SHA512 cdff94b284057745e2abee9c8ff1756fbfe138c6a377d7137f929c34ab25deef145cbe2ac52a7a4a209cb543f3aef206216f01ab789d9c845b3516125264c2c3
-EBUILD gnome-control-center-3.24.3.ebuild 5403 BLAKE2B f5c31153103975ce101472e691f7a35d7bacb3ed8700e1ce589a17c51b12ce7669b01f015db3654e8237d84379525b3c5dc1b4a805ac3da3dbcbfad479f7b51b SHA512 fa64269bf78ab35ce42cecf90521f810ffadd33de01e1053bc01c730f77b3deaff6f8e5c0b1a8499a7d142efd73dc6ab9bfe8b702abaa376dbcb91e19a8e2821
+EBUILD gnome-control-center-3.24.3.ebuild 5402 BLAKE2B f964d533504d01348b00859128c7b072de5df21519a80e4ef9311b4ceb6db4a80c874305ad4d4ae1f1b12e1e5bc3f90fb3a3239fd75c4014a8a45a9b463893fd SHA512 9a742f54d74c7cc66c6a010e430694eaf42b8a05bd3532c8a7abd50f3c1a17f2856c6e505d0c7bd86b22cbe7c051a11393d4ba5cd82710f59ef1e554efb5da01
 MISC metadata.xml 592 BLAKE2B b868af571d6fb58f3a7baaa586261025de5be5a928f963f6fde8db3b6549b6dd30c0d73752e296f9ba3b128c96f3a942ed6cecc8acb98d745502483822c9866b SHA512 af75d12dbd91e798b6f81933f5e6cbb73aa0a81858ec711e88e79c2a4a239dbefa9da0375bf01f2614b5098af6a883b5baf27f2f74fc166838ab00e00108b104
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.24.3.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.24.3.ebuild
index 17377bed124d..520bb6e2e32f 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.24.3.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.24.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI+=" https://dev.gentoo.org/~mgorny/dist/${PN}-3.24.2-patchset.tar.xz"
 LICENSE="GPL-2+"
 SLOT="2"
 IUSE="+bluetooth +colord +cups debug +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager v4l wayland"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 
 # False positives caused by nested configure scripts
 QA_CONFIGURE_OPTIONS=".*"
diff --git a/gnome-base/gnome-core-apps/Manifest b/gnome-base/gnome-core-apps/Manifest
index 86960d3043b5..302fe9695254 100644
--- a/gnome-base/gnome-core-apps/Manifest
+++ b/gnome-base/gnome-core-apps/Manifest
@@ -1,5 +1,5 @@
 EBUILD gnome-core-apps-3.20.0.ebuild 1446 BLAKE2B f14dc6f63582ab8f9a11c55e780d3a56a3e9642ed8ebd6c109e9aaabf8f95910c266e124a16adf14f8b4af367fa74c27ac30a4c198c1fb779fd226e6dbd64daa SHA512 265e62a1341dc6dcd4da66ae67e11ae43a5b434fac1b18c329646871201663cee4c7fa1cb1b16526193057d7da9345a38d62e9f82c2f64be8323b2411ef3bd8f
 EBUILD gnome-core-apps-3.22.2.ebuild 1577 BLAKE2B 49c557127cb74dcdf1f0ad52019dcb6078167183135fc336e013839e28b8d54d71187de8065f5e25827ddfde924814ded30f7dccad6086ceada629717b598aaa SHA512 cd1d1c939e04a1b6850b25c7c0a8a0279a5b90f490b61b9b0015fc4eea0e40926cb9e9e9164fd59bab071cb2caba7ae55233a3d47f3c95e95819e6f2a98954d2
 EBUILD gnome-core-apps-3.24.0.ebuild 1571 BLAKE2B 5f93c5c018c2f08f10216036eede44951ca4eebc2a6e119b4a18e2ebe5f42e43d9dd767071ecaba4311834c36da31dd1a5e9016720ff55bb0e37167200487ea6 SHA512 e33c6f3231804e2b764b4ec9b4ca8adf1197913820a4a6743c4462e907e22736191bb4c9e1dd40b6d005173247ec7e0a5fd1f9bb0fb515d51cd49ddc2d824069
-EBUILD gnome-core-apps-3.24.2.ebuild 1507 BLAKE2B 1a21819f6eb6d74538566ffa9739e6a1929d70a47e5cd786d1e3c93d96a6acb9e11d01aaa805b07faad1788325ae49a85923b55a482d88705c0e80d2aa818674 SHA512 c7ec1bbd0720fa704620c026e98e1e6a22a39cf72243c93027c31c536de585c8b1812b1cd4d52427c2f5029956aa284c711c9a119f6672ac16d8fb50816c84ba
+EBUILD gnome-core-apps-3.24.2.ebuild 1506 BLAKE2B 514feee02bfe57ff00f83db8a0beb317a6be0678a066658b39b7740000625ba647410a90384769b7041aa19ea681803124fd492dde4209089a65e769dbe11f59 SHA512 5e7f9285e94ca98f1ea51d17d91f994a657b4a25f41e64357130e40aa287bc10106376b5f98f67fc44664ceb82519886a03d9ff218008ee85a1de4bba191476a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gnome-core-apps/gnome-core-apps-3.24.2.ebuild b/gnome-base/gnome-core-apps/gnome-core-apps-3.24.2.ebuild
index c0b29a721c43..3822a36e6092 100644
--- a/gnome-base/gnome-core-apps/gnome-core-apps-3.24.2.ebuild
+++ b/gnome-base/gnome-core-apps/gnome-core-apps-3.24.2.ebuild
@@ -11,7 +11,7 @@ IUSE="+bluetooth +cdr cups"
 
 # when unmasking for an arch
 # double check none of the deps are still masked !
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 x86"
 
 # Note to developers:
 # This is a wrapper for the core apps tightly integrated with GNOME 3
diff --git a/gnome-base/gnome-core-libs/Manifest b/gnome-base/gnome-core-libs/Manifest
index d62cc3e8418f..ce8d1cfe7c2d 100644
--- a/gnome-base/gnome-core-libs/Manifest
+++ b/gnome-base/gnome-core-libs/Manifest
@@ -1,4 +1,4 @@
 EBUILD gnome-core-libs-3.22.2.ebuild 1087 BLAKE2B 604caa643e1f198e35c8e753b27e539d925fd349cf5fd5e6d643204ae5fa399d47ff08111a8a325ac5ecba66b75dfa5f838150af97f9b6591f93328eec8ffcbe SHA512 4e69a5b10cffe7e9aca337371d6c105ae6d3dcf802b074bbb4477b3586b0d447baaea4027f204c8c04c22bbde9c1ca762fdb17a73c669a4245dd788688bbd844
 EBUILD gnome-core-libs-3.24.0.ebuild 1083 BLAKE2B 47ca35d840526083ec93a128632f549c0dc8ff0a3606bf5e92d22a72c53899bdb5b956da6b653aab099e354ec4f691bbdcbabfa928b1c23ceaf5e32f6f196bf1 SHA512 1d07361fcd70ce3d90ff0fd02b8619161810f19fb1c1be7bca51509085ccb4ba36406e675e10a85023bee1bbf67a71c14879e670d29d773e9b8cb37d46645275
-EBUILD gnome-core-libs-3.24.2.ebuild 1054 BLAKE2B 1e6c24e0ffeca98b18b912de1caa3f559ca7be264568dc91a6c3fdc2cddf923b3ed8d45091ddd5b9f1b3839ea128826f02dd44343a84e6ce6192ec8597fd232a SHA512 3fbbe6553d64ebf8ce2ee17a7c07685c643930e61ae10d3f991e69d3a2874417fb4a9fbb73c1d003e01f9479156333c3acaf50d95ad06aaafde64300202879c9
+EBUILD gnome-core-libs-3.24.2.ebuild 1053 BLAKE2B baea5363a73c2a7ea9f77417d3e224d24983405572d4aaa48fdf41198b489aee0ca9c5df2820a8f676adf2b28b28bc31c9154e8dcab1deee390782b5c14c46d9 SHA512 48301a8470a7d2179ee9a8b639cf449d7493b41abfe48a33f454fe66f88eb67d888827d15f2bccbc63a93923bcbca074ade6e185251a93eac2cc374506284ac0
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gnome-core-libs/gnome-core-libs-3.24.2.ebuild b/gnome-base/gnome-core-libs/gnome-core-libs-3.24.2.ebuild
index 429a2081fc29..4c40ebc736e8 100644
--- a/gnome-base/gnome-core-libs/gnome-core-libs-3.24.2.ebuild
+++ b/gnome-base/gnome-core-libs/gnome-core-libs-3.24.2.ebuild
@@ -11,7 +11,7 @@ IUSE="cups python"
 
 # when unmasking for an arch
 # double check none of the deps are still masked !
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 # Note to developers:
 # This is a wrapper for the core libraries used by GNOME 3
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index 784443d4ef27..f107f33a9f02 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -5,5 +5,5 @@ DIST gnome-desktop-3.22.2.tar.xz 1064496 BLAKE2B 51c4420f7d6c37ee516f1d4c87828f7
 DIST gnome-desktop-3.24.2.tar.xz 1064808 BLAKE2B 8574d26f2c2adedd7a287651fb34170e75d1744ad14e6caab8ede87af63b93197bcf4cde60dd9f6352dae8ae7bf8d598d0b24588d3a06cc2192c651b58577562 SHA512 691817fda97fc1c560c72213668eb4c2a8d03cc2433470a78149b3f785e95d9b4b681bceb733a67e1bfda649a6aed7ca4569b4891ee89f824a28d7a95f2782c2
 EBUILD gnome-desktop-2.32.1-r2.ebuild 2321 BLAKE2B 36bbc9ad0c5fadd3eb323e20cdb7bcfcc2a90acaed43c2319f4dc7c6835dd113e8eeeb6fa9a15468320e30a2b549a59e055fde416a9376248cf30b8261080316 SHA512 2631840d679cfdd6522a073012093a9cf532b990016ed6b4317d2a505c1c4dbdfe3b6a80deda8c7f37a69cd4a9edf718266e7c5ffac95f6e3378bc43212b9234
 EBUILD gnome-desktop-3.22.2.ebuild 1599 BLAKE2B 767473a884ce2e4f8c67579a0d9b0b4559ac2be65b7fc3a79b586c47e90696f88613c7fa86d51e58456d178e7b228c52164b4ac96f0a3cd12c4be8a9052c7276 SHA512 95b56cad878377f21fa2acf7892c0c4c01b8b9bb33881a33aaa117276893c7f97d2114b6f00efb0e14d74fb2c84da75161e1e4a793772076ce19005745b3ffd8
-EBUILD gnome-desktop-3.24.2.ebuild 1600 BLAKE2B dd88e7d9a743bb54c1c4574e0838eafdc0ff5f79597a5d06f614edb3ad98bb2a9129b80be2dd2c2fc6d0dfe920618ca08d5b5827bd7797b3901ade6ad46e893f SHA512 08167d4784d1b326b944cb11e563894dfaa3e29f99212b444f29c9e2c2b7229d92a0637b311f95fdf279df84a5c4ce5a88aa64744356e680b0e7f019e9272810
+EBUILD gnome-desktop-3.24.2.ebuild 1599 BLAKE2B 320d3099a184f6a2dcb148c74fdc3af8e447877a33af8f8c532dee9e4627f7da6e95e3aa884bad7270ad150d9e2c1082514d7092df34782254b89833b812d70a SHA512 bccc39c9205f7cb40d40dd9456f0abc795fba003215b60f25cc6337d58569fdaf3cdce1a12a4df9d64a3927eedfdfdc1f435a035b968a775f9a11dc99048db6f
 MISC metadata.xml 354 BLAKE2B f3504e89fa723ab0e4856f88e088fe1a3eff2bfee9635ffaae7404eff28b0090a636a9d9441e27dea8a3a62e980537636cf696097c946908554730ba12f1c358 SHA512 bfd7555f171ffd08174b134d34475d1dd40e6d325d188dd0a631d82d85836d92900a3ac641c6b200654ecdcd76371d7bbb4c3e34c4ee8b8410e8c6d8503a5bea
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.24.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.24.2.ebuild
index 7d0b3dd05848..2077b8c28950 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.24.2.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.24.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-desktop"
 LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
 SLOT="3/12" # subslot = libgnome-desktop-3 soname version
 IUSE="debug +introspection udev"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris"
 
 # cairo[X] needed for gnome-bg
 COMMON_DEPEND="
diff --git a/gnome-base/gnome-extra-apps/Manifest b/gnome-base/gnome-extra-apps/Manifest
index dead4dc8a3d0..24be7d9c98ec 100644
--- a/gnome-base/gnome-extra-apps/Manifest
+++ b/gnome-base/gnome-extra-apps/Manifest
@@ -1,4 +1,4 @@
 EBUILD gnome-extra-apps-3.22.2.ebuild 2294 BLAKE2B 3f0454bbccdb639b285d775c3abc0576d5f0f88db10319d53cf7c09abea58cbb74fe6e9fcdcd869fac0f522133225bbb7d2419c1340d488a5857f60249718dbc SHA512 3621f7dd842bf43f6f53fa84816796b32510250de026fd8bb9d028ee392c48d1797d61d2b1a610ea4540959ce22e4ac2e4d8af58a685bcfa38e51c05a515041a
 EBUILD gnome-extra-apps-3.24.0.ebuild 2271 BLAKE2B cf08ccb749f4447fa49fa7aba6ba792fde0187363f12baeba8ba19d4db9e5b1866778c609a24b929f5e9f525ea1a23e7e5085f232dbab418fbc3f94a5618c7f6 SHA512 9bba68301ecb21e31e582a21b3f1403c088ca6ca86969232d2f472e2ea31adf4dbbb4f5473f3273224184a00564a33fde060a331d295303d32d87b16ae146a91
-EBUILD gnome-extra-apps-3.24.2.ebuild 2336 BLAKE2B 94d038b5d1301ddf65934b8fb6865b76cedeabbfc55795e3683ff3a3dda6ae030886b9e2b2b8763d045ed360c11e69e340b45bebd2c74163ac76a087d7452d3e SHA512 6d5e2c3789984e46e73ae83d2fcd01fc406a89acd6182ce52294146900a5bd66ab69b568e872c1ff2d173d06b6d184d64ddbc5daf796985610399289cf3e678a
+EBUILD gnome-extra-apps-3.24.2.ebuild 2335 BLAKE2B 2bafe0766ef3e641f0a7281defcfdb2b75b05b222a5098a552d0a5cd9b4ba7925c82a3fa8889bca4183360a39d7a4a5840c1343e30bf92495f2a1e76b9829645 SHA512 671d41127a5144a31985b96e9768312cb4e4cdfd9a5e45269a18bd3c6d7bae4dc644b265dc358181017542131a8c5f77825cee5c884673f2ee1605b921489f95
 MISC metadata.xml 617 BLAKE2B ee89ac320ee9fa2c6a29d3d8b86df05a734781bfb5e538f9f84a85c9467672901713d94347acbef958c8c5733f9a0a07f0b008bf84f2daa2df5390bf8225eb66 SHA512 d91641939c20487a6ba4cfc0c55b6bdf7ba6315b63b8a045976bb9367c6001f9feea9c206ac522cf47efbd5267205e45c29b3ad5ce6189fd1a02f4d993a036be
diff --git a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.24.2.ebuild b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.24.2.ebuild
index 033026be11df..1ccdc6efeb50 100644
--- a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.24.2.ebuild
+++ b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.24.2.ebuild
@@ -9,7 +9,7 @@ LICENSE="metapackage"
 SLOT="3.0"
 IUSE="+games +share +shotwell +tracker"
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # Note to developers:
 # This is a wrapper for the extra apps integrated with GNOME 3
diff --git a/gnome-base/gnome-light/Manifest b/gnome-base/gnome-light/Manifest
index d81dcc0dd69a..b853b43fc0bf 100644
--- a/gnome-base/gnome-light/Manifest
+++ b/gnome-base/gnome-light/Manifest
@@ -1,5 +1,5 @@
 EBUILD gnome-light-3.22.0.ebuild 1762 BLAKE2B 7aece5726a0453567f9a0191f42fbe888cb567aad79b5066d19e3fc5f190d451f926cd1298868d137b996fde0111c30c6214ec52c72da04c20a0a889586d8a3c SHA512 6d835eee81128178793ce60d96687f0cf7a5d7e2c6d8329a7df0d1bc54f1fd1fd746a3151c8e1510b66598488a35647c65c01dc06cdc14ff6ae3cad864dec3b5
 EBUILD gnome-light-3.22.2.ebuild 1708 BLAKE2B 7baebff7de3ebd4e9d23277900092da05d778478207e81f4353e8492905f84937a9885498bd38341e25dbe5d0e11cd7dd36ac76c2ed7f4da0bf71192245a947b SHA512 5ed974788a11b4e11fb196f66488a3ab59133ad0ee10ed813878124da6f8c790d1299f71ba9da7d5c7b41ef292f1f436b92e81586cf24cc6568ec01368880fa7
 EBUILD gnome-light-3.24.0.ebuild 1709 BLAKE2B addf0fbfbaab3ee6dee5990daead095913fa2440c4791727a7015ad45d9d16cee6a59b0f617d39f5ab1b3c93988caf27cc50248d21f6bd56b7cfa163165bdd20 SHA512 1dde665871cc76cc788f30db21faad8a24bed02fd8a7d0b7eed70f391c4c91c564086a4eae6e04d97a67af756a340638d2ff5460e56039fc83d66227f1d4b898
-EBUILD gnome-light-3.24.2.ebuild 1710 BLAKE2B aef4fa72a8770a34c7eb1401e32d03d1fd9a696a8d3d8623e10dc099c230de894ab75327d1dc7e5ffb320992da31a4a22eb0697756af3cccf698ad70112d18da SHA512 e66b29d33b3c57db634a691f49d0d0118f8040089eb4949462d33dd2ba050a0399103d6d985942df56cb784abcc886c1d85a64b4b1c6f26dce171448074af4b9
+EBUILD gnome-light-3.24.2.ebuild 1709 BLAKE2B a95ca9100ad9842d54fff566dfd4088adf709636eb5a1458446c400ff1f55b807a7a8eef295002ea798c94a064dc7af93de5d693445dfeb1586e5913286c068e SHA512 5a79223238c824c08a835bb6e35036d5ef0d3244a92c04684d716b35a89220830a0a59a19ea44af108b54bbc650b2e85140adf042c81d5fe6a377e28520a4f1e
 MISC metadata.xml 406 BLAKE2B 562a281deb064ec0aa74ffebe4e38c864746809724acc4522df8c9cc0590d80937836923a029e521c5a0eec83adda11f169fa554e9760128408b78e87d916f26 SHA512 04875558c048cf102d8e5ffb17cb363808ca84c350f9b03958536cc5185cfd109b4653bbb4de202f47d092f8fc6d15173d3453a3bc62aa431b0c83cbb699a047
diff --git a/gnome-base/gnome-light/gnome-light-3.24.2.ebuild b/gnome-base/gnome-light/gnome-light-3.24.2.ebuild
index c0d4bf6c8471..00f36b71176e 100644
--- a/gnome-base/gnome-light/gnome-light-3.24.2.ebuild
+++ b/gnome-base/gnome-light/gnome-light-3.24.2.ebuild
@@ -15,7 +15,7 @@ IUSE="cups +gnome-shell"
 
 # when unmasking for an arch
 # double check none of the deps are still masked !
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 x86"
 
 # XXX: Note to developers:
 # This is a wrapper for the 'light' GNOME 3 desktop, and should only consist of
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index f092862722d6..4580218302bd 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -10,7 +10,7 @@ DIST gnome-session-3.22.3.tar.xz 777420 BLAKE2B 34d438e1fefcd197f2c51ce9c2866a6d
 DIST gnome-session-3.24.1.tar.xz 780632 BLAKE2B efd1c297d4af08e9bbf47e74aa28b4899b22d00248eb4d786afdd688f5c6117f4865561ca5cf4a47bb6fb003e1d9c365a585f7009f24992fe9752391607a3cfb SHA512 507f9f1cddab37f1b66c72291e1885397f7e8b6bfb7c365f6f1ff827649a71380706fe0e3a8c6e74c3c159349a0eea0aabe3d5c7bbae5b29aeb2d49ae715affb
 DIST gnome-session-3.24.2-xorg-default-translations.patch.xz 3392 BLAKE2B afe0e04c6218377e91508fc67add8ec0894dc75d47c039c44a8c47635c0418986e0949f916d6269995c1c8853c3dfaab21a3db86c427d966029ed747d4106aa8 SHA512 0af7d4025647c6dd2c78243d91ec8a61fd171b78904ac28ce48c4f3f7cafb9fd28263410d31d08431e73417ff7910e9bdfc1ea4de0a3290cd5229a96bffc56dc
 DIST gnome-session-3.24.2.tar.xz 783288 BLAKE2B 24b06404b9206a53f394db86a90f9c22c2774432bcb33f136eedd333e813139ded8b9445b4e597f3270ec0b2ef167ce3c2dca2c5b75d5fba977ebcfc4c1bb8ea SHA512 52a609d60303e7d733567cc81698fe4a4042ac17d0260aadb334ab8ad2c355086f8f87c2bcac05f659c28f8f3290128f9ca8875806d199ee27ff84d972333e27
-EBUILD gnome-session-3.22.3.ebuild 4440 BLAKE2B 87c63c18c91e6f659eb78139512246c891067540f31b63adf61a24fe37630ea554d77972303358e82ddc66e4d08e5075624e9b97305ce3658cdd2bbf49673ca8 SHA512 cd0afcddfce169e155010f7354feb91d4538fd8b38b22be46a23a81a92a6aa3d98729347e753313580afe28c5503449702921729878d5595bb9bb27d58d8b000
-EBUILD gnome-session-3.24.1.ebuild 3555 BLAKE2B b38adb290c91b1d4aa77979ef05ad6529e53e5d4cba130fcf643482c3c4ad81f18a4f8c90d4ddbf1dca7ef9f75e6822dd3460149e8edc90070e79e9ff89e7a68 SHA512 aac4a9df9ad8d5237015c2c86246fa8453679586becf5da829e9572e0f21f6e83e90029b0bff72c5e9965f4a2af11128aa50c046f9b9e15c91c76be87b33b6ab
-EBUILD gnome-session-3.24.2.ebuild 4515 BLAKE2B 1c62f4cfd973a53cc979cf6c5f2ec411f6bb2fa14b51881c8046bfd1461452861c394a8ee1258e45e570d70c1822183726d938f925f60a5a7ab2c7aa89bfdb94 SHA512 0f30d0d2f47bdfa839460e45d463c7bfc1477f9825a06d75f74e587f2318b1f5fa5634f9a5ba86ce2616c75cf3afec43a326720397aa2e9dcd58c33df083d9d3
+EBUILD gnome-session-3.22.3.ebuild 4478 BLAKE2B 5300ef756f4547eb290858caf3ae3962a03f4a0e44d17cef37f8a1ec216339909ad45801ea4655d00acdc6dc7febf9bbc2e29c77d63007ab191d1854362c6496 SHA512 90e4d7df11c52df4f6d5b5c13e37a1b2c704b8e21b69f643486d59e95263f9ae5e38cceea12bdabd453ad4b1d4097ec2553eb53c7c79371a5c771da6dcf8277c
+EBUILD gnome-session-3.24.1.ebuild 3593 BLAKE2B 29398b30cbfb735ad5cf85b667b09ebb68e353de2a2578c0c00e151a7f1f9faf5df15b40f2f7b4c85841d1d2a91a6ca59a24280b50e50cefb5fee3e16b93f9f3 SHA512 8c7bfdae77e91973aa0a4517a28843b3ee1a6eb0ac969ce6b1a63e5c6fca10be8de5b692b4597c99c7613ef744fcb168f668a26d71c6d2f136af5cc8c2232545
+EBUILD gnome-session-3.24.2-r1.ebuild 4552 BLAKE2B c5aee03290d0fb718777313002f2a3fe2c7df2d6403e00ca1bbcb3105f21fad2eede1f487e1e9b2b06f2554b436d73310ae3fad994a42f92ca64be81b18f5e11 SHA512 e2ebe3cb856799af58998e74a9d642eb0599bfc0ebed80c7e5047977a8337c925c909ed8fb19bea33ffcd93bf7b5f587bb2ec97f4d97942f6b263bb58c866e89
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gnome-session/gnome-session-3.22.3.ebuild b/gnome-base/gnome-session/gnome-session-3.22.3.ebuild
index 4e89bd630b17..311a3798511f 100644
--- a/gnome-base/gnome-session/gnome-session-3.22.3.ebuild
+++ b/gnome-base/gnome-session/gnome-session-3.22.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,7 +23,7 @@ COMMON_DEPEND="
 	>=x11-libs/gtk+-3.18.0:3
 	>=dev-libs/json-glib-0.10
 	>=gnome-base/gnome-desktop-3.18:3=
-	elibc_FreeBSD? ( dev-libs/libexecinfo )
+	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 
 	media-libs/mesa[egl,gles2]
 
diff --git a/gnome-base/gnome-session/gnome-session-3.24.1.ebuild b/gnome-base/gnome-session/gnome-session-3.24.1.ebuild
index 9eaa8c16f0e8..ccbcf8130268 100644
--- a/gnome-base/gnome-session/gnome-session-3.24.1.ebuild
+++ b/gnome-base/gnome-session/gnome-session-3.24.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,7 @@ COMMON_DEPEND="
 	>=x11-libs/gtk+-3.18.0:3
 	>=dev-libs/json-glib-0.10
 	>=gnome-base/gnome-desktop-3.18:3=
-	elibc_FreeBSD? ( dev-libs/libexecinfo )
+	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 
 	media-libs/mesa[egl,gles2]
 
diff --git a/gnome-base/gnome-session/gnome-session-3.24.2.ebuild b/gnome-base/gnome-session/gnome-session-3.24.2-r1.ebuild
index 28c25cd75f4a..905dab2736df 100644
--- a/gnome-base/gnome-session/gnome-session-3.24.2.ebuild
+++ b/gnome-base/gnome-session/gnome-session-3.24.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="GPL-2 LGPL-2 FDL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="doc elibc_FreeBSD ipv6 systemd"
 
 # x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
@@ -25,7 +25,7 @@ COMMON_DEPEND="
 	>=x11-libs/gtk+-3.18.0:3
 	>=dev-libs/json-glib-0.10
 	>=gnome-base/gnome-desktop-3.18:3=
-	elibc_FreeBSD? ( dev-libs/libexecinfo )
+	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 
 	media-libs/mesa[egl,gles2]
 
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index 294640dd18ca..36ba1673f91c 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -8,5 +8,5 @@ AUX gnome-settings-daemon-3.22.0-optional.patch 4101 BLAKE2B 34bfc06d2a37a8567dc
 DIST gnome-settings-daemon-3.22.2.tar.xz 1657132 BLAKE2B 4582793b2c13b4cecb1e93ff5053f94af16dc72436fbfe83a74b21b21c4bf8473409f52acae30e717176b01fd60165e43a69ae16787883ee862fe7fa3b9c448c SHA512 7bbeb0b50d178bf951f5a8375703f3e2e88b7c5082ec7394df1f277dd08059e616118e003db23dcc175b92d803924b3927326d10a2101b7923dfb0e980d277e3
 DIST gnome-settings-daemon-3.24.3.tar.xz 1583044 BLAKE2B f075abe574663cb9e6092e9698efb12d598584fe004042b5ac63df7e30ba9dfdb28ac4d0fac4148fa8fd49ccb6991414dc9a3dc49400efbe2cf4752d6295d62c SHA512 2450c3bb31746fe4883f194094cf79e94207e74d39c992107244d89f36c3ea373a33a2dca4a55af138f03fb4abd8733da4bacb215e2202bbc0976b566f8529a6
 EBUILD gnome-settings-daemon-3.22.2-r1.ebuild 4185 BLAKE2B 74666ed2940c5e35e4c178b239ef05e190284ed5c63b92dd0408217fe46b04d3a1bfe30b18657a582ab559c62b62231af8fd1818362aaeb1e173d827b32af4d1 SHA512 676d36c8d9bd465792a1e1cb911ad727d4e6d00458507cb083a266f4e6bb8b2ca7a8c6a92247eeec152d77f78f6af6555a9c89ad8d150d54809e5b8b948c1ac4
-EBUILD gnome-settings-daemon-3.24.3.ebuild 4905 BLAKE2B 1a19a584cd3e576e6f52f64967a002b8623a486cee1c2145de51dbda580aa14eab96569b5e8a6a8c8314e0699e6720e7e48ab29b67740de9834d0e56e4fd6694 SHA512 42dd75a1fef11749379e439117c70d9cb5229a9d9df758fbc3444c564104a0fb2a1c593e1893876bd4d99c5150543b0349453d3fde38f248b7c3cfa3b8f3275e
+EBUILD gnome-settings-daemon-3.24.3.ebuild 4904 BLAKE2B 8b38af85f86bd9f4b694f9b4dad4d4ade3da5cda4241cc5ce70e0882567555eb3ec6d5a8b711b0a1be9a71375efc8947f4afd07e9c000ff49602add3510f4ace SHA512 5f60a54dfd9c0eb1eeedc18692be773916e4e62442e02441f45a657d5060caee941ae157526635b3c942ffb702c43612f5fbfdacfae838d956074ed262ca0695
 MISC metadata.xml 591 BLAKE2B 6dfcef2c04291096bef621cb68ed9f2fa2c379920fb2072783b6245673fb37a6b6903d80ac8da46439a6a6be81372a3474585abbe4234559b558f48c3e23a1a6 SHA512 8cd323d8cfa69cb2630805fca3cffcf373980ea9da041e5088dc6cef83acf4b001dead2cce394e41f0d57152b4b0f06498918d54324367941049f4cf180be96a
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.3.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.3.ebuild
index 08ef2d56a27d..f8ecb153f4d6 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.3.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.3.ebuild
@@ -20,7 +20,7 @@ REQUIRED_USE="
 	smartcard? ( udev )
 	wayland? ( udev )
 "
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.44.0:2[dbus]
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 601e4e33146b..f4ae6b08f650 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -6,5 +6,5 @@ DIST gnome-shell-3.22.3.tar.xz 1952576 BLAKE2B 26d974bc45b93342db3d23f9a999734b5
 DIST gnome-shell-3.24.3.tar.xz 1982088 BLAKE2B 608b3e73d546dea543a23c31a64b03c32f35d118cd79fd0371a9e392377b4dd03bc16413443d643ed604a2fa81c2838939d92ef4c89a54469a8bd83dc9661f8f SHA512 369ed80b975369b79d4ac9b3f1fbd469fdde331e9079d09eeac6398a9b3c349b09f7570dfce1ed6e1cdfaf514b4b40c6038f34b6c3c7928470b2cd65b702ff15
 EBUILD gnome-shell-3.22.3-r2.ebuild 6637 BLAKE2B 2a911e1af1ad874225a07a64c50a16677fd6f1e4399f1f155e0e9ab4a52ef124cb44b47c2e5369aac3cfa9d20929d588b241174baacc5666f38e8706e86e3d6b SHA512 60914c7e4931a73e174ad470fa8581f519c68bee9cf98bc6fb499f483b52af0efc9ca818d8b0f09fd2500177588ab2f1f05472a27eeee0498ad23f2380dc93c6
 EBUILD gnome-shell-3.22.3.ebuild 6865 BLAKE2B 5c13185446bec0e28a319d0a56dfd05dd087706433f4efaf1fe4aadeb61573f89c333c944be55a24ba444f908f9b2031556a4cf86867701c3f10515f6169d133 SHA512 c454e77fda925908ff497818dc1559217628b0b4830fe8a8d70b3251c888f6d5e7c375e57bb2eacec8a6e25af01cfafc0ec6a7f3944a0cd6eb6853fcea9f06aa
-EBUILD gnome-shell-3.24.3.ebuild 6569 BLAKE2B 04a1888eff062efdbcb9e82701ef8a0b50902ab193ea15084e79198b9469186b06fc9ad2c5e34f9748345143b921871a05690e54e75f7e661acd8d4d8ad4b985 SHA512 6df83e260759864f6e6600aabab3f82b0946f036fad3ec6d29472cdeb02b76c90034f3cdaa60d0caa3fb39633ab5a12ea389a769071e6e31fc3ac58158921654
+EBUILD gnome-shell-3.24.3.ebuild 6568 BLAKE2B 6ecdb9b049a67d41d9051bfc606e480419e48e9eb84742901c7e022d7aadfc7ab9d83e82c3a00e49c17a3b4c52efd4f61180717035eb6819d2df1924443f0b84 SHA512 b7fa60c65c9c642d4da55803ad0d730ce5be3e5934cca34c83e076f4517e5b252f959b9bf40757ca8eaba434d48ed2bde7460bc72b7a1f250bdafc62706bc4ab
 MISC metadata.xml 738 BLAKE2B f379ab17d70d0241fffcef221940031cf797d3393c903fcc75c847e4bd985242c124b598e61ae50bce7e58ababe8595533bf3fb52fea47d75712eaa2af291492 SHA512 02db87e2ac6c43ed104ae911de8caf78632b861c4efd3bbf5b0cf7dfab1d4d79e023b724b140ca86e72961c06454479f4d814ad1ae5dfd481bfbc7a45af0c18b
diff --git a/gnome-base/gnome-shell/gnome-shell-3.24.3.ebuild b/gnome-base/gnome-shell/gnome-shell-3.24.3.ebuild
index 1880b88fdaa0..03418b19a10c 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.24.3.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.24.3.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
 IUSE="+bluetooth +browser-extension +ibus +networkmanager nsplugin -openrc-force"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 x86"
 
 # libXfixes-5.0 needed for pointer barriers
 # FIXME:
diff --git a/gnome-base/gnome/Manifest b/gnome-base/gnome/Manifest
index 87b350cf3044..2c29a6fc09c3 100644
--- a/gnome-base/gnome/Manifest
+++ b/gnome-base/gnome/Manifest
@@ -1,5 +1,5 @@
 EBUILD gnome-3.20.0.ebuild 1456 BLAKE2B 9acd17a4f24ff1220bcb3caf32bebf2b625150e02175c60b30390d5577b000de8f97f33ec88ca690afdaad20ba921f11d0b48ae4211f825f713c7eed5a634a6f SHA512 db4545199d2f9b4e4bf0b0991ec6f21040d7191644bb1929fbe16151899c07e30d452e50c8e2732eb02674f7141fa845bfb604642c491597c452d13c4403d57f
 EBUILD gnome-3.22.2.ebuild 1399 BLAKE2B 47d213fa95e659599b6538ea598a2afe598a001abaff560927ab5b75e55bb5d4c08fa203e581f6e53c9ebdd2445c69dccae6c46b04ac720360783e8400db8d6e SHA512 2abf56bbadce04382eeabe6cac07027df60e9308d3de2d2d6a2089b8629cc257cecd24ea68b8646a105b33743558efb102270280544cd32e78ae5d674fc26842
 EBUILD gnome-3.24.0.ebuild 1400 BLAKE2B e0329908ea4bc3db4ee0a5ecea0da1cfe00030dd5a1b7ab83e0ef7d944c4e204b0ed5fdbc286c8f5273f83e8ab3351d44d0d43b0e749ed6f3dd7bb65835a3d9a SHA512 280e8de05c613e31cd33066f1f0745ad114ec1d627a02143a418464a87de43243a94f9348cd4d9b24954910950fc38b81acf231e907eac2d52810bc608e61681
-EBUILD gnome-3.24.2.ebuild 1405 BLAKE2B 897ae8835b69ceb704d3a5dd16c92f3b555fd8aecd3a33cbb1667fb2e9fc979e4687065e98c308a629c87e2f2579aeed2bc5376b104ceb99004e3983177193b0 SHA512 dc72cd9b128fffff522c965956474c587cc6891335ee8e2dcb9f97b538389618441a5a84042dc0a46bb0a9bfc30a3935bc6d2103a570c08c86ffa4136a44cafa
+EBUILD gnome-3.24.2.ebuild 1404 BLAKE2B 2a83d561ded9713019c9e7360eeff82bcd01c4405fcae85202c6fc736fc7fff9ed5d31a1afedf224e756fb43c30d6784911e0fafd4e74f716bc44b4a7fb6595f SHA512 698c330c27fe7ecdbf8aead2d5e32ccb9e983ac2428c8f383654e057742f649bb0e543a24a723a36961a20e9d637d1bf8fbd7456c39c76bc9f4b0e968cab8ea2
 MISC metadata.xml 452 BLAKE2B 94890a098fcc359b62b9176f57baa243301ab562c549395f6307789987a668c095a1d571be9b7a5325ffdcbd51efaff100c1098ae0e2c337be11c54b3b703529 SHA512 459b43467672d33807e28cfa40ad930a083a026de9cc1dba2e5b795c1d766ca8f42591153164dbdedaeb7785d22a431eb5d1b36e618314ce792bb1c7da383d9a
diff --git a/gnome-base/gnome/gnome-3.24.2.ebuild b/gnome-base/gnome/gnome-3.24.2.ebuild
index bca5be8f2de3..cbf8482f077a 100644
--- a/gnome-base/gnome/gnome-3.24.2.ebuild
+++ b/gnome-base/gnome/gnome-3.24.2.ebuild
@@ -11,7 +11,7 @@ SLOT="2.0" # Cannot be installed at the same time as gnome-2
 
 # when unmasking for an arch
 # double check none of the deps are still masked !
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 
 IUSE="accessibility +bluetooth +classic +cdr cups +extras"
 
diff --git a/gnome-base/gsettings-desktop-schemas/Manifest b/gnome-base/gsettings-desktop-schemas/Manifest
index 2d9a4fae821a..134eb0aefd70 100644
--- a/gnome-base/gsettings-desktop-schemas/Manifest
+++ b/gnome-base/gsettings-desktop-schemas/Manifest
@@ -3,5 +3,5 @@ DIST gsettings-desktop-schemas-3.24.0.tar.xz 620780 BLAKE2B 0d1585c394d3c08e20ee
 DIST gsettings-desktop-schemas-3.24.1.tar.xz 638780 BLAKE2B c1857636e18c69658458aa9dfd65a7c3983791000f16eba08f706c243a0b804ed20dfde58f9cbe879f41348dc8257ecab86d5111c89bc1aacca1d8b62f2c0332 SHA512 c3970d61cc1c29bf97a39c439b3e0ba5c5d5c0f811e17b8884f106f095b159dd0c43cb90e02561edcc26e15b2b887e960d38de1c0e7498413db0c63102f15833
 EBUILD gsettings-desktop-schemas-3.22.0.ebuild 762 BLAKE2B e0502aa9126fc0808e90ecf18ec028d00edbaf9a813db4d4230f5c4572dadf4b5dc26afda75cb76902022341a4b3a55e541f14a84b1a52da0ed0ba57821f48f6 SHA512 66a5ff681cec7c66941ce08292117c26d2314499f55daea0f87c95d3f4d73ae4c3e0ac166717bc793c9d4f9a03593c317b5c0ddbd065146b35992334a1c8e209
 EBUILD gsettings-desktop-schemas-3.24.0.ebuild 771 BLAKE2B 4ecee752265adaa2257e31458a154a9bd1201b3aa899d6f493db57566ef7b8a651e1f5eab46f0507fe133e705f0da43f3c186cc3f49d7aed07bed8af582ea8c7 SHA512 60ea82cc84d4574941718a501a4cc9e116f1612d33e27a650ac1f36059c4ede5826ec25b936f3d0559be6ad50105bc299e6099b0b94e080f68e1b750ba96b15d
-EBUILD gsettings-desktop-schemas-3.24.1.ebuild 769 BLAKE2B 38189845ef1946fcb634530d4faf94e6ac00c631395061f1a656a5314463d699eea3880f74ed516cd20dcbb1af73b2bba4b574b5908b3536405ba19ec1a18f19 SHA512 9d79614b5fc852b1ee3c8ddadbf5e74ab6fe3298a7ee548424ddb0b3f9d302c95626d496591d3cd951a5fd78612b7dd377b12e694c60bce7f47cd590d6d37f56
+EBUILD gsettings-desktop-schemas-3.24.1.ebuild 768 BLAKE2B 3c928ad01fc820f2a73b512744fe6fb21aae6040406c25e1da393ac75df7dfda0fefd2f3b965da73db3f9c211dde66c17f0c05e68ac6c7db1754b5c6698a5ccd SHA512 154a85cb25b1b6b284739c82b68175816aa87a408569e89bc84c536ad997175556e61bcd87be7f1138ae81c1d62b07884344cd1cc65824638b2361c8ea3253d4
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.24.1.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.24.1.ebuild
index 627648080bb1..25d5843dc445 100644
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.24.1.ebuild
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.24.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/gsettings-desktop-schemas"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="+introspection"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.31:2
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index 910419ca6f70..68130753358a 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -3,6 +3,6 @@ DIST gvfs-1.30.4.tar.xz 1895304 BLAKE2B 7e7dbcde464ac3afc982d6d04916ecbee4b0cfae
 DIST gvfs-1.32.1-patches.tar.xz 53288 BLAKE2B 2394f0931927069b4aeab69769df74c823ebffca2e7e73245b3597e085f2fff5c98999e6eccd052fa3564339b75d764f2124592c0977fddd2eb4afeca819b965 SHA512 c3e9de02e013aaf707878f8ffab96c42ac558412020f8462f928d2c7bd8b9756aa980e6b8db50e6f0ff0ad91f250ef1a26358d80b5d1cdaa9234475ec3a3db4f
 DIST gvfs-1.32.1.tar.xz 1813212 BLAKE2B 4b349e968eaab75d75ac9e7b66087298754ad81668e415812c4db74e2e393ac2cddea1b55771656dcd67ffdca23e4cf1642afef101498d309c643519fcefcca3 SHA512 7bd4d137437c1704faf6a9c2712bddcc327284e752c552c2cc18c64beb5e6d291af321e92d02d4f09b619762121129cee82c13ec2a4ca39d045196ebeeb28dd8
 EBUILD gvfs-1.30.4.ebuild 3682 BLAKE2B 2d3d1ef263069a971b730ca70ca5719a67279b393381e14ea385fc677be382d7e81d68a81e89a1a8cfd288e56fb2cf52577cc55568a666aba89b64e247cc47d1 SHA512 e5698ae16fad71377b69a981ab420754be4303f36b8b18bd1687b2377469a215ae2a6eb75df5682c80dca4b682a7e9f48840247616d431b1b11a2b56048110ad
-EBUILD gvfs-1.32.1-r1.ebuild 3833 BLAKE2B b2fc325d0d495b84f56d03ba57ae581ea59389c6b23c3e2e1a8c2c0ec672741cc4198c088ade9d2a3a8da878e08e11796090bc684d035042b665b4f5d3b9305b SHA512 f9a6ab116df37954ed6f5053b3c0d81d2c1e6b0c45758ae13fb60fe2ebc8297ccea0b0ff62d6e83cad7b89cc4fb584e991bd25cb54e7ea1a13e27b489f46d74f
+EBUILD gvfs-1.32.1-r1.ebuild 3832 BLAKE2B 955d8c66cd0277c972f0178335b3d5f0440315502fa24e045adf46f7dde459a2ffa508653294612234e2273ca6f138e42576fca0d8fd587e9e3e917e973ca9eb SHA512 0dcb98cbc2ac85c087b7860de06fd34e0c234300f92f985963f8d2bb3979e182b179ea1989b614dcf8fd0842b999f3bcde8811a802fd65de4ed26f6d6970ac57
 EBUILD gvfs-1.32.1.ebuild 3621 BLAKE2B 2364de0783d0a1a5d3a4de00f9528ebed53a40aea3056211ad5349c726921304682314bf3c6b040edd41f4fc726415a25cf05a49074885c1dfff28d289a1b52a SHA512 00057451a01ede2cc50c271bc14bfd53c50f3d56a2d386c0106b3550c0d577e7aca11e39568d02a3821e6695602b74e6c094d5798a809f3b1aa60005c46c989e
 MISC metadata.xml 1625 BLAKE2B 931da927a3cef58e8d768454cdda485acf3b8b42a87d9d4be0faa495e7b49b16e780815a0a959b91b116b078cb333c69873374e0f95e8aadb074ce836df3149d SHA512 4a3815b41763def19356793e36bafbd8a87359c9501f526465a6d8b62394c1605909b70ba4b8679b2dca89bb2660ea573a0e97611facf2d23c878fcdf51e7bfc
diff --git a/gnome-base/gvfs/gvfs-1.32.1-r1.ebuild b/gnome-base/gvfs/gvfs-1.32.1-r1.ebuild
index e1ea6f28348c..62c1d179e87f 100644
--- a/gnome-base/gvfs/gvfs-1.32.1-r1.ebuild
+++ b/gnome-base/gvfs/gvfs-1.32.1-r1.ebuild
@@ -23,7 +23,7 @@ REQUIRED_USE="
 	udisks? ( udev )
 	systemd? ( !elogind udisks )
 "
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	app-crypt/gcr:=
diff --git a/gnome-base/libgtop/Manifest b/gnome-base/libgtop/Manifest
index b620b605dce4..4d6cd209e1ea 100644
--- a/gnome-base/libgtop/Manifest
+++ b/gnome-base/libgtop/Manifest
@@ -1,5 +1,5 @@
 DIST libgtop-2.34.2.tar.xz 725720 BLAKE2B fc69a6d64f86e16490f417748937b196c090de7afb68052a42258c06b7b65b686edb41abbf69ad42065a44b5811def0776969c2caa01009c2087355e9b1b2e9f SHA512 22ae4792236c47fda265f1b16f66f8685122f84a76e14adf2fd9e5e669c1f9776a58a2ec00564e37add98084d7e3cea621b38b8ad09b15e348f9c74f5345f19a
 DIST libgtop-2.36.0.tar.xz 727072 BLAKE2B 46f24573bde0bcfeb2210ea08446f6e6590fadc5697745178133ce5f3aec2e464cbce8446d2dbddb9f05d4a16eb7daf110c4554778a28573116b2b59edcf556f SHA512 2768c628fa3e872a940246042b2c78ad4618612ecb2cf2b95fb70343a4f1a01bb558d0ce9e5b3468f395349f338ca33d460e1d91f2c123ad39243cd0ff20d5e5
 EBUILD libgtop-2.34.2.ebuild 695 BLAKE2B 721a1692bcc264ba0b3c70a283b522f15e02a24d03c8b96086e51729c0c19932259c0f90542c0ed05b7225bb4f0a1733492535c6d33e78a246c475c4b7205ae6 SHA512 748d1283986bc38c5ab86e5d91996c1149e02f31339898cc39c8eab2b72c056e8569854a751487bd1d8c54d4f7fe8c03b6ed8fbe3cbb63a1a6d95dd1ded42e77
-EBUILD libgtop-2.36.0.ebuild 775 BLAKE2B 9eee39bbcbaaf71146849793d1c5845a596d13130c96979bf5d1c0c4c90a2d24d7d07b9a00d5926fe563234936687555d52656d63f9191f56a8159cff4c6307d SHA512 913fe7b992055060d2a4f49cb29a988b7ea9a6c8ca082813a97439d3458957681a800c81f5a9ace2903f9470263fdf0afba0bd1d7690b394fa0161643ff0d980
+EBUILD libgtop-2.36.0.ebuild 774 BLAKE2B 1fe04c3c4589bea430a0e35478a0dc9d3835a121bdb62ecd5c9261a1d465550ef41c43e99b38dcf4ebd0c747b2ab3608498b736f6ba647e6ef3a1a923f290d8c SHA512 4e1a772a19823f4c06d52654c6e08f370f6376e201b3b9fcb0064f3666ef46f6d132442e3ca7a16d61a719724187a5edd5b95656a326e1774947ee36fddec88e
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/libgtop/libgtop-2.36.0.ebuild b/gnome-base/libgtop/libgtop-2.36.0.ebuild
index 8b8ca9447dd2..2528fb5ae674 100644
--- a/gnome-base/libgtop/libgtop-2.36.0.ebuild
+++ b/gnome-base/libgtop/libgtop-2.36.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://git.gnome.org/browse/libgtop"
 
 LICENSE="GPL-2"
 SLOT="2/10" # libgtop soname version
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd"
 IUSE="+introspection"
 
 RDEPEND="
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 08a97c93000a..04f8953e80dc 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -3,5 +3,5 @@ DIST nautilus-3.22.3.tar.xz 5104800 BLAKE2B f8eaa735f9c7398de038e428acffef74c4dd
 DIST nautilus-3.24.2.1.tar.xz 5143440 BLAKE2B 731046b6bdd0817b770cf3e2f0667187bfde613cf1a15611e6ec06e74bc3c2432ca66894119f224023fe46b01fd777d3dde2d2ac7bba0a9eb0fd71d38e1756ff SHA512 f6868600bcdc82071b3a63f4e4a0f7decf0d72e021eb3d0c26e914413c858163ee4403c4f3ef7689556a0fc91394f30cff9a3db14da030b277b50972c7b80a07
 EBUILD nautilus-3.20.4.ebuild 2842 BLAKE2B 4988a1517e443a73e86d915d6d4db7f76d0422887b8ec76f65d00bf5d1e0e044fd773df619344476e23d4a95fcd281b12cd4c6d181e85e69550e1529cb03fdb6 SHA512 82e8360fffd669cdc4d31c1af637b7e557d4f0f59b582890a0d842c2924c711c653fa4d7d3faaa6cc48def59b7ad59ea3da80705189ffb2c34cd60f9b62f58df
 EBUILD nautilus-3.22.3.ebuild 2865 BLAKE2B 795785efc37c3b4a2dfb3c915b843eb95e3293eaecefe9b4f8682f3321fdefaffda4197f2717fe66bea91e6b87ab7bfa6d3e8d9f47f678670da61a032a6a3e10 SHA512 c646ecb222c89e6a3f151b741b7c4444b5b4f0a9ee895601dffc0cf53b640c1ca3d12b249888a8b9c9c6039eced09e88c535afbc0bb2c181046d32376ac377cb
-EBUILD nautilus-3.24.2.1.ebuild 2865 BLAKE2B ed9401edef924f0f0d35d5f5076747615e43e7fae2352c0111c6e04c1257632aa60acb51ec0be7f58aad4d95de3f215d0f40ea3d81c0718db4da513c8dbc6d48 SHA512 749a8f7dd6cac5bfe7ce8e3af1192729860049c56c6da362537d3a57e9a3ddc9d50e60a0d2f4a51c25ec2fafacaf741d4b51c4e1d77e41f3533dc9bc4f72fc9a
+EBUILD nautilus-3.24.2.1.ebuild 2864 BLAKE2B 66e72d848e05218740554e9c924149d3e0d5e38e0894e1e21e8eee2296516e25f0d185bd7e30de499c35a9209397327b0c142241a39379d6d96a1cad1de621e5 SHA512 8b46aa27923ace87256aa0aeb2848f6621e0c048c3c7c59bcdaf1d4dc2ad4810c6ccb5c6784837ed05b1648c7c4625a91ea291aaf8d19564496a5125214e2e71
 MISC metadata.xml 795 BLAKE2B 5932c49c4317d89bb5bbc9754909397129147647a203cb5ee6e2d984850fbe87fa567f7e77b8b8afb329b4ea8d1c29413d1e51afa24d8f9ad8ada9efec1e21e5 SHA512 22363d80a08d2422ca7e454caf87dceb0ec7cfa6461467f3857c28e53cab914466c85a9fbabfa7d811009cbd3be2243cfb07462f49c434f345bf4c1999de1668
diff --git a/gnome-base/nautilus/nautilus-3.24.2.1.ebuild b/gnome-base/nautilus/nautilus-3.24.2.1.ebuild
index 06c9d8cff3cc..0309f44f6301 100644
--- a/gnome-base/nautilus/nautilus-3.24.2.1.ebuild
+++ b/gnome-base/nautilus/nautilus-3.24.2.1.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
 SLOT="0"
 IUSE="exif gnome +introspection packagekit +previewer selinux sendto tracker xmp"
 
-KEYWORDS="~alpha amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 ~ia64 ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 
 # FIXME: tests fails under Xvfb, but pass when building manually
 # "FAIL: check failed in nautilus-file.c, line 8307"
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index a829377dd8ca..260aa9db344b 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 6a906f7b443c..5e3c10bfd0fb 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -6,5 +6,5 @@ DIST evolution-data-server-3.24.6.tar.xz 4252940 BLAKE2B 42a0a39a8248628964cfd02
 DIST evolution-data-server-3.24.7.tar.xz 4253252 BLAKE2B ca435a4e6c3a003c5166bd06f0308766686cc9e02f1eb6a15a521c58805bafdfd39cbc7ee058339ba383329ab34a11ed2b0eeebd9b545219c4b3d8f51de8df60 SHA512 3e83cb0e87ec822ebf6c81963693e7c701d20266e0811bd261a78073c75724e2c24ac5d5561e997ed8567e9e519c175b3104fa6e2e28158854c8c3ec39a8e9df
 EBUILD evolution-data-server-3.22.7.ebuild 3689 BLAKE2B 4b37c74e6b0d27d4cd1061049f27e5044cd0319367fae2d521cd0a861076de52a52c736e009ee55ea93fae46fb38a7d1e63b3988d5d188dd35f0e034c85174a1 SHA512 ec236fda93b156d8ee5ada17f83ba66fee61807c44979d6f9301711e088bca1135abc367f2959cbc95c2e7be5c2976844418decb82e8eda362bb2af059adf1cb
 EBUILD evolution-data-server-3.24.6.ebuild 4047 BLAKE2B efaa725a8ca0c725bbbf5a45d50380a3cc08b164d7683af8cb63e5f3ecd790906cd0af3457d2ed306fc3bcac82737c800cc9be452c8d0694a8c549f49a626db5 SHA512 961f124186d8ade010b8c77ad34f07b2aabb16ffbbaaa93db1ec564a9fce8ef8de171b6890fc2685030f64f06781208f283caba45c29ce56688b5b43b4e826d1
-EBUILD evolution-data-server-3.24.7.ebuild 4146 BLAKE2B 6ae48342fa0bc402330cb6154928502b903f988f4971db0b3e45189ff62c78a0a37ab87e8826ec52f1cfb6e46c286889399a812d70c33fb7bcaffbe988a4a87b SHA512 2aba5c329631c4500ceded327c56c78d5e88100e6a958906830a2a118744f8f7f82cd1dcd4afab52acbf6603745ca53c83ac59de0741324a3f81c74c1661edf5
+EBUILD evolution-data-server-3.24.7.ebuild 4145 BLAKE2B 57e6f7f7908806fa50aa131648aaae3e6a2a835826bd0184f0cc89a631e876e8c2bbca68442fb134855f4b86513b13c8fbc2f5e573ace476ee3f8e82b739f5f7 SHA512 3091dac9ea3d6ccc827b84d68fb6e08d1a8dc0579f2aa7e08f320628d58e1641f65186e104b1e6f15759261813cd7857bba2334335f849c4f69dbece01b89e35
 MISC metadata.xml 894 BLAKE2B 2b37b8e2f6a027c64cf3fa2e93dda6270d6d73291213c956aabd91d3cdbeed7b7f40d7738f22566059304c13cb4471d6a344b564d28c4d11e86ac159dd789ebb SHA512 26ebc7b28f82f5d0d048bb699ad3663f8cb26cecccff86bb77543412a8faaf54c9cfbf3f526a6d3e113ec5b573fb97cc60eb56343d3a79d9d6162922cfddab52
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.24.7.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.24.7.ebuild
index 0beffe7558c5..cfc4ff4b4e9f 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.24.7.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.24.7.ebuild
@@ -18,7 +18,7 @@ SLOT="0/60" # subslot = libcamel-1.2 soname version
 IUSE="api-doc-extras berkdb +gnome-online-accounts +gtk google +introspection ipv6 ldap kerberos vala +weather"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 
 # sys-libs/db is only required for migrating from <3.13 versions
 # gdata-0.17.7 soft required for new gdata_feed_get_next_page_token API to handle more than 100 google tasks
diff --git a/gnome-extra/evolution-ews/Manifest b/gnome-extra/evolution-ews/Manifest
index f702f98c1277..dfc8639e2bae 100644
--- a/gnome-extra/evolution-ews/Manifest
+++ b/gnome-extra/evolution-ews/Manifest
@@ -5,5 +5,5 @@ DIST evolution-ews-3.24.5.tar.xz 488116 BLAKE2B 8144f1eae7440993c2bedd76e5cdfb33
 DIST evolution-ews-3.24.6.tar.xz 488668 BLAKE2B 3ec507b654042882158d2d8dfdbaae0372cc67d515501e45e327ef006cd8674f7b6e48de63f8930add9f29536d3428604f21666cfac98a764cb2eb0c20353ef3 SHA512 24bcaf9755b9d45d4848624b42f2b41bf1532aa836cdd26f8ab57b4dd5ac83d4375c340e0cac6f7f1b830c3ab998597893bce0fdd471ed7b0758a69367edfac1
 EBUILD evolution-ews-3.22.6.ebuild 797 BLAKE2B 364b2955e3d909feb216050230cb1c4b5cfe86b5e6e7ee934959913f4cfbc29314be5a68ce6f30ee2200a1f2dfef1a34ee299ae736acab8673453343348efae0 SHA512 0baa303346cd26bfc417cf8ee7fd2bdcaeb62980d6cda234b131b55cf7d3fb7638a9b127684bb2762453b37e1938ace02dabfa5bdb82027e99a7d8c30ceead93
 EBUILD evolution-ews-3.24.5.ebuild 1076 BLAKE2B 5c71eb434a6c91b53a20450960d8c89d19297c5f0af7661a3465c0201303b4af1b456387e6e18338bc927e4350883adb5c2c4119f5282401aab24340f80ed971 SHA512 9343a952f6c3d9b58a8b9bf6522107311de6c01f16715cb548cfff63d316873db07f05d1e61d4719dea6bad034b4998a8d65ed71ac1cf46a2e076d2c810c0be8
-EBUILD evolution-ews-3.24.6.ebuild 1307 BLAKE2B c90806e8b16c566b93d1dff5c583c49f0afedc816a577f8690d6b9734c2ae3854b68a7437a6f3a046ccce0263297572c3eb7245c4d0df52395ff22ea8dd5bcf4 SHA512 62bf8effe29c5acae98288b83392f7cee79653b9d764a77a68c99356453ea14a0c0227250a11410b0a5965200ba1d85aa55243dbcd354a6ec807bcb39e9d09fc
+EBUILD evolution-ews-3.24.6.ebuild 1306 BLAKE2B f82629ba467605d6c359c1b2c0db19a912332e6c1c32126a70919131d15b639bac496004c344a9078932fe262c5c84ff669aa2a3e30cdc5fd76ae969e9bd0675 SHA512 b270f0ec8019b39bd49157c393be0ba1bf305fe4dba9bb7a0e18e89c6095b6c0b5af662b21b9f4cb87c9f4ea629ebe36e339125976977afbc31601f516df2a7d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.24.6.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.24.6.ebuild
index 6c78ec33370e..dd21ac33a3b7 100644
--- a/gnome-extra/evolution-ews/evolution-ews-3.24.6.ebuild
+++ b/gnome-extra/evolution-ews/evolution-ews-3.24.6.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/gnome-extra/gnome-builder/Manifest b/gnome-extra/gnome-builder/Manifest
index cb173f838e1e..8a5f732ff089 100644
--- a/gnome-extra/gnome-builder/Manifest
+++ b/gnome-extra/gnome-builder/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-builder-3.22.4.tar.xz 2480900 BLAKE2B cd144cd92030b6c452a58e52010f0a47edf0817a12387b69833675ab817235fb6912668ecf4b5d36e8ba797cd7652f00fcca1444692b66ba7ac1a64e2ca8dc7b SHA512 69ee0d22f7e60f1bc236f2648662ece38f2a3c827d6877f8cbee82eadd499c19de8e4f6f94d7ad8832a93d26cddb5d34106ec6a9e878a7abea3350929d50711d
 DIST gnome-builder-3.24.2.tar.xz 4342908 BLAKE2B 5dca80d2e948041bc096fa9a2a5d39322c6fedb0560e3e4f3c60c7b0657c7c62e89387a63f7d050c3df90d8c129485bc5495039802548b22ae268d94c14a37ae SHA512 dec133ad3c5ef96a036598ebbe684667dc44f73d8643e700f1e776cf8eb860b99c1d333f1fed5bc896cb7bdcf607eb51fedb7bb1f5b0cc662e4b2703d74140bf
 EBUILD gnome-builder-3.22.4.ebuild 5156 BLAKE2B 9dd8aabe0a60aa5395b3a9d66e97fe16ee031be00df80c2c3328ae001804080b43a778a014372d5aec7a6652a0d5d6c9b5bb8ee2a3e1997b440886ba88e896aa SHA512 c3a63df2d162b05f795b83acad7a248c2413620ab3bc39059036d4753149f6518e62f31c95a6dcb96fadb66f2d5a962ca066f20a861d4633dc2ac5d6b901fc08
-EBUILD gnome-builder-3.24.2.ebuild 5021 BLAKE2B 6c2313fa1a23ddba6dfcff32c72712cc0664bc61053f1e67904ed52f09cad6bbed8a4dbe115bc1dafc3fc8f748be763fb43b969f9e8b0e274dad74a4b1bf42b9 SHA512 71cc440195a314fc6223e81de0491534a66d18c5db3c64b264f239c03e804ad1ed31ea703428c71eebeeed1a5a19f8624f9d605805f44e3d51252dcfc57d80ed
+EBUILD gnome-builder-3.24.2.ebuild 5020 BLAKE2B b922dc740bfeda6eb2efb89d419c325b11e03e5e19c12a9856076d7bd751c86e8e818cb55ea21e15383f6597228a4fb702de87beaf7176092f8c780de7308545 SHA512 d46fccf01ec184bcb7d92ee454320ac1da50c9f6002070859afaffd20b3484d98f4c03d07bf13c3974af40b9ce8caedf3d7b7ed46ec65595ad3297cb1a6eb5ca
 MISC metadata.xml 1011 BLAKE2B d6099c6cd5ffaf091f2ee0e07e261caacf0283aa18dc6be22a617b95236131e831d24f36bbc73f86edc66a3e6fe74f5102d101c9736d5d992a80929a68ac2100 SHA512 b3519707a4023a6c9892827abaf6465e28dbad2f1a8c2760a3f2d9b34d4be384d10326870e0d7952b41cb725c955cc838092786543ff1867db4a3acf41cb404a
diff --git a/gnome-extra/gnome-builder/gnome-builder-3.24.2.ebuild b/gnome-extra/gnome-builder/gnome-builder-3.24.2.ebuild
index 969a0403d977..2511ead60189 100644
--- a/gnome-extra/gnome-builder/gnome-builder-3.24.2.ebuild
+++ b/gnome-extra/gnome-builder/gnome-builder-3.24.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Builder"
 # FIXME: Review licenses at some point
 LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="clang +git sysprof vala webkit"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/gnome-extra/gnome-calculator/Manifest b/gnome-extra/gnome-calculator/Manifest
index 9eb06f27c5ee..8ec9364e23c6 100644
--- a/gnome-extra/gnome-calculator/Manifest
+++ b/gnome-extra/gnome-calculator/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-calculator-3.22.3.tar.xz 1324432 BLAKE2B da308ea5b781a55e50df459b914d2bf508577a9a0175ec93bd8e63d37607b261f9d3d72abcf838d7c555303cb0a30b9750712c1336a9f071793df7b53cd50101 SHA512 e11731a3b0d16067e98d7f5d6657c879dde22563c4ac7cf8e4323c6d959f7b4e95e1d28cb2c937b1bbc72256fa1e6e2cf3a1bdc77f72f38766605e482b63ce78
 DIST gnome-calculator-3.24.0.tar.xz 1358368 BLAKE2B 81ad42598418b11f2436ebf482bbf93547460990cdb464efb3107e93010081f3d687bf99c80d35d9a6576b5d838218c7ea07e81256abfa358ce78031d80b346d SHA512 55968f3a307748050089652394a3652b8e199be9abf87d43e732874526dc2f08c4521e302a69afd2c09705ffa67a890fc2217503dd31ef51959df9189364c22f
 EBUILD gnome-calculator-3.22.3.ebuild 817 BLAKE2B 24ffd92b21eb54911aa9c5d49cda3aa20c7642fabc731527d68ae908bee82e88bc8e2c1d4fff23bfc8f4a68fe12b79b9d2e913551a13e3d1ae78fabfbc7ca8b7 SHA512 2219acb5b62e3b8eb2b263cde34a008053997da93cb02d40833555d3e635d4f3146c31961c301ed88ae88bcb3eab087c28ec5173f82430dc76f1c59b2f0a8959
-EBUILD gnome-calculator-3.24.0.ebuild 832 BLAKE2B d3987e7d6cf1d93e3f5194a7fcebe6be4094ced83cf88227ddf9d4772ac94dfa5d1854edf536ae828dc69e94bf574b5e29648f511f1b632edc9d8f5e3b6ade78 SHA512 0ba68357dbbf81510895a459216a415e091d8ba5c1495cb2699aeb472dbd2f7bc4c488d790e8815b0aec10160e700cc956ee7be73e55e923f84c2a409e945dbf
+EBUILD gnome-calculator-3.24.0.ebuild 831 BLAKE2B fe40aff436455bc94177f54c7b55d5b96a262cde479c0c5cc7f9751756fbff16fa060aaf826ba671fd546e3f5228ca125ba67c9671eb549171e7ba377d57b42e SHA512 2aa97c1e4701f088c6489786141706914f0db3578cd66c14df96463490f9ecebbc8f8584854fc00755563d93f9eca0c4108b3ce1eb01e579cfbe72860131847b
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-3.24.0.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-3.24.0.ebuild
index 7957ba7be857..9a438f523ab4 100644
--- a/gnome-extra/gnome-calculator/gnome-calculator-3.24.0.ebuild
+++ b/gnome-extra/gnome-calculator/gnome-calculator-3.24.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Calculator"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.40:2
diff --git a/gnome-extra/gnome-calendar/Manifest b/gnome-extra/gnome-calendar/Manifest
index ffb08ccbed5a..3a3af8cc9dff 100644
--- a/gnome-extra/gnome-calendar/Manifest
+++ b/gnome-extra/gnome-calendar/Manifest
@@ -3,5 +3,5 @@ AUX 3.24.3-week-grid-fixes.patch 4124 BLAKE2B 99fca623889b10356defd0da2ab2672123
 DIST gnome-calendar-3.22.5.tar.xz 2376792 BLAKE2B b36ba91a0c8202bf1419450656b8abd75913a83ecb7780ac73204e0e52dd938069c364fc106860d3ef7ae14bb3545ddab54db9889207d0568e0fb6bb055eeba7 SHA512 113a77c64fce8317f12d1704bf4076b48abb0f42e4d6e474a7912bc948295bf71e8b9ea00e50301464fa9726cdbfe453af92a24acd3c9ac76a6f40e92062e335
 DIST gnome-calendar-3.24.3.tar.xz 2425292 BLAKE2B cb859e229b040dd1ef34643e7aac5ddc1d0368d0bc6912effd73bd2c95ecab458294fef866f5718e108ef36f03bfc0dcb5a1140a571b3dc35128125ea8ff8e19 SHA512 979a369a5c5fc7d4621ff1ae69dfb1b53002cc014b2f1c480c0122da5bf4282c1928df9dcdb3528352e9589099184ab51f96d1a065e346be8e639aa5fc96ac67
 EBUILD gnome-calendar-3.22.5.ebuild 748 BLAKE2B ef9d8db79696ae99c9cbe392fc0413f595f78debc7cbe1ab467b7d2777ad55539acd3a6b885b2f62e7d5a73f27336c97b86c3ffff05f4548433080db3b8eb0a4 SHA512 70cf17138a1f4d5f14076c9f330228a1f82007bfbaf121b4ccb2a6d36a3b83e257e7e9aa2f5c601e7fd11ddc05399babb5a0ee98d3bc632c08af8fd27e3db266
-EBUILD gnome-calendar-3.24.3.ebuild 1137 BLAKE2B 09f876ea161d579b2d2ab02d60124f7650dca659f37856c2e81925b9548e5f3a7f474aaa66759e2b93e7a3e7f569a7034ac773bdd779d3b12a94a08545544d4b SHA512 6dccd3bf2c2eded75a64025394b8850808a7c70a325b80cf94e77db70e6f2af16665a59cd003184a65b01a8aa3e92b9e98abfeed02c3684eed239960ebecf31f
+EBUILD gnome-calendar-3.24.3.ebuild 1136 BLAKE2B e265e44c1601c312823afa579b13e2821d948b2cd3cf3982351eca7e9d3bf15c9e34f0aac46ecdd920b9d9c28d3366adb891806777644177fe7b5358470f6640 SHA512 de38681c39092192c46a5239f01af054b7d56d436d56747da1ee5829ff74f86b078488614a2c6d5a5efe1438610548c15000ca94efacf3efca1620dac300e0b6
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-3.24.3.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-3.24.3.ebuild
index ede107b0602a..49a000b1905d 100644
--- a/gnome-extra/gnome-calendar/gnome-calendar-3.24.3.ebuild
+++ b/gnome-extra/gnome-calendar/gnome-calendar-3.24.3.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Calendar"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 # >=libical-1.0.1 for https://bugzilla.gnome.org/show_bug.cgi?id=751244
diff --git a/gnome-extra/gnome-characters/Manifest b/gnome-extra/gnome-characters/Manifest
index acc56513e092..459aab22eb32 100644
--- a/gnome-extra/gnome-characters/Manifest
+++ b/gnome-extra/gnome-characters/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-characters-3.22.0.tar.xz 1481416 BLAKE2B 4a61951c427d5ca7f36a0d221ca9b39053998329d936e16e0cbf080fe3300450776280bd31be0ff4de2c18c638243d34c4a6813763ffb7f4bfabd618baa90748 SHA512 c04d79f9b31601e127ae6103b2f473e2e4733facebf504189a8d5721a78b430883a0f790b58537eb7772c5a4ce72013183d037909f30a237cd1482c31144905f
 DIST gnome-characters-3.24.0.tar.xz 1490304 BLAKE2B b7bea411ae623a29469fa82d8a9a220a718134776c0973431f4f16f6753bcedd34a8886f3cecc8af59b178f93c051310fa988aef198618b2c4d0be9001cb7ad8 SHA512 28531676e3ed89cea574f800a1f0e19106eb4ccb0edc62ea493bb6680fdbe3b1ed45c3cd865a637c059a89df63b980cd4a9d69d73049778c52725b1d38fdad9d
 EBUILD gnome-characters-3.22.0.ebuild 1087 BLAKE2B 3c1a5508a639dcc0b5a30c0a8b3637750d419dde6996f65995fd00d4485ac8d49f79cfa181d9ff9f168e0bfc75b52ec112a9b7d6e3e9852b3d07b46380f81975 SHA512 d5b33399bd0042e66f5ca0ee15d15693893ce20e7318d14f3ddff7f813232ebb697cc6dbd76fdbdb463ff2956b0ae970f75a53965c09db0620ba8d1cd17365d3
-EBUILD gnome-characters-3.24.0.ebuild 1169 BLAKE2B 9290850d7ff6e39bad484fab00b4bb9af1d49d0d00c7ae80b80a480976efc1dc1ae33d1a73ece36044d3629317c037264880d61e31de17461e1aded5e6029bdf SHA512 c442582d20f09b92b339c596b884b360922082f8010a5b32f492febec72fdaa7c0a64be8cbdeb2618b3a4c654fc104c4d15d4e778d1d62e222575b0e44c8da7c
+EBUILD gnome-characters-3.24.0.ebuild 1168 BLAKE2B 17e378c2397c5f9c02242ce840ba6c5f9626086e62287d00ded178f09a9d3f7a6797155b3946a39742006c9a80b032bea78466757c093c1142657dda1415fe29 SHA512 5dd6ce8d5cdb738fa247a2e97ac7703cfcccd9bf4bf7a2493e4443422de620665a34303ffba1005ea886ea0685ffd833c35aa617facdd95d756ded751570263c
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-characters/gnome-characters-3.24.0.ebuild b/gnome-extra/gnome-characters/gnome-characters-3.24.0.ebuild
index 13c2fb9c4914..ef88e3fd8906 100644
--- a/gnome-extra/gnome-characters/gnome-characters-3.24.0.ebuild
+++ b/gnome-extra/gnome-characters/gnome-characters-3.24.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/CharacterMap"
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/gnome-extra/gnome-clocks/Manifest b/gnome-extra/gnome-clocks/Manifest
index 5b9d45555c20..d6f1b133346b 100644
--- a/gnome-extra/gnome-clocks/Manifest
+++ b/gnome-extra/gnome-clocks/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-clocks-3.22.1.tar.xz 954416 BLAKE2B 52a59c0514cb05a9216997d1ebb985952be2c81b8105db02e5e3d11c1f6a6a13ee15ae86c35c97d985bde3763c8eed51fbcca1b8809c701db4e8102ca7e28d69 SHA512 76c4b9c493d6897a3d5bab4679f834bc515861bf6030d7fac2b59f5584b2a5278385dd4f5747adbe04df92c3af822ded669490d680daf3b9bc46ce09786f602f
 DIST gnome-clocks-3.24.0.tar.xz 954576 BLAKE2B 848303243391bfbc5ae2fcd8bfb4f3320ccb8465098d95379aaecf856341f05171964eda1a0a8637e04b5330cee6343003ec25063157f6d8ba0abcc22aa3f6ef SHA512 f29a61ac9634008fa918f9f08c6e24c93816c0077687bd2feff3ef2c62c0db475076de5dbc1e223027627e985c4e4362f0cdf1a47821356c0a9ef9c4cd672de1
 EBUILD gnome-clocks-3.22.1.ebuild 700 BLAKE2B a39f9de9f253146017112d1b110c01263023698462c6deaa9acb19505d078812d2bd28a5a887665995d5caf6564c8eb843563f506f5d8bb725019cbd63d5bab4 SHA512 6c443dbcce5358c79cdee75f5b98251d058c23719e04ef9cc7d5f34013e0137d5b885be7ea9f04282b6a6d3f30534bcf14c4bcdc6b6dea8c364536bac5703c5d
-EBUILD gnome-clocks-3.24.0.ebuild 701 BLAKE2B 269ec0a2e199b379275959e4d5340b1c234ca3f782dfab003ac013aad76a49df646b344f41674712410e8d12ab6f8157795c061fe6d13f53129de02c6bdeb10a SHA512 9fa696fe6d6cc0040bd81900357296f538e09e9e1e367b7ff0e0d8e4f6698f9889e26c935137ea8dfac5c5d5ec69c4fdeb4fe4b46d54ed3c5ee42768ebf2175a
+EBUILD gnome-clocks-3.24.0.ebuild 700 BLAKE2B 6eb7773cd6c818eed081337668cdd1a83cab80e946f8fc94635b895eff454f55d410297a113b58223ce8df2510418eeb188ac02fdcb4c38d6e049b8a6bf4aba7 SHA512 a108464748a745e78c230d635d1085fcbbc2b2a96b9a01a6fec6b63e7384b38377bd6e4fe40fd7a1784f0b970f6b772d36b08760e4812e160f9b7481d2bbb192
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-clocks/gnome-clocks-3.24.0.ebuild b/gnome-extra/gnome-clocks/gnome-clocks-3.24.0.ebuild
index c41f725ea7ae..7740ca668b48 100644
--- a/gnome-extra/gnome-clocks/gnome-clocks-3.24.0.ebuild
+++ b/gnome-extra/gnome-clocks/gnome-clocks-3.24.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Clocks"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/gnome-extra/gnome-color-manager/Manifest b/gnome-extra/gnome-color-manager/Manifest
index 039d76fc1027..ac52fad44eae 100644
--- a/gnome-extra/gnome-color-manager/Manifest
+++ b/gnome-extra/gnome-color-manager/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-color-manager-3.22.2.tar.xz 2671864 BLAKE2B 0560a234d66fd55f28d59b373e0f52a9b06610ff925e7cf8c959233883a039dfa61c0595bb97f1ad5e415d07a2baa24d8df5240ad5ca41dd5ad8a682639a8369 SHA512 dd50cff841fc8e70554c0c998494e363b709d1a8d4084dfc8daca6297d9491c1b797c4f3f106284e0f8ef133ac77704ad805b5519566c2f49e311f30a1e8397f
 DIST gnome-color-manager-3.24.0.tar.xz 2857120 BLAKE2B c73c3718f77517a41fc74c12347101c57b9939101b2c816cc6390185fb0b21f87d16ed30b17a94f7bd03e28abb4bd5f5d411c086d350659f6686cfffb7e88cf2 SHA512 e145caf4e885ea6e9c4ee5a5b4d800d70af338e26d3bfcda81e20c6144e36d0581638d07099302d30787d6d30e9d58f2b8373f6585ae3788df825d6d24f5b003
 EBUILD gnome-color-manager-3.22.2.ebuild 1532 BLAKE2B 0a31c6c73129fa838121fe80b6c6a1b1afa1526085a557c153450bf5165832c0ebf543eaec3309f3df19475db9b56e883b1580116afca6c2b24f8cc7b14a8aaf SHA512 75aac8de5f1a1425948107ab943f73eaadf1d735f236ce586950e606bd6eaf8cd0d80a8957d8f6e74848e2d4bc46c36367655c1e27a360424f089864e9766896
-EBUILD gnome-color-manager-3.24.0.ebuild 1538 BLAKE2B 4e85be17e2c78b297fc17a03714d0c8cdf3ef723602a7e6e09b529ac5eb7ffd431785cab63c0a07ff6439191e4389d7ff7120a02975c3b865deff3f4de9864f7 SHA512 d779210f3e0ee2e42eac62dab947650fa62d7c0da41477d6408b8fd6d64f4df0739fd119599a8213b2d3ffe90dff6be29ebaf4da2fb6cdf95c1ca7bfa7e92d28
+EBUILD gnome-color-manager-3.24.0.ebuild 1537 BLAKE2B 084f0e787a17f17923e8996d81b8e01151abe110045e6fb5f7d2a229b96559d4dc25167a0f5dd738bc6d9ac78c9327748f303364f80f921c9fa33fffb62cc9ba SHA512 bf6667a55b0e63a9c5797e6cdfa13534be558f6ece1aa4ed15be39915ea203051e51f5e6c2a1a98933d115a35134b29d3fd95f107224d0a2a64ede099497a3f8
 MISC metadata.xml 394 BLAKE2B 1a38f315a074ea0d45493f48b8de54baccea3378a2c8e4a07aa097750487e8b32f10b6c1e7ccadbefd52762e4723a842fe20a58f3e7b3d044eec9a9bdcac04f3 SHA512 628edb4565daf3f3591c8306916b0271b7647c3cbad1476414c368be1cec2bb790da5cd8f29a660b04dde649b21f2271660ce84cc87079e753709f1d3394f48d
diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-3.24.0.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.24.0.ebuild
index 90c71ab83902..441b966300cd 100644
--- a/gnome-extra/gnome-color-manager/gnome-color-manager-3.24.0.ebuild
+++ b/gnome-extra/gnome-color-manager/gnome-color-manager-3.24.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-color-manager"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="packagekit raw"
 
 # Need gtk+-3.3.8 for https://bugzilla.gnome.org/show_bug.cgi?id=673331
diff --git a/gnome-extra/gnome-documents/Manifest b/gnome-extra/gnome-documents/Manifest
index 4ce1b0993c81..c1ef7dbbaecf 100644
--- a/gnome-extra/gnome-documents/Manifest
+++ b/gnome-extra/gnome-documents/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-documents-3.22.5.tar.xz 2312164 BLAKE2B 09ccc89de43b81a2a9f5d0b85e616089896149559a34507463ac698362ffc72ea135fd660215d29fbc6d9e09df9745b38aff4b3d5ae9d62692de05262bdf3b60 SHA512 b074c5f5a5d7a698f3e571005a523f48928eca4081df7cfba6c97a0178b59ef3071920e5622e6200c8f59125fee934baaa2f07b8c011f8a4c2338c8488d0c516
 DIST gnome-documents-3.24.3.tar.xz 2313680 BLAKE2B 920e18b0ca43cfa95945268613f15f2f417de74c8992aefe414205d3463c0cdaac81fcabb9453ac93a76ae7b221da73379d86902b483fe2f3d12063ac27acdf7 SHA512 c5b59ba4a2eb83d7c61e6e50f6af2d0b310c7b9709ea7c8a02da707cc7e335589e4bef7b6f6618bbcca729fdaed531647f7f839aa3538830a226b837d0f0118a
 EBUILD gnome-documents-3.22.5.ebuild 1244 BLAKE2B 41dd0a635aef79cc1e76f6509b615de814558f3dc9dc3b8b1da6ad90fcc3fc55cf05d0ff2ca1067e9efc92e677d1e73717c7f36806374366f5fd209e91e5f080 SHA512 6d8f0c736487f0e3811523229c69b649f9bb5f583458cd0da81182211de94c00f9c23c7e8fabcc55b53066d01058844d82c2eedabc078cbc7d72a137dc65a1f3
-EBUILD gnome-documents-3.24.3.ebuild 1246 BLAKE2B ecebf114cd20eb1e162455ed0770f06aeee5f8b2c12bcbd0a3ef647f526e32defd29af2e8821f2a558c324f2f3882f5dfbfae540b63ed1c2f09b6dbf31fecc66 SHA512 3a57e340d161cc9bf919a875bdd72a9f2efd7493969a8f007adebe179bb1a510c25723a8c66162c90e58eb1b26b4a7682b26f063417f0be677eb1b2b19f94b61
+EBUILD gnome-documents-3.24.3.ebuild 1245 BLAKE2B 33bc45540e828e4045b47930b3e4627fd40aa0e15de115b3b8516c93ca8a76941bf62089a434b824da3788e3098660ca937e1c00dc1b68c790dd8796b2a6dd18 SHA512 acd279ff281474d3654f2f49f9783a84226971caacdeae4b21b5dadd6e47520dd69fffc383d3259d401c96542e2eb1f45b3e325c60174eff447c375ea1707dda
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-documents/gnome-documents-3.24.3.ebuild b/gnome-extra/gnome-documents/gnome-documents-3.24.3.ebuild
index 7a15f814eef7..0d0f874803cf 100644
--- a/gnome-extra/gnome-documents/gnome-documents-3.24.3.ebuild
+++ b/gnome-extra/gnome-documents/gnome-documents-3.24.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Documents"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # cairo-1.14 for cairo_surface_set_device_scale check and usage
 COMMON_DEPEND="
diff --git a/gnome-extra/gnome-getting-started-docs/Manifest b/gnome-extra/gnome-getting-started-docs/Manifest
index 3f7b2fa9742f..9b8c4ff12ab0 100644
--- a/gnome-extra/gnome-getting-started-docs/Manifest
+++ b/gnome-extra/gnome-getting-started-docs/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-getting-started-docs-3.22.0.tar.xz 119100024 BLAKE2B 9d6daaa565b92b5b27d621c1e3450a576105297c221da33169a9de2d51823250267464855b31024ad84f05272a365347a6a10f5eb171b199331cac9dfa47d744 SHA512 8eeebe70054a5fe68bd19c81b0725d3f2084c92aa91c925653bb2e53d4cb66c592d78af1e5446bc8063e9f0bf19f684d8b22c01b8300886ff32dca228f45cb6f
 DIST gnome-getting-started-docs-3.24.1.tar.xz 119137908 BLAKE2B 628dab2c9a938f3b265855443e794c1575586d0579692e1a21bae77dd497989cd061cff4dd97090f11719916f24742eedfc81bacb4fdf31536eca78cdd221d6f SHA512 7d44ac4030c3459014f391d10699b48f9be789c196900e29a56574e98698ffe494d3344a7c99f04291c49093827385093877b9047549cc5ff4d352d39297387d
 EBUILD gnome-getting-started-docs-3.22.0.ebuild 424 BLAKE2B abcb6723c0e89b6b166621bd6f7be96b37989692155742adb7d3b16c5895b3991b0c63de4d691eed8fa417209e4cd58e59742ca82b82e733a7af034c4792c3ac SHA512 4cec7d1bdd1f8a95a0e001bb6fa2e613c4fd8ccf937d17cf6b09a910dcc96553ae9a485b3bd5ea2e3459077342675b93cd62538a55c00f08871d5b2d812e7cf3
-EBUILD gnome-getting-started-docs-3.24.1.ebuild 425 BLAKE2B 6639539e385fb9cc700cea875eea128a29667b6d17220663cdd8f57d5b960d6e74855cd6dd7db483c0abf0ad9ea4872661a01d5cf9667201559de4e69f40904d SHA512 5c4a3c0b0d7618ba69e3b82850d63b0b2851f1ce734ba218eda8a68d759090d39b3394875419cb6f958dacf8cc74b643df31ecac681906a3511a5d7a2421fffc
+EBUILD gnome-getting-started-docs-3.24.1.ebuild 424 BLAKE2B 64093399bab07a9e68c313ab3084eb774543e336106b9f46517fcd27ec476c5cae4cc36091a1234c386374953ef0cce20c046a4db7942112b850cacdb84aab26 SHA512 adfea1597f4471168fed28f8de0f9002c83b95c47f5cfc254044252deac204bff92e29ef4514c66d35e6c043935afe0f9e3c249df8388a3bc501e2bda1fe45ff
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.24.1.ebuild b/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.24.1.ebuild
index 0d60cd6199f1..6e1a40b324b1 100644
--- a/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.24.1.ebuild
+++ b/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.24.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://help.gnome.org/"
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 RDEPEND="gnome-extra/gnome-user-docs"
diff --git a/gnome-extra/gnome-logs/Manifest b/gnome-extra/gnome-logs/Manifest
index 70fe1ddadff1..c6040c4b02b7 100644
--- a/gnome-extra/gnome-logs/Manifest
+++ b/gnome-extra/gnome-logs/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-logs-3.22.1.tar.xz 968664 BLAKE2B 02376b0b4e47298f9921bdb2d306eb7a3678a98df16815c9b46135171edbfc69813e8d34bce18c33f1bb061c67d78119b7bc7b84f17779f93f1c9fe7cfbfa93f SHA512 0836f326407bcfa66b57f10218ccb557356baaed53867c96f4a8fa12eea547fe4bc8a4f5aea894852c4de31d19c4e2374ecfe78bcfcceda93d2884cefdef90be
 DIST gnome-logs-3.24.2.tar.xz 1000552 BLAKE2B da237fbce0b1ced77c52ffab1965f6e1209df8fa1f224274b3dddd30bea106fed6449e37e0ad654b579ce1128fb6b554ffd521faa5362db9ef8f8f2a54a1685f SHA512 6f7dabb0b0093b860198344373eb1feae244ed23c3a65494499c09a83c687ba68ff023ec5ce34846be51fd74293fdb4b575cf3a748a22fae183e89086eba1db9
 EBUILD gnome-logs-3.22.1.ebuild 995 BLAKE2B 9708932255d64ee1e92e56e78b043b67b28b93d85509dd9912ee6c70c03a80c4250ab410d806ce732ec99d2d3b68d437f567bcf88c354be3ee283b067c022a03 SHA512 7059edb371700bef17a64bcd021b8e82eae59d10d2bc7b78b7c146fa69c81cc5ab09f9877b6a4fbb63da26dff95b06f4b3ec861107e59e9d102e7c533f3e0ffe
-EBUILD gnome-logs-3.24.2.ebuild 996 BLAKE2B ccb93c0d4d18c9ee7ee41db04bcc1b6f1e7056001cb62be55ffb762b4f833ef3dc17ae9c8adaa74d4cc76a35bf522374abf839ca2db4544e784ff2803f3064bd SHA512 7822194eaef098346c5ddd3e8f058c79ebd86b7692c6d201e6976b51de0bc2db0f07feff094c7779f9ce74604a8a33b0db72dba4b1979699c7f8cd4648d7dd56
+EBUILD gnome-logs-3.24.2.ebuild 995 BLAKE2B a84cd13c043754c4ef9e377ee4033cd8a018d9d5b46c6dbc1d2c97029d685c47ad00394fb129e710effe65030a765d9cb4d99088d54648a71493a6ccb937ffab SHA512 634cd794549eea11f7cf675f2e8404af952cc51f756fa8ea439776e8ab0f2b0fef4ec9045cde019fa9f78a88706df1ca79b31a30836f2476170924af8d98b47e
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-logs/gnome-logs-3.24.2.ebuild b/gnome-extra/gnome-logs/gnome-logs-3.24.2.ebuild
index 3d2d45d8eb33..b5ed60f132c6 100644
--- a/gnome-extra/gnome-logs/gnome-logs-3.24.2.ebuild
+++ b/gnome-extra/gnome-logs/gnome-logs-3.24.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Logs"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/gnome-extra/gnome-power-manager/Manifest b/gnome-extra/gnome-power-manager/Manifest
index 5d303b33d52f..9acbee4813e5 100644
--- a/gnome-extra/gnome-power-manager/Manifest
+++ b/gnome-extra/gnome-power-manager/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-power-manager-3.22.2.tar.xz 453204 BLAKE2B 3b0213481bdba4fdbcc25987660cd358271355a1d259b848399e8dde4e093dd4d8020277e44eafe0cf448e6fccf0abdc68fd8e28d1a654ea45c1ea46f4f2ca41 SHA512 a8039404bf9850422d385281b6572485b39b5fd63c7eec1b41df14f4d551898a90c8d943683517744d0dc2d851a7fd1f7697655af91a0d17a3df476828a763aa
 DIST gnome-power-manager-3.24.0.tar.xz 554616 BLAKE2B f39ce93943426fe8e833b48b5e7e4a02645eb3ffd28aa9e3e8c515d159950409ae9904b2683419d0087b3ced8e30f1c42b4dd9c511100041952449aef0b18e0f SHA512 fbbac0f5176382ccd13497cd80792d10ca4bc39fa4cc0585543f5458ba0f256ffb66b7ebd82667e482ba33cf2b6f3ef6a64bf2f55ac224e1d9ab2e2b7491e4e0
 EBUILD gnome-power-manager-3.22.2.ebuild 1325 BLAKE2B 01a147f9b88eef2137bc3b3029babe37d18bb92dba14417ccd7de7f3277a08ab88bebf59ed241fd412a3076735ccaf2f2ff9eee3b8f683fb66581bc31d960132 SHA512 c5469e6c05c96901ba3993c948dc291981c281331779af3956a2337f87e1d74566ad738d231b8f1f6e3d9189c87150a9ca5cb68b7e2dd85e97879a97f4b1ad77
-EBUILD gnome-power-manager-3.24.0.ebuild 1309 BLAKE2B b6093bb002b551e2af0a24ed29836e443b12abea68cb9b624a11c0f84af345c920074316a0234f4dde764772477dcb0175b7b58fe3f16e6f745fbae19aef4ffb SHA512 ebe7c3071518af70eb42694304834c7bc054c85b552f576038bb4f43831cb988c677d40391b740e553758602d7f9a9c3ce91f69e4221829401f303c67db58602
+EBUILD gnome-power-manager-3.24.0.ebuild 1308 BLAKE2B 078e603ad3abdefe5eacbe16d8651f1c9d28c571f204e6327af747b447e74d9afab91a77aeceb77eba66ac4c01e04601a55da88177d0c1e4b6264ee49f9cecd6 SHA512 b86ad47dad5536a8f307462a91852e11272463a312cd0ec69413cd4f53de6fcbbb9f93adf2ae2917f1263cfb91bca3cf2d40188321199e56287a8f3ddc36368d
 MISC metadata.xml 421 BLAKE2B db2e0d7210e04256add24c9bfa054291ffcd6cf8b52107c184b61b27859589ed17bc3ef2037cf3eaf1fe7a8ceb3ac381c67f6c3557f0d960ff0f1aaf67e9bb99 SHA512 3734560a015221b467a58c968ebd60272e14fc37bd93d07dfecc15e68dd403ed82e1724d62ba88ce3ee07b5c0e179adc1fc67d68d2c119458901e609a740b43a
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-3.24.0.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-3.24.0.ebuild
index 16fe9693c4fa..040231ce2727 100644
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-3.24.0.ebuild
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-3.24.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://projects.gnome.org/gnome-power-manager/"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="test"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.45.8:2
diff --git a/gnome-extra/gnome-shell-extensions/Manifest b/gnome-extra/gnome-shell-extensions/Manifest
index 6b75f1760a31..fd75aeb4d028 100644
--- a/gnome-extra/gnome-shell-extensions/Manifest
+++ b/gnome-extra/gnome-shell-extensions/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-shell-extensions-3.22.2.tar.xz 339444 BLAKE2B 4d25481db952efb0433e8b55d2345b6a9fb8b6ee7fb0f84a53aec2e4ff0dfa560b0b8848095926ed707b5523a9dba6a14484035550e21dddaa657576dc181fdb SHA512 7cd045f2df885f50f5e7e41b818aad01c65bd503d656793d64bc9e283fe715f588215a894ac856da0c4c2759c549a1ce2dcb91af64081f40c664c9d28edc2d1c
 DIST gnome-shell-extensions-3.24.3.tar.xz 346420 BLAKE2B 3b6f6686656ca6f395bd69fea905c4f28264db81ac0f207bc2e0d6c82410328be2bc4c98faa659d9ac551cabb73e0576c4e28def9c14e5c7710a9785528909db SHA512 7948a9cb6f5cb8d760bc42ea2865823ee60bd164b491d944edb0413e362f38ed90d39ead44ac57872a83c43c4050f5448936e739626b89a2b486a22f41d61e20
 EBUILD gnome-shell-extensions-3.22.2.ebuild 2052 BLAKE2B ec08a847c5872d418c4af2441228204bb89c79a8301f74c410a49e92190a1566b96a53d4840f4e1681390722ac1bde204f00256caba3a068b65713d02ad1ba14 SHA512 b718a6171594590c37c6695ddde1cde5d62193faaf4a1122c7645ba9a3850e3434bc2996b08be02813330789e85e4e52972d07bf192b258ae0da404269d88d31
-EBUILD gnome-shell-extensions-3.24.3.ebuild 2053 BLAKE2B 8b4c60aff049502365c61ef6cc543d31ec1a77afd361dc9bb2719a21b2c0e843037718a48099f7005d06b1bdc99a455eccfeaff2d3fcffc2b64c8a4c062c182b SHA512 47b5586c31082486a463dcaef7fc1f008bbe9d8878aa9779006d1a4bb6cc18aa3800bd8416a33b9866cd4f669e2a1df4df70e79e932a0e4840d7ab1297dcb99e
+EBUILD gnome-shell-extensions-3.24.3.ebuild 2052 BLAKE2B a1be0802d71c34de0baf77b088badb0ef0f492c30ce738e85fcc52f921f2156f11715dfa2f3a7309cb1e3fe804ef80bd3d3c37a95b8dc49aecb7ea801fcceec7 SHA512 2aa74c3f079d1fe228e12fed8f984f80be3f0bdbc904499555e80d2a0931bc9003f652ba5aacb49563eef5bc86495c6f8552c2b1136fe0179b078a1004e45cba
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.24.3.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.24.3.ebuild
index e55bd917da2c..b083460498d0 100644
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.24.3.ebuild
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.24.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="examples"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.26:2
diff --git a/gnome-extra/gnome-system-monitor/Manifest b/gnome-extra/gnome-system-monitor/Manifest
index 300dd8af97a9..d1821d6f8158 100644
--- a/gnome-extra/gnome-system-monitor/Manifest
+++ b/gnome-extra/gnome-system-monitor/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-system-monitor-3.22.2.tar.xz 907524 BLAKE2B 81a1efd150439b84f471f7836d79da13d848c234372f41f67cd09d17b4ae6dfe36e3f9f9b8b769f611715513bd5c2624a058c24bf511a8aa46f85b0a6487fccd SHA512 ff713efc63a8b5f247c27358f69fcb8b27d631fb242bddc6a819b453996f7c49ba8a883bd3dc38437dccd227cbf393e473226d597af0994f25f4ca3246707d13
 DIST gnome-system-monitor-3.24.0.tar.xz 930956 BLAKE2B f08b6da2ee9d45d232f1d1f019b6844f6fcf50baf85944d240611fbc0794cce6755d6b7daf275f4d97686558fc0f2525a8700fda473b576f8d5d41f66f118275 SHA512 4155d9f130cc1e38d32b76d10ca91056d82b90ca555f9ded26acfd1ef018b92163b0cc2256861b8e166b3bfa7eadc6c900aa9c79fd0c859045197ab2eaf3dc9f
 EBUILD gnome-system-monitor-3.22.2.ebuild 967 BLAKE2B 6c03bca17f8767aa89bad5e71c6cb5e5a0ccf7f34ecb91c4845045084b3bac7666daf3794eb23f0dfde0fcc48b4572fcd334746cc950171982e6e28a343e5812 SHA512 5faf503b26e4a3dbd0d8dd0de2570d75533e5b9b1c78a7c2c8bc92922c3c86e2a70b4c8a3f76c41b919dae224d9f4112d29f9bbeb03123b9b627917648b20da0
-EBUILD gnome-system-monitor-3.24.0.ebuild 975 BLAKE2B 2429b52513c0c4d0de9bf34d281641a93e0e5e0df45fa63fcada591fe1e3e3138f161a32fca99b6f5586b11146dea00b2eb6c7b04c08ad5d433d6c3ad048cf89 SHA512 bfdca795a014b8916d07b6c2d8bdd5e6204be2c9741afd58283042bf76e0aba0cbd8ae22c6c7a39251a23f823e69c70262d0860d2ba0512f7170c7ea9e849f3d
+EBUILD gnome-system-monitor-3.24.0.ebuild 974 BLAKE2B 2ff42e344500a9c746eb1d89dc9b8c9c742625d09d967806847f01001ce44a412c364a86be6b0c9106c83d7908ada98414c40de98ba177bba3a4cf9a696d93ae SHA512 faa193df18b0b1317500364a2d371c7bcbc56dc7d25bf3e82581f73f63a3cc0f68e1e9944949dc481c145132ee5df31a202ee2ac25676f021c09a702eeb403bb
 MISC metadata.xml 378 BLAKE2B 2087d7820bf1a1544e22fa7451cd241ce73b899e2e48886f0feb234bf72c97710ec9bdee27fbeefa96ca43a0c36fcf87eec2161805a46cf7d7047f3d9472a286 SHA512 62f13c436d761ad3e4dcad32486a4f163b88e19644e4d1299813c22b0158cbf23e1d8d41ec20aa800c7cf638e89e721e6296b93446144e7b067f26b66bcfda88
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.24.0.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.24.0.ebuild
index d0aac964a42f..a091aeed701c 100644
--- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.24.0.ebuild
+++ b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.24.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://help.gnome.org/users/gnome-system-monitor/"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="systemd X"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 
 RDEPEND="
 	>=dev-libs/glib-2.37.3:2
diff --git a/gnome-extra/gnome-tweak-tool/Manifest b/gnome-extra/gnome-tweak-tool/Manifest
index 0f35a572f558..57cb4ed46ff3 100644
--- a/gnome-extra/gnome-tweak-tool/Manifest
+++ b/gnome-extra/gnome-tweak-tool/Manifest
@@ -2,5 +2,5 @@ AUX gnome-tweak-tool-3.10.1-gentoo-cursor-themes.patch 1029 BLAKE2B 8b97e43a73f9
 DIST gnome-tweak-tool-3.22.0.tar.xz 260132 BLAKE2B fe3e8810fa3fc209707ca5b2fa16d75114038243ff3930065b44ea34c1030a435a2aec70b108134ae238d8ed4d3ec70cc51c0c1f69c1d41bea162211765fb690 SHA512 c63c2c61787c78e2e25077cc83b28ae49bffd9e7c39aa78ebd93587ba9640275083f46273cb55986bcc46842449a31f38b77f0e9be69cea551218fd160f6d769
 DIST gnome-tweak-tool-3.24.1.tar.xz 261872 BLAKE2B ce62ad4357d8f8660bbbdcd81a1190f21cf7a832853aba404bc087b8150bff8f6451902102dfe030a6eec5ce658d31f176e0d32055f25e69203fda65ce092120 SHA512 b76e9a46de07d12b586fb7326fcd51fff1565b831fe8f4d1ab4bbefe36450b5d2cb7c7a168922960894ba57ac9bd412afa61973c034bd1b5f2b45c52eb34adcd
 EBUILD gnome-tweak-tool-3.22.0.ebuild 1649 BLAKE2B d4f0202d18e68d2f8427970155aadb5f69d4c19b1065e0598427b387a0532a59637f522f3a22c2919c4e23232a86236a7482834728673e86fa9893404eb1ffcb SHA512 50154ce71b3504ea9aff6797031cf9dec2209def242a701d8a05215a1dc80cf5fc8508456641776ab409da984a8af0e931d7ef2f0319d53ee51bca63d6126a8a
-EBUILD gnome-tweak-tool-3.24.1.ebuild 1583 BLAKE2B 627c1f3582baaf9994a1d1c252d65a282601cf238130be7e1ae48f9fd07be1b4c6c40a79914c2a425990e2a86ea443a2c9e8d0b152fb1d0d6a71fb99e24dac46 SHA512 abb4aaed8eb5501241ff4405db27a82fc1bce4c34005f2b990aa8742c8e93b5a54585546cf5eaa33c893c4e4945d00cbc3e2d571a57f52c4195701b8978cfc31
+EBUILD gnome-tweak-tool-3.24.1.ebuild 1582 BLAKE2B 9949f10799534331b7bacb75159ee55f5f555d96f55a9abc440c9363b4bb1b227c18660b601b14180c66f35c889e7a7f69580a2bbd17a531a6a726c442c7a996 SHA512 3ce39b7ebc3bfdcac542c28b0b64834936a0701874dd3b4fb93973667142caa31197e2ec4e4a1bc063709d4acfdc2eb0d8d3e0741857f908b6984228facc9bed
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.24.1.ebuild b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.24.1.ebuild
index 70d7fdf0d06b..e53ec44d1f8f 100644
--- a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.24.1.ebuild
+++ b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.24.1.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="amd64 ~ia64 ~x86"
+KEYWORDS="amd64 ~ia64 x86"
 
 COMMON_DEPEND="
 	${PYTHON_DEPS}
diff --git a/gnome-extra/gnome-user-docs/Manifest b/gnome-extra/gnome-user-docs/Manifest
index 5ce947553034..005cbfc76961 100644
--- a/gnome-extra/gnome-user-docs/Manifest
+++ b/gnome-extra/gnome-user-docs/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-user-docs-3.22.0.tar.xz 14148700 BLAKE2B 5a7d7b36b0854f937cc3389024eb5bf2f068d0d9874449d0589336aef6573fd3d21b1343025de5729483031b716482c485395c803bee352a966d59568e6a0d7c SHA512 d81768b1c2bb5e32fa6d81358dc8fce24d1a6af4a01553c30879a73afb86bde8ece513f5bd08df9fd1bd4e8cc545ee49f2f072391eed13703d804f73c71c696e
 DIST gnome-user-docs-3.24.2.tar.xz 14167700 BLAKE2B deec09954a9c3bf915c86030d13df70efec81090c74744fb98192a1e9727cab2bd54ee608f1f3bddcf8707f6a3a6e1ddaeffdc5175e0d0f2ad4ab2e890036330 SHA512 7725ceb6d079d244f9f764c54b2d374588a808c8f1b2e70f655e1d3e3dc957cab3a8edcfe3d000c5d4520e9d9da031585a20ade978b66753ef3b2c912230a87d
 EBUILD gnome-user-docs-3.22.0.ebuild 936 BLAKE2B 8c38734bfdcd009f20a98bd69bb2b6cefb6345ec1383e47c14d6ce6d24058fd3635df576279877ded14bac4079a57638a72bc06a4ac3187fda2a7159d8eb7994 SHA512 c551a2e2598aad54bb3a6b99c1aceeae23013a432ea5e1d5c3fa0eda39eb53e9177056ba426263b45bd6cc9337cc160046bb74b7eb5b4fd9d4ad07a25bcb787a
-EBUILD gnome-user-docs-3.24.2.ebuild 937 BLAKE2B ecaa3abd9b8045021c84eea42e031009d830167c660977594d72b4a04156e354dc75e8cf065a1c98e0bb975de75a9a0851c7e16c5629b3d4b914ecefea7c5df2 SHA512 17aa19782a039c3c2a07556ee808557a4b8a8c0e899a1686352f1aed8fe21d9af8cfaa3ea312f8f96a76bba1d08719a477b9dbeec71985ba714bf84b60a4eab4
+EBUILD gnome-user-docs-3.24.2.ebuild 936 BLAKE2B c73905e25c9a419e3c8999f7a09ae702becd42b1a526d90342bc3b3436e63af99631f00875526940f387a98ed39d42b5383f39a55990bacb313f15113385f5f4 SHA512 1b63ecd8d58c1110c79134c3679a715a3fcb09e075fe045ce512d5a83ad82051d691da674bc7880f5a6ed7a0183957e172ee69764a020d5313061b42ad0c66cb
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-3.24.2.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-3.24.2.ebuild
index 6c83a10eb7f1..e4ff024c6df4 100644
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-3.24.2.ebuild
+++ b/gnome-extra/gnome-user-docs/gnome-user-docs-3.24.2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-user-docs"
 
 LICENSE="CC-BY-3.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="test"
 
 RDEPEND=""
diff --git a/gnome-extra/gnome-weather/Manifest b/gnome-extra/gnome-weather/Manifest
index e05dc7c949e7..5f82580fab13 100644
--- a/gnome-extra/gnome-weather/Manifest
+++ b/gnome-extra/gnome-weather/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-weather-3.20.2.tar.xz 5360264 BLAKE2B 3863f105ef2db4d367c9f431a7be447d59d32fd44621e89fe4c83682637da4aa00df7da85e9c28bcb58d20e3a9d3d614f569886ca50d3ed8ff647b42e7430714 SHA512 3c592726949251d4deae6412592975d6439dccf3415df1ac2bff75ee97ef9fb927167ceee0835ef4d1d3205038340c20d9e9b2261205412341baeb4098c9fdff
 DIST gnome-weather-3.24.0.tar.xz 5358924 BLAKE2B 89091c0dd2e69109621450621a03231da9fc6032cfdc44386e632ab3e8e478fc9a02efff86417277fbdbd2c39d730efd76df1a787e14112dd0447b53715b5aff SHA512 c286c97dc1cbb4991e56ed49e8c788c6a58f0f0dcd5534812ee3e06a0570fd1bb0b45f7e35bdc11443f62dc3a2cd262db4f3d2b1f238cfc24236de88de4a4bce
 EBUILD gnome-weather-3.20.2.ebuild 1081 BLAKE2B beb358e0b30eef8bf88d264e81d8d504db0e9b539fe0296beb627cf360efaf7e195cee4f960cfd02da09a4bb17077d43ff090fbfebf769ac61aaa564d145ca3b SHA512 69ef257d0b5329843e87cc09260f25b8b9453c3cff34d83be05aa4799be34f994cef75b7cf974365766d5e0acdaf8c7b0f125d758a0bf7f89da34cdf2a162f3f
-EBUILD gnome-weather-3.24.0.ebuild 1086 BLAKE2B 379e330a79831daaec20726c17c7fc13af91cc46094544b24c70f441b900d4eae31a67107907c6f0250dc315fa2fe8cc6dfc3a781531fe90351724f7147cea3f SHA512 0c2e204fabfc14990c0daecb71ad5acec6c479ff4024fcf1573618a34ffd31b9efc2a1b64855982c560344d04c0e22ad85c2456cadfff39d1d0b1d0845619587
+EBUILD gnome-weather-3.24.0.ebuild 1085 BLAKE2B 23e877012247c7bacf65e616bb5ba59ce5eaf1b460b79950f684ca083f0b6af164a39fdba803d3a22bdae898d455cc3618f0ba930e377dfd07633123cd5e6b58 SHA512 1c3bd5d93d8809c2f6322577ff950a4387806880fcc733b927c37deb174a1a45a9b2fb7ab0f68d568df222f077e61e46d0432b404b41c2da57804b1597868d30
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-weather/gnome-weather-3.24.0.ebuild b/gnome-extra/gnome-weather/gnome-weather-3.24.0.ebuild
index bde2eaceac32..544418eed9c9 100644
--- a/gnome-extra/gnome-weather/gnome-weather-3.24.0.ebuild
+++ b/gnome-extra/gnome-weather/gnome-weather-3.24.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/Weather"
 
 LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/gnome-extra/nautilus-tracker-tags/Manifest b/gnome-extra/nautilus-tracker-tags/Manifest
index 8c4c32c57f5a..58f53b0ed98b 100644
--- a/gnome-extra/nautilus-tracker-tags/Manifest
+++ b/gnome-extra/nautilus-tracker-tags/Manifest
@@ -1,6 +1,4 @@
 AUX 0.12.5-Makefile 759 BLAKE2B c7c184be791db0f74dc0ade23d30297ae06de599ad0317c6973c262e2df2ed93468a8737c454b63f089886c07a4d9c45e8e1117d057b0feb5e27c3e4e5be3f5f SHA512 57731bd3626b33c34f10f84cbe21654eedb2bbee7a374f78ae2015e9bfaf273f7cf797d5a5a7e31ab7ebfb6a8e7241dc7735126634ce455dc57f057158b21b8d
-DIST tracker-1.12.3.tar.xz 5053768 BLAKE2B e67054e8a9f61c7342ae05136aef20589efb59991b5222d046359f936eb1b1bd970d00ec21f3e749aeaa22df58115f89085197a0fd7abd910e1fbfcbea19211b SHA512 4c2155a295bc431740e52394885edfa2fd8487ef2f4b6749b9392a82ac355a440fb34381267a8793414fe750501fed7e1b1d0c5b06a766282513de78adde41d3
 DIST tracker-1.12.4.tar.xz 5051884 BLAKE2B 99cc85fc4d49691eb0a73e4f1776d9971b5cbe5844478825e473137b4d7b13e2578065be497da57285abc2d3cf4c6d1ed1b077a01cd68dc093e18ddd7674c1f1 SHA512 e81af22733c7d80535c79e23a4b3edbbcf888eede1dff071d466518054e90d4c207af76bcb4d8c73dc20729ae2eab60444ca91ee7ae09e96c0da2fdab97752c1
-EBUILD nautilus-tracker-tags-1.12.3.ebuild 969 BLAKE2B 86b120e8f9b06d7f272f6ecafe8b19db453adc5d16d0ee2132380cf089ef38ef2ceeace6aca46b241079342d4ecbcfaf999f1d0265bcb040205b22a69cd5364b SHA512 e5bca77ccf67c817d48c6490f7bbdc3d5b056c47847e973409299053bf5f35057bdac1e6bd90f542811cec5a75689bd571c93b67a82b8fba0dc09b2f62cfaaf1
-EBUILD nautilus-tracker-tags-1.12.4.ebuild 970 BLAKE2B 7f0d2755db5bf3e826a66b8df33123d1e4595cfa91c114508df8951550a3a51cf71c07d87578dd5a045984be7ae5dbaa5916aa3f0b4517b3e85a9d185180e540 SHA512 59b5311b54070f3ae42aec22201055e076fda1085e1283470968af1e0bffa86105996413a1a2db88ed04c6c9f29929c24a390ff54479cc5bae130defdbed724e
+EBUILD nautilus-tracker-tags-1.12.4.ebuild 969 BLAKE2B dc8b84e61d4b1fa24665275fdd025839d657845ed80ee9c0798cf79d536372755dbcfae8b95edc34dc2f60ae9b55a2d6749bb74a965b773f488e4516df702191 SHA512 20de68b14de7403987569922ad78ba8004b0a150a1bbb0be8bc19bb526ab237538af0700f7b3687b3ddb669ec3ea3f7e9999c6365cb0138afb6bbf938b76c5bb
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.12.3.ebuild b/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.12.3.ebuild
deleted file mode 100644
index c3c94b391c37..000000000000
--- a/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.12.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="tracker"
-
-inherit gnome.org toolchain-funcs
-
-DESCRIPTION="Nautilus extension to tag files for Tracker"
-HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-COMMON_DEPEND="
-	~app-misc/tracker-${PV}
-	>=dev-libs/glib-2.44:2
-	>=gnome-base/nautilus-2.90
-	x11-libs/gtk+:3
-"
-RDEPEND="${COMMON_DEPEND}
-	!<app-misc/tracker-0.12.5-r1[nautilus]
-"
-# Before tracker-0.12.5-r1, nautilus-tracker-tags was part of tracker
-DEPEND="${COMMON_DEPEND}"
-
-S="${S}/src/plugins/nautilus"
-
-pkg_setup() {
-	tc-export CC
-	export TRACKER_API=1.0
-}
-
-src_prepare() {
-	default
-	cp "${FILESDIR}/0.12.5-Makefile" Makefile || die "cp failed"
-	# config.h is not used, but is included in every source file...
-	sed -e 's:#include "config.h"::' -i *.c *.h || die "sed failed"
-}
diff --git a/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.12.4.ebuild b/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.12.4.ebuild
index 610d9ae0b464..0dedff4b8909 100644
--- a/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.12.4.ebuild
+++ b/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.12.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/gnome-extra/zenity/Manifest b/gnome-extra/zenity/Manifest
index 66a306059087..698a08e4142d 100644
--- a/gnome-extra/zenity/Manifest
+++ b/gnome-extra/zenity/Manifest
@@ -1,5 +1,5 @@
 DIST zenity-3.22.0.tar.xz 1082088 BLAKE2B ec9d7a82a5086c1eec6fbc278fce6de3fb02e56cab2cf2f75458fe978ef80b110d02872b32716421b69125f0bac3c8abf85ea8cadf68e033d404a0bdbced9702 SHA512 0131e854ffb8093e6c36787ffc831af8d1adbb663931b09b86a477c28c3b456ad2c9bb59cdc00a2d6505a1cf645df6fc9ebdd3c46c1a666c69d607e79b4364a3
 DIST zenity-3.24.0.tar.xz 1085124 BLAKE2B 2be50461c8575b5322319e3b35a9c833ae87f2e35abfdb27bed61dbead1b31dc31d551c8973634a7a0f0abc178ee6c7a4bb24377632df7d7fcaf77780f7fd4d6 SHA512 b24291166221cc2dabeabfeab7ca00ca63ff21c12a4eb327cd35ac43f485b8d4a858dd717df1b35b8bd3fd89d0bb235609855c6d349b76879b0f77b4fedd4dd9
 EBUILD zenity-3.22.0.ebuild 1101 BLAKE2B d2af9709a129354108822ad977eaecb7a282cc25680a91573873d235e389ff74cc8cad1adcf51c2ec94bc6d764228799ee7bcc2fa44dd3f85af73c570317c108 SHA512 6b050763a6e6d06e66000f0d0792735858ffc46739e3dffc534df8213eb03d095a71caf16e3b0c399709c8b6cc67fef1c425eda57081d11dde90bb0dc945ca33
-EBUILD zenity-3.24.0.ebuild 1109 BLAKE2B b00e30b8be111b13fb631498dc57324bc05a31dcefda875ef079d9d8a5d53b4c8d262e14bc692c63425f2f849d776c98c423c722019f84a8f2dd8bfe001fcd1e SHA512 e4f7b32f830492498960c48ec22611c8fec6e51c5d15f844c40ee3f10e4fd43f3b413f151da9d34a765806e1a59b31e4f0f04d504714e756cde5b06ae70af15d
+EBUILD zenity-3.24.0.ebuild 1108 BLAKE2B 32be4a94db30a9b9f4ed49607c096b9375041b360a10972a23b8441b4685082326375b3835cb8321367ddfde751fd2cc6fcebf8e6649618793da946603f35f3b SHA512 dafbd0107b9135b22a575d235dd6921928d2bdbde5dacd500798151255500343892978226b14a4c05359c52a55ed2b2ad67b3d8b948debfa49a06bebeaa3c47c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/zenity/zenity-3.24.0.ebuild b/gnome-extra/zenity/zenity-3.24.0.ebuild
index be81f8d843b5..3373cce2a49f 100644
--- a/gnome-extra/zenity/zenity-3.24.0.ebuild
+++ b/gnome-extra/zenity/zenity-3.24.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Zenity"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug libnotify webkit"
 
 # TODO: X11 dependency is automagically enabled
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 74edd6d6194a..ecd9297054bc 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 5715f921920b..d2d8d8062c9d 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -7,5 +7,5 @@ DIST evolution-3.24.6.tar.xz 12153692 BLAKE2B ced20d9e08f6b9aac65be6f5ecd5beb861
 EBUILD evolution-3.22.4.ebuild 4086 BLAKE2B 43e3c62a5c89f72a4539e92f4695db1fa8e890d4638c81045bf359f53d64d969fc958e20c1bb47885f4ea77895f651e2d023b613ca8ba2f45914947094531303 SHA512 6b419b6eba9a57551b889ca94fc18770789a24a7e8aeba1aa6c49186aa656b27d3045f571f05781aada1bcb18dfecaeff557fa28404a0e5380cbf1eb7b03e744
 EBUILD evolution-3.22.6.ebuild 4069 BLAKE2B 3b8cbaf03bfbe4883d67ff982481d6abb85f3edab97e9ec3ffee30ea4fe822e5803ac37e28310cb6da6b0a170f6de378a8b44044de254daa1958600c5420e074 SHA512 bf276e7f5c0d6936b5166e739ac7d5b1f3349684cbd940a629baf37b505a78ebbcaa1f79a5eb634db8d903db8e881dcf9f4bd14f94402e3904d3c9f074a6230d
 EBUILD evolution-3.24.5.ebuild 4374 BLAKE2B 9793bdc3cf4eb793a88b42bb3935fc0674182f88d8535c0f631654fb35301a3804654db620cb322cbb1c3d198a31a2d9b227f0626b6827511a37f01e0102d85c SHA512 18020872e0c355671307098d4dc36b2c800a253cbc51392494f9190fe45c4c5d17e4fdb7ccec4a70d1c04e76b1822d9d4897a02fbc7b33d4784540460012160b
-EBUILD evolution-3.24.6.ebuild 4537 BLAKE2B 222051a6437185e968ae5563d83bfa5744e3695794c5964b037b70ce5c3468e4d32a2283803f99f3a4941bcaf7fd124e077d53ee39d77fd3a03ac8c25ae18c5e SHA512 a18d16429ac866617498f8426f345c0848c26c721354124621d12be4a85b73df1baec0ae56a01c1fc9663bc0d1ed97d6239fdff6991fd780b8222f7138043daf
+EBUILD evolution-3.24.6.ebuild 4536 BLAKE2B 6a533b93d2a912fb5b78a5e52f25b76625fd4ba78eacf6d73db7ba9a20ef98961714ea344a5d6dd38ae06ad69697ec388dce3b8fb92dd8c8e3aff04b586982fe SHA512 5bf391f8ddbc6dc82585224f9b5ff2c7f61a7892f2f42ac7f40124f61a64c01b5952a3441ce0d8b7462b14bb984fc4b72e461aeb4ad1b3fb3b7f13fc026dd3a3
 MISC metadata.xml 1205 BLAKE2B 66e8fe4cec38cecf66a4a781c5d3498d8f11d72f1298a1df615a1b178b53cfd435bbbbcfbb6805662027be17be00082f429cc1e3c93fd5ce54cd2b88c873df8c SHA512 8713d5f9cbc7efdc7245cb7b18d30132c96095e396a1c8559e8f942c87157b6b5f3de03daade3b6d2ad9fc53067bc938b7af4369beeec70ca01291c198e438bd
diff --git a/mail-client/evolution/evolution-3.24.6.ebuild b/mail-client/evolution/evolution-3.24.6.ebuild
index 3edb84ab3504..902c307fdb09 100644
--- a/mail-client/evolution/evolution-3.24.6.ebuild
+++ b/mail-client/evolution/evolution-3.24.6.ebuild
@@ -15,7 +15,7 @@ SLOT="2.0"
 
 IUSE="archive +bogofilter crypt geolocation highlight ldap spamassassin spell ssl +weather ytnef"
 
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 x86"
 
 # We need a graphical pinentry frontend to be able to ask for the GPG
 # password from inside evolution, bug 160302
diff --git a/mail-client/geary/Manifest b/mail-client/geary/Manifest
index 22ab54bed82b..f1aa16d6a3f2 100644
--- a/mail-client/geary/Manifest
+++ b/mail-client/geary/Manifest
@@ -4,5 +4,5 @@ AUX geary-0.7.2-cflags.patch 659 BLAKE2B 09f34b7e3afc9edb9d11bb0d83671cf635a1997
 DIST geary-0.11.3.tar.xz 964024 BLAKE2B daf30b11f045741b4f5ec00d245afdcc04763f25526f3c5d12b0408fec9b0ce96a5ef53f01b622b4aed4bb43e879903385a545430d1e0e1bca14a80bce159f8b SHA512 dee389384b6bab25f939f0f40525670c27e3687cdfdfbc0c5632ccb2e9e189be3902aedb4fb37affb67c8b149e40ff78e41efbf8a754d76dcd405c8295be0d4b
 DIST geary-0.12.0.tar.xz 1064064 BLAKE2B c4021a784f7704494dfcf9013e4b108d9f921d553e47f55878de30c9878852ac2c023e679c33660cfe2fb190fac56dea4976eccb15bc1a512914442564a24e48 SHA512 caaf49065181f84234bbdb3dc20808f68cb7339e7ef3e992bd83789d3a474b5f59a210d54db2b4fe5f44539a2d52ad7f328087580748c74a513cca7be31c2e52
 EBUILD geary-0.11.3.ebuild 1892 BLAKE2B 6705d7e5003647847799bf56a73cca2de0ec3be6de6789cbbaae9e8cf20fe54d8d1be85aba2a6ff43bf990fadd0fa8cc0b10ef8d2d33ba94f7c50a7f9c013de3 SHA512 3693ccd3b21d527f76f440dc546fab9e04b0e3b444816fa39ff73ae170b6dc6ba127894d4c07998f140cad442a3a54390eaec1220fc3d2aeb356d36d7c768c05
-EBUILD geary-0.12.0.ebuild 1697 BLAKE2B 7d1ee9a0a0f081e8e8de4e5858e54ca314ff3fbffe18a58441220aac88251f5bfb075e51e7ae73e8d33c4ad566c55f779f46e8e54259a43f94532f56920f51c5 SHA512 24b7eb42be490031d9a700e1f36da04d75094b6a245f441be305dc2636308f25bd7f8f252543d789184409023f2906258814d5c32a34ce5e8086fed41a9f07c8
+EBUILD geary-0.12.0.ebuild 1696 BLAKE2B e09db7ec9f677f5cd287be3a5a14852e443db1679c29e32c88cd72efefa911978e22fd4fd23c2c09dad6947746b4e2799eb2ec0d1b41094ec3cd091dd9c775cd SHA512 c70ced94dd34b205bf1ecd86b642856582cb4c44a14bfb83d316e1c816f520e5fdd4929afc14a23a1e08d982b2e6f52286f8be1c1da8b53a78372377adb17011
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/mail-client/geary/geary-0.12.0.ebuild b/mail-client/geary/geary-0.12.0.ebuild
index 458518fd7ead..e50c3dfda668 100644
--- a/mail-client/geary/geary-0.12.0.ebuild
+++ b/mail-client/geary/geary-0.12.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Geary"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nls"
 
 DEPEND="
diff --git a/mate-base/Manifest.gz b/mate-base/Manifest.gz
index 741104f6616c..59e85f39344d 100644
--- a/mate-base/Manifest.gz
+++ b/mate-base/Manifest.gz
diff --git a/mate-base/mate-session-manager/Manifest b/mate-base/mate-session-manager/Manifest
index bc58ed42c7e8..81d8bdf81680 100644
--- a/mate-base/mate-session-manager/Manifest
+++ b/mate-base/mate-session-manager/Manifest
@@ -7,9 +7,9 @@ DIST mate-session-manager-1.12.2.tar.xz 538832 BLAKE2B 6442fae3076e2ac54b4705326
 DIST mate-session-manager-1.14.1.tar.xz 574804 BLAKE2B af3ed0abec15a7bf2002d965252b07eb5327c2fc351b1f475c0afc64011a7b18d21d0b4f3d40f56282ea11b8055e21e52ac0a2df9e509442b2e43eeeb549c9af SHA512 993f314c887bca8d8e0b9450f0e62686e133ea16ee2b6675ff69766564d47a4e7d48581867e8d5e8395ee2e3b1735b121f16cb1be22c7da29015a58f98edd638
 DIST mate-session-manager-1.16.1.tar.xz 574540 BLAKE2B 40abb2655acf84c90a8805e967817d1ef4739a1278369f5b632071302d22a9c6cf15d83d69e8ccf7503dc19f8c39844f14afa976a96f905dfd355a7071a609a1 SHA512 fdce8351b5541e7e8455659c1107be2976a24602e61010261fd8d1931d07298033d15fda43163fabc2bfcd6b42120c68e377278b820100686a8ef8e36852ff0e
 DIST mate-session-manager-1.18.0.tar.xz 578256 BLAKE2B ef58007798ac15934b6e8c071ce97ad3bd52d47fdbf639ac7a2e6c1120d67492e77a2d1159700a17a6a6321645b4a63e6de2c493fdc26d65aba4e98f7262c6c5 SHA512 0b1299eed5a745112a9976a85965847fc7a579e161236f4d661cf08a1292037aa8246bd3e3efcf3d0c6ea8b005e9dfc33cec797c8dc48615f7bc88ce5d351ba8
-EBUILD mate-session-manager-1.12.2-r1.ebuild 2230 BLAKE2B de6a5a28b0ec3ee14d09eb0e85ed7ee5058d806e03ed3d905ee893064e9c4bd44630bf6496564a14807e85a622ef39d7421640e34230d69f07ab6a8a423aa81a SHA512 55063c103ad5851136df465c4a7dc7cbc0032805da4acf4df22e0c3276dfc21b1ae41dc91d6f27cfae76983c5f36d9703e83a114023a2da67ac4b3422f4dec54
-EBUILD mate-session-manager-1.14.1.ebuild 2118 BLAKE2B 206db9ba0cc46441a7861a58359eceeb9def7ec306093691371479f7df15de399c66c77abac6083812888a9e93aae1efbdb16d4da573fd1169b71294db60386d SHA512 9249fb51db47698f455dc127ad136166ab4500fd00419da86af3e6013fee9b1969376bb24675985095f74ee31f14683efb6f37508d8c4e996948d1a75ba60a14
-EBUILD mate-session-manager-1.16.1.ebuild 2076 BLAKE2B 50a36a0f7cacf0535d945962f1a99ad270b5723892c13578af25acb42469a394d1259428dafba05703e17a731c539506d60c668651190cc72d9f2f9994e3f9e0 SHA512 3e4b58de6e7eb24b69917030311d34ef72cb284d1cf344528bb6202e39bd7fe296d7cf3f3d16d8df20af552c6ede0535d9da85cfa4c908661ba3f4c8532181ef
-EBUILD mate-session-manager-1.18.0-r1.ebuild 2014 BLAKE2B 1930d25922bedf4e44132cd243a8079571d8ae28edcc3ce5f26e98c6928857141bb53a71cc05448fabc48029c30143d43c864e7e3e34aefe5c04d8b8a3a3f667 SHA512 65b1cc52f9c5a33207662fef05698371a12d72460bacc8beb074d4e20d6eaaf11d370c239c4e659deb9a98f686d3e7aae84afd595d6b8f165872217811fbabc9
-EBUILD mate-session-manager-1.18.0.ebuild 2006 BLAKE2B f4ee751c8a1c65cb40260cf5bc62aae54720fd5230499688c986aa61f857b7a8ee7df2116dc872683aba05ced1bfb977fe53beada8914fdc730028a708f15658 SHA512 fb1e2010ae2bec4a6e931cdbc9ac2169baaa027f3254b7ca1c9fb3a77fba19fc661ea12b76d5ad62725e4b0688aebd1cd2ace107e0ed177aa3892ae6b393be6d
+EBUILD mate-session-manager-1.12.2-r1.ebuild 2268 BLAKE2B f1413a4cab927cf550ac419223836dd3b506944c9cd5da37c34c85a4ab945a477d350ff65cdb6482b7ca10b9abb2e12f5e74793cfe364dd8ccc60404a6087b20 SHA512 a4192c79ddbb94ae522d87d304e485e292352b788a0aada7b0003f42b5573948a727deb3e695a5dd58004444ee27054fefca9c0de88c29a9fe43f94d1e3850b8
+EBUILD mate-session-manager-1.14.1.ebuild 2156 BLAKE2B af21c59cc37eb4a955ddd6a168bfe0351f37e8dc8904e510315b7b95da5cc3251a4ae9faf94a3bd32f0a7245ebd5eebacaae17fdbdc6adf1c4dfb85636b4aaad SHA512 ce5408ca30670daedceaa6942ca6097e85ca6cd4167af15d0f075260ab1416da0ed36eefdb46cf9a1854bf22ceea6d20bc88172e15268948fda04c5cfdbbf4e0
+EBUILD mate-session-manager-1.16.1.ebuild 2114 BLAKE2B a7c96a7322526dd5c936179a8b3d5d9d26f97af037aeb3a9ea754fb2c5832decdc4abfde4a79f3cf2bc0c35c69d0d1301cbf31f7bd5c9f107c3edc3aa8c2171f SHA512 b2d2acbab19357943cb195d74ff799435e33016dff4d01b859aa5307f745d4ad81ed1acefa83df8922ff614852b237f42760893b266a22db1819076f6b2713a9
+EBUILD mate-session-manager-1.18.0-r1.ebuild 2052 BLAKE2B aa45fe425cf05f7cd5b4b99d8ede2f8f33d83cc0f5c9d5043317198a591d08ed6fe0f2c508ec72d97148268ec3e551b43789d79228f34f94d19b7646a3a5afc9 SHA512 4ee6d2f4f33b5f2ec093bfec33eea15ef25f205721be118f94a05c95f6d833a3980fd7641a339cf292791dd048c459a2fad31e1045eab31e92d64ec0ac290d09
+EBUILD mate-session-manager-1.18.0.ebuild 2044 BLAKE2B 69a45c09931ab44a5821759ec50d2bc9c1dabbe88c87d92046f2b48d84ecc0b446fd133bee35eac74addd88ffe678b56dbe146d5d6dba098e0d211f9891045b1 SHA512 5538b863f80254dac59b449b453cdfd2468219e0a0274ed64cf628ea24ef6f3dfc8f3651bd3cff6e762825c97186cc1fa64d682dae8aa401b6a5c6b1a2761b17
 MISC metadata.xml 558 BLAKE2B 6c7b3116a26b07af4afe5be2f4635ffeba7a67bddddb5bee3009f20ad215c2fdd4bdd89d3d8f58c02e8edf6ac665da54b35a708936bb6edd12f4c1703360b497 SHA512 3ec5ae6695bb7477bf8384dc31143be21ff5d2f5ac0715309657b14e3b43b8013cfccf701307b2ee1a0f8e2cf0e7956d5db37739578c18006a299e428137ed14
diff --git a/mate-base/mate-session-manager/mate-session-manager-1.12.2-r1.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.12.2-r1.ebuild
index 02ad708b1ee7..1f8d061666fe 100644
--- a/mate-base/mate-session-manager/mate-session-manager-1.12.2-r1.ebuild
+++ b/mate-base/mate-session-manager/mate-session-manager-1.12.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -39,7 +39,7 @@ RDEPEND=">=dev-libs/dbus-glib-0.76
 	x11-misc/xdg-user-dirs
 	x11-misc/xdg-user-dirs-gtk
 	virtual/libintl
-	elibc_FreeBSD? ( dev-libs/libexecinfo )
+	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 	gnome-keyring? ( gnome-base/gnome-keyring )
 	!gtk3? ( >=x11-libs/gtk+-2.14:2 )
 	gtk3? ( >=x11-libs/gtk+-3.0:3 )
diff --git a/mate-base/mate-session-manager/mate-session-manager-1.14.1.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.14.1.ebuild
index 054ad67775f6..3e193a85805e 100644
--- a/mate-base/mate-session-manager/mate-session-manager-1.14.1.ebuild
+++ b/mate-base/mate-session-manager/mate-session-manager-1.14.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -36,7 +36,7 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.76
 	x11-libs/pango
 	x11-libs/xtrans
 	virtual/libintl
-	elibc_FreeBSD? ( dev-libs/libexecinfo )
+	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 	!gtk3? ( >=x11-libs/gtk+-2.14:2 )
 	gtk3? ( >=x11-libs/gtk+-3.0:3 )
 	systemd? ( sys-apps/systemd )
diff --git a/mate-base/mate-session-manager/mate-session-manager-1.16.1.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.16.1.ebuild
index 0e302b18648e..8ca0b8b67a59 100644
--- a/mate-base/mate-session-manager/mate-session-manager-1.16.1.ebuild
+++ b/mate-base/mate-session-manager/mate-session-manager-1.16.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -35,7 +35,7 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.76
 	x11-libs/libXtst
 	x11-libs/pango
 	virtual/libintl
-	elibc_FreeBSD? ( dev-libs/libexecinfo )
+	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 	>=x11-libs/gtk+-3.14:3
 	systemd? ( sys-apps/systemd )
 	upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) )
diff --git a/mate-base/mate-session-manager/mate-session-manager-1.18.0-r1.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.18.0-r1.ebuild
index 5ca37a0ed168..30752431738a 100644
--- a/mate-base/mate-session-manager/mate-session-manager-1.18.0-r1.ebuild
+++ b/mate-base/mate-session-manager/mate-session-manager-1.18.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -36,7 +36,7 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.76
 	x11-libs/libXtst
 	x11-libs/pango
 	virtual/libintl
-	elibc_FreeBSD? ( dev-libs/libexecinfo )
+	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 	systemd? ( sys-apps/systemd )
 	!systemd? ( >=sys-auth/consolekit-0.9.2 )
 	xtrans? ( x11-libs/xtrans )"
diff --git a/mate-base/mate-session-manager/mate-session-manager-1.18.0.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.18.0.ebuild
index dae79928d3a0..ce7d45a672d5 100644
--- a/mate-base/mate-session-manager/mate-session-manager-1.18.0.ebuild
+++ b/mate-base/mate-session-manager/mate-session-manager-1.18.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -36,7 +36,7 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.76
 	x11-libs/libXtst
 	x11-libs/pango
 	virtual/libintl
-	elibc_FreeBSD? ( dev-libs/libexecinfo )
+	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 	systemd? ( sys-apps/systemd )
 	!systemd? ( >=sys-auth/consolekit-0.9.2 )
 	xtrans? ( x11-libs/xtrans )"
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 9bf37bf7fb0f..aede7ba2547e 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/fontawesome/Manifest b/media-fonts/fontawesome/Manifest
index b19c4a8e7fe8..8ad09e8b706f 100644
--- a/media-fonts/fontawesome/Manifest
+++ b/media-fonts/fontawesome/Manifest
@@ -1,5 +1,5 @@
-DIST fontawesome-4.6.3.tar.gz 2526615 BLAKE2B 5ecc9cff9ba09bf72427a4170f450aeadda8f2b6a8925b1ce76409debe2b5fd0e1d13a995df13459a7a0b57e8ef1e03c63af054ef990ffeec80caad4094abce6 SHA512 ecf78028e7948e89d352c7f0de413198d95c235e36f49c24146d246012145ac62e0f4d1148655ef88be15710340688b2f3cc55247cfb6742a41400422f88d69f
 DIST fontawesome-4.7.0.tar.gz 2672776 BLAKE2B c20474c0167665d82fcbe74984ad9c44fa1155a2a5363222981d6c32f40a3bf13bfc2c582d78e8d36e57939f8af3810fa823f2241d1924a83a05c79ed08cface SHA512 913e5eec2211111e9601c92059745344766f4c3a6f3563cbc6f8a5f3850a0101bab8f3f992a97c6f1c264a2bbb5163f3feecc6b3f64fcb22c9592d2d38cc777d
-EBUILD fontawesome-4.6.3.ebuild 599 BLAKE2B 75e2c003ed3aac16cef42fefdae1984f0aa65870be71c738b3713648bcfb3e09a7379c99197b5d64d4af15520af45cf3e8fc855cfa4cfd82ad19758f4045cc4f SHA512 0c7ca7cf44d1078dcfecec56c622a03014914b3964be31cda20261f0e026d5d90c2daeb8fb873324d7e6791fef8fe5c6b7b4dc8fbebbef2604a810d1a9e669d6
-EBUILD fontawesome-4.7.0.ebuild 603 BLAKE2B 54e6cd36f597b4d5ecbd19810af57fd442663a937a6c79284beaa582d0c1e64412f2edc33307f5ba55e15c1daebba888a89567a10f60efdfb26bbcb885c67e72 SHA512 456e3f7c08e5121d32cc0ae392ed4610c52ca503af70ced28c165e926e054b737713ef1d1619d84c9cd1c2d67cde2df589704d3a050f435e9fc5f2204dda4b5e
+DIST fontawesome-free-5.0.4.zip 14981074 BLAKE2B e899c4bde9012ee8496e6c55a7c37cc65daf195366ebb6ba4eaa536bb0912c8558ba709f61b3ccc7807f064f247a151630c4b763e9bb8c5e8e659484ed5c26a6 SHA512 af5dc97d2672a307f4867925aa3a45e6148d2565e53c99300dd9b204f6f9304270821271ab3c5240944e6c3ce0997c48b1cd483185f85cb81d30620af5d87a73
+EBUILD fontawesome-4.7.0.ebuild 605 BLAKE2B a2ab612d6c2b1ef834dcb384391383f1bcce2df7d3ad01e9349f50f604b510d3e782aa3dafdb6e45dc9b5ddb29c7666fa1c291f1853ecbaa7f16b85ae2a554ce SHA512 35d1c23ba8a514c33424b9806a142059cc522ed99e1ae69df543b81482bb09f97cd056e037f7862abb777b557c8cf464c1c89fc90100e52e39aabae463afef6e
+EBUILD fontawesome-5.0.4.ebuild 790 BLAKE2B b6fe16fc5ef3ac0ec831760e68fad46861037149282551a162ec608e8fee867c33cca1d030a1ec7dfa3133dd24c42d88bcecbbf72c0fc7039b8aa94c6d6ba172 SHA512 43f42587eac345820ea069905d5c5ed3d843157397b72f08cd62f02ea5cedccb4163535b8dd6562416eba99140e01d3d96aaeee91e2cb98a1e453eab632814ff
 MISC metadata.xml 621 BLAKE2B fefcdf06ea11f267a41d7749056954e7e2f16ba1554fefc8d54ce4cbe3bf2c35177a79ba0c795b898fefc62ccb3d79da346bc938b22423c0b238e8d6d234b77e SHA512 5709fc280c0d0d1fd5c266cf4f4985446682ac955fcb94775298e4c2fe0c352d94a6b863c3e0b1b73aa70ba5c815460f786deae7cc43ccdce6cdf7950246910a
diff --git a/media-fonts/fontawesome/fontawesome-4.6.3.ebuild b/media-fonts/fontawesome/fontawesome-4.6.3.ebuild
deleted file mode 100644
index d43429db8adb..000000000000
--- a/media-fonts/fontawesome/fontawesome-4.6.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit font
-
-REPO_PN="Font-Awesome"
-
-DESCRIPTION="The iconic font"
-HOMEPAGE="http://fontawesome.io"
-SRC_URI="https://github.com/FortAwesome/${REPO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-3.0 OFL-1.1"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
-IUSE="+otf +ttf"
-
-REQUIRED_USE="|| ( otf ttf )"
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${REPO_PN}-${PV}"
-
-FONT_S="${S}/fonts"
-FONT_SUFFIX=""
-
-src_configure() {
-	use otf && FONT_SUFFIX+="otf "
-	use ttf && FONT_SUFFIX+="ttf "
-}
diff --git a/media-fonts/fontawesome/fontawesome-4.7.0.ebuild b/media-fonts/fontawesome/fontawesome-4.7.0.ebuild
index 5c623f0053b7..2b9a2ca0b133 100644
--- a/media-fonts/fontawesome/fontawesome-4.7.0.ebuild
+++ b/media-fonts/fontawesome/fontawesome-4.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="http://fontawesome.io"
 SRC_URI="https://github.com/FortAwesome/${REPO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="CC-BY-3.0 OFL-1.1"
-SLOT="0"
+SLOT="0/4"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="+otf +ttf"
 
diff --git a/media-fonts/fontawesome/fontawesome-5.0.4.ebuild b/media-fonts/fontawesome/fontawesome-5.0.4.ebuild
new file mode 100644
index 000000000000..aafd04922e96
--- /dev/null
+++ b/media-fonts/fontawesome/fontawesome-5.0.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit font
+
+REPO_PN="Font-Awesome"
+
+MY_P="${PN}-free-${PV}"
+
+DESCRIPTION="The iconic font"
+HOMEPAGE="https://fontawesome.com"
+SRC_URI="https://github.com/FortAwesome/${REPO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://use.fontawesome.com/releases/v${PV}/${MY_P}.zip"
+
+LICENSE="CC-BY-3.0 OFL-1.1"
+SLOT="0/5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+otf +ttf"
+
+REQUIRED_USE="|| ( otf ttf )"
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	if use otf; then
+		FONT_S="${S}/use-on-desktop" FONT_SUFFIX="otf" font_src_install
+	fi
+	if use ttf; then
+		FONT_S="${S}/web-fonts-with-css/webfonts" FONT_SUFFIX="ttf" font_src_install
+	fi
+}
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 34d066c3011a..62c5c03da4db 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/alembic/Manifest b/media-gfx/alembic/Manifest
index 2a1642dcd3f8..60eafd4cbe4f 100644
--- a/media-gfx/alembic/Manifest
+++ b/media-gfx/alembic/Manifest
@@ -2,5 +2,5 @@ AUX alembic-CMakeLists-fix_lib.patch 4760 BLAKE2B a5365176200b40a31d274bab9ef126
 AUX alembic-FindIlmBase-pkgconfig.patch 971 BLAKE2B 946766bceb152a1673737af5158be9f5efce812a70adfe36bf5642f150d2576f14c22670cc1bbf9027834c69ac661ca30d27f06f9fbf73f656dd883ce38a381f SHA512 4f5fa5a33c8fb4edcb3c0a5d0290a912015c0e02ecd6340e5dced1f658302034148a1050aee1dcbf3d7d89f11c5e9ea07637c659414951152dd49081c70560c7
 AUX alembic-fix-importerror.patch 662 BLAKE2B 140f80ff08522ec84a43cb5e988e7e532b2391a002e0aedbd9276d2c3ef34570bb07ec78e470eb3eadc0b9c719263030d0074dd839e37a6ea19de88f5b5cd001 SHA512 a97c3d6854cc9aabfaeaf6ac62669f1ada78edf7ded8ab9cfd7e0b7077288f16cb1537196a14d62f4cdda33ef3c65ff640ff6250a3f40e499eab72913c099efd
 DIST alembic-1.7.4.tar.gz 805503 BLAKE2B b8a8b986d0323dbe3748e1dde5436d66e08620a28852c3331ee612d43a414e381a1cdbbb63200b8f146ce94ebb0e3d0ae6f70f33575bd9ff25e9121f2cd73d1a SHA512 8e752d6d85bea3b6a53582d35a589fc40824456098d950974effe0a6a0e359fec1e056af1ea1379f7e23b7ffed2c05c7f5269fa4b64757631b7d57fb60ee98b0
-EBUILD alembic-1.7.4.ebuild 2351 BLAKE2B 43724d725456e19eb5d273ee8a80df5557ef50092cc61ef20dd8b7de62bd8aea50f60dbedbbf9253f634b894c95183b619122dc0056eab8a3a1921b56c88e873 SHA512 4c7caf975f6ac7823d137099c9d652ce9c70a0b40843fcb79a9751e913c45b65ea2b07505759cef67e3afc69253cba7f77275d6ae3c905044e0dd62347134569
+EBUILD alembic-1.7.4.ebuild 2394 BLAKE2B 95e18a022ceaa6f837d176cb648fdcfa3b28defb1b2098a653506fd89471f037bf7df9f6336cc7814437a2aef4d0ddff728535d2a2de1ebe347f59686beead8d SHA512 271ad1042e79cf8aa2f00f9720600ddd6a4696d23a91cd61328854711f65b70f92a7a12ffa5df27214af908aa564a0c469a123a3e937ab86c592c274fe0fea97
 MISC metadata.xml 1044 BLAKE2B e671e00836fe612f62c5548685c4149705e9081ac79c8df895ea37568d10f10cffe042ad3b67c9c29ffdaa3a5fa8b996dbffdffb765f7cce4bf9c792e01753ff SHA512 6adc2cae7c93307f0ed926fa9a0c666ec1484005af80e1239e6b4718d771f32defb2824715783cb906b2fec1becbf76e116fdf6610a75a1740641ecb96932d61
diff --git a/media-gfx/alembic/alembic-1.7.4.ebuild b/media-gfx/alembic/alembic-1.7.4.ebuild
index 1c14f809024c..59e04e1ce8f4 100644
--- a/media-gfx/alembic/alembic-1.7.4.ebuild
+++ b/media-gfx/alembic/alembic-1.7.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -38,6 +38,7 @@ DOCS=( ACKNOWLEDGEMENTS.txt FEEDBACK.txt NEWS.txt README.txt )
 PATCHES=(
 	"${FILESDIR}/${PN}-FindIlmBase-pkgconfig.patch"
 	"${FILESDIR}/${PN}-CMakeLists-fix_lib.patch"
+	"${FILESDIR}/${PN}-fix-importerror.patch"
 )
 
 pkg_setup() {
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index af4ad8f58199..0fecd1b1423e 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,5 +1,5 @@
 DIST eog-3.20.5.tar.xz 4622880 BLAKE2B c70e9bd8c93b3443910803b6c65d49ac3e4cc67767cc7cf1632034294ecb3be5a983c8fa58583d3438cd894dbe2132c5794cbfb2d47f51c0c3c0732a8e0e3bb2 SHA512 b4256cfe5f42921efd58d7ce09fa2a82d0328e1fe4cd94e953cc161c23b5079d05b89106ec78c670079d0b6ff0f31eeff25d67c259a600dbb4a0afe25b5d93a1
 DIST eog-3.24.1.tar.xz 4632496 BLAKE2B 24d6957285d5dae7fa2299165b1bac236e75dfa77938132c1d3f8f7312ed4a07d5d3a770fdbdbcf5ee1966a43b4443d331fbedec47575836e2170fa3022e657f SHA512 c007b6f2cd2b59747db72a5b86ecb34ac87fe0910a2d33df466eb05ebe5ff638fb9e57b15f2ea9328c95037334a2fd9010895241ff285628b7ed7b6d65912fb0
 EBUILD eog-3.20.5.ebuild 1344 BLAKE2B 30b10f0b5059ec6c6d5a6f13b53cf9ab6b9cb116ff7507ad5d5aef71cd7cd70827ea29c14043abedbec9e858fcd62722e6326894158d9cbdb3fdea591a1931fe SHA512 78730d2cc6f2edfff39ec0b1ad20acaedd9e0b01f4da4834f6ce554570e716af4e8e184f13432ded774dad0e654e2710e59a2d91e4a784d1edb4f429dad80552
-EBUILD eog-3.24.1.ebuild 1344 BLAKE2B 2c4fe096e0f7c32de1c136ee78e268d66894f928fd8700ea92c32ea8e2aaf9180277e30dc11ffe02a2286571dca2bb36e403b796b98b132890f9cbe585ff557b SHA512 ffc8473e75c83c9e77dc51ff17cabec9a6e8a189afb2789ccde18de6c5d5c367566278f7b984a1bf6881e63c0951279ab020f9f53900734fc490d4253ee53993
+EBUILD eog-3.24.1.ebuild 1343 BLAKE2B 63fa0d9614a37e9f3d40b2de61560a7642df4b14bb8196ff6de563b6afb5d0195f0832c27d41516659efbacadc977876b2ec09d736434d3026ddee8d913da0c2 SHA512 460f0f6c1e435cd970b0a67197d1885137c69d673eecd0e00dd5e7f9ebb8d52b2d22771b234786d3c31d175fcc24aad72314d0f0b14b11eea921b814fc725c50
 MISC metadata.xml 481 BLAKE2B 2c12b594b9a5b1e4ce3983131d1911f62026c5186d8f5c5af13842cfedfa4d20abdc5ee82e11db3a2e1b45e2b8d4d95fa1a62e668936956e8453b166daff00b4 SHA512 141ec1d6923697f744de806804279b602120ce3d5494257de36b8c8b71185d101692f2e438d7ba0e4a4c946d0aaba068117f16c8344abe891e0ddd4f768ded26
diff --git a/media-gfx/eog/eog-3.24.1.ebuild b/media-gfx/eog/eog-3.24.1.ebuild
index 34a0a3706f05..a8cbe4ce4c94 100644
--- a/media-gfx/eog/eog-3.24.1.ebuild
+++ b/media-gfx/eog/eog-3.24.1.ebuild
@@ -15,7 +15,7 @@ SLOT="1"
 IUSE="debug +exif +introspection +jpeg lcms +svg tiff xmp"
 REQUIRED_USE="exif? ( jpeg )"
 
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 
 RDEPEND="
 	>=dev-libs/glib-2.42.0:2[dbus]
diff --git a/media-gfx/gnome-font-viewer/Manifest b/media-gfx/gnome-font-viewer/Manifest
index edeaef14b746..55d267ebd0e9 100644
--- a/media-gfx/gnome-font-viewer/Manifest
+++ b/media-gfx/gnome-font-viewer/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-font-viewer-3.22.0.tar.xz 320680 BLAKE2B d1324c1316d1f43727a5fd38164a9f114d84f20bb73207adf4e6799dbde52cd8151d246f0452334bc1211c11d944b1471ba3b1e10031ee2e55855bcb74a4721b SHA512 deea5dce759fa7134701f5edddf4838a0221ef776777fabd071982fddc8d3a6c535a55035d4457d262db54760c3616335d9ef89e29f846a648c1d9d522018978
 DIST gnome-font-viewer-3.24.0.tar.xz 321600 BLAKE2B 85fbd170ccf3b9464f51b6c6d556fa8d9fce155581b37d2db0ff37abb703b4fefad3b2f5db7ed09edd033bc36aacd4a574b84fefdac4cb516c43f1255d9c0d8a SHA512 b951e98161dde808aaea0666c0266a3381c82a264dc7280fcd4e4debcf07bd44c940e738a2dd5134276625e404f87323f57930764ed2faeedad831ba6a8bb591
 EBUILD gnome-font-viewer-3.22.0.ebuild 603 BLAKE2B bd5ec7cd690de2baa911ca8f78719ec0146d4f53d730ff24a41a4c08e00e1fcd2c0110f81be6b9b1c94aa7843a1b5098f9e185dbf773973cedf1f7ce3e5a6284 SHA512 0f831db3a3dff5c49953f884bdb073a5b61636b3252c6600b9c0281426c3c5b3267155118595a286cfdd71565e89f609761debf4fc5dd37d144b5f7b1326620c
-EBUILD gnome-font-viewer-3.24.0.ebuild 604 BLAKE2B 1d246bbeb294eca160455a9ea195270c62aaf5b08805c6bcf3aea307cdadb46e4889ccb31127a15d2a842e523adce20e1b15f50632874f8ced99df3b17c9a775 SHA512 0fd95e85bb0312aa3be3a377a88b0b90d26c4897d87b18e091b1fdb5a19808244947eb7cf1fcc00fcf666e0b5759f02d90585e75078b9829bd6bbf8c85981d01
+EBUILD gnome-font-viewer-3.24.0.ebuild 603 BLAKE2B 2559d1e1155e5f877fbf7b74d662879b3deb7f4ffb65e58f214c86b8f62bba7537cfcb02e36e4974b88d56f249dcb7bb837ecad3b86a7708af874119fc85c7a4 SHA512 fed65120155408b85413622b6bdd607e0806cc32a2b769964119da41625a2c928a0f212ddf8738207e8e5b6a9541f167ae95606c4cf41b6d10a33161b88a1d77
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-gfx/gnome-font-viewer/gnome-font-viewer-3.24.0.ebuild b/media-gfx/gnome-font-viewer/gnome-font-viewer-3.24.0.ebuild
index 821109b15242..75353af23a5b 100644
--- a/media-gfx/gnome-font-viewer/gnome-font-viewer-3.24.0.ebuild
+++ b/media-gfx/gnome-font-viewer/gnome-font-viewer-3.24.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-font-viewer"
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-libs/glib-2.35.1:2
diff --git a/media-gfx/gnome-photos/Manifest b/media-gfx/gnome-photos/Manifest
index 2c5f3b1d5038..e747379e857c 100644
--- a/media-gfx/gnome-photos/Manifest
+++ b/media-gfx/gnome-photos/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-photos-3.22.6.tar.xz 962468 BLAKE2B ceb0e54801f42a681b26e95d670a7fbb0f62d9965e38452f8d5aab045c85bb0ee57558e90caa6a8090f978c5a02b6f327692460dfe5de92bf88079dd86fc8ba9 SHA512 4fb2a67b5acdbd63cf6f252d0116a4b759e0e6daae48d638ce96ec35f24deee44720c45cb0720a26b6a380e66bbde1619173de340375828bc2f4ef943606fe26
 DIST gnome-photos-3.24.5.tar.xz 985864 BLAKE2B d5e7dd48a6f81c9ca6efa7dcb2b17fdeb781070d1789514098b8cf30bcd12eba145e57e584f42f66286579ad40ef31f370c471abaab30ba684bada9878afc3c4 SHA512 8dcdb9962a55d6e2e9aa28ef86dcc9100f80fa9739763cea1475052379050a23428e09e8416ed75b9a9b1c85a9bc27d94a75faeefde3d546195c21f04f85379d
 EBUILD gnome-photos-3.22.6.ebuild 1735 BLAKE2B 95e990724288f0fe43926fd43431f860f3cad59ad28d3e6812c5c86a6d1e35bce895113243a708a536c49eef31c753be761904975f1a93b30b6340d36355dcaf SHA512 fe73b9b9a9cf368b41a06c8f4a33625a5684c9e41b376145c55aa51e990be34e8ef5066017d4d38ce7e0666fe587b3d90ec340f73837a6e0703978e94ff1a34a
-EBUILD gnome-photos-3.24.5.ebuild 1777 BLAKE2B d757253b09db6c110280e757d02e0ceb9b6c3ecfacfe03a5629e23d2eb4d0755e03c42f19cf88475e2c15c358ce6f3ee4ad9cc95d9fa7a6f9125db96bf5f63f5 SHA512 5cc9aafbedadd6ab013ef7058db63a373ac0f455a4cbdbc74b9b0735cdcf42936a452968613d7e045d81ab474a96aaf3cfb80f0b28f5f7100230e04b8d2e581e
+EBUILD gnome-photos-3.24.5.ebuild 1776 BLAKE2B c4868a2dfe4d4dbbfa7a396ffaf2667844ac63f767162fa4fff975de27aa81cb86b3736f0b9461663a8a311e5e5f9fcce28934cf9e4da9fc8b74f2025810e2c8 SHA512 469751ff495f9a15ada2a680cc6191e5aef9a5e51770075a69578dfbfb1253a2d7e04e0cb5da850f0968e8d3224686f5f354683cd7718262f6f3b3caaee1bc24
 MISC metadata.xml 320 BLAKE2B b66fb85cefaafccf9575d4f85c017cc07cb55b75d377e8a95bf482b6cb7817f902c5fd3987e08c3d77b604f10710cb6f9820f5e4451e402b186e7714444abf4a SHA512 86c99b12ed97b3f09e9469dcb093e18f844f5b3efb3a3169e62e10fe446075c7839ba7ca00e3537744d3c839522cf5ed2ee33215cd5988466e35d0f4dd739b11
diff --git a/media-gfx/gnome-photos/gnome-photos-3.24.5.ebuild b/media-gfx/gnome-photos/gnome-photos-3.24.5.ebuild
index 955636b54220..d802c9d1eb7b 100644
--- a/media-gfx/gnome-photos/gnome-photos-3.24.5.ebuild
+++ b/media-gfx/gnome-photos/gnome-photos-3.24.5.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Photos"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="flickr test upnp-av"
 
 COMMON_DEPEND="
diff --git a/media-gfx/gpicview/Manifest b/media-gfx/gpicview/Manifest
index fec1ec4379b8..1c5f9783ea82 100644
--- a/media-gfx/gpicview/Manifest
+++ b/media-gfx/gpicview/Manifest
@@ -1,5 +1,6 @@
 DIST gpicview-0.2.4.tar.gz 488510 BLAKE2B 2a674c35cb849531923afde826bdf3f10eeb61f09b2bcb92166532918bd286a886ab52fdfb0b8b00e4e3c4b63aa9f473fd938d81b14409854ec1ccb3421da605 SHA512 60aeae5100ceafc5131cf61d600be5e5fd21c7d0fa62b8124b6f5bc917666b80908ba9e540010867c6d3eab485d9735dfa72f16095be468a718c55eeb65cef34
 DIST gpicview-0.2.5.tar.xz 349536 BLAKE2B c215e812693a30d55d3e606b9958d308b5d7f564ba0c3fc60e7606c492ec3ddd9997ae63f0865a6bebdf79c0a18e6a8b26a1e2c8d5dd7e2174d211130dbbe817 SHA512 afc7e67c7ae1252f9c1816ee46fe69e96ea7be9a60e03406a539f17b2e4f0e4b93a028c6f3f1c455f5433d6d7d78a58dcee2cb0ac91ea53093a21935bf454afd
 EBUILD gpicview-0.2.4.ebuild 557 BLAKE2B e1257ea8f8246c5c7c11795cd49542cc2ca8dc452f3af771aeca3986a908aadca3b8703d55ea277bfd654bf73b88bb14aa78094651f4b25bac71da3e689c1a6f SHA512 e828f13b60422bb346cec11a7f517627da4b7c3c723c158ec526c1f55790a0d141f24c1745154ab99480af33a73d546820a5b3f8ec671f3d7b7e5fad2c20fe85
+EBUILD gpicview-0.2.5-r1.ebuild 671 BLAKE2B 0a9c0b073b55b0a75ef6d22531ded3f761e49a1fa79e1519b48a4a9d65e7fc642ab570eada6ee26ddfd1f88b1b7d725e2195b7c32a1f2e27c1db20292eece70d SHA512 dc32f5adc040c2384019edb07a09e4c196e6cc210834defe77a104a91e83e9dbc238e94c586bfb3fc13523c3cd40263a03e57760ae46a370c21737081cc98d56
 EBUILD gpicview-0.2.5.ebuild 559 BLAKE2B 6c5df41b9beeeca66042fc906b7de613cd1254624066856864ab61d2c4986b8625ccd48254084dbc89b3c03de69ba9e5a7adcbbaf7752bcdecb09df6cad19071 SHA512 93b64543846b23886439429a96f9ba7e743818dd5e705582a5395de2afa6851b924d2f7318814c08920f98294cb5f170c29242fa95371e280a943ed64ab62992
 MISC metadata.xml 445 BLAKE2B d91e39bbfe204c70cc479af04d21d643a48077eef9940f4a2cab081ee8f5921291074d0c68c207798b9ec1400e27ba6092068a98e15ca80d2c0e45d5e02f33aa SHA512 bbc64e2e70d381c829c9ef28d202be2b2418b5d387d99f281db5f666a45bd67cbde4c161c99a2e39f4bdd2a3a276574aab878c0a7e0a861f2483aee0bdca55b5
diff --git a/media-gfx/gpicview/gpicview-0.2.5-r1.ebuild b/media-gfx/gpicview/gpicview-0.2.5-r1.ebuild
new file mode 100644
index 000000000000..c78b2b2ba9e4
--- /dev/null
+++ b/media-gfx/gpicview/gpicview-0.2.5-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils xdg-utils
+
+DESCRIPTION="A Simple and Fast Image Viewer for X"
+HOMEPAGE="http://lxde.sourceforge.net/gpicview"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~arm-linux ~x86-linux"
+
+RDEPEND="virtual/jpeg:0
+	>=x11-libs/gtk+-2.6:2"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest
index 63b68de1f503..7a68dd9f1ed4 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -1,5 +1,5 @@
 DIST simple-scan-3.22.0.1.tar.xz 659564 BLAKE2B 6001f03b6dbdec8b84ac3098f86b131df8784cd65a6a557ecda6465e1fdeac49ad8efb43fd1ea93aa933efc1c7edb6753ede103fee35d7074da191a2bb114c03 SHA512 2513887546c1e6764cffeac26638646b03eaf2f2e5d8013d9c29dfd4fbe200b347f7ee8a94e402497d1e8bdc3ba55d2fb2a740eecc8663c692f75fda2b1607c0
 DIST simple-scan-3.24.1.tar.xz 669452 BLAKE2B 927c3479a96525e2996aab7c8d37b585f93fb07315a4f5cb0292b29befb0417df6e6afb059158d9840903d7474bf0d4fb97e634c585ca7654581b82a264e80f0 SHA512 9f0ced644b13dcaad4f1e23a6520b1cbe3c36d995fca4791383f959986cd396f123638a23dbd02a9511ef7e1c9c915b3a025e9b7e4de4542a4c180c4fe29e2b9
 EBUILD simple-scan-3.22.0.1.ebuild 1303 BLAKE2B c19801e07528697e62e756a45647474481456701ce56b76bb0576e3adc63175b08d2322e287792747f37f8d069a3e1cb76081a4dc0e02ba4c66a9673ed9c29bc SHA512 07e3f1c580eeb17e11fa287b95a729f25819bdaaa6d85b9f1c7fb814ac2c1324c5a0b567b111e0713cc259c83611b9b6a9d8de48d593105157616ee3f3c83355
-EBUILD simple-scan-3.24.1.ebuild 1304 BLAKE2B 6d37c9dd1acd1f1ff449d20a6f8ec580bd7ce4a2bc6e87ccfb9bda42baad77f60d1a9f2663f8391dbe37a0fb6807c50be4a016f9d365974272f8ec638c6712a4 SHA512 c977660f44b5d0649ac2b32d4546881cad6bdf8e6b0034b8b4fc476bbbadbc0dd13b943323784755e59311509ed9d7dab03fdd4e83b78e93ace391e0ec8f8998
+EBUILD simple-scan-3.24.1.ebuild 1303 BLAKE2B 86538dcf27e462ebc43f598d32c584235409e91610be9e03216b7384d7b296c81b050cb9f0d0d785a08afbdc4f1b7bb705fdc1654363342530d049e09a31f14e SHA512 04a4cddaf9711c7ca99bf6446c1578b955755bd8885ba405ab2f13f84b59112d8657a03b58e2d9016b506064825fd8ca43797199911dac75280514f48a168646
 MISC metadata.xml 718 BLAKE2B 46e5929721e967a667f32a8993903b635599ae06c5b5179edf0579070b2b393f750a044bc280519b820f336843d1b98a795f73ef9500a27951a64b61794901e5 SHA512 82244c0dc32c4ded72048a387cee5f350a66148ecaa12a941e4a86d9d9079f1769f1f240ee564c7f991f9d53c050e9fd3e9113024fc8831a6766ec3d88b665ca
diff --git a/media-gfx/simple-scan/simple-scan-3.24.1.ebuild b/media-gfx/simple-scan/simple-scan-3.24.1.ebuild
index a1363be3a243..d88b6a65acb6 100644
--- a/media-gfx/simple-scan/simple-scan-3.24.1.ebuild
+++ b/media-gfx/simple-scan/simple-scan-3.24.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="colord" # packagekit
 
 COMMON_DEPEND="
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 7e5f40db7d04..30676785de18 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/glm/Manifest b/media-libs/glm/Manifest
index 9e99ae86dade..f6c147fa5ac4 100644
--- a/media-libs/glm/Manifest
+++ b/media-libs/glm/Manifest
@@ -1,3 +1,4 @@
+AUX glm-gcc73.patch 1378 BLAKE2B 98be49157daff3250931510e26f7b21cdee74ab2931f5df50153d31a66d4b85e6b7eeeed2316154a2a4c70ed63c53f530a486672fc6b5255a1de9521cac512ef SHA512 c816b9ab071f5d6ef2435c10699c562807d1e8dac08c896d0a6a76f0bcd6c21f82e831349f544e171897e826c26d23a3bf958f808abc8a3d6b8f1c8b534ccda5
 DIST glm-0.9.6.1.zip 4232099 BLAKE2B ba8e9fc4a4401f9a78c46f6eebe5fdd6bd9af14f8c65bfcac7b61988b551ba27bf8d28f3a50f3f619dad5a10e11adb6988f9408227d10d738ea6d809d81db0bf SHA512 7f1468c5e60e65181f4685a2429fa8d70350a3576175a55b7c9e8597a03837cb84aeaeb88d311e1e1948c5bd90ad9cee9286433cb78fdee54b0fbe5313ce2f84
 DIST glm-0.9.7.6.tar.gz 3457100 BLAKE2B f9c0e481dbac76fa8922d4f58f2d4d60f0735a44a249b1136aa519f7638c21fa193e8c618c784b8b3adbbcf3838e9dbd6ff6a22a2708483bfc39bbea5a24494a SHA512 d4e1e173405c11b5744df8dc12f0848cd84ab27b868434c0f8fc74f15110b78606564991f3063ccc97e68a0aa1c1cb4a1b40ba6ce7feffb0d1a23c3e5cff315a
 DIST glm-0.9.8.4.tar.gz 3769208 BLAKE2B f675d110d1ceb16ed8afe171fd537254bef68790eca010677a15db501f964e0f7ed7a2cacc93e17c71140e7e3cd9a36a12222f0a40c908d01c405ae335be3016 SHA512 ff0e0651a695caebe9235882d14e09546d52b3cdf66cca8e2078f15b02a3fca4e47bd97d2807aa329f76aa633af3b4999501bd4d0b22ad44b00558d4917f39ed
@@ -5,5 +6,5 @@ DIST glm-0.9.8.5.tar.gz 3756809 BLAKE2B 41abc10e1c41c40ad68b7148a8ccbe9d2f4fc8a8
 EBUILD glm-0.9.6.1.ebuild 524 BLAKE2B 470804896aa3430cb812a7db1adc89c461ed7c2ef1428f63b92c88e6587c0e73f8730d32a454bbc6b63454506a18eabdaacb3a0ccf63dedca833efd3f2b40efe SHA512 c5c46d8dcad501804adbd4b75d852e3df36e93df2f453c862c0b344df5be9a9993dd9c938badb26cad1787ac70a70d33fb1f006d44d6b777f216dc10b4030a4c
 EBUILD glm-0.9.7.6.ebuild 884 BLAKE2B e916a774258380213b4beafd015105cc76592c512d373519d4a67c57d1ac8ceaf199189164270ab78a7d103d59b7c6ac7d60f9d416433cd3d08abf34cd98d660 SHA512 88038c4a32d943061db4879ea6d173b4a8ee8fc9a1574c18f7359ccf106704b70a5f532afc6f68e780ae3f94eebce08e802861b7d240a6ee87d5ba61a1d02ec5
 EBUILD glm-0.9.8.4.ebuild 884 BLAKE2B dff985eff3489d2436afb02b3d3e65f06814e0b78c7690aeac19ec6028b60be37aa3209c8bf8bee0227bd46b9a9928ec959625bbf79e38cbe85ee1b6876c958a SHA512 4404107395ac1389e2c85757eb1c7aa60f75f7c4a4b57fcb9b0de816891d6675df9aa8269dac68008645e535814dda51401e68264741d159ba0602361f177541
-EBUILD glm-0.9.8.5.ebuild 858 BLAKE2B 92e8f6a3e4b9060ee9c0f96fcf13a4c9020071e16e3abba73c3543345e748df9fc8c0dc8757c1e4e87902378e94e03f399a9966080ccbd993063eb66072064cc SHA512 9e470e69ba2c380d4d88f7fa209579f5a465d8f47a3cdfbbcaee505779db3db8376e3c3eeef04abc9ea59e5ab1de822bff19338af01352449d85b6d92573b263
+EBUILD glm-0.9.8.5.ebuild 902 BLAKE2B 2330311f439fb6d7f6d24a279926ed79f7332720018ac2995fb13d6008ed3a417cc141925ea3e5e222bba60c68f37c1d9ef507d69ed5a5fcc8972a41355637df SHA512 c685f2175a2543675d5f074d189319a01ad473593cd3ed7ae123aea295471bbd7518a0880c5bb47069d7708767a35dff6b70ee5f07a97efe72091b9b7d49c521
 MISC metadata.xml 545 BLAKE2B 842701f1a6d1483b75f14aa99f546975b4c7de1a84d36b1e15a882d17662d98d37b491e236da73d9457706b667f0499405b5717af3ccfed73ad0518f34167c72 SHA512 637114ed9721e6d1c8f1d1ce56e9b9c208ca4dfe5f3a0c2b844d90bcdbab8344c00682c9647f7323eec7c485abcd841ef37300a8fe0bc8a5f5c12cfbb1da4971
diff --git a/media-libs/glm/files/glm-gcc73.patch b/media-libs/glm/files/glm-gcc73.patch
new file mode 100644
index 000000000000..68033b5b6f63
--- /dev/null
+++ b/media-libs/glm/files/glm-gcc73.patch
@@ -0,0 +1,35 @@
+diff -ur glm-0.9.8.5.orig/glm/simd/platform.h glm-0.9.8.5/glm/simd/platform.h
+--- glm-0.9.8.5.orig/glm/simd/platform.h	2017-08-16 05:15:24.000000000 -0700
++++ glm-0.9.8.5/glm/simd/platform.h	2018-01-26 15:38:57.584130263 -0800
+@@ -111,7 +111,8 @@
+ #define GLM_COMPILER_GCC70			0x02000A00
+ #define GLM_COMPILER_GCC71			0x02000B00
+ #define GLM_COMPILER_GCC72			0x02000C00
+-#define GLM_COMPILER_GCC80			0x02000D00
++#define GLM_COMPILER_GCC73			0x02000D00
++#define GLM_COMPILER_GCC80			0x02000E00
+ 
+ // CUDA
+ #define GLM_COMPILER_CUDA			0x10000000
+@@ -283,6 +284,8 @@
+ #		define GLM_COMPILER (GLM_COMPILER_GCC71)
+ #	elif (__GNUC__ == 7) && (__GNUC_MINOR__ == 2)
+ #		define GLM_COMPILER (GLM_COMPILER_GCC72)
++#	elif (__GNUC__ == 7) && (__GNUC_MINOR__ == 3)
++#		define GLM_COMPILER (GLM_COMPILER_GCC73)
+ #	elif (__GNUC__ >= 8)
+ #		define GLM_COMPILER (GLM_COMPILER_GCC80)
+ #	else
+diff -ur glm-0.9.8.5.orig/test/core/core_setup_message.cpp glm-0.9.8.5/test/core/core_setup_message.cpp
+--- glm-0.9.8.5.orig/test/core/core_setup_message.cpp	2017-08-16 05:15:24.000000000 -0700
++++ glm-0.9.8.5/test/core/core_setup_message.cpp	2018-01-26 15:37:56.953298475 -0800
+@@ -86,6 +86,9 @@
+ 		case GLM_COMPILER_GCC72:
+ 			std::printf("GCC 7.2\n");
+ 			break;
++		case GLM_COMPILER_GCC73:
++			std::printf("GCC 7.3\n");
++			break;
+ 		case GLM_COMPILER_GCC80:
+ 			std::printf("GCC 8.0\n");
+ 			break;
diff --git a/media-libs/glm/glm-0.9.8.5.ebuild b/media-libs/glm/glm-0.9.8.5.ebuild
index 548d897c6840..073f3bee1e27 100644
--- a/media-libs/glm/glm-0.9.8.5.ebuild
+++ b/media-libs/glm/glm-0.9.8.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,6 +16,10 @@ IUSE="test cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_avx cpu_flags_x86
 
 RDEPEND="virtual/opengl"
 
+PATCHES=(
+	"${FILESDIR}/glm-gcc73.patch"
+)
+
 src_configure() {
 	if use test; then
 		local mycmakeargs=(
diff --git a/media-libs/gst-plugins-base/Manifest b/media-libs/gst-plugins-base/Manifest
index b41208dd918b..091344bb5652 100644
--- a/media-libs/gst-plugins-base/Manifest
+++ b/media-libs/gst-plugins-base/Manifest
@@ -2,6 +2,8 @@ AUX gst-plugins-base-0.10.36-gcc-4.9.patch 387 BLAKE2B 5ff5d2b0ae4a97240f86ef857
 AUX gst-plugins-base-0.10.36-resync-ringbuffer.patch 530 BLAKE2B cbf4d51313e94df62ff3c3e4df859c04a91e22e994587e4ca6baba59294dff572a7ed80cceb3944d4070717fd6f9ce680e42e71a95032d54c8ca6693df29e21f SHA512 fbc252f10f4539f0448eb6f652a945ecf522f6100cb63fb362617a8990818efb1ba4bd5f866b25d439f39e32a41fcab7ef9b176d4be0e6e5bbb6c1853aa2a688
 DIST gst-plugins-base-0.10.36.tar.xz 2364108 BLAKE2B a71ef5d5c7462d60937602681c060e85ed086a753b7ef354dad48354d6c3741d809f2c0c6a321ef9ac60fb12d24ec65e1baa63e51211134d2a5e03aae16f73d2 SHA512 ea77778e073515df58229a641b4363df31f0b80204a5a43a8feb31f0b03a5a4b9b79d6e07e1615c773a59927a9b649f1b1d782def1120d581d09a090be8363b8
 DIST gst-plugins-base-1.12.3.tar.xz 3117364 BLAKE2B c5c16f1b46b10cfc5b9731ea990638238b82eb7f312345fece3826deed20992aff1c5a48e031060dc175b5ab5ad8ee21bb3e1e950fc0681ee4b596e65f5f92fe SHA512 d32f71836e25081b00040709a2184da85489e5af90902a0b27b820a478f5805bde93a04cefaeabf36dde53c16ad12f2816777cc195f1e027f19d1883e088e2b2
+DIST gst-plugins-base-1.12.4.tar.xz 3119468 BLAKE2B d5ac157618a25c8f0323d1922d5b26b0b5c49f56cb75df3ceeadd0566f873be1a06c863a1da6afff40901fbbbeb1ec6cd6ef4614309ca7f7ff988c0fa9040a10 SHA512 89a6e92cd294612cf1406eb156416ab4606643f6b43637e64a18f6f28ab789ca8d4cf1308434ed85e5fc679c79cc3ca115db48f37e0065a6ab3cdfdbaaad9f53
 EBUILD gst-plugins-base-0.10.36-r2.ebuild 2274 BLAKE2B 58f8930c8694880b5ca270637cf0f46be89e19e30c670fee61e3a04680008e2e80536676ebc91f7fc9250fe14f13a093d6e4156b0af57f4e0eff613c030828d7 SHA512 2455419d70993b01fd436a2954df6c811384338a0d4a2ca3a2c04e83a2602c0d6aefd2bef29d64d7535ee2a767390d5910300f0d2a8351435c360f32c83869f2
 EBUILD gst-plugins-base-1.12.3.ebuild 2719 BLAKE2B a94595ce1544795bbf62c3c489255e30d53d404220f0d132ebdfcb19547eb35e6f217c7363a88e875022f3df4ace7f0270f2ad99543ebb962134eed07a1708c7 SHA512 9aef3d6262351f76b623ac6df278980ae8962ff7f35cdd3e6e59f3ec83d3dfdcc4899f38841cf02710fe8e6cf0e8db0aec1d0e77fbe908992dbbc89e057195ae
+EBUILD gst-plugins-base-1.12.4.ebuild 2802 BLAKE2B b0aad6e8737c1e52ba40df66f10900cd186bf58fc285c1a24f09c77914cad835c1bf0645cb0b451c6e433ea4d898007ae27c7730e1c9c0ed5af3b52f23e01b77 SHA512 8fa4d6243f650b30b91299c75d34226b58f01609d19462407d8e46d82470879d3a1352a2983dc5fca821aa17d8717927fce367bcf18d8a1c878e305d6484cfb0
 MISC metadata.xml 397 BLAKE2B 4bb000c5586a8912669b1584356b30d8483b6f15180e7acfdb03d0c4e169c3cc703487a9f1f96867c23ba6b5114903b92bb2b2fda4deb9b979ccf610f8151b8e SHA512 89c4bdb8f7a5da325255b43be4017510c4a5b4a3f8f650dc625b513d0cd2260267f840fc52926fe9ca262d9f3f2c16bcf0aff9c22dd0c8b577e632155910b568
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.12.4.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.12.4.ebuild
new file mode 100644
index 000000000000..15e6288957d1
--- /dev/null
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.12.4.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE="gst-plugins-base"
+
+inherit flag-o-matic ltprune gstreamer
+
+DESCRIPTION="Basepack of plugins for gstreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="GPL-2+ LGPL-2+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+IUSE="alsa +introspection ivorbis +ogg +orc +pango theora +vorbis X"
+REQUIRED_USE="
+	ivorbis? ( ogg )
+	theora? ( ogg )
+	vorbis? ( ogg )
+"
+
+RDEPEND="
+	app-text/iso-codes
+	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-${PV}:1.0[introspection?,${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+	ivorbis? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}] )
+	ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
+	orc? ( >=dev-lang/orc-0.4.24[${MULTILIB_USEDEP}] )
+	pango? ( >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}] )
+	theora? ( >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] )
+	vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.12
+	X? (
+		>=x11-proto/videoproto-2.3.1-r1[${MULTILIB_USEDEP}]
+		>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
+		>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] )
+"
+RDEPEND+="!<media-libs/gst-plugins-bad-1.11.90:1.0" # rawparse move
+
+multilib_src_configure() {
+	filter-flags -mno-sse -mno-sse2 -mno-sse4.1 #610340
+
+	gstreamer_multilib_src_configure \
+		$(use_enable alsa) \
+		$(multilib_native_use_enable introspection) \
+		$(use_enable ivorbis) \
+		$(use_enable ogg) \
+		$(use_enable orc) \
+		$(use_enable pango) \
+		$(use_enable theora) \
+		$(use_enable vorbis) \
+		$(use_enable X x) \
+		$(use_enable X xshm) \
+		$(use_enable X xvideo) \
+		--enable-iso-codes \
+		--enable-zlib \
+		--disable-debug \
+		--disable-examples \
+		--disable-static
+	# cdparanoia and libvisual are split out, per leio's request
+
+	# bug #366931, flag-o-matic for the whole thing is overkill
+	if [[ ${CHOST} == *86-*-darwin* ]] ; then
+		sed -i \
+			-e '/FLAGS = /s|-O[23]|-O1|g' \
+			gst/audioconvert/Makefile \
+			gst/volume/Makefile || die
+	fi
+
+	if multilib_is_native_abi; then
+		local x
+		for x in libs plugins; do
+			ln -s "${S}"/docs/${x}/html docs/${x}/html || die
+		done
+	fi
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS NEWS README RELEASE"
+	einstalldocs
+	prune_libtool_files --modules
+}
diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest
index 5c76e2736fbc..e47daced3620 100644
--- a/media-libs/gstreamer/Manifest
+++ b/media-libs/gstreamer/Manifest
@@ -2,6 +2,8 @@ AUX gstreamer-0.10.36-disable-test_fail_abstract_new.patch 1319 BLAKE2B 6b7fc646
 AUX gstreamer-make-grammar.y-work-with-bison-3.patch 820 BLAKE2B 1809d190e37fde67c1e7108315e477ed05a3602e401013c26aff33dd0a74e2db8fc4e3d72d6e0b2d5fd79b3c4390c2ec5d2140fdcdb60530facc5e546c1dbe31 SHA512 8f5e904cc42be918c0a170c7227e22d0a31b5eb613a44294dbc03e5b1d7315d565f29d3de796ffbca822fe53b10b83bea54694b58ff2bf453af4b8859741ee21
 DIST gstreamer-0.10.36.tar.xz 3025876 BLAKE2B f0f70f483e8ccb2a294fb3bc8b51aac089f5e76522249b64e3e60e7b488a9e03b9300617e2c137bdcc0e3e61668b7b203e899f270f004e2dfcee0927fa7dfc3c SHA512 7468abb578398681d2adb0e9bbc9ee8ae25aaef72369d45a66ada6c67d1759afdce606cb32e68d9e30ae813196bdfef3d4d33202bc77839cc1fbf5fc436c1bd8
 DIST gstreamer-1.12.3.tar.xz 3175480 BLAKE2B e42b908b6fef2be5d4a0ad435cab5760a5e73e6f09afa0fd0993dd84d01f956b6437beb367082002e875307970f3b4b3fcb8735f7f69836da0ba76ed186e42db SHA512 fceeeca4314aead7ff358db3474bd6fe1eef70f745a6ba20505da6c0caaea6ea6317246dc66c23edab396ca811a610c52fa930f8f99c701241ae7f15857aa2b0
+DIST gstreamer-1.12.4.tar.xz 3177208 BLAKE2B cb859503edbe09cebbbfa70cb4edc5d433bbaa5b299e05921d30e6096f8765e17d449c45bd7d5ea3e4603ae46d337d4e3291b1d0456c7b72a7ebb41faad9e73a SHA512 849aa4ddf8ef465f2915e05d36fc0c31c2e31ae28be2fa38f8069a64a91b7347020fac5b881b7f3ee54c2198c3596138d49f27b09f258303834164a5d68b38a2
 EBUILD gstreamer-0.10.36-r2.ebuild 3975 BLAKE2B fd2155ec778c09848da944eaaeeef191050fa98be5fe3463cbfe9acf75233e2d1f5571a28c7e0f14891005bcd8678664ed4d0ccb37b6773fe359285e265780f3 SHA512 b3e544ebed44ab38c1fa3dea0dc776abac7920a3674d12ad09b82ace577d5ee2cc367647165da15d227e0a12670248557fb7431eb9b764468feac8040c6f2623
 EBUILD gstreamer-1.12.3.ebuild 3309 BLAKE2B f2dae365901d455f952bcb9a568a4aafaa46ac2da6e90307108ebc1f28d89adec2e96c3c0aae0811ce20f6dd7559d5cf90e4c8e8022a65c3ac26b06a9ece3997 SHA512 4fd05a9b129e65dff3420defc93b5dd7b3f2573c3c587f410c301732b879e12b904dbaafcab98aa7f8aef0b9cb897488e62fde387d40c199a42929172a9c7119
+EBUILD gstreamer-1.12.4.ebuild 3317 BLAKE2B b5d296b1f720be9c35846de8970c48d4dd650090c143bb9714b10ac430551a1d35ccccf5c3c03c88758a069f51ca8e9747799796418cac98e668e0c37434d467 SHA512 c14ce2c5f96aad7739719e4f245b20f4e82db5460014e37c3c7bcc49f115639f04f9e45d30f782cca4e7efe39ad0c4150004c9511dfdc1e218c2d614bec375b4
 MISC metadata.xml 586 BLAKE2B 319df0c2c013f3018bdb31afddcd80b298f9b74d0a581981f30d483b0773339befe4dc62eb78a267b3a0f5a63a7e6462bd0ece4d4285c0ca91a1329c12ba1b93 SHA512 f7de0325f671119a5b787dcba9572d06d58375ba9d815854beffd668da55e4d4695f586365b3455e63cd56f4469fb8e1a92ab6de4e05847668f56c076dfdaf57
diff --git a/media-libs/gstreamer/gstreamer-1.12.4.ebuild b/media-libs/gstreamer/gstreamer-1.12.4.ebuild
new file mode 100644
index 000000000000..6843c71199f5
--- /dev/null
+++ b/media-libs/gstreamer/gstreamer-1.12.4.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 eutils multilib-minimal pax-utils
+
+DESCRIPTION="Open source multimedia framework"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="+caps +introspection nls +orc test unwind"
+
+RDEPEND="
+	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
+	caps? ( sys-libs/libcap[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+	unwind? (
+		>=sys-libs/libunwind-1.2_rc1[${MULTILIB_USEDEP}]
+		dev-libs/elfutils[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.12
+	sys-devel/bison
+	sys-devel/flex
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	nls? ( sys-devel/gettext )
+"
+# gtk-doc-am to install API docs
+
+src_configure() {
+	if [[ ${CHOST} == *-interix* ]] ; then
+		export ac_cv_lib_dl_dladdr=no
+		export ac_cv_func_poll=no
+	fi
+	if [[ ${CHOST} == powerpc-apple-darwin* ]] ; then
+		# GCC groks this, but then refers to an implementation (___multi3,
+		# ___udivti3) that don't exist (at least I can't find it), so force
+		# this one to be off, such that we use 2x64bit emulation code.
+		export gst_cv_uint128_t=no
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local completiondir=$(get_bashcompdir)
+	# Set 'libexecdir' to ABI-specific location for the library spawns
+	# helpers from there.
+	# Disable static archives and examples to speed up build time
+	# Disable debug, as it only affects -g passing (debugging symbols), this must done through make.conf in gentoo
+	local myconf=(
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
+		--disable-debug
+		--disable-examples
+		--disable-static
+		--disable-valgrind
+		--enable-check
+		$(use_with unwind)
+		$(use_with unwind dw)
+		$(multilib_native_use_enable introspection)
+		$(use_enable nls)
+		$(use_enable test tests)
+		--with-bash-completion-dir="${completiondir%/*}"
+		--with-package-name="GStreamer ebuild for Gentoo"
+		--with-package-origin="https://packages.gentoo.org/package/media-libs/gstreamer"
+	)
+
+	if use caps ; then
+		myconf+=( --with-ptp-helper-permissions=capabilities )
+	else
+		myconf+=(
+			--with-ptp-helper-permissions=setuid-root
+			--with-ptp-helper-setuid-user=nobody
+			--with-ptp-helper-setuid-group=nobody
+		)
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+	if multilib_is_native_abi; then
+		local x
+		for x in gst libs plugins; do
+			ln -s "${S}"/docs/${x}/html docs/${x}/html || die
+		done
+	fi
+}
+
+multilib_src_install() {
+	# can't do "default", we want to install docs in multilib_src_install_all
+	emake DESTDIR="${D}" install
+
+	# Needed for orc-using gst plugins on hardened/PaX systems, bug #421579
+	use orc && pax-mark -m "${ED}usr/$(get_libdir)/gstreamer-${SLOT}/gst-plugin-scanner"
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README RELEASE"
+	einstalldocs
+	prune_libtool_files --modules
+
+	# Needed for orc-using gst plugins on hardened/PaX systems, bug #421579
+	use orc && pax-mark -m "${ED}usr/bin/gst-launch-${SLOT}"
+}
diff --git a/media-libs/libmatroska/Manifest b/media-libs/libmatroska/Manifest
index 6746631c98c4..7215b54d96f7 100644
--- a/media-libs/libmatroska/Manifest
+++ b/media-libs/libmatroska/Manifest
@@ -3,5 +3,5 @@ DIST libmatroska-1.4.7.tar.bz2 619463 BLAKE2B 5cd5adad33e327b07ded8ae042b8e2f898
 DIST libmatroska-1.4.8.tar.xz 286284 BLAKE2B 46bec9bbba97d89fe7db63715c2b3d9b648076814b206f6fe2423b09e0b9c6ab130c9cd338442eb810471773c24fe6e32dc6cc044d02bd622789e6e41f36dda1 SHA512 af3b8bfae891be77896b6afa2da3325ebba73a957cd43a4e6086b68e1237bb37b2e6d5eb57322c05ede0ad0c03464087b77fbdf06101314f09411648e1073cee
 EBUILD libmatroska-1.4.5.ebuild 694 BLAKE2B bd3cb928ea029955ea64ca953c29df990e9f433f91f0dd08ffce3e12afd5be04256bba6447f73afe681150242a06d750f3c4bc84c51ce64defd3d1e650543d67 SHA512 58d2222582303d3b556071b46e0fc141836ebbc2b16b5d8c7120a6508e9b798b83b755fe8312f786451ba1fb08bcf62cd30453873b39a73f2c4d9ca3b7aeb353
 EBUILD libmatroska-1.4.7.ebuild 709 BLAKE2B 0cd3c996b2583541cd0db22420d46beb73aade0e6884ac4dca86341df70387d2e513f331b77c08b49dc7dcbe4f0072647996e4c4012bc40f3a2b3d6cc38a8175 SHA512 c1fd7b67325fd6895676f0391809dc71aa77b2d2b2bbfcc22b454f19ef692ae080ced026e1189d387a454723d6573831a0e9cb3d48691a1690f2235b7f98f5b5
-EBUILD libmatroska-1.4.8.ebuild 705 BLAKE2B 563d8ffa8326efbcefb486f93e7c27524963dc394a7853b54de52914858b4a8feaecdffd843d8e72c622e5f8509e6481f3eb4876ff36f1641a62b4029376ac1a SHA512 889a9c95548d7d042257a47dd1e7466563ceb7af50cf16715c8b1b4793a17065dc51c8eae9e73024026d53f23b3e98b513d47a242aea49f31428d044f5cee481
+EBUILD libmatroska-1.4.8.ebuild 704 BLAKE2B 21427ad603e2ca8b71236f8f4ef236d826ba7c656048ab589c50c7fdde9170f54bd7cfc3d58b3ed79f07a8208529097f879684cf640bd5668eb3230f19c5250b SHA512 a88e12754b16666c5a63e231f6430b458b83fa2ef9d34a9b8fe722b6deb28bf8856184998485ad1b7c184db3892c9bc5a8a59ddd060618e41e665dbaf581ebaf
 MISC metadata.xml 320 BLAKE2B edd6b2e35a7833d3510edec80f3771a319cbb257cbb203e0f71f33636431496c620cb3307b2bebb44360d6932a7e4376b0d134f3f42d26fc9271423c2eed11f6 SHA512 5c1dad06e1fef24b1ec68fb6b12d0d17b4bd05f22b1953f713c25a513340cb08540eebaec32fbe7c6607ba2142a057b8e6e5743a929b7368665d91bc014f35a9
diff --git a/media-libs/libmatroska/libmatroska-1.4.8.ebuild b/media-libs/libmatroska/libmatroska-1.4.8.ebuild
index ae166a1913ba..1da3fb754fc6 100644
--- a/media-libs/libmatroska/libmatroska-1.4.8.ebuild
+++ b/media-libs/libmatroska/libmatroska-1.4.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="https://dl.matroska.org/downloads/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/6" # subslot = soname major version
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/libebml-1.3.4:="
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index e442f31a6904..9264e358b124 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -11,10 +11,12 @@ AUX tiff-4.0.7-pdfium-0013-validate-refblackwhite.patch 1278 BLAKE2B d2e9406584c
 AUX tiff-4.0.7-pdfium-0017-safe_skews_in_gtTileContig.patch 2992 BLAKE2B f588838219ba3323a15b35d04b168180229ce1ad9c018c2104d2663905aaafc2aae001f188f6c6c722190d086b1fd1422ca5bfd2a55b45c7120dfe1792b4d728 SHA512 0fc1b6b8a57629730b10c0c30d915ce8a9575cac5e1daa91ae74be4e866e4c9cf49031897c001b3ade8182274d875988d40c1d4214b2a427d4676762ca7f2c4c
 AUX tiff-4.0.7-pdfium-0018-fix-leak-in-PredictorSetupDecode.patch 849 BLAKE2B b0087382944185e1b91e65ae5b1a8998d31c4285308a1d9a2db20064f92b8aea07341a4a93242678f7ff332bf21d091a902907f74d320d2739b151efff25bec1 SHA512 9da30e7223522dfb4d8a8bc8b5bd545615cfe60a509f8583d29817ecbb1ff28ca38a6e00ee845e9484d9bc02666f99b0144ea08e5083eef2035e99b1825f4bd3
 AUX tiff-4.0.7-pdfium-0021-oom-TIFFFillStrip.patch 1228 BLAKE2B ca3babb8a10c96ecfb72914651f8e737ec4d2a7a7fbdc4b9c153e2a7f540fa1a0b5907bad374ddbce53364caba0282d848b03992b793c14490740ecb786fe47c SHA512 4add933c6b7e2938affb03e00da0bb28789cd9998f5496f4b592ae14d35175f6ce8a4e83ee639ef42211a8683bddad5b4c8375a1ba0a331bc72a40c45e691162
+AUX tiff-4.0.9-CVE-2017-9935.patch 6636 BLAKE2B b7660dee9e379aea59f7225024697ea35b820837502e9e19157391c569c6b85473c4da5163f2e6fa8934c68cc32cbc45d025a2c336d21d79f461723a68a6e49f SHA512 ca1beda6e1550ac8a4bdf2bdefaba38f5fc40d2e842709ed1a803aeef5c34cd466f93fc6e7bb8e7ffb7e21a702d54584b84615e7c3dc3a8d2d29ceeadaeca7f6
 DIST tiff-3.9.7.tar.gz 1468097 BLAKE2B 303339acf9bb48558695b13fcc2b41acacbbf2ce6d2ec497067761895cb2de7674108e8ca2f35f845dcd2e45801777fe25d234af1c308acf59846c2f5617ab53 SHA512 ca89584a9ffa33b4986e4bc2165043cec239896f1f0ab73db00818d0442b570efaa6345b2ed422e884202324d359713df849bf14782bb0cf3b959655febddd77
 DIST tiff-4.0.8.tar.gz 2065574 BLAKE2B b9ece26d3549836d2cbbce1b90ce724a6eae51adae0abbd6193942ced8be965df63d1aa8e774b83d9ae689e5d08033705ef62b77276b40c34913cd535caa72b9 SHA512 5d010ec4ce37aca733f7ab7db9f432987b0cd21664bd9d99452a146833c40f0d1e7309d1870b0395e947964134d5cfeb1366181e761fe353ad585803ff3d6be6
 DIST tiff-4.0.9.tar.gz 2305681 BLAKE2B 3de03408d2974b9f9f5f2444029cc3018ef43beb67e9fd21be68ee400cdcc6deca1247f055d880841a18b92284ce81f112682c8b5f083ddc61e5255d73a7de3f SHA512 04f3d5eefccf9c1a0393659fe27f3dddd31108c401ba0dc587bca152a1c1f6bc844ba41622ff5572da8cc278593eff8c402b44e7af0a0090e91d326c2d79f6cd
 EBUILD tiff-3.9.7-r1.ebuild 2072 BLAKE2B 1a1fbd60077b9d98c591041006443f2074d78d86dc6e165b9ca0e8d8b1578ec7b4a610046a1bb3a5860dac17f7dcfc7da142ae7a4f15ea2ca388ded15e4c9d6e SHA512 735b3fc6b18d754463f0b3b7e8c4ce31c9bf66a89bc5f761dcf1a8cdad28e494107784dd1a49a496095e0eec3dfca792bb62632190a95c9cb9e5c4ced03e3336
 EBUILD tiff-4.0.8.ebuild 2619 BLAKE2B ea84c84c765588cd4e148e4f62f3182062532cea1ec5a1460bf0fc0be286df2619b6daabbe999ba9446d4d4e9f16e6d8d8197e6696b6952d3593e9c5a2db48c3 SHA512 c2754d6d0a097319f2b1ac9122e16ec2e0f25ddd434f4158f806631670cfa00a9a5a838cb50fb9336d70e0baa54c6cfabaec9fe7380c65fb0f58e65dc0a39900
+EBUILD tiff-4.0.9-r1.ebuild 2260 BLAKE2B 4bf6af1f52b2990ffe3ec4a6169ee8ac774f3bdb52bdfe46450a6b724b4ca0ac04d4d7f849e390125403e0aa8555465b32ce5a824d8344403688321a6708f2de SHA512 1b47e588d6578cc2d6d3c0b1264f896854f2279ee8f9dd07b377ed4f78d680306eefa3cd462e27e460af18289d8734fa69128b55d5d0352a0199ba93a4377e09
 EBUILD tiff-4.0.9.ebuild 2486 BLAKE2B 39a931e22b9cc13b7ca8a863ddfa07e5812a3299465799b0bd156b044edb3154cb94a6d4cfe11cb1a3ff09a99df5d19485fd4f606a0072a898e848b3be0cba90 SHA512 fc596b278c56d07fa5f58a053528f73d4486935a3783d4d1653f0d83bd891697b70a9e0fc3098c419dc34a9f674398299037ea47870eed9d596a98109ff7f4c5
 MISC metadata.xml 565 BLAKE2B 3d487835599974795ba6007439bf1d08756ab1c5dbe191509832b302f3199e4ffc05be64df3e26b4d4a1c11d1292c48cbb59ffa6e412831d16d7415e076f1062 SHA512 289043206dbb512c97e4bb703b32549ac4a77f40e212548b80ea865052b80fed9d4562f9fc94638fda54da9bc3e0c19ba303c027e66e7b75c772aeec91aebe6f
diff --git a/media-libs/tiff/files/tiff-4.0.9-CVE-2017-9935.patch b/media-libs/tiff/files/tiff-4.0.9-CVE-2017-9935.patch
new file mode 100644
index 000000000000..96a10aa9b373
--- /dev/null
+++ b/media-libs/tiff/files/tiff-4.0.9-CVE-2017-9935.patch
@@ -0,0 +1,153 @@
+From 3dd8f6a357981a4090f126ab9025056c938b6940 Mon Sep 17 00:00:00 2001
+From: Brian May <brian@linuxpenguins.xyz>
+Date: Thu, 7 Dec 2017 07:46:47 +1100
+Subject: [PATCH] tiff2pdf: Fix CVE-2017-9935
+
+Fix for http://bugzilla.maptools.org/show_bug.cgi?id=2704
+
+This vulnerability - at least for the supplied test case - is because we
+assume that a tiff will only have one transfer function that is the same
+for all pages. This is not required by the TIFF standards.
+
+We than read the transfer function for every page.  Depending on the
+transfer function, we allocate either 2 or 4 bytes to the XREF buffer.
+We allocate this memory after we read in the transfer function for the
+page.
+
+For the first exploit - POC1, this file has 3 pages. For the first page
+we allocate 2 extra extra XREF entries. Then for the next page 2 more
+entries. Then for the last page the transfer function changes and we
+allocate 4 more entries.
+
+When we read the file into memory, we assume we have 4 bytes extra for
+each and every page (as per the last transfer function we read). Which
+is not correct, we only have 2 bytes extra for the first 2 pages. As a
+result, we end up writing past the end of the buffer.
+
+There are also some related issues that this also fixes. For example,
+TIFFGetField can return uninitalized pointer values, and the logic to
+detect a N=3 vs N=1 transfer function seemed rather strange.
+
+It is also strange that we declare the transfer functions to be of type
+float, when the standard says they are unsigned 16 bit values. This is
+fixed in another patch.
+
+This patch will check to ensure that the N value for every transfer
+function is the same for every page. If this changes, we abort with an
+error. In theory, we should perhaps check that the transfer function
+itself is identical for every page, however we don't do that due to the
+confusion of the type of the data in the transfer function.
+---
+ libtiff/tif_dir.c |  3 +++
+ tools/tiff2pdf.c  | 65 +++++++++++++++++++++++++++++++++++++------------------
+ 2 files changed, 47 insertions(+), 21 deletions(-)
+
+diff --git a/libtiff/tif_dir.c b/libtiff/tif_dir.c
+index 2ccaf448fc40..cbf2b6933a40 100644
+--- a/libtiff/tif_dir.c
++++ b/libtiff/tif_dir.c
+@@ -1065,6 +1065,9 @@ _TIFFVGetField(TIFF* tif, uint32 tag, va_list ap)
+ 			if (td->td_samplesperpixel - td->td_extrasamples > 1) {
+ 				*va_arg(ap, uint16**) = td->td_transferfunction[1];
+ 				*va_arg(ap, uint16**) = td->td_transferfunction[2];
++			} else {
++				*va_arg(ap, uint16**) = NULL;
++				*va_arg(ap, uint16**) = NULL;
+ 			}
+ 			break;
+ 		case TIFFTAG_REFERENCEBLACKWHITE:
+diff --git a/tools/tiff2pdf.c b/tools/tiff2pdf.c
+index d1a9b0959f84..c3ec07465e5a 100644
+--- a/tools/tiff2pdf.c
++++ b/tools/tiff2pdf.c
+@@ -1047,6 +1047,8 @@ void t2p_read_tiff_init(T2P* t2p, TIFF* input){
+ 	uint16 pagen=0;
+ 	uint16 paged=0;
+ 	uint16 xuint16=0;
++	uint16 tiff_transferfunctioncount=0;
++	float* tiff_transferfunction[3];
+ 
+ 	directorycount=TIFFNumberOfDirectories(input);
+ 	t2p->tiff_pages = (T2P_PAGE*) _TIFFmalloc(TIFFSafeMultiply(tmsize_t,directorycount,sizeof(T2P_PAGE)));
+@@ -1147,26 +1149,48 @@ void t2p_read_tiff_init(T2P* t2p, TIFF* input){
+                 }
+ #endif
+ 		if (TIFFGetField(input, TIFFTAG_TRANSFERFUNCTION,
+-                                 &(t2p->tiff_transferfunction[0]),
+-                                 &(t2p->tiff_transferfunction[1]),
+-                                 &(t2p->tiff_transferfunction[2]))) {
+-			if((t2p->tiff_transferfunction[1] != (float*) NULL) &&
+-                           (t2p->tiff_transferfunction[2] != (float*) NULL) &&
+-                           (t2p->tiff_transferfunction[1] !=
+-                            t2p->tiff_transferfunction[0])) {
+-				t2p->tiff_transferfunctioncount = 3;
+-				t2p->tiff_pages[i].page_extra += 4;
+-				t2p->pdf_xrefcount += 4;
+-			} else {
+-				t2p->tiff_transferfunctioncount = 1;
+-				t2p->tiff_pages[i].page_extra += 2;
+-				t2p->pdf_xrefcount += 2;
+-			}
+-			if(t2p->pdf_minorversion < 2)
+-				t2p->pdf_minorversion = 2;
++                                 &(tiff_transferfunction[0]),
++                                 &(tiff_transferfunction[1]),
++                                 &(tiff_transferfunction[2]))) {
++
++                        if((tiff_transferfunction[1] != (float*) NULL) &&
++                           (tiff_transferfunction[2] != (float*) NULL)
++                          ) {
++                            tiff_transferfunctioncount=3;
++                        } else {
++                            tiff_transferfunctioncount=1;
++                        }
+                 } else {
+-			t2p->tiff_transferfunctioncount=0;
++			tiff_transferfunctioncount=0;
+ 		}
++
++                if (i > 0){
++                    if (tiff_transferfunctioncount != t2p->tiff_transferfunctioncount){
++                        TIFFError(
++                            TIFF2PDF_MODULE,
++                            "Different transfer function on page %d",
++                            i);
++                        t2p->t2p_error = T2P_ERR_ERROR;
++                        return;
++                    }
++                }
++
++                t2p->tiff_transferfunctioncount = tiff_transferfunctioncount;
++                t2p->tiff_transferfunction[0] = tiff_transferfunction[0];
++                t2p->tiff_transferfunction[1] = tiff_transferfunction[1];
++                t2p->tiff_transferfunction[2] = tiff_transferfunction[2];
++                if(tiff_transferfunctioncount == 3){
++                        t2p->tiff_pages[i].page_extra += 4;
++                        t2p->pdf_xrefcount += 4;
++                        if(t2p->pdf_minorversion < 2)
++                                t2p->pdf_minorversion = 2;
++                } else if (tiff_transferfunctioncount == 1){
++                        t2p->tiff_pages[i].page_extra += 2;
++                        t2p->pdf_xrefcount += 2;
++                        if(t2p->pdf_minorversion < 2)
++                                t2p->pdf_minorversion = 2;
++                }
++
+ 		if( TIFFGetField(
+ 			input, 
+ 			TIFFTAG_ICCPROFILE, 
+@@ -1828,9 +1852,8 @@ void t2p_read_tiff_data(T2P* t2p, TIFF* input){
+ 			 &(t2p->tiff_transferfunction[1]),
+ 			 &(t2p->tiff_transferfunction[2]))) {
+ 		if((t2p->tiff_transferfunction[1] != (float*) NULL) &&
+-                   (t2p->tiff_transferfunction[2] != (float*) NULL) &&
+-                   (t2p->tiff_transferfunction[1] !=
+-                    t2p->tiff_transferfunction[0])) {
++                   (t2p->tiff_transferfunction[2] != (float*) NULL)
++                  ) {
+ 			t2p->tiff_transferfunctioncount=3;
+ 		} else {
+ 			t2p->tiff_transferfunctioncount=1;
+-- 
+2.15.1
+
diff --git a/media-libs/tiff/tiff-4.0.9-r1.ebuild b/media-libs/tiff/tiff-4.0.9-r1.ebuild
new file mode 100644
index 000000000000..fbb216176cdd
--- /dev/null
+++ b/media-libs/tiff/tiff-4.0.9-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit autotools eutils libtool multilib-minimal
+
+DESCRIPTION="Tag Image File Format (TIFF) library"
+HOMEPAGE="http://libtiff.maptools.org"
+SRC_URI="http://download.osgeo.org/libtiff/${P}.tar.gz
+	ftp://ftp.remotesensing.org/pub/libtiff/${P}.tar.gz"
+
+LICENSE="libtiff"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="+cxx jbig jpeg lzma static-libs test zlib"
+
+RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+	jbig? ( >=media-libs/jbigkit-2.1:=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20130224-r9
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="test? ( jpeg )" #483132
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0.7-pdfium-0006-HeapBufferOverflow-ChopUpSingleUncompressedStrip.patch
+	"${FILESDIR}"/${PN}-4.0.7-pdfium-0008-HeapBufferOverflow-ChopUpSingleUncompressedStrip.patch
+	"${FILESDIR}"/${P}-CVE-2017-9935.patch #624696
+)
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/tiffconf.h
+)
+
+src_prepare() {
+	default
+
+	# tiffcp-thumbnail.sh fails as thumbnail binary doesn't get built anymore since tiff-4.0.7
+	sed '/tiffcp-thumbnail\.sh/d' -i test/Makefile.am || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable static-libs static) \
+		$(use_enable zlib) \
+		$(use_enable jpeg) \
+		$(use_enable jbig) \
+		$(use_enable lzma) \
+		$(use_enable cxx) \
+		--without-x
+
+	# remove useless subdirs
+	if ! multilib_is_native_abi ; then
+		sed -i \
+			-e 's/ tools//' \
+			-e 's/ contrib//' \
+			-e 's/ man//' \
+			-e 's/ html//' \
+			Makefile || die
+	fi
+}
+
+multilib_src_test() {
+	if ! multilib_is_native_abi ; then
+		emake -C tools
+	fi
+	emake check
+}
+
+multilib_src_install_all() {
+	prune_libtool_files --all
+	rm -f "${ED}"/usr/share/doc/${PF}/{COPYRIGHT,README*,RELEASE-DATE,TODO,VERSION}
+}
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 7c452e29b0ec..50ce71070423 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/grilo-plugins/Manifest b/media-plugins/grilo-plugins/Manifest
index 7a999b1f773e..5b54dbacaab0 100644
--- a/media-plugins/grilo-plugins/Manifest
+++ b/media-plugins/grilo-plugins/Manifest
@@ -3,5 +3,5 @@ DIST grilo-plugins-0.3.4.tar.xz 1879324 BLAKE2B 6cd9c27fcee17724a5ab5b5b7c0e6f0c
 DIST grilo-plugins-0.3.5.tar.xz 1881080 BLAKE2B 06f06fe47cf6fb374d3d398e113a2d851c46e390011f2ef8c04a9b658bd04eea5f0c17ad4e89f7cd922ac0a24efe94f30db65697d4b71fab512eaf71c8ef936c SHA512 3420b18d5d938559b75ae41199a6a79dfa5a8a43d2b29631f7cb03c28df569627be610a4087514240c3413e476fa76def3ee7a1b065b5104679b788b633a5b0e
 EBUILD grilo-plugins-0.2.17.ebuild 2435 BLAKE2B 3b10e88bc22e510adb5ef7b841304ff550ddc1ecd4b0977c8e09d618207a8ce3d41a4a527f3c7e6c36d3b0ba5dd962f33be9e982fd34b3ebc60e22a24b68d6e1 SHA512 28fff3c2ba9ccc801502d42f10ff125abb66250bc474d3748fe8ed6ec48484afcbf8e887428ec079eeec6be89fe1f45e58e1781ecf1ec00624a0e6d494c5ded8
 EBUILD grilo-plugins-0.3.4.ebuild 3167 BLAKE2B e1e60a924be462500c0c57cc20b23af78202807af10725532d2412c388d6aa5a6176a0467df59e3a3e4e73cb0c8155ce98a574bcb23556d8509ab062f1ae3b6f SHA512 412f8bbd11492a420725fc0b3f4737fa13691aa81fad7dd8ec601b2fda0e9899e823e3b832aefa6c3935bc7f01f04a67bd449f774784d295f6f3236aa8b7b78a
-EBUILD grilo-plugins-0.3.5.ebuild 3565 BLAKE2B 73db8da12977eefd109217baf68a8ebe10d83e11da550256a7c0f6594b658b6edf0e6fd64ca882d2d1192cb776677cb4d398af48c6d918661ed6bdc7641b4489 SHA512 61e0648dc22aab0bda0c316dd0fe383532b6412792a45dfd367ad2e45f6269e788a7504b0a551765681d0f5818823ed087a44e64fc4f80e33795ee6404945696
+EBUILD grilo-plugins-0.3.5.ebuild 3564 BLAKE2B c8ba947c095ca882c47d76419b63341da17b748ad8996ee94509b25a76ededd1a0ea0ec40f84c13de630e6e0cc34de7176461ee4fa546b34b8a6d61e9c835eae SHA512 e457405c615df714be61aa1d72c2752d2daf2b2c458324055403685be8130cbcc87558474257bb743d3841fb01851a3e29d9408df9c6cb4557e1c5ba3f58d269
 MISC metadata.xml 1136 BLAKE2B 0efdd69b0def1abeb70d76229addd8cc17db0d8bf314696eb8abfe3e938a8f60ab68b47b0be7aad81d99ddcf0e597cec76e1717ff32e5c0529a8b4bbf8b92c08 SHA512 d308b981dd17f7c78462d0e90892169e2f15affbeb99d909aa35a46e0c1728f6fc3530e0fd936424150781411b469041a47fe62bbf438aa68c0140755830799d
diff --git a/media-plugins/grilo-plugins/grilo-plugins-0.3.5.ebuild b/media-plugins/grilo-plugins/grilo-plugins-0.3.5.ebuild
index cf196f935e1f..b8fb7a0d1885 100644
--- a/media-plugins/grilo-plugins/grilo-plugins-0.3.5.ebuild
+++ b/media-plugins/grilo-plugins/grilo-plugins-0.3.5.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Grilo"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="daap dvd examples chromaprint flickr freebox gnome-online-accounts lua subtitles test thetvdb tracker upnp-av vimeo +youtube"
 
 # Bump gom requirement to avoid segfaults
diff --git a/media-plugins/gst-plugins-cdparanoia/Manifest b/media-plugins/gst-plugins-cdparanoia/Manifest
index 3fb9e3703ced..69f924a5e135 100644
--- a/media-plugins/gst-plugins-cdparanoia/Manifest
+++ b/media-plugins/gst-plugins-cdparanoia/Manifest
@@ -1,5 +1,7 @@
 DIST gst-plugins-base-0.10.36.tar.xz 2364108 BLAKE2B a71ef5d5c7462d60937602681c060e85ed086a753b7ef354dad48354d6c3741d809f2c0c6a321ef9ac60fb12d24ec65e1baa63e51211134d2a5e03aae16f73d2 SHA512 ea77778e073515df58229a641b4363df31f0b80204a5a43a8feb31f0b03a5a4b9b79d6e07e1615c773a59927a9b649f1b1d782def1120d581d09a090be8363b8
 DIST gst-plugins-base-1.12.3.tar.xz 3117364 BLAKE2B c5c16f1b46b10cfc5b9731ea990638238b82eb7f312345fece3826deed20992aff1c5a48e031060dc175b5ab5ad8ee21bb3e1e950fc0681ee4b596e65f5f92fe SHA512 d32f71836e25081b00040709a2184da85489e5af90902a0b27b820a478f5805bde93a04cefaeabf36dde53c16ad12f2816777cc195f1e027f19d1883e088e2b2
+DIST gst-plugins-base-1.12.4.tar.xz 3119468 BLAKE2B d5ac157618a25c8f0323d1922d5b26b0b5c49f56cb75df3ceeadd0566f873be1a06c863a1da6afff40901fbbbeb1ec6cd6ef4614309ca7f7ff988c0fa9040a10 SHA512 89a6e92cd294612cf1406eb156416ab4606643f6b43637e64a18f6f28ab789ca8d4cf1308434ed85e5fc679c79cc3ca115db48f37e0065a6ab3cdfdbaaad9f53
 EBUILD gst-plugins-cdparanoia-0.10.36-r1.ebuild 438 BLAKE2B 056dbad1b9473f84356d9fb0f0ba8c0f7a0438e06b0353d4344c879e9092d05e655f2ab4141259412f621bb53218c454dda0033aca1dc204c5eb0a03c0612757 SHA512 8be7db6c102859a541cf40301567414398e0cd7cc51435956490af1a92a403444d252260178de83f48453ce701020d963fa0f95ff3bad03c1b7973a94ab5d4a8
 EBUILD gst-plugins-cdparanoia-1.12.3.ebuild 470 BLAKE2B 80c0c24e05fb0d5627a801b5fe209db94a98ea783496113c72978f7aa9249145cf12fc9f136fa692f027f94a7d1752a318f26ea9d888926fdebebc8413707862 SHA512 1429e584a600a4199ace2cf2e4ff98cfc782a815da12044472ec27df80bab5ffaad5ff488c1977e65c61f48b6273eafb112760ff5a9fa2e4108a9458e4f78157
+EBUILD gst-plugins-cdparanoia-1.12.4.ebuild 478 BLAKE2B ae3b8f0d44952df4570242e38ad8e4696be5dc8c10904bcdc848f1884a304acb1933c77392775bbc97426470ede9500977f2e020fa45cdb6fb65a335d4b28a70 SHA512 9ad4fdaddb50e1fc911f8f28be2c7e22c2b2f8e15d7febf55dd75792474f426271559d72e0a661fa82918ba91477d4f4ee37ea833e24c6e8731bb44bf950ed5a
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.12.4.ebuild b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.12.4.ebuild
new file mode 100644
index 000000000000..bb0935f0a750
--- /dev/null
+++ b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.12.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-base
+
+inherit gstreamer
+
+DESCRIPTION="CD Audio Source (cdda) plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=media-sound/cdparanoia-3.10.2-r6[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	gstreamer_system_link gst-libs/gst/audio:gstreamer-audio
+}
diff --git a/media-plugins/gst-plugins-libvisual/Manifest b/media-plugins/gst-plugins-libvisual/Manifest
index b39b708f7f56..b5f46048b18c 100644
--- a/media-plugins/gst-plugins-libvisual/Manifest
+++ b/media-plugins/gst-plugins-libvisual/Manifest
@@ -1,5 +1,7 @@
 DIST gst-plugins-base-0.10.36.tar.xz 2364108 BLAKE2B a71ef5d5c7462d60937602681c060e85ed086a753b7ef354dad48354d6c3741d809f2c0c6a321ef9ac60fb12d24ec65e1baa63e51211134d2a5e03aae16f73d2 SHA512 ea77778e073515df58229a641b4363df31f0b80204a5a43a8feb31f0b03a5a4b9b79d6e07e1615c773a59927a9b649f1b1d782def1120d581d09a090be8363b8
 DIST gst-plugins-base-1.12.3.tar.xz 3117364 BLAKE2B c5c16f1b46b10cfc5b9731ea990638238b82eb7f312345fece3826deed20992aff1c5a48e031060dc175b5ab5ad8ee21bb3e1e950fc0681ee4b596e65f5f92fe SHA512 d32f71836e25081b00040709a2184da85489e5af90902a0b27b820a478f5805bde93a04cefaeabf36dde53c16ad12f2816777cc195f1e027f19d1883e088e2b2
+DIST gst-plugins-base-1.12.4.tar.xz 3119468 BLAKE2B d5ac157618a25c8f0323d1922d5b26b0b5c49f56cb75df3ceeadd0566f873be1a06c863a1da6afff40901fbbbeb1ec6cd6ef4614309ca7f7ff988c0fa9040a10 SHA512 89a6e92cd294612cf1406eb156416ab4606643f6b43637e64a18f6f28ab789ca8d4cf1308434ed85e5fc679c79cc3ca115db48f37e0065a6ab3cdfdbaaad9f53
 EBUILD gst-plugins-libvisual-0.10.36-r1.ebuild 517 BLAKE2B 613be0fe785b8e48de8cf992817fb9f3de264430efa63d9067921565af06abd13bfe06c7794e83dd011d4e86f87853a188348558076ce6f97a27228004ec0c6b SHA512 54c26a7c8f82a1e2c7fa1f7fece6112bed1d6205d188a1368c5e101641d81009361b28e67caa8daf827817bbfe33a260eed0fc747b78d9ce18d8dc2ff8f7d9c0
 EBUILD gst-plugins-libvisual-1.12.3.ebuild 623 BLAKE2B 6300696bd9703bd6af4004f57479e804d65beaeda1b9085223d1ba82a8f54c9b72b6189f4c39430691b9c4e2d2c07585bad559222d6a0bddf582621499db37a8 SHA512 a83e8a034225975ed73a5e5319408cae4e37e336b7cf00619015b4d603001701014266a6fac1a125cbaea4620bdb15f95cdfcc589dc8084b3322b9b0040bf042
+EBUILD gst-plugins-libvisual-1.12.4.ebuild 628 BLAKE2B 4f20e3b377c2e5d303c7797c229d8292385ed107e91affb05a176715405e41e0d178924440fcb57c5b54a0f5983f59308ef90999f1baf98a7fd19ddf9e26b23a SHA512 997caf15d267d10e323f7433e3765d8e0c8900c9dfed4b6593cb87c772c774859fc8f768376aa3ac3ccad2a670e5a583bbe237e1843b712e6924575acf164225
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.12.4.ebuild b/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.12.4.ebuild
new file mode 100644
index 000000000000..c46b3cedc35f
--- /dev/null
+++ b/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.12.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-base
+
+inherit gstreamer
+
+DESCRIPTION="Visualization elements for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND="
+	>=media-libs/libvisual-0.4.0-r3[${MULTILIB_USEDEP}]
+	>=media-plugins/libvisual-plugins-0.4.0-r3[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	gstreamer_system_link \
+		gst-libs/gst/audio:gstreamer-audio \
+		gst-libs/gst/video:gstreamer-video \
+		gst-libs/gst/pbutils:gstreamer-pbutils
+}
diff --git a/media-plugins/gst-plugins-opus/Manifest b/media-plugins/gst-plugins-opus/Manifest
index 0cfbd5fdee96..0552e2991827 100644
--- a/media-plugins/gst-plugins-opus/Manifest
+++ b/media-plugins/gst-plugins-opus/Manifest
@@ -1,5 +1,7 @@
 DIST gst-plugins-bad-0.10.23.tar.xz 3155044 BLAKE2B 86ed955fb5c73f2145b8f8ed2daaeffd9975362e81c3ca911be00d18f6b6d975381651071eb54514ef94a931f1fc89e673dc8c1d68e10de132bbe51accb6d165 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4
 DIST gst-plugins-base-1.12.3.tar.xz 3117364 BLAKE2B c5c16f1b46b10cfc5b9731ea990638238b82eb7f312345fece3826deed20992aff1c5a48e031060dc175b5ab5ad8ee21bb3e1e950fc0681ee4b596e65f5f92fe SHA512 d32f71836e25081b00040709a2184da85489e5af90902a0b27b820a478f5805bde93a04cefaeabf36dde53c16ad12f2816777cc195f1e027f19d1883e088e2b2
+DIST gst-plugins-base-1.12.4.tar.xz 3119468 BLAKE2B d5ac157618a25c8f0323d1922d5b26b0b5c49f56cb75df3ceeadd0566f873be1a06c863a1da6afff40901fbbbeb1ec6cd6ef4614309ca7f7ff988c0fa9040a10 SHA512 89a6e92cd294612cf1406eb156416ab4606643f6b43637e64a18f6f28ab789ca8d4cf1308434ed85e5fc679c79cc3ca115db48f37e0065a6ab3cdfdbaaad9f53
 EBUILD gst-plugins-opus-0.10.23-r1.ebuild 483 BLAKE2B 6bb8cdf5374aae793161711f58f645d7dc0a9e0e984dd36ef440c86350d6af56f302acaa34233745509731ac228275b062b4131262baf636b40a6e77f821278f SHA512 5bdc5e46ed34feaa7b63fd6f5dadb6e6c7b623b05a6c22b0f5e893f0f6c1e9a243d6265f865dc509d460822429d446833172ece1549564d676b1154d2ef8cba8
 EBUILD gst-plugins-opus-1.12.3.ebuild 658 BLAKE2B 717918a4f782fc986be3a89e1510fa7700c7d33170bd5c97d548e484b8e8ad36c7721e13a8fe3d5df5b60fa1981f80570b6154e4e96319a5c480a4ba26c5a116 SHA512 f3c5d1611e6635ba42a0b13c9c1f000a6c4fa6d3381f08d916295ad7edaff3b75e15ef225e7aba1a72c85e9d50c294cca5e75f24e3304cd14df1d8ea9c06f780
+EBUILD gst-plugins-opus-1.12.4.ebuild 666 BLAKE2B 320a41bdc6c0531073da7b386d9a3bcb5e309255c4e6de28709069ab76b38c607135ba0ecfa57b734f55731fc7cc4259264a6b97d3d2a68d7fa09368544a1639 SHA512 b1ef39b5f20274db4c9380fa4b07f31d7686155da9ca68663769916de615a791c36d6ce4e4188ec91acce3da925fc31f5d74106f04f6c6dc01a28acc61c1d4a2
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.12.4.ebuild b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.12.4.ebuild
new file mode 100644
index 000000000000..38869f9abd10
--- /dev/null
+++ b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.12.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-base
+
+inherit gstreamer
+
+DESCRIPTION="Opus audio parser plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+COMMON_DEPEND=">=media-libs/opus-1.1:=[${MULTILIB_USEDEP}]"
+
+RDEPEND="${COMMON_DEPEND}
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},ogg]
+"
+DEPEND="${COMMON_DEPEND}"
+
+src_prepare() {
+	default
+	gstreamer_system_link \
+		gst-libs/gst/tag:gstreamer-tag \
+		gst-libs/gst/pbutils:gstreamer-pbutils \
+		gst-libs/gst/audio:gstreamer-audio
+}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 2ad77bfb9b40..bf908851b013 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/gnome-music/Manifest b/media-sound/gnome-music/Manifest
index c2c59bc855b2..91125d40c593 100644
--- a/media-sound/gnome-music/Manifest
+++ b/media-sound/gnome-music/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-music-3.22.2.tar.xz 1547556 BLAKE2B 4cd54ca211018a21b744e14fa2b81e7a229e293bd4e4288771969bc75d2845fb05862b679c35218d7c1a85a595def5eeacf6009f3fca6b8e46a08395d7c9d40d SHA512 5f30a943209171f19f344139b40725649a56499ad874be138d8681e0ff81fda7fe85fc1b20c3dcf7fea21dd28a0921a47fe28fe064fa1ea8d51a313ec56e7924
 DIST gnome-music-3.24.2.tar.xz 1557848 BLAKE2B 329d60da4c2c601524e01bddf086ea699bc10ea311d440ae24af0a83829d7ad4c351963e1b08bd30a8538c9b9987d9f2a41f95690ae31e75c06aac0cc9db2dcf SHA512 a922c80f922b9231e9bbe0cbd1fd33c059c719350c250dbb24316224e3306de7576303119fc9ec303f569559c36d6b076b5ec1076b4f9221a8fb133dcd9f040e
 EBUILD gnome-music-3.22.2-r1.ebuild 1547 BLAKE2B d74f1bcd68cdfe50ff1e543008eca81500636e0f88bab6394cf889b81cb4a50b2398991f6320629d07417761e2e83a2d1b1198bb5f89a0b4d219932ad520312d SHA512 913775e5ad8c25b338003346c1349e386dad5ce068efbf4a895f861863f418171e5548f5cf87edf09795463eb0119ddd235c4dc52395d03c4d95be15751159fe
-EBUILD gnome-music-3.24.2.ebuild 1557 BLAKE2B 4d7a3580c23626dcf0983916dd98bbd6964c401bc759b77ee9df00c645450abce346c10cead5667a05b82dfcaf3cf2d27aa19d584e4f3b358e939b9cf3af5633 SHA512 015451016cd7ccf11ec65fce48d13a757f80a1ba4ec7323acef2caceb10ac3a9d070f37d621d2c293a4abf8420e0a33d43646f6d031b4362ae8b7cb953636bab
+EBUILD gnome-music-3.24.2.ebuild 1556 BLAKE2B 88a976174405a82f362f57f1bbe0157571a36d1eaa0fe0d0bbf3166660dcae4d1dbb4eda6a485fd922b54eaf1ff948423af0ffd2ef05c2e6b183ab932818d98c SHA512 e1dc5fb96a59d03b902047e0937268a5aac7da6f477ecfb296f15f45577180af8f8363f2e9a53da5abd742afb9ac8e804f09ecbc4c3b4b49134acdddd51b68d4
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-sound/gnome-music/gnome-music-3.24.2.ebuild b/media-sound/gnome-music/gnome-music-3.24.2.ebuild
index 925303cf3748..2190414a7d80 100644
--- a/media-sound/gnome-music/gnome-music-3.24.2.ebuild
+++ b/media-sound/gnome-music/gnome-music-3.24.2.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 COMMON_DEPEND="
 	${PYTHON_DEPS}
diff --git a/media-sound/gnome-sound-recorder/Manifest b/media-sound/gnome-sound-recorder/Manifest
index a516911f61d4..54efb3e91e88 100644
--- a/media-sound/gnome-sound-recorder/Manifest
+++ b/media-sound/gnome-sound-recorder/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-sound-recorder-3.21.92.tar.xz 450092 BLAKE2B ebfd5e671b4c379e294e19f1f17de7f96c3d70fb3b0bfe8becfc919b76d055350603ccc03c8795bb96f64846b4d8b4f875eda73a998932aa2fef1db5ea605daa SHA512 60afa42367f9087e580037213f06c1eab10a4a29fcf3c90f9737e73c9d6a1dbdb990cd010d7e33021c0e25bb33ff673e35bffb74d6fbc33b82047a0516ff31be
 DIST gnome-sound-recorder-3.24.0.1.tar.xz 452240 BLAKE2B 37b2b81255af5aff4de08e92bf7db216b229885b1aeee87d91a1210412634b62641758c6132290b75494f780d304d78dee4c3d5d7e08de46736750c2730b20d0 SHA512 00e190e8d6a1a3961122485742705da4d85ef926453ff8098718566771600690562597f012f7cd9dc61b5910b4e75cc7518e86a092f052c3fc40a96310ab3c3f
 EBUILD gnome-sound-recorder-3.21.92.ebuild 673 BLAKE2B 7edad00d49018f7248060566b5c8c7e7b5bc6bab8508e1ef3e56d8eae1c7fbd4ff183212b1aa1cff6d1f0c25813f1db7c392db5c61c643e69dc76b8c40adab1f SHA512 33cc4fabc1c16aec885f4885c4edc377d2ad2f14a177b33e135256a9e285b5d2424a09392212744bce14fb78ea47936529260c649b24e88b9bcc7ee2861b6d28
-EBUILD gnome-sound-recorder-3.24.0.1.ebuild 1084 BLAKE2B b9c5e52589476a78b597b2125285ee9f8fa0d1729b8987f62d72b834d1eae322c0065aa4ed84e6f355f4472ac93bce783d01f109c261d492fb8d99f3f50b502d SHA512 85ab4a80d3d09e8c4bceff689e56a5452c17a9efbf0de1b17b1e06fdccd1a84d85a16568d565a9dc6c99a62002f3d7aaaa7a8778294d214d074e3068adf1ae52
+EBUILD gnome-sound-recorder-3.24.0.1.ebuild 1083 BLAKE2B d9df40ebe569a1c0f3edfb91c57ff26b8d6345f56c9d5122c42abeda635df851f679009e21cce1dced73deb7ed7f529df036bc1aa5e2a5a4143200cface68a3e SHA512 499c05e1955bad18123c5a3f994da3034b7df4d0d6816718f39ca43df1da1cde7dc8212ca84193474a832c5d9976b996ab6394009a52420f1a0d96a88c7b2691
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.24.0.1.ebuild b/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.24.0.1.ebuild
index 83c185a0e836..2e40dc899df6 100644
--- a/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.24.0.1.ebuild
+++ b/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.24.0.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/SoundRecorder"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/media-sound/sound-juicer/Manifest b/media-sound/sound-juicer/Manifest
index f246fead953a..291268d83238 100644
--- a/media-sound/sound-juicer/Manifest
+++ b/media-sound/sound-juicer/Manifest
@@ -1,5 +1,5 @@
 DIST sound-juicer-3.22.1.tar.xz 1015520 BLAKE2B 20bf45a7b5acc11eef53e03011b66bb0054746973acf30940185c45608fce2a521a9ee60b7662f2be20ab1e27af567176c869718096cdff298a676d313e23511 SHA512 023bc24006930edc9c224e0d437d2c3dbd513af9c56737cca800e38e8f56d76686e5fdff13e9cdb81f27fe3dd87b274611484a8beb0f8705d4cde5d56a23f7a2
 DIST sound-juicer-3.24.0.tar.xz 1019588 BLAKE2B 04ba81aaa2e02fa0f6d7bfc1304be3dd1eb750c324c577b4a12809fbf43fc5ff74339750af3d99e91dc66bb0f0e4e6c33144177421f34258fb13c949a3fd5b63 SHA512 7bd158a4e3a7c3072513fc508f59cd70b6d9371cde142fdb58597e72b3687790b9368fc7e1a35fd8c7b49cb28703f8b2da4a789854f96cdc0af076278818a91f
 EBUILD sound-juicer-3.22.1.ebuild 1519 BLAKE2B 8b4fe482268894749cae76917790689c7b682b8edc8cf66d3b21c44e23101e8945f8cdd9c60881ac57a4d9a98694dcefd9fd9b9a0486625f128e595af8d27aa7 SHA512 122dac4f24e52c2ff263adf82c964248a2e94bfb0beacd96f66025ce42fea14b5fc6cd1853260d22f36f6df322dfb151cbd652a2d522a20f2ad4a69a157b3356
-EBUILD sound-juicer-3.24.0.ebuild 1495 BLAKE2B d0edbe981a881db9fadaac97682a52d886b431c25188c91b742f6b5a2dca26256de224e616089f2185fd9f72c2acda4b65c0c8a5b17c3db9912330b34a3b0a72 SHA512 5b8cd04092f6237a93c13692b7b3525d62ea2a1ebb6c5350a206e83c8963ea6ae7fca1e1b02f25f02f82978f0e8b319ad89b223e1cee9ce922d12156f4768896
+EBUILD sound-juicer-3.24.0.ebuild 1494 BLAKE2B cf3b299bce2123b2397591f3ce9b850f2ba7240d350f43122f9020e30b91c3e304d96567be3f2ed97803491a40430e225671529d65955d9cb2e382b57f21adf0 SHA512 9ce32d6895e70b0be5d0c10fabbc3afcea6f3a70c97f7169c29016138fc025fde410494c30c3b5eaf80a1e0ca3a74e48f2fcba0d91b991229b54cfa42edad067
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-sound/sound-juicer/sound-juicer-3.24.0.ebuild b/media-sound/sound-juicer/sound-juicer-3.24.0.ebuild
index 1048134c57c7..878c4c6fdc38 100644
--- a/media-sound/sound-juicer/sound-juicer-3.24.0.ebuild
+++ b/media-sound/sound-juicer/sound-juicer-3.24.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/SoundJuicer"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="debug flac test vorbis"
 
 COMMON_DEPEND="
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index f3508e811242..d35ccae90905 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/cheese/Manifest b/media-video/cheese/Manifest
index 6ec6ea1ce7dc..0b927c077e88 100644
--- a/media-video/cheese/Manifest
+++ b/media-video/cheese/Manifest
@@ -1,5 +1,5 @@
 DIST cheese-3.22.1.tar.xz 1843092 BLAKE2B ac96629373bf02fc8e92eaea372045c72b7a69230d970d346cb3fffccf3083d03e7d9a96b85281a6725a6e96f792c7ae993e598e47f074ceee39f43f50304d52 SHA512 193e421a0310a60871b8e0ac7ac28c16b7ed1caf0869904f803f45c4b15be74ab98dd88df54e5ce8c0885f466004d182450350295d3d89264e6f39035a389656
 DIST cheese-3.24.0.tar.xz 1846412 BLAKE2B bc18ee7009f4297df232c0ffdc40f5783891f721efe137e4127c7ea61595dcb033e98b415ea31e5918d93c408355e6534ddd95687a570b5abcc1c5ce0603d262 SHA512 c81d2f3038970f735960a2cbcec3a074ac2e9835d3f1fa6aae83d65299692d0464fed274e71caa59831a105430ce5db56557ea0cda27c72cdb050a59331b3107
 EBUILD cheese-3.22.1.ebuild 1957 BLAKE2B 26f7ddaf5b479b95d808f5e1936c8338242a5e72f9cdeb8962843416d5b114b332a52be4d8b4c587ab169a4f44e06fe39934f8c674dee803476c551e16b7c930 SHA512 bb8de1b7023f1d23272dae0ac89d7651705c78002d17af02625849e4c7cda99550349d52581a9b1f5c0e87cd39dbc784207197103baf1a3d79677c124b97ebed
-EBUILD cheese-3.24.0.ebuild 1976 BLAKE2B 0a7f9d670698ad6a70a33fdf108b2e94fbb6731eeb38dfa5ed901cd3cefc8a3116259422444b2731068a232fab7b1247773ee7c3dfffe7e17eae214cde04d4b3 SHA512 7d63c767ecd10e858fc17b9c5bcdf38a4c0ccb7e4d9d10c2a542823fb3d81e42f431c1b571f3aa1a40763d58d88f7ec8706e0d2028e04d45c27478823c3223e3
+EBUILD cheese-3.24.0.ebuild 1975 BLAKE2B ca981be25844ffc3e14f6fa1ea762f06e74af1b9b99111a7fb864eb351b2277daf4f975ef23e0da95fdfc22bcd02f4542aa85d4a2798c7649a5ba9dcb05c2fdd SHA512 f9cf9f626d8ecce0c16c0b01b5d88d4f0e197a4633d3c28fa410689bd9a701b8a8ff0b0ac6cafeb0d813b3b258b5a09bb2e26eb1f452cfbae1f9cd8a8a70fb8b
 MISC metadata.xml 428 BLAKE2B 3a6b33697b144cba857668b55e04897b8b6c6c4323f09be85ce827843ef50c9c6d988a4e60ffde4ecf1e66a73d70f0e71f2f05371f33f3853429107684abbc9a SHA512 cbe065cc8fe75a86d8f16788dc2ddeafda2b1c27858427f6c9ec83841730e3d9c1c9f7815718c86e19626098b96782a1017b614bac5a0121c92af04b11a30a22
diff --git a/media-video/cheese/cheese-3.24.0.ebuild b/media-video/cheese/cheese-3.24.0.ebuild
index b4ec71a08b2c..c4355c816aa4 100644
--- a/media-video/cheese/cheese-3.24.0.ebuild
+++ b/media-video/cheese/cheese-3.24.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Cheese"
 LICENSE="GPL-2+"
 SLOT="0/8" # subslot = libcheese soname version
 IUSE="+introspection test"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.39.90:2
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index c30364c8cb67..1c62dcbbf4cc 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,7 +1,7 @@
 DIST mkvtoolnix-19.0.0.tar.xz 4616780 BLAKE2B 72eb3b1a34bbed0d492098c02c1f60c7ce7f0ea6a8fbff6b88bd9d7af5891dda8c8adb9a0f856c65106fb430b481183ce74b9369590cd4dcfe881d7db84eb06d SHA512 dd18eeffc8a5210ca3c8a287321ad106f63cff8fbe5ad3891460aab7e60f2d5261a3f335f3991524a95724861288593cfb3bd9df6829a2f7751f6a1fdaba0ca6
 DIST mkvtoolnix-20.0.0.tar.xz 4670268 BLAKE2B fd10e5bd739338252d4d1c8878382652660e59b9669c85a3f9bfab1349da6cbcd4a79b23a1db9f59adb5ccb12aa1ae046978f722e887ab0668c91270cf50b705 SHA512 1ba7b2d02fcaa2252409702e82e04075237a33b8f2cfe8b85e4ea416d7ad55d0454659c821eb851fa666b15acceec40a5be00691ddaa4ea098cd3a4d2db0d313
 DIST mkvtoolnix-9.6.0.tar.xz 3810216 BLAKE2B 0213f7643b517436610fd2abd5862026cad81ae48018bbdde6fd83b226eaba6d36589925fd49b7244a47569f7fd15480eac9af559df1da7c131a05aea4865606 SHA512 5f469215a10dc865e51f77c43961705d70b1b0e38d70b930e5065d8d89b8379734d9826a63e2cb7ae9cb6723ed8a1d16793df35bad6244cedaa19bc4df49b436
-EBUILD mkvtoolnix-19.0.0.ebuild 2552 BLAKE2B 83fd2697455d3f25a23ce9c050a1e5435f4f52bca5e289c47814f9c9a5e7ebee7435beb3f7e495ecd7fc704dfa64dbf0ccf3df6232634358a1faf277a9fac2c8 SHA512 c3cb925382cb19947251ffd175c1cd67b30010829a38ad4a8bab489a17a769fcf5f2ba5edcba8def33181dbf94da369fdbf4c4c0936ef443bff951417bff1cc5
+EBUILD mkvtoolnix-19.0.0.ebuild 2551 BLAKE2B 5255e0dd75e6e5888bdf14502ed4f7285781e2de6b6df2d851d81ab4fd698c3999ee8997800fec64a38db92cdb87f6dfa07012fcfb7d7586a96a1ec688109fae SHA512 7d6bf6d2f5ffe0684263efa496318936ccbdfa01fc4041eaf9c1cd3f0e4260ed87875da30262724f0d1b3db497007677d010c115cffb49a89180423ce6e8c28e
 EBUILD mkvtoolnix-20.0.0.ebuild 2699 BLAKE2B bd92f5a119e392e640ca0169dce9fe0c30c1837a6553ed3e0678f338517f52199eb6ebbd005005d8c8d7d442dd84d76abd7b999586404e1b79ac6527e0edb2d3 SHA512 364475b382607e75c39519584959733d61b5bccd86199f55376ff91d28a1d1b692299f3b6f2ab7b1102e2be82a787acdc5e47a82c680d3aa1cc052c93bf2da62
 EBUILD mkvtoolnix-9.6.0.ebuild 2797 BLAKE2B 63dcef388c97df90fa9d47572d2af82839fb1687409060aedeb824400e5e2d450674689c69e630bc02f00ff92f784ab29d3b445b39a4317884a30513e30151b2 SHA512 bd376bb7787b79719e4e3bba4361e55be0d8c39d55b6c37c905c84bf8b583f718b66d7ce9941f87213514ce38c33f2d2a506f2fd8e1edcd6d0fb4e11e45d4052
 EBUILD mkvtoolnix-9999.ebuild 2711 BLAKE2B 05bc79c266139415bfa53d7c739bfd4b1738b606d2d7660d41eb1fa68a4738970371ab915e0413b30ff8a482452ed8b4568f076c32a8383955f5c2a7f237bff8 SHA512 db31f33ad3f2f302fb978a5a5ce59c265141844142b1d557a1febc42b2c3a0ac1a13a9b5cd04d8903a7c1dab01f3fea9701aa634edd165c40d04e6d64ff9f5df
diff --git a/media-video/mkvtoolnix/mkvtoolnix-19.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-19.0.0.ebuild
index f0e294854bdb..8830cd670aae 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-19.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-19.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index 6ed268f19f4b..510b982f2edb 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -1,5 +1,5 @@
 DIST totem-3.22.1.tar.xz 1982788 BLAKE2B fe9dae757201dc0f0c39f635f192322ec12fff5f3f02202771dc6f97d83f3e5865db757b3a42e98a0c172f43f0c82198e51be88e8b84915670a4f81af600e120 SHA512 919f313d2af1d72256ccfa1fe41fe897427b7558c2308da8c257e5b5439f90af9a47a905dd692ab4cabec730a5be0e55710932f91bc6e2f63949f5d83c840e97
 DIST totem-3.24.0.tar.xz 1987260 BLAKE2B 81cb8c359b2225148a18f7a5c6ae9990cbe2e2f3b9a6a31012c9c8c0920c0cea6bad0a5d9407a79530fadf00fb845fe9e6aa8dbc84d0f8d6e84fbc144d86bc9e SHA512 488db91e09b7f5947e81cb5474444c753367542820777faab561582707b012e664f232d3810d543dfbe0823adf3d8302c2fe6cc387f4225a362d15a6df8b4342
 EBUILD totem-3.22.1-r1.ebuild 3878 BLAKE2B c448e18a99f1b5e1b249e066b2a4b4a3540aeafb1006665b493d91257aa728702f95f139ea1b3b3c63844c5a3231981eec52eb49eb0e6e8981b467f2a9a420e5 SHA512 b74fb308090d9dc823aab3e83d835c75aa462238a6ebec1f0257386424f15d57b36efdf66dd7ec52f77ecb5c5717d442dafff48ea49da1aeed2bfb2ca6a093e6
-EBUILD totem-3.24.0.ebuild 3883 BLAKE2B 05147a6be9fb27c72b54d44801002b2b2dbef7d0eaaa3c5ed82cb8b6e2eb43626334273f55c2aeb8c78a59d5dcf11408e50c1729c5320445813e75d40eb38a31 SHA512 0f6ade1021f152ddf02a9d45103bcf39dd746471a8bc9084b2c7a998f04306e624cd54270aeb6d6172b75ba8d9cc76bc996c3fb8a73b0a2b36b7b5aae2b8fc7b
+EBUILD totem-3.24.0.ebuild 3882 BLAKE2B 633d982ee9c3dc709001b837de0d8d573fc5d8290db60d7142141a8a4aec7e22bb5acb0a317227d6c2139973e63aa7a17504a6c7de625a432edc406586dec2d1 SHA512 f50c6dd202d48a86f01a4bbb54a011aac3c30a2b02ba267839e2c7148b230c9598670c0868788d9f3ba6018d97542a215e9604dda5372d18dd91bae174bd16eb
 MISC metadata.xml 1203 BLAKE2B 17dbe39772d0e1e06ddc792e26344fa17d957c7fbc483030be4c48a3ebe262c23670f77f5ed811161f0419f020a435af791147f94276285b5c9e72b9fcf1e03f SHA512 d361035197d6ecbd6f2ad3cabc641cae06144148f468b5311c778950806fb0fffc9f2f4685ea557b64c7da67e08830b3ae4d11535849a01b9c06bb1c813b3b08
diff --git a/media-video/totem/totem-3.24.0.ebuild b/media-video/totem/totem-3.24.0.ebuild
index 3f37a962464e..c7f1d655e4ea 100644
--- a/media-video/totem/totem-3.24.0.ebuild
+++ b/media-video/totem/totem-3.24.0.ebuild
@@ -20,7 +20,7 @@ REQUIRED_USE="
 	zeitgeist? ( introspection )
 "
 
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86 ~x86-fbsd"
 
 # FIXME:
 # Runtime dependency on gnome-session-2.91
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 77dee986c1e6..027ad1c94155 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 3e5d4982e927..b1ecf81c32cc 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 26 Jan 2018 14:38:27 +0000
+Sat, 27 Jan 2018 17:08:27 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 3a453797f35a..78f736bcbf9f 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 415966 BLAKE2B 664ebf4d322399166469a6cd167dfeeba8ecc3b61712e950abcb3c63c18cca02140bfaa206e2eb06bb1476d73682fe2d76e35b8a94dc0228c60af02e86c19a87 SHA512 7d06c7f62e8712502202c5d9e88cc501b34d79560f0bdd5e1f5907dc55cbc791a6d1c654b9e913106a8a96545f88c154fb9731c255532e719a8a5c200a14acc3
-TIMESTAMP 2018-01-26T14:38:30Z
+MANIFEST Manifest.files.gz 416281 BLAKE2B 9f5d0005cdae01ce5134efdc393aef2fa9e4486317293d473758f4b6f8a874ce6ac4b387a4d8c46338853ea09d96165ac399c906f15c28230dbfd8e95d4cdf26 SHA512 abd62c080ba1aa5d4609732620883228f3aa81aa544122207a98ca33c50401945a5d524cfb277af684f89fcc0fb6bc394206dcd88925ddccd9d1d6a9ee4a9949
+TIMESTAMP 2018-01-27T17:08:31Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlprPWZfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlpssg9fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAxYxAAtH5Pn1i40vUGCtIsp4f1t1qbaZnVY3CbZMv0bfi/E7+TnjYiViX9+fUQ
-DlCuP4Iw6znGILlmaHqWBfm3Vp3UbsM/25Hdh5EGLS+aTWqZYVpURLg0Xbbt3j4c
-WN5XQj1Mr55r3Wf4AsltBrlJ97s0PGgaWETQKt6svF8pBWLVtzXLLsKTcHGey5r+
-enF89cUYCKfZ3RPYkPjPpy40v1rU1IE6S+B2wX4Obg74Y20iZQV+e+pV/yNcd1nQ
-NJWCQ9fcoOUBqD5/J0lDACt+Rvv0QVoc2FZDwfJ9wEmcrT6mWtaMz2TuXybfnZkW
-aUgJBXDz/kFqNkMyOs67r/3hUH0oUw7lgshURs+mQrlE4+ddCetu4b08Bo5pye5u
-qVUq3EGUQ2m91DXH3KlN0CPBOWOF0GjG/l7O2L54pB7MUXMuNc8u1mMqF8uhD6JF
-fXZHdb2y7Ww1fLmkPNq0iH5XrrITWM5RqpWFmzCBv8vLFvWR+dZ6GnPClWKjOQBo
-vgRm2sGo26y+HZUthSXhB11iDlVxNmSye048wDDjsmzFyyqMBgUECOdBvtsK5z8n
-eOvBG7sT1c4S6/jHpr6A+pP9S5rIl3ddVjx7VffVNARcTmRwE8f6t2DmNOf37W/N
-/G39PeQvyKCYpTK2hCJZW+pEDvBio9o7wy/4L0CO0OKauXpIkwY=
-=w/A2
+klB8lhAAshl8/IWz7rA9DB2LulqcTCA31/LKk/nK+H7hsIQDDkhX+H4w3vpeadnO
+qnpSOQ0L3zb/zbXt9IMp8TYY2hiurjsBkg9RF4MEp0UqlLRFLEBX4KzzNYBCABkE
+NOi8xHI/rSzFTWLgWMiN9pN3BvBgUyOdODnOZoeRHqY4RQBuIwjS4OLCcRug5eCq
+pEEm6dqO3e17aITB1SmU0LrO8vsLEeC5X9MzGJQq6MzwjmdvNG0S0r4+gBD/ivMO
+VFfZzvVkquHxgIp0yVjER0cZtN8VFEE6VdYZk8GAQaDyDcA+NoP0WxG9BhsNiO7x
+z+TsF7FBshJvTCkVYYy3B98yeVGukzcWB9qlNPlx0FkFQuXOuqjHEMIRqE1nXsl/
+oHZV0DDTDe5piS/YIGRnRpY8HbNzPywL5NLupMocQ0UoSHrZLj+8kWFUIXxL1PzU
+E+2Fdqve4fCGH+WZ5Ia3YSOHlEHsvl/eK1mXcC1q1t57x9JUj8Aw//mce5MjKseR
+qpnD5FaqsT3jF0eOtEkPXe1Zz4CQXLWFTbkkp+G/3oiDvMKG3voYHmTNGTwked7o
+opS6Ry90UDZkw/R2jLct/fgANBN2odyMgKNX7/Aoxe2rzSAyzHvtQbFdrGmdHvQp
+0np7gMefh/gqoO77LO/wuNSi1icNrf0zteOgiQrzOvxN3YtEx7s=
+=LbIQ
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/Manifest.files.gz b/metadata/glsa/Manifest.files.gz
index f87efb13feb5..f87abaa3fa80 100644
--- a/metadata/glsa/Manifest.files.gz
+++ b/metadata/glsa/Manifest.files.gz
diff --git a/metadata/glsa/glsa-201801-19.xml b/metadata/glsa/glsa-201801-19.xml
new file mode 100644
index 000000000000..42b4b79dfcef
--- /dev/null
+++ b/metadata/glsa/glsa-201801-19.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201801-19">
+  <title>ClamAV: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in ClamAV, the worst of
+    which may allow execution of arbitrary code.
+  </synopsis>
+  <product type="ebuild">clamav</product>
+  <announced>2018-01-26</announced>
+  <revised count="1">2018-01-26</revised>
+  <bug>645794</bug>
+  <access>remote</access>
+  <affected>
+    <package name="app-antivirus/clamav" auto="yes" arch="*">
+      <unaffected range="ge">0.99.3</unaffected>
+      <vulnerable range="lt">0.99.3</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>ClamAV is a GPL virus scanner.</p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in ClamAV. Please review
+      the CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="high">
+    <p>A remote attacker could cause ClamAV to scan a specially crafted file,
+      possibly resulting in execution of arbitrary code with the privileges of
+      the process or cause a Denial of Service condition.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All ClamAV users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=app-antivirus/clamav-0.99.3"
+    </code>
+    
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2017-12374">CVE-2017-12374</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2017-12375">CVE-2017-12375</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2017-12376">CVE-2017-12376</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2017-12377">CVE-2017-12377</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2017-12378">CVE-2017-12378</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2017-12379">CVE-2017-12379</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2017-12380">CVE-2017-12380</uri>
+  </references>
+  <metadata tag="requester" timestamp="2018-01-26T15:58:04Z">whissi</metadata>
+  <metadata tag="submitter" timestamp="2018-01-26T16:14:41Z">whissi</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-201801-20.xml b/metadata/glsa/glsa-201801-20.xml
new file mode 100644
index 000000000000..f5f2e01a30c4
--- /dev/null
+++ b/metadata/glsa/glsa-201801-20.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201801-20">
+  <title>Fossil: User-assisted execution of arbitrary code</title>
+  <synopsis>A vulnerability has been discovered in Fossil allowing for
+    user-assisted remote execution of arbitrary code.
+  </synopsis>
+  <product type="ebuild">fossil</product>
+  <announced>2018-01-27</announced>
+  <revised count="1">2018-01-27</revised>
+  <bug>640208</bug>
+  <access>remote</access>
+  <affected>
+    <package name="dev-vcs/fossil" auto="yes" arch="*">
+      <unaffected range="ge">2.4</unaffected>
+      <vulnerable range="lt">2.4</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Fossil is a simple, high-reliability, distributed software configuration
+      management system.
+    </p>
+  </background>
+  <description>
+    <p>Fossil does not properly validate SSH sync protocol URLs.</p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker, by enticing a user to open a specially crafted URL,
+      could possibly execute arbitrary commands with the privileges of the user
+      running the application.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Fossil users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=dev-vcs/fossil-2.4"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2017-17459">CVE-2017-17459</uri>
+  </references>
+  <metadata tag="requester" timestamp="2018-01-22T21:39:18Z">b-man</metadata>
+  <metadata tag="submitter" timestamp="2018-01-27T17:00:59Z">b-man</metadata>
+</glsa>
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 3e5d4982e927..d12dcf7f326f 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 26 Jan 2018 14:38:27 +0000
+Sat, 27 Jan 2018 17:08:28 +0000
diff --git a/metadata/glsa/timestamp.commit b/metadata/glsa/timestamp.commit
index 473792849815..70bcad55b1d5 100644
--- a/metadata/glsa/timestamp.commit
+++ b/metadata/glsa/timestamp.commit
@@ -1 +1 @@
-1f7488673c3108de82dfc31b7c1132230e991834 1516196748 2018-01-17T13:45:48+00:00
+d8a17c05c216f757bca7ba612006419934a11158 1517072516 2018-01-27T17:01:56+00:00
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index edf187c0bcad..880e8949086a 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index be6d7afd76dc..d6974868b273 100644
--- a/metadata/md5-cache/app-accessibility/Manifest.gz
+++ b/metadata/md5-cache/app-accessibility/Manifest.gz
diff --git a/metadata/md5-cache/app-accessibility/at-spi2-atk-2.24.1 b/metadata/md5-cache/app-accessibility/at-spi2-atk-2.24.1
index 9c4df0ee6c3a..8669a3f35d18 100644
--- a/metadata/md5-cache/app-accessibility/at-spi2-atk-2.24.1
+++ b/metadata/md5-cache/app-accessibility/at-spi2-atk-2.24.1
@@ -4,10 +4,10 @@ DESCRIPTION=Gtk module for bridging AT-SPI to Atk
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Accessibility
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=LGPL-2+
 RDEPEND=>=app-accessibility/at-spi2-core-2.17.90[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/atk-2.15.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.32:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/dbus-1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<gnome-extra/at-spi-1.32.0-r1
 SLOT=2
 SRC_URI=mirror://gnome/sources/at-spi2-atk/2.24/at-spi2-atk-2.24.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=eb5d96c34f7f1746f5c0f5cb5e05f779
+_md5_=21caf1210d6fe138f1f0ad8c127f0143
diff --git a/metadata/md5-cache/app-accessibility/at-spi2-core-2.24.1 b/metadata/md5-cache/app-accessibility/at-spi2-core-2.24.1
index 75e4aa23594e..e77c08b5b197 100644
--- a/metadata/md5-cache/app-accessibility/at-spi2-core-2.24.1
+++ b/metadata/md5-cache/app-accessibility/at-spi2-core-2.24.1
@@ -4,10 +4,10 @@ DESCRIPTION=D-Bus accessibility specifications and registration daemon
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Accessibility
 IUSE=X +introspection abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.36:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/dbus-1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libSM[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXtst[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXtst[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=2
 SRC_URI=mirror://gnome/sources/at-spi2-core/2.24/at-spi2-core-2.24.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=258ee74c26ec0e516d3d046847fecfa5
+_md5_=47cfff1f85cfd874f9830d3777b35535
diff --git a/metadata/md5-cache/app-accessibility/orca-3.22.2 b/metadata/md5-cache/app-accessibility/orca-3.22.2
deleted file mode 100644
index 6d1fa66ceba3..000000000000
--- a/metadata/md5-cache/app-accessibility/orca-3.22.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=python_targets_python3_4? ( dev-lang/python:3.4[threads] ) python_targets_python3_5? ( dev-lang/python:3.5[threads] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=app-accessibility/at-spi2-atk-2.12:2 >=app-accessibility/at-spi2-core-2.12:2[introspection] >=dev-libs/atk-2.10 >=dev-libs/glib-2.28:2 dev-python/gst-python:1.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pygobject-3.10:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] media-libs/gstreamer:1.0[introspection] >=x11-libs/gtk+-3.6.2:3[introspection] braille? ( >=app-accessibility/brltty-5.0-r3[python,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-libs/liblouis[python,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=dev-util/intltool-0.50 dev-util/itstool virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Extensible screen reader that provides access to the desktop
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/Orca
-IUSE=+braille python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
-LICENSE=LGPL-2.1+ CC-BY-SA-3.0
-RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4[threads] ) python_targets_python3_5? ( dev-lang/python:3.5[threads] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=app-accessibility/at-spi2-atk-2.12:2 >=app-accessibility/at-spi2-core-2.12:2[introspection] >=dev-libs/atk-2.10 >=dev-libs/glib-2.28:2 dev-python/gst-python:1.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pygobject-3.10:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] media-libs/gstreamer:1.0[introspection] >=x11-libs/gtk+-3.6.2:3[introspection] braille? ( >=app-accessibility/brltty-5.0-r3[python,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-libs/liblouis[python,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=app-accessibility/speech-dispatcher-0.8[python,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-libs/atk[introspection] dev-python/pyatspi[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setproctitle[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] x11-libs/libwnck:3[introspection] x11-libs/pango[introspection]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/orca/3.22/orca-3.22.2.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1b05057f85b9861d4c3e209803245e87
diff --git a/metadata/md5-cache/app-accessibility/orca-3.24.0 b/metadata/md5-cache/app-accessibility/orca-3.24.0
index 09b318761740..6b1f8cd7c350 100644
--- a/metadata/md5-cache/app-accessibility/orca-3.24.0
+++ b/metadata/md5-cache/app-accessibility/orca-3.24.0
@@ -4,11 +4,11 @@ DESCRIPTION=Extensible screen reader that provides access to the desktop
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Orca
 IUSE=+braille python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=LGPL-2.1+ CC-BY-SA-3.0
 RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4[threads] ) python_targets_python3_5? ( dev-lang/python:3.5[threads] ) python_targets_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-accessibility/at-spi2-atk-2.12:2 >=app-accessibility/at-spi2-core-2.12:2[introspection] >=dev-libs/atk-2.10 >=dev-libs/glib-2.28:2 dev-python/gst-python:1.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygobject-3.10:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-libs/gstreamer:1.0[introspection] >=x11-libs/gtk+-3.6.2:3[introspection] braille? ( >=app-accessibility/brltty-5.0-r3[python,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/liblouis[python,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=app-accessibility/speech-dispatcher-0.8[python,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/atk[introspection] dev-python/pyatspi[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setproctitle[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-libs/libwnck:3[introspection] x11-libs/pango[introspection]
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/orca/3.24/orca-3.24.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f2c8e17a364bb65a8784babf602ea9ff
+_md5_=24ba3439a538a6f001f290d0e64424ad
diff --git a/metadata/md5-cache/app-accessibility/speech-dispatcher-0.8.7 b/metadata/md5-cache/app-accessibility/speech-dispatcher-0.8.7
index 92c3b136fc9b..1eaf48bb737a 100644
--- a/metadata/md5-cache/app-accessibility/speech-dispatcher-0.8.7
+++ b/metadata/md5-cache/app-accessibility/speech-dispatcher-0.8.7
@@ -4,11 +4,11 @@ DESCRIPTION=Speech synthesis interface
 EAPI=6
 HOMEPAGE=http://www.freebsoft.org/speechd
 IUSE=alsa ao +espeak flite nas pulseaudio python static-libs python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=python? ( python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-libs/dotconf-1.3 >=dev-libs/glib-2.28:2 dev-libs/libltdl:0 >=media-libs/libsndfile-1.0.2 alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) espeak? ( app-accessibility/espeak ) flite? ( app-accessibility/flite ) nas? ( media-libs/nas ) pulseaudio? ( media-sound/pulseaudio ) dev-python/pyxdg
 REQUIRED_USE=python? ( || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=http://www.freebsoft.org/pub/projects/speechd/speech-dispatcher-0.8.7.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=fa95fc2f261d8342f62313202a3b430b
+_md5_=578c7cb1121f8a0df957b7426cd38fa8
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 4cca8be8c9f6..82cd65cc1b6b 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/checksec-1.7.3 b/metadata/md5-cache/app-admin/checksec-1.7.3
deleted file mode 100644
index 9d7f43942a75..000000000000
--- a/metadata/md5-cache/app-admin/checksec-1.7.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)
-EAPI=5
-HOMEPAGE=https://github.com/slimm609/checksec.sh
-KEYWORDS=~amd64 ~mips ~ppc ~ppc64 ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/slimm609/checksec.sh/archive/1.7.3.tar.gz -> checksec-1.7.3.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=68fbbe84264531f1fd5493f02eb3415c
diff --git a/metadata/md5-cache/app-admin/checksec-1.7.4 b/metadata/md5-cache/app-admin/checksec-1.7.4
deleted file mode 100644
index ac60ba0af938..000000000000
--- a/metadata/md5-cache/app-admin/checksec-1.7.4
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)
-EAPI=5
-HOMEPAGE=https://github.com/slimm609/checksec.sh
-KEYWORDS=~amd64 ~mips ~ppc ~ppc64 ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/slimm609/checksec.sh/archive/1.7.4.tar.gz -> checksec-1.7.4.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=e07b9e69a06a714b0a191f0bf1a03fd4
diff --git a/metadata/md5-cache/app-admin/checksec-1.7.2 b/metadata/md5-cache/app-admin/checksec-1.8.0
index 79fdfa8cd5c6..a5399688603c 100644
--- a/metadata/md5-cache/app-admin/checksec-1.7.2
+++ b/metadata/md5-cache/app-admin/checksec-1.8.0
@@ -5,6 +5,6 @@ HOMEPAGE=https://github.com/slimm609/checksec.sh
 KEYWORDS=~amd64 ~mips ~ppc ~ppc64 ~x86
 LICENSE=BSD
 SLOT=0
-SRC_URI=https://github.com/slimm609/checksec.sh/archive/1.7.2.tar.gz -> checksec-1.7.2.tar.gz
+SRC_URI=https://github.com/slimm609/checksec.sh/archive/1.8.0.tar.gz -> checksec-1.8.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f1cee480c7a1a23c7b382e0d6a2802ee
+_md5_=4b079701dd0c323eec55a37a210ae88b
diff --git a/metadata/md5-cache/app-admin/conky-1.10.7-r1 b/metadata/md5-cache/app-admin/conky-1.10.7-r1
new file mode 100644
index 000000000000..61be8054cb03
--- /dev/null
+++ b/metadata/md5-cache/app-admin/conky-1.10.7-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=X? ( imlib? ( media-libs/imlib2[X] ) lua-cairo? ( >=dev-lua/toluapp-1.0.93 x11-libs/cairo[X] ) lua-imlib? ( >=dev-lua/toluapp-1.0.93 media-libs/imlib2[X] ) lua-rsvg? ( >=dev-lua/toluapp-1.0.93 gnome-base/librsvg ) nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) x11-libs/libX11 x11-libs/libXdamage x11-libs/libXinerama x11-libs/libXfixes x11-libs/libXext audacious? ( >=media-sound/audacious-1.5 dev-libs/glib:2 ) xmms2? ( media-sound/xmms2 ) ) cmus? ( media-sound/cmus ) curl? ( net-misc/curl ) eve? ( net-misc/curl dev-libs/libxml2 ) ical? ( dev-libs/libical ) iconv? ( virtual/libiconv ) irc? ( net-libs/libircclient ) mysql? ( >=virtual/mysql-5.0 ) ncurses? ( sys-libs/ncurses:= ) pulseaudio? ( media-sound/pulseaudio ) rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) systemd? ( sys-apps/systemd ) wifi? ( net-wireless/wireless-tools ) weather-metar? ( net-misc/curl ) weather-xoap? ( dev-libs/libxml2 net-misc/curl ) webserver? ( net-libs/libmicrohttpd ) >=dev-lang/lua-5.1.4-r8:0 app-text/docbook2X sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=An advanced, highly configurable system monitor for X
+EAPI=6
+HOMEPAGE=https://github.com/brndnmtthws/conky
+IUSE=apcupsd audacious cmus curl eve hddtemp ical iconv imlib iostats ipv6 irc lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax ncurses nvidia +portmon pulseaudio rss systemd thinkpad truetype vim-syntax weather-metar weather-xoap webserver wifi X xmms2
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3 BSD LGPL-2.1 MIT
+RDEPEND=X? ( imlib? ( media-libs/imlib2[X] ) lua-cairo? ( >=dev-lua/toluapp-1.0.93 x11-libs/cairo[X] ) lua-imlib? ( >=dev-lua/toluapp-1.0.93 media-libs/imlib2[X] ) lua-rsvg? ( >=dev-lua/toluapp-1.0.93 gnome-base/librsvg ) nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) x11-libs/libX11 x11-libs/libXdamage x11-libs/libXinerama x11-libs/libXfixes x11-libs/libXext audacious? ( >=media-sound/audacious-1.5 dev-libs/glib:2 ) xmms2? ( media-sound/xmms2 ) ) cmus? ( media-sound/cmus ) curl? ( net-misc/curl ) eve? ( net-misc/curl dev-libs/libxml2 ) ical? ( dev-libs/libical ) iconv? ( virtual/libiconv ) irc? ( net-libs/libircclient ) mysql? ( >=virtual/mysql-5.0 ) ncurses? ( sys-libs/ncurses:= ) pulseaudio? ( media-sound/pulseaudio ) rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) systemd? ( sys-apps/systemd ) wifi? ( net-wireless/wireless-tools ) weather-metar? ( net-misc/curl ) weather-xoap? ( dev-libs/libxml2 net-misc/curl ) webserver? ( net-libs/libmicrohttpd ) >=dev-lang/lua-5.1.4-r8:0 apcupsd? ( sys-power/apcupsd ) hddtemp? ( app-admin/hddtemp ) moc? ( media-sound/moc ) nano-syntax? ( app-editors/nano ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+SLOT=0
+SRC_URI=https://github.com/brndnmtthws/conky/archive/v1.10.7.tar.gz -> conky-1.10.7.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a8383ddf6320098d541c642afd6a4aec
diff --git a/metadata/md5-cache/app-admin/filebeat-6.1.1 b/metadata/md5-cache/app-admin/filebeat-6.1.1
new file mode 100644
index 000000000000..c1a517b4fdae
--- /dev/null
+++ b/metadata/md5-cache/app-admin/filebeat-6.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=>=dev-lang/go-1.9.2
+DESCRIPTION=Lightweight log shipper for Logstash and Elasticsearch
+EAPI=6
+HOMEPAGE=https://www.elastic.co/products/beats
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=!app-admin/filebeat-bin
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/elastic/beats/archive/v6.1.1.tar.gz -> filebeat-6.1.1.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=9f13e8fd14dad9d4da6d7a020cd52ef5
diff --git a/metadata/md5-cache/app-admin/mongo-tools-3.4.10 b/metadata/md5-cache/app-admin/mongo-tools-3.4.10
index 94580df5c13a..2933f2c11e87 100644
--- a/metadata/md5-cache/app-admin/mongo-tools-3.4.10
+++ b/metadata/md5-cache/app-admin/mongo-tools-3.4.10
@@ -4,10 +4,10 @@ DESCRIPTION=A high-performance, open source, schema-free document-oriented datab
 EAPI=6
 HOMEPAGE=https://www.mongodb.org
 IUSE=sasl ssl
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=!<dev-db/mongodb-3.0.0
 SLOT=0
 SRC_URI=https://github.com/mongodb/mongo-tools/archive/r3.4.10.tar.gz -> mongo-tools-3.4.10.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=20d24c76240262eb07bbecf70aa864da
+_md5_=383ab11da03e4e878d2336223f98f5b3
diff --git a/metadata/md5-cache/app-admin/packagekit-base-1.1.7 b/metadata/md5-cache/app-admin/packagekit-base-1.1.7
index 61f1e17b0025..60a683769df7 100644
--- a/metadata/md5-cache/app-admin/packagekit-base-1.1.7
+++ b/metadata/md5-cache/app-admin/packagekit-base-1.1.7
@@ -4,11 +4,11 @@ DESCRIPTION=Manage packages in a secure way using a cross-distro and cross-archi
 EAPI=6
 HOMEPAGE=http://www.packagekit.org/
 IUSE=cron command-not-found elogind +introspection entropy systemd test vala python_targets_python2_7
-KEYWORDS=~alpha amd64 ~arm ~mips ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha amd64 ~arm ~mips ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=app-shells/bash-completion-2 dev-db/sqlite:3 >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.46.0:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=sys-auth/polkit-0.98 >=sys-apps/dbus-1.3.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] elogind? ( >=sys-auth/elogind-229.4 ) introspection? ( >=dev-libs/gobject-introspection-0.9.9:= ) systemd? ( >=sys-apps/systemd-204 ) >=app-portage/layman-2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=sys-apps/portage-2.2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] entropy? ( >=sys-apps/entropy-234[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) !systemd? ( !elogind? ( sys-auth/consolekit ) )
 REQUIRED_USE=python_targets_python2_7 ?? ( elogind systemd ) vala? ( introspection )
 SLOT=0/18
 SRC_URI=https://www.freedesktop.org/software/PackageKit/releases/PackageKit-1.1.7.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=58006bf782d677f79f77d671500f5e0f
+_md5_=bd67d6671aac8c3bee233fb6925c3325
diff --git a/metadata/md5-cache/app-admin/su-exec-0.2 b/metadata/md5-cache/app-admin/su-exec-0.2
new file mode 100644
index 000000000000..d0b9c3605e39
--- /dev/null
+++ b/metadata/md5-cache/app-admin/su-exec-0.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=Switch user and group id and exec
+EAPI=6
+HOMEPAGE=https://github.com/ncopa/su-exec
+KEYWORDS=~amd64
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://github.com/ncopa/su-exec/archive/v0.2.tar.gz -> su-exec-0.2.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=5c30d274085f8931487175db1e47fe99
diff --git a/metadata/md5-cache/app-admin/sudo-1.8.20_p2 b/metadata/md5-cache/app-admin/sudo-1.8.20_p2
index 10d5aeab783f..9974f17158b9 100644
--- a/metadata/md5-cache/app-admin/sudo-1.8.20_p2
+++ b/metadata/md5-cache/app-admin/sudo-1.8.20_p2
@@ -2,13 +2,13 @@ DEFINED_PHASES=configure install postinst prepare
 DEPEND=gcrypt? ( dev-libs/libgcrypt:= ) openssl? ( dev-libs/openssl:0= ) pam? ( virtual/pam ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) sys-libs/zlib sys-devel/bison >=app-portage/elt-patches-20170422
 DESCRIPTION=Allows users or groups to run commands as other users
 EAPI=6
-HOMEPAGE=http://www.sudo.ws/
+HOMEPAGE=https://www.sudo.ws/
 IUSE=gcrypt ldap nls pam offensive openssl selinux skey +sendmail
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris
 LICENSE=ISC BSD
 RDEPEND=gcrypt? ( dev-libs/libgcrypt:= ) openssl? ( dev-libs/openssl:0= ) pam? ( virtual/pam ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) sys-libs/zlib selinux? ( sec-policy/selinux-sudo ) ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) >=app-misc/editor-wrapper-3 virtual/editor sendmail? ( virtual/mta )
 REQUIRED_USE=pam? ( !skey ) skey? ( !pam ) ?? ( gcrypt openssl )
 SLOT=0
-SRC_URI=http://www.sudo.ws/sudo/dist/sudo-1.8.20p2.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.8.20p2.tar.gz
+SRC_URI=https://www.sudo.ws/sudo/dist/sudo-1.8.20p2.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.8.20p2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=d8d807e52c44b7122bdb1075c3228704
+_md5_=d91e1599c004b7803d45dff946db83e8
diff --git a/metadata/md5-cache/app-admin/sudo-1.8.21_p2 b/metadata/md5-cache/app-admin/sudo-1.8.21_p2
index 2e36b5282f9b..c78269733297 100644
--- a/metadata/md5-cache/app-admin/sudo-1.8.21_p2
+++ b/metadata/md5-cache/app-admin/sudo-1.8.21_p2
@@ -2,13 +2,13 @@ DEFINED_PHASES=configure install postinst prepare
 DEPEND=gcrypt? ( dev-libs/libgcrypt:= ) openssl? ( dev-libs/openssl:0= ) pam? ( virtual/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) sys-libs/zlib sys-devel/bison >=app-portage/elt-patches-20170422
 DESCRIPTION=Allows users or groups to run commands as other users
 EAPI=6
-HOMEPAGE=http://www.sudo.ws/
+HOMEPAGE=https://www.sudo.ws/
 IUSE=gcrypt ldap nls pam offensive openssl sasl selinux +sendmail skey
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris
 LICENSE=ISC BSD
 RDEPEND=gcrypt? ( dev-libs/libgcrypt:= ) openssl? ( dev-libs/openssl:0= ) pam? ( virtual/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) sys-libs/zlib selinux? ( sec-policy/selinux-sudo ) ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) >=app-misc/editor-wrapper-3 virtual/editor sendmail? ( virtual/mta )
 REQUIRED_USE=pam? ( !skey ) skey? ( !pam ) ?? ( gcrypt openssl )
 SLOT=0
-SRC_URI=http://www.sudo.ws/sudo/dist/sudo-1.8.21p2.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.8.21p2.tar.gz
+SRC_URI=https://www.sudo.ws/sudo/dist/sudo-1.8.21p2.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.8.21p2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=95706be16960118536c4fe6e411bce25
+_md5_=e841e61b9b310386dac59a3a1c78b713
diff --git a/metadata/md5-cache/app-admin/sudo-1.8.22 b/metadata/md5-cache/app-admin/sudo-1.8.22
index f1dcf9a90d6f..0aed75016f89 100644
--- a/metadata/md5-cache/app-admin/sudo-1.8.22
+++ b/metadata/md5-cache/app-admin/sudo-1.8.22
@@ -2,13 +2,13 @@ DEFINED_PHASES=configure install postinst prepare
 DEPEND=gcrypt? ( dev-libs/libgcrypt:= ) openssl? ( dev-libs/openssl:0= ) pam? ( virtual/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) sys-libs/zlib sys-devel/bison >=app-portage/elt-patches-20170422
 DESCRIPTION=Allows users or groups to run commands as other users
 EAPI=6
-HOMEPAGE=http://www.sudo.ws/
+HOMEPAGE=https://www.sudo.ws/
 IUSE=gcrypt ldap nls pam offensive openssl sasl selinux +sendmail skey
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris
 LICENSE=ISC BSD
 RDEPEND=gcrypt? ( dev-libs/libgcrypt:= ) openssl? ( dev-libs/openssl:0= ) pam? ( virtual/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) sys-libs/zlib selinux? ( sec-policy/selinux-sudo ) ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) >=app-misc/editor-wrapper-3 virtual/editor sendmail? ( virtual/mta )
 REQUIRED_USE=pam? ( !skey ) skey? ( !pam ) ?? ( gcrypt openssl )
 SLOT=0
-SRC_URI=http://www.sudo.ws/sudo/dist/sudo-1.8.22.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.8.22.tar.gz
+SRC_URI=https://www.sudo.ws/sudo/dist/sudo-1.8.22.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.8.22.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=95706be16960118536c4fe6e411bce25
+_md5_=e841e61b9b310386dac59a3a1c78b713
diff --git a/metadata/md5-cache/app-admin/sudo-9999 b/metadata/md5-cache/app-admin/sudo-9999
index c1cd56db586f..e5478663a991 100644
--- a/metadata/md5-cache/app-admin/sudo-9999
+++ b/metadata/md5-cache/app-admin/sudo-9999
@@ -2,11 +2,11 @@ DEFINED_PHASES=configure install postinst prepare unpack
 DEPEND=sys-libs/zlib ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) gcrypt? ( dev-libs/libgcrypt:= ) openssl? ( dev-libs/openssl:0= ) pam? ( virtual/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) sys-devel/bison >=app-portage/elt-patches-20170422 dev-vcs/mercurial
 DESCRIPTION=Allows users or groups to run commands as other users
 EAPI=6
-HOMEPAGE=http://www.sudo.ws/
+HOMEPAGE=https://www.sudo.ws/
 IUSE=gcrypt ldap nls openssl offensive pam sasl selinux +sendmail skey
 LICENSE=ISC BSD
 RDEPEND=sys-libs/zlib ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) gcrypt? ( dev-libs/libgcrypt:= ) openssl? ( dev-libs/openssl:0= ) pam? ( virtual/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) >=app-misc/editor-wrapper-3 virtual/editor ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) selinux? ( sec-policy/selinux-sudo ) sendmail? ( virtual/mta )
 REQUIRED_USE=pam? ( !skey ) skey? ( !pam ) ?? ( gcrypt openssl )
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mercurial	0bdc9ce12272665fa3749c8408b4d389	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=6d452c9ea7cdbae70447dc007abeb922
+_md5_=57097c51bcf8983ec437a1be8ade64d1
diff --git a/metadata/md5-cache/app-admin/tenshi-0.17 b/metadata/md5-cache/app-admin/tenshi-0.17
index 81715033e2e3..0dce6cd1813a 100644
--- a/metadata/md5-cache/app-admin/tenshi-0.17
+++ b/metadata/md5-cache/app-admin/tenshi-0.17
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst prepare setup
 DESCRIPTION=Log parsing and notification program
 EAPI=6
 HOMEPAGE=http://dev.inversepath.com/trac/tenshi
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=ISC
 RDEPEND=dev-lang/perl dev-perl/IO-BufferedSelect sys-apps/coreutils
 SLOT=0
 SRC_URI=https://github.com/inversepath/tenshi/archive/0.17.tar.gz -> tenshi-0.17.tar.gz
 _eclasses_=user	8bc2845510e2109af75e3eeac607ec81
-_md5_=df8e6b46f189af38e52d94139debb7f7
+_md5_=ac96c459e2a26d905e5114f11e89da9b
diff --git a/metadata/md5-cache/app-antivirus/Manifest.gz b/metadata/md5-cache/app-antivirus/Manifest.gz
index 1eb1094052d4..cd026292ad70 100644
--- a/metadata/md5-cache/app-antivirus/Manifest.gz
+++ b/metadata/md5-cache/app-antivirus/Manifest.gz
diff --git a/metadata/md5-cache/app-antivirus/clamav-0.99.3-r1 b/metadata/md5-cache/app-antivirus/clamav-0.99.3-r1
new file mode 100644
index 000000000000..cc0c53b6d815
--- /dev/null
+++ b/metadata/md5-cache/app-antivirus/clamav-0.99.3-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare setup test
+DEPEND=bzip2? ( app-arch/bzip2 ) clamdtop? ( sys-libs/ncurses:0 ) iconv? ( virtual/libiconv ) metadata-analysis-api? ( dev-libs/json-c:= ) milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) dev-libs/libtommath >=sys-libs/zlib-1.2.2:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-devel/libtool || ( dev-libs/libpcre2 >dev-libs/libpcre-6 ) !!<app-antivirus/clamav-0.99 virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=Clam Anti-Virus Scanner
+EAPI=6
+HOMEPAGE=http://www.clamav.net/
+IUSE=bzip2 clamdtop iconv ipv6 libressl milter metadata-analysis-api selinux static-libs uclibc
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=bzip2? ( app-arch/bzip2 ) clamdtop? ( sys-libs/ncurses:0 ) iconv? ( virtual/libiconv ) metadata-analysis-api? ( dev-libs/json-c:= ) milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) dev-libs/libtommath >=sys-libs/zlib-1.2.2:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-devel/libtool || ( dev-libs/libpcre2 >dev-libs/libpcre-6 ) !!<app-antivirus/clamav-0.99 selinux? ( sec-policy/selinux-clamav )
+SLOT=0
+SRC_URI=https://www.clamav.net/downloads/production/clamav-0.99.3.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=c35d3865e75a2dcca7e4e409639cbecc
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 1543ea80f087..086e8e7dd803 100644
--- a/metadata/md5-cache/app-arch/Manifest.gz
+++ b/metadata/md5-cache/app-arch/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/file-roller-3.22.3 b/metadata/md5-cache/app-arch/file-roller-3.22.3
deleted file mode 100644
index 982ea13a92c0..000000000000
--- a/metadata/md5-cache/app-arch/file-roller-3.22.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-arch/libarchive-3:= >=dev-libs/glib-2.36:2 >=dev-libs/json-glib-0.14 >=x11-libs/gtk+-3.13.2:3 sys-apps/file x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/pango libnotify? ( >=x11-libs/libnotify-0.4.3:= ) packagekit? ( app-admin/packagekit-base ) >=dev-util/intltool-0.50.1 dev-util/itstool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Archive manager for GNOME
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/FileRoller
-IUSE=libnotify packagekit
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2+ CC-BY-SA-3.0
-RDEPEND=>=app-arch/libarchive-3:= >=dev-libs/glib-2.36:2 >=dev-libs/json-glib-0.14 >=x11-libs/gtk+-3.13.2:3 sys-apps/file x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/pango libnotify? ( >=x11-libs/libnotify-0.4.3:= ) packagekit? ( app-admin/packagekit-base )
-SLOT=0
-SRC_URI=mirror://gnome/sources/file-roller/3.22/file-roller-3.22.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4e1ef1189f4079397b0e76b5c9e4c959
diff --git a/metadata/md5-cache/app-arch/file-roller-3.24.1 b/metadata/md5-cache/app-arch/file-roller-3.24.1
index acf6846924af..919bf2a610f6 100644
--- a/metadata/md5-cache/app-arch/file-roller-3.24.1
+++ b/metadata/md5-cache/app-arch/file-roller-3.24.1
@@ -4,10 +4,10 @@ DESCRIPTION=Archive manager for GNOME
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/FileRoller
 IUSE=libnotify nautilus packagekit
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2+ CC-BY-SA-3.0
 RDEPEND=>=app-arch/libarchive-3:= >=dev-libs/glib-2.36:2 >=dev-libs/json-glib-0.14 >=x11-libs/gtk+-3.13.2:3 sys-apps/file x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/pango libnotify? ( >=x11-libs/libnotify-0.4.3:= ) nautilus? ( >=gnome-base/nautilus-2.22.2 ) packagekit? ( app-admin/packagekit-base )
 SLOT=0
 SRC_URI=mirror://gnome/sources/file-roller/3.24/file-roller-3.24.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=63a7f2901db616ab0cff550e28935d61
+_md5_=189a5f28fb81631c75e7f31ab98bca7c
diff --git a/metadata/md5-cache/app-arch/xz-utils-5.2.2 b/metadata/md5-cache/app-arch/xz-utils-5.2.2
index ab2e1dff18cf..2452857ad49b 100644
--- a/metadata/md5-cache/app-arch/xz-utils-5.2.2
+++ b/metadata/md5-cache/app-arch/xz-utils-5.2.2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst preinst prepare test
 DEPEND=!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57 >=app-portage/elt-patches-20170422
 DESCRIPTION=utils for managing LZMA compressed files
 EAPI=4
-HOMEPAGE=http://tukaani.org/xz/
+HOMEPAGE=https://tukaani.org/xz/
 IUSE=elibc_FreeBSD nls static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=public-domain LGPL-2.1+ GPL-2+
@@ -10,4 +10,4 @@ RDEPEND=!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57
 SLOT=0
 SRC_URI=https://tukaani.org/xz/xz-5.2.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=69c3b63c10ad8c69b8b3cb8e57929471
+_md5_=24091eb9abca4010aab26158be48395e
diff --git a/metadata/md5-cache/app-arch/xz-utils-5.2.3 b/metadata/md5-cache/app-arch/xz-utils-5.2.3
index 510b6069c1de..51a34a4068f1 100644
--- a/metadata/md5-cache/app-arch/xz-utils-5.2.3
+++ b/metadata/md5-cache/app-arch/xz-utils-5.2.3
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst preinst prepare test
 DEPEND=!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57 >=app-portage/elt-patches-20170422
 DESCRIPTION=utils for managing LZMA compressed files
 EAPI=5
-HOMEPAGE=http://tukaani.org/xz/
+HOMEPAGE=https://tukaani.org/xz/
 IUSE=elibc_FreeBSD +extra-filters nls static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=public-domain LGPL-2.1+ GPL-2+
@@ -11,4 +11,4 @@ RESTRICT=!extra-filters? ( test )
 SLOT=0
 SRC_URI=https://tukaani.org/xz/xz-5.2.3.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=90b03626c856f0fc7befa6fa856f1686
+_md5_=943323717efae7f1cf7aa85a22d1c335
diff --git a/metadata/md5-cache/app-arch/xz-utils-9999 b/metadata/md5-cache/app-arch/xz-utils-9999
index 2b41f86a83d9..420c143385a8 100644
--- a/metadata/md5-cache/app-arch/xz-utils-9999
+++ b/metadata/md5-cache/app-arch/xz-utils-9999
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install postinst preinst prepare test unpack
 DEPEND=!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57 sys-devel/gettext dev-vcs/cvs >=sys-devel/libtool-2 >=app-portage/elt-patches-20170422 >=dev-vcs/git-1.8.2.1 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=utils for managing LZMA compressed files
 EAPI=5
-HOMEPAGE=http://tukaani.org/xz/
+HOMEPAGE=https://tukaani.org/xz/
 IUSE=elibc_FreeBSD +extra-filters nls static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 LICENSE=public-domain LGPL-2.1+ GPL-2+
 RDEPEND=!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57
 RESTRICT=!extra-filters? ( test )
 SLOT=0
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=27671b11f66e6595d80a5562f018a1d7
+_md5_=261863b2dad19bc2350d6e547b406411
diff --git a/metadata/md5-cache/app-benchmarks/Manifest.gz b/metadata/md5-cache/app-benchmarks/Manifest.gz
index 690d2df9ae7e..4090d42323ce 100644
--- a/metadata/md5-cache/app-benchmarks/Manifest.gz
+++ b/metadata/md5-cache/app-benchmarks/Manifest.gz
diff --git a/metadata/md5-cache/app-benchmarks/sysbench-1.0.12 b/metadata/md5-cache/app-benchmarks/sysbench-1.0.12
new file mode 100644
index 000000000000..cf461f2f0273
--- /dev/null
+++ b/metadata/md5-cache/app-benchmarks/sysbench-1.0.12
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare test
+DEPEND=aio? ( dev-libs/libaio ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= ) dev-lang/luajit:= dev-libs/concurrencykit dev-libs/libxslt sys-devel/libtool:= virtual/pkgconfig test? ( dev-util/cram ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=System performance benchmark
+EAPI=6
+HOMEPAGE=https://github.com/akopytov/sysbench
+IUSE=aio mysql postgres test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=aio? ( dev-libs/libaio ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= )
+SLOT=0
+SRC_URI=https://github.com/akopytov/sysbench/archive/1.0.12.tar.gz -> sysbench-1.0.12.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=04d5d8455c9b0d5f9979f56c705a3481
diff --git a/metadata/md5-cache/app-cdr/Manifest.gz b/metadata/md5-cache/app-cdr/Manifest.gz
index 9bf8cd20aa00..1b33be8b2f2c 100644
--- a/metadata/md5-cache/app-cdr/Manifest.gz
+++ b/metadata/md5-cache/app-cdr/Manifest.gz
diff --git a/metadata/md5-cache/app-cdr/brasero-3.12.2 b/metadata/md5-cache/app-cdr/brasero-3.12.2
deleted file mode 100644
index 1552723bd097..000000000000
--- a/metadata/md5-cache/app-cdr/brasero-3.12.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.29.14:2 >=x11-libs/gtk+-3:3[introspection?] media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=dev-libs/libxml2-2.6:2 >=x11-libs/libnotify-0.6.1:= media-libs/libcanberra[gtk3] x11-libs/libICE x11-libs/libSM introspection? ( >=dev-libs/gobject-introspection-1.30:= ) libburn? ( >=dev-libs/libburn-0.4:= >=dev-libs/libisofs-0.6.4:= ) nautilus? ( >=gnome-base/nautilus-2.91.90 ) playlist? ( >=dev-libs/totem-pl-parser-2.29.1:= ) tracker? ( >=app-misc/tracker-1:0= ) >=dev-util/intltool-0.50 dev-util/itstool >=dev-util/gtk-doc-am-1.12 sys-devel/gettext virtual/pkgconfig test? ( app-text/docbook-xml-dtd:4.3 ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=CD/DVD burning application for the GNOME desktop
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Brasero
-IUSE=+css +introspection +libburn mp3 nautilus packagekit playlist test tracker
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2+ CC-BY-SA-3.0
-PDEPEND=gnome-base/gvfs
-RDEPEND=>=dev-libs/glib-2.29.14:2 >=x11-libs/gtk+-3:3[introspection?] media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=dev-libs/libxml2-2.6:2 >=x11-libs/libnotify-0.6.1:= media-libs/libcanberra[gtk3] x11-libs/libICE x11-libs/libSM introspection? ( >=dev-libs/gobject-introspection-1.30:= ) libburn? ( >=dev-libs/libburn-0.4:= >=dev-libs/libisofs-0.6.4:= ) nautilus? ( >=gnome-base/nautilus-2.91.90 ) playlist? ( >=dev-libs/totem-pl-parser-2.29.1:= ) tracker? ( >=app-misc/tracker-1:0= ) media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-meta:1.0 x11-themes/hicolor-icon-theme css? ( media-libs/libdvdcss:1.2 ) !libburn? ( app-cdr/cdrdao app-cdr/dvd+rw-tools virtual/cdrtools ) mp3? ( media-libs/gst-plugins-ugly:1.0 media-plugins/gst-plugins-mad:1.0 ) packagekit? ( app-admin/packagekit-base )
-SLOT=0/3.1
-SRC_URI=mirror://gnome/sources/brasero/3.12/brasero-3.12.2.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1ea584e06343e6b36cdba327821bb175
diff --git a/metadata/md5-cache/app-cdr/brasero-3.12.2-r1 b/metadata/md5-cache/app-cdr/brasero-3.12.2-r1
index 75c1d671f784..9dcbf5a6a661 100644
--- a/metadata/md5-cache/app-cdr/brasero-3.12.2-r1
+++ b/metadata/md5-cache/app-cdr/brasero-3.12.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=CD/DVD burning application for the GNOME desktop
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Brasero
 IUSE=+css +introspection +libburn mp3 nautilus packagekit playlist test tracker
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+ CC-BY-SA-3.0
 PDEPEND=gnome-base/gvfs
 RDEPEND=>=dev-libs/glib-2.29.14:2 >=x11-libs/gtk+-3:3[introspection?] media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=dev-libs/libxml2-2.6:2 >=x11-libs/libnotify-0.6.1:= media-libs/libcanberra[gtk3] x11-libs/libICE x11-libs/libSM introspection? ( >=dev-libs/gobject-introspection-1.30:= ) libburn? ( >=dev-libs/libburn-0.4:= >=dev-libs/libisofs-0.6.4:= ) nautilus? ( >=gnome-base/nautilus-2.91.90 ) playlist? ( >=dev-libs/totem-pl-parser-2.29.1:= ) tracker? ( >=app-misc/tracker-1:0= ) media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-meta:1.0[mp3?] x11-themes/hicolor-icon-theme css? ( media-libs/libdvdcss:1.2 ) !libburn? ( app-cdr/cdrdao app-cdr/dvd+rw-tools virtual/cdrtools ) packagekit? ( app-admin/packagekit-base )
 SLOT=0/3.1
 SRC_URI=mirror://gnome/sources/brasero/3.12/brasero-3.12.2.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e28bb62eb80a4d287b5c8afec7f4c666
+_md5_=ac72dc2cbe2270ecf0b6753950ca862c
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index e2bd73350065..e034ce26f0ae 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/mit-krb5-1.16 b/metadata/md5-cache/app-crypt/mit-krb5-1.16
new file mode 100644
index 000000000000..73966a4d5941
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/mit-krb5-1.16
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.42.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( >=dev-libs/libverto-0.2.5[libev,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libverto-0.2.5[libevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libverto-0.2.5[tevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) keyutils? ( >=sys-apps/keyutils-1.5.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkinit? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) xinetd? ( sys-apps/xinetd ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) virtual/yacc doc? ( virtual/latex-base ) test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/tcl:0 dev-util/dejagnu ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=MIT Kerberos V
+EAPI=6
+HOMEPAGE=https://web.mit.edu/kerberos/www/
+IUSE=doc +keyutils libressl nls openldap +pkinit selinux +threads test xinetd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )
+RDEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.42.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( >=dev-libs/libverto-0.2.5[libev,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libverto-0.2.5[libevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libverto-0.2.5[tevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) keyutils? ( >=sys-apps/keyutils-1.5.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkinit? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) xinetd? ( sys-apps/xinetd ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) selinux? ( sec-policy/selinux-kerberos )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://web.mit.edu/kerberos/dist/krb5/1.16/krb5-1.16.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=358e6f82c495646166586500f6f574fd
diff --git a/metadata/md5-cache/app-dicts/Manifest.gz b/metadata/md5-cache/app-dicts/Manifest.gz
index 86503ad2f319..60193c4c6662 100644
--- a/metadata/md5-cache/app-dicts/Manifest.gz
+++ b/metadata/md5-cache/app-dicts/Manifest.gz
diff --git a/metadata/md5-cache/app-dicts/gnome-dictionary-3.20.0 b/metadata/md5-cache/app-dicts/gnome-dictionary-3.20.0
deleted file mode 100644
index 467ac51fe441..000000000000
--- a/metadata/md5-cache/app-dicts/gnome-dictionary-3.20.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.39:2[dbus] x11-libs/cairo:= >=x11-libs/gtk+-3.20:3 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-1.42:= ) >=dev-util/gtk-doc-am-1.15 >=dev-util/intltool-0.40 dev-util/itstool >=sys-devel/gettext-0.17 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Dictionary utility for GNOME
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Dictionary
-IUSE=debug +introspection ipv6
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2+ LGPL-2.1+ FDL-1.1+
-RDEPEND=>=dev-libs/glib-2.39:2[dbus] x11-libs/cairo:= >=x11-libs/gtk+-3.20:3 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-1.42:= ) gnome-base/gsettings-desktop-schemas !<gnome-extra/gnome-utils-3.4
-SLOT=0/10
-SRC_URI=mirror://gnome/sources/gnome-dictionary/3.20/gnome-dictionary-3.20.0.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e5fa7f61edc318b0d25fdd10b768b6a6
diff --git a/metadata/md5-cache/app-dicts/gnome-dictionary-3.24.0 b/metadata/md5-cache/app-dicts/gnome-dictionary-3.24.0
deleted file mode 100644
index 2dce08a7ef7c..000000000000
--- a/metadata/md5-cache/app-dicts/gnome-dictionary-3.24.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.42:2[dbus] x11-libs/cairo:= >=x11-libs/gtk+-3.21.1:3 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-1.42:= ) >=dev-util/gtk-doc-am-1.15 >=dev-util/intltool-0.40 dev-util/itstool >=sys-devel/gettext-0.17 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Dictionary utility for GNOME
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Dictionary
-IUSE=debug +introspection ipv6
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2+ LGPL-2.1+ FDL-1.1+
-RDEPEND=>=dev-libs/glib-2.42:2[dbus] x11-libs/cairo:= >=x11-libs/gtk+-3.21.1:3 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-1.42:= ) gnome-base/gsettings-desktop-schemas !<gnome-extra/gnome-utils-3.4
-SLOT=0/10
-SRC_URI=mirror://gnome/sources/gnome-dictionary/3.24/gnome-dictionary-3.24.0.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0e3c1df71ebc690150f021435ddff9f2
diff --git a/metadata/md5-cache/app-dicts/gnome-dictionary-3.24.1 b/metadata/md5-cache/app-dicts/gnome-dictionary-3.24.1
index 72c9f2d95214..5a4726ddcd46 100644
--- a/metadata/md5-cache/app-dicts/gnome-dictionary-3.24.1
+++ b/metadata/md5-cache/app-dicts/gnome-dictionary-3.24.1
@@ -4,10 +4,10 @@ DESCRIPTION=Dictionary utility for GNOME
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Dictionary
 IUSE=debug +introspection ipv6
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2+ LGPL-2.1+ FDL-1.1+
 RDEPEND=>=dev-libs/glib-2.42:2[dbus] x11-libs/cairo:= >=x11-libs/gtk+-3.21.1:3 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-1.42:= ) gnome-base/gsettings-desktop-schemas !<gnome-extra/gnome-utils-3.4
 SLOT=0/10
 SRC_URI=mirror://gnome/sources/gnome-dictionary/3.24/gnome-dictionary-3.24.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=195f2791df630a0870be3cd6e919fef7
+_md5_=85a031dfce3bbd92255dc793a96bfd63
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index ee68a2efc5cc..a1e6d713aac4 100644
--- a/metadata/md5-cache/app-doc/Manifest.gz
+++ b/metadata/md5-cache/app-doc/Manifest.gz
diff --git a/metadata/md5-cache/app-doc/podbrowser-0.12-r3 b/metadata/md5-cache/app-doc/podbrowser-0.12-r3
deleted file mode 100644
index 04ea799ecb18..000000000000
--- a/metadata/md5-cache/app-doc/podbrowser-0.12-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-perl/gtk2-gladexml dev-perl/Gtk2 dev-perl/HTML-Parser dev-perl/Locale-gettext virtual/perl-Pod-Simple dev-perl/URI dev-perl/Gtk2-Ex-PodViewer dev-perl/Gtk2-Ex-PrintDialog dev-perl/Gtk2-Ex-Simple-List || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] ) >=x11-libs/gtk+-2.6.0:2 >=x11-themes/gnome-icon-theme-2.10.0 >=gnome-base/libglade-2:2.0 sys-devel/gettext
-DESCRIPTION=PodBrowser is a documentation browser for Perl
-EAPI=5
-HOMEPAGE=http://jodrell.net/projects/podbrowser
-KEYWORDS=amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-perl/gtk2-gladexml dev-perl/Gtk2 dev-perl/HTML-Parser dev-perl/Locale-gettext virtual/perl-Pod-Simple dev-perl/URI dev-perl/Gtk2-Ex-PodViewer dev-perl/Gtk2-Ex-PrintDialog dev-perl/Gtk2-Ex-Simple-List || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] ) >=x11-libs/gtk+-2.6.0:2 >=x11-themes/gnome-icon-theme-2.10.0 >=gnome-base/libglade-2:2.0
-SLOT=0
-SRC_URI=http://jodrell.net/files/podbrowser/podbrowser-0.12.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=445d5c9b1e85f5adfdd9d00f856e4be7
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index b855108217b2..ad7a3ca70aaf 100644
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/emacs-25.2-r1 b/metadata/md5-cache/app-editors/emacs-25.2-r1
deleted file mode 100644
index 16294da71de5..000000000000
--- a/metadata/md5-cache/app-editors/emacs-25.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] net-libs/liblockfile acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) hesiod? ( net-dns/hesiod ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( xwidgets? ( x11-libs/gtk+:3 net-libs/webkit-gtk:3= ) !xwidgets? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) ) ) ) ) virtual/pkgconfig gzip-el? ( app-arch/gzip ) pax_kernel? ( sys-apps/attr )
-DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/emacs/
-IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib
-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
-LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-RDEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] net-libs/liblockfile acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) hesiod? ( net-dns/hesiod ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( xwidgets? ( x11-libs/gtk+:3 net-libs/webkit-gtk:3= ) !xwidgets? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) ) ) ) ) !<app-editors/emacs-vcs-25.2
-REQUIRED_USE=?? ( aqua X )
-SLOT=25
-SRC_URI=mirror://gnu/emacs/emacs-25.2.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-25.2-patches-1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9373de29ff7f56f3e8e880bcd234ee35
diff --git a/metadata/md5-cache/app-editors/emacs-25.3 b/metadata/md5-cache/app-editors/emacs-25.3
index a1c9d141b99a..87ad4f100590 100644
--- a/metadata/md5-cache/app-editors/emacs-25.3
+++ b/metadata/md5-cache/app-editors/emacs-25.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] net-libs/liblockfile acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) hesiod? ( net-dns/hesiod ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( xwidgets? ( x11-libs/gtk+:3 net-libs/webkit-gtk:3= ) !xwidgets? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) ) ) ) ) virtual/pkgconfig gzip-el? ( app-arch/gzip ) pax_kernel? ( sys-apps/attr )
+DEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] net-libs/liblockfile acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) hesiod? ( net-dns/hesiod ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) ) ) ) ) virtual/pkgconfig gzip-el? ( app-arch/gzip ) pax_kernel? ( sys-apps/attr )
 DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/emacs/
-IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib
+IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib
 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
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-RDEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] net-libs/liblockfile acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) hesiod? ( net-dns/hesiod ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( xwidgets? ( x11-libs/gtk+:3 net-libs/webkit-gtk:3= ) !xwidgets? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) ) ) ) ) !<app-editors/emacs-vcs-25.3
+RDEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] net-libs/liblockfile acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) hesiod? ( net-dns/hesiod ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) ) ) ) ) !<app-editors/emacs-vcs-25.3
 REQUIRED_USE=?? ( aqua X )
 SLOT=25
 SRC_URI=mirror://gnu/emacs/emacs-25.3.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=2dc2f9306bff5361ee397ba9f32d2606
+_md5_=049c2d7e70aff72c1760fb0244fc63a4
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index bce9bd1e9b99..a7836a74e75c 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/lxd-2.18 b/metadata/md5-cache/app-emulation/lxd-2.18
deleted file mode 100644
index 38c29ebfe75c..000000000000
--- a/metadata/md5-cache/app-emulation/lxd-2.18
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup test unpack
-DEPEND=>=dev-lang/go-1.7.1 dev-libs/protobuf nls? ( sys-devel/gettext ) test? ( app-misc/jq dev-db/sqlite net-misc/curl sys-devel/gettext ) virtual/pkgconfig >=dev-lang/go-1.8
-DESCRIPTION=Fast, dense and secure container management
-EAPI=6
-HOMEPAGE=https://linuxcontainers.org/lxd/introduction/
-IUSE=+daemon +ipv6 +dnsmasq nls test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=daemon? ( app-arch/xz-utils >=app-emulation/lxc-2.0.7[seccomp] dnsmasq? ( net-dns/dnsmasq[dhcp,ipv6?] ) net-misc/rsync[xattr] sys-apps/iproute2[ipv6?] sys-fs/squashfs-tools virtual/acl )
-SLOT=0
-SRC_URI=https://github.com/lxc/lxd/archive/lxd-2.18.tar.gz -> lxd-2.18.tar.gz https://github.com/dustinkirkland/golang-petname/archive/d3c2ba80e75eeef10c5cf2fc76d2c809637376b3.tar.gz -> github.com-dustinkirkland-golang-petname-d3c2ba80e75eeef10c5cf2fc76d2c809637376b3.tar.gz https://github.com/golang/protobuf/archive/130e6b02ab059e7b717a096f397c5b60111cae74.tar.gz -> github.com-golang-protobuf-130e6b02ab059e7b717a096f397c5b60111cae74.tar.gz https://github.com/gorilla/mux/archive/3f19343c7d9ce75569b952758bd236af94956061.tar.gz -> github.com-gorilla-mux-3f19343c7d9ce75569b952758bd236af94956061.tar.gz https://github.com/gorilla/websocket/archive/6f34763140ed8887aed6a044912009832b4733d7.tar.gz -> github.com-gorilla-websocket-6f34763140ed8887aed6a044912009832b4733d7.tar.gz https://github.com/gosexy/gettext/archive/74466a0a0c4a62fea38f44aa161d4bbfbe79dd6b.tar.gz -> github.com-gosexy-gettext-74466a0a0c4a62fea38f44aa161d4bbfbe79dd6b.tar.gz https://github.com/jessevdk/go-flags/archive/6cf8f02b4ae8ba723ddc64dcfd403e530c06d927.tar.gz -> github.com-jessevdk-go-flags-6cf8f02b4ae8ba723ddc64dcfd403e530c06d927.tar.gz https://github.com/mattn/go-colorable/archive/ad5389df28cdac544c99bd7b9161a0b5b6ca9d1b.tar.gz -> github.com-mattn-go-colorable-ad5389df28cdac544c99bd7b9161a0b5b6ca9d1b.tar.gz https://github.com/mattn/go-runewidth/archive/97311d9f7767e3d6f422ea06661bc2c7a19e8a5d.tar.gz -> github.com-mattn-go-runewidth-97311d9f7767e3d6f422ea06661bc2c7a19e8a5d.tar.gz https://github.com/mattn/go-sqlite3/archive/05548ff55570cdb9ac72ff4a25a3b5e77a6fb7e5.tar.gz -> github.com-mattn-go-sqlite3-05548ff55570cdb9ac72ff4a25a3b5e77a6fb7e5.tar.gz https://github.com/olekukonko/tablewriter/archive/0fd34425a5aee40ff3f260b34e6c3b0d59f58c66.tar.gz -> github.com-olekukonko-tablewriter-0fd34425a5aee40ff3f260b34e6c3b0d59f58c66.tar.gz https://github.com/pborman/uuid/archive/e790cca94e6cc75c7064b1332e63811d4aae1a53.tar.gz -> github.com-pborman-uuid-e790cca94e6cc75c7064b1332e63811d4aae1a53.tar.gz https://github.com/stretchr/testify/archive/890a5c3458b43e6104ff5da8dfa139d013d77544.tar.gz -> github.com-stretchr-testify-890a5c3458b43e6104ff5da8dfa139d013d77544.tar.gz https://github.com/syndtr/gocapability/archive/db04d3cc01c8b54962a58ec7e491717d06cfcc16.tar.gz -> github.com-syndtr-gocapability-db04d3cc01c8b54962a58ec7e491717d06cfcc16.tar.gz https://github.com/go-stack/stack/archive/817915b46b97fd7bb80e8ab6b69f01a53ac3eebf.tar.gz -> github.com-go-stack-stack-817915b46b97fd7bb80e8ab6b69f01a53ac3eebf.tar.gz https://github.com/mattn/go-isatty/archive/fc9e8d8ef48496124e79ae0df75490096eccf6fe.tar.gz -> github.com-mattn-go-isatty-fc9e8d8ef48496124e79ae0df75490096eccf6fe.tar.gz https://github.com/juju/errors/archive/c7d06af17c68cd34c835053720b21f6549d9b0ee.tar.gz -> github.com-juju-errors-c7d06af17c68cd34c835053720b21f6549d9b0ee.tar.gz https://github.com/golang/crypto/archive/7d9177d70076375b9a59c8fde23d52d9c4a7ecd5.tar.gz -> github.com-golang-crypto-7d9177d70076375b9a59c8fde23d52d9c4a7ecd5.tar.gz https://github.com/golang/net/archive/0744d001aa8470aaa53df28d32e5ceeb8af9bd70.tar.gz -> github.com-golang-net-0744d001aa8470aaa53df28d32e5ceeb8af9bd70.tar.gz https://github.com/golang/sync/archive/f52d1811a62927559de87708c8913c1650ce4f26.tar.gz -> github.com-golang-sync-f52d1811a62927559de87708c8913c1650ce4f26.tar.gz https://github.com/golang/text/archive/1cbadb444a806fd9430d14ad08967ed91da4fa0a.tar.gz -> github.com-golang-text-1cbadb444a806fd9430d14ad08967ed91da4fa0a.tar.gz https://github.com/golang/tools/archive/e531a2a1c15f94033f6fa87666caeb19a688175f.tar.gz -> github.com-golang-tools-e531a2a1c15f94033f6fa87666caeb19a688175f.tar.gz https://github.com/golang/sys/archive/429f518978ab01db8bb6f44b66785088e7fba58b.tar.gz -> github.com-golang-sys-429f518978ab01db8bb6f44b66785088e7fba58b.tar.gz https://github.com/go-check/check/archive/20d25e2804050c1cd24a7eea1e7a6447dd0e74ec.tar.gz -> github.com-go-check-check-20d25e2804050c1cd24a7eea1e7a6447dd0e74ec.tar.gz https://github.com/flosch/pongo2/archive/5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9.tar.gz -> github.com-flosch-pongo2-5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9.tar.gz https://github.com/inconshreveable/log15/archive/b105bd37f74e5d9dc7b6ad7806715c7a2b83fd3f.tar.gz -> github.com-inconshreveable-log15-b105bd37f74e5d9dc7b6ad7806715c7a2b83fd3f.tar.gz https://github.com/lxc/go-lxc/archive/89b06ca6fad6daea5a72a1f47e69e39716c46198.tar.gz -> github.com-lxc-go-lxc-89b06ca6fad6daea5a72a1f47e69e39716c46198.tar.gz https://github.com/go-tomb/tomb/archive/d5d1b5820637886def9eef33e03a27a9f166942c.tar.gz -> github.com-go-tomb-tomb-d5d1b5820637886def9eef33e03a27a9f166942c.tar.gz https://github.com/go-yaml/yaml/archive/eb3733d160e74a9c7e442f435eb3bea458e1d19f.tar.gz -> github.com-go-yaml-yaml-eb3733d160e74a9c7e442f435eb3bea458e1d19f.tar.gz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	estack	43ddf5aaffa7a8d0482df54d25a66a1f	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=1d5d04989631c04357e1a3c5290709df
diff --git a/metadata/md5-cache/app-emulation/lxd-2.21 b/metadata/md5-cache/app-emulation/lxd-2.21
new file mode 100644
index 000000000000..f1e616a8142e
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/lxd-2.21
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare setup test unpack
+DEPEND=>=dev-lang/go-1.7.1 dev-libs/protobuf nls? ( sys-devel/gettext ) test? ( app-misc/jq dev-db/sqlite net-misc/curl sys-devel/gettext ) virtual/pkgconfig >=dev-lang/go-1.8
+DESCRIPTION=Fast, dense and secure container management
+EAPI=6
+HOMEPAGE=https://linuxcontainers.org/lxd/introduction/
+IUSE=+daemon +ipv6 +dnsmasq nls test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=daemon? ( app-arch/xz-utils >=app-emulation/lxc-2.0.7[seccomp] dnsmasq? ( net-dns/dnsmasq[dhcp,ipv6?] ) net-misc/rsync[xattr] sys-apps/iproute2[ipv6?] sys-fs/squashfs-tools virtual/acl )
+SLOT=0
+SRC_URI=https://github.com/lxc/lxd/archive/lxd-2.21.tar.gz -> lxd-2.21.tar.gz https://github.com/syndtr/gocapability/archive/db04d3cc01c8b54962a58ec7e491717d06cfcc16.tar.gz -> github.com-syndtr-gocapability-db04d3cc01c8b54962a58ec7e491717d06cfcc16.tar.gz https://github.com/dustinkirkland/golang-petname/archive/d3c2ba80e75eeef10c5cf2fc76d2c809637376b3.tar.gz -> github.com-dustinkirkland-golang-petname-d3c2ba80e75eeef10c5cf2fc76d2c809637376b3.tar.gz https://github.com/juju/gomaasapi/archive/663f786f595ba1707f56f62f7f4f2284c47c0f1d.tar.gz -> github.com-juju-gomaasapi-663f786f595ba1707f56f62f7f4f2284c47c0f1d.tar.gz https://github.com/juju/loggo/archive/8232ab8918d91c72af1a9fb94d3edbe31d88b790.tar.gz -> github.com-juju-loggo-8232ab8918d91c72af1a9fb94d3edbe31d88b790.tar.gz https://github.com/juju/persistent-cookiejar/archive/d5e5a8405ef9633c84af42fbcc734ec8dd73c198.tar.gz -> github.com-juju-persistent-cookiejar-d5e5a8405ef9633c84af42fbcc734ec8dd73c198.tar.gz https://github.com/juju/utils/archive/4d9b38694f1e441c16421e2320f2b2fbd97fa597.tar.gz -> github.com-juju-utils-4d9b38694f1e441c16421e2320f2b2fbd97fa597.tar.gz https://github.com/juju/idmclient/archive/15392b0e99abe5983297959c737b8d000e43b34c.tar.gz -> github.com-juju-idmclient-15392b0e99abe5983297959c737b8d000e43b34c.tar.gz https://github.com/juju/errors/archive/c7d06af17c68cd34c835053720b21f6549d9b0ee.tar.gz -> github.com-juju-errors-c7d06af17c68cd34c835053720b21f6549d9b0ee.tar.gz https://github.com/juju/go4/archive/40d72ab9641a2a8c36a9c46a51e28367115c8e59.tar.gz -> github.com-juju-go4-40d72ab9641a2a8c36a9c46a51e28367115c8e59.tar.gz https://github.com/juju/httprequest/archive/77d36ac4b71a6095506c0617d5881846478558cb.tar.gz -> github.com-juju-httprequest-77d36ac4b71a6095506c0617d5881846478558cb.tar.gz https://github.com/juju/version/archive/1f41e27e54f21acccf9b2dddae063a782a8a7ceb.tar.gz -> github.com-juju-version-1f41e27e54f21acccf9b2dddae063a782a8a7ceb.tar.gz https://github.com/juju/webbrowser/archive/54b8c57083b4afb7dc75da7f13e2967b2606a507.tar.gz -> github.com-juju-webbrowser-54b8c57083b4afb7dc75da7f13e2967b2606a507.tar.gz https://github.com/juju/schema/archive/e4e05803c9a103fdfa880476044100ac17e54830.tar.gz -> github.com-juju-schema-e4e05803c9a103fdfa880476044100ac17e54830.tar.gz https://github.com/gorilla/websocket/archive/cdedf21e585dae942951e34d6defc3215b4280fa.tar.gz -> github.com-gorilla-websocket-cdedf21e585dae942951e34d6defc3215b4280fa.tar.gz https://github.com/gorilla/mux/archive/5ab525f4fb1678e197ae59401e9050fa0b6cb5fd.tar.gz -> github.com-gorilla-mux-5ab525f4fb1678e197ae59401e9050fa0b6cb5fd.tar.gz https://github.com/mpvl/subtest/archive/f6e4cfd4b9ea1beb9fb5d53afba8c30804a02ae7.tar.gz -> github.com-mpvl-subtest-f6e4cfd4b9ea1beb9fb5d53afba8c30804a02ae7.tar.gz https://github.com/olekukonko/tablewriter/archive/65fec0d89a572b4367094e2058d3ebe667de3b60.tar.gz -> github.com-olekukonko-tablewriter-65fec0d89a572b4367094e2058d3ebe667de3b60.tar.gz https://github.com/golang/protobuf/archive/1e59b77b52bf8e4b449a57e6f79f21226d571845.tar.gz -> github.com-golang-protobuf-1e59b77b52bf8e4b449a57e6f79f21226d571845.tar.gz https://github.com/julienschmidt/httprouter/archive/e1b9828bc9e5904baec057a154c09ca40fe7fae0.tar.gz -> github.com-julienschmidt-httprouter-e1b9828bc9e5904baec057a154c09ca40fe7fae0.tar.gz https://github.com/gosexy/gettext/archive/74466a0a0c4a62fea38f44aa161d4bbfbe79dd6b.tar.gz -> github.com-gosexy-gettext-74466a0a0c4a62fea38f44aa161d4bbfbe79dd6b.tar.gz https://github.com/stretchr/testify/archive/2aa2c176b9dab406a6970f6a55f513e8a8c8b18f.tar.gz -> github.com-stretchr-testify-2aa2c176b9dab406a6970f6a55f513e8a8c8b18f.tar.gz https://github.com/mattn/go-runewidth/archive/97311d9f7767e3d6f422ea06661bc2c7a19e8a5d.tar.gz -> github.com-mattn-go-runewidth-97311d9f7767e3d6f422ea06661bc2c7a19e8a5d.tar.gz https://github.com/mattn/go-isatty/archive/6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c.tar.gz -> github.com-mattn-go-isatty-6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c.tar.gz https://github.com/mattn/go-colorable/archive/6fcc0c1fd9b620311d821b106a400b35dc95c497.tar.gz -> github.com-mattn-go-colorable-6fcc0c1fd9b620311d821b106a400b35dc95c497.tar.gz https://github.com/mattn/go-sqlite3/archive/d5ffb5c0cca8778699a929b236766f4a7af674e8.tar.gz -> github.com-mattn-go-sqlite3-d5ffb5c0cca8778699a929b236766f4a7af674e8.tar.gz https://github.com/rogpeppe/fastuuid/archive/6724a57986aff9bff1a1770e9347036def7c89f6.tar.gz -> github.com-rogpeppe-fastuuid-6724a57986aff9bff1a1770e9347036def7c89f6.tar.gz https://github.com/pborman/uuid/archive/e533369306653d193b93dae055f6083cbf8ba54f.tar.gz -> github.com-pborman-uuid-e533369306653d193b93dae055f6083cbf8ba54f.tar.gz https://github.com/lxc/lxd/archive/a324ad91230e5353fe746d06636dc59211122e6c.tar.gz -> github.com-lxc-lxd-a324ad91230e5353fe746d06636dc59211122e6c.tar.gz https://github.com/golang/crypto/archive/d585fd2cc9195196078f516b69daff6744ef5e84.tar.gz -> github.com-golang-crypto-d585fd2cc9195196078f516b69daff6744ef5e84.tar.gz https://github.com/golang/net/archive/d866cfc389cec985d6fda2859936a575a55a3ab6.tar.gz -> github.com-golang-net-d866cfc389cec985d6fda2859936a575a55a3ab6.tar.gz https://github.com/golang/sys/archive/571f7bbbe08da2a8955aed9d4db316e78630e9a3.tar.gz -> github.com-golang-sys-571f7bbbe08da2a8955aed9d4db316e78630e9a3.tar.gz https://github.com/go-retry/retry/archive/01631078ef2fdce601e38cfe5f527fab24c9a6d2.tar.gz -> github.com-go-retry-retry-01631078ef2fdce601e38cfe5f527fab24c9a6d2.tar.gz https://github.com/go-macaroon/macaroon/archive/bed2a428da6e56d950bed5b41fcbae3141e5b0d0.tar.gz -> github.com-go-macaroon-macaroon-bed2a428da6e56d950bed5b41fcbae3141e5b0d0.tar.gz https://github.com/go-yaml/yaml/archive/287cf08546ab5e7e37d55a84f7ed3fd1db036de5.tar.gz -> github.com-go-yaml-yaml-287cf08546ab5e7e37d55a84f7ed3fd1db036de5.tar.gz https://github.com/juju/names/archive/54f00845ae470a362430a966fe17f35f8784ac92.tar.gz -> github.com-juju-names-54f00845ae470a362430a966fe17f35f8784ac92.tar.gz https://github.com/juju/environschema/archive/7359fc7857abe2b11b5b3e23811a9c64cb6b01e0.tar.gz -> github.com-juju-environschema-7359fc7857abe2b11b5b3e23811a9c64cb6b01e0.tar.gz https://github.com/go-macaroon-bakery/macaroon-bakery/archive/ec9d2ad6796100720c154f614b6dea8798ec1181.tar.gz -> github.com-go-macaroon-bakery-macaroon-bakery-ec9d2ad6796100720c154f614b6dea8798ec1181.tar.gz https://github.com/go-httprequest/httprequest/archive/fdaf1bffa25560ba0920e3e29aae85d3677ab32e.tar.gz -> github.com-go-httprequest-httprequest-fdaf1bffa25560ba0920e3e29aae85d3677ab32e.tar.gz https://github.com/flosch/pongo2/archive/5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9.tar.gz -> github.com-flosch-pongo2-5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9.tar.gz https://github.com/go-mgo/mgo/archive/3f83fa5005286a7fe593b055f0d7771a7dce4655.tar.gz -> github.com-go-mgo-mgo-3f83fa5005286a7fe593b055f0d7771a7dce4655.tar.gz https://github.com/go-tomb/tomb/archive/d5d1b5820637886def9eef33e03a27a9f166942c.tar.gz -> github.com-go-tomb-tomb-d5d1b5820637886def9eef33e03a27a9f166942c.tar.gz https://github.com/go-errgo/errgo/archive/442357a80af5c6bf9b6d51ae791a39c3421004f3.tar.gz -> github.com-go-errgo-errgo-442357a80af5c6bf9b6d51ae791a39c3421004f3.tar.gz https://github.com/lxc/go-lxc/archive/a7d112aed2f5f57f565d6e557671eeef7e76811c.tar.gz -> github.com-lxc-go-lxc-a7d112aed2f5f57f565d6e557671eeef7e76811c.tar.gz
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	estack	43ddf5aaffa7a8d0482df54d25a66a1f	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=fefaa944a4dbb27d963c48f2a5a5c6d0
diff --git a/metadata/md5-cache/app-emulation/punes-0.102 b/metadata/md5-cache/app-emulation/punes-0.102
new file mode 100644
index 000000000000..a2f5083418c0
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/punes-0.102
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure postinst postrm prepare
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 cg? ( media-gfx/nvidia-cg-toolkit ) media-libs/alsa-lib media-libs/libsdl[opengl] virtual/opengl virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Nintendo Entertainment System (NES) emulator
+EAPI=6
+HOMEPAGE=https://github.com/punesemu/puNES
+IUSE=cg
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 cg? ( media-gfx/nvidia-cg-toolkit ) media-libs/alsa-lib media-libs/libsdl[opengl] virtual/opengl
+SLOT=0
+SRC_URI=https://github.com/punesemu/puNES/archive/v0.102.tar.gz -> punes-0.102.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=eb651029a643bcda780f1128faff6eda
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 16c8c076e2f4..9c608401ae60 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/gcal-4.1 b/metadata/md5-cache/app-misc/gcal-4.1
new file mode 100644
index 000000000000..c59fa7bb2638
--- /dev/null
+++ b/metadata/md5-cache/app-misc/gcal-4.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure
+DEPEND=app-arch/xz-utils nls? ( >=sys-devel/gettext-0.17 )
+DESCRIPTION=The GNU Calendar - a replacement for cal
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/gcal/
+IUSE=ncurses nls unicode
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=GPL-3
+RDEPEND=nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=mirror://gnu/gcal/gcal-4.1.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=3f3ae615e70351e8f7a623fdf95e8a27
diff --git a/metadata/md5-cache/app-misc/gnote-3.22.1 b/metadata/md5-cache/app-misc/gnote-3.22.1
deleted file mode 100644
index 80ccb3a62b33..000000000000
--- a/metadata/md5-cache/app-misc/gnote-3.22.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=app-text/docbook-xml-dtd:4.1.2 >=dev-util/intltool-0.35.0 dev-util/itstool virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Desktop note-taking application
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Gnote
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+ FDL-1.1
-RDEPEND=>=app-crypt/libsecret-0.8 >=app-text/gtkspell-3.0:3 >=dev-cpp/glibmm-2.32:2 >=dev-cpp/gtkmm-3.18:3.0 >=dev-libs/boost-1.34:= >=dev-libs/glib-2.32:2[dbus] >=dev-libs/libxml2-2:2 dev-libs/libxslt >=sys-apps/util-linux-2.16:= >=x11-libs/gtk+-3.20:3 gnome-base/gsettings-desktop-schemas
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnote/3.22/gnote-3.22.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a13c47a5475247434e51c069bc2344b5
diff --git a/metadata/md5-cache/app-misc/gnote-3.24.0 b/metadata/md5-cache/app-misc/gnote-3.24.0
deleted file mode 100644
index bfee5bc28fe1..000000000000
--- a/metadata/md5-cache/app-misc/gnote-3.24.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=app-text/docbook-xml-dtd:4.1.2 >=dev-util/intltool-0.35.0 dev-util/itstool virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Desktop note-taking application
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Gnote
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+ FDL-1.1
-RDEPEND=>=app-crypt/libsecret-0.8 >=app-text/gtkspell-3.0:3 >=dev-cpp/glibmm-2.32:2 >=dev-cpp/gtkmm-3.18:3.0 >=dev-libs/glib-2.32:2[dbus] >=dev-libs/libxml2-2:2 dev-libs/libxslt >=sys-apps/util-linux-2.16:= >=x11-libs/gtk+-3.20:3 gnome-base/gsettings-desktop-schemas
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnote/3.24/gnote-3.24.0.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ceb79c819496b65e30e1e2cb2ecfd57c
diff --git a/metadata/md5-cache/app-misc/gnote-3.24.1 b/metadata/md5-cache/app-misc/gnote-3.24.1
index c512fdc7a079..8c2b0eae0011 100644
--- a/metadata/md5-cache/app-misc/gnote-3.24.1
+++ b/metadata/md5-cache/app-misc/gnote-3.24.1
@@ -4,10 +4,10 @@ DESCRIPTION=Desktop note-taking application
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Gnote
 IUSE=debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+ FDL-1.1
 RDEPEND=>=app-crypt/libsecret-0.8 >=app-text/gtkspell-3.0:3 >=dev-cpp/glibmm-2.32:2 >=dev-cpp/gtkmm-3.18:3.0 >=dev-libs/glib-2.32:2[dbus] >=dev-libs/libxml2-2:2 dev-libs/libxslt >=sys-apps/util-linux-2.16:= >=x11-libs/gtk+-3.20:3 gnome-base/gsettings-desktop-schemas
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnote/3.24/gnote-3.24.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=99ac3f639e4c03e5459fca8121b6251a
+_md5_=24f5bce254983a50aab65510496b51b8
diff --git a/metadata/md5-cache/app-misc/tmux-2.3-r2 b/metadata/md5-cache/app-misc/tmux-2.3-r2
new file mode 100644
index 000000000000..88baa74779d4
--- /dev/null
+++ b/metadata/md5-cache/app-misc/tmux-2.3-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=>=dev-libs/libevent-2.1.5-r4:= utempter? ( kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) ) sys-libs/ncurses:0= virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Terminal multiplexer
+EAPI=6
+HOMEPAGE=http://tmux.github.io/
+IUSE=debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux
+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
+LICENSE=ISC
+RDEPEND=>=dev-libs/libevent-2.1.5-r4:= utempter? ( kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) ) sys-libs/ncurses:0= selinux? ( sec-policy/selinux-screen ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+SLOT=0
+SRC_URI=https://github.com/tmux/tmux/releases/download/2.3/tmux-2.3.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=cb7346f3e8114b5fc2b8d34eb0d6da40
diff --git a/metadata/md5-cache/app-misc/tracker-1.12.3 b/metadata/md5-cache/app-misc/tracker-1.12.3
deleted file mode 100644
index c95c44c54fc9..000000000000
--- a/metadata/md5-cache/app-misc/tracker-1.12.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=app-i18n/enca-1.9 >=dev-db/sqlite-3.20:= >=dev-libs/glib-2.44:2 >=dev-libs/gobject-introspection-0.9.5:= >=dev-libs/icu-4.8.1.1:= >=dev-libs/json-glib-1.0 >=media-libs/libpng-1.2:0= >=net-libs/libsoup-2.40:2.4 >=x11-libs/pango-1:= sys-apps/util-linux virtual/imagemagick-tools[png,jpeg?] cue? ( media-libs/libcue ) elibc_glibc? ( >=sys-libs/glibc-2.12 ) exif? ( >=media-libs/libexif-0.6 ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) firefox-bookmarks? ( || ( >=www-client/firefox-4.0 >=www-client/firefox-bin-4.0 ) ) flac? ( >=media-libs/flac-1.2.1 ) gif? ( media-libs/giflib:= ) gsf? ( >=gnome-extra/libgsf-1.14.24 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( >=x11-libs/gtk+-3:3 ) iptc? ( media-libs/libiptcdata ) iso? ( >=sys-libs/libosinfo-0.2.9:= ) jpeg? ( virtual/jpeg:0 ) upower? ( || ( >=sys-power/upower-0.9 sys-power/upower-pm-utils ) ) mp3? ( >=media-libs/taglib-1.6 ) networkmanager? ( >=net-misc/networkmanager-0.8:= ) pdf? ( >=x11-libs/cairo-1:= >=app-text/poppler-0.16[cairo,utils] >=x11-libs/gtk+-2.12:2 ) playlist? ( >=dev-libs/totem-pl-parser-3 ) rss? ( >=net-libs/libgrss-0.7:0 ) stemmer? ( dev-libs/snowball-stemmer ) thunderbird? ( || ( >=mail-client/thunderbird-5.0 >=mail-client/thunderbird-bin-5.0 ) ) tiff? ( media-libs/tiff:0 ) upnp-av? ( >=media-libs/gupnp-dlna-0.9.4:2.0 ) vorbis? ( >=media-libs/libvorbis-0.22 ) xml? ( >=dev-libs/libxml2-2.6 ) xmp? ( >=media-libs/exempi-2.1 ) xps? ( app-text/libgxps ) !gstreamer? ( !ffmpeg? ( || ( media-video/totem media-video/mplayer ) ) ) seccomp? ( >=sys-libs/libseccomp-2.0 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1.8 >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.17 virtual/pkgconfig test? ( >=dev-libs/dbus-glib-0.82-r1 >=sys-apps/dbus-1.3.1[X] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=A tagging metadata database, search tool and indexer
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/Tracker
-IUSE=cue elibc_glibc exif ffmpeg firefox-bookmarks flac gif gsf gstreamer gtk iptc +iso +jpeg libav +miner-fs mp3 nautilus networkmanager pdf playlist rss seccomp stemmer test thunderbird +tiff upnp-av upower +vorbis +xml xmp xps test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2+ LGPL-2.1+
-PDEPEND=nautilus? ( ~gnome-extra/nautilus-tracker-tags-1.12.3 )
-RDEPEND=>=app-i18n/enca-1.9 >=dev-db/sqlite-3.20:= >=dev-libs/glib-2.44:2 >=dev-libs/gobject-introspection-0.9.5:= >=dev-libs/icu-4.8.1.1:= >=dev-libs/json-glib-1.0 >=media-libs/libpng-1.2:0= >=net-libs/libsoup-2.40:2.4 >=x11-libs/pango-1:= sys-apps/util-linux virtual/imagemagick-tools[png,jpeg?] cue? ( media-libs/libcue ) elibc_glibc? ( >=sys-libs/glibc-2.12 ) exif? ( >=media-libs/libexif-0.6 ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) firefox-bookmarks? ( || ( >=www-client/firefox-4.0 >=www-client/firefox-bin-4.0 ) ) flac? ( >=media-libs/flac-1.2.1 ) gif? ( media-libs/giflib:= ) gsf? ( >=gnome-extra/libgsf-1.14.24 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( >=x11-libs/gtk+-3:3 ) iptc? ( media-libs/libiptcdata ) iso? ( >=sys-libs/libosinfo-0.2.9:= ) jpeg? ( virtual/jpeg:0 ) upower? ( || ( >=sys-power/upower-0.9 sys-power/upower-pm-utils ) ) mp3? ( >=media-libs/taglib-1.6 ) networkmanager? ( >=net-misc/networkmanager-0.8:= ) pdf? ( >=x11-libs/cairo-1:= >=app-text/poppler-0.16[cairo,utils] >=x11-libs/gtk+-2.12:2 ) playlist? ( >=dev-libs/totem-pl-parser-3 ) rss? ( >=net-libs/libgrss-0.7:0 ) stemmer? ( dev-libs/snowball-stemmer ) thunderbird? ( || ( >=mail-client/thunderbird-5.0 >=mail-client/thunderbird-bin-5.0 ) ) tiff? ( media-libs/tiff:0 ) upnp-av? ( >=media-libs/gupnp-dlna-0.9.4:2.0 ) vorbis? ( >=media-libs/libvorbis-0.22 ) xml? ( >=dev-libs/libxml2-2.6 ) xmp? ( >=media-libs/exempi-2.1 ) xps? ( app-text/libgxps ) !gstreamer? ( !ffmpeg? ( || ( media-video/totem media-video/mplayer ) ) ) seccomp? ( >=sys-libs/libseccomp-2.0 )
-REQUIRED_USE=?? ( gstreamer ffmpeg ) cue? ( gstreamer ) upnp-av? ( gstreamer ) !miner-fs? ( !cue !exif !flac !gif !gsf !iptc !iso !jpeg !mp3 !pdf !playlist !tiff !vorbis !xml !xmp !xps )
-SLOT=0/100
-SRC_URI=mirror://gnome/sources/tracker/1.12/tracker-1.12.3.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1a096dc8e2c59555e7a30b6e6799b7a2
diff --git a/metadata/md5-cache/app-misc/tracker-1.12.4 b/metadata/md5-cache/app-misc/tracker-1.12.4
index 041597cad96c..fa3c428107d1 100644
--- a/metadata/md5-cache/app-misc/tracker-1.12.4
+++ b/metadata/md5-cache/app-misc/tracker-1.12.4
@@ -4,7 +4,7 @@ DESCRIPTION=A tagging metadata database, search tool and indexer
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Tracker
 IUSE=cue elibc_glibc exif ffmpeg firefox-bookmarks flac gif gsf gstreamer gtk iptc +iso +jpeg libav +miner-fs mp3 nautilus networkmanager pdf playlist rss seccomp stemmer test thunderbird +tiff upnp-av upower +vorbis +xml xmp xps test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+ LGPL-2.1+
 PDEPEND=nautilus? ( ~gnome-extra/nautilus-tracker-tags-1.12.4 )
 RDEPEND=>=app-i18n/enca-1.9 >=dev-db/sqlite-3.20:= >=dev-libs/glib-2.44:2 >=dev-libs/gobject-introspection-0.9.5:= >=dev-libs/icu-4.8.1.1:= >=dev-libs/json-glib-1.0 >=media-libs/libpng-1.2:0= >=net-libs/libsoup-2.40:2.4 >=x11-libs/pango-1:= sys-apps/util-linux virtual/imagemagick-tools[png,jpeg?] cue? ( media-libs/libcue ) elibc_glibc? ( >=sys-libs/glibc-2.12 ) exif? ( >=media-libs/libexif-0.6 ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) firefox-bookmarks? ( || ( >=www-client/firefox-4.0 >=www-client/firefox-bin-4.0 ) ) flac? ( >=media-libs/flac-1.2.1 ) gif? ( media-libs/giflib:= ) gsf? ( >=gnome-extra/libgsf-1.14.24 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( >=x11-libs/gtk+-3:3 ) iptc? ( media-libs/libiptcdata ) iso? ( >=sys-libs/libosinfo-0.2.9:= ) jpeg? ( virtual/jpeg:0 ) upower? ( || ( >=sys-power/upower-0.9 sys-power/upower-pm-utils ) ) mp3? ( >=media-libs/taglib-1.6 ) networkmanager? ( >=net-misc/networkmanager-0.8:= ) pdf? ( >=x11-libs/cairo-1:= >=app-text/poppler-0.16[cairo,utils] >=x11-libs/gtk+-2.12:2 ) playlist? ( >=dev-libs/totem-pl-parser-3 ) rss? ( >=net-libs/libgrss-0.7:0 ) stemmer? ( dev-libs/snowball-stemmer ) thunderbird? ( || ( >=mail-client/thunderbird-5.0 >=mail-client/thunderbird-bin-5.0 ) ) tiff? ( media-libs/tiff:0 ) upnp-av? ( >=media-libs/gupnp-dlna-0.9.4:2.0 ) vorbis? ( >=media-libs/libvorbis-0.22 ) xml? ( >=dev-libs/libxml2-2.6 ) xmp? ( >=media-libs/exempi-2.1 ) xps? ( app-text/libgxps ) !gstreamer? ( !ffmpeg? ( || ( media-video/totem media-video/mplayer ) ) ) seccomp? ( >=sys-libs/libseccomp-2.0 )
@@ -12,4 +12,4 @@ REQUIRED_USE=?? ( gstreamer ffmpeg ) cue? ( gstreamer ) upnp-av? ( gstreamer ) !
 SLOT=0/100
 SRC_URI=mirror://gnome/sources/tracker/1.12/tracker-1.12.4.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f744b16e1ac1f775bcd6914e5566304b
+_md5_=0abe9fe8e5c01e926bac1ed139f0b420
diff --git a/metadata/md5-cache/app-mobilephone/Manifest.gz b/metadata/md5-cache/app-mobilephone/Manifest.gz
index aedf016aaa29..8eb7e00b9f2d 100644
--- a/metadata/md5-cache/app-mobilephone/Manifest.gz
+++ b/metadata/md5-cache/app-mobilephone/Manifest.gz
diff --git a/metadata/md5-cache/app-mobilephone/gammu-1.38.5 b/metadata/md5-cache/app-mobilephone/gammu-1.38.5
index 646d38ab9869..88a90d8df6bb 100644
--- a/metadata/md5-cache/app-mobilephone/gammu-1.38.5
+++ b/metadata/md5-cache/app-mobilephone/gammu-1.38.5
@@ -4,10 +4,10 @@ DESCRIPTION=A tool to handle your cellular phone
 EAPI=6
 HOMEPAGE=https://wammu.eu/gammu/
 IUSE=bluetooth curl dbi debug irda mysql nls odbc postgres usb
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2= virtual/libgudev:= bluetooth? ( net-wireless/bluez:= ) curl? ( net-misc/curl:= ) dbi? ( >=dev-db/libdbi-0.8.3:= ) mysql? ( virtual/mysql:= ) postgres? ( dev-db/postgresql:= ) usb? ( virtual/libusb:1= ) dev-util/dialog virtual/libiconv
 SLOT=0
 SRC_URI=https://dl.cihar.com/gammu/releases/gammu-1.38.5.tar.bz2
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a5ba99498e183357c05647d3d9475f5f
+_md5_=8d53f22d2d77ab491e69d9779e30aace
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 3ad74f86f291..3185f3cb91fd 100644
--- a/metadata/md5-cache/app-office/Manifest.gz
+++ b/metadata/md5-cache/app-office/Manifest.gz
diff --git a/metadata/md5-cache/app-office/kmymoney-4.8.0-r3 b/metadata/md5-cache/app-office/kmymoney-4.8.0-r3
deleted file mode 100644
index 881abeb549bb..000000000000
--- a/metadata/md5-cache/app-office/kmymoney-4.8.0-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=app-crypt/gpgme-1.7.0[cxx] <app-office/libalkimia-6.0.0 dev-libs/gmp:0= dev-libs/libgpg-error x11-misc/shared-mime-info calendar? ( dev-libs/libical:= ) hbci? ( >=net-libs/aqbanking-5.5.1 >=sys-libs/gwenhywfar-4.15.3[qt4] ) ofx? ( >=dev-libs/libofx-0.9.4 ) weboob? ( www-client/weboob ) dev-libs/boost virtual/pkgconfig doc? ( app-doc/doxygen ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-3.7.2 dev-util/automoc virtual/pkgconfig >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) >=dev-qt/qtsql-4.8.5:4 dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
-DESCRIPTION=Personal finance manager by KDE
-EAPI=6
-HOMEPAGE=https://kmymoney.org/
-IUSE=calendar debug doc hbci ofx quotes weboob test +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=app-crypt/gpgme-1.7.0[cxx] <app-office/libalkimia-6.0.0 dev-libs/gmp:0= dev-libs/libgpg-error x11-misc/shared-mime-info calendar? ( dev-libs/libical:= ) hbci? ( >=net-libs/aqbanking-5.5.1 >=sys-libs/gwenhywfar-4.15.3[qt4] ) ofx? ( >=dev-libs/libofx-0.9.4 ) weboob? ( www-client/weboob ) quotes? ( dev-perl/Finance-Quote ) kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) >=dev-qt/qtsql-4.8.5:4 dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
-SLOT=4
-SRC_URI=mirror://kde/stable/kmymoney/4.8.0/src/kmymoney-4.8.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=628d18a42ab023e2eb4078f5f04e77bd
diff --git a/metadata/md5-cache/app-office/kmymoney-4.8.1.1-r1 b/metadata/md5-cache/app-office/kmymoney-4.8.1.1-r1
index 1b92675705f7..1ee2139ca7b8 100644
--- a/metadata/md5-cache/app-office/kmymoney-4.8.1.1-r1
+++ b/metadata/md5-cache/app-office/kmymoney-4.8.1.1-r1
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-crypt/gpgme-1.7.0[cxx] <app-office/libalkimia-6.0.0 dev-libs/gmp:0= dev-libs/libgpg-error dev-qt/qtcore:4[ssl] dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtsql:4 dev-qt/qtsvg:4 kde-frameworks/kdelibs:4 x11-misc/shared-mime-info calendar? ( dev-libs/libical:= ) hbci? ( >=net-libs/aqbanking-5.5.1 >=sys-libs/gwenhywfar-4.15.3[qt4] ) ofx? ( >=dev-libs/libofx-0.9.4 ) weboob? ( www-client/weboob ) dev-libs/boost virtual/pkgconfig doc? ( app-doc/doxygen ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) test? ( dev-qt/qttest:4 ) sys-devel/make >=dev-util/cmake-3.7.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-crypt/gpgme-1.7.0[cxx] <app-office/libalkimia-6.0.0 dev-libs/gmp:0= dev-libs/libgpg-error dev-qt/qtcore:4[ssl] dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtsql:4 dev-qt/qtsvg:4 kde-frameworks/kdelibs:4 x11-misc/shared-mime-info calendar? ( dev-libs/libical:= ) hbci? ( >=net-libs/aqbanking-5.5.1 >=sys-libs/gwenhywfar-4.15.3[qt4] ) ofx? ( >=dev-libs/libofx-0.9.4 ) weboob? ( www-client/weboob ) dev-libs/boost virtual/pkgconfig doc? ( app-doc/doxygen ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) test? ( dev-qt/qttest:4 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Personal finance manager by KDE
 EAPI=6
 HOMEPAGE=https://kmymoney.org/
 IUSE=calendar debug doc +handbook hbci ofx quotes test weboob test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=app-crypt/gpgme-1.7.0[cxx] <app-office/libalkimia-6.0.0 dev-libs/gmp:0= dev-libs/libgpg-error dev-qt/qtcore:4[ssl] dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtsql:4 dev-qt/qtsvg:4 kde-frameworks/kdelibs:4 x11-misc/shared-mime-info calendar? ( dev-libs/libical:= ) hbci? ( >=net-libs/aqbanking-5.5.1 >=sys-libs/gwenhywfar-4.15.3[qt4] ) ofx? ( >=dev-libs/libofx-0.9.4 ) weboob? ( www-client/weboob ) kde-frameworks/oxygen-icons:* handbook? ( kde-frameworks/kdelibs:4[handbook] ) quotes? ( dev-perl/Finance-Quote )
 SLOT=4
 SRC_URI=mirror://kde/stable/kmymoney/4.8.1.1/src/kmymoney-4.8.1.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7162093a2f60782be5c06e12cc82dbec
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e514badc45752e8a6ae6a6c66edc2033
diff --git a/metadata/md5-cache/app-officeext/Manifest.gz b/metadata/md5-cache/app-officeext/Manifest.gz
index b3df5eec9882..2559eb4d6e22 100644
--- a/metadata/md5-cache/app-officeext/Manifest.gz
+++ b/metadata/md5-cache/app-officeext/Manifest.gz
diff --git a/metadata/md5-cache/app-officeext/ooofbtools-2.51 b/metadata/md5-cache/app-officeext/ooofbtools-2.51
index 802bf4191efc..255d07f308cd 100644
--- a/metadata/md5-cache/app-officeext/ooofbtools-2.51
+++ b/metadata/md5-cache/app-officeext/ooofbtools-2.51
@@ -4,11 +4,11 @@ DESCRIPTION=OpenOffice extension for the FictionBook2 format with validation
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/fbtools/
 IUSE=office_implementation_libreoffice office_implementation_openoffice
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/libxml2 app-arch/zip office_implementation_libreoffice? ( || ( app-office/libreoffice app-office/libreoffice-bin ) ) office_implementation_openoffice? ( app-office/openoffice-bin )
 REQUIRED_USE=|| ( office_implementation_libreoffice office_implementation_openoffice )
 SLOT=0
 SRC_URI=mirror://sourceforge/fbtools/files/release/OOoFBTools-2.51.zip
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	office-ext-r1	bb4127989b6cee094cde73ac366c2b9d	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=7fe55b81a3fcf514e57a712a811514fc
+_md5_=d4bd7cca556c4d8f83878060061b9a72
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index ed31db8a4a77..be023c6b61a9 100644
--- a/metadata/md5-cache/app-shells/Manifest.gz
+++ b/metadata/md5-cache/app-shells/Manifest.gz
diff --git a/metadata/md5-cache/app-shells/mpv-bash-completion-3.3.16 b/metadata/md5-cache/app-shells/mpv-bash-completion-3.3.16
index 6d8edd6f3b9a..0cb8fb525dcc 100644
--- a/metadata/md5-cache/app-shells/mpv-bash-completion-3.3.16
+++ b/metadata/md5-cache/app-shells/mpv-bash-completion-3.3.16
@@ -4,10 +4,10 @@ DESCRIPTION=Bash completion for the mpv video player
 EAPI=6
 HOMEPAGE=https://2ion.github.io/mpv-bash-completion/
 IUSE=luajit
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-3+
 RDEPEND=>=media-video/mpv-0.25.0[cli] >=app-shells/bash-completion-2.3-r1
 SLOT=0
 SRC_URI=https://github.com/2ion/mpv-bash-completion/archive/3.3.16.tar.gz -> mpv-bash-completion-3.3.16.tar.gz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=36d9eb66a6b03b34726b512b33ce53f3
+_md5_=6b6daf1458bfa6dde3b4328edd05870b
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 6f94dfcffe6b..788edf0a29d5 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/evince-3.22.1-r1 b/metadata/md5-cache/app-text/evince-3.22.1-r1
deleted file mode 100644
index 4228283c063c..000000000000
--- a/metadata/md5-cache/app-text/evince-3.22.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=dev-libs/atk >=dev-libs/glib-2.36:2[dbus] >=dev-libs/libxml2-2.5:2 sys-libs/zlib:= x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.16.0:3[introspection?] gnome-base/gsettings-desktop-schemas >=x11-libs/cairo-1.10:= >=app-text/poppler-0.33[cairo] djvu? ( >=app-text/djvu-3.5.22:= ) dvi? ( virtual/tex-base dev-libs/kpathsea:= t1lib? ( >=media-libs/t1lib-5:= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 ) gnome? ( gnome-base/gnome-desktop:3= ) gnome-keyring? ( >=app-crypt/libsecret-0.5 ) introspection? ( >=dev-libs/gobject-introspection-1:= ) nautilus? ( >=gnome-base/nautilus-2.91.4[introspection?] ) postscript? ( >=app-text/libspectre-0.2:= ) tiff? ( >=media-libs/tiff-3.6:0= ) xps? ( >=app-text/libgxps-0.2.1:= ) app-text/docbook-xml-dtd:4.3 app-text/yelp-tools dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1.13 >=dev-util/intltool-0.35 dev-util/itstool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig
-DESCRIPTION=Simple document viewer for GNOME
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Evince
-IUSE=djvu dvi gstreamer gnome gnome-keyring +introspection nautilus nsplugin +postscript t1lib tiff xps
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris
-LICENSE=GPL-2+ CC-BY-SA-3.0
-RDEPEND=dev-libs/atk >=dev-libs/glib-2.36:2[dbus] >=dev-libs/libxml2-2.5:2 sys-libs/zlib:= x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.16.0:3[introspection?] gnome-base/gsettings-desktop-schemas >=x11-libs/cairo-1.10:= >=app-text/poppler-0.33[cairo] djvu? ( >=app-text/djvu-3.5.22:= ) dvi? ( virtual/tex-base dev-libs/kpathsea:= t1lib? ( >=media-libs/t1lib-5:= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 ) gnome? ( gnome-base/gnome-desktop:3= ) gnome-keyring? ( >=app-crypt/libsecret-0.5 ) introspection? ( >=dev-libs/gobject-introspection-1:= ) nautilus? ( >=gnome-base/nautilus-2.91.4[introspection?] ) postscript? ( >=app-text/libspectre-0.2:= ) tiff? ( >=media-libs/tiff-3.6:0= ) xps? ( >=app-text/libgxps-0.2.1:= ) gnome-base/gvfs gnome-base/librsvg || ( >=x11-themes/adwaita-icon-theme-2.17.1 >=x11-themes/hicolor-icon-theme-0.10 )
-SLOT=0/evd3.4-evv3.3
-SRC_URI=mirror://gnome/sources/evince/3.22/evince-3.22.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=48971917b790da7d787d61154b4f90a2
diff --git a/metadata/md5-cache/app-text/evince-3.24.2 b/metadata/md5-cache/app-text/evince-3.24.2
index dabe852f6089..a06d6b386d0a 100644
--- a/metadata/md5-cache/app-text/evince-3.24.2
+++ b/metadata/md5-cache/app-text/evince-3.24.2
@@ -4,10 +4,10 @@ DESCRIPTION=Simple document viewer for GNOME
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Evince
 IUSE=djvu dvi gstreamer gnome gnome-keyring +introspection nautilus nsplugin +postscript t1lib tiff xps
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris
 LICENSE=GPL-2+ CC-BY-SA-3.0
 RDEPEND=dev-libs/atk >=dev-libs/glib-2.36:2[dbus] >=dev-libs/libxml2-2.5:2 sys-libs/zlib:= x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.16.0:3[introspection?] gnome-base/gsettings-desktop-schemas >=x11-libs/cairo-1.10:= >=app-text/poppler-0.33[cairo] djvu? ( >=app-text/djvu-3.5.22:= ) dvi? ( virtual/tex-base dev-libs/kpathsea:= t1lib? ( >=media-libs/t1lib-5:= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 ) gnome? ( gnome-base/gnome-desktop:3= ) gnome-keyring? ( >=app-crypt/libsecret-0.5 ) introspection? ( >=dev-libs/gobject-introspection-1:= ) nautilus? ( >=gnome-base/nautilus-2.91.4[introspection?] ) postscript? ( >=app-text/libspectre-0.2:= ) tiff? ( >=media-libs/tiff-3.6:0= ) xps? ( >=app-text/libgxps-0.2.1:= ) gnome-base/gvfs gnome-base/librsvg || ( >=x11-themes/adwaita-icon-theme-2.17.1 >=x11-themes/hicolor-icon-theme-0.10 )
 SLOT=0/evd3.4-evv3.3
 SRC_URI=mirror://gnome/sources/evince/3.24/evince-3.24.2.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cc505e5022f0b8359c57e705958214cc
+_md5_=028e85bf70ca8f5d3ba3ad8e8c57f306
diff --git a/metadata/md5-cache/app-text/iso-codes-3.76 b/metadata/md5-cache/app-text/iso-codes-3.76
index 1dd290b68e4f..95b77274e5b5 100644
--- a/metadata/md5-cache/app-text/iso-codes-3.76
+++ b/metadata/md5-cache/app-text/iso-codes-3.76
@@ -3,10 +3,10 @@ DEPEND=|| ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) app-ar
 DESCRIPTION=ISO language, territory, currency, script codes and their translations
 EAPI=6
 HOMEPAGE=http://pkg-isocodes.alioth.debian.org/
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=LGPL-2.1+
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=http://pkg-isocodes.alioth.debian.org/downloads/iso-codes-3.76.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=80280fe3d344505a5499f2b9ba937ed1
+_md5_=e9176f23969a8d74613b446847e76c5c
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index b67f5dc41d76..76d81641afe9 100644
--- a/metadata/md5-cache/dev-cpp/Manifest.gz
+++ b/metadata/md5-cache/dev-cpp/Manifest.gz
diff --git a/metadata/md5-cache/dev-cpp/catch-2.1.0 b/metadata/md5-cache/dev-cpp/catch-2.1.0
deleted file mode 100644
index 1f50cd643351..000000000000
--- a/metadata/md5-cache/dev-cpp/catch-2.1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=Modern C++ header-only framework for unit-tests
-EAPI=6
-HOMEPAGE=https://github.com/catchorg/Catch2
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=Boost-1.0
-SLOT=0
-SRC_URI=https://github.com/catchorg/Catch2/archive/v2.1.0.tar.gz -> Catch2-2.1.0.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4374a363d78beab8183ea6d1de5bbd70
diff --git a/metadata/md5-cache/dev-cpp/catch-2.0.1 b/metadata/md5-cache/dev-cpp/catch-2.1.1
index 71f3ab3cfca1..dff234ae359a 100644
--- a/metadata/md5-cache/dev-cpp/catch-2.0.1
+++ b/metadata/md5-cache/dev-cpp/catch-2.1.1
@@ -1,12 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.7.2
+DEPEND=dev-util/ninja >=dev-util/cmake-3.7.2
 DESCRIPTION=Modern C++ header-only framework for unit-tests
 EAPI=6
 HOMEPAGE=https://github.com/catchorg/Catch2
 IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=Boost-1.0
+RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/catchorg/Catch2/archive/v2.0.1.tar.gz -> Catch2-2.0.1.tar.gz
+SRC_URI=https://github.com/catchorg/Catch2/archive/v2.1.1.tar.gz -> Catch2-2.1.1.tar.gz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4374a363d78beab8183ea6d1de5bbd70
+_md5_=86abc7bbffd8c7d6e38c0b9f18a4ef47
diff --git a/metadata/md5-cache/dev-cpp/catch-9999 b/metadata/md5-cache/dev-cpp/catch-9999
index 2b476e57becc..15efea4f0bfe 100644
--- a/metadata/md5-cache/dev-cpp/catch-9999
+++ b/metadata/md5-cache/dev-cpp/catch-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=sys-devel/make >=dev-util/cmake-3.7.2 >=dev-vcs/git-1.8.2.1
+DEPEND=dev-util/ninja >=dev-util/cmake-3.7.2 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Modern C++ header-only framework for unit-tests
 EAPI=6
 HOMEPAGE=https://github.com/catchorg/Catch2
@@ -8,4 +8,4 @@ LICENSE=Boost-1.0
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=76ded2f428e143b24636a9ebcfba9da6
+_md5_=86abc7bbffd8c7d6e38c0b9f18a4ef47
diff --git a/metadata/md5-cache/dev-cpp/glibmm-2.52.1 b/metadata/md5-cache/dev-cpp/glibmm-2.52.1
index bee73c70a494..fa8abc76af20 100644
--- a/metadata/md5-cache/dev-cpp/glibmm-2.52.1
+++ b/metadata/md5-cache/dev-cpp/glibmm-2.52.1
@@ -4,10 +4,10 @@ DESCRIPTION=C++ interface for glib2
 EAPI=6
 HOMEPAGE=https://www.gtkmm.org
 IUSE=doc debug test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2.1+ GPL-2+
 RDEPEND=>=dev-libs/libsigc++-2.9.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.50.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=2
 SRC_URI=mirror://gnome/sources/glibmm/2.52/glibmm-2.52.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7cca19bb465517238dc2a7bcbf04074e
+_md5_=4bc5d776f41997d73660ee8f4bfc53c8
diff --git a/metadata/md5-cache/dev-cpp/pficommon-1.3.1.0 b/metadata/md5-cache/dev-cpp/pficommon-1.3.1.0
deleted file mode 100644
index ffcd8fa06975..000000000000
--- a/metadata/md5-cache/dev-cpp/pficommon-1.3.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup unpack
-DEPEND=fcgi? ( dev-libs/fcgi ) imagemagick? ( media-libs/lcms media-gfx/imagemagick[cxx] sys-devel/libtool ) mprpc? ( dev-libs/msgpack ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql ) || ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) test? ( dev-cpp/gtest )
-DESCRIPTION=General purpose C++ library for PFI
-EAPI=4
-HOMEPAGE=https://github.com/pfi/pficommon
-IUSE=fcgi imagemagick mprpc mysql postgres test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=fcgi? ( dev-libs/fcgi ) imagemagick? ( media-libs/lcms media-gfx/imagemagick[cxx] sys-devel/libtool ) mprpc? ( dev-libs/msgpack ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql )
-SLOT=0
-SRC_URI=https://github.com/pfi/pficommon/tarball/1.3.1.0 -> pficommon-1.3.1.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	waf-utils	d1ea2758053cbb7c5b38b8f88654468d
-_md5_=37b3bb0024038c88cfe9330139e63f9f
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index bbfb08b92e57..c2444c564551 100644
--- a/metadata/md5-cache/dev-db/Manifest.gz
+++ b/metadata/md5-cache/dev-db/Manifest.gz
diff --git a/metadata/md5-cache/dev-db/mongodb-3.4.10 b/metadata/md5-cache/dev-db/mongodb-3.4.10
index 2fa448e4b028..9b05e6427a0a 100644
--- a/metadata/md5-cache/dev-db/mongodb-3.4.10
+++ b/metadata/md5-cache/dev-db/mongodb-3.4.10
@@ -4,11 +4,11 @@ DESCRIPTION=A high-performance, open source, schema-free document-oriented datab
 EAPI=6
 HOMEPAGE=http://www.mongodb.org
 IUSE=debug kerberos libressl mms-agent ssl test +tools
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=AGPL-3 Apache-2.0
 PDEPEND=tools? ( >=app-admin/mongo-tools-3.4.10 )
 RDEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3 >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.8:= mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r3.4.10.tar.gz
 _eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	scons-utils	fcace052aef60e6b0eb3023c26aa585a	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=b33e34be6ed3fcb028709ba281edd2c6
+_md5_=791b3c22b305b5466e61173b75c3dc86
diff --git a/metadata/md5-cache/dev-db/redis-4.0.7 b/metadata/md5-cache/dev-db/redis-4.0.7
new file mode 100644
index 000000000000..d4fb638c564b
--- /dev/null
+++ b/metadata/md5-cache/dev-db/redis-4.0.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( || ( dev-lang/lua:5.1 =dev-lang/lua-5.1*:0 ) ) tcmalloc? ( dev-util/google-perftools ) jemalloc? ( >=dev-libs/jemalloc-3.2 ) virtual/pkgconfig >=sys-devel/autoconf-2.63 test? ( dev-lang/tcl:0= ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=A persistent caching system, key-value and data structures database
+EAPI=6
+HOMEPAGE=http://redis.io/
+IUSE=+jemalloc tcmalloc luajit test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
+LICENSE=BSD
+RDEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( || ( dev-lang/lua:5.1 =dev-lang/lua-5.1*:0 ) ) tcmalloc? ( dev-util/google-perftools ) jemalloc? ( >=dev-libs/jemalloc-3.2 )
+REQUIRED_USE=?? ( tcmalloc jemalloc )
+SLOT=0
+SRC_URI=http://download.redis.io/releases/redis-4.0.7.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=012a9724e3a1abf9cd303f8dee77a9c6
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index fe71d1d9c3ca..aec54a255cd1 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/jikes-1.22-r13 b/metadata/md5-cache/dev-java/jikes-1.22-r13
deleted file mode 100644
index faddf0e8ffbf..000000000000
--- a/metadata/md5-cache/dev-java/jikes-1.22-r13
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=IBM's open source, high performance Java compiler
-EAPI=0
-HOMEPAGE=http://jikes.sourceforge.net/
-KEYWORDS=amd64 ~arm ppc64 x86 ~x86-fbsd
-LICENSE=IBM
-RDEPEND=>=dev-java/java-config-2.0.0
-SLOT=0
-SRC_URI=mirror://sourceforge/jikes/jikes-1.22.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=460976774d1c53173f02ccb4cdfa27b8
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 5fc42cb991db..4879bd131c64 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/qu-prolog-10.0-r1 b/metadata/md5-cache/dev-lang/qu-prolog-10.0-r1
new file mode 100644
index 000000000000..ecd495564372
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/qu-prolog-10.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=!dev-util/mpatch !dev-util/rej !games-rpg/kqlives qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) pedro? ( net-misc/pedro ) readline? ( app-misc/rlwrap ) dev-lang/perl
+DESCRIPTION=Extended Prolog supporting quantifiers, object-variables and substitutions
+EAPI=5
+HOMEPAGE=http://www.itee.uq.edu.au/~pjr/HomePages/QuPrologHome.html
+IUSE=debug doc examples pedro qt5 readline threads
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Apache-2.0 GPL-2+
+RDEPEND=!dev-util/mpatch !dev-util/rej !games-rpg/kqlives qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) pedro? ( net-misc/pedro ) readline? ( app-misc/rlwrap )
+SLOT=0
+SRC_URI=http://www.itee.uq.edu.au/~pjr/HomePages/QPFiles/qp10.0.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=bd4780cfbc9b73a2c0c9ee8027f3b710
diff --git a/metadata/md5-cache/dev-lang/rust-1.23.0-r1 b/metadata/md5-cache/dev-lang/rust-1.23.0-r1
new file mode 100644
index 000000000000..60667702b29f
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/rust-1.23.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup
+DEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 jemalloc? ( dev-libs/jemalloc ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.5 ) dev-util/cmake
+DESCRIPTION=Systems programming language from Mozilla
+EAPI=6
+HOMEPAGE=http://www.rust-lang.org/
+IUSE=debug doc extended +jemalloc
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
+PDEPEND=!extended? ( >=dev-util/cargo-0.24.0 )
+RDEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 jemalloc? ( dev-libs/jemalloc )
+SLOT=stable/1.23
+SRC_URI=https://static.rust-lang.org/dist/rustc-1.23.0-src.tar.gz -> rustc-1.23.0-src.tar.gz amd64? ( https://static.rust-lang.org/dist/rust-1.22.0-x86_64-unknown-linux-gnu.tar.gz ) x86? ( https://static.rust-lang.org/dist/rust-1.22.0-i686-unknown-linux-gnu.tar.gz )
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=331d9f092e9b716f41398e5328d5561c
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-7.6.4 b/metadata/md5-cache/dev-lang/swi-prolog-7.6.4
new file mode 100644
index 000000000000..10b7a71da2f2
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/swi-prolog-7.6.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=sys-libs/ncurses:= archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.7:= ) uuid? ( dev-libs/ossp-uuid ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) X? ( x11-proto/xproto ) java? ( test? ( =dev-java/junit-3.8* ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=free, small, and standard compliant Prolog compiler
+EAPI=5
+HOMEPAGE=http://www.swi-prolog.org/
+IUSE=archive berkdb debug doc +gmp hardened java +libedit libressl minimal odbc pcre readline ssl static-libs test uuid zlib X elibc_FreeBSD java
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=BSD-2
+RDEPEND=sys-libs/ncurses:= archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.7:= ) uuid? ( dev-libs/ossp-uuid ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) java? ( >=dev-java/java-config-2.2.0-r3 )
+SLOT=0
+SRC_URI=http://www.swi-prolog.org/download/stable/src/swipl-7.6.4.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=cfa63fd4cdce3a34a6de80ac469ddaec
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-7.7.8 b/metadata/md5-cache/dev-lang/swi-prolog-7.7.8
new file mode 100644
index 000000000000..8c1428b9fa61
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/swi-prolog-7.7.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=sys-libs/ncurses:= archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.7:= ) uuid? ( dev-libs/ossp-uuid ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) X? ( x11-proto/xproto ) java? ( test? ( =dev-java/junit-3.8* ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=free, small, and standard compliant Prolog compiler
+EAPI=5
+HOMEPAGE=http://www.swi-prolog.org/
+IUSE=archive berkdb debug doc +gmp hardened java +libedit libressl minimal odbc pcre readline ssl static-libs test uuid zlib X elibc_FreeBSD java
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=BSD-2
+RDEPEND=sys-libs/ncurses:= archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.7:= ) uuid? ( dev-libs/ossp-uuid ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) java? ( >=dev-java/java-config-2.2.0-r3 )
+SLOT=0
+SRC_URI=http://www.swi-prolog.org/download/devel/src/swipl-7.7.8.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=49c0c9d662391dd462544188441b7e75
diff --git a/metadata/md5-cache/dev-lang/vala-0.36.7 b/metadata/md5-cache/dev-lang/vala-0.36.7
index e14f53913de2..dac8c5fa3d9d 100644
--- a/metadata/md5-cache/dev-lang/vala-0.36.7
+++ b/metadata/md5-cache/dev-lang/vala-0.36.7
@@ -4,10 +4,10 @@ DESCRIPTION=Compiler for the GObject type system
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Vala
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/vala-common-0.36.7
 SLOT=0.36
 SRC_URI=mirror://gnome/sources/vala/0.36/vala-0.36.7.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=86612dd435cdea694f2103c47fe3a849
+_md5_=4165c840525138e21611d8252ff079ae
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index a0c531e631a4..54fc9c187812 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/atk-2.24.0 b/metadata/md5-cache/dev-libs/atk-2.24.0
index 2cfde48a691a..7eab4d6e5b46 100644
--- a/metadata/md5-cache/dev-libs/atk-2.24.0
+++ b/metadata/md5-cache/dev-libs/atk-2.24.0
@@ -4,10 +4,10 @@ DESCRIPTION=GTK+ & GNOME Accessibility Toolkit
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Accessibility
 IUSE=+introspection nls test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/atk/2.24/atk-2.24.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=68591b947fa7ebeaebd1651e22ebf369
+_md5_=06d005f7cb304f369288d8e993c24808
diff --git a/metadata/md5-cache/dev-libs/boehm-gc-7.4.0 b/metadata/md5-cache/dev-libs/boehm-gc-7.4.0
index 650680f02ca0..25d3936b8a90 100644
--- a/metadata/md5-cache/dev-libs/boehm-gc-7.4.0
+++ b/metadata/md5-cache/dev-libs/boehm-gc-7.4.0
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile configure install
-DEPEND=>=dev-libs/libatomic_ops-7.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare
+DEPEND=>=dev-libs/libatomic_ops-7.4 virtual/pkgconfig >=app-portage/elt-patches-20170422
 DESCRIPTION=The Boehm-Demers-Weiser conservative garbage collector
 EAPI=5
 HOMEPAGE=http://www.hboehm.info/gc/
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=boehm-gc
 SLOT=0
 SRC_URI=http://www.hboehm.info/gc/gc_source/gc-7.4.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f8f67adb126ef6df16099042e8c26695
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=155631ed302fe0fed3b43dc7410245ea
diff --git a/metadata/md5-cache/dev-libs/boehm-gc-7.4.2 b/metadata/md5-cache/dev-libs/boehm-gc-7.4.2
index 858c370d677e..6db01827e2e8 100644
--- a/metadata/md5-cache/dev-libs/boehm-gc-7.4.2
+++ b/metadata/md5-cache/dev-libs/boehm-gc-7.4.2
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile configure install
-DEPEND=>=dev-libs/libatomic_ops-7.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare
+DEPEND=>=dev-libs/libatomic_ops-7.4 virtual/pkgconfig >=app-portage/elt-patches-20170422
 DESCRIPTION=The Boehm-Demers-Weiser conservative garbage collector
 EAPI=5
 HOMEPAGE=http://www.hboehm.info/gc/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~a
 LICENSE=boehm-gc
 SLOT=0
 SRC_URI=http://www.hboehm.info/gc/gc_source/gc-7.4.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=bf1fc242abc32b1c9807ab538b68cea7
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=15bd513096bdf5f1ea7ab99a4b4862fa
diff --git a/metadata/md5-cache/dev-libs/boehm-gc-7.6.0 b/metadata/md5-cache/dev-libs/boehm-gc-7.6.0
index 3f9459f5a99c..dbb2536acd4b 100644
--- a/metadata/md5-cache/dev-libs/boehm-gc-7.6.0
+++ b/metadata/md5-cache/dev-libs/boehm-gc-7.6.0
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-libs/libatomic_ops-7.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/libatomic_ops-7.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig >=app-portage/elt-patches-20170422
 DESCRIPTION=The Boehm-Demers-Weiser conservative garbage collector
 EAPI=6
 HOMEPAGE=http://www.hboehm.info/gc/
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x8
 LICENSE=boehm-gc
 SLOT=0
 SRC_URI=http://www.hboehm.info/gc/gc_source/gc-7.6.0.tar.gz
-_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=6f06687df843687c9316e4996100bc55
+_eclasses_=libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=37ff5b234e0c2708c1ff3d365074369d
diff --git a/metadata/md5-cache/dev-libs/boehm-gc-7.6.2 b/metadata/md5-cache/dev-libs/boehm-gc-7.6.2
index f8645f3aed74..bd7048de2144 100644
--- a/metadata/md5-cache/dev-libs/boehm-gc-7.6.2
+++ b/metadata/md5-cache/dev-libs/boehm-gc-7.6.2
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-libs/libatomic_ops-7.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/libatomic_ops-7.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig >=app-portage/elt-patches-20170422
 DESCRIPTION=The Boehm-Demers-Weiser conservative garbage collector
 EAPI=6
 HOMEPAGE=http://www.hboehm.info/gc/
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x8
 LICENSE=boehm-gc
 SLOT=0/2.1
 SRC_URI=http://www.hboehm.info/gc/gc_source/gc-7.6.2.tar.gz
-_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=72cfe1d039d29d2c3af92066fc2c8c34
+_eclasses_=libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=b6fc00737cb850d8c6c3d196664cbe4b
diff --git a/metadata/md5-cache/dev-libs/boehm-gc-7.6.4 b/metadata/md5-cache/dev-libs/boehm-gc-7.6.4
new file mode 100644
index 000000000000..c0d4043dbcec
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/boehm-gc-7.6.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/libatomic_ops-7.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig >=app-portage/elt-patches-20170422
+DESCRIPTION=The Boehm-Demers-Weiser conservative garbage collector
+EAPI=6
+HOMEPAGE=http://www.hboehm.info/gc/ https://github.com/ivmai/bdwgc/
+IUSE=cxx static-libs threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=boehm-gc
+SLOT=0
+SRC_URI=https://github.com/ivmai/bdwgc/releases/download/v7.6.4/gc-7.6.4.tar.gz
+_eclasses_=libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=ca0114e5b2c5e26077f9e323055343d2
diff --git a/metadata/md5-cache/dev-libs/efl-1.17.0-r1 b/metadata/md5-cache/dev-libs/efl-1.17.0-r1
index a7c40fc1eb10..6db2d0c4ac11 100644
--- a/metadata/md5-cache/dev-libs/efl-1.17.0-r1
+++ b/metadata/md5-cache/dev-libs/efl-1.17.0-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare unpack
 DEPEND=!!dev-libs/ecore !!dev-libs/edbus !!dev-libs/eet !!dev-libs/eeze !!dev-libs/efreet !!dev-libs/eina !!dev-libs/eio !!dev-libs/embryo !!dev-libs/eobj !!dev-libs/ephysics !!media-libs/edje !!media-libs/emotion !!media-libs/ethumb !!media-libs/evas drm? ( >=dev-libs/libinput-0.8 media-libs/mesa[gbm] >=x11-libs/libdrm-2.4 >=x11-libs/libxkbcommon-0.3.0 ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gif? ( media-libs/giflib ) glib? ( dev-libs/glib:2 ) gnutls? ( net-libs/gnutls ) !gnutls? ( ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) harfbuzz? ( media-libs/harfbuzz ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:0 ) !oldlua? ( >=dev-lang/luajit-2.0.0 ) oldlua? ( dev-lang/lua:* ) physics? ( >=sci-physics/bullet-2.80 ) pixman? ( x11-libs/pixman ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 virtual/opengl ) sound? ( media-libs/libsndfile ) systemd? ( sys-apps/systemd ) tiff? ( media-libs/tiff:0= ) tslib? ( x11-libs/tslib ) unwind? ( sys-libs/libunwind ) valgrind? ( dev-util/valgrind ) wayland? ( >=dev-libs/wayland-1.8.0 >=x11-libs/libxkbcommon-0.3.1 media-libs/mesa[gles2,wayland] ) webp? ( media-libs/libwebp ) X? ( x11-libs/libXcursor x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXp x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver opengl? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) gles? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) ) xine? ( >=media-libs/xine-lib-1.1.1 ) xpm? ( x11-libs/libXpm ) sys-apps/dbus >=sys-apps/util-linux-2.20.0 sys-libs/zlib virtual/jpeg:0= !dev-libs/ecore !dev-libs/edbus !dev-libs/eet !dev-libs/eeze !dev-libs/efreet !dev-libs/eina !dev-libs/eio !dev-libs/embryo !dev-libs/eobj !dev-libs/ephysics !media-libs/edje !media-libs/emotion !media-libs/ethumb !media-libs/evas doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170317 >=app-portage/elt-patches-20170422 doc? ( app-doc/doxygen )
 DESCRIPTION=Enlightenment Foundation Libraries all-in-one package
 EAPI=5
-HOMEPAGE=http://www.enlightenment.org/
+HOMEPAGE=https://www.enlightenment.org
 IUSE=+bmp debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz +ico ibus jpeg2k libressl neon oldlua opengl ssl physics pixman +png +ppm +psd pulseaudio scim sdl sound systemd tga tiff tslib unwind v4l valgrind wayland webp X xim xine xpm nls doc
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=BSD-2 GPL-2 LGPL-2.1 ZLIB
@@ -10,5 +10,5 @@ RDEPEND=drm? ( >=dev-libs/libinput-0.8 media-libs/mesa[gbm] >=x11-libs/libdrm-2.
 REQUIRED_USE=pulseaudio? ( sound ) opengl? ( || ( X sdl wayland ) ) gles? ( || ( X wayland ) ) gles? ( !sdl ) gles? ( egl ) sdl? ( opengl ) wayland? ( egl !opengl gles ) xim? ( X )
 SLOT=0
 SRC_URI=https://download.enlightenment.org/rel/libs/efl/efl-1.17.0.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	enlightenment	ac1fc335a7f44c04309a9f4aae403165	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	enlightenment	1fa177784657aaf9484e91d7427a2b2e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=5fbb7d34cf8131061f335993836e3764
diff --git a/metadata/md5-cache/dev-libs/efl-1.18.4 b/metadata/md5-cache/dev-libs/efl-1.18.4
index 3ae7df1a1a19..827f1baea2f3 100644
--- a/metadata/md5-cache/dev-libs/efl-1.18.4
+++ b/metadata/md5-cache/dev-libs/efl-1.18.4
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare unpack
 DEPEND=!!dev-libs/ecore !!dev-libs/edbus !!dev-libs/eet !!dev-libs/eeze !!dev-libs/efreet !!dev-libs/eina !!dev-libs/eio !!dev-libs/embryo !!dev-libs/eobj !!dev-libs/ephysics !!media-libs/edje !!media-libs/emotion !!media-libs/ethumb !!media-libs/evas drm? ( >=dev-libs/libinput-0.8 media-libs/mesa[gbm] >=x11-libs/libdrm-2.4 >=x11-libs/libxkbcommon-0.3.0 ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gif? ( media-libs/giflib ) glib? ( dev-libs/glib:2 ) gnutls? ( net-libs/gnutls ) !gnutls? ( ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) harfbuzz? ( media-libs/harfbuzz ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:0 ) !oldlua? ( >=dev-lang/luajit-2.0.0 ) oldlua? ( dev-lang/lua:* ) physics? ( >=sci-physics/bullet-2.80 ) pixman? ( x11-libs/pixman ) postscript? ( app-text/libspectre ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) raw? ( media-libs/libraw ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 virtual/opengl ) sound? ( media-libs/libsndfile ) systemd? ( sys-apps/systemd ) tiff? ( media-libs/tiff:0= ) tslib? ( x11-libs/tslib ) unwind? ( sys-libs/libunwind ) valgrind? ( dev-util/valgrind ) wayland? ( >=dev-libs/wayland-1.8.0 >=x11-libs/libxkbcommon-0.3.1 media-libs/mesa[gles2,wayland] ) webp? ( media-libs/libwebp ) X? ( x11-libs/libXcursor x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXp x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver opengl? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) gles? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) ) xine? ( >=media-libs/xine-lib-1.1.1 ) xpm? ( x11-libs/libXpm ) sys-apps/dbus >=sys-apps/util-linux-2.20.0 sys-libs/zlib virtual/jpeg:0= !dev-libs/ecore !dev-libs/edbus !dev-libs/eet !dev-libs/eeze !dev-libs/efreet !dev-libs/eina !dev-libs/eio !dev-libs/embryo !dev-libs/eobj !dev-libs/ephysics !media-libs/edje !media-libs/elementary !media-libs/emotion !media-libs/ethumb !media-libs/evas !media-plugins/emotion_generic_players !media-plugins/evas_generic_loaders doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170317 >=app-portage/elt-patches-20170422 doc? ( app-doc/doxygen )
 DESCRIPTION=Enlightenment Foundation Libraries all-in-one package
 EAPI=5
-HOMEPAGE=http://www.enlightenment.org/
+HOMEPAGE=https://www.enlightenment.org
 IUSE=+bmp debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz +ico ibus jpeg2k libressl neon oldlua opengl ssl physics pixman +png postscript +ppm +psd pulseaudio raw scim sdl sound systemd tga tiff tslib unwind v4l valgrind wayland webp X xim xine xpm nls doc
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=BSD-2 GPL-2 LGPL-2.1 ZLIB
@@ -10,5 +10,5 @@ RDEPEND=drm? ( >=dev-libs/libinput-0.8 media-libs/mesa[gbm] >=x11-libs/libdrm-2.
 REQUIRED_USE=pulseaudio? ( sound ) opengl? ( || ( X sdl wayland ) ) gles? ( || ( X wayland ) ) gles? ( !sdl ) gles? ( egl ) sdl? ( opengl ) wayland? ( egl !opengl gles ) xim? ( X )
 SLOT=0
 SRC_URI=https://download.enlightenment.org/rel/libs/efl/efl-1.18.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	enlightenment	ac1fc335a7f44c04309a9f4aae403165	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	enlightenment	1fa177784657aaf9484e91d7427a2b2e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=507f39cd7cc73df79fdc11bd276e3460
diff --git a/metadata/md5-cache/dev-libs/efl-9999 b/metadata/md5-cache/dev-libs/efl-9999
index 53ff3869ee91..176c08aaa642 100644
--- a/metadata/md5-cache/dev-libs/efl-9999
+++ b/metadata/md5-cache/dev-libs/efl-9999
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install prepare unpack
 DEPEND=!!dev-libs/ecore !!dev-libs/edbus !!dev-libs/eet !!dev-libs/eeze !!dev-libs/efreet !!dev-libs/eina !!dev-libs/eio !!dev-libs/embryo !!dev-libs/eobj !!dev-libs/ephysics !!media-libs/edje !!media-libs/emotion !!media-libs/ethumb !!media-libs/evas drm? ( >=dev-libs/libinput-0.8 media-libs/mesa[gbm] >=x11-libs/libdrm-2.4 >=x11-libs/libxkbcommon-0.3.0 ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gif? ( media-libs/giflib ) glib? ( dev-libs/glib:2 ) gnutls? ( net-libs/gnutls ) !gnutls? ( ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) harfbuzz? ( media-libs/harfbuzz ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:0 ) !oldlua? ( >=dev-lang/luajit-2.0.0 ) oldlua? ( dev-lang/lua:* ) physics? ( >=sci-physics/bullet-2.80 ) pixman? ( x11-libs/pixman ) postscript? ( app-text/libspectre ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) raw? ( media-libs/libraw ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 virtual/opengl ) sound? ( media-libs/libsndfile ) systemd? ( sys-apps/systemd ) tiff? ( media-libs/tiff:0= ) tslib? ( x11-libs/tslib ) unwind? ( sys-libs/libunwind ) valgrind? ( dev-util/valgrind ) wayland? ( >=dev-libs/wayland-1.8.0 >=x11-libs/libxkbcommon-0.3.1 media-libs/mesa[gles2,wayland] ) webp? ( media-libs/libwebp ) X? ( x11-libs/libXcursor x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXp x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver opengl? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) gles? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) ) xine? ( >=media-libs/xine-lib-1.1.1 ) xpm? ( x11-libs/libXpm ) sys-apps/dbus >=sys-apps/util-linux-2.20.0 sys-libs/zlib virtual/jpeg:0= !dev-libs/ecore !dev-libs/edbus !dev-libs/eet !dev-libs/eeze !dev-libs/efreet !dev-libs/eina !dev-libs/eio !dev-libs/embryo !dev-libs/eobj !dev-libs/ephysics !media-libs/edje !media-libs/elementary !media-libs/emotion !media-libs/ethumb !media-libs/evas !media-plugins/emotion_generic_players !media-plugins/evas_generic_loaders doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170317 >=app-portage/elt-patches-20170422 dev-vcs/git !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 doc? ( app-doc/doxygen )
 DESCRIPTION=Enlightenment Foundation Libraries all-in-one package
 EAPI=5
-HOMEPAGE=http://www.enlightenment.org/
+HOMEPAGE=https://www.enlightenment.org
 IUSE=+bmp debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz +ico ibus jpeg2k libressl neon oldlua opengl ssl physics pixman +png postscript +ppm +psd pulseaudio raw scim sdl sound systemd tga tiff tslib unwind v4l valgrind wayland webp X xim xine xpm nls doc
 LICENSE=BSD-2 GPL-2 LGPL-2.1 ZLIB
 RDEPEND=drm? ( >=dev-libs/libinput-0.8 media-libs/mesa[gbm] >=x11-libs/libdrm-2.4 >=x11-libs/libxkbcommon-0.3.0 ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gif? ( media-libs/giflib ) glib? ( dev-libs/glib:2 ) gnutls? ( net-libs/gnutls ) !gnutls? ( ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) harfbuzz? ( media-libs/harfbuzz ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:0 ) !oldlua? ( >=dev-lang/luajit-2.0.0 ) oldlua? ( dev-lang/lua:* ) physics? ( >=sci-physics/bullet-2.80 ) pixman? ( x11-libs/pixman ) postscript? ( app-text/libspectre ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) raw? ( media-libs/libraw ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 virtual/opengl ) sound? ( media-libs/libsndfile ) systemd? ( sys-apps/systemd ) tiff? ( media-libs/tiff:0= ) tslib? ( x11-libs/tslib ) unwind? ( sys-libs/libunwind ) valgrind? ( dev-util/valgrind ) wayland? ( >=dev-libs/wayland-1.8.0 >=x11-libs/libxkbcommon-0.3.1 media-libs/mesa[gles2,wayland] ) webp? ( media-libs/libwebp ) X? ( x11-libs/libXcursor x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXp x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver opengl? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) gles? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) ) xine? ( >=media-libs/xine-lib-1.1.1 ) xpm? ( x11-libs/libXpm ) sys-apps/dbus >=sys-apps/util-linux-2.20.0 sys-libs/zlib virtual/jpeg:0= !dev-libs/ecore !dev-libs/edbus !dev-libs/eet !dev-libs/eeze !dev-libs/efreet !dev-libs/eina !dev-libs/eio !dev-libs/embryo !dev-libs/eobj !dev-libs/ephysics !media-libs/edje !media-libs/elementary !media-libs/emotion !media-libs/ethumb !media-libs/evas !media-plugins/emotion_generic_players !media-plugins/evas_generic_loaders nls? ( sys-devel/gettext )
 REQUIRED_USE=pulseaudio? ( sound ) opengl? ( || ( X sdl wayland ) ) gles? ( || ( X wayland ) ) gles? ( !sdl ) gles? ( egl ) sdl? ( opengl ) wayland? ( egl !opengl gles ) xim? ( X )
 SLOT=0
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	enlightenment	ac1fc335a7f44c04309a9f4aae403165	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	git-2	195a672bfaf52d868442171c9469bbb6	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	enlightenment	1fa177784657aaf9484e91d7427a2b2e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	git-2	195a672bfaf52d868442171c9469bbb6	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=507f39cd7cc73df79fdc11bd276e3460
diff --git a/metadata/md5-cache/dev-libs/gjs-1.48.7 b/metadata/md5-cache/dev-libs/gjs-1.48.7
index ada3d15e7b10..0e1da361fdac 100644
--- a/metadata/md5-cache/dev-libs/gjs-1.48.7
+++ b/metadata/md5-cache/dev-libs/gjs-1.48.7
@@ -4,10 +4,10 @@ DESCRIPTION=Javascript bindings for GNOME
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Gjs
 IUSE=+cairo examples gtk test test
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )
 RDEPEND=>=dev-libs/glib-2.52.1 >=dev-libs/gobject-introspection-1.52.1:= sys-libs/readline:0= dev-lang/spidermonkey:38 virtual/libffi cairo? ( x11-libs/cairo[X] ) gtk? ( >=x11-libs/gtk+-3.20:3 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gjs/1.48/gjs-1.48.7.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7834ab1c30d1e114a38a03c81f299209
+_md5_=db6d84f2bcd00ef1fd3c498b15962333
diff --git a/metadata/md5-cache/dev-libs/glib-2.52.3 b/metadata/md5-cache/dev-libs/glib-2.52.3
index 9b2c447218ec..a748b6ad0a3d 100644
--- a/metadata/md5-cache/dev-libs/glib-2.52.3
+++ b/metadata/md5-cache/dev-libs/glib-2.52.3
@@ -4,7 +4,7 @@ DESCRIPTION=The GLib library of C routines
 EAPI=6
 HOMEPAGE=https://www.gtk.org/
 IUSE=dbus debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7 test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=LGPL-2.1+
 PDEPEND=!<gnome-base/gvfs-1.6.4-r990 dbus? ( gnome-base/dconf ) mime? ( x11-misc/shared-mime-info )
 RDEPEND=!<dev-util/gdbus-codegen-2.52.3 >=dev-libs/libpcre-8.13:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libffi-3.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] kernel_linux? ( sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xattr? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fam? ( >=virtual/fam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-util/gdbus-codegen-2.52.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/libelf:0= )
@@ -12,4 +12,4 @@ REQUIRED_USE=utils? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targ
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.52/glib-2.52.3.tar.xz https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=40f5af02ef76cbafa95393cc71dacadf
+_md5_=61571b48611177dd36dfc7b4d15ac628
diff --git a/metadata/md5-cache/dev-libs/gmime-3.0.5 b/metadata/md5-cache/dev-libs/gmime-3.0.5
index 0c843c2d7730..57cab3699a86 100644
--- a/metadata/md5-cache/dev-libs/gmime-3.0.5
+++ b/metadata/md5-cache/dev-libs/gmime-3.0.5
@@ -4,10 +4,10 @@ DESCRIPTION=Utilities for creating and parsing messages using MIME
 EAPI=6
 HOMEPAGE=http://spruce.sourceforge.net/gmime/ https://developer.gnome.org/gmime/stable/
 IUSE=crypt doc idn static-libs test vala
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.32.0:2 sys-libs/zlib crypt? ( >=app-crypt/gpgme-1.8.0:1= ) idn? ( net-dns/libidn ) vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) >=dev-libs/gobject-introspection-1.30.0:= )
 SLOT=3.0
 SRC_URI=mirror://gnome/sources/gmime/3.0/gmime-3.0.5.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d211c8e67277c50fb10620ed627aa312
+_md5_=dc795d7dd5a5545827b70e7ce8d9ae35
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-1.52.1 b/metadata/md5-cache/dev-libs/gobject-introspection-1.52.1
index 5f6e22a49ea2..b38aba72e6a0 100644
--- a/metadata/md5-cache/dev-libs/gobject-introspection-1.52.1
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-1.52.1
@@ -4,7 +4,7 @@ DESCRIPTION=Introspection system for GObject-based libraries
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/GObjectIntrospection
 IUSE=cairo doctool test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+ GPL-2+
 PDEPEND=cairo? ( x11-libs/cairo[glib] )
 RDEPEND=>=dev-libs/gobject-introspection-common-1.52.1 >=dev-libs/glib-2.52:2 doctool? ( dev-python/mako[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) virtual/libffi:= virtual/pkgconfig !<dev-lang/vala-0.20.0 python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4
 SLOT=0
 SRC_URI=mirror://gnome/sources/gobject-introspection/1.52/gobject-introspection-1.52.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9cf5aaf400c1067a21683413ec16787d
+_md5_=5abbddd52e0ba7f42a1b81ea3b481e57
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-common-1.52.1 b/metadata/md5-cache/dev-libs/gobject-introspection-common-1.52.1
index ec311b19157c..824b8f6cd447 100644
--- a/metadata/md5-cache/dev-libs/gobject-introspection-common-1.52.1
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-common-1.52.1
@@ -3,10 +3,10 @@ DEPEND=app-arch/xz-utils
 DESCRIPTION=Build infrastructure for GObject Introspection
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/GObjectIntrospection
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=HPND
 RDEPEND=!<dev-libs/gobject-introspection-1.52.1
 SLOT=0
 SRC_URI=mirror://gnome/sources/gobject-introspection/1.52/gobject-introspection-1.52.1.tar.xz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=4c7cd03e0896619868146d4611ae098c
+_md5_=c133ebfb1b0bb6450ecd698e3306c60f
diff --git a/metadata/md5-cache/dev-libs/libebml-1.3.5 b/metadata/md5-cache/dev-libs/libebml-1.3.5
index 2125ab8fa6fa..2a6c67feb88f 100644
--- a/metadata/md5-cache/dev-libs/libebml-1.3.5
+++ b/metadata/md5-cache/dev-libs/libebml-1.3.5
@@ -4,9 +4,9 @@ DESCRIPTION=Extensible binary format library (kinda like XML)
 EAPI=6
 HOMEPAGE=https://www.matroska.org/ https://github.com/Matroska-Org/libebml/
 IUSE=debug static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=LGPL-2.1
 SLOT=0/4
 SRC_URI=https://dl.matroska.org/downloads/libebml/libebml-1.3.5.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=36c471f6ec182f8ff31db5f4c4da2c36
+_md5_=475c0e0d15f1b5b09d48f27e2a4370b0
diff --git a/metadata/md5-cache/dev-libs/libgit2-0.26.0 b/metadata/md5-cache/dev-libs/libgit2-0.26.0
index 6f2d33986344..59c7c646e44a 100644
--- a/metadata/md5-cache/dev-libs/libgit2-0.26.0
+++ b/metadata/md5-cache/dev-libs/libgit2-0.26.0
@@ -4,10 +4,10 @@ DESCRIPTION=A linkable library for Git
 EAPI=5
 HOMEPAGE=https://libgit2.github.com/
 IUSE=examples gssapi libressl +ssh test +threads trace
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86 ~ppc-macos
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~x86 ~ppc-macos
 LICENSE=GPL-2-with-linking-exception
 RDEPEND=!libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) sys-libs/zlib net-libs/http-parser:= gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 )
 SLOT=0/26
 SRC_URI=https://github.com/libgit2/libgit2/archive/v0.26.0.tar.gz -> libgit2-0.26.0.tar.gz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9e8c6e3fa68ab231432008434f95879c
+_md5_=034b4b5d2cf0997ef3332041a1b3a73d
diff --git a/metadata/md5-cache/dev-libs/libgit2-glib-0.26.2 b/metadata/md5-cache/dev-libs/libgit2-glib-0.26.2
index 42a4b5965bb5..8619dc8c5d5c 100644
--- a/metadata/md5-cache/dev-libs/libgit2-glib-0.26.2
+++ b/metadata/md5-cache/dev-libs/libgit2-glib-0.26.2
@@ -4,11 +4,11 @@ DESCRIPTION=Git library for GLib
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Libgit2-glib
 IUSE=python +ssh +vala python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/gobject-introspection-0.10.1:= >=dev-libs/glib-2.44.0:2 >=dev-libs/libgit2-0.26.0:0/26[ssh?] python? ( python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
 REQUIRED_USE=python? ( || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libgit2-glib/0.26/libgit2-glib-0.26.2.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c8442e918bcce4a837430f5a1d048af1
+_md5_=8e03a05ab75e302b108dabc92a97cc92
diff --git a/metadata/md5-cache/dev-libs/libgweather-3.24.1 b/metadata/md5-cache/dev-libs/libgweather-3.24.1
index d4ab112599b2..8e995d06cfcf 100644
--- a/metadata/md5-cache/dev-libs/libgweather-3.24.1
+++ b/metadata/md5-cache/dev-libs/libgweather-3.24.1
@@ -4,11 +4,11 @@ DESCRIPTION=Library to access weather information from online services
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/LibGWeather
 IUSE=glade +introspection vala
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=>=x11-libs/gtk+-3.13.5:3[introspection?] >=dev-libs/glib-2.35.1:2 >=net-libs/libsoup-2.44:2.4 >=dev-libs/libxml2-2.6.0:2 sci-geosciences/geocode-glib >=sys-libs/timezone-data-2010k glade? ( >=dev-util/glade-3.16:3.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) !<gnome-base/gnome-applets-2.22.0
 REQUIRED_USE=vala? ( introspection )
 SLOT=2/3-6
 SRC_URI=mirror://gnome/sources/libgweather/3.24/libgweather-3.24.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a65739c4ca9251482ff4e6993c36a754
+_md5_=d8fb7dd5e114484e77295f8397480343
diff --git a/metadata/md5-cache/dev-libs/libinput-1.9.4 b/metadata/md5-cache/dev-libs/libinput-1.9.4
index a743ffbbc560..e2ecfa9cc004 100644
--- a/metadata/md5-cache/dev-libs/libinput-1.9.4
+++ b/metadata/md5-cache/dev-libs/libinput-1.9.4
@@ -4,11 +4,11 @@ DESCRIPTION=Library to handle input devices in Wayland
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/libinput/
 IUSE=doc input_devices_wacom test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86
 LICENSE=MIT
 RDEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.3 >=sys-libs/mtdev-1.1 virtual/libudev
 RESTRICT=test
 SLOT=0/10
 SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.9.4.tar.xz
 _eclasses_=meson	f8e09b2b2ac1e9bb0bd374b6ad77a90d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182
-_md5_=475bb144bccfb548b2bbc1d084c17969
+_md5_=f14bbfc4179a1ef39a933702d4edd1a9
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.9.7 b/metadata/md5-cache/dev-libs/libxml2-2.9.7
index 32e0ba9deba4..5c1e0e86259c 100644
--- a/metadata/md5-cache/dev-libs/libxml2-2.9.7
+++ b/metadata/md5-cache/dev-libs/libxml2-2.9.7
@@ -4,11 +4,11 @@ DESCRIPTION=Version 2 of the library to manipulate XML files
 EAPI=6
 HOMEPAGE=http://www.xmlsoft.org/
 IUSE=debug examples icu ipv6 lzma python readline static-libs test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) readline? ( sys-libs/readline:= )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=2
 SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.7.tar.gz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz http://www.w3.org/XML/Test/xmlts20080827.tar.gz )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=a1ed4c02a2cb520a71193fe37f70dcdb
+_md5_=20fbc0d30ba5ed36e59c15b8850a8323
diff --git a/metadata/md5-cache/dev-libs/vala-common-0.36.7 b/metadata/md5-cache/dev-libs/vala-common-0.36.7
index 6705d66ab4bc..4ffb117298b7 100644
--- a/metadata/md5-cache/dev-libs/vala-common-0.36.7
+++ b/metadata/md5-cache/dev-libs/vala-common-0.36.7
@@ -3,10 +3,10 @@ DEPEND=app-arch/xz-utils
 DESCRIPTION=Build infrastructure for packages that use Vala
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Vala
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=LGPL-2.1
 RDEPEND=!<dev-lang/vala-0.10.4-r2 !<dev-lang/vala-0.12.1-r1:0.12 !<dev-lang/vala-0.14.2-r2:0.14 !<dev-lang/vala-0.16.1-r2:0.16 !<dev-lang/vala-0.17.5:0.18
 SLOT=0
 SRC_URI=mirror://gnome/sources/vala/0.36/vala-0.36.7.tar.xz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=94900143fdb1b84f1572125cd65513ef
+_md5_=81efbc3dc9be13f22429f9e69ae1f59c
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index 35d87c9c7275..cd44e53aec8d 100644
--- a/metadata/md5-cache/dev-php/Manifest.gz
+++ b/metadata/md5-cache/dev-php/Manifest.gz
diff --git a/metadata/md5-cache/dev-php/PEAR-Exception-1.0.0 b/metadata/md5-cache/dev-php/PEAR-Exception-1.0.0
index 9b2fd32b9481..6dfe15346611 100644
--- a/metadata/md5-cache/dev-php/PEAR-Exception-1.0.0
+++ b/metadata/md5-cache/dev-php/PEAR-Exception-1.0.0
@@ -4,9 +4,9 @@ DESCRIPTION=The PEAR Exception base class
 EAPI=6
 HOMEPAGE=http://pear.php.net/package/PEAR_Exception
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 sparc ~x86
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=BSD-2
 RDEPEND=dev-lang/php:* !<=dev-php/PEAR-PEAR-1.10.3-r1
 SLOT=0
 SRC_URI=http://download.pear.php.net/package/PEAR_Exception-1.0.0.tgz
-_md5_=58676a7ffa1347d3544558c0c0ab98cd
+_md5_=8e7c34de0d35ecbf3394ee2e351d2a25
diff --git a/metadata/md5-cache/dev-php/PEAR-PEAR-1.10.1-r1 b/metadata/md5-cache/dev-php/PEAR-PEAR-1.10.1-r1
deleted file mode 100644
index 4445964c0089..000000000000
--- a/metadata/md5-cache/dev-php/PEAR-PEAR-1.10.1-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst setup
-DESCRIPTION=PEAR Base System
-EAPI=6
-HOMEPAGE=http://pear.php.net/package/PEAR
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=MIT
-RDEPEND=dev-lang/php:*[cli,xml,zlib] >=dev-php/PEAR-Archive_Tar-1.4.0 >=dev-php/PEAR-Console_Getopt-1.4.1 >=dev-php/PEAR-Structures_Graph-1.1.0 >=dev-php/PEAR-XML_Util-1.3.0
-SLOT=0
-SRC_URI=http://pear.php.net/get/PEAR-1.10.1.tgz
-_md5_=ed0f4094f0a90fbfb1c30667f41bd166
diff --git a/metadata/md5-cache/dev-php/PEAR-PEAR-1.10.5 b/metadata/md5-cache/dev-php/PEAR-PEAR-1.10.5
index 7853739f70f5..0670a7bca47c 100644
--- a/metadata/md5-cache/dev-php/PEAR-PEAR-1.10.5
+++ b/metadata/md5-cache/dev-php/PEAR-PEAR-1.10.5
@@ -2,9 +2,9 @@ DEFINED_PHASES=config install postinst prepare prerm setup
 DESCRIPTION=PEAR Base System
 EAPI=6
 HOMEPAGE=http://pear.php.net/package/PEAR
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 sparc ~x86
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=MIT
 RDEPEND=dev-lang/php:*[cli,xml,zlib] >=dev-php/PEAR-Archive_Tar-1.4.0 >=dev-php/PEAR-Console_Getopt-1.4.1 dev-php/PEAR-Exception >=dev-php/PEAR-Structures_Graph-1.1.0 >=dev-php/PEAR-XML_Util-1.3.0
 SLOT=0
 SRC_URI=http://pear.php.net/get/PEAR-1.10.5.tgz
-_md5_=5ed69bdc308e016da61aab2990ec7594
+_md5_=6f2db8e05e4d603164d51dbfeec73166
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 3544bb380841..ef59c6705135 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/compizconfig-python-0.8.4-r5 b/metadata/md5-cache/dev-python/compizconfig-python-0.8.4-r5
deleted file mode 100644
index 409991d7f2f0..000000000000
--- a/metadata/md5-cache/dev-python/compizconfig-python-0.8.4-r5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-libs/glib-2.6 >=x11-libs/libcompizconfig-0.8.4 dev-python/pyrex[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/pkgconfig >=app-portage/elt-patches-20170422
-DESCRIPTION=Compizconfig Python Bindings
-EAPI=5
-HOMEPAGE=http://www.compiz.org/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-libs/glib-2.6 >=x11-libs/libcompizconfig-0.8.4
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://releases.compiz.org/0.8.4/compizconfig-python-0.8.4.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=b7d0c423c7456694a537111c89af7e45
diff --git a/metadata/md5-cache/dev-python/dbusmock-0.16.9 b/metadata/md5-cache/dev-python/dbusmock-0.16.9
index defac1556dab..11ce6f37baf7 100644
--- a/metadata/md5-cache/dev-python/dbusmock-0.16.9
+++ b/metadata/md5-cache/dev-python/dbusmock-0.16.9
@@ -4,11 +4,11 @@ DESCRIPTION=Easily create mock objects on D-Bus for software testing
 EAPI=6
 HOMEPAGE=https://github.com/martinpitt/python-dbusmock
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-3+
 RDEPEND=dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-dbusmock/python-dbusmock-0.16.9.tar.gz -> dbusmock-0.16.9.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=30f9a736552c573c4f3ccd109942b79e
+_md5_=9fbf58b198be2aacebf70a69edf230d7
diff --git a/metadata/md5-cache/dev-python/pyatspi-2.24.0 b/metadata/md5-cache/dev-python/pyatspi-2.24.0
index 232fee60ab72..0dcf3d24281d 100644
--- a/metadata/md5-cache/dev-python/pyatspi-2.24.0
+++ b/metadata/md5-cache/dev-python/pyatspi-2.24.0
@@ -4,11 +4,11 @@ DESCRIPTION=Python binding to at-spi library
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Accessibility
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86
 LICENSE=LGPL-2 GPL-2+
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-libs/atk-2.11.2 dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygobject-2.90.1:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sys-apps/dbus-1 >=app-accessibility/at-spi2-core-2.20.2[introspection] !<gnome-extra/at-spi-1.32.0-r1
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/pyatspi/2.24/pyatspi-2.24.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=944d3c7325f83d4b2d381179cffc1831
+_md5_=41164360da2ad8217c4c1631ddbdaced
diff --git a/metadata/md5-cache/dev-python/pygit2-0.26.3 b/metadata/md5-cache/dev-python/pygit2-0.26.3
index a8b73e9246d5..42f91b4a297a 100644
--- a/metadata/md5-cache/dev-python/pygit2-0.26.3
+++ b/metadata/md5-cache/dev-python/pygit2-0.26.3
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings for libgit2
 EAPI=6
 HOMEPAGE=https://github.com/libgit2/pygit2 https://pypi.python.org/pypi/pygit2
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2-with-linking-exception
 RDEPEND==dev-libs/libgit2-0.26* >=dev-python/cffi-1.0:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pygit2/pygit2-0.26.3.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3937317dc3c08051e272ad1dcd2ce0ae
+_md5_=1c47335c7c44aea347f90018a0b6a936
diff --git a/metadata/md5-cache/dev-python/pygobject-3.24.1 b/metadata/md5-cache/dev-python/pygobject-3.24.1
index 1c42b3c85581..97dee1170caf 100644
--- a/metadata/md5-cache/dev-python/pygobject-3.24.1
+++ b/metadata/md5-cache/dev-python/pygobject-3.24.1
@@ -4,11 +4,11 @@ DESCRIPTION=GLib's GObject library bindings for Python
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/PyGObject
 IUSE=+cairo examples test +threads python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
-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 ~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 ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-1.46.0:= virtual/libffi:= cairo? ( >=dev-python/pycairo-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-libs/cairo ) !<dev-python/pygtk-2.13 !<dev-python/pygobject-2.28.6-r50:2[introspection]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) test? ( cairo )
 SLOT=3
 SRC_URI=mirror://gnome/sources/pygobject/3.24/pygobject-3.24.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fa4cc8a152b507ca46547e43536748fc
+_md5_=8b8ab476b5aa7143c05ae961ff31c711
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index f5e5e34265d9..10041c8afd7b 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/ae-1.8.2 b/metadata/md5-cache/dev-ruby/ae-1.8.2
index 5eb6cf3bc9be..caaad97eebfc 100644
--- a/metadata/md5-cache/dev-ruby/ae-1.8.2
+++ b/metadata/md5-cache/dev-ruby/ae-1.8.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.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 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=Assertive Expressive is an assertions library designed for reuse
 EAPI=5
 HOMEPAGE=https://rubyworks.github.io/ae/
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD-2
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.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 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) 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_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/ae-1.8.2.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=31057422dbdd82c98b4342ed605535a1
+_md5_=7b7702fb10c729e18daf2c1a38c9271a
diff --git a/metadata/md5-cache/dev-ruby/asciidoctor-1.5.6.1 b/metadata/md5-cache/dev-ruby/asciidoctor-1.5.6.1
index 82fa785f1efc..7c26d8025712 100644
--- a/metadata/md5-cache/dev-ruby/asciidoctor-1.5.6.1
+++ b/metadata/md5-cache/dev-ruby/asciidoctor-1.5.6.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( dev-util/cucumber[ruby_targets_ruby22] dev-ruby/rspec-expectations:*[ruby_targets_ruby22] dev-ruby/asciimath[ruby_targets_ruby22] dev-ruby/coderay[ruby_targets_ruby22] dev-ruby/erubis[ruby_targets_ruby22] dev-ruby/haml[ruby_targets_ruby22] dev-ruby/nokogiri[ruby_targets_ruby22] dev-ruby/slim[ruby_targets_ruby22] dev-ruby/tilt[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-util/cucumber[ruby_targets_ruby23] dev-ruby/rspec-expectations:*[ruby_targets_ruby23] dev-ruby/asciimath[ruby_targets_ruby23] dev-ruby/coderay[ruby_targets_ruby23] dev-ruby/erubis[ruby_targets_ruby23] dev-ruby/haml[ruby_targets_ruby23] dev-ruby/nokogiri[ruby_targets_ruby23] dev-ruby/slim[ruby_targets_ruby23] dev-ruby/tilt[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-util/cucumber[ruby_targets_ruby22] dev-ruby/rspec-expectations:*[ruby_targets_ruby22] dev-ruby/asciimath[ruby_targets_ruby22] dev-ruby/coderay[ruby_targets_ruby22] dev-ruby/erubis[ruby_targets_ruby22] dev-ruby/haml[ruby_targets_ruby22] dev-ruby/nokogiri[ruby_targets_ruby22] dev-ruby/slim[ruby_targets_ruby22] dev-ruby/tilt[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-util/cucumber[ruby_targets_ruby23] dev-ruby/rspec-expectations:*[ruby_targets_ruby23] dev-ruby/asciimath[ruby_targets_ruby23] dev-ruby/coderay[ruby_targets_ruby23] dev-ruby/erubis[ruby_targets_ruby23] dev-ruby/haml[ruby_targets_ruby23] dev-ruby/nokogiri[ruby_targets_ruby23] dev-ruby/slim[ruby_targets_ruby23] dev-ruby/tilt[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-util/cucumber[ruby_targets_ruby24] dev-ruby/rspec-expectations:*[ruby_targets_ruby24] dev-ruby/asciimath[ruby_targets_ruby24] dev-ruby/coderay[ruby_targets_ruby24] dev-ruby/erubis[ruby_targets_ruby24] dev-ruby/haml[ruby_targets_ruby24] dev-ruby/nokogiri[ruby_targets_ruby24] dev-ruby/slim[ruby_targets_ruby24] dev-ruby/tilt[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Processor for converting AsciiDoc into HTML 5, DocBook 4.5 and other formats
 EAPI=6
 HOMEPAGE=https://github.com/asciidoctor/asciidoctor
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/asciidoctor/asciidoctor/archive/v1.5.6.1.tar.gz -> asciidoctor-1.5.6.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=a4ea8a8017ac5d3542e03e7a43379f20
+_md5_=7e003623276fba31b8927a5bba409cc3
diff --git a/metadata/md5-cache/dev-ruby/asciidoctor-diagram-1.5.7 b/metadata/md5-cache/dev-ruby/asciidoctor-diagram-1.5.7
new file mode 100644
index 000000000000..3d1f19794bd0
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/asciidoctor-diagram-1.5.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby22? ( =dev-ruby/asciidoctor-1.5*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/asciidoctor-1.5*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DESCRIPTION=A set of Asciidoctor extensions that enable you to add diagrams
+EAPI=6
+HOMEPAGE=https://github.com/asciidoctor/asciidoctor-diagram
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( =dev-ruby/asciidoctor-1.5*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/asciidoctor-1.5*[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+SLOT=0
+SRC_URI=https://github.com/asciidoctor/asciidoctor-diagram/archive/v1.5.7.tar.gz -> asciidoctor-diagram-1.5.7.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=8e769c05d829db968d8c1823452e139d
diff --git a/metadata/md5-cache/dev-ruby/atomic-1.1.99 b/metadata/md5-cache/dev-ruby/atomic-1.1.99
index 27049d3a35fa..98f75a430128 100644
--- a/metadata/md5-cache/dev-ruby/atomic-1.1.99
+++ b/metadata/md5-cache/dev-ruby/atomic-1.1.99
@@ -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_ruby22 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_ruby22? ( dev-lang/ruby:2.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 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) 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_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/atomic-1.1.99.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=91d45ddc7e9c1537cab5ea059af6a1fc
+_md5_=5045bb00033789b91d53c88414d7914d
diff --git a/metadata/md5-cache/dev-ruby/brass-1.2.1 b/metadata/md5-cache/dev-ruby/brass-1.2.1
index a81ce260571e..55d3f15afa9a 100644
--- a/metadata/md5-cache/dev-ruby/brass-1.2.1
+++ b/metadata/md5-cache/dev-ruby/brass-1.2.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.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 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=BRASS is a very basic assertions framework for Ruby
 EAPI=5
 HOMEPAGE=https://rubyworks.github.io/brass/
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD-2
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.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 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) 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_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/brass-1.2.1.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=95568f9fb9c06f29a1d90cb5754762e4
+_md5_=60723442c06832050ca8bffea74548bd
diff --git a/metadata/md5-cache/dev-ruby/maxitest-2.5.0 b/metadata/md5-cache/dev-ruby/maxitest-2.5.0
new file mode 100644
index 000000000000..0fa35ddddad8
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/maxitest-2.5.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby22? ( <dev-ruby/minitest-5.12:5[ruby_targets_ruby22] ) ruby_targets_ruby23? ( <dev-ruby/minitest-5.12:5[ruby_targets_ruby23] ) ruby_targets_ruby24? ( <dev-ruby/minitest-5.12:5[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bundler[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=Minitest + all the features you always wanted
+EAPI=6
+HOMEPAGE=https://github.com/grosser/maxitest
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( <dev-ruby/minitest-5.12:5[ruby_targets_ruby22] ) ruby_targets_ruby23? ( <dev-ruby/minitest-5.12:5[ruby_targets_ruby23] ) ruby_targets_ruby24? ( <dev-ruby/minitest-5.12:5[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=1
+SRC_URI=https://github.com/grosser/maxitest/archive/v2.5.0.tar.gz -> maxitest-2.5.0.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=fcb6afd3d1ad056ebcc276f68676604a
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.11.3 b/metadata/md5-cache/dev-ruby/minitest-5.11.3
new file mode 100644
index 000000000000..60638c1e0518
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/minitest-5.11.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.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 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=minitest/unit is a small and fast replacement for ruby's huge and slow test/unit
+EAPI=6
+HOMEPAGE=https://github.com/seattlerb/minitest
+IUSE=doc test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+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
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.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 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) 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_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=5
+SRC_URI=mirror://rubygems/minitest-5.11.3.gem
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=0bd8985587a63e3efaadc63cdcb70203
diff --git a/metadata/md5-cache/dev-ruby/qed-2.9.2 b/metadata/md5-cache/dev-ruby/qed-2.9.2
index e06a0d35cf78..9a3288bac44e 100644
--- a/metadata/md5-cache/dev-ruby/qed-2.9.2
+++ b/metadata/md5-cache/dev-ruby/qed-2.9.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/ae[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/ae[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/ansi[ruby_targets_ruby22] dev-ruby/brass[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/ansi[ruby_targets_ruby23] dev-ruby/brass[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/ae[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/ae[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/ae[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/ansi[ruby_targets_ruby22] dev-ruby/brass[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/ansi[ruby_targets_ruby23] dev-ruby/brass[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/ansi[ruby_targets_ruby24] dev-ruby/brass[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=QED (Quality Ensured Demonstrations) is a TDD/BDD framework
 EAPI=5
 HOMEPAGE=https://rubyworks.github.io/qed/
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD-2
-RDEPEND=ruby_targets_ruby22? ( dev-ruby/ansi[ruby_targets_ruby22] dev-ruby/brass[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/ansi[ruby_targets_ruby23] dev-ruby/brass[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/ansi[ruby_targets_ruby22] dev-ruby/brass[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/ansi[ruby_targets_ruby23] dev-ruby/brass[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/ansi[ruby_targets_ruby24] dev-ruby/brass[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/qed-2.9.2.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=c8e47d1628a379161ee848b9a434b699
+_md5_=06bdd80b9c26579392599ecfc451df03
diff --git a/metadata/md5-cache/dev-ruby/spring-2.0.2 b/metadata/md5-cache/dev-ruby/spring-2.0.2
index f1871febb28c..eb77c2414ccd 100644
--- a/metadata/md5-cache/dev-ruby/spring-2.0.2
+++ b/metadata/md5-cache/dev-ruby/spring-2.0.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] dev-ruby/activesupport[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] dev-ruby/activesupport[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] dev-ruby/activesupport[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] dev-ruby/activesupport[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bundler[ruby_targets_ruby24] dev-ruby/activesupport[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Rails application preloader
 EAPI=6
 HOMEPAGE=https://github.com/rails/spring
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~arm ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1.1
 SRC_URI=https://github.com/rails/spring/archive/v2.0.2.tar.gz -> spring-2.0.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=d7c7e47701c44c423cea54dbbb84f2a7
+_md5_=53d9d45f2d0e0de8737c2dc38bd81bd8
diff --git a/metadata/md5-cache/dev-ruby/thread_safe-0.3.6 b/metadata/md5-cache/dev-ruby/thread_safe-0.3.6
index f2470417c127..bf0600c72347 100644
--- a/metadata/md5-cache/dev-ruby/thread_safe-0.3.6
+++ b/metadata/md5-cache/dev-ruby/thread_safe-0.3.6
@@ -4,11 +4,11 @@ DESCRIPTION=A collection of thread-safe versions of common core Ruby classes
 EAPI=5
 HOMEPAGE=https://github.com/ruby-concurrency/thread_safe
 IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/thread_safe-0.3.6.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=a4c3ae33a2de9f5406ba4c1193fba096
+_md5_=0a9a89430e123b85f54d054c62d85988
diff --git a/metadata/md5-cache/dev-ruby/tzinfo-1.2.4 b/metadata/md5-cache/dev-ruby/tzinfo-1.2.4
index f6a0121609e1..5c2f6ac052d7 100644
--- a/metadata/md5-cache/dev-ruby/tzinfo-1.2.4
+++ b/metadata/md5-cache/dev-ruby/tzinfo-1.2.4
@@ -4,11 +4,11 @@ DESCRIPTION=Daylight-savings aware timezone library
 EAPI=6
 HOMEPAGE=https://tzinfo.github.io/
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=sys-libs/timezone-data ruby_targets_ruby22? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1
 SRC_URI=mirror://rubygems/tzinfo-1.2.4.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=7d26d6d41e5144c2dad221d3258cac79
+_md5_=8e9bd90475a6957039a97b2efc5b77af
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 14a4ef7d50ef..ae5dbc889ca6 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/android-tools-8.1.0_p1 b/metadata/md5-cache/dev-util/android-tools-8.1.0_p1
new file mode 100644
index 000000000000..7f232ffb8320
--- /dev/null
+++ b/metadata/md5-cache/dev-util/android-tools-8.1.0_p1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=sys-libs/zlib:= dev-libs/libpcre2:= virtual/libusb:1= dev-lang/go dev-util/ninja >=dev-util/cmake-3.7.2
+DESCRIPTION=Android platform tools (adb, fastboot, and mkbootimg)
+EAPI=6
+HOMEPAGE=https://android.googlesource.com/platform/system/core.git/
+IUSE=python python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~x86 ~arm-linux ~x86-linux
+LICENSE=Apache-2.0 BSD-2
+RDEPEND=sys-libs/zlib:= dev-libs/libpcre2:= virtual/libusb:1= python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
+SLOT=0
+SRC_URI=https://git.archlinux.org/svntogit/community.git/snapshot/community-2b7f9774cc468205fec145e64e9103aee8e5c6f9.tar.gz -> android-tools-8.1.0_r1-arch.tar.gz https://github.com/android/platform_system_core/archive/android-8.1.0_r1.tar.gz -> android-tools-8.1.0_r1-core.tar.gz https://github.com/google/boringssl/archive/14308731e5446a73ac2258688a9688b524483cb6.tar.gz -> boringssl-14308731e5446a73ac2258688a9688b524483cb6.tar.gz mirror://gentoo/android-tools-8.1.0_r1-extras.tar.xz https://dev.gentoo.org/~vapier/dist/android-tools-8.1.0_r1-extras.tar.xz mirror://gentoo/android-tools-8.1.0_r1-selinux.tar.xz https://dev.gentoo.org/~vapier/dist/android-tools-8.1.0_r1-selinux.tar.xz mirror://gentoo/android-tools-8.1.0_r1-f2fs-tools.tar.xz https://dev.gentoo.org/~vapier/dist/android-tools-8.1.0_r1-f2fs-tools.tar.xz mirror://gentoo/android-tools-8.1.0_r1.ninja.xz https://dev.gentoo.org/~vapier/dist/android-tools-8.1.0_r1.ninja.xz
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=424f5e5dba00f1aa97ab9404a9cd56f5
diff --git a/metadata/md5-cache/dev-util/bitcoin-tx-0.15.1 b/metadata/md5-cache/dev-util/bitcoin-tx-0.15.1
index bd60bda238e7..b80862d2e80a 100644
--- a/metadata/md5-cache/dev-util/bitcoin-tx-0.15.1
+++ b/metadata/md5-cache/dev-util/bitcoin-tx-0.15.1
@@ -4,10 +4,10 @@ DESCRIPTION=Command-line Bitcoin transaction tool
 EAPI=6
 HOMEPAGE=http://bitcoincore.org/ http://bitcoinknots.org/
 IUSE=knots libressl
-KEYWORDS=~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=!libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) >=dev-libs/libsecp256k1-0.0.0_pre20151118[recovery] dev-libs/univalue >=dev-libs/boost-1.52.0:=[threads(+)]
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/7b57bc998f334775b50ebc8ca5e78ca728db4c58.tar.gz -> bitcoin-v0.15.1.tar.gz http://bitcoinknots.org/files/0.15.x/0.15.1.knots20171111/bitcoin-0.15.1.knots20171111.patches.txz -> bitcoin-0.15.1.knots20171111.patches.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=68b29ee4d319894d2552ac8099fb45ac
+_md5_=23d797fe488c35cfb17741e379150fb8
diff --git a/metadata/md5-cache/dev-util/devhelp-3.24.0 b/metadata/md5-cache/dev-util/devhelp-3.24.0
index 0d08d79c4077..d86d63a3244c 100644
--- a/metadata/md5-cache/dev-util/devhelp-3.24.0
+++ b/metadata/md5-cache/dev-util/devhelp-3.24.0
@@ -4,11 +4,11 @@ DESCRIPTION=An API documentation browser for GNOME
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Devhelp
 IUSE=gedit +introspection python_targets_python3_4 python_targets_python3_5 python_single_target_python3_4 python_single_target_python3_5
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.38:2[dbus] >=x11-libs/gtk+-3.20:3 >=net-libs/webkit-gtk-2.6.0:4 introspection? ( >=dev-libs/gobject-introspection-1.30:= ) gedit? ( python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] app-editors/gedit[introspection,python,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] x11-libs/gtk+[introspection] ) gnome-base/gsettings-desktop-schemas
 REQUIRED_USE=gedit? ( ^^ ( python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) )
 SLOT=0/3-3
 SRC_URI=mirror://gnome/sources/devhelp/3.24/devhelp-3.24.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=993aed9cf220a6cc5bba8333478bffde
+_md5_=9d5fc07ab65982f499bf2385db63340a
diff --git a/metadata/md5-cache/dev-util/gdbus-codegen-2.52.3 b/metadata/md5-cache/dev-util/gdbus-codegen-2.52.3
index fc2fd856c5d9..d3a40149351d 100644
--- a/metadata/md5-cache/dev-util/gdbus-codegen-2.52.3
+++ b/metadata/md5-cache/dev-util/gdbus-codegen-2.52.3
@@ -4,7 +4,7 @@ DESCRIPTION=GDBus code and documentation generator
 EAPI=5
 HOMEPAGE=https://www.gtk.org/
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=LGPL-2+
 PDEPEND=>=dev-libs/glib-2.52.3:2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib/2.52/glib-2.52.3.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fad6e7c735ec7dac2222f8a6b50bc460
+_md5_=0e002c887e29a58134bdbfae9146485f
diff --git a/metadata/md5-cache/dev-util/glade-3.20.2 b/metadata/md5-cache/dev-util/glade-3.20.2
index 79a7dd6d3e4c..a8e64d5c2190 100644
--- a/metadata/md5-cache/dev-util/glade-3.20.2
+++ b/metadata/md5-cache/dev-util/glade-3.20.2
@@ -4,11 +4,11 @@ DESCRIPTION=A user interface designer for GTK+ and GNOME
 EAPI=6
 HOMEPAGE=https://glade.gnome.org/
 IUSE=debug +introspection python python_targets_python2_7 test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2+ FDL-1.1+
 RDEPEND=dev-libs/atk[introspection?] >=dev-libs/glib-2.32:2 >=dev-libs/libxml2-2.4.0:2 x11-libs/cairo:= x11-libs/gdk-pixbuf:2[introspection?] >=x11-libs/gtk+-3.20.0:3[introspection?] x11-libs/pango[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.32:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygobject-3.8:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=3.10/6
 SRC_URI=mirror://gnome/sources/glade/3.20/glade-3.20.2.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7a96d30cfa7b7721f765ec4fd0bab603
+_md5_=1596038e582761d9abbce7db3ffa9de6
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.1.85 b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.1.85
new file mode 100644
index 000000000000..318f98e2a78a
--- /dev/null
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.1.85
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=~dev-util/nvidia-cuda-toolkit-9.1.85 media-libs/freeglut examples? ( media-libs/freeimage media-libs/glew:0= >=x11-drivers/nvidia-drivers-387.26[uvm] mpi? ( virtual/mpi ) )
+DESCRIPTION=NVIDIA CUDA Software Development Kit
+EAPI=6
+HOMEPAGE=https://developer.nvidia.com/cuda-zone
+IUSE=+cuda debug +doc +examples opencl mpi
+KEYWORDS=~amd64 ~amd64-linux
+LICENSE=CUDPP
+RDEPEND=~dev-util/nvidia-cuda-toolkit-9.1.85 media-libs/freeglut examples? ( media-libs/freeimage media-libs/glew:0= >=x11-drivers/nvidia-drivers-387.26[uvm] mpi? ( virtual/mpi ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://developer.nvidia.com/compute/cuda/9.1/Prod2/local_installers/cuda_9.1.85_387.26_linux -> cuda_9.1.85_387.26_linux.run
+_eclasses_=cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=f36aad04c20ab126f5f630e8801499b9
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.1.85 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.1.85
new file mode 100644
index 000000000000..02adb8738e62
--- /dev/null
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.1.85
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst prepare pretend setup unpack
+DESCRIPTION=NVIDIA CUDA Toolkit (compiler and friends)
+EAPI=6
+HOMEPAGE=https://developer.nvidia.com/cuda-zone
+IUSE=debugger doc eclipse profiler
+KEYWORDS=-* ~amd64 ~amd64-linux
+LICENSE=NVIDIA-CUDA
+RDEPEND=<sys-devel/gcc-7[cxx] >=x11-drivers/nvidia-drivers-387.26[X,uvm] debugger? ( sys-libs/libtermcap-compat sys-libs/ncurses:5/5[tinfo] ) eclipse? ( >=virtual/jre-1.6 ) profiler? ( >=virtual/jre-1.6 )
+SLOT=0/9.1.85
+SRC_URI=https://developer.nvidia.com/compute/cuda/9.1/Prod/local_installers/cuda_9.1.85_387.26_linux -> cuda_9.1.85_387.26_linux.run
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=7bc6974df7767af036c0c79301e865ca
diff --git a/metadata/md5-cache/dev-util/pycharm-community-2017.3.3 b/metadata/md5-cache/dev-util/pycharm-community-2017.3.3
new file mode 100644
index 000000000000..d3f5825ae714
--- /dev/null
+++ b/metadata/md5-cache/dev-util/pycharm-community-2017.3.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=>=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Intelligent Python IDE with unique code assistance and analysis
+EAPI=6
+HOMEPAGE=http://www.jetbrains.com/pycharm/
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 BSD CDDL MIT-with-advertising
+RDEPEND=>=virtual/jre-1.8
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=http://download.jetbrains.com/python/pycharm-community-2017.3.3.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2a781754ff9ec8098efa30e11565b00d
diff --git a/metadata/md5-cache/dev-util/pycharm-professional-2017.3.3 b/metadata/md5-cache/dev-util/pycharm-professional-2017.3.3
new file mode 100644
index 000000000000..d6771e055b77
--- /dev/null
+++ b/metadata/md5-cache/dev-util/pycharm-professional-2017.3.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=>=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Intelligent Python IDE with unique code assistance and analysis
+EAPI=6
+HOMEPAGE=http://www.jetbrains.com/pycharm/
+KEYWORDS=~amd64 ~x86
+LICENSE=PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview
+RDEPEND=>=virtual/jre-1.8 dev-python/pip
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=http://download.jetbrains.com/python/pycharm-professional-2017.3.3.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=cb9e489ec7b18af895d6266774de887a
diff --git a/metadata/md5-cache/dev-util/sysprof-3.24.1 b/metadata/md5-cache/dev-util/sysprof-3.24.1
index eed7bb18b9e1..8232d89b5580 100644
--- a/metadata/md5-cache/dev-util/sysprof-3.24.1
+++ b/metadata/md5-cache/dev-util/sysprof-3.24.1
@@ -4,10 +4,10 @@ DESCRIPTION=System-wide Linux Profiler
 EAPI=6
 HOMEPAGE=http://sysprof.com/
 IUSE=debug gtk systemd
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.44:2 gtk? ( sys-auth/polkit >=x11-libs/gtk+-3.22.0:3 ) systemd? ( sys-auth/polkit >=sys-apps/systemd-222 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/sysprof/3.24/sysprof-3.24.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f9188f688b5244015a8b3db7b570eb51
+_md5_=28715b154aab99d8ca4b07ca685a1d60
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 105e863e5ef4..3f04724a9b56 100644
--- a/metadata/md5-cache/dev-vcs/Manifest.gz
+++ b/metadata/md5-cache/dev-vcs/Manifest.gz
diff --git a/metadata/md5-cache/dev-vcs/archway-0.2.1 b/metadata/md5-cache/dev-vcs/archway-0.2.1
deleted file mode 100644
index 25271c57290c..000000000000
--- a/metadata/md5-cache/dev-vcs/archway-0.2.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=A GUI for GNU Arch
-EAPI=3
-HOMEPAGE=http://www.nongnu.org/archway/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2 >=dev-perl/Gtk2-1.040
-SLOT=0
-SRC_URI=https://savannah.nongnu.org/download/archway/archway-0.2.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9b338b3878fb318ccaba442fe2ddfab4
diff --git a/metadata/md5-cache/dev-vcs/bzr-gtk-0.104.0-r1 b/metadata/md5-cache/dev-vcs/bzr-gtk-0.104.0-r1
deleted file mode 100644
index c8c4377bb76d..000000000000
--- a/metadata/md5-cache/dev-vcs/bzr-gtk-0.104.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-vcs/bzr-1.6_rc1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pygobject[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/notify-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pycairo-1.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] nautilus? ( >=dev-python/nautilus-python-1.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] virtual/pkgconfig ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
-DESCRIPTION=A GTK+ interfaces to most Bazaar operations
-EAPI=5
-HOMEPAGE=http://bazaar-vcs.org/bzr-gtk
-IUSE=gnome-keyring gpg nautilus python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-vcs/bzr-1.6_rc1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pygobject[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/notify-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pycairo-1.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] nautilus? ( >=dev-python/nautilus-python-1.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] virtual/pkgconfig ) nautilus? ( >=dev-python/nautilus-python-1.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) dev-python/notify-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] gnome-keyring? ( dev-python/gnome-keyring-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) gpg? ( app-crypt/seahorse ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://launchpad.net/bzr-gtk/gtk3/0.104.0/+download/bzr-gtk-0.104.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=66ad13a8459eb8a6b8d27d7911291446
diff --git a/metadata/md5-cache/dev-vcs/gitg-3.26.0 b/metadata/md5-cache/dev-vcs/gitg-3.26.0
index a43c4c73955a..f3d9cffd5d42 100644
--- a/metadata/md5-cache/dev-vcs/gitg-3.26.0
+++ b/metadata/md5-cache/dev-vcs/gitg-3.26.0
@@ -4,11 +4,11 @@ DESCRIPTION=git repository viewer for GNOME
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Gitg
 IUSE=glade +python python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=app-crypt/libsecret dev-libs/libgee:0.8[introspection] >=app-text/gtkspell-3.0.3:3 >=dev-libs/glib-2.38:2[dbus] >=dev-libs/gobject-introspection-0.10.1:= dev-libs/libgit2:=[threads] >=dev-libs/libgit2-glib-0.25.0[ssh] <dev-libs/libgit2-glib-0.27.0 >=dev-libs/libpeas-1.5.0[gtk] >=dev-libs/libxml2-2.9.0:2 net-libs/libsoup:2.4 >=gnome-base/gsettings-desktop-schemas-0.1.1 >=x11-libs/gtk+-3.20.0:3 >=x11-libs/gtksourceview-3.10:3.0 x11-themes/adwaita-icon-theme glade? ( >=dev-util/glade-3.2:3.10 ) python? ( python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
 REQUIRED_USE=python? ( || ( python_targets_python3_4 python_targets_python3_5 ) )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gitg/3.26/gitg-3.26.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=67cae46d4b272c4a71a4cdd8eca20b72
+_md5_=c1bfc07ab7cd8e538d4ea9302a5c85a3
diff --git a/metadata/md5-cache/games-arcade/Manifest.gz b/metadata/md5-cache/games-arcade/Manifest.gz
index bf911d50e3a7..5c8af48e82c3 100644
--- a/metadata/md5-cache/games-arcade/Manifest.gz
+++ b/metadata/md5-cache/games-arcade/Manifest.gz
diff --git a/metadata/md5-cache/games-arcade/gnome-nibbles-3.24.0 b/metadata/md5-cache/games-arcade/gnome-nibbles-3.24.0
index d95584993752..0e2b4f158958 100644
--- a/metadata/md5-cache/games-arcade/gnome-nibbles-3.24.0
+++ b/metadata/md5-cache/games-arcade/gnome-nibbles-3.24.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.40.0:2 dev-libs/libgee:0.8= dev-libs/libgnome-games-sup
 DESCRIPTION=Nibbles clone for Gnome
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Nibbles
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+ CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.40.0:2 dev-libs/libgee:0.8= dev-libs/libgnome-games-support:1 >=media-libs/clutter-1.22.0:1.0 >=media-libs/clutter-gtk-1.4.0:1.0 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.18.0:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-nibbles/3.24/gnome-nibbles-3.24.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=117e1469ab5e0c1ca2652201e1133816
+_md5_=8bdcd524038763103f29814d5eb5012a
diff --git a/metadata/md5-cache/games-board/Manifest.gz b/metadata/md5-cache/games-board/Manifest.gz
index 1636680110c3..9cf038b80b71 100644
--- a/metadata/md5-cache/games-board/Manifest.gz
+++ b/metadata/md5-cache/games-board/Manifest.gz
diff --git a/metadata/md5-cache/games-board/gnome-chess-3.24.1 b/metadata/md5-cache/games-board/gnome-chess-3.24.1
index 465a52aaea0d..72bc09ca8137 100644
--- a/metadata/md5-cache/games-board/gnome-chess-3.24.1
+++ b/metadata/md5-cache/games-board/gnome-chess-3.24.1
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.40:2 >=gnome-base/librsvg-2.32:2 >=x11-libs/gtk+-3.19:3
 DESCRIPTION=Play the classic two-player boardgame of chess
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Chess
-KEYWORDS=amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.40:2 >=gnome-base/librsvg-2.32:2 >=x11-libs/gtk+-3.19:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-chess/3.24/gnome-chess-3.24.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5d40f9a5d68bbf64ded20851a8853493
+_md5_=e1c6b82ce2f60bfdbfbb11dd9f7543d4
diff --git a/metadata/md5-cache/games-board/gnome-mines-3.24.0 b/metadata/md5-cache/games-board/gnome-mines-3.24.0
index 06d58ab35274..f74c002b1316 100644
--- a/metadata/md5-cache/games-board/gnome-mines-3.24.0
+++ b/metadata/md5-cache/games-board/gnome-mines-3.24.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.40:2 dev-libs/libgnome-games-support:1 >=gnome-base/lib
 DESCRIPTION=Clear hidden mines from a minefield
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Mines
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+ CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.40:2 dev-libs/libgnome-games-support:1 >=gnome-base/librsvg-2.32.0:2 >=x11-libs/gtk+-3.12:3 !<x11-themes/gnome-themes-standard-3.14
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-mines/3.24/gnome-mines-3.24.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=35bce5599b2fe8a99300483257823c9e
+_md5_=66a21c411fcf0158f65d10fa6eb21b6e
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index 02c5ddbd8a7a..f86ee0ac9a77 100644
--- a/metadata/md5-cache/games-emulation/Manifest.gz
+++ b/metadata/md5-cache/games-emulation/Manifest.gz
diff --git a/metadata/md5-cache/games-emulation/gxmame-0.35_beta2 b/metadata/md5-cache/games-emulation/gxmame-0.35_beta2
deleted file mode 100644
index 2ee3184e5974..000000000000
--- a/metadata/md5-cache/games-emulation/gxmame-0.35_beta2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=dev-libs/expat >=x11-libs/gtk+-2.4:2 >=dev-libs/glib-2.4:2 x11-themes/gnome-icon-theme nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext )
-DESCRIPTION=frontend for XMame using the GTK library
-EAPI=5
-HOMEPAGE=http://gxmame.sourceforge.net/
-IUSE=nls joystick
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/expat >=x11-libs/gtk+-2.4:2 >=dev-libs/glib-2.4:2 x11-themes/gnome-icon-theme nls? ( virtual/libintl ) games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/gxmame/gxmame-0.35beta2.tar.gz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=5262f0bca63940b0d5e4b7215d340dfe
diff --git a/metadata/md5-cache/games-emulation/higan-106_p1 b/metadata/md5-cache/games-emulation/higan-106_p1-r1
index 446008ac1400..cef62b530237 100644
--- a/metadata/md5-cache/games-emulation/higan-106_p1
+++ b/metadata/md5-cache/games-emulation/higan-106_p1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( ao openal alsa pulseaudio oss ) || ( xv opengl sdl )
 SLOT=0
 SRC_URI=https://gitlab.com/higan/higan/repository/41efdba45afa770db99bc7484a8ad340ccc597d2/archive.tar.bz2 -> higan-106_p1.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=93291c13df037340e37f39aaec102469
+_md5_=92b402fce5ca880e1840c756303f5e3c
diff --git a/metadata/md5-cache/games-fps/Manifest.gz b/metadata/md5-cache/games-fps/Manifest.gz
index 08ac8209f257..f6e6fb9d6a02 100644
--- a/metadata/md5-cache/games-fps/Manifest.gz
+++ b/metadata/md5-cache/games-fps/Manifest.gz
diff --git a/metadata/md5-cache/games-fps/quake1-demodata-1.06 b/metadata/md5-cache/games-fps/quake1-demodata-1.06
index f0d9bbdbf307..d41ef31eaef1 100644
--- a/metadata/md5-cache/games-fps/quake1-demodata-1.06
+++ b/metadata/md5-cache/games-fps/quake1-demodata-1.06
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=app-arch/lha app-arch/unzip
 DESCRIPTION=Demo data for Quake 1
 EAPI=5
-HOMEPAGE=http://en.wikipedia.org/wiki/Quake_I
+HOMEPAGE=https://en.wikipedia.org/wiki/Quake_I
 IUSE=symlink
 KEYWORDS=~amd64 ~x86
 LICENSE=quake1-demodata
@@ -10,4 +10,4 @@ RDEPEND=games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://idsoftware/quake/quake106.zip
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=679d9a348befb15ce5b331838b5c0b95
+_md5_=ad0828b814bf09bf39daf13960eca27f
diff --git a/metadata/md5-cache/games-fps/quake2-demodata-3.14 b/metadata/md5-cache/games-fps/quake2-demodata-3.14
index e46e70abcafc..f233638c0227 100644
--- a/metadata/md5-cache/games-fps/quake2-demodata-3.14
+++ b/metadata/md5-cache/games-fps/quake2-demodata-3.14
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=app-arch/unzip !games-fps/quake2-data
 DESCRIPTION=Demo data for Quake 2
 EAPI=5
-HOMEPAGE=http://en.wikipedia.org/wiki/Quake_II
+HOMEPAGE=https://en.wikipedia.org/wiki/Quake_II
 IUSE=symlink
 KEYWORDS=~alpha ~amd64 ~x86 ~x86-fbsd
 LICENSE=quake2-demodata
@@ -10,4 +10,4 @@ RDEPEND=games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://idsoftware/quake2/q2-314-demo-x86.exe
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=c429cfbe79ca0783a032c4f1c97069e5
+_md5_=214729a3ef4c229b66724ff28a6f54b7
diff --git a/metadata/md5-cache/games-puzzle/Manifest.gz b/metadata/md5-cache/games-puzzle/Manifest.gz
index 36566231835a..f0d83526c92f 100644
--- a/metadata/md5-cache/games-puzzle/Manifest.gz
+++ b/metadata/md5-cache/games-puzzle/Manifest.gz
diff --git a/metadata/md5-cache/games-puzzle/gnome-sudoku-3.24.0 b/metadata/md5-cache/games-puzzle/gnome-sudoku-3.24.0
index 3d819ca22163..c6ae4991f556 100644
--- a/metadata/md5-cache/games-puzzle/gnome-sudoku-3.24.0
+++ b/metadata/md5-cache/games-puzzle/gnome-sudoku-3.24.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.40:2 dev-libs/libgee:0.8=[introspection] dev-libs/json-
 DESCRIPTION=Test your logic skills in this number grid puzzle
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Sudoku
-KEYWORDS=amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-3+ CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.40:2 dev-libs/libgee:0.8=[introspection] dev-libs/json-glib >=dev-libs/qqwing-1.3.4 x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.19.0:3[introspection] x11-libs/pango[introspection]
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-sudoku/3.24/gnome-sudoku-3.24.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=82915b1723e3d33694c64bae60cdcfd3
+_md5_=54a5d6afef03c9c1401292e7899a9fed
diff --git a/metadata/md5-cache/games-puzzle/lightsoff-3.24.0 b/metadata/md5-cache/games-puzzle/lightsoff-3.24.0
index f75008314291..5eaf2b73d6bb 100644
--- a/metadata/md5-cache/games-puzzle/lightsoff-3.24.0
+++ b/metadata/md5-cache/games-puzzle/lightsoff-3.24.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.38:2 >=gnome-base/librsvg-2.32:2 >=media-libs/clutter-1
 DESCRIPTION=Turn off all the lights
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Lightsoff
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2+ CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.38:2 >=gnome-base/librsvg-2.32:2 >=media-libs/clutter-1.14:1.0 >=media-libs/clutter-gtk-1.5.5:1.0 >=x11-libs/gtk+-3.13.4:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/lightsoff/3.24/lightsoff-3.24.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2297640607821b36efafc053ef6c2cb7
+_md5_=1ba7110f248914b90b4cf1047b839792
diff --git a/metadata/md5-cache/games-puzzle/swell-foop-3.24.0 b/metadata/md5-cache/games-puzzle/swell-foop-3.24.0
index 07d4ad8af3e7..864d56833942 100644
--- a/metadata/md5-cache/games-puzzle/swell-foop-3.24.0
+++ b/metadata/md5-cache/games-puzzle/swell-foop-3.24.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.36:2 >=media-libs/clutter-1.14:1.0 >=media-libs/clutter
 DESCRIPTION=Clear the screen by removing groups of colored and shaped tiles
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Swell%20Foop
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2+ FDL-1.1+
 RDEPEND=>=dev-libs/glib-2.36:2 >=media-libs/clutter-1.14:1.0 >=media-libs/clutter-gtk-1.5:1.0 >=x11-libs/gtk+-3.12:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/swell-foop/3.24/swell-foop-3.24.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b98e4a2654f555d8ab20a9b74b962a44
+_md5_=5e1ebe3ea028e357f4b37713e8d3ba8d
diff --git a/metadata/md5-cache/games-rpg/Manifest.gz b/metadata/md5-cache/games-rpg/Manifest.gz
index ae49362a4177..2dc6e2838fe9 100644
--- a/metadata/md5-cache/games-rpg/Manifest.gz
+++ b/metadata/md5-cache/games-rpg/Manifest.gz
diff --git a/metadata/md5-cache/games-rpg/bass-1.2-r1 b/metadata/md5-cache/games-rpg/bass-1.2-r1
index ec90bc14a22a..f71c111f39b1 100644
--- a/metadata/md5-cache/games-rpg/bass-1.2-r1
+++ b/metadata/md5-cache/games-rpg/bass-1.2-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=>=games-engines/scummvm-0.5.0 app-arch/unzip
 DESCRIPTION=Beneath a Steel Sky: a SciFi thriller set in a bleak vision of the future
 EAPI=5
-HOMEPAGE=http://en.wikipedia.org/wiki/Beneath_a_Steel_Sky
+HOMEPAGE=https://en.wikipedia.org/wiki/Beneath_a_Steel_Sky
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=bass
 RDEPEND=>=games-engines/scummvm-0.5.0 games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/scummvm/bass-cd-1.2.zip mirror://gentoo/bass.png
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=0f89851ac5e0795da6fdcb47420896bb
+_md5_=8e05dc9be4e1ffc0dbd204824c3defec
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index ffd0e40b5647..aa83d19f2c85 100644
--- a/metadata/md5-cache/games-strategy/Manifest.gz
+++ b/metadata/md5-cache/games-strategy/Manifest.gz
diff --git a/metadata/md5-cache/games-strategy/wargus-2.4.1 b/metadata/md5-cache/games-strategy/wargus-2.4.1
new file mode 100644
index 000000000000..88acf02cdffa
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/wargus-2.4.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND==games-engines/stratagus-2.4.1*[theora] media-libs/libpng:0= sys-libs/zlib:= x11-libs/gtk+:2 x11-libs/libX11 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
+DESCRIPTION=Warcraft II for the Stratagus game engine
+EAPI=6
+HOMEPAGE=http://wargus.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+PDEPEND=games-strategy/wargus-data
+RDEPEND==games-engines/stratagus-2.4.1*[theora] media-libs/libpng:0= sys-libs/zlib:= x11-libs/gtk+:2 x11-libs/libX11
+SLOT=0
+SRC_URI=https://github.com/Wargus/wargus/archive/v2.4.1.tar.gz -> wargus-2.4.1.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=21f9bf5beabef6e75ffd4aef26f7599e
diff --git a/metadata/md5-cache/games-strategy/wargus-data-0-r1 b/metadata/md5-cache/games-strategy/wargus-data-0-r1
new file mode 100644
index 000000000000..30d8671dc796
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/wargus-data-0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install
+DEPEND=games-strategy/wargus media-sound/cdparanoia media-sound/timidity++ media-video/ffmpeg2theora
+DESCRIPTION=Warcraft II data for wargus (needs DOS CD)
+EAPI=6
+HOMEPAGE=http://wargus.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=all-rights-reserved
+PROPERTIES=interactive
+RESTRICT=userpriv
+SLOT=0
+_eclasses_=cdrom	c64e4c5e9cbf2a58be31431e015a6210	portability	2b88d3ecc35035a3b8ab628b49cafb0e
+_md5_=0f0563cee2808c9c204c3aff4b28dd27
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index d870a8603538..d0c59b19e400 100644
--- a/metadata/md5-cache/gnome-base/Manifest.gz
+++ b/metadata/md5-cache/gnome-base/Manifest.gz
diff --git a/metadata/md5-cache/gnome-base/dconf-editor-3.24.3 b/metadata/md5-cache/gnome-base/dconf-editor-3.24.3
index eff34636ed63..d9bde2bb3fdc 100644
--- a/metadata/md5-cache/gnome-base/dconf-editor-3.24.3
+++ b/metadata/md5-cache/gnome-base/dconf-editor-3.24.3
@@ -3,10 +3,10 @@ DEPEND=dev-libs/appstream-glib >=dev-libs/glib-2.46.0:2 >=gnome-base/dconf-0.25.
 DESCRIPTION=Graphical tool for editing the dconf configuration database
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/dconf-editor
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~arm-linux ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/appstream-glib >=dev-libs/glib-2.46.0:2 >=gnome-base/dconf-0.25.1 >=x11-libs/gtk+-3.22.0:3 !<gnome-base/dconf-0.22[X]
 SLOT=0
 SRC_URI=mirror://gnome/sources/dconf-editor/3.24/dconf-editor-3.24.3.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=dcc399f4c8eb106ed0cea68003d7675e
+_md5_=164546ed992445cd6e913b59abec5161
diff --git a/metadata/md5-cache/gnome-base/gdm-3.24.3 b/metadata/md5-cache/gnome-base/gdm-3.24.3
index 0a057c357901..1099e7b35d36 100644
--- a/metadata/md5-cache/gnome-base/gdm-3.24.3
+++ b/metadata/md5-cache/gnome-base/gdm-3.24.3
@@ -4,10 +4,10 @@ DESCRIPTION=GNOME Display Manager for managing graphical display servers and use
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/GDM
 IUSE=accessibility audit branding fprint +introspection ipv6 plymouth selinux smartcard tcpd test wayland xinerama
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh x86
 LICENSE=GPL-2+ branding? ( CC-BY-SA-4.0 )
 RDEPEND=app-text/iso-codes >=dev-libs/glib-2.36:2[dbus] >=x11-libs/gtk+-2.91.1:3 >=gnome-base/dconf-0.20 >=gnome-base/gnome-settings-daemon-3.1.4 gnome-base/gsettings-desktop-schemas >=media-libs/fontconfig-2.5.0:1.0 >=media-libs/libcanberra-0.4[gtk3] sys-apps/dbus >=sys-apps/accountsservice-0.6.35 x11-apps/sessreg x11-base/xorg-server x11-libs/libXi x11-libs/libXau x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-libs/libxcb >=x11-misc/xdg-utils-1.0.2-r3 virtual/pam >=sys-apps/systemd-186:0=[pam] sys-auth/pambase[systemd] audit? ( sys-process/audit ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) plymouth? ( sys-boot/plymouth ) selinux? ( sys-libs/libselinux ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) xinerama? ( x11-libs/libXinerama ) >=gnome-base/gnome-session-3.6 >=gnome-base/gnome-shell-3.1.90 x11-apps/xhost accessibility? ( >=app-accessibility/orca-3.10 gnome-extra/mousetweaks ) fprint? ( sys-auth/fprintd sys-auth/pam_fprint ) !gnome-extra/fast-user-switch-applet
 SLOT=0
 SRC_URI=mirror://gnome/sources/gdm/3.24/gdm-3.24.3.tar.xz branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6b806aef2bb81ca89dd30f55498d5dfb
+_md5_=e8630062f4c7f2fcd64e8d30900e3c52
diff --git a/metadata/md5-cache/gnome-base/gnome-3.24.2 b/metadata/md5-cache/gnome-base/gnome-3.24.2
index 67d2770b0804..95014074475f 100644
--- a/metadata/md5-cache/gnome-base/gnome-3.24.2
+++ b/metadata/md5-cache/gnome-base/gnome-3.24.2
@@ -3,9 +3,9 @@ DESCRIPTION=Meta package for GNOME 3, merge this package to install
 EAPI=6
 HOMEPAGE=https://www.gnome.org/
 IUSE=accessibility +bluetooth +classic +cdr cups +extras
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=metapackage
 PDEPEND=>=gnome-base/gvfs-1.32.1[udisks]
 RDEPEND=>=gnome-base/gnome-core-libs-3.24.2[cups?] >=gnome-base/gnome-core-apps-3.24.2[cups?,bluetooth?,cdr?] >=gnome-base/gdm-3.24.2 >=x11-wm/mutter-3.24.2 >=gnome-base/gnome-shell-3.24.2[bluetooth?] >=x11-themes/gnome-backgrounds-3.24.0 x11-themes/sound-theme-freedesktop accessibility? ( >=app-accessibility/at-spi2-atk-2.24.1 >=app-accessibility/at-spi2-core-2.24.1 >=app-accessibility/caribou-0.4.21 >=app-accessibility/orca-3.24.0 >=gnome-extra/mousetweaks-3.12.0 ) classic? ( >=gnome-extra/gnome-shell-extensions-3.24.2 ) extras? ( >=gnome-base/gnome-extra-apps-3.24.2 )
 SLOT=2.0
-_md5_=4a6f263a00f2935dd9b123866c8488f9
+_md5_=99a66983af1f2eee91bf91d990a43949
diff --git a/metadata/md5-cache/gnome-base/gnome-control-center-3.24.3 b/metadata/md5-cache/gnome-base/gnome-control-center-3.24.3
index 286e99463886..44a6ce691b9a 100644
--- a/metadata/md5-cache/gnome-base/gnome-control-center-3.24.3
+++ b/metadata/md5-cache/gnome-base/gnome-control-center-3.24.3
@@ -4,11 +4,11 @@ DESCRIPTION=GNOME's main interface to configure various aspects of the desktop
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/gnome-control-center/
 IUSE=+bluetooth +colord +cups debug +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager v4l wayland
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+
 PDEPEND=>=gnome-base/gnome-session-2.91.6-r1
 RDEPEND=>=dev-libs/glib-2.44.0:2[dbus] >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.22.0:3[X,wayland?] >=gnome-base/gsettings-desktop-schemas-3.21.4 >=gnome-base/gnome-desktop-3.21.2:3= >=gnome-base/gnome-settings-daemon-3.23.90[colord,policykit] >=x11-misc/colord-0.1.34:0= >=dev-libs/libpwquality-1.2.2 dev-libs/libxml2:2 gnome-base/libgtop:2= media-libs/fontconfig >=sys-apps/accountsservice-0.6.39 >=media-libs/libcanberra-0.13[gtk3] >=media-sound/pulseaudio-2[glib] >=sys-auth/polkit-0.97 >=sys-power/upower-0.99:= virtual/libgudev x11-apps/xmodmap x11-libs/cairo x11-libs/libX11 x11-libs/libXxf86misc >=x11-libs/libXi-1.2 bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= ) colord? ( net-libs/libsoup:2.4 >=x11-misc/colord-0.1.34:0= >=x11-libs/colord-gtk-0.1.24 ) cups? ( >=net-print/cups-1.7[dbus] >=net-fs/samba-4.0.0[client] ) gnome-online-accounts? ( >=media-libs/grilo-0.3.0:0.3= >=net-libs/gnome-online-accounts-3.21.5:= ) ibus? ( >=app-i18n/ibus-1.5.2 ) kerberos? ( app-crypt/mit-krb5 ) networkmanager? ( >=gnome-extra/nm-applet-1.2.0 >=net-misc/networkmanager-1.2.0:=[modemmanager] >=net-misc/modemmanager-0.7.990 ) v4l? ( media-libs/clutter-gtk:1.0 >=media-video/cheese-3.5.91 ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=media-libs/clutter-1.11.3:1.0 media-libs/clutter-gtk:1.0 >=x11-libs/libXi-1.2 ) || ( >=sys-apps/systemd-31 ( app-admin/openrc-settingsd sys-auth/consolekit ) ) x11-themes/adwaita-icon-theme colord? ( >=gnome-extra/gnome-color-manager-3 ) cups? ( app-admin/system-config-printer net-print/cups-pk-helper ) input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] ) >=gnome-base/libgnomekbd-3 wayland? ( dev-libs/libinput ) !wayland? ( >=x11-drivers/xf86-input-libinput-0.19.0 input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) ) !<gnome-base/gdm-2.91.94 !<gnome-extra/gnome-color-manager-3.1.2 !gnome-extra/gnome-media[pulseaudio] !<gnome-extra/gnome-media-2.32.0-r300 !<net-wireless/gnome-bluetooth-3.3.2
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-control-center/3.24/gnome-control-center-3.24.3.tar.xz https://dev.gentoo.org/~mgorny/dist/gnome-control-center-3.24.2-patchset.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=448034fb0bd1247359f3b77aa0785357
+_md5_=3451b6598b399ba77d432b2808624247
diff --git a/metadata/md5-cache/gnome-base/gnome-core-apps-3.24.2 b/metadata/md5-cache/gnome-base/gnome-core-apps-3.24.2
index b85509add944..7ea186f648f9 100644
--- a/metadata/md5-cache/gnome-base/gnome-core-apps-3.24.2
+++ b/metadata/md5-cache/gnome-base/gnome-core-apps-3.24.2
@@ -3,8 +3,8 @@ DESCRIPTION=Sub-meta package for the core applications integrated with GNOME 3
 EAPI=6
 HOMEPAGE=https://www.gnome.org/
 IUSE=+bluetooth +cdr cups
-KEYWORDS=amd64 ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ia64 ~ppc ~ppc64 x86
 LICENSE=metapackage
 RDEPEND=>=gnome-base/gnome-core-libs-3.24.2[cups?] >=gnome-base/gnome-session-3.24.2 >=gnome-base/gnome-settings-daemon-3.24.2[cups?] >=gnome-base/gnome-control-center-3.24.2[cups?] >=app-crypt/gcr-3.20.0 >=gnome-base/nautilus-3.24.2 >=gnome-base/gnome-keyring-3.20.0 >=gnome-extra/evolution-data-server-3.24.2 >=app-crypt/seahorse-3.20.0 >=app-editors/gedit-3.22.1 >=app-text/evince-3.24.2 >=gnome-extra/gnome-contacts-3.22.1 >=media-gfx/eog-3.24.1 >=media-video/totem-3.24.0 >=x11-terms/gnome-terminal-3.24.2 >=gnome-extra/gnome-user-docs-3.24.2 >=gnome-extra/yelp-3.22.0 >=x11-themes/adwaita-icon-theme-3.24.0 >=x11-themes/gnome-themes-standard-3.22.3 bluetooth? ( >=net-wireless/gnome-bluetooth-3.20.1 ) cdr? ( >=app-cdr/brasero-3.12.2 ) !gnome-base/gnome-applets
 SLOT=3.0
-_md5_=1c2f25b7241808352ac24ad3c45c408f
+_md5_=fc98d96a0885d76ec61c07ad22c7fdc1
diff --git a/metadata/md5-cache/gnome-base/gnome-core-libs-3.24.2 b/metadata/md5-cache/gnome-base/gnome-core-libs-3.24.2
index 2771fb9e4218..90b03a3d61d3 100644
--- a/metadata/md5-cache/gnome-base/gnome-core-libs-3.24.2
+++ b/metadata/md5-cache/gnome-base/gnome-core-libs-3.24.2
@@ -3,8 +3,8 @@ DESCRIPTION=Sub-meta package for the core libraries of GNOME 3
 EAPI=6
 HOMEPAGE=https://www.gnome.org/
 IUSE=cups python
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=metapackage
 RDEPEND=>=dev-libs/glib-2.52.2:2 >=x11-libs/gdk-pixbuf-2.36.6:2 >=x11-libs/pango-1.40.9 >=x11-libs/gtk+-3.22.16:3[cups?] >=dev-libs/atk-2.24 >=gnome-base/librsvg-2.40.18 >=gnome-base/gnome-desktop-3.24.2:3 >=x11-libs/startup-notification-0.12 >=gnome-base/gvfs-1.32.1 >=gnome-base/dconf-0.26 >=media-libs/gstreamer-1.12.3:1.0 >=media-libs/gst-plugins-base-1.12.3:1.0 >=media-libs/gst-plugins-good-1.12.3:1.0 python? ( >=dev-python/pygobject-3.24.1:3 )
 SLOT=3.0
-_md5_=009f0ec9ab90e420bbe5cf299b07d7a5
+_md5_=3d011e5f4e6b55154a00a0c2a61dbf93
diff --git a/metadata/md5-cache/gnome-base/gnome-desktop-3.24.2 b/metadata/md5-cache/gnome-base/gnome-desktop-3.24.2
index 52a15f08d576..e7e8aa9ac9f0 100644
--- a/metadata/md5-cache/gnome-base/gnome-desktop-3.24.2
+++ b/metadata/md5-cache/gnome-base/gnome-desktop-3.24.2
@@ -4,10 +4,10 @@ DESCRIPTION=Libraries for the gnome desktop that are not part of the UI
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/gnome-desktop
 IUSE=debug +introspection udev test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+ FDL-1.1+ LGPL-2+
 RDEPEND=app-text/iso-codes >=dev-libs/glib-2.44.0:2[dbus] >=x11-libs/gdk-pixbuf-2.36.5:2[introspection?] >=x11-libs/gtk+-3.3.6:3[X,introspection?] x11-libs/cairo:=[X] x11-libs/libX11 x11-misc/xkeyboard-config >=gnome-base/gsettings-desktop-schemas-3.5.91 introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) udev? ( sys-apps/hwids virtual/libudev:= ) !<gnome-base/gnome-desktop-2.32.1-r1:2[doc]
 SLOT=3/12
 SRC_URI=mirror://gnome/sources/gnome-desktop/3.24/gnome-desktop-3.24.2.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=701c10338e97abe976293f0daa2415ee
+_md5_=ebd9f5b4031ae3f1d2ceeb92b49bf505
diff --git a/metadata/md5-cache/gnome-base/gnome-extra-apps-3.24.2 b/metadata/md5-cache/gnome-base/gnome-extra-apps-3.24.2
index b9af06b7e900..81903365fa77 100644
--- a/metadata/md5-cache/gnome-base/gnome-extra-apps-3.24.2
+++ b/metadata/md5-cache/gnome-base/gnome-extra-apps-3.24.2
@@ -3,8 +3,8 @@ DESCRIPTION=Sub-meta package for the applications of GNOME 3
 EAPI=6
 HOMEPAGE=https://www.gnome.org/
 IUSE=+games +share +shotwell +tracker
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=gnome-base/gnome-core-libs-3.24.2 >=sys-apps/baobab-3.24.0 >=media-video/cheese-3.24.0 >=www-client/epiphany-3.24.2 >=app-arch/file-roller-3.24.1 >=gnome-extra/gnome-calculator-3.24.0 >=gnome-extra/gnome-calendar-3.24.2 >=gnome-extra/gnome-characters-3.24.0 >=sys-apps/gnome-disk-utility-3.24.1 >=media-gfx/gnome-font-viewer-3.24.0 >=gnome-extra/gnome-power-manager-3.24.0 >=media-gfx/gnome-screenshot-3.22.0 >=gnome-extra/gnome-system-monitor-3.24.0 >=gnome-extra/gnome-weather-3.24.0 >=gnome-extra/gucharmap-9.0.4:2.90 >=gnome-extra/sushi-3.24.0 >=media-sound/sound-juicer-3.24.0 >=net-misc/vino-3.22.0 >=gnome-base/dconf-editor-3.24.2 >=app-dicts/gnome-dictionary-3.24.1 >=mail-client/evolution-3.24.2 >=net-analyzer/gnome-nettool-3.8.1 >=gnome-extra/gnome-tweak-tool-3.24.1 >=gnome-extra/nautilus-sendto-3.8.4 >=net-misc/vinagre-3.22.0 games? ( >=games-puzzle/five-or-more-3.22.2 >=games-board/four-in-a-row-3.22.1 >=games-board/gnome-chess-3.24.1 >=games-puzzle/gnome-klotski-3.22.1 >=games-board/gnome-mahjongg-3.22.0 >=games-board/gnome-mines-3.24.0 >=games-arcade/gnome-nibbles-3.24.0 >=games-arcade/gnome-robots-3.22.1 >=games-puzzle/gnome-sudoku-3.24.0 >=games-puzzle/gnome-taquin-3.22.0 >=games-puzzle/gnome-tetravex-3.22.0 >=games-puzzle/hitori-3.22.3 >=games-board/iagno-3.22.0 >=games-puzzle/lightsoff-3.24.0 >=games-puzzle/quadrapassel-3.22.0 >=games-puzzle/swell-foop-3.24.0 >=games-board/tali-3.22.0 ) share? ( >=gnome-extra/gnome-user-share-3.18.3 ) shotwell? ( >=media-gfx/shotwell-0.24 ) tracker? ( >=app-misc/tracker-1.12 >=gnome-extra/gnome-documents-3.24.2 >=media-gfx/gnome-photos-3.24.2 >=media-sound/gnome-music-3.24.2 )
 SLOT=3.0
-_md5_=41f1c6c064d5988391d9bf60f5b3a417
+_md5_=5809f2903ce4bc0fd90608e0ae8328fc
diff --git a/metadata/md5-cache/gnome-base/gnome-light-3.24.2 b/metadata/md5-cache/gnome-base/gnome-light-3.24.2
index 95a65d0c568e..b4425415c926 100644
--- a/metadata/md5-cache/gnome-base/gnome-light-3.24.2
+++ b/metadata/md5-cache/gnome-base/gnome-light-3.24.2
@@ -3,10 +3,10 @@ DESCRIPTION=Meta package for GNOME-Light, merge this package to install
 EAPI=6
 HOMEPAGE=https://www.gnome.org/
 IUSE=cups +gnome-shell
-KEYWORDS=amd64 ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ia64 ~ppc ~ppc64 x86
 LICENSE=metapackage
 PDEPEND=>=gnome-base/gvfs-1.32.1
 RDEPEND=!gnome-base/gnome >=gnome-base/gnome-core-libs-3.24.2[cups?] >=gnome-base/gnome-session-3.24.2 >=gnome-base/gnome-settings-daemon-3.24.2[cups?] >=gnome-base/gnome-control-center-3.24.2[cups?] >=gnome-base/nautilus-3.24.2 gnome-shell? ( >=x11-wm/mutter-3.24.2 >=gnome-base/gnome-shell-3.24.2 ) >=x11-themes/adwaita-icon-theme-2 >=x11-themes/gnome-themes-standard-3.22.3 >=x11-themes/gnome-backgrounds-2 >=x11-terms/gnome-terminal-3.24.2
 SLOT=2.0
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=b895cef8820c096a28ed505d6f194c14
+_md5_=6b76105f46c69178428fb9aae0355bc1
diff --git a/metadata/md5-cache/gnome-base/gnome-session-3.22.3 b/metadata/md5-cache/gnome-base/gnome-session-3.22.3
index 3648c11bbeb3..dc5febabae2a 100644
--- a/metadata/md5-cache/gnome-base/gnome-session-3.22.3
+++ b/metadata/md5-cache/gnome-base/gnome-session-3.22.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.46.0:2[dbus] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.18.0:3 >=dev-libs/json-glib-0.10 >=gnome-base/gnome-desktop-3.18:3= elibc_FreeBSD? ( dev-libs/libexecinfo ) media-libs/mesa[egl,gles2] media-libs/libepoxy x11-libs/libSM x11-libs/libICE x11-libs/libXau x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk x11-apps/xdpyinfo systemd? ( >=sys-apps/systemd-183:0= ) dev-libs/libxslt >=dev-util/intltool-0.40.6 >=sys-devel/gettext-0.10.40 virtual/pkgconfig !<gnome-base/gdm-2.20.4 doc? ( app-text/xmlto dev-libs/libxslt ) gnome-base/gnome-common >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.46.0:2[dbus] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.18.0:3 >=dev-libs/json-glib-0.10 >=gnome-base/gnome-desktop-3.18:3= elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) media-libs/mesa[egl,gles2] media-libs/libepoxy x11-libs/libSM x11-libs/libICE x11-libs/libXau x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk x11-apps/xdpyinfo systemd? ( >=sys-apps/systemd-183:0= ) dev-libs/libxslt >=dev-util/intltool-0.40.6 >=sys-devel/gettext-0.10.40 virtual/pkgconfig !<gnome-base/gdm-2.20.4 doc? ( app-text/xmlto dev-libs/libxslt ) gnome-base/gnome-common >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Gnome session manager
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/gnome-session
 IUSE=doc elibc_FreeBSD ipv6 systemd
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2 LGPL-2 FDL-1.1
-RDEPEND=>=dev-libs/glib-2.46.0:2[dbus] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.18.0:3 >=dev-libs/json-glib-0.10 >=gnome-base/gnome-desktop-3.18:3= elibc_FreeBSD? ( dev-libs/libexecinfo ) media-libs/mesa[egl,gles2] media-libs/libepoxy x11-libs/libSM x11-libs/libICE x11-libs/libXau x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk x11-apps/xdpyinfo systemd? ( >=sys-apps/systemd-183:0= ) gnome-base/gnome-settings-daemon >=gnome-base/gsettings-desktop-schemas-0.1.7 x11-themes/adwaita-icon-theme sys-apps/dbus[X] !systemd? ( sys-auth/consolekit >=dev-libs/dbus-glib-0.76 )
+RDEPEND=>=dev-libs/glib-2.46.0:2[dbus] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.18.0:3 >=dev-libs/json-glib-0.10 >=gnome-base/gnome-desktop-3.18:3= elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) media-libs/mesa[egl,gles2] media-libs/libepoxy x11-libs/libSM x11-libs/libICE x11-libs/libXau x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk x11-apps/xdpyinfo systemd? ( >=sys-apps/systemd-183:0= ) gnome-base/gnome-settings-daemon >=gnome-base/gsettings-desktop-schemas-0.1.7 x11-themes/adwaita-icon-theme sys-apps/dbus[X] !systemd? ( sys-auth/consolekit >=dev-libs/dbus-glib-0.76 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-session/3.22/gnome-session-3.22.3.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4df2deb20e0c92adedfa0bd6325621b3
+_md5_=d6ca3626d1c10ee28239fa32abe9f1d6
diff --git a/metadata/md5-cache/gnome-base/gnome-session-3.24.1 b/metadata/md5-cache/gnome-base/gnome-session-3.24.1
index 83d90835d640..b518cf9fa49d 100644
--- a/metadata/md5-cache/gnome-base/gnome-session-3.24.1
+++ b/metadata/md5-cache/gnome-base/gnome-session-3.24.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.46.0:2[dbus] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.18.0:3 >=dev-libs/json-glib-0.10 >=gnome-base/gnome-desktop-3.18:3= elibc_FreeBSD? ( dev-libs/libexecinfo ) media-libs/mesa[egl,gles2] media-libs/libepoxy x11-libs/libSM x11-libs/libICE x11-libs/libXau x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk x11-apps/xdpyinfo systemd? ( >=sys-apps/systemd-183:0= ) dev-libs/libxslt >=dev-util/intltool-0.40.6 >=sys-devel/gettext-0.10.40 virtual/pkgconfig !<gnome-base/gdm-2.20.4 doc? ( app-text/xmlto dev-libs/libxslt ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.46.0:2[dbus] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.18.0:3 >=dev-libs/json-glib-0.10 >=gnome-base/gnome-desktop-3.18:3= elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) media-libs/mesa[egl,gles2] media-libs/libepoxy x11-libs/libSM x11-libs/libICE x11-libs/libXau x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk x11-apps/xdpyinfo systemd? ( >=sys-apps/systemd-183:0= ) dev-libs/libxslt >=dev-util/intltool-0.40.6 >=sys-devel/gettext-0.10.40 virtual/pkgconfig !<gnome-base/gdm-2.20.4 doc? ( app-text/xmlto dev-libs/libxslt ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Gnome session manager
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/gnome-session
 IUSE=doc elibc_FreeBSD ipv6 systemd
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2 LGPL-2 FDL-1.1
-RDEPEND=>=dev-libs/glib-2.46.0:2[dbus] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.18.0:3 >=dev-libs/json-glib-0.10 >=gnome-base/gnome-desktop-3.18:3= elibc_FreeBSD? ( dev-libs/libexecinfo ) media-libs/mesa[egl,gles2] media-libs/libepoxy x11-libs/libSM x11-libs/libICE x11-libs/libXau x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk x11-apps/xdpyinfo systemd? ( >=sys-apps/systemd-183:0= ) >=gnome-base/gnome-settings-daemon-3.23.2 >=gnome-base/gsettings-desktop-schemas-0.1.7 x11-themes/adwaita-icon-theme sys-apps/dbus[X] !systemd? ( sys-auth/consolekit >=dev-libs/dbus-glib-0.76 )
+RDEPEND=>=dev-libs/glib-2.46.0:2[dbus] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.18.0:3 >=dev-libs/json-glib-0.10 >=gnome-base/gnome-desktop-3.18:3= elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) media-libs/mesa[egl,gles2] media-libs/libepoxy x11-libs/libSM x11-libs/libICE x11-libs/libXau x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk x11-apps/xdpyinfo systemd? ( >=sys-apps/systemd-183:0= ) >=gnome-base/gnome-settings-daemon-3.23.2 >=gnome-base/gsettings-desktop-schemas-0.1.7 x11-themes/adwaita-icon-theme sys-apps/dbus[X] !systemd? ( sys-auth/consolekit >=dev-libs/dbus-glib-0.76 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-session/3.24/gnome-session-3.24.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9ccb4c6ab76eebb4792f550a30132308
+_md5_=288a500febf64b6a601ad18e24e9f0e2
diff --git a/metadata/md5-cache/gnome-base/gnome-session-3.24.2 b/metadata/md5-cache/gnome-base/gnome-session-3.24.2
deleted file mode 100644
index 117ff8136117..000000000000
--- a/metadata/md5-cache/gnome-base/gnome-session-3.24.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.46.0:2[dbus] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.18.0:3 >=dev-libs/json-glib-0.10 >=gnome-base/gnome-desktop-3.18:3= elibc_FreeBSD? ( dev-libs/libexecinfo ) media-libs/mesa[egl,gles2] media-libs/libepoxy x11-libs/libSM x11-libs/libICE x11-libs/libXau x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk x11-apps/xdpyinfo systemd? ( >=sys-apps/systemd-183:0= ) dev-libs/libxslt >=dev-util/intltool-0.40.6 >=sys-devel/gettext-0.10.40 virtual/pkgconfig !<gnome-base/gdm-2.20.4 doc? ( app-text/xmlto dev-libs/libxslt ) gnome-base/gnome-common >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Gnome session manager
-EAPI=6
-HOMEPAGE=https://git.gnome.org/browse/gnome-session
-IUSE=doc elibc_FreeBSD ipv6 systemd
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2 LGPL-2 FDL-1.1
-RDEPEND=>=dev-libs/glib-2.46.0:2[dbus] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.18.0:3 >=dev-libs/json-glib-0.10 >=gnome-base/gnome-desktop-3.18:3= elibc_FreeBSD? ( dev-libs/libexecinfo ) media-libs/mesa[egl,gles2] media-libs/libepoxy x11-libs/libSM x11-libs/libICE x11-libs/libXau x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk x11-apps/xdpyinfo systemd? ( >=sys-apps/systemd-183:0= ) >=gnome-base/gnome-settings-daemon-3.23.2 >=gnome-base/gsettings-desktop-schemas-0.1.7 x11-themes/adwaita-icon-theme sys-apps/dbus[X] !systemd? ( sys-auth/consolekit >=dev-libs/dbus-glib-0.76 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-session/3.24/gnome-session-3.24.2.tar.xz https://dev.gentoo.org/~leio/distfiles/gnome-session-3.24.2-xorg-default-translations.patch.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2759b24d3e559ea09d014e3501529f54
diff --git a/metadata/md5-cache/gnome-base/gnome-session-3.24.2-r1 b/metadata/md5-cache/gnome-base/gnome-session-3.24.2-r1
new file mode 100644
index 000000000000..5f046056624c
--- /dev/null
+++ b/metadata/md5-cache/gnome-base/gnome-session-3.24.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.46.0:2[dbus] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.18.0:3 >=dev-libs/json-glib-0.10 >=gnome-base/gnome-desktop-3.18:3= elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) media-libs/mesa[egl,gles2] media-libs/libepoxy x11-libs/libSM x11-libs/libICE x11-libs/libXau x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk x11-apps/xdpyinfo systemd? ( >=sys-apps/systemd-183:0= ) dev-libs/libxslt >=dev-util/intltool-0.40.6 >=sys-devel/gettext-0.10.40 virtual/pkgconfig !<gnome-base/gdm-2.20.4 doc? ( app-text/xmlto dev-libs/libxslt ) gnome-base/gnome-common >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Gnome session manager
+EAPI=6
+HOMEPAGE=https://git.gnome.org/browse/gnome-session
+IUSE=doc elibc_FreeBSD ipv6 systemd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2 LGPL-2 FDL-1.1
+RDEPEND=>=dev-libs/glib-2.46.0:2[dbus] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.18.0:3 >=dev-libs/json-glib-0.10 >=gnome-base/gnome-desktop-3.18:3= elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) media-libs/mesa[egl,gles2] media-libs/libepoxy x11-libs/libSM x11-libs/libICE x11-libs/libXau x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk x11-apps/xdpyinfo systemd? ( >=sys-apps/systemd-183:0= ) >=gnome-base/gnome-settings-daemon-3.23.2 >=gnome-base/gsettings-desktop-schemas-0.1.7 x11-themes/adwaita-icon-theme sys-apps/dbus[X] !systemd? ( sys-auth/consolekit >=dev-libs/dbus-glib-0.76 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-session/3.24/gnome-session-3.24.2.tar.xz https://dev.gentoo.org/~leio/distfiles/gnome-session-3.24.2-xorg-default-translations.patch.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=954cf18979ef4fc2e9f553e95133d124
diff --git a/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.24.3 b/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.24.3
index 36ef923fb825..6e987ecebb86 100644
--- a/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.24.3
+++ b/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.24.3
@@ -4,7 +4,7 @@ DESCRIPTION=Gnome Settings Daemon
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/gnome-settings-daemon
 IUSE=+colord +cups debug input_devices_wacom -openrc-force networkmanager policykit smartcard test +udev wayland test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.44.0:2[dbus] >=x11-libs/gtk+-3.15.3:3[X,wayland?] >=gnome-base/gnome-desktop-3.11.1:3= >=gnome-base/gsettings-desktop-schemas-3.23.3 >=gnome-base/librsvg-2.36.2:2 media-fonts/cantarell media-libs/alsa-lib media-libs/fontconfig media-libs/libcanberra[gtk3] >=media-sound/pulseaudio-2 >=sys-power/upower-0.99:= x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/libnotify-0.7.3:= x11-libs/libX11 x11-libs/libxkbfile x11-libs/libXi x11-libs/libXext x11-libs/libXfixes x11-libs/libXtst x11-libs/libXxf86misc x11-misc/xkeyboard-config >=app-misc/geoclue-2.3.1:2.0 >=dev-libs/libgweather-3.9.5:2= >=sci-geosciences/geocode-glib-3.10 >=sys-auth/polkit-0.103 colord? ( >=media-libs/lcms-2.2:2 >=x11-misc/colord-1.0.2:= ) cups? ( >=net-print/cups-1.4[dbus] ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=x11-libs/pango-1.20 x11-drivers/xf86-input-wacom virtual/libgudev:= ) networkmanager? ( >=net-misc/networkmanager-1.0 ) smartcard? ( >=dev-libs/nss-3.11.2 ) udev? ( virtual/libgudev:= ) wayland? ( dev-libs/wayland ) gnome-base/dconf !openrc-force? ( sys-apps/systemd ) !<gnome-base/gnome-control-center-2.22 !<gnome-extra/gnome-color-manager-3.1.1 !<gnome-extra/gnome-power-manager-3.1.3 !<gnome-base/gnome-session-3.23.2
 REQUIRED_USE=input_devices_wacom? ( udev ) smartcard? ( udev ) wayland? ( udev )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-settings-daemon/3.24/gnome-settings-daemon-3.24.3.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4195813f9dbd2f6d79339fa042e070cc
+_md5_=756fc381f4ac35c373718f199f998cca
diff --git a/metadata/md5-cache/gnome-base/gnome-shell-3.24.3 b/metadata/md5-cache/gnome-base/gnome-shell-3.24.3
index 7f1946cd1b6c..9a272ebe80fd 100644
--- a/metadata/md5-cache/gnome-base/gnome-shell-3.24.3
+++ b/metadata/md5-cache/gnome-base/gnome-shell-3.24.3
@@ -4,7 +4,7 @@ DESCRIPTION=Provides core UI functions for the GNOME 3 desktop
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShell
 IUSE=+bluetooth +browser-extension +ibus +networkmanager nsplugin -openrc-force python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ia64 ~ppc ~ppc64 x86
 LICENSE=GPL-2+ LGPL-2+
 PDEPEND=>=gnome-base/gdm-3.5[introspection] >=gnome-base/gnome-control-center-3.8.3[bluetooth(+)?,networkmanager(+)?] browser-extension? ( gnome-extra/chrome-gnome-shell )
 RDEPEND=>=app-accessibility/at-spi2-atk-2.5.3 >=dev-libs/atk-2[introspection] >=app-crypt/gcr-3.7.5[introspection] >=dev-libs/glib-2.45.3:2[dbus] >=dev-libs/gjs-1.47.0 >=dev-libs/gobject-introspection-1.49.1:= dev-libs/libical:= >=x11-libs/gtk+-3.15.0:3[introspection] >=dev-libs/libcroco-0.6.8:0.6 >=gnome-base/gnome-desktop-3.7.90:3=[introspection] >=gnome-base/gsettings-desktop-schemas-3.21.3 >=gnome-extra/evolution-data-server-3.17.2:= >=media-libs/gstreamer-0.11.92:1.0 >=net-im/telepathy-logger-0.2.4[introspection] >=net-libs/telepathy-glib-0.19[introspection] >=sys-auth/polkit-0.100[introspection] >=x11-libs/libXfixes-5.0 x11-libs/libXtst >=x11-wm/mutter-3.24.0:0/0[introspection] >=x11-libs/startup-notification-0.11 python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-libs/dbus-glib dev-libs/libxml2:2 media-libs/libcanberra[gtk3] media-libs/mesa >=media-sound/pulseaudio-2 >=net-libs/libsoup-2.40:2.4[introspection] x11-libs/libX11 x11-libs/gdk-pixbuf:2[introspection] x11-apps/mesa-progs bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) networkmanager? ( app-crypt/libsecret >=gnome-extra/nm-applet-0.9.8 >=net-misc/networkmanager-0.9.8:=[introspection] ) nsplugin? ( >=dev-libs/json-glib-0.13.2 ) app-accessibility/at-spi2-core:2[introspection] >=app-accessibility/caribou-0.4.8 dev-libs/libgweather:2[introspection] >=sys-apps/accountsservice-0.6.14[introspection] >=sys-power/upower-0.99:=[introspection] x11-libs/pango[introspection] >=gnome-base/gnome-session-2.91.91 >=gnome-base/gnome-settings-daemon-3.8.3 !openrc-force? ( >=sys-apps/systemd-31 ) x11-misc/xdg-utils media-fonts/dejavu >=x11-themes/adwaita-icon-theme-3.19.90 networkmanager? ( net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] )
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-shell/3.24/gnome-shell-3.24.3.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=50ef471d23a63a624645f56138267120
+_md5_=80d4f58b738883a9d43a0b276141cd15
diff --git a/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.24.1 b/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.24.1
index 3943843b1f1d..2056cf33cb13 100644
--- a/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.24.1
+++ b/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.24.1
@@ -4,10 +4,10 @@ DESCRIPTION=Collection of GSettings schemas for GNOME desktop
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/gsettings-desktop-schemas
 IUSE=+introspection
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.31:2 introspection? ( >=dev-libs/gobject-introspection-1.31.0:= ) !<gnome-base/gdm-3.8
 SLOT=0
 SRC_URI=mirror://gnome/sources/gsettings-desktop-schemas/3.24/gsettings-desktop-schemas-3.24.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f8b9386b01c11cd9596cb723308bfc0b
+_md5_=131c347d5962f45354a77444ef2fbe47
diff --git a/metadata/md5-cache/gnome-base/gvfs-1.32.1-r1 b/metadata/md5-cache/gnome-base/gvfs-1.32.1-r1
index 8e3942f69d81..96f1c14ef1a5 100644
--- a/metadata/md5-cache/gnome-base/gvfs-1.32.1-r1
+++ b/metadata/md5-cache/gnome-base/gvfs-1.32.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Virtual filesystem implementation for gio
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/gvfs
 IUSE=afp archive bluray cdda elogind fuse google gnome-keyring gnome-online-accounts gphoto2 gtk +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=app-crypt/gcr:= >=dev-libs/glib-2.51:2 dev-libs/libxml2:2 net-misc/openssh afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) archive? ( app-arch/libarchive:= ) bluray? ( media-libs/libbluray:= ) elogind? ( >=sys-auth/elogind-229:0= ) fuse? ( >=sys-fs/fuse-2.8.0:0 ) gnome-keyring? ( app-crypt/libsecret ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1:= ) google? ( >=dev-libs/libgdata-0.17.7:=[crypt,gnome-online-accounts] >=net-libs/gnome-online-accounts-3.17.1:= ) gphoto2? ( >=media-libs/libgphoto2-2.5.0:= ) gtk? ( >=x11-libs/gtk+-3.0:3 ) http? ( >=net-libs/libsoup-2.42:2.4 ) ios? ( >=app-pda/libimobiledevice-1.2:= >=app-pda/libplist-1:= ) mtp? ( >=dev-libs/libusb-1.0.21 >=media-libs/libmtp-1.1.12 ) nfs? ( >=net-fs/libnfs-1.9.8 ) policykit? ( sys-auth/polkit sys-libs/libcap ) samba? ( >=net-fs/samba-4[client] ) systemd? ( >=sys-apps/systemd-206:0= ) udev? ( cdda? ( dev-libs/libcdio-paranoia ) >=virtual/libgudev-147:= virtual/libudev:= ) udisks? ( >=sys-fs/udisks-1.97:2 ) zeroconf? ( >=net-dns/avahi-0.6 )
 REQUIRED_USE=cdda? ( udev ) elogind? ( !systemd udisks ) google? ( gnome-online-accounts ) mtp? ( udev ) udisks? ( udev ) systemd? ( !elogind udisks )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gvfs/1.32/gvfs-1.32.1.tar.xz https://dev.gentoo.org/~leio/distfiles/gvfs-1.32.1-patches.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=230187b31ec776cf724300ec49319f78
+_md5_=31e204aa6d7464de20712f2b497161dc
diff --git a/metadata/md5-cache/gnome-base/libgtop-2.36.0 b/metadata/md5-cache/gnome-base/libgtop-2.36.0
index 48613c3e51ce..0cf41a433104 100644
--- a/metadata/md5-cache/gnome-base/libgtop-2.36.0
+++ b/metadata/md5-cache/gnome-base/libgtop-2.36.0
@@ -4,10 +4,10 @@ DESCRIPTION=A library that provides top functionality to applications
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/libgtop
 IUSE=+introspection
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.26:2 introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
 SLOT=2/10
 SRC_URI=mirror://gnome/sources/libgtop/2.36/libgtop-2.36.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5fa2ed0ccdab8e7effd1ec40dcbe564b
+_md5_=f9a8a93f10c61f531c8dcf7ef729b59e
diff --git a/metadata/md5-cache/gnome-base/nautilus-3.24.2.1 b/metadata/md5-cache/gnome-base/nautilus-3.24.2.1
index 0a963119e8b5..3689721e6777 100644
--- a/metadata/md5-cache/gnome-base/nautilus-3.24.2.1
+++ b/metadata/md5-cache/gnome-base/nautilus-3.24.2.1
@@ -4,7 +4,7 @@ DESCRIPTION=A file manager for the GNOME desktop
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Nautilus
 IUSE=exif gnome +introspection packagekit +previewer selinux sendto tracker xmp test
-KEYWORDS=~alpha amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm64 ~ia64 ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-2+ LGPL-2+ FDL-1.1
 PDEPEND=gnome? ( x11-themes/adwaita-icon-theme ) tracker? ( >=gnome-extra/nautilus-tracker-tags-0.12 ) previewer? ( >=gnome-extra/sushi-0.1.9 ) sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 ) >=gnome-base/gvfs-1.14[gtk]
 RDEPEND=>=app-arch/gnome-autoar-0.2.1 >=dev-libs/glib-2.51.2:2[dbus] >=x11-libs/pango-1.28.3 >=x11-libs/gtk+-3.21.6:3[introspection?] >=dev-libs/libxml2-2.7.8:2 >=gnome-base/gnome-desktop-3:3= gnome-base/dconf >=gnome-base/gsettings-desktop-schemas-3.8.0 x11-libs/libX11 x11-libs/libXext x11-libs/libXrender exif? ( >=media-libs/libexif-0.6.20 ) introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) selinux? ( >=sys-libs/libselinux-2 ) tracker? ( >=app-misc/tracker-1:= ) xmp? ( >=media-libs/exempi-2.1.0:2 ) packagekit? ( app-admin/packagekit-base ) sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/nautilus/3.24/nautilus-3.24.2.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=05ae3b60e054bb9a649d1a50124b6c01
+_md5_=6a6a6b9223fd32cc8f29068c41cf40dc
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index 06dd02ee0130..200e5f7e19d3 100644
--- a/metadata/md5-cache/gnome-extra/Manifest.gz
+++ b/metadata/md5-cache/gnome-extra/Manifest.gz
diff --git a/metadata/md5-cache/gnome-extra/evolution-data-server-3.24.7 b/metadata/md5-cache/gnome-extra/evolution-data-server-3.24.7
index f02e037d778b..66682cfa20ae 100644
--- a/metadata/md5-cache/gnome-extra/evolution-data-server-3.24.7
+++ b/metadata/md5-cache/gnome-extra/evolution-data-server-3.24.7
@@ -4,7 +4,7 @@ DESCRIPTION=Evolution groupware backend
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
 IUSE=api-doc-extras berkdb +gnome-online-accounts +gtk google +introspection ipv6 ldap kerberos vala +weather test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=|| ( LGPL-2 LGPL-3 ) BSD Sleepycat
 RDEPEND=>=app-crypt/gcr-3.4 >=app-crypt/libsecret-0.5[crypt] >=dev-db/sqlite-3.7.17:= >=dev-libs/glib-2.46:2 >=dev-libs/libical-0.43:= >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4:= >=dev-libs/nss-3.9:= >=net-libs/libsoup-2.42:2.4 dev-libs/icu:= sys-libs/zlib:= virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gtk? ( >=app-crypt/gcr-3.4[gtk] >=x11-libs/gtk+-3.10:3 ) google? ( >=dev-libs/json-glib-1.0.4 >=net-libs/webkit-gtk-2.11.91:4 >=dev-libs/libgdata-0.17.7:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= >=dev-libs/libgdata-0.17.7:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) kerberos? ( virtual/krb5:= ) ldap? ( >=net-nds/openldap-2:= ) weather? ( >=dev-libs/libgweather-3.10:2= )
 REQUIRED_USE=vala? ( introspection )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0/60
 SRC_URI=mirror://gnome/sources/evolution-data-server/3.24/evolution-data-server-3.24.7.tar.xz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	db-use	582140d1a711279e50ce284fc7b609f5	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c96553aacb3feecb13294d582480fd1a
+_md5_=1ac7e93764e6527b314093706a0c0c4a
diff --git a/metadata/md5-cache/gnome-extra/evolution-ews-3.24.6 b/metadata/md5-cache/gnome-extra/evolution-ews-3.24.6
index e73eb25a517b..9bab61edd27e 100644
--- a/metadata/md5-cache/gnome-extra/evolution-ews-3.24.6
+++ b/metadata/md5-cache/gnome-extra/evolution-ews-3.24.6
@@ -4,11 +4,11 @@ DESCRIPTION=Evolution module for connecting to Microsoft Exchange Web Services
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
 IUSE=test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-db/sqlite:3= >=dev-libs/glib-2.46:2 dev-libs/libical:0= >=dev-libs/libmspack-0.4 >=dev-libs/libxml2-2 >=gnome-extra/evolution-data-server-3.24.7:0= >=mail-client/evolution-3.24.6:2.0 >=net-libs/libsoup-2.42:2.4 >=x11-libs/gtk+-3.10:3
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/evolution-ews/3.24/evolution-ews-3.24.6.tar.xz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=41067d510c0bc86c440046431c74b387
+_md5_=4d1a60c799bfb9e5ac53c49a14e1aa65
diff --git a/metadata/md5-cache/gnome-extra/gnome-builder-3.24.2 b/metadata/md5-cache/gnome-extra/gnome-builder-3.24.2
index bf2f535b31d2..d0edb9fee521 100644
--- a/metadata/md5-cache/gnome-extra/gnome-builder-3.24.2
+++ b/metadata/md5-cache/gnome-extra/gnome-builder-3.24.2
@@ -4,7 +4,7 @@ DESCRIPTION=Builder attempts to be an IDE for writing software for GNOME
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Builder
 IUSE=clang +git sysprof vala webkit python_targets_python3_4 python_targets_python3_5 python_single_target_python3_4 python_single_target_python3_5 test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0
 RDEPEND=>=x11-libs/gtk+-3.22.1:3[introspection] >=dev-libs/glib-2.50.0:2[dbus] >=x11-libs/gtksourceview-3.22.0:3.0[introspection] >=dev-libs/gobject-introspection-1.48.0:= >=dev-python/pygobject-3.22.0:3 >=dev-libs/libxml2-2.9.0 >=x11-libs/pango-1.38.0 >=dev-libs/libpeas-1.18.0[python,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-libs/json-glib-1.2.0 >=app-text/gspell-1.2.0 >=app-text/enchant-1.6.0 webkit? ( >=net-libs/webkit-gtk-2.12.0:4=[introspection] ) clang? ( sys-devel/clang:= ) git? ( dev-libs/libgit2[ssh,threads] >=dev-libs/libgit2-glib-0.25.0[ssh] ) >=x11-libs/vte-0.46:2.91 sysprof? ( >=dev-util/sysprof-3.23.91[gtk] ) dev-libs/libpcre:3 python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) )
 REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-builder/3.24/gnome-builder-3.24.2.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d42d96c15b8d0afbd1902a1ad36bd410
+_md5_=9c45e0ea783a289d57609f067da71970
diff --git a/metadata/md5-cache/gnome-extra/gnome-calculator-3.24.0 b/metadata/md5-cache/gnome-extra/gnome-calculator-3.24.0
index e934d2fe1528..01f8b23c9c2e 100644
--- a/metadata/md5-cache/gnome-extra/gnome-calculator-3.24.0
+++ b/metadata/md5-cache/gnome-extra/gnome-calculator-3.24.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.40:2 dev-libs/libxml2:2 dev-libs/mpfr:0 dev-libs/mpc >=
 DESCRIPTION=A calculator application for GNOME
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Calculator
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.40:2 dev-libs/libxml2:2 dev-libs/mpfr:0 dev-libs/mpc >=net-libs/libsoup-2.42:2.4 >=x11-libs/gtk+-3.19.3:3 >=x11-libs/gtksourceview-3.15.1:3.0 !<gnome-extra/gnome-utils-2.3 !gnome-extra/gcalctool
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-calculator/3.24/gnome-calculator-3.24.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8a0335cf8b5849aaea51bf2a6bba91db
+_md5_=b0e4f10705dfa070006fc85781b6e95e
diff --git a/metadata/md5-cache/gnome-extra/gnome-calendar-3.24.3 b/metadata/md5-cache/gnome-extra/gnome-calendar-3.24.3
index 2eecbf11fa2f..3d0fa605f08d 100644
--- a/metadata/md5-cache/gnome-extra/gnome-calendar-3.24.3
+++ b/metadata/md5-cache/gnome-extra/gnome-calendar-3.24.3
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.43.4:2 >=x11-libs/gtk+-3.21.6:3 >=gnome-extra/evolution
 DESCRIPTION=Manage your online calendars with simple and modern interface
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Calendar
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.43.4:2 >=x11-libs/gtk+-3.21.6:3 >=gnome-extra/evolution-data-server-3.17.1:= >=dev-libs/libical-1.0.1:0= net-libs/libsoup:2.4 >=net-libs/gnome-online-accounts-3.2.0:= >=gnome-base/gsettings-desktop-schemas-3.21.2
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-calendar/3.24/gnome-calendar-3.24.3.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4a094cbc32beffb8f332f9ad5fdbdec3
+_md5_=800afbdd8b943b6eb5653e77795c2bf1
diff --git a/metadata/md5-cache/gnome-extra/gnome-characters-3.24.0 b/metadata/md5-cache/gnome-extra/gnome-characters-3.24.0
index 3e69f5325a23..5e4af408b3f6 100644
--- a/metadata/md5-cache/gnome-extra/gnome-characters-3.24.0
+++ b/metadata/md5-cache/gnome-extra/gnome-characters-3.24.0
@@ -4,10 +4,10 @@ DESCRIPTION=Unicode character map viewer and library
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Design/Apps/CharacterMap
 IUSE=test test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2 BSD
 RDEPEND=>=dev-libs/gjs-1.43.3 >=dev-libs/glib-2.32:2 >=dev-libs/gobject-introspection-1.35.9:= >=dev-libs/libunistring-0.9.5 >=x11-libs/gtk+-3.20:3[introspection] >=x11-libs/pango-1.36[introspection]
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-characters/3.24/gnome-characters-3.24.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4818715f32292dcfb1fa118d8ec3f8bf
+_md5_=5dfd469aef7f58b04600477ccbf27d5c
diff --git a/metadata/md5-cache/gnome-extra/gnome-clocks-3.24.0 b/metadata/md5-cache/gnome-extra/gnome-clocks-3.24.0
index 12313827a2d5..a922171b7ab3 100644
--- a/metadata/md5-cache/gnome-extra/gnome-clocks-3.24.0
+++ b/metadata/md5-cache/gnome-extra/gnome-clocks-3.24.0
@@ -3,10 +3,10 @@ DEPEND=>=app-misc/geoclue-2.3.1:2.0 >=dev-libs/glib-2.44:2 >=dev-libs/libgweathe
 DESCRIPTION=Clocks application for GNOME
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Clocks
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=>=app-misc/geoclue-2.3.1:2.0 >=dev-libs/glib-2.44:2 >=dev-libs/libgweather-3.13.91:2= >=gnome-base/gnome-desktop-3.7.90:3= >=media-libs/gsound-0.98 >=sci-geosciences/geocode-glib-0.99.4 >=x11-libs/gtk+-3.19.8:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-clocks/3.24/gnome-clocks-3.24.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=91f3a613844e9832341d8c54cf751cd2
+_md5_=b6d04001437818a9cf538bdc827b13a1
diff --git a/metadata/md5-cache/gnome-extra/gnome-color-manager-3.24.0 b/metadata/md5-cache/gnome-extra/gnome-color-manager-3.24.0
index 94e7b1ceb0cb..2467e41a2d6c 100644
--- a/metadata/md5-cache/gnome-extra/gnome-color-manager-3.24.0
+++ b/metadata/md5-cache/gnome-extra/gnome-color-manager-3.24.0
@@ -4,10 +4,10 @@ DESCRIPTION=Color profile manager for the GNOME desktop
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/gnome-color-manager
 IUSE=packagekit raw test
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.31.10:2 >=media-libs/lcms-2.2:2 >=media-libs/libcanberra-0.10[gtk3] media-libs/libexif media-libs/tiff:0= >=x11-libs/gtk+-3.3.8:3 >=x11-libs/vte-0.25.1:2.91 >=x11-misc/colord-1.3.1:0= >=x11-libs/colord-gtk-0.1.20 packagekit? ( app-admin/packagekit-base ) raw? ( media-gfx/exiv2:0= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-color-manager/3.24/gnome-color-manager-3.24.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0dc0da9cdf1ec2b4c31f912f4809c285
+_md5_=025abfdb46d00dd378869a7c49b29593
diff --git a/metadata/md5-cache/gnome-extra/gnome-documents-3.24.3 b/metadata/md5-cache/gnome-extra/gnome-documents-3.24.3
index a7db11cbf56a..b4cdbd8b0bfd 100644
--- a/metadata/md5-cache/gnome-extra/gnome-documents-3.24.3
+++ b/metadata/md5-cache/gnome-extra/gnome-documents-3.24.3
@@ -3,10 +3,10 @@ DEPEND=>=app-text/evince-3.13.3[introspection] >=net-libs/webkit-gtk-2.6:4[intro
 DESCRIPTION=A document manager application for GNOME
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Documents
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=>=app-text/evince-3.13.3[introspection] >=net-libs/webkit-gtk-2.6:4[introspection] dev-libs/gjs >=dev-libs/glib-2.39.3:2 >=dev-libs/gobject-introspection-1.31.6:= >=x11-libs/gtk+-3.22.10:3[introspection] >=net-libs/libsoup-2.41.3:2.4 gnome-base/gnome-desktop:3=[introspection] >=app-misc/tracker-1:=[miner-fs] >=x11-libs/cairo-1.14 >=dev-libs/libgdata-0.13.3:=[crypt,gnome-online-accounts,introspection] x11-libs/gdk-pixbuf:2[introspection] >=net-libs/gnome-online-accounts-3.2.0[introspection] x11-libs/pango[introspection] >=net-libs/libzapojit-0.0.2[introspection] >=app-text/libgepub-0.4[introspection] net-misc/gnome-online-miners sys-apps/dbus x11-themes/adwaita-icon-theme
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-documents/3.24/gnome-documents-3.24.3.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1a616d2c045a47498be60c787d239797
+_md5_=a7dcd0b93853c59b4988b0b319cf970e
diff --git a/metadata/md5-cache/gnome-extra/gnome-getting-started-docs-3.24.1 b/metadata/md5-cache/gnome-extra/gnome-getting-started-docs-3.24.1
index f67722af61a5..cba111a0fc23 100644
--- a/metadata/md5-cache/gnome-extra/gnome-getting-started-docs-3.24.1
+++ b/metadata/md5-cache/gnome-extra/gnome-getting-started-docs-3.24.1
@@ -3,11 +3,11 @@ DEPEND=app-text/yelp-tools >=app-portage/elt-patches-20170422 app-arch/xz-utils
 DESCRIPTION=Help a new user get started in GNOME
 EAPI=6
 HOMEPAGE=https://help.gnome.org/
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=CC-BY-SA-3.0
 RDEPEND=gnome-extra/gnome-user-docs
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-getting-started-docs/3.24/gnome-getting-started-docs-3.24.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=35732624f082d482ad5ecbf09625e226
+_md5_=ca482646e1c7ab1ca299cf5c76fdb6a9
diff --git a/metadata/md5-cache/gnome-extra/gnome-logs-3.24.2 b/metadata/md5-cache/gnome-extra/gnome-logs-3.24.2
index 7fe4fe5d8818..d7e2c4fa851b 100644
--- a/metadata/md5-cache/gnome-extra/gnome-logs-3.24.2
+++ b/metadata/md5-cache/gnome-extra/gnome-logs-3.24.2
@@ -4,10 +4,10 @@ DESCRIPTION=Log messages and event viewer
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Logs
 IUSE=test test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.43.90:2 gnome-base/gsettings-desktop-schemas sys-apps/systemd:= >=x11-libs/gtk+-3.19.3:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-logs/3.24/gnome-logs-3.24.2.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3e009ae7841e2b1be1a9d8d2e8e5c4c9
+_md5_=b93a4b78b2ecb49a889020b8e7669215
diff --git a/metadata/md5-cache/gnome-extra/gnome-power-manager-3.24.0 b/metadata/md5-cache/gnome-extra/gnome-power-manager-3.24.0
index e310149773a7..d86bd89499cb 100644
--- a/metadata/md5-cache/gnome-extra/gnome-power-manager-3.24.0
+++ b/metadata/md5-cache/gnome-extra/gnome-power-manager-3.24.0
@@ -4,10 +4,10 @@ DESCRIPTION=GNOME power management service
 EAPI=6
 HOMEPAGE=https://projects.gnome.org/gnome-power-manager/
 IUSE=test test
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.45.8:2 >=x11-libs/gtk+-3.3.8:3 >=x11-libs/cairo-1 >=sys-power/upower-0.99:= x11-themes/adwaita-icon-theme
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-power-manager/3.24/gnome-power-manager-3.24.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=61e79843890f72da1efa0c086ae90802
+_md5_=1c9e05185d4a32051c1584a884fc5f6e
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extensions-3.24.3 b/metadata/md5-cache/gnome-extra/gnome-shell-extensions-3.24.3
index 67d9c958fadf..dcd136d64b25 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extensions-3.24.3
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extensions-3.24.3
@@ -4,10 +4,10 @@ DESCRIPTION=JavaScript extensions for GNOME Shell
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShell/Extensions
 IUSE=examples
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.26:2 >=gnome-base/libgtop-2.28.3[introspection] >=app-eselect/eselect-gnome-shell-extensions-20111211 >=dev-libs/gjs-1.29 dev-libs/gobject-introspection:= dev-libs/atk[introspection] gnome-base/gnome-menus:3[introspection] >=gnome-base/gnome-shell-3.14.2 media-libs/clutter:1.0[introspection] net-libs/telepathy-glib[introspection] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] x11-themes/adwaita-icon-theme x11-wm/mutter[introspection]
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-shell-extensions/3.24/gnome-shell-extensions-3.24.3.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=24e5b270f2bb57f0b2396a638c7962da
+_md5_=4d3c4858f5da64a73aa5a99ebbe50017
diff --git a/metadata/md5-cache/gnome-extra/gnome-system-monitor-3.24.0 b/metadata/md5-cache/gnome-extra/gnome-system-monitor-3.24.0
index 471b9a1a929e..adaebe1b5428 100644
--- a/metadata/md5-cache/gnome-extra/gnome-system-monitor-3.24.0
+++ b/metadata/md5-cache/gnome-extra/gnome-system-monitor-3.24.0
@@ -4,10 +4,10 @@ DESCRIPTION=The Gnome System Monitor
 EAPI=6
 HOMEPAGE=https://help.gnome.org/users/gnome-system-monitor/
 IUSE=systemd X
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.37.3:2 >=gnome-base/libgtop-2.28.2:2= >=x11-libs/gtk+-3.22:3[X(+)] >=dev-cpp/gtkmm-3.3.18:3.0 >=dev-cpp/glibmm-2.46:2 >=dev-libs/libxml2-2.0:2 >=gnome-base/librsvg-2.35:2 systemd? ( >=sys-apps/systemd-44:0= ) X? ( >=x11-libs/libwnck-2.91.0:3 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-system-monitor/3.24/gnome-system-monitor-3.24.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d37cbb560ef75dce5f011e9b329b8f44
+_md5_=ac96f6cfccec1b3c36cd27181b27716f
diff --git a/metadata/md5-cache/gnome-extra/gnome-tweak-tool-3.24.1 b/metadata/md5-cache/gnome-extra/gnome-tweak-tool-3.24.1
index cd342ddd5016..ff1a59d4f915 100644
--- a/metadata/md5-cache/gnome-extra/gnome-tweak-tool-3.24.1
+++ b/metadata/md5-cache/gnome-extra/gnome-tweak-tool-3.24.1
@@ -4,11 +4,11 @@ DESCRIPTION=Tool to customize GNOME 3 options
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/action/show/Apps/GnomeTweakTool
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~ia64 ~x86
+KEYWORDS=amd64 ~ia64 x86
 LICENSE=GPL-2+
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/glib:2[dbus] >=dev-python/pygobject-3.10.2:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=gnome-base/gsettings-desktop-schemas-3.23.3 >=gnome-base/gnome-desktop-3.6.0.1:3=[introspection] >=x11-libs/gtk+-3.12:3[introspection] net-libs/libsoup:2.4[introspection] x11-libs/libnotify[introspection] >=gnome-base/gnome-settings-daemon-3 >=gnome-base/gnome-shell-3.24 >=gnome-base/nautilus-3
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-tweak-tool/3.24/gnome-tweak-tool-3.24.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d346d8021ac89df9e55c68fe3b992646
+_md5_=ec3b035f9071e8dc5974c85aa60b5169
diff --git a/metadata/md5-cache/gnome-extra/gnome-user-docs-3.24.2 b/metadata/md5-cache/gnome-extra/gnome-user-docs-3.24.2
index f63cb4d00cd6..c29e58c4f1f9 100644
--- a/metadata/md5-cache/gnome-extra/gnome-user-docs-3.24.2
+++ b/metadata/md5-cache/gnome-extra/gnome-user-docs-3.24.2
@@ -4,10 +4,10 @@ DESCRIPTION=GNOME end user documentation
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/gnome-user-docs
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=CC-BY-3.0
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-user-docs/3.24/gnome-user-docs-3.24.2.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=eb59c092b632657f69c3b0940c65d6fd
+_md5_=6a2f14e98c12e128c027731f550a6068
diff --git a/metadata/md5-cache/gnome-extra/gnome-weather-3.24.0 b/metadata/md5-cache/gnome-extra/gnome-weather-3.24.0
index 02a7f269d119..297bac7507fb 100644
--- a/metadata/md5-cache/gnome-extra/gnome-weather-3.24.0
+++ b/metadata/md5-cache/gnome-extra/gnome-weather-3.24.0
@@ -4,10 +4,10 @@ DESCRIPTION=A weather application for GNOME
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Design/Apps/Weather
 IUSE=test test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0
 RDEPEND=>=app-misc/geoclue-2.3.1:2.0 >=dev-libs/gjs-1.43.3 >=dev-libs/glib-2.32:2 >=dev-libs/gobject-introspection-1.35.9:= >=dev-libs/libgweather-3.17.2:= gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.11.4:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-weather/3.24/gnome-weather-3.24.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=493394e93763d919f7af9dc58b30f52d
+_md5_=63d15337c9c679216c83fdb7492bf278
diff --git a/metadata/md5-cache/gnome-extra/nautilus-tracker-tags-1.12.3 b/metadata/md5-cache/gnome-extra/nautilus-tracker-tags-1.12.3
deleted file mode 100644
index b89f284eea68..000000000000
--- a/metadata/md5-cache/gnome-extra/nautilus-tracker-tags-1.12.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare setup
-DEPEND=~app-misc/tracker-1.12.3 >=dev-libs/glib-2.44:2 >=gnome-base/nautilus-2.90 x11-libs/gtk+:3 app-arch/xz-utils
-DESCRIPTION=Nautilus extension to tag files for Tracker
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/Tracker
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2
-RDEPEND=~app-misc/tracker-1.12.3 >=dev-libs/glib-2.44:2 >=gnome-base/nautilus-2.90 x11-libs/gtk+:3 !<app-misc/tracker-0.12.5-r1[nautilus]
-SLOT=0
-SRC_URI=mirror://gnome/sources/tracker/1.12/tracker-1.12.3.tar.xz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=b0315ad80c0cbd97a4f6d9f0fa4f6251
diff --git a/metadata/md5-cache/gnome-extra/nautilus-tracker-tags-1.12.4 b/metadata/md5-cache/gnome-extra/nautilus-tracker-tags-1.12.4
index 5233055749a3..252cb05d0b48 100644
--- a/metadata/md5-cache/gnome-extra/nautilus-tracker-tags-1.12.4
+++ b/metadata/md5-cache/gnome-extra/nautilus-tracker-tags-1.12.4
@@ -3,10 +3,10 @@ DEPEND=~app-misc/tracker-1.12.4 >=dev-libs/glib-2.44:2 >=gnome-base/nautilus-2.9
 DESCRIPTION=Nautilus extension to tag files for Tracker
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Tracker
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=~app-misc/tracker-1.12.4 >=dev-libs/glib-2.44:2 >=gnome-base/nautilus-2.90 x11-libs/gtk+:3 !<app-misc/tracker-0.12.5-r1[nautilus]
 SLOT=0
 SRC_URI=mirror://gnome/sources/tracker/1.12/tracker-1.12.4.tar.xz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=30c4c1fc033aa8478f2fb51ce4f19cba
+_md5_=d32de93d65790b02545a2da6caac7f1b
diff --git a/metadata/md5-cache/gnome-extra/zenity-3.24.0 b/metadata/md5-cache/gnome-extra/zenity-3.24.0
index 05b118502304..2e64917b9c1a 100644
--- a/metadata/md5-cache/gnome-extra/zenity-3.24.0
+++ b/metadata/md5-cache/gnome-extra/zenity-3.24.0
@@ -4,10 +4,10 @@ DESCRIPTION=Tool to display dialogs from the commandline and shell scripts
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Zenity
 IUSE=debug libnotify webkit
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.8:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3:3[X] x11-libs/libX11 x11-libs/pango libnotify? ( >=x11-libs/libnotify-0.6.1:= ) webkit? ( >=net-libs/webkit-gtk-2.8.1:4 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/zenity/3.24/zenity-3.24.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fcc08eb76040ef3b40bb7e984d98168b
+_md5_=1b2953b9779d513c0c4e84b507b00d23
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index 1c9ee71945ec..28747809a6db 100644
--- a/metadata/md5-cache/mail-client/Manifest.gz
+++ b/metadata/md5-cache/mail-client/Manifest.gz
diff --git a/metadata/md5-cache/mail-client/evolution-3.24.6 b/metadata/md5-cache/mail-client/evolution-3.24.6
index cc7791521253..32edd576bd17 100644
--- a/metadata/md5-cache/mail-client/evolution-3.24.6
+++ b/metadata/md5-cache/mail-client/evolution-3.24.6
@@ -4,10 +4,10 @@ DESCRIPTION=Integrated mail, addressbook and calendaring functionality
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
 IUSE=archive +bogofilter crypt geolocation highlight ldap spamassassin spell ssl +weather ytnef
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 x86
 LICENSE=|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP
 RDEPEND=>=app-crypt/gcr-3.4:=[gtk] >=app-text/enchant-1.1.7 >=dev-libs/glib-2.46:2[dbus] >=dev-libs/libxml2-2.7.3:2 >=gnome-base/gnome-desktop-2.91.3:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 >=gnome-extra/evolution-data-server-3.24.6:=[gtk,weather?] >=media-libs/libcanberra-0.25[gtk3] >=net-libs/libsoup-2.42:2.4 >=net-libs/webkit-gtk-2.13.90:4 >=x11-libs/cairo-1.9.15:=[glib] >=x11-libs/gdk-pixbuf-2.24:2 >=x11-libs/gtk+-3.10:3 >=x11-libs/libnotify-0.7:= >=x11-misc/shared-mime-info-0.22 >=app-text/iso-codes-0.49 dev-libs/atk gnome-base/dconf dev-libs/libical:= x11-libs/libSM x11-libs/libICE archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] ) crypt? ( >=app-crypt/gnupg-1.4 || ( app-crypt/pinentry[gnome-keyring] app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] app-crypt/pinentry[qt5] ) x11-libs/libcryptui ) geolocation? ( >=media-libs/libchamplain-0.12:0.12[gtk] >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 >=sci-geosciences/geocode-glib-3.10.0 x11-libs/mx:1.0 ) ldap? ( >=net-nds/openldap-2:= ) spell? ( app-text/gtkspell:3 ) ssl? ( >=dev-libs/nspr-4.6.1:= >=dev-libs/nss-3.11:= ) weather? ( >=dev-libs/libgweather-3.10:2= ) ytnef? ( net-mail/ytnef ) bogofilter? ( mail-filter/bogofilter ) highlight? ( app-text/highlight ) spamassassin? ( mail-filter/spamassassin ) !gnome-extra/evolution-exchange
 SLOT=2.0
 SRC_URI=mirror://gnome/sources/evolution/3.24/evolution-3.24.6.tar.xz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7ec4262a64305edcdd0ef6074574b8b9
+_md5_=ce8d96b8f262aa1c00d1bbeeda80ef5b
diff --git a/metadata/md5-cache/mail-client/geary-0.12.0 b/metadata/md5-cache/mail-client/geary-0.12.0
index d95bf167493b..036263a8e508 100644
--- a/metadata/md5-cache/mail-client/geary-0.12.0
+++ b/metadata/md5-cache/mail-client/geary-0.12.0
@@ -4,10 +4,10 @@ DESCRIPTION=A lightweight, easy-to-use, feature-rich email client
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Geary
 IUSE=nls
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=app-crypt/gcr-3.10.1:0=[gtk,introspection,vala] app-crypt/libsecret app-text/iso-codes dev-db/sqlite:3 >=dev-libs/glib-2.42:2[dbus] >=dev-libs/libgee-0.8.5:0.8= dev-libs/libxml2:2 dev-libs/gmime:2.6 media-libs/libcanberra >=net-libs/webkit-gtk-2.10.0:4=[introspection] >=x11-libs/gtk+-3.14.0:3[introspection] x11-libs/libnotify gnome-base/gsettings-desktop-schemas nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnome/sources/geary/0.12/geary-0.12.0.tar.xz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=974c54472879746f862e301df5274c5a
+_md5_=7b9f8e66157bcd8a332db6ba90506d7b
diff --git a/metadata/md5-cache/mate-base/Manifest.gz b/metadata/md5-cache/mate-base/Manifest.gz
index 67dbc104b211..36e4a1d75b3a 100644
--- a/metadata/md5-cache/mate-base/Manifest.gz
+++ b/metadata/md5-cache/mate-base/Manifest.gz
diff --git a/metadata/md5-cache/mate-base/mate-session-manager-1.12.2-r1 b/metadata/md5-cache/mate-base/mate-session-manager-1.12.2-r1
index 74d965b94190..b458a8579bb1 100644
--- a/metadata/md5-cache/mate-base/mate-session-manager-1.12.2-r1
+++ b/metadata/md5-cache/mate-base/mate-session-manager-1.12.2-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.36:2 dev-libs/libxslt sys-apps/dbus x11-apps/xdpyinfo x11-libs/gdk-pixbuf:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango x11-libs/xtrans x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk virtual/libintl elibc_FreeBSD? ( dev-libs/libexecinfo ) gnome-keyring? ( gnome-base/gnome-keyring ) !gtk3? ( >=x11-libs/gtk+-2.14:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) systemd? ( sys-apps/systemd ) upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) ) >=dev-util/intltool-0.40:* >=dev-lang/perl-5 >=sys-devel/gettext-0.10.40:* virtual/pkgconfig:* !<gnome-base/gdm-2.20.4 >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.12
+DEPEND=>=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.36:2 dev-libs/libxslt sys-apps/dbus x11-apps/xdpyinfo x11-libs/gdk-pixbuf:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango x11-libs/xtrans x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk virtual/libintl elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) gnome-keyring? ( gnome-base/gnome-keyring ) !gtk3? ( >=x11-libs/gtk+-2.14:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) systemd? ( sys-apps/systemd ) upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) ) >=dev-util/intltool-0.40:* >=dev-lang/perl-5 >=sys-devel/gettext-0.10.40:* virtual/pkgconfig:* !<gnome-base/gdm-2.20.4 >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.12
 DESCRIPTION=MATE session manager
 EAPI=6
 HOMEPAGE=http://mate-desktop.org/
 IUSE=debug elibc_FreeBSD gnome-keyring gtk3 ipv6 systemd upower
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2 LGPL-2 FDL-1.1
-RDEPEND=>=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.36:2 dev-libs/libxslt sys-apps/dbus x11-apps/xdpyinfo x11-libs/gdk-pixbuf:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango x11-libs/xtrans x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk virtual/libintl elibc_FreeBSD? ( dev-libs/libexecinfo ) gnome-keyring? ( gnome-base/gnome-keyring ) !gtk3? ( >=x11-libs/gtk+-2.14:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) systemd? ( sys-apps/systemd ) upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) )
+RDEPEND=>=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.36:2 dev-libs/libxslt sys-apps/dbus x11-apps/xdpyinfo x11-libs/gdk-pixbuf:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango x11-libs/xtrans x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk virtual/libintl elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) gnome-keyring? ( gnome-base/gnome-keyring ) !gtk3? ( >=x11-libs/gtk+-2.14:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) systemd? ( sys-apps/systemd ) upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) )
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.12/mate-session-manager-1.12.2.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cefe7aae6c2ed565d5e20908e254dbaa
+_md5_=0c8dce55df871a3a38b4bc4edb67387b
diff --git a/metadata/md5-cache/mate-base/mate-session-manager-1.14.1 b/metadata/md5-cache/mate-base/mate-session-manager-1.14.1
index a0c4c949cf6a..9c3d09ead5be 100644
--- a/metadata/md5-cache/mate-base/mate-session-manager-1.14.1
+++ b/metadata/md5-cache/mate-base/mate-session-manager-1.14.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.36:2 dev-libs/libxslt sys-apps/dbus x11-libs/gdk-pixbuf:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango x11-libs/xtrans virtual/libintl elibc_FreeBSD? ( dev-libs/libexecinfo ) !gtk3? ( >=x11-libs/gtk+-2.14:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) systemd? ( sys-apps/systemd ) upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) ) >=dev-util/intltool-0.40:* >=dev-lang/perl-5 >=sys-devel/gettext-0.10.40:* virtual/pkgconfig:* !<gnome-base/gdm-2.20.4 >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.14
+DEPEND=>=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.36:2 dev-libs/libxslt sys-apps/dbus x11-libs/gdk-pixbuf:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango x11-libs/xtrans virtual/libintl elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) !gtk3? ( >=x11-libs/gtk+-2.14:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) systemd? ( sys-apps/systemd ) upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) ) >=dev-util/intltool-0.40:* >=dev-lang/perl-5 >=sys-devel/gettext-0.10.40:* virtual/pkgconfig:* !<gnome-base/gdm-2.20.4 >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.14
 DESCRIPTION=MATE session manager
 EAPI=6
 HOMEPAGE=http://mate-desktop.org/
 IUSE=debug elibc_FreeBSD gnome-keyring gtk3 ipv6 systemd upower
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2 LGPL-2 FDL-1.1
-RDEPEND=>=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.36:2 dev-libs/libxslt sys-apps/dbus x11-libs/gdk-pixbuf:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango x11-libs/xtrans virtual/libintl elibc_FreeBSD? ( dev-libs/libexecinfo ) !gtk3? ( >=x11-libs/gtk+-2.14:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) systemd? ( sys-apps/systemd ) upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) ) x11-apps/xdpyinfo x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk gnome-keyring? ( gnome-base/gnome-keyring )
+RDEPEND=>=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.36:2 dev-libs/libxslt sys-apps/dbus x11-libs/gdk-pixbuf:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango x11-libs/xtrans virtual/libintl elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) !gtk3? ( >=x11-libs/gtk+-2.14:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) systemd? ( sys-apps/systemd ) upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) ) x11-apps/xdpyinfo x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk gnome-keyring? ( gnome-base/gnome-keyring )
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.14/mate-session-manager-1.14.1.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=eb8e7234c19cbfe2ba587959d3823f4e
+_md5_=fbbe46584ccc9eceb15619585e32eb46
diff --git a/metadata/md5-cache/mate-base/mate-session-manager-1.16.1 b/metadata/md5-cache/mate-base/mate-session-manager-1.16.1
index 008bb989a7e5..17e818d0bb11 100644
--- a/metadata/md5-cache/mate-base/mate-session-manager-1.16.1
+++ b/metadata/md5-cache/mate-base/mate-session-manager-1.16.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.36:2 dev-libs/libxslt sys-apps/dbus x11-libs/gdk-pixbuf:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango virtual/libintl elibc_FreeBSD? ( dev-libs/libexecinfo ) >=x11-libs/gtk+-3.14:3 systemd? ( sys-apps/systemd ) upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) ) xtrans? ( x11-libs/xtrans ) >=dev-util/intltool-0.40:* >=dev-lang/perl-5 >=sys-devel/gettext-0.10.40:* virtual/pkgconfig:* !<gnome-base/gdm-2.20.4 >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.16
+DEPEND=>=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.36:2 dev-libs/libxslt sys-apps/dbus x11-libs/gdk-pixbuf:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango virtual/libintl elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) >=x11-libs/gtk+-3.14:3 systemd? ( sys-apps/systemd ) upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) ) xtrans? ( x11-libs/xtrans ) >=dev-util/intltool-0.40:* >=dev-lang/perl-5 >=sys-devel/gettext-0.10.40:* virtual/pkgconfig:* !<gnome-base/gdm-2.20.4 >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.16
 DESCRIPTION=MATE session manager
 EAPI=6
 HOMEPAGE=http://mate-desktop.org/
 IUSE=debug elibc_FreeBSD gnome-keyring ipv6 systemd upower +xtrans
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2 LGPL-2 FDL-1.1
-RDEPEND=>=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.36:2 dev-libs/libxslt sys-apps/dbus x11-libs/gdk-pixbuf:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango virtual/libintl elibc_FreeBSD? ( dev-libs/libexecinfo ) >=x11-libs/gtk+-3.14:3 systemd? ( sys-apps/systemd ) upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) ) xtrans? ( x11-libs/xtrans ) x11-apps/xdpyinfo x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk gnome-keyring? ( gnome-base/gnome-keyring )
+RDEPEND=>=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.36:2 dev-libs/libxslt sys-apps/dbus x11-libs/gdk-pixbuf:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango virtual/libintl elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) >=x11-libs/gtk+-3.14:3 systemd? ( sys-apps/systemd ) upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) ) xtrans? ( x11-libs/xtrans ) x11-apps/xdpyinfo x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk gnome-keyring? ( gnome-base/gnome-keyring )
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.16/mate-session-manager-1.16.1.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=afeda98880fee286254a84a3e9ddec5b
+_md5_=d003facfcf90e9bdf31a8665ca101f01
diff --git a/metadata/md5-cache/mate-base/mate-session-manager-1.18.0 b/metadata/md5-cache/mate-base/mate-session-manager-1.18.0
index edead26cdb8e..135c9484c72d 100644
--- a/metadata/md5-cache/mate-base/mate-session-manager-1.18.0
+++ b/metadata/md5-cache/mate-base/mate-session-manager-1.18.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.36:2 dev-libs/libxslt sys-apps/dbus x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango virtual/libintl elibc_FreeBSD? ( dev-libs/libexecinfo ) systemd? ( sys-apps/systemd ) !systemd? ( >=sys-auth/consolekit-0.9.2 ) xtrans? ( x11-libs/xtrans ) >=dev-util/intltool-0.40:* >=dev-lang/perl-5 >=sys-devel/gettext-0.10.40:* virtual/pkgconfig:* !<gnome-base/gdm-2.20.4 >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.18
+DEPEND=>=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.36:2 dev-libs/libxslt sys-apps/dbus x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango virtual/libintl elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) systemd? ( sys-apps/systemd ) !systemd? ( >=sys-auth/consolekit-0.9.2 ) xtrans? ( x11-libs/xtrans ) >=dev-util/intltool-0.40:* >=dev-lang/perl-5 >=sys-devel/gettext-0.10.40:* virtual/pkgconfig:* !<gnome-base/gdm-2.20.4 >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.18
 DESCRIPTION=MATE session manager
 EAPI=6
 HOMEPAGE=http://mate-desktop.org/
 IUSE=debug elibc_FreeBSD gnome-keyring ipv6 systemd xtrans
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2 LGPL-2 FDL-1.1
-RDEPEND=>=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.36:2 dev-libs/libxslt sys-apps/dbus x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango virtual/libintl elibc_FreeBSD? ( dev-libs/libexecinfo ) systemd? ( sys-apps/systemd ) !systemd? ( >=sys-auth/consolekit-0.9.2 ) xtrans? ( x11-libs/xtrans ) x11-apps/xdpyinfo x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk gnome-keyring? ( gnome-base/gnome-keyring )
+RDEPEND=>=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.36:2 dev-libs/libxslt sys-apps/dbus x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango virtual/libintl elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) systemd? ( sys-apps/systemd ) !systemd? ( >=sys-auth/consolekit-0.9.2 ) xtrans? ( x11-libs/xtrans ) x11-apps/xdpyinfo x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk gnome-keyring? ( gnome-base/gnome-keyring )
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.18/mate-session-manager-1.18.0.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ec41ce25e846672b9645624b08d804ad
+_md5_=778bae00905fdf6725e055848ff7aab0
diff --git a/metadata/md5-cache/mate-base/mate-session-manager-1.18.0-r1 b/metadata/md5-cache/mate-base/mate-session-manager-1.18.0-r1
index 57e337978bfa..f47c42e10972 100644
--- a/metadata/md5-cache/mate-base/mate-session-manager-1.18.0-r1
+++ b/metadata/md5-cache/mate-base/mate-session-manager-1.18.0-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.36:2 dev-libs/libxslt sys-apps/dbus x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango virtual/libintl elibc_FreeBSD? ( dev-libs/libexecinfo ) systemd? ( sys-apps/systemd ) !systemd? ( >=sys-auth/consolekit-0.9.2 ) xtrans? ( x11-libs/xtrans ) >=dev-util/intltool-0.40:* >=dev-lang/perl-5 >=sys-devel/gettext-0.10.40:* virtual/pkgconfig:* !<gnome-base/gdm-2.20.4 >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.18
+DEPEND=>=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.36:2 dev-libs/libxslt sys-apps/dbus x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango virtual/libintl elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) systemd? ( sys-apps/systemd ) !systemd? ( >=sys-auth/consolekit-0.9.2 ) xtrans? ( x11-libs/xtrans ) >=dev-util/intltool-0.40:* >=dev-lang/perl-5 >=sys-devel/gettext-0.10.40:* virtual/pkgconfig:* !<gnome-base/gdm-2.20.4 >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.18
 DESCRIPTION=MATE session manager
 EAPI=6
 HOMEPAGE=http://mate-desktop.org/
 IUSE=debug elibc_FreeBSD gnome-keyring ipv6 systemd +xtrans
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2 LGPL-2 FDL-1.1
-RDEPEND=>=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.36:2 dev-libs/libxslt sys-apps/dbus x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango virtual/libintl elibc_FreeBSD? ( dev-libs/libexecinfo ) systemd? ( sys-apps/systemd ) !systemd? ( >=sys-auth/consolekit-0.9.2 ) xtrans? ( x11-libs/xtrans ) x11-apps/xdpyinfo x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk gnome-keyring? ( gnome-base/gnome-keyring )
+RDEPEND=>=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.36:2 dev-libs/libxslt sys-apps/dbus x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango virtual/libintl elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) systemd? ( sys-apps/systemd ) !systemd? ( >=sys-auth/consolekit-0.9.2 ) xtrans? ( x11-libs/xtrans ) x11-apps/xdpyinfo x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk gnome-keyring? ( gnome-base/gnome-keyring )
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.18/mate-session-manager-1.18.0.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7b454860d5e6cb2a15f5efffd261c924
+_md5_=be9a1a19ee420c8c825d70502640cc3a
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index 964c420415b2..cbc8f04d57e7 100644
--- a/metadata/md5-cache/media-fonts/Manifest.gz
+++ b/metadata/md5-cache/media-fonts/Manifest.gz
diff --git a/metadata/md5-cache/media-fonts/fontawesome-4.7.0 b/metadata/md5-cache/media-fonts/fontawesome-4.7.0
index 3c2401e1cd40..fd103b5fb6f2 100644
--- a/metadata/md5-cache/media-fonts/fontawesome-4.7.0
+++ b/metadata/md5-cache/media-fonts/fontawesome-4.7.0
@@ -7,7 +7,7 @@ IUSE=+otf +ttf X
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=CC-BY-3.0 OFL-1.1
 REQUIRED_USE=|| ( otf ttf )
-SLOT=0
+SLOT=0/4
 SRC_URI=https://github.com/FortAwesome/Font-Awesome/archive/v4.7.0.tar.gz -> fontawesome-4.7.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	font	82836641e7d4639329d8c195234ad0e3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9429ee1158067d04e4c96032a2088ab5
+_md5_=ed2c4eb0196a6f84bafe10c00b0a5d95
diff --git a/metadata/md5-cache/media-fonts/fontawesome-4.6.3 b/metadata/md5-cache/media-fonts/fontawesome-5.0.4
index 9a7370202596..861ca58e5b8f 100644
--- a/metadata/md5-cache/media-fonts/fontawesome-4.6.3
+++ b/metadata/md5-cache/media-fonts/fontawesome-5.0.4
@@ -1,13 +1,13 @@
-DEFINED_PHASES=configure install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEFINED_PHASES=install postinst postrm setup
+DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
 DESCRIPTION=The iconic font
 EAPI=6
-HOMEPAGE=http://fontawesome.io
+HOMEPAGE=https://fontawesome.com
 IUSE=+otf +ttf X
-KEYWORDS=amd64 arm arm64 x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=CC-BY-3.0 OFL-1.1
 REQUIRED_USE=|| ( otf ttf )
-SLOT=0
-SRC_URI=https://github.com/FortAwesome/Font-Awesome/archive/v4.6.3.tar.gz -> fontawesome-4.6.3.tar.gz
+SLOT=0/5
+SRC_URI=https://use.fontawesome.com/releases/v5.0.4/fontawesome-free-5.0.4.zip
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	font	82836641e7d4639329d8c195234ad0e3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=8c41ac135aced964c641ce5e56e9bcb5
+_md5_=6d2e50637e5839bf0990914e28f2e430
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 6c0185ca6f56..5afc153effb5 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/alembic-1.7.4 b/metadata/md5-cache/media-gfx/alembic-1.7.4
index 687340229b1b..0a8ea9c8abd3 100644
--- a/metadata/md5-cache/media-gfx/alembic-1.7.4
+++ b/metadata/md5-cache/media-gfx/alembic-1.7.4
@@ -11,4 +11,4 @@ REQUIRED_USE=python_targets_python2_7 hdf5? ( zlib ) pyalembic? ( boost )
 SLOT=0
 SRC_URI=https://github.com/alembic/alembic/archive/1.7.4.tar.gz -> alembic-1.7.4.tar.gz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=df18e602afe678ad95412e20342bdb37
+_md5_=306448c2dbee73918d9c932d11334c3c
diff --git a/metadata/md5-cache/media-gfx/eog-3.24.1 b/metadata/md5-cache/media-gfx/eog-3.24.1
index 39f8170fb983..73c4b7ddfad3 100644
--- a/metadata/md5-cache/media-gfx/eog-3.24.1
+++ b/metadata/md5-cache/media-gfx/eog-3.24.1
@@ -4,11 +4,11 @@ DESCRIPTION=The Eye of GNOME image viewer
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/EyeOfGnome
 IUSE=debug +exif +introspection +jpeg lcms +svg tiff xmp
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.42.0:2[dbus] >=dev-libs/libpeas-0.7.4:=[gtk] >=gnome-base/gnome-desktop-2.91.2:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 >=x11-libs/gtk+-3.22.0:3[introspection,X] >=x11-misc/shared-mime-info-0.20 >=x11-libs/gdk-pixbuf-2.30.0:2[jpeg?,tiff?] x11-libs/libX11 exif? ( >=media-libs/libexif-0.6.14 ) introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) svg? ( >=gnome-base/librsvg-2.36.2:2 ) xmp? ( media-libs/exempi:2 )
 REQUIRED_USE=exif? ( jpeg )
 SLOT=1
 SRC_URI=mirror://gnome/sources/eog/3.24/eog-3.24.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=aef43a7aa26473540aa410d012776c3d
+_md5_=81156550cc45e0ea4f82ff84079c857e
diff --git a/metadata/md5-cache/media-gfx/gnome-font-viewer-3.24.0 b/metadata/md5-cache/media-gfx/gnome-font-viewer-3.24.0
index 84d060bf676d..917e8230b5ca 100644
--- a/metadata/md5-cache/media-gfx/gnome-font-viewer-3.24.0
+++ b/metadata/md5-cache/media-gfx/gnome-font-viewer-3.24.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.35.1:2 gnome-base/gnome-desktop:3= media-libs/fontconfi
 DESCRIPTION=Font viewer for GNOME
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/gnome-font-viewer
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.35.1:2 gnome-base/gnome-desktop:3= media-libs/fontconfig:1.0 media-libs/freetype:2 >=media-libs/harfbuzz-0.9.9 >=x11-libs/gtk+-3.20:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-font-viewer/3.24/gnome-font-viewer-3.24.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0916a46faeba34c12421de97bfc5c149
+_md5_=fdc81141ba8a9430d4071aeb977970c1
diff --git a/metadata/md5-cache/media-gfx/gnome-photos-3.24.5 b/metadata/md5-cache/media-gfx/gnome-photos-3.24.5
index a5a1372fa0e8..e8b307ad0ecf 100644
--- a/metadata/md5-cache/media-gfx/gnome-photos-3.24.5
+++ b/metadata/md5-cache/media-gfx/gnome-photos-3.24.5
@@ -4,10 +4,10 @@ DESCRIPTION=Access, organize and share your photos on GNOME
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Photos
 IUSE=flickr test upnp-av test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=app-misc/tracker-1:=[miner-fs] >=dev-libs/glib-2.44:2 gnome-base/gsettings-desktop-schemas >=dev-libs/libgdata-0.15.2:0=[gnome-online-accounts] media-libs/babl >=media-libs/gegl-0.3.14:0.3[cairo,jpeg2k,raw] media-libs/gexiv2 >=media-libs/grilo-0.3.0:0.3= >=media-libs/libpng-1.6:0= >=net-libs/gnome-online-accounts-3.8:= >=net-libs/libgfbgraph-0.2.1:0.2 sci-geosciences/geocode-glib >=x11-libs/cairo-1.14 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22.15:3 net-misc/gnome-online-miners[flickr?] upnp-av? ( media-plugins/grilo-plugins:0.3[upnp-av] ) flickr? ( media-plugins/grilo-plugins:0.3[flickr] )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-photos/3.24/gnome-photos-3.24.5.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=84ef46e75a09e2bb75e77051ffc486a1
+_md5_=9c87a0449b99adcfa6f4972db1c5598e
diff --git a/metadata/md5-cache/media-gfx/gpicview-0.2.5-r1 b/metadata/md5-cache/media-gfx/gpicview-0.2.5-r1
new file mode 100644
index 000000000000..46981fa17c21
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/gpicview-0.2.5-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=postinst postrm
+DEPEND=virtual/jpeg:0 >=x11-libs/gtk+-2.6:2 >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=A Simple and Fast Image Viewer for X
+EAPI=6
+HOMEPAGE=http://lxde.sourceforge.net/gpicview
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~arm-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=virtual/jpeg:0 >=x11-libs/gtk+-2.6:2
+SLOT=0
+SRC_URI=mirror://sourceforge/lxde/gpicview-0.2.5.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1c6ded41dd3e746c14a9c665dd12ab23
diff --git a/metadata/md5-cache/media-gfx/simple-scan-3.24.1 b/metadata/md5-cache/media-gfx/simple-scan-3.24.1
index b1b0aaf808a7..d25dfa6b5bb0 100644
--- a/metadata/md5-cache/media-gfx/simple-scan-3.24.1
+++ b/metadata/md5-cache/media-gfx/simple-scan-3.24.1
@@ -4,10 +4,10 @@ DESCRIPTION=Simple document scanning utility
 EAPI=6
 HOMEPAGE=https://launchpad.net/simple-scan
 IUSE=colord
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.32:2 dev-libs/libgusb[vala] >=media-gfx/sane-backends-1.0.20:= >=sys-libs/zlib-1.2.3.1:= virtual/jpeg:0= x11-libs/cairo:= >=x11-libs/gtk+-3:3 colord? ( >=x11-misc/colord-0.1.24:=[udev] ) x11-misc/xdg-utils x11-themes/adwaita-icon-theme
 SLOT=0
 SRC_URI=https://launchpad.net/simple-scan/3.24/3.24.1/+download/simple-scan-3.24.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d2e419498c2704da67bdf2a5278bd4a3
+_md5_=d309f0f68791a9f9ac0af6f00b35a5b8
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index af4b27a10e10..e69ce24303f7 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/elementary-1.17.0 b/metadata/md5-cache/media-libs/elementary-1.17.0
index 2ab3193c91a2..14f4f7ddbe29 100644
--- a/metadata/md5-cache/media-libs/elementary-1.17.0
+++ b/metadata/md5-cache/media-libs/elementary-1.17.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/efl-1.17.0[fbcon?,sdl?,png,wayland?,X?] javascript? ( net-libs/nodejs ) nls? ( sys-devel/gettext )
 SLOT=0
 SRC_URI=https://download.enlightenment.org/rel/libs/elementary/elementary-1.17.0.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	enlightenment	ac1fc335a7f44c04309a9f4aae403165	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	enlightenment	1fa177784657aaf9484e91d7427a2b2e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=e6039461db6db3d26996d194c35af8da
diff --git a/metadata/md5-cache/media-libs/elementary-9999 b/metadata/md5-cache/media-libs/elementary-9999
index d3cf955671d1..319a28c01a52 100644
--- a/metadata/md5-cache/media-libs/elementary-9999
+++ b/metadata/md5-cache/media-libs/elementary-9999
@@ -7,5 +7,5 @@ IUSE=debug examples fbcon javascript quicklaunch sdl wayland X static-libs nls d
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/efl-9999[fbcon?,sdl?,png,wayland?,X?] javascript? ( net-libs/nodejs ) nls? ( sys-devel/gettext )
 SLOT=0
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	enlightenment	ac1fc335a7f44c04309a9f4aae403165	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	git-2	195a672bfaf52d868442171c9469bbb6	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	enlightenment	1fa177784657aaf9484e91d7427a2b2e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	git-2	195a672bfaf52d868442171c9469bbb6	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=abb2c814a8c78e6c23b3899eeabafb5b
diff --git a/metadata/md5-cache/media-libs/glm-0.9.8.5 b/metadata/md5-cache/media-libs/glm-0.9.8.5
index d288b970eb5d..e1e2e9f70f1c 100644
--- a/metadata/md5-cache/media-libs/glm-0.9.8.5
+++ b/metadata/md5-cache/media-libs/glm-0.9.8.5
@@ -10,4 +10,4 @@ RDEPEND=virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/g-truc/glm/archive/0.9.8.5.tar.gz -> glm-0.9.8.5.tar.gz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5001463435749a72578b1c8a0a406e3c
+_md5_=77da09df0c9e9d78eb60805db7845d05
diff --git a/metadata/md5-cache/media-libs/gst-plugins-base-1.12.4 b/metadata/md5-cache/media-libs/gst-plugins-base-1.12.4
new file mode 100644
index 000000000000..1138fc5210a4
--- /dev/null
+++ b/metadata/md5-cache/media-libs/gst-plugins-base-1.12.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=app-text/iso-codes >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.12.4:1.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) ivorbis? ( >=media-libs/tremor-0_pre20130223[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ogg? ( >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) orc? ( >=dev-lang/orc-0.4.24[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pango? ( >=x11-libs/pango-1.36.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-util/gtk-doc-am-1.12 X? ( >=x11-proto/videoproto-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-proto/xextproto-7.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-proto/xproto-7.0.24[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] nls? ( >=sys-devel/gettext-0.17 ) >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Basepack of plugins for gstreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=alsa +introspection ivorbis +ogg +orc +pango theora +vorbis X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 nls
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2+ LGPL-2+
+RDEPEND=app-text/iso-codes >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.12.4:1.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) ivorbis? ( >=media-libs/tremor-0_pre20130223[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ogg? ( >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) orc? ( >=dev-lang/orc-0.4.24[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pango? ( >=x11-libs/pango-1.36.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<media-libs/gst-plugins-bad-1.11.90:1.0 >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+REQUIRED_USE=ivorbis? ( ogg ) theora? ( ogg ) vorbis? ( ogg )
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.12.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1dc5a594f3b560a5a4c6c64561b3d0c3
diff --git a/metadata/md5-cache/media-libs/gstreamer-1.12.4 b/metadata/md5-cache/media-libs/gstreamer-1.12.4
new file mode 100644
index 000000000000..01f2667f7bcf
--- /dev/null
+++ b/metadata/md5-cache/media-libs/gstreamer-1.12.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] caps? ( sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) unwind? ( >=sys-libs/libunwind-1.2_rc1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/elfutils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-util/gtk-doc-am-1.12 sys-devel/bison sys-devel/flex >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] nls? ( sys-devel/gettext )
+DESCRIPTION=Open source multimedia framework
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=+caps +introspection nls +orc test unwind abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2+
+RDEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] caps? ( sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) unwind? ( >=sys-libs/libunwind-1.2_rc1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/elfutils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.12.4.tar.xz
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=748c1f7139c6179a36ee0410d93949cf
diff --git a/metadata/md5-cache/media-libs/imlib2-1.4.10 b/metadata/md5-cache/media-libs/imlib2-1.4.10
index bf8dcc7b960a..78979002d60f 100644
--- a/metadata/md5-cache/media-libs/imlib2-1.4.10
+++ b/metadata/md5-cache/media-libs/imlib2-1.4.10
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=media-libs/freetype:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gif? ( >=media-libs/giflib-4.1.6-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-4.0.3-r6:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-libs/libid3tag-0.15.1b-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext )
 SLOT=0
 SRC_URI=mirror://sourceforge/enlightenment/imlib2-1.4.10.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	enlightenment	ac1fc335a7f44c04309a9f4aae403165	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	enlightenment	1fa177784657aaf9484e91d7427a2b2e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=4e1bc926cfd02badc9c5547721b5c9e1
diff --git a/metadata/md5-cache/media-libs/imlib2-1.4.9 b/metadata/md5-cache/media-libs/imlib2-1.4.9
index 337add08cdd9..6106bcc81164 100644
--- a/metadata/md5-cache/media-libs/imlib2-1.4.9
+++ b/metadata/md5-cache/media-libs/imlib2-1.4.9
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=media-libs/freetype:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gif? ( >=media-libs/giflib-4.1.6-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-4.0.3-r6:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-libs/libid3tag-0.15.1b-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext )
 SLOT=0
 SRC_URI=mirror://sourceforge/enlightenment/imlib2-1.4.9.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	enlightenment	ac1fc335a7f44c04309a9f4aae403165	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	enlightenment	1fa177784657aaf9484e91d7427a2b2e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=3af8ba127c81b37eaafdac84d92e2078
diff --git a/metadata/md5-cache/media-libs/imlib2-9999 b/metadata/md5-cache/media-libs/imlib2-9999
index e80fc8d2a5f7..0bc49124fd5e 100644
--- a/metadata/md5-cache/media-libs/imlib2-9999
+++ b/metadata/md5-cache/media-libs/imlib2-9999
@@ -7,5 +7,5 @@ IUSE=bzip2 gif jpeg cpu_flags_x86_mmx cpu_flags_x86_sse2 mp3 png static-libs tif
 LICENSE=BSD
 RDEPEND=media-libs/freetype:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gif? ( >=media-libs/giflib-4.1.6-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-4.0.3-r6:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-libs/libid3tag-0.15.1b-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext )
 SLOT=0
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	enlightenment	ac1fc335a7f44c04309a9f4aae403165	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	git-2	195a672bfaf52d868442171c9469bbb6	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	enlightenment	1fa177784657aaf9484e91d7427a2b2e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	git-2	195a672bfaf52d868442171c9469bbb6	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=856eb72ec09b2eb571fbdf0d596dffdf
diff --git a/metadata/md5-cache/media-libs/libmatroska-1.4.8 b/metadata/md5-cache/media-libs/libmatroska-1.4.8
index 45070cbe80df..626a796be3a9 100644
--- a/metadata/md5-cache/media-libs/libmatroska-1.4.8
+++ b/metadata/md5-cache/media-libs/libmatroska-1.4.8
@@ -4,9 +4,9 @@ DESCRIPTION=Extensible multimedia container format based on EBML
 EAPI=6
 HOMEPAGE=https://www.matroska.org/ https://github.com/Matroska-Org/libmatroska/
 IUSE=static-libs
-KEYWORDS=~alpha amd64 arm ~arm64 ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/libebml-1.3.4:=
 SLOT=0/6
 SRC_URI=https://dl.matroska.org/downloads/libmatroska/libmatroska-1.4.8.tar.xz
-_md5_=eef540cd21ebd96472a6ff1fb685eb1d
+_md5_=03b663c680f133393d61841f1f9b9601
diff --git a/metadata/md5-cache/media-libs/tiff-4.0.9-r1 b/metadata/md5-cache/media-libs/tiff-4.0.9-r1
new file mode 100644
index 000000000000..ae0b778031b8
--- /dev/null
+++ b/metadata/md5-cache/media-libs/tiff-4.0.9-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=jpeg? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jbig? ( >=media-libs/jbigkit-2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Tag Image File Format (TIFF) library
+EAPI=6
+HOMEPAGE=http://libtiff.maptools.org
+IUSE=+cxx jbig jpeg lzma static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=libtiff
+RDEPEND=jpeg? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jbig? ( >=media-libs/jbigkit-2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
+REQUIRED_USE=test? ( jpeg )
+SLOT=0
+SRC_URI=http://download.osgeo.org/libtiff/tiff-4.0.9.tar.gz ftp://ftp.remotesensing.org/pub/libtiff/tiff-4.0.9.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=7993da2aaf80e43468ec88548a38b546
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index 7e15c3585d9c..135355925782 100644
--- a/metadata/md5-cache/media-plugins/Manifest.gz
+++ b/metadata/md5-cache/media-plugins/Manifest.gz
diff --git a/metadata/md5-cache/media-plugins/emotion_generic_players-1.17.0 b/metadata/md5-cache/media-plugins/emotion_generic_players-1.17.0
index efeece34331c..6ed5a4404b4e 100644
--- a/metadata/md5-cache/media-plugins/emotion_generic_players-1.17.0
+++ b/metadata/md5-cache/media-plugins/emotion_generic_players-1.17.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/efl-1.17.0 media-video/vlc nls? ( sys-devel/gettext )
 SLOT=0
 SRC_URI=https://download.enlightenment.org/rel/libs/emotion_generic_players/emotion_generic_players-1.17.0.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	enlightenment	ac1fc335a7f44c04309a9f4aae403165	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	enlightenment	1fa177784657aaf9484e91d7427a2b2e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=00f1965d6bcb77171cdfcf9220ad7580
diff --git a/metadata/md5-cache/media-plugins/emotion_generic_players-9999 b/metadata/md5-cache/media-plugins/emotion_generic_players-9999
index f1aa63ef46f3..a0d5e92ca168 100644
--- a/metadata/md5-cache/media-plugins/emotion_generic_players-9999
+++ b/metadata/md5-cache/media-plugins/emotion_generic_players-9999
@@ -7,5 +7,5 @@ IUSE=nls doc
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/efl-9999 media-video/vlc nls? ( sys-devel/gettext )
 SLOT=0
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	enlightenment	ac1fc335a7f44c04309a9f4aae403165	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	git-2	195a672bfaf52d868442171c9469bbb6	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	enlightenment	1fa177784657aaf9484e91d7427a2b2e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	git-2	195a672bfaf52d868442171c9469bbb6	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=daac83e83a7b73a8bade9a4909a1651b
diff --git a/metadata/md5-cache/media-plugins/evas_generic_loaders-1.17.0 b/metadata/md5-cache/media-plugins/evas_generic_loaders-1.17.0
index 319e788b69dd..d6fd43f1134b 100644
--- a/metadata/md5-cache/media-plugins/evas_generic_loaders-1.17.0
+++ b/metadata/md5-cache/media-plugins/evas_generic_loaders-1.17.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/efl-1.17.0 gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) pdf? ( app-text/poppler ) postscript? ( app-text/libspectre ) raw? ( media-libs/libraw ) svg? ( gnome-base/librsvg x11-libs/cairo ) nls? ( sys-devel/gettext )
 SLOT=0
 SRC_URI=https://download.enlightenment.org/rel/libs/evas_generic_loaders/evas_generic_loaders-1.17.0.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	enlightenment	ac1fc335a7f44c04309a9f4aae403165	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	enlightenment	1fa177784657aaf9484e91d7427a2b2e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=91341597a1acbe16cb42a34b67afa800
diff --git a/metadata/md5-cache/media-plugins/evas_generic_loaders-9999 b/metadata/md5-cache/media-plugins/evas_generic_loaders-9999
index 67715bd2f37e..8c014f5a38ab 100644
--- a/metadata/md5-cache/media-plugins/evas_generic_loaders-9999
+++ b/metadata/md5-cache/media-plugins/evas_generic_loaders-9999
@@ -7,5 +7,5 @@ IUSE=gstreamer pdf postscript raw svg nls doc
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/efl-9999 gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) pdf? ( app-text/poppler ) postscript? ( app-text/libspectre ) raw? ( media-libs/libraw ) svg? ( gnome-base/librsvg x11-libs/cairo ) nls? ( sys-devel/gettext )
 SLOT=0
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	enlightenment	ac1fc335a7f44c04309a9f4aae403165	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-2	195a672bfaf52d868442171c9469bbb6	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	enlightenment	1fa177784657aaf9484e91d7427a2b2e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-2	195a672bfaf52d868442171c9469bbb6	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=2158e4898c2b12b495c096f9df0106d8
diff --git a/metadata/md5-cache/media-plugins/grilo-plugins-0.3.5 b/metadata/md5-cache/media-plugins/grilo-plugins-0.3.5
index adfa41bdbc72..b43c359c7476 100644
--- a/metadata/md5-cache/media-plugins/grilo-plugins-0.3.5
+++ b/metadata/md5-cache/media-plugins/grilo-plugins-0.3.5
@@ -4,10 +4,10 @@ DESCRIPTION=A framework for easy media discovery and browsing
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Grilo
 IUSE=daap dvd examples chromaprint flickr freebox gnome-online-accounts lua subtitles test thetvdb tracker upnp-av vimeo +youtube
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.44:2 >=media-libs/grilo-0.3.1:0.3=[network,playlist] media-libs/libmediaart:2.0 >=dev-libs/gom-0.3.2 dev-libs/gmime:3.0 dev-libs/json-glib dev-libs/libxml2:2 dev-db/sqlite:3 chromaprint? ( media-libs/gstreamer:1.0 ) daap? ( >=net-libs/libdmapsharing-2.9.12:3.0 ) dvd? ( >=dev-libs/totem-pl-parser-3.4.1 ) flickr? ( net-libs/liboauth ) freebox? ( net-dns/avahi ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.91:= ) lua? ( >=dev-lang/lua-5.3 app-arch/libarchive dev-libs/libxml2:2 >=dev-libs/totem-pl-parser-3.4.1 ) subtitles? ( net-libs/libsoup:2.4 ) thetvdb? ( app-arch/libarchive dev-libs/libxml2 ) tracker? ( >=app-misc/tracker-0.10.5:= ) youtube? ( >=dev-libs/libgdata-0.9.1:= >=dev-libs/totem-pl-parser-3.4.1 ) upnp-av? ( net-libs/libsoup:2.4 net-libs/dleyna-connector-dbus net-misc/dleyna-server ) vimeo? ( >=dev-libs/totem-pl-parser-3.4.1 )
 SLOT=0.3
 SRC_URI=mirror://gnome/sources/grilo-plugins/0.3/grilo-plugins-0.3.5.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cc4cc708487378e6731ae5910d9eca3b
+_md5_=c4f45207fb67d3a40774120c391e5403
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.12.4
new file mode 100644
index 000000000000..f6da0eaaef98
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.12.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=media-sound/cdparanoia-3.10.2-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=CD Audio Source (cdda) plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-sound/cdparanoia-3.10.2-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.12.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=65244248dabb41de34c8ffaa790da7cb
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.12.4
new file mode 100644
index 000000000000..8aed004b9447
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.12.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=media-libs/libvisual-0.4.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-plugins/libvisual-plugins-0.4.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Visualization elements for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libvisual-0.4.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-plugins/libvisual-plugins-0.4.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.12.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=90f838acb10a3c87ebfc0e879f1b74bc
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-opus-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-opus-1.12.4
new file mode 100644
index 000000000000..3241fc0b08f3
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-opus-1.12.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=media-libs/opus-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Opus audio parser plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=GPL-2
+RDEPEND=>=media-libs/opus-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,ogg] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.12.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=bd4c9280e9e2d586477ddd63841347dd
diff --git a/metadata/md5-cache/media-plugins/imlib2_loaders-1.4.7 b/metadata/md5-cache/media-plugins/imlib2_loaders-1.4.7
index af76fcf80c7d..2b4d66ff832d 100644
--- a/metadata/md5-cache/media-plugins/imlib2_loaders-1.4.7
+++ b/metadata/md5-cache/media-plugins/imlib2_loaders-1.4.7
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=media-libs/imlib2-1.4.7 eet? ( dev-libs/efl ) nls? ( sys-devel/gettext )
 SLOT=0
 SRC_URI=mirror://sourceforge/enlightenment/imlib2_loaders-1.4.7.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	enlightenment	ac1fc335a7f44c04309a9f4aae403165	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	enlightenment	1fa177784657aaf9484e91d7427a2b2e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=6d58c9d859e08aa073f8b106154d0cae
diff --git a/metadata/md5-cache/media-plugins/imlib2_loaders-1.4.8 b/metadata/md5-cache/media-plugins/imlib2_loaders-1.4.8
index ee4c30356ba9..401b038ae5e9 100644
--- a/metadata/md5-cache/media-plugins/imlib2_loaders-1.4.8
+++ b/metadata/md5-cache/media-plugins/imlib2_loaders-1.4.8
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=media-libs/imlib2-1.4.8 eet? ( dev-libs/efl ) nls? ( sys-devel/gettext )
 SLOT=0
 SRC_URI=mirror://sourceforge/enlightenment/imlib2_loaders-1.4.8.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	enlightenment	ac1fc335a7f44c04309a9f4aae403165	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	enlightenment	1fa177784657aaf9484e91d7427a2b2e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=6d58c9d859e08aa073f8b106154d0cae
diff --git a/metadata/md5-cache/media-plugins/imlib2_loaders-9999 b/metadata/md5-cache/media-plugins/imlib2_loaders-9999
index 0a2b31815d2d..43687007a5b0 100644
--- a/metadata/md5-cache/media-plugins/imlib2_loaders-9999
+++ b/metadata/md5-cache/media-plugins/imlib2_loaders-9999
@@ -7,5 +7,5 @@ IUSE=eet xcf nls doc
 LICENSE=BSD
 RDEPEND=>=media-libs/imlib2-9999 eet? ( dev-libs/efl ) nls? ( sys-devel/gettext )
 SLOT=0
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	enlightenment	ac1fc335a7f44c04309a9f4aae403165	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	git-2	195a672bfaf52d868442171c9469bbb6	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	enlightenment	1fa177784657aaf9484e91d7427a2b2e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	git-2	195a672bfaf52d868442171c9469bbb6	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=6cc66786f3fc0c5d7bff8b88756f36d1
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 88badf3d6090..e553822a37da 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/gnome-music-3.24.2 b/metadata/md5-cache/media-sound/gnome-music-3.24.2
index ed029910013b..b7380d50c087 100644
--- a/metadata/md5-cache/media-sound/gnome-music-3.24.2
+++ b/metadata/md5-cache/media-sound/gnome-music-3.24.2
@@ -4,11 +4,11 @@ DESCRIPTION=Music management for Gnome
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Music
 IUSE=python_targets_python3_4 python_targets_python3_5 python_single_target_python3_4 python_single_target_python3_5
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=app-misc/tracker-1.11.1[introspection(+)] >=dev-python/pygobject-3.21.1:3[cairo,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-libs/glib-2.28:2 >=dev-libs/gobject-introspection-1.35.9:= >=media-libs/grilo-0.3.2:0.3[introspection] >=media-libs/libmediaart-1.9.1:2.0[introspection] >=x11-libs/gtk+-3.19.3:3[introspection] || ( app-misc/tracker[gstreamer] app-misc/tracker[ffmpeg] ) x11-libs/libnotify[introspection] dev-python/dbus-python[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/requests[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-plugins/gst-plugins-meta:1.0 media-plugins/grilo-plugins:0.3[tracker] x11-misc/xdg-user-dirs
 REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-music/3.24/gnome-music-3.24.2.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=47d4cdc36789ae22e1b0fd128a1a78c9
+_md5_=8d9c379269b584529c2d9951d69e4067
diff --git a/metadata/md5-cache/media-sound/gnome-sound-recorder-3.24.0.1 b/metadata/md5-cache/media-sound/gnome-sound-recorder-3.24.0.1
index 2ac156d310ef..4a3571477c4a 100644
--- a/metadata/md5-cache/media-sound/gnome-sound-recorder-3.24.0.1
+++ b/metadata/md5-cache/media-sound/gnome-sound-recorder-3.24.0.1
@@ -3,10 +3,10 @@ DEPEND=dev-libs/gjs >=dev-libs/glib-2.46:2 >=dev-libs/gobject-introspection-1.31
 DESCRIPTION=Simple sound recorder
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Design/Apps/SoundRecorder
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/gjs >=dev-libs/glib-2.46:2 >=dev-libs/gobject-introspection-1.31.6 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.12:3[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection,ogg] media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-flac:1.0 media-plugins/gst-plugins-pulse:1.0
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-sound-recorder/3.24/gnome-sound-recorder-3.24.0.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6407445fbda931eacb2eca004dddcdab
+_md5_=da085adab8e9758d2d3a88881fc93c98
diff --git a/metadata/md5-cache/media-sound/sound-juicer-3.24.0 b/metadata/md5-cache/media-sound/sound-juicer-3.24.0
index 6f69569b21cb..f16a1536ec80 100644
--- a/metadata/md5-cache/media-sound/sound-juicer-3.24.0
+++ b/metadata/md5-cache/media-sound/sound-juicer-3.24.0
@@ -4,10 +4,10 @@ DESCRIPTION=CD ripper for GNOME
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/SoundJuicer
 IUSE=debug flac test vorbis
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2+
 RDEPEND=app-text/iso-codes >=dev-libs/glib-2.49.5:2[dbus] >=x11-libs/gtk+-3.21.6:3 media-libs/libcanberra[gtk3] >=app-cdr/brasero-2.90 sys-apps/dbus gnome-base/gsettings-desktop-schemas >=media-libs/libdiscid-0.4.0 >=media-libs/musicbrainz-5.0.1:5= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0[vorbis?] flac? ( media-plugins/gst-plugins-flac:1.0 ) gnome-base/gvfs[cdda,udev] || ( media-plugins/gst-plugins-cdparanoia:1.0 media-plugins/gst-plugins-cdio:1.0 ) media-plugins/gst-plugins-meta:1.0
 SLOT=0
 SRC_URI=mirror://gnome/sources/sound-juicer/3.24/sound-juicer-3.24.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e76c5c41fe84734283400a20b4f73158
+_md5_=c9595e8bff475c17076c67a71ef8447e
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index d5087faaa077..993ac1db3480 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
diff --git a/metadata/md5-cache/media-video/cheese-3.24.0 b/metadata/md5-cache/media-video/cheese-3.24.0
index 7f91edc86dfc..fe8651df9d3f 100644
--- a/metadata/md5-cache/media-video/cheese-3.24.0
+++ b/metadata/md5-cache/media-video/cheese-3.24.0
@@ -4,10 +4,10 @@ DESCRIPTION=A cheesy program to take pictures and videos from your webcam
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Cheese
 IUSE=+introspection test test
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.39.90:2 >=x11-libs/gtk+-3.13.4:3[introspection?] >=gnome-base/gnome-desktop-2.91.6:3= >=media-libs/libcanberra-0.26[gtk3] >=media-libs/clutter-1.13.2:1.0[introspection?] >=media-libs/clutter-gtk-0.91.8:1.0 media-libs/clutter-gst:3.0 media-libs/cogl:1.0=[introspection?] media-video/gnome-video-effects x11-libs/gdk-pixbuf:2[jpeg,introspection?] x11-libs/libX11 x11-libs/libXtst >=media-libs/gstreamer-1.4:1.0[introspection?] >=media-libs/gst-plugins-base-1.4:1.0[introspection?,ogg,pango,theora,vorbis,X] introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) >=media-libs/gst-plugins-bad-1.4:1.0 >=media-libs/gst-plugins-good-1.4:1.0 >=media-plugins/gst-plugins-jpeg-1.4:1.0 >=media-plugins/gst-plugins-v4l2-1.4:1.0 >=media-plugins/gst-plugins-vpx-1.4:1.0
 SLOT=0/8
 SRC_URI=mirror://gnome/sources/cheese/3.24/cheese-3.24.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c4091a564afd32f3a88ec413b8c56b2c
+_md5_=7f0e8a751c619df196c23df6c2ca2826
diff --git a/metadata/md5-cache/media-video/mkvtoolnix-19.0.0 b/metadata/md5-cache/media-video/mkvtoolnix-19.0.0
index a1c3a1c81f5c..175bfdbba485 100644
--- a/metadata/md5-cache/media-video/mkvtoolnix-19.0.0
+++ b/metadata/md5-cache/media-video/mkvtoolnix-19.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=Tools to create, alter, and inspect Matroska files
 EAPI=6
 HOMEPAGE=https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix
 IUSE=debug pch test qt5
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/boost-1.49.0:= >=dev-libs/libebml-1.3.5:= dev-libs/jsoncpp:= dev-libs/pugixml media-libs/flac >=media-libs/libmatroska-1.4.8:= media-libs/libogg media-libs/libvorbis sys-apps/file sys-libs/zlib qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5 )
 SLOT=0
 SRC_URI=https://mkvtoolnix.download/sources/mkvtoolnix-19.0.0.tar.xz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=d72b34aa008773eb8a782e21a060eb71
+_md5_=39b79105b0913edf6d687b4caa3b47d7
diff --git a/metadata/md5-cache/media-video/totem-3.24.0 b/metadata/md5-cache/media-video/totem-3.24.0
index 49f2d63342bf..06577da9d288 100644
--- a/metadata/md5-cache/media-video/totem-3.24.0
+++ b/metadata/md5-cache/media-video/totem-3.24.0
@@ -4,11 +4,11 @@ DESCRIPTION=Media player for GNOME
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Videos
 IUSE=debug +introspection lirc nautilus +python test zeitgeist python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86 ~x86-fbsd
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=dev-libs/glib-2.35:2[dbus] >=dev-libs/libpeas-1.1[gtk] >=dev-libs/libxml2-2.6:2 >=dev-libs/totem-pl-parser-3.10.1:0=[introspection?] >=media-libs/clutter-1.17.3:1.0[gtk] >=media-libs/clutter-gst-2.99.2:3.0 >=media-libs/clutter-gtk-1.8.1:1.0 >=x11-libs/cairo-1.14 >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.19.4:3[introspection?] >=media-libs/grilo-0.3.0:0.3[playlist] >=media-libs/gstreamer-1.6.0:1.0 >=media-libs/gst-plugins-base-1.6.0:1.0[X,introspection?,pango] media-libs/gst-plugins-good:1.0 x11-libs/libX11 gnome-base/gnome-desktop:3= gnome-base/gsettings-desktop-schemas introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) lirc? ( app-misc/lirc ) nautilus? ( >=gnome-base/nautilus-2.91.3 ) python? ( python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/pygobject-2.90.3:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) zeitgeist? ( >=gnome-extra/zeitgeist-0.9.12 ) media-plugins/grilo-plugins:0.3 media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-taglib:1.0 x11-themes/adwaita-icon-theme python? ( >=dev-libs/libpeas-1.1.0[python,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pyxdg[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/dbus-python[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=x11-libs/gtk+-3.5.2:3[introspection] )
 REQUIRED_USE=python? ( introspection ^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) ) zeitgeist? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/totem/3.24/totem-3.24.0.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4b36d1fa664102511dedfb26a10964cc
+_md5_=d9f3ed9f32ad57ed6ffd122bb7c42cbe
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 3ad49794dad8..382a2b20a31a 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/sslscan-1.11.9 b/metadata/md5-cache/net-analyzer/sslscan-1.11.9
deleted file mode 100644
index 74ec33d10662..000000000000
--- a/metadata/md5-cache/net-analyzer/sslscan-1.11.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=!libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl )
-DESCRIPTION=Fast SSL configuration scanner
-EAPI=6
-HOMEPAGE=https://github.com/rbsec/sslscan
-IUSE=libressl +static
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=!libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl )
-SLOT=0
-SRC_URI=https://github.com/rbsec/sslscan/archive/1.11.9-rbsec.tar.gz -> sslscan-1.11.9-rbsec.tar.gz static? ( mirror://openssl/source/openssl-1.0.2k.tar.gz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=daeab8e5dd0d9c4cfde5922cf681b37f
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 18a960f8a51a..c263bab6ca55 100644
--- a/metadata/md5-cache/net-dns/Manifest.gz
+++ b/metadata/md5-cache/net-dns/Manifest.gz
diff --git a/metadata/md5-cache/net-dns/bind-9.11.2_p1 b/metadata/md5-cache/net-dns/bind-9.11.2_p1
index f0fe2301ceca..0388d0ec2b21 100644
--- a/metadata/md5-cache/net-dns/bind-9.11.2_p1
+++ b/metadata/md5-cache/net-dns/bind-9.11.2_p1
@@ -4,7 +4,7 @@ DESCRIPTION=BIND - Berkeley Internet Name Domain - Name Server
 EAPI=5
 HOMEPAGE=http://www.isc.org/software/bind
 IUSE=-berkdb +caps dlz dnstap doc filter-aaaa fixed-rrset geoip gost gssapi idn ipv6 json ldap libressl lmdb mysql nslint odbc postgres python rpz seccomp selinux ssl static-libs +threads urandom xml +zlib python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl ) ) mysql? ( >=virtual/mysql-4.0 ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) idn? ( net-dns/idnkit ) postgres? ( dev-db/postgresql:= ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( >=dev-libs/geoip-1.4.6 ) gssapi? ( virtual/krb5 ) gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] ) seccomp? ( sys-libs/libseccomp ) json? ( dev-libs/json-c:= ) lmdb? ( dev-db/lmdb ) zlib? ( sys-libs/zlib ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ply[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) selinux? ( sec-policy/selinux-bind ) || ( sys-process/psmisc >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd )
 REQUIRED_USE=postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz !threads ) odbc? ( dlz ) ldap? ( dlz ) gost? ( !libressl ssl ) threads? ( caps ) dnstap? ( threads ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://www.isc.org/downloads/file/bind-9.11.2-P1/?version=tar-gz -> bind-9.11.2_p1.tar.gz doc? ( mirror://gentoo/dyndns-samples.tbz2 )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	db-use	582140d1a711279e50ce284fc7b609f5	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=1bae84baaeb27596e67af013b50c6f9d
+_md5_=f223b8b8e87a12bb943c69c29b538da7
diff --git a/metadata/md5-cache/net-dns/bind-tools-9.11.2_p1 b/metadata/md5-cache/net-dns/bind-tools-9.11.2_p1
index fc7f8af3ab05..c9aa801a51f8 100644
--- a/metadata/md5-cache/net-dns/bind-tools-9.11.2_p1
+++ b/metadata/md5-cache/net-dns/bind-tools-9.11.2_p1
@@ -4,7 +4,7 @@ DESCRIPTION=bind tools: dig, nslookup, host, nsupdate, dnssec-keygen
 EAPI=5
 HOMEPAGE=http://www.isc.org/software/bind
 IUSE=doc gost gssapi idn ipv6 libressl readline seccomp ssl urandom xml
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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 ~m68k ~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
 LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/idnkit ) gssapi? ( virtual/krb5 ) readline? ( sys-libs/readline:0= ) seccomp? ( sys-libs/libseccomp ) !<net-dns/bind-9.10.2
 REQUIRED_USE=gost? ( !libressl ssl )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://www.isc.org/downloads/file/bind-9.11.2-P1/?version=tar-gz -> bind-9.11.2_p1.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=39301be4be1f77969b8e6cc4601a64d9
+_md5_=d20507ae8a3e9a25fbf75fa1565ea7e7
diff --git a/metadata/md5-cache/net-dns/libidn-1.33-r2 b/metadata/md5-cache/net-dns/libidn-1.33-r2
index 6e65363a0007..efb0b4b83bd9 100644
--- a/metadata/md5-cache/net-dns/libidn-1.33-r2
+++ b/metadata/md5-cache/net-dns/libidn-1.33-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Internationalized Domain Names (IDN) implementation
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libidn/
 IUSE=doc emacs java mono nls static-libs elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )
 RDEPEND=emacs? ( virtual/emacs ) mono? ( >=dev-lang/mono-0.95 ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.5 ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r5 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=mirror://gnu/libidn/libidn-1.33.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=ceadca8dba1628352bb17e02a11984a1
+_md5_=f9941a9d4db054f776dc3774721aedee
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index a085f06b5710..8842d2a63491 100644
--- a/metadata/md5-cache/net-irc/Manifest.gz
+++ b/metadata/md5-cache/net-irc/Manifest.gz
diff --git a/metadata/md5-cache/net-irc/polari-3.24.2 b/metadata/md5-cache/net-irc/polari-3.24.2
index f5109615166b..0b5a97c01f17 100644
--- a/metadata/md5-cache/net-irc/polari-3.24.2
+++ b/metadata/md5-cache/net-irc/polari-3.24.2
@@ -3,10 +3,10 @@ DEPEND=>=x11-libs/gtk+-3.21.6:3[introspection] net-libs/telepathy-glib[introspec
 DESCRIPTION=An IRC client for Gnome
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Polari
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-3.21.6:3[introspection] net-libs/telepathy-glib[introspection] >=dev-libs/glib-2.43.4:2 >=dev-libs/gobject-introspection-1.50:= >=dev-libs/gjs-1.45.3 x11-libs/gdk-pixbuf:2[introspection] >=app-text/gspell-1.4.0[introspection] x11-libs/pango[introspection] app-crypt/libsecret[introspection] net-libs/libsoup:2.4[introspection] net-im/telepathy-logger[introspection] >=net-irc/telepathy-idle-0.2
 SLOT=0
 SRC_URI=mirror://gnome/sources/polari/3.24/polari-3.24.2.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=358b9550efc8c4d7265f10fb04976da6
+_md5_=4d1223cf59d080d8dc9dadcf7bf5cb46
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index ac338c181d5d..86600ff836ed 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/gnome-online-accounts-3.24.4 b/metadata/md5-cache/net-libs/gnome-online-accounts-3.24.4
index 44d6a664c061..8cf614a7da63 100644
--- a/metadata/md5-cache/net-libs/gnome-online-accounts-3.24.4
+++ b/metadata/md5-cache/net-libs/gnome-online-accounts-3.24.4
@@ -4,7 +4,7 @@ DESCRIPTION=GNOME framework for accessing online accounts
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/GnomeOnlineAccounts
 IUSE=debug gnome +introspection kerberos vala
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2+
 PDEPEND=gnome? ( >=gnome-base/gnome-control-center-3.2[gnome-online-accounts(+)] )
 RDEPEND=>=dev-libs/glib-2.44:2 >=app-crypt/libsecret-0.5 >=dev-libs/json-glib-0.16 dev-libs/libxml2:2 >=net-libs/libsoup-2.42:2.4 net-libs/rest:0.7 net-libs/telepathy-glib >=net-libs/webkit-gtk-2.7.2:4 >=x11-libs/gtk+-3.19.12:3 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-0.6.2:= ) kerberos? ( app-crypt/gcr:0=[gtk] app-crypt/mit-krb5 )
@@ -12,4 +12,4 @@ REQUIRED_USE=vala? ( introspection )
 SLOT=0/1
 SRC_URI=mirror://gnome/sources/gnome-online-accounts/3.24/gnome-online-accounts-3.24.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fa4576b9f1d94dd6c9d0d2083dd0b03d
+_md5_=8ca1257069466e523fc0cc1cb7729423
diff --git a/metadata/md5-cache/net-libs/h323plus-1.25.0-r1 b/metadata/md5-cache/net-libs/h323plus-1.25.0-r1
deleted file mode 100644
index 611c16081b88..000000000000
--- a/metadata/md5-cache/net-libs/h323plus-1.25.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure prepare
-DEPEND=>=net-libs/ptlib-2.6.4:=[wav] aec? ( >=media-libs/speex-1.2_rc1 ) sound? ( media-sound/gsm dev-libs/ilbc-rfc3951 ) video? ( media-libs/libtheora virtual/ffmpeg )
-DESCRIPTION=Open Source implementation of the ITU H.323 protocol, successor of OpenH323
-EAPI=5
-HOMEPAGE=http://www.h323plus.org/
-IUSE=aec debug +sound +video
-KEYWORDS=~alpha ~amd64 ~arm ~ppc ~sparc ~x86
-LICENSE=MPL-1.1
-RDEPEND=>=net-libs/ptlib-2.6.4:=[wav] aec? ( >=media-libs/speex-1.2_rc1 ) sound? ( media-sound/gsm dev-libs/ilbc-rfc3951 ) video? ( media-libs/libtheora virtual/ffmpeg ) !net-libs/openh323
-SLOT=0/1.25.0
-SRC_URI=mirror://sourceforge/h323plus/h323plus-v1_25_0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=fcf1758d05f29d91be0f6e5606f8da86
diff --git a/metadata/md5-cache/net-libs/h323plus-1.25.0-r2 b/metadata/md5-cache/net-libs/h323plus-1.25.0-r2
deleted file mode 100644
index 14f74c7a593f..000000000000
--- a/metadata/md5-cache/net-libs/h323plus-1.25.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure prepare
-DEPEND=>=net-libs/ptlib-2.6.4:=[-debug,wav] aec? ( >=media-libs/speex-1.2_rc1 ) sound? ( media-sound/gsm dev-libs/ilbc-rfc3951 ) video? ( media-libs/libtheora virtual/ffmpeg ) net-nds/openldap dev-libs/openssl:0=
-DESCRIPTION=Open Source implementation of the ITU H.323 protocol, successor of OpenH323
-EAPI=5
-HOMEPAGE=http://www.h323plus.org/
-IUSE=aec debug +sound +video
-KEYWORDS=~alpha ~amd64 ~arm ~ppc ~sparc ~x86
-LICENSE=MPL-1.1
-RDEPEND=>=net-libs/ptlib-2.6.4:=[-debug,wav] aec? ( >=media-libs/speex-1.2_rc1 ) sound? ( media-sound/gsm dev-libs/ilbc-rfc3951 ) video? ( media-libs/libtheora virtual/ffmpeg ) net-nds/openldap dev-libs/openssl:0= !net-libs/openh323
-SLOT=0/1.25.0
-SRC_URI=mirror://sourceforge/h323plus/h323plus-v1_25_0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=12d01dde3896fc7bd58f9ce554f71202
diff --git a/metadata/md5-cache/net-libs/libbitcoinconsensus-0.15.1 b/metadata/md5-cache/net-libs/libbitcoinconsensus-0.15.1
index 4b0cb7e05d09..ea82b9bcad05 100644
--- a/metadata/md5-cache/net-libs/libbitcoinconsensus-0.15.1
+++ b/metadata/md5-cache/net-libs/libbitcoinconsensus-0.15.1
@@ -4,10 +4,10 @@ DESCRIPTION=Bitcoin Core consensus library
 EAPI=6
 HOMEPAGE=http://bitcoincore.org/ http://bitcoinknots.org/
 IUSE=+asm knots libressl
-KEYWORDS=~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=!libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) >=dev-libs/libsecp256k1-0.0.0_pre20151118[recovery]
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/7b57bc998f334775b50ebc8ca5e78ca728db4c58.tar.gz -> bitcoin-v0.15.1.tar.gz http://bitcoinknots.org/files/0.15.x/0.15.1.knots20171111/bitcoin-0.15.1.knots20171111.patches.txz -> bitcoin-0.15.1.knots20171111.patches.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=6de0fd75c5125e7456db7df1d1ae1d3f
+_md5_=261449e7815bba18dbc9bbd39039f792
diff --git a/metadata/md5-cache/net-libs/libsignon-glib-1.14 b/metadata/md5-cache/net-libs/libsignon-glib-1.14
index c9bd07ddf423..7811463a9212 100644
--- a/metadata/md5-cache/net-libs/libsignon-glib-1.14
+++ b/metadata/md5-cache/net-libs/libsignon-glib-1.14
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-libs/glib:2 net-libs/signond introspection? ( dev-libs/gobject-introspection:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-util/gdbus-codegen doc? ( dev-util/gtk-doc ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=dev-libs/glib:2 net-libs/signond introspection? ( dev-libs/gobject-introspection:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-util/gdbus-codegen doc? ( dev-util/gtk-doc ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=GLib binding for the D-Bus API provided by signond
 EAPI=6
 HOMEPAGE=https://01.org/gsso/
-IUSE=debug doc +introspection python test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+IUSE=debug doc +introspection python test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
-RDEPEND=dev-libs/glib:2 net-libs/signond introspection? ( dev-libs/gobject-introspection:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
-REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) introspection )
+RDEPEND=dev-libs/glib:2 net-libs/signond introspection? ( dev-libs/gobject-introspection:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
+REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) introspection )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://gitlab.com/accounts-sso/libsignon-glib/repository/archive.tar.gz?ref=VERSION_1.14 -> libsignon-glib-1.14.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=736f6378b2ce27a380db677ed082ad78
+_md5_=ae64bb2b5d5d85b284584b08bbeab4fb
diff --git a/metadata/md5-cache/net-libs/libsoup-2.58.2 b/metadata/md5-cache/net-libs/libsoup-2.58.2
index c463373a821b..0e8c388b65e3 100644
--- a/metadata/md5-cache/net-libs/libsoup-2.58.2
+++ b/metadata/md5-cache/net-libs/libsoup-2.58.2
@@ -4,11 +4,11 @@ DESCRIPTION=An HTTP library implementation in C
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/libsoup
 IUSE=debug gssapi +introspection samba ssl test vala abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/glib-networking-2.38.2[ssl?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) samba? ( net-fs/samba )
 REQUIRED_USE=vala? ( introspection )
 SLOT=2.4
 SRC_URI=mirror://gnome/sources/libsoup/2.58/libsoup-2.58.2.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=dc160ba54786f19d3bf50ad214fb37d1
+_md5_=bcda620b462fabe42c139613c6720ff1
diff --git a/metadata/md5-cache/net-libs/opal-3.10.11-r1 b/metadata/md5-cache/net-libs/opal-3.10.11-r1
deleted file mode 100644
index c0c91ea74bd7..000000000000
--- a/metadata/md5-cache/net-libs/opal-3.10.11-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=>=net-libs/ptlib-2.10.10:=[stun,debug=,dtmf,http,ipv6?,ldap?,sound?,ssl?,video?,vxml?,wav?,xml?] >=media-libs/speex-1.2_beta fax? ( net-libs/ptlib[asn] ) h323? ( net-libs/ptlib[asn] ) ivr? ( net-libs/ptlib[http,xml,vxml] ) java? ( >=virtual/jre-1.4:* ) plugins? ( media-sound/gsm celt? ( media-libs/celt:0 ) ffmpeg? ( libav? ( media-video/libav:0=[encode] ) !libav? ( media-video/ffmpeg:0=[encode] ) ) ilbc? ( dev-libs/ilbc-rfc3951 ) sbc? ( media-libs/libsamplerate ) theora? ( media-libs/libtheora ) x264? ( virtual/ffmpeg media-libs/x264 ) ) srtp? ( net-libs/libsrtp:0= ) vxml? ( net-libs/ptlib[http,vxml] ) virtual/pkgconfig java? ( swig? ( dev-lang/swig ) >=virtual/jdk-1.4 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=C++ class library normalising numerous telephony protocols
-EAPI=6
-HOMEPAGE=http://www.opalvoip.org/
-IUSE=celt debug doc +dtmf examples fax ffmpeg h224 h281 h323 iax ilbc ipv6 ivr java ldap libav lid +plugins sbc +sip +sipim +sound srtp ssl static-libs stats swig theora +video vpb vxml +wav x264 x264-static +xml elibc_FreeBSD java
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
-LICENSE=MPL-1.0
-RDEPEND=>=net-libs/ptlib-2.10.10:=[stun,debug=,dtmf,http,ipv6?,ldap?,sound?,ssl?,video?,vxml?,wav?,xml?] >=media-libs/speex-1.2_beta fax? ( net-libs/ptlib[asn] ) h323? ( net-libs/ptlib[asn] ) ivr? ( net-libs/ptlib[http,xml,vxml] ) java? ( >=virtual/jre-1.4:* ) plugins? ( media-sound/gsm celt? ( media-libs/celt:0 ) ffmpeg? ( libav? ( media-video/libav:0=[encode] ) !libav? ( media-video/ffmpeg:0=[encode] ) ) ilbc? ( dev-libs/ilbc-rfc3951 ) sbc? ( media-libs/libsamplerate ) theora? ( media-libs/libtheora ) x264? ( virtual/ffmpeg media-libs/x264 ) ) srtp? ( net-libs/libsrtp:0= ) vxml? ( net-libs/ptlib[http,vxml] ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=x264-static? ( x264 ) h281? ( h224 ) sip? ( sipim )
-SLOT=0
-SRC_URI=mirror://sourceforge/opalvoip/opal-3.10.11.tar.bz2 doc? ( mirror://sourceforge/opalvoip/opal-3.10.11-htmldoc.tar.bz2 )
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=77f5f1ff1f919cd2d9c6551a4374f923
diff --git a/metadata/md5-cache/net-libs/phodav-2.2 b/metadata/md5-cache/net-libs/phodav-2.2
index c67a3815d9c3..0cb43b3e58d2 100644
--- a/metadata/md5-cache/net-libs/phodav-2.2
+++ b/metadata/md5-cache/net-libs/phodav-2.2
@@ -4,10 +4,10 @@ DESCRIPTION=WebDav server implementation using libsoup
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/phodav
 IUSE=spice systemd zeroconf
-KEYWORDS=~alpha amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha amd64 ~arm ~ppc ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.51:2 >=net-libs/libsoup-2.48:2.4 dev-libs/libxml2 zeroconf? ( net-dns/avahi )
 SLOT=2.0
 SRC_URI=mirror://gnome/sources/phodav/2.2/phodav-2.2.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5aa8985d35c534d69a4b3a2184b40868
+_md5_=7268364c2e83ae341e14854787403623
diff --git a/metadata/md5-cache/net-libs/ptlib-2.10.11 b/metadata/md5-cache/net-libs/ptlib-2.10.11
deleted file mode 100644
index 78bd5e698eb8..000000000000
--- a/metadata/md5-cache/net-libs/ptlib-2.10.11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=ldap? ( net-nds/openldap ) lua? ( dev-lang/lua ) odbc? ( dev-db/unixODBC ) pulseaudio? ( media-sound/pulseaudio ) sasl? ( dev-libs/cyrus-sasl:2 ) sdl? ( media-libs/libsdl ) sound? ( alsa? ( media-libs/alsa-lib ) ) ssl? ( dev-libs/openssl ) video? ( v4l? ( media-libs/libv4l ) ) xml? ( dev-libs/expat ) !!dev-libs/pwlib virtual/pkgconfig sys-devel/bison sys-devel/flex video? ( v4l? ( sys-kernel/linux-headers ) )
-DESCRIPTION=Network focused portable C++ class library providing high level functions
-EAPI=5
-HOMEPAGE=http://www.opalvoip.org/
-IUSE=alsa +asn debug doc +dtmf examples ffmpeg ftp +http ipv6 xmpp ldap lua mail odbc oss pch pulseaudio qos remote sasl sdl serial shmvideo snmp soap socks +sound ssl static-libs +stun telnet tts v4l +video vxml +wav +xml xmlrpc
-KEYWORDS=alpha amd64 ~arm ia64 ppc ppc64 sparc x86
-LICENSE=MPL-1.0
-RDEPEND=ldap? ( net-nds/openldap ) lua? ( dev-lang/lua ) odbc? ( dev-db/unixODBC ) pulseaudio? ( media-sound/pulseaudio ) sasl? ( dev-libs/cyrus-sasl:2 ) sdl? ( media-libs/libsdl ) sound? ( alsa? ( media-libs/alsa-lib ) ) ssl? ( dev-libs/openssl ) video? ( v4l? ( media-libs/libv4l ) ) xml? ( dev-libs/expat ) !!dev-libs/pwlib ffmpeg? ( virtual/ffmpeg )
-REQUIRED_USE=sdl? ( video ) xmpp? ( xml ) vxml? ( http tts xml ) xmlrpc? ( http xml ) soap? ( http xml )
-SLOT=0/2.10.11
-SRC_URI=mirror://sourceforge/opalvoip/ptlib-2.10.11.tar.bz2 doc? ( mirror://sourceforge/opalvoip/ptlib-2.10.10-htmldoc.tar.bz2 )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=ca16f2d6625ac61639d45ea7d15b8551
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.18.6 b/metadata/md5-cache/net-libs/webkit-gtk-2.18.6
index 18ba75b5dbff..5b1dbb86b27c 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.18.6
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.18.6
@@ -4,7 +4,7 @@ DESCRIPTION=Open source web browser engine
 EAPI=6
 HOMEPAGE=http://www.webkitgtk.org/
 IUSE=aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl +X test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=LGPL-2+ BSD
 RDEPEND=>=x11-libs/cairo-1.10.2:= >=media-libs/fontconfig-2.8.0:1.0 >=media-libs/freetype-2.4.2:2 >=dev-libs/libgcrypt-1.6.0:0= >=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.3.3:=[icu(+)] >=dev-libs/icu-3.8.1-r1:= virtual/jpeg:0= >=net-libs/libsoup-2.48:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.8.0 media-libs/libwebp:= >=dev-libs/glib-2.40:2 >=dev-libs/libxslt-1.1.7 gnome-keyring? ( app-crypt/libsecret ) geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) dev-libs/libtasn1:= >=dev-libs/libgcrypt-1.7.0:0= nsplugin? ( >=x11-libs/gtk+-2.24.10:2 ) spell? ( >=app-text/enchant-0.22:= ) gstreamer? ( >=media-libs/gstreamer-1.2.3:1.0 >=media-libs/gst-plugins-base-1.2.3:1.0 >=media-libs/gst-plugins-bad-1.10:1.0[opengl?,egl?] ) X? ( x11-libs/cairo[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen egl? ( media-libs/mesa[egl] ) gles2? ( media-libs/mesa[gles2] ) opengl? ( virtual/opengl x11-libs/cairo[opengl] ) webgl? ( x11-libs/cairo[opengl] x11-libs/libXcomposite x11-libs/libXdamage )
 REQUIRED_USE=geolocation? ( introspection ) gles2? ( egl ) introspection? ( gstreamer ) nsplugin? ( X ) webgl? ( ^^ ( gles2 opengl ) ) !webgl? ( ?? ( gles2 opengl ) ) webgl? ( gstreamer ) wayland? ( egl ) || ( aqua wayland X )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=4/37
 SRC_URI=http://www.webkitgtk.org/releases/webkitgtk-2.18.6.tar.xz
 _eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1c69997bc4d8fda09cc48406c03b31f5
+_md5_=dc830a979cf6381e8896bd7a842342d6
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index db2b173757b1..05cb1abf12d8 100644
--- a/metadata/md5-cache/net-mail/Manifest.gz
+++ b/metadata/md5-cache/net-mail/Manifest.gz
diff --git a/metadata/md5-cache/net-mail/dovecot-2.2.33.2-r1 b/metadata/md5-cache/net-mail/dovecot-2.2.33.2-r1
index 83ff63898fab..c494bfe6f951 100644
--- a/metadata/md5-cache/net-mail/dovecot-2.2.33.2-r1
+++ b/metadata/md5-cache/net-mail/dovecot-2.2.33.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
 EAPI=6
 HOMEPAGE=http://www.dovecot.org/
 IUSE=kerberos ldap mysql pam postgres sqlite vpopmail bzip2 lzma lz4 zlib caps doc ipv6 libressl lucene managesieve selinux sieve solr +ssl static-libs suid tcpd textcat ssl
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86
 LICENSE=LGPL-2.1 MIT
 RDEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= net-mail/mailbase
 REQUIRED_USE=ssl
 SLOT=0
 SRC_URI=https://dovecot.org/releases/2.2/dovecot-2.2.33.2.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.21.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.21.tar.gz )
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=13ce28d164b4e62738e72244d33492fd
+_md5_=d36a20dd5a6c9869110576af9cef5829
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index df467df24599..ec8a3fe493da 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/connman-1.35-r1 b/metadata/md5-cache/net-misc/connman-1.35-r1
index d9812c72b778..78834bf928f7 100644
--- a/metadata/md5-cache/net-misc/connman-1.35-r1
+++ b/metadata/md5-cache/net-misc/connman-1.35-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Provides a daemon for managing internet connections
 EAPI=6
 HOMEPAGE=https://01.org/connman
 IUSE=bluetooth debug doc examples +ethernet iptables l2tp nftables ofono openvpn openconnect pptp policykit tools vpnc +wifi wispr networkmanager
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.16 >=sys-apps/dbus-1.2.24 iptables? ( >=net-firewall/iptables-1.4.8 ) bluetooth? ( net-wireless/bluez ) l2tp? ( net-dialup/xl2tpd ) nftables? ( >=net-libs/libnftnl-1.0.4:0= >=net-libs/libmnl-1.0.0:0= ) ofono? ( net-misc/ofono ) openconnect? ( net-vpn/openconnect ) openvpn? ( net-vpn/openvpn ) policykit? ( sys-auth/polkit ) pptp? ( net-dialup/pptpclient ) vpnc? ( net-vpn/vpnc ) wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] ) wispr? ( net-libs/gnutls )
 REQUIRED_USE=|| ( iptables nftables )
 SLOT=0
 SRC_URI=mirror://kernel/linux/network/connman/connman-1.35.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=3eae670fb7e0ecefbf40cdd0d7d279f5
+_md5_=03d89447fc691118dbc5f92b95fe38ae
diff --git a/metadata/md5-cache/net-misc/dleyna-server-0.5.0 b/metadata/md5-cache/net-misc/dleyna-server-0.5.0
index 3c1e255052d8..1aabb2aafea9 100644
--- a/metadata/md5-cache/net-misc/dleyna-server-0.5.0
+++ b/metadata/md5-cache/net-misc/dleyna-server-0.5.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.28:2 dev-libs/libxml2 >=media-libs/gupnp-dlna-0.9.4:2.0
 DESCRIPTION=library for implementing services that allow clients to discover, browse and manipulate DLNA Servers
 EAPI=5
 HOMEPAGE=https://01.org/dleyna/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.28:2 dev-libs/libxml2 >=media-libs/gupnp-dlna-0.9.4:2.0 >=net-libs/dleyna-core-0.5 >=net-libs/gssdp-0.13.2 >=net-libs/gupnp-0.20.3 >=net-libs/gupnp-av-0.11.5 >=net-libs/libsoup-2.28.2:2.4
 SLOT=0
 SRC_URI=https://01.org/sites/default/files/downloads/dleyna/dleyna-server-0.5.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=0f0c725f3c082da07036fa7894693d91
+_md5_=55072db9300d783f20e9b9fed6258935
diff --git a/metadata/md5-cache/net-misc/electrum-3.0.5 b/metadata/md5-cache/net-misc/electrum-3.0.5
index 3c70bd03b751..9fc2e4808085 100644
--- a/metadata/md5-cache/net-misc/electrum-3.0.5
+++ b/metadata/md5-cache/net-misc/electrum-3.0.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=python_targets_python3_4? ( dev-lang/python:3.4[ncurses?] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=sys-apps/sed-4
+DEPEND=python_targets_python3_4? ( dev-lang/python:3.4[ncurses?] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses?] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sys-apps/sed-4
 DESCRIPTION=User friendly Bitcoin client
 EAPI=6
 HOMEPAGE=https://electrum.org/
-IUSE=audio_modem cli cosign digitalbitbox email greenaddress_it ncurses qrcode +qt5 sync trustedcoin_com vkb l10n_ar l10n_bg l10n_cs l10n_da l10n_de l10n_el l10n_eo l10n_es l10n_fa l10n_fr l10n_hu l10n_hy l10n_id l10n_it l10n_ja l10n_ko l10n_ky l10n_lv l10n_nb l10n_nl l10n_pl l10n_pt-BR l10n_pt-PT l10n_ro l10n_ru l10n_sk l10n_sl l10n_ta l10n_th l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW python_targets_python3_4 python_targets_python3_5
+IUSE=audio_modem cli cosign digitalbitbox email greenaddress_it ncurses qrcode +qt5 sync trustedcoin_com vkb l10n_ar l10n_bg l10n_cs l10n_da l10n_de l10n_el l10n_eo l10n_es l10n_fa l10n_fr l10n_hu l10n_hy l10n_id l10n_it l10n_ja l10n_ko l10n_ky l10n_lv l10n_nb l10n_nl l10n_pl l10n_pt-BR l10n_pt-PT l10n_ro l10n_ru l10n_sk l10n_sl l10n_ta l10n_th l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=dev-python/ecdsa[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/jsonrpclib[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pbkdf2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyaes[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/PySocks[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/qrcode[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/requests[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/tlslite[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] || ( dev-python/protobuf-python[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-libs/protobuf[python,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) virtual/python-dnspython[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ncurses? ( dev-lang/python ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses?] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( cli ncurses qt5 ) audio_modem? ( qt5 ) cosign? ( qt5 ) digitalbitbox? ( qt5 ) email? ( qt5 ) greenaddress_it? ( qt5 ) qrcode? ( qt5 ) sync? ( qt5 ) trustedcoin_com? ( qt5 ) vkb? ( qt5 ) || ( python_targets_python3_4 python_targets_python3_5 )
+RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4[ncurses?] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses?] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ecdsa[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jsonrpclib[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pbkdf2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyaes[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/PySocks[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/qrcode[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/tlslite[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] || ( dev-python/protobuf-python[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/protobuf[python,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) virtual/python-dnspython[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ncurses? ( dev-lang/python ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses?] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses?] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( cli ncurses qt5 ) audio_modem? ( qt5 ) cosign? ( qt5 ) digitalbitbox? ( qt5 ) email? ( qt5 ) greenaddress_it? ( qt5 ) qrcode? ( qt5 ) sync? ( qt5 ) trustedcoin_com? ( qt5 ) vkb? ( qt5 ) || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://download.electrum.org/3.0.5/Electrum-3.0.5.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ecc3003c4a6e7ca0b26bed85428e951f
+_md5_=450d64976d642bcf32a19d707f758988
diff --git a/metadata/md5-cache/net-misc/gnome-online-miners-3.24.0 b/metadata/md5-cache/net-misc/gnome-online-miners-3.24.0
index c3bf6d43b762..3d1671bb3638 100644
--- a/metadata/md5-cache/net-misc/gnome-online-miners-3.24.0
+++ b/metadata/md5-cache/net-misc/gnome-online-miners-3.24.0
@@ -4,10 +4,10 @@ DESCRIPTION=Crawls through your online content
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/GnomeOnlineMiners
 IUSE=flickr
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=>=app-misc/tracker-1:0= >=dev-libs/glib-2.35.1:2 >=dev-libs/libgdata-0.15.2:0=[crypt,gnome-online-accounts] media-libs/grilo:0.3 >=net-libs/gnome-online-accounts-3.13.3:= >=net-libs/libgfbgraph-0.2.2:0.2 >=net-libs/libzapojit-0.0.2 flickr? ( media-plugins/grilo-plugins:0.3[flickr] )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-online-miners/3.24/gnome-online-miners-3.24.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=83e3965595a4d3a1e08f07c44b8ce1ee
+_md5_=8251ad15952abdaa4554ca6bcaf2b332
diff --git a/metadata/md5-cache/net-misc/rygel-0.34.0 b/metadata/md5-cache/net-misc/rygel-0.34.0
index 7ff71471b350..fcb1f6602a7b 100644
--- a/metadata/md5-cache/net-misc/rygel-0.34.0
+++ b/metadata/md5-cache/net-misc/rygel-0.34.0
@@ -4,10 +4,10 @@ DESCRIPTION=Rygel is an open source UPnP/DLNA MediaServer
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Rygel
 IUSE=X +introspection +sqlite tracker test transcode test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/libgee-0.8:0.8 >=dev-libs/libxml2-2.7:2 >=media-libs/gupnp-dlna-0.9.4:2.0 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmediaart-0.7:2.0 media-plugins/gst-plugins-soup:1.0 >=net-libs/gssdp-0.13 >=net-libs/gupnp-0.20.14 >=net-libs/gupnp-av-0.12.8 >=net-libs/libsoup-2.44:2.4 >=sys-apps/util-linux-2.20 x11-misc/shared-mime-info introspection? ( >=dev-libs/gobject-introspection-1.33.4:= ) sqlite? ( >=dev-db/sqlite-3.5:3 dev-libs/libunistring:= x11-libs/gdk-pixbuf:2 ) tracker? ( >=app-misc/tracker-0.16:= ) transcode? ( media-libs/gst-plugins-bad:1.0 media-plugins/gst-plugins-twolame:1.0 media-plugins/gst-plugins-libav:1.0 ) X? ( >=x11-libs/gtk+-3:3 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/rygel/0.34/rygel-0.34.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fd07e364d4b1f2e9ddf30a66dba310d7
+_md5_=f68a6a256de0deee0970b9a745ae630d
diff --git a/metadata/md5-cache/net-misc/whois-5.2.20 b/metadata/md5-cache/net-misc/whois-5.2.20
index 1792d29cfe60..9db43a63c0df 100644
--- a/metadata/md5-cache/net-misc/whois-5.2.20
+++ b/metadata/md5-cache/net-misc/whois-5.2.20
@@ -4,11 +4,11 @@ DESCRIPTION=improved Whois Client
 EAPI=6
 HOMEPAGE=https://www.linux.it/~md/software/
 IUSE=iconv idn nls
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=iconv? ( virtual/libiconv ) idn? ( net-dns/libidn ) nls? ( virtual/libintl )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://debian/pool/main/w/whois/whois_5.2.20.tar.xz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=15a1404467a5489c7c6d4a5953b79215
+_md5_=ad5a5beff23bb1bf19f7748caa93b34b
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2018.01.14 b/metadata/md5-cache/net-misc/youtube-dl-2018.01.21
index 68c5c5516b70..20f0451a5e73 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-2018.01.14
+++ b/metadata/md5-cache/net-misc/youtube-dl-2018.01.21
@@ -9,6 +9,6 @@ LICENSE=public-domain
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
-SRC_URI=https://youtube-dl.org/downloads/2018.01.14/youtube-dl-2018.01.14.tar.gz
+SRC_URI=https://youtube-dl.org/downloads/2018.01.21/youtube-dl-2018.01.21.tar.gz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c95d17b3ee9606122fbffdd9f9be4467
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 36cfdf8c6238..f5b49e76f0ce 100644
--- a/metadata/md5-cache/net-p2p/Manifest.gz
+++ b/metadata/md5-cache/net-p2p/Manifest.gz
diff --git a/metadata/md5-cache/net-p2p/bitcoin-cli-0.15.1 b/metadata/md5-cache/net-p2p/bitcoin-cli-0.15.1
index f95afc254870..5155d0317d23 100644
--- a/metadata/md5-cache/net-p2p/bitcoin-cli-0.15.1
+++ b/metadata/md5-cache/net-p2p/bitcoin-cli-0.15.1
@@ -4,10 +4,10 @@ DESCRIPTION=Command-line JSON-RPC client specifically for interfacing with bitco
 EAPI=6
 HOMEPAGE=http://bitcoincore.org/ http://bitcoinknots.org/
 IUSE=knots libressl
-KEYWORDS=~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=!libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) dev-libs/libevent dev-libs/univalue >=dev-libs/boost-1.52.0:=[threads(+)]
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/7b57bc998f334775b50ebc8ca5e78ca728db4c58.tar.gz -> bitcoin-v0.15.1.tar.gz http://bitcoinknots.org/files/0.15.x/0.15.1.knots20171111/bitcoin-0.15.1.knots20171111.patches.txz -> bitcoin-0.15.1.knots20171111.patches.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=8ab736ae6fa21e9da37719b75727edc1
+_md5_=002080c22c0b089cce6c751b0fa203e5
diff --git a/metadata/md5-cache/net-p2p/bitcoin-qt-0.15.1 b/metadata/md5-cache/net-p2p/bitcoin-qt-0.15.1
index 3f468b9d4b8b..7ef95e6fe108 100644
--- a/metadata/md5-cache/net-p2p/bitcoin-qt-0.15.1
+++ b/metadata/md5-cache/net-p2p/bitcoin-qt-0.15.1
@@ -4,11 +4,11 @@ DESCRIPTION=An end-user Qt GUI for the Bitcoin crypto-currency
 EAPI=6
 HOMEPAGE=http://bitcoincore.org/ http://bitcoinknots.org/
 IUSE=+asm +bip70 +bitcoin_policy_rbf dbus kde +libevent knots libressl +qrcode +http test +tor upnp +wallet zeromq l10n_sl l10n_en-US l10n_ar l10n_ru l10n_pt-BR l10n_uk l10n_hu l10n_es-UY l10n_nl l10n_nb l10n_ky l10n_gl l10n_es-CO l10n_de l10n_be l10n_hr l10n_es-CL l10n_et l10n_es l10n_hu l10n_el l10n_de l10n_da l10n_zh-TW l10n_pam l10n_ko l10n_pt-PT l10n_ne l10n_ka l10n_es-VE l10n_eo l10n_eu l10n_en l10n_zh-CN l10n_lv l10n_el l10n_sr-Latn l10n_ru l10n_ms l10n_af l10n_nl l10n_et l10n_ro l10n_id l10n_en-AU l10n_es-MX l10n_he l10n_nb l10n_am l10n_th l10n_af l10n_si l10n_fr l10n_cy l10n_bg l10n_sk l10n_kk l10n_ur-PK l10n_fr l10n_fa l10n_es-419 l10n_ca l10n_pt l10n_ms l10n_ja l10n_la l10n_zh-HK l10n_zh l10n_sn l10n_bn l10n_hi l10n_cs l10n_vi l10n_fr-CA l10n_en-GB l10n_tr l10n_my l10n_id l10n_lt l10n_es-DO l10n_ku l10n_es-AR l10n_tr l10n_fa l10n_th l10n_ro l10n_bs l10n_bg l10n_sq l10n_is l10n_ca l10n_te l10n_mn l10n_it l10n_ca-valencia l10n_vi l10n_sr l10n_fi l10n_pl l10n_uz-Cyrl l10n_ta l10n_sv l10n_pl l10n_mk l10n_ja l10n_it l10n_he l10n_es-ES
-KEYWORDS=~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=!libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) libevent? ( dev-libs/libevent ) >=dev-libs/libsecp256k1-0.0.0_pre20151118[recovery] dev-libs/univalue >=dev-libs/boost-1.52.0:=[threads(+)] upnp? ( >=net-libs/miniupnpc-1.9.20150916 ) wallet? ( sys-libs/db:4.8[cxx] ) zeromq? ( net-libs/zeromq ) virtual/bitcoin-leveldb bip70? ( dev-libs/protobuf ) qrcode? ( media-gfx/qrencode ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dbus? ( dev-qt/qtdbus:5 )
 REQUIRED_USE=http? ( libevent ) tor? ( libevent ) libevent? ( http tor ) l10n_am? ( knots ) l10n_pt? ( knots ) l10n_sn? ( knots ) l10n_is? ( knots )
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/7b57bc998f334775b50ebc8ca5e78ca728db4c58.tar.gz -> bitcoin-v0.15.1.tar.gz http://bitcoinknots.org/files/0.15.x/0.15.1.knots20171111/bitcoin-0.15.1.knots20171111.patches.txz -> bitcoin-0.15.1.knots20171111.patches.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	db-use	582140d1a711279e50ce284fc7b609f5	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=de1b19f4d46ca1375db54bdc962dcbdf
+_md5_=ab8d67bfb76447b7f82d286ff6af65e6
diff --git a/metadata/md5-cache/net-p2p/bitcoind-0.15.1 b/metadata/md5-cache/net-p2p/bitcoind-0.15.1
index 14743510c498..262bc0cc3a82 100644
--- a/metadata/md5-cache/net-p2p/bitcoind-0.15.1
+++ b/metadata/md5-cache/net-p2p/bitcoind-0.15.1
@@ -4,10 +4,10 @@ DESCRIPTION=Original Bitcoin crypto-currency wallet for automated services
 EAPI=6
 HOMEPAGE=http://bitcoincore.org/ http://bitcoinknots.org/
 IUSE=+asm +bitcoin_policy_rbf examples knots libressl test upnp +wallet zeromq
-KEYWORDS=~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=!libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) dev-libs/libevent >=dev-libs/libsecp256k1-0.0.0_pre20151118[recovery] dev-libs/univalue >=dev-libs/boost-1.52.0:=[threads(+)] upnp? ( >=net-libs/miniupnpc-1.9.20150916 ) wallet? ( sys-libs/db:4.8[cxx] ) zeromq? ( net-libs/zeromq ) virtual/bitcoin-leveldb
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/7b57bc998f334775b50ebc8ca5e78ca728db4c58.tar.gz -> bitcoin-v0.15.1.tar.gz http://bitcoinknots.org/files/0.15.x/0.15.1.knots20171111/bitcoin-0.15.1.knots20171111.patches.txz -> bitcoin-0.15.1.knots20171111.patches.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	db-use	582140d1a711279e50ce284fc7b609f5	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=c4ced6793dd9960e91002f7de56ba2a1
+_md5_=45a4d7f3dd7b0b68dbeda2fea78134cb
diff --git a/metadata/md5-cache/net-p2p/classified-ads-0.12 b/metadata/md5-cache/net-p2p/classified-ads-0.12
new file mode 100644
index 000000000000..445b59ebde8d
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/classified-ads-0.12
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/openssl:0 >=net-libs/libnatpmp-20130911 <=net-libs/libnatpmp-20140401-r1 >=net-libs/miniupnpc-1.8 sys-apps/file dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtwidgets:5 dev-qt/qtsql:5[sqlite] dev-qt/qtmultimedia:5[widgets] dev-qt/qtprintsupport:5 media-libs/opus virtual/libintl dev-lang/tcl:= dev-lang/tk:= sys-libs/zlib sys-devel/gettext doc? ( app-doc/doxygen[dot] ) test? ( dev-libs/libgcrypt:0 dev-qt/qttest:5 sys-devel/gdb:0 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Program for displaying classified advertisement items
+EAPI=6
+HOMEPAGE=http://katiska.org/classified-ads/
+IUSE=doc test test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-libs/openssl:0 >=net-libs/libnatpmp-20130911 <=net-libs/libnatpmp-20140401-r1 >=net-libs/miniupnpc-1.8 sys-apps/file dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtwidgets:5 dev-qt/qtsql:5[sqlite] dev-qt/qtmultimedia:5[widgets] dev-qt/qtprintsupport:5 media-libs/opus virtual/libintl dev-lang/tcl:= dev-lang/tk:= sys-libs/zlib
+SLOT=0
+SRC_URI=https://github.com/operatornormal/classified-ads/archive/0.12.tar.gz -> classified-ads-0.12.tar.gz https://github.com/operatornormal/classified-ads/blob/graphics/preprocessed.tar.gz?raw=true -> classified-ads-graphics-0.12.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=48ac9fedf0a44d46ec55edfcc2a12394
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index f4c0c0847ce1..52eccc744745 100644
--- a/metadata/md5-cache/net-proxy/Manifest.gz
+++ b/metadata/md5-cache/net-proxy/Manifest.gz
diff --git a/metadata/md5-cache/net-proxy/squid-3.5.27-r1 b/metadata/md5-cache/net-proxy/squid-3.5.27-r1
index 0809b10f5911..08f1e32e59ed 100644
--- a/metadata/md5-cache/net-proxy/squid-3.5.27-r1
+++ b/metadata/md5-cache/net-proxy/squid-3.5.27-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A full-featured web proxy cache
 EAPI=6
 HOMEPAGE=http://www.squid-cache.org/
 IUSE=caps ipv6 pam ldap libressl samba sasl kerberos nis radius ssl snmp selinux logrotate test ecap esi ssl-crtd mysql postgres sqlite qos tproxy +htcp +wccp +wccpv2 pf-transparent ipf-transparent kqueue elibc_uclibc kernel_linux
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( libressl? ( dev-libs/libressl:0 ) !libressl? ( dev-libs/openssl:0 ) dev-libs/nettle >=net-libs/gnutls-3.1.5 ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap:1 ) esi? ( dev-libs/expat dev-libs/libxml2 ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4:* dev-lang/perl dev-libs/libltdl:0 samba? ( net-fs/samba ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) selinux? ( sec-policy/selinux-squid ) sqlite? ( dev-perl/DBD-SQLite ) !<=sci-biology/meme-4.8.1-r1
 REQUIRED_USE=tproxy? ( caps ) qos? ( caps )
 SLOT=0
 SRC_URI=http://www.squid-cache.org/Versions/v3/3.5/squid-3.5.27.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=e03202ac44803bda624058a384c19c55
+_md5_=5e047604ad613cb9d292fd2a84ffe80b
diff --git a/metadata/md5-cache/net-voip/Manifest.gz b/metadata/md5-cache/net-voip/Manifest.gz
index d21703477375..2b5668f98fdd 100644
--- a/metadata/md5-cache/net-voip/Manifest.gz
+++ b/metadata/md5-cache/net-voip/Manifest.gz
diff --git a/metadata/md5-cache/net-voip/ekiga-4.0.1-r1 b/metadata/md5-cache/net-voip/ekiga-4.0.1-r1
deleted file mode 100644
index ed13ed184039..000000000000
--- a/metadata/md5-cache/net-voip/ekiga-4.0.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.24.0:2 >=dev-libs/boost-1.49:0= dev-libs/libxml2:2 >=gnome-base/gconf-2.6.0:2 >=net-libs/opal-3.10.9:0=[sip,sound,video,debug=,h323?,xml] <net-libs/opal-3.12 >=net-libs/ptlib-2.10.9:0=[ldap?,stun,v4l?,video,wav,debug=,dtmf,pulseaudio?,xml] <net-libs/ptlib-2.12 >=x11-libs/gtk+-2.20.0:2 x11-themes/gnome-icon-theme dbus? ( >=sys-apps/dbus-0.36 >=dev-libs/dbus-glib-0.36 ) eds? ( >=gnome-extra/evolution-data-server-1.2:= ) ldap? ( dev-libs/cyrus-sasl:2 net-nds/openldap ) libnotify? ( x11-libs/libnotify ) shm? ( x11-libs/libXext ) xv? ( x11-libs/libXv ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) >=dev-util/intltool-0.35 virtual/pkgconfig sys-devel/gettext doc? ( app-text/rarian app-text/gnome-doc-utils app-doc/doxygen ) v4l? ( sys-kernel/linux-headers ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=H.323 and SIP VoIP softphone
-EAPI=6
-HOMEPAGE=http://www.ekiga.org/
-IUSE=dbus debug doc eds h323 ldap libnotify cpu_flags_x86_mmx pulseaudio +shm v4l xv zeroconf
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.24.0:2 >=dev-libs/boost-1.49:0= dev-libs/libxml2:2 >=gnome-base/gconf-2.6.0:2 >=net-libs/opal-3.10.9:0=[sip,sound,video,debug=,h323?,xml] <net-libs/opal-3.12 >=net-libs/ptlib-2.10.9:0=[ldap?,stun,v4l?,video,wav,debug=,dtmf,pulseaudio?,xml] <net-libs/ptlib-2.12 >=x11-libs/gtk+-2.20.0:2 x11-themes/gnome-icon-theme dbus? ( >=sys-apps/dbus-0.36 >=dev-libs/dbus-glib-0.36 ) eds? ( >=gnome-extra/evolution-data-server-1.2:= ) ldap? ( dev-libs/cyrus-sasl:2 net-nds/openldap ) libnotify? ( x11-libs/libnotify ) shm? ( x11-libs/libXext ) xv? ( x11-libs/libXv ) zeroconf? ( >=net-dns/avahi-0.6[dbus] )
-SLOT=0
-SRC_URI=mirror://gnome/sources/ekiga/4.0/ekiga-4.0.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d8084dc6978f07df7cb497665291e6f7
diff --git a/metadata/md5-cache/net-voip/openmcu-2.2.5-r1 b/metadata/md5-cache/net-voip/openmcu-2.2.5-r1
deleted file mode 100644
index 7ba78b39122d..000000000000
--- a/metadata/md5-cache/net-voip/openmcu-2.2.5-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst prepare
-DEPEND=net-libs/ptlib:= net-libs/h323plus:=
-DESCRIPTION=Simple Multi Conference Unit using H.323
-EAPI=6
-HOMEPAGE=http://www.h323plus.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=MPL-1.0 GPL-2
-RDEPEND=net-libs/ptlib:= net-libs/h323plus:=
-SLOT=0
-SRC_URI=mirror://sourceforge/h323plus/h323plus-app-v1_23_0.tar.gz
-_eclasses_=user	8bc2845510e2109af75e3eeac607ec81
-_md5_=0904004f864d8f5930fbd487c01655e2
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 358aa1411bab..40d75ae6b2f6 100644
--- a/metadata/md5-cache/net-vpn/Manifest.gz
+++ b/metadata/md5-cache/net-vpn/Manifest.gz
diff --git a/metadata/md5-cache/net-vpn/libreswan-3.20 b/metadata/md5-cache/net-vpn/libreswan-3.20
deleted file mode 100644
index a387ae40704f..000000000000
--- a/metadata/md5-cache/net-vpn/libreswan-3.20
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( net-dns/unbound net-libs/ldns ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd:0= ) app-text/docbook-xml-dtd:4.1.2 app-text/xmlto dev-libs/nss sys-devel/bison sys-devel/flex virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=IPsec implementation for Linux, fork of Openswan
-EAPI=6
-HOMEPAGE=https://libreswan.org/
-IUSE=caps curl dnssec ldap pam systemd
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2 BSD-4 RSA DES
-RDEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( net-dns/unbound net-libs/ldns ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd:0= ) dev-libs/nss[utils(+)] sys-apps/iproute2 !net-misc/openswan !net-vpn/strongswan
-SLOT=0
-SRC_URI=https://download.libreswan.org/libreswan-3.20.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=0f8a6942bf0cb6b278b717d2210462b1
diff --git a/metadata/md5-cache/net-vpn/libreswan-3.23 b/metadata/md5-cache/net-vpn/libreswan-3.23
new file mode 100644
index 000000000000..4fffd3841069
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/libreswan-3.23
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( net-dns/unbound net-libs/ldns ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) app-text/docbook-xml-dtd:4.1.2 app-text/xmlto dev-libs/nss sys-devel/bison sys-devel/flex virtual/pkgconfig test? ( dev-python/setproctitle ) virtual/pkgconfig
+DESCRIPTION=IPsec implementation for Linux, fork of Openswan
+EAPI=6
+HOMEPAGE=https://libreswan.org/
+IUSE=caps curl dnssec ldap pam seccomp selinux systemd test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2 BSD-4 RSA DES
+RDEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( net-dns/unbound net-libs/ldns ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) dev-libs/nss[utils(+)] sys-apps/iproute2 !net-misc/openswan !net-vpn/strongswan selinux? ( sec-policy/selinux-ipsec )
+SLOT=0
+SRC_URI=https://download.libreswan.org/libreswan-3.23.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=80c9893a93cb99afc45b26b84d9e1c0f
diff --git a/metadata/md5-cache/net-vpn/strongswan-5.6.0-r1 b/metadata/md5-cache/net-vpn/strongswan-5.6.0-r1
index 310bce7ba927..c8970836c909 100644
--- a/metadata/md5-cache/net-vpn/strongswan-5.6.0-r1
+++ b/metadata/md5-cache/net-vpn/strongswan-5.6.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=IPsec-based VPN solution focused on security and ease of use, suppor
 EAPI=5
 HOMEPAGE=http://www.strongswan.org/
 IUSE=+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite pam pkcs11 +strongswan_plugins_led +strongswan_plugins_lookip +strongswan_plugins_systime-fix +strongswan_plugins_unity +strongswan_plugins_vici strongswan_plugins_blowfish strongswan_plugins_ccm strongswan_plugins_ctr strongswan_plugins_gcm strongswan_plugins_ha strongswan_plugins_ipseckey strongswan_plugins_ntru strongswan_plugins_padlock strongswan_plugins_rdrand strongswan_plugins_unbound strongswan_plugins_whitelist
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
 LICENSE=GPL-2 RSA DES
 RDEPEND=!net-misc/openswan gmp? ( >=dev-libs/gmp-4.1.5:= ) gcrypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) ldap? ( net-nds/openldap ) openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist] ) mysql? ( virtual/mysql ) sqlite? ( >=dev-db/sqlite-3.3.1 ) networkmanager? ( net-misc/networkmanager ) pam? ( sys-libs/pam ) strongswan_plugins_unbound? ( net-dns/unbound net-libs/ldns ) virtual/logger sys-apps/iproute2 !net-vpn/libreswan selinux? ( sec-policy/selinux-ipsec )
 SLOT=0
 SRC_URI=http://download.strongswan.org/strongswan-5.6.0.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=87ac8ffd8e75bdb8b37f9dd94647419b
+_md5_=d99ed23e4efae6af8eca336a9ed2e0da
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index f15c96c3c3ff..922cd2ec9d57 100644
--- a/metadata/md5-cache/net-wireless/Manifest.gz
+++ b/metadata/md5-cache/net-wireless/Manifest.gz
diff --git a/metadata/md5-cache/net-wireless/iw-4.9 b/metadata/md5-cache/net-wireless/iw-4.9
index fa48b70df020..ac7a8e1e6266 100644
--- a/metadata/md5-cache/net-wireless/iw-4.9
+++ b/metadata/md5-cache/net-wireless/iw-4.9
@@ -3,10 +3,10 @@ DEPEND=dev-libs/libnl virtual/pkgconfig
 DESCRIPTION=nl80211-based configuration utility for wireless devices using the mac80211 kernel stack
 EAPI=6
 HOMEPAGE=https://wireless.kernel.org/en/users/Documentation/iw
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=ISC
 RDEPEND=dev-libs/libnl
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/network/iw/iw-4.9.tar.xz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=c94789addfa59a0c8ffba039b87957bf
+_md5_=48c6d1a7739ea33a8741dc3a900a820d
diff --git a/metadata/md5-cache/net-wireless/wireless-regdb-20171223 b/metadata/md5-cache/net-wireless/wireless-regdb-20171223
new file mode 100644
index 000000000000..abbb9bf95757
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/wireless-regdb-20171223
@@ -0,0 +1,9 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=Binary regulatory database for CRDA
+EAPI=6
+HOMEPAGE=https://wireless.kernel.org/en/developers/Regulatory
+KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86
+LICENSE=ISC
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/software/network/wireless-regdb/wireless-regdb-2017.12.23.tar.xz
+_md5_=754a4582ab776805fa724b88fd0ab76c
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index c7bca2af0609..c6a3e7495d17 100644
--- a/metadata/md5-cache/sci-electronics/Manifest.gz
+++ b/metadata/md5-cache/sci-electronics/Manifest.gz
diff --git a/metadata/md5-cache/sci-electronics/iverilog-10.2 b/metadata/md5-cache/sci-electronics/iverilog-10.2
new file mode 100644
index 000000000000..c2ccfae8e7b2
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/iverilog-10.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/bzip2 sys-libs/readline:0= sys-libs/zlib:=
+DESCRIPTION=A Verilog simulation and synthesis tool
+EAPI=6
+HOMEPAGE=http://iverilog.icarus.com/
+IUSE=examples
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-arch/bzip2 sys-libs/readline:0= sys-libs/zlib:=
+SLOT=0
+SRC_URI=ftp://icarus.com/pub/eda/verilog/v10/verilog-10.2.tar.gz
+_md5_=9fe4104a245392cdea2cb1101e623711
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index f8cf536c3c41..8ca21e84a03f 100644
--- a/metadata/md5-cache/sci-geosciences/Manifest.gz
+++ b/metadata/md5-cache/sci-geosciences/Manifest.gz
diff --git a/metadata/md5-cache/sci-geosciences/geocode-glib-3.24.0 b/metadata/md5-cache/sci-geosciences/geocode-glib-3.24.0
index 42e8f13bc264..ba995dcef752 100644
--- a/metadata/md5-cache/sci-geosciences/geocode-glib-3.24.0
+++ b/metadata/md5-cache/sci-geosciences/geocode-glib-3.24.0
@@ -4,11 +4,11 @@ DESCRIPTION=GLib geocoding library that uses the Yahoo! Place Finder service
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/geocode-glib
 IUSE=+introspection test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.44:2 >=dev-libs/json-glib-0.99.2[introspection?] gnome-base/gvfs[http] >=net-libs/libsoup-2.42:2.4[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.6.3:= )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/geocode-glib/3.24/geocode-glib-3.24.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5a1aacae4723ad434f85678754aa4f13
+_md5_=2581ed49e60502d8dbc87a4064b335b7
diff --git a/metadata/md5-cache/sci-geosciences/gnome-maps-3.24.3 b/metadata/md5-cache/sci-geosciences/gnome-maps-3.24.3
index 8d83cbedca18..78ecb3bac21d 100644
--- a/metadata/md5-cache/sci-geosciences/gnome-maps-3.24.3
+++ b/metadata/md5-cache/sci-geosciences/gnome-maps-3.24.3
@@ -3,10 +3,10 @@ DEPEND=>=app-misc/geoclue-0.12.99:2.0[introspection] >=dev-libs/folks-0.10 >=dev
 DESCRIPTION=A map application for GNOME
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Maps
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0
 RDEPEND=>=app-misc/geoclue-0.12.99:2.0[introspection] >=dev-libs/folks-0.10 >=dev-libs/gjs-1.44.0 >=dev-libs/gobject-introspection-0.6.3:= >=dev-libs/glib-2.39.3:2 >=dev-libs/libgee-0.16:0.8[introspection] dev-libs/libxml2:2 >=media-libs/libchamplain-0.12.14:0.12[gtk,introspection] >=net-libs/rest-0.7.90:0.7[introspection] >=sci-geosciences/geocode-glib-3.15.2[introspection] >=x11-libs/gtk+-3.22:3[introspection] app-crypt/libsecret[introspection] dev-libs/libgweather[introspection] media-libs/clutter-gtk:1.0[introspection] media-libs/clutter:1.0[introspection] media-libs/cogl:1.0[introspection] net-libs/gnome-online-accounts[introspection] net-libs/libgfbgraph[introspection] net-libs/libsoup:2.4[introspection] net-libs/webkit-gtk:4[introspection] x11-libs/gdk-pixbuf:2[introspection]
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-maps/3.24/gnome-maps-3.24.3.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d8696bfd2863cbb6a5f25deb6d2b7799
+_md5_=0eb665214dc96e2204d309647c8fff6c
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index 68a1fc8389f0..acadb3e2c389 100644
--- a/metadata/md5-cache/sci-visualization/Manifest.gz
+++ b/metadata/md5-cache/sci-visualization/Manifest.gz
diff --git a/metadata/md5-cache/sci-visualization/qtiplot-0.9.8.9-r2 b/metadata/md5-cache/sci-visualization/qtiplot-0.9.8.9-r2
deleted file mode 100644
index 82c1dd86b7a2..000000000000
--- a/metadata/md5-cache/sci-visualization/qtiplot-0.9.8.9-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=media-libs/libemf dev-qt/qthelp:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 dev-qt/qt3support:4 dev-qt/qthelp:4[compat] dev-qt/qtsvg:4 >=x11-libs/gl2ps-1.3.5[png] >=dev-cpp/muParser-1.32 >=dev-libs/boost-1.35.0:= dev-libs/quazip[qt4] media-libs/libpng:= sci-libs/alglib:= <sci-libs/gsl-2 sci-libs/tamu_anova latex? ( dev-tex/qtexengine ) mono? ( dev-dotnet/libgdiplus ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) virtual/pkgconfig python? ( >=dev-python/sip-4.9[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) doc? ( >=app-text/docbook-sgml-utils-0.6.14-r1 >=app-text/docbook-xml-dtd-4.4-r2:4.4 )
-DESCRIPTION=Qt based clone of the Origin plotting package
-EAPI=5
-HOMEPAGE=http://soft.proindependent.com/qtiplot.html http://www.staff.science.uu.nl/~zeven101/qtiplot.html
-IUSE=bindist doc mono latex python linguas_zh_CN linguas_cs linguas_de linguas_es linguas_fr linguas_ja linguas_ro linguas_ru linguas_sv python_targets_python2_7
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2 GPL-3
-RDEPEND=media-libs/libemf dev-qt/qthelp:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 dev-qt/qt3support:4 dev-qt/qthelp:4[compat] dev-qt/qtsvg:4 >=x11-libs/gl2ps-1.3.5[png] >=dev-cpp/muParser-1.32 >=dev-libs/boost-1.35.0:= dev-libs/quazip[qt4] media-libs/libpng:= sci-libs/alglib:= <sci-libs/gsl-2 sci-libs/tamu_anova latex? ( dev-tex/qtexengine ) mono? ( dev-dotnet/libgdiplus ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) python? ( dev-python/PyQt4[X,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
-REQUIRED_USE=python? ( python_targets_python2_7 )
-RESTRICT=!bindist? ( bindist )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/qtiplot-0.9.8.9.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/qtiplot-0.9.8.9-origin.patch.bz2
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=c1f2ccdb12a915401fc8f762c846739b
diff --git a/metadata/md5-cache/sci-visualization/qtiplot-0.9.8.9-r3 b/metadata/md5-cache/sci-visualization/qtiplot-0.9.8.9-r3
deleted file mode 100644
index e1a6c4f628a6..000000000000
--- a/metadata/md5-cache/sci-visualization/qtiplot-0.9.8.9-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=media-libs/libemf dev-qt/qthelp:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 dev-qt/qt3support:4 dev-qt/qthelp:4[compat] dev-qt/qtsvg:4 >=x11-libs/gl2ps-1.3.5[png] >=dev-cpp/muParser-1.32 >=dev-libs/boost-1.35.0:= dev-libs/quazip[qt4] media-libs/libpng:= sci-libs/alglib:= <sci-libs/gsl-2 sci-libs/tamu_anova latex? ( dev-tex/qtexengine ) mono? ( dev-dotnet/libgdiplus ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/PyQt4-4.11.3[X,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) virtual/pkgconfig python? ( >=dev-python/sip-4.16.5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) doc? ( >=app-text/docbook-sgml-utils-0.6.14-r1 >=app-text/docbook-xml-dtd-4.4-r2:4.4 )
-DESCRIPTION=Qt based clone of the Origin plotting package
-EAPI=5
-HOMEPAGE=http://soft.proindependent.com/qtiplot.html http://www.staff.science.uu.nl/~zeven101/qtiplot.html
-IUSE=bindist doc mono latex python linguas_zh_CN linguas_cs linguas_de linguas_es linguas_fr linguas_ja linguas_ro linguas_ru linguas_sv python_targets_python2_7
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2 GPL-3
-RDEPEND=media-libs/libemf dev-qt/qthelp:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 dev-qt/qt3support:4 dev-qt/qthelp:4[compat] dev-qt/qtsvg:4 >=x11-libs/gl2ps-1.3.5[png] >=dev-cpp/muParser-1.32 >=dev-libs/boost-1.35.0:= dev-libs/quazip[qt4] media-libs/libpng:= sci-libs/alglib:= <sci-libs/gsl-2 sci-libs/tamu_anova latex? ( dev-tex/qtexengine ) mono? ( dev-dotnet/libgdiplus ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/PyQt4-4.11.3[X,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
-REQUIRED_USE=python? ( python_targets_python2_7 )
-RESTRICT=!bindist? ( bindist )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/qtiplot-0.9.8.9.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/qtiplot-0.9.8.9-origin.patch.bz2
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=157629837ed765ad6b063f1dc56e5655
diff --git a/metadata/md5-cache/sci-visualization/qtiplot-0.9.8.9-r4 b/metadata/md5-cache/sci-visualization/qtiplot-0.9.8.9-r4
deleted file mode 100644
index 5d5bb1cb76a9..000000000000
--- a/metadata/md5-cache/sci-visualization/qtiplot-0.9.8.9-r4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-cpp/muParser-1.32 >=dev-libs/boost-1.35.0:= dev-libs/quazip[qt4] dev-qt/qt3support:4 dev-qt/qtgui:4 dev-qt/qthelp:4 dev-qt/qthelp:4[compat] dev-qt/qtopengl:4 dev-qt/qtsvg:4 media-libs/libemf media-libs/libpng:= sci-libs/alglib:= >=sci-libs/gsl-2 sci-libs/tamu_anova >=x11-libs/gl2ps-1.3.5[png] latex? ( dev-tex/qtexengine ) mono? ( dev-dotnet/libgdiplus ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/PyQt4-4.11.3[X,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) virtual/pkgconfig doc? ( >=app-text/docbook-sgml-utils-0.6.14-r1 >=app-text/docbook-xml-dtd-4.4-r2:4.4 ) python? ( >=dev-python/sip-4.16.5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Qt based clone of the Origin plotting package
-EAPI=6
-HOMEPAGE=http://soft.proindependent.com/qtiplot.html http://www.staff.science.uu.nl/~zeven101/qtiplot.html
-IUSE=bindist doc mono latex python linguas_zh_CN linguas_cs linguas_de linguas_es linguas_fr linguas_ja linguas_ro linguas_ru linguas_sv python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2 GPL-3
-RDEPEND=>=dev-cpp/muParser-1.32 >=dev-libs/boost-1.35.0:= dev-libs/quazip[qt4] dev-qt/qt3support:4 dev-qt/qtgui:4 dev-qt/qthelp:4 dev-qt/qthelp:4[compat] dev-qt/qtopengl:4 dev-qt/qtsvg:4 media-libs/libemf media-libs/libpng:= sci-libs/alglib:= >=sci-libs/gsl-2 sci-libs/tamu_anova >=x11-libs/gl2ps-1.3.5[png] latex? ( dev-tex/qtexengine ) mono? ( dev-dotnet/libgdiplus ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/PyQt4-4.11.3[X,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
-REQUIRED_USE=python? ( python_targets_python2_7 )
-RESTRICT=!bindist? ( bindist )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/qtiplot-0.9.8.9.tar.bz2 https://dev.gentoo.org/~jlec/distfiles/qtiplot-0.9.8.9-origin.patch.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0f75e4cb166fe19915cc0bd33afbd725
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 4020c1e44ffc..a0ee8d60efa5 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/baobab-3.24.0 b/metadata/md5-cache/sys-apps/baobab-3.24.0
index 1c6409148ebe..356e70e8e8a3 100644
--- a/metadata/md5-cache/sys-apps/baobab-3.24.0
+++ b/metadata/md5-cache/sys-apps/baobab-3.24.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.40:2[dbus] >=x11-libs/gtk+-3.19.1:3 app-text/yelp-tools
 DESCRIPTION=Disk usage browser for GNOME
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Baobab
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2+ FDL-1.1+
 RDEPEND=>=dev-libs/glib-2.40:2[dbus] >=x11-libs/gtk+-3.19.1:3 gnome-base/gsettings-desktop-schemas x11-themes/adwaita-icon-theme !<gnome-extra/gnome-utils-3.4
 SLOT=0
 SRC_URI=mirror://gnome/sources/baobab/3.24/baobab-3.24.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a86c3e536e5597207378e460eed71852
+_md5_=6b713db40227129ba8ad9f375dd57b12
diff --git a/metadata/md5-cache/sys-apps/gnome-disk-utility-3.24.1 b/metadata/md5-cache/sys-apps/gnome-disk-utility-3.24.1
index ba90f6841111..a1b7ed56d826 100644
--- a/metadata/md5-cache/sys-apps/gnome-disk-utility-3.24.1
+++ b/metadata/md5-cache/sys-apps/gnome-disk-utility-3.24.1
@@ -4,10 +4,10 @@ DESCRIPTION=Disk Utility for GNOME using udisks
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/gnome-disk-utility
 IUSE=fat gnome systemd
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=app-arch/xz-utils-5.0.5 >=app-crypt/libsecret-0.7 >=dev-libs/glib-2.31:2[dbus] dev-libs/libpwquality >=media-libs/libcanberra-0.1[gtk3] >=media-libs/libdvdread-4.2.0 >=sys-fs/udisks-2.1.1:2 >=x11-libs/gtk+-3.16.0:3 >=x11-libs/libnotify-0.7:= systemd? ( >=sys-apps/systemd-209:0= ) x11-themes/adwaita-icon-theme fat? ( sys-fs/dosfstools ) gnome? ( >=gnome-base/gnome-settings-daemon-3.8 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-disk-utility/3.24/gnome-disk-utility-3.24.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=193b3f67b60703a0c446215073480bad
+_md5_=ac1c9edd77c4c9a9c36240aad0d48f72
diff --git a/metadata/md5-cache/sys-apps/systemd-236-r5 b/metadata/md5-cache/sys-apps/systemd-236-r5
index 0e22e05464b4..2bf7b9f146c6 100644
--- a/metadata/md5-cache/sys-apps/systemd-236-r5
+++ b/metadata/md5-cache/sys-apps/systemd-236-r5
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd/archive/v236.tar.gz -> systemd-236.tar.gz https://dev.gentoo.org/~floppym/dist/systemd-236-patches-2.tar.gz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	meson	f8e09b2b2ac1e9bb0bd374b6ad77a90d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=2ca63c655f6c8a7aa68412f0df3f8c8b
+_md5_=67a8b7167b98120c7b9b72707b792866
diff --git a/metadata/md5-cache/sys-apps/systemd-9999 b/metadata/md5-cache/sys-apps/systemd-9999
index 151e9f0feda1..f4ae550b8c48 100644
--- a/metadata/md5-cache/sys-apps/systemd-9999
+++ b/metadata/md5-cache/sys-apps/systemd-9999
@@ -11,4 +11,4 @@ REQUIRED_USE=importd? ( curl gcrypt lzma )
 RESTRICT=!test? ( test )
 SLOT=0/2
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	meson	f8e09b2b2ac1e9bb0bd374b6ad77a90d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=204336791174552d657d47bf6c7ffb2e
+_md5_=a85a39c5bcfdba779b3c2a0202b91042
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index fc4b89b3c890..e930e5c3cca0 100644
--- a/metadata/md5-cache/sys-cluster/Manifest.gz
+++ b/metadata/md5-cache/sys-cluster/Manifest.gz
diff --git a/metadata/md5-cache/sys-cluster/openmpi-1.10.7 b/metadata/md5-cache/sys-cluster/openmpi-1.10.7
index 5c8e96e72fc2..158eda423add 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-1.10.7
+++ b/metadata/md5-cache/sys-cluster/openmpi-1.10.7
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/mpiexec >=dev-libs/libevent-2.0.21[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-1.10.0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) elibc_FreeBSD? ( dev-libs/libexecinfo ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jdk-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/mpiexec >=dev-libs/libevent-2.0.21[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-1.10.0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jdk-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=A high-performance message passing library (MPI)
 EAPI=6
 HOMEPAGE=http://www.open-mpi.org
 IUSE=cma cuda +cxx elibc_FreeBSD fortran heterogeneous ipv6 java mpi-threads numa romio threads vt openmpi_fabrics_ofed openmpi_fabrics_knem openmpi_fabrics_psm openmpi_rm_pbs openmpi_rm_slurm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_connectx-xrc openmpi_ofed_features_udcm openmpi_ofed_features_rdmacm openmpi_ofed_features_dynamic-sl openmpi_ofed_features_failover elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux
 LICENSE=BSD
-RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/mpiexec >=dev-libs/libevent-2.0.21[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-1.10.0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) elibc_FreeBSD? ( dev-libs/libexecinfo ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jre-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/mpiexec >=dev-libs/libevent-2.0.21[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-1.10.0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jre-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_connectx-xrc? ( openmpi_fabrics_ofed ) openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed ) openmpi_ofed_features_failover? ( openmpi_fabrics_ofed )
 SLOT=0
 SRC_URI=http://www.open-mpi.org/software/ompi/v1.10/downloads/openmpi-1.10.7.tar.bz2
 _eclasses_=cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=816d0a464ddb7d5176934ac428d37604
+_md5_=b157580ccda631d7e0c2735c8fd79f06
diff --git a/metadata/md5-cache/sys-cluster/openmpi-1.4.3 b/metadata/md5-cache/sys-cluster/openmpi-1.4.3
index 136ab1090db6..03b52158e636 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-1.4.3
+++ b/metadata/md5-cache/sys-cluster/openmpi-1.4.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install prepare setup test
-DEPEND=pbs? ( sys-cluster/torque ) vt? ( !dev-libs/libotf !app-text/lcdf-typetools ) elibc_FreeBSD? ( dev-libs/libexecinfo ) !sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec fortran? ( virtual/fortran )
+DEPEND=pbs? ( sys-cluster/torque ) vt? ( !dev-libs/libotf !app-text/lcdf-typetools ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) !sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec fortran? ( virtual/fortran )
 DESCRIPTION=A high-performance message passing library (MPI)
 EAPI=5
 HOMEPAGE=http://www.open-mpi.org
 IUSE=+cxx elibc_FreeBSD fortran heterogeneous ipv6 mpi-threads pbs romio threads vt
 KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=BSD
-RDEPEND=pbs? ( sys-cluster/torque ) vt? ( !dev-libs/libotf !app-text/lcdf-typetools ) elibc_FreeBSD? ( dev-libs/libexecinfo ) !sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec fortran? ( virtual/fortran )
+RDEPEND=pbs? ( sys-cluster/torque ) vt? ( !dev-libs/libotf !app-text/lcdf-typetools ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) !sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec fortran? ( virtual/fortran )
 RESTRICT=mpi-threads? ( test )
 SLOT=0
 SRC_URI=http://www.open-mpi.org/software/ompi/v1.4/downloads/openmpi-1.4.3.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=ef00ecc012cf13d085b9a0a9e819bff4
+_md5_=a46d6b73c15eadf88331c0e196e6c664
diff --git a/metadata/md5-cache/sys-cluster/openmpi-1.4.5 b/metadata/md5-cache/sys-cluster/openmpi-1.4.5
index 0b2014ef4158..9dfa90272a74 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-1.4.5
+++ b/metadata/md5-cache/sys-cluster/openmpi-1.4.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install prepare setup test
-DEPEND=pbs? ( sys-cluster/torque ) vt? ( !dev-libs/libotf !app-text/lcdf-typetools ) elibc_FreeBSD? ( dev-libs/libexecinfo ) !sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec fortran? ( virtual/fortran )
+DEPEND=pbs? ( sys-cluster/torque ) vt? ( !dev-libs/libotf !app-text/lcdf-typetools ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) !sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec fortran? ( virtual/fortran )
 DESCRIPTION=A high-performance message passing library (MPI)
 EAPI=5
 HOMEPAGE=http://www.open-mpi.org
 IUSE=+cxx elibc_FreeBSD fortran heterogeneous ipv6 mpi-threads pbs romio threads vt
 KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=BSD
-RDEPEND=pbs? ( sys-cluster/torque ) vt? ( !dev-libs/libotf !app-text/lcdf-typetools ) elibc_FreeBSD? ( dev-libs/libexecinfo ) !sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec fortran? ( virtual/fortran )
+RDEPEND=pbs? ( sys-cluster/torque ) vt? ( !dev-libs/libotf !app-text/lcdf-typetools ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) !sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec fortran? ( virtual/fortran )
 RESTRICT=mpi-threads? ( test )
 SLOT=0
 SRC_URI=http://www.open-mpi.org/software/ompi/v1.4/downloads/openmpi-1.4.5.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=7fd47725c9a1135ca519a4d227b2e1f5
+_md5_=f78e9b5813e7d0634188bcdf67756aa3
diff --git a/metadata/md5-cache/sys-cluster/openmpi-1.6.5-r1 b/metadata/md5-cache/sys-cluster/openmpi-1.6.5-r1
index 4bcfe503ef47..35171605f96c 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-1.6.5-r1
+++ b/metadata/md5-cache/sys-cluster/openmpi-1.6.5-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install prepare setup test
-DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec >=sys-apps/hwloc-1.3 dev-libs/libltdl:0 elibc_FreeBSD? ( dev-libs/libexecinfo ) openmpi_fabrics_dapl? ( sys-fabric/dapl ) openmpi_fabrics_ofed? ( sys-fabric/ofed ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_open-mx? ( sys-cluster/open-mx ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm ) openmpi_fabrics_sctp? ( net-misc/lksctp-tools ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm ) vt? ( !dev-libs/libotf !app-text/lcdf-typetools ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 fortran? ( virtual/fortran )
+DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec >=sys-apps/hwloc-1.3 dev-libs/libltdl:0 elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_dapl? ( sys-fabric/dapl ) openmpi_fabrics_ofed? ( sys-fabric/ofed ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_open-mx? ( sys-cluster/open-mx ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm ) openmpi_fabrics_sctp? ( net-misc/lksctp-tools ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm ) vt? ( !dev-libs/libotf !app-text/lcdf-typetools ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 fortran? ( virtual/fortran )
 DESCRIPTION=A high-performance message passing library (MPI)
 EAPI=5
 HOMEPAGE=http://www.open-mpi.org
 IUSE=+cxx elibc_FreeBSD fortran heterogeneous ipv6 mpi-threads romio threads vt openmpi_fabrics_dapl openmpi_fabrics_ofed openmpi_fabrics_knem openmpi_fabrics_open-mx openmpi_fabrics_psm openmpi_fabrics_sctp openmpi_rm_pbs openmpi_rm_slurm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_connectx-xrc openmpi_ofed_features_rdmacm openmpi_ofed_features_dynamic-sl openmpi_ofed_features_failover
 KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux
 LICENSE=BSD
-RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec >=sys-apps/hwloc-1.3 dev-libs/libltdl:0 elibc_FreeBSD? ( dev-libs/libexecinfo ) openmpi_fabrics_dapl? ( sys-fabric/dapl ) openmpi_fabrics_ofed? ( sys-fabric/ofed ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_open-mx? ( sys-cluster/open-mx ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm ) openmpi_fabrics_sctp? ( net-misc/lksctp-tools ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm ) vt? ( !dev-libs/libotf !app-text/lcdf-typetools ) fortran? ( virtual/fortran )
+RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec >=sys-apps/hwloc-1.3 dev-libs/libltdl:0 elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_dapl? ( sys-fabric/dapl ) openmpi_fabrics_ofed? ( sys-fabric/ofed ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_open-mx? ( sys-cluster/open-mx ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm ) openmpi_fabrics_sctp? ( net-misc/lksctp-tools ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm ) vt? ( !dev-libs/libotf !app-text/lcdf-typetools ) fortran? ( virtual/fortran )
 REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_connectx-xrc? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed ) openmpi_ofed_features_failover? ( openmpi_fabrics_ofed )
 SLOT=0
 SRC_URI=http://www.open-mpi.org/software/ompi/v1.6/downloads/openmpi-1.6.5.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=b5e2a654f19f00700eb988dd824ba1f2
+_md5_=60b24cb804c419e262aa37986365b93c
diff --git a/metadata/md5-cache/sys-cluster/openmpi-1.7.5-r1 b/metadata/md5-cache/sys-cluster/openmpi-1.7.5-r1
index 2cbcf8cd10f6..73a699bfd2c4 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-1.7.5-r1
+++ b/metadata/md5-cache/sys-cluster/openmpi-1.7.5-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install prepare setup test
-DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec dev-libs/libevent dev-libs/libltdl:0 >=sys-apps/hwloc-1.7.2 cuda? ( dev-util/nvidia-cuda-toolkit ) elibc_FreeBSD? ( dev-libs/libexecinfo ) openmpi_fabrics_ofed? ( sys-fabric/ofed ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_open-mx? ( sys-cluster/open-mx ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 fortran? ( virtual/fortran )
+DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec dev-libs/libevent dev-libs/libltdl:0 >=sys-apps/hwloc-1.7.2 cuda? ( dev-util/nvidia-cuda-toolkit ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_open-mx? ( sys-cluster/open-mx ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 fortran? ( virtual/fortran )
 DESCRIPTION=A high-performance message passing library (MPI)
 EAPI=5
 HOMEPAGE=http://www.open-mpi.org
 IUSE=cma cuda +cxx elibc_FreeBSD fortran heterogeneous ipv6 mpi-threads romio threads vt openmpi_fabrics_ofed openmpi_fabrics_knem openmpi_fabrics_open-mx openmpi_fabrics_psm openmpi_rm_pbs openmpi_rm_slurm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_connectx-xrc openmpi_ofed_features_rdmacm openmpi_ofed_features_dynamic-sl openmpi_ofed_features_failover
 KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux
 LICENSE=BSD
-RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec dev-libs/libevent dev-libs/libltdl:0 >=sys-apps/hwloc-1.7.2 cuda? ( dev-util/nvidia-cuda-toolkit ) elibc_FreeBSD? ( dev-libs/libexecinfo ) openmpi_fabrics_ofed? ( sys-fabric/ofed ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_open-mx? ( sys-cluster/open-mx ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm ) fortran? ( virtual/fortran )
+RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec dev-libs/libevent dev-libs/libltdl:0 >=sys-apps/hwloc-1.7.2 cuda? ( dev-util/nvidia-cuda-toolkit ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_open-mx? ( sys-cluster/open-mx ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm ) fortran? ( virtual/fortran )
 REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_connectx-xrc? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed ) openmpi_ofed_features_failover? ( openmpi_fabrics_ofed )
 SLOT=0
 SRC_URI=http://www.open-mpi.org/software/ompi/v1.7/downloads/openmpi-1.7.5.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=370c1fbaaf0d296a98ab10016dbdb3d6
+_md5_=bed2b4d16ad9df0e33ca1d395ea55ad7
diff --git a/metadata/md5-cache/sys-cluster/openmpi-1.8.4-r4 b/metadata/md5-cache/sys-cluster/openmpi-1.8.4-r4
index b355063a83c8..d0e7743a1aef 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-1.8.4-r4
+++ b/metadata/md5-cache/sys-cluster/openmpi-1.8.4-r4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install prepare setup test
-DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec dev-libs/libevent dev-libs/libltdl:0 >=sys-apps/hwloc-1.9.1[numa?] sys-libs/zlib cuda? ( dev-util/nvidia-cuda-toolkit ) elibc_FreeBSD? ( dev-libs/libexecinfo ) openmpi_fabrics_ofed? ( sys-fabric/ofed ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_open-mx? ( sys-cluster/open-mx ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 fortran? ( virtual/fortran )
+DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec dev-libs/libevent dev-libs/libltdl:0 >=sys-apps/hwloc-1.9.1[numa?] sys-libs/zlib cuda? ( dev-util/nvidia-cuda-toolkit ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_open-mx? ( sys-cluster/open-mx ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 fortran? ( virtual/fortran )
 DESCRIPTION=A high-performance message passing library (MPI)
 EAPI=5
 HOMEPAGE=http://www.open-mpi.org
 IUSE=cma cuda +cxx elibc_FreeBSD fortran heterogeneous ipv6 mpi-threads numa romio threads vt openmpi_fabrics_ofed openmpi_fabrics_knem openmpi_fabrics_open-mx openmpi_fabrics_psm openmpi_rm_pbs openmpi_rm_slurm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_connectx-xrc openmpi_ofed_features_udcm openmpi_ofed_features_rdmacm openmpi_ofed_features_dynamic-sl openmpi_ofed_features_failover
 KEYWORDS=alpha ~amd64 ~ia64 ppc ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux
 LICENSE=BSD
-RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec dev-libs/libevent dev-libs/libltdl:0 >=sys-apps/hwloc-1.9.1[numa?] sys-libs/zlib cuda? ( dev-util/nvidia-cuda-toolkit ) elibc_FreeBSD? ( dev-libs/libexecinfo ) openmpi_fabrics_ofed? ( sys-fabric/ofed ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_open-mx? ( sys-cluster/open-mx ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm ) fortran? ( virtual/fortran )
+RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec dev-libs/libevent dev-libs/libltdl:0 >=sys-apps/hwloc-1.9.1[numa?] sys-libs/zlib cuda? ( dev-util/nvidia-cuda-toolkit ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_open-mx? ( sys-cluster/open-mx ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm ) fortran? ( virtual/fortran )
 REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_connectx-xrc? ( openmpi_fabrics_ofed ) openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed ) openmpi_ofed_features_failover? ( openmpi_fabrics_ofed )
 SLOT=0
 SRC_URI=http://www.open-mpi.org/software/ompi/v1.8/downloads/openmpi-1.8.4.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=088000703899d79fab5817b1312959d9
+_md5_=29edc629b1ef80b724468dea873151a4
diff --git a/metadata/md5-cache/sys-cluster/openmpi-1.8.7-r1 b/metadata/md5-cache/sys-cluster/openmpi-1.8.7-r1
index d83bb9710cd1..d88369c13069 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-1.8.7-r1
+++ b/metadata/md5-cache/sys-cluster/openmpi-1.8.7-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install preinst prepare setup test
-DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec dev-libs/libevent dev-libs/libltdl:0 >=sys-apps/hwloc-1.9.1[numa?] sys-libs/zlib cuda? ( dev-util/nvidia-cuda-toolkit ) elibc_FreeBSD? ( dev-libs/libexecinfo ) openmpi_fabrics_ofed? ( sys-fabric/ofed ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_open-mx? ( sys-cluster/open-mx ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm ) java? ( >=virtual/jdk-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec dev-libs/libevent dev-libs/libltdl:0 >=sys-apps/hwloc-1.9.1[numa?] sys-libs/zlib cuda? ( dev-util/nvidia-cuda-toolkit ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_open-mx? ( sys-cluster/open-mx ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm ) java? ( >=virtual/jdk-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=A high-performance message passing library (MPI)
 EAPI=5
 HOMEPAGE=http://www.open-mpi.org
 IUSE=cma cuda +cxx elibc_FreeBSD fortran heterogeneous ipv6 java mpi-threads numa romio threads vt openmpi_fabrics_ofed openmpi_fabrics_knem openmpi_fabrics_open-mx openmpi_fabrics_psm openmpi_rm_pbs openmpi_rm_slurm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_connectx-xrc openmpi_ofed_features_udcm openmpi_ofed_features_rdmacm openmpi_ofed_features_dynamic-sl openmpi_ofed_features_failover elibc_FreeBSD java
 KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux
 LICENSE=BSD
-RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec dev-libs/libevent dev-libs/libltdl:0 >=sys-apps/hwloc-1.9.1[numa?] sys-libs/zlib cuda? ( dev-util/nvidia-cuda-toolkit ) elibc_FreeBSD? ( dev-libs/libexecinfo ) openmpi_fabrics_ofed? ( sys-fabric/ofed ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_open-mx? ( sys-cluster/open-mx ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm ) java? ( >=virtual/jre-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec dev-libs/libevent dev-libs/libltdl:0 >=sys-apps/hwloc-1.9.1[numa?] sys-libs/zlib cuda? ( dev-util/nvidia-cuda-toolkit ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_open-mx? ( sys-cluster/open-mx ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm ) java? ( >=virtual/jre-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_connectx-xrc? ( openmpi_fabrics_ofed ) openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed ) openmpi_ofed_features_failover? ( openmpi_fabrics_ofed )
 SLOT=0
 SRC_URI=http://www.open-mpi.org/software/ompi/v1.8/downloads/openmpi-1.8.7.tar.bz2
 _eclasses_=cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=7bd3c33b579dbbf4d83c9a8450da0e32
+_md5_=640a7efe17d94eaf76cc3b9a9fc987f6
diff --git a/metadata/md5-cache/sys-cluster/openmpi-1.8.8 b/metadata/md5-cache/sys-cluster/openmpi-1.8.8
index b89e16ba06b0..2e5c4da241df 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-1.8.8
+++ b/metadata/md5-cache/sys-cluster/openmpi-1.8.8
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install preinst prepare setup test
-DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec dev-libs/libevent dev-libs/libltdl:0 >=sys-apps/hwloc-1.9.1[numa?] sys-libs/zlib cuda? ( dev-util/nvidia-cuda-toolkit ) elibc_FreeBSD? ( dev-libs/libexecinfo ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_open-mx? ( sys-cluster/open-mx ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jdk-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec dev-libs/libevent dev-libs/libltdl:0 >=sys-apps/hwloc-1.9.1[numa?] sys-libs/zlib cuda? ( dev-util/nvidia-cuda-toolkit ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_open-mx? ( sys-cluster/open-mx ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jdk-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=A high-performance message passing library (MPI)
 EAPI=5
 HOMEPAGE=http://www.open-mpi.org
 IUSE=cma cuda +cxx elibc_FreeBSD fortran heterogeneous ipv6 java mpi-threads numa romio threads vt openmpi_fabrics_ofed openmpi_fabrics_knem openmpi_fabrics_open-mx openmpi_fabrics_psm openmpi_rm_pbs openmpi_rm_slurm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_connectx-xrc openmpi_ofed_features_udcm openmpi_ofed_features_rdmacm openmpi_ofed_features_dynamic-sl openmpi_ofed_features_failover elibc_FreeBSD java
 KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux
 LICENSE=BSD
-RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec dev-libs/libevent dev-libs/libltdl:0 >=sys-apps/hwloc-1.9.1[numa?] sys-libs/zlib cuda? ( dev-util/nvidia-cuda-toolkit ) elibc_FreeBSD? ( dev-libs/libexecinfo ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_open-mx? ( sys-cluster/open-mx ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jre-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec dev-libs/libevent dev-libs/libltdl:0 >=sys-apps/hwloc-1.9.1[numa?] sys-libs/zlib cuda? ( dev-util/nvidia-cuda-toolkit ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_open-mx? ( sys-cluster/open-mx ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jre-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_connectx-xrc? ( openmpi_fabrics_ofed ) openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed ) openmpi_ofed_features_failover? ( openmpi_fabrics_ofed )
 SLOT=0
 SRC_URI=http://www.open-mpi.org/software/ompi/v1.8/downloads/openmpi-1.8.8.tar.bz2
 _eclasses_=cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=f8b8823f29c4d41d50be3c277a0f1305
+_md5_=7015ea0dcd744fa8acbdb1fff55f960b
diff --git a/metadata/md5-cache/sys-cluster/openmpi-2.0.2 b/metadata/md5-cache/sys-cluster/openmpi-2.0.2
index 6bd433c39c99..924937458deb 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-2.0.2
+++ b/metadata/md5-cache/sys-cluster/openmpi-2.0.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/mpiexec >=dev-libs/libevent-2.0.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-1.11.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) elibc_FreeBSD? ( dev-libs/libexecinfo ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jdk-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/mpiexec >=dev-libs/libevent-2.0.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-1.11.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jdk-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=A high-performance message passing library (MPI)
 EAPI=6
 HOMEPAGE=http://www.open-mpi.org
 IUSE=cma cuda cxx elibc_FreeBSD fortran heterogeneous ipv6 java mpi-threads numa romio threads openmpi_fabrics_ofed openmpi_fabrics_knem openmpi_fabrics_psm openmpi_rm_pbs openmpi_rm_slurm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_connectx-xrc openmpi_ofed_features_udcm openmpi_ofed_features_rdmacm openmpi_ofed_features_dynamic-sl openmpi_ofed_features_failover elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux
 LICENSE=BSD
-RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/mpiexec >=dev-libs/libevent-2.0.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-1.11.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) elibc_FreeBSD? ( dev-libs/libexecinfo ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jre-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/mpiexec >=dev-libs/libevent-2.0.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-1.11.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jre-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_connectx-xrc? ( openmpi_fabrics_ofed ) openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed ) openmpi_ofed_features_failover? ( openmpi_fabrics_ofed )
 SLOT=0
 SRC_URI=http://www.open-mpi.org/software/ompi/v2.0/downloads/openmpi-2.0.2.tar.bz2
 _eclasses_=cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=7dcfc9365d30a626dd31fffe80f75cca
+_md5_=7b7574efbe9fb51967426339cf6ed941
diff --git a/metadata/md5-cache/sys-cluster/openmpi-2.0.4 b/metadata/md5-cache/sys-cluster/openmpi-2.0.4
index b7f0be331ec9..4d7b492f2ee4 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-2.0.4
+++ b/metadata/md5-cache/sys-cluster/openmpi-2.0.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/mpiexec >=dev-libs/libevent-2.0.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-apps/hwloc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) elibc_FreeBSD? ( dev-libs/libexecinfo ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jdk-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/mpiexec >=dev-libs/libevent-2.0.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-apps/hwloc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jdk-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=A high-performance message passing library (MPI)
 EAPI=6
 HOMEPAGE=http://www.open-mpi.org
 IUSE=cma cuda cxx elibc_FreeBSD fortran heterogeneous ipv6 java mpi-threads numa romio threads openmpi_fabrics_ofed openmpi_fabrics_knem openmpi_fabrics_psm openmpi_rm_pbs openmpi_rm_slurm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_connectx-xrc openmpi_ofed_features_udcm openmpi_ofed_features_rdmacm openmpi_ofed_features_dynamic-sl openmpi_ofed_features_failover elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux
 LICENSE=BSD
-RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/mpiexec >=dev-libs/libevent-2.0.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-apps/hwloc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) elibc_FreeBSD? ( dev-libs/libexecinfo ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jre-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/mpiexec >=dev-libs/libevent-2.0.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-apps/hwloc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jre-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_connectx-xrc? ( openmpi_fabrics_ofed ) openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed ) openmpi_ofed_features_failover? ( openmpi_fabrics_ofed )
 SLOT=0
 SRC_URI=http://www.open-mpi.org/software/ompi/v2.0/downloads/openmpi-2.0.4.tar.bz2
 _eclasses_=cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=314b8ad2a81a578f7ec33f4100bbad47
+_md5_=969c0d5907e1435d6c61eb6311a08851
diff --git a/metadata/md5-cache/sys-cluster/openmpi-2.1.2 b/metadata/md5-cache/sys-cluster/openmpi-2.1.2
index ebf8f4f28568..3697c267b0c8 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-2.1.2
+++ b/metadata/md5-cache/sys-cluster/openmpi-2.1.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/mpiexec >=dev-libs/libevent-2.0.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-1.11.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) elibc_FreeBSD? ( dev-libs/libexecinfo ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jdk-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/mpiexec >=dev-libs/libevent-2.0.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-1.11.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jdk-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=A high-performance message passing library (MPI)
 EAPI=6
 HOMEPAGE=http://www.open-mpi.org
 IUSE=cma cuda cxx elibc_FreeBSD fortran heterogeneous ipv6 java mpi-threads numa romio threads openmpi_fabrics_ofed openmpi_fabrics_knem openmpi_fabrics_psm openmpi_rm_pbs openmpi_rm_slurm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_udcm openmpi_ofed_features_rdmacm openmpi_ofed_features_dynamic-sl elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux
 LICENSE=BSD
-RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/mpiexec >=dev-libs/libevent-2.0.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-1.11.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) elibc_FreeBSD? ( dev-libs/libexecinfo ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jre-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/mpiexec >=dev-libs/libevent-2.0.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-1.11.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jre-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )
 SLOT=0
 SRC_URI=http://www.open-mpi.org/software/ompi/v2.1/downloads/openmpi-2.1.2.tar.bz2
 _eclasses_=cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=83d8f78468de22fb37d11c9a138dfecc
+_md5_=45fda1861e62daa9beb8e28f7baa9262
diff --git a/metadata/md5-cache/sys-cluster/openmpi-3.0.0 b/metadata/md5-cache/sys-cluster/openmpi-3.0.0-r1
index 28f95fa3a9b5..72e4a05d2a01 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-3.0.0
+++ b/metadata/md5-cache/sys-cluster/openmpi-3.0.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/mpiexec >=dev-libs/libevent-2.0.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-1.11.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) elibc_FreeBSD? ( dev-libs/libexecinfo ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jdk-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/mpiexec >=dev-libs/libevent-2.0.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-1.11.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jdk-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=A high-performance message passing library (MPI)
 EAPI=6
 HOMEPAGE=http://www.open-mpi.org
 IUSE=cma cuda cxx elibc_FreeBSD fortran heterogeneous ipv6 java numa romio openmpi_fabrics_ofed openmpi_fabrics_knem openmpi_fabrics_psm openmpi_rm_pbs openmpi_rm_slurm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_udcm openmpi_ofed_features_rdmacm openmpi_ofed_features_dynamic-sl elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux
 LICENSE=BSD
-RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/mpiexec >=dev-libs/libevent-2.0.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-1.11.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) elibc_FreeBSD? ( dev-libs/libexecinfo ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jre-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/mpiexec >=dev-libs/libevent-2.0.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-1.11.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jre-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )
 SLOT=0
 SRC_URI=http://www.open-mpi.org/software/ompi/v3.0/downloads/openmpi-3.0.0.tar.bz2
 _eclasses_=cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=48b43136b01811cd5abf28fe9d7de29f
+_md5_=d27d31fc1e9decd456f984d20a23390a
diff --git a/metadata/md5-cache/sys-cluster/teleport-2.2.0 b/metadata/md5-cache/sys-cluster/teleport-2.2.0
deleted file mode 100644
index f7dc6af21fa1..000000000000
--- a/metadata/md5-cache/sys-cluster/teleport-2.2.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=app-arch/zip >=dev-lang/go-1.8.3 >=dev-lang/go-1.8 virtual/pkgconfig
-DESCRIPTION=Modern SSH server for teams managing distributed infrastructure
-EAPI=6
-HOMEPAGE=https://gravitational.com/teleport
-KEYWORDS=~amd64 ~arm
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/gravitational/teleport/archive/v2.2.0.tar.gz -> teleport-2.2.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=00fc922bab704ad4b85eaf29717411ca
diff --git a/metadata/md5-cache/sys-cluster/teleport-2.2.1 b/metadata/md5-cache/sys-cluster/teleport-2.2.1
deleted file mode 100644
index 27f66b6ff8b7..000000000000
--- a/metadata/md5-cache/sys-cluster/teleport-2.2.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=app-arch/zip >=dev-lang/go-1.8.3 >=dev-lang/go-1.8 virtual/pkgconfig
-DESCRIPTION=Modern SSH server for teams managing distributed infrastructure
-EAPI=6
-HOMEPAGE=https://gravitational.com/teleport
-KEYWORDS=~amd64 ~arm
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/gravitational/teleport/archive/v2.2.1.tar.gz -> teleport-2.2.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=00fc922bab704ad4b85eaf29717411ca
diff --git a/metadata/md5-cache/sys-cluster/teleport-2.2.4 b/metadata/md5-cache/sys-cluster/teleport-2.4.0
index 46cd4dc10909..ca0bf545b8dd 100644
--- a/metadata/md5-cache/sys-cluster/teleport-2.2.4
+++ b/metadata/md5-cache/sys-cluster/teleport-2.4.0
@@ -5,8 +5,8 @@ EAPI=6
 HOMEPAGE=https://gravitational.com/teleport
 KEYWORDS=~amd64 ~arm
 LICENSE=Apache-2.0
-RESTRICT=test
+RESTRICT=test strip
 SLOT=0
-SRC_URI=https://github.com/gravitational/teleport/archive/v2.2.4.tar.gz -> teleport-2.2.4.tar.gz
+SRC_URI=https://github.com/gravitational/teleport/archive/v2.4.0.tar.gz -> teleport-2.4.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=00fc922bab704ad4b85eaf29717411ca
+_md5_=d32056e406d894c816fa7d9b637a8c8f
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index d8d65d24476c..c60f1604df6c 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/binutils-9999 b/metadata/md5-cache/sys-devel/binutils-9999
index ff4903df1a09..96c08701e978 100644
--- a/metadata/md5-cache/sys-devel/binutils-9999
+++ b/metadata/md5-cache/sys-devel/binutils-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib test? ( dev-util/dejagnu ) nls? ( sys-devel/gettext ) sys-devel/flex virtual/yacc >=app-portage/elt-patches-20170422 sys-devel/gnuconfig >=dev-vcs/git-1.8.2.1
+DEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib doc? ( sys-apps/texinfo ) test? ( dev-util/dejagnu ) nls? ( sys-devel/gettext ) sys-devel/flex virtual/yacc >=app-portage/elt-patches-20170422 sys-devel/gnuconfig >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Tools necessary to build programs
 EAPI=6
 HOMEPAGE=https://sourceware.org/binutils/
-IUSE=cxx multitarget nls static-libs test
-LICENSE=|| ( GPL-3 LGPL-3 )
+IUSE=+cxx doc multitarget +nls static-libs test
+LICENSE=GPL-3+
 RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
 SLOT=git
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=c13c3e110fc3ec07c33268eff5c80a57
+_md5_=cedbf6b9a054370c33b1f6e4a4c6e203
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index df986a311a31..bcffdac39ee8 100644
--- a/metadata/md5-cache/sys-fs/Manifest.gz
+++ b/metadata/md5-cache/sys-fs/Manifest.gz
diff --git a/metadata/md5-cache/sys-fs/btrfsmaintenance-0.4 b/metadata/md5-cache/sys-fs/btrfsmaintenance-0.4
new file mode 100644
index 000000000000..61d541ac08a5
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/btrfsmaintenance-0.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prepare prerm
+DEPEND=virtual/pkgconfig
+DESCRIPTION=Scripts for btrfs maintenance tasks like periodic scrub, balance, trim or defrag
+EAPI=6
+HOMEPAGE=https://github.com/kdave/btrfsmaintenance
+IUSE=systemd
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=systemd? ( sys-apps/systemd ) sys-fs/btrfs-progs virtual/cron
+SLOT=0
+SRC_URI=https://github.com/kdave/btrfsmaintenance/archive/v0.4.tar.gz -> btrfsmaintenance-0.4.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=f3131e75cef62bc6bf7a5995951ff1e9
diff --git a/metadata/md5-cache/sys-fs/eudev-3.2.5 b/metadata/md5-cache/sys-fs/eudev-3.2.5
index 95e837779ef7..a249347ba0b2 100644
--- a/metadata/md5-cache/sys-fs/eudev-3.2.5
+++ b/metadata/md5-cache/sys-fs/eudev-3.2.5
@@ -4,11 +4,11 @@ DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace de
 EAPI=6
 HOMEPAGE=https://github.com/gentoo/eudev
 IUSE=+hwdb +kmod introspection rule-generator selinux static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1 MIT GPL-2
 PDEPEND=>=sys-fs/udev-init-scripts-26 hwdb? ( >=sys-apps/hwids-20140304[udev] )
 RDEPEND=>=sys-apps/util-linux-2.20 introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10 !sys-fs/udev !sys-apps/systemd
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/eudev/eudev-3.2.5.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=65a2540d0e8dcde4c04038bd7c4fbc87
+_md5_=dc01472b5629f1044fef607fabf510ac
diff --git a/metadata/md5-cache/sys-fs/udev-236 b/metadata/md5-cache/sys-fs/udev-236
index 041d5314c44d..0c467ed217fd 100644
--- a/metadata/md5-cache/sys-fs/udev-236
+++ b/metadata/md5-cache/sys-fs/udev-236
@@ -4,7 +4,7 @@ DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace de
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
 IUSE=acl +kmod selinux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86
 LICENSE=LGPL-2.1 MIT GPL-2
 PDEPEND=>=sys-apps/hwids-20140304[udev] >=sys-fs/udev-init-scripts-26
 RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v236.tar.gz -> systemd-236.tar.gz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	ca370deef9d44125d829f2eb6ebc83e0	meson	f8e09b2b2ac1e9bb0bd374b6ad77a90d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=b870faadae4df55eb7fa4cbc1dd5e54c
+_md5_=bf7e6bcd37f6753319e3cb0627cdf78e
diff --git a/metadata/md5-cache/sys-fs/udev-9999 b/metadata/md5-cache/sys-fs/udev-9999
index 44a93ad36ec4..1064f3064643 100644
--- a/metadata/md5-cache/sys-fs/udev-9999
+++ b/metadata/md5-cache/sys-fs/udev-9999
@@ -10,4 +10,4 @@ RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=0
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	linux-info	ca370deef9d44125d829f2eb6ebc83e0	meson	f8e09b2b2ac1e9bb0bd374b6ad77a90d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=49d5120d481a510f86f302f39ac9ca4e
+_md5_=ffa5965624c9023e4c2b529cb967209b
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 1b81236700ef..7d450acd36ee 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.14 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.14
new file mode 100644
index 000000000000..28bcff0c151a
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.14
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.14.14
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14_p20171127.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-19.base.tar.xz mirror://gentoo/genpatches-4.14-19.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-19.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	kernel-2	7e15aacb412856eaa750db7b17a321b3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=77636441732d972615c59f17faf3bf94
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.15 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.15
new file mode 100644
index 000000000000..d7e7c96fc8bc
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.15
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.14.15
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14_p20171127.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-20.base.tar.xz mirror://gentoo/genpatches-4.14-20.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-20.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	kernel-2	7e15aacb412856eaa750db7b17a321b3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=e6834a1acbbd61da082ae34ad9e3686b
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.111-r1 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.111-r1
new file mode 100644
index 000000000000..fca4dee83408
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.111-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.4.111-r1
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20171127.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-115.base.tar.xz mirror://gentoo/genpatches-4.4-115.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-115.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	kernel-2	7e15aacb412856eaa750db7b17a321b3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=88db5891b051a7de239b5de0ce1d9806
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.112 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.112
new file mode 100644
index 000000000000..016c02943de8
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.112
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.4.112
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20171127.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-116.base.tar.xz mirror://gentoo/genpatches-4.4-116.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-116.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	kernel-2	7e15aacb412856eaa750db7b17a321b3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=4b529931b89ec9936e556399d23f00da
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.113 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.113
new file mode 100644
index 000000000000..caa26bf5cc48
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.113
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.4.113
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20171127.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-117.base.tar.xz mirror://gentoo/genpatches-4.4-117.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-117.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	kernel-2	7e15aacb412856eaa750db7b17a321b3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=599dae2419c9d4ce47d1d8ef2fac9d86
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.76-r1 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.76-r1
new file mode 100644
index 000000000000..f4a4f0c64f6d
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.76-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.9.76-r1
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20171127.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-79.base.tar.xz mirror://gentoo/genpatches-4.9-79.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-79.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	kernel-2	7e15aacb412856eaa750db7b17a321b3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=e613d81ca19d8608cf0d7aa774cb4bad
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.77 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.77
new file mode 100644
index 000000000000..f3702dba69f9
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.77
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.9.77
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20171127.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-80.base.tar.xz mirror://gentoo/genpatches-4.9-80.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-80.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	kernel-2	7e15aacb412856eaa750db7b17a321b3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=20079cd208ecfe486e32ebfd78b98009
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.78 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.78
new file mode 100644
index 000000000000..5006e3bab377
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.78
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.9.78
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20171127.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-81.base.tar.xz mirror://gentoo/genpatches-4.9-81.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-81.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	kernel-2	7e15aacb412856eaa750db7b17a321b3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=5bbcf3cea8d7f60e7e0dc9c12b5d49b5
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index ade888c1e28d..e8f1e281767c 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/uclibc-ng-1.0.28 b/metadata/md5-cache/sys-libs/uclibc-ng-1.0.28
new file mode 100644
index 000000000000..3a39afc81a8f
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/uclibc-ng-1.0.28
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DESCRIPTION=C library for developing embedded Linux systems
+EAPI=6
+HOMEPAGE=https://uclibc-ng.org/
+IUSE=debug hardened iconv ipv6 symlink-compat headers-only savedconfig
+KEYWORDS=-* ~amd64 ~arm ~mips ~ppc ~x86
+LICENSE=LGPL-2
+RDEPEND=!!sys-libs/uclibc iconv? ( dev-libs/libiconv )
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://downloads.uclibc-ng.org/releases/1.0.28/uClibc-ng-1.0.28.tar.bz2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=c2f4e18bda4f8e89bb97bf74a3014a40
diff --git a/metadata/md5-cache/sys-libs/uclibc-ng-9999 b/metadata/md5-cache/sys-libs/uclibc-ng-9999
index b6026a2ec436..911c747949b8 100644
--- a/metadata/md5-cache/sys-libs/uclibc-ng-9999
+++ b/metadata/md5-cache/sys-libs/uclibc-ng-9999
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install postinst prepare setup test unpack
 DEPEND=>=dev-vcs/git-1.8.2.1
 DESCRIPTION=C library for developing embedded Linux systems
 EAPI=6
-HOMEPAGE=http://www.uclibc-ng.org/
-IUSE=debug hardened iconv ipv6 rpc symlink-compat headers-only savedconfig
+HOMEPAGE=https://uclibc-ng.org/
+IUSE=debug hardened iconv ipv6 symlink-compat headers-only savedconfig
 LICENSE=LGPL-2
 RDEPEND=!!sys-libs/uclibc iconv? ( dev-libs/libiconv )
 RESTRICT=strip
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=26dc2c79377ff04871ad277116b4e712
+_md5_=c2f4e18bda4f8e89bb97bf74a3014a40
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index c17abbc489b3..251956c4d0b7 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/libgudev-232 b/metadata/md5-cache/virtual/libgudev-232
index 386a6af1e1bd..6f2944111eaf 100644
--- a/metadata/md5-cache/virtual/libgudev-232
+++ b/metadata/md5-cache/virtual/libgudev-232
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for libgudev providers
 EAPI=6
 IUSE=introspection static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86
 RDEPEND=>=dev-libs/libgudev-232:0/0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,introspection?,static-libs?]
 SLOT=0/0
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=e0eba33b07152b9640abf0ecb384cbfe
+_md5_=59f12f5b713c340fa20a8b440170e37f
diff --git a/metadata/md5-cache/virtual/texi2dvi-0 b/metadata/md5-cache/virtual/texi2dvi-0-r1
index d6b02dccc924..05995b5c306e 100644
--- a/metadata/md5-cache/virtual/texi2dvi-0
+++ b/metadata/md5-cache/virtual/texi2dvi-0-r1
@@ -4,4 +4,4 @@ EAPI=5
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 RDEPEND=sys-apps/texinfo virtual/latex-base || ( dev-texlive/texlive-plaingeneric >=dev-texlive/texlive-plainextra-2013 )
 SLOT=0
-_md5_=777c6756e8ba6ebebd9488cbf0957bc1
+_md5_=1b80b7cb57a8d85ffceab058ac1dd0f9
diff --git a/metadata/md5-cache/www-apache/Manifest.gz b/metadata/md5-cache/www-apache/Manifest.gz
index d7d6781ee93f..231093937eb4 100644
--- a/metadata/md5-cache/www-apache/Manifest.gz
+++ b/metadata/md5-cache/www-apache/Manifest.gz
diff --git a/metadata/md5-cache/www-apache/passenger-5.1.12 b/metadata/md5-cache/www-apache/passenger-5.1.12
index 76924b1b3db4..cb7d2fef45e2 100644
--- a/metadata/md5-cache/www-apache/passenger-5.1.12
+++ b/metadata/md5-cache/www-apache/passenger-5.1.12
@@ -4,11 +4,11 @@ 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_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rake-0.8.1[ruby_targets_ruby22] ) 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_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://s3.amazonaws.com/phusion-passenger/releases/passenger-5.1.12.tar.gz
 _eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	0917334d570e07f9743a04ff85b3bf1b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=d2a1b0924006be70241670a7f2450c38
+_md5_=fcc9168e4c286c7d0f6ae6701cb9a1d1
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 730a958fbd4b..12c2fa0e7b17 100644
--- a/metadata/md5-cache/www-apps/Manifest.gz
+++ b/metadata/md5-cache/www-apps/Manifest.gz
diff --git a/metadata/md5-cache/www-apps/rt-4.2.12-r2 b/metadata/md5-cache/www-apps/rt-4.2.12-r2
deleted file mode 100644
index e28d88d4fcdc..000000000000
--- a/metadata/md5-cache/www-apps/rt-4.2.12-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare prerm setup
-DEPEND=>=dev-lang/perl-5.10.1 >=dev-perl/Apache-Session-1.53 >=dev-perl/CGI-4 >=dev-perl/CSS-Squish-0.06 >=dev-perl/Class-Accessor-0.34 >=dev-perl/Class-ReturnValue-0.550.0-r1 >=dev-perl/DBI-1.37 >=dev-perl/Date-Extract-0.02 >=dev-perl/DateTime-Format-Natural-0.67 >=dev-perl/Devel-StackTrace-1.19 >=dev-perl/HTML-FormatText-WithLinks-0.14 >=dev-perl/HTML-Mason-1.43 >=dev-perl/HTML-Scrubber-0.08 >=dev-perl/HTTP-Server-Simple-0.34 >=dev-perl/HTTP-Server-Simple-Mason-0.14 >=dev-perl/Locale-Maketext-Lexicon-0.32 >=dev-perl/Log-Dispatch-2.410.0 >=dev-perl/MIME-tools-5.425 >=dev-perl/MailTools-1.60 >=dev-perl/Module-Versions-Report-1.05 >=dev-perl/Role-Basic-0.12 >=dev-perl/Symbol-Global-Name-0.04 >=dev-perl/Text-Quoted-2.80.0 >=dev-perl/Text-WikiFormat-0.76 >=dev-perl/Tree-Simple-1.04 >=dev-perl/XML-RSS-1.05 >=dev-perl/DBIx-SearchBuilder-1.660.0 >=virtual/perl-Digest-MD5-2.27 >=virtual/perl-Encode-2.730.0 >=virtual/perl-File-Spec-0.8 >=virtual/perl-Getopt-Long-2.24 >=virtual/perl-Locale-Maketext-1.06 >=virtual/perl-Storable-2.08 dev-perl/CGI-Emulate-PSGI dev-perl/CGI-PSGI dev-perl/Cache-Simple-TimedExpiry dev-perl/Calendar-Simple dev-perl/Convert-Color dev-perl/Crypt-Eksblowfish dev-perl/Crypt-SSLeay dev-perl/Crypt-X509 dev-perl/DBD-SQLite dev-perl/Data-GUID dev-perl/Data-ICal dev-perl/Date-Manip dev-perl/Devel-GlobalDestruction dev-perl/Email-Address dev-perl/Email-Address-List dev-perl/File-ShareDir dev-perl/File-Which dev-perl/GDGraph dev-perl/GDTextUtil dev-perl/GD[png,gif] dev-perl/GnuPG-Interface dev-perl/GraphViz dev-perl/HTML-Formatter dev-perl/HTML-FormatText-WithLinks-AndTables dev-perl/HTML-Mason-PSGIHandler dev-perl/HTML-Parser dev-perl/HTML-Quoted dev-perl/HTML-RewriteAttributes dev-perl/HTML-Tree dev-perl/IPC-Run3 dev-perl/JSON dev-perl/JavaScript-Minifier dev-perl/MIME-Types dev-perl/Module-Refresh dev-perl/Mozilla-CA dev-perl/Net-CIDR dev-perl/PerlIO-eol dev-perl/Plack dev-perl/Regexp-Common-net-CIDR dev-perl/Regexp-IPv6 dev-perl/Starlet dev-perl/String-ShellQuote dev-perl/TermReadKey dev-perl/Text-Autoformat dev-perl/Text-Password-Pronounceable dev-perl/Time-ParseDate dev-perl/TimeDate dev-perl/UNIVERSAL-require dev-perl/libwww-perl dev-perl/Locale-Maketext-Fuzzy dev-perl/Net-Server dev-perl/Regexp-Common dev-perl/Text-Template dev-perl/Text-Wrapper virtual/perl-Digest virtual/perl-File-Temp virtual/perl-Scalar-List-Utils virtual/perl-Time-HiRes virtual/perl-libnet fastcgi? ( dev-perl/FCGI dev-perl/FCGI-ProcManager ) !lighttpd? ( dev-perl/Apache-DBI !fastcgi? ( >=www-apache/mod_perl-2 ) ) lighttpd? ( dev-perl/FCGI ) mysql? ( >=dev-perl/DBD-mysql-2.1018 ) postgres? ( >=dev-perl/DBD-Pg-1.43 ) || ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=RT is an enterprise-grade ticketing system
-EAPI=5
-HOMEPAGE=http://www.bestpractical.com/rt/
-IUSE=mysql +postgres fastcgi lighttpd vhosts
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/perl-5.10.1 >=dev-perl/Apache-Session-1.53 >=dev-perl/CGI-4 >=dev-perl/CSS-Squish-0.06 >=dev-perl/Class-Accessor-0.34 >=dev-perl/Class-ReturnValue-0.550.0-r1 >=dev-perl/DBI-1.37 >=dev-perl/Date-Extract-0.02 >=dev-perl/DateTime-Format-Natural-0.67 >=dev-perl/Devel-StackTrace-1.19 >=dev-perl/HTML-FormatText-WithLinks-0.14 >=dev-perl/HTML-Mason-1.43 >=dev-perl/HTML-Scrubber-0.08 >=dev-perl/HTTP-Server-Simple-0.34 >=dev-perl/HTTP-Server-Simple-Mason-0.14 >=dev-perl/Locale-Maketext-Lexicon-0.32 >=dev-perl/Log-Dispatch-2.410.0 >=dev-perl/MIME-tools-5.425 >=dev-perl/MailTools-1.60 >=dev-perl/Module-Versions-Report-1.05 >=dev-perl/Role-Basic-0.12 >=dev-perl/Symbol-Global-Name-0.04 >=dev-perl/Text-Quoted-2.80.0 >=dev-perl/Text-WikiFormat-0.76 >=dev-perl/Tree-Simple-1.04 >=dev-perl/XML-RSS-1.05 >=dev-perl/DBIx-SearchBuilder-1.660.0 >=virtual/perl-Digest-MD5-2.27 >=virtual/perl-Encode-2.730.0 >=virtual/perl-File-Spec-0.8 >=virtual/perl-Getopt-Long-2.24 >=virtual/perl-Locale-Maketext-1.06 >=virtual/perl-Storable-2.08 dev-perl/CGI-Emulate-PSGI dev-perl/CGI-PSGI dev-perl/Cache-Simple-TimedExpiry dev-perl/Calendar-Simple dev-perl/Convert-Color dev-perl/Crypt-Eksblowfish dev-perl/Crypt-SSLeay dev-perl/Crypt-X509 dev-perl/DBD-SQLite dev-perl/Data-GUID dev-perl/Data-ICal dev-perl/Date-Manip dev-perl/Devel-GlobalDestruction dev-perl/Email-Address dev-perl/Email-Address-List dev-perl/File-ShareDir dev-perl/File-Which dev-perl/GDGraph dev-perl/GDTextUtil dev-perl/GD[png,gif] dev-perl/GnuPG-Interface dev-perl/GraphViz dev-perl/HTML-Formatter dev-perl/HTML-FormatText-WithLinks-AndTables dev-perl/HTML-Mason-PSGIHandler dev-perl/HTML-Parser dev-perl/HTML-Quoted dev-perl/HTML-RewriteAttributes dev-perl/HTML-Tree dev-perl/IPC-Run3 dev-perl/JSON dev-perl/JavaScript-Minifier dev-perl/MIME-Types dev-perl/Module-Refresh dev-perl/Mozilla-CA dev-perl/Net-CIDR dev-perl/PerlIO-eol dev-perl/Plack dev-perl/Regexp-Common-net-CIDR dev-perl/Regexp-IPv6 dev-perl/Starlet dev-perl/String-ShellQuote dev-perl/TermReadKey dev-perl/Text-Autoformat dev-perl/Text-Password-Pronounceable dev-perl/Time-ParseDate dev-perl/TimeDate dev-perl/UNIVERSAL-require dev-perl/libwww-perl dev-perl/Locale-Maketext-Fuzzy dev-perl/Net-Server dev-perl/Regexp-Common dev-perl/Text-Template dev-perl/Text-Wrapper virtual/perl-Digest virtual/perl-File-Temp virtual/perl-Scalar-List-Utils virtual/perl-Time-HiRes virtual/perl-libnet fastcgi? ( dev-perl/FCGI dev-perl/FCGI-ProcManager ) !lighttpd? ( dev-perl/Apache-DBI !fastcgi? ( >=www-apache/mod_perl-2 ) ) lighttpd? ( dev-perl/FCGI ) mysql? ( >=dev-perl/DBD-mysql-2.1018 ) postgres? ( >=dev-perl/DBD-Pg-1.43 ) virtual/mta !lighttpd? ( =www-servers/apache-2* ) lighttpd? ( >=www-servers/lighttpd-1.3.13 sys-apps/openrc ) >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=^^ ( mysql postgres )
-RESTRICT=test
-SLOT=4.2.12-r2
-SRC_URI=http://download.bestpractical.com/pub/rt/release/rt-4.2.12.tar.gz
-_eclasses_=depend.apache	0917334d570e07f9743a04ff85b3bf1b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=2e3e8804abcff8ba8c265e4d130338c0
diff --git a/metadata/md5-cache/www-apps/rt-4.4.1-r1 b/metadata/md5-cache/www-apps/rt-4.4.1-r1
deleted file mode 100644
index 52a165d3dfa9..000000000000
--- a/metadata/md5-cache/www-apps/rt-4.4.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare prerm setup
-DEPEND=>=dev-lang/perl-5.10.1 >=dev-perl/Apache-Session-1.53 >=dev-perl/CGI-4 >=dev-perl/CSS-Squish-0.06 >=dev-perl/Class-Accessor-0.34 >=dev-perl/Class-ReturnValue-0.550.0-r1 >=dev-perl/DBI-1.37 >=dev-perl/Date-Extract-0.02 >=dev-perl/DateTime-Format-Natural-0.67 >=dev-perl/Devel-StackTrace-1.19 >=dev-perl/HTML-FormatText-WithLinks-0.14 >=dev-perl/HTML-Mason-1.43 >=dev-perl/HTML-Scrubber-0.08 >=dev-perl/HTTP-Server-Simple-0.34 >=dev-perl/HTTP-Server-Simple-Mason-0.14 >=dev-perl/Locale-Maketext-Lexicon-0.32 >=dev-perl/Log-Dispatch-2.410.0 >=dev-perl/MIME-tools-5.425 >=dev-perl/MailTools-1.60 >=dev-perl/Module-Versions-Report-1.05 >=dev-perl/Role-Basic-0.12 >=dev-perl/Symbol-Global-Name-0.04 >=dev-perl/Text-Quoted-2.80.0 >=dev-perl/Text-WikiFormat-0.76 >=dev-perl/Tree-Simple-1.04 >=dev-perl/XML-RSS-1.05 >=dev-perl/DBIx-SearchBuilder-1.660.0 >=virtual/perl-Digest-MD5-2.27 >=virtual/perl-Encode-2.730.0 >=virtual/perl-File-Spec-0.8 >=virtual/perl-Getopt-Long-2.24 >=virtual/perl-Locale-Maketext-1.06 >=virtual/perl-Storable-2.08 dev-perl/Business-Hours dev-perl/CGI-Emulate-PSGI dev-perl/CGI-PSGI dev-perl/Cache-Simple-TimedExpiry dev-perl/Calendar-Simple dev-perl/Convert-Color dev-perl/Crypt-Eksblowfish dev-perl/Crypt-SSLeay dev-perl/Crypt-X509 dev-perl/CSS-Minifier-XS dev-perl/Data-Page-Pageset dev-perl/DBD-SQLite dev-perl/Data-GUID dev-perl/Data-ICal dev-perl/Date-Manip dev-perl/Devel-GlobalDestruction dev-perl/Email-Address dev-perl/Email-Address-List dev-perl/File-ShareDir dev-perl/File-Which dev-perl/GDGraph dev-perl/GDTextUtil dev-perl/GD[png,gif] dev-perl/GnuPG-Interface dev-perl/GraphViz dev-perl/HTML-Formatter dev-perl/HTML-FormatText-WithLinks-AndTables dev-perl/HTML-Mason-PSGIHandler dev-perl/HTML-Parser dev-perl/HTML-Quoted dev-perl/HTML-RewriteAttributes dev-perl/HTML-Tree dev-perl/IPC-Run3 dev-perl/JSON dev-perl/JavaScript-Minifier-XS dev-perl/MIME-Types dev-perl/Module-Refresh dev-perl/Mozilla-CA dev-perl/Net-CIDR dev-perl/PerlIO-eol dev-perl/Plack dev-perl/Regexp-Common-net-CIDR dev-perl/Regexp-IPv6 dev-perl/Scope-Upper dev-perl/Starlet dev-perl/String-ShellQuote dev-perl/TermReadKey dev-perl/Text-Autoformat dev-perl/Text-Password-Pronounceable dev-perl/Time-ParseDate dev-perl/TimeDate dev-perl/UNIVERSAL-require dev-perl/libwww-perl dev-perl/Locale-Maketext-Fuzzy dev-perl/Net-IP dev-perl/Net-Server dev-perl/Regexp-Common dev-perl/Text-Template dev-perl/Text-Wrapper virtual/perl-Digest virtual/perl-File-Temp virtual/perl-Scalar-List-Utils virtual/perl-Time-HiRes virtual/perl-libnet fastcgi? ( dev-perl/FCGI dev-perl/FCGI-ProcManager ) !lighttpd? ( dev-perl/Apache-DBI !fastcgi? ( >=www-apache/mod_perl-2 ) ) lighttpd? ( dev-perl/FCGI ) mysql? ( >=dev-perl/DBD-mysql-2.1018 ) postgres? ( >=dev-perl/DBD-Pg-1.43 ) || ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=RT is an enterprise-grade ticketing system
-EAPI=5
-HOMEPAGE=http://www.bestpractical.com/rt/
-IUSE=mysql +postgres fastcgi lighttpd vhosts
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/perl-5.10.1 >=dev-perl/Apache-Session-1.53 >=dev-perl/CGI-4 >=dev-perl/CSS-Squish-0.06 >=dev-perl/Class-Accessor-0.34 >=dev-perl/Class-ReturnValue-0.550.0-r1 >=dev-perl/DBI-1.37 >=dev-perl/Date-Extract-0.02 >=dev-perl/DateTime-Format-Natural-0.67 >=dev-perl/Devel-StackTrace-1.19 >=dev-perl/HTML-FormatText-WithLinks-0.14 >=dev-perl/HTML-Mason-1.43 >=dev-perl/HTML-Scrubber-0.08 >=dev-perl/HTTP-Server-Simple-0.34 >=dev-perl/HTTP-Server-Simple-Mason-0.14 >=dev-perl/Locale-Maketext-Lexicon-0.32 >=dev-perl/Log-Dispatch-2.410.0 >=dev-perl/MIME-tools-5.425 >=dev-perl/MailTools-1.60 >=dev-perl/Module-Versions-Report-1.05 >=dev-perl/Role-Basic-0.12 >=dev-perl/Symbol-Global-Name-0.04 >=dev-perl/Text-Quoted-2.80.0 >=dev-perl/Text-WikiFormat-0.76 >=dev-perl/Tree-Simple-1.04 >=dev-perl/XML-RSS-1.05 >=dev-perl/DBIx-SearchBuilder-1.660.0 >=virtual/perl-Digest-MD5-2.27 >=virtual/perl-Encode-2.730.0 >=virtual/perl-File-Spec-0.8 >=virtual/perl-Getopt-Long-2.24 >=virtual/perl-Locale-Maketext-1.06 >=virtual/perl-Storable-2.08 dev-perl/Business-Hours dev-perl/CGI-Emulate-PSGI dev-perl/CGI-PSGI dev-perl/Cache-Simple-TimedExpiry dev-perl/Calendar-Simple dev-perl/Convert-Color dev-perl/Crypt-Eksblowfish dev-perl/Crypt-SSLeay dev-perl/Crypt-X509 dev-perl/CSS-Minifier-XS dev-perl/Data-Page-Pageset dev-perl/DBD-SQLite dev-perl/Data-GUID dev-perl/Data-ICal dev-perl/Date-Manip dev-perl/Devel-GlobalDestruction dev-perl/Email-Address dev-perl/Email-Address-List dev-perl/File-ShareDir dev-perl/File-Which dev-perl/GDGraph dev-perl/GDTextUtil dev-perl/GD[png,gif] dev-perl/GnuPG-Interface dev-perl/GraphViz dev-perl/HTML-Formatter dev-perl/HTML-FormatText-WithLinks-AndTables dev-perl/HTML-Mason-PSGIHandler dev-perl/HTML-Parser dev-perl/HTML-Quoted dev-perl/HTML-RewriteAttributes dev-perl/HTML-Tree dev-perl/IPC-Run3 dev-perl/JSON dev-perl/JavaScript-Minifier-XS dev-perl/MIME-Types dev-perl/Module-Refresh dev-perl/Mozilla-CA dev-perl/Net-CIDR dev-perl/PerlIO-eol dev-perl/Plack dev-perl/Regexp-Common-net-CIDR dev-perl/Regexp-IPv6 dev-perl/Scope-Upper dev-perl/Starlet dev-perl/String-ShellQuote dev-perl/TermReadKey dev-perl/Text-Autoformat dev-perl/Text-Password-Pronounceable dev-perl/Time-ParseDate dev-perl/TimeDate dev-perl/UNIVERSAL-require dev-perl/libwww-perl dev-perl/Locale-Maketext-Fuzzy dev-perl/Net-IP dev-perl/Net-Server dev-perl/Regexp-Common dev-perl/Text-Template dev-perl/Text-Wrapper virtual/perl-Digest virtual/perl-File-Temp virtual/perl-Scalar-List-Utils virtual/perl-Time-HiRes virtual/perl-libnet fastcgi? ( dev-perl/FCGI dev-perl/FCGI-ProcManager ) !lighttpd? ( dev-perl/Apache-DBI !fastcgi? ( >=www-apache/mod_perl-2 ) ) lighttpd? ( dev-perl/FCGI ) mysql? ( >=dev-perl/DBD-mysql-2.1018 ) postgres? ( >=dev-perl/DBD-Pg-1.43 ) virtual/mta !lighttpd? ( =www-servers/apache-2* ) lighttpd? ( >=www-servers/lighttpd-1.3.13 sys-apps/openrc ) >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=^^ ( mysql postgres )
-RESTRICT=test
-SLOT=4.4.1-r1
-SRC_URI=http://download.bestpractical.com/pub/rt/release/rt-4.4.1.tar.gz
-_eclasses_=depend.apache	0917334d570e07f9743a04ff85b3bf1b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=c52b2fc148d4b01b45f2909296c8b838
diff --git a/metadata/md5-cache/www-apps/rt-4.4.2 b/metadata/md5-cache/www-apps/rt-4.4.2
new file mode 100644
index 000000000000..f8de15c296a4
--- /dev/null
+++ b/metadata/md5-cache/www-apps/rt-4.4.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare prerm setup
+DEPEND=>=dev-lang/perl-5.10.1 >=dev-perl/Apache-Session-1.53 >=dev-perl/CGI-4 >=dev-perl/CSS-Squish-0.06 >=dev-perl/Class-Accessor-0.34 >=dev-perl/Class-ReturnValue-0.550.0-r1 >=dev-perl/DBI-1.37 >=dev-perl/Date-Extract-0.02 >=dev-perl/DateTime-Format-Natural-0.67 >=dev-perl/Devel-StackTrace-1.19 >=dev-perl/Email-Address-1.908.0 >=dev-perl/HTML-FormatText-WithLinks-0.14 >=dev-perl/HTML-Mason-1.43 >=dev-perl/HTML-Scrubber-0.08 >=dev-perl/HTTP-Server-Simple-0.34 >=dev-perl/HTTP-Server-Simple-Mason-0.14 >=dev-perl/Locale-Maketext-Lexicon-0.32 >=dev-perl/Log-Dispatch-2.410.0 >=dev-perl/MIME-tools-5.425 >=dev-perl/MailTools-1.60 >=dev-perl/Module-Versions-Report-1.05 >=dev-perl/Role-Basic-0.12 >=dev-perl/Symbol-Global-Name-0.04 >=dev-perl/Text-Quoted-2.80.0 >=dev-perl/Text-WikiFormat-0.76 >=dev-perl/Tree-Simple-1.04 >=dev-perl/XML-RSS-1.05 >=dev-perl/DBIx-SearchBuilder-1.660.0 >=virtual/perl-Digest-MD5-2.27 >=virtual/perl-Encode-2.730.0 >=virtual/perl-File-Spec-0.8 >=virtual/perl-Getopt-Long-2.24 >=virtual/perl-Locale-Maketext-1.06 >=virtual/perl-Storable-2.08 dev-perl/Business-Hours dev-perl/CGI-Emulate-PSGI dev-perl/CGI-PSGI dev-perl/Cache-Simple-TimedExpiry dev-perl/Calendar-Simple dev-perl/Convert-Color dev-perl/Crypt-Eksblowfish dev-perl/Crypt-SSLeay dev-perl/Crypt-X509 dev-perl/CSS-Minifier-XS dev-perl/Data-Page-Pageset dev-perl/DBD-SQLite dev-perl/Data-GUID dev-perl/Data-ICal dev-perl/Date-Manip dev-perl/Devel-GlobalDestruction dev-perl/Email-Address-List dev-perl/File-ShareDir dev-perl/File-Which dev-perl/GDGraph dev-perl/GDTextUtil dev-perl/GD[png,gif] dev-perl/GnuPG-Interface dev-perl/GraphViz dev-perl/HTML-Formatter dev-perl/HTML-FormatText-WithLinks-AndTables dev-perl/HTML-Mason-PSGIHandler dev-perl/HTML-Parser dev-perl/HTML-Quoted dev-perl/HTML-RewriteAttributes dev-perl/HTML-Tree dev-perl/IPC-Run3 dev-perl/JSON dev-perl/JavaScript-Minifier-XS dev-perl/MIME-Types dev-perl/Module-Refresh dev-perl/Mozilla-CA dev-perl/Net-CIDR dev-perl/PerlIO-eol dev-perl/Plack dev-perl/Regexp-Common-net-CIDR dev-perl/Regexp-IPv6 dev-perl/Scope-Upper dev-perl/Starlet dev-perl/String-ShellQuote dev-perl/TermReadKey dev-perl/Text-Autoformat dev-perl/Text-Password-Pronounceable dev-perl/Time-ParseDate dev-perl/TimeDate dev-perl/UNIVERSAL-require dev-perl/libwww-perl dev-perl/Locale-Maketext-Fuzzy dev-perl/Net-IP dev-perl/Net-Server dev-perl/Regexp-Common dev-perl/Text-Template dev-perl/Text-Wrapper virtual/perl-Digest virtual/perl-File-Temp virtual/perl-Scalar-List-Utils virtual/perl-Time-HiRes virtual/perl-libnet fastcgi? ( dev-perl/FCGI dev-perl/FCGI-ProcManager ) !lighttpd? ( dev-perl/Apache-DBI !fastcgi? ( >=www-apache/mod_perl-2 ) ) lighttpd? ( dev-perl/FCGI ) mysql? ( >=dev-perl/DBD-mysql-2.1018 ) postgres? ( >=dev-perl/DBD-Pg-1.43 ) || ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=RT is an enterprise-grade ticketing system
+EAPI=5
+HOMEPAGE=http://www.bestpractical.com/rt/
+IUSE=mysql +postgres fastcgi lighttpd vhosts
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/perl-5.10.1 >=dev-perl/Apache-Session-1.53 >=dev-perl/CGI-4 >=dev-perl/CSS-Squish-0.06 >=dev-perl/Class-Accessor-0.34 >=dev-perl/Class-ReturnValue-0.550.0-r1 >=dev-perl/DBI-1.37 >=dev-perl/Date-Extract-0.02 >=dev-perl/DateTime-Format-Natural-0.67 >=dev-perl/Devel-StackTrace-1.19 >=dev-perl/Email-Address-1.908.0 >=dev-perl/HTML-FormatText-WithLinks-0.14 >=dev-perl/HTML-Mason-1.43 >=dev-perl/HTML-Scrubber-0.08 >=dev-perl/HTTP-Server-Simple-0.34 >=dev-perl/HTTP-Server-Simple-Mason-0.14 >=dev-perl/Locale-Maketext-Lexicon-0.32 >=dev-perl/Log-Dispatch-2.410.0 >=dev-perl/MIME-tools-5.425 >=dev-perl/MailTools-1.60 >=dev-perl/Module-Versions-Report-1.05 >=dev-perl/Role-Basic-0.12 >=dev-perl/Symbol-Global-Name-0.04 >=dev-perl/Text-Quoted-2.80.0 >=dev-perl/Text-WikiFormat-0.76 >=dev-perl/Tree-Simple-1.04 >=dev-perl/XML-RSS-1.05 >=dev-perl/DBIx-SearchBuilder-1.660.0 >=virtual/perl-Digest-MD5-2.27 >=virtual/perl-Encode-2.730.0 >=virtual/perl-File-Spec-0.8 >=virtual/perl-Getopt-Long-2.24 >=virtual/perl-Locale-Maketext-1.06 >=virtual/perl-Storable-2.08 dev-perl/Business-Hours dev-perl/CGI-Emulate-PSGI dev-perl/CGI-PSGI dev-perl/Cache-Simple-TimedExpiry dev-perl/Calendar-Simple dev-perl/Convert-Color dev-perl/Crypt-Eksblowfish dev-perl/Crypt-SSLeay dev-perl/Crypt-X509 dev-perl/CSS-Minifier-XS dev-perl/Data-Page-Pageset dev-perl/DBD-SQLite dev-perl/Data-GUID dev-perl/Data-ICal dev-perl/Date-Manip dev-perl/Devel-GlobalDestruction dev-perl/Email-Address-List dev-perl/File-ShareDir dev-perl/File-Which dev-perl/GDGraph dev-perl/GDTextUtil dev-perl/GD[png,gif] dev-perl/GnuPG-Interface dev-perl/GraphViz dev-perl/HTML-Formatter dev-perl/HTML-FormatText-WithLinks-AndTables dev-perl/HTML-Mason-PSGIHandler dev-perl/HTML-Parser dev-perl/HTML-Quoted dev-perl/HTML-RewriteAttributes dev-perl/HTML-Tree dev-perl/IPC-Run3 dev-perl/JSON dev-perl/JavaScript-Minifier-XS dev-perl/MIME-Types dev-perl/Module-Refresh dev-perl/Mozilla-CA dev-perl/Net-CIDR dev-perl/PerlIO-eol dev-perl/Plack dev-perl/Regexp-Common-net-CIDR dev-perl/Regexp-IPv6 dev-perl/Scope-Upper dev-perl/Starlet dev-perl/String-ShellQuote dev-perl/TermReadKey dev-perl/Text-Autoformat dev-perl/Text-Password-Pronounceable dev-perl/Time-ParseDate dev-perl/TimeDate dev-perl/UNIVERSAL-require dev-perl/libwww-perl dev-perl/Locale-Maketext-Fuzzy dev-perl/Net-IP dev-perl/Net-Server dev-perl/Regexp-Common dev-perl/Text-Template dev-perl/Text-Wrapper virtual/perl-Digest virtual/perl-File-Temp virtual/perl-Scalar-List-Utils virtual/perl-Time-HiRes virtual/perl-libnet fastcgi? ( dev-perl/FCGI dev-perl/FCGI-ProcManager ) !lighttpd? ( dev-perl/Apache-DBI !fastcgi? ( >=www-apache/mod_perl-2 ) ) lighttpd? ( dev-perl/FCGI ) mysql? ( >=dev-perl/DBD-mysql-2.1018 ) postgres? ( >=dev-perl/DBD-Pg-1.43 ) virtual/mta !lighttpd? ( =www-servers/apache-2* ) lighttpd? ( >=www-servers/lighttpd-1.3.13 sys-apps/openrc ) >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=^^ ( mysql postgres )
+RESTRICT=test
+SLOT=4.4.2
+SRC_URI=http://download.bestpractical.com/pub/rt/release/rt-4.4.2.tar.gz
+_eclasses_=depend.apache	0917334d570e07f9743a04ff85b3bf1b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	webapp	a76ebd3cb5649737496e8238992dd7ca
+_md5_=12e5fa056d3564332d2e46b2e4f171a2
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 6347d1437928..aabec31a7a72 100644
--- a/metadata/md5-cache/www-client/Manifest.gz
+++ b/metadata/md5-cache/www-client/Manifest.gz
diff --git a/metadata/md5-cache/www-client/epiphany-3.24.5 b/metadata/md5-cache/www-client/epiphany-3.24.5
index ba549c9770b1..c734b50d821d 100644
--- a/metadata/md5-cache/www-client/epiphany-3.24.5
+++ b/metadata/md5-cache/www-client/epiphany-3.24.5
@@ -4,10 +4,10 @@ DESCRIPTION=GNOME webbrowser based on Webkit
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Web
 IUSE=test test
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.46.0:2[dbus] >=x11-libs/gtk+-3.22.13:3 >=net-libs/webkit-gtk-2.15.90:4= >=x11-libs/cairo-1.2 >=app-crypt/gcr-3.5.5:=[gtk] >=x11-libs/gdk-pixbuf-2.36.5:2 >=gnome-base/gnome-desktop-2.91.2:3= dev-libs/icu:= >=x11-libs/libnotify-0.5.1:= >=app-crypt/libsecret-0.14 >=net-libs/libsoup-2.48:2.4 >=dev-libs/libxml2-2.6.12:2 >=dev-libs/libxslt-1.1.7 dev-db/sqlite:3 >=app-text/iso-codes-0.35 >=gnome-base/gsettings-desktop-schemas-0.0.1 x11-themes/adwaita-icon-theme !www-client/epiphany-extensions
 SLOT=0
 SRC_URI=mirror://gnome/sources/epiphany/3.24/epiphany-3.24.5.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5c4380f1b7e058c421de503e3592a5ff
+_md5_=4eedccd56f65d765ca49a8c081dcd452
diff --git a/metadata/md5-cache/www-client/firefox-52.6.0 b/metadata/md5-cache/www-client/firefox-52.6.0
index 4a0f48e9694e..1dbbade0f66a 100644
--- a/metadata/md5-cache/www-client/firefox-52.6.0
+++ b/metadata/md5-cache/www-client/firefox-52.6.0
@@ -4,11 +4,11 @@ DESCRIPTION=Firefox Web Browser
 EAPI=6
 HOMEPAGE=http://www.mozilla.com/firefox
 IUSE=bindist eme-free +gmp-autoupdate hardened hwaccel jack pgo rust selinux test custom-cflags custom-optimization dbus debug +jemalloc neon pulseaudio selinux startup-notification system-cairo system-harfbuzz system-icu system-jpeg system-libevent system-sqlite system-libvpx gtk2 wifi pgo l10n_ach l10n_af l10n_an l10n_ar l10n_as l10n_ast l10n_az l10n_bg l10n_bn-BD l10n_bn-IN l10n_br l10n_bs l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-GB l10n_en-ZA l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mai l10n_mk l10n_ml l10n_mr l10n_ms l10n_nb l10n_nl l10n_nn l10n_or l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=MPL-2.0 GPL-2 LGPL-2.1
 RDEPEND=jack? ( virtual/jack ) >=dev-libs/nss-3.28.3 >=dev-libs/nspr-4.13.1 selinux? ( sec-policy/selinux-mozilla ) >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.25:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-58.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.17.0:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.3.3:0= >=media-gfx/graphite2-1.3.8 ) !gtk2? ( >=x11-libs/gtk+-3.4.0:3 ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/ach.xpi -> firefox-52.6.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/af.xpi -> firefox-52.6.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/an.xpi -> firefox-52.6.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/ar.xpi -> firefox-52.6.0esr-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/as.xpi -> firefox-52.6.0esr-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/ast.xpi -> firefox-52.6.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/az.xpi -> firefox-52.6.0esr-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/bg.xpi -> firefox-52.6.0esr-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/bn-BD.xpi -> firefox-52.6.0esr-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/bn-IN.xpi -> firefox-52.6.0esr-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/br.xpi -> firefox-52.6.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/bs.xpi -> firefox-52.6.0esr-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/ca.xpi -> firefox-52.6.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/cak.xpi -> firefox-52.6.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/cs.xpi -> firefox-52.6.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/cy.xpi -> firefox-52.6.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/da.xpi -> firefox-52.6.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/de.xpi -> firefox-52.6.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/dsb.xpi -> firefox-52.6.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/el.xpi -> firefox-52.6.0esr-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/en-GB.xpi -> firefox-52.6.0esr-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/en-ZA.xpi -> firefox-52.6.0esr-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/eo.xpi -> firefox-52.6.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/es-AR.xpi -> firefox-52.6.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/es-CL.xpi -> firefox-52.6.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/es-ES.xpi -> firefox-52.6.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/es-MX.xpi -> firefox-52.6.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/et.xpi -> firefox-52.6.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/eu.xpi -> firefox-52.6.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/fa.xpi -> firefox-52.6.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/ff.xpi -> firefox-52.6.0esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/fi.xpi -> firefox-52.6.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/fr.xpi -> firefox-52.6.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/fy-NL.xpi -> firefox-52.6.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/ga-IE.xpi -> firefox-52.6.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/gd.xpi -> firefox-52.6.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/gl.xpi -> firefox-52.6.0esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/gn.xpi -> firefox-52.6.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/gu-IN.xpi -> firefox-52.6.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/he.xpi -> firefox-52.6.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/hi-IN.xpi -> firefox-52.6.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/hr.xpi -> firefox-52.6.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/hsb.xpi -> firefox-52.6.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/hu.xpi -> firefox-52.6.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/hy-AM.xpi -> firefox-52.6.0esr-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/id.xpi -> firefox-52.6.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/is.xpi -> firefox-52.6.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/it.xpi -> firefox-52.6.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/ja.xpi -> firefox-52.6.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/ka.xpi -> firefox-52.6.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/kab.xpi -> firefox-52.6.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/kk.xpi -> firefox-52.6.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/km.xpi -> firefox-52.6.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/kn.xpi -> firefox-52.6.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/ko.xpi -> firefox-52.6.0esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/lij.xpi -> firefox-52.6.0esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/lt.xpi -> firefox-52.6.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/lv.xpi -> firefox-52.6.0esr-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/mai.xpi -> firefox-52.6.0esr-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/mk.xpi -> firefox-52.6.0esr-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/ml.xpi -> firefox-52.6.0esr-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/mr.xpi -> firefox-52.6.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/ms.xpi -> firefox-52.6.0esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/nb-NO.xpi -> firefox-52.6.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/nl.xpi -> firefox-52.6.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/nn-NO.xpi -> firefox-52.6.0esr-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/or.xpi -> firefox-52.6.0esr-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/pa-IN.xpi -> firefox-52.6.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/pl.xpi -> firefox-52.6.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/pt-BR.xpi -> firefox-52.6.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/pt-PT.xpi -> firefox-52.6.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/rm.xpi -> firefox-52.6.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/ro.xpi -> firefox-52.6.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/ru.xpi -> firefox-52.6.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/si.xpi -> firefox-52.6.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/sk.xpi -> firefox-52.6.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/sl.xpi -> firefox-52.6.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/son.xpi -> firefox-52.6.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/sq.xpi -> firefox-52.6.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/sr.xpi -> firefox-52.6.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/sv-SE.xpi -> firefox-52.6.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/ta.xpi -> firefox-52.6.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/te.xpi -> firefox-52.6.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/th.xpi -> firefox-52.6.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/tr.xpi -> firefox-52.6.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/uk.xpi -> firefox-52.6.0esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/uz.xpi -> firefox-52.6.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/vi.xpi -> firefox-52.6.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/xh.xpi -> firefox-52.6.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/zh-CN.xpi -> firefox-52.6.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/zh-TW.xpi -> firefox-52.6.0esr-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/source/firefox-52.6.0esr.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-52.5-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-52.5-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-52.5-patches-02.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozconfig-v6.52	aeba761913d03fc45f4d6ae2b89165ca	mozcoreconf-v5	dfc58397c1e9ecd4420428e695cf8dc8	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2c3881f08689029e09bdc23dbba2ad88
+_md5_=01aab0e14b3fa27f88c7d8ef3dd74bde
diff --git a/metadata/md5-cache/www-client/google-chrome-63.0.3239.132 b/metadata/md5-cache/www-client/google-chrome-64.0.3282.119
index ad9ecf60dc14..835d0b2db1f3 100644
--- a/metadata/md5-cache/www-client/google-chrome-63.0.3239.132
+++ b/metadata/md5-cache/www-client/google-chrome-64.0.3282.119
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.google.com/chrome
 IUSE=+plugins +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
 KEYWORDS=-* amd64
 LICENSE=google-chrome
-RDEPEND=app-arch/bzip2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-misc/xdg-utils
+RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-misc/xdg-utils
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_63.0.3239.132-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_64.0.3282.119-1_amd64.deb
 _eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6b3fa1b0706af6e24c40a6977e18e391
+_md5_=d510fb3268b2d7e61ce9b58396b9fbfe
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-64.0.3282.99 b/metadata/md5-cache/www-client/google-chrome-beta-64.0.3282.119
index 9fa25d4786e1..59435bc1179e 100644
--- a/metadata/md5-cache/www-client/google-chrome-beta-64.0.3282.99
+++ b/metadata/md5-cache/www-client/google-chrome-beta-64.0.3282.119
@@ -9,6 +9,6 @@ LICENSE=google-chrome
 RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-misc/xdg-utils
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_64.0.3282.99-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_64.0.3282.119-1_amd64.deb
 _eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7383cd3d2d1fb2ee1a8519f2fecf0517
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-65.0.3322.3 b/metadata/md5-cache/www-client/google-chrome-unstable-65.0.3325.18
index bc31f77f599b..9c89104924ce 100644
--- a/metadata/md5-cache/www-client/google-chrome-unstable-65.0.3322.3
+++ b/metadata/md5-cache/www-client/google-chrome-unstable-65.0.3325.18
@@ -9,6 +9,6 @@ LICENSE=google-chrome
 RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-misc/xdg-utils
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_65.0.3322.3-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_65.0.3325.18-1_amd64.deb
 _eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e8be15f36495a908aec4766ff2b29883
diff --git a/metadata/md5-cache/www-misc/Manifest.gz b/metadata/md5-cache/www-misc/Manifest.gz
index 798d0a016914..6fc62f9edb26 100644
--- a/metadata/md5-cache/www-misc/Manifest.gz
+++ b/metadata/md5-cache/www-misc/Manifest.gz
diff --git a/metadata/md5-cache/www-misc/monitorix-3.10.0 b/metadata/md5-cache/www-misc/monitorix-3.10.0
new file mode 100644
index 000000000000..14cf1d52a680
--- /dev/null
+++ b/metadata/md5-cache/www-misc/monitorix-3.10.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare setup
+DEPEND=virtual/pkgconfig
+DESCRIPTION=A lightweight system monitoring tool
+EAPI=6
+HOMEPAGE=http://www.monitorix.org/
+IUSE=apcupsd hddtemp httpd lm_sensors postfix
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-perl/Config-General dev-perl/DBI dev-perl/HTTP-Server-Simple dev-perl/IO-Socket-SSL dev-perl/libwww-perl dev-perl/MIME-Lite dev-perl/XML-Simple net-analyzer/rrdtool[graph,perl] dev-perl/CGI apcupsd? ( sys-power/apcupsd ) hddtemp? ( app-admin/hddtemp ) httpd? ( virtual/httpd-cgi ) lm_sensors? ( sys-apps/lm_sensors ) postfix? ( net-mail/pflogsumm dev-perl/MailTools )
+SLOT=0
+SRC_URI=https://github.com/mikaku/Monitorix/archive/v3.10.0.tar.gz -> monitorix-3.10.0.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=1566332946ed6c91080b3f70dfb0c1ba
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index bfc52f122c33..acfbd4c2a1f9 100644
--- a/metadata/md5-cache/www-plugins/Manifest.gz
+++ b/metadata/md5-cache/www-plugins/Manifest.gz
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-63.0.3239.132 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-64.0.3282.119
index c85b8cd4cf8b..a61fe70075d4 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-63.0.3239.132
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-64.0.3282.119
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=widevine? ( !<www-client/chromium-57[widevine(-)] ) !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:unstable
 RESTRICT=bindist mirror strip
 SLOT=stable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_63.0.3239.132-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_64.0.3282.119-1_amd64.deb
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
 _md5_=1d7d85b29380275bca17735b05c995a4
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-64.0.3282.99_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-64.0.3282.119_beta
index 74e9997380aa..468cff0c3c7d 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-64.0.3282.99_beta
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-64.0.3282.119_beta
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=widevine? ( !<www-client/chromium-57[widevine(-)] ) !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:stable !www-plugins/chrome-binary-plugins:unstable
 RESTRICT=bindist mirror strip
 SLOT=beta
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_64.0.3282.99-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_64.0.3282.119-1_amd64.deb
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
 _md5_=961944dc038e342d0f63b365c993ebb1
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-65.0.3322.3_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-65.0.3325.18_alpha
index f0f0daef7404..bf06090a3816 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-65.0.3322.3_alpha
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-65.0.3325.18_alpha
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=widevine? ( !<www-client/chromium-57[widevine(-)] ) !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:stable
 RESTRICT=bindist mirror strip
 SLOT=unstable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_65.0.3322.3-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_65.0.3325.18-1_amd64.deb
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
 _md5_=961944dc038e342d0f63b365c993ebb1
diff --git a/metadata/md5-cache/x11-apps/Manifest.gz b/metadata/md5-cache/x11-apps/Manifest.gz
index 96892cea77bb..cfd13aeed401 100644
--- a/metadata/md5-cache/x11-apps/Manifest.gz
+++ b/metadata/md5-cache/x11-apps/Manifest.gz
diff --git a/metadata/md5-cache/x11-apps/fusion-icon-0.1-r4 b/metadata/md5-cache/x11-apps/fusion-icon-0.1-r4
deleted file mode 100644
index 0169e9b89bf9..000000000000
--- a/metadata/md5-cache/x11-apps/fusion-icon-0.1-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=dev-python/compizconfig-python-0.6.0 >=x11-wm/compiz-0.6.0 x11-apps/xvinfo gtk? ( >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) qt4? ( dev-python/PyQt4[X,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sys-apps/sed-4
-DESCRIPTION=Compiz Fusion Tray Icon and Manager
-EAPI=5
-HOMEPAGE=http://compiz.org
-IUSE=+gtk qt4 python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-python/compizconfig-python-0.6.0 >=x11-wm/compiz-0.6.0 x11-apps/xvinfo gtk? ( >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) qt4? ( dev-python/PyQt4[X,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( gtk qt4 ) || ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://gentoo/fusion-icon-0.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b4f7aa01cb73bc54a44a203066b95d45
diff --git a/metadata/md5-cache/x11-apps/fusion-icon-0.2.4 b/metadata/md5-cache/x11-apps/fusion-icon-0.2.4
deleted file mode 100644
index 8cd3dff009f0..000000000000
--- a/metadata/md5-cache/x11-apps/fusion-icon-0.2.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-python/compizconfig-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-apps/xvinfo x11-wm/compiz gtk? ( dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sys-apps/sed-4
-DESCRIPTION=Compiz Fusion Tray Icon and Manager
-EAPI=6
-HOMEPAGE=http://compiz.org
-IUSE=+gtk qt5 python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=dev-python/compizconfig-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-apps/xvinfo x11-wm/compiz gtk? ( dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( gtk qt5 ) || ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/compiz-reloaded/fusion-icon/releases/download/v0.2.4/fusion-icon-0.2.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fd8d7a819de4daffc4eb4ea304851c1b
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 51bbb65e5cd7..d7e6eda38f24 100644
--- a/metadata/md5-cache/x11-libs/Manifest.gz
+++ b/metadata/md5-cache/x11-libs/Manifest.gz
diff --git a/metadata/md5-cache/x11-libs/compiz-bcop-0.8.8 b/metadata/md5-cache/x11-libs/compiz-bcop-0.8.8
deleted file mode 100644
index f80dcaff4c6c..000000000000
--- a/metadata/md5-cache/x11-libs/compiz-bcop-0.8.8
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=dev-libs/libxslt virtual/pkgconfig
-DESCRIPTION=Compiz Option code Generator
-EAPI=4
-HOMEPAGE=http://www.compiz.org/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libxslt
-SLOT=0
-SRC_URI=http://releases.compiz.org/0.8.8/compiz-bcop-0.8.8.tar.bz2
-_md5_=fe0f4a1fcc195445c0136bf5a81e6487
diff --git a/metadata/md5-cache/x11-libs/compizconfig-backend-gconf-0.8.8 b/metadata/md5-cache/x11-libs/compizconfig-backend-gconf-0.8.8
deleted file mode 100644
index 916b4b63ad77..000000000000
--- a/metadata/md5-cache/x11-libs/compizconfig-backend-gconf-0.8.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=gnome-base/gconf-2.0:2 >=x11-libs/libcompizconfig-0.8.8 >=x11-wm/compiz-0.8.8
-DESCRIPTION=Compizconfig Gconf Backend
-EAPI=4
-HOMEPAGE=http://www.compiz.org/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=gnome-base/gconf-2.0:2 >=x11-libs/libcompizconfig-0.8.8 >=x11-wm/compiz-0.8.8
-SLOT=0
-SRC_URI=http://releases.compiz.org/0.8.8/compizconfig-backend-gconf-0.8.8.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=4deabce941799b6cd9330ae6866edcc0
diff --git a/metadata/md5-cache/x11-libs/gtksourceview-3.24.6 b/metadata/md5-cache/x11-libs/gtksourceview-3.24.6
index cf51d9158e83..5587c8ff3dd1 100644
--- a/metadata/md5-cache/x11-libs/gtksourceview-3.24.6
+++ b/metadata/md5-cache/x11-libs/gtksourceview-3.24.6
@@ -4,11 +4,11 @@ DESCRIPTION=A text widget implementing syntax highlighting and other features
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/GtkSourceView
 IUSE=glade +introspection vala test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.48:2 >=dev-libs/libxml2-2.6:2 >=x11-libs/gtk+-3.20:3[introspection?] glade? ( >=dev-util/glade-3.9:3.10 ) introspection? ( >=dev-libs/gobject-introspection-1.42:= )
 REQUIRED_USE=vala? ( introspection )
 SLOT=3.0/3
 SRC_URI=mirror://gnome/sources/gtksourceview/3.24/gtksourceview-3.24.6.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d272f8558324a492dc9feb0dbab84460
+_md5_=eba830219035a1839ee54f697957ef8d
diff --git a/metadata/md5-cache/x11-libs/libcompizconfig-0.8.8-r1 b/metadata/md5-cache/x11-libs/libcompizconfig-0.8.8-r1
deleted file mode 100644
index eb07446d3074..000000000000
--- a/metadata/md5-cache/x11-libs/libcompizconfig-0.8.8-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-libs/libxml2 dev-libs/protobuf >=x11-wm/compiz-0.8.8 x11-libs/libX11 >=dev-util/intltool-0.41 virtual/pkgconfig x11-proto/xproto
-DESCRIPTION=Compiz Configuration System
-EAPI=6
-HOMEPAGE=http://www.compiz.org/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libxml2 dev-libs/protobuf >=x11-wm/compiz-0.8.8 x11-libs/libX11
-RESTRICT=test
-SLOT=0
-SRC_URI=http://releases.compiz.org/0.8.8/libcompizconfig-0.8.8.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=37e87e1737e85e3559e6ce7c1e978020
diff --git a/metadata/md5-cache/x11-libs/libwnck-3.24.1 b/metadata/md5-cache/x11-libs/libwnck-3.24.1
index 39140ebe2819..9e229e956f1d 100644
--- a/metadata/md5-cache/x11-libs/libwnck-3.24.1
+++ b/metadata/md5-cache/x11-libs/libwnck-3.24.1
@@ -4,10 +4,10 @@ DESCRIPTION=A window navigation construction kit
 EAPI=6
 HOMEPAGE=https://developer.gnome.org/libwnck/stable/
 IUSE=+introspection startup-notification tools
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=x11-libs/cairo[X] >=x11-libs/gtk+-3.22:3[introspection?] >=dev-libs/glib-2.32:2 x11-libs/libX11 x11-libs/libXres x11-libs/libXext introspection? ( >=dev-libs/gobject-introspection-0.6.14:= ) startup-notification? ( >=x11-libs/startup-notification-0.4 )
 SLOT=3
 SRC_URI=mirror://gnome/sources/libwnck/3.24/libwnck-3.24.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=91ecf95eb584ffcbe52206ecab783ecd
+_md5_=a1b9489b8fec4db8718e34a22ed5db81
diff --git a/metadata/md5-cache/x11-libs/pango-1.40.14 b/metadata/md5-cache/x11-libs/pango-1.40.14
index f8283a5d4747..1aed77bd8de5 100644
--- a/metadata/md5-cache/x11-libs/pango-1.40.14
+++ b/metadata/md5-cache/x11-libs/pango-1.40.14
@@ -4,10 +4,10 @@ DESCRIPTION=Internationalized text layout and rendering library
 EAPI=6
 HOMEPAGE=http://www.pango.org/
 IUSE=X +introspection test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+ FTL
 RDEPEND=>=media-libs/harfbuzz-1.2.3:=[glib(+),truetype(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/fontconfig-2.10.92:1.0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.12.14-r4:=[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) X? ( >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=mirror://gnome/sources/pango/1.40/pango-1.40.14.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2ebb74efdb2e69323f9006fb3cc1d687
+_md5_=de00e76575dc967b3bf200af44a56434
diff --git a/metadata/md5-cache/x11-libs/vte-0.48.4 b/metadata/md5-cache/x11-libs/vte-0.48.4
index 120a83fe5c38..f9e1310ed6d6 100644
--- a/metadata/md5-cache/x11-libs/vte-0.48.4
+++ b/metadata/md5-cache/x11-libs/vte-0.48.4
@@ -4,11 +4,11 @@ DESCRIPTION=Library providing a virtual terminal emulator widget
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/action/show/Apps/Terminal/VTE
 IUSE=+crypt debug glade +introspection vala vanilla
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.40:2 >=dev-libs/libpcre2-10.21 >=x11-libs/gtk+-3.16:3[introspection?] >=x11-libs/pango-1.22.0 sys-libs/ncurses:0= sys-libs/zlib crypt? ( >=net-libs/gnutls-3.2.7:0= ) glade? ( >=dev-util/glade-3.9:3.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.0:= ) !x11-libs/vte:2.90[glade]
 REQUIRED_USE=vala? ( introspection )
 SLOT=2.91
 SRC_URI=mirror://gnome/sources/vte/0.48/vte-0.48.4.tar.xz !vanilla? ( https://dev.gentoo.org/~eva/distfiles/vte/vte-0.48.4-command-notify.patch.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c63269785db8ce9fad61af3af939a570
+_md5_=f262b4f86f9f265d8f8f58e50aab028d
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index f0e46018692b..44f634fef23b 100644
--- a/metadata/md5-cache/x11-misc/Manifest.gz
+++ b/metadata/md5-cache/x11-misc/Manifest.gz
diff --git a/metadata/md5-cache/x11-misc/albert-0.14.15 b/metadata/md5-cache/x11-misc/albert-0.14.15
new file mode 100644
index 000000000000..ed27442580e5
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/albert-0.14.15
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-cpp/muParser dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
+DESCRIPTION=Desktop agnostic launcher
+EAPI=6
+HOMEPAGE=https://albertlauncher.github.io/
+IUSE=debug
+KEYWORDS=~amd64
+LICENSE=GPL-3+
+RDEPEND=dev-cpp/muParser dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11
+SLOT=0
+SRC_URI=https://github.com/albertlauncher/albert/archive/v0.14.15.tar.gz -> albert-0.14.15.tar.gz https://github.com/albertlauncher/plugins/archive/caa38cfa1ba6289ee2fc4913ea70d49fd761244e.tar.gz -> albert-0.14.15-plugins.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9a9e5e71b8e74132d76d1729c3c8d1a1
diff --git a/metadata/md5-cache/x11-misc/ccsm-0.8.4-r5 b/metadata/md5-cache/x11-misc/ccsm-0.8.4-r5
deleted file mode 100644
index 930d843e310a..000000000000
--- a/metadata/md5-cache/x11-misc/ccsm-0.8.4-r5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Compizconfig Settings Manager
-EAPI=5
-HOMEPAGE=http://www.compiz.org/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-python/compizconfig-python-0.8.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pygtk-2.12:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] gnome-base/librsvg python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://releases.compiz.org/0.8.4/ccsm-0.8.4.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5c51d98338211ea741dbd417c7b3157a
diff --git a/metadata/md5-cache/x11-misc/simple-ccsm-0.8.4-r2 b/metadata/md5-cache/x11-misc/simple-ccsm-0.8.4-r2
deleted file mode 100644
index 53e0f38d812e..000000000000
--- a/metadata/md5-cache/x11-misc/simple-ccsm-0.8.4-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-util/intltool virtual/pkgconfig python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sys-apps/sed-4
-DESCRIPTION=Simplified Compizconfig Settings Manager
-EAPI=5
-HOMEPAGE=http://www.compiz.org/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-python/compizconfig-python-0.8.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=x11-misc/ccsm-0.8.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://releases.compiz.org/0.8.4/simple-ccsm-0.8.4.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=97119c9c463e715d21143bc40ab4b1fe
diff --git a/metadata/md5-cache/x11-plugins/Manifest.gz b/metadata/md5-cache/x11-plugins/Manifest.gz
index d0d5cb94dbc0..18b9ad733e06 100644
--- a/metadata/md5-cache/x11-plugins/Manifest.gz
+++ b/metadata/md5-cache/x11-plugins/Manifest.gz
diff --git a/metadata/md5-cache/x11-plugins/compiz-plugins-extra-0.8.8 b/metadata/md5-cache/x11-plugins/compiz-plugins-extra-0.8.8
deleted file mode 100644
index 3ce7b7db87d4..000000000000
--- a/metadata/md5-cache/x11-plugins/compiz-plugins-extra-0.8.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst prepare
-DEPEND=>=gnome-base/librsvg-2.14.0:2 virtual/jpeg:0 >=x11-libs/compiz-bcop-0.8.8 >=x11-plugins/compiz-plugins-main-0.8.8 >=x11-wm/compiz-0.8.8[gconf?] libnotify? ( x11-libs/libnotify ) >=dev-util/intltool-0.35 virtual/pkgconfig >=sys-devel/gettext-0.15 x11-libs/cairo gconf? ( gnome-base/gconf:2 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
-DESCRIPTION=Compiz Fusion Window Decorator Extra Plugins
-EAPI=4
-HOMEPAGE=http://www.compiz.org/
-IUSE=gconf libnotify
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=gnome-base/librsvg-2.14.0:2 virtual/jpeg:0 >=x11-libs/compiz-bcop-0.8.8 >=x11-plugins/compiz-plugins-main-0.8.8 >=x11-wm/compiz-0.8.8[gconf?] libnotify? ( x11-libs/libnotify )
-SLOT=0
-SRC_URI=http://releases.compiz.org/0.8.8/compiz-plugins-extra-0.8.8.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=76270bf50676c1ad086099b0877b9ea2
diff --git a/metadata/md5-cache/x11-plugins/compiz-plugins-main-0.8.8 b/metadata/md5-cache/x11-plugins/compiz-plugins-main-0.8.8
deleted file mode 100644
index 7644ea070800..000000000000
--- a/metadata/md5-cache/x11-plugins/compiz-plugins-main-0.8.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst prepare
-DEPEND=>=gnome-base/librsvg-2.14.0:2 x11-libs/cairo >=x11-libs/compiz-bcop-0.8.8 >=x11-wm/compiz-0.8.8[gconf?] virtual/jpeg:0 virtual/glu >=dev-util/intltool-0.35 virtual/pkgconfig >=sys-devel/gettext-0.15 gconf? ( gnome-base/gconf:2 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
-DESCRIPTION=Compiz Fusion Window Decorator Plugins
-EAPI=4
-HOMEPAGE=http://www.compiz.org/
-IUSE=gconf
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=gnome-base/librsvg-2.14.0:2 x11-libs/cairo >=x11-libs/compiz-bcop-0.8.8 >=x11-wm/compiz-0.8.8[gconf?] virtual/jpeg:0 virtual/glu
-SLOT=0
-SRC_URI=http://releases.compiz.org/0.8.8/compiz-plugins-main-0.8.8.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d9353c8f985e6686fc7b386b7eb0abba
diff --git a/metadata/md5-cache/x11-plugins/compiz-plugins-unsupported-0.8.8 b/metadata/md5-cache/x11-plugins/compiz-plugins-unsupported-0.8.8
deleted file mode 100644
index c69f912877f8..000000000000
--- a/metadata/md5-cache/x11-plugins/compiz-plugins-unsupported-0.8.8
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=>=gnome-base/librsvg-2.14.0:2 virtual/jpeg:0 >=x11-libs/compiz-bcop-0.8.8 >=x11-plugins/compiz-plugins-main-0.8.8 >=x11-wm/compiz-0.8.8 >=dev-util/intltool-0.35 virtual/pkgconfig >=sys-devel/gettext-0.15 x11-libs/cairo
-DESCRIPTION=Compiz Fusion Window Decorator Unsupported Plugins
-EAPI=6
-HOMEPAGE=http://www.compiz.org/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=gnome-base/librsvg-2.14.0:2 virtual/jpeg:0 >=x11-libs/compiz-bcop-0.8.8 >=x11-plugins/compiz-plugins-main-0.8.8 >=x11-wm/compiz-0.8.8
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~pinkbyte/distfiles/compiz-plugins-unsupported-0.8.8.tar.bz2
-_md5_=923bfafd20bf27c5b29e8660e842433d
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 4de8b01fbedf..306ac282b96f 100644
--- a/metadata/md5-cache/x11-terms/Manifest.gz
+++ b/metadata/md5-cache/x11-terms/Manifest.gz
diff --git a/metadata/md5-cache/x11-terms/gnome-terminal-3.24.2 b/metadata/md5-cache/x11-terms/gnome-terminal-3.24.2
index e903676fc751..201180c300eb 100644
--- a/metadata/md5-cache/x11-terms/gnome-terminal-3.24.2
+++ b/metadata/md5-cache/x11-terms/gnome-terminal-3.24.2
@@ -4,10 +4,10 @@ DESCRIPTION=The Gnome Terminal
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Terminal/
 IUSE=debug +gnome-shell +nautilus vanilla
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.42:2 >=x11-libs/gtk+-3.20:3 >=x11-libs/vte-0.48.3:2.91[!vanilla?] >=dev-libs/libpcre2-10 >=gnome-base/dconf-0.14 >=gnome-base/gsettings-desktop-schemas-0.1.0 sys-apps/util-linux gnome-shell? ( gnome-base/gnome-shell ) nautilus? ( >=gnome-base/nautilus-3 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-terminal/3.24/gnome-terminal-3.24.2.tar.xz !vanilla? ( https://dev.gentoo.org/~leio/distfiles/gnome-terminal-notify-open-title-transparency.patch.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1de227143321939cb80d7db7001d13e9
+_md5_=204f6d0b78e6fb191c2a8af5453c9a47
diff --git a/metadata/md5-cache/x11-terms/terminology-1.0.0 b/metadata/md5-cache/x11-terms/terminology-1.0.0
index ce9893ffca3d..9b57c2e2842a 100644
--- a/metadata/md5-cache/x11-terms/terminology-1.0.0
+++ b/metadata/md5-cache/x11-terms/terminology-1.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/efl-1.18 nls? ( sys-devel/gettext )
 SLOT=0
 SRC_URI=https://download.enlightenment.org/rel/apps/terminology/terminology-1.0.0.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	enlightenment	ac1fc335a7f44c04309a9f4aae403165	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	enlightenment	1fa177784657aaf9484e91d7427a2b2e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=acfb9e2ce515cb0329e0a2f4ecd35fda
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index bcc35e192c39..573c0c558177 100644
--- a/metadata/md5-cache/x11-themes/Manifest.gz
+++ b/metadata/md5-cache/x11-themes/Manifest.gz
diff --git a/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.24.0 b/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.24.0
index 853717b022cc..c737fcc62325 100644
--- a/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.24.0
+++ b/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.24.0
@@ -4,11 +4,11 @@ DESCRIPTION=GNOME default icon theme
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/adwaita-icon-theme/
 IUSE=branding
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-3 CC-BY-SA-3.0 ) branding? ( CC-BY-SA-4.0 )
 RDEPEND=>=x11-themes/hicolor-icon-theme-0.10 gnome-base/librsvg:2 !<x11-themes/gnome-themes-standard-3.14
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gnome/sources/adwaita-icon-theme/3.24/adwaita-icon-theme-3.24.0.tar.xz branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b695df81bda726cfa1ec3ce640970e80
+_md5_=5df508858626bb01c5a074d758b25eeb
diff --git a/metadata/md5-cache/x11-themes/emerald-themes-0.5.2 b/metadata/md5-cache/x11-themes/emerald-themes-0.5.2
deleted file mode 100644
index 179944f41715..000000000000
--- a/metadata/md5-cache/x11-themes/emerald-themes-0.5.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=x11-wm/emerald
-DESCRIPTION=Emerald window decorator themes
-EAPI=4
-HOMEPAGE=http://compiz.org
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://cgit.compiz.org/fusion/decorators/0.5.2/snapshot/emerald-themes-0.5.2.tar.bz2
-_md5_=a26c7cd17270c54cadebb0fb1809acf1
diff --git a/metadata/md5-cache/x11-themes/gnome-backgrounds-3.24.0 b/metadata/md5-cache/x11-themes/gnome-backgrounds-3.24.0
index 053f4cb2b61a..3a1319a70255 100644
--- a/metadata/md5-cache/x11-themes/gnome-backgrounds-3.24.0
+++ b/metadata/md5-cache/x11-themes/gnome-backgrounds-3.24.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-util/intltool-0.40.0 sys-devel/gettext >=app-portage/elt-patches-20
 DESCRIPTION=A set of backgrounds packaged with the GNOME desktop
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/gnome-backgrounds
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=!<x11-themes/gnome-themes-standard-3.14
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-backgrounds/3.24/gnome-backgrounds-3.24.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d09d8a3ceffbe0214dff2875f1ebc25d
+_md5_=6556810cbae0f85a4a6cb4d77fdf8d0c
diff --git a/metadata/md5-cache/x11-themes/silver-xcursors-0.4 b/metadata/md5-cache/x11-themes/silver-xcursors-0.4
index 250d001b0dda..0dd40318c7c4 100644
--- a/metadata/md5-cache/x11-themes/silver-xcursors-0.4
+++ b/metadata/md5-cache/x11-themes/silver-xcursors-0.4
@@ -1,9 +1,10 @@
 DEFINED_PHASES=install postinst
 DESCRIPTION=A high quality set of Xfree 4.3.0 animated mouse cursors
-EAPI=0
+EAPI=6
 HOMEPAGE=http://www.kde-look.org/content/show.php?content=5533
 KEYWORDS=alpha amd64 hppa ia64 ~mips ppc sparc x86 ~x86-fbsd
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://www.kde-look.org/CONTENT/content-files/5533-Silver-XCursors-3D-0.4.tar.bz2
-_md5_=88894a6ac41ef6ab9046797df1674800
+_eclasses_=readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986
+_md5_=9910df1ae0fd8d97f6ac117071a87efb
diff --git a/metadata/md5-cache/x11-themes/silver-xcursors-0.4-r1 b/metadata/md5-cache/x11-themes/silver-xcursors-0.4-r1
index c6c60389d86e..627bdf613357 100644
--- a/metadata/md5-cache/x11-themes/silver-xcursors-0.4-r1
+++ b/metadata/md5-cache/x11-themes/silver-xcursors-0.4-r1
@@ -6,4 +6,4 @@ KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://www.kde-look.org/CONTENT/content-files/5533-Silver-XCursors-3D-0.4.tar.bz2
-_md5_=d3820192122075704fa617edd60d2dd7
+_md5_=2e846910ff27c94b9822c2b73e075e88
diff --git a/metadata/md5-cache/x11-themes/zuki-themes-3.24.3 b/metadata/md5-cache/x11-themes/zuki-themes-3.24.3
index 0d451007a32e..d34320800886 100644
--- a/metadata/md5-cache/x11-themes/zuki-themes-3.24.3
+++ b/metadata/md5-cache/x11-themes/zuki-themes-3.24.3
@@ -3,10 +3,10 @@ DESCRIPTION=Zuki themes for GTK, gnome-shell and more
 EAPI=6
 HOMEPAGE=https://github.com/lassekongo83/zuki-themes
 IUSE=gnome-shell mate xfce
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=>=x11-themes/gnome-themes-standard-3.6 >=x11-themes/gtk-engines-murrine-0.98.1.1 gnome-shell? ( media-fonts/roboto ) !<x11-themes/zukitwo-2016.08.08 !<x11-themes/zukitwo-shell-2016.08.08
 SLOT=0
 SRC_URI=https://github.com/lassekongo83/zuki-themes/archive/v3.24-3.tar.gz -> zuki-themes-3.24.3.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=a9b0429e29a45d42dfd0850ad66491d7
+_md5_=8c044704d49a79b49e3eb6e589955b79
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index 70ee676b50fe..5d8bbaec6689 100644
--- a/metadata/md5-cache/x11-wm/Manifest.gz
+++ b/metadata/md5-cache/x11-wm/Manifest.gz
diff --git a/metadata/md5-cache/x11-wm/awesome-3.5.6-r2 b/metadata/md5-cache/x11-wm/awesome-3.5.6-r2
index b4c3a5c4054e..9591a5beff96 100644
--- a/metadata/md5-cache/x11-wm/awesome-3.5.6-r2
+++ b/metadata/md5-cache/x11-wm/awesome-3.5.6-r2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-lang/lua-5.1:0 dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 >=dev-lua/lgi-0.7 x11-libs/cairo[xcb] x11-libs/gdk-pixbuf:2 >=x11-libs/libxcb-1.6 >=x11-libs/pango-1.19.3[introspection] >=x11-libs/startup-notification-0.10_p20110426 >=x11-libs/xcb-util-0.3.8 x11-libs/xcb-util-cursor x11-libs/libXcursor >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) elibc_FreeBSD? ( dev-libs/libexecinfo ) >=app-text/asciidoc-8.4.5 app-text/xmlto dev-util/gperf virtual/pkgconfig media-gfx/imagemagick[png] >=x11-proto/xcb-proto-1.5 >=x11-proto/xproto-7.0.15 doc? ( app-doc/doxygen media-gfx/graphviz ) sys-devel/make >=dev-util/cmake-3.7.2
+DEPEND=>=dev-lang/lua-5.1:0 dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 >=dev-lua/lgi-0.7 x11-libs/cairo[xcb] x11-libs/gdk-pixbuf:2 >=x11-libs/libxcb-1.6 >=x11-libs/pango-1.19.3[introspection] >=x11-libs/startup-notification-0.10_p20110426 >=x11-libs/xcb-util-0.3.8 x11-libs/xcb-util-cursor x11-libs/libXcursor >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) >=app-text/asciidoc-8.4.5 app-text/xmlto dev-util/gperf virtual/pkgconfig media-gfx/imagemagick[png] >=x11-proto/xcb-proto-1.5 >=x11-proto/xproto-7.0.15 doc? ( app-doc/doxygen media-gfx/graphviz ) sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=A dynamic floating and tiling window manager
 EAPI=5
 HOMEPAGE=http://awesome.naquadah.org/
 IUSE=dbus doc elibc_FreeBSD gnome
 KEYWORDS=amd64 arm ppc ppc64 x86 ~x86-fbsd
 LICENSE=GPL-2
-RDEPEND=>=dev-lang/lua-5.1:0 dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 >=dev-lua/lgi-0.7 x11-libs/cairo[xcb] x11-libs/gdk-pixbuf:2 >=x11-libs/libxcb-1.6 >=x11-libs/pango-1.19.3[introspection] >=x11-libs/startup-notification-0.10_p20110426 >=x11-libs/xcb-util-0.3.8 x11-libs/xcb-util-cursor x11-libs/libXcursor >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) elibc_FreeBSD? ( dev-libs/libexecinfo )
+RDEPEND=>=dev-lang/lua-5.1:0 dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 >=dev-lua/lgi-0.7 x11-libs/cairo[xcb] x11-libs/gdk-pixbuf:2 >=x11-libs/libxcb-1.6 >=x11-libs/pango-1.19.3[introspection] >=x11-libs/startup-notification-0.10_p20110426 >=x11-libs/xcb-util-0.3.8 x11-libs/xcb-util-cursor x11-libs/libXcursor >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 SLOT=0
 SRC_URI=http://awesome.naquadah.org/download/awesome-3.5.6.tar.xz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9a5bf3d9dd99fc8ce9d8d54c27237e0a
+_md5_=3386d8d2e07094a380e708874a7318aa
diff --git a/metadata/md5-cache/x11-wm/awesome-3.5.7 b/metadata/md5-cache/x11-wm/awesome-3.5.7
index bcd0b0f8b652..b6a143a95510 100644
--- a/metadata/md5-cache/x11-wm/awesome-3.5.7
+++ b/metadata/md5-cache/x11-wm/awesome-3.5.7
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-lang/lua-5.1:0 dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 >=dev-lua/lgi-0.7 x11-libs/cairo[xcb] x11-libs/gdk-pixbuf:2 >=x11-libs/libxcb-1.6 >=x11-libs/pango-1.19.3[introspection] >=x11-libs/startup-notification-0.10_p20110426 >=x11-libs/xcb-util-0.3.8 x11-libs/xcb-util-cursor x11-libs/libXcursor >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) elibc_FreeBSD? ( dev-libs/libexecinfo ) >=app-text/asciidoc-8.4.5 app-text/xmlto dev-util/gperf virtual/pkgconfig media-gfx/imagemagick[png] >=x11-proto/xcb-proto-1.5 >=x11-proto/xproto-7.0.15 doc? ( app-doc/doxygen media-gfx/graphviz ) sys-devel/make >=dev-util/cmake-3.7.2
+DEPEND=>=dev-lang/lua-5.1:0 dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 >=dev-lua/lgi-0.7 x11-libs/cairo[xcb] x11-libs/gdk-pixbuf:2 >=x11-libs/libxcb-1.6 >=x11-libs/pango-1.19.3[introspection] >=x11-libs/startup-notification-0.10_p20110426 >=x11-libs/xcb-util-0.3.8 x11-libs/xcb-util-cursor x11-libs/libXcursor >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) >=app-text/asciidoc-8.4.5 app-text/xmlto dev-util/gperf virtual/pkgconfig media-gfx/imagemagick[png] >=x11-proto/xcb-proto-1.5 >=x11-proto/xproto-7.0.15 doc? ( app-doc/doxygen media-gfx/graphviz ) sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=A dynamic floating and tiling window manager
 EAPI=5
 HOMEPAGE=http://awesome.naquadah.org/
 IUSE=dbus doc elibc_FreeBSD gnome
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd
 LICENSE=GPL-2
-RDEPEND=>=dev-lang/lua-5.1:0 dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 >=dev-lua/lgi-0.7 x11-libs/cairo[xcb] x11-libs/gdk-pixbuf:2 >=x11-libs/libxcb-1.6 >=x11-libs/pango-1.19.3[introspection] >=x11-libs/startup-notification-0.10_p20110426 >=x11-libs/xcb-util-0.3.8 x11-libs/xcb-util-cursor x11-libs/libXcursor >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) elibc_FreeBSD? ( dev-libs/libexecinfo )
+RDEPEND=>=dev-lang/lua-5.1:0 dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 >=dev-lua/lgi-0.7 x11-libs/cairo[xcb] x11-libs/gdk-pixbuf:2 >=x11-libs/libxcb-1.6 >=x11-libs/pango-1.19.3[introspection] >=x11-libs/startup-notification-0.10_p20110426 >=x11-libs/xcb-util-0.3.8 x11-libs/xcb-util-cursor x11-libs/libXcursor >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 SLOT=0
 SRC_URI=http://awesome.naquadah.org/download/awesome-3.5.7.tar.xz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=767bec19b2a9b22a392345a4549c46b1
+_md5_=38d9adb6174c2d81db559792989d17e9
diff --git a/metadata/md5-cache/x11-wm/awesome-3.5.8 b/metadata/md5-cache/x11-wm/awesome-3.5.8
index 40cb3d8c3e51..94a1a20947c8 100644
--- a/metadata/md5-cache/x11-wm/awesome-3.5.8
+++ b/metadata/md5-cache/x11-wm/awesome-3.5.8
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-lang/lua-5.1:0 dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 >=dev-lua/lgi-0.7 x11-libs/cairo[xcb] x11-libs/gdk-pixbuf:2 >=x11-libs/libxcb-1.6 >=x11-libs/pango-1.19.3[introspection] >=x11-libs/startup-notification-0.10_p20110426 >=x11-libs/xcb-util-0.3.8 x11-libs/xcb-util-cursor x11-libs/libXcursor >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) elibc_FreeBSD? ( dev-libs/libexecinfo ) >=app-text/asciidoc-8.4.5 app-text/xmlto dev-util/gperf virtual/pkgconfig media-gfx/imagemagick[png] >=x11-proto/xcb-proto-1.5 >=x11-proto/xproto-7.0.15 doc? ( app-doc/doxygen media-gfx/graphviz ) sys-devel/make >=dev-util/cmake-3.7.2
+DEPEND=>=dev-lang/lua-5.1:0 dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 >=dev-lua/lgi-0.7 x11-libs/cairo[xcb] x11-libs/gdk-pixbuf:2 >=x11-libs/libxcb-1.6 >=x11-libs/pango-1.19.3[introspection] >=x11-libs/startup-notification-0.10_p20110426 >=x11-libs/xcb-util-0.3.8 x11-libs/xcb-util-cursor x11-libs/libXcursor >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) >=app-text/asciidoc-8.4.5 app-text/xmlto dev-util/gperf virtual/pkgconfig media-gfx/imagemagick[png] >=x11-proto/xcb-proto-1.5 >=x11-proto/xproto-7.0.15 doc? ( app-doc/doxygen media-gfx/graphviz ) sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=A dynamic floating and tiling window manager
 EAPI=5
 HOMEPAGE=http://awesome.naquadah.org/
 IUSE=dbus doc elibc_FreeBSD gnome
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd
 LICENSE=GPL-2
-RDEPEND=>=dev-lang/lua-5.1:0 dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 >=dev-lua/lgi-0.7 x11-libs/cairo[xcb] x11-libs/gdk-pixbuf:2 >=x11-libs/libxcb-1.6 >=x11-libs/pango-1.19.3[introspection] >=x11-libs/startup-notification-0.10_p20110426 >=x11-libs/xcb-util-0.3.8 x11-libs/xcb-util-cursor x11-libs/libXcursor >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) elibc_FreeBSD? ( dev-libs/libexecinfo )
+RDEPEND=>=dev-lang/lua-5.1:0 dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 >=dev-lua/lgi-0.7 x11-libs/cairo[xcb] x11-libs/gdk-pixbuf:2 >=x11-libs/libxcb-1.6 >=x11-libs/pango-1.19.3[introspection] >=x11-libs/startup-notification-0.10_p20110426 >=x11-libs/xcb-util-0.3.8 x11-libs/xcb-util-cursor x11-libs/libXcursor >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 SLOT=0
 SRC_URI=http://awesome.naquadah.org/download/awesome-3.5.8.tar.xz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=767bec19b2a9b22a392345a4549c46b1
+_md5_=38d9adb6174c2d81db559792989d17e9
diff --git a/metadata/md5-cache/x11-wm/awesome-3.5.9 b/metadata/md5-cache/x11-wm/awesome-3.5.9-r1
index fbaa2b0a6447..10989ce8269e 100644
--- a/metadata/md5-cache/x11-wm/awesome-3.5.9
+++ b/metadata/md5-cache/x11-wm/awesome-3.5.9-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-lang/lua-5.1:0 dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 >=dev-lua/lgi-0.7 x11-libs/cairo[xcb] x11-libs/gdk-pixbuf:2 >=x11-libs/libxcb-1.6 >=x11-libs/pango-1.19.3[introspection] >=x11-libs/startup-notification-0.10_p20110426 >=x11-libs/xcb-util-0.3.8 x11-libs/xcb-util-cursor x11-libs/libXcursor >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) elibc_FreeBSD? ( dev-libs/libexecinfo ) >=app-text/asciidoc-8.4.5 app-text/xmlto dev-util/gperf virtual/pkgconfig media-gfx/imagemagick[png] >=x11-proto/xcb-proto-1.5 >=x11-proto/xproto-7.0.15 doc? ( app-doc/doxygen media-gfx/graphviz ) sys-devel/make >=dev-util/cmake-3.7.2
+DEPEND=>=dev-lang/lua-5.1:0 dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 >=dev-lua/lgi-0.7 x11-libs/cairo[xcb] x11-libs/gdk-pixbuf:2 >=x11-libs/libxcb-1.6 >=x11-libs/pango-1.19.3[introspection] >=x11-libs/startup-notification-0.10_p20110426 >=x11-libs/xcb-util-0.3.8 x11-libs/xcb-util-cursor x11-libs/libXcursor >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) >=app-text/asciidoc-8.4.5 app-text/xmlto dev-util/gperf virtual/pkgconfig media-gfx/imagemagick[png] >=x11-proto/xcb-proto-1.5 >=x11-proto/xproto-7.0.15 doc? ( app-doc/doxygen media-gfx/graphviz ) sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=A dynamic floating and tiling window manager
 EAPI=5
 HOMEPAGE=http://awesome.naquadah.org/
 IUSE=dbus doc elibc_FreeBSD gnome
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd
 LICENSE=GPL-2
-RDEPEND=>=dev-lang/lua-5.1:0 dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 >=dev-lua/lgi-0.7 x11-libs/cairo[xcb] x11-libs/gdk-pixbuf:2 >=x11-libs/libxcb-1.6 >=x11-libs/pango-1.19.3[introspection] >=x11-libs/startup-notification-0.10_p20110426 >=x11-libs/xcb-util-0.3.8 x11-libs/xcb-util-cursor x11-libs/libXcursor >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) elibc_FreeBSD? ( dev-libs/libexecinfo )
+RDEPEND=>=dev-lang/lua-5.1:0 dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 >=dev-lua/lgi-0.7 x11-libs/cairo[xcb] x11-libs/gdk-pixbuf:2 >=x11-libs/libxcb-1.6 >=x11-libs/pango-1.19.3[introspection] >=x11-libs/startup-notification-0.10_p20110426 >=x11-libs/xcb-util-0.3.8 x11-libs/xcb-util-cursor x11-libs/libXcursor >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 SLOT=0
 SRC_URI=http://awesome.naquadah.org/download/awesome-3.5.9.tar.xz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=767bec19b2a9b22a392345a4549c46b1
+_md5_=38d9adb6174c2d81db559792989d17e9
diff --git a/metadata/md5-cache/x11-wm/awesome-4.0 b/metadata/md5-cache/x11-wm/awesome-4.0
index 1dd4f6300eec..0b5908efb357 100644
--- a/metadata/md5-cache/x11-wm/awesome-4.0
+++ b/metadata/md5-cache/x11-wm/awesome-4.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-lang/lua-5.1:0 dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 >=dev-lua/lgi-0.7 x11-libs/cairo[xcb] x11-libs/gdk-pixbuf:2 >=x11-libs/libxcb-1.6 >=x11-libs/pango-1.19.3[introspection] >=x11-libs/startup-notification-0.10_p20110426 >=x11-libs/xcb-util-0.3.8 x11-libs/xcb-util-cursor >=x11-libs/xcb-util-keysyms-0.3.4 >=x11-libs/xcb-util-wm-0.3.8 >=x11-libs/xcb-util-xrm-1.0 x11-libs/libXcursor x11-libs/libxkbcommon[X] >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) elibc_FreeBSD? ( dev-libs/libexecinfo ) >=app-text/asciidoc-8.4.5 app-text/xmlto dev-util/gperf virtual/pkgconfig media-gfx/imagemagick[png] >=x11-proto/xcb-proto-1.5 >=x11-proto/xproto-7.0.15 doc? ( dev-lua/ldoc ) sys-devel/make >=dev-util/cmake-3.7.2
+DEPEND=>=dev-lang/lua-5.1:0 dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 >=dev-lua/lgi-0.7 x11-libs/cairo[xcb] x11-libs/gdk-pixbuf:2 >=x11-libs/libxcb-1.6 >=x11-libs/pango-1.19.3[introspection] >=x11-libs/startup-notification-0.10_p20110426 >=x11-libs/xcb-util-0.3.8 x11-libs/xcb-util-cursor >=x11-libs/xcb-util-keysyms-0.3.4 >=x11-libs/xcb-util-wm-0.3.8 >=x11-libs/xcb-util-xrm-1.0 x11-libs/libXcursor x11-libs/libxkbcommon[X] >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) >=app-text/asciidoc-8.4.5 app-text/xmlto dev-util/gperf virtual/pkgconfig media-gfx/imagemagick[png] >=x11-proto/xcb-proto-1.5 >=x11-proto/xproto-7.0.15 doc? ( dev-lua/ldoc ) sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=A dynamic floating and tiling window manager
 EAPI=6
 HOMEPAGE=https://awesomewm.org/
 IUSE=dbus doc elibc_FreeBSD gnome
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-lang/lua-5.1:0 dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 >=dev-lua/lgi-0.7 x11-libs/cairo[xcb] x11-libs/gdk-pixbuf:2 >=x11-libs/libxcb-1.6 >=x11-libs/pango-1.19.3[introspection] >=x11-libs/startup-notification-0.10_p20110426 >=x11-libs/xcb-util-0.3.8 x11-libs/xcb-util-cursor >=x11-libs/xcb-util-keysyms-0.3.4 >=x11-libs/xcb-util-wm-0.3.8 >=x11-libs/xcb-util-xrm-1.0 x11-libs/libXcursor x11-libs/libxkbcommon[X] >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) elibc_FreeBSD? ( dev-libs/libexecinfo )
+RDEPEND=>=dev-lang/lua-5.1:0 dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 >=dev-lua/lgi-0.7 x11-libs/cairo[xcb] x11-libs/gdk-pixbuf:2 >=x11-libs/libxcb-1.6 >=x11-libs/pango-1.19.3[introspection] >=x11-libs/startup-notification-0.10_p20110426 >=x11-libs/xcb-util-0.3.8 x11-libs/xcb-util-cursor >=x11-libs/xcb-util-keysyms-0.3.4 >=x11-libs/xcb-util-wm-0.3.8 >=x11-libs/xcb-util-xrm-1.0 x11-libs/libXcursor x11-libs/libxkbcommon[X] >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 SLOT=0
 SRC_URI=https://github.com/awesomeWM/awesome-releases/raw/master/awesome-4.0.tar.xz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=19155e0212c22e19ad93c7de1f68443e
+_md5_=724928458b66ada71b81e01b347c00d8
diff --git a/metadata/md5-cache/x11-wm/awesome-4.0-r1 b/metadata/md5-cache/x11-wm/awesome-4.0-r1
index 29fa50c8909a..219e0d3551ae 100644
--- a/metadata/md5-cache/x11-wm/awesome-4.0-r1
+++ b/metadata/md5-cache/x11-wm/awesome-4.0-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-lang/lua-5.1:0 dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 >=dev-lua/lgi-0.7 x11-libs/cairo[xcb] x11-libs/gdk-pixbuf:2 >=x11-libs/libxcb-1.6 >=x11-libs/pango-1.19.3[introspection] >=x11-libs/startup-notification-0.10_p20110426 >=x11-libs/xcb-util-0.3.8 x11-libs/xcb-util-cursor >=x11-libs/xcb-util-keysyms-0.3.4 >=x11-libs/xcb-util-wm-0.3.8 >=x11-libs/xcb-util-xrm-1.0 x11-libs/libXcursor x11-libs/libxkbcommon[X] >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) elibc_FreeBSD? ( dev-libs/libexecinfo ) >=app-text/asciidoc-8.4.5 app-text/xmlto dev-util/gperf virtual/pkgconfig media-gfx/imagemagick[png] >=x11-proto/xcb-proto-1.5 >=x11-proto/xproto-7.0.15 doc? ( dev-lua/ldoc ) luajit? ( dev-lang/luajit:2 ) sys-devel/make >=dev-util/cmake-3.7.2
+DEPEND=>=dev-lang/lua-5.1:0 dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 >=dev-lua/lgi-0.7 x11-libs/cairo[xcb] x11-libs/gdk-pixbuf:2 >=x11-libs/libxcb-1.6 >=x11-libs/pango-1.19.3[introspection] >=x11-libs/startup-notification-0.10_p20110426 >=x11-libs/xcb-util-0.3.8 x11-libs/xcb-util-cursor >=x11-libs/xcb-util-keysyms-0.3.4 >=x11-libs/xcb-util-wm-0.3.8 >=x11-libs/xcb-util-xrm-1.0 x11-libs/libXcursor x11-libs/libxkbcommon[X] >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) >=app-text/asciidoc-8.4.5 app-text/xmlto dev-util/gperf virtual/pkgconfig media-gfx/imagemagick[png] >=x11-proto/xcb-proto-1.5 >=x11-proto/xproto-7.0.15 doc? ( dev-lua/ldoc ) luajit? ( dev-lang/luajit:2 ) sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=A dynamic floating and tiling window manager
 EAPI=6
 HOMEPAGE=https://awesomewm.org/
 IUSE=dbus doc elibc_FreeBSD gnome luajit
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-lang/lua-5.1:0 dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 >=dev-lua/lgi-0.7 x11-libs/cairo[xcb] x11-libs/gdk-pixbuf:2 >=x11-libs/libxcb-1.6 >=x11-libs/pango-1.19.3[introspection] >=x11-libs/startup-notification-0.10_p20110426 >=x11-libs/xcb-util-0.3.8 x11-libs/xcb-util-cursor >=x11-libs/xcb-util-keysyms-0.3.4 >=x11-libs/xcb-util-wm-0.3.8 >=x11-libs/xcb-util-xrm-1.0 x11-libs/libXcursor x11-libs/libxkbcommon[X] >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) elibc_FreeBSD? ( dev-libs/libexecinfo )
+RDEPEND=>=dev-lang/lua-5.1:0 dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 >=dev-lua/lgi-0.7 x11-libs/cairo[xcb] x11-libs/gdk-pixbuf:2 >=x11-libs/libxcb-1.6 >=x11-libs/pango-1.19.3[introspection] >=x11-libs/startup-notification-0.10_p20110426 >=x11-libs/xcb-util-0.3.8 x11-libs/xcb-util-cursor >=x11-libs/xcb-util-keysyms-0.3.4 >=x11-libs/xcb-util-wm-0.3.8 >=x11-libs/xcb-util-xrm-1.0 x11-libs/libXcursor x11-libs/libxkbcommon[X] >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 SLOT=0
 SRC_URI=https://github.com/awesomeWM/awesome-releases/raw/master/awesome-4.0.tar.xz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=198701b793a61d7f845b51665d2228a4
+_md5_=6625445a05ee65c63e0f768eb9ed930b
diff --git a/metadata/md5-cache/x11-wm/awesome-4.1 b/metadata/md5-cache/x11-wm/awesome-4.1
index 479b0fc36c65..e0961d1a2b2c 100644
--- a/metadata/md5-cache/x11-wm/awesome-4.1
+++ b/metadata/md5-cache/x11-wm/awesome-4.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-lang/lua-5.1:0 dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 >=dev-lua/lgi-0.8 x11-libs/cairo[xcb] x11-libs/gdk-pixbuf:2 >=x11-libs/libxcb-1.6 >=x11-libs/pango-1.19.3[introspection] >=x11-libs/startup-notification-0.10_p20110426 >=x11-libs/xcb-util-0.3.8 x11-libs/xcb-util-cursor >=x11-libs/xcb-util-keysyms-0.3.4 >=x11-libs/xcb-util-wm-0.3.8 >=x11-libs/xcb-util-xrm-1.0 x11-libs/libXcursor x11-libs/libxkbcommon[X] >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) elibc_FreeBSD? ( dev-libs/libexecinfo ) >=app-text/asciidoc-8.4.5 app-text/xmlto dev-util/gperf virtual/pkgconfig media-gfx/imagemagick[png] >=x11-proto/xcb-proto-1.5 >=x11-proto/xproto-7.0.15 doc? ( dev-lua/ldoc ) luajit? ( dev-lang/luajit:2 ) sys-devel/make >=dev-util/cmake-3.7.2
+DEPEND=>=dev-lang/lua-5.1:0 dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 >=dev-lua/lgi-0.8 x11-libs/cairo[xcb] x11-libs/gdk-pixbuf:2 >=x11-libs/libxcb-1.6 >=x11-libs/pango-1.19.3[introspection] >=x11-libs/startup-notification-0.10_p20110426 >=x11-libs/xcb-util-0.3.8 x11-libs/xcb-util-cursor >=x11-libs/xcb-util-keysyms-0.3.4 >=x11-libs/xcb-util-wm-0.3.8 >=x11-libs/xcb-util-xrm-1.0 x11-libs/libXcursor x11-libs/libxkbcommon[X] >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) >=app-text/asciidoc-8.4.5 app-text/xmlto dev-util/gperf virtual/pkgconfig media-gfx/imagemagick[png] >=x11-proto/xcb-proto-1.5 >=x11-proto/xproto-7.0.15 doc? ( dev-lua/ldoc ) luajit? ( dev-lang/luajit:2 ) sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=A dynamic floating and tiling window manager
 EAPI=6
 HOMEPAGE=https://awesomewm.org/
 IUSE=dbus doc elibc_FreeBSD gnome luajit
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-lang/lua-5.1:0 dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 >=dev-lua/lgi-0.8 x11-libs/cairo[xcb] x11-libs/gdk-pixbuf:2 >=x11-libs/libxcb-1.6 >=x11-libs/pango-1.19.3[introspection] >=x11-libs/startup-notification-0.10_p20110426 >=x11-libs/xcb-util-0.3.8 x11-libs/xcb-util-cursor >=x11-libs/xcb-util-keysyms-0.3.4 >=x11-libs/xcb-util-wm-0.3.8 >=x11-libs/xcb-util-xrm-1.0 x11-libs/libXcursor x11-libs/libxkbcommon[X] >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) elibc_FreeBSD? ( dev-libs/libexecinfo )
+RDEPEND=>=dev-lang/lua-5.1:0 dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 >=dev-lua/lgi-0.8 x11-libs/cairo[xcb] x11-libs/gdk-pixbuf:2 >=x11-libs/libxcb-1.6 >=x11-libs/pango-1.19.3[introspection] >=x11-libs/startup-notification-0.10_p20110426 >=x11-libs/xcb-util-0.3.8 x11-libs/xcb-util-cursor >=x11-libs/xcb-util-keysyms-0.3.4 >=x11-libs/xcb-util-wm-0.3.8 >=x11-libs/xcb-util-xrm-1.0 x11-libs/libXcursor x11-libs/libxkbcommon[X] >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 SLOT=0
 SRC_URI=https://github.com/awesomeWM/awesome-releases/raw/master/awesome-4.1.tar.xz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=56ad50304f4efeae329ebd2c477bb1e5
+_md5_=2230e2196054fa95fe989e514ce56f57
diff --git a/metadata/md5-cache/x11-wm/awesome-4.2 b/metadata/md5-cache/x11-wm/awesome-4.2
index 1648eb496e94..9ebf1a3b9c61 100644
--- a/metadata/md5-cache/x11-wm/awesome-4.2
+++ b/metadata/md5-cache/x11-wm/awesome-4.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-lang/lua-5.1:0 dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 >=dev-lua/lgi-0.8 x11-libs/cairo[xcb] x11-libs/gdk-pixbuf:2 >=x11-libs/libxcb-1.6 >=x11-libs/pango-1.19.3[introspection] >=x11-libs/startup-notification-0.10_p20110426 >=x11-libs/xcb-util-0.3.8 x11-libs/xcb-util-cursor >=x11-libs/xcb-util-keysyms-0.3.4 >=x11-libs/xcb-util-wm-0.3.8 >=x11-libs/xcb-util-xrm-1.0 x11-libs/libXcursor x11-libs/libxkbcommon[X] >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) elibc_FreeBSD? ( dev-libs/libexecinfo ) >=app-text/asciidoc-8.4.5 app-text/xmlto dev-util/gperf virtual/pkgconfig media-gfx/imagemagick[png] >=x11-proto/xcb-proto-1.5 >=x11-proto/xproto-7.0.15 doc? ( dev-lua/ldoc ) luajit? ( dev-lang/luajit:2 ) sys-devel/make >=dev-util/cmake-3.7.2
+DEPEND=>=dev-lang/lua-5.1:0 dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 >=dev-lua/lgi-0.8 x11-libs/cairo[xcb] x11-libs/gdk-pixbuf:2 >=x11-libs/libxcb-1.6 >=x11-libs/pango-1.19.3[introspection] >=x11-libs/startup-notification-0.10_p20110426 >=x11-libs/xcb-util-0.3.8 x11-libs/xcb-util-cursor >=x11-libs/xcb-util-keysyms-0.3.4 >=x11-libs/xcb-util-wm-0.3.8 >=x11-libs/xcb-util-xrm-1.0 x11-libs/libXcursor x11-libs/libxkbcommon[X] >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) >=app-text/asciidoc-8.4.5 app-text/xmlto dev-util/gperf virtual/pkgconfig media-gfx/imagemagick[png] >=x11-proto/xcb-proto-1.5 >=x11-proto/xproto-7.0.15 doc? ( dev-lua/ldoc ) luajit? ( dev-lang/luajit:2 ) sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=A dynamic floating and tiling window manager
 EAPI=6
 HOMEPAGE=https://awesomewm.org/
 IUSE=dbus doc elibc_FreeBSD gnome luajit
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-lang/lua-5.1:0 dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 >=dev-lua/lgi-0.8 x11-libs/cairo[xcb] x11-libs/gdk-pixbuf:2 >=x11-libs/libxcb-1.6 >=x11-libs/pango-1.19.3[introspection] >=x11-libs/startup-notification-0.10_p20110426 >=x11-libs/xcb-util-0.3.8 x11-libs/xcb-util-cursor >=x11-libs/xcb-util-keysyms-0.3.4 >=x11-libs/xcb-util-wm-0.3.8 >=x11-libs/xcb-util-xrm-1.0 x11-libs/libXcursor x11-libs/libxkbcommon[X] >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) elibc_FreeBSD? ( dev-libs/libexecinfo )
+RDEPEND=>=dev-lang/lua-5.1:0 dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 >=dev-lua/lgi-0.8 x11-libs/cairo[xcb] x11-libs/gdk-pixbuf:2 >=x11-libs/libxcb-1.6 >=x11-libs/pango-1.19.3[introspection] >=x11-libs/startup-notification-0.10_p20110426 >=x11-libs/xcb-util-0.3.8 x11-libs/xcb-util-cursor >=x11-libs/xcb-util-keysyms-0.3.4 >=x11-libs/xcb-util-wm-0.3.8 >=x11-libs/xcb-util-xrm-1.0 x11-libs/libXcursor x11-libs/libxkbcommon[X] >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 SLOT=0
 SRC_URI=https://github.com/awesomeWM/awesome-releases/raw/master/awesome-4.2.tar.xz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=76aca995af36bb70b9fba9e1afab1aa9
+_md5_=c5e48232b62a57f415137eda54c0187b
diff --git a/metadata/md5-cache/x11-wm/awesome-9999 b/metadata/md5-cache/x11-wm/awesome-9999
index e3d1385bcbce..1792afdf9814 100644
--- a/metadata/md5-cache/x11-wm/awesome-9999
+++ b/metadata/md5-cache/x11-wm/awesome-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=>=dev-lang/lua-5.1:0 dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 >=dev-lua/lgi-0.7 x11-libs/cairo[xcb] x11-libs/gdk-pixbuf:2 >=x11-libs/libxcb-1.6 >=x11-libs/pango-1.19.3[introspection] >=x11-libs/startup-notification-0.10_p20110426 >=x11-libs/xcb-util-0.3.8 x11-libs/xcb-util-cursor >=x11-libs/xcb-util-keysyms-0.3.4 >=x11-libs/xcb-util-wm-0.3.8 >=x11-libs/xcb-util-xrm-1.0 x11-libs/libXcursor x11-libs/libxkbcommon[X] >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) elibc_FreeBSD? ( dev-libs/libexecinfo ) >=app-text/asciidoc-8.4.5 app-text/xmlto dev-util/gperf virtual/pkgconfig media-gfx/imagemagick[png] >=x11-proto/xcb-proto-1.5 >=x11-proto/xproto-7.0.15 doc? ( dev-lua/ldoc ) luajit? ( dev-lang/luajit:2 ) sys-devel/make >=dev-util/cmake-3.7.2 >=dev-vcs/git-1.8.2.1
+DEPEND=>=dev-lang/lua-5.1:0 dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 >=dev-lua/lgi-0.7 x11-libs/cairo[xcb] x11-libs/gdk-pixbuf:2 >=x11-libs/libxcb-1.6 >=x11-libs/pango-1.19.3[introspection] >=x11-libs/startup-notification-0.10_p20110426 >=x11-libs/xcb-util-0.3.8 x11-libs/xcb-util-cursor >=x11-libs/xcb-util-keysyms-0.3.4 >=x11-libs/xcb-util-wm-0.3.8 >=x11-libs/xcb-util-xrm-1.0 x11-libs/libXcursor x11-libs/libxkbcommon[X] >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) >=app-text/asciidoc-8.4.5 app-text/xmlto dev-util/gperf virtual/pkgconfig media-gfx/imagemagick[png] >=x11-proto/xcb-proto-1.5 >=x11-proto/xproto-7.0.15 doc? ( dev-lua/ldoc ) luajit? ( dev-lang/luajit:2 ) sys-devel/make >=dev-util/cmake-3.7.2 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=A dynamic floating and tiling window manager
 EAPI=6
 HOMEPAGE=https://awesomewm.org/
 IUSE=dbus doc elibc_FreeBSD gnome luajit
 LICENSE=GPL-2
-RDEPEND=>=dev-lang/lua-5.1:0 dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 >=dev-lua/lgi-0.7 x11-libs/cairo[xcb] x11-libs/gdk-pixbuf:2 >=x11-libs/libxcb-1.6 >=x11-libs/pango-1.19.3[introspection] >=x11-libs/startup-notification-0.10_p20110426 >=x11-libs/xcb-util-0.3.8 x11-libs/xcb-util-cursor >=x11-libs/xcb-util-keysyms-0.3.4 >=x11-libs/xcb-util-wm-0.3.8 >=x11-libs/xcb-util-xrm-1.0 x11-libs/libXcursor x11-libs/libxkbcommon[X] >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) elibc_FreeBSD? ( dev-libs/libexecinfo )
+RDEPEND=>=dev-lang/lua-5.1:0 dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 >=dev-lua/lgi-0.7 x11-libs/cairo[xcb] x11-libs/gdk-pixbuf:2 >=x11-libs/libxcb-1.6 >=x11-libs/pango-1.19.3[introspection] >=x11-libs/startup-notification-0.10_p20110426 >=x11-libs/xcb-util-0.3.8 x11-libs/xcb-util-cursor >=x11-libs/xcb-util-keysyms-0.3.4 >=x11-libs/xcb-util-wm-0.3.8 >=x11-libs/xcb-util-xrm-1.0 x11-libs/libXcursor x11-libs/libxkbcommon[X] >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 SLOT=0
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a9197b725b72e1d5220f573ddb2d92f9
+_md5_=3a52b8f63a640d8d3e39a099ab4744fc
diff --git a/metadata/md5-cache/x11-wm/compiz-0.8.8-r3 b/metadata/md5-cache/x11-wm/compiz-0.8.8-r3
deleted file mode 100644
index 40ea814df362..000000000000
--- a/metadata/md5-cache/x11-wm/compiz-0.8.8-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst prepare prerm
-DEPEND=>=dev-libs/glib-2 dev-libs/libxml2 dev-libs/libxslt media-libs/libpng:0= >=media-libs/mesa-6.5.1-r1 >=x11-base/xorg-server-1.1.1-r1 >=x11-libs/libX11-1.4 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXinerama x11-libs/libXrandr x11-libs/libICE x11-libs/libSM >=x11-libs/libXrender-0.8.4 >=x11-libs/startup-notification-0.7 virtual/glu cairo? ( x11-libs/cairo[X] ) dbus? ( >=sys-apps/dbus-1.0 dev-libs/dbus-glib ) fuse? ( sys-fs/fuse ) gnome? ( >=gnome-base/gnome-control-center-2.16.1:2 gnome-base/gnome-desktop:2 gconf? ( gnome-base/gconf:2 ) ) gtk? ( >=x11-libs/gtk+-2.8.0:2 >=x11-libs/libwnck-2.18.3:1 x11-libs/pango ) svg? ( >=gnome-base/librsvg-2.14.0:2 >=x11-libs/cairo-1.0 ) virtual/pkgconfig x11-proto/damageproto x11-proto/xineramaproto >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
-DESCRIPTION=OpenGL window and compositing manager
-EAPI=5
-HOMEPAGE=http://www.compiz.org/
-IUSE=+cairo dbus fuse gnome gconf gtk +svg
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2 LGPL-2.1 MIT
-RDEPEND=>=dev-libs/glib-2 dev-libs/libxml2 dev-libs/libxslt media-libs/libpng:0= >=media-libs/mesa-6.5.1-r1 >=x11-base/xorg-server-1.1.1-r1 >=x11-libs/libX11-1.4 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXinerama x11-libs/libXrandr x11-libs/libICE x11-libs/libSM >=x11-libs/libXrender-0.8.4 >=x11-libs/startup-notification-0.7 virtual/glu cairo? ( x11-libs/cairo[X] ) dbus? ( >=sys-apps/dbus-1.0 dev-libs/dbus-glib ) fuse? ( sys-fs/fuse ) gnome? ( >=gnome-base/gnome-control-center-2.16.1:2 gnome-base/gnome-desktop:2 gconf? ( gnome-base/gconf:2 ) ) gtk? ( >=x11-libs/gtk+-2.8.0:2 >=x11-libs/libwnck-2.18.3:1 x11-libs/pango ) svg? ( >=gnome-base/librsvg-2.14.0:2 >=x11-libs/cairo-1.0 ) x11-apps/mesa-progs x11-apps/xdpyinfo x11-apps/xset x11-apps/xvinfo
-SLOT=0
-SRC_URI=http://releases.compiz.org/0.8.8/compiz-0.8.8.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3e9c36cd25f92e33f924d84038d3be7e
diff --git a/metadata/md5-cache/x11-wm/compiz-fusion-0.8.8-r1 b/metadata/md5-cache/x11-wm/compiz-fusion-0.8.8-r1
deleted file mode 100644
index baa87820ff4b..000000000000
--- a/metadata/md5-cache/x11-wm/compiz-fusion-0.8.8-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=postinst
-DESCRIPTION=Compiz Fusion (meta)
-EAPI=6
-HOMEPAGE=http://www.compiz.org/
-IUSE=emerald gnome unsupported
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=x11-wm/compiz-0.8.8 >=x11-plugins/compiz-plugins-main-0.8.8 >=x11-plugins/compiz-plugins-extra-0.8.8 >=x11-misc/ccsm-0.8.4 emerald? ( >=x11-wm/emerald-0.8.8 ) gnome? ( >=x11-libs/compizconfig-backend-gconf-0.8.8 ) unsupported? ( >=x11-plugins/compiz-plugins-unsupported-0.8.8 )
-SLOT=0
-_md5_=c1892023ff12c323817c2a2ed0e508c1
diff --git a/metadata/md5-cache/x11-wm/emerald-0.8.8-r1 b/metadata/md5-cache/x11-wm/emerald-0.8.8-r1
deleted file mode 100644
index 5845942a8872..000000000000
--- a/metadata/md5-cache/x11-wm/emerald-0.8.8-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=x11-libs/gtk+-2.8.0:2 >=x11-libs/libwnck-2.14.2:1 >=x11-wm/compiz-0.8.8 >=dev-util/intltool-0.35 virtual/pkgconfig >=sys-devel/gettext-0.15
-DESCRIPTION=Emerald Window Decorator
-EAPI=6
-HOMEPAGE=http://www.compiz.org/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=~x11-themes/emerald-themes-0.5.2
-RDEPEND=>=x11-libs/gtk+-2.8.0:2 >=x11-libs/libwnck-2.14.2:1 >=x11-wm/compiz-0.8.8
-SLOT=0
-SRC_URI=http://releases.compiz.org/0.8.8/emerald-0.8.8.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=d0528d740c8ca3afffbf7d9bd93a9041
diff --git a/metadata/md5-cache/x11-wm/enlightenment-0.17.9999 b/metadata/md5-cache/x11-wm/enlightenment-0.17.9999
index adea34f3639d..43f8d61afcb4 100644
--- a/metadata/md5-cache/x11-wm/enlightenment-0.17.9999
+++ b/metadata/md5-cache/x11-wm/enlightenment-0.17.9999
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile configure install prepare unpack
 DEPEND=pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd ) wayland? ( dev-libs/efl[wayland] >=dev-libs/wayland-1.10.0 >=x11-libs/pixman-0.31.1 >=x11-libs/libxkbcommon-0.3.1 ) >=dev-libs/efl-1.18[X] x11-libs/xcb-util-keysyms >=app-portage/elt-patches-20170317 >=app-portage/elt-patches-20170422 dev-vcs/git !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 doc? ( app-doc/doxygen )
 DESCRIPTION=Enlightenment DR17 window manager
 EAPI=5
-HOMEPAGE=http://www.enlightenment.org/
+HOMEPAGE=https://www.enlightenment.org
 IUSE=pam spell static-libs systemd ukit wayland +enlightenment_modules_conf-applications +enlightenment_modules_conf-bindings +enlightenment_modules_conf-dialogs +enlightenment_modules_conf-display +enlightenment_modules_conf-interaction +enlightenment_modules_conf-intl +enlightenment_modules_conf-menus +enlightenment_modules_conf-paths +enlightenment_modules_conf-performance +enlightenment_modules_conf-randr +enlightenment_modules_conf-shelves +enlightenment_modules_conf-theme +enlightenment_modules_conf-window-manipulation +enlightenment_modules_conf-window-remembers +enlightenment_modules_appmenu +enlightenment_modules_backlight +enlightenment_modules_bluez4 +enlightenment_modules_battery +enlightenment_modules_clock +enlightenment_modules_conf +enlightenment_modules_connman +enlightenment_modules_cpufreq +enlightenment_modules_everything +enlightenment_modules_fileman +enlightenment_modules_fileman-opinfo +enlightenment_modules_gadman +enlightenment_modules_geolocation +enlightenment_modules_ibar +enlightenment_modules_ibox +enlightenment_modules_lokker +enlightenment_modules_mixer +enlightenment_modules_msgbus +enlightenment_modules_music-control +enlightenment_modules_notification +enlightenment_modules_pager +enlightenment_modules_packagekit +enlightenment_modules_pager-plain +enlightenment_modules_policy-mobile +enlightenment_modules_quickaccess +enlightenment_modules_shot +enlightenment_modules_start +enlightenment_modules_syscon +enlightenment_modules_systray +enlightenment_modules_tasks +enlightenment_modules_teamwork +enlightenment_modules_temperature +enlightenment_modules_tiling +enlightenment_modules_time +enlightenment_modules_winlist +enlightenment_modules_wireless +enlightenment_modules_wizard +enlightenment_modules_wl-desktop-shell +enlightenment_modules_wl-drm +enlightenment_modules_wl-text-input +enlightenment_modules_wl-weekeyboard +enlightenment_modules_wl-wl +enlightenment_modules_wl-x11 +enlightenment_modules_xkbswitch +enlightenment_modules_xwayland nls doc
 LICENSE=BSD-2
 RDEPEND=pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd ) wayland? ( dev-libs/efl[wayland] >=dev-libs/wayland-1.10.0 >=x11-libs/pixman-0.31.1 >=x11-libs/libxkbcommon-0.3.1 ) >=dev-libs/efl-1.18[X] x11-libs/xcb-util-keysyms nls? ( sys-devel/gettext )
 SLOT=0.17/0.17.9999
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	enlightenment	ac1fc335a7f44c04309a9f4aae403165	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	git-2	195a672bfaf52d868442171c9469bbb6	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	enlightenment	1fa177784657aaf9484e91d7427a2b2e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	git-2	195a672bfaf52d868442171c9469bbb6	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=6941f9112a3bae6ff7be0d106de4a123
diff --git a/metadata/md5-cache/x11-wm/enlightenment-0.20.5 b/metadata/md5-cache/x11-wm/enlightenment-0.20.5
index 2f5d6a4b584f..4584c1d46700 100644
--- a/metadata/md5-cache/x11-wm/enlightenment-0.20.5
+++ b/metadata/md5-cache/x11-wm/enlightenment-0.20.5
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure install prepare unpack
 DEPEND=pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd ) wayland? ( dev-libs/efl[wayland] >=dev-libs/wayland-1.8.0 >=x11-libs/pixman-0.31.1 >=x11-libs/libxkbcommon-0.3.1 ) >=dev-libs/efl-1.17[X] >=media-libs/elementary-1.17 x11-libs/xcb-util-keysyms >=app-portage/elt-patches-20170317 >=app-portage/elt-patches-20170422 doc? ( app-doc/doxygen )
 DESCRIPTION=Enlightenment DR17 window manager
 EAPI=5
-HOMEPAGE=http://www.enlightenment.org/
+HOMEPAGE=https://www.enlightenment.org
 IUSE=pam spell static-libs systemd ukit wayland +enlightenment_modules_conf-applications +enlightenment_modules_conf-bindings +enlightenment_modules_conf-dialogs +enlightenment_modules_conf-display +enlightenment_modules_conf-interaction +enlightenment_modules_conf-intl +enlightenment_modules_conf-menus +enlightenment_modules_conf-paths +enlightenment_modules_conf-performance +enlightenment_modules_conf-randr +enlightenment_modules_conf-shelves +enlightenment_modules_conf-theme +enlightenment_modules_conf-window-manipulation +enlightenment_modules_conf-window-remembers +enlightenment_modules_appmenu +enlightenment_modules_backlight +enlightenment_modules_bluez4 +enlightenment_modules_battery +enlightenment_modules_clock +enlightenment_modules_conf +enlightenment_modules_connman +enlightenment_modules_cpufreq +enlightenment_modules_everything +enlightenment_modules_fileman +enlightenment_modules_fileman-opinfo +enlightenment_modules_gadman +enlightenment_modules_geolocation +enlightenment_modules_ibar +enlightenment_modules_ibox +enlightenment_modules_lokker +enlightenment_modules_mixer +enlightenment_modules_msgbus +enlightenment_modules_music-control +enlightenment_modules_notification +enlightenment_modules_pager +enlightenment_modules_packagekit +enlightenment_modules_pager-plain +enlightenment_modules_policy-mobile +enlightenment_modules_quickaccess +enlightenment_modules_shot +enlightenment_modules_start +enlightenment_modules_syscon +enlightenment_modules_systray +enlightenment_modules_tasks +enlightenment_modules_teamwork +enlightenment_modules_temperature +enlightenment_modules_tiling +enlightenment_modules_winlist +enlightenment_modules_wizard +enlightenment_modules_wl-desktop-shell +enlightenment_modules_wl-drm +enlightenment_modules_wl-text-input +enlightenment_modules_wl-weekeyboard +enlightenment_modules_wl-wl +enlightenment_modules_wl-x11 +enlightenment_modules_xkbswitch +enlightenment_modules_xwayland nls doc
 KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd ) wayland? ( dev-libs/efl[wayland] >=dev-libs/wayland-1.8.0 >=x11-libs/pixman-0.31.1 >=x11-libs/libxkbcommon-0.3.1 ) >=dev-libs/efl-1.17[X] >=media-libs/elementary-1.17 x11-libs/xcb-util-keysyms nls? ( sys-devel/gettext )
 SLOT=0.17/0.20.5
 SRC_URI=https://download.enlightenment.org/rel/apps/enlightenment/enlightenment-0.20.5.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	enlightenment	ac1fc335a7f44c04309a9f4aae403165	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	enlightenment	1fa177784657aaf9484e91d7427a2b2e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=c9a2629d6ae5e24460d320d229e2ef68
diff --git a/metadata/md5-cache/x11-wm/enlightenment-0.20.6 b/metadata/md5-cache/x11-wm/enlightenment-0.20.6
index c6e222ef66a0..418cf68735da 100644
--- a/metadata/md5-cache/x11-wm/enlightenment-0.20.6
+++ b/metadata/md5-cache/x11-wm/enlightenment-0.20.6
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure install prepare unpack
 DEPEND=pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd ) wayland? ( dev-libs/efl[wayland] >=dev-libs/wayland-1.10.0 >=x11-libs/pixman-0.31.1 >=x11-libs/libxkbcommon-0.3.1 ) >=dev-libs/efl-1.17[X] >=media-libs/elementary-1.17 x11-libs/xcb-util-keysyms >=app-portage/elt-patches-20170317 >=app-portage/elt-patches-20170422 doc? ( app-doc/doxygen )
 DESCRIPTION=Enlightenment DR17 window manager
 EAPI=5
-HOMEPAGE=http://www.enlightenment.org/
+HOMEPAGE=https://www.enlightenment.org
 IUSE=pam spell static-libs systemd ukit wayland +enlightenment_modules_conf-applications +enlightenment_modules_conf-bindings +enlightenment_modules_conf-dialogs +enlightenment_modules_conf-display +enlightenment_modules_conf-interaction +enlightenment_modules_conf-intl +enlightenment_modules_conf-menus +enlightenment_modules_conf-paths +enlightenment_modules_conf-performance +enlightenment_modules_conf-randr +enlightenment_modules_conf-shelves +enlightenment_modules_conf-theme +enlightenment_modules_conf-window-manipulation +enlightenment_modules_conf-window-remembers +enlightenment_modules_appmenu +enlightenment_modules_backlight +enlightenment_modules_bluez4 +enlightenment_modules_battery +enlightenment_modules_clock +enlightenment_modules_conf +enlightenment_modules_connman +enlightenment_modules_cpufreq +enlightenment_modules_everything +enlightenment_modules_fileman +enlightenment_modules_fileman-opinfo +enlightenment_modules_gadman +enlightenment_modules_geolocation +enlightenment_modules_ibar +enlightenment_modules_ibox +enlightenment_modules_lokker +enlightenment_modules_mixer +enlightenment_modules_msgbus +enlightenment_modules_music-control +enlightenment_modules_notification +enlightenment_modules_pager +enlightenment_modules_packagekit +enlightenment_modules_pager-plain +enlightenment_modules_policy-mobile +enlightenment_modules_quickaccess +enlightenment_modules_shot +enlightenment_modules_start +enlightenment_modules_syscon +enlightenment_modules_systray +enlightenment_modules_tasks +enlightenment_modules_teamwork +enlightenment_modules_temperature +enlightenment_modules_tiling +enlightenment_modules_winlist +enlightenment_modules_wizard +enlightenment_modules_wl-desktop-shell +enlightenment_modules_wl-drm +enlightenment_modules_wl-text-input +enlightenment_modules_wl-weekeyboard +enlightenment_modules_wl-wl +enlightenment_modules_wl-x11 +enlightenment_modules_xkbswitch +enlightenment_modules_xwayland nls doc
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd ) wayland? ( dev-libs/efl[wayland] >=dev-libs/wayland-1.10.0 >=x11-libs/pixman-0.31.1 >=x11-libs/libxkbcommon-0.3.1 ) >=dev-libs/efl-1.17[X] >=media-libs/elementary-1.17 x11-libs/xcb-util-keysyms nls? ( sys-devel/gettext )
 SLOT=0.17/0.20.6
 SRC_URI=https://download.enlightenment.org/rel/apps/enlightenment/enlightenment-0.20.6.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	enlightenment	ac1fc335a7f44c04309a9f4aae403165	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	enlightenment	1fa177784657aaf9484e91d7427a2b2e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=f6b98f2e20d277d2e0d5584933445599
diff --git a/metadata/md5-cache/x11-wm/enlightenment-0.21.7 b/metadata/md5-cache/x11-wm/enlightenment-0.21.7
index 805109a1e2de..3f7e7416eb08 100644
--- a/metadata/md5-cache/x11-wm/enlightenment-0.21.7
+++ b/metadata/md5-cache/x11-wm/enlightenment-0.21.7
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure install prepare unpack
 DEPEND=pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd ) wayland? ( dev-libs/efl[wayland] >=dev-libs/wayland-1.10.0 >=x11-libs/pixman-0.31.1 >=x11-libs/libxkbcommon-0.3.1 ) >=dev-libs/efl-1.18[X] x11-libs/xcb-util-keysyms >=app-portage/elt-patches-20170317 >=app-portage/elt-patches-20170422 doc? ( app-doc/doxygen )
 DESCRIPTION=Enlightenment DR17 window manager
 EAPI=5
-HOMEPAGE=http://www.enlightenment.org/
+HOMEPAGE=https://www.enlightenment.org
 IUSE=pam spell static-libs systemd ukit wayland +enlightenment_modules_conf-applications +enlightenment_modules_conf-bindings +enlightenment_modules_conf-dialogs +enlightenment_modules_conf-display +enlightenment_modules_conf-interaction +enlightenment_modules_conf-intl +enlightenment_modules_conf-menus +enlightenment_modules_conf-paths +enlightenment_modules_conf-performance +enlightenment_modules_conf-randr +enlightenment_modules_conf-shelves +enlightenment_modules_conf-theme +enlightenment_modules_conf-window-manipulation +enlightenment_modules_conf-window-remembers +enlightenment_modules_appmenu +enlightenment_modules_backlight +enlightenment_modules_bluez4 +enlightenment_modules_battery +enlightenment_modules_clock +enlightenment_modules_conf +enlightenment_modules_connman +enlightenment_modules_cpufreq +enlightenment_modules_everything +enlightenment_modules_fileman +enlightenment_modules_fileman-opinfo +enlightenment_modules_gadman +enlightenment_modules_geolocation +enlightenment_modules_ibar +enlightenment_modules_ibox +enlightenment_modules_lokker +enlightenment_modules_mixer +enlightenment_modules_msgbus +enlightenment_modules_music-control +enlightenment_modules_notification +enlightenment_modules_pager +enlightenment_modules_packagekit +enlightenment_modules_pager-plain +enlightenment_modules_policy-mobile +enlightenment_modules_quickaccess +enlightenment_modules_shot +enlightenment_modules_start +enlightenment_modules_syscon +enlightenment_modules_systray +enlightenment_modules_tasks +enlightenment_modules_teamwork +enlightenment_modules_temperature +enlightenment_modules_tiling +enlightenment_modules_time +enlightenment_modules_winlist +enlightenment_modules_wireless +enlightenment_modules_wizard +enlightenment_modules_wl-desktop-shell +enlightenment_modules_wl-drm +enlightenment_modules_wl-text-input +enlightenment_modules_wl-weekeyboard +enlightenment_modules_wl-wl +enlightenment_modules_wl-x11 +enlightenment_modules_xkbswitch +enlightenment_modules_xwayland nls doc
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd ) wayland? ( dev-libs/efl[wayland] >=dev-libs/wayland-1.10.0 >=x11-libs/pixman-0.31.1 >=x11-libs/libxkbcommon-0.3.1 ) >=dev-libs/efl-1.18[X] x11-libs/xcb-util-keysyms nls? ( sys-devel/gettext )
 SLOT=0.17/0.21.7
 SRC_URI=https://download.enlightenment.org/rel/apps/enlightenment/enlightenment-0.21.7.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	enlightenment	ac1fc335a7f44c04309a9f4aae403165	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	enlightenment	1fa177784657aaf9484e91d7427a2b2e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=6941f9112a3bae6ff7be0d106de4a123
diff --git a/metadata/md5-cache/x11-wm/mutter-3.24.4 b/metadata/md5-cache/x11-wm/mutter-3.24.4
index 8a7a4ac33b90..286446c63e2f 100644
--- a/metadata/md5-cache/x11-wm/mutter-3.24.4
+++ b/metadata/md5-cache/x11-wm/mutter-3.24.4
@@ -4,10 +4,10 @@ DESCRIPTION=GNOME 3 compositing window manager based on Clutter
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/mutter/
 IUSE=debug gles2 input_devices_wacom +introspection test udev wayland test
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/atk-2.5.3 >=x11-libs/gdk-pixbuf-2:2 >=dev-libs/json-glib-0.12.0 >=x11-libs/pango-1.30[introspection?] >=x11-libs/cairo-1.14[X] >=x11-libs/gtk+-3.19.8:3[X,introspection?] >=dev-libs/glib-2.49.0:2[dbus] >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/startup-notification-0.7 >=x11-libs/libXcomposite-0.2 >=gnome-base/gsettings-desktop-schemas-3.21.4[introspection?] gnome-base/gnome-desktop:3= >sys-power/upower-0.99:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXinerama >=x11-libs/libXrandr-1.5 x11-libs/libXrender x11-libs/libxcb x11-libs/libxkbfile >=x11-libs/libxkbcommon-0.4.3[X] x11-misc/xkeyboard-config gnome-extra/zenity media-libs/mesa[egl] gles2? ( media-libs/mesa[gles2] ) input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) introspection? ( >=dev-libs/gobject-introspection-1.42:= ) udev? ( >=virtual/libgudev-232:= ) wayland? ( >=dev-libs/libinput-1.4 >=dev-libs/wayland-1.6.90 >=dev-libs/wayland-protocols-1.7 >=media-libs/mesa-10.3[egl,gbm,wayland] sys-apps/systemd >=virtual/libgudev-232:= >=virtual/libudev-136:= x11-base/xorg-server[wayland] x11-libs/libdrm:= ) !x11-misc/expocity
 SLOT=0/0
 SRC_URI=mirror://gnome/sources/mutter/3.24/mutter-3.24.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=04cb6f592ceb6f5dada2198a29f7725f
+_md5_=f504b35adc4e4194b27d5e68d45c8f97
diff --git a/metadata/md5-cache/xfce-base/Manifest.gz b/metadata/md5-cache/xfce-base/Manifest.gz
index 16125c897987..f601e142afac 100644
--- a/metadata/md5-cache/xfce-base/Manifest.gz
+++ b/metadata/md5-cache/xfce-base/Manifest.gz
diff --git a/metadata/md5-cache/xfce-base/thunar-1.7.0 b/metadata/md5-cache/xfce-base/thunar-1.7.0
index 2bf26b43c9b4..c2ddd3c476e3 100644
--- a/metadata/md5-cache/xfce-base/thunar-1.7.0
+++ b/metadata/md5-cache/xfce-base/thunar-1.7.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install postinst postrm test
-DEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.30:= >=x11-libs/gdk-pixbuf-2.14:= >=x11-libs/gtk+-3.20:3= >=xfce-base/exo-0.10:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfconf-4.12:= exif? ( >=media-libs/libexif-0.6.19:= ) introspection? ( dev-libs/gobject-introspection:= ) libnotify? ( >=x11-libs/libnotify-0.7:= ) pcre? ( >=dev-libs/libpcre-6:= ) trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= ) udisks? ( virtual/libgudev:= ) dev-util/intltool sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.30:= >=x11-libs/gdk-pixbuf-2.14:= >=x11-libs/gtk+-3.20:3= >=xfce-base/exo-0.11:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfconf-4.12:= exif? ( >=media-libs/libexif-0.6.19:= ) introspection? ( dev-libs/gobject-introspection:= ) libnotify? ( >=x11-libs/libnotify-0.7:= ) pcre? ( >=dev-libs/libpcre-6:= ) trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= ) udisks? ( virtual/libgudev:= ) dev-util/intltool sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=File manager for the Xfce desktop environment
 EAPI=6
 HOMEPAGE=https://www.xfce.org/projects/ https://docs.xfce.org/xfce/thunar/start
 IUSE=exif introspection libnotify pcre test +trash-panel-plugin udisks test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2 LGPL-2
-RDEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.30:= >=x11-libs/gdk-pixbuf-2.14:= >=x11-libs/gtk+-3.20:3= >=xfce-base/exo-0.10:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfconf-4.12:= exif? ( >=media-libs/libexif-0.6.19:= ) introspection? ( dev-libs/gobject-introspection:= ) libnotify? ( >=x11-libs/libnotify-0.7:= ) pcre? ( >=dev-libs/libpcre-6:= ) trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= ) udisks? ( virtual/libgudev:= ) >=dev-util/desktop-file-utils-0.20-r1 x11-misc/shared-mime-info trash-panel-plugin? ( >=gnome-base/gvfs-1.18.3 ) udisks? ( virtual/udev >=gnome-base/gvfs-1.18.3[udisks,udev] )
+RDEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.30:= >=x11-libs/gdk-pixbuf-2.14:= >=x11-libs/gtk+-3.20:3= >=xfce-base/exo-0.11:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfconf-4.12:= exif? ( >=media-libs/libexif-0.6.19:= ) introspection? ( dev-libs/gobject-introspection:= ) libnotify? ( >=x11-libs/libnotify-0.7:= ) pcre? ( >=dev-libs/libpcre-6:= ) trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= ) udisks? ( virtual/libgudev:= ) >=dev-util/desktop-file-utils-0.20-r1 x11-misc/shared-mime-info trash-panel-plugin? ( >=gnome-base/gvfs-1.18.3 ) udisks? ( virtual/udev >=gnome-base/gvfs-1.18.3[udisks,udev] )
 SLOT=0
 SRC_URI=mirror://xfce/src/xfce/thunar/1.7/Thunar-1.7.0.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1156a06875a92ab5796b2989163bd73f
+_md5_=2d95986664e298bb97e1c3186863339e
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 191217c18379..c6230b7ab717 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 19029 BLAKE2B ce06494761e0d519b11c6e90add9344a529739b54c9ed439c6eb0d3079283090966ce78b3efa765cef03592f2eaec8c4c45822e3207427dcebc59e2f0903d3f6 SHA512 8d6322320c30905299bf49afe5ddebe7341c62d7ac02b6106a345e4a6a33d933c49dd510b54c28fe6aa6d79991d2e352cd49e7bf4ed3e8baa812bdd04b33f2bf
-TIMESTAMP 2018-01-26T14:38:30Z
+TIMESTAMP 2018-01-27T17:08:31Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlprPWdfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlpssg9fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klA1FA//fxuvUCzjmAOJ/FhdX9dt7N1YVBvWEae18FJE42ikcC7AbjwvjRw35JHT
-4JljzmvT3R5aDw/7UDdx4azESMhqcIrvaYTdSIdPbHlNo7cwTRgbpDYNQCTVWUeT
-ADRvuSnKwKJ2voK85OamhdC0Seu5ufjzLXLChvXPhvZGVjFl6jBf6bqMXC+e9uTU
-rsyTo+oN828wHGpi5xk1vLFwaUx5VVCug/CXJ0+1oA4sENR+hwt3FbzqnfHtSKzV
-DR1UZ5DVAb2Oo/q5TX6Ejb4Y6apQRN80ZWEsFgddat/1bniT8X20kPuGkyxhEmGQ
-Y1QAvyIfI9dTVZ008A3qGXf13oBf9gR0a5Z22a/DtWL/7399BSlnMbeTHHNaEbzl
-pmcBU44ada1gzX23GbWH6cd3KvgkKHrqSqeR67rCOxcGTbpoPcoiUpub6uYtJjur
-wj9iJIFKABMpGGHW1TcILqVWQxoolhpqtD5ijf+SEwsxmwALKiIFN4s1ijhKw6RD
-KBs0g3lA+dxKVqLQoqI61ISvzpjbwqgfUlNeMSQX+BN81nMuA7d2rHZTRpESBY8U
-Sk4sVdfK6Sd5ZDYM38qusn25O+hT4RWzArAwJvGIFV+xePLYGDmsBhSryJMljHMD
-PX61c0Z+vWcMc+PClpFl7gTJQ3rrDTvB+1uUhiry3PFbU8yg0P8=
-=8xqv
+klANBhAApPRLOAQMhmFCU0RaaIxdGSBOUmBeOPFbXp7795rNbJM41pm+ybauJ5IL
+jztaj1VNkwY1dJCDiCND2l8OFzbR5EyebPf+6OXx6sv8xx9dLSZfTBDH4YmFUq1o
+Slka69XvionvoJSbIAdr2kbKHZaNKWZg2V0yB7A6Im2tQzZrl/UGByRUqchubF9F
+AGiMexjZ6/vjvvUnuUoajWqOyHn/zrTuWTeiOvYve/vCwSrAVgRNIum6k7pHlqeL
+XNkRoeueV43ir2A49gwYfJLjtKztu++qjj8Qfs8cRYi1S277E26xy11nZo0l9pV0
+uqIskTrI3zXDZYQPl80kXMsE4Gt8tyHeIi7XP2yyvA3iQoJlND6hI/BsU8Px7KZ0
+ifbQoPwxCU4PD0oST/BwrPtf1FXg8KcUiZymGvzsUUm1/F+7k+QeIckj1t4JM3bG
+1TLGQeGYQF1MVbc4eA0X0EjnRGZoPNuaE/rSlvrJAbvBtT2ZGlecvVEjwXwhnofF
+zZE8P40uSwJgiKwRv+s1dxTcLUyK6KLHL2Wf/Bkq5EPJn/XsO0BRZCZyIjS8U3Mg
+/StMb4ZpxPYIYtO3vSased7gajbB6U/6SUDmHBOj+w0kVnswUPzist6DJf3tBYZQ
+4Qq8cAMKTdxofaYrc0SCqpdhL97/Sl6t5pzbxL0GpIrapCFmgrg=
+=QIOB
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 3e5d4982e927..d12dcf7f326f 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 26 Jan 2018 14:38:27 +0000
+Sat, 27 Jan 2018 17:08:28 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 4857b00fcef0..e05f8da620b3 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Jan 26 14:38:27 UTC 2018
+Sat Jan 27 17:08:27 UTC 2018
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 6d48f430265c..4d536cbe709e 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 26 Jan 2018 14:45:01 +0000
+Sat, 27 Jan 2018 17:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 8b1afe32161a..83276ad69eb8 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-18d0514b77b1b7b801c701fac504b7abcd9a2fc3 1516976320 2018-01-26T14:18:40+00:00
+9ad40f06da1793d05f68455d43ba7454064cb8c7 1517071739 2018-01-27T16:48:59+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index e67d30f36ab4..46251abc89d8 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1516977302 Fri 26 Jan 2018 02:35:02 PM UTC
+1517072701 Sat 27 Jan 2018 05:05:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 3e5d4982e927..b1ecf81c32cc 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 26 Jan 2018 14:38:27 +0000
+Sat, 27 Jan 2018 17:08:27 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 2bf5e5370820..2dc84eb9127f 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/sslscan/Manifest b/net-analyzer/sslscan/Manifest
index 3f1f094e30f5..6f83f36296ff 100644
--- a/net-analyzer/sslscan/Manifest
+++ b/net-analyzer/sslscan/Manifest
@@ -1,10 +1,7 @@
-DIST openssl-1.0.2k.tar.gz 5309236 BLAKE2B 97069b9c7aaab2381ae5be989caff6907cd44ab1831d84685c3421ad985889a2bbc3a462decdff9c4c158ace96975de2b9e49e4f1b9f306990c3dc0f03767dad SHA512 0d314b42352f4b1df2c40ca1094abc7e9ad684c5c35ea997efdd58204c70f22a1abcb17291820f0fff3769620a4e06906034203d31eb1a4d540df3e0db294016
 DIST sslscan-1.11.10-rbsec-openssl.tar.gz 5523414 BLAKE2B 4cadd45ac8c41983ca79ec994b3bc5cafbacd02ea4b0336eead2dc8e77f6c2c0a39e5c6c07c7e12f16e92a753e3ee352a60148ea0a402b5b57f24b39be184a2e SHA512 e0ab14cd20bf8251defb685ca1384564f5f3624a8168608bed476f8d77ae4fd9096eacc36c0f271fc281d2d9070d25fa9e56ebf993321e06d6954e40c28537a7
 DIST sslscan-1.11.10-rbsec.tar.gz 52108 BLAKE2B db78ae281149da451cc2f6f60d8379d50bc2707b18b605960783dc90c75e365ee849435dfe982f6b3f3e33d1f99855f1a147754a97db2b58a82e67342a593c35 SHA512 802be7ad5289fb56b2902c69e2c831b5d8cacc01d650353b29c839e0ce4ae03e55656fa5d481c213b5162fc71b2a82da19b0ea34f6d86c34278c275a2bb73a7a
 DIST sslscan-1.11.11-rbsec-openssl.tar.gz 5523256 BLAKE2B d8f5aa8bf748310fe1186ec9ab74ecc33425d6fa3db709d94516780d4efadbdd9cf6358798796704dfeb4032ec615298f3b67c8150e314f1e79a4d826c2589b7 SHA512 9bfdac0b6dcbb9e932ef41db9753f7298cf38ddc18731386968289114fd5ed10d81e95523d557b42b431377638d2f62fb710189e7d944ba89979fe5e3437fd3f
 DIST sslscan-1.11.11-rbsec.tar.gz 53432 BLAKE2B 08be7c5a4126e8dee85adb48bd5d55f5e7931820462a18fe904439edc8fc690d60379c53c436d4953f9fbbb94c4e47eebd3fd48867b00d5819ba651569c99b7b SHA512 9492f1460b45212f80a19364c284ef2a11ad0c343bb324447ec519685d52805104d95a7817fda4d43af98ce2be2edede889e6ae83eab37d75be0ab46dca29d72
-DIST sslscan-1.11.9-rbsec.tar.gz 52215 BLAKE2B 8f2a28beb0a0c08f469ba473821e73420e593bb7d627064df520bb3e49311b426ebf3d94d255b3902cdf4eca167c1f54092d923f637bfd8c00eac8a84108ae61 SHA512 ed2ca15c185a36c166bec640f1771114ce845c0a84a6490aeca8170b8623ad3c370515c25079bb1f29fce79e3b24186fd298d72cc101d9076e4d7984a1202938
 EBUILD sslscan-1.11.10.ebuild 1303 BLAKE2B 2c39f37ed0ad85e4e2a3f76e5b47a29906e2d50150f96686b2466fd5ebb7a364bf9355cf155434720967e1430c6363eaf1b468bbb884039914504038f2bf6085 SHA512 f11f67b88a4577a70c684584e70b6bf75e8498a3b48fc9ed7f07601ce97415375ab3136577e3b4feabc3ebe02d711de3b76b4b14715b2831a4312d517f0d43a4
 EBUILD sslscan-1.11.11.ebuild 1163 BLAKE2B 7bccef3a83ed1a8c7d914dd0959beb92d4402f1c141df390bd209ad7c77eaf7e2346c6547305a7dbf471e0d091199b70e4fbc1583b1076a13ff6c4bb21225400 SHA512 d86e6c4ea2e1437b63956e37d26c3240e71386c2e0dce98edd8077bd8aafb1c7b1ca4d2b8c3cb87250d51af6fa24a86e13992679ebbdd07d3667fa7171cbe920
-EBUILD sslscan-1.11.9.ebuild 1110 BLAKE2B e1036f2fdfbb28cc53826e7b48e931ae6b35f4cd8c709ccaaf51e87b13432a24e3493a09bea49ca8d778952498a74858532aea43b5d52ddf630af2bd9d902b3e SHA512 bcc11d8cf25284ee634e36bd4d9bc5fee8a98154064b0a9cbc01f969a1a9933a4e864a64a7b744a26a2c1d661e9b3709ab6519cd72ba9fc4bfc9be14e7273ca5
 MISC metadata.xml 295 BLAKE2B 4aed9a7658ee65ef0630a49abe71b2ab860377365b040ea0e19dfd8069f05e64cdab2c93fdf95276ad4087c247a18c195d05c81d90226ab6e753950fafce846e SHA512 561d272316db60726db149ffd3f77a59ed4fd7d16dd96e8064e1994666812d5056180965ef93939904ae653e0aa2cbc04621f5700464d5115490d56c24354bb4
diff --git a/net-analyzer/sslscan/sslscan-1.11.9.ebuild b/net-analyzer/sslscan/sslscan-1.11.9.ebuild
deleted file mode 100644
index bb6a781952f1..000000000000
--- a/net-analyzer/sslscan/sslscan-1.11.9.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-OPENSSL_V=1.0.2k
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Fast SSL configuration scanner"
-HOMEPAGE="https://github.com/rbsec/sslscan"
-MY_FORK="rbsec"
-SRC_URI="https://github.com/${MY_FORK}/${PN}/archive/${PV}-${MY_FORK}.tar.gz -> ${P}-${MY_FORK}.tar.gz
-	static? ( mirror://openssl/source/openssl-${OPENSSL_V}.tar.gz )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="libressl +static"
-
-# Depend on -bindist since sslscan unconditionally requires elliptic
-# curve support, bug 491102
-DEPEND="!libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P}-${MY_FORK}"
-
-src_prepare() {
-	if use static; then
-		ln -s ../openssl-${OPENSSL_V} openssl || die
-		touch .openssl_is_fresh || die
-
-		sed -i -e '/openssl\/.git/,/fi/d' \
-			-e '/openssl test/d' Makefile || die
-
-	fi
-
-	default
-}
-
-src_compile() {
-	if use static; then
-		emake static
-	else
-		emake
-	fi
-}
-
-src_install() {
-	DESTDIR="${D}" emake install
-
-	dodoc Changelog README.md
-}
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 4a0d00eded93..61f0aff76693 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index bc967b7a6ffe..f39f929a4863 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -3,5 +3,5 @@ AUX bind-tools-9.5.0_p1-lwconfig.patch 1856 BLAKE2B 3f65aaf584ced53a098cd9536eb4
 DIST bind-9.11.1-P3.tar.gz 9749095 BLAKE2B 1b68b57b9aed1a5210464e9c47a4e0569f1932076c042a7096dc04f69b45da9df8b2d56ec0f1f0d0fb136e7f61a39b3cb20d1912075f3a4138cbdf47f859cf0a SHA512 bf92ce1e07e5c84cc42b413bdbd3ad97f37712a6dc330dc10182992d948b7a393d5446efa188379b39020c34d810cebe2a7acccc9b8aa6bb564e1f3e6be42e96
 DIST bind-9.11.2_p1.tar.gz 9783329 BLAKE2B 5a3bbd87112064231bd5e6b09ebb4014f9d5cf65cb601c03555ff540a22d87aec3990cd8e37ce5ff09e9a149bdf122d20ecb01f87731e6c79d80379a6926014f SHA512 168f27f580e3be2f7ada27afa2f72e715e750eec76831cf01bd32fabc1fa65dc29dab0eb7ed1682b076d3be99269897ddbc2c10551631a3911d9e5ae1aa40597
 EBUILD bind-tools-9.11.1_p3.ebuild 3188 BLAKE2B b312b7c843926fd4efc2c72faed439f3b83008db49d79a556741989361e5c7c2781b2cec328d117f19f9b60a85a10e305e7849d7117da4327bc159ed458ab48c SHA512 7915e28f89343b3aa70b7855bb241b336c6c5181cd1d1d552cd7e52540fe945bca3dcfaa1b0b7651c6c9e6dd0ce5fa42e52a2cb493e60ce948a14a682c57cbbd
-EBUILD bind-tools-9.11.2_p1.ebuild 3152 BLAKE2B 025d406f8402012210c9bfa698ba6bbe33c482becbfec5e73fa842a5d0228d3291a36a234601567088e2b7151ea5d557b364b832555820bb78f1082c87b8e800 SHA512 699991b8c2a93d3285bc9e1850e94707e4f483d47777fef31408e3470a096105383758676cc0842e10a06f5290f7b5e7f7632174828c8e34a55ae9d13f54ebc0
+EBUILD bind-tools-9.11.2_p1.ebuild 3151 BLAKE2B 0d7c46f4d5fb7087fb69b24cbe90a08023be1ca111861b8a534c323781c38d601d082741aaa60f2a725dcecfa93d38894c44d0a2e06c245fa7787d4809968567 SHA512 1f40a37eca5b58300b2b9b7c5bbd80ee17ba987c185e71175b0bcaa3b0d27617b9fb72ad47f65b5692dd53e1059cdd5b5e537c0432e1413527af8127bf8f64c3
 MISC metadata.xml 513 BLAKE2B bfb78568f9c2b262000c297e06791ddee8455c24a29e0fc822e272ed7d1cc3b90cd106f4faf3eff1da3824aca8dbe359b7fb3f767d72a967464edc649728066e SHA512 5c817f1afce4f096d912de9f0cd82b92e2b97f86db24de5eae8aa1a877c78e1800582b4615666c43f139049e179dbc30134692d7039517f97cf53ba9a2dcbd4d
diff --git a/net-dns/bind-tools/bind-tools-9.11.2_p1.ebuild b/net-dns/bind-tools/bind-tools-9.11.2_p1.ebuild
index c91aa87a3b6b..4ec43afe6ce8 100644
--- a/net-dns/bind-tools/bind-tools-9.11.2_p1.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.11.2_p1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.isc.org/downloads/file/${MY_P}/?version=tar-gz -> ${MY_PN}-
 
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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 ~m68k ~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"
 IUSE="doc gost gssapi idn ipv6 libressl readline seccomp ssl urandom xml"
 # no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
 
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 8cc2cffd57cb..68bdd4ea087b 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -12,5 +12,5 @@ DIST bind-9.11.1-P3.tar.gz 9749095 BLAKE2B 1b68b57b9aed1a5210464e9c47a4e0569f193
 DIST bind-9.11.2_p1.tar.gz 9783329 BLAKE2B 5a3bbd87112064231bd5e6b09ebb4014f9d5cf65cb601c03555ff540a22d87aec3990cd8e37ce5ff09e9a149bdf122d20ecb01f87731e6c79d80379a6926014f SHA512 168f27f580e3be2f7ada27afa2f72e715e750eec76831cf01bd32fabc1fa65dc29dab0eb7ed1682b076d3be99269897ddbc2c10551631a3911d9e5ae1aa40597
 DIST dyndns-samples.tbz2 22866 BLAKE2B 409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac
 EBUILD bind-9.11.1_p3.ebuild 12500 BLAKE2B 2c1f6df537c01239c7f08421f76bb3a57b24215703c67833f86415c06cdc0ad8bc78bba68cc56fe3658456c4ade80e2a9a4f225f701f09764d4b20fb8515b029 SHA512 618cf728933b41521cf50c0e6c3d40f596d8fe4ca3c0f1725051e8f3d05800e9ff9e9b67c35719086c723e37efca22f0d42ff40eaab989557b14a9fd772d3d5d
-EBUILD bind-9.11.2_p1.ebuild 12454 BLAKE2B 5fd095c8734fe27a490444bdbf36c4e697db0b65810a1ece110b9c1fa31b9f921bbd8abc719657523052cc1e3a13d6f21560b8dbba5e292f4124e9803d7e4468 SHA512 2257e8533427d6dd6e33c85a275ba10e564565c2f3d10e31d8c864748cad7ba5e819800ba8c9ebbae6e4082d37b8404a0a5a16dce4fa77dcb4ab79c9c5e02363
+EBUILD bind-9.11.2_p1.ebuild 12453 BLAKE2B ca284c6afe3803d9a7b1100df118858c31b258c0b844112b25cb1f26f2255d67c1bbce4833827bbf4a6fb1e883ec197d5456c7429bdd34ddd487bf4602c0564c SHA512 4150e7136fca5aa6b1f674ed7031eb1d7c9f709e7bdf29a5b9486acc44748eb0371bcadf5bc09c6333ef62d43241a2f8b2d742eca66396a1c0bf604a16ecc54e
 MISC metadata.xml 1085 BLAKE2B 2de8c47ab09298e6d526d2b3d19fcdde83aa7975918acabca68243f690c90ed2a656073b047c7d032b53acad70a8a08b3d95c0e1ce143d28cb9ac2729b0b738e SHA512 a04b103703aaebc79738193b378f94df74461e918bf8fa7a99459e42b41b59a1b294113040cf5892d77b4c7c31b1448d9869b53cd2a9fb2f885ab1a1a6ba2f3b
diff --git a/net-dns/bind/bind-9.11.2_p1.ebuild b/net-dns/bind/bind-9.11.2_p1.ebuild
index b5e999209ff2..4f0dde8aa52c 100644
--- a/net-dns/bind/bind-9.11.2_p1.ebuild
+++ b/net-dns/bind/bind-9.11.2_p1.ebuild
@@ -38,7 +38,7 @@ SRC_URI="https://www.isc.org/downloads/file/${MY_P}/?version=tar-gz -> ${P}.tar.
 
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # -berkdb by default re bug 602682
 IUSE="-berkdb +caps dlz dnstap doc filter-aaaa fixed-rrset geoip gost gssapi idn ipv6
 json ldap libressl lmdb mysql nslint odbc postgres python rpz seccomp selinux ssl static-libs
diff --git a/net-dns/libidn/Manifest b/net-dns/libidn/Manifest
index 8f976d8043c3..ecdd9f2d19a8 100644
--- a/net-dns/libidn/Manifest
+++ b/net-dns/libidn/Manifest
@@ -3,6 +3,6 @@ AUX libidn-1.33-CVE-2017-14062.patch 2348 BLAKE2B 4f9606d25405d950f23444886e4230
 AUX libidn-1.33-parallel-make.patch 3584 BLAKE2B fbd1f372b11bc1da38bdeb3a8c0f01708339e0a7c23da7f22b450985a2b69c31887a5f686430e5014d1a5c116ae7e03b922c0350f3926e5a43e5cbc6cdbbfb83 SHA512 de98b4122c272bcd38a673beab8da56fac5b4c877d4bc0930505979addf4cc4e85fcf065ee9044d1196e83b1d2d5389ee8dceac4ffe7bf623a3f3c7bc7aca4f1
 DIST libidn-1.33.tar.gz 3501056 BLAKE2B ce6319dc61dd825cf7ddb33f4279c178709e16ce2815c3d1a464bba6b5c6cc493107a10a686f349247a0d6023b1b834a650046e68da9f2f559870dba13a59384 SHA512 38dd459eaeda0c9e3cc2d24d967113515a499747550a2a9157f32357def90d71a3a3b52398e96a44a28cd5948dc353b0473c4ff0453a69720191c4cb49cac2c6
 EBUILD libidn-1.33-r1.ebuild 2973 BLAKE2B c34576f6c0104090b1c2a1602028d60ef6199973e13209b28e434fc69fa2a47980ba2132a2ab0265b0a96f40044ee4b0a9d3fb577534485ab8c9ff7ee1dc5f03 SHA512 b77bb63c075538a59ccdbefd9ccdbd4059ada9efc899482d9b793a10f81ef6f582f9aada266cc4537f3c403b0b3dcacd50f7896a271a283f0c90b3729e0bc9ef
-EBUILD libidn-1.33-r2.ebuild 3020 BLAKE2B 7132cac94f93da3b750022983e41448be7b309c41ae768d596d5568bea452d43d415c20a11061c7e711cf6966f6cf75770894252649dd9b51c4b1a7e4b58f88e SHA512 b6de4cd4ad233aa34117473687ce0fb2a8858ccaf900a22709895fae2c0ee12710950edd962b0acf52a2ca04857e7b16d4437f09bc90c6bb9ac93440faac25d0
+EBUILD libidn-1.33-r2.ebuild 3019 BLAKE2B fea3181de64813585c11f8734918fa11fa59d13efbb3c5dc3c0e4319380c9fb43ed8c4d2b589b31def684f3aedf62940248b0f2e688ecaf9783393c6d7d6c81c SHA512 4f0afe275b92645ea86670b1dd2571d09e7dc2c2f7c01139dd5293085457c96c2d66752e294e81add75d04fdaa243e835e8df57c16438cdb0848698c5a668865
 EBUILD libidn-1.33.ebuild 2793 BLAKE2B 0d451ba20b772d3343503a122c92a5de5f98a67e3e95246adb2220f03ec9a96b887704c0bfd40fab0eecec3839f43705e00c19949fe7760a187b4d0a49b7b71f SHA512 56ea6fce689533f562410a2a3e15328873c76c6b1e231a3272162ea7c786369fec86e0332785d0170b81632126c75c2adbf880da7e9ee9152eb4548eb3b0ca5d
 MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
diff --git a/net-dns/libidn/libidn-1.33-r2.ebuild b/net-dns/libidn/libidn-1.33-r2.ebuild
index fbb9668bd66c..bc3d9c7c48ab 100644
--- a/net-dns/libidn/libidn-1.33-r2.ebuild
+++ b/net-dns/libidn/libidn-1.33-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/libidn/${P}.tar.gz"
 
 LICENSE="GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs java mono nls static-libs"
 
 DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS TODO )
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 2a64ad34d3ee..e4a75c592357 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/polari/Manifest b/net-irc/polari/Manifest
index 6f73579fb43b..7255ac7e5245 100644
--- a/net-irc/polari/Manifest
+++ b/net-irc/polari/Manifest
@@ -1,5 +1,5 @@
 DIST polari-3.22.2.tar.xz 617316 BLAKE2B 3eca7e01270f02973e90188a81a15215e5fc8cca19b684dec7185d906d6312a5188a0b67c7b664c708a6cac4ab58516c20f3c47efa2db0d0324ad86d145cdc42 SHA512 36bc3b506c73f5d27c32430a19134c2b147f6344840d3cd3ee2bee14369f4c8fc87b30445fbb8186e0dc79fbc8336985d6ef2e018c9a1f8809f06ee7ac68c876
 DIST polari-3.24.2.tar.xz 804160 BLAKE2B c0e651d478cf814d1e055ef196ea725a17c50ee4836df7939b73dc59bbea0f74d8dbf6ceebd07b3748b6814fa52ae8a300515ac8f6952f59546e7c27ed35d6da SHA512 23a475d657556e7f4e93dde8e545bf7bede227635d540bd006b85b068923d87e713bd05f14d8ccde458bf6efd4920665bca02ea41c4de870680581ebfa595f0e
 EBUILD polari-3.22.2.ebuild 795 BLAKE2B b4143a1f794a399ffeb0f894e0d6a7b58ec5be374b55f6f93bfc09900ce396a829fc77af04e04842592f0257cef05595a13a41a272188473f6453e4040c120a8 SHA512 863e10ad80d9a587a7bdc02dfad147d9c873dc0895d60de71bd4d682a1690c2d5b83e437658af6fedb33ba3d1251568954eeb893acaf1dda48b6e17bdba2fbbe
-EBUILD polari-3.24.2.ebuild 867 BLAKE2B 34d4c8212eed94d20655c992c90c6371a7eac6c8457c5666f12fcd3af5b8da72dfcbce9525383eab2ee6cc6e7be3c280ce70360b50fe85b8ec89768aada74bea SHA512 25a32c59060f6babd8de727e3eef7e3186234c7231974ef3a29407de85671efd45cb2424f09118c8095a2e8408637de5d0301b93366f6756518848a2ae20d9ac
+EBUILD polari-3.24.2.ebuild 866 BLAKE2B b17a5c9cdbbcc9b81de2585570104dc0472916805a8a86c1e414bd9dccabe3db0500f2e0188abc2fe24d5a709a647c0f408f4a19952d0e25893520f82a95a636 SHA512 a27466f037ee91f9cd3ab512bb586a5df13fd50da3b6fa30354316dbf4918ee8190b80113e015049b878b3a11b3efbd8acce852946b1e65d0831cb4be2b6b953
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-irc/polari/polari-3.24.2.ebuild b/net-irc/polari/polari-3.24.2.ebuild
index 53aa5a3fb5ce..7b11a06be695 100644
--- a/net-irc/polari/polari-3.24.2.ebuild
+++ b/net-irc/polari/polari-3.24.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Polari"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index e2a3d9b7d0f6..203d0d1cf86f 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/gnome-online-accounts/Manifest b/net-libs/gnome-online-accounts/Manifest
index c42fc58a473d..106c73c54c4b 100644
--- a/net-libs/gnome-online-accounts/Manifest
+++ b/net-libs/gnome-online-accounts/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-online-accounts-3.22.7.tar.xz 1404820 BLAKE2B 7a9bd80c5a240ff7172dda5cfe93fa7410b83e7f3b14c615a465b322d5ee07b220773c7424e8dd4c2e0dcacbd11545cfa968f247e545a9eaa530e6d2ecebfb72 SHA512 76a5b6897540f05126786caeddd392d465063571e3884484aa68cd66de851f2f72351afe74dd7e38d8fb8a628d57bd8dde0c8379f909f9de19e451cdf9112b67
 DIST gnome-online-accounts-3.24.4.tar.xz 1412004 BLAKE2B 96e92eefeedb94563af755367b4932469d8a55bd545324bb1ebffb4798bd0a499aafe9523abc7c707342b1c78f912c499335708dfb3f9a149567b64877f0bbd9 SHA512 6e12f03d3ff9b9c831705f0310923b2c3e0daeee1304bb3dfa52fd17d6df49656f3380a1ffd9f30f75890340fb7ee23f53789e4df357a0aeba4e31667fd9c45a
 EBUILD gnome-online-accounts-3.22.7.ebuild 2471 BLAKE2B 91861dafa0a3d5a4bca7664fcbd4a0f4b75942babd2763e5e2b0e2932a6c803597bd1869a22bd6a96d032f197aee5c33ece56e45acd2bc1f21cfa78fc9ba9a8a SHA512 b41c1207d37f821942ea448cc9cb69aee186b16888c2da5177790eac7cbd76a1d8672dfe2711d95903c87428616853aacdaae6bdc2711b3518dd20a069786005
-EBUILD gnome-online-accounts-3.24.4.ebuild 2472 BLAKE2B 97b454a3efe7a14b1568be3588ffe3af8f14de2f26f38b92c3a4f5008c5cda5d46023ec2837a883c9b73c4108b0703f10a86e7bbc02e095c2290e6c86e9bae5b SHA512 90c67ff61cf2ea918007d0bf40c4ea83205e1e44870b3ba96bd64ebe7215f1ba636b9d33701d472e84d810dddac2fccc437a38707ba814316921124f40e1b517
+EBUILD gnome-online-accounts-3.24.4.ebuild 2471 BLAKE2B d5748c5b547daaba2a7eddd8141219d00f102f3522bfd3e7d03547db3a7114a9fb739a7d93a642fdcca6a549734ca4c20bd724fbd2d72b9453d8eae407f143fb SHA512 a7356397015414a0a4908eef03f38cb96286268bda14a82bb996ef2df1bdfde5969b0761b0f4a7ded9c4e4d065f682f16f60559b3af6b946fdb53cfc6b56531d
 MISC metadata.xml 473 BLAKE2B 316b4409acb16dbde8349acb5bbdeee6cfe96968bb15e90a2c3d96346f6ead282993a48e6b5ea201d9f0b3293e68259b7cd99bab1399cb6a92e1a0cc7291c197 SHA512 fe0bb40a0e1962c67a0208b6c2b9603ae37966b4427b5141efa7f63163fff3eed542a58400c0ac31e508589074c80d130de56733b55c7b10270e2e89de093a03
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.24.4.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.24.4.ebuild
index 4db7224a62ae..728d55bc04df 100644
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.24.4.ebuild
+++ b/net-libs/gnome-online-accounts/gnome-online-accounts-3.24.4.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
 
 LICENSE="LGPL-2+"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 IUSE="debug gnome +introspection kerberos vala" # telepathy"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/net-libs/h323plus/Manifest b/net-libs/h323plus/Manifest
deleted file mode 100644
index 7f6267b83722..000000000000
--- a/net-libs/h323plus/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX h323plus-1.25.0-ptlib-2.10.10.patch 668 BLAKE2B 1b9681e4fe23141c5160dac0124944603a32e5dcd88d0ae9e2fd24e3ea9ee2a7e6aaeb768d46bf9e6e636cdceab7fd0db2dcc8e8f309c49999cbf5b053b05f05 SHA512 8c1c1777663a77fbe38d3c033ca388c3dbfaeeef2665a5564d8f482bbe26146d6f79be71100fb395dc35c33fcccda9c6eb0a4cfe9746aa968933e287343b1c93
-AUX h323plus-1.25.0-ptrace-debugoptionlist.patch 470 BLAKE2B 9b632864138a891e38c3f95bf487b4faf035ebbcf452cd223b5c10ab5294fcbf3437ec84d7fdaaa9dae78da0bd2f5bf87bfe1657645e1ab60cecddc99ba4d914 SHA512 a12809c96ad236a1c3d9aed07976ea64653227f612676f0bac34fde6638e1719ade9fbd31e54f601c6dcefb52170788cead570b6dfdd2e1763b7b55d85e3d9ba
-AUX h323plus-1.25.0-ptrace-param.patch 598 BLAKE2B c81a1048811905c76cea9163e03e157b917cc462ea97db9e49d9c5bcd4393aca6e866dad84d694e2f9e711bfee0e37ca46867a461f4834b0136ed92e928cc86f SHA512 b51686ec30930cbf4749f233625a9f26651f7a93570468e70ff7e423fc74508f0495b74e565ff7f907a2e775572a54dc7253ebe8434e1d4f5a2b1b990638c09d
-DIST h323plus-v1_25_0.tar.gz 4193136 BLAKE2B 341458e146cef9a006a990ae04749c4f18dfeababb07fee69eaf19a72fb5509d76e8eccb553ecf91b9b13123b485b40be8dc96c7c797706f516b7ff36db83a32 SHA512 f0b8b26a0062eadc183af60d25302f95d06720dffe23f0bc0c9568ce34d7aae10acef434da9e09839fe19fcdc9f7f5d47396eb7c684ef55e457556abb66a682d
-EBUILD h323plus-1.25.0-r1.ebuild 1836 BLAKE2B 816edd10d8130695001df87052a779218d00856241f8462bc76a2664454980c09c6660eef72f7b6397efd616ab37eaaf03aa2d06648b11d73e8ec0d368ce50d7 SHA512 a0cdc1e6f52db1fe609c4e673a2e18d5c463cfdc8f48409454a8ce9c9eca80586311ff2026e445d47a97d71c8ab0a6a0e621ff45b45cb8c9a6a2051747de5f36
-EBUILD h323plus-1.25.0-r2.ebuild 1882 BLAKE2B fc9ce9fdfcf3dce4461a5e34f916269f5367f79297290ab4ff7b210fadc6dd60cf4c17608821090a1590f72ad1d209afc8c5427e86e266c2b305837583f50ba4 SHA512 404ea34aa939aeb2316342afde62286f6da1790aa2b5270cfa1bf4b6334611b6814fbb2300fb4790d2db2d72e5538c3ed4b9048d8e5f54a9854f57f8757f1512
-MISC metadata.xml 429 BLAKE2B e2ead7699cf8fa757fae60249cdb08af08b85ddbcecca3932418ca5dd7832093d8d1668bcd496f9507e3dbcf85fa2cc9993c167b6c0b017318aae9abd5eeb155 SHA512 6f4be02d7183a2a7376ee3d003b91f6996f2b7d4793ee9c91bd038f584efd7f892c8e4065979f50616a9119109f62831904109e834055de2386e176f97cbdb4b
diff --git a/net-libs/h323plus/files/h323plus-1.25.0-ptlib-2.10.10.patch b/net-libs/h323plus/files/h323plus-1.25.0-ptlib-2.10.10.patch
deleted file mode 100644
index 74856a099c0f..000000000000
--- a/net-libs/h323plus/files/h323plus-1.25.0-ptlib-2.10.10.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fix macro definition for ptlib-2.10.10 compatibility
-http://lists.packetizer.com/pipermail/h323plus/2012-December/002543.html
-
-diff -ur a/include/openh323buildopts.h.in b/include/openh323buildopts.h.in
---- a/include/openh323buildopts.h.in	2012-09-21 05:53:21.000000000 +0200
-+++ b/include/openh323buildopts.h.in	2013-03-05 19:26:25.251373540 +0100
-@@ -35,7 +35,7 @@
- #include <ptbuildopts.h>
- #include <ptlib/../../revision.h>
- 
--#if PTLIB_MAJOR == 2 && PTLIB_MINOR < 10
-+#if PTLIB_MAJOR == 2 && PTLIB_MINOR <= 10
-    #define PTLIB_VER ( PTLIB_MAJOR*100 + PTLIB_MINOR*10 + PTLIB_BUILD )
- #else
-    #define PTLIB_VER ( PTLIB_MAJOR*1000 + PTLIB_MINOR*10 + PTLIB_BUILD )
diff --git a/net-libs/h323plus/files/h323plus-1.25.0-ptrace-debugoptionlist.patch b/net-libs/h323plus/files/h323plus-1.25.0-ptrace-debugoptionlist.patch
deleted file mode 100644
index 7e800f490f19..000000000000
--- a/net-libs/h323plus/files/h323plus-1.25.0-ptrace-debugoptionlist.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur a/src/h323pluginmgr.cxx b/src/h323pluginmgr.cxx
---- a/src/h323pluginmgr.cxx	2012-11-29 17:23:26.000000000 +0100
-+++ b/src/h323pluginmgr.cxx	2013-02-22 18:56:33.100356993 +0100
-@@ -1543,7 +1543,9 @@
-     PopulateMediaFormatOptions(codecDefn, fmt);
-     PopulateMediaFormatFromGenericData(fmt, 
-           (PluginCodec_H323GenericCodecData *)codecDefn->h323CapabilityData);
-+#if PTRACING
-     OpalMediaFormat::DebugOptionList(fmt);
-+#endif
-     return true;
- }
- 
diff --git a/net-libs/h323plus/files/h323plus-1.25.0-ptrace-param.patch b/net-libs/h323plus/files/h323plus-1.25.0-ptrace-param.patch
deleted file mode 100644
index c69e703f42c0..000000000000
--- a/net-libs/h323plus/files/h323plus-1.25.0-ptrace-param.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -ur a/src/rtp.cxx b/src/rtp.cxx
---- a/src/rtp.cxx	2012-12-10 18:56:08.000000000 +0100
-+++ b/src/rtp.cxx	2013-02-22 18:54:35.360358638 +0100
-@@ -1164,9 +1164,13 @@
-   return e_ProcessPacket;
- }
- 
--
-+#if PTRACING
- void RTP_Session::OnRxSenderReport(const SenderReport & PTRACE_PARAM(sender),
-                                    const ReceiverReportArray & PTRACE_PARAM(reports))
-+#else
-+void RTP_Session::OnRxSenderReport(const SenderReport & sender,
-+                                   const ReceiverReportArray & reports)
-+#endif
- {
-    userData->OnRxSenderReport(sessionID,sender,reports);
- 
diff --git a/net-libs/h323plus/h323plus-1.25.0-r1.ebuild b/net-libs/h323plus/h323plus-1.25.0-r1.ebuild
deleted file mode 100644
index cd5e799e4520..000000000000
--- a/net-libs/h323plus/h323plus-1.25.0-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-MY_P="${PN}-v${PV//./_}"
-
-DESCRIPTION="Open Source implementation of the ITU H.323 protocol, successor of OpenH323"
-HOMEPAGE="http://www.h323plus.org/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-v${PV//./_}.tar.gz"
-
-IUSE="aec debug +sound +video"
-SLOT="0/${PV}"
-LICENSE="MPL-1.1"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~sparc ~x86"
-
-DEPEND=">=net-libs/ptlib-2.6.4:=[wav]
-	aec? ( >=media-libs/speex-1.2_rc1 )
-	sound? (
-		media-sound/gsm
-		dev-libs/ilbc-rfc3951
-	)
-	video? (
-		media-libs/libtheora
-		virtual/ffmpeg
-	)"
-RDEPEND="${DEPEND}
-	!net-libs/openh323"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.25.0-ptrace-param.patch
-	epatch "${FILESDIR}"/${PN}-1.25.0-ptrace-debugoptionlist.patch
-	epatch "${FILESDIR}"/${PN}-1.25.0-ptlib-2.10.10.patch
-}
-
-src_configure() {
-	# TODO: support for h.263/h.264/sbc(bluetooth)/celt/spandsp
-	#export OPENH323DIR=${S}
-	econf \
-		PTLIB_CONFIG="${EPREFIX}/usr/bin/ptlib-config" \
-		$(use_enable video) \
-		$(use_enable sound audio) \
-		$(use_enable aec) \
-		$(use_enable debug asntracing)
-	# revision.h does not exist in ptlib(?)
-	sed -i "/revision.h/d" include/openh323buildopts.h || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR)"
-	# these should point to the right directories,
-	# openh323.org apps and others need this
-	sed -i -e "s:^OH323_LIBDIR = \$(OPENH323DIR).*:OH323_LIBDIR = /usr/$(get_libdir):" \
-		openh323u.mak || die
-	sed -i -e "s:^OH323_INCDIR = \$(OPENH323DIR).*:OH323_INCDIR = /usr/include/openh323:" \
-		openh323u.mak || die
-	# this is hardcoded now?
-	sed -i -e "s:^\(OPENH323DIR[ \t]\+=\) "${S}":\1 /usr/share/openh323:" \
-		openh323u.mak || die
-}
diff --git a/net-libs/h323plus/h323plus-1.25.0-r2.ebuild b/net-libs/h323plus/h323plus-1.25.0-r2.ebuild
deleted file mode 100644
index 6abbd14d31f1..000000000000
--- a/net-libs/h323plus/h323plus-1.25.0-r2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-MY_P="${PN}-v${PV//./_}"
-
-DESCRIPTION="Open Source implementation of the ITU H.323 protocol, successor of OpenH323"
-HOMEPAGE="http://www.h323plus.org/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-v${PV//./_}.tar.gz"
-
-IUSE="aec debug +sound +video"
-SLOT="0/${PV}"
-LICENSE="MPL-1.1"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~sparc ~x86"
-
-DEPEND=">=net-libs/ptlib-2.6.4:=[-debug,wav]
-	aec? ( >=media-libs/speex-1.2_rc1 )
-	sound? (
-		media-sound/gsm
-		dev-libs/ilbc-rfc3951
-	)
-	video? (
-		media-libs/libtheora
-		virtual/ffmpeg
-	)
-	net-nds/openldap
-	dev-libs/openssl:0="
-RDEPEND="${DEPEND}
-	!net-libs/openh323"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.25.0-ptrace-param.patch
-	epatch "${FILESDIR}"/${PN}-1.25.0-ptrace-debugoptionlist.patch
-	epatch "${FILESDIR}"/${PN}-1.25.0-ptlib-2.10.10.patch
-}
-
-src_configure() {
-	# TODO: support for h.263/h.264/sbc(bluetooth)/celt/spandsp
-	#export OPENH323DIR=${S}
-	econf \
-		PTLIB_CONFIG="${EPREFIX}/usr/bin/ptlib-config" \
-		$(use_enable video) \
-		$(use_enable sound audio) \
-		$(use_enable aec) \
-		$(use_enable debug asntracing)
-	# revision.h does not exist in ptlib(?)
-	sed -i "/revision.h/d" include/openh323buildopts.h || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR)"
-	# these should point to the right directories,
-	# openh323.org apps and others need this
-	sed -i -e "s:^OH323_LIBDIR = \$(OPENH323DIR).*:OH323_LIBDIR = /usr/$(get_libdir):" \
-		openh323u.mak || die
-	sed -i -e "s:^OH323_INCDIR = \$(OPENH323DIR).*:OH323_INCDIR = /usr/include/openh323:" \
-		openh323u.mak || die
-	# this is hardcoded now?
-	sed -i -e "s:^\(OPENH323DIR[ \t]\+=\) "${S}":\1 /usr/share/openh323:" \
-		openh323u.mak || die
-}
diff --git a/net-libs/h323plus/metadata.xml b/net-libs/h323plus/metadata.xml
deleted file mode 100644
index 304a5e0c2a93..000000000000
--- a/net-libs/h323plus/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <use>
-    <flag name="aec">Enable acoustic echo cancellation</flag>
-    <flag name="sound">Enable audio codecs</flag>
-    <flag name="video">Enable video codecs</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">h323plus</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/net-libs/libbitcoinconsensus/Manifest b/net-libs/libbitcoinconsensus/Manifest
index 57aaa6869141..56d8f3ab4dfd 100644
--- a/net-libs/libbitcoinconsensus/Manifest
+++ b/net-libs/libbitcoinconsensus/Manifest
@@ -6,5 +6,5 @@ DIST bitcoin-v0.13.2.tgz 6088472 BLAKE2B d6b13613d90d0abf33c937ec0cd003756c4984b
 DIST bitcoin-v0.15.1.tar.gz 7550228 BLAKE2B 0cbb7d0e9d0e5e8eb33502a28289c3f9c86b7c531ed179f7e3e8b601a69a423fa736238a2caae890fd8850eb505533995e578e676860a4014922fbc238185ebb SHA512 a09b6cb64a1649d11e3fd6deeb13a07b1bf4bed504a2fc1c585919459ca8ac1af8e5ecc89dee487359e831a8f12625d54f408f95bb341033d6380b82c290c0d9
 EBUILD libbitcoinconsensus-0.13.1.ebuild 608 BLAKE2B 6f6cfdf482edc19ba4708664d0a161514c13c205d0ba5f9ddfcf8492e9ab5b734ccc73ced89d196cac82cfa314dbff14900648d461886d972d0c18d3b240f110 SHA512 20581062b5cc1dd73e8334aa127b750f2b73e38544076ab77c5f9d9659d186f4d46b4e0ecf31317d16893dfef89e194eaef310e108d76115e3d8b359edb3339f
 EBUILD libbitcoinconsensus-0.13.2.ebuild 608 BLAKE2B 5536ce019cd28b55129ac466012f0d3463cc081389ce3497fda010e46a9c0ffa586a0c9f00fd80ce81463f3a77d6ad6dccf1b4959f1e8f8ac5ed1ec8b158a0b6 SHA512 62b1de1e117af3f66721df34519a40f3347e51914f0f3deab203225d684a4056e0db09a1e2c8acdcaf97b492018d6ab726f9e2b6e0b87b3200d203df9ea66348
-EBUILD libbitcoinconsensus-0.15.1.ebuild 2387 BLAKE2B 41805a2aeae89849833054571267ad0c90d20cf25570cc60e70fe2ca15abce2a482cdbe6be3b10ff8a9c682b6dcb27c844dc0628b9855440464961d46d203f7d SHA512 6912c3598f2516d583f4569bb66fcf30c8ab12e097393a3d5ee6d37ff6f890c4a002b349e0d616303bc87481b93352898327d54a288de5197af82e10bb74da77
+EBUILD libbitcoinconsensus-0.15.1.ebuild 2386 BLAKE2B 5da5ee97d5adba35f46518d85811b3a0408360d547214af6bbfaed2cbad06d5220e4a62fd6ca8eb429aadc001b002db0bd3fd12f6a687a977b9aaf5b3bc53784 SHA512 fa19b751ca150dd23153875198e9193504c08504d3ee2169871c256bb2401cb78b8858f51ac715f61ff037d7449818d9942d7ad91eea280f2db57e21e9da4149
 MISC metadata.xml 679 BLAKE2B 5283fe5aba24ba5d425e68ee4f6b1059378027c116c675d94ffdd44fab28c68ea52434df749a3a906121e2a044e296e8a26975f9653b93e693f3815bddf98d9d SHA512 3a9ccff97c3e952ec4c321184144be64daf4d9a1c03d21cc8aa454162ad1c1d133382cbbf5d21a873ea3bf746ec68c4ed0be0b81e2b562724ca9bd05f481d665
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.15.1.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.15.1.ebuild
index d83c3297cadf..58ed3be69a99 100644
--- a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.15.1.ebuild
+++ b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.15.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2010-2017 Gentoo Foundation
+# Copyright 2010-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ DESCRIPTION="Bitcoin Core consensus library"
 HOMEPAGE="http://bitcoincore.org/ http://bitcoinknots.org/"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc x86 ~amd64-linux ~x86-linux"
 
 SRC_URI="
 	https://github.com/${MyPN}/${MyPN}/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> ${MyPN}-v${PV}.tar.gz
diff --git a/net-libs/libsignon-glib/Manifest b/net-libs/libsignon-glib/Manifest
index 1151259a81b3..c2dc2fb690db 100644
--- a/net-libs/libsignon-glib/Manifest
+++ b/net-libs/libsignon-glib/Manifest
@@ -1,5 +1,5 @@
 AUX libsignon-glib-1.12-doc-disable.patch 844 BLAKE2B 600b936552c64473dfce637d60a782526a42858d3b7e3118c78ec442cb6d53e167503407d0bf3ded34024a7065d5fdbf3f487edd7e3fb701d0a009eff158d094 SHA512 690ee30d4e1d6277c0b02720212654d482173a75657da7f72c30f258921cbe790ea2d47d3de9a598be04e4ef55b995118ab5a537ed728c2735445915810f561d
 AUX libsignon-glib-1.14-default-opts.patch 1714 BLAKE2B 8c00bcf5b056cd0fe05f58ed5727569cf9b917d6e4e7e11d90bd52ef343f8b26e02f98ab463e5c2a1121ba48f0260896f1301b1446c0f26146a8e2e5d6ce3c05 SHA512 bb27417ff1dc03510fdd1f019b7b8d044a8c281243467dfa7d2fdd8123ef3290a325a7c9a96bd246f37891bd7ac9ce2702b40396ed067dbac4b9e995a89d2430
 DIST libsignon-glib-1.14.tar.gz 54019 BLAKE2B 9ffdb96a374ef0848c1b70cb369a533ea826b24856a32b4b454a0fd8982533041fcc88382fdf1eee6857aa36ec8d076885fc769a058e148e91da54dbddaf7125 SHA512 c2277933d6ec2c3288ce510c853da7719116dac15d60c7114fcdcb87d04e7f70390d066938dea6aa0f819fbd70158fb875c5be5684c47fd27c0b6c55e9467a1d
-EBUILD libsignon-glib-1.14.ebuild 1752 BLAKE2B eb39bd4d5031d29377681babdaddb090639295fa080da51fb110b94adbd31f19a1ab60f35f482e27c64e84e16070dcd8df3ec047021bc47be466393d2da6d87a SHA512 d11952359f6aacffdbd5cb91db8f91eb788bbeb6719c0cf564191453a887bd088b0437c99166c1b33a696646c96854de146a90aa91d3f910a52f2f3b60aa492f
+EBUILD libsignon-glib-1.14.ebuild 1756 BLAKE2B bb5a3f42035dee0647b6e13f040c766ab1b78210cd4fcdf39e05869e22e9a56ec9b7d4e7a10643765407a16ff173eb646b52599fc6ce6748b53d9b8cb6cb8d6a SHA512 1b11907e4a449014fa1a75ce0b06e1cc6790d9843dcf5725b4ac7bd5ce6e3ec33e8ae58702fcc5c0b0bb72eee27091528f7963a0325e55db7387ba1b776b745d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/libsignon-glib/libsignon-glib-1.14.ebuild b/net-libs/libsignon-glib/libsignon-glib-1.14.ebuild
index 4b1fc11e2067..51eecdc3d558 100644
--- a/net-libs/libsignon-glib/libsignon-glib-1.14.ebuild
+++ b/net-libs/libsignon-glib/libsignon-glib-1.14.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit autotools python-r1 vcs-snapshot xdg-utils
 
 DESCRIPTION="GLib binding for the D-Bus API provided by signond"
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index 531290cdd07b..513a1effbad8 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -1,5 +1,5 @@
 DIST libsoup-2.56.1.tar.xz 1806416 BLAKE2B eb10d76a92912dcf8f450d6e8449e2aec26936ca1b706d16351ead4174f0cc107e6a2b43b96bf75c16106f8f4b24620bfb07814162390eba195b8a9f56a338fb SHA512 5ac087eeba346c27e884a2053a4f8afdb2fc6e432527f4494024a7edc4eccdf145188a3faa64e3f4bdd98af2fcb98914e494b4ed24f92cffc2ff1485dce7d693
 DIST libsoup-2.58.2.tar.xz 1815256 BLAKE2B 23c6e40f91a2dca13fcabe4fa3af7311874cbe06962c6cdc93d8d8d0a998d29cff9e7ce61190541b6114b4996d758b7c469b0354a6012856667e9541a78177cb SHA512 85af6fac87343bdd22312518402144d33916225f60d6fa158efdd84f7ee7ed1f9895989b3558f711c9aedc93cff35a4114ad79d6d2aa19c54cb326f162a4c7de
 EBUILD libsoup-2.56.1.ebuild 2726 BLAKE2B d8451ad0baebc1441d8f9627107abbc78bdf965089b94b9286d951357641eeafef784cfb4f8b31a69510ed6b597a308a848edde02a6307e6a77cbbad7215a122 SHA512 342ca26d36901023c260c366b4dc97a003f88b397c803680aeb57de39129b48c8e12ad338673872ff315796da703ad782d4e473e658d690133247461a589b753
-EBUILD libsoup-2.58.2.ebuild 2890 BLAKE2B 9347a865b2526f0d5a53a3a13f56a02f80e03406da7d2be1a6597de595b2bf367169a8272f476b08adfbd314e63f92f02935c88c9b0b3c62cd6b214a7b32dc5d SHA512 1c7738dab99b6b9ef3f85426f3a944e130be90cd8feb6bc78b248feeb244d55b4ea51e7494365f5b00d2eb3730ceb0e35e79d6ff9cd1d27851ac1399f5c4cea8
+EBUILD libsoup-2.58.2.ebuild 2889 BLAKE2B b1fd946deb5d4b9db875d98a32a25031c8dab6f5c93df16735e841e8bc4c5199b311e61c48a44bef424a28e4f8372b3377c4d2e997c1140d46dd5aa1e7f4a18d SHA512 a696e7e6d9acc4db758e01b3a06778ae941ba95a97bb41726432e963da08786d0bbb8ec8a5ae43eedd1760a08d109ed09ecf1f6a9fd3bc1ce35a4e35b482edec
 MISC metadata.xml 402 BLAKE2B 19f91e3d9de7ec450d9c60686a443e0180d3f36c5d9508d50ef55f64924fa4b7e6f143e7fd5c25b437bd4a1d85e9a1c8aa8592b414c73935084fa6d93aa18f55 SHA512 db900ca6c6904d8c293938f6cbd25a39aa123273cf42dd6f5c670635501c81af94e0c4076ca45267c2d8861ce61b3189900b3027c6477d9e9b6d3c093006ed9f
diff --git a/net-libs/libsoup/libsoup-2.58.2.ebuild b/net-libs/libsoup/libsoup-2.58.2.ebuild
index 537c2349be01..ac2b25eaa0ea 100644
--- a/net-libs/libsoup/libsoup-2.58.2.ebuild
+++ b/net-libs/libsoup/libsoup-2.58.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ SLOT="2.4"
 IUSE="debug gssapi +introspection samba ssl test vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/opal/Manifest b/net-libs/opal/Manifest
deleted file mode 100644
index 00d20887de32..000000000000
--- a/net-libs/opal/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX opal-3.10.10-ffmpeg2-1.patch 15039 BLAKE2B 6951443ade9bbcaf2cebad4865ff63c3b99f8cc68dc0adf5400c9c95432a32243503f2c140c71e65f609e9a595dbdcaeefa13e5c21236b46960f2abda0689d5f SHA512 606eb31858505c03086e963d2f75108f7ef1e6653beb46d4bc5c8ec5672fca06c653ae82689cacd6278bad32d243c4822ba9ab87500626380ca74c39081d8a82
-AUX opal-3.10.9-disable-h323-workaround.patch 498 BLAKE2B a75a6dcea5f329ce9d5750bff4e100e7692f51379334c7e7d2a47f061479807484e30cfd9ba6626e682334fe4bd2042465532da4c4c750406ab8670df56849d7 SHA512 58e8ef12c39bce3a4d386b2b6033e1e242852bbf78371c58e91bd020cfcd95b40a9831db91fa76da431a9f8c4bb40c846b420e3a462dad77658a37c2281a9d39
-AUX opal-3.10.9-java-ruby-swig-fix.patch 874 BLAKE2B 4d78f1790265f37b0bfc86bd1009802acc5d4f7b105e2c2471b3658185a90ae719d26815bf481177e5207b82110d41fa1049f4d12af0d1aaf17d88a2722f16a5 SHA512 a7132cd6ad61d143cc11e00a048aaf66e1802890ac5fbde7ff964f99dc45a3abc79a081572cbdae5a84a50eee8af11266695a5de9c2691385c6f849e27105022
-DIST opal-3.10.11-htmldoc.tar.bz2 2944338 BLAKE2B 3e686809a217c13718e3e777a5c11b92b1405d5421b882abc50a3e231db28d72099e7383fa23bf130cc5fa2bf123412702248054cfa7be14dcbc999fd3bd1248 SHA512 6075487344d4cfa5c2e2219376e3eccd98028475eac6f89d20d24d611a8806a27eb354ce8e77e16c620c8cb3d398b9502082f3fe8f67763d3f67feea835819b5
-DIST opal-3.10.11.tar.bz2 8590616 BLAKE2B 1ea56285315e879d85190db4e2b2fa814cf0fc7825db80547d1fde978f6d24a8e2cd853575a4c13dbfc7d8dada422a90ab95512a367a87de6d13889a6d8f8ca4 SHA512 970745375e7ebb29178ce9d0bc29254e69dd952e5f754038979a8613489a26f0fb68d63ec2709ffa1964e50fe9cfde874489f683a451d83e7a075d62d9228fa1
-EBUILD opal-3.10.11-r1.ebuild 7154 BLAKE2B 24fa894a33811f40fe1199cf941245b04059a86cc7ee9b5a42647ce60264595a692651153b1e62111e1f827c323f93007d0c215576426c859e4c323555e27d60 SHA512 7ea10d2622315c6f20af990d2d4239f9e30c88ccf975e58acda2aec2723e9a693aa575f0fdb531c868f21162dff1d7940be458a5ad658cc7c9981e36c168c717
-MISC metadata.xml 1834 BLAKE2B c3c4375126d202302919e5077ce6ba78fb0607e6bf398bbb47e10661d615eff11a734d86c96e131712f7b4fb3edb67b2cee2a7b7af5adc9a34c99245ad6e0cb3 SHA512 4b411c0729d4927420c19a6e2063937de3b0e4922771c44467a6f7bcd47c728ec361edd529e1736e2f8b5ce1d53851612ce85e30b22098bd55ba71bf6cb38d90
diff --git a/net-libs/opal/files/opal-3.10.10-ffmpeg2-1.patch b/net-libs/opal/files/opal-3.10.10-ffmpeg2-1.patch
deleted file mode 100644
index 6b58ac28f3d4..000000000000
--- a/net-libs/opal/files/opal-3.10.10-ffmpeg2-1.patch
+++ /dev/null
@@ -1,396 +0,0 @@
-Submitted By:            Igor Živković <contact@igor-zivkovic.from.hr>
-Date:                    2013-10-08
-Initial Package Version: 3.10.10
-Upstream Status:         Unknown
-Origin:                  Gentoo
-Description:             Fixes building against FFmpeg version >= 2.0.0
-
-diff -Naur opal-3.10.10.orig/plugins/video/common/dyna.cxx opal-3.10.10/plugins/video/common/dyna.cxx
---- opal-3.10.10.orig/plugins/video/common/dyna.cxx	2013-02-20 03:18:05.000000000 +0100
-+++ opal-3.10.10/plugins/video/common/dyna.cxx	2013-10-08 12:57:25.058873513 +0200
-@@ -210,7 +210,7 @@
- #endif
- 
- 
--FFMPEGLibrary::FFMPEGLibrary(CodecID codec)
-+FFMPEGLibrary::FFMPEGLibrary(AVCodecID codec)
- {
-   m_codec = codec;
-   if (m_codec==CODEC_ID_H264)
-@@ -348,12 +348,12 @@
-   return true;
- }
- 
--AVCodec *FFMPEGLibrary::AvcodecFindEncoder(enum CodecID id)
-+AVCodec *FFMPEGLibrary::AvcodecFindEncoder(enum AVCodecID id)
- {
-   return Favcodec_find_encoder(id);
- }
- 
--AVCodec *FFMPEGLibrary::AvcodecFindDecoder(enum CodecID id)
-+AVCodec *FFMPEGLibrary::AvcodecFindDecoder(enum AVCodecID id)
- {
-   WaitAndSignal m(processLock);
- 
-diff -Naur opal-3.10.10.orig/plugins/video/common/dyna.h opal-3.10.10/plugins/video/common/dyna.h
---- opal-3.10.10.orig/plugins/video/common/dyna.h	2013-02-20 03:18:05.000000000 +0100
-+++ opal-3.10.10/plugins/video/common/dyna.h	2013-10-08 12:57:25.058873513 +0200
-@@ -88,13 +88,13 @@
- class FFMPEGLibrary 
- {
-   public:
--    FFMPEGLibrary(CodecID codec);
-+    FFMPEGLibrary(AVCodecID codec);
-     ~FFMPEGLibrary();
- 
-     bool Load();
- 
--    AVCodec *AvcodecFindEncoder(enum CodecID id);
--    AVCodec *AvcodecFindDecoder(enum CodecID id);
-+    AVCodec *AvcodecFindEncoder(enum AVCodecID id);
-+    AVCodec *AvcodecFindDecoder(enum AVCodecID id);
-     AVCodecContext *AvcodecAllocContext(void);
-     AVFrame *AvcodecAllocFrame(void);
-     int AvcodecOpen(AVCodecContext *ctx, AVCodec *codec);
-@@ -117,15 +117,15 @@
-     DynaLink m_libAvcodec;
-     DynaLink m_libAvutil;
- 
--    CodecID m_codec;
-+    AVCodecID m_codec;
-     char m_codecString[32];
- 
-     void (*Favcodec_init)(void);
-     void (*Fav_init_packet)(AVPacket *pkt);
- 
-     void (*Favcodec_register_all)(void);
--    AVCodec *(*Favcodec_find_encoder)(enum CodecID id);
--    AVCodec *(*Favcodec_find_decoder)(enum CodecID id);
-+    AVCodec *(*Favcodec_find_encoder)(enum AVCodecID id);
-+    AVCodec *(*Favcodec_find_decoder)(enum AVCodecID id);
-     AVCodecContext *(*Favcodec_alloc_context)(void);
-     AVFrame *(*Favcodec_alloc_frame)(void);
-     int (*Favcodec_open)(AVCodecContext *ctx, AVCodec *codec);
-diff -Naur opal-3.10.10.orig/plugins/video/common/ffmpeg/libavcodec/avcodec.h opal-3.10.10/plugins/video/common/ffmpeg/libavcodec/avcodec.h
---- opal-3.10.10.orig/plugins/video/common/ffmpeg/libavcodec/avcodec.h	2013-02-20 03:18:04.000000000 +0100
-+++ opal-3.10.10/plugins/video/common/ffmpeg/libavcodec/avcodec.h	2013-10-08 12:57:25.060873488 +0200
-@@ -101,7 +101,7 @@
-  * 1. no value of a existing codec ID changes (that would break ABI),
-  * 2. it is as close as possible to similar codecs.
-  */
--enum CodecID {
-+enum AVCodecID {
-     CODEC_ID_NONE,
- 
-     /* video codecs */
-@@ -1390,7 +1390,7 @@
- 
-     char codec_name[32];
-     enum AVMediaType codec_type; /* see AVMEDIA_TYPE_xxx */
--    enum CodecID codec_id; /* see CODEC_ID_xxx */
-+    enum AVCodecID codec_id; /* see CODEC_ID_xxx */
- 
-     /**
-      * fourcc (LSB first, so "ABCD" -> ('D'<<24) + ('C'<<16) + ('B'<<8) + 'A').
-@@ -2843,7 +2843,7 @@
-      */
-     const char *name;
-     enum AVMediaType type;
--    enum CodecID id;
-+    enum AVCodecID id;
-     int priv_data_size;
-     int (*init)(AVCodecContext *);
-     int (*encode)(AVCodecContext *, uint8_t *buf, int buf_size, void *data);
-@@ -2898,7 +2898,7 @@
-      *
-      * See CODEC_ID_xxx
-      */
--    enum CodecID id;
-+    enum AVCodecID id;
- 
-     /**
-      * Supported pixel format.
-@@ -3402,10 +3402,10 @@
- /**
-  * Find a registered encoder with a matching codec ID.
-  *
-- * @param id CodecID of the requested encoder
-+ * @param id AVCodecID of the requested encoder
-  * @return An encoder if one was found, NULL otherwise.
-  */
--AVCodec *avcodec_find_encoder(enum CodecID id);
-+AVCodec *avcodec_find_encoder(enum AVCodecID id);
- 
- /**
-  * Find a registered encoder with the specified name.
-@@ -3418,10 +3418,10 @@
- /**
-  * Find a registered decoder with a matching codec ID.
-  *
-- * @param id CodecID of the requested decoder
-+ * @param id AVCodecID of the requested decoder
-  * @return A decoder if one was found, NULL otherwise.
-  */
--AVCodec *avcodec_find_decoder(enum CodecID id);
-+AVCodec *avcodec_find_decoder(enum AVCodecID id);
- 
- /**
-  * Find a registered decoder with the specified name.
-@@ -3822,7 +3822,7 @@
-  * @param[in] codec_id the codec
-  * @return Number of bits per sample or zero if unknown for the given codec.
-  */
--int av_get_bits_per_sample(enum CodecID codec_id);
-+int av_get_bits_per_sample(enum AVCodecID codec_id);
- 
- #if FF_API_OLD_SAMPLE_FMT
- /**
-diff -Naur opal-3.10.10.orig/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.10/plugins/video/H.263-1998/h263-1998.cxx
---- opal-3.10.10.orig/plugins/video/H.263-1998/h263-1998.cxx	2013-02-20 03:18:03.000000000 +0100
-+++ opal-3.10.10/plugins/video/H.263-1998/h263-1998.cxx	2013-10-08 12:57:25.061873475 +0200
-@@ -48,6 +48,10 @@
- #endif
- 
- #include "h263-1998.h"
-+extern "C"
-+{
-+#include <libavutil/opt.h>
-+}
- #include <limits>
- #include <iomanip>
- #include <stdio.h>
-@@ -203,7 +207,7 @@
-   PTRACE(4, m_prefix, "Encoder closed");
- }
- 
--bool H263_Base_EncoderContext::Init(CodecID codecId)
-+bool H263_Base_EncoderContext::Init(AVCodecID codecId)
- {
-   PTRACE(5, m_prefix, "Opening encoder");
- 
-@@ -317,9 +321,9 @@
-     // Level 2+ 
-     // works with eyeBeam, signaled via  non-standard "D"
-     if (atoi(value) == 1)
--      m_context->flags |= CODEC_FLAG_H263P_UMV; 
-+      av_opt_set_int(m_context->priv_data, "umv", 1, 0);
-     else
--      m_context->flags &= ~CODEC_FLAG_H263P_UMV; 
-+      av_opt_set_int(m_context->priv_data, "umv", 0, 0);
-     return;
-   }
- 
-@@ -328,9 +332,9 @@
-     // Annex F: Advanced Prediction Mode
-     // does not work with eyeBeam
-     if (atoi(value) == 1)
--      m_context->flags |= CODEC_FLAG_OBMC; 
-+      av_opt_set_int(m_context->priv_data, "obmc", 1, 0);
-     else
--      m_context->flags &= ~CODEC_FLAG_OBMC; 
-+      av_opt_set_int(m_context->priv_data, "obmc", 0, 0);
-     return;
-   }
- #endif
-@@ -360,9 +364,9 @@
-     // Annex K: Slice Structure
-     // does not work with eyeBeam
-     if (atoi(value) != 0)
--      m_context->flags |= CODEC_FLAG_H263P_SLICE_STRUCT; 
-+      av_opt_set_int(m_context->priv_data, "structured_slices", 1, 0);
-     else
--      m_context->flags &= ~CODEC_FLAG_H263P_SLICE_STRUCT; 
-+      av_opt_set_int(m_context->priv_data, "structured_slices", 0, 0);
-     return;
-   }
- 
-@@ -370,9 +374,9 @@
-     // Annex S: Alternative INTER VLC mode
-     // does not work with eyeBeam
-     if (atoi(value) == 1)
--      m_context->flags |= CODEC_FLAG_H263P_AIV; 
-+      av_opt_set_int(m_context->priv_data, "aiv", 1, 0);
-     else
--      m_context->flags &= ~CODEC_FLAG_H263P_AIV; 
-+      av_opt_set_int(m_context->priv_data, "aiv", 0, 0);
-     return;
-   }
- 
-@@ -450,15 +454,6 @@
-   PTRACE(5, m_prefix, "qmax set to " << m_context->qmax);
-   PTRACE(5, m_prefix, "payload size set to " << m_context->rtp_payload_size);
- 
--  #define CODEC_TRACER_FLAG(tracer, flag) \
--    PTRACE(4, m_prefix, #flag " is " << ((m_context->flags & flag) ? "enabled" : "disabled"));
--  CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_UMV);
--  CODEC_TRACER_FLAG(tracer, CODEC_FLAG_OBMC);
--  CODEC_TRACER_FLAG(tracer, CODEC_FLAG_AC_PRED);
--  CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_SLICE_STRUCT)
--  CODEC_TRACER_FLAG(tracer, CODEC_FLAG_LOOP_FILTER);
--  CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_AIV);
--
-   return FFMPEGLibraryInstance.AvcodecOpen(m_context, m_codec) == 0;
- }
- 
-@@ -521,7 +516,7 @@
- 
-     // Need to copy to local buffer to guarantee 16 byte alignment
-     memcpy(m_inputFrame->data[0], OPAL_VIDEO_FRAME_DATA_PTR(header), header->width*header->height*3/2);
--    m_inputFrame->pict_type = (flags & PluginCodec_CoderForceIFrame) ? FF_I_TYPE : AV_PICTURE_TYPE_NONE;
-+    m_inputFrame->pict_type = (flags & PluginCodec_CoderForceIFrame) ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_NONE;
- 
-     /*
-     m_inputFrame->pts = (int64_t)srcRTP.GetTimestamp()*m_context->time_base.den/m_context->time_base.num/VIDEO_CLOCKRATE;
-@@ -603,13 +598,13 @@
-   m_context->rtp_callback = &H263_RFC2190_EncoderContext::RTPCallBack;
-   m_context->opaque = this; // used to separate out packets from different encode threads
- 
--  m_context->flags &= ~CODEC_FLAG_H263P_UMV;
-+  av_opt_set_int(m_context->priv_data, "umv", 0, 0);
-   m_context->flags &= ~CODEC_FLAG_4MV;
- #if LIBAVCODEC_RTP_MODE
-   m_context->flags &= ~CODEC_FLAG_H263P_AIC;
- #endif
--  m_context->flags &= ~CODEC_FLAG_H263P_AIV;
--  m_context->flags &= ~CODEC_FLAG_H263P_SLICE_STRUCT;
-+  av_opt_set_int(m_context->priv_data, "aiv", 0, 0);
-+  av_opt_set_int(m_context->priv_data, "structured_slices", 0, 0);
- 
-   return true;
- }
-diff -Naur opal-3.10.10.orig/plugins/video/H.263-1998/h263-1998.h opal-3.10.10/plugins/video/H.263-1998/h263-1998.h
---- opal-3.10.10.orig/plugins/video/H.263-1998/h263-1998.h	2013-02-20 03:18:03.000000000 +0100
-+++ opal-3.10.10/plugins/video/H.263-1998/h263-1998.h	2013-10-08 12:57:25.062873463 +0200
-@@ -115,7 +115,7 @@
-     virtual ~H263_Base_EncoderContext();
- 
-     virtual bool Init() = 0;
--    virtual bool Init(CodecID codecId);
-+    virtual bool Init(AVCodecID codecId);
- 
-     virtual bool SetOptions(const char * const * options);
-     virtual void SetOption(const char * option, const char * value);
-diff -Naur opal-3.10.10.orig/plugins/video/H.263-1998/Makefile.in opal-3.10.10/plugins/video/H.263-1998/Makefile.in
---- opal-3.10.10.orig/plugins/video/H.263-1998/Makefile.in	2013-02-20 03:18:03.000000000 +0100
-+++ opal-3.10.10/plugins/video/H.263-1998/Makefile.in	2013-10-08 12:57:25.062873463 +0200
-@@ -35,7 +35,7 @@
-              $(COMMONDIR)/dyna.cxx
- 
- CFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR)
--LIBS   += @DL_LIBS@
-+LIBS   += @DL_LIBS@ @LIBAVUTIL_LIBS@
- 
- HAVE_LIBAVCODEC_RTP_MODE=@HAVE_LIBAVCODEC_RTP_MODE@
- ifeq ($(HAVE_LIBAVCODEC_RTP_MODE),yes)
-diff -Naur opal-3.10.10.orig/plugins/video/H.264/gpl/h264_helper.cxx opal-3.10.10/plugins/video/H.264/gpl/h264_helper.cxx
---- opal-3.10.10.orig/plugins/video/H.264/gpl/h264_helper.cxx	2013-02-20 03:18:02.000000000 +0100
-+++ opal-3.10.10/plugins/video/H.264/gpl/h264_helper.cxx	2013-10-08 12:57:25.062873463 +0200
-@@ -27,6 +27,7 @@
- #include <fstream>
- #include <stdlib.h> 
- #include <sys/stat.h>
-+#include <unistd.h>
- 
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
-diff -Naur opal-3.10.10.orig/plugins/video/H.264/h264-x264.cxx opal-3.10.10/plugins/video/H.264/h264-x264.cxx
---- opal-3.10.10.orig/plugins/video/H.264/h264-x264.cxx	2013-02-20 03:18:02.000000000 +0100
-+++ opal-3.10.10/plugins/video/H.264/h264-x264.cxx	2013-10-08 12:57:25.063873450 +0200
-@@ -40,6 +40,9 @@
- #include "plugin-config.h"
- #endif
- 
-+#define FF_IDCT_H264 11
-+#define CODEC_FLAG2_SKIP_RD 0x00004000
-+
- #include <codec/opalplugin.hpp>
- 
- #include "../common/ffmpeg.h"
-@@ -1071,13 +1074,10 @@
-         return false;
- 
-       m_context->workaround_bugs = FF_BUG_AUTODETECT;
--      m_context->error_recognition = FF_ER_AGGRESSIVE;
-       m_context->idct_algo = FF_IDCT_H264;
-       m_context->error_concealment = FF_EC_GUESS_MVS | FF_EC_DEBLOCK;
-       m_context->flags = CODEC_FLAG_INPUT_PRESERVED | CODEC_FLAG_EMU_EDGE;
--      m_context->flags2 = CODEC_FLAG2_BRDO |
--                          CODEC_FLAG2_MEMC_ONLY |
--                          CODEC_FLAG2_DROP_FRAME_TIMECODE |
-+      m_context->flags2 = CODEC_FLAG2_DROP_FRAME_TIMECODE |
-                           CODEC_FLAG2_SKIP_RD |
-                           CODEC_FLAG2_CHUNKS;
- 
-diff -Naur opal-3.10.10.orig/plugins/video/H.264/shared/x264wrap.cxx opal-3.10.10/plugins/video/H.264/shared/x264wrap.cxx
---- opal-3.10.10.orig/plugins/video/H.264/shared/x264wrap.cxx	2013-02-20 03:18:02.000000000 +0100
-+++ opal-3.10.10/plugins/video/H.264/shared/x264wrap.cxx	2013-10-08 12:57:25.064873438 +0200
-@@ -33,6 +33,7 @@
- 
- #include <codec/opalplugin.hpp>
- #include <stdio.h>
-+#include <unistd.h>
- 
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
-diff -Naur opal-3.10.10.orig/plugins/video/MPEG4-ffmpeg/Makefile.in opal-3.10.10/plugins/video/MPEG4-ffmpeg/Makefile.in
---- opal-3.10.10.orig/plugins/video/MPEG4-ffmpeg/Makefile.in	2013-02-20 03:18:07.000000000 +0100
-+++ opal-3.10.10/plugins/video/MPEG4-ffmpeg/Makefile.in	2013-10-08 12:57:25.064873438 +0200
-@@ -31,7 +31,7 @@
- SRCS      := mpeg4.cxx $(COMMONDIR)/dyna.cxx
- 
- CFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR)
--LIBS   += @DL_LIBS@
-+LIBS   += @DL_LIBS@ @LIBAVUTIL_LIBS@
- 
- # Add LIBAVCODEC_SOURCE_DIR to the include path so we can #include <libavcodec/...h>
- # Also add libavutil, so ffmpeg headers can #include "log.h".
-diff -Naur opal-3.10.10.orig/plugins/video/MPEG4-ffmpeg/mpeg4.cxx opal-3.10.10/plugins/video/MPEG4-ffmpeg/mpeg4.cxx
---- opal-3.10.10.orig/plugins/video/MPEG4-ffmpeg/mpeg4.cxx	2013-02-20 03:18:07.000000000 +0100
-+++ opal-3.10.10/plugins/video/MPEG4-ffmpeg/mpeg4.cxx	2013-10-08 12:57:25.065873425 +0200
-@@ -103,6 +103,7 @@
- 
- #else /* LIBAVCODEC_HAVE_SOURCE_DIR */
- #include "../common/ffmpeg.h"
-+#include <libavutil/opt.h>
- #endif /* LIBAVCODEC_HAVE_SOURCE_DIR */
- }
- 
-@@ -589,17 +590,17 @@
-     m_avpicture->quality = m_videoQMin;
- 
- #ifdef USE_ORIG
--    m_avcontext->flags |= CODEC_FLAG_PART;   // data partitioning
-+    av_opt_set_int(m_avcontext->priv_data, "data_partitionin", 1, 0);
-     m_avcontext->flags |= CODEC_FLAG_4MV;    // 4 motion vectors
- #else
-     m_avcontext->max_b_frames=0; /*don't use b frames*/
-     m_avcontext->flags|=CODEC_FLAG_AC_PRED;
--    m_avcontext->flags|=CODEC_FLAG_H263P_UMV;
-+    av_opt_set_int(m_avcontext->priv_data, "umv", 1, 0);
-     /*c->flags|=CODEC_FLAG_QPEL;*/ /*don't enable this one: this forces profile_level to advanced simple profile */
-     m_avcontext->flags|=CODEC_FLAG_4MV;
-     m_avcontext->flags|=CODEC_FLAG_GMC;
-     m_avcontext->flags|=CODEC_FLAG_LOOP_FILTER;
--    m_avcontext->flags|=CODEC_FLAG_H263P_SLICE_STRUCT;
-+    av_opt_set_int(m_avcontext->priv_data, "structured_slices", 1, 0);
- #endif
-     m_avcontext->opaque = this;              // for use in RTP callback
- }
-@@ -804,7 +805,7 @@
-         // Should the next frame be an I-Frame?
-         if ((flags & PluginCodec_CoderForceIFrame) || (m_frameNum == 0))
-         {
--            m_avpicture->pict_type = FF_I_TYPE;
-+            m_avpicture->pict_type = AV_PICTURE_TYPE_I;
-         }
-         else // No IFrame requested, let avcodec decide what to do
-         {
-@@ -1325,7 +1326,7 @@
- 
- void MPEG4DecoderContext::SetStaticDecodingParams() {
-     m_avcontext->flags |= CODEC_FLAG_4MV; 
--    m_avcontext->flags |= CODEC_FLAG_PART;
-+    av_opt_set_int(m_avcontext->priv_data, "data_partitionin", 1, 0);
-     m_avcontext->workaround_bugs = 0; // no workaround for buggy implementations
- }
- 
diff --git a/net-libs/opal/files/opal-3.10.9-disable-h323-workaround.patch b/net-libs/opal/files/opal-3.10.9-disable-h323-workaround.patch
deleted file mode 100644
index 3d1761566ed1..000000000000
--- a/net-libs/opal/files/opal-3.10.9-disable-h323-workaround.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-# Sent to upstream on 2012-10-23
-# By Jesus Rivero <neurogeek@gentoo.org>
-diff -uNr opal-3.10.8.orig/include/h323/h323.h opal-3.10.8/include/h323/h323.h
---- opal-3.10.8.orig/include/h323/h323.h        2012-10-22 07:50:37.000000000 -0400
-+++ opal-3.10.8/include/h323/h323.h     2012-10-23 14:10:37.000000000 -0400
-@@ -40,6 +40,7 @@
- #include <h323/h323con.h>
- #include <h323/gkclient.h>
- #include <opal/buildopts.h>
-+#include <ptlib.h>
- 
- PString  OpalGetVersion();
- unsigned OpalGetMajorVersion();
diff --git a/net-libs/opal/files/opal-3.10.9-java-ruby-swig-fix.patch b/net-libs/opal/files/opal-3.10.9-java-ruby-swig-fix.patch
deleted file mode 100644
index 65708635a34d..000000000000
--- a/net-libs/opal/files/opal-3.10.9-java-ruby-swig-fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -uNr opal-3.10.9.orig/Makefile.in opal-3.10.9/Makefile.in
---- opal-3.10.9.orig/Makefile.in	2012-12-03 11:09:17.000000000 -0500
-+++ opal-3.10.9/Makefile.in	2012-12-03 11:09:35.000000000 -0500
-@@ -371,9 +371,9 @@
- ifeq ($(OPAL_JAVA), yes)
- 
- JAVA_SRCDIR      = $(OPAL_SRCDIR)/java
--JAVA_WRAPPER     = $(JAVA_SRCDIR)/java_swig_wrapper.c
-+JAVA_WRAPPER     = $(JAVA_SRCDIR)/java_swig_wrapper.cxx
- 
--VPATH_C         += $(JAVA_SRCDIR)
-+VPATH_CXX       += $(JAVA_SRCDIR)
- SOURCES         += $(JAVA_WRAPPER)
- 
- endif
-@@ -384,10 +384,10 @@
- 
- ifeq ($(OPAL_RUBY), yes)
- 
--RUBY_SRCDIR      = $(OPAL_SRCDIR)/ruby
--RUBY_WRAPPER     = $(JAVA_SRCDIR)/ruby_swig_wrapper.c
-+RUBY_SRCDIR      = $(OPAL_SRCDIR)/Ruby
-+RUBY_WRAPPER     = $(JAVA_SRCDIR)/ruby_swig_wrapper.cxx
- 
--VPATH_C         += $(RUBY_SRCDIR)
-+VPATH_CXX       += $(RUBY_SRCDIR)
- SOURCES         += $(RUBY_WRAPPER)
- 
- endif
diff --git a/net-libs/opal/metadata.xml b/net-libs/opal/metadata.xml
deleted file mode 100644
index 237de9848980..000000000000
--- a/net-libs/opal/metadata.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<use>
-		<flag name="celt">Enable CELT ultra-low delay audio codec</flag>
-		<flag name="dtmf">Enable DTMF encoding/decoding support</flag>
-		<flag name="fax">Enable T.38 FAX protocol</flag>
-		<flag name="h224">Enable H.224 real time control protocol</flag>
-		<flag name="h281">Enable H.281 Far-End Camera Control protocol</flag>
-		<flag name="h323">Enable H.323 protocol</flag>
-		<flag name="iax">Enable Inter-Asterisk eXchange protocol</flag>
-		<flag name="ivr">Enable Interactive Voice Response</flag>
-		<flag name="ilbc">Enable iLBC (RFC 3951) speech codec</flag>
-		<flag name="lid">Enable Line Interface Device</flag>
-		<flag name="plugins">Enable plugins support</flag>
-		<flag name="sbc">Enable the Bluetooth low-complexity, SubBand Codec
-		</flag>
-		<flag name="sip">Enable Session Initiation Protocol</flag>
-		<flag name="sipim">Enable SIP Instant Messages session</flag>
-		<flag name="srtp">Enable Secure Real-time Transport Protocol</flag>
-		<flag name="stats">Enable statistic reporting</flag>
-		<flag name="swig">Use swig to generate bindings</flag>
-		<flag name="video">Enable video support</flag>
-		<flag name="vpb">Enable Voicetronics VPB card support</flag>
-		<flag name="vxml">Enable VXML support</flag>
-		<flag name="wav">Enable WAVFILE support</flag>
-		<flag name="x264-static">Install x264 plugin statically linked with x264
-		</flag>
-		<!-- unused atm
-		<flag name="g711plc">Enable G711 Packet Loss Concealment</flag>
-		<flag name="msrp">Enable Message Session Relay Protocol</flag>
-		<flag name="rfc4103">Enable RTP Payload for Text Conversation</flag>
-		-->
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">opalvoip</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-libs/opal/opal-3.10.11-r1.ebuild b/net-libs/opal/opal-3.10.11-r1.ebuild
deleted file mode 100644
index eb0508072328..000000000000
--- a/net-libs/opal/opal-3.10.11-r1.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools toolchain-funcs java-pkg-opt-2 flag-o-matic
-
-DESCRIPTION="C++ class library normalising numerous telephony protocols"
-HOMEPAGE="http://www.opalvoip.org/"
-SRC_URI="mirror://sourceforge/opalvoip/${P}.tar.bz2
-	doc? ( mirror://sourceforge/opalvoip/${P}-htmldoc.tar.bz2 )"
-
-LICENSE="MPL-1.0"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE="celt debug doc +dtmf examples fax ffmpeg h224 h281 h323 iax ilbc
-ipv6 ivr java ldap libav lid +plugins sbc +sip +sipim +sound srtp ssl static-libs
-stats swig theora +video vpb vxml +wav x264 x264-static +xml"
-
-REQUIRED_USE="
-	x264-static? ( x264 )
-	h281? ( h224 )
-	sip? ( sipim )
-"
-
-RDEPEND="
-	>=net-libs/ptlib-2.10.10:=[stun,debug=,dtmf,http,ipv6?,ldap?,sound?,ssl?,video?,vxml?,wav?,xml?]
-	>=media-libs/speex-1.2_beta
-	fax? ( net-libs/ptlib[asn] )
-	h323? ( net-libs/ptlib[asn] )
-	ivr? ( net-libs/ptlib[http,xml,vxml] )
-	java? ( >=virtual/jre-1.4:* )
-	plugins? (
-		media-sound/gsm
-		celt? ( media-libs/celt:0 )
-		ffmpeg? (
-			libav? ( media-video/libav:0=[encode] )
-			!libav? ( media-video/ffmpeg:0=[encode] ) )
-		ilbc? ( dev-libs/ilbc-rfc3951 )
-		sbc? ( media-libs/libsamplerate )
-		theora? ( media-libs/libtheora )
-		x264? (	virtual/ffmpeg
-			media-libs/x264 ) )
-	srtp? ( net-libs/libsrtp:0= )
-	vxml? ( net-libs/ptlib[http,vxml] )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	java? ( swig? ( dev-lang/swig )
-		>=virtual/jdk-1.4 )
-"
-
-# NOTES:
-# ffmpeg[encode] is for h263 and mpeg4
-# ssl, xml, vxml, ipv6, ldap, sound, wav, and video are use flags
-#   herited from ptlib: feature is enabled if ptlib has enabled it
-#   however, disabling it if ptlib has it looks hard (coz of buildopts.h)
-#   forcing ptlib to disable it for opal is not a solution too
-#   atm, accepting the "auto-feature" looks like a good solution
-#   (asn is used for fax and config _only_ for examples)
-# OPALDIR should not be used anymore but if a package still need it, create it
-
-pkg_setup() {
-	# workaround for bug 282838
-	append-cxxflags "-fno-visibility-inlines-hidden"
-	append-cxxflags "-fno-strict-aliasing"
-
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# remove visual studio related files from samples/
-	if use examples; then
-		rm -f samples/*/*.vcproj
-		rm -f samples/*/*.sln
-		rm -f samples/*/*.dsp
-		rm -f samples/*/*.dsw
-	fi
-
-	# LFS ffmpeg2+ fixes.
-	eapply "${FILESDIR}"/opal-3.10.10-ffmpeg2-1.patch
-
-	if ! use h323; then
-		# Without this patch, ekiga wont compile, even with
-		# USE=-h323.
-		eapply "${FILESDIR}/${PN}-3.10.9-disable-h323-workaround.patch"
-	fi
-
-	eapply "${FILESDIR}/${PN}-3.10.9-java-ruby-swig-fix.patch"
-
-	sed -i -e "s:\(.*HAS_H224.*\), \[OPAL_H323\]:\1:" configure.ac \
-		|| die "sed failed"
-
-	# sed fixes for ffmpeg-3.
-	sed -e 's/CODEC_ID/AV_&/' \
-		-e 's/PIX_FMT_/AV_&/' \
-		-i plugins/video/H.263-1998/h263-1998.cxx \
-		   plugins/video/common/dyna.cxx          \
-		   plugins/video/H.264/h264-x264.cxx      \
-		   plugins/video/MPEG4-ffmpeg/mpeg4.cxx || die "sed failed"
-
-	eaclocal
-	eautoconf
-
-	# in plugins
-	cd plugins/
-	eaclocal
-	eautoconf
-	cd ..
-
-	# disable celt if celt is not enabled (prevent auto magic dep)
-	# already in repository
-	if ! use celt; then
-		sed -i -e "s/HAVE_CELT=yes/HAVE_CELT=no/" plugins/configure \
-			|| die "sed failed"
-	fi
-
-	# fix automatic swig detection, upstream bug 2712521 (upstream reject it)
-	if ! use swig; then
-		sed -i -e "/^SWIG=/d" configure || die "patching configure failed"
-	fi
-
-	use ilbc || { rm -r plugins/audio/iLBC/ || die "removing iLBC failed"; }
-
-	java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
-	local forcedconf=""
-
-	# fix bug 277233, upstream bug 2820939
-	if use fax; then
-		forcedconf="${forcedconf} --enable-statistics"
-	fi
-
-	# --with-libavcodec-source-dir should _not_ be set, it's for trunk sources
-	# versioncheck: check for ptlib version
-	# shared: should always be enabled for a lib
-	# localspeex, localspeexdsp, localgsm, localilbc: never use bundled libs
-	# samples: only build some samples, useless
-	# libavcodec-stackalign-hack: prevent hack (default disable by upstream)
-	# default-to-full-capabilties: default enable by upstream
-	# aec: atm, only used when bundled speex, so it's painless for us
-	# zrtp doesn't depend on net-libs/libzrtpcpp but on libzrtp from
-	# 	http://zfoneproject.com/ wich is not in portage
-	# msrp: highly experimental
-	# spandsp: doesn't work with newest spandsp, upstream bug 2796047
-	# g711plc: force enable
-	# rfc4103: not really used, upstream bug 2795831
-	# t38, spandsp: merged in fax
-	# h450, h460, h501: merged in h323 (they are additional features of h323)
-	econf \
-		--enable-versioncheck \
-		--enable-shared \
-		--disable-zrtp \
-		--disable-localspeex \
-		--disable-localspeexdsp \
-		--disable-localgsm \
-		--disable-localilbc \
-		--disable-samples \
-		--disable-libavcodec-stackalign-hack \
-		--enable-default-to-full-capabilties \
-		--enable-aec \
-		--disable-msrp \
-		--disable-spandsp \
-		--enable-g711plc \
-		--enable-rfc4103 \
-		--disable-capi \
-		--disable-ixj \
-		$(use_enable debug) \
-		$(use_enable fax) \
-		$(use_enable fax t38) \
-		$(use_enable h224) \
-		$(use_enable h281) \
-		$(use_enable h323) \
-		$(use_enable h323 h450) \
-		$(use_enable h323 h460) \
-		$(use_enable h323 h501) \
-		$(use_enable iax) \
-		$(use_enable ivr) \
-		$(use_enable java) \
-		$(use_enable lid) \
-		$(use_enable plugins) \
-		$(use_enable sbc) \
-		$(use_enable sip) \
-		$(use_enable sipim) \
-		$(use_enable stats statistics) \
-		$(use_enable video) $(use_enable video rfc4175) \
-		$(use_enable vpb) \
-		$(use_enable x264 h264) \
-		$(use_enable x264-static x264-link-static) \
-		${forcedconf}
-}
-
-src_compile() {
-	local makeopts=""
-
-	use debug && makeopts="debug"
-
-	emake ${makeopts}
-}
-
-src_install() {
-	default
-
-	# Get rid of static libraries if not requested
-	# There seems to be no easy way to disable this in the build system
-	if ! use static-libs; then
-		rm -v "${D}"/usr/lib*/*.a || die
-	fi
-
-	if use doc; then
-		dohtml -r "${WORKDIR}"/html/* docs/* || die "dohtml failed"
-	fi
-
-	if use examples; then
-		local exampledir="/usr/share/doc/${PF}/examples"
-		local basedir="samples"
-		local sampledirs="`ls ${basedir} --hide=configure* \
-			--hide=opal_samples.mak.in`"
-
-		# first, install files
-		insinto ${exampledir}/
-		doins ${basedir}/{configure*,opal_samples*} \
-			|| die "doins failed"
-
-		# now, all examples
-		for x in ${sampledirs}; do
-			insinto ${exampledir}/${x}/
-			doins ${basedir}/${x}/* || die "doins failed"
-		done
-
-		# some examples need version.h
-		insinto "/usr/share/doc/${PF}/"
-		doins version.h || die "doins failed"
-	fi
-}
-
-pkg_postinst() {
-	if use examples; then
-		ewarn "All examples have been installed, some of them will not work on your system"
-		ewarn "it will depend of the enabled USE flags in ptlib and opal"
-	fi
-
-	if ! use plugins || ! use sound || ! use video; then
-		ewarn "You have disabled sound, video or plugins USE flags."
-		ewarn "Most audio/video features or plugins have been disabled silently"
-		ewarn "even if enabled via USE flags."
-		ewarn "Having a feature enabled via USE flag but disabled can lead to issues."
-	fi
-}
diff --git a/net-libs/phodav/Manifest b/net-libs/phodav/Manifest
index aa5d07afb5b6..8aeb55b441c3 100644
--- a/net-libs/phodav/Manifest
+++ b/net-libs/phodav/Manifest
@@ -3,5 +3,5 @@ AUX spice-webdavd.initd 344 BLAKE2B 6a7f36f4f698e5327455b3e95a71ae39df56f6d57e8d
 DIST phodav-2.1.tar.xz 293128 BLAKE2B bdb175812d742189b1efe5589f63a1fd50a18d7f1a59e0627a0eba0c8a82fd110bec1d434519c362a2d232680b3040c47768d9f960236c20dad0e036b7433529 SHA512 e43bd4c9ed97b7454e8452246c37211905b4cff430e91f3d2d36182736e1b8924d6ad477f58f110c98b85f02c085cd12c099020a0bea8abb19e65a9d52e1f4a8
 DIST phodav-2.2.tar.xz 294216 BLAKE2B e7062f933f407dff339b050a8b735e733fa41634cc34b0a37556b283b941ff620ae59a2ed3b7bce41530195f33a9fb3113f89e37190bb046352d90d72a750468 SHA512 1d16716c1bda674a6695b651e9b1bcb4b7cfefd9b60291ed3f5691f4f6f45f68a970d99fc4820bed0484cf0a43c1bf32e4d208fcc239ac0c0b7a75bf779e8913
 EBUILD phodav-2.1.ebuild 1255 BLAKE2B ce097cfc986614406a34dd30998b32b45d3b3b05b7e569b82cc0e3715f6cbf3f74d46cf8af45deab1f9ce3f48fe100285e674f952b723934bf2410f5c10373b6 SHA512 2a09d351e0b45efcb5efce2d58fe6e265c4e98d54795ff4d89c0751933534e8dc8dc0ce69031d7361f14155c822dcf90e6f9d322caffbf25c631729714a8fc1c
-EBUILD phodav-2.2.ebuild 1518 BLAKE2B ea481edd7864d561e47ca9e809d833131c3c95be08ed8942499900ec067d9aae9b583ec4daf65f20b264d922f26ef2e11ac18c0ea0f25e91fe840fe6d40b8bf0 SHA512 ec3768e75b61c16c7e4b56b637ba97a316dbb7853d24d1f278040781445b6dba4bd6ab66573d647a7ad174e057148622c2544ca16a775066ef87e1a2cd1ddc8e
+EBUILD phodav-2.2.ebuild 1517 BLAKE2B 5684a44e1061b57b647c203e26581e9ba4622b1e01e099488aa1e050f30ddb9d4b38caa9dec38cc2b42a5d012e67bd8116c12949b7088096cc799d6fb0e983e8 SHA512 ab4b0dd9ee1761e0560cbf88b4323815be6540d060c584ea68bf28eba078811b48f255149dac79a10eb8a7bfa98df1147896828130e520e730ad1cf34908a6a0
 MISC metadata.xml 466 BLAKE2B 81d7512b98e6c1e300131546f378edffde1f5206fde50b012cda0167df1ff4e16c7f64b5362b2dfa6797c2ebabfd8f89f88fe2bd01f5c0d3397ba1f0555b00ea SHA512 835e6f875a2540a0f6761373e568c6e24bb60ab437164638f69e238c5eba8413cd3752a19aab9ecdbbef4f1f0927d00ee11a51f8786c54feec401426ae76b6ec
diff --git a/net-libs/phodav/phodav-2.2.ebuild b/net-libs/phodav/phodav-2.2.ebuild
index 10fd9a02ac54..03d13d55eda9 100644
--- a/net-libs/phodav/phodav-2.2.ebuild
+++ b/net-libs/phodav/phodav-2.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/phodav"
 
 LICENSE="LGPL-2.1+"
 SLOT="2.0"
-KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 x86"
 IUSE="spice systemd zeroconf"
 
 # It included g_uuid_* symbols of its own from an unapplied patch to glib; now that they
diff --git a/net-libs/ptlib/Manifest b/net-libs/ptlib/Manifest
deleted file mode 100644
index f9e8db713e73..000000000000
--- a/net-libs/ptlib/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-AUX ptlib-2.10.10-mga-bison-parameter.patch 820 BLAKE2B 9168cef397a8699c90f65d586253e07eb023485f242b3edfd15ab88c246baadb59c10d4f699cab3620e6cf4c1418c0223fd4675d01a5d7910e92d3e85f196a42 SHA512 9e28f29c26bd990bea3ff22bff8594eb24aff9a485bea54ebd97d0ec96d693ba64ee872fe1e7036188167d31f010a38ee811821236673bfaddbe28854a584748
-AUX ptlib-2.10.10-respect_cflags_cxxflags.patch 578 BLAKE2B 75360ba7fcd2643887e748c39d323466b095e244c3ad28cb747f0eaa825f74b4156749d09ac040184e23ee8fa3f9428aca5de58cd44984decc101a2dd5c99753 SHA512 551d9b8dd248fa66da731bd274c6183deacdbfe48d46b3686ae72aca5b622d4f62c00f6e27bf989d9ae8f2b9c58481b29c84eb99ee0c0a994668037c81bc15f8
-AUX ptlib-2.10.11-gcc6.patch 979 BLAKE2B 08faf2766450c4d7945a0db78b8525f6fc17f329e731725bedf19fd9471f01d78058909dfdbbe50991cb352e5d835e7c530d562aa6ebab8e1430ee84d8e484ee SHA512 11433fc6bdc3e6e275b5a8545796d566fe5e7ad26908205f8cb689ccc4e243d7abb94a11a0e18b60b7ac5ff8a546303b204db85f632e5e8da8d993d98183621b
-AUX ptlib-2.10.9-disable-telnet-symbols.patch 636 BLAKE2B 541478b517fd779c0a32b881cdfd568855bf7eafb56c11ef84e80e2b858ace74c3ebe4cd6c69bea27407adb7e4a5fdc18ae2ea1af3fe1f4a73514454e8bb29fa SHA512 63568fd8b6333af4ce553acf3a143dd91ff948ba905333ffa4e0156be4557aacedc75c6f2025d36216b6c9719fa79da9a9fe77c9c6f9e07d5e9764358532d682
-AUX ptlib-2.10.9-pkgconfig_ldflags.patch 444 BLAKE2B df7f56bd2a68c9266fbd7bb1651355fd7bece0658cb983a60e75ef8e7c97a4cc4c3715fd6c412abbbe8606d827542d8cd1002a2a78c99dcbc672909604986b30 SHA512 948a3c3ba011ae773b0c575109b833446bc5acc7dd3415545dc5f53548a0c2d973f3485672d3694a373242b9ff33911fd9c5efe67c42c8be1289b7622f87e8b4
-AUX ptlib-2.10.9-respect_cxxflags.patch 350 BLAKE2B 683b044721a8abbf36aed816e0a74b9578f063a8ab48d6edbe99c3d37c0880f7824290ad468270ab9e6f7979350b72457306d79ad17d706c9a1a281bf5182a16 SHA512 a74aa658f73b0b73db90324a7e6ef6546e43c190aa052119abf6898c70938a64a896b62d4a237002c7e235f1ba527c80e3befb9757da5de18934a029abf1bd7d
-AUX ptlib-2.10.9-svn_revision_override.patch 706 BLAKE2B 01051f4fd2d27425b9331d69b276bb0821df3e60ddc90dc5311cd6398af55ff5de1e21e9eec5cf7673315ce41cf5cd41e9605de33691789b8ef030f47d829cfa SHA512 be1c89ba86f6587d59fa9ed14e2db4ec02639922461d06e28ef302e2ae9085f7d6c388b51931ec32d78aff0c38eb72d48714e6602e296ce934053eaf6f1bb137
-DIST ptlib-2.10.10-htmldoc.tar.bz2 4504867 BLAKE2B a260c8a170c067e89f07185e0512f7857f2ffcc3c93a3d3853bd93a367333fcd94cd7e9d767e2131180fb9be09ce16c1f4d6c8052bee2db6feda8274d9eaa674 SHA512 7db5d169ad107132d2bca945a1269bae0dd0100b7566b1766dda83d0559a6f2044ffc21905520f7f15d218dd0b1290eaa13d5150d81340c6b0a9a464a713741d
-DIST ptlib-2.10.11.tar.bz2 3736259 BLAKE2B f594f71ca11b7828b5bcb88f5b7468c3689afa68d2cac6693a37cce12aa188e5c4b724eb08e3a8f077c57613846ba1b261c2b3a16a9345030332b5dd0c5b83e3 SHA512 ac8af8962330abf11986ccb863be0990c2e78ae611666d17c68068b72c4a5ea523ba74c55566284c3549e2346e407ccfffb5cc509fbf6ef19f1eb51dcb8b5f15
-EBUILD ptlib-2.10.11.ebuild 6278 BLAKE2B 9fd19dbce5213407461371b812bbc2b125b42f1f8015461249bd99b1ff2050f1d6bd643fc1923ede31759f65de948e2f760606ab8995808914c8b83c9a287a4b SHA512 caf82a7e556ea73801c06e7d08699662bd82391f21bd0d95ebfe7ff6e108f6c81dd774a17f4bda6b778fcbe17d0484c8cfeea6c84afd987f96d5cc27118ae9a1
-MISC metadata.xml 1102 BLAKE2B 59263308311f10f4e5a7f0425ab60fd6d60af2131dbd64c8b0517ea4a02b102f28d9b340b76c0522c3eac87304c28630525c01dc66922c35b60be473b9694300 SHA512 1d45a13f4197fbf7fc9ae6f8f0222309f59dd0fd7bedd6844125c48e60431d99a81d0e4dbeee4b9aa1dc4fb2c1e100f262b113dadf46e65613ed5a09e18435f7
diff --git a/net-libs/ptlib/files/ptlib-2.10.10-mga-bison-parameter.patch b/net-libs/ptlib/files/ptlib-2.10.10-mga-bison-parameter.patch
deleted file mode 100644
index fcc8d0d2e7a8..000000000000
--- a/net-libs/ptlib/files/ptlib-2.10.10-mga-bison-parameter.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- ptlib-2.10.11/./src/ptlib/common/getdate.y	2013-08-15 01:20:26.000000000 +0200
-+++ /mnt/chroot/cauldron/home/dan/rpm/BUILD/ptlib-2.10.11/src/ptlib/common/getdate.y	2013-12-15 00:24:27.866481490 +0100
-@@ -121,9 +121,9 @@
- static int yylex();
- 
- #ifdef __GNUC__
--static int yyerror(char const *msg);
-+static int yyerror(void *, char const *msg);
- #else
--static void yyerror(char const *msg);
-+static void yyerror(void *, char const *msg);
- #endif
- 
- 
-@@ -132,7 +132,8 @@
- 
- %}
- 
--%pure_parser
-+%pure-parser
-+%parse-param {void *parseParam}
- 
- %union {
-     time_t		Number;
-@@ -1018,12 +1019,12 @@
- #endif
- 
- #ifdef __GNUC__
--int yyerror(const char * s)
-+int yyerror(void *var, const char * s)
- {
-   return 0;
- }
- #else
--static void yyerror(const char * s)
-+static void yyerror(void *var, const char * s)
- {
- }
- #endif
diff --git a/net-libs/ptlib/files/ptlib-2.10.10-respect_cflags_cxxflags.patch b/net-libs/ptlib/files/ptlib-2.10.10-respect_cflags_cxxflags.patch
deleted file mode 100644
index 4442d333fcd1..000000000000
--- a/net-libs/ptlib/files/ptlib-2.10.10-respect_cflags_cxxflags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur ptlib-2.10.10.orig/make/ptbuildopts.mak.in ptlib-2.10.10/make/ptbuildopts.mak.in
---- ptlib-2.10.10.orig/make/ptbuildopts.mak.in	2014-08-04 18:11:02.000000000 +0000
-+++ ptlib-2.10.10/make/ptbuildopts.mak.in	2014-08-04 18:11:32.000000000 +0000
-@@ -15,8 +15,8 @@
- OSTYPE	   = @OSTYPE@
- OSRELEASE  = @OSRELEASE@
- 
--STDCCFLAGS    += @STDCCFLAGS@ @CPPFLAGS@
--STDCXXFLAGS   += @STDCXXFLAGS@ @CPPFLAGS@
-+STDCCFLAGS    += @STDCCFLAGS@ @CFLAGS@
-+STDCXXFLAGS   += @STDCXXFLAGS@ @CXXFLAGS@
- OPTSTDCCFLAGS += @OPTSTDCCFLAGS@
- LDFLAGS	      += @LDFLAGS@
- ENDLDLIBS     += @ENDLDLIBS@
-\ No newline at end of file
diff --git a/net-libs/ptlib/files/ptlib-2.10.11-gcc6.patch b/net-libs/ptlib/files/ptlib-2.10.11-gcc6.patch
deleted file mode 100644
index 140de64f16e4..000000000000
--- a/net-libs/ptlib/files/ptlib-2.10.11-gcc6.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/src/ptlib/unix/svcproc.cxx
-+++ b/src/ptlib/unix/svcproc.cxx
-@@ -217,7 +217,7 @@
-     pid_t pid;
- 
-     {
--      ifstream pidfile(pidfilename);
-+      ifstream pidfile(static_cast<const char*>(pidfilename));
-       if (!pidfile.is_open()) {
-         cout << "Could not open pid file: \"" << pidfilename << "\""
-                 " - " << strerror(errno) << endl;
-@@ -384,7 +384,7 @@
-   // Run as a daemon, ie fork
- 
-   if (!pidfilename) {
--    ifstream pidfile(pidfilename);
-+    ifstream pidfile(static_cast<const char*>(pidfilename));
-     if (pidfile.is_open()) {
-       pid_t pid;
-       pidfile >> pid;
-@@ -412,7 +412,7 @@
-       cout << "Daemon started with pid " << pid << endl;
-       if (!pidfilename) {
-         // Write out the child pid to magic file in /var/run (at least for linux)
--        ofstream pidfile(pidfilename);
-+        ofstream pidfile(static_cast<const char*>(pidfilename));
-         if (pidfile.is_open())
-           pidfile << pid;
-         else
diff --git a/net-libs/ptlib/files/ptlib-2.10.9-disable-telnet-symbols.patch b/net-libs/ptlib/files/ptlib-2.10.9-disable-telnet-symbols.patch
deleted file mode 100644
index 0a3012c8510a..000000000000
--- a/net-libs/ptlib/files/ptlib-2.10.9-disable-telnet-symbols.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -uNr ptlib-2.10.8.orig/src/ptclib/cli.cxx ptlib-2.10.8/src/ptclib/cli.cxx
---- ptlib-2.10.8.orig/src/ptclib/cli.cxx	2012-10-19 13:45:35.000000000 -0400
-+++ ptlib-2.10.8/src/ptclib/cli.cxx	2012-10-22 16:02:58.000000000 -0400
-@@ -858,6 +858,7 @@
- 
- ///////////////////////////////////////////////////////////////////////////////
- 
-+#ifdef HAS_TELNET
- PCLITelnet::PCLITelnet(WORD port, const char * prompt, bool singleThreadForAll)
-   : PCLISocket(port, prompt, singleThreadForAll)
- {
-@@ -868,6 +869,7 @@
- {
-   return new PTelnetSocket();
- }
-+#endif
- 
- 
- ///////////////////////////////////////////////////////////////////////////////
diff --git a/net-libs/ptlib/files/ptlib-2.10.9-pkgconfig_ldflags.patch b/net-libs/ptlib/files/ptlib-2.10.9-pkgconfig_ldflags.patch
deleted file mode 100644
index acd531977c3b..000000000000
--- a/net-libs/ptlib/files/ptlib-2.10.9-pkgconfig_ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -uNr ptlib-2.10.8.orig/ptlib.pc.in ptlib-2.10.8/ptlib.pc.in
---- ptlib-2.10.8.orig/ptlib.pc.in       2012-10-19 13:45:35.000000000 -0400
-+++ ptlib-2.10.8/ptlib.pc.in    2012-10-19 14:03:26.000000000 -0400
-@@ -11,7 +11,7 @@
- Name: ptlib
- Description: PT Library
- Version: @PTLIB_VERSION@
--Libs: @LDFLAGS@ -L${libdir} -lpt${suffix}
-+Libs: @ENDLDLIBS@ -L${libdir} -lpt${suffix}
- Libs.private: @ENDLDLIBS@
- Cflags: -I${includedir} @STDCCFLAGS@
diff --git a/net-libs/ptlib/files/ptlib-2.10.9-respect_cxxflags.patch b/net-libs/ptlib/files/ptlib-2.10.9-respect_cxxflags.patch
deleted file mode 100644
index dc09f960f05a..000000000000
--- a/net-libs/ptlib/files/ptlib-2.10.9-respect_cxxflags.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -uNr ptlib-2.10.8.orig/configure.ac ptlib-2.10.8/configure.ac
---- ptlib-2.10.8.orig/configure.ac	2012-10-19 13:45:35.000000000 -0400
-+++ ptlib-2.10.8/configure.ac	2012-10-23 08:08:57.000000000 -0400
-@@ -538,7 +540,7 @@
-   AC_MSG_RESULT(yes)
- else
-   AC_MSG_RESULT(no)
--  STDCXXFLAGS="$STDCCFLAGS -frtti"
-+  STDCXXFLAGS="$STDCXXFLAGS -frtti"
- fi
diff --git a/net-libs/ptlib/files/ptlib-2.10.9-svn_revision_override.patch b/net-libs/ptlib/files/ptlib-2.10.9-svn_revision_override.patch
deleted file mode 100644
index 5531fd9f6fcb..000000000000
--- a/net-libs/ptlib/files/ptlib-2.10.9-svn_revision_override.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -uNr ptlib-2.10.8.orig/src/ptlib/common/osutils.cxx ptlib-2.10.8/src/ptlib/common/osutils.cxx
---- ptlib-2.10.8.orig/src/ptlib/common/osutils.cxx      2012-10-19 13:45:35.000000000 -0400
-+++ ptlib-2.10.8/src/ptlib/common/osutils.cxx   2012-10-19 13:52:50.000000000 -0400
-@@ -43,13 +43,13 @@
- #include <ptlib/svcproc.h>
- #include <ptlib/pluginmgr.h>
- #include "../../../version.h"
--#include "../../../revision.h"
-+# define SVN_REVISION 0
-+//#include "../../../revision.h"
- 
- #ifdef _WIN32
- #include <ptlib/msos/ptlib/debstrm.h>
- #endif
- 
--
- static const char * const VersionStatus[PProcess::NumCodeStatuses] = { "alpha", "beta", "." };
- static const char DefaultRollOverPattern[] = "_yyyy_MM_dd_hh_mm";
diff --git a/net-libs/ptlib/metadata.xml b/net-libs/ptlib/metadata.xml
deleted file mode 100644
index 11317127f35c..000000000000
--- a/net-libs/ptlib/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<use>
-		<flag name="asn">Enable ASN decoding/encoding support</flag>
-		<flag name="dtmf">Enable DTMF encoding/decoding support</flag>
-		<flag name="http">Enable HTTP support</flag>
-		<flag name="mail">Enable mail protocols (POP3/SMTP)</flag>
-		<flag name="qos">Enable QOS support</flag>
-		<flag name="remote">Enable remote connection support</flag>
-		<flag name="serial">Enable serial port support</flag>
-		<flag name="shmvideo">Enable shared memory video devices</flag>
-		<flag name="socks">Enable SOCKS protocol support</flag>
-		<flag name="stun">Enable STUN support</flag>
-		<flag name="telnet">Enable telnet protocol support</flag>
-		<flag name="tts">Enable Text-To-Speech server support</flag>
-		<flag name="video">Enable video support</flag>
-		<flag name="vxml">Enable VoiceXML support</flag>
-		<flag name="wav">Enable WAVFILE support</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">opalvoip</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-libs/ptlib/ptlib-2.10.11.ebuild b/net-libs/ptlib/ptlib-2.10.11.ebuild
deleted file mode 100644
index 02495a8d0e38..000000000000
--- a/net-libs/ptlib/ptlib-2.10.11.ebuild
+++ /dev/null
@@ -1,225 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="Network focused portable C++ class library providing high level functions"
-HOMEPAGE="http://www.opalvoip.org/"
-SRC_URI="mirror://sourceforge/opalvoip/${P}.tar.bz2
-	doc? ( mirror://sourceforge/opalvoip/${PN}-2.10.10-htmldoc.tar.bz2 )"
-
-LICENSE="MPL-1.0"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86"
-# default enabled are features from 'minsize', the most used according to ptlib
-IUSE="alsa +asn debug doc +dtmf examples ffmpeg ftp +http ipv6
-xmpp ldap lua mail odbc oss pch pulseaudio qos remote sasl sdl serial
-shmvideo snmp soap socks +sound ssl static-libs +stun telnet tts v4l +video
-vxml +wav +xml xmlrpc"
-
-CDEPEND="
-	ldap? ( net-nds/openldap )
-	lua? ( dev-lang/lua )
-	odbc? ( dev-db/unixODBC )
-	pulseaudio? ( media-sound/pulseaudio )
-	sasl? ( dev-libs/cyrus-sasl:2 )
-	sdl? ( media-libs/libsdl )
-	sound? ( alsa? ( media-libs/alsa-lib ) )
-	ssl? ( dev-libs/openssl )
-	video? ( v4l? ( media-libs/libv4l ) )
-	xml? ( dev-libs/expat )
-	!!dev-libs/pwlib"
-RDEPEND="${CDEPEND}
-	ffmpeg? ( virtual/ffmpeg )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	sys-devel/bison
-	sys-devel/flex
-	video? ( v4l? ( sys-kernel/linux-headers ) )"
-
-# NOTES:
-# media-libs/libdc1394:2 should be supported but headers location have changed
-# tools/ directory is ignored
-# avc plugin is disabled to fix bug 276514, see upstream bug 2821744
-
-conditional_use_warn_msg() {
-	ewarn "To enable ${1} USE flag, you need ${2} USE flag to be enabled"
-	ewarn "Please, enable ${2} or disable ${1}"
-}
-
-REQUIRED_USE="sdl? ( video )
-	xmpp? ( xml )
-	vxml? ( http tts xml )
-	xmlrpc? ( http xml )
-	soap? ( http xml )"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.10.9-svn_revision_override.patch" \
-		"${FILESDIR}/${PN}-2.10.9-pkgconfig_ldflags.patch" \
-		"${FILESDIR}/${PN}-2.10.9-respect_cxxflags.patch" \
-		"${FILESDIR}/${PN}-2.10.10-mga-bison-parameter.patch" \
-		"${FILESDIR}/${PN}-2.10.10-respect_cflags_cxxflags.patch" \
-		"${FILESDIR}/${P}-gcc6.patch"
-
-	if ! use telnet; then
-		epatch "${FILESDIR}/${PN}-2.10.9-disable-telnet-symbols.patch"
-	fi
-
-	# remove visual studio related files from samples/
-	if use examples; then
-		rm -f samples/*/*.vcproj
-		rm -f samples/*/*.sln
-		rm -f samples/*/*.dsp
-		rm -f samples/*/*.dsw
-	fi
-
-	if [[ ! -z ${TARGET+set} ]]; then
-		ewarn "TARGET variable is set. Removing as it would break the build, bug #465722."
-		unset TARGET
-	fi
-}
-
-src_configure() {
-	local myconf=""
-
-	# plugins are disabled only if ! sound and ! video
-	if ! use sound && ! use video; then
-		myconf="${myconf} --disable-plugins"
-	else
-		myconf="${myconf} --enable-plugins"
-	fi
-
-	# minsize: presets of features (overwritten by use flags)
-	# ansi-bool, atomicity: there is no reason to disable those features
-	# internalregex: we want to use system one
-	# sunaudio and bsdvideo are respectively for SunOS and BSD's
-	# appshare, vfw: only for windows
-	# samples: no need to build samples
-	# avc: disabled, bug 276514, upstream bug 2821744
-	# mlib: SUN mediaLibs. Not in tree.
-	# pipechan, configfile, resolver, url: force enabling
-	econf ${myconf} \
-		--disable-minsize \
-		--enable-ansi-bool \
-		--enable-atomicity \
-		--disable-internalregex \
-		--disable-sunaudio \
-		--disable-bsdvideo \
-		--disable-appshare \
-		--disable-vfw \
-		--disable-samples \
-		--disable-avc \
-		--disable-mlib \
-		--enable-configfile \
-		--enable-pipechan \
-		--enable-resolver \
-		--enable-url \
-		$(use_enable alsa) \
-		$(use_enable asn) \
-		$(use_enable debug exceptions) \
-		$(use_enable debug memcheck) \
-		$(use_enable debug tracing) \
-		$(use_enable dtmf) \
-		--disable-esd \
-		$(use_enable ffmpeg ffvdev) \
-		$(use_enable ftp) \
-		$(use_enable http) \
-		$(use_enable http httpforms) \
-		$(use_enable http httpsvc) \
-		--disable-dc \
-		$(use_enable ipv6) \
-		$(use_enable xmpp jabber) \
-		$(use_enable ldap openldap) \
-		$(use_enable lua) \
-		$(use_enable mail pop3smtp) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable odbc) \
-		$(use_enable oss) \
-		$(use_enable pch) \
-		$(use_enable qos) \
-		$(use_enable remote remconn) \
-		$(use_enable sasl) \
-		$(use_enable sdl) \
-		$(use_enable serial) \
-		$(use_enable shmvideo) \
-		$(use_enable snmp) \
-		$(use_enable soap) \
-		$(use_enable socks) \
-		$(use_enable sound audio) \
-		$(use_enable ssl openssl) \
-		$(use_enable stun) \
-		$(use_enable telnet) \
-		$(use_enable tts) \
-		--disable-v4l \
-		$(use_enable v4l v4l2) \
-		$(use_enable video) $(use_enable video vidfile) \
-		$(use_enable vxml) \
-		$(use_enable wav wavfile) \
-		$(use_enable xml expat) \
-		$(use_enable xmlrpc)
-}
-
-src_compile() {
-	local makeopts=""
-	tc-env_build
-
-	use debug && makeopts="debug"
-
-	emake ${makeopts} V=1 || die "emake failed"
-}
-
-src_install() {
-	local makeopts=""
-
-	use debug && makeopts="DEBUG=1"
-
-	emake DESTDIR="${D}" ${makeopts} install || die "emake install failed"
-
-	# Get rid of static libraries if not requested
-	# There seems to be no easy way to disable this in the build system
-	if ! use static-libs; then
-		rm -v "${D}"/usr/lib*/*.a || die
-	fi
-
-	if use doc; then
-		dohtml -r "${WORKDIR}"/html/* || die "dohtml failed"
-	fi
-
-	dodoc History.txt ReadMe.txt ReadMe_QOS.txt || die "dodoc failed"
-
-	if use sound || use video; then
-		newdoc plugins/ReadMe.txt ReadMe-Plugins.txt || die "newdoc failed"
-	fi
-
-	if use examples; then
-		local exampledir="/usr/share/doc/${PF}/examples"
-		local basedir="samples"
-		local sampledirs="`ls samples --hide=Makefile`"
-
-		# first, install Makefile
-		insinto ${exampledir}/
-		doins ${basedir}/Makefile || die "doins failed"
-
-		# now, all examples
-		for x in ${sampledirs}; do
-			insinto ${exampledir}/${x}/
-			doins ${basedir}/${x}/* || die "doins failed"
-		done
-	fi
-}
-
-pkg_postinst() {
-	if use examples; then
-		ewarn "All examples have been installed, some of them will not work on your system"
-		ewarn "it will depend of the enabled USE flags."
-		ewarn "To test examples, you have to run PTLIBDIR=/usr/share/ptlib make"
-	fi
-
-	if ! use sound || ! use video; then
-		ewarn "You have disabled sound or video USE flags."
-		ewarn "Most audio/video have been disabled silently even if enabled via USE flags."
-		ewarn "Having a feature enabled via use flag but disabled can lead to issues."
-	fi
-}
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 13e5c0ac210f..400ebec082a6 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -13,7 +13,7 @@ DIST webkitgtk-2.18.5.tar.xz 14828616 BLAKE2B 850d5b74327975060615d9bb481c8ec264
 DIST webkitgtk-2.18.6.tar.xz 14829316 BLAKE2B 4c0140c17d513f064efe09aaefff434e3cbf2a88691c7916ed393bf9bd25a3cb5a1d4ea8699eb7e0d678d807293b66c4629e46df9088df9b4d122c554b280ead SHA512 375907d4c84e27aaa4b5df9a71424488c1b2ba0cf1d63e107d678c0f55f677996a80e9d9a9d4a412b40d1d0dde77b88464c54246cbafe70751042ec8a7bbe029
 DIST webkitgtk-2.4.11.tar.xz 9869100 BLAKE2B 9b1351976dc753025e6aba86a40f97fdf58821a6a7af109140a18adc7a0e1d8c140711b48bceeb3c4c189e7d52f258520623c7d971c46b6f2572c0e1de0d0100 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb
 EBUILD webkit-gtk-2.18.5.ebuild 8283 BLAKE2B 746803e8799d8125e39fb395b8ffdeb4bd0e34c969bec79b264974aead813a7e73a1b6c4d121bd34ee42a060f970fe0966c1272fac4f723cb71e669d8425af9d SHA512 93a751dc658101a97ccff5ad637e317200a21b0faabb42a35502a5b40b850ce23ce843f6bdb5de08fa5cdf991ebd91b780260b9a5130a8def2c4191b295a4b74
-EBUILD webkit-gtk-2.18.6.ebuild 8285 BLAKE2B e9937008fc089687a6903593651f4a9dddbf5a5090d88ffda3f88a6ae2b21f94bd6a2a5605520091b0c5e0fe70db9ecbd15f658fba4e58121222a3a127b53cd4 SHA512 33e38bebe2027cb9cef7d2f1492ae318fc6aa212204f86b904a3ea921712cc20c6c1778f6fd5264b5210a26058826b33c063b7f2180e7f30e61aa3340acd5beb
+EBUILD webkit-gtk-2.18.6.ebuild 8284 BLAKE2B 0d476e2d8f12429328ba8675ba51dc822de26a6b37a1284be6da0883ba622dc9bf88a6be8d911d75ac0a5dc68727ef7bd047f8641456f72a0f0f6f26e46ddd4e SHA512 067593940d294aaa82007d72a2915b5748c4f229812859a040103b99d5586595fe2e267df65a94e921aa1b5f9b8498dc715ca0cf6862cac8a89b052ebc141fc4
 EBUILD webkit-gtk-2.4.11-r1.ebuild 8966 BLAKE2B f54135230b3e5d12303f131bec732e2163c32a58c8571d566810f6563b285c11b253d5e46b80752a1e15a3f6c8462aaa3e856ea1c52b1bb9032d80f1e1b3f021 SHA512 559a7228b2c7f2dd00c26c7d4b0b935850eb93cc1e192c2e6695e5a418766050c80181d3b96254dcbfc3b9a8419c0605835a13b7640ceb6b750ec40edff35cd9
 EBUILD webkit-gtk-2.4.11-r200.ebuild 8373 BLAKE2B 9ee92280f93c2aa1107aab98faabf9c3298b0b70b9e5c30fdfd6c8d9cb3f7c9ab5362248c19a9d0d6ed49ec81ca4e6f0b5510413e16dbdace7941f051d0872ca SHA512 7b96440750ed9f5e6402aed773cfe1e40e419364d7d526922247e58c9cb7ead97960f9866d90cc990abce8e183d06bd66191d09991d137b7b9ba86faee4f4dca
 MISC metadata.xml 771 BLAKE2B 219d1c257311262d452b02b19b387cca0fc17cdc675cb4c790277c2c4f2ae9863a6039738a9151a3d6912ca024bc1d2348f5ca786f50412295fa8455c90fc8b4 SHA512 a4f15ea6644bf827f15628917d7af57f6569a2273cdf1246d468af95ab776ffe89fa305f842c869ad75c2b9a9480c4d5bc0e00732952ded75607de7ed9695236
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild
index 300736415c52..0e48cc9ffb85 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl +X"
 
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index dc9e4811406f..7c393ef222d5 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 9b3ca7b1e8fa..0a0d472741d7 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -15,7 +15,7 @@ DIST dovecot-2.3.0.tar.gz 6635541 BLAKE2B 3c76ccc0fac19511c9852aabd5d86c2fb81589
 EBUILD dovecot-2.2.19.ebuild 9085 BLAKE2B 6f0bcda9ec145e8ad90e024fbe38f4036ca4ff632a7281bdaf1f292d148b63df587ea380a7df8bcf0bde2e5aa9e4ca6200f2159b61923fe93710f7c30dc230d3 SHA512 cb619f9f5588ab1be1b5de749663e4798044d695a359c96182037c8b3cdb94c8a7b41eac93054f2979b30d09405a3396e83d0d08cad3ad964654ae98f7632098
 EBUILD dovecot-2.2.29.1.ebuild 9214 BLAKE2B 4107278bc4fe19d5ea04f1e7218ba4ce7f4fbcc7521d04d018433934b23f46480bb62a2c00f6ec324e8d32ca2fdc7064f19c927d4285460f8f357e28f5f4f307 SHA512 e278bb8f734cc648ae10b34615ef08b3bbd4e070dda898c85ec5b48dde22b6475b266470cbba41f82b33969ad2f55fc523d6a2df9a3f74dceaa14e015b8b5ccf
 EBUILD dovecot-2.2.32.ebuild 8654 BLAKE2B 46aa411f0cab5d3ef96127912d59e23d72a8b4149afed4f9e7fbbb39397f75ff1a4369d10e259287ff0c5bf6b8bbcfe8de19f4940645ba315ab2a0c9c692668e SHA512 570c9c5e20344a3c941e7b13a3dd1be6150967a108f15150d56dbcd6852e08a67a4b975259fabb8bdb9ecfd1a5dd3cbf94b19c13c5482cc39dc2fe23bfb77a80
-EBUILD dovecot-2.2.33.2-r1.ebuild 8717 BLAKE2B 293456634a74b240d0dd8e06f2929b53a101fd1d91ac1faff53b89449bdab7b5c3d3223a2761188123010738e8e7607f138a6db6f6f29a6139d5efcde682e93b SHA512 4dd6f96f611668fcac174ee055529fd910f42d79fedd3bce465a9ce354a650a4062b7fe202b1a2a3edd1fd1cc5fe74ef64ecce3e437a0d8671202a8e652126f6
+EBUILD dovecot-2.2.33.2-r1.ebuild 8716 BLAKE2B 64446a5b4f92ad83d32fa733255a6188c1f736a59de2a42ddd4b78248f8547f0b8832f8eac121eab7d5d078b8efb5498664f25e2e23a832b710b9632ec2243f1 SHA512 e42043d9309193b1b8e8639523dd0371cfdce698d7e19ceabd7104adaac3d33f87a00c2f0b94e0220923d2055d890b40e18a26767c20e6dfa0054a3faac965a1
 EBUILD dovecot-2.2.33.2.ebuild 8659 BLAKE2B cbfd45f4ac3642de86f543fafb39e91c67ee27eec6d67f8e862670f8a125e7d4c9dab55771100db357dd8576c6fba1d6ae825c240f7cf803a95e141955a183ce SHA512 6c86a0ade4f80b658e162b7518f5bc543c2b51008ecc33894432a22b7de1b2b78a11fb38483630f1277bd89c60d6a119f5a4400d11d5d4f9c9505b2484d2ad47
 EBUILD dovecot-2.3.0-r1.ebuild 8684 BLAKE2B c8f291c972ea59fe10c7cfe1dc4bbe49998aa9e1764c18ee95825a9dc91e05eec64e4e73956a61860989341b94a4c3688ff6ead414bd36bc63c7ae01ec7efe73 SHA512 ea6b08be76fb43c4a66355daf9ae1e73e51bf5f6b39d9638cfad112e434721a58fcea99936fff6a332c9a39518c797daa8e023bbdca96d1633a508460977ae4d
 EBUILD dovecot-2.3.0-r2.ebuild 8747 BLAKE2B 2e89b81e959b7e7350a407f41a6a826d34b5b087c3d2f6e4b112248084cef9fef1337140b299ee42dfcac016e302b98dfefe733b27a54064252309ef9b05744f SHA512 76ce6c3d0cc7b22189d51c6f87a631f44381bdbc23c3dd29c9f94b40fcaf9e481b8e8a91d55816e9d1c6807a878f4362dc8fb3034c4d066ff0677cc265a95577
diff --git a/net-mail/dovecot/dovecot-2.2.33.2-r1.ebuild b/net-mail/dovecot/dovecot-2.2.33.2-r1.ebuild
index c45f29c7a8b2..3edda0721dc7 100644
--- a/net-mail/dovecot/dovecot-2.2.33.2-r1.ebuild
+++ b/net-mail/dovecot/dovecot-2.2.33.2-r1.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.dovecot.org/"
 
 SLOT="0"
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
 
 IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
 IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index e8d6df14d869..9bf02140dbdd 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/connman/Manifest b/net-misc/connman/Manifest
index eb9ad26dd43b..b0002812cfb9 100644
--- a/net-misc/connman/Manifest
+++ b/net-misc/connman/Manifest
@@ -12,5 +12,5 @@ DIST connman-1.35.tar.xz 686092 BLAKE2B 706d8333dc2fcbee8d0ef3849325c4975dfe312a
 EBUILD connman-1.29.ebuild 2013 BLAKE2B 8b80a54f1e7db67aaf16b7ba31d27aa4e9533260944944d6e3877d3794f67963b420a074bafdc5b5ec1f26fe29f6a24e29bd618a9eec52b3c3c2d690db21975e SHA512 e77846ca1759957f4d898fd76b06f126d6181c85384eed8f6ffee4d9e6845eb43f831a0db1ea349b387392e60e43dda8c364f87b1f98c5ca84652e2fa858e35b
 EBUILD connman-1.33-r1.ebuild 2280 BLAKE2B ac059303eeae7e2eefa254a874ff80c254c8dda3b80bbbf27ea62f6a9a59c5033bb0b244d30c68dc2dd3cb8117af6c0204b766911804cae6323a8056f7b1852e SHA512 8c396fa66e67a4519d2fe067e43f11cff3cb751e7f610e6ccb2cc75836cf74784fde1f8ae291b4b2189e92c941885b3c67e55556807eb1c9fdf619c9bc247ce0
 EBUILD connman-1.34.ebuild 2490 BLAKE2B bd804da85d0d880e69cf9fd6ea2b8fe813c508ffc3196cb82774d59966b9a4468f271e7e9472e74814c8c6a3df22c934ca2fcac5c792e64bb72226f0172d4b4a SHA512 51b456ca18a681392a9ffdc44ca31d1838cfe597e43ecef28b5202f69415465ee29a70d26a6ead153acaf7028b3da18049ab7d2c465b21fffd443c8b07afe302
-EBUILD connman-1.35-r1.ebuild 2496 BLAKE2B 0d19021df51200d4232cfa769dc7d8a4823444ae50f29a893db339138f9a5dbed2f079ef5f2c83a3fce3454443526539411126ef765c8c1b7cd61a082a5ce684 SHA512 b32d306828bcb2d9a7691ae2b3e833cad5df5d6965744792c068c93b2edf8baec621c473ae51e198328c5d8a3836d4465f177089b4001045ac886d09fcef5220
+EBUILD connman-1.35-r1.ebuild 2495 BLAKE2B 90b6032ac9af0419fef9bc30f83543460c99a1df6932eba3596e720728e2ce18f3c462a6cda06a6ab5ba3e6b8271180e0e476abc2c93b3fbee965a01987a33d0 SHA512 a68626ab05347665300309baad5610909c5c14a9c1410eb2917f69d742a953b852417c8cf18e09849fd60688971096647eeb334afbb12c2eb6d7ff548219e49d
 MISC metadata.xml 1087 BLAKE2B a6c16a8e9ce0a5154d6b6081f1527316dd2bf9aec3d45c1f64c224ab25479e041b4848f08fef072ef5d026517bfc49c04756f062524aa6ad60c80945c7c182b1 SHA512 8f02d9cf4194c9e24edaa9a0427d63db483bbf559ea119a043a70a759f583aec42203bedd12c91364e1c24850e9cb6b1831054294c3837a0c3a50cb75dc1de42
diff --git a/net-misc/connman/connman-1.35-r1.ebuild b/net-misc/connman/connman-1.35-r1.ebuild
index 8d406d12dd1f..1f7d110cfb2d 100644
--- a/net-misc/connman/connman-1.35-r1.ebuild
+++ b/net-misc/connman/connman-1.35-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -10,7 +10,7 @@ SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 IUSE="${IUSE} bluetooth debug doc examples +ethernet iptables l2tp nftables"
 IUSE="${IUSE} ofono openvpn openconnect pptp policykit tools vpnc +wifi wispr networkmanager"
diff --git a/net-misc/dleyna-server/Manifest b/net-misc/dleyna-server/Manifest
index d58e43d67dab..20b24605b2ca 100644
--- a/net-misc/dleyna-server/Manifest
+++ b/net-misc/dleyna-server/Manifest
@@ -1,4 +1,4 @@
 AUX dleyna-server-0.5.0-fix-references-to-GUPnPContextManager.patch 285 BLAKE2B 5425885163b4df90ec99ff0756d1d1da0b0336a73790f1f1c3e7c2ed40b51c78752705a229313d4e35503f62acd3d521026cc7553c154f35c464de5fe53dcf48 SHA512 76df25eac5b3b0d726089e98c38d8280bf3a72dfa830381f3b6a9a31df10abe31cc53c64e75f2fb12901130f243377392c607129821ca7645929ec2696bd88e4
 DIST dleyna-server-0.5.0.tar.gz 412938 BLAKE2B 532e1a418708d84dabd98670d84c865b6f69252cbd851504bd2d75bbbf683b699a47513a6ae994f809f3993a67815d5a3ee53683a016448c76d604fed040aceb SHA512 30bafd14c9b85406efc21dd078bce80ed10927ef2728c4535990654b6c279549c5a89099d9266cd1e22a2f574006d2c9cfec8e3e79109c2e760d8ab4609cf398
-EBUILD dleyna-server-0.5.0.ebuild 873 BLAKE2B d1af1ae02af52f45c6fdd533829bd4810057701d56d1c04328e1c589ea54dcac9f3f1783b20d74383e2d9857dc8321975f556e4ae6fdb8df10c81cd530820735 SHA512 507717788e3381b2e75d9bea7edcb7989a02c8bf21081199883da091ae09558148ab0a23807cadea032d1c0c8bc4e0b686eb206111c05802b681551a8a1e1a9c
+EBUILD dleyna-server-0.5.0.ebuild 872 BLAKE2B cf3ea2916e153af0b4438d01d7b2495112d2fe356fbc3b3f74fb7f811327cd91f0fef142cd4fb8b4bfbc2eb338f04ad63deb84ee10582611ac53b2fe9f046c6e SHA512 fac6e7c16a244a41f46b48b79f15d3835affea3be55209b4f522c8c7a5b0a0eea8ea1070d5f4e9a3b464a5660c60d3e0d678a3ea3b0bf2c8db88d5a4ae3034c7
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-misc/dleyna-server/dleyna-server-0.5.0.ebuild b/net-misc/dleyna-server/dleyna-server-0.5.0.ebuild
index a10310c86cab..9d565e6f13d5 100644
--- a/net-misc/dleyna-server/dleyna-server-0.5.0.ebuild
+++ b/net-misc/dleyna-server/dleyna-server-0.5.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://01.org/sites/default/files/downloads/dleyna/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index 1c69c2d3d184..711672933237 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -1,4 +1,4 @@
 AUX 2.8.0-no-user-root.patch 708 BLAKE2B fe16be6af4322f52a5014acf034ad4f8e2711c46386de9ccbeedee819224d8523ecd79c862338de1910f84a5c39cddbffce9955c2c0185576d837f2d2ac08da6 SHA512 d5e75f6b4dad401b547d4533126b93690c17237c51987547639c407fe684f5fe83759ea77637b8b2e7b2b9c63ac85ff015ec2b35c459bbef74572ea08f89c8dd
 DIST Electrum-3.0.5.tar.gz 2639766 BLAKE2B 28587ca056247a5671d84c0b79824e8eea8df8ca2e3204333e6edd7db98ecbeebdf81f4ac819de8b87c7593e83f948d091d48d55cdff08af76322d94bacec0fd SHA512 27cfa44ce8eeb5eef8038f1f68b4a42d173daaf7a940ffc9e9b1dad16a8f7f49bd53d5eefdbaf242e5e09aa2f887bce536f17941c2250225cd92c78f62c52e39
-EBUILD electrum-3.0.5.ebuild 4256 BLAKE2B 6f8b98f75accac0d16401175ec13acbe355ae328b69b06a04d0e55e0ccfa95c34d4804a8239bed611188af59c54a346077701defd827aed4b525ee42ad2628d4 SHA512 09d6270945126e63ea0c8385ec4fb4726d7b029e12543fcf6466c1384bebb38ab87d5462e926f1928971423099cb49fa0cb9433c52b4230fff474eb29750a877
+EBUILD electrum-3.0.5.ebuild 4280 BLAKE2B d4bfe3b62c9561b1335d9ff9d77048b20a7c94a0fd5e9cf0df1de7fc341302ab275a0efff300cf01ab492df4323dcc979ec9846f2246877387d138a64c337a81 SHA512 71db35179f27cf9d7a273df7d346087020e4c0ed46d2d581acaaba322a788be6829215fcafe3d05b666fd8e793fe748b9697d9d6e6af405ea35607751ff0b713
 MISC metadata.xml 1327 BLAKE2B d0029a93d9b105b621b2053498ff5c570e97e3945fb1c33252f85ab3110d06395b03d05b2625dc278ca8c36521762c74d52fcb9317055f9532e82c18168fb02e SHA512 3047791e1985494eeec1348c64e9a7ef6f9055cc01b0eb462dcb8958a6fb448d75ace206c33498cdd45a5470efc4091f5bc0bc062284a2bd2b0f4a6299591d09
diff --git a/net-misc/electrum/electrum-3.0.5.ebuild b/net-misc/electrum/electrum-3.0.5.ebuild
index 47ccf45aef4d..c876f238df53 100644
--- a/net-misc/electrum/electrum-3.0.5.ebuild
+++ b/net-misc/electrum/electrum-3.0.5.ebuild
@@ -3,10 +3,10 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_{4,5} )
+PYTHON_COMPAT=( python3_{4,5,6} )
 PYTHON_REQ_USE="ncurses?"
 
-inherit distutils-r1 gnome2-utils xdg-utils
+inherit desktop distutils-r1 gnome2-utils xdg-utils
 
 MY_P="Electrum-${PV}"
 DESCRIPTION="User friendly Bitcoin client"
@@ -46,7 +46,7 @@ REQUIRED_USE="
 	vkb? ( qt5 )
 "
 
-RDEPEND="
+RDEPEND="${PYTHON_DEPS}
 	dev-python/ecdsa[${PYTHON_USEDEP}]
 	dev-python/jsonrpclib[${PYTHON_USEDEP}]
 	dev-python/pbkdf2[${PYTHON_USEDEP}]
diff --git a/net-misc/gnome-online-miners/Manifest b/net-misc/gnome-online-miners/Manifest
index 0f84ad818ea0..80c5fcdf2095 100644
--- a/net-misc/gnome-online-miners/Manifest
+++ b/net-misc/gnome-online-miners/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-online-miners-3.22.0.tar.xz 272832 BLAKE2B 67e56662dc74e35f23f7db5ae586a761a0043e01c07cb3ac9d3dd43b2f978e1472155748ac1c67498c1f30f0b342cab40d35a9934eff28ac31493778a8fc0c6f SHA512 91fafb41523b239fae6dda6dbbf0a1c64dba6089f70b2336574604c996c2e09e1f64445621c170ec70a98736362633443aea5ed7028cd8347d9beaaeb7f4aed4
 DIST gnome-online-miners-3.24.0.tar.xz 272572 BLAKE2B 6331e72f65510041cc278670df328ab6ec5336bb76ec1c6681136c6731c70b9d343ef296062da6de302cfea195d1b99c0040e1e016394b2fe3bbbe077915cd76 SHA512 96c6aa99b99553c399ecef754d10a918d8ef3bdf6369a77357241091edc9c2ff7a8350f8a064bb011deddac75b25bdde8006e8d72b6562f9cdcf3b373e693253
 EBUILD gnome-online-miners-3.22.0.ebuild 894 BLAKE2B 952812eaf8755bd1ba2ee159c87cbfc3e898cc6fc72d8163d24afa56319042082ab68e68cbdbcd79c2fffd45a228ceac74df747df87b2aa88d2e71322fd584fb SHA512 2d8df1e94072b071be24a5498baa901842163112f16edebb81784e8d86b4efd77120093e349df31a4d1a1a2306a332f3e1d0a098d4608c11631c84d427db9b46
-EBUILD gnome-online-miners-3.24.0.ebuild 895 BLAKE2B 0ef740d6869466629bec1a7cdc151186bb17d92cb37d323eac9477fdde4bc509b8d89ac1f9aaf6b81c0984963e00bedc7872a4b6a0170cebdac8de1d8b7e0b7c SHA512 c3a844f967dda3ac890ed1303b2a69415abbb7d9e40e6de2b63750c7b2e26604a7e56d2bf864c356f27b42f2dbfe9c9edfa76225a919d6624695260fa37d461e
+EBUILD gnome-online-miners-3.24.0.ebuild 894 BLAKE2B 7237aa4f222c2da2b888cdfd2809941ed5264114ee54961b11d330bdc576c2f8e9fefb1436dfb12cb59a0497438baa85807c90203d35fdaa07959b79d095239c SHA512 e484cf9af3528388c9dd8ea6f7fcd04311830d2a4715dc6283d8b428427d1b803e0f43169d85eadcd6d5d6cb03420eda8d867d0df717b5831d8056b37863e7f1
 MISC metadata.xml 312 BLAKE2B 4529eb2ea76ee2c88700e8d551c726424ce4338361eb87c39599d1ee263914d9861cc8f93e1d8e667bdba186c40afbf1376bd9b530edbdab32ec4f961a60f00b SHA512 483189736c04729c1497b3bd6321a1d86241835c22df7c06658fda2af4f06d56f614499bcb8ab7eac76a3619fbaac81cfb430aedf3d4f78592ef3c8fd73746dd
diff --git a/net-misc/gnome-online-miners/gnome-online-miners-3.24.0.ebuild b/net-misc/gnome-online-miners/gnome-online-miners-3.24.0.ebuild
index 25457546f6e5..0a5b5e7d07e1 100644
--- a/net-misc/gnome-online-miners/gnome-online-miners-3.24.0.ebuild
+++ b/net-misc/gnome-online-miners/gnome-online-miners-3.24.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineMiners"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="flickr"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # libgdata[gnome] needed for goa support
 RDEPEND="
diff --git a/net-misc/rygel/Manifest b/net-misc/rygel/Manifest
index 64a325903684..da479c979a96 100644
--- a/net-misc/rygel/Manifest
+++ b/net-misc/rygel/Manifest
@@ -1,5 +1,5 @@
 DIST rygel-0.32.1.tar.xz 3977648 BLAKE2B 8d1777bb0092779ca545ee561e80504180cd3aeb4add0f0a41bcd8001a8130b0e52a31216414f9d4ee949fe3aaf4e607faf718c250680085692e0e262dfb0639 SHA512 55aaed85a44496792bf9bc34d150f1f9d79b7c440da4351c730580200cc7e3a19f378dd93fdf2ab5b4c19cd793a25481c2bf15f3e7043595e6971eca983f0767
 DIST rygel-0.34.0.tar.xz 3997364 BLAKE2B 2906bcdea61caddd93a7fa0363c7957ce3c0443581a625b40712d2c75f25d05c693b745f72392c917190f754533c03c524fefa80799a5e8163f44eb22c1d33da SHA512 90e582f42e73376bbe6b06f33d44c6a70969961728dc512523bcc578b5b7c3f826cb425b469ade87d3fdf82117309f8589c30b1cdd8ba74cc14424c7f2efdb21
 EBUILD rygel-0.32.1.ebuild 2473 BLAKE2B 62467c9f94cd0a587a70d41d567cbd19d96fc0955e28c15b713d9a0a0441f5f134bd9d35ee169a9c6bf3d037ad3cbb06b5dac2d099e68099bda9645d3a41d41f SHA512 8388da9196641fa5dc2e744546634718b7e733e80b6eb338828d693f5a1789416355db295da6da3b9ecd9af072b30df1d43e0b48adec9d120c87c9336557fd89
-EBUILD rygel-0.34.0.ebuild 2770 BLAKE2B 008d8ba0bb2a2437a1e614058c61c99ed227c9c3f20de66eea28401d7d5c4ff8352cdbfc079581d47234e63bc5d3bd8a8ddebaa3e337dfa477fde5a25e2b88f4 SHA512 8d51ef9905c9ac31b81195be2ecc875800e9e90a68721ef6274ca9a33ce05a460a718506b8148cbd0fad4c99af1ac8454c30ac633764ad2a2c546fa0c579fe03
+EBUILD rygel-0.34.0.ebuild 2769 BLAKE2B e4e60beff945f8fa6901d4e6d378faa6bd669225daf055b360bdc03aaf7216d3fde8abd06a03654dc1c609936e8a99e0cc7c76a2bcf7478c12110e6fcdfbc13f SHA512 a9c9077cd0068eadf25f49ef56afd21bf6f778e4bedd92ccfdc71d90482a4eb1d2c30359d2e4f8f96ae1fc03171380299007b10d7e67238375884a2dbeca4e60
 MISC metadata.xml 431 BLAKE2B 26d8bc725f5e93f39bbc4f3dde70de841cc0cfd407f1c37be3934f25fed17e1d30e1509859e18786baf4af1f502ab420774d6fec95117bba1832f116d1b93274 SHA512 61bc8e851d50b1d47ee5f286aa76e69a9d345514b0a94d643cb6bfc0fe5072f272d0aebcdaa9389734080ef8eda0cbd3a616d90860c88c6ab59309ec05cdc0ce
diff --git a/net-misc/rygel/rygel-0.34.0.ebuild b/net-misc/rygel/rygel-0.34.0.ebuild
index 3153ae5b41fc..1165e3f4db7c 100644
--- a/net-misc/rygel/rygel-0.34.0.ebuild
+++ b/net-misc/rygel/rygel-0.34.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Rygel"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="X +introspection +sqlite tracker test transcode"
 
 # The deps for tracker? and transcode? are just the earliest available
diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest
index a9a855a48d30..e9d6a1e1eda4 100644
--- a/net-misc/whois/Manifest
+++ b/net-misc/whois/Manifest
@@ -4,6 +4,6 @@ DIST whois_5.2.12.tar.xz 80428 BLAKE2B 53aa08d4e45ab417585aaaff03beb588a01e88c35
 DIST whois_5.2.20.tar.xz 82336 BLAKE2B b10d7e22f41bfb68cdd1264016bbfeeb93436a5c46b0ddcfc79834d0446ea8c21cd8ff95bc440bbe4fda0d5b08a16c50fe9504c98c3de3cf4ce18892203518e1 SHA512 3308d9f5562babe007e46b7764718f13c1e7cd8ef7f501161353e4b1b81efacec9742ec25dec3b1cc80940898c785c1920a1aa68af10081f952ebde320075808
 DIST whois_5.3.0.tar.xz 82728 BLAKE2B ac5e9bdd070c3a79306f79709d6450455ff74fc7c3a8c81380f79b98cdd36d25932032673710a39ec55da2220f1d0a21221e1a2b70c36e8798affe9b7f46f3bb SHA512 a507f38254d826a9112d1f5a7888fbd4b79eeaa372977c02e4e8235509d133540ba647ddece95376f6ac704f9b1042d276051d4a3a36d10906ad11f69561432f
 EBUILD whois-5.2.12.ebuild 1494 BLAKE2B b84e9fa6367d3f977423ff590d54d094f2d2cf218937f410619646f574b7810029a7b587a8d8600baed31cf050f19f67e5cb56f189175f516dad5af1cf9dce52 SHA512 ca9371338ccbba81f3a60a611e82b6702c4a43166d57c02cb029d1303fc2cee92cf2173f9381d888a48785191dd05719f66d3eb687bf90e4d987377d092700ff
-EBUILD whois-5.2.20.ebuild 1508 BLAKE2B b6486a1f27377bc0cb1e1c71528ccee0434d4562dadb86be53db0e9f677fa59519b78157c7fde37f57b7a30c59767001c4a772bb8d78a094b1c2d826e8c3b076 SHA512 adadd8cf8ddbacb2e6c757d70b8c5bda6cdb8fa0b267d0ab45cd675c71397fec029dcb1259aca5cbcb306f58876b52e24a3f95378cbb91539fba06fb26cdac9b
+EBUILD whois-5.2.20.ebuild 1507 BLAKE2B 1d0a3510e57ad699d3679763eb96f7bbe61dd1d63332830dee10bad27dd6aa0bc9d47c715cc93ed8e4a85cb3456514b161ef351ea80e509e8937e3412768738e SHA512 aab1f1340b4449f98dc1cc3d59e6ced74a8602c96242462951bc839b50f610385eed2cb9820848bf93a8ae1380e48f04735d46943c0168d9eef4a9d672964fc6
 EBUILD whois-5.3.0.ebuild 1588 BLAKE2B 4518cbf6d72192faa8ac482d752571d9df527cdf61e856c9c4c572e307e334269c00e031d80beeab44b4ecab207eb9e6428b0e8b3fb5979c197c317cd02dc39f SHA512 fe7028e212fc0a1062e081b46c4c16ff57622b95062ef7533cee5ecaafdfda8200b047e2f24670058652f5c1c2ba7e07fd6c244dfa039cc7716d647da23c64f2
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-misc/whois/whois-5.2.20.ebuild b/net-misc/whois/whois-5.2.20.ebuild
index 5e49d4fc2fae..62154e8a94cd 100644
--- a/net-misc/whois/whois-5.2.20.ebuild
+++ b/net-misc/whois/whois-5.2.20.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="iconv idn nls"
 RESTRICT="test" #59327
 
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 7a3c5ead7d5c..473ff37119a2 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,10 +1,10 @@
 DIST youtube-dl-2017.03.16.tar.gz 2631620 BLAKE2B 2aff8710a296140a4329b0f8e7f57526684ca114ba39a7397eef81b1b79b4b5dfae685c1f0011cddf8569d8df1e50111bbce7f12647c067972c79ea3b116b2ff SHA512 f3b8942f6b2be3b1cfd4bddfb74c17bad48c8ef4bea34114970ecb9d65b5a3dcbe71beba6d7c2dbda168371bbb2e8bbaddce58039bd9d158bf23950a2a88123c
 DIST youtube-dl-2017.11.15.tar.gz 2834012 BLAKE2B fd93e3923f99874be58681a886c09e31ac10063975ab636badf27e59b44743c72cddf05e3a431c49ffd0f7b40f9b005f4d90feff85d4ca889dee80833300b076 SHA512 e10c0d53db7fdfb02610b53f54046c0a9354b305ba05c5d00a43649a283a6449263f66ff56171d52cf18f906c6aeccc25dc48ea708b4b1bb2b8323b937abca96
-DIST youtube-dl-2018.01.14.tar.gz 2885608 BLAKE2B 57e4eac94ab3ff615470115d2d25de20633828f95d041e17659ae890564f8de5bc67ad1f6209551e3fd7a654892d9ce9eb3e87f016036b10211498b6c526e43b SHA512 687a38a96e8b09452c9460cd4d3796d7334bbe9ff2563adc700865ed8f30f5dd7254aaf3b57a7bdaacda4147210f9390e5c0f739449992abc680a037013189e2
 DIST youtube-dl-2018.01.18.tar.gz 2885167 BLAKE2B 2615c70fbc119c0d07cc797e9c36ea9a751a6603da91ff6822440cec0ccf924ac9cf76b08cb2d2975fa6572473d41cd898f71ceb43529aa27def1a15b7e86367 SHA512 8770b82b61b9038eccdbfe1391d85b7ac8edd8ff1258259a8955ca12b98559b889b0d98e8d39df1f27e7c7dd92cd7ee303af15de19eedfa74206d2a66155c12b
+DIST youtube-dl-2018.01.21.tar.gz 2888153 BLAKE2B 8e8dc011438b26acc49daf9564b20a3f037834f90f906a2e04eb2ba67d657e96f1dd7dcba363153d6a2b36542b7236454663db10c5955009b9687b55263e5c0c SHA512 58bb02918aa0ec04f30ab4acb4fc0f130fd0b991084331f4b587c87f0e08db678ff588e92afea44491d275e909aee4bd73b7f941cc0c0acdbc2bad9ba94bb15b
 EBUILD youtube-dl-2017.03.16.ebuild 2381 BLAKE2B bbf217461544a08786e3ba044e9b704354133dde4197d05ad92a8cdfd2e402dd0c013964da8b7971475a31ced7db734c89ef3ea33991b0227980d4025490c0fa SHA512 b47b7f8c00e04879aaac6bc70621d28f9e6e153b618bd246f95a2b11f8f09bf77cfefc5f0869b379759edf68a8f5d4afded6425032a9efdb8a1cbf44a23e9862
 EBUILD youtube-dl-2017.11.15.ebuild 2378 BLAKE2B d4103998f29f54f2ca5ff154e4bf4dee3f78e618cd8c049cbcb1d8fca987363c5eeab8d02e8bc4e24ccf80937b43e895056aa888fc9755edeb7308730fe306d8 SHA512 294f5c1cf25cc3fd59c16c6d7ca7091051ebc491e8cbd475ec09d70b7d9a8e369de5de5b2c2aa21c97aee344dfe0b91a4cfc2aa55abaf495ca25bb0e0400b2b8
-EBUILD youtube-dl-2018.01.14.ebuild 3284 BLAKE2B a36074bf28f7e0a3f835ca1b0231b3eb02fbe4de5b3df7420f8f0ec036e088658b2f8b9dc34e255d84559c12b34adf3b259231c8137f4d74679f9e1a51be2ce9 SHA512 9b12579cb1afd266c835016733cced4b2f1108ba0d30bfc855ae5b36eb31bb63e739fc78e30e2d37145e404d0c5e3d0f37797f0efa863b553324d69b26bc6a50
 EBUILD youtube-dl-2018.01.18.ebuild 3284 BLAKE2B a36074bf28f7e0a3f835ca1b0231b3eb02fbe4de5b3df7420f8f0ec036e088658b2f8b9dc34e255d84559c12b34adf3b259231c8137f4d74679f9e1a51be2ce9 SHA512 9b12579cb1afd266c835016733cced4b2f1108ba0d30bfc855ae5b36eb31bb63e739fc78e30e2d37145e404d0c5e3d0f37797f0efa863b553324d69b26bc6a50
+EBUILD youtube-dl-2018.01.21.ebuild 3284 BLAKE2B a36074bf28f7e0a3f835ca1b0231b3eb02fbe4de5b3df7420f8f0ec036e088658b2f8b9dc34e255d84559c12b34adf3b259231c8137f4d74679f9e1a51be2ce9 SHA512 9b12579cb1afd266c835016733cced4b2f1108ba0d30bfc855ae5b36eb31bb63e739fc78e30e2d37145e404d0c5e3d0f37797f0efa863b553324d69b26bc6a50
 EBUILD youtube-dl-99999999.ebuild 2089 BLAKE2B df876c715ffaa403d175515951e751611df0cb89e815515b045bebb29add327aa0df50f25303864e1ff0abe8f19a53718e9d20c64dd9d3ead549ad57125376d0 SHA512 a390ee79a77aa98603ca01a702df6621ac4630e62e7afd089e065bd4468fc38bfd13bba365e28916024f0eb9e92627133281985f57692432522aeb4671a0cf11
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2018.01.14.ebuild b/net-misc/youtube-dl/youtube-dl-2018.01.21.ebuild
index db51a779b025..db51a779b025 100644
--- a/net-misc/youtube-dl/youtube-dl-2018.01.14.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2018.01.21.ebuild
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index de471c4892eb..7b69b4b681af 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/bitcoin-cli/Manifest b/net-p2p/bitcoin-cli/Manifest
index 3f222509f7f0..61bf3a3ce84c 100644
--- a/net-p2p/bitcoin-cli/Manifest
+++ b/net-p2p/bitcoin-cli/Manifest
@@ -9,5 +9,5 @@ DIST bitcoin-v0.15.1.tar.gz 7550228 BLAKE2B 0cbb7d0e9d0e5e8eb33502a28289c3f9c86b
 EBUILD bitcoin-cli-0.13.0.ebuild 845 BLAKE2B 4b8c3ed24ff36bcedd3ac20074844e9704bd77a8d21d33f973836ef32dc2127ac8aec56321a28edb8db1857acbb239c909360b436669743ccb9a85002f685ba6 SHA512 6e506aca05ad2dc9e4218117911c82130815bdf559b8c66a906be161187e4d3f8f4a51d3eafe3ecfad91e32a18e6363ad1b16701bece15776998bda4106c40ba
 EBUILD bitcoin-cli-0.13.1.ebuild 842 BLAKE2B 423aadcd0b341bd0c54a08a08fef112d6a33a8b432e3ca444b6a9e3d06fa38637dd42d6d17a2a36149a3597f38bc2ab63bf00268f382ab9cc86842554a86ab2b SHA512 f9d27641b2c952c5de81e950e8c8ce279ae60cdfd13d0ae28bf01ddc1011b597551f353b3bbdc33f0f1e50f4db8cac11b40422833d916a559558ebcda9b9d432
 EBUILD bitcoin-cli-0.13.2.ebuild 846 BLAKE2B 688ea6c2ae9b01e2e538eaa183f3c9b88a3217acf341d9bc12b65caa99efa0d45257b75345253a3c9f646137799f7ab2f2220598257ef852da33be7f98bd759e SHA512 d4274818fef2a1ccc78813be7ecee1aa2fc490b9d13126cbfbf352b2d45520d40e2493e42f49ce28a8d4f0d0951d6d6aa671e156a811d608fd5f150a5de0219a
-EBUILD bitcoin-cli-0.15.1.ebuild 2443 BLAKE2B 1fafb537902d0d76d92ca4dd1feaaf8cf9d291f871a92b2826cd2bd7d4f1ce5197c60a65e3a58a943aafaa8f2c64eb11c725752f78457d83248b786715bf2f44 SHA512 5b5323387d760589b909ab620829e6f1ef5d812344049cf86f6692c37674db0c63d956bfea105249c4c115811c3b85a9007b78f08ad917ecd7bfe4494fcc21f6
+EBUILD bitcoin-cli-0.15.1.ebuild 2442 BLAKE2B 2b302ae86d0d3fe1a05fb5b8e6f64339ef6825fdd58597cecceb757815a7b0ff2ad05239d251db2301fb4290343ac69fbf2e6ec0fab07dddc16f6ed36536456a SHA512 677c5e3cfc7cb9309fa3a64fd6f427247bd2c8a103658881bd1035d18ac0cfd5a54a4f0ab85d2ae4a0b99821497ac925fb11193e4a521671162709d11efa9382
 MISC metadata.xml 675 BLAKE2B 7b92bc182ba751e03f1c39d2c03ff0d585f9bbca06f73056cb033d449b492baa521e41f2aba0cd333f91769c859f0ce0c8060c5147f1cb7a33dffd60201ef13e SHA512 88cc1fd8dbecc4c30c96680e2d38a8f870ff9ff3ab21003fc00bf159ed105ab606d5abd5242456c3776f2d3af6c860f9f622c117afd6f0d79bdc0b80931863b4
diff --git a/net-p2p/bitcoin-cli/bitcoin-cli-0.15.1.ebuild b/net-p2p/bitcoin-cli/bitcoin-cli-0.15.1.ebuild
index a63af598ca66..e143f8a4489f 100644
--- a/net-p2p/bitcoin-cli/bitcoin-cli-0.15.1.ebuild
+++ b/net-p2p/bitcoin-cli/bitcoin-cli-0.15.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2010-2017 Gentoo Foundation
+# Copyright 2010-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ DESCRIPTION="Command-line JSON-RPC client specifically for interfacing with bitc
 HOMEPAGE="http://bitcoincore.org/ http://bitcoinknots.org/"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc x86 ~amd64-linux ~x86-linux"
 
 SRC_URI="
 	https://github.com/${MyPN}/${MyPN}/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> ${MyPN}-v${PV}.tar.gz
diff --git a/net-p2p/bitcoin-qt/Manifest b/net-p2p/bitcoin-qt/Manifest
index 10bcad168222..8a504e138505 100644
--- a/net-p2p/bitcoin-qt/Manifest
+++ b/net-p2p/bitcoin-qt/Manifest
@@ -12,5 +12,5 @@ DIST bitcoin-v0.15.1.tar.gz 7550228 BLAKE2B 0cbb7d0e9d0e5e8eb33502a28289c3f9c86b
 EBUILD bitcoin-qt-0.13.0.ebuild 3357 BLAKE2B 059d39373790811281935c9c334ecbbce1482b151671fcf38ee725b5015d0a3e40b2b308441b516854e2a8e0de322a3dd0246058186f27fcfe7b7a6167a6caa3 SHA512 e497fedd35c0f5fd8658b0d66e02eb7ef465a5243c41623094905e63f58e2d3c553313602242d67a9b3c1810f588c6aae7cdc0aafa98ee7a48248e1f960c7b1b
 EBUILD bitcoin-qt-0.13.1-r1.ebuild 3439 BLAKE2B e515048dcd52c352a363c8aa6eb17373e95fc0f238ea7d11c482f1571fbb1cedd232a52985f2111508b87fb94a0561710187cca3056c3bc6696402b2337282df SHA512 3532a46a44b4cd323968b1ca3984c752b89ea4f728003ccd709218bcc55a8f9aa9efdfcda2de8dd82f5047833aa9c4bffa182f8b56f0af85802da6dea5085b1b
 EBUILD bitcoin-qt-0.13.2.ebuild 3513 BLAKE2B 2cd862f6138b273d3db66ecafaaa43e2984dc05a6826d39b81c45d9982f33c65f00b26912c4161f383576aa9aad7b41dc003b1f22343b4cdd250568285efdd64 SHA512 067c72153669280b7d62f908cc911df53e86e14c165fd3a3af5a93f3e496cf2f334e534bffa1e07be9af466db1b5e82bb8a5c892fd9317e88228205e5a22f5bf
-EBUILD bitcoin-qt-0.15.1.ebuild 7202 BLAKE2B 9a65506221f561f06813ce42461eb2ac22346a3638b666de75637dc53ad8e0efb9c72673e1bbfc44b314066d433083bc2e3e69a722c81440ded40993eb8182e4 SHA512 5ebade519185819820de91e3611f3352b6b24b1348e9cdb02b6a76f50f78cc8b358faa2bc0e93abc8c9c02c42f4001bee9b22caa0bccaef18390288d24f688d5
+EBUILD bitcoin-qt-0.15.1.ebuild 7201 BLAKE2B 18103d2d308b40e6b67649bfea95a60d8230d6ffb0b1fc89dbb0892f7c0d09178c394941548c3459a3d10cddf4801a05fe7221257cb0691faf483339cde34e6e SHA512 bd48066a57f93718e53154c13f2dfb1d8c8a53580df342fa5ffca05dacb373bde21dc366ac619784c6c22908ef8a68b51df6ea0afb54f27a9a8bea604c3fb200
 MISC metadata.xml 6592 BLAKE2B 1674ae2f00b2b07a14167db1225de76b811502edd43dd9a2254de519893e389e82804e86ebaa565ae6891f1deff0bf7af68aa6b7783854d20454cffb5b172af2 SHA512 96c2b6c1b6d04706746e2ac8f7272bb08bc7176c016c66e37d6b0b59b0192c8f51d999a00693418b70c90be8ae076a9a9b50e9d050a5d77c5e02d5192db69709
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.15.1.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.15.1.ebuild
index 75bc2d1f74f2..864deba6ffd4 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.15.1.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.15.1.ebuild
@@ -21,7 +21,7 @@ DESCRIPTION="An end-user Qt GUI for the Bitcoin crypto-currency"
 HOMEPAGE="http://bitcoincore.org/ http://bitcoinknots.org/"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc x86 ~amd64-linux ~x86-linux"
 
 SRC_URI="
 	https://github.com/${MyPN}/${MyPN}/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> ${MyPN}-v${PV}.tar.gz
diff --git a/net-p2p/bitcoind/Manifest b/net-p2p/bitcoind/Manifest
index 4d56a77f8f2f..60c9645da660 100644
--- a/net-p2p/bitcoind/Manifest
+++ b/net-p2p/bitcoind/Manifest
@@ -16,5 +16,5 @@ DIST bitcoin-v0.15.1.tar.gz 7550228 BLAKE2B 0cbb7d0e9d0e5e8eb33502a28289c3f9c86b
 EBUILD bitcoind-0.13.0.ebuild 1922 BLAKE2B 4dbcdb8ace05ce867da8cce4f74f561639376ddc9a2b70d057af2766b7e7f2f2e3f1a11594e4c9d204ce4bbaf287175912dc3353cf0e20aadf3c30ed2cda6912 SHA512 231f04e06fe2a9820f66147ba971c96901f506bb74878006c36bb5f459a41387fbd5df328f36c447235af8f81a28e62ab6280a4eeea88bf7261c57d3f2660549
 EBUILD bitcoind-0.13.1.ebuild 1919 BLAKE2B edbfe9ccb5f7d3f5526f531b51ff117bbb85f3b7bdf651badc7fcacbc5ba29e8ffb2f4ffff1f56f015fd0a5383b74f811e91dc6a214264f431edc25527548efd SHA512 da9c7226dcc905263be4f82330217e8680e5917b7d15620d89ecd0e13e6328fa4d5c8a282950e9824d3c0c6d6e1677c5baaf3c87515aa7c6515afa2d4e921098
 EBUILD bitcoind-0.13.2.ebuild 1924 BLAKE2B 5c1ce54380441d7e082772510f6b03d2c8983566ee662af7601e9abf0cfd5c981f183be12a9d87e0b0daf0b07943f3c1c18ff1d079f2ffe00c3912068e3a37a2 SHA512 cfdff039da31701c29cdefc2f66c47a3715468c4e5da90d2bfb30bca8d4ec778b498b671df2a28820f4017a32e0f5d8f4d5b78174c0e7bcf92cfbbbc48d5238b
-EBUILD bitcoind-0.15.1.ebuild 5040 BLAKE2B dd9c35a79d762e2efb6923c70f885727e549a10740f887c37dce320c34d4260092d0025390ed7095c84d47bc3c5730e847924607a1cdb97f7b9c1abd41773569 SHA512 9bc238b9f958668c90dd5d396fce7a391acf033490712718b67e06750f3a9be1c900da057e2f05018231ef8c8c65f48a857d9bfd46fa645e90a80374f88e1d62
+EBUILD bitcoind-0.15.1.ebuild 5039 BLAKE2B e299b271ffed0f152a243f0daee1214edea8c0a456a9c877e9d8bc8002664c12e20b69117770eb243602f74dfec2102da8958a2afe0160bc4abac167e42705f8 SHA512 b7a1235ea7df287ea8ec03282afe42244646ced80dad8c5482758b8041a3a51858fe06058569e7c131ac6373a8113918cdab6a7a102ab501fd31a5e1d2be4256
 MISC metadata.xml 1218 BLAKE2B e01b34ede70163c5a9793bd1d2109ec21b9aaed014d22e4c1f8d16800d6ffe65e37a67c6697ae04fa64e6a540d034a553e332866dd3e0f086a4dd90c527d48f7 SHA512 02bf23ba23c56f439491c168f8801e1d325aff4f98113b9be486a2e6289135f0fa650c135af4a2967cc634a6a85a15f145d1ea6e05e959c4e4f6a5ddbac1399e
diff --git a/net-p2p/bitcoind/bitcoind-0.15.1.ebuild b/net-p2p/bitcoind/bitcoind-0.15.1.ebuild
index 3d8c5eb306c1..0d8788ad457a 100644
--- a/net-p2p/bitcoind/bitcoind-0.15.1.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.15.1.ebuild
@@ -19,7 +19,7 @@ DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services"
 HOMEPAGE="http://bitcoincore.org/ http://bitcoinknots.org/"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc x86 ~amd64-linux ~x86-linux"
 
 SRC_URI="
 	https://github.com/${MyPN}/${MyPN}/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> ${MyPN}-v${PV}.tar.gz
diff --git a/net-p2p/classified-ads/Manifest b/net-p2p/classified-ads/Manifest
index 3eaf99e1e98c..d8768ce100c1 100644
--- a/net-p2p/classified-ads/Manifest
+++ b/net-p2p/classified-ads/Manifest
@@ -1,4 +1,8 @@
+AUX classified-ads-0.12-unit-tests.patch 2200 BLAKE2B 7d8205798aab3bbc04c7b3feada407e347e74887a2ec7bba5fd230345c805d6ffc8110a4f378a4c782049d9d205aa957698eb5421134fb0049c28db42ee490ab SHA512 ffcb49fac566ca410f1b49092f6a799f08bedbb4288b58aa0b702e9456a6aa7d0d0739a0893c7e6072cc2d1bff36e681e43a7c5993bd0e834e9dd8e5545af3dc
 DIST classified-ads-0.11.tar.gz 2528877 BLAKE2B a2e9bfe2acdf9e95cd6e7246ca50525fdfbaf8b11b8fac41faa7c8fe01db7a4cf1055a69b4cf9168bbce7e7e25438b44d57a50669c3c406015df357c20e9106d SHA512 29e1af0eac079201354364959af8dc606f4d7595fe4e8013212c4e5b30622d095e2beaeeadce350974ef32680329664ad37aae575c103fa052345acf0a49ed04
+DIST classified-ads-0.12.tar.gz 2639300 BLAKE2B 09822a4908e3a34fbd00af60effa53c437e1e32cb1821c0041ca0cb87f4deb74ba79603c5d5aa5fe37384f2bc32f2ccd2979711c2de1e2864361904e62e2de26 SHA512 cbcd3f40cd9003b840b1305361f93c901b073c653f610e46154e8ff1db92167ce77aafe5179168d7403fed7b22fab60cadfc8c1fc95ebe37a4f7ffc616b66929
 DIST classified-ads-graphics-0.11.tar.gz 340476 BLAKE2B c9bac95f0e620a671959f0eb8c719cd70be5c9340ccb3bc3baa7eae669b5201d3127880b9006a4031e09be09e72754c8ec07824b3581e3af691c3944d5b32d21 SHA512 c59f65f37a8e4dddb753dbcdec835e946d9de021c5273319b3cd95ef1c3343715ce4b87d76b2d96264acc791a6cced32967521c74978131bd76fbcfc37bb344d
+DIST classified-ads-graphics-0.12.tar.gz 340476 BLAKE2B c9bac95f0e620a671959f0eb8c719cd70be5c9340ccb3bc3baa7eae669b5201d3127880b9006a4031e09be09e72754c8ec07824b3581e3af691c3944d5b32d21 SHA512 c59f65f37a8e4dddb753dbcdec835e946d9de021c5273319b3cd95ef1c3343715ce4b87d76b2d96264acc791a6cced32967521c74978131bd76fbcfc37bb344d
 EBUILD classified-ads-0.11.ebuild 1735 BLAKE2B 24ae015cd8d3e808269bb7b162b4078e2d3848ff7cb8b0a0eae8769c0c11ac62e89ad30d1c3c7b8aa5892983605ddd9028291ff19baaba1649dfbd784be26443 SHA512 86392db458ae8b0341e08e50753b59db1c8cbb3313481e110ed9da4a4818e8cdced4fba2cf08448c842786dfb156ce34d7a58b594955f896d829969f5f9f78b7
-MISC metadata.xml 1672 BLAKE2B 093c7ae44c9b112d96c25f9c9a6c3f1dca47b746d500dd709888864719c151f1465c0ee5a612dc37b15fdaceb37fbf1496d8a0e2bc21624a86e2e36bec0353ce SHA512 12ef46cd8e1e665c9cbea8926780669128c828866856c7fd445d85b3606396650655b9a07320aee1dec34dc41a6c2665804a48fd80945a76625b339d3246ace9
+EBUILD classified-ads-0.12.ebuild 1931 BLAKE2B 54589943a591f3f42906e62d8a98792e386dcfde98d6c02573c9d1cd01ca6a6375e2dbaaf198430014d7984013e1b493334261e632f60e7200f4d4efb19a1966 SHA512 4635643f7d607adba051a270137abe0bc71b48d582ae6df1071e86edc8d6f046ce62afd13d03583ed3c8cd51bf8b6e6fce1fef7003d06328a0a2604d154a8193
+MISC metadata.xml 1851 BLAKE2B b2560a2855eb1640c92300281804959d109859bbfd2ebcca7f2143a9c72a9f181e5b508a69f10b31d488714d1660ec79a4c3a5506230e6036443d67714f660c0 SHA512 56069de00ca8e4ef0480e1baa3699a1293d70a0bb6ef2654263f489f3911a4662ea3c8146b55435641ee17746b334c018298702a9a1004dd2733ab64a9a9f20f
diff --git a/net-p2p/classified-ads/classified-ads-0.12.ebuild b/net-p2p/classified-ads/classified-ads-0.12.ebuild
new file mode 100644
index 000000000000..083c75d23ab6
--- /dev/null
+++ b/net-p2p/classified-ads/classified-ads-0.12.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PLOCALES="en fi sv da uk es"
+PLOCALE_BACKUP="en"
+inherit qmake-utils virtualx l10n
+
+DESCRIPTION="Program for displaying classified advertisement items"
+HOMEPAGE="http://katiska.org/classified-ads/"
+SRC_URI="https://github.com/operatornormal/classified-ads/archive/${PV}.tar.gz \
+		-> classified-ads-${PV}.tar.gz \
+	https://github.com/operatornormal/classified-ads/blob/graphics/preprocessed.tar.gz?raw=true \
+		-> classified-ads-graphics-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="doc test"
+
+RDEPEND="dev-libs/openssl:0
+		>=net-libs/libnatpmp-20130911
+		<=net-libs/libnatpmp-20140401-r1
+		>=net-libs/miniupnpc-1.8
+		sys-apps/file
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5[ssl]
+		dev-qt/qtwidgets:5
+		dev-qt/qtsql:5[sqlite]
+		dev-qt/qtmultimedia:5[widgets]
+		dev-qt/qtprintsupport:5
+		media-libs/opus
+		virtual/libintl
+		dev-lang/tcl:=
+		dev-lang/tk:=
+		sys-libs/zlib"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	doc? ( app-doc/doxygen[dot] )
+	test? ( dev-libs/libgcrypt:0
+		dev-qt/qttest:5
+		sys-devel/gdb:0 )"
+
+src_prepare() {
+	# preprocessed graphics are unpacked into wrong directory
+	# so lets move them into correct location:
+	mv ../ui/* ui/ || die
+	# unit-test patch
+	eapply "${FILESDIR}/${P}-unit-tests.patch"
+	# possible patches
+	eapply_user
+}
+
+src_configure() {
+	eqmake5
+	if use test; then
+		cd test || die
+		eqmake5
+	fi
+}
+
+src_compile() {
+	emake
+	if use doc; then
+		pushd doc > /dev/null || die
+		doxygen || die
+		popd > /dev/null || die
+	fi
+	if use test; then
+		pushd test > /dev/null || die
+		emake
+		popd > /dev/null || die
+	fi
+}
+
+src_test() {
+	# testca will return 0 if all unit tests pass
+	virtx ./test/testca
+}
+
+src_install() {
+	docompress -x /usr/share/doc/
+	emake install INSTALL_ROOT="${D}" DESTDIR="${D}"
+	use doc && dodoc -r doc/doxygen.generated/html/
+}
diff --git a/net-p2p/classified-ads/files/classified-ads-0.12-unit-tests.patch b/net-p2p/classified-ads/files/classified-ads-0.12-unit-tests.patch
new file mode 100644
index 000000000000..1a1ec45f130f
--- /dev/null
+++ b/net-p2p/classified-ads/files/classified-ads-0.12-unit-tests.patch
@@ -0,0 +1,48 @@
+Patch-by: Antti Järvinen <antti.jarvinen@katiska.org>
+Fixes unit-tests that are in non-compiling condition in released source code.
+
+--- a/test/testca.pro	2017-11-17 18:30:27.000000000 +0300
++++ b/test/testca.pro	2017-11-21 21:55:00.000000000 +0300
+@@ -1,5 +1,5 @@
+ #
+-# Classified Ads is Copyright (c) Antti Järvinen 2013-2016.
++# Classified Ads is Copyright (c) Antti Järvinen 2013-2017.
+ #
+ # This file is part of Classified Ads.
+ #
+@@ -42,7 +42,8 @@ SOURCES = testca.cpp ../util/hash.cpp mockup_controller.cpp \
+            ../datamodel/voicecall.cpp ../datamodel/cadbrecord.cpp \
+            ../datamodel/cadbrecordmodel.cpp ../tcl/tclWrapper.cpp \
+            ../datamodel/tclprogram.cpp ../datamodel/tclmodel.cpp \
+-           ../tcl/tclCallbacks.cpp ../tcl/tclUtil.cpp ../ui/tclConsole.cpp
++           ../tcl/tclCallbacks.cpp ../tcl/tclUtil.cpp ../ui/tclConsole.cpp \
++           ../util/ungzip.cpp
+ HEADERS = ../util/hash.h ../mcontroller.h mockup_controller.h \
+ 	   ../datamodel/model.h ../datamodel/nodemodel.h \
+ 	   ../datamodel/contentencryptionmodel.h ../net/networklistener.h \
+@@ -68,13 +69,13 @@ HEADERS = ../util/hash.h ../mcontroller.h mockup_controller.h \
+            ../net/mvoicecallengine.h ../datamodel/voicecall.h ../datamodel/cadbrecord.h \
+            ../datamodel/cadbrecordmodel.h ../tcl/tclWrapper.h \
+            ../datamodel/tclprogram.h ../datamodel/tclmodel.h ../tcl/tclCallbacks.h \
+-           ../tcl/tclUtil.h ../ui/tclConsole.h
++           ../tcl/tclUtil.h ../ui/tclConsole.h ../util/ungzip.h
+ CONFIG  += debug qtestlib 
+ QT      += core network sql
+ greaterThan(QT_MAJOR_VERSION, 4) {
+     QT += widgets
+ }
+-LIBS = -lssl -lcrypto -lgcrypt -lnatpmp -lgcov -lminiupnpc -ltcl -ltk
++LIBS = -lssl -lcrypto -lgcrypt -lnatpmp -lgcov -lminiupnpc -ltcl -ltk -lz
+ lessThan(QT_MAJOR_VERSION, 5) {
+     LIBS += -lqjson
+ }
+--- a/util/ungzip.cpp	2017-11-17 18:30:27.000000000 +0300
++++ b/util/ungzip.cpp	2017-11-21 21:55:00.000000000 +0300
+@@ -23,6 +23,6 @@ static const unsigned KZLibBlockSize ( 1024 ) ;
+#include "ungzip.h"
+#include <zlib.h> // actual gzip functions and data-types
+-#include "log.h"
++#include "../log.h"
+ 
+ UnGZip::UnGZip() {
+     // not really used
diff --git a/net-p2p/classified-ads/metadata.xml b/net-p2p/classified-ads/metadata.xml
index 51fdc6e87f25..4546060675a0 100644
--- a/net-p2p/classified-ads/metadata.xml
+++ b/net-p2p/classified-ads/metadata.xml
@@ -1,36 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>antti.jarvinen@katiska.org</email>
-		<name>Antti Järvinen</name>
-		<description>proxy maintainer</description>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<longdescription lang="en">
-		Classified ads is an attempt to re-produce parts of the functionality
-		that went away when Usenet news ceased to exist. This attempt tries to
-		fix the problem of disappearing news-servers so that there is no servers
-		required and no service-providers needed for any operation ;
-		data storage is implemented inside client applications that
-		users are running. Features of the program currently include:
+    <maintainer type="person">
+        <email>antti.jarvinen@katiska.org</email>
+        <name>Antti Järvinen</name>
+        <description>proxy maintainer</description>
+    </maintainer>
+    <maintainer type="project">
+                <email>proxy-maint@gentoo.org</email>
+                <name>Proxy Maintainers</name>
+        </maintainer>
+    <longdescription lang="en">
+   Classified ads is an attempt to re-produce parts of the functionality
+   that went away when Usenet news ceased to exist. This attempt tries to
+   fix the problem of disappearing news-servers so that there is no servers
+   required and no service-providers needed for any operation;
+   data storage is implemented inside client applications that
+   users are running. Features of the program currently include:
 
-		* Posting of ads online. Ads have a category ; there are some pre-defined categories but more can be invented just by typing over the suggested categories.
-		* Replying to ads either in public or privately to operator.
-		* (Small-sized) binary attachments to posts.
-		* Providing basic data of operators - data that operator may enter himself, or leave blank.
-		* Basic searching of content based on words.
-	</longdescription>
-	<upstream>
-		<maintainer status="active">
-			<email>antti.jarvinen@katiska.org</email>
-			<name>Antti Järvinen</name>
-		</maintainer>
-		<changelog>https://github.com/operatornormal/classified-ads/commits/master</changelog>
-		<bugs-to>https://github.com/operatornormal/classified-ads/issues</bugs-to>
-		<remote-id type="github">operatornormal/classified-ads</remote-id>
-	</upstream>
+ * Posting of ads online. Ads have a category ; there are some
+   pre-defined categories but more can be invented just by typing
+   over the suggested categories.
+ * Replying to ads either in public or privately to operator.
+ * (Small-sized) binary attachments to posts.
+ * Providing basic data of operators - data that operator may enter
+   himself, or leave blank.
+ * Basic searching of content based on words.
+    </longdescription>
+    <upstream>
+                <maintainer status="active">
+                        <email>antti.jarvinen@katiska.org</email>
+                        <name>Antti Järvinen</name>
+                </maintainer>
+                <changelog>https://github.com/operatornormal/classified-ads/commits/master</changelog>
+        <bugs-to>https://github.com/operatornormal/classified-ads/issues</bugs-to>
+        <remote-id type="github">operatornormal/classified-ads</remote-id>
+    </upstream>
 </pkgmetadata>
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 9ca35171a312..74a9fa50a57c 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index fa0b575b5513..450d96a6fb6d 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -10,6 +10,6 @@ AUX squid.pam 209 BLAKE2B 113fa119ce4fd96ddf34b95c1a1ca958b34aea405564076f89abdb
 DIST squid-3.5.26.tar.xz 2328352 BLAKE2B 236f2d83176a7596fd2455c6bbe411a9b2c1dfc8b0b6f12f28c2723965418cca59d02dd04d39ca646580042f6fde00f0a7c9bbf4f3a50780d302f3b9473b650a SHA512 08fc7fb5d1dea8d91cc318e5be9044fd75c69d0d2053a0c79ab594155aeb4a0f48bb0ff1dd754497485dc8db117b71f1787b0265842cf61b474293d5d38a9222
 DIST squid-3.5.27.tar.xz 2303468 BLAKE2B 448dbb703469bdd38a0e88da8e473510e9652fc7c7ae2e48bf687a4c2e1698f3baa92c212631fd3734ee51bead89980d31af58d64654418a7c4c4a16e1be751e SHA512 4172a053c3b7ffe7a12dfb3febac96942d0fbbe7e98e3f797f22cd75b0a3a89cbbfe7260b5daad099e79d5e9303bb5dfbfee7499cb30a90590aa1bd242ff4817
 EBUILD squid-3.5.26.ebuild 7357 BLAKE2B c445299036ac606d3b74b163fccd404440eca341d736625898273517fe9111874292c1b4daf2f7d8c8446762c9b6da27d90df71b689b76265dac54fb90f19ba4 SHA512 c3a57bfe2194b64854b26507b595ca0e60d4d6c7dc51c12ef62ea91c734de3fb943008be943421c33c39430249d2831e55358e40b205798c49e1ba0a3c4def4a
-EBUILD squid-3.5.27-r1.ebuild 7758 BLAKE2B 11954ef4510d477b019f17f5c8451b245e2fa3e013e0d570a1c52e10a4a527beac40ecd92b1fef1bc42f87a6c56caf08eaf0842c1027ed2ab734081a0d0408db SHA512 5969b09c2826e6337838d8108459ba9629b4529bfb103b1496dac83bb734eafa64e011b79e300c7da53dc9e9ad8efcb9df9faa24258cea1e024f43a870d009d3
+EBUILD squid-3.5.27-r1.ebuild 7757 BLAKE2B da5fe731f07900f25b0b5d5c9ff7ff0a02faf14d5bdd90c2d2bfd7041e128a8cb3852cdca940ab25e7dec2a40da1cf0e1b7f03075dc2c30221ef579bcf3e0dbe SHA512 5103196877a907a0cfdc7dcc817195c79b9cbb2d034f2b08ffc4967b6e9db7f606728b86fd44dfbca184813a0d590bca28f6664d58bcd69aebbde83677cf9f36
 EBUILD squid-3.5.27.ebuild 7677 BLAKE2B b699b902e394aeda95aa268b57cb5c6480eb23e79e8ed0233244f66027566160489f603ce4341fb70966e73b512c8c1562f78fe496bab1396813099ec3c79890 SHA512 82860ad6254afa72707f9c37a4f582cbfe2b78fb809175d913beb805a38c0a0ee0c5a1c691f977af76fd211866b079ed6bad15ae9712f00964c13e2b4b36694d
 MISC metadata.xml 1539 BLAKE2B 05cdb519d9113240c6b3ec38da9c19cfe3e63ed7423e4555eb198d79e75013d142da7d6d0c2e3f293ecd6c0b3e215806915724eb7c453cc5da1923f61ee9ef30 SHA512 7e28e289a27097bc5b2a4caca81506c9c76898c416842e0858dc82b5a03e5f473818ccd52b43c47ee549cf1bebe7e83a0d125eb24995c1a2d74db4e998825c6d
diff --git a/net-proxy/squid/squid-3.5.27-r1.ebuild b/net-proxy/squid/squid-3.5.27-r1.ebuild
index 01198d20552a..959f1917badb 100644
--- a/net-proxy/squid/squid-3.5.27-r1.ebuild
+++ b/net-proxy/squid/squid-3.5.27-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.squid-cache.org/Versions/v3/3.5/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="caps ipv6 pam ldap libressl samba sasl kerberos nis radius ssl snmp selinux logrotate test \
 	ecap esi ssl-crtd \
 	mysql postgres sqlite \
diff --git a/net-voip/Manifest.gz b/net-voip/Manifest.gz
index 3463c45f078c..d1fc92a37758 100644
--- a/net-voip/Manifest.gz
+++ b/net-voip/Manifest.gz
diff --git a/net-voip/ekiga/Manifest b/net-voip/ekiga/Manifest
deleted file mode 100644
index 1d21c00feb8d..000000000000
--- a/net-voip/ekiga/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX ekiga-4.0.1-crash-clear.patch 1074 BLAKE2B 52df4fd1503387d456a501d8b307a9e1b5892474d7709230444ec35ffd4cc11646dc0ea2762405401dadf0f80352da901d8995df0b9496caef81f04413d9423c SHA512 7f7a5fc4f3bd92f308a534de330d9c6cf60382a21e26c671141d6f2f066e6f3595a9dbea42664aed4f0ec2ada3fc55decf7ac327f9a7f50fade63ee8a426cf26
-DIST ekiga-4.0.1.tar.xz 8339364 BLAKE2B baa6ba4f30e48cf4ec6e11abce06fa369b60b69105bb724cf7acfc29177c6adbbea3ae708ccc927f26fe9860b78a2c7852b58eab119e046dc3e1483179b68afa SHA512 3c4dd5eab6e91434da4bbfe5728ac5943ed5ae89b8b2241fb59abb3e41bcd08ba187b5d60c9d839b1010edd7fc97b53cc6db57a6eec40ba81757a772febd2217
-EBUILD ekiga-4.0.1-r1.ebuild 3292 BLAKE2B 5f63db3d0f4b7d669918542cd9ebf62e5ed32067879e46c80d2584c0207db22a07b96da94df58e338e05eb960b2caeae82fa650b5e4759718745f81b8e5f1a96 SHA512 d54ce8233d6a0e8211926c77d76e546da6810a44a966f4b6f22d2aa281d452be9842d5fbf10e01cf66517c7ac869cad129bd580dede373d4f7fb4b03854edb93
-MISC metadata.xml 305 BLAKE2B d334df26094eafee6f675234528f24f2d3d6d3560b4291bb756c16c30b675eeaf63ad1493652b11e9903442c36f65efc01e180a92b566126954d7bd8922a9aef SHA512 fc1b3c5c121d476c5c339c78b543fb9a1be57019d3e05505ffa717b3877cd48d825c0c123a4882e02ff0fbee37bffc1e146a7098ae7840d80a8b54355c3e5683
diff --git a/net-voip/ekiga/ekiga-4.0.1-r1.ebuild b/net-voip/ekiga/ekiga-4.0.1-r1.ebuild
deleted file mode 100644
index 5cc07966a143..000000000000
--- a/net-voip/ekiga/ekiga-4.0.1-r1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="H.323 and SIP VoIP softphone"
-HOMEPAGE="http://www.ekiga.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE="dbus debug doc eds h323 ldap libnotify cpu_flags_x86_mmx pulseaudio +shm v4l xv zeroconf"
-
-# gconf is a hard requirement until this bug is fixed:
-# https://bugzilla.gnome.org/show_bug.cgi?id=721198
-#
-# x11-themes/gnome-icon-theme needed, bug #600398, https://bugzilla.gnome.org/show_bug.cgi?id=775652
-# changing configure check is not enough and icons will be missing.
-RDEPEND="
-	>=dev-libs/glib-2.24.0:2
-	>=dev-libs/boost-1.49:0=
-	dev-libs/libxml2:2
-	>=gnome-base/gconf-2.6.0:2
-
-	>=net-libs/opal-3.10.9:0=[sip,sound,video,debug=,h323?,xml]
-	<net-libs/opal-3.12
-	>=net-libs/ptlib-2.10.9:0=[ldap?,stun,v4l?,video,wav,debug=,dtmf,pulseaudio?,xml]
-	<net-libs/ptlib-2.12
-
-	>=x11-libs/gtk+-2.20.0:2
-	x11-themes/gnome-icon-theme
-	dbus? ( >=sys-apps/dbus-0.36
-		>=dev-libs/dbus-glib-0.36 )
-	eds? ( >=gnome-extra/evolution-data-server-1.2:= )
-	ldap? ( dev-libs/cyrus-sasl:2
-		net-nds/openldap )
-	libnotify? ( x11-libs/libnotify )
-	shm? ( x11-libs/libXext )
-	xv? ( x11-libs/libXv )
-	zeroconf? ( >=net-dns/avahi-0.6[dbus] )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-	sys-devel/gettext
-	doc? (
-		app-text/rarian
-		app-text/gnome-doc-utils
-		app-doc/doxygen )
-	v4l? ( sys-kernel/linux-headers )
-"
-
-# NOTES:
-# ptlib/opal needed features are not checked by ekiga, upstream bug 577249
-# +doc is not installing dev doc (doxygen)
-# UPSTREAM:
-# contact ekiga team to be sure intltool and gettext are not nls deps
-
-PATCHES=(
-	# https://bugs.gentoo.org/show_bug.cgi?id=499208
-	"${FILESDIR}"/${P}-crash-clear.patch
-)
-
-src_prepare() {
-	# remove call to gconftool-2 --shutdown, upstream bug 555976
-	# gnome-2 eclass is reloading schemas with SIGHUP
-	sed -i -e '/gconftool-2 --shutdown/d' Makefile.in || die "sed failed"
-
-	# V4L support is auto-enabled, want it to be a user choice
-	# do not contact upstream because that's a hack
-	# TODO: check if upstream has removed this hack
-	if ! use v4l; then
-		sed -i -e "s/V4L=\"enabled\"/V4L=\"disabled\"/" configure || die "sed failed"
-	fi
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# dbus-service: always enable if dbus is enabled, no reason to disable it
-	# Upstream doesn't support experimental stuff:
-	# https://bugzilla.gnome.org/show_bug.cgi?id=689301
-	# Hence, we disable gstreamer, kde, kab (kontact) 
-	gnome2_src_configure \
-		--disable-gstreamer \
-		--disable-kde \
-		--enable-libtool-lock \
-		--disable-kab \
-		--disable-xcap \
-		--enable-gconf \
-		--enable-schemas-install \
-		--enable-nls \
-		--disable-static-libs \
-		$(use_enable dbus) \
-		$(use_enable dbus dbus_service) \
-		$(use_enable debug gtk-debug) \
-		$(use_enable debug opal-debug) \
-		$(use_enable doc gdu) \
-		$(use_enable eds) \
-		$(use_enable h323) \
-		$(use_enable ldap) \
-		$(use_enable libnotify notify) \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable shm) \
-		$(use_enable xv) \
-		$(use_enable zeroconf avahi)
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use doc && use dbus; then
-		insinto "/usr/share/doc/${PF}/"
-		doins doc/using_dbus.html
-	fi
-}
diff --git a/net-voip/ekiga/files/ekiga-4.0.1-crash-clear.patch b/net-voip/ekiga/files/ekiga-4.0.1-crash-clear.patch
deleted file mode 100644
index 9b9ca657895d..000000000000
--- a/net-voip/ekiga/files/ekiga-4.0.1-crash-clear.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From ebfdaa0690c2f65dfe90714b02ff4f9bc9a3fa6d Mon Sep 17 00:00:00 2001
-From: Julien Puydt <jpuydt@free.fr>
-Date: Mon, 21 Jan 2013 15:54:38 +0100
-Subject: Made the call-history signal the changes first, then do some cleaning
- later -- fixes a crash on clear
-
----
- lib/engine/components/call-history/history-book.cpp | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/lib/engine/components/call-history/history-book.cpp b/lib/engine/components/call-history/history-book.cpp
-index b110d4d..4db92fa 100644
---- a/lib/engine/components/call-history/history-book.cpp
-+++ b/lib/engine/components/call-history/history-book.cpp
-@@ -177,6 +177,10 @@ History::Book::clear ()
- 
-   std::list<ContactPtr> old_contacts = ordered_contacts;
-   ordered_contacts.clear ();
-+
-+  cleared ();
-+  updated ();
-+
-   for (std::list<ContactPtr>::iterator iter = old_contacts.begin ();
-        iter != old_contacts.end();
-        ++iter)
-@@ -187,7 +191,6 @@ History::Book::clear ()
-   xmlDocSetRootElement (doc.get (), root);
- 
-   save ();
--  cleared ();
- }
- 
- void
--- 
-cgit v0.12
-
diff --git a/net-voip/ekiga/metadata.xml b/net-voip/ekiga/metadata.xml
deleted file mode 100644
index 3a28e4d695db..000000000000
--- a/net-voip/ekiga/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<use>
-		<flag name="h323">Enable H.323 protocol</flag>
-		<flag name="shm">Enable the Shared Memory Extension from libXext</flag>
-	</use>
-</pkgmetadata>
diff --git a/net-voip/openmcu/Manifest b/net-voip/openmcu/Manifest
deleted file mode 100644
index cc568ea23a25..000000000000
--- a/net-voip/openmcu/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX openmcu-2.2.1-path.patch 2321 BLAKE2B 56fb01d216b751c43d90d139d0abfa995d4cc5cccd9974ba63e940dc160fe966566f0f960cadaae4334f6816a2c70598634433ef14d088f924b73f91c4c7dba9 SHA512 9a18d10ff604459aae8b5256cf34908f046691e4ec4d9f3d4a92e5423a78d50473069a29f1a51e03f528fdff73f16c24832d9fa24c074641b06424fd996336df
-AUX openmcu.confd 167 BLAKE2B a515f6f5707cef1d8eba4af90a37da2d9b4796ae650891bc207fcc96148c59670afa0acdcb78a8d720d422a066bfcd3b2579a22f0ac345e48fcfd8162dc2ea65 SHA512 d89a3ca06313c972363a9a7d935cb16902233677262b903962970ad6f9f5bae6c2752e02e073064f27333cc4c73b7c751e4aeef1d3555b2408b60ae9ef94b686
-AUX openmcu.ini 398 BLAKE2B a3952038e0aeef6a749bf36a4ce852bf4ef30db031344c95c9d8f612eec3e6cc105ca047283717359b653941b8e5287272c187e4c17071bc10845e46ba7a1aaa SHA512 2ce9468386b71f7fb37c633e9de083796a61262ace4b83b85490365b8d133af94f9bc53680c44996a9f0b7350e4ad0ccfb2ef387ede2ae3b55a0ef7ad6da9de4
-AUX openmcu.rc6 538 BLAKE2B e69be8879c03014bc2404ec82b6aa0c9367ebe2c4ca243a5b54611b1b4d653662564c4d15db3044a5e1db3c4d048e720d17035aff2392c75b0cc3cc016d91679 SHA512 91b341ded3e1b98e9004ff877f2b1fad0aafa30d03b3f63896afcf876e77064e8a78551a93c025936f540ad1727510f6de2db51519104ca8686e755b459ef10f
-DIST h323plus-app-v1_23_0.tar.gz 610103 BLAKE2B 18b56a0f0454e3c0cd0473c4819f0ae280f955d6adb6bc3645defafd6b7edde71134b7744569924a755cac823f3e7a5af178c4b832fa2610081fa975579da564 SHA512 cdb9c587cc857c64440fc9f9d8e1a08e2c9ae00c2070a8d4678e65ca951124c1b4423c24cf795c3f810bd4694f05536b981ca20377755a2c19908de56498dbd0
-EBUILD openmcu-2.2.5-r1.ebuild 1493 BLAKE2B 790724f2314f0409be75119e0011e8207c2c221293e7103912f2a6e1df25206d009606bf85d7db0e25c2ad391020dde26a1aac9830b6217f266de28274ece312 SHA512 6e3bd1263966e0b53b000c3652559b1ed9d786fb8bfde35b8a4c6f0020ccf6303ae8f1c855261e479e929fe5ab737297790e1d35076b9acca716dba426add042
-MISC metadata.xml 245 BLAKE2B f579247804d70925f1385f23477620d77c6af8be2fa03f57ba6f470978b864f4fb359b5a7d8ed562003cf708f05c636afcf4f96fc9179fdcad811ef67f2493e3 SHA512 38267c382aa98b4e5deb5e81d8ce7edf8cba90ce141bda4176ae8a9e31d4a285e8ebd1f50ce4640509aa7f3ee15d4fe6d9c96cac2c4ca479996407374128cf6d
diff --git a/net-voip/openmcu/files/openmcu-2.2.1-path.patch b/net-voip/openmcu/files/openmcu-2.2.1-path.patch
deleted file mode 100644
index 48ae0364a8c6..000000000000
--- a/net-voip/openmcu/files/openmcu-2.2.1-path.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -u openmcu_v2_2_1.orig/main.cxx openmcu_v2_2_1/main.cxx
---- openmcu_v2_2_1.orig/main.cxx	2006-06-09 00:39:59.000000000 -0400
-+++ openmcu_v2_2_1/main.cxx	2009-02-10 23:09:49.000000000 -0500
-@@ -54,9 +54,9 @@
- #include <ptlib.h>
- #include "mcu.h"
- 
--static const char DefaultConnectingWAVFile[] = "connecting.wav";
--static const char DefaultEnteringWAVFile[]   = "entering.wav";
--static const char DefaultLeavingWAVFile[]    = "leaving.wav";
-+static const char DefaultConnectingWAVFile[] = "/usr/share/openmcu/sounds/connecting.wav";
-+static const char DefaultEnteringWAVFile[]   = "/usr/share/openmcu/sounds/entering.wav";
-+static const char DefaultLeavingWAVFile[]    = "/usr/share/openmcu/sounds/leaving.wav";
- 
- static const char ConnectingWAVFileKey[]  = "Connecting WAV File";
- static const char EnteringWAVFileKey[]    = "Entering WAV File";
-diff -u openmcu_v2_2_1.orig/mcu.cxx openmcu_v2_2_1/mcu.cxx
---- openmcu_v2_2_1.orig/mcu.cxx	2006-07-14 01:28:01.000000000 -0400
-+++ openmcu_v2_2_1/mcu.cxx	2009-02-10 23:11:43.000000000 -0500
-@@ -83,7 +83,7 @@
- static const char DefaultRoomKey[]          = "Default room";
- static const char DefaultRoomTimeLimitKey[] = "Room time limit";
- 
--static const char DefaultCallLogFilename[] = "mcu_log.txt"; 
-+static const char DefaultCallLogFilename[] = "/var/log/openmcu/openmcu.log"; 
- static const char DefaultRoom[]            = "room101";
- 
- #if OPENMCU_VIDEO
-@@ -154,8 +154,8 @@
- #endif
-   exeDir.Change();
- 
--  httpNameSpace.AddResource(new PHTTPDirectory("data", "data"));
--  httpNameSpace.AddResource(new PServiceHTTPDirectory("html", "html"));
-+  httpNameSpace.AddResource(new PHTTPDirectory("data", "/usr/share/openmcu/data"));
-+  httpNameSpace.AddResource(new PServiceHTTPDirectory("html", "/usr/share/openmcu/html"));
- 
-   manager  = CreateConferenceManager();
-   endpoint = CreateEndPoint(*manager);
-@@ -229,7 +229,7 @@
- 
- #if P_SSL
-   // SSL certificate file.
--  PString certificateFile = cfg.GetString(HTTPCertificateFileKey, "server.pem");
-+  PString certificateFile = cfg.GetString(HTTPCertificateFileKey, "/etc/openmcu/server.pem");
-   rsrc->Add(new PHTTPStringField(HTTPCertificateFileKey, 25, certificateFile));
-   if (!SetServerCertificate(certificateFile, TRUE)) {
-     PSYSTEMLOG(Fatal, "MCU\tCould not load certificate \"" << certificateFile << '"');
diff --git a/net-voip/openmcu/files/openmcu.confd b/net-voip/openmcu/files/openmcu.confd
deleted file mode 100644
index 59b42a260c91..000000000000
--- a/net-voip/openmcu/files/openmcu.confd
+++ /dev/null
@@ -1,5 +0,0 @@
-#/etc/conf.d/openmcu.confd
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-OPTIONS="-u openmcu -g openmcu"
diff --git a/net-voip/openmcu/files/openmcu.ini b/net-voip/openmcu/files/openmcu.ini
deleted file mode 100644
index 7dbdac551989..000000000000
--- a/net-voip/openmcu/files/openmcu.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-[Parameters]
-Password=i9Vp7LN+X5Y=
-Log Level=2
-HTTP Certificate=/etc/openmcu/server.pem
-HTTP Port=1420
-Gatekeeper Mode=No gatekeeper
-Interface Array Size=0
-Default room=room101
-Connecting WAV File=/usr/share/openmcu/sounds/connecting.wav
-Entering WAV File=/usr/share/openmcu/sounds/entering.wav
-Leaving WAV File=/usr/share/openmcu/sounds/leaving.wav
-Call log filename=/var/log/openmcu/mcu_log.txt
-
diff --git a/net-voip/openmcu/files/openmcu.rc6 b/net-voip/openmcu/files/openmcu.rc6
deleted file mode 100644
index a62d80994db5..000000000000
--- a/net-voip/openmcu/files/openmcu.rc6
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting H.323 Conferencing service"
-	start-stop-daemon --start --quiet --pidfile /var/run/openmcu/openmcu.pid \
-		--exec /usr/sbin/openmcu -- ${OPTIONS} -d -p /var/run/openmcu/openmcu.pid -i /etc/openmcu/openmcu.ini
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping H.323 Conferencing service"
-	start-stop-daemon --stop --quiet --pidfile /var/run/openmcu/openmcu.pid
-	eend $?
-}
diff --git a/net-voip/openmcu/metadata.xml b/net-voip/openmcu/metadata.xml
deleted file mode 100644
index 26e6909bbf92..000000000000
--- a/net-voip/openmcu/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">h323plus</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-voip/openmcu/openmcu-2.2.5-r1.ebuild b/net-voip/openmcu/openmcu-2.2.5-r1.ebuild
deleted file mode 100644
index 9b9df4d15bbf..000000000000
--- a/net-voip/openmcu/openmcu-2.2.5-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user
-
-MY_PN=h323plus-app
-MY_PV=1_23_0
-DESCRIPTION="Simple Multi Conference Unit using H.323"
-HOMEPAGE="http://www.h323plus.org/"
-SRC_URI="mirror://sourceforge/h323plus/${MY_PN}-v${MY_PV}.tar.gz"
-
-LICENSE="MPL-1.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="net-libs/ptlib:=
-	net-libs/h323plus:="
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/applications/${PN}
-
-src_prepare() {
-	# set path for various files
-	eapply "${FILESDIR}"/${PN}-2.2.1-path.patch
-
-	default
-}
-
-src_compile() {
-	emake OPENH323DIR=/usr/share/openh323
-}
-
-src_install() {
-	dosbin obj_*_*_*/${PN}
-
-	keepdir /usr/share/${PN}/data /usr/share/${PN}/html
-
-	# needed for daemon
-	keepdir /var/log/${PN} /var/run/${PN}
-
-	insinto /usr/share/${PN}/sounds
-	doins *.wav
-
-	insinto /etc/${PN}
-	doins server.pem
-	doins "${FILESDIR}"/${PN}.ini
-
-	doman ${PN}.1
-
-	dodoc ReadMe.txt
-
-	newinitd "${FILESDIR}"/${PN}.rc6 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
-
-pkg_preinst() {
-	enewgroup openmcu
-	enewuser openmcu -1 -1 /dev/null openmcu
-}
-
-pkg_postinst() {
-	einfo "Setting permissions..."
-	chown -R openmcu:openmcu "${ROOT}"etc/openmcu
-	chmod -R u=rwX,g=rX,o=   "${ROOT}"etc/openmcu
-	chown -R openmcu:openmcu "${ROOT}"var/{log,run}/openmcu
-	chmod -R u=rwX,g=rX,o=   "${ROOT}"var/{log,run}/openmcu
-
-	echo
-	elog "This patched version of openmcu stores it's configuration"
-	elog "in \"/etc/openmcu/openmcu.ini\""
-}
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index ac8dd4216367..2e104847925b 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/libreswan/Manifest b/net-vpn/libreswan/Manifest
index 6b4a9f0b46da..d133990f6a6e 100644
--- a/net-vpn/libreswan/Manifest
+++ b/net-vpn/libreswan/Manifest
@@ -1,7 +1,7 @@
-DIST libreswan-3.20.tar.gz 8898915 BLAKE2B 5b1d10e5eef757062604d0ccac2502114b81bfcadc4cec927e07ff89e859eea2559eabf6b734e63a8049506d81e3dc9c131594759e72d5e5f0d7b7eb87989689 SHA512 89f562412d03e0e9af1bceeda18ab73a749046c37e05dab719468cb537e16803a3b270781de9de88416b2d63b7b0fd85df0c593ca59c30ba3d681526f272fc93
 DIST libreswan-3.21.tar.gz 8945666 BLAKE2B 88a96310d54f44c28eb676689c76737a44bfaf17c02146297f1759f1019d8cbb6effc15175880c18bf08b265778a2aba9d055172ea710c259e14cbe2fd84c158 SHA512 f1ef002b3e0869920edfebfc8efd73d9a9f84f64a77ad4832f46b12dfdd3c31cdf48c1473522b63f155058592c46af05995756af5440ca3e9c0fa5207436e0fc
 DIST libreswan-3.22.tar.gz 6910418 BLAKE2B c06134fa2d1096231797f1ea93de8ed61121472b10ae30ee9a843250dce4ef9f21e7d3bf63f38daf53fbfd8d1e435cfdc704743d0fdcbde8ecac137d9becac48 SHA512 93868327394527750590e1297443d3eb1c9a528d680348098fd2913123dac52c9fecd73b855ee00586c2516b8aa00f7f0d158d8e9b19d7487b5fb26432b86aff
-EBUILD libreswan-3.20.ebuild 2336 BLAKE2B 9d3ff96d09ceee945128bec6b2575322ac994c89ddfc491db4f50522f22ce2d559d3a02b21ce8ee86f8736455a72bb0d2c0f82bebcac5a4fe1e9bae5c1b70269 SHA512 4c6ecfb7ebcf4d7e27edab37079a84ae0a39b0bf5a6f0b44b194e960c98caccc52d54f51e1a36a39899ea1ce5295561d1f6aa4a66c416c220d1c4e9d083e740d
+DIST libreswan-3.23.tar.gz 3836073 BLAKE2B ffb27ed75618afcf39c36b7326bb1e4b70ea8337bb4b13951bef95dc13989613c226fe83e031eeba080f55f98262df432b776c3ac5b7b4fb740506f918172ed3 SHA512 3645af522ea9ac868c55bfadfd2cf27dc5acb247543f43290cbe677a90cd00316be6520ca2128b9aaecce2b0293710ae6a2bd710a7d93198b8cb81e32276ced8
 EBUILD libreswan-3.21.ebuild 2568 BLAKE2B 1df86e3bdaebd713fc430d09270bd36d6585696920c936ec1e80d63ca14d829eeb097597d7aa2001fc3f1d7e3aa598d1d72c8a10baf5e5661b4a292a9c1f463b SHA512 65fa1471cd46cbf5cb816f3b4bfe9f29a09b0ffb8d28e688544be044c5b794673d0b89c108c810b43d44fca4ca3107b4c8ff6cf364899211a7c0ea9442d45bfa
 EBUILD libreswan-3.22.ebuild 2814 BLAKE2B 585feda36983c3ac31d4bb5995655576d7d775878488661990f10f457f953b133e574fd91ae84e5bfc3b3fcf1f9bf687c4f495e81df27d4e8f1253f77515c178 SHA512 4c49bb8a4cfc2fb4f52a07484e6bff60ad46a21337465b438733a9d37f6be690b1b124b0bfbf78998a471e4187487a4907757757d91013dfb41c19eb1d14a9a1
+EBUILD libreswan-3.23.ebuild 2814 BLAKE2B 75a2bd92b38261da8141c05e287e9ee33d55b2a19aaddfb30b2f76fea4e944979345512ba1d29465342066646d69cabfef85f4417e471350a05f8becd7f73f9a SHA512 c5c8409272f7bb661e9578ff7d97c52fd07f291b8392826031b106998f1c516f6a6f343813cafdeef4c6245e4123509c764dd303a40200a9b0f98b0821c14a1e
 MISC metadata.xml 319 BLAKE2B 6bae0756e29efeb1cf77d60f7e38fe62ffa5f24c3745e07900e6ef5f65194c50f6a479d97fdcc24804ccdcfefd9707b12f08dffe613fcf798afc421826de36e4 SHA512 924161f15c0f7a9666a6d7a422b45da679190e1a0f2859b997ddd753cbf49df9da337e5420040210736f76fa712dca3ec8862480f62bd321de71e74bee7c0865
diff --git a/net-vpn/libreswan/libreswan-3.20.ebuild b/net-vpn/libreswan/libreswan-3.23.ebuild
index 11837d0212da..b71d536ae106 100644
--- a/net-vpn/libreswan/libreswan-3.20.ebuild
+++ b/net-vpn/libreswan/libreswan-3.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,14 +6,14 @@ EAPI=6
 inherit systemd toolchain-funcs
 
 SRC_URI="https://download.libreswan.org/${P}.tar.gz"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 DESCRIPTION="IPsec implementation for Linux, fork of Openswan"
 HOMEPAGE="https://libreswan.org/"
 
 LICENSE="GPL-2 BSD-4 RSA DES"
 SLOT="0"
-IUSE="caps curl dnssec ldap pam systemd"
+IUSE="caps curl dnssec ldap pam seccomp selinux systemd test"
 
 COMMON_DEPEND="
 	dev-libs/gmp:0=
@@ -24,6 +24,8 @@ COMMON_DEPEND="
 	dnssec? ( net-dns/unbound net-libs/ldns )
 	ldap? ( net-nds/openldap )
 	pam? ( sys-libs/pam )
+	seccomp? ( sys-libs/libseccomp )
+	selinux? ( sys-libs/libselinux )
 	systemd? ( sys-apps/systemd:0= )
 "
 DEPEND="${COMMON_DEPEND}
@@ -33,12 +35,14 @@ DEPEND="${COMMON_DEPEND}
 	sys-devel/bison
 	sys-devel/flex
 	virtual/pkgconfig
+	test? ( dev-python/setproctitle )
 "
 RDEPEND="${COMMON_DEPEND}
 	dev-libs/nss[utils(+)]
 	sys-apps/iproute2
 	!net-misc/openswan
 	!net-vpn/strongswan
+	selinux? ( sec-policy/selinux-ipsec )
 "
 
 usetf() {
@@ -47,6 +51,7 @@ usetf() {
 
 src_prepare() {
 	sed -i -e 's:/sbin/runscript:/sbin/openrc-run:' initsystems/openrc/ipsec.init.in || die
+	sed -i -e '/^install/ s/postcheck//' -e '/^doinstall/ s/oldinitdcheck//' initsystems/systemd/Makefile || die
 	default
 }
 
@@ -62,9 +67,12 @@ src_configure() {
 	export USERCOMPILE=
 	export USERLINK=
 	export USE_DNSSEC=$(usetf dnssec)
+	export USE_LABELED_IPSEC=$(usetf selinux)
 	export USE_LIBCAP_NG=$(usetf caps)
 	export USE_LIBCURL=$(usetf curl)
+	export USE_LINUX_AUDIT=$(usetf selinux)
 	export USE_LDAP=$(usetf ldap)
+	export USE_SECCOMP=$(usetf seccomp)
 	export USE_SYSTEMD_WATCHDOG=$(usetf systemd)
 	export SD_WATCHDOGSEC=$(usex systemd 200 0)
 	export USE_XAUTHPAM=$(usetf pam)
@@ -78,6 +86,10 @@ src_compile() {
 	emake -C initsystems INITSYSTEM=systemd UNITDIR="$(systemd_get_systemunitdir)" all
 }
 
+src_test() {
+	: # integration tests only that require set of kvms to be set up
+}
+
 src_install() {
 	default
 	emake -C initsystems INITSYSTEM=systemd UNITDIR="$(systemd_get_systemunitdir)" DESTDIR="${D}" install
diff --git a/net-vpn/strongswan/Manifest b/net-vpn/strongswan/Manifest
index 944628f03b6e..be9e7f390a65 100644
--- a/net-vpn/strongswan/Manifest
+++ b/net-vpn/strongswan/Manifest
@@ -2,6 +2,6 @@ AUX ipsec 451 BLAKE2B deb3fff7043e04c1630119bb0cbbd6fa9b6f15666131ac9744a32d35cf
 DIST strongswan-5.5.3.tar.bz2 4768820 BLAKE2B 9f9da6c2ef27cec7f6a07f1cd5a7ecc8a92576fad2a5c6379b93d8a2e9d3b0804fe26dc0bc7b303754ef499ee938549c7cafbdf9a3f8f818d14cf88f613fe0fd SHA512 0b0b25d2102c98cda54300dc8c3c3a49a55e64f7c695dda65a24f2194f19bce0b7aab9e4f7486c243b552f9d1a94867d6a8782ee504aad1c9973809706d599ac
 DIST strongswan-5.6.0.tar.bz2 4850722 BLAKE2B edb9f2b277cd8bccf886a824e4b3fb3c06af7510d9e21283fcb8d8ba9cf234f38182fcd1ca0c350b4039945ab10888406986d9a0b8edac24fe09faf0b8967fb2 SHA512 9362069a01c3642e62864d88fdb409a3c7514bf7c92cbe36e552c6a80915119cf5bb91c39592aab2d15b562684a0628a764e4fa7636d3b5fd2ebaf165c0ce649
 EBUILD strongswan-5.5.3.ebuild 9280 BLAKE2B b6c402f593f7f7d7b15c5d0fe9dcf05aaddd4a86152e788cfdf62f7a26a93ae98a2f947b3ae5de554aa008fdc369ef4cdf1f9fb73532b2d1ab05becf6526ffc3 SHA512 0131f9d5a852379941bfae1259b3962eb6e1676510e798215b4859277deedc9c6adbce7c6aafc5e07cfc5546663cf036394c27c6a166b8cc098bb9afddc51bbf
-EBUILD strongswan-5.6.0-r1.ebuild 9317 BLAKE2B 10940b5090de8855717a7a54e63b8252848b3361e39f7eee1e12945438b846e67af0d1eea185c490bbaef94d49ddd80329f9db50fed5456f766f996be75388d3 SHA512 dbe3b2a87579f77d943fb674d8f4f60b4dc2d928af26649cc56b4d408aed13aa683279788c261d57234cc9bfcb5823674bac28c7b105e4409a024332056126e4
+EBUILD strongswan-5.6.0-r1.ebuild 9316 BLAKE2B 376087c977ce1ba389d1bdad9dedf782aa51a9de271b5728065da508cf7840dbe9cc1519cee75212bad803913fd90c05bdb81ef6003dfbd5a5123dca9257b71e SHA512 7fa010b7e81e4e4eb074059ba4acc20b50f0543b38674fd3e793ec380fa85776bca6897cf0878f9fa9534655aeff9d2c7eaa07c474f6b39af3b2e1511860f60c
 EBUILD strongswan-5.6.0.ebuild 9284 BLAKE2B 3f4da75ec2607a58c1e163010c2be07d71433392d741ab2d9b045df8873d2965936dec7f457615aadc00085809dba08c3a1fd339275e9d1d4f3a3346fe5662eb SHA512 c3f51e481bd8df4fd5f573a54214a1cd5a9098c5432c8e5926ad371d6bd9105391d2c658d61237ecf651f356dc5dd5f46d6fb91af0e347419c66e9ac48ab4494
 MISC metadata.xml 3660 BLAKE2B 3d25016e6a4f70aa3f8e5bc1081dd535220084529326af8f69a58906d3c4b9b0b8b4a56f17abd1315adbcdfb515c4dd63395bf1884939fab75f1ad2fcf09e434 SHA512 ec594568c35dc645d790b9582413dc5ca54a8d5ea73059299920854cb1053c22f232bd87d0044ff85108021c3fd4c0fc7ed6c7070fa438a159ad4e8e98048478
diff --git a/net-vpn/strongswan/strongswan-5.6.0-r1.ebuild b/net-vpn/strongswan/strongswan-5.6.0-r1.ebuild
index f6c8a771da54..7d50b595dfe1 100644
--- a/net-vpn/strongswan/strongswan-5.6.0-r1.ebuild
+++ b/net-vpn/strongswan/strongswan-5.6.0-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://download.strongswan.org/${P}.tar.bz2"
 
 LICENSE="GPL-2 RSA DES"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE="+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite pam pkcs11"
 
 STRONGSWAN_PLUGINS_STD="led lookip systime-fix unity vici"
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 9c518176e453..8847d028c27f 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/iw/Manifest b/net-wireless/iw/Manifest
index 82fcec6c139b..1a235c8133b2 100644
--- a/net-wireless/iw/Manifest
+++ b/net-wireless/iw/Manifest
@@ -9,5 +9,5 @@ EBUILD iw-4.0.ebuild 753 BLAKE2B 0dcafdc4d190d6786d32ff487056184789d60745d1e7ab5
 EBUILD iw-4.14.ebuild 771 BLAKE2B bdf9689a1784e513ba927bf4674abbb060f0065b066ef5aaa5ed49b128b480ec8253968fccd671feb683cf9d4e858ce2c8c64c135ef7c636845b63a45fe0dc71 SHA512 33b81ff5cbf786b406a759dd2b72d8e914c805df99d442c07bbf79723be063608ddab0851c3728862ef71e4d37b7baeb4b1a8b560836f4f4e93eb65c628e5d1f
 EBUILD iw-4.3.ebuild 755 BLAKE2B d9c359eb34d37efc6ef28f44aea898bf6d89e622c4db6fe206b2d04c2c40d543954498df913fa43c3ccd47338b1bb07290c91045e4a29f83d95b092e43443227 SHA512 46429aae6cc69881d3a1320df9e11f28c5e01d010839b99cab83c5f455ed986b4972c698f71c72b9063b3475be062bc7e05e8dd64de18727bf5978b75e165fa5
 EBUILD iw-4.7.ebuild 762 BLAKE2B 417d038aa7efece0cfd2dadeb4bdfc7fb10834053d1e4a0c72706c69deb06b8ba0210e663ff7b0c3ce48358e77a1df80992b2277d567ea76f689979a1d35c84e SHA512 4788121468e574ed343a9a8f781c3e83d15fef389661ffbf17032f29ba984e1bff46f837ec30cedbbb3f52ffaea558ed1794357bbde49be7384546acb5ec7d72
-EBUILD iw-4.9.ebuild 769 BLAKE2B bcf21b170e7dc3bff669711ce2ecc6b3e5a7234dae100dacc7d32b891187625ea8b1fea98e9c09a946dba73bbbfb43a4db309b488d4d8ac9491b0849d8699153 SHA512 9f320c85b568e4db24ef2379b67bc65f87ed14b624ebc7f204574b5825e16745d97d4936c8f366060ca0ca2e88bfc9d66524edfa362ee2106eea47580766f6c5
+EBUILD iw-4.9.ebuild 768 BLAKE2B 1462b68541721ab422c35c7db9bee36a041bfc3e93b653a6381fe99a85636a606da965e3c0eb7456cba98cf0c97bafe77d783e3380f246b2afbc0a4c5ab64118 SHA512 b19a2be04bf5900292408d539ba3ca666fbc4807898cbb6ec4684b4261fd490d7c1be106419216d7a3c4de41f5dc99d9f66dd0d01c0154e822381f07c10c5df2
 MISC metadata.xml 429 BLAKE2B e3e0a01fc5b56817b2c9ee51eb9ed0a01209aca6fe2f61762a71e7396897040642b6d85b291d825e6d8bab75a7c47f8bc632339ac68560a267d17ba1a4fc7924 SHA512 1587dc139d13d1c33e06d52235f0334fca32c6c4536e46ffa81f14ef093fb978c34f739d57046e01cda58cd18e5638202a6e580ece4fdb1b2e350b5b083b66c0
diff --git a/net-wireless/iw/iw-4.9.ebuild b/net-wireless/iw/iw-4.9.ebuild
index f43f3e9fbd79..f9a771d3839a 100644
--- a/net-wireless/iw/iw-4.9.ebuild
+++ b/net-wireless/iw/iw-4.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/software/network/${PN}/${P}.tar.xz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-libs/libnl"
diff --git a/net-wireless/wireless-regdb/Manifest b/net-wireless/wireless-regdb/Manifest
index e646a121af31..840c690837bc 100644
--- a/net-wireless/wireless-regdb/Manifest
+++ b/net-wireless/wireless-regdb/Manifest
@@ -1,7 +1,9 @@
 DIST wireless-regdb-2016.05.02.tar.xz 16508 BLAKE2B 15017851a72c9fd8bd12b6154418c49e2d8f51d7b4e14beef0e4019af9d07f2af4c80102ed45e35b13af4a0730853f59847ba8b4ef962a6e6e62ecbdcfd11c29 SHA512 3a81b57430b934978be97a0532c1cd04fdcadd0528279b5fbd8723134f50e5f54ef0ddb4de74c4a397e51c6588b88714dff4cd37ebf059f02f15efed96f705ed
 DIST wireless-regdb-2016.06.10.tar.xz 16596 BLAKE2B ae7dcf2602f675929e6a74f9e5584454574a839c52dc0dbd3043d933dc112d773242fed69f4288b8446d403f6fd6407acc2686bc9131e0ec038438d14e5f01a4 SHA512 8064d18232924d86633df9e1195e9521f8f9ca0216f1e664591e3163d583085971b743b9fbbce196e650f239c231caebb7807c5019fcb409b950c6fbd8396f22
 DIST wireless-regdb-2017.03.07.tar.xz 16848 BLAKE2B 8db0fdf0aac1c1faf34ef69eae9abfd32e9cafb97e123fbd6bbbfffd430ab4f00a03a36a5ba6f4a4a9124799efb3067185ca34939d44ec586c228155e8ffcecc SHA512 91e2458feb5bf4d4b7d9008afd9c2d40b700d53cb898855f6278b93a7779aefeed283bfff2dd77b89bcbcc98c5e131f5187730356e5bba858d96774d610ab450
+DIST wireless-regdb-2017.12.23.tar.xz 21444 BLAKE2B 0fa2b2e998d255c574c810b1bd3cc142d8e33cab476f5be91977e55ee9cec092f53ebca742817b28377a446ed4839c9239117643f28e3d0937f05f18123e4514 SHA512 4169ad538939350c70ff2af719e66e1ef3b3bb8ccb71802d0de1c29629ca4c90a6c31ea764207cca63ed928847b0f6c6c561e3b73d5c41b3207da0008e2dc49e
 EBUILD wireless-regdb-20160502.ebuild 921 BLAKE2B a9440bdbc3c99eaef7a75444fad7a8594044e712cc0adff02db655324e87eb2953dfe23d7f8c8986501bfcd121bdd2038dca2a4f5eaa923922efabe8c0c29bb5 SHA512 a368f96429681ae0aa9b1110e5d11ed43948e01c38b99151d24e95913bf9ec2ee3a6252416330fa129c14058d58a01f82f9a4671b70d6073266a11fe16728693
 EBUILD wireless-regdb-20160610.ebuild 921 BLAKE2B a9440bdbc3c99eaef7a75444fad7a8594044e712cc0adff02db655324e87eb2953dfe23d7f8c8986501bfcd121bdd2038dca2a4f5eaa923922efabe8c0c29bb5 SHA512 a368f96429681ae0aa9b1110e5d11ed43948e01c38b99151d24e95913bf9ec2ee3a6252416330fa129c14058d58a01f82f9a4671b70d6073266a11fe16728693
 EBUILD wireless-regdb-20170307.ebuild 921 BLAKE2B cb0d44fca0b8cf7fb9d2a6a58917d046ccfb0bcbc7eae8866bfbec28a1023fa99cb857ab33e972cc8df9e41d06d3c1381234382038aba4aca28cf3a929909c6c SHA512 63a8a84b7378654a354ca7a68ef17a8cd1f27365d10324dae72479ac1df5d305a22ebb9de495837b4cadb52b18e10ed31b73eae35cdac8af663ee8941146ad67
+EBUILD wireless-regdb-20171223.ebuild 921 BLAKE2B b4468cb0bc864b8c78157eb706d94b2982f2cc33c6b458be6f760260da3cbad191cfabd94086e9840baf13e9655781791adec325059c85aa652ebdac867f1cec SHA512 aa24eda52c76c3a34b994aa5b8b16e4df05a1dd89af754141704b5a26ce16b25c63e17b70b1f357cdbbba5bf268ef082047c72a17d92490342c4fb84554238e2
 MISC metadata.xml 457 BLAKE2B b9df8d376a76636ad2c8b8e78414889163936311a12421871a57d28c83c249da98a275b37a9b4a32ab979b194eb2ca000f34503dfe01a18c7c61e4044478ffd6 SHA512 0ee51061d82f0d81f263b479b1932666109450df0bf8c72faca8881f0417f2940245a0099ddc785526b95dcfffcc255de8a07f27356239781921dec10827c4bd
diff --git a/net-wireless/wireless-regdb/wireless-regdb-20171223.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20171223.ebuild
new file mode 100644
index 000000000000..177f04cb7b8b
--- /dev/null
+++ b/net-wireless/wireless-regdb/wireless-regdb-20171223.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="wireless-regdb-${PV:0:4}.${PV:4:2}.${PV:6:2}"
+DESCRIPTION="Binary regulatory database for CRDA"
+HOMEPAGE="https://wireless.kernel.org/en/developers/Regulatory"
+SRC_URI="https://www.kernel.org/pub/software/network/${PN}/${MY_P}.tar.xz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	einfo "Recompiling regulatory.bin from db.txt would break CRDA verify. Installing unmodified binary version."
+}
+
+src_install() {
+	# This file is not ABI-specific, and crda itself always hardcodes
+	# this path.  So install into a common location for all ABIs to use.
+	insinto /usr/lib/crda
+	doins regulatory.bin
+
+	insinto /etc/wireless-regdb/pubkeys
+	doins sforshee.key.pub.pem
+
+	doman regulatory.bin.5
+	dodoc README db.txt
+}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 6fc3766c69ea..179e745961ac 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 9fc4a4c7d158..ff5cb51e522b 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -212,10 +212,6 @@ dev-vcs/rabbitvcs gedit
 # Multiple test failures.
 sys-boot/grub:2 test
 
-# Ulrich Müller <ulm@gentoo.org> (4 Feb 2017)
-# Uses old and vulnerable net-libs/webkit-gtk:3, bug #584156.
-app-editors/emacs:25 xwidgets
-
 # Ian Stakenvicius (25 Jan 2017)
 # rust on mozilla packages is experimental
 www-client/firefox rust
diff --git a/profiles/package.mask b/profiles/package.mask
index 361b72fd4488..5676a5b012eb 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Patrice Clement <monsieurp@gentoo.org> (26 Jan 2018)
+# Has different symbols. Known to cause issues with i3bar/swaybar.
+media-fonts/fontawesome:0/5
+
 # Michael Palimaka <kensington@gentoo.org> (25 Jan 2018)
 # Requires dead Qt 4. Dead upstream.
 # Masked for removal in 30 days. Bug #644532.
diff --git a/profiles/updates/1Q-2016 b/profiles/updates/1Q-2016
index 549d6cfdd87f..8d28a9e60438 100644
--- a/profiles/updates/1Q-2016
+++ b/profiles/updates/1Q-2016
@@ -3,8 +3,6 @@ move x11-apps/xtitle x11-misc/xtitle
 move kde-base/kde-meta kde-apps/kde-meta
 move dev-perl/Unicode-Normalize perl-core/Unicode-Normalize
 move media-video/nvenc media-video/nvidia_video_sdk
-move x11-apps/ccsm x11-misc/ccsm
-move x11-apps/simple-ccsm x11-misc/simple-ccsm
 move dev-python/socksipy dev-python/PySocks
 slotmove <sci-libs/libint-2 0 1
 slotmove >=sci-libs/libint-2 0 2
diff --git a/profiles/use.desc b/profiles/use.desc
index aba304a18032..90be69bc7ed5 100644
--- a/profiles/use.desc
+++ b/profiles/use.desc
@@ -383,7 +383,7 @@ xemacs - Add support for XEmacs
 xface - Add xface support used to allow a small image of xface format to be included in an email via the header 'X-Face'
 xft - Build with support for XFT font renderer (x11-libs/libXft)
 xine - Add support for the XINE movie libraries
-xinerama - Add support for the xinerama X11 extension, which is mandatory if you work in multiple monitors setup
+xinerama - Add support for the (legacy) xinerama X11 extension
 xinetd - Add support for the xinetd super-server
 xml - Add support for XML files
 xmlrpc - Support for xml-rpc library
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 62ef60c1b42f..d42801178afa 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -386,7 +386,6 @@ app-editors/emacs:pax_kernel - Enable building under a PaX enabled kernel
 app-editors/emacs:source - Install C source files and make them available for find-function
 app-editors/emacs:toolkit-scroll-bars - Use the selected toolkit's scrollbars in preference to Emacs' own scrollbars
 app-editors/emacs:wide-int - Prefer wide Emacs integers (typically 62-bit). This option has an effect only on architectures where "long" and "long long" types have different size.
-app-editors/emacs:xwidgets - Enable use of GTK widgets in Emacs buffers (requires GTK3)
 app-editors/emacs-vcs:athena - Enable the MIT Athena widget set (x11-libs/libXaw)
 app-editors/emacs-vcs:dynamic-loading - Enable loading of dynamic libraries at runtime
 app-editors/emacs-vcs:games - Support shared score files for games
@@ -536,6 +535,7 @@ app-emulation/open-vm-tools:grabbitmqproxy - Enable grabbitmqproxy
 app-emulation/open-vm-tools:pic - Force shared libraries to be built as PIC
 app-emulation/open-vm-tools:vgauth - Enable vgauth
 app-emulation/playonlinux:winbind - Enables support for the winbind auth daemon
+app-emulation/punes:cg - Add support for Nvidia CG Toolkit
 app-emulation/q4wine:ico - Enable ico support via media-gfx/icoutils
 app-emulation/q4wine:iso - Support unprivileged mounting of ISO9660 images via sys-fs/fuseiso
 app-emulation/q4wine:wineappdb - Enable Wine AppDB browser support
@@ -1297,8 +1297,6 @@ dev-cpp/libjson-rpc-cpp:http-server - Build support for HTTP server using net-li
 dev-cpp/libjson-rpc-cpp:redis-client - Build support for Redis client using dev-libs/hiredis
 dev-cpp/libjson-rpc-cpp:redis-server - Build support for Redis server using dev-libs/hiredis
 dev-cpp/libjson-rpc-cpp:stubgen - Build header stub code generator (needed for development and when pregenerated headers are not bundled)
-dev-cpp/pficommon:fcgi - Build FCGI feature
-dev-cpp/pficommon:mprpc - Build MessagePack RPC feature
 dev-cpp/websocketpp:boost - Use dev-libs/boost instead of C++11
 dev-cpp/xsd:ace - Enable support for serializing to/from an ACE CDR stream
 dev-db/aerospike-server-community:tools - Install extra tools
@@ -1937,6 +1935,7 @@ dev-lang/ruby:rdoc - Install dev-ruby/rdoc after installing Ruby.
 dev-lang/ruby:readline - Use the sys-libs/readline library to provide the readline extension, used for instance by the irb tool. This flag is meaningful only if the libedit USE flag is disabled. If neither libedit nor readline USE flags are enabled, the readline extension will not be built (and irb will lose line editing functionality).
 dev-lang/ruby:rubytests - Install ruby tests that can only be run after ruby is installed
 dev-lang/rust:clang - Use sys-devel/clang for building
+dev-lang/rust:extended - Build and install rls, rustfmt and cargo alongside the compiler and stdlib
 dev-lang/rust:jemalloc - Use sys-libs/jemalloc as the standard memory allocator
 dev-lang/rust:libcxx - Use sys-libs/libcxx as standard library when building with sys-devel/clang
 dev-lang/rust:system-llvm - Use system sys-devel/llvm in place of the bundled one
@@ -2963,8 +2962,6 @@ dev-util/sysprof:systemd - Build the sysprofd daemon service, required to run th
 dev-util/systemtap:libvirt - Support probing of libvirt domains.
 dev-util/trace-cmd:udis86 - Enable support for dev-libs/udis86 disassembler library
 dev-vcs/bzr:sftp - Enable sftp support
-dev-vcs/bzr-gtk:gpg - Support signing with GnuPG.
-dev-vcs/bzr-gtk:nautilus - Integrate with Nautilus file manager
 dev-vcs/cssc:valgrind - Enable usage of dev-util/valgrind in tests
 dev-vcs/cvs:server - Enable server support
 dev-vcs/cvs2svn:bazaar - Support for dev-vcs/bzr
@@ -5940,9 +5937,6 @@ net-libs/gnutls:tls-heartbeat - Enable the Heartbeat Extension in TLS and DTLS
 net-libs/gnutls:tools - Build extra tools
 net-libs/gnutls:valgrind - Enable usage of dev-util/valgrind in debug
 net-libs/gtk-vnc:gtk3 - Build the gtk3 gtk-vnc library and other gtk3 assets
-net-libs/h323plus:aec - Enable acoustic echo cancellation
-net-libs/h323plus:sound - Enable audio codecs
-net-libs/h323plus:video - Enable video codecs
 net-libs/iax:snomhack - Use slower memset for SNOM phoneem
 net-libs/ldns:dane - Enable DNS-based Authentication of Named Entities (DANE) support
 net-libs/ldns:ecdsa - Enable ECDSA support
@@ -6028,28 +6022,6 @@ net-libs/onion:boehm-gc - Add dev-libs/boehm-gc support for memory allocations.
 net-libs/onion:libev - Use dev-libs/libev as thread poller instead of Linux's epoll.
 net-libs/onion:libevent - Use dev-libs/libevent as thread poller instead of libev or Linux's epoll.
 net-libs/onion:redis - Add support for redis sessions.
-net-libs/opal:celt - Enable CELT ultra-low delay audio codec
-net-libs/opal:dtmf - Enable DTMF encoding/decoding support
-net-libs/opal:fax - Enable T.38 FAX protocol
-net-libs/opal:h224 - Enable H.224 real time control protocol
-net-libs/opal:h281 - Enable H.281 Far-End Camera Control protocol
-net-libs/opal:h323 - Enable H.323 protocol
-net-libs/opal:iax - Enable Inter-Asterisk eXchange protocol
-net-libs/opal:ilbc - Enable iLBC (RFC 3951) speech codec
-net-libs/opal:ivr - Enable Interactive Voice Response
-net-libs/opal:lid - Enable Line Interface Device
-net-libs/opal:plugins - Enable plugins support
-net-libs/opal:sbc - Enable the Bluetooth low-complexity, SubBand Codec
-net-libs/opal:sip - Enable Session Initiation Protocol
-net-libs/opal:sipim - Enable SIP Instant Messages session
-net-libs/opal:srtp - Enable Secure Real-time Transport Protocol
-net-libs/opal:stats - Enable statistic reporting
-net-libs/opal:swig - Use swig to generate bindings
-net-libs/opal:video - Enable video support
-net-libs/opal:vpb - Enable Voicetronics VPB card support
-net-libs/opal:vxml - Enable VXML support
-net-libs/opal:wav - Enable WAVFILE support
-net-libs/opal:x264-static - Install x264 plugin statically linked with x264
 net-libs/ortp:ntp-timestamp - Turn on NTP timestamping on received packet
 net-libs/ortp:srtp - Add support for Secure RTP
 net-libs/phodav:spice - Install the spice-webdavd guest agent
@@ -6067,21 +6039,6 @@ net-libs/pjproject:resample - Include resampling implementations in the build
 net-libs/pjproject:silk - Include SILK support in the build
 net-libs/pjproject:v4l2 - Include Video4Linux v2 support in the build
 net-libs/pjproject:webrtc - Enable WebRTC support
-net-libs/ptlib:asn - Enable ASN decoding/encoding support
-net-libs/ptlib:dtmf - Enable DTMF encoding/decoding support
-net-libs/ptlib:http - Enable HTTP support
-net-libs/ptlib:mail - Enable mail protocols (POP3/SMTP)
-net-libs/ptlib:qos - Enable QOS support
-net-libs/ptlib:remote - Enable remote connection support
-net-libs/ptlib:serial - Enable serial port support
-net-libs/ptlib:shmvideo - Enable shared memory video devices
-net-libs/ptlib:socks - Enable SOCKS protocol support
-net-libs/ptlib:stun - Enable STUN support
-net-libs/ptlib:telnet - Enable telnet protocol support
-net-libs/ptlib:tts - Enable Text-To-Speech server support
-net-libs/ptlib:video - Enable video support
-net-libs/ptlib:vxml - Enable VoiceXML support
-net-libs/ptlib:wav - Enable WAVFILE support
 net-libs/qxmpp:opus - Enable Opus codec support via media-libs/opus
 net-libs/qxmpp:vpx - Enable VP8 codec support via media-libs/libvpx
 net-libs/rabbitmq-c:tools - Builds cli tools to interact with brokers
@@ -7006,8 +6963,6 @@ net-proxy/tsocks:server-lookups - Allow hostname resolution _for_ SOCKS servers
 net-proxy/tsocks:tordns - Apply tordns patch which allows transparent TORification of the DNS queries
 net-proxy/ufdbguard:doc - Download and install the ufdbguard reference manual in PDF.
 net-proxy/ufdbguard:httpd - Build, install and start the provided mini-http daemon with the redirect CGI integrated. Since there is no way to tell ufdbguard to not start it, this is a build-time option.
-net-voip/ekiga:h323 - Enable H.323 protocol
-net-voip/ekiga:shm - Enable the Shared Memory Extension from libXext
 net-voip/linphone:assistant - Turn on assistant compiling (needs gtk enabled)
 net-voip/linphone:gsm-nonstandard - Support non-standard GSM frequencies
 net-voip/linphone:sqlite - Turn on compilation of message storage
@@ -7671,15 +7626,6 @@ sci-visualization/paraview:coprocessing - Enable the coprocessing infrastructure
 sci-visualization/paraview:development - Install development files including headers
 sci-visualization/paraview:nvcontrol - Add NVCONTROL support for OpenGL options
 sci-visualization/paraview:plugins - Build and install additional plugins
-sci-visualization/qtiplot:linguas_cs - Czech locale
-sci-visualization/qtiplot:linguas_de - German locale
-sci-visualization/qtiplot:linguas_es - Spanish locale
-sci-visualization/qtiplot:linguas_fr - French locale
-sci-visualization/qtiplot:linguas_ja - Japanese locale
-sci-visualization/qtiplot:linguas_ro - Romanian locale
-sci-visualization/qtiplot:linguas_ru - Russian locale
-sci-visualization/qtiplot:linguas_sv - Swedish locale
-sci-visualization/qtiplot:linguas_zh_CN - Chinese locale for China
 sci-visualization/veusz:emf - Add FITS format via dev-python/pyemf
 sci-visualization/veusz:fits - Add FITS format via dev-python/astropy
 sci-visualization/veusz:minuit - Use Minuit during fitting viadev-python/pyminuit
@@ -8250,6 +8196,7 @@ sys-fs/btrfs-progs:convert - Build ext2 conversion utility (btrfs-convert)
 sys-fs/btrfs-progs:reiserfs - Enable reiserfs support in btrfs-convert tool.
 sys-fs/btrfs-progs:static - Build static binaries in addition to the dynamic ones
 sys-fs/btrfs-progs:zstd - Enable zstd compression support.
+sys-fs/btrfsmaintenance:systemd - Enable systemd services and timers instead of cron timers
 sys-fs/cryfs:update-check - Enable automatic checking for updates and security vulnerabilities
 sys-fs/cryptsetup:argon2 - Enable password hashing algorithm from app-crypt/argon2
 sys-fs/cryptsetup:gcrypt - Use dev-libs/libgcrypt crypto backend
@@ -8896,8 +8843,6 @@ x11-misc/xscreensaver:new-login - Enable user switching support using gdmflexise
 x11-misc/xsr:cursor - Capture mouse cursor using x11-misc/xdotool, and place them on the screenshots using media-gfx/imagemagick
 x11-misc/xss-lock:man - Build and install man pages
 x11-plugins/bfm:gkrellm - Enable building of app-admin/gkrellm module
-x11-plugins/compiz-plugins-extra:gconf - Install GConf schemas for the plugins, needed when using the GConf-based configuration backend in x11-wm/compiz.
-x11-plugins/compiz-plugins-main:gconf - Install GConf schemas for the plugins, needed when using the GConf-based configuration backend in x11-wm/compiz.
 x11-plugins/pidgin-mbpurple:twitgin - Enable graphical plugin for Gtk+ interface of Pidgin.
 x11-plugins/pidgin-sipe:ocs2005-message-hack - Disable message timeout for OCS2005 clients which causes "false" not delivered error messages
 x11-plugins/pidgin-sipe:openssl - Enable crypto support via dev-libs/openssl
@@ -8976,10 +8921,6 @@ x11-themes/zuki-themes:mate - Install Metacity theme for mate-base/mate
 x11-themes/zuki-themes:xfce - Install theme for xfce-base/xfwm4
 x11-themes/zukitwo:gnome-shell - Install theme for gnome-base/gnome-shell
 x11-wm/awesome:luajit - Use dev-lang/luajit instead of dev-lang/lua
-x11-wm/compiz:fuse - Enables support for the filesystem in userspace plugin through sys-fs/fuse.
-x11-wm/compiz:gconf - Enable the GConf-based configuration backend; it is not required to work with GNOME, and might actually be faster if it's not used.
-x11-wm/compiz-fusion:emerald - Install the x11-wm/emerald package.
-x11-wm/compiz-fusion:unsupported - Install the x11-plugins/compiz-plugins-unsupported package.
 x11-wm/echinus:xrandr - Enable support for multihead configuration
 x11-wm/enlightenment:enlightenment_modules_appmenu - Gadget that hold the toolbar of the foreground application
 x11-wm/enlightenment:enlightenment_modules_backlight - Backlight control slider gadget
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index d9fb097ca7a9..1ff952ef7487 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/iverilog/Manifest b/sci-electronics/iverilog/Manifest
index 2e7f784a2d4b..bbfe636b6d2b 100644
--- a/sci-electronics/iverilog/Manifest
+++ b/sci-electronics/iverilog/Manifest
@@ -1,5 +1,7 @@
 DIST verilog-0.9.6.tar.gz 1219982 BLAKE2B 12f7dfb1ab8b7e4524cf0a3061ce801bfa741015fc1446aef7ffe51c42d76b5d0578e78ce13cd8c3fb6bac580e9da1ed11ca03e1fd02f8cb75dd74425546f851 SHA512 63c18f211eb9711547db65b859551063129cf18acb1196eaa88562f194231079fe929a6f7b8fbe2160863c521f02dde079e792f1b0bbe1c2514deafd55d5288c
 DIST verilog-0.9.7.tar.gz 1238088 BLAKE2B c0b173b4857abc0d35ad05d9f11d5265763c92e625aadb1b487978c40e0679725b8e6de0fc05cc8e4bc7a6db6e1d9abacf886942b05e27d8513b9586cca156f9 SHA512 1a81f132c667f5cd33a11156364a366806ef9b6ef59b86f69df852af79cc92db17df8db0bace4e3c14929b0110df0aa7d83f35f664057e715842acf7bd21c1f5
+DIST verilog-10.2.tar.gz 1695227 BLAKE2B ea2488de55ef60a248e7f5ffd5e06c6d86d57f3cff4536cb64a727ab70d8868847e53beec093e21243a1e81ede021b0ccde771d66ce1d986f737b5d925aaff11 SHA512 21e0861ee994daf0a98d0da3e0ad665e37cba4669faa873ae57d05eb41794b6cc2948c88cc07ebe1e9266850ad2bad189096ae6911b9c4064f772279d0901aef
 EBUILD iverilog-0.9.6.ebuild 1123 BLAKE2B bd804cd0e062aad50ae3d13b86181431634a9ffc5e06f725bd3c3dba8e3cdcdcefe970ac5c5af9dd12bdcf6e6efe45158d8e262c445f155b51bc7289e8f84782 SHA512 b5bfe49d06522810054db72693e30220ceda8e0e1886a45a2094024b6e114cb3c8e943c333308fd0f17facdaa5bf7066aedc33120bed3fbb942ff0320733695a
 EBUILD iverilog-0.9.7.ebuild 1127 BLAKE2B 0df427e1b40eb81301e3ad5a783ba439d11e29f64bba8db1bae0b814807525367a1009b7dd3daad2c04e315c0899b32e6b83fa5c034dc821350151e234546616 SHA512 0166372b9aec56da2edce510783bdd9aece5610f418d0ceea081a72f0b7277b62133fcd866360fea449395a7e9bd6a7f24ae03c2373184bd14c1c951e81d4e33
+EBUILD iverilog-10.2.ebuild 645 BLAKE2B bfa32a5577961ef503b53654f1c076cfe8a1cb000a2986ca603404115502332f6c8be2ca10b925ce70f148ee394bed96c6e4f19c303664cde249de7e9dd8bc43 SHA512 de3c3cb13a45900e02cc90a9283a41f5d32e5a6fb6c9f8e261bd356fbcfafd98fd65e38c42324d246927360a6b1af17c0b9d110b38d6f2ce19921b350a19f905
 MISC metadata.xml 611 BLAKE2B 6399e25c12a2b7ee9fc9f047361b4d8d34b785507ba3e0ee5e42b8fb13763c37570e4fc01723fd60fd7ebbef0441a852e96bd44c385a4cab73b1a50130dbbc40 SHA512 83a276b3b5dcb6dff9a03fe2886ad4476833e4a375af2e5c1b1a597a6a16374f843e319bf03283aabe2c7e12e4d5fa0a6125963177c6227e83bdc8dbae7cbd0a
diff --git a/sci-electronics/iverilog/iverilog-10.2.ebuild b/sci-electronics/iverilog/iverilog-10.2.ebuild
new file mode 100644
index 000000000000..adcc651fe357
--- /dev/null
+++ b/sci-electronics/iverilog/iverilog-10.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A Verilog simulation and synthesis tool"
+SRC_URI="ftp://icarus.com/pub/eda/verilog/v${PV:0:2}/verilog-${PV}.tar.gz"
+HOMEPAGE="http://iverilog.icarus.com/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="examples"
+
+RDEPEND="
+	app-arch/bzip2
+	sys-libs/readline:0=
+	sys-libs/zlib:="
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P#i}"
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install
+	einstalldocs
+	dodoc *.txt
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index aa5763a41b0e..b1b914cab3aa 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/geocode-glib/Manifest b/sci-geosciences/geocode-glib/Manifest
index ae9c7121aa6c..a74809376779 100644
--- a/sci-geosciences/geocode-glib/Manifest
+++ b/sci-geosciences/geocode-glib/Manifest
@@ -1,5 +1,5 @@
 DIST geocode-glib-3.20.1.tar.xz 371200 BLAKE2B 7872ced7d4edee0c45c00c2e876cb307e5eac4615b194cf69bd6fbc3e50c809c9d8b85604c1273f6e65f1be1db88ca811f913124c4697c8ac676118861a3caa9 SHA512 0016b04928d3d7e9e3339bf1457d5ba7951af7af53b72a185f9cb3e92e9d1b1deb7ca11f95de1bcb0a3521a5b200ce3c25bb35eaf8bf15b81672846ec01b718f
 DIST geocode-glib-3.24.0.tar.xz 413536 BLAKE2B 37eebd39bb64d614af338e323b7c37c9bcf554d82b761c135326a9b2c0ab405901739ffe89f50c35932d162e4d2743a21caf4f446924c5d9f47bcf50eb11f4e8 SHA512 0e3910e99d164fdf5afd6befbcb7139a56779834fb1f2a318951c03e5196a31c4dafd7f88c37c7014377f15cd4d4b81e7080a440881e2c50aadaadf621abe3b6
 EBUILD geocode-glib-3.20.1.ebuild 1150 BLAKE2B 8610bf82d56eccab434d6521f16c11ac2c1ae169d878c2d8b0f12874da16fcd85b50d2fd06b79a8ed7158c99bb5f3cf8dd34710d1cdc98a0e454eb85321d0b3e SHA512 d8225ebb02239aaf5a3791b6ebbc035bc7eaef41a400443f496e7703c905d9ccade3b1c0d218dcbd8ee269f949c3fc24cb815c6f8367f9329868ac9d5c242ce0
-EBUILD geocode-glib-3.24.0.ebuild 1127 BLAKE2B c279cfc74a4c8ea028d15f77907ad8c49a639b826a183578a64d4463b3356189ff3bb285212ee837b7ea59340a2b41a2b7087ea80d98338f21cb6c25cd2bf6b2 SHA512 5a0247235d8cc1b8d5cd187373f140549a0c9f19cefdbefd4b013f2cf140314743a4b2d0de59209c443db50b53694217647caf2557e85aab9ca217009a47b067
+EBUILD geocode-glib-3.24.0.ebuild 1126 BLAKE2B a32f466ba0e92ce4f07cb8c4c3de71f45cf9d309e16aecdb3b976cca8644de0feff9d50ec69a5c30104e4b64cdf8ece6a97430d7cc7cb4a328db121ac55c3e63 SHA512 92bc4d7b61f6eb6c38268fa6ac2852a2aeb126bab0953e3280b6750cd9a4c74d024f8205d30bce000ca990ae0cf979773cd726834880f167eb76cda28e2b863e
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sci-geosciences/geocode-glib/geocode-glib-3.24.0.ebuild b/sci-geosciences/geocode-glib/geocode-glib-3.24.0.ebuild
index df04a380af83..792fefb398a0 100644
--- a/sci-geosciences/geocode-glib/geocode-glib-3.24.0.ebuild
+++ b/sci-geosciences/geocode-glib/geocode-glib-3.24.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://git.gnome.org/browse/geocode-glib"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="+introspection test"
 
 RDEPEND="
diff --git a/sci-geosciences/gnome-maps/Manifest b/sci-geosciences/gnome-maps/Manifest
index dee7ed83741e..d82a0b6f958d 100644
--- a/sci-geosciences/gnome-maps/Manifest
+++ b/sci-geosciences/gnome-maps/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-maps-3.22.2.tar.xz 1086264 BLAKE2B c51a387b562921704976946e244fa6bdf0abc42588a3e361e4886e08690c382cbd8f9fcdbcece48eaa9315d01c952ba161df3a799172bdeab12bf20df8eeddb2 SHA512 bdff6c55c811c9a12f2a56adfb2acbad4dfd3ceba761a4c50463b025eb9df01f5849f871b7934eae659ab8f90db7cd612694de40fdecbc9d63a3b59d343ee997
 DIST gnome-maps-3.24.3.tar.xz 1145872 BLAKE2B bd6e9652c341def652beea966d3a171a050219f3bc83288bd83eacb069899cd94d154d53bcea081bdfefdeee9b74e56c158c703ed92c9fcb5e35ecd718900e4a SHA512 b4a4c278359803e11b1aa43fb522a84b95eecfc349a134322f45db7acfe93867a61f6bd48e55a07d5d602b8161cdf5949a6b5d4da1212659e133260063ab6198
 EBUILD gnome-maps-3.22.2.ebuild 1266 BLAKE2B a45ff144d54a37368270c45540e8fd0e749a42aee64d658fb6042800f19d2bf8a1f1b810722004d03e8e5b7c12935481067b6942d22c109aadae65ecb270bd95 SHA512 44e4f35367af35d2813d53cd4a7e8ab90b5b40d9d7cbb1bb87a62fe1524d655ff65f3ae81845ce19dbc657bafedbf614423edda1d6b69a1c32641dfbf0e358b8
-EBUILD gnome-maps-3.24.3.ebuild 1274 BLAKE2B 72b8b08c65bbeaa03cb51d848dfddc23d4572d12a26865390b655e83188f5fb3ab030f2e1d3dfd6b7c39c9e0c91eee6a7662a95182fd72f633fffeef86ade6f3 SHA512 3291d7fec32a80c611ed3b5f17f2704cf8c18d4412cbb9e4711d2211df0efea026c3ac9412230cb0fd00beb5d2a3ab8b490cb4e742bfb82fb4b9b2b938e0ef95
+EBUILD gnome-maps-3.24.3.ebuild 1273 BLAKE2B f971aaab9df9b0e7da41eec1954456e71e4fa75daa69a7636e06ebd0c4fccc44a7577a6c9592f18ebba5db450a6ada2e0334cc9324a89dfc706a151708e1bdc5 SHA512 ea5f53871629920a4b2b8b90ef65c77943e6643c2630c2f0ecb9017d526b2d86e6500d13e0f2ff8681f641e7cd89b6912b1f7aae1dac73a11029f0a73ba38470
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sci-geosciences/gnome-maps/gnome-maps-3.24.3.ebuild b/sci-geosciences/gnome-maps/gnome-maps-3.24.3.ebuild
index 5540d4569e77..463e746e312d 100644
--- a/sci-geosciences/gnome-maps/gnome-maps-3.24.3.ebuild
+++ b/sci-geosciences/gnome-maps/gnome-maps-3.24.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Maps"
 LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
 SLOT="0"
 IUSE=""
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 COMMON_DEPEND="
 	>=app-misc/geoclue-0.12.99:2.0[introspection]
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 7eb0e50aedfc..55d2af6de8f7 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/qtiplot/Manifest b/sci-visualization/qtiplot/Manifest
deleted file mode 100644
index 6164765e6b16..000000000000
--- a/sci-visualization/qtiplot/Manifest
+++ /dev/null
@@ -1,22 +0,0 @@
-AUX qtiplot-0.9.7.10-dont-install-qwt.patch 605 BLAKE2B 4500f66d7fc02ff489d49d893c04be2416dd39a2d6a1e090b7d58e758191ece3456c80d13f92ad7d5de6bc6a6c76a94162fd897345eaa161dd676c4d3bd12d09 SHA512 c2ff3cac3745c0f6b15aaecd64601b0869684c850de4b431b719bf448c08e86906ca1f506fdc4c2e8da6e44ed79376f5338b0f96fd89b59f72db6159596c06b2
-AUX qtiplot-0.9.8.6-gold.patch 535 BLAKE2B f437c02e9bb4a4cbb1c4ef1f44c4d6354399d403e8b6d59221cca85daedc25a0cf6a8a1466a600815600dfc03ab112a646b91c30614db18f7c3877a694a8c606 SHA512 fae41593f480c0d32a4a1f619d735bbd67ff3d97ae5d2e6813ef7f487fb3dac6edb99022f34ab6e725358bddef988de025d2d6261c93f9c1429dd2329649b04f
-AUX qtiplot-0.9.8.7-kde.patch 454 BLAKE2B 07cfb0b5fbe99bb50b6894f078a6c86715643be949cde9c7dae7743ae69115bb503640325c6299d7c9f5e5d654df6a4c305c6b034498e67c4d738d8ed4b59c2c SHA512 6de43a6fea8dee412b5b9b0ca8d36099167febbf86292222077cbd9bc3055808e317ad1ef4b721b76b7fdec7b26520ee5edc27407b0ac44e0e2d73256424f620
-AUX qtiplot-0.9.8.8-system-gl2ps.patch 2436 BLAKE2B a4b19934c4393800903462231504eb38255ca7d87d33dd0984ee23b3cf22c3c74bc8e65c7bcf961b41b469da433ca99826456a93ac03d3cff0dc26eeabeab70e SHA512 d5342962c2710048eac398b3122bbf1bbfb7360dff2aad759fa8fe111d23b761f1bcfd8597ebba996813c082d9c746ad2d4b393e00c527845ca7a684f698b4d2
-AUX qtiplot-0.9.8.9-PyQt4-4.10.patch 1089 BLAKE2B 9b1a1b8e281f3dabc60620f7a48613b7844595d243acdd0bb652753fa34b41f21e8b3d22d9a99c05945c0fd94e9146b761ac23434702209160699f9c24b619e9 SHA512 6c85172fda42f0f381a7146080a92858c850d92eca0c580afe0ce384f4bf124afdc94b809af78bc6d9373a5921be5647a79d0159ae3f26daeb911a7e0bb072fb
-AUX qtiplot-0.9.8.9-PyQt4-4.11.3.patch 1098 BLAKE2B 930f469e29ed87a3d0e6a4562f52f1b0f9f2b162f2fdea437f49491803bc86cdca51669c556cab5362ec8530dd54c63f14a38be3cbbeaab1c85c8754bb790ce0 SHA512 58268def88227cfb765873bc4b809c3f3851bf9bb09a3e3fd1b54e6158de9294226e3394968312c25cf452ddf02af9078a494e9d62149f458f5b67d21438c740
-AUX qtiplot-0.9.8.9-adopt_to_alglib3.patch 3596 BLAKE2B 4c85e350ad2f808ecd85e4d674261429d099a8cd52754384f79277a4e380ea6449199754130bc1c10805b1160c8758b701b664e530804061ef7f6026b4195eac SHA512 7e1a1b1ce174c010c66025e3d84975d2f636924abf5f4f862d3e3a367731fb25856e017bc3fd8e6a726ce3d707143b704dafef8b272a6307b3f17747c2a35b67
-AUX qtiplot-0.9.8.9-crasher_without_internet.patch 939 BLAKE2B 30b41034b48c7d4314af35e3c787a4ae69919a47a33cfdabf4ef5996f8a0528e3e8861f96716a134aaf108c51d3fc2a1a5a14be38c6933fe7968121388d63a1b SHA512 d32a0302ec508d9646b1e2c40a69329d376d9c8e859a607044e5fd9cfa6a59a5b89ff5c21c8a56c110cc0747ddf8538751f28309635c3ef97876abeae7782f4a
-AUX qtiplot-0.9.8.9-gsl-2.patch 1285 BLAKE2B 4c0319bcce1393bcdec4151ed6a3ae3cacf82f7774ba4cecb97c8f3b49eb6c92cb8f0e8c7e356635d09c2c724920b700dcffde030afed9751f0b60f169ce5720 SHA512 04c77ffb1f187bfeee813c2a1947922aec2f05cbfdd6e3a11be81924c6dcf302a365c05ceef60f9138105235c3413c5dbcb494ac18ff58da1d99ad49c9f68e84
-AUX qtiplot-0.9.8.9-origin-2.patch 1713 BLAKE2B 1a292df67d1a9cc8029f11586fa0520017885d139185f1b57cb2a810fb211fd417a48434ccd2fb1debf2158df98762adde071a01f00f6d2652e891cb310efe14 SHA512 516addaab1a21aff57dece95e424afc7df6cbc5422962aef668f991d52122d07e44b8b17b985edde3074ac8d846c8f54a6ef857a5924ae393da56852692dd64d
-AUX qtiplot-0.9.8.9-private.patch 696 BLAKE2B 7ec45240d3477db38a7385a6e9ca72abe89e2060a8bbfcb7c11f692a32b068dc4bd23bc9a098dd4bd86e2bb0dc2733bf64d559b52813eaa1afc965e486600e5f SHA512 e7ae0f1b010f5d4ed69e553932f97c97f643c948795619bbf33ff8d6137a3f02dc4832b434aa28c43ba71a01c9ebd5c60642d14cb24f0c83f2cb866955cb9815
-AUX qtiplot-0.9.8.9-qt48.patch 984 BLAKE2B b6e87a54a9e82374f84a58e7d5575a27c66014b537286b3190da67ce8af8d859c74df8a3335b63da050ee4cda871ab04dc0def255de05728ef2ead9ac35cf75e SHA512 5405786c3b42626d34f3fdf7f04f186def79b0b242cb1850cf5075b020d39f601cfa961aaf21e7a9276f4c2ce12cde4cc426f5f879be8135fd4bf10f9728098b
-AUX qtiplot-0.9.8.9-set_col_values.patch 945 BLAKE2B 14b1e244f62802a07f710749e9c11b691c45ca9ba03ad035d71632e459b7ed7609476baf636734e0b8becc067dda94489196f1930b673cd5e4cf023b6b07acae SHA512 7de22eca7cc9ac40321c450d406fffe5b76a88b34bd9ddb8fda801f7d70d67f5747ee3144eb2a14d5e30a8c31b6f27b229f96e206ebbea5b6e22494c393cd1eb
-AUX qtiplot-0.9.8.9-sip-4.15.patch 1248 BLAKE2B d8f8724f478b3d02788fa51de08fe025fddf34afc7e04117ed12d8b5fd6d0e751654d77dc83844aa8b89fed4e6a86eb506b4b558022d7807545e0801f83b9c97 SHA512 5db9db5189ba3914dfe2413d899438e8f5da267d6d1367eef3a781592ab7b70e4381e5eb35dca8a60bb9b0540187586d4f75f80b90afa15a9aecb4bf872f66c4
-AUX qtiplot-0.9.8.9-sip-4.19.patch 1548 BLAKE2B eddecaf8bd13355ae0ff892caf2c1579acaa89aa94b375734cdf4bf5957e58fbc45e89c944bfe072e933e00c1331d91516fa8266e100eef18f8f1f5527cb7c4a SHA512 c3ddce29bda642b8d9deccd53136ca25c0a2d5b97547a7219be7f30400abfd595f23f49d4d7049382d3b481e111db01c3d89f0625aedf0b4c1c3eafd65672c5f
-DIST qtiplot-0.9.8.9-origin.patch.bz2 104708 BLAKE2B 38993180a33ae2d5c4e7f2adbfabe54efb5abebb6eb678edc6a0d40f9ad552e3fac2a99be9b6793001cf880f2445751435fb3476be24a41fb769a8ffe6d0e7d9 SHA512 62f5bb531c2fc7e061661ab5733a70acf9a61ff90a934af42b5741c63478caebabc8240f37d25660f623c5cbcd530e1303e967a095ca99b3452f29cfb5200b69
-DIST qtiplot-0.9.8.9-origin.patch.xz 89660 BLAKE2B 77b9808173300a65f950ff1e15ba66271ec5bb45f147bb4707b881ec3987c22a35c9fb07c78f2f3205b252ae7f336d8a7d83eba57b96ff5510c65ef051a6a089 SHA512 adbd002975bb49997eb610b150c1bbfe9c9617b0b5bbb70f52df7475339b7d68cada175eb9f6048f6ece043ca3dcf5c62ef361d82bc670b1576ee8493d6b757c
-DIST qtiplot-0.9.8.9.tar.bz2 16202943 BLAKE2B ce7efb424da293f8770a90d9c4346c9c709d98605a726e466e2c85a8b1b8db2b519c3e7c719077c14aeed71e9696194e3b5acf075ebc052fe6be88a887fae7fd SHA512 3a0cb7b49c508f56228e8e3a259b4fd34c872410ad14ef1d8656372e3e8ab9f92e59094a9cc1a75680099a8832f7472ad31462b3ae8a9e132ac7056d5245cf2a
-EBUILD qtiplot-0.9.8.9-r2.ebuild 6199 BLAKE2B 9251ef008fc5ea67ef7e693d28569dc7f2be7d0524d548ab78cdac7dcae6bce335a826f7931c52c8cd6bca0c238f59c3f96524f4e10d4536074d52b8e527e981 SHA512 def75343c2eb7da66633ff27fee433d2cad928b2c19d146931e1bfd07427cbb8da3530a6126e82c570472c27dc1c9c6d95286359d3b9f9cdb5d9c55286dd9c0d
-EBUILD qtiplot-0.9.8.9-r3.ebuild 6240 BLAKE2B 576a7d9b6a496717a1789dae778b95d82bcc8330bbdc7bf1d112de983bed063ecbc0ee3bfb703fcb2177e32c17384ab0df32b2afa74a55091e35c2845e646f9e SHA512 12a2a19b0ca2602e0d391303ea232d821c68a1371a0dddb2cba4bd850564ca74db72cd0f1605da7f6c6d0cd29d887d0e95776ffe60177b2bdac5c825f63b01a4
-EBUILD qtiplot-0.9.8.9-r4.ebuild 6221 BLAKE2B 9df861f67b907104161f8db94ebd2899f8ea140b0aafd9f88af2a154434a6ce2664233e0181641337c8307e1b4c4b601c9943019ade45aba77e9aa4793062652 SHA512 31563c2024b29df7167b0530d5ed9c6084150cd2ffb7d0625eeec27eb3288d916f95773ad9a2c1a35daacbf873124cd327921db9890db762ecffcd1100f7bbac
-MISC metadata.xml 1090 BLAKE2B a5f07ad241c27b413f693580fd8e89f899d221ea440e6dab049039cd55770ea7cf0da647ec57aea9792d6236ec01b3a6b135e5490512d141b8a917c9897f9fa4 SHA512 a129e47f1c493767fd8cdfaf9b9e2d7e55b3f099b9480a7cdd13e25eb6f95f977b92877ceb5dc995357505f2698cea5dfe366a1a1c22a37298a009e1c1eadd00
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-dont-install-qwt.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-dont-install-qwt.patch
deleted file mode 100644
index 86e4d4c6a9c1..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-dont-install-qwt.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/3rdparty/qwt/qwtconfig.pri b/3rdparty/qwt/qwtconfig.pri
-index b7d0d0e..e36f131 100755
---- a/3rdparty/qwt/qwtconfig.pri
-+++ b/3rdparty/qwt/qwtconfig.pri
-@@ -7,17 +7,6 @@ VER_MIN      = 2
- VER_PAT      = 0
- VERSION      = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT}
- 
--unix {
--    INSTALLBASE    = /usr/local/qwt-5.2.0
--}
--
--win32 {
--    INSTALLBASE    = C:/Qwt-5.2.0
--}
--
--target.path    = $$INSTALLBASE/lib
--headers.path   = $$INSTALLBASE/include
--doc.path       = $$INSTALLBASE/doc
- 
- ######################################################################
- # qmake internal options
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.6-gold.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.6-gold.patch
deleted file mode 100644
index 3b6757533a52..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.6-gold.patch
+++ /dev/null
@@ -1,15 +0,0 @@
- qtiplot/qtiplot.pro |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/qtiplot/qtiplot.pro b/qtiplot/qtiplot.pro
-index 99e0e36..b7cf373 100755
---- a/qtiplot/qtiplot.pro
-+++ b/qtiplot/qtiplot.pro
-@@ -20,6 +20,7 @@ LIBS         += $$MUPARSER_LIBS
- LIBS         += $$QWT_LIBS
- LIBS         += $$QWT3D_LIBS
- LIBS         += $$GSL_LIBS
-+LIBS         += -lz
- 
- #############################################################################
- ###################### BASIC PROJECT PROPERTIES #############################
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.7-kde.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.7-kde.patch
deleted file mode 100644
index af1dca42da42..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.7-kde.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- qtiplot/src/plot2D/Graph.cpp |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/qtiplot/src/plot2D/Graph.cpp b/qtiplot/src/plot2D/Graph.cpp
-index 626172a..d4eab1b 100755
---- a/qtiplot/src/plot2D/Graph.cpp
-+++ b/qtiplot/src/plot2D/Graph.cpp
-@@ -73,7 +73,8 @@
- #include <PatternBox.h>
- #include <SymbolBox.h>
- #include <LinearColorMap.h>
- 
-+#include <QPaintEngine>
- #include <QApplication>
- #include <QBitmap>
- #include <QClipboard>
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.8-system-gl2ps.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.8-system-gl2ps.patch
deleted file mode 100644
index d7b40c414b1d..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.8-system-gl2ps.patch
+++ /dev/null
@@ -1,76 +0,0 @@
- 3rdparty/qwtplot3d/qwtplot3d.pri          |    8 ++++----
- 3rdparty/qwtplot3d/qwtplot3d.pro          |    3 ---
- 3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp |    2 +-
- 3rdparty/qwtplot3d/src/qwt3d_label.cpp    |    2 +-
- 4 files changed, 6 insertions(+), 9 deletions(-)
-
-diff --git a/3rdparty/qwtplot3d/qwtplot3d.pri b/3rdparty/qwtplot3d/qwtplot3d.pri
-index 45a0c3e..16bbe53 100755
---- a/3rdparty/qwtplot3d/qwtplot3d.pri
-+++ b/3rdparty/qwtplot3d/qwtplot3d.pri
-@@ -8,6 +8,8 @@ DEPENDPATH += src \
-     3rdparty\gl2ps
- INCLUDEPATH += .
- 
-+LIBS+=-lgl2ps
-+
- # Input
- HEADERS += include/qwt3d_extglwidget.h \
-     include/qwt3d_color.h \
-@@ -37,8 +39,7 @@ HEADERS += include/qwt3d_extglwidget.h \
-     include/qwt3d_volumeplot.h \
-     include/qwt3d_graphplot.h \
-     include/qwt3d_multiplot.h \
--    include/qwt3d_io_gl2ps.h \
--    3rdparty/gl2ps/gl2ps.h
-+    include/qwt3d_io_gl2ps.h
- SOURCES += src/qwt3d_extglwidget.cpp \
-     src/qwt3d_axis.cpp \
-     src/qwt3d_color.cpp \
-@@ -62,5 +63,4 @@ SOURCES += src/qwt3d_extglwidget.cpp \
-     src/qwt3d_function.cpp \
-     src/qwt3d_gridplot.cpp \
-     src/qwt3d_meshplot.cpp \
--    src/qwt3d_io_gl2ps.cpp \
--    3rdparty/gl2ps/gl2ps.c
-+    src/qwt3d_io_gl2ps.cpp
-diff --git a/3rdparty/qwtplot3d/qwtplot3d.pro b/3rdparty/qwtplot3d/qwtplot3d.pro
-index 95c8e26..18d03e3 100755
---- a/3rdparty/qwtplot3d/qwtplot3d.pro
-+++ b/3rdparty/qwtplot3d/qwtplot3d.pro
-@@ -31,9 +31,6 @@ RCC_DIR      = $$DESTDIR/tmp
- MOC_DIR      = $$DESTDIR/tmp
- 
- DEFINES     += GL2PS_HAVE_LIBPNG
--INCLUDEPATH += ../zlib/
--INCLUDEPATH += ../libpng/
--LIBS        += ../libpng/libpng.a
- 
- # install
- target.path = lib
-diff --git a/3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp b/3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp
-index bc7a9d8..589cfd2 100755
---- a/3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp
-+++ b/3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp
-@@ -6,7 +6,7 @@
- #include <locale.h>
- 
- #include "qwt3d_openglhelper.h"
--#include "../3rdparty/gl2ps/gl2ps.h"
-+#include "gl2ps.h"
- #include "qwt3d_io_gl2ps.h"
- #include "qwt3d_plot.h"
- 
-diff --git a/3rdparty/qwtplot3d/src/qwt3d_label.cpp b/3rdparty/qwtplot3d/src/qwt3d_label.cpp
-index 7e54ad9..cc8bd60 100755
---- a/3rdparty/qwtplot3d/src/qwt3d_label.cpp
-+++ b/3rdparty/qwtplot3d/src/qwt3d_label.cpp
-@@ -1,7 +1,7 @@
- #include <qbitmap.h>
- #include "qwt3d_label.h"
- #include "qwt3d_plot.h"
--#include "../3rdparty/gl2ps/gl2ps.h"
-+#include "gl2ps.h"
- 
- using namespace Qwt3D;
- 
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-PyQt4-4.10.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-PyQt4-4.10.patch
deleted file mode 100644
index 67bd0a32d105..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-PyQt4-4.10.patch
+++ /dev/null
@@ -1,32 +0,0 @@
- qtiplot/python-sipcmd.py | 21 ++++++++++++++++++---
- 1 file changed, 18 insertions(+), 3 deletions(-)
-
-diff --git a/qtiplot/python-sipcmd.py b/qtiplot/python-sipcmd.py
-index f643194..d8d1ef2 100755
---- a/qtiplot/python-sipcmd.py
-+++ b/qtiplot/python-sipcmd.py
-@@ -27,6 +27,21 @@
- #                                                                          #
- ############################################################################
- 
--from PyQt4 import pyqtconfig
--config = pyqtconfig.Configuration()
--print " ".join([config.sip_bin, "-I", config.pyqt_sip_dir, config.pyqt_sip_flags])
-+from __future__ import print_function
-+
-+import os
-+import sipconfig
-+import PyQt4.QtCore
-+
-+try:
-+	# >= 4.10
-+	SIP_FLAGS = PyQt4.QtCore.PYQT_CONFIGURATION['sip_flags']
-+except:
-+	import PyQt4.pyqtconfig
-+	SIP_FLAGS = PyQt4.pyqtconfig.Configuration().pyqt_sip_flags
-+
-+PYQT_SIP_DIR = os.path.join(sipconfig.Configuration().default_sip_dir)
-+SIP_BIN = sipconfig.Configuration().sip_bin
-+SIP_INC_DIR = sipconfig.Configuration().sip_inc_dir
-+
-+print(" ".join([SIP_BIN, "-I", PYQT_SIP_DIR, SIP_FLAGS]))
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-PyQt4-4.11.3.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-PyQt4-4.11.3.patch
deleted file mode 100644
index a011782550d6..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-PyQt4-4.11.3.patch
+++ /dev/null
@@ -1,32 +0,0 @@
- qtiplot/python-sipcmd.py | 21 ++++++++++++++++++---
- 1 file changed, 18 insertions(+), 3 deletions(-)
-
-diff --git a/qtiplot/python-sipcmd.py b/qtiplot/python-sipcmd.py
-index f643194..d8d1ef2 100755
---- a/qtiplot/python-sipcmd.py
-+++ b/qtiplot/python-sipcmd.py
-@@ -27,6 +27,21 @@
- #                                                                          #
- ############################################################################
- 
--from PyQt4 import pyqtconfig
--config = pyqtconfig.Configuration()
--print " ".join([config.sip_bin, "-I", config.pyqt_sip_dir, config.pyqt_sip_flags])
-+from __future__ import print_function
-+
-+import os
-+import sipconfig
-+import PyQt4.QtCore
-+
-+try:
-+	# >= 4.10
-+	SIP_FLAGS = PyQt4.QtCore.PYQT_CONFIGURATION['sip_flags']
-+except:
-+	import PyQt4.pyqtconfig
-+	SIP_FLAGS = PyQt4.pyqtconfig.Configuration().pyqt_sip_flags
-+
-+PYQT_SIP_DIR = os.path.join(sipconfig.Configuration().default_sip_dir, 'PyQt4')
-+SIP_BIN = sipconfig.Configuration().sip_bin
-+SIP_INC_DIR = sipconfig.Configuration().sip_inc_dir
-+
-+print(" ".join([SIP_BIN, "-I", PYQT_SIP_DIR, SIP_FLAGS]))
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-adopt_to_alglib3.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-adopt_to_alglib3.patch
deleted file mode 100644
index 8f1bde25a038..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-adopt_to_alglib3.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-Description: adoptation to alglib3.
-Author: Anton Gladky <gladk@debian.org>
-Last-Update: 2013-05-16
-
---- a/qtiplot/src/analysis/dialogs/GriddingDialog.cpp
-+++ b/qtiplot/src/analysis/dialogs/GriddingDialog.cpp
-@@ -41,7 +41,7 @@
- #include <QComboBox>
- #include <QLayout>
- 
--#include <idwint.h>
-+#include <interpolation.h>
- 
- GriddingDialog::GriddingDialog(Table* t, const QString& colName, int nodes, QWidget* parent, Qt::WFlags fl )
- 	: QDialog( parent, fl ),
-@@ -365,26 +365,27 @@
- 	Matrix* m = app->newMatrix(rows, cols);
- 	m->setCoordinates(xmin, xmax, ymin, ymax);
- 
--	idwinterpolant z;
-+	alglib::idwinterpolant z;
-+  
- 	switch (boxMethod->currentIndex()){
- 		case 0:
--			idwbuildmodifiedshepardr(xy, d_nodes, 2, boxRadius->value(), z);
-+			alglib::idwbuildmodifiedshepardr(xy, d_nodes, 2, boxRadius->value(), z);
- 		break;
- 		case 1:
--			idwbuildmodifiedshepard(xy, d_nodes, 2, boxModel->currentIndex() + 1, boxNQ->value(), boxNW->value(), z);
-+			alglib::idwbuildmodifiedshepard(xy, d_nodes, 2, boxModel->currentIndex() + 1, boxNQ->value(), boxNW->value(), z);
- 		break;
- 		case 2:
--			idwbuildnoisy(xy, d_nodes, 2, boxModel->currentIndex() + 1, boxNQ->value(), boxNW->value(), z);
-+			alglib::idwbuildnoisy(xy, d_nodes, 2, boxModel->currentIndex() + 1, boxNQ->value(), boxNW->value(), z);
- 		break;
- 	}
- 
--	ap::real_1d_array p;
-+	alglib::real_1d_array p;
- 	p.setlength(2);
- 	for (int i = 0; i < rows; i++){
- 		p(1) = ymin + i*ystep;
- 		for (int j = 0; j < cols; j++){
- 			p(0) = xmin + j*xstep;
--			m->setCell(i, j, idwcalc(z, p));
-+			m->setCell(i, j, alglib::idwcalc(z, p));
- 		}
- 	}
- 
-@@ -435,20 +436,20 @@
- 	double xstep = fabs(xmax - xmin)/(cols - 1);
- 	double ystep = fabs(ymax - ymin)/(rows - 1);
- 
--	idwinterpolant z;
-+	alglib::idwinterpolant z;
- 	switch (boxMethod->currentIndex()){
- 		case 0:
--			idwbuildmodifiedshepardr(xy, d_nodes, 2, boxRadius->value(), z);
-+			alglib::idwbuildmodifiedshepardr(xy, d_nodes, 2, boxRadius->value(), z);
- 		break;
- 		case 1:
--			idwbuildmodifiedshepard(xy, d_nodes, 2, boxModel->currentIndex() + 1, boxNQ->value(), boxNW->value(), z);
-+			alglib::idwbuildmodifiedshepard(xy, d_nodes, 2, boxModel->currentIndex() + 1, boxNQ->value(), boxNW->value(), z);
- 		break;
- 		case 2:
--			idwbuildnoisy(xy, d_nodes, 2, boxModel->currentIndex() + 1, boxNQ->value(), boxNW->value(), z);
-+			alglib::idwbuildnoisy(xy, d_nodes, 2, boxModel->currentIndex() + 1, boxNQ->value(), boxNW->value(), z);
- 		break;
- 	}
- 
--	ap::real_1d_array p;
-+	alglib::real_1d_array p;
- 	p.setlength(2);
- 
- 	double **data_matrix = Matrix::allocateMatrixData(cols, rows);
-@@ -456,7 +457,7 @@
- 		p(1) = ymin + i*ystep;
- 		for (int j = 0; j < cols; j++){
- 			p(0) = xmin + j*xstep;
--			data_matrix[j][i] = idwcalc(z, p);
-+			data_matrix[j][i] = alglib::idwcalc(z, p);
- 		}
- 	}
- 
---- a/qtiplot/src/analysis/dialogs/GriddingDialog.h
-+++ b/qtiplot/src/analysis/dialogs/GriddingDialog.h
-@@ -71,7 +71,7 @@
- 
- 	QString d_col_name;
- 	int d_nodes;
--	ap::real_2d_array xy;
-+	alglib::real_2d_array xy;
- 
- 	QPushButton* buttonFit;
- 	QPushButton* buttonCancel;
---- a/qtiplot/src/matrix/MatrixModel.cpp
-+++ b/qtiplot/src/matrix/MatrixModel.cpp
-@@ -45,7 +45,7 @@
- #include <stdlib.h>
- 
- #ifdef HAVE_ALGLIB
--	#include <spline2d.h>
-+	#include <interpolation.h>
- #endif
- 
- MatrixModel::MatrixModel(int rows, int cols, QObject *parent)
-@@ -1026,7 +1026,7 @@
- #ifdef HAVE_ALGLIB
- 	QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
- 
--	ap::real_2d_array oldValues, newValues;
-+	alglib::real_2d_array oldValues, newValues;
- 	oldValues.setlength(d_rows, d_cols);
- 	newValues.setlength(rows, cols);
- 
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-crasher_without_internet.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-crasher_without_internet.patch
deleted file mode 100644
index fe542341e99d..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-crasher_without_internet.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Crashes if not connected to the internet.
-Author: Scott Howard <showard@debian.org>
-Bug-Debian: http://bugs.debian.org/626915
-
-Index: qtiplot/qtiplot/src/core/ApplicationWindow.cpp
-===================================================================
---- qtiplot.orig/qtiplot/src/core/ApplicationWindow.cpp	2012-11-07 11:14:15.021706679 -0500
-+++ qtiplot/qtiplot/src/core/ApplicationWindow.cpp	2012-11-07 11:14:22.853706641 -0500
-@@ -16228,11 +16228,12 @@
- 	if (hostInfo.error() != QHostInfo::NoError){
- 		QApplication::restoreOverrideCursor();
- 		QMessageBox::critical(this, tr("QtiPlot - Error"), qtiplotWeb + ": " + hostInfo.errorString());
--		exit(0);
-+		QApplication::restoreOverrideCursor();
-+	}
-+	else {
-+		QApplication::restoreOverrideCursor();
-+		showDonationsPage();
- 	}
--
--	QApplication::restoreOverrideCursor();
--	showDonationsPage();
- }
- 
- void ApplicationWindow::parseCommandLineArguments(const QStringList& args)
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-gsl-2.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-gsl-2.patch
deleted file mode 100644
index 9ad891938cd6..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-gsl-2.patch
+++ /dev/null
@@ -1,36 +0,0 @@
- * Info: Using [gentoo] (https://bugs.gentoo.org/xmlrpc.cgi)
- * Info: Getting attachment 425760
- * Info: Viewing attachment: "fix_fit_gsl_fdfsolver.patch"
-diff --git a/qtiplot/src/analysis/Fit.cpp b/qtiplot/src/analysis/Fit.cpp
-index 22cb5be..555f21d 100755
---- a/qtiplot/src/analysis/Fit.cpp
-+++ b/qtiplot/src/analysis/Fit.cpp
-@@ -106,6 +106,7 @@ void Fit::init()
- gsl_multifit_fdfsolver * Fit::fitGSL(gsl_multifit_function_fdf f, int &iterations, int &status)
- {
- 	const gsl_multifit_fdfsolver_type *T;
-+	gsl_matrix *J;
- 	if (d_solver)
- 		T = gsl_multifit_fdfsolver_lmder;
- 	else
-@@ -128,7 +129,8 @@ gsl_multifit_fdfsolver * Fit::fitGSL(gsl_multifit_function_fdf f, int &iteration
- 	}
- 
- 	if (status){
--	    gsl_multifit_covar (s->J, 0.0, covar);
-+	    gsl_multifit_fdfsolver_jac (s, J);
-+	    gsl_multifit_covar (J, 0.0, covar);
- 	    iterations = 0;
- 	    return s;
- 	}
-@@ -155,7 +157,8 @@ gsl_multifit_fdfsolver * Fit::fitGSL(gsl_multifit_function_fdf f, int &iteration
- 		status = gsl_multifit_test_delta (s->dx, s->x, d_tolerance, d_tolerance);
- 	} while (inRange && status == GSL_CONTINUE && (int)iter < d_max_iterations);
- 
--	gsl_multifit_covar (s->J, 0.0, covar);
-+	gsl_multifit_fdfsolver_jac (s, J);
-+	gsl_multifit_covar (J, 0.0, covar);
- 
- 	iterations = iter;
- 	return s;
-
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-origin-2.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-origin-2.patch
deleted file mode 100644
index d85420b790f4..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-origin-2.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -ruN qtiplot-0.9.8.9-origin/qtiplot/exportEMF.pro qtiplot-0.9.8.9/qtiplot/exportEMF.pro
---- qtiplot-0.9.8.9-origin/qtiplot/exportEMF.pro	2012-01-21 20:39:03.000000000 +0100
-+++ qtiplot-0.9.8.9/qtiplot/exportEMF.pro	2012-01-21 20:32:45.000000000 +0100
-@@ -5,6 +5,7 @@
- 
- INCLUDEPATH	+= $$QWT_INCLUDEPATH
- INCLUDEPATH	+= $$GSL_INCLUDEPATH
-+INCLUDEPATH	+= $$EMF_INCLUDEPATH
- 
- include(src/core/core.pri)
- include(src/lib/libqti.pri)
-diff -ruN qtiplot-0.9.8.9-origin/qtiplot/qtiplot.pro qtiplot-0.9.8.9/qtiplot/qtiplot.pro
---- qtiplot-0.9.8.9-origin/qtiplot/qtiplot.pro	2011-11-07 10:17:21.000000000 +0100
-+++ qtiplot-0.9.8.9/qtiplot/qtiplot.pro	2012-01-21 20:44:11.000000000 +0100
-@@ -236,9 +236,9 @@
- ###############################################################
- 
- TARGET		=	qtiplot
--DESTDIR		=	../
-+DESTDIR		=	./
- LIBS		+=	../tmp/qtiplot/libFreeSoftwareQtiPlotExportEMF.a \
- 				../tmp/qtiplot/libFreeSoftwareQtiPlotImportOPJ.a
- 
- include(src/plugins/exportEMF/exportEMF.pri)
--include(src/plugins/OriginPlugin/OriginPlugin.pri)
-\ Kein Zeilenumbruch am Dateiende.
-+include(src/plugins/OriginPlugin/OriginPlugin.pri)
-diff -ruN qtiplot-0.9.8.9-origin/qtiplot/src/plugins/exportEMF/exportEMF.pri qtiplot-0.9.8.9/qtiplot/src/plugins/exportEMF/exportEMF.pri
---- qtiplot-0.9.8.9-origin/qtiplot/src/plugins/exportEMF/exportEMF.pri	2011-10-27 13:44:34.000000000 +0200
-+++ qtiplot-0.9.8.9/qtiplot/src/plugins/exportEMF/exportEMF.pri	2012-01-21 20:51:34.000000000 +0100
-@@ -10,5 +10,5 @@
- SOURCES		+=  src/plugins/exportEMF/exportEMF.cpp \
- 				src/plugins/exportEMF/3rdparty/EmfEngine/src/EmfEngine.cpp \
- 				src/plugins/exportEMF/3rdparty/EmfEngine/src/EmfPaintDevice.cpp
--				
--LIBS		+= -lgdi32
-+
-+LIBS		+= -lEMF
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-private.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-private.patch
deleted file mode 100644
index 7bec3771813c..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-private.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ruN qtiplot-0.9.8.9.orig/qtiplot/src/plot2D/ImageWidget.h qtiplot-0.9.8.9/qtiplot/src/plot2D/ImageWidget.h
---- qtiplot-0.9.8.9.orig/qtiplot/src/plot2D/ImageWidget.h	2010-10-17 09:04:05.000000000 +0200
-+++ qtiplot-0.9.8.9/qtiplot/src/plot2D/ImageWidget.h	2013-11-01 12:11:36.559973891 +0100
-@@ -67,10 +67,10 @@
- 	void setWindowName(const QString& name){d_window_name = name;};
- 
- 	static QPixmap windowPixmap(ApplicationWindow *mw, const QString& name, const QSize& size);
-+	void paintEvent(QPaintEvent *e);
- 
- private:
- 	void draw(QPainter *painter, const QRect& r);
--	void paintEvent(QPaintEvent *e);
- 	QPixmap d_pix;
- 	//! The file from which the image was loaded.
- 	QString d_file_name;
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-qt48.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-qt48.patch
deleted file mode 100644
index 31c8a5ee7af2..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-qt48.patch
+++ /dev/null
@@ -1,29 +0,0 @@
- 3rdparty/qwtplot3d/include/qwt3d_openglhelper.h |    2 ++
- qtiplot/src/plot3D/Cone3D.cpp                   |    1 +
- 2 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h b/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h
-index 0ee80de..3d02e3f 100755
---- a/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h
-+++ b/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h
-@@ -8,6 +8,8 @@
- #include <QtOpenGL/qgl.h>
- #endif
- 
-+#include <GL/glu.h>
-+
- namespace Qwt3D
- {
- 
-diff --git a/qtiplot/src/plot3D/Cone3D.cpp b/qtiplot/src/plot3D/Cone3D.cpp
-index 16df12d..169d5c7 100755
---- a/qtiplot/src/plot3D/Cone3D.cpp
-+++ b/qtiplot/src/plot3D/Cone3D.cpp
-@@ -27,6 +27,7 @@
-  *                                                                         *
-  ***************************************************************************/
- #include <math.h>
-+#include <GL/glu.h>
- #include "qwt3d_color.h"
- #include "qwt3d_plot.h"
- #include <qwt3d_curve.h>
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-set_col_values.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-set_col_values.patch
deleted file mode 100644
index 5afe43eb3daf..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-set_col_values.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: if you don't initialize the "i" variable, or initialize it to 0.0
- qtiplot won't let you set the column values using muparser.
-Author: Scott Howard <showard@debian.org>
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=707736
-
-Index: qtiplot/qtiplot/src/table/Table.cpp
-===================================================================
---- qtiplot.orig/qtiplot/src/table/Table.cpp	2013-06-08 02:06:35.550201324 -0400
-+++ qtiplot/qtiplot/src/table/Table.cpp	2013-06-08 02:08:30.026204044 -0400
-@@ -564,7 +564,7 @@
- 	QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
- 
-     muParserScript *mup = new muParserScript(scriptEnv, cmd, this,  QString("<%1>").arg(colName(col)));
--    double *r = mup->defineVariable("i");
-+    double *r = mup->defineVariable("i",startRow + 1.0);
-     mup->defineVariable("j", (double)col);
-     mup->defineVariable("sr", startRow + 1.0);
-     mup->defineVariable("er", endRow + 1.0);
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-sip-4.15.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-sip-4.15.patch
deleted file mode 100644
index c08163019a3e..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-sip-4.15.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- ./qtiplot/src/analysis/FFT.cpp.orig	2011-07-06 11:51:08.000000000 +0000
-+++ ./qtiplot/src/analysis/FFT.cpp	2013-10-23 23:07:45.674925476 +0000
-@@ -353,7 +353,7 @@
- 	ml->arrangeLayers(false, false);
- }
- 
--bool FFT::setDataFromTable(Table *t, const QString& realColName, const QString& imagColName, int from, int to)
-+bool FFT::setDataFromTable(Table *t, const QString& realColName, const QString& imagColName, int from, int to, bool unused)
- {
- 	d_init_err = true;
- 
---- ./qtiplot/src/analysis/FFT.h.orig	2011-07-05 22:05:03.000000000 +0000
-+++ ./qtiplot/src/analysis/FFT.h	2013-10-23 23:11:34.277924367 +0000
-@@ -52,6 +52,8 @@
- 	Matrix *realOutputMatrix(){return d_re_out_matrix;}
- 	Matrix *imaginaryOutputMatrix(){return d_im_out_matrix;}
- 
-+    bool setDataFromTable(Table *t, const QString& realColName, const QString& imagColName = QString(), int from = 0, int to = -1, bool unused = false);
-+
- private:
-     void init();
-     void output();
-@@ -60,8 +62,6 @@
- 	void fftTable();
- 	void fftMatrix();
- 
--    bool setDataFromTable(Table *t, const QString& realColName, const QString& imagColName = QString(), int from = 0, int to = -1);
--
-     double d_sampling;
-     //! Flag telling if an inverse FFT must be performed.
-     bool d_inverse;
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-sip-4.19.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-sip-4.19.patch
deleted file mode 100644
index a1ea502787c3..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-sip-4.19.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/qtiplot/src/scripting/qti.sip	2017-02-13 17:01:03.123828499 +0100
-+++ b/qtiplot/src/scripting/qti.sip	2017-02-13 17:02:12.628828234 +0100
-@@ -148,14 +148,14 @@
-     }
-     break;
-   case Table::Date:
--    if (sipCanConvertToType(item, sipType_QDateTime, 0)) {
-+    if (sipCanConvertToType(item, sipFindType("QDateTime"), 0)) {
-       int isErr = 0;
--      QDateTime* dateTime = reinterpret_cast<QDateTime*>(sipConvertToType(item, sipType_QDateTime,
-+      QDateTime* dateTime = reinterpret_cast<QDateTime*>(sipConvertToType(item, sipFindType("QDateTime"),
-                             0/*sipTransferObj*/, 0/*flags*/, 0/*state*/, &isErr));
-       if (isErr)
-         return 1;
-       table->setText(row, col, dateTime->toString(table->columnFormat(col)));
--      delete dateTime;
-+      //delete dateTime;
-     }
-     else {
-       if (PyType_Ready(item_type) == 0)
-@@ -164,14 +164,14 @@
-     }
-     break;
-   case Table::Time:
--    if (sipCanConvertToType(item, sipType_QTime, 0)) {
-+    if (sipCanConvertToType(item, sipFindType("QTime"), 0)) {
-       int isErr = 0;
--      QTime* time = reinterpret_cast<QTime*>(sipConvertToType(item, sipType_QTime,
-+      QTime* time = reinterpret_cast<QTime*>(sipConvertToType(item, sipFindType("QTime"),
-                             0/*sipTransferObj*/, 0/*flags*/, 0/*state*/, &isErr));
-       if (isErr)
-         return 1;
-       table->setText(row, col, time->toString(table->columnFormat(col)));
--      delete time;
-+      //delete time;
-     }
-     else {
-       if (PyType_Ready(item_type) == 0)
diff --git a/sci-visualization/qtiplot/metadata.xml b/sci-visualization/qtiplot/metadata.xml
deleted file mode 100644
index d4db0da9a895..000000000000
--- a/sci-visualization/qtiplot/metadata.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sci@gentoo.org</email>
-		<name>Gentoo Science Project</name>
-	</maintainer>
-	<longdescription>
-		Data analysis and scientific plotting package. This is a clone of the
-		popular Origin software available on another well known platform implemented
-		in Qt with powerful 2D and 3D data plotting, ASCII import and powerful
-		spreadsheet data manipulation using column logic. Curve fitting and other
-		statistical tools are also available.
-	</longdescription>
-	<use>
-		<flag name="linguas_cs">Czech locale</flag>
-		<flag name="linguas_de">German locale</flag>
-		<flag name="linguas_es">Spanish locale</flag>
-		<flag name="linguas_fr">French locale</flag>
-		<flag name="linguas_ja">Japanese locale</flag>
-		<flag name="linguas_ro">Romanian locale</flag>
-		<flag name="linguas_ru">Russian locale</flag>
-		<flag name="linguas_sv">Swedish locale</flag>
-		<flag name="linguas_zh_CN">Chinese locale for China</flag>
-	</use>
-</pkgmetadata>
diff --git a/sci-visualization/qtiplot/qtiplot-0.9.8.9-r2.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.8.9-r2.ebuild
deleted file mode 100644
index 3fcaffb291d1..000000000000
--- a/sci-visualization/qtiplot/qtiplot-0.9.8.9-r2.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils qt4-r2 fdo-mime python-single-r1 toolchain-funcs
-
-DESCRIPTION="Qt based clone of the Origin plotting package"
-HOMEPAGE="http://soft.proindependent.com/qtiplot.html
-	http://www.staff.science.uu.nl/~zeven101/qtiplot.html"
-SRC_URI="
-	https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2
-	https://dev.gentoo.org/~dilfridge/distfiles/${P}-origin.patch.bz2"
-
-LICENSE="GPL-2 GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="bindist doc mono latex python"
-
-LANGS="cn cz de es fr ja ro ru sv"
-for l in ${LANGS}; do
-	lu=${l/cz/cs}
-	lu=${lu/cn/zh_CN}
-	IUSE="${IUSE} linguas_${lu}"
-done
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# qwtplot3d much modified from original upstream
-# >=x11-libs/qwt-5.3 they are using trunk checkouts
-CDEPEND="
-	media-libs/libemf
-	dev-qt/qthelp:4
-	dev-qt/qtgui:4
-	dev-qt/qtopengl:4
-	dev-qt/qt3support:4
-	dev-qt/qthelp:4[compat]
-	dev-qt/qtsvg:4
-	>=x11-libs/gl2ps-1.3.5[png]
-	>=dev-cpp/muParser-1.32
-	>=dev-libs/boost-1.35.0:=
-	dev-libs/quazip[qt4]
-	media-libs/libpng:=
-	sci-libs/alglib:=
-	<sci-libs/gsl-2
-	sci-libs/tamu_anova
-	latex? ( dev-tex/qtexengine )
-	mono? ( dev-dotnet/libgdiplus )
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	python? ( >=dev-python/sip-4.9[${PYTHON_USEDEP}] )
-	doc? (
-		>=app-text/docbook-sgml-utils-0.6.14-r1
-		>=app-text/docbook-xml-dtd-4.4-r2:4.4 )"
-
-RDEPEND="${CDEPEND}
-	python? ( dev-python/PyQt4[X,${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${DISTDIR}"/${P}-origin.patch.bz2
-	"${FILESDIR}"/${P}-origin-2.patch
-	"${FILESDIR}"/${P}-qt48.patch
-	"${FILESDIR}"/${PN}-0.9.8.8-system-gl2ps.patch
-	"${FILESDIR}"/${PN}-0.9.7.10-dont-install-qwt.patch
-	"${FILESDIR}"/${PN}-0.9.8.6-gold.patch
-	"${FILESDIR}"/${PN}-0.9.8.7-kde.patch
-	"${FILESDIR}"/${P}-set_col_values.patch
-	"${FILESDIR}"/${P}-adopt_to_alglib3.patch
-	"${FILESDIR}"/${P}-crasher_without_internet.patch
-	"${FILESDIR}"/${P}-private.patch
-	"${FILESDIR}"/${P}-sip-4.15.patch
-	"${FILESDIR}"/${P}-PyQt4-4.10.patch
-	)
-
-RESTRICT="!bindist? ( bindist )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	local mylibs
-
-	qt4-r2_src_prepare
-
-	rm -rf 3rdparty/{liborigin,QTeXEngine,/qwtplot3d/3rdparty/gl2ps/,boost,alglib} || die
-	sed \
-		-e "s:dll:static:g" \
-		-e "/INSTALLS/d" \
-		-i 3rdparty/qwtplot3d/*.pro
-
-	mylibs="${mylibs} -lquazip"
-	use mono && mylibs="${mylibs} $($(tc-getPKG_CONFIG) --libs libgdiplus)"
-
-	# Check build.conf for changes on bump.
-	cat > build.conf <<-EOF
-	# Automatically generated by Gentoo ebuild
-	isEmpty( QTI_ROOT ) {
-	  message( "each file including this config needs to set QTI_ROOT to the dir containing this file!" )
-	}
-
-	MUPARSER_LIBS = $($(tc-getPKG_CONFIG) --libs muparser)
-	GSL_LIBS = $($(tc-getPKG_CONFIG) --libs gsl)
-	QWT_INCLUDEPATH = \$\$QTI_ROOT/3rdparty/qwt/src
-	QWT_LIBS = \$\$QTI_ROOT/3rdparty/qwt/lib/libqwt.a
-	QWT3D_INCLUDEPATH = \$\$QTI_ROOT/3rdparty/qwtplot3d/include
-	QWT3D_LIBS = \$\$QTI_ROOT/3rdparty/qwtplot3d/lib/libqwtplot3d.a
-	EMF_INCLUDEPATH = "${EPREFIX}/usr/include/libEMF
-	SYS_LIBS = -lgl2ps ${mylibs} -lGLU
-
-	LUPDATE = lupdate
-	LRELEASE = lrelease
-
-	SCRIPTING_LANGS += muParser
-
-	CONFIG          += release
-	CONFIG          += CustomInstall
-	DEFINES         += SCRIPTING_CONSOLE
-
-	LIBPNG_LIBS = $($(tc-getPKG_CONFIG) --libs libpng)
-	TAMUANOVA_LIBS = -ltamuanova
-	TAMUANOVA_INCLUDEPATH = "${EPREFIX}/usr/include/tamu_anova"
-	ALGLIB_LIBS = -lalglib
-
-	EOF
-
-	use bindist && echo "DEFINES         += QTIPLOT_SUPPORT" >> build.conf
-	use bindist || echo "DEFINES         += QTIPLOT_PRO" >> build.conf
-	use python && echo "SCRIPTING_LANGS += Python" >> build.conf
-	use python && echo "PYTHON = ${EPYTHON}" >> build.conf
-	use latex && echo "TEX_ENGINE_LIBS = -lQTeXEngine" >> build.conf
-
-	sed \
-		-e "s:doc/${PN}/manual:doc/${PN}/html:" \
-		-e '/INSTALLS.*documentation/d' \
-		-e '/INSTALLS.*manual/d' \
-		-e "/INSTALLBASE/s: /usr: ${EPREFIX}/usr:g" \
-		-e 's:/usr/local/qtiplot:$$INSTALLBASE:g' \
-		-i qtiplot/qtiplot.pro || die
-
-	if use python; then
-		sed \
-			-e "s:/usr/local/${PN}:${EPREFIX}$(python_get_sitedir)/qtiplot:" \
-			-i qtiplot/qtiplot.pro || die
-	fi
-
-	sed \
-		-e "/^target.path/s:/usr:${EPREFIX}/usr:g" \
-		-i fitPlugins/*/*.pro || die
-
-	sed -e '/manual/d' -i qtiplot.pro || die
-
-	sed -e "s:QTIPLOT_PRO:QTIPLOT_PROFESSIONAL:g" -i qtiplot/src/core/main.cpp || die
-
-	# Drop langs only if LINGUAS is not empty
-	if [[ -n ${LINGUAS} ]]; then
-		for l in ${LANGS}; do
-			lu=${l/cz/cs}
-			lu=${lu/cn/zh_CN}
-			use linguas_${lu} || \
-				sed -e "s:translations/qtiplot_${l}.[tq][sm]::" \
-						-i qtiplot/qtiplot.pro || die
-		done
-	fi
-
-	sed \
-		-e "s:d_python_config_folder + \":\"${EPREFIX}/usr/share/qtiplot:g" \
-		-i qtiplot/src/core/ApplicationWindow.cpp || die
-
-	chmod -x qtiplot/qti_wordlist.txt
-
-	# sed out debian paths
-	sed -e 's:\(/usr/share/sgml/\)docbook/stylesheet/dsssl/modular\(/html/docbook.dsl\):\1stylesheets/dsssl/docbook\2:' \
-		-i manual/qtiplot.dsl || die
-	sed -e 's:\(/usr/share/\)xml/docbook/stylesheet/nwalsh\(/html/chunk.xsl\):\1sgml/docbook/xsl-stylesheets\2:' \
-		-i manual/qtiplot_html.xsl || die
-
-	sed \
-		-e '1i#define OF(x) x' \
-		-i 3rdparty/zlib/minigzip.c || die
-}
-
-src_configure() {
-	use amd64 && export QMAKESPEC="linux-g++-64"
-	eqmake4
-}
-
-src_compile() {
-	emake
-	lrelease qtiplot/qtiplot.pro || die
-	if use doc; then
-		cd manual
-		emake web
-	fi
-}
-
-src_install() {
-	qt4-r2_src_install
-
-	insinto /usr/share/qtiplot
-	doins qtiplot/qti_wordlist.txt
-
-	newicon qtiplot_logo.png qtiplot.png
-	make_desktop_entry qtiplot "QtiPlot Scientific Plotting" qtiplot
-
-	use doc && dohtml -r manual/html/*
-
-	use python && python_optimize
-
-	if [[ -n ${LINGUAS} ]]; then
-		insinto /usr/share/${PN}/translations
-		for l in ${LANGS}; do
-			lu=${l/cz/cs}
-			lu=${lu/cn/zh_CN}
-			use linguas_${lu} && \
-				doins qtiplot/translations/qtiplot_${l}.qm
-		done
-	fi
-}
-
-pkg_postinst() {
-	if use python; then
-		optfeature "Enhanced python support" \
-			dev-python/pygsl dev-python/rpy sci-libs/scipy dev-python/sympy
-	fi
-
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/sci-visualization/qtiplot/qtiplot-0.9.8.9-r3.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.8.9-r3.ebuild
deleted file mode 100644
index 65c127fe41f9..000000000000
--- a/sci-visualization/qtiplot/qtiplot-0.9.8.9-r3.ebuild
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils qt4-r2 fdo-mime python-single-r1 toolchain-funcs
-
-DESCRIPTION="Qt based clone of the Origin plotting package"
-HOMEPAGE="http://soft.proindependent.com/qtiplot.html
-	http://www.staff.science.uu.nl/~zeven101/qtiplot.html"
-SRC_URI="
-	https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2
-	https://dev.gentoo.org/~dilfridge/distfiles/${P}-origin.patch.bz2"
-
-LICENSE="GPL-2 GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="bindist doc mono latex python"
-
-LANGS="cn cz de es fr ja ro ru sv"
-for l in ${LANGS}; do
-	lu=${l/cz/cs}
-	lu=${lu/cn/zh_CN}
-	IUSE="${IUSE} linguas_${lu}"
-done
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# qwtplot3d much modified from original upstream
-# >=x11-libs/qwt-5.3 they are using trunk checkouts
-CDEPEND="
-	media-libs/libemf
-	dev-qt/qthelp:4
-	dev-qt/qtgui:4
-	dev-qt/qtopengl:4
-	dev-qt/qt3support:4
-	dev-qt/qthelp:4[compat]
-	dev-qt/qtsvg:4
-	>=x11-libs/gl2ps-1.3.5[png]
-	>=dev-cpp/muParser-1.32
-	>=dev-libs/boost-1.35.0:=
-	dev-libs/quazip[qt4]
-	media-libs/libpng:=
-	sci-libs/alglib:=
-	<sci-libs/gsl-2
-	sci-libs/tamu_anova
-	latex? ( dev-tex/qtexengine )
-	mono? ( dev-dotnet/libgdiplus )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/PyQt4-4.11.3[X,${PYTHON_USEDEP}]
-		)"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	python? ( >=dev-python/sip-4.16.5[${PYTHON_USEDEP}] )
-	doc? (
-		>=app-text/docbook-sgml-utils-0.6.14-r1
-		>=app-text/docbook-xml-dtd-4.4-r2:4.4 )"
-
-RDEPEND="${CDEPEND}"
-
-PATCHES=(
-	"${DISTDIR}"/${P}-origin.patch.bz2
-	"${FILESDIR}"/${P}-origin-2.patch
-	"${FILESDIR}"/${P}-qt48.patch
-	"${FILESDIR}"/${PN}-0.9.8.8-system-gl2ps.patch
-	"${FILESDIR}"/${PN}-0.9.7.10-dont-install-qwt.patch
-	"${FILESDIR}"/${PN}-0.9.8.6-gold.patch
-	"${FILESDIR}"/${PN}-0.9.8.7-kde.patch
-	"${FILESDIR}"/${P}-set_col_values.patch
-	"${FILESDIR}"/${P}-adopt_to_alglib3.patch
-	"${FILESDIR}"/${P}-crasher_without_internet.patch
-	"${FILESDIR}"/${P}-private.patch
-	"${FILESDIR}"/${P}-sip-4.15.patch
-	"${FILESDIR}"/${P}-PyQt4-4.11.3.patch
-	"${FILESDIR}"/${P}-sip-4.19.patch
-)
-
-RESTRICT="!bindist? ( bindist )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	local mylibs
-
-	qt4-r2_src_prepare
-
-	rm -rf 3rdparty/{liborigin,QTeXEngine,/qwtplot3d/3rdparty/gl2ps/,boost,alglib} || die
-	sed \
-		-e "s:dll:static:g" \
-		-e "/INSTALLS/d" \
-		-i 3rdparty/qwtplot3d/*.pro
-
-	mylibs="${mylibs} -lquazip"
-	use mono && mylibs="${mylibs} $($(tc-getPKG_CONFIG) --libs libgdiplus)"
-
-	# Check build.conf for changes on bump.
-	cat > build.conf <<-EOF
-	# Automatically generated by Gentoo ebuild
-	isEmpty( QTI_ROOT ) {
-	  message( "each file including this config needs to set QTI_ROOT to the dir containing this file!" )
-	}
-
-	MUPARSER_LIBS = $($(tc-getPKG_CONFIG) --libs muparser)
-	GSL_LIBS = $($(tc-getPKG_CONFIG) --libs gsl)
-	QWT_INCLUDEPATH = \$\$QTI_ROOT/3rdparty/qwt/src
-	QWT_LIBS = \$\$QTI_ROOT/3rdparty/qwt/lib/libqwt.a
-	QWT3D_INCLUDEPATH = \$\$QTI_ROOT/3rdparty/qwtplot3d/include
-	QWT3D_LIBS = \$\$QTI_ROOT/3rdparty/qwtplot3d/lib/libqwtplot3d.a
-	EMF_INCLUDEPATH = "${EPREFIX}/usr/include/libEMF
-	SYS_LIBS = -lgl2ps ${mylibs} -lGLU
-
-	LUPDATE = lupdate
-	LRELEASE = lrelease
-
-	SCRIPTING_LANGS += muParser
-
-	CONFIG          += release
-	CONFIG          += CustomInstall
-	DEFINES         += SCRIPTING_CONSOLE
-
-	LIBPNG_LIBS = $($(tc-getPKG_CONFIG) --libs libpng)
-	TAMUANOVA_LIBS = -ltamuanova
-	TAMUANOVA_INCLUDEPATH = "${EPREFIX}/usr/include/tamu_anova"
-	ALGLIB_LIBS = -lalglib
-
-	EOF
-
-	use bindist && echo "DEFINES         += QTIPLOT_SUPPORT" >> build.conf
-	use bindist || echo "DEFINES         += QTIPLOT_PRO" >> build.conf
-	use python && echo "SCRIPTING_LANGS += Python" >> build.conf
-	use python && echo "PYTHON = ${EPYTHON}" >> build.conf
-	use latex && echo "TEX_ENGINE_LIBS = -lQTeXEngine" >> build.conf
-
-	sed \
-		-e "s:doc/${PN}/manual:doc/${PN}/html:" \
-		-e '/INSTALLS.*documentation/d' \
-		-e '/INSTALLS.*manual/d' \
-		-e "/INSTALLBASE/s: /usr: ${EPREFIX}/usr:g" \
-		-e 's:/usr/local/qtiplot:$$INSTALLBASE:g' \
-		-i qtiplot/qtiplot.pro || die
-
-	if use python; then
-		sed \
-			-e "s:/usr/local/${PN}:${EPREFIX}$(python_get_sitedir)/qtiplot:" \
-			-i qtiplot/qtiplot.pro || die
-	fi
-
-	sed \
-		-e "/^target.path/s:/usr:${EPREFIX}/usr:g" \
-		-i fitPlugins/*/*.pro || die
-
-	sed -e '/manual/d' -i qtiplot.pro || die
-
-	sed -e "s:QTIPLOT_PRO:QTIPLOT_PROFESSIONAL:g" -i qtiplot/src/core/main.cpp || die
-
-	# Drop langs only if LINGUAS is not empty
-	if [[ -n ${LINGUAS} ]]; then
-		for l in ${LANGS}; do
-			lu=${l/cz/cs}
-			lu=${lu/cn/zh_CN}
-			use linguas_${lu} || \
-				sed -e "s:translations/qtiplot_${l}.[tq][sm]::" \
-						-i qtiplot/qtiplot.pro || die
-		done
-	fi
-
-	sed \
-		-e "s:d_python_config_folder + \":\"${EPREFIX}/usr/share/qtiplot:g" \
-		-i qtiplot/src/core/ApplicationWindow.cpp || die
-
-	chmod -x qtiplot/qti_wordlist.txt
-
-	# sed out debian paths
-	sed -e 's:\(/usr/share/sgml/\)docbook/stylesheet/dsssl/modular\(/html/docbook.dsl\):\1stylesheets/dsssl/docbook\2:' \
-		-i manual/qtiplot.dsl || die
-	sed -e 's:\(/usr/share/\)xml/docbook/stylesheet/nwalsh\(/html/chunk.xsl\):\1sgml/docbook/xsl-stylesheets\2:' \
-		-i manual/qtiplot_html.xsl || die
-
-	sed \
-		-e '1i#define OF(x) x' \
-		-i 3rdparty/zlib/minigzip.c || die
-}
-
-src_configure() {
-	use amd64 && export QMAKESPEC="linux-g++-64"
-	eqmake4
-}
-
-src_compile() {
-	emake
-	lrelease qtiplot/qtiplot.pro || die
-	if use doc; then
-		cd manual
-		emake web
-	fi
-}
-
-src_install() {
-	qt4-r2_src_install
-
-	insinto /usr/share/qtiplot
-	doins qtiplot/qti_wordlist.txt
-
-	newicon qtiplot_logo.png qtiplot.png
-	make_desktop_entry qtiplot "QtiPlot Scientific Plotting" qtiplot
-
-	use doc && dohtml -r manual/html/*
-
-	use python && python_optimize
-
-	if [[ -n ${LINGUAS} ]]; then
-		insinto /usr/share/${PN}/translations
-		for l in ${LANGS}; do
-			lu=${l/cz/cs}
-			lu=${lu/cn/zh_CN}
-			use linguas_${lu} && \
-				doins qtiplot/translations/qtiplot_${l}.qm
-		done
-	fi
-}
-
-pkg_postinst() {
-	if use python; then
-		optfeature "Enhanced python support" \
-			dev-python/pygsl dev-python/rpy sci-libs/scipy dev-python/sympy
-	fi
-
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/sci-visualization/qtiplot/qtiplot-0.9.8.9-r4.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.8.9-r4.ebuild
deleted file mode 100644
index 42a68ecc39cb..000000000000
--- a/sci-visualization/qtiplot/qtiplot-0.9.8.9-r4.ebuild
+++ /dev/null
@@ -1,241 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils qmake-utils python-single-r1 toolchain-funcs xdg
-
-DESCRIPTION="Qt based clone of the Origin plotting package"
-HOMEPAGE="
-	http://soft.proindependent.com/qtiplot.html
-	http://www.staff.science.uu.nl/~zeven101/qtiplot.html"
-SRC_URI="
-	https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2
-	https://dev.gentoo.org/~jlec/distfiles/${P}-origin.patch.xz"
-
-LICENSE="GPL-2 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bindist doc mono latex python"
-
-LANGS="cn cz de es fr ja ro ru sv"
-for l in ${LANGS}; do
-	lu=${l/cz/cs}
-	lu=${lu/cn/zh_CN}
-	IUSE="${IUSE} linguas_${lu}"
-done
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# qwtplot3d much modified from original upstream
-# >=x11-libs/qwt-5.3 they are using trunk checkouts
-RDEPEND="
-	>=dev-cpp/muParser-1.32
-	>=dev-libs/boost-1.35.0:=
-	dev-libs/quazip[qt4]
-	dev-qt/qt3support:4
-	dev-qt/qtgui:4
-	dev-qt/qthelp:4
-	dev-qt/qthelp:4[compat]
-	dev-qt/qtopengl:4
-	dev-qt/qtsvg:4
-	media-libs/libemf
-	media-libs/libpng:=
-	sci-libs/alglib:=
-	>=sci-libs/gsl-2
-	sci-libs/tamu_anova
-	>=x11-libs/gl2ps-1.3.5[png]
-	latex? ( dev-tex/qtexengine )
-	mono? ( dev-dotnet/libgdiplus )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/PyQt4-4.11.3[X,${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		>=app-text/docbook-sgml-utils-0.6.14-r1
-		>=app-text/docbook-xml-dtd-4.4-r2:4.4
-	)
-	python? ( >=dev-python/sip-4.16.5[${PYTHON_USEDEP}] )
-"
-
-PATCHES=(
-	"${WORKDIR}"/${P}-origin.patch
-	"${FILESDIR}"/${P}-origin-2.patch
-	"${FILESDIR}"/${P}-qt48.patch
-	"${FILESDIR}"/${PN}-0.9.8.8-system-gl2ps.patch
-	"${FILESDIR}"/${PN}-0.9.7.10-dont-install-qwt.patch
-	"${FILESDIR}"/${PN}-0.9.8.6-gold.patch
-	"${FILESDIR}"/${PN}-0.9.8.7-kde.patch
-	"${FILESDIR}"/${P}-set_col_values.patch
-	"${FILESDIR}"/${P}-adopt_to_alglib3.patch
-	"${FILESDIR}"/${P}-crasher_without_internet.patch
-	"${FILESDIR}"/${P}-private.patch
-	"${FILESDIR}"/${P}-sip-4.15.patch
-	"${FILESDIR}"/${P}-PyQt4-4.11.3.patch
-	"${FILESDIR}"/${P}-gsl-2.patch
-	"${FILESDIR}"/${P}-sip-4.19.patch
-)
-
-RESTRICT="!bindist? ( bindist )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	local mylibs
-
-	xdg_src_prepare
-
-	rm -rf \
-		3rdparty/{liborigin,QTeXEngine,/qwtplot3d/3rdparty/gl2ps/,boost,alglib} \
-		|| die
-	sed \
-		-e "s:dll:static:g" \
-		-e "/INSTALLS/d" \
-		-i 3rdparty/qwtplot3d/*.pro || die
-
-	mylibs="${mylibs} -lquazip"
-	use mono && mylibs="${mylibs} $($(tc-getPKG_CONFIG) --libs libgdiplus)"
-
-	# Check build.conf for changes on bump.
-	cat > build.conf <<-EOF
-	# Automatically generated by Gentoo ebuild
-	isEmpty( QTI_ROOT ) {
-	  message( "each file including this config needs to set QTI_ROOT to the dir containing this file!" )
-	}
-
-	MUPARSER_LIBS = $($(tc-getPKG_CONFIG) --libs muparser)
-	GSL_LIBS = $($(tc-getPKG_CONFIG) --libs gsl)
-	QWT_INCLUDEPATH = \$\$QTI_ROOT/3rdparty/qwt/src
-	QWT_LIBS = \$\$QTI_ROOT/3rdparty/qwt/lib/libqwt.a
-	QWT3D_INCLUDEPATH = \$\$QTI_ROOT/3rdparty/qwtplot3d/include
-	QWT3D_LIBS = \$\$QTI_ROOT/3rdparty/qwtplot3d/lib/libqwtplot3d.a
-	EMF_INCLUDEPATH = "${EPREFIX}"/usr/include/libEMF
-	SYS_LIBS = -lgl2ps ${mylibs} -lGLU
-
-	LUPDATE = lupdate
-	LRELEASE = lrelease
-
-	SCRIPTING_LANGS += muParser
-
-	CONFIG          += release
-	CONFIG          += CustomInstall
-	DEFINES         += SCRIPTING_CONSOLE
-
-	LIBPNG_LIBS = $($(tc-getPKG_CONFIG) --libs libpng)
-	TAMUANOVA_LIBS = -ltamuanova
-	TAMUANOVA_INCLUDEPATH = "${EPREFIX}/usr/include/tamu_anova"
-	ALGLIB_LIBS = -lalglib
-
-	EOF
-
-	use bindist && echo "DEFINES         += QTIPLOT_SUPPORT" >> build.conf
-	use bindist || echo "DEFINES         += QTIPLOT_PRO" >> build.conf
-	use python && echo "SCRIPTING_LANGS += Python" >> build.conf
-	use python && echo "PYTHON = ${EPYTHON}" >> build.conf
-	use latex && echo "TEX_ENGINE_LIBS = -lQTeXEngine" >> build.conf
-
-	sed \
-		-e "s:doc/${PN}/manual:doc/${PN}/html:" \
-		-e '/INSTALLS.*documentation/d' \
-		-e '/INSTALLS.*manual/d' \
-		-e "/INSTALLBASE/s: /usr: ${EPREFIX}/usr:g" \
-		-e 's:/usr/local/qtiplot:$$INSTALLBASE:g' \
-		-i qtiplot/qtiplot.pro || die
-
-	if use python; then
-		sed \
-			-e "s:/usr/local/${PN}:${EPREFIX}$(python_get_sitedir)/qtiplot:" \
-			-i qtiplot/qtiplot.pro || die
-	fi
-
-	sed \
-		-e "/^target.path/s:/usr:${EPREFIX}/usr:g" \
-		-i fitPlugins/*/*.pro || die
-
-	sed -e '/manual/d' -i qtiplot.pro || die
-
-	sed -e "s:QTIPLOT_PRO:QTIPLOT_PROFESSIONAL:g" -i qtiplot/src/core/main.cpp || die
-
-	# Drop langs only if LINGUAS is not empty
-	if [[ -n ${LINGUAS} ]]; then
-		for l in ${LANGS}; do
-			lu=${l/cz/cs}
-			lu=${lu/cn/zh_CN}
-			use linguas_${lu} || \
-				sed -e "s:translations/qtiplot_${l}.[tq][sm]::" \
-						-i qtiplot/qtiplot.pro || die
-		done
-	fi
-
-	sed \
-		-e "s:d_python_config_folder + \":\"${EPREFIX}/usr/share/qtiplot:g" \
-		-i qtiplot/src/core/ApplicationWindow.cpp || die
-
-	chmod -x qtiplot/qti_wordlist.txt
-
-	# sed out debian paths
-	sed \
-		-e 's:\(/usr/share/sgml/\)docbook/stylesheet/dsssl/modular\(/html/docbook.dsl\):\1stylesheets/dsssl/docbook\2:' \
-		-i manual/qtiplot.dsl || die
-	sed \
-		-e 's:\(/usr/share/\)xml/docbook/stylesheet/nwalsh\(/html/chunk.xsl\):\1sgml/docbook/xsl-stylesheets\2:' \
-		-i manual/qtiplot_html.xsl || die
-
-	sed \
-		-e '1i#define OF(x) x' \
-		-i 3rdparty/zlib/minigzip.c || die
-}
-
-src_configure() {
-	use amd64 && export QMAKESPEC="linux-g++-64"
-	eqmake4
-}
-
-src_compile() {
-	default
-	lrelease qtiplot/qtiplot.pro || die
-	if use doc; then
-		cd manual || die
-		emake web
-	fi
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-
-	insinto /usr/share/qtiplot
-	doins qtiplot/qti_wordlist.txt
-
-	newicon qtiplot_logo.png qtiplot.png
-	make_desktop_entry qtiplot "QtiPlot Scientific Plotting" qtiplot
-
-	use doc && dodoc -r manual/html
-
-	use python && python_optimize
-
-	if [[ -n ${LINGUAS} ]]; then
-		insinto /usr/share/${PN}/translations
-		for l in ${LANGS}; do
-			lu=${l/cz/cs}
-			lu=${lu/cn/zh_CN}
-			use linguas_${lu} && \
-				doins qtiplot/translations/qtiplot_${l}.qm
-		done
-	fi
-}
-
-pkg_postinst() {
-	if use python; then
-		optfeature "Enhanced python support" \
-			dev-python/pygsl dev-python/rpy sci-libs/scipy dev-python/sympy
-	fi
-
-	xdg_pkg_postinst
-}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 95b082c6deb5..5cae13d88941 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/baobab/Manifest b/sys-apps/baobab/Manifest
index 9fddd265744a..46a63ee9f838 100644
--- a/sys-apps/baobab/Manifest
+++ b/sys-apps/baobab/Manifest
@@ -1,5 +1,5 @@
 DIST baobab-3.22.1.tar.xz 947932 BLAKE2B 820c483964ef44d9ce557253128030044f456986e4c71bc0c2e64436290fd2b9e4aeadb1cb717179de68064faf80df5deaeced91d535eb5ae084abeb897b62fd SHA512 6fae974ef79dc9b61269cc07fcdb4f6d8f043cf3eb8239c2408a7ccb1445800c1beda85da8ae9e0da1a39604e4896a6aab0ab04391286df20c20783d208c6c36
 DIST baobab-3.24.0.tar.xz 970636 BLAKE2B bac7397a0b157723f8341b09b7e00fdaef2a50803ff901be6c307aa733b72478f7b3f62850e3e8445b79d1ad17668c617655aa7268402a487ee6e10267d0a7a2 SHA512 7a16cdc7b4e77e8bad23bccc171b4e552b2eb33a43822579cdf4b1d5ac76526955c0efeadf355fcda3a72b1fd6f8dbf2a6088406b5a21b8ecc4d06ff525baa17
 EBUILD baobab-3.22.1.ebuild 826 BLAKE2B f6eb457e87e64cda16727b3a3f1a54e404f4c0e44102205a0456d0112dfe5346bcacf21fb7738a77ccd862673146250c7ae4bce29e296d5150ee04244ddfca56 SHA512 9f7237475393c82e795a34f2e52bc7104b0200d435643ab54eeca2bde42c059282fbb224c4aa655bda6ffa66dd2c910ce9e5e3519a5c11cea0037443b5424690
-EBUILD baobab-3.24.0.ebuild 827 BLAKE2B c4ec6a2609a1e3e017e872811299f8c19d54aed7b5bb10d3673a4937387f4ab447ad50ff515b26a9bddd507d1627d086bde2968f82ab7ab8d80302a19a4b7293 SHA512 9901c6ffb70d93856727e0dc95852069665e47e65953c243141a98dd2c759b457a2931c17218132621e48f832d9878c9a868b84498110f371f241ca8971c6d78
+EBUILD baobab-3.24.0.ebuild 826 BLAKE2B 2710c2b9102a30500cdf8e27dbc22be0145c293f615be673ff41a634f82f61bc76e9ae17fba1aab1c8a4acb918e2d03471563ffc5fb4468683d312d3a6cd2e23 SHA512 c617bd4aa3327aebd0c9576b6921b38dc309bed6cd7dfa339a8293c261109bbafb5092f9db6da6c1ba575eb1dbceb32be0f2a982c0b4f47a0abf1e67d062f7b9
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-apps/baobab/baobab-3.24.0.ebuild b/sys-apps/baobab/baobab-3.24.0.ebuild
index c7fc52195c75..1fb4c71b319b 100644
--- a/sys-apps/baobab/baobab-3.24.0.ebuild
+++ b/sys-apps/baobab/baobab-3.24.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Baobab"
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
 IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.40:2[dbus]
diff --git a/sys-apps/gnome-disk-utility/Manifest b/sys-apps/gnome-disk-utility/Manifest
index d305f5a4849a..b9979205d768 100644
--- a/sys-apps/gnome-disk-utility/Manifest
+++ b/sys-apps/gnome-disk-utility/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-disk-utility-3.22.1.tar.xz 1455508 BLAKE2B 49075e3b6e413a6c69e483004aba7fe4212c2494992f7177ae8ea139bab9f4f657e9ce756ba558b073a09c7c8fe24f58e470bb52811a7bc98fb9c6048ed9b98c SHA512 f8ea64eb5adc3d6d55669bfa85c80a23f91ecb86f8632ae4ef035ad5062375e4fd73581f6ad12f6d83b1d6d98508a046b64a5a6544dea59765da2ff4b42b2d37
 DIST gnome-disk-utility-3.24.1.tar.xz 1947976 BLAKE2B a3b9d02417bed415bf6b9b8d86abcfa857abe316133ce7abfa11db835831e916d879b09d1e1129d12621b0234ffa27c1e246837cb614c51c54ce387a9c73bea4 SHA512 ae6bf83e005733ae985987411a9fe25b0059f64484fc0d613ad54af478130782974607bec53713ee36c2a28de653ceba82b0fb091aee57101773c0eeeaaed2d5
 EBUILD gnome-disk-utility-3.22.1.ebuild 1058 BLAKE2B 93b66145017932d9f09b7b660e4a17486d45311911e67cfbc8a9685078e18725f7a080a0333b8adb57b7650155e2cd3fe015f91a7ab20e3086387ed917f819d4 SHA512 5d521e064f7af967328969c485fe93247560bc9d05396e4096faf470b3b9c09fdcce389a7e50e5340de289e264b4b89d7dfcf5c0ba216e67ac3c5b61a4088671
-EBUILD gnome-disk-utility-3.24.1.ebuild 1066 BLAKE2B 257f6de11937dedbc6db571701aa09e78c586b7f327eb33862719e198b14495528aa66d6384142234d5832c1b44ae34bd2f5c7d8f2725de0dac24d867eb1ee48 SHA512 1aa5919aeb1c3d78fd4d9dbe0132dec49627752e659fc56cb0e162bd5d551dafce76981a3866153e15f73c0c9a5682f1109b0aeabb41acb7a1fbd59ceb1bad7f
+EBUILD gnome-disk-utility-3.24.1.ebuild 1065 BLAKE2B a94d3c210fe8038a595a61e0eb50b6ab7444c39222d4c2e6643698ccad2a3e3ffc5edb3a64c8dbfc95c5a701e889c8405af46412752d23bd59201703c84d1c80 SHA512 810ae41d78b5ada6e2200a73065fb83004377129441c1460aab85bb3d008ac789b3810af70e52f8b1d161fa2bf8969c7c33917678d84ec405b2adb904d230f4f
 MISC metadata.xml 348 BLAKE2B 78a8cab4d641fbf3a66632f3f22b66f271f39ec44c6afe18b7e2ee3b049f36a5fa1ffc29964cb293125061f4b2be45ac9f09e136f42aef428375bf3630e92643 SHA512 7da9aaf34df822f6f62b606fb00655a4d2a7bf710cb9e265dea98b887365d64536c927caa2810b9b1d92dbeb8c93f9e09b7e529e4304bdc4de5d4f6d61208c24
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.24.1.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.24.1.ebuild
index c5f6930d605b..1d0dec0a2bed 100644
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.24.1.ebuild
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.24.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-disk-utility"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="fat gnome systemd"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86"
 
 COMMON_DEPEND="
 	>=app-arch/xz-utils-5.0.5
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 930ed5e9fbe3..e78d874300a7 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -18,6 +18,6 @@ DIST systemd-236.tar.gz 6759035 BLAKE2B 0fc26bd67fb6cc3b0565c763fc26e38186c4b05c
 EBUILD systemd-233-r6.ebuild 13593 BLAKE2B 888f373f78f0ba49f91d765b1568c7b6183b2cc2794f66cff37bf1518aa926148ce67411077de68f45419021bd4b99610e4552b1bd7d84dd2a3ce594f109be43 SHA512 ba05ead8530e2276ebde9b5dbd76d129ddb80224cb551114bcd0d55a079597a77b57f1bf58be520b74bbbb419a0c4020cf1039897a6d01c1e839fe3b67cac711
 EBUILD systemd-235-r1.ebuild 13515 BLAKE2B a7c8172b85924b970a5104681c0577c447408d88232eff3dd9a607b86f18952db48ed358c7451834291214432424694e5873719a1e0d2d30888d9747d3313729 SHA512 263a14227163ca7d4a993f150e864a67e7ccc1092f808a14493206f418780453e4e74df3b700cb746060d46da5025d8c0db5841404db09afc13e2e968bdf93b8
 EBUILD systemd-236-r4.ebuild 12986 BLAKE2B 1ea709672003c2864317751b1471e088bdc5cd430a9449fe28b43840d9af53ecbcfa4877bf6a9eb0f96999a5d4ad4c47c7b548d5125196c5df5984a187868210 SHA512 ed6f3ff41b7266f6010e73d67659619836f17f8900e64d0172b335631ae75e2d357af0ceeb5424c691a546e9b4cf5f68ff2a01d766fa73319567a0b628752ac7
-EBUILD systemd-236-r5.ebuild 12985 BLAKE2B 13b9cd1545d7aec213f84c165031b1c07a60b16723ebe7c9ef06b8cb066c0542e4b36faee64b48f29cc12521ca3d145ed8c04c4dbe3299935aa099824acd9eb7 SHA512 4acc78aab5f23c0b620b62551135329940a89dbc4c1cc105fd4cec49c1f25240ef399d568e243a512e6b6fe3e212bfdc4df76eaad20a953089987f3ed8a898e5
-EBUILD systemd-9999.ebuild 12925 BLAKE2B 44e3ff49e2898a8199a1d106de12ceb286e33dd810e6fcc046ededd7f720914c355f5ab189af07b2f8d4951dbee1ad4046fc403fc357d6d6a13c67e67045d39c SHA512 f31ee8d40c1eb31af6a06b58a79c3121b824eec0ecbc0e8d3a37ba77368d8c3f3b96e2167f1d7ca10690c1963da37a0394989c0d4ba8789e39666924c5188b26
+EBUILD systemd-236-r5.ebuild 13012 BLAKE2B 6e8960a49da6cc13f93c2b0f38114e9f350bb600658a0437a1551e085bbefb773fe64f787522619e1942e40fa072979244447c9b244d9bc40c3ae2c7556f839a SHA512 1fe475b4e0bdff7b68088d08a88ae779f84307e33b1c0e21aa1cc0305f616ff9245f0fda7d1e77ccd8aa20cee554915367a9ae0d305e2c4890f5c8efe2e7bb53
+EBUILD systemd-9999.ebuild 12952 BLAKE2B afaeef8029d984f90a38f4cb007220d068265a12f126ef581e0534aa3d8fff8f7311e2cb52ae146358ff7b976c35d412e2c6461cc7c643406becf853c2c3ac60 SHA512 938578a047b0890d797500f9b60cfec82f7ab5fbc63eb2cd0856c2aa9e33ad1092e0f3ff165ceda723718afe4a660e873a71f423d59db10ba5141968ed0560e8
 MISC metadata.xml 2032 BLAKE2B a554cb3dc21d5c5a5a4227f05f4a91054080999d23022051252f3461fb9c4398112fa1c96982205b4e1709de00ae395706ac46b86ae44610ecf85ededc3ceca7 SHA512 1c97f2c573c63a63d2ed78820d891d9593c5d8636574270c4306dc3c8ce739e52f6829e7e219cc2744acd7f3e2362e340b7c2406923f1aaf9adebc785cdb6544
diff --git a/sys-apps/systemd/systemd-236-r5.ebuild b/sys-apps/systemd/systemd-236-r5.ebuild
index 961530f55ed2..4156ce618fe2 100644
--- a/sys-apps/systemd/systemd-236-r5.ebuild
+++ b/sys-apps/systemd/systemd-236-r5.ebuild
@@ -313,9 +313,10 @@ multilib_src_install_all() {
 	fi
 
 	# Preserve empty dirs in /etc & /var, bug #437008
-	keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \
-		/etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd \
-		/var/log/journal/remote
+	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
+	keepdir /etc/systemd/{ntp-units.d,user} /var/lib/systemd
+	keepdir /etc/udev/{hwdb.d,rules.d}
+	keepdir /var/log/journal/remote
 
 	# Symlink /etc/sysctl.conf for easy migration.
 	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 7e7bcf41a449..36144514e860 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -312,9 +312,10 @@ multilib_src_install_all() {
 	fi
 
 	# Preserve empty dirs in /etc & /var, bug #437008
-	keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \
-		/etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd \
-		/var/log/journal/remote
+	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
+	keepdir /etc/systemd/{ntp-units.d,user} /var/lib/systemd
+	keepdir /etc/udev/{hwdb.d,rules.d}
+	keepdir /var/log/journal/remote
 
 	# Symlink /etc/sysctl.conf for easy migration.
 	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 270c06abf9ec..c6d490052bbb 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/raid-check/Manifest b/sys-block/raid-check/Manifest
index 4f50f04311b5..7d7ac0024ffd 100644
--- a/sys-block/raid-check/Manifest
+++ b/sys-block/raid-check/Manifest
@@ -2,4 +2,4 @@ AUX raid-check-20140719-makefile.patch 1451 BLAKE2B dbd8b448a59dcc67564c021e675d
 AUX raid-check-20140719-path.patch 293 BLAKE2B b678612376f89f896ddd6949c00caa08b5bbaae0aed861375704fd335e2113f091e15d2ed521a407afdf3864cf67af149ee7cedd53b9aa548a6cb546ee5fdfac SHA512 7b9939b9ac05d6c04af5a1422713a316ac18826b7d6f9ed1d5b66e4d557e0069f91e4e04e627a827070c676a845af53eeb2ef7be8bc15455229117727bd4e1e2
 DIST raid-check-20140719.tar.xz 4000 BLAKE2B d9ece0d24d0d32fa68debb7960b74d95f90acc556fdbdd2802597b738cf88e7e993c8d410e9f6b5474484c441b8da3653b4953de9cea8f84a48d2693fc6aac93 SHA512 dc7b4c6e784b3ef2ca89e9dac0bbe3e47056439dfe48615b79922b47cb3b0df7f157ae52ab9de0b9abf5373bd769090088fc8712b492b0aa5327aeaeaee52edb
 EBUILD raid-check-20140719-r1.ebuild 565 BLAKE2B d5d43b986ec3bc63d711b996b09e24385738fdee5dd418706681e0ea7d552eb4563f0cd5fb661bfbbc4720e5b94e75271fdc279eed2853e6e3ce88f3d5b50656 SHA512 19ec1641b943732a75beac267a426dd0e4425e33c5f2ac5c6d914fddd0d65c4f570e714f381eb0cdf5f193af023ae23c0e2012b324bf03b0e45147be6785f7ee
-MISC metadata.xml 539 BLAKE2B d281d33deb27a9730a45dc9a2c001f2afc1fdfef6c2e8b5b875d4ce7e66481fad16c475007dcfafdfeba983a382c97ce0ac391e33f16499f3408e899a8ba36a7 SHA512 6700dd1dbdb3b43e731f92e8b2e8c225ae2e0d53563d5342a9d304333b5d617c06e48d7d5aa32b05069525c509bc9511ba7825598e91aee7fbd08cf3be28b709
+MISC metadata.xml 540 BLAKE2B ec4fcf654a9ccb585438e23c554114699b5722c456ffea12f1e28e0fd653abac61ea0b3ff39d2cf700c2693ce07316b95f6e1341fa3899d9e601ccf25bd889e2 SHA512 80b6f214b0e3a8b0a1bb8d60bb5097ca36eaf4d97e1c379b0adbf2d1b26a3e66017780f955d73a2c75c6f3727af87f230a94d3ef854ca58015ea21e3387129cf
diff --git a/sys-block/raid-check/metadata.xml b/sys-block/raid-check/metadata.xml
index 6fada7444fd3..caeaa178e9d7 100644
--- a/sys-block/raid-check/metadata.xml
+++ b/sys-block/raid-check/metadata.xml
@@ -7,7 +7,7 @@
 	</maintainer>
 	<longdescription lang="en">
 		Script that should be run regularly on systems running software RAID (mdadm) to
-		perform "scrubbing" (http://en.wikipedia.org/wiki/Data_scrubbing#In_RAID)
+		perform "scrubbing" (https://en.wikipedia.org/wiki/Data_scrubbing#In_RAID)
 	</longdescription>
 	<upstream>
 		<remote-id type="github">fukawi2/raid-check</remote-id>
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index b877cbde0fba..0cac28e0e705 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index 08fb109a5915..0c35a70099d4 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -12,16 +12,16 @@ DIST openmpi-2.0.2.tar.bz2 8311215 BLAKE2B 8dd0d7b95c396e9a0f05760136bbf62defd35
 DIST openmpi-2.0.4.tar.bz2 8272983 BLAKE2B 7d0a392fbc8c896cdccefb9bf0ff83fbd8db8a42d17f06cb23ac88ba896e2c75e1b1b7a79559d0ce3c2b881f197f54ce1bd8967c889bafe2b97f95fb6b957501 SHA512 2cccb83847d44f6282ec24f7bc12ab51b84dc5ac1a2a919ef0761847ff7cdcb31cfb1f38dca33df7063a98c27a64575a108002716d207cbba3a54773b999e6c5
 DIST openmpi-2.1.2.tar.bz2 8278459 BLAKE2B 83f6617322baad4fb13d399fa6a491d1d8dec1a5862974552a5f0cb033ab2a27eb0a44055e2670e3fbe79dbac68ed0130bdfec057cad48e474b814ccd56e59e6 SHA512 8a27a67cab384f9f03efe69bfdd51a8e8790f47a156e3a7e34f26a29d033889653070981c0105f142a96f00293fc069536bd020ae28a97afb564eab747e60457
 DIST openmpi-3.0.0.tar.bz2 9267606 BLAKE2B 9ee569a9c5f5918bb3d389a2945a2e7a5d98464afbd111eb2426a4e8296a23cf6d5b558554ce8126b13f910bd59acbb77e93ac297f3cf222c4bc764836b39ee6 SHA512 7e37eacf959a803d6d89dff4291b64a1f3d83bc7941b778a2fb13d12be0f205cb904e4a807d79676ad1e31fd99ffb15f255c8a227e830673455abb144f14616a
-EBUILD openmpi-1.10.7.ebuild 6355 BLAKE2B 3217a0e603cc8a1a2c9f2e9abf4d55e06e8cd8236ce257713c497a259734d62f634358fe6b4529884d740f7095bfa555fd2e9d4639f2b4d96409a57e594d13bc SHA512 1da5f322ebc8e7d0e4858bf005083370d1431559fa445eb0f0b80cdc9cf75d0493ab8db452784f87d052b38f434031b20c01f5eacd780eb720d69b9677b9e140
-EBUILD openmpi-1.4.3.ebuild 2571 BLAKE2B 82d9af83842020d3ec526b3abfdf413ce6408d563e50c761615a25f29a046cfa2b8aa9976954a266df35030a111f6dcb4482687ebc66d0ee4688c1fbb0151c38 SHA512 cbd64eaa022ca3861166ceb5a12b0d113d88c9cf4381c5f4eb9e1ca9c0b0006c2457e7639a2cabdd8118518f313bded89d80eb0b2ccd9a91dbb29018a3dd9efd
-EBUILD openmpi-1.4.5.ebuild 2580 BLAKE2B ec72a459e6ed9f8264e74700d541a303d52f1b1dced0f3b512041b415bfcee86e64e3661644107aee8c4cfe4528afdf84e79a23e91a3557e2837846feb6991df SHA512 a8b3f8628aa6f8379b959d2c3ea7ad4e8d9edf7c1e5a41e54e42959f831b53355a3dd0590a72e389f3864dcecafbc62f4b4cee03fe475455900e881598a290a1
-EBUILD openmpi-1.6.5-r1.ebuild 5294 BLAKE2B 1444b0787b6a32fccbe2bfb87f02b27305002221da5b6ae7ff2a11a6e727b3d5fe15a84f79b374263359d606ae1c14db9808c5edcfa2a569b460ef56e851a7ca SHA512 9598d7407d6af3fa0c726aebc087731fa612590127da79fe559a151fd339991fd955c2825538dcfbc0ef255efba47952cbfe7af591e629c590a31c73443390f6
-EBUILD openmpi-1.7.5-r1.ebuild 4989 BLAKE2B e2f22a357515aeb734c191422331e7f7207aae50c27b6fcc4572c3f195070fc42c163135e077869c11b8e8689cdb9d2d4d91fa78a4e7e3e52bd82b1575a2c5b5 SHA512 b69c89d38fed3d7345a12d783f8ef553cc1156e2f8058d990c8a866155a8aeca76b93a514f9980099dc378fdc49752392854d4c432af6cc17fc38e72cb2a7ae8
-EBUILD openmpi-1.8.4-r4.ebuild 5032 BLAKE2B 4139eae8a8c37ddb8f3199c9d2f4603b106ebc62f70b60c3221b2547f4546aaf2c105a1b5c44e2b33375a4398112e3c8f3b30e010f857aa54af2f2fa0fbe600d SHA512 2ebcedba5301d5e70b6c91f958ff902b83ab977187aec96956d468499880788851fe36996a04245c559a6c3eea447467620ac040e3d944c12ba18444c7fca634
-EBUILD openmpi-1.8.7-r1.ebuild 5544 BLAKE2B 9cd368c551d8d47477f524676d6aa1cd981b32a58041f624fbe2cf39c03290e829c4e404e6340334f559fe2065e507bf91f65aae59e3bfc57c07d4331216b962 SHA512 2b3de9e53b8cb911a5ab1a1181f734fb115f77b2ceeadaaf04eaaf776eb476150633d307431c7294a602ab48a6fb9c7172fbf057c1ec0d2155c8a5eb72953ef0
-EBUILD openmpi-1.8.8.ebuild 5550 BLAKE2B 06f87cf78851ae31b86f77ab1e8ef7c71ebb919e39e73df95b81e8aaffc38b1b1afb20c1972cf6328b51fe8d734baf274ef95b8450ebb2e7948b3b98b8a86e56 SHA512 51a5e3282133dbcc1d54e21f5f3957804c32df6d799d968dba43263cb7aba089fe9f7338b09c0e285b2d007758d446a8e64a02b2609a211b03bf984ec0fe3192
-EBUILD openmpi-2.0.2.ebuild 5865 BLAKE2B 6a89c033e8d1e0d77390f6b8d662137d46b4f4c5c326b4092a86746a3168003ad73bb3fd780ccd8b714ff4a90b03f68810adb8c5daf303039a0b7c59757e3682 SHA512 52b5c8c601d20988b06fb96d88b4afa4d81c759ab5526ced4f5844e7fd7b94003dfeca2ab50c9344352d448a0dfc88a09effd518dfc91cebabb311427ebd35af
-EBUILD openmpi-2.0.4.ebuild 5863 BLAKE2B de4495c7064fecd4b83f4ff03058ef1debb452461ca1f65b4d5117636719cfb3d8d8bca8cfc266f30efab816f690b4330a8cc126b491790ae702cc147013fec3 SHA512 bec1430b29d0bf95c349c61a2eee288a228bef721bc2a2587354679918610cd852fe032a48e16869ba8abfd9b15c9e0908f24b859b8ec89a67525ceab88d6a2e
-EBUILD openmpi-2.1.2.ebuild 5580 BLAKE2B 2ea31b522aab0aad425d75c9819bf52f17943df64f754656f6e1d8fe82621f97956537c3513332f1c1e163b00e0eaae79a8f22670d0e62f9916421dceeea43e0 SHA512 86bdd21e669732ee8bb13fb9b6461d75b7680dc5ee1ca90985562e479ab4df06f3bde2d7c4e765e3fbf893eb967f81d6092648eb16071e365ba008ab1dd0a2e5
-EBUILD openmpi-3.0.0.ebuild 5466 BLAKE2B bcd2bd17ad1083973abf4deabe650ea15ab96b9b016b4f3206f9f840bbeca00aafb3bce003be1f019d9319114c4e939017942676cccee0f3a21917bb35afb4c6 SHA512 25b3c1a816319b8113cc3e7b39dc7d425e10f820d8d5dbeee3dc3b28779da39cd59e9a9f1f9ac3fedc8329a33f4dc74b38cb9325677c034fbbc0ec32ef1b3ee9
+EBUILD openmpi-1.10.7.ebuild 6393 BLAKE2B aa12672c1001a3202bda64baef192936ce0b01d48f103d64a63392ea0b575518700739163b1b8be68c30569338d1e60c96891f5080833b52353c511810fe9878 SHA512 3d77924fd58fedefecfcd0670c856d1e7f5e84378b196427f1f9ac5b75989680718a88d4d6fcef2c97c92feaf08d1e1a8a41af0cf53f27655d674f5f469dfef3
+EBUILD openmpi-1.4.3.ebuild 2609 BLAKE2B 89a9c29abfeefec1a634d9e47d06d3711308eea7ee12f9caf6e606fc037a4dcde1de4d8b8f3af5a38b37f5507d5ab48de157905adf2405243288c91be81037b9 SHA512 2f9167f3560fbddf5add9b541ab04b50f995f7db19234c4f35187465d4e9b5399b9a4cf44aa2e879dd6e5419393a87b526059ea538c31b83db441affaa738324
+EBUILD openmpi-1.4.5.ebuild 2618 BLAKE2B 96f296ccf3769f447a191872fd0a8be6729efcf9faf4ae9d9e4b48378c0d0e82e19b87cac583b3e37f3ce450cdc97de3a5b53064e8b9e9dbf479d61fd66f7166 SHA512 19a6fe168a919c00d050f4765743a781fa7366d55e76e0c4577d06c41ea02f250e3d3271b57c9dacfdb1cbca4c83d98894ebab68d9e722f2674320da71c162db
+EBUILD openmpi-1.6.5-r1.ebuild 5332 BLAKE2B 0ec2290549071656df12ce053bfcfbea3cf2cb07a170e03a6ea984f3669415264d53f926328f80393d50d8b498a701c6bb54a5ea90ce96bbc9b405d104c88f67 SHA512 ed720f49baf180819f45bbf0e7da1ebb5b5c911ce85bc6a07c19bad85cb70f7c092eaf2789c3c5756fe22970039cb7323c039069167f90673c2ada17e072026d
+EBUILD openmpi-1.7.5-r1.ebuild 5027 BLAKE2B 845258cd2ccedde7ee293673a4ef963af102b9d195bf70990ff6f36c5d34f412e00dfb1d5a50ba6cf2f560f36e27d400704f6ac37bd59558447972955919b6c4 SHA512 c1d6ae9b3b7de3b199187427fc9e341d30fc1aaaa8af3d4b40a9c4cf041fd7b075b31183d8364b2ca8aa42faabff482ce0ec6c5e8d9e24e2b608bc6b20ecb281
+EBUILD openmpi-1.8.4-r4.ebuild 5070 BLAKE2B 4198a8d25c8ea1ecf338573dee0110e21b84b34a51a96887c161672d00aedf5e84ba1f9dd8d907fa33d089dfe34f7257d48938189049ec8f7324abdc03fcbb07 SHA512 e5bfe9b21e51525e9a5a014aaec2789ea0872a5892f98251adb704b93fb3fc59878d6e1341a1949524c03113ffe53e0ca14a00409ac1ad382cbd3720ec2ca463
+EBUILD openmpi-1.8.7-r1.ebuild 5582 BLAKE2B c6ee77fa3fe8727483fea9cef4595251e00c39f56222f991fd7b7a6e0b3cf383877eac3012a6a328a053375f955a1084c8e3e526d220799d63d0512d0e8a2484 SHA512 92a18ce195accaf97bfdde6537a7b1050cb30a8499e4ef2ab73fe6aa301e8a4e3590197d9581b4891f29f00d56ed8c4b219cc452aa95311b030abbfc6cbd49f9
+EBUILD openmpi-1.8.8.ebuild 5588 BLAKE2B c347599dee7a2181af1029bb0d952e4f9c1d92124785d8bb3e92c00fa76a4ff1b18b3e6f6071221971d6c3255136404d8d875a8b63df4420a321187d948b7402 SHA512 4ad186947a2da72e6957acfb9de023e9a02f47bf761971e7a200f9ff5f2c116d860d26f440cb5adca47b270edfe9bd48d459f1593ae47f7ee076303490a01f69
+EBUILD openmpi-2.0.2.ebuild 5903 BLAKE2B 514a877afbe8f190874068e484b0cac0d7dcb8ee535cb512191d27d12bc5ae475ee9c9424ea8992c408dea3bf6b83abcbdf70b4ced1453e0e43329600a548a40 SHA512 2ea34926ab67a3c92e7262643c9f655bbd36952c21e6f77c8de1b4d60eb649d1b7c9bc0e36f3a26af0716231e9cffb26351fc143c3d7ec52dba53ddf31e1f884
+EBUILD openmpi-2.0.4.ebuild 5901 BLAKE2B ad0b46dd7f73e8600771f7dcb3681afa5ae4d352e387b5ec9c5d18a3150840d23676296efe4555f3ed5e1f24b1dccb9715ff94977793bbd81d546effa29fca55 SHA512 397aa6c8c92446955adc52f38953190452166032757a5658cf18ed850beee04f38acdad1a90550ea66716cce22b16d67a1f3b146c6a17d6259060dd87fd77657
+EBUILD openmpi-2.1.2.ebuild 5618 BLAKE2B 7b271525a70585159fe3d74d5040ff1f4aabff28aadc5e4d5efafe1c9c2e9b6ff090d9a134be397a388fcd06ab6a080f2d119559d5e518333772b86a44b9c945 SHA512 f7644e47f09e6d051c477601076949a2404b719992663d594d3bc749d869e9c15962b50e7781feb1d85adbb448f43eb19ac8c0d517ceffdee3c60709fd8bfbd0
+EBUILD openmpi-3.0.0-r1.ebuild 5504 BLAKE2B 4650ff7d29b3124fdb3e39b837e414af0aa207d873d7ea6fe54a6ebdf9d7dc9bc456cfec1251485c0b2a57fa6a47ce0ef3ade350b047f58b7eae47b67b140a7b SHA512 3eb7b81014dcef1d06a1aab49495235c6f2f731f7ac54955d496d75a3015108d7683dad32ca0cc7c002446f7289c4742307b585c4f83b2d1e6157f97f8df3171
 MISC metadata.xml 901 BLAKE2B 8cdef4e4438351cb99b59bafb932e4b2b960f08b4eaa9917ac2a5d97fd2423781b1ec27a16005ae6470b8f50509ae3c08c2d06f95e452bd2cf00505b7a79ac35 SHA512 6f30f50d2f2173a01e7ef0d4b808352be98b64945b6af1f05cfaa28024f6efccad28984fe0ad31094f8822c5e251c1270765d5905c7737e1b84302143fe4ac09
diff --git a/sys-cluster/openmpi/openmpi-1.10.7.ebuild b/sys-cluster/openmpi/openmpi-1.10.7.ebuild
index b5f0b4edbf30..1e9755408ffe 100644
--- a/sys-cluster/openmpi/openmpi-1.10.7.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.10.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -63,7 +63,7 @@ CDEPEND="
 	>=sys-apps/hwloc-1.10.0-r2[${MULTILIB_USEDEP},numa?]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 )
-	elibc_FreeBSD? ( dev-libs/libexecinfo )
+	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 	openmpi_fabrics_ofed? ( sys-fabric/ofed:* )
 	openmpi_fabrics_knem? ( sys-cluster/knem )
 	openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* )
diff --git a/sys-cluster/openmpi/openmpi-1.4.3.ebuild b/sys-cluster/openmpi/openmpi-1.4.3.ebuild
index 4b8de0f2d9e8..26a9f682d276 100644
--- a/sys-cluster/openmpi/openmpi-1.4.3.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -23,7 +23,7 @@ RDEPEND="
 		!dev-libs/libotf
 		!app-text/lcdf-typetools
 	)
-	elibc_FreeBSD? ( dev-libs/libexecinfo )
+	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 	!sys-cluster/mpich
 	!sys-cluster/mpich2
 	!sys-cluster/mpiexec"
diff --git a/sys-cluster/openmpi/openmpi-1.4.5.ebuild b/sys-cluster/openmpi/openmpi-1.4.5.ebuild
index a810a5a3e3ce..86fb9bf1eeaa 100644
--- a/sys-cluster/openmpi/openmpi-1.4.5.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -25,7 +25,7 @@ RDEPEND="
 		!dev-libs/libotf
 		!app-text/lcdf-typetools
 	)
-	elibc_FreeBSD? ( dev-libs/libexecinfo )
+	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 	!sys-cluster/mpich
 	!sys-cluster/mpich2
 	!sys-cluster/mpiexec"
diff --git a/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild b/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild
index 51c493411e17..977ad9484e68 100644
--- a/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -54,7 +54,7 @@ RDEPEND="
 	!sys-cluster/mpiexec
 	>=sys-apps/hwloc-1.3
 	dev-libs/libltdl:0
-	elibc_FreeBSD? ( dev-libs/libexecinfo )
+	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 	openmpi_fabrics_dapl? ( sys-fabric/dapl )
 	openmpi_fabrics_ofed? ( sys-fabric/ofed )
 	openmpi_fabrics_knem? ( sys-cluster/knem )
diff --git a/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild b/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild
index ad59007d9d7b..efe14693943d 100644
--- a/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -59,7 +59,7 @@ RDEPEND="
 	dev-libs/libltdl:0
 	>=sys-apps/hwloc-1.7.2
 	cuda? ( dev-util/nvidia-cuda-toolkit )
-	elibc_FreeBSD? ( dev-libs/libexecinfo )
+	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 	openmpi_fabrics_ofed? ( sys-fabric/ofed )
 	openmpi_fabrics_knem? ( sys-cluster/knem )
 	openmpi_fabrics_open-mx? ( sys-cluster/open-mx )
diff --git a/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild b/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild
index f028d4301614..1eaa1042367a 100644
--- a/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -62,7 +62,7 @@ RDEPEND="
 	>=sys-apps/hwloc-1.9.1[numa?]
 	sys-libs/zlib
 	cuda? ( dev-util/nvidia-cuda-toolkit )
-	elibc_FreeBSD? ( dev-libs/libexecinfo )
+	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 	openmpi_fabrics_ofed? ( sys-fabric/ofed )
 	openmpi_fabrics_knem? ( sys-cluster/knem )
 	openmpi_fabrics_open-mx? ( sys-cluster/open-mx )
diff --git a/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild b/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild
index fccf7a7c8285..7c24c4df1221 100644
--- a/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -62,7 +62,7 @@ CDEPEND="
 	>=sys-apps/hwloc-1.9.1[numa?]
 	sys-libs/zlib
 	cuda? ( dev-util/nvidia-cuda-toolkit )
-	elibc_FreeBSD? ( dev-libs/libexecinfo )
+	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 	openmpi_fabrics_ofed? ( sys-fabric/ofed )
 	openmpi_fabrics_knem? ( sys-cluster/knem )
 	openmpi_fabrics_open-mx? ( sys-cluster/open-mx )
diff --git a/sys-cluster/openmpi/openmpi-1.8.8.ebuild b/sys-cluster/openmpi/openmpi-1.8.8.ebuild
index af6407a8a709..a940676eb17f 100644
--- a/sys-cluster/openmpi/openmpi-1.8.8.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.8.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -62,7 +62,7 @@ CDEPEND="
 	>=sys-apps/hwloc-1.9.1[numa?]
 	sys-libs/zlib
 	cuda? ( dev-util/nvidia-cuda-toolkit )
-	elibc_FreeBSD? ( dev-libs/libexecinfo )
+	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 	openmpi_fabrics_ofed? ( sys-fabric/ofed:* )
 	openmpi_fabrics_knem? ( sys-cluster/knem )
 	openmpi_fabrics_open-mx? ( sys-cluster/open-mx )
diff --git a/sys-cluster/openmpi/openmpi-2.0.2.ebuild b/sys-cluster/openmpi/openmpi-2.0.2.ebuild
index 5553a3fcd9ce..6874cdda5d30 100644
--- a/sys-cluster/openmpi/openmpi-2.0.2.ebuild
+++ b/sys-cluster/openmpi/openmpi-2.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -57,7 +57,7 @@ CDEPEND="
 	>=sys-apps/hwloc-1.11.2[${MULTILIB_USEDEP},numa?]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 )
-	elibc_FreeBSD? ( dev-libs/libexecinfo )
+	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 	openmpi_fabrics_ofed? ( sys-fabric/ofed:* )
 	openmpi_fabrics_knem? ( sys-cluster/knem )
 	openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* )
diff --git a/sys-cluster/openmpi/openmpi-2.0.4.ebuild b/sys-cluster/openmpi/openmpi-2.0.4.ebuild
index e1517dff800c..4be809c2952b 100644
--- a/sys-cluster/openmpi/openmpi-2.0.4.ebuild
+++ b/sys-cluster/openmpi/openmpi-2.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -57,7 +57,7 @@ CDEPEND="
 	<sys-apps/hwloc-2[${MULTILIB_USEDEP},numa?]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 )
-	elibc_FreeBSD? ( dev-libs/libexecinfo )
+	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 	openmpi_fabrics_ofed? ( sys-fabric/ofed:* )
 	openmpi_fabrics_knem? ( sys-cluster/knem )
 	openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* )
diff --git a/sys-cluster/openmpi/openmpi-2.1.2.ebuild b/sys-cluster/openmpi/openmpi-2.1.2.ebuild
index 0ef453d9dc78..d27771af895e 100644
--- a/sys-cluster/openmpi/openmpi-2.1.2.ebuild
+++ b/sys-cluster/openmpi/openmpi-2.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -53,7 +53,7 @@ CDEPEND="
 	>=sys-apps/hwloc-1.11.2[${MULTILIB_USEDEP},numa?]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 )
-	elibc_FreeBSD? ( dev-libs/libexecinfo )
+	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 	openmpi_fabrics_ofed? ( sys-fabric/ofed:* )
 	openmpi_fabrics_knem? ( sys-cluster/knem )
 	openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* )
diff --git a/sys-cluster/openmpi/openmpi-3.0.0.ebuild b/sys-cluster/openmpi/openmpi-3.0.0-r1.ebuild
index b50c4f2ad163..3626af9f53e8 100644
--- a/sys-cluster/openmpi/openmpi-3.0.0.ebuild
+++ b/sys-cluster/openmpi/openmpi-3.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -53,7 +53,7 @@ CDEPEND="
 	>=sys-apps/hwloc-1.11.2[${MULTILIB_USEDEP},numa?]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 )
-	elibc_FreeBSD? ( dev-libs/libexecinfo )
+	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 	openmpi_fabrics_ofed? ( sys-fabric/ofed:* )
 	openmpi_fabrics_knem? ( sys-cluster/knem )
 	openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* )
diff --git a/sys-cluster/teleport/Manifest b/sys-cluster/teleport/Manifest
index 49b60358feb5..ffa5d115c4e7 100644
--- a/sys-cluster/teleport/Manifest
+++ b/sys-cluster/teleport/Manifest
@@ -4,11 +4,7 @@ AUX teleport.init.d 763 BLAKE2B b57826ab86550da58590546d484c78c05744699363de770e
 AUX teleport.service 209 BLAKE2B ee1f8561ec543a9571cccd5449a276bfdb581db2bccf5f47151159670a9588fc655dcecde69fa951c9a8fb5243033a56b656663bbec94753d5f4925fecd3a3a8 SHA512 c71665c287575b1e127fdf5c580552aeb17bff55627d537999964be3a86ba2b11dce9d46bf10ab8e909c65a9d94263ced590191b7ea9e5ee2f0c3f65a044816e
 AUX teleport.service.conf 90 BLAKE2B 7f12f281d73ac6573c882a7910e400f901ff6392e0c576e4b7076972f4ced046f709c8898766aaf38cc38fbfcf450b526d3045ff859eed2a48e19dbd92ec3131 SHA512 d17faa0deaf3c864e5159d3567e542e36d09c6ea0ac91c663d3ae9729d1bccf7d2139f1f48fec132eccc473e023ffdaed0b8f2ee75db5dedc6ff36f637f68e1c
 AUX teleport.yaml 5177 BLAKE2B 8280b9924497af772574faad5d01351d9c49dd1916dca8e3e0384579e7628b2c0b1833b72882231bfef4ae11b2fa9820a4785393ea8c9d00aef105263bbf5c15 SHA512 f9f854472d469d0822d5766517cc68364feca4f3345a69d616d073aaaf9af7be6f72aa55c7d0c801426c3fef42714c09b884e0e086a58a07208ebef0ffe3ca80
-DIST teleport-2.2.0.tar.gz 7229371 BLAKE2B 8425326e026e5ca23c43b11947d575efccda98e18519dbcd8b9fb4baa2fecf15b3d66b225b22f40e9d78e0e6d39bbed3c2c569b3d15b5af9099f0f4979259cbd SHA512 bec288983371bd3807b7ce994b1533a5e869d903251f8a8ce6315768a1d3ae95d72f832037345c36c9cd4789fbc449c54b86359988b1e74d4f46f9e0db6b3239
-DIST teleport-2.2.1.tar.gz 7235188 BLAKE2B 1f1272bdc96bac0eb424660a285232980063b1a82fec60d7ba80f227da34fa22052aae1eba3137ae73e62fc9c71a8037f067f16ac6b22014f3a82fdd88b444fb SHA512 011ffd8fdf42131455c32b8a8ed1ddee0181a8dcd3424dc9cf5ac96c53ce719d369e0bfac4392cc0dec14e78fed94732bbcb56c2db5987ee778ad29e4f7a749d
-DIST teleport-2.2.4.tar.gz 7234252 BLAKE2B 22c49e3659559ff6f8e55d3b60cf44fce00e67642d16457917b038cbbf48cc32db8caafbf39b70cef2ab39f0d8c1b3cb09e6ea1ab329e8e46c1fdf09b4a3aff2 SHA512 859bc34c90c4d1a504b9fa2958e49803c7af8bee3c2692d70590095ef0356a00cf963c5fc30613f3a7852b602fc7fbbd81ca99fc24ce51787f6d8d2e05af4762
-EBUILD teleport-2.2.0.ebuild 1542 BLAKE2B 698f8b48e6ea9ed1fd3305d83346ad1972beb675e86854b479bb5f7a790008505ab3ca54db1ce96489b190717617fbc346bcf02403dde192d6a7bb1ee2df4f80 SHA512 416f9685b2b50788476043d7130ac358b68621da05237ea84502220fe065dff96b10f44e29b068690c79a9a0f528dfabee7430a87e25ef4b86c64e1d288c78a8
-EBUILD teleport-2.2.1.ebuild 1542 BLAKE2B 698f8b48e6ea9ed1fd3305d83346ad1972beb675e86854b479bb5f7a790008505ab3ca54db1ce96489b190717617fbc346bcf02403dde192d6a7bb1ee2df4f80 SHA512 416f9685b2b50788476043d7130ac358b68621da05237ea84502220fe065dff96b10f44e29b068690c79a9a0f528dfabee7430a87e25ef4b86c64e1d288c78a8
-EBUILD teleport-2.2.4.ebuild 1542 BLAKE2B 698f8b48e6ea9ed1fd3305d83346ad1972beb675e86854b479bb5f7a790008505ab3ca54db1ce96489b190717617fbc346bcf02403dde192d6a7bb1ee2df4f80 SHA512 416f9685b2b50788476043d7130ac358b68621da05237ea84502220fe065dff96b10f44e29b068690c79a9a0f528dfabee7430a87e25ef4b86c64e1d288c78a8
+DIST teleport-2.4.0.tar.gz 9967298 BLAKE2B 26cb5610701c4c7deba0ba36b02f43928f4582cd81449045f58281b06a570eb5df762d21e5fef8f7f461855af3ac766fbafd1d2238b6916f9aaaaf07e20b7353 SHA512 4ed3a38fea4ba5acd52aa44cbc36d2bb1cda1fcb304d7787754b1165eefa3d1c8da65e76bf5c33a3f524ecf43b50145f2e850c927b35f2ec754ed90ed507c54d
+EBUILD teleport-2.4.0.ebuild 1219 BLAKE2B 08b15391673d1fb70c7bbd3897a55bab447bb9eb0f2de0550bdc8d0ee2e533c1f0c9c0b0636e4401cff6c915a0df6c116c921ad7a71652a49e14c93168a61b1c SHA512 0fef7d62e254ac354c32ce125b3ede4b747216e1e324651ad92718cf6569b7d713d79ae5652a4a17a03795d84a274e6b3948a31b69cd9cf911918500d6315fcd
 EBUILD teleport-9999.ebuild 1460 BLAKE2B 8ae106a5bdf26e8b8ffe36f83719a10d7ed3e10e875ba735eedd26d09141b3a016cd5f5dacd37657db6f9c399486038a5a5f1f02ceeb507fdf29159e331ac90e SHA512 74ff9bb734b5b47ad2ac475413af8721c818293eb8166bc99887f75f3e9fa4b8e66e5abeb6fcbf58bb8a4f63db34f010d85471b1a5a7cd1c28c70e43019fa2cd
 MISC metadata.xml 630 BLAKE2B ad22bb63ecf79ddd45b62fe0dcadd6d0d7fd475938b18ec868b56b0f4afe7ee5d3e0908eb0b13249a7c7b5031a3296bec406fea6fb487069a087c9e29dcf0ef2 SHA512 2aa911f2a91bfdea340b38715d69cbe59bcd460d34ac6d1d641f2badf2ba72f4e02cdd2f8a2ca387c9a9d19ea2c22e2be80ab4bb582d9395c1517b818f343c74
diff --git a/sys-cluster/teleport/teleport-2.2.0.ebuild b/sys-cluster/teleport/teleport-2.2.0.ebuild
deleted file mode 100644
index 90fddb344c0c..000000000000
--- a/sys-cluster/teleport/teleport-2.2.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils golang-build systemd user
-
-DESCRIPTION="Modern SSH server for teams managing distributed infrastructure"
-HOMEPAGE="https://gravitational.com/teleport"
-
-EGO_PN="github.com/gravitational/${PN}/..."
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3 golang-vcs
-	EGIT_REPO_URI="https://github.com/gravitational/${PN}.git"
-else
-	inherit golang-vcs-snapshot
-	SRC_URI="https://github.com/gravitational/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-RESTRICT="test"
-
-DEPEND="
-	app-arch/zip
-	>=dev-lang/go-1.8.3"
-RDEPEND=""
-
-PATCHES=( "${FILESDIR}"/${PN}-makefile-buildflags.patch )
-
-src_compile() {
-	BUILDFLAGS="" GOPATH="${S}" emake -C src/${EGO_PN%/*}
-	pushd src/${EGO_PN%/*}/web/dist >/dev/null || die
-	zip -qr "${S}/src/${EGO_PN%/*}/build/webassets.zip" . || die
-	popd >/dev/null || die
-	cat "${S}/src/${EGO_PN%/*}/build/webassets.zip" >> "src/${EGO_PN%/*}/build/${PN}" || die
-	zip -q -A "${S}/src/${EGO_PN%/*}/build/${PN}" || die
-}
-
-src_install() {
-	dodir /var/lib/${PN} /etc/${PN}
-	dobin src/${EGO_PN%/*}/build/{tsh,tctl,teleport}
-
-	insinto /etc/${PN}
-	doins "${FILESDIR}"/${PN}.yaml
-
-	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
-	newconfd "${FILESDIR}"/${PN}.conf.d ${PN}
-
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	systemd_install_serviced "${FILESDIR}"/${PN}.service.conf ${PN}.service
-}
-
-src_test() {
-	GOPATH="${S}" emake -C src/${EGO_PN%/*} test
-}
diff --git a/sys-cluster/teleport/teleport-2.2.4.ebuild b/sys-cluster/teleport/teleport-2.2.4.ebuild
deleted file mode 100644
index 90fddb344c0c..000000000000
--- a/sys-cluster/teleport/teleport-2.2.4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils golang-build systemd user
-
-DESCRIPTION="Modern SSH server for teams managing distributed infrastructure"
-HOMEPAGE="https://gravitational.com/teleport"
-
-EGO_PN="github.com/gravitational/${PN}/..."
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3 golang-vcs
-	EGIT_REPO_URI="https://github.com/gravitational/${PN}.git"
-else
-	inherit golang-vcs-snapshot
-	SRC_URI="https://github.com/gravitational/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-RESTRICT="test"
-
-DEPEND="
-	app-arch/zip
-	>=dev-lang/go-1.8.3"
-RDEPEND=""
-
-PATCHES=( "${FILESDIR}"/${PN}-makefile-buildflags.patch )
-
-src_compile() {
-	BUILDFLAGS="" GOPATH="${S}" emake -C src/${EGO_PN%/*}
-	pushd src/${EGO_PN%/*}/web/dist >/dev/null || die
-	zip -qr "${S}/src/${EGO_PN%/*}/build/webassets.zip" . || die
-	popd >/dev/null || die
-	cat "${S}/src/${EGO_PN%/*}/build/webassets.zip" >> "src/${EGO_PN%/*}/build/${PN}" || die
-	zip -q -A "${S}/src/${EGO_PN%/*}/build/${PN}" || die
-}
-
-src_install() {
-	dodir /var/lib/${PN} /etc/${PN}
-	dobin src/${EGO_PN%/*}/build/{tsh,tctl,teleport}
-
-	insinto /etc/${PN}
-	doins "${FILESDIR}"/${PN}.yaml
-
-	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
-	newconfd "${FILESDIR}"/${PN}.conf.d ${PN}
-
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	systemd_install_serviced "${FILESDIR}"/${PN}.service.conf ${PN}.service
-}
-
-src_test() {
-	GOPATH="${S}" emake -C src/${EGO_PN%/*} test
-}
diff --git a/sys-cluster/teleport/teleport-2.2.1.ebuild b/sys-cluster/teleport/teleport-2.4.0.ebuild
index 90fddb344c0c..dc7173e18dc7 100644
--- a/sys-cluster/teleport/teleport-2.2.1.ebuild
+++ b/sys-cluster/teleport/teleport-2.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,29 +18,22 @@ else
 	KEYWORDS="~amd64 ~arm"
 fi
 
+IUSE=""
 LICENSE="Apache-2.0"
+RESTRICT="test strip"
 SLOT="0"
-IUSE=""
-RESTRICT="test"
 
 DEPEND="
 	app-arch/zip
 	>=dev-lang/go-1.8.3"
 RDEPEND=""
 
-PATCHES=( "${FILESDIR}"/${PN}-makefile-buildflags.patch )
-
 src_compile() {
-	BUILDFLAGS="" GOPATH="${S}" emake -C src/${EGO_PN%/*}
-	pushd src/${EGO_PN%/*}/web/dist >/dev/null || die
-	zip -qr "${S}/src/${EGO_PN%/*}/build/webassets.zip" . || die
-	popd >/dev/null || die
-	cat "${S}/src/${EGO_PN%/*}/build/webassets.zip" >> "src/${EGO_PN%/*}/build/${PN}" || die
-	zip -q -A "${S}/src/${EGO_PN%/*}/build/${PN}" || die
+	GOPATH="${S}" emake -j1 -C src/${EGO_PN%/*} full
 }
 
 src_install() {
-	dodir /var/lib/${PN} /etc/${PN}
+	keepdir /var/lib/${PN} /etc/${PN}
 	dobin src/${EGO_PN%/*}/build/{tsh,tctl,teleport}
 
 	insinto /etc/${PN}
@@ -54,5 +47,5 @@ src_install() {
 }
 
 src_test() {
-	GOPATH="${S}" emake -C src/${EGO_PN%/*} test
+	BUILDFLAGS="" GOPATH="${S}" emake -C src/${EGO_PN%/*} test
 }
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 9974aa8319cd..b7be7464bc4e 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index 41b27f041b49..db838c6e3445 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -15,5 +15,5 @@ EBUILD binutils-2.26.1.ebuild 280 BLAKE2B 6c8363e933c3a7e40fc21a737b59d08d2b9bdd
 EBUILD binutils-2.27-r1.ebuild 293 BLAKE2B 750c39e7ba698916b54eadd97e36fa8b84c9aaa547bcd671deaff719e9d95e66265a12c7845ea7a98de4337263230ac69f0f634c29a6bead78fa13820dca280f SHA512 4137e36156afbfd4ddc6ba08b6fc94e37556375c42f77e21d72d8338e55af094ef28bcbdfcf2c686232b5932208562f38b64db8638d2199ecfc2465518544267
 EBUILD binutils-2.28.1.ebuild 280 BLAKE2B 6c8363e933c3a7e40fc21a737b59d08d2b9bddc950a6b103036e3b8dff1933f9b8d803fe2c85b1497119ee1fb6358c08234cf44eb5a57a43061c815fbd510080 SHA512 322c2cbc01135c2c22afeeeef1a6147e9c896432ee81cee131965013e67d569f49e4017e76d9fec90a00175fd4af2cf0fd3e00ef1e76157f85506e5d33e3035d
 EBUILD binutils-2.29.1-r1.ebuild 328 BLAKE2B 1f38a6896f710e1c18ea80569f02a93814daaf0fa84b08f9762bbe002607189a8c75ddcbee978af878d5976ede247f31d84fda6c00142f5020e7d18b4b03b17c SHA512 7a08fc2878be20f311cd5cf10f59035f17869da5f59822a73c55da3c134a9dffdc57de855f7392b396dfe3a526c1dc4ff60d3202466b6e9c2d26e1cd18a48289
-EBUILD binutils-9999.ebuild 10747 BLAKE2B 4a45c17c7462dc5ff6898df8b4422d12d9c522fbf00dd77f023790d9be9c33d9aed4f171ac1952c993b3d27d14801fec962d024684580ae88d34afc57e09d2f4 SHA512 647674e10ffd4482e9baf0e7cee69db1210b66b9da0bdafabc61e4541bcc7b833de4aa4e78b4aff44747c0926d2ab7a24acd18598fb6573de0d9b1b3053c1b2b
+EBUILD binutils-9999.ebuild 10246 BLAKE2B c5d159a6fe57e25afd0c0bd8a9c95e9a43e3a9b7fd50bbce162deacf90cf5d25d8809d5c1da0a1cc054e3a410ddcac9d6847f3a3fa66d3d8210e78db78f1f570 SHA512 797c978fa7391631c664a3192ab92beeb139c242ef278150b20e4652c709059bc6f120891c7505a3bfffae88523e035476172fc76c143f6dd61ff225def1aeb4
 MISC metadata.xml 447 BLAKE2B 78d0b6e0a34f19d0f90f568fb84fcddbc995eb2c64f9c4feef2545d49322311fc6825b3b208dc03718bd75d550581efbdc9ee26e7f7a6f856902e640f90bf0f5 SHA512 73cb18db3a677767a78d5cab44ca721083ef17b4a158c10a66a186835b57a3d763b6f6753c836620b32ec912834ae8da2148c8fa0e4932170956b92c75169a9d
diff --git a/sys-devel/binutils/binutils-9999.ebuild b/sys-devel/binutils/binutils-9999.ebuild
index 16b853f51c7e..cef3720ff2ca 100644
--- a/sys-devel/binutils/binutils-9999.ebuild
+++ b/sys-devel/binutils/binutils-9999.ebuild
@@ -7,8 +7,8 @@ inherit eutils libtool flag-o-matic gnuconfig multilib versionator
 
 DESCRIPTION="Tools necessary to build programs"
 HOMEPAGE="https://sourceware.org/binutils/"
-LICENSE="|| ( GPL-3 LGPL-3 )"
-IUSE="cxx multitarget nls static-libs test"
+LICENSE="GPL-3+"
+IUSE="+cxx doc multitarget +nls static-libs test"
 
 # Variables that can be set here:
 # PATCH_VER          - the patchset version
@@ -62,6 +62,7 @@ RDEPEND="
 	sys-libs/zlib
 "
 DEPEND="${RDEPEND}
+	doc? ( sys-apps/texinfo )
 	test? ( dev-util/dejagnu )
 	nls? ( sys-devel/gettext )
 	sys-devel/flex
@@ -86,12 +87,11 @@ src_unpack() {
 			;;
 	esac
 	mkdir -p "${MY_BUILDDIR}"
-	[[ -d ${WORKDIR}/patch ]] && mkdir "${WORKDIR}"/patch/skip
 }
 
 src_prepare() {
 	if [[ ! -z ${PATCH_VER} ]] ; then
-		elog "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
+		einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
 		eapply "${WORKDIR}/patch"/*.patch
 	fi
 
@@ -132,7 +132,6 @@ src_prepare() {
 	elibtoolize --portage --no-uclibc
 }
 
-# Intended for ebuilds to override to set their own versioning information.
 toolchain-binutils_bugurl() {
 	printf "https://bugs.gentoo.org/"
 }
@@ -219,6 +218,7 @@ src_configure() {
 		--enable-obsolete
 		--enable-shared
 		--enable-threads
+		--enable-default-hash-style=gnu
 		# Newer versions (>=2.27) offer a configure flag now.
 		--enable-relro
 		# Newer versions (>=2.24) make this an explicit option. #497268
@@ -237,13 +237,8 @@ src_configure() {
 	echo ./configure "${myconf[@]}"
 	"${S}"/configure "${myconf[@]}" || die
 
-	# Prevent makeinfo from running in releases.  It may not always be
-	# installed, and older binutils may fail with newer texinfo.
-	# Besides, we never patch the doc files anyways, so regenerating
-	# in the first place is useless. #193364
-	# For older versions, it means we don't get any info pages at all.
-	# Oh well, tough luck. #294617
-	if [[ -e ${S}/gas/doc/as.info ]] || ! version_is_at_least 2.24 ; then
+	# Prevent makeinfo from running if doc is unset.
+	if ! use doc ; then
 		sed -i \
 			-e '/^MAKEINFO/s:=.*:= true:' \
 			Makefile || die
@@ -254,9 +249,8 @@ src_compile() {
 	cd "${MY_BUILDDIR}"
 	emake all
 
-	# only build info pages if we user wants them, and if
-	# we have makeinfo (may not exist when we bootstrap)
-	if type -p makeinfo > /dev/null ; then
+	# only build info pages if the user wants them
+	if use doc ; then
 		emake info
 	fi
 
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index b5a4d00454a6..1eb845937459 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/btrfsmaintenance/Manifest b/sys-fs/btrfsmaintenance/Manifest
index 0ea6f9af03df..b18cbc8520e9 100644
--- a/sys-fs/btrfsmaintenance/Manifest
+++ b/sys-fs/btrfsmaintenance/Manifest
@@ -1,3 +1,5 @@
 DIST btrfsmaintenance-0.3.1.tar.gz 19698 BLAKE2B f792d7e55dd738b4be2f18aa4047c8b2c092244b71c50e32cf881a7862b14a2d897a170515388fcee40a89763c4c91d357ca3ceb559e372ca3c673d0b1d3aec2 SHA512 89be6da3d6bb3f85f645ac899f173d19cb787e938dd2fc91be16b3202a6784ca33dc4a4d9f9ee78ac6a96468dbaa4f4dc7a2f2e6998d550ea44d7af24198dbfb
+DIST btrfsmaintenance-0.4.tar.gz 21622 BLAKE2B 844d467b7712093370c1d6391e26d5046deb84cee6fd60b5774743415c75ad00a1e27c0be21004c260680b72b5615dcfd01b84f1eba3d57f7c9c5d22b6750d8d SHA512 2d19e82c03b291d157dc5f763dcb094330fd1a4aaee6215dbe576a5da44f71f4adee55fd06c60409e4699ac671d2fc73628f202f4f68270910eeba782f0ad153
 EBUILD btrfsmaintenance-0.3.1.ebuild 1381 BLAKE2B c3dcf441fb735792133f6dca9a5bdf5d2cb76d03fc46540a2ac87ea0211b83027249706c6eb55494aaab223ac222c0e3dfd65d09cfa169c37b950436daa46a59 SHA512 f681469cc0db852d21625736f3ecca7cd745c2dae6ef3d2d1b7ca1a4cf51645e904346ab18ce0d19abcd5b372aa40d42822629c9e113dd7fee856e7481b5c2c6
-MISC metadata.xml 454 BLAKE2B 944720aeb7738b0eba992a1800cd7ed7dfb359cad9e71bdef39161a8d9f6f9ba5306d8574c81216ea0f88a2a92ff8e9b85619bc24d7ad021e5da6d7752b9e98d SHA512 d23ea714ccb28d7f7266fc12c89bafb4b673025e285d1ca6faddaf74b99b39f54aefb043848e2812db5c28ef950ff86ba075d1afac51c0ce23c8c7c9691eb96e
+EBUILD btrfsmaintenance-0.4.ebuild 2054 BLAKE2B 8fdfc67a107f525d827226b556684c3d6ee461b1c412a8c662571991ef9373e1a6c72dd1b86da7e340176b42a54bb1bd25b0b67235a0cd8ab570541c143e755e SHA512 1d84d447b4eb7a47a695b6b8458da137f356779297c65be0ca82b81445c69f1a2a49fe5e3d7df9dce8f82bd75d50fe08086e5de0e07d2fd577e93923162e0ab9
+MISC metadata.xml 564 BLAKE2B a54366a1b7a22e5b6f7ba8814ebcc75e4fb6185a5ce49f021bc2dec51277f31f82cafd4cf2de29918b97aa9276485bdc0dcf42d21e65d71636d3ab6ea4bf78da SHA512 6affb15730bb1ec7d8601c46ac5ea9f48b603d36825b364831459025764080641f51644af6c838d0e6de9edca766236662d068ee5893ba811687c4a1d7585bdc
diff --git a/sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.ebuild b/sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.ebuild
new file mode 100644
index 000000000000..8c4208008be5
--- /dev/null
+++ b/sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd
+
+DESCRIPTION="Scripts for btrfs maintenance tasks like periodic scrub, balance, trim or defrag"
+HOMEPAGE="https://github.com/kdave/btrfsmaintenance"
+SRC_URI="https://github.com/kdave/btrfsmaintenance/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="systemd"
+
+RDEPEND="systemd? ( sys-apps/systemd )
+	sys-fs/btrfs-progs
+	virtual/cron"
+
+src_prepare() {
+	# Fix config path into watching service
+	sed -i 's%/etc/sysconfig/btrfsmaintenance%/etc/default/btrfsmaintenance%g' btrfsmaintenance-refresh.* || \
+		die "Unable to patch btrfsmaintenance-refresh.*"
+	default
+}
+
+src_install() {
+	dodoc README.md CONTRIBUTING.md btrfsmaintenance.changes
+	insinto /etc/default
+	newins sysconfig.btrfsmaintenance btrfsmaintenance
+	insinto /usr/share/btrfsmaintenance
+	doins btrfsmaintenance-functions
+	exeinto /usr/share/btrfsmaintenance
+	doexe btrfs*.sh
+	systemd_dounit *.service
+	systemd_dounit *.timer
+	systemd_dounit *.path
+}
+
+pkg_postinst() {
+	elog "Installing default btrfsmaintenance scripts"
+	if use systemd; then
+		"${EROOT%/}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh systemd-timer || die
+	else
+		"${EROOT%/}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh || die
+	fi
+	elog "Now edit cron periods and mount points in /etc/default/btrfsmaintenance "
+	elog "then run /usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh to"
+	elog "update cron symlinks or run"
+	elog "/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh systemd-timer"
+	elog "to update systemd timers."
+	elog "You can also enable btrfsmaintenance-refresh.path service in order to"
+	elog "monitor the config files changes and update systemd timers accordly."
+}
+
+pkg_prerm() {
+	if [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		elog "Removing symlinks from btrfsmaintenance cron tasks"
+		"${EROOT%/}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh uninstall || die
+	fi
+}
diff --git a/sys-fs/btrfsmaintenance/metadata.xml b/sys-fs/btrfsmaintenance/metadata.xml
index 1aba136c2736..46342cb51b38 100644
--- a/sys-fs/btrfsmaintenance/metadata.xml
+++ b/sys-fs/btrfsmaintenance/metadata.xml
@@ -12,4 +12,9 @@
 	<upstream>
 		<remote-id type="github">kdave/btrfsmaintenance</remote-id>
 	</upstream>
+	<use>
+		<flag name="systemd">
+			Enable systemd services and timers instead of cron timers
+		</flag>
+	</use>
 </pkgmetadata>
diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest
index 4cf1b56f781e..f1f546f6ab35 100644
--- a/sys-fs/eudev/Manifest
+++ b/sys-fs/eudev/Manifest
@@ -6,7 +6,7 @@ DIST eudev-3.2.4.tar.gz 1856432 BLAKE2B 2382a8052033a93f54750dfcdba0624bbf506112
 DIST eudev-3.2.5.tar.gz 1856958 BLAKE2B 8ca5706a91395ffa38c9bc552df874c1521d18103a6568bcf82d0664a20f8e38b58b67a74798f9f0c10a5adc99a7524318055b79dc2e360aee684c2a2a5983a4 SHA512 f73efde0d2dafcf79be4ebe9f6e6abb44329ea4ae45ccc4d9662c1d5ca6f4d45c27ca0b3135d7fa85f305bf7c5825dc1000079eb93fe7179c36a229fe63e372c
 EBUILD eudev-3.1.5.ebuild 7324 BLAKE2B ae82567bb7d926edf0bbdcbd50493e3de3ee602058ca78624ef6c98209265d990fea4f6a7533b2a506f603e999edb99ec7ca4fdbd37b021271d6936294fd29c1 SHA512 caba559c00546389c4a8ae0cd62cd1926877939d89b97060e175e8bfc7ba3bc2d081e8400a34bf830a269d8a1102a2a56e00b19e2b23b75b98347fdcbec4908f
 EBUILD eudev-3.2.4.ebuild 7374 BLAKE2B 62476242231ed8d6a037f232417ef7d6cdac5917ce6b22ee15b9acc14b4b6dbaf7c274359cbd5d41e575cc5ab7e8ad74b94415e31104f292881a1f94b490d45d SHA512 1953a761499144642ef49552116d66aff1fdb2aeb56d86c8dcf9118040f0f2ecd160666ffe3281288a812228433b0f4c58c19be70cf9b2eca871d6fd627b95bd
-EBUILD eudev-3.2.5.ebuild 7314 BLAKE2B b0c0630ae1029c611536d4a7eeb928171f4175308f275ac16c42bba6241421a2101bca64ac80bf45050f4b7a7fee6078fc93a117ae73e03818e3935f7b927a54 SHA512 bba81dcce7562500933c7836a951ce1f7a71a7755b106c604189938b782697a837fd7d712cc5a0bedacb0eab6d260728a6a109c6a8876e48d4d4541341d34fef
+EBUILD eudev-3.2.5.ebuild 7312 BLAKE2B 03134141340e1fe93969d4e9ec7088fa8257fbcf15e284013e869bcd30ef655df02f9a1b6d15a2d7c750ccc5bb3a031cdfa97ddf35e2e7ae88c68dcd6e669a2e SHA512 71b63d44bf993ad8b1df9f1c18a877293c6307fe1d4b811aeaba3ab1524b17c8a81d1722f5bdf0d68c765c041e1d546b21d668e1af8bf6e22fc2eb16c4e54c42
 EBUILD eudev-4.9999.ebuild 6604 BLAKE2B a3156ec55b873be29ca371162f89d92e5be23fd72eb7bcf1fd968c5ce4cb622155fe7da3e0dde47b085b840dcbc536a6afe65f66f37b04c904e4b955ab69415f SHA512 c5b231b5dc6406255b38e67e99b054e429f5c482614eb905f9a9c0c03af9c7107c30c29850f0a2566e6731f4d206e957b4d714ef59739c60835e80a0b6a3e4fd
 EBUILD eudev-9999.ebuild 7314 BLAKE2B b0c0630ae1029c611536d4a7eeb928171f4175308f275ac16c42bba6241421a2101bca64ac80bf45050f4b7a7fee6078fc93a117ae73e03818e3935f7b927a54 SHA512 bba81dcce7562500933c7836a951ce1f7a71a7755b106c604189938b782697a837fd7d712cc5a0bedacb0eab6d260728a6a109c6a8876e48d4d4541341d34fef
 MISC metadata.xml 858 BLAKE2B dda0b6f29e9bce44b437db2236a94db9924c1e0999bcd68833ffae35fb6b390cfe0b6373d2e66d45eaa78059a89e9824f14c8ec775d085f51aa2b9ee7eb80a42 SHA512 bfffbea2229a0beabe8e979857b9f9761ade64faa0fc421a5f4d8ec1030aed60cce1505ff7d964f0128220773865d7f564db746fee1d68e611851c73406d1a79
diff --git a/sys-fs/eudev/eudev-3.2.5.ebuild b/sys-fs/eudev/eudev-3.2.5.ebuild
index a864deb766cc..f252b3f01e7f 100644
--- a/sys-fs/eudev/eudev-3.2.5.ebuild
+++ b/sys-fs/eudev/eudev-3.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 fi
 
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 9e7537122730..63f4b14b0939 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -14,6 +14,6 @@ EBUILD udev-225-r1.ebuild 13566 BLAKE2B 9aba88a7a7edcd0b2f63f590f84af713df2b2bbb
 EBUILD udev-233.ebuild 13034 BLAKE2B ab219baa2baa309e5b0598bbc1fc9a11d8dfb110e100dc8bf9e63c894df62c217a4ebaf9c2a28d67ce0f61d90c64fe476c3c5c4ba25b52decef9d47d4d72001a SHA512 6382221804b758022770ef3643720bd6780722790d408506fc4357132dc052e2061180ccef904da59302c464d9383de305b01f47835fef33dea5869f75a54d8a
 EBUILD udev-234-r1.ebuild 9990 BLAKE2B 8759bf272f1f7d2e03692049c11d9cbf106e0169c36b5125f8bf342af00133c70c5ecf88bf10bd1edfecddbc3c5075c7149903d5211c956277d7920191275688 SHA512 347f2941145237bc9732ad94074e5a6be432b15466ef2af4f82110a9314dbd9c6d69d391d8181ca66e9b13998466d9a609d03886e5afb5e250ad0323aaa65ec9
 EBUILD udev-235.ebuild 9988 BLAKE2B 275ed1ba897951832d3bcd566aed8c3762002736444fcd808b71c11cdadb194ab59da7df31af42092f474eeba2ae47f87cf8d68ed1c09117990c0bdfeda7fbaf SHA512 8a6fc0f42ccba3f0cbf808d1bf4c2d725347781f156fb36fe39057573f35e8d2a5c01fc091e2a5fc2a9a49ba78b4c86f6fec164ffd4d9d153092c3dfdc46c76f
-EBUILD udev-236.ebuild 9986 BLAKE2B 70f0639d812d5b80e11ac39e39b0f3df525111d043107bbfeb9dd31a97d0fe0253c23e8a109b2794a41bd61093b3d21dcb0a94e7c340a461777e3ec51c3f561f SHA512 e3e5f17d0dbc479b52b64a4abad8dca63a4670399759ae2da50bda52edf84b3abee2d265a890d5869d0a67201f1db0da8083f57cb3b33135444d53a600440641
-EBUILD udev-9999.ebuild 9988 BLAKE2B 1e5bd0e56d880773cf8737a7fb10601daaa49b32d22d4471d135e3048231d976dffb6e8eeb2e6a50ce26c7f5888b3f22e20b388168845e115226a766f57a7852 SHA512 0e2378f4f690be31c6091ec74b015269b32a42191d06a28d4b664bc08686e057089dc786a6bee5bd0779374cb0caf326527bcd5f95bfd951df72c3c3296ebb32
+EBUILD udev-236.ebuild 10021 BLAKE2B 433f4bf443b6e8add993f98c47c3b2b1b8afaca366d66e268a5be743b8a7842ac342688cc43007959d40cef1b35d6fcabf67b8466b40ddd98f3403ab74e8fcb2 SHA512 67506a5dbd607b781bbe6c3ae18b43695ab375fb37e9b529b5c039837104bb3abe71c7dc1115d3869a0456f344f563216fee9b40c5a9d1be6b3024bb0054e945
+EBUILD udev-9999.ebuild 10024 BLAKE2B 73f00f31b7feb9c33095c3617bbf6281dcebb97ad208b5636510069e17e91395d544fbe76ebb193f16c7ac38d29d54bd430fb3624b081bcb52beca62521b88d9 SHA512 7bee9649aca3f8d32b85c245f4dee1d14b566a6d58b3c05427c819083a381ceea64374c0a97e536a48acfd388e7b93f6ba62b5d7cdfb7b60a1c1d53aef396865
 MISC metadata.xml 680 BLAKE2B 3f6b21eff391977d69921da6eeb7f48ae6c706dd856e12c4b0126f0db4ced358925374bed23d950d957a58b5447e087ad98301aa1f75dd140a1cd816ef1d2426 SHA512 2e90cdfb013904211fba8404c6b96ad940dfaea05eebe7592e3fa185dec9b16b738cc7661fd466990788accf8c261a596bcb08477e879e0e18fcc91cdce65c5e
diff --git a/sys-fs/udev/udev-236.ebuild b/sys-fs/udev/udev-236.ebuild
index 0bc6698ce506..614a5e9f08ae 100644
--- a/sys-fs/udev/udev-236.ebuild
+++ b/sys-fs/udev/udev-236.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
 fi
 
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
@@ -195,6 +195,7 @@ multilib_src_install_all() {
 
 	insinto /etc/udev
 	doins src/udev/udev.conf
+	keepdir /etc/udev/{hwdb.d,rules.d}
 
 	insinto /lib/systemd/network
 	doins network/99-default.link
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index ec6201a5a68d..fcbf552175c1 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -195,6 +195,7 @@ multilib_src_install_all() {
 
 	insinto /etc/udev
 	doins src/udev/udev.conf
+	keepdir /etc/udev/{hwdb.d,rules.d}
 
 	insinto /lib/systemd/network
 	doins network/99-default.link
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 655e99f514cb..61579411d941 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/aufs-sources/Manifest b/sys-kernel/aufs-sources/Manifest
index 3648728b596a..39b4d716206a 100644
--- a/sys-kernel/aufs-sources/Manifest
+++ b/sys-kernel/aufs-sources/Manifest
@@ -42,6 +42,12 @@ DIST genpatches-4.14-17.extras.tar.xz 17480 BLAKE2B 7cf764e9bf306b116a1e1a503f58
 DIST genpatches-4.14-18.base.tar.xz 411104 BLAKE2B 47dd66b96c07d0cbed88b2f661df3929ab534af4bc509c00ef1b65b2b183b5c427b990458ebd6eaf0b1853a817525a573efdfcbb21704a54153c3aa872f25d99 SHA512 26d28354611fca415e61e3634452b8d05fdda726c894bcad459fec1420c639fc632e389769ec24573bf61c48635fee641c53883e9e4cba64a1e7dd5dad9ab54d
 DIST genpatches-4.14-18.experimental.tar.xz 5184 BLAKE2B 059cedd0277ccace3fd1a4f420699ef78857ffd14667121584a996b185f62a6fb238d55dc859e134fe06fab7e914b10a4999fb64c4b264cc94a8281c45ee368f SHA512 6f525de7eabcde119d898a68ebe76ddf3d51de3b8f0998279a4bd34f6b4a4794faa246ea97ae8868124a47bc12138dc18ca79952a565656b8092bf60c6ca1703
 DIST genpatches-4.14-18.extras.tar.xz 17500 BLAKE2B c858ab443c96384fed01154b3665b527aa3a8f42529b943cd7d6711545da5c7f5b6601382b505a83187118f3850c638d602f2c3d397ddc5c156983ee3f7894a5 SHA512 da1d13c7cc9e5a1346e8af4bbf9523ab704b767de799ea1a74e11170ae55fb1b4bda59d1b8da607b3de0015d2cb860729d381be29df5f2de847d9034235b9e9a
+DIST genpatches-4.14-19.base.tar.xz 452160 BLAKE2B 17ea7d41932b27feb9d83d7f7e620ba681b7051d25d32ff8dc6fbaac3642473737c89ffe33564c0a5bf2cfa15ffea31fe1abd4748874a6db53bf2a6f3b457693 SHA512 7263397dbbcc508ba4242c48ad470cf34ff94e69c143cd0f0f1142a7f07dd44517620c19fcdfb6e239091c112a877c5abec5f6b4ddeb668d4054ed7204838126
+DIST genpatches-4.14-19.experimental.tar.xz 5180 BLAKE2B 5f38d5116ca27f91d4e370d5bd78efc1dc85a715cb8329cc0d19e762b6ae395b7e261b1835d5c3c69ff10457ea69ca0fe2b993c1d5ae0c161f47ec1686af998b SHA512 d60a0ed5bdb7dcd92a7e99d507d9cdd45443ac0b3e2b6cfd16d31d192120a1a8a32215041ca040ca2838978ec6ca6a8f309859a2519fd2fe305d49d1761a177b
+DIST genpatches-4.14-19.extras.tar.xz 17480 BLAKE2B e214124df420df163c22a8d904a7fff2f1b672e1f86bc259d8ddebfc374489789fa547e4bdaacc80eac2080106c84a56fbb0a418fbcebc5266a5d9b1b4f711ea SHA512 8e06e3e692c575e08c5ab8e9f3883e7f82b436cc3d2cdcb79b0e10689acb621f58a33ca7ad582fa6f14fc8545343a7d04219a845dfbb249539d10dddbde5b8be
+DIST genpatches-4.14-20.base.tar.xz 480536 BLAKE2B de076ea8dfcec740a606a347c1ea52d723ed1d80cccc9156bc31cbda4814af03bf7c6711f01e479bb2c88a37f83fc53db17700c6e2f1d79f3fde8ca5f0f8f1aa SHA512 5744952e167b94607690e83ccad17a0851763647365d16811f6cc59f64020da3c19436f58c1bb19e3790baa082eaedad2826d04a9da9cf340d89ad7b3064fafb
+DIST genpatches-4.14-20.experimental.tar.xz 5180 BLAKE2B d8482323b0d5ef996d3e6830ff6e88c6d1e19f722108affbceab8bbc032e64363a4c9f470ed64a353bbacb1dd08dee007634e868f072f2329f2e2c612e84e2ec SHA512 5187fcf6b730ee81e3afba9caa1b8f3c8873c5e59243f4b5006fb3f5b821577425b04cef90658be77cad7ca60bc8e1c56ec39e271f9b543e9e63b93994475f63
+DIST genpatches-4.14-20.extras.tar.xz 17492 BLAKE2B 9540c0fbc4c6f824a235fe80a3ba3ccdbd274eaf65db74d748057da8146004f0391a8fef75bc2a0ae79d17535320840e5bee91afef4b567e0c972952a20f1482 SHA512 12e435f75c8907c985bcce2bc5b572385e905a8970712f53e85616c3b61a9c4f1567a4b7662758c537a2f533078a2dbb7f723b96c5bc9b61931d644d04833032
 DIST genpatches-4.4-107.base.tar.xz 1587988 BLAKE2B 827d3ae42c0fc412c165568edaf1f8550bf828d7e2edb7c5abd3013a2b639dbeb68d2e3a9656e2995baee07c7619695918e654174528ce3eebc8a891715bc636 SHA512 1fffc6d7b2c186c87c8b343d4bf5fcf94086dae9f4e70b2965f5dc8c18ff4753d417074ec4ad7deca29ff597a6e5d0cfca4bf325609596678febea5ac2f5ea24
 DIST genpatches-4.4-107.experimental.tar.xz 87776 BLAKE2B b239fcc9ee1d0344a9fac8b6ae8e712bdf97df7547a2d3d1d6b39ea23f50d8836ae8fac3bfffcc401b3af52dd333b2b2b1e1626fb739da608d247be5fc67dbf3 SHA512 49e0cbc980cfafc7992d92e0bd2dd07d594ec39b9ba0bae27dd915eaffbd78c5af6d3d47847a98ee9a619447b3b220faf0c44484dc99088609ff8053f3c5d907
 DIST genpatches-4.4-107.extras.tar.xz 16468 BLAKE2B 1ece602969ead12faab3e0e5d5703a75c737a18efe873d5bdda71ff134387f5760a76105262270543b4a0e882a9b5434905b3846bd68cc3af5bc1b0383122cd2 SHA512 0843f4cc2cb2b3219f7e1343d68062a9c86f08c51c67a801f82c7685c8c0eb92ea32841a8a6d4bb8da9fc9882eeb965bc66317d7c14e7a5ffbb58214f962dc35
@@ -66,6 +72,15 @@ DIST genpatches-4.4-113.extras.tar.xz 16452 BLAKE2B 62ece17a3e3379c9e05747bb2e8e
 DIST genpatches-4.4-114.base.tar.xz 1691888 BLAKE2B e7529003017105d3cda92a43feb7b4b268a2c64b32897726301f7e4ade81a2e697aab026fc6bf6d180da275e56dbe2af892d4794fad57bc5fb97e5cba0bceb6d SHA512 1352f96e9312fbadce7f3812a7b0040971d332db3d00fcd71d779b354e912009916841dd5cf6fbf594b666d3bf91603d6bbfc7f6736d10ee8b5da4e6565b30e3
 DIST genpatches-4.4-114.experimental.tar.xz 87792 BLAKE2B 13ad2e5a81d258ba0f84ce63318f8fa5ad2f02d5a2cc5ef47297a0e972e7a8b16546a82fc439cec1ce2308339c7be74db3b77bc1a77ec04ec6b44a3aef113009 SHA512 1255439ece64b36fd43a2e3d2539fd0d1e00ae3b409c9a8c970ae93d3d9e5783472f36ce637a122c0f2934255ad1cba2a22d0ff7ce6d5e5ca09d49762b5c0adc
 DIST genpatches-4.4-114.extras.tar.xz 16452 BLAKE2B d5afae8366b23a9c55db13e6e266184c3dd72c73c51d536e19fa317a1c613f03b371769579f7a0774bf484093c4ebf4907d6feb8404efe09919b5a6c9dae54d1 SHA512 a1c96aa2eebcba9d657de90abdce15a438d3584ddc4a55a27e39fcef1f19f89bfba59b6653ccb7d3c8607269494ffea9cbc383c7c40a7c4937a7db560b82ace5
+DIST genpatches-4.4-115.base.tar.xz 1692684 BLAKE2B 8595bbb40d0f0172e5b6f5266d89b3aa67fad3889375c3925a39e01ccccf9dd03e86f934d8d3c0bd93bab58ceee274277aaac4051d09f2edf665c106f2c0e29d SHA512 43dac11a37c6cbef7a4070336bda44beb2d5a9a649188d188e37c4654ce94a71244a7e87652368da5a0f88dc53ad5c8d6194ad614c4033d08295debab0c90eca
+DIST genpatches-4.4-115.experimental.tar.xz 87744 BLAKE2B dc8a9f9ae6e6789e7c072e5c6dfa0e875765d77ffb746060f65cd708124f81f8a269a54ec6bd6f9bd159d0cd5d0d9dabd6ad9489ff5453e01c264b0f34153300 SHA512 e82343f1d4220ecab61503c7cefae9d5d9cd605187f4861eac21f330c39af77e90950badf1896a8fefee57133496f706e2b1905eee1d8c6cf945e77ed3b36094
+DIST genpatches-4.4-115.extras.tar.xz 16456 BLAKE2B 3c854f5619d349eb7b20b8f92787564019769884c28cf8bd3191686e3fc8f5c764ebc3a3c99d3ea7290aab316b8a0a0728a4f679196b80b524943c503fef6705 SHA512 84d76421f1e3d3041ab18a2a6a019b571c1a6f27d2fc880da64ae11398c43e5eab79c538940df82aa02d697983a97145197b127613bb7f4765a26813cc36eacf
+DIST genpatches-4.4-116.base.tar.xz 1719772 BLAKE2B 163d9b1341012e443264a43a9030e70e4aebdcc871f44c8eae0b2e956712c302ca0c00682d3299f55d7c34148d62323bb6919cc3bd72a130798f984bcedcf94f SHA512 077f7c50b7e01e3f5e4b0fda0d377547f27b000ee84f8d66cc92e990441ecce603bded93e1d40c7cead49f4fd0325d6a055d017898fe8b07dff608c5dbeb6924
+DIST genpatches-4.4-116.experimental.tar.xz 87796 BLAKE2B 119464d5722a2173d694b4f502a086778e44aad495121b4e7e68c113ba0603fd28a5d6e90b0c311c1d35ea668aabeae8828c3093fac3899e122a206815b8c6e7 SHA512 3643dc9b48d4ed2dbc6ed6ae9c56b830a66a5c22e7e9676e7b807e297e78c5ee92c726342e004b1a140518c897cdc7d430bfea40c7d789317666dada3fff2582
+DIST genpatches-4.4-116.extras.tar.xz 16452 BLAKE2B 6a7b47b5d1f1b281c8b2bee1b9c4ba8b58c23d460613c0585157903aa502322210fc206abb003c3cdc2b17dc2c5b8c24dc8e0fb257df67fa7403c0499fd34910 SHA512 c1a4b08388c907faf7a49112095d5420991750bb725d459fe3d77074806a93bbfa2ab668e4f5ff661c469e5b63ee755fd2912c4af3514a9e39e1002a4763bb7b
+DIST genpatches-4.4-117.base.tar.xz 1734428 BLAKE2B f7d891e1d0e5d9273d495ad42b1cdb72730d56ee1a572e44abd35a62f38b71aa8b78adfaa1537636bf0ce73e634f56d419856805498168b85c0fa40ac97a7b00 SHA512 a351549239b85ccf432832d1fabd2be2403096b41eb8ed1dd21d92246c24ae7d0ec6f70570348ec61e01533105664d0f9d85b9e74d317bc368e72c4ef73ed412
+DIST genpatches-4.4-117.experimental.tar.xz 87768 BLAKE2B ddcc6fdcfd688f957ac8e144739910fcb2c27c1d81ad2c7266878f559166baf5bdea28ee39a9d4e89907e3384028cee7b29cc5d72ab996574a18a9c8c6695f69 SHA512 0daee9a3eb93beefcd86d5c5140a18c1f9101dd12946e60be61e53f8eee17b2d30262df5c9e2a6615ab7574092741f3833351a865f842e4d2d2a88d32b7450e6
+DIST genpatches-4.4-117.extras.tar.xz 16452 BLAKE2B 9e482d457abb019663d022a8c2971883a1b90b0c155e6bd54ad99f85909d3f19d7476b7dd69543cb820290e59c72780f33b51b863a32987713fb70feaf03b2d8 SHA512 d27658290e685637a6afc2c6bd85fe872c10a75bc9fcf34ea288b66d9c7dee14d7b997b75530f292c799ebefd168c5e54a2447f60ab9c46c39b59c83a79abdf6
 DIST genpatches-4.4-91.base.tar.xz 1428436 BLAKE2B 4b706e9682e883dd1954632efe5ec161347432a6260c353e160b8591f8377e6d1e1768acd2e3e72237e3ea6b7104137e3504e3f290fb12b0dabf662b0fb034c1 SHA512 cdddd25be04b33558f7ebcee66df992aae38f29181474ebed82958d4d50639097b4a82eaf256d7b3576bfcd0cd3fe7682956e1d2cdbdb912d47fe86205d9b554
 DIST genpatches-4.4-91.experimental.tar.xz 87760 BLAKE2B d8a165fb3708192a12e826a713e896ca83785da084c9a9aeaae909473c598669867fa303636d762facd2d7bc1a857da3ba0d994ee62d008dc17955dd84181942 SHA512 0bbc83e076d45da1d0258bfd7f6acf6170e99891a9a857b2552f3a0fcefff4f318a8c5c8779591b0bb654760f905530de18723f2ba960618eae59a1b7219c28f
 DIST genpatches-4.4-91.extras.tar.xz 16468 BLAKE2B b99298cd9e57a2b8a0619495df0450373c9f5c14ff2398d76534c7167f3a563c05e67f9aff80ff97a474ae7a8cb298a4ffbc5eab25d79075aac5cc01964c3e9d SHA512 229922945fcb882a0cb7dcba8bac9de51683690462a8df59e181a03d702fcb1c9b54078c5434624b4a197c481f0bb9b73dca58456ef5a5884a30bfd3644dfd6d
@@ -102,6 +117,15 @@ DIST genpatches-4.9-77.extras.tar.xz 17364 BLAKE2B c666be38c1f3dc02cc87324a60359
 DIST genpatches-4.9-78.base.tar.xz 1439100 BLAKE2B 83246625ab36915073ebfadc2f65fc8342c26a6cc63e4bb747d89d7effec7ffbdf732b306164365416c19d199e46d1f46d40325ece781150cfa71b3b1afa9d9a SHA512 51e9a9bab5ee92ebc5d3cd3028e2110b6e7a74b337d82c12dd8e0da06775cc0f986f1e6d49738dae5e1d9add374017b19c040ddd8298d281714a6544782001d6
 DIST genpatches-4.9-78.experimental.tar.xz 106396 BLAKE2B 64171f3f73be138e3e3270d90cfec2b59312868ff67f81db06d45456307d5efa72aa0e81d0908fe66f32ccc53de8f09b330fdba1f8790a4cdc7132f3ceeba40a SHA512 6f2d60ef1055036ccfdf2caff3eff3c0abd5d6481ef44ee6ff369748546b88cd849ad46ec8b33503e756ff2782829221dfb3abe7ac1dc56f44742cc0c0a90489
 DIST genpatches-4.9-78.extras.tar.xz 17344 BLAKE2B 846c60bc299c4617ce28b4e6b122d42f55d1ac0b73a692902453c0fb6149cda70fd5d62516a2c422cf6415f6c82ff2bb47e1abbb18bcf933132f37657498bdf8 SHA512 ad46777bee10b787100cfa5a66beff302832828db2e8cc144d9d544485e0f4e3ff66827d8ee7541d96b8b7499a508f14e62824c868033b986a641e3f414bfd3b
+DIST genpatches-4.9-79.base.tar.xz 1439664 BLAKE2B 2b4b32c798e2080e0e730c408cbae7fde31a89e59ae9291ade87d797da28173ca563fbf9306b3d4b575db11bc5eef26ab8590275802f6c925141c92a377f331b SHA512 359f6bb0e079d3ac905b682ebef7991e446c6fa0b6a88ef8422d950525a791c4055b529d154c16409cae484209a4d71283c93810f1afd01d2ac06fc20199067f
+DIST genpatches-4.9-79.experimental.tar.xz 106344 BLAKE2B e7e874e9a738f4cc1ad68c81a201e77fd8658db65788037bfbb8bb097f2f96434fc6d49b694ba607173457d3c865a212118eeb16c5188c26e31ef9c10043b20b SHA512 0d0b5da7c66a0bbf997940f91c87b7d033b8a88621d3448dfe39c7c2cf6c8483d6178b1cff499463f803e53391eb53e8dd3ee3f3008b9509e3d8f3643ab400b4
+DIST genpatches-4.9-79.extras.tar.xz 17352 BLAKE2B c194973419a011d035ccd6c5d98a90d04c2c2242f18dc950536a7dc9f505de7416047fb0893787f17023951aea59f21062d3f5a3a0d2ad3eab5127dbfb46df9c SHA512 27ff88dae9a66784d842410b0e3f02c66d748dab63fe391701624d4ca398c824819c7a9fa2dd474e62fd29bf7d8576ae4162c53b3127bccbe30a1657a2760ad2
+DIST genpatches-4.9-80.base.tar.xz 1472296 BLAKE2B 3d5a961e2b84d71df250078e223ebe7a7c3cd05093d22219813454664d3c7bd85fb332d26c0d212144a6d50607256ce4e739f35faf935b323d533de452e46ca5 SHA512 9e7b5418ffbe7515573381d054accb89fd5bef83748b21ac1cd5f2352dbbeb1f55c606eec45174ed093289098420d9c1f780b182be1650f4963499cce310e3e7
+DIST genpatches-4.9-80.experimental.tar.xz 106456 BLAKE2B 4399562800f6224722105166d24075fb53237b6eab5728b20ff368fa6080ee1d8f6845b5835adec64d5a3583bdf063e8970ff1c9f61b989de474ece88fa9d318 SHA512 03fca9e1bfbf504bc3b42cac4626701aefb36f1f8f0a10d5b7f428aa1244030f50ffc6e24101afc1a6c16d741eb56f44d33c6a2293910a13c97a97f7fb061650
+DIST genpatches-4.9-80.extras.tar.xz 17352 BLAKE2B 8e3043af0e0ccddb209bcce022cd5ddb4ca681b4c0dbdd6a3fb8767b6154ba716fadc137059a845f93a20dcfdb35b3520e6fe67a6fbf5d9018ff1d72368a2358 SHA512 5049f111e3a5ed50f150ab9e257df362f91758424f151ef4ca86c69d6382231b4b2d31262bb331dbe99e4f7c8fe8eede134f0e6dec7e13fbdedfe504f9f73488
+DIST genpatches-4.9-81.base.tar.xz 1485156 BLAKE2B 552c163be8839e6d8cf086a11b8ec8e4ea7fa89ac420c51df02fd52dcfd91008698389282b7d4f4a631ed66c30428d1c37f7ce63d0906734ee04f9a9817c4d97 SHA512 45890146343db03df4fbb51d2121a86be4c7904999d037e4852346f5db7ce5f9daa4e3fda405f21dc6df3dea8a4d3d295416162afd27344454d2022f9804872b
+DIST genpatches-4.9-81.experimental.tar.xz 106400 BLAKE2B 5b542d87b2e47c6ec666756295472aa03c8ef3a1adb28a6433c0b74ee24c32321a0980736390dbe264b2046cfaf4b04499ef940714e3ddc1fd82add51ae6fccc SHA512 e19b574b87de3735bcc03aa89e83b285913e701788ba9baed27a3a86bac119b554a65995b46f78a445767daabc269bc61b3f76880071adb3a36630f2295b795c
+DIST genpatches-4.9-81.extras.tar.xz 17356 BLAKE2B 3e26281722b92a9720a04bdc35910e558adfdb2094f908174a209d04b50fd4859bc60a6fc19b808ae85f103d7961183e74f2cc9419140a9683e78692dc040962 SHA512 37fe1b24e66825c1b63e5f78ec798dfd3350690250ba356a4c0abd3f395bdeb97604c94f90ba3934a9303adf6e983ce0739ee58dece40f1db9790ab900755ff0
 DIST linux-4.12.tar.xz 99186576 BLAKE2B 02d031c7f2f29849c06a6b5b589af78bc486a05a758267e47f2ff16844ae8ca701fff53cb859fcc105f7ea92c0769acf8d7f7cc116444c15235ef4d63cadc8c0 SHA512 8e81b41b253e63233e92948941f44c6482acb52aa3a3fd172f03a38a86f2c35b2ad4fd407acd1bc3964673eba344fe104d3a03e3ff4bf9cd1f22bd44263bd728
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5d1586f60dced772e1b1107ecf3aae0558c3e6f39c36f7d3aa1e6cd1e5c64ec9d6f2218f47b98413da6466fb SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e
@@ -116,6 +140,8 @@ EBUILD aufs-sources-4.14.11-r2.ebuild 2230 BLAKE2B 8fbe05e9c35c1cce7a895a2f1c838
 EBUILD aufs-sources-4.14.11.ebuild 2230 BLAKE2B 988b2ea132f484b17ed5657c886485f0313bbd33b4808583eb70045600ff1e281d134de8e5267a3936ac397106abfbcb790e3a0c4f8a17560187116a1b7b51ac SHA512 d84469d21a950a4e0657a382b1315f1bdc479830c56b73b01d18089dd0066e53e83ea741fa200a5d339096f3c3b955e3f63351b191185a5dcab78e2ee44ace8d
 EBUILD aufs-sources-4.14.12.ebuild 2230 BLAKE2B 390b814e79e4b5c5f628ad27b29ecfb3c660a3396c94c961332ba2665a191633a2b203cacdb3ac9540f29ba36838bdd55f95b470a555be172148a04244aa0ab6 SHA512 2829f8d6da89728d1c8bd2a1fcf2197f7b83e865c04cfd69d5872ad6af2e318fac037a844d05d58f5c7ed60bfacc6cb680db001d6b4f519fe10e83947fc0a0a5
 EBUILD aufs-sources-4.14.13.ebuild 2230 BLAKE2B c1408efc0bce553e1d8384a1afa54ffc96efe9cb14f6f8b1de3b08374d8132b12051766db7afdfd517b481a71ecf080124f9784f2ed1bfe1585ea537c141e03e SHA512 214f9f9de1b429663252606e840ad3075fef634bb1befcb8212bfe333865d610839e286e54c7f611f06d7519c8d84a4980811e89529cd302def7fe5d28bfba04
+EBUILD aufs-sources-4.14.14.ebuild 2230 BLAKE2B a204f8649c6d61cc273c944d37813362dfb6097cc0deb93d01983e2cc5134b452e9504a77283fb0332ab3b1320c10c9552fe2d6e10b8432a217caf1d9dad039b SHA512 606efabf0a767ddc3a27b620bb35c82126f349e7ad152f05ecb1d535c1bed372a88cdb136882582abc0c44b64b34bb2da4c2ef4921da1899212826b703f7c7ed
+EBUILD aufs-sources-4.14.15.ebuild 2230 BLAKE2B 5cdccbf5d439b40ab0360af7c41f053be454f17572d3e29db0bc9f0fbd94fcc3ee61a5241685d12ecfb4dacfc953497903aba5408978daca419a66d9271a4061 SHA512 98a7539ce6e31c288af1735e4716827d41102ebad486a6aba51cbfdb0003dfd62e9b7d69c845593dc0f2ca1d2da7a643def4862abf87ce203e5cad25410f65f6
 EBUILD aufs-sources-4.14.8-r1.ebuild 2230 BLAKE2B 173576704dffd0476803e7a07bad8d9670e60faa472c1f582c2a5d4a94370995350625d6dfe17740ce7984efdd0f75898e156ea2144761c22430e95014618798 SHA512 ff5f3b8e572698deb06e949e33e7226b9aa7987407035ff2407708b8e6d08b3cc04e34789fab9ab3c5a35cfb397d21f5ff8bd94a1dfd25a497ec4fecd691ff31
 EBUILD aufs-sources-4.14.9.ebuild 2230 BLAKE2B 7166b35c2e474d33df0e682dbfe318cc24dfb4c903889b1c45f93b99a9907b9eb4022560bed7b50814159b744523cf920e831856d9fdbcff18cd286a5c1136aa SHA512 aec54e61560e02bef6370d187cd0206c4e2d34f6284a4ff1645d85a47758d3d011dcb1f9e94de09cdae817bffe1563292355fd94ed99ecc3b12d91d6e46cafac
 EBUILD aufs-sources-4.4.104.ebuild 2230 BLAKE2B 7a9ca3e6cd72247427066785157924eca0cfb71a5100222bc88b36b43f9b0be69ed30df459210af4788de65c0612f4bb8d8fd9cf1f810c6b72972e8de91c5189 SHA512 e797e62f2b379585bab5c79c151819f56dab9b41a6af608615757f7731b5de8ce75dc2c0945ec797c62f1a287ed0ba50956e7adf252634c4f9e8ccf09f1c3549
@@ -125,7 +151,10 @@ EBUILD aufs-sources-4.4.107.ebuild 2230 BLAKE2B 4034cf7a029faf6fd94cb1eeb39ad99b
 EBUILD aufs-sources-4.4.108.ebuild 2230 BLAKE2B 4a756d25e750f44d724c3000efd430ed2a0fa310819b5b8bf124ad905c95df80c1f8d342f3d4df3b9b588717581cac707d047992ff48d2c0428d1b538a4ee1ff SHA512 2edaca6f44e09a0aea3692e07bd6795fadf0ae529b3fdee87f3c19fd3f38bf600fc86e42e9a4a9e69a982558e906603459149c33a8df458c9f35d836058799b6
 EBUILD aufs-sources-4.4.109.ebuild 2230 BLAKE2B d641fb38655c2f82cb846ea07a4ec908ad130f754323c312ef021680435c0c30491c143340846f77ebf29b2960faab74d4f14122b0a6ee0480f4a14e7a0fc7fd SHA512 fcd3ef7a3607e9d46f9b09f1bbe32c4e2092d6598bb10972fdd24e31cad84227b6c120c6a596593224409a5de142189e0dcc71525346afec0bd27d0e3fd914b3
 EBUILD aufs-sources-4.4.110.ebuild 2230 BLAKE2B 95fcc5389cb20696b4af97eade02c57e4fe813c9cab3d6ba72b36d9d7d61cf304cdd3e48eb954b009cc1f61ada35ec0abb150f2af08c6785e080976ddfa51e85 SHA512 f8f4a0ae3015d184db001dfef14a2c5cf8ac0ff7520b73f17bf3c41a0a558f6eff1d4b02446c8223365bcc20151c1d5efa663c2ae7437ee33bb8d63d0227dce3
+EBUILD aufs-sources-4.4.111-r1.ebuild 2230 BLAKE2B 88826920ce4a394b5c46c94e93688ee402942adedb38bc83a89289e6e06e2a67e2e3340e1dcbc9e57e105d42d7446d3a8babafeef460e04727db00af6b272bac SHA512 e41732c3c3f822c6aad493a2a727e9ad9b06ba07734b62214b953388db85f378adce14ec75de9fc0540a3c95de75fd90ffccddbfbeee9dd980eb293e513bafdc
 EBUILD aufs-sources-4.4.111.ebuild 2230 BLAKE2B 8968bf11085242aec2817ead4c7064d7b6ff04c1a433c03efe7caace53b0de19bb994996d82cfa715d66f52e8ad61e2f65e05e4d0f2233a53489d9200bdd2b82 SHA512 ff5f6e398f66a6d0f951352170285eb6d95058a98e3ab7b84c4bcc270687a69c29b035fd30093773313c9d1eafdfdf3874e7bbf2963fe93b59d2465411d85ebe
+EBUILD aufs-sources-4.4.112.ebuild 2230 BLAKE2B b8d70de99853f83b9116719162c207bd9dfe09fe3ca6c5e70021ba9adc1589acabca0c61b13a3e84b33e5db36481a4a04f1a91056b3a54691dda29888adccc6e SHA512 7a6855f063362c61216080fc72e2b2a727bf88917983e69f32f422002198a09bacf21b46b264a81f2a891e8f180443204f73299c49efee54f3b66ba04042fc29
+EBUILD aufs-sources-4.4.113.ebuild 2230 BLAKE2B f28c7d059dd81b188840ef6a67613a8cd2fdbc48183c27fa4422eb21a29b46131a839f67523ef452ecbe2a0d30645ceb93b75bf7df965f8c34a76412f80a1053 SHA512 89d69e43eb719f9650d124a492d9c38bcf5daa79f597f6183a04f7cec035449f32e59797c838c8c4336c41b7e09959b862465a35f379cc586aa1679d3b8fb051
 EBUILD aufs-sources-4.4.87-r1.ebuild 2229 BLAKE2B c833f0bdf1e89ee3f3a3258de89a4e53c1d35cd7774fd2e93e1ce0cc532f6995f4ff99d1df83de37acd82fac150fd7f305b08588e4b48727ac865b5758889381 SHA512 f6caec63aba14857d6992cc9d2edd2b6bc345c93a2ab36efe6b87e5d6412c295d64d4777bf9174a71d3fdecaa90d5af7596c66343a2b875d5be1b6d1e64971a1
 EBUILD aufs-sources-4.9.49-r1.ebuild 2229 BLAKE2B 2b551c3767df65c6008704f6e4c0beee15b26fc255e5f11f126b8f82950dee9c6797d7cf216898c3e4b50b3638fc7ffa2b77721611db325138e08cbb9cdabc70 SHA512 5c0a4dd8fce85cf8db60366e3bb8bf851310e00f02b368890e7f2cdda8ec8adc40791e77160081ac664ab86a8350d1508783f8a738a11bbe12e0c31e95d2ed9d
 EBUILD aufs-sources-4.9.67.ebuild 2229 BLAKE2B f153cc37109461ad6b3a9cf77276b89caf45cfdf72ea3206c559594aac73268706a9d01e92e7333c42a3b8602b31fe8c6c76762cf6b13581dd0ee5dd65ea8a0a SHA512 7fa142870ea13dd4c24f5afa0f60a874b9416c005ba00e4a755b10e5708dc9f348eea56097d4a44df11c52099cd0238dcfd906f90b9edd1bed3f3c2dc6fe68f9
@@ -137,5 +166,8 @@ EBUILD aufs-sources-4.9.72.ebuild 2229 BLAKE2B 3d61a3886f2714e24576fa4dea00002f5
 EBUILD aufs-sources-4.9.73.ebuild 2229 BLAKE2B 16f502f67d0c46392f526ca5b8b82dfde2546f15ae155c5b05ba954795e4378dffef6d532a29bf7d7f9a618d944836b1a99e7d5179a4e242bded1eb2a9d2bea1 SHA512 9e92aa62a7d73e478d3c0b06691b94677653b40a940a529d3e6c236c149133ad92f7946f55eb900841a4fe609b002160da7791e365b659f6053e2d08a7c0534e
 EBUILD aufs-sources-4.9.74.ebuild 2229 BLAKE2B 17a7b6d1e198b67b760a00aef12555b3cbe7b43722a4ed28e8562293f0a718681e022c32191fe089b47e757cea87ed0ae661da46e5f25cfa8c125165a3839cc8 SHA512 3a605c5e8cddb72edb3900cd450976ea19413184a0839239614e7a12fddf6d30d2d2de82e6833938b4075e45e551accbb2f78421c0848d91406aa50ff4097e63
 EBUILD aufs-sources-4.9.75.ebuild 2229 BLAKE2B 9ff408aefe8e05d2b0518fcf7545f9d76c243cabb42764e2795f1331ea61a75dcdac7cb0d5af49d42ef1a8cdd5a70ae16afb14b2b4f733920d98ca3a6a5481dc SHA512 e123d7c0db26c0c8f8d5b349fa286098bcdc395a4493094bdfa32b0652e57a30ee4b910904489018f85fb94fa3c8a09993c0a27cedf1b0fb8471686b8d0dc1e4
+EBUILD aufs-sources-4.9.76-r1.ebuild 2229 BLAKE2B 85b1d667b2d821a5af3d620f1c521a648a712b3f478af806363a395fd49b875e07cffed452016b829ae07285668d90ee3c5815f95f92891669ed27f96ee0782f SHA512 4d3cd4a437b4ff07f5702fd49a849e8a0366e3adc5e216de1b04e360900c85d268d4745ed1ae8ad6a54c7a2eaecad7e37ff606f2182a1d3ea1ee0b1d7d6ab0d6
 EBUILD aufs-sources-4.9.76.ebuild 2229 BLAKE2B 9d94d40fc813e29f986e517b247f0cf7158f4dcb1d2261e44bd972bd47e9c6405a332ac0928b66dda85d2cc0edc3ce1ea487e68b5f2cc3cd2a66940f7fa78722 SHA512 a3f09b0f91d4422255f00a4c8b3a378db79e6e9176dbb9b16259086c39e709f39403208765efbab0e3153d017eae18b2968504c4ec22a32b3642694c1b2affc8
+EBUILD aufs-sources-4.9.77.ebuild 2229 BLAKE2B f8c8f5366b34c73fac36fa260564cca9e594a384bbdeeb69b7a890cfce43b9c4d467f81c67486660d13be91b15835ac8859211a82d613ef76a777922f67433e1 SHA512 7e8e4d6d72e5cb178c18dc363998ceb32e0689344db4fb2630f29d3438b7dffd25207789d2d2f71724896e43b3aa5e5330c38bbd4df7103b5d0cbf344d19b341
+EBUILD aufs-sources-4.9.78.ebuild 2229 BLAKE2B 008093633065466d15fd74bc4bebbfb102638bf1c011d8ed05fd75cdcb0bf54a3bc6645b30112edb2cef8a7163ca6b4242a0b77c431e7f9d400ecf21f2f741fd SHA512 0ae9e17f0c2981c9223e04145328b445488175ceae1212f258b23644e5de935092f23777bdbf1ae2b9e5ffdb5fab9591552fb3b280f9262cefb9c351dbabdd7d
 MISC metadata.xml 786 BLAKE2B 4a7ec566e14be79c65ccf8f9b04db4c66ef27e0940af8d3d870a3f08d96bbc8987836100aff699d90a5564a1986c929af02b9cb00553ed3f400378ca20f41fda SHA512 95853521c2369a4bfa752be73e2e7e8e5665e790a5763c7d347da1762ac142fd6caec3e20f7d31f58c16f3a38df6dfcca63b296569b7131dcbd72eeb23e9d3ff
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.14.14.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.14.14.ebuild
new file mode 100644
index 000000000000..96a53b0e4bb5
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.14.14.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=19
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.14_p20171127
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.14.15.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.14.15.ebuild
new file mode 100644
index 000000000000..fa0cbfceb4c5
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.14.15.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=20
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.14_p20171127
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.111-r1.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.111-r1.ebuild
new file mode 100644
index 000000000000..0e73d5dcc3bc
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.4.111-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=115
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.4_p20171127
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.112.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.112.ebuild
new file mode 100644
index 000000000000..8d4bd66b5933
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.4.112.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=116
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.4_p20171127
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.113.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.113.ebuild
new file mode 100644
index 000000000000..19914acca573
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.4.113.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=117
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.4_p20171127
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.76-r1.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.76-r1.ebuild
new file mode 100644
index 000000000000..719e592e54b2
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.9.76-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=79
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.9_p20171127
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.77.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.77.ebuild
new file mode 100644
index 000000000000..243aeffe311a
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.9.77.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=80
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.9_p20171127
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.78.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.78.ebuild
new file mode 100644
index 000000000000..00d7ee1f83b0
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.9.78.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=81
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.9_p20171127
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 700d948d1142..5642cf382699 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/uclibc-ng/Manifest b/sys-libs/uclibc-ng/Manifest
index 8a02366ac841..59738335b3c6 100644
--- a/sys-libs/uclibc-ng/Manifest
+++ b/sys-libs/uclibc-ng/Manifest
@@ -2,8 +2,10 @@ AUX uclibc-compat-r1.patch 814 BLAKE2B 75fe9c5321171f3e378200e1c4d11792b3ea047fb
 DIST uClibc-ng-1.0.25.tar.bz2 2234505 BLAKE2B c1f352ca0145a473e357f2627b08905ce66d0a1630dd7d62996abc52cf6ec6f51d789fecf59158dd8b425304fab992d4f2fe7290a21966b240cab7fc75fdccd9 SHA512 3bc5e3f0626a529a688e56649b34c48d0ddf733c09279c84fad0954880aa7c0ec3440664811196d11bbc3f05cbea99f3ba47efaad7f315a55ba3d8d587d3b313
 DIST uClibc-ng-1.0.26.tar.bz2 2285709 BLAKE2B 6276f1d080f0c90b5a0ce4a4fc3556070852ad157b9c0a15305108b2f46a2d0f5371dde12ac0a8f05cad7db942cceb8057b5ef351e100a52609f2ebdc6b19634 SHA512 48c37ab2000af13848ef007ce89f226bded5188f37839c11371bab48497670d30d39fda2a031c6aff95f429a4abadc431ddd77c0e023810a341e2c2d2645f71b
 DIST uClibc-ng-1.0.27.tar.bz2 2306274 BLAKE2B 64ad0634ca548960ad3ff003d98981853b0658cad75fcf3b7391b5b965656dc15daa06ae312ca34672caa47a2a3e33fbe6291c94df10547eef5dc395c2cbd0cc SHA512 bf8f56f75465f7b793e0356df495a00a41ed2478ea90e8d686e8591dcb1bb75be27fadedd8adf2494f5053ceefa4b0ba2223758efa2a920ea0f55bf104e433a2
+DIST uClibc-ng-1.0.28.tar.bz2 2299119 BLAKE2B 1f31b9a98fd669bad42ceeb1b8c33fd65994b0252707b532ad8a71c12f8bd0c4d99bc89ad919a1fbc2526efcf25d2e9f823f889c7c009da98e861269399c97a3 SHA512 9e77fece126b6ba6f9903a2fc5689a9f7efb335e38914a3806a7e0831033f5373a4b07e942d28876ed81a6a80b2d64b0fa122dccc4874db263d2d5fb7fef99ba
 EBUILD uclibc-ng-1.0.25.ebuild 10528 BLAKE2B 008167fee3fe21e07becaebb302f9c1a389f8b38df5ae4fb3bb1b0da3ca01847380c267d32e0badca0c16f034c46f7eb894e26952b825d243490b80d2dcc0823 SHA512 5e17953c9b892a65c3c4728862841c0a5da077db212e9f2dfbaef644044150401c5e7a0aaadba83cbaf63680db1453a8555d93bbc46d9c856812d538cac17239
 EBUILD uclibc-ng-1.0.26.ebuild 10528 BLAKE2B 008167fee3fe21e07becaebb302f9c1a389f8b38df5ae4fb3bb1b0da3ca01847380c267d32e0badca0c16f034c46f7eb894e26952b825d243490b80d2dcc0823 SHA512 5e17953c9b892a65c3c4728862841c0a5da077db212e9f2dfbaef644044150401c5e7a0aaadba83cbaf63680db1453a8555d93bbc46d9c856812d538cac17239
 EBUILD uclibc-ng-1.0.27.ebuild 10526 BLAKE2B b8eebf77be2faf3b72c1d385f6d3f751216353dccc1f35c031f90da8bdece98a3c643e663ff9e825ebbfc883c792885807b3564b09a1c9104d1f9590d4db7a28 SHA512 8db3306a5bb8f34beda467f8d6cf5f1b59dcebb7c3c0c02f974d1db0eec298f54e77ef691a59a1094a58e0ef2a35abd9a33625ddfb1e9cdbe19de1182359f7bf
-EBUILD uclibc-ng-9999.ebuild 10532 BLAKE2B 1f79a8e30fe1bf18e5648b48d9702e12a7b53de04295a5af37fbf7ee1343a67d25c6ef8dc1bcb63e37b4610c4407463b40772b15ee105270749665a83e1df9a1 SHA512 a50c006c732f296283c1c16f5ddb87b28912c29201d03bca419f73e06d34c01a470ab2851293a238d55876ab5c8c2e8a75fb66058146f8f2bf25af8cca64fb2a
+EBUILD uclibc-ng-1.0.28.ebuild 10283 BLAKE2B a1c1c9ccdba9161981794837d8fabe8496e3f6259044284c6459523b61f30edc3e7d6980372d69eb8830bf54e6ffe74ea6fa112e872a46d29d800c7295a0d5d2 SHA512 6e2b12bab2783c9f7e746e389a548a50a4238c3e8f29e80b0b8f178954470fad2f5294a0e18419a10a8f5f2464ed37be283e0408ffb47fdb500b401e6ba3b3c7
+EBUILD uclibc-ng-9999.ebuild 10283 BLAKE2B a1c1c9ccdba9161981794837d8fabe8496e3f6259044284c6459523b61f30edc3e7d6980372d69eb8830bf54e6ffe74ea6fa112e872a46d29d800c7295a0d5d2 SHA512 6e2b12bab2783c9f7e746e389a548a50a4238c3e8f29e80b0b8f178954470fad2f5294a0e18419a10a8f5f2464ed37be283e0408ffb47fdb500b401e6ba3b3c7
 MISC metadata.xml 877 BLAKE2B 191277020e32edd39fc3a1594aaf3fad65ca7b48a2f0df3f0e381d3c7cc5451c09f9ad87a6da9e75b146c2ebe209918d699519582fc64fb8c3b7ae2e51eaf507 SHA512 3988e346916b283836e5c3d094eec4f25c66763e4e10a6413fe97f98629e1f14b67d6013f13f9ca2e2712dd638567973c02e6ebcce3554c55caf5483c3c9dfd4
diff --git a/sys-libs/uclibc-ng/uclibc-ng-1.0.28.ebuild b/sys-libs/uclibc-ng/uclibc-ng-1.0.28.ebuild
new file mode 100644
index 000000000000..507f8c13ae96
--- /dev/null
+++ b/sys-libs/uclibc-ng/uclibc-ng-1.0.28.ebuild
@@ -0,0 +1,401 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit flag-o-matic multilib savedconfig toolchain-funcs versionator
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://uclibc-ng.org/git/uclibc-ng"
+	inherit git-r3
+	MY_P=uclibc-ng-${PV}
+else
+	MY_P=uClibc-ng-${PV}
+fi
+
+DESCRIPTION="C library for developing embedded Linux systems"
+HOMEPAGE="https://uclibc-ng.org/"
+if [[ ${PV} != "9999" ]] ; then
+	PATCH_VER=""
+	SRC_URI="http://downloads.uclibc-ng.org/releases/${PV}/${MY_P}.tar.bz2"
+	KEYWORDS="-* ~amd64 ~arm ~mips ~ppc ~x86"
+fi
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="debug hardened iconv ipv6 symlink-compat headers-only"
+RESTRICT="strip"
+
+# 1) We can't upgrade from uclibc to uclibc-ng via a soft blocker since portage
+#    will delete the ld.so sym link prematurely and break the system. So we
+#    will hard block and give manual migration instructions.
+# 2) Currently uclibc and uclibc-ng's iconv are in bad shape.  We've been using
+#    the breakout library.  The disadvantage here is that we have to sprinkle
+#    LDFAGS=-liconv on build systems that need to link against libiconv.
+RDEPEND="
+	!!sys-libs/uclibc
+	iconv? ( dev-libs/libiconv )"
+
+S=${WORKDIR}/${MY_P}
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CHOST} == ${CTARGET} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+
+alt_build_kprefix() {
+	if [[ ${CBUILD} == ${CHOST} && ${CHOST} == ${CTARGET} ]] ; then
+		echo /usr/include
+	else
+		echo /usr/${CTARGET}/usr/include
+	fi
+}
+
+just_headers() {
+	use headers-only && is_crosscompile
+}
+
+uclibc_endian() {
+	# XXX: this wont work for a toolchain which is bi-endian, but we
+	#      dont have any such thing at the moment, so not a big deal
+	touch "${T}"/endian.s
+	$(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o
+	case $(file "${T}"/endian.o) in
+		*" MSB "*) echo "BIG";;
+		*" LSB "*) echo "LITTLE";;
+		*)         echo "NFC";;
+	esac
+	rm -f "${T}"/endian.{s,o}
+}
+
+kconfig_q_opt() {
+	local flag=$1; shift
+	case ${flag} in
+		y|n) ;;
+		*) flag=$(usex ${flag} y n) ;;
+	esac
+
+	local var="defs_${flag}"
+	eval "${var}+=( $* )"
+}
+
+get_opt() {
+	(
+	unset ${1}
+	. ${2:-"${S}"/.config}
+	echo ${!1}
+	)
+}
+
+make_oldconfig() {
+	yes "" 2>/dev/null | emake -s oldconfig >/dev/null
+}
+
+make_config() {
+	restore_config .config
+	if [ -f .config ]; then
+		make_oldconfig
+		return 0
+	else
+		ewarn "Could not locate user configfile, so we will save a default one"
+	fi
+
+	emake ARCH=$1 defconfig >/dev/null
+
+	local defs_{y,n}
+
+	# These are forced off
+	defs_n=(
+		DOASSERTS
+		DODEBUG_PT
+		HAS_NO_THREADS
+		PROPOLICE_BLOCK_ABRT
+		SSP_QUICK_CANARY
+		SUPPORT_LD_DEBUG_EARLY
+		UCLIBC_HAS_CTYPE_UNSAFE
+		UCLIBC_HAS_LOCALE
+		LDSO_SAFE_RUNPATH
+	)
+
+	# These are forced on
+	defs_y=(
+		DO_C99_MATH
+		DO_XSI_MATH
+		FORCE_SHAREABLE_TEXT_SEGMENTS
+		LDSO_GNU_HASH_SUPPORT
+		LDSO_PRELOAD_FILE_SUPPORT
+		LDSO_RUNPATH
+		LDSO_RUNPATH_OF_EXECUTABLE
+		LDSO_STANDALONE_SUPPORT
+		PROPOLICE_BLOCK_SEGV
+		PTHREADS_DEBUG_SUPPORT
+		UCLIBC_HAS_ARC4RANDOM
+		UCLIBC_HAS_BACKTRACE
+		UCLIBC_HAS_BSD_RES_CLOSE
+		UCLIBC_HAS_CONTEXT_FUNCS
+		UCLIBC_HAS_CTYPE_CHECKED
+		UCLIBC_HAS_EXTRA_COMPAT_RES_STATE
+		UCLIBC_HAS_FENV
+		UCLIBC_HAS_FOPEN_CLOSEEXEC_MODE
+		UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE
+		UCLIBC_HAS_FOPEN_LARGEFILE_MODE
+		UCLIBC_HAS_FTS
+		UCLIBC_HAS_FTW
+		UCLIBC_HAS_GETPT
+		UCLIBC_HAS_GLIBC_CUSTOM_PRINTF
+		UCLIBC_HAS_GLIBC_CUSTOM_STREAMS
+		UCLIBC_HAS_GNU_GLOB
+		UCLIBC_HAS_HEXADECIMAL_FLOATS
+		UCLIBC_HAS_LIBUTIL
+		UCLIBC_HAS_NFTW
+		UCLIBC_HAS_OBSOLETE_BSD_SIGNAL
+		UCLIBC_HAS_PRINTF_M_SPEC
+		UCLIBC_HAS_PROGRAM_INVOCATION_NAME
+		UCLIBC_HAS_RESOLVER_SUPPORT
+		UCLIBC_HAS_SHA256_CRYPT_IMPL
+		UCLIBC_HAS_SHA512_CRYPT_IMPL
+		UCLIBC_HAS_SSP
+		UCLIBC_HAS_STUBS
+		UCLIBC_HAS_SYS_ERRLIST
+		UCLIBC_HAS_SYS_SIGLIST
+		UCLIBC_HAS_THREADS_NATIVE
+		UCLIBC_HAS_TZ_FILE_READ_MANY
+		UCLIBC_HAS_UTMP
+		UCLIBC_HAS_UTMPX
+		UCLIBC_HAS_WCHAR
+		UCLIBC_HAS_WORDEXP
+		UCLIBC_NTP_LEGACY
+		UCLIBC_SUPPORT_AI_ADDRCONFIG
+		UCLIBC_SUSV2_LEGACY
+		UCLIBC_SUSV3_LEGACY
+		UCLIBC_SUSV3_LEGACY_MACROS
+		UCLIBC_SUSV4_LEGACY
+		UCLIBC_USE_NETLINK
+	)
+
+	sed -i -e '/ARCH_.*_ENDIAN/d' .config
+	kconfig_q_opt y "ARCH_WANTS_$(uclibc_endian)_ENDIAN"
+
+	kconfig_q_opt debug DODEBUG
+	kconfig_q_opt debug SUPPORT_LD_DEBUG
+	kconfig_q_opt debug UCLIBC_HAS_PROFILING
+
+	kconfig_q_opt ipv6 UCLIBC_HAS_IPV6
+
+	kconfig_q_opt hardened UCLIBC_BUILD_NOEXECSTACK
+	kconfig_q_opt hardened UCLIBC_BUILD_NOW
+	kconfig_q_opt hardened UCLIBC_BUILD_PIE
+	kconfig_q_opt hardened UCLIBC_BUILD_RELRO
+	kconfig_q_opt hardened UCLIBC_BUILD_SSP
+
+	local count def
+	for count in 1 2 ; do
+		# Run twice as some config opts depend on others being enabled first.
+		for def in ${defs_y[@]} ; do
+			sed -i -e "s|.*\<${def}\>.*set|${def}=y|g" .config
+		done
+		for def in ${defs_n[@]} ; do
+			sed -i -e "s|${def}=y|# ${def} is not set|g" .config
+		done
+		make_oldconfig
+	done
+
+	einfo "Enabled options:"
+	for def in ${defs_y[@]} ; do
+		einfo " " $(grep "^${def}=y" .config || echo "could not find ${def}")
+	done
+	einfo "Disabled options:"
+	for def in ${defs_n[@]} ; do
+		einfo " " $(grep "^# ${def} is not set" .config || echo "could not find ${def}")
+	done
+
+	# setup build and run paths
+	sed -i \
+		-e "/^CROSS_COMPILER_PREFIX/s|=.*|=\"${CTARGET}-\"|" \
+		-e "/^KERNEL_HEADERS/s|=.*|=\"$(alt_build_kprefix)\"|" \
+		-e "/^SHARED_LIB_LOADER_PREFIX/s|=.*|=\"/$(get_libdir)\"|" \
+		-e "/^DEVEL_PREFIX/s|=.*|=\"/usr\"|" \
+		-e "/^RUNTIME_PREFIX/s|=.*|=\"/\"|" \
+		-e "/^UCLIBC_EXTRA_CFLAGS/s|=.*|=\"${UCLIBC_EXTRA_CFLAGS}\"|" \
+		.config || die
+
+	make_oldconfig
+}
+
+pkg_setup() {
+	# Make sure our CHOST is a uclibc toolchain for native compiling
+	if [[ ${CHOST} == ${CTARGET} ]]; then
+		case ${CHOST} in
+			*-uclinux*|*-uclibc*) ;;
+			*) die "Use sys-devel/crossdev to build a uclibc toolchain" ;;
+		esac
+	fi
+
+	# uClibc-ng doesn't carry old Linux threads, and since we force
+	# threading our only choice is NPTL which requires i486 and later.
+	[[ ${CTARGET} == i386* ]] && die "i386 can't support Native Posix Threads (NPTL)."
+}
+
+src_prepare() {
+	local version subversion extraversion
+
+	# uclibc-ng tries to create a two sym link with ld.so,
+	# ld-uClibc.so.{0,MAJOR_VERSION} -> ld-uClibc-<version>.so
+	# where MAJOR_VERSION != 0 indicates the ABI verison.
+	# We want to get rid of this and just have ABI = 0.
+	eapply "${FILESDIR}"/uclibc-compat-r1.patch
+
+	# We need to change the major.minor.sublevel of uclibc-ng.
+	# Upstream sets MAJOR_VERSION = 1 which breaks runtime linking.
+	# If we really want the ABI bump, we'll have to hack the gcc
+	# spec file and change the '*link:' rule.
+	version=( $(get_version_components) )
+	if [[ -z ${version[1]} ]]; then
+		subversion=0
+		extraversion=0
+	else
+		subversion=${version[1]}
+		if [[ -z ${version[2]} ]]; then
+			extraversion=0
+		else
+			extraversion=.${version[2]}
+		fi
+	fi
+
+	sed -i \
+		-e "/^MAJOR_VERSION/s|:=.*|:= 0|" \
+		-e "/^MINOR_VERSION/s|:=.*|:= ${version[0]}|" \
+		-e "/^SUBLEVEL/s|:=.*|:= ${subversion}|" \
+		-e "/^EXTRAVERSION/s|:=.*|:= ${extraversion}|" \
+		Rules.mak || die
+
+	eapply_user
+}
+
+src_configure() {
+	# Map our toolchain arch name to the name expected by uClibc-ng.
+	local target=$(tc-arch)
+	case ${target} in
+		amd64) target="x86_64";;
+		arm)   target="arm";;
+		mips)  target="mips";;
+		ppc)   target="powerpc";;
+		x86)   target="i386";;
+	esac
+
+	# Do arch specific configuration by changing the defaults in
+	# extra/Configs/Config.<arch>.  If these are not overridden
+	# by an save .config, they will be selected by default.
+
+	# For i386, i486, i586 and i686
+	local cpu
+	if [[ ${target} == "i386" ]]; then
+		[[ ${CTARGET} == i[456]86* ]] && cpu="${CTARGET:1:1}86"
+		sed -i -e "s|default CONFIG_686|default CONFIG_${cpu:-486}|" \
+			extra/Configs/Config.i386 || die
+	fi
+
+	# For arm
+	if [[ ${target} == "arm" ]]; then
+		sed -i -e '/Build for EABI/a \\tdefault y' extra/Configs/Config.arm
+	fi
+
+	# We set HOSTCC to the proper tuple rather than just 'gcc'
+	sed -i -e "s|^HOSTCC.*=.*|HOSTCC=$(tc-getBUILD_CC)|" Rules.mak
+
+	make_config ${target}
+
+	einfo
+	einfo "Runtime Prefix: /"
+	einfo "Devel Prefix:   /usr"
+	einfo "Kernel Prefix:  $(alt_build_kprefix)"
+	einfo "CBUILD:         ${CBUILD}"
+	einfo "CHOST:          ${CHOST}"
+	einfo "CTARGET:        ${CTARGET}"
+	einfo "ABI:            ${ABI}"
+	einfo "ENDIAN:         $(uclibc_endian)"
+	einfo
+}
+
+src_compile() {
+	emake headers
+	just_headers && return 0
+
+	emake
+	if is_crosscompile ; then
+		emake -C utils hostutils
+	else
+		emake utils
+	fi
+}
+
+src_test() {
+	is_crosscompile && return 0
+
+	# assert test fails on pax/grsec enabled kernels
+	# normal vfork test fails in sandbox (both glibc/uclibc)
+	emake UCLIBC_ONLY=1 check
+}
+
+src_install() {
+	local sysroot=${D}
+	is_crosscompile && sysroot+="/usr/${CTARGET}"
+
+	local target="install"
+	just_headers && target="install_headers"
+	emake DESTDIR="${sysroot}" ${target}
+
+	save_config .config
+
+	# remove files coming from kernel-headers
+	rm -rf "${sysroot}"/usr/include/{linux,asm*}
+
+	# Make sure we install the sys-include symlink so that when
+	# we build a 2nd stage cross-compiler, gcc finds the target
+	# system headers correctly.  See gcc/doc/gccinstall.info
+	if is_crosscompile ; then
+		dosym usr/include /usr/${CTARGET}/sys-include
+		if ! just_headers && [[ -n $(get_opt HAVE_SHARED) ]] ; then
+			newbin utils/ldconfig.host ${CTARGET}-ldconfig
+			newbin utils/ldd.host ${CTARGET}-ldd
+		fi
+		return 0
+	fi
+
+	if use symlink-compat; then
+		dosym libc.so.0 "${DESTDIR}"/lib/libcrypt.so.0
+		dosym libc.so.0 "${DESTDIR}"/lib/libdl.so.0
+		dosym libc.so.0 "${DESTDIR}"/lib/libm.so.0
+		dosym libc.so.0 "${DESTDIR}"/lib/libpthread.so.0
+		dosym libc.so.0 "${DESTDIR}"/lib/librt.so.0
+		dosym libc.so.0 "${DESTDIR}"/lib/libresolv.so.0
+		dosym libc.so.0 "${DESTDIR}"/lib/libubacktrace.so.0
+		dosym libc.so.0 "${DESTDIR}"/lib/libutil.so.0
+	fi
+
+	emake DESTDIR="${D}" install_utils
+	dobin extra/scripts/getent
+	dodoc README docs/*.txt
+}
+
+pkg_postinst() {
+	is_crosscompile && return 0
+
+	if [ ! -e "${ROOT}"/etc/TZ ] ; then
+		ewarn "Please remember to set your timezone in /etc/TZ"
+		mkdir -p "${ROOT}"/etc
+		echo "UTC" > "${ROOT}"/etc/TZ
+	fi
+	[ "${ROOT}" != "/" ] && return 0
+	# update cache before reloading init
+	ldconfig
+	# reload init ...
+	/sbin/telinit U 2>/dev/null
+}
diff --git a/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild b/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild
index 9c2e972dc4c0..507f8c13ae96 100644
--- a/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild
+++ b/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild
@@ -14,7 +14,7 @@ else
 fi
 
 DESCRIPTION="C library for developing embedded Linux systems"
-HOMEPAGE="http://www.uclibc-ng.org/"
+HOMEPAGE="https://uclibc-ng.org/"
 if [[ ${PV} != "9999" ]] ; then
 	PATCH_VER=""
 	SRC_URI="http://downloads.uclibc-ng.org/releases/${PV}/${MY_P}.tar.bz2"
@@ -23,7 +23,7 @@ fi
 
 LICENSE="LGPL-2"
 SLOT="0"
-IUSE="debug hardened iconv ipv6 rpc symlink-compat headers-only"
+IUSE="debug hardened iconv ipv6 symlink-compat headers-only"
 RESTRICT="strip"
 
 # 1) We can't upgrade from uclibc to uclibc-ng via a soft blocker since portage
@@ -121,21 +121,19 @@ make_config() {
 		SUPPORT_LD_DEBUG_EARLY
 		UCLIBC_HAS_CTYPE_UNSAFE
 		UCLIBC_HAS_LOCALE
-		UCLIBC_HAS_SSP_COMPAT
+		LDSO_SAFE_RUNPATH
 	)
 
 	# These are forced on
 	defs_y=(
-		COMPAT_ATEXIT
 		DO_C99_MATH
 		DO_XSI_MATH
 		FORCE_SHAREABLE_TEXT_SEGMENTS
 		LDSO_GNU_HASH_SUPPORT
-		LDSO_PRELINK_SUPPORT
 		LDSO_PRELOAD_FILE_SUPPORT
+		LDSO_RUNPATH
 		LDSO_RUNPATH_OF_EXECUTABLE
 		LDSO_STANDALONE_SUPPORT
-		MALLOC_GLIBC_COMPAT
 		PROPOLICE_BLOCK_SEGV
 		PTHREADS_DEBUG_SUPPORT
 		UCLIBC_HAS_ARC4RANDOM
@@ -155,12 +153,9 @@ make_config() {
 		UCLIBC_HAS_GLIBC_CUSTOM_STREAMS
 		UCLIBC_HAS_GNU_GLOB
 		UCLIBC_HAS_HEXADECIMAL_FLOATS
-		UCLIBC_HAS_LIBNSL_STUB
-		UCLIBC_HAS_LIBRESOLV_STUB
 		UCLIBC_HAS_LIBUTIL
 		UCLIBC_HAS_NFTW
 		UCLIBC_HAS_OBSOLETE_BSD_SIGNAL
-		UCLIBC_HAS_OBSTACK
 		UCLIBC_HAS_PRINTF_M_SPEC
 		UCLIBC_HAS_PROGRAM_INVOCATION_NAME
 		UCLIBC_HAS_RESOLVER_SUPPORT
@@ -194,10 +189,6 @@ make_config() {
 
 	kconfig_q_opt ipv6 UCLIBC_HAS_IPV6
 
-	kconfig_q_opt rpc UCLIBC_HAS_RPC
-	kconfig_q_opt rpc UCLIBC_HAS_FULL_RPC
-	kconfig_q_opt rpc UCLIBC_HAS_REENTRANT_RPC
-
 	kconfig_q_opt hardened UCLIBC_BUILD_NOEXECSTACK
 	kconfig_q_opt hardened UCLIBC_BUILD_NOW
 	kconfig_q_opt hardened UCLIBC_BUILD_PIE
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index ac416ced36cb..915a720132d2 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/libgudev/Manifest b/virtual/libgudev/Manifest
index 750206f7d7ae..bf4bc9882768 100644
--- a/virtual/libgudev/Manifest
+++ b/virtual/libgudev/Manifest
@@ -1,4 +1,4 @@
 EBUILD libgudev-215-r3.ebuild 751 BLAKE2B b0f4f40f27b42761143e6902b37792e44aea3847c99ac68546720671be0761e4f3c7066ce8fe9406a8ae4c00816c74871456d3805ad45f7a397d9d1564c67c4b SHA512 78133167bb7bc75752945273a89cda970219707f34a06c8d0bf569a497463135469078019329bbab24d85b1b4d82a065cfc1f5c5899d7396366fc58701f2a8c0
 EBUILD libgudev-230.ebuild 396 BLAKE2B 38ed14c2feeab8dd49f26473727739e7725fa1e728fc009596ad46a2b075a58e2ba56867116329ebf7945f8d032528adc35c905d4e549abdf3652a2676e2736d SHA512 d23ba1b095a43089554ffc8c098abe3e10384e4103a233f3686f49da9490d8286ac0c92f9784dadd0e2588ef8a06a7f24da1d89c03b92a4ed0083e533137c3f3
-EBUILD libgudev-232.ebuild 408 BLAKE2B 317d395b264515ba066b1b296d04d2b87dfdeac24191d6130a37b2b0e21968a4ec67745c7e87302f1614a86bc5aa6cdb2726d62961c5d6d6eb6e74db9ffabc15 SHA512 7f1a4dfb3bbf3aac71bea351e5e82f07eca8d50ab069ab8cad156a0251beeddd243551d4fd95d23324cd4f6ea97aee03e1d82f37864a719bb69faa3cb36ec3d2
+EBUILD libgudev-232.ebuild 407 BLAKE2B 069f75a789ac2f80f027e56dac8235414bebea95297e3cf1a4dde728a8e56b779d601cc45184b44ddd5e7f11c50dd881e7d813081697604d5bcadc57343c87f7 SHA512 df30db156f69978dfe6ad9359a0d934a745c4b7bc4a56e7885d882948019c01503f2f06b567105f82e88058ad36d042807ffec3d33994e74306fab580e355d39
 MISC metadata.xml 379 BLAKE2B 5b6f06cda07bf27984ccc9d28751ffffab6debce45c8d883d963334f4295e6fdece7de2175290b4ba807aa417c0e0f3ca4c21f262185968f66c76d3f8ac8d0c8 SHA512 8353b418ec271a0ae9ae0d0a6bad81eb941610a989a5497c940929f14c622bf8199ffbc5061bc723977aa3c01aacf66a37f72311cf1f69082982f27503b17013
diff --git a/virtual/libgudev/libgudev-232.ebuild b/virtual/libgudev/libgudev-232.ebuild
index cb3258e8e2cb..1c90086332e0 100644
--- a/virtual/libgudev/libgudev-232.ebuild
+++ b/virtual/libgudev/libgudev-232.ebuild
@@ -6,7 +6,7 @@ inherit multilib-build
 
 DESCRIPTION="Virtual for libgudev providers"
 SLOT="0/0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
 IUSE="introspection static-libs"
 
 RDEPEND=">=dev-libs/libgudev-232:0/0[${MULTILIB_USEDEP},introspection?,static-libs?]"
diff --git a/virtual/texi2dvi/Manifest b/virtual/texi2dvi/Manifest
index 9f1d96c8df9e..e0c689af02a6 100644
--- a/virtual/texi2dvi/Manifest
+++ b/virtual/texi2dvi/Manifest
@@ -1,2 +1,2 @@
-EBUILD texi2dvi-0.ebuild 492 BLAKE2B 50d7add6cfcf1dd3dc547e9336ee022e73ad4a759fed982f40174539a216a825f6239f71cf1ba393c7f414c4272f858f8bcec8d83b985309e99eddd4df22132d SHA512 6e9306d71f29f459dba9253583f8441c30c27de9a66b6b67bcd84f7b861c51598cd751b9945f1503dc40f21ea1cd7b36f10247876959260a7a7590cf983374fe
+EBUILD texi2dvi-0-r1.ebuild 492 BLAKE2B dca865cb4cd75e0ef2654140da793c910ce7d6628d5ad002d00af79f7e2fe1bf1d7876b5be50ca23729821bc1e21c45f15a12b92e831b7bcacbc9b362d3dbb9a SHA512 bbe730ea6de25443365bdb3701f239590d996884e270e367381964c0c5adae2de893db2617689766db6e3a1f6ce49f4015d7ce5b0ab9f28c747b25d2e5418f1c
 MISC metadata.xml 359 BLAKE2B 2ea428cd832710fc7b9cc25393e15a874b726be6a1bbccc284bca872fc2ba2a80c2a72ca587dd43c440d4cd6650e13cd20f1fe7f3c0057fc06e7640811aad719 SHA512 aaec61de8f382de09053c63ffec9c01c4b5c1516edf005693274ce0434b1c104327d2ea57111f9a3a34e169a3e3e14886b44736cb3bf295f6b226da163a5ee90
diff --git a/virtual/texi2dvi/texi2dvi-0.ebuild b/virtual/texi2dvi/texi2dvi-0-r1.ebuild
index d94ca0c201fc..58c61cde7057 100644
--- a/virtual/texi2dvi/texi2dvi-0.ebuild
+++ b/virtual/texi2dvi/texi2dvi-0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 26d08485cdb5..9e09f2f56380 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index 6ed4d1a7dfa4..81dfd818b684 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -5,5 +5,5 @@ AUX passenger-5.1.11-gentoo.patch 1064 BLAKE2B f62d689d7425e11609917506b1c19e15f
 DIST passenger-5.1.11.tar.gz 4243340 BLAKE2B 25c6cc0016c4078962466716f16a2d084d4e59528153bbe09dae70c4935941cabc456062e0004f7640074f163e53aa6f95e44fc7b99136292db5e3c9bb9fe554 SHA512 7dce496916533f2fcd5cb5931d79308da8adda300a8b8603ce90b92645e69a1283d147976b5aa3408f86ccb71f9e5849bfb68e58a806a8a58529cadda557bccb
 DIST passenger-5.1.12.tar.gz 4245993 BLAKE2B 4f5808bcb373a85fbe2e160d9bd993fdff32a78f5083f5b5ff38112a4d3ca906a18a241cef6744350c0f33ef357dfda7a2cd5af875223a082a19b4e99cba4aeb SHA512 7ecdf0be306a3c4b842c8497861dbc072fc87f5601840678fe1125b77d50e683003b49616397d39b34705c967f604f5193be173c52a9c5ab235ef4e6e43f2f4a
 EBUILD passenger-5.1.11.ebuild 3980 BLAKE2B af2fdba8ec82519a2008563d4b3a9ffb6cb7b73df1c34aacd7cf11240a0d99ecd9f4212bbea32f5c2e5d3f0237e1106eebe5389cf40491e7a8f0edfe0711783b SHA512 3ee83e353f2a8e645b4e499b945deb2ad518ab620715ed7d6ed0fb69ac8571c1c63383ebf4e44514e9a420a8ac6739c1120b3af688c397260ee3aae94eb542f4
-EBUILD passenger-5.1.12.ebuild 3982 BLAKE2B 56f00e6cf61a3fa4488eb23a31bf372a1452ad6946ca6e625f5b7beeb4727e2c42e5f02894da2d37367a1ca56fea02c61f5d256cb24100b940788e8271ca05d8 SHA512 c3ded6ac19b039183cc4b3d9468b706b3a2aca2e4fc2e022d2b4cd1260a142eaa938a6d67a5eb636832d3cd9a77590d1e116a7daddd8e7c69526b22afc1d264d
+EBUILD passenger-5.1.12.ebuild 3980 BLAKE2B 53fb3918d8368e51347ec18fa073916e79952ff432e279ab2007523a87bd1012f5833e354ecbc57e6595a4f0fdf0ef5288fe8141fa4e3c67494ef37e57171ef8 SHA512 09185eead6e3b933713f2b1538ae55bae0ed6457bc723f52cad69948c3c7cca3b3091b2fbf4ac71f5d57c3437db03392b67b0a5560e953e3339aebec5cc1cefc
 MISC metadata.xml 330 BLAKE2B 80067f262ce3e04098eaab92ec2420a879014d624fa6c230f57daf871ac33b77fcd786868ec508236c62623f2c81dc86573875a42993604896745524d7220fc7 SHA512 5ea7e5026084dedcd363bb79076763cca7d66bb08411d5e2dc56ade23bfdbd522a8db13db9c0b8f50163f130f28c784b622d9639cb3dd33aa810dda3d2577db8
diff --git a/www-apache/passenger/passenger-5.1.12.ebuild b/www-apache/passenger/passenger-5.1.12.ebuild
index 8e51ddcea35a..81449d020955 100644
--- a/www-apache/passenger/passenger-5.1.12.ebuild
+++ b/www-apache/passenger/passenger-5.1.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="apache2 debug"
 
 ruby_add_bdepend "dev-ruby/rake"
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 3bedc9710b92..81dd29d787ec 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/rt/Manifest b/www-apps/rt/Manifest
index 7e623715fc59..bf449d1fbfe6 100644
--- a/www-apps/rt/Manifest
+++ b/www-apps/rt/Manifest
@@ -2,10 +2,6 @@ AUX config.layout-gentoo 741 BLAKE2B 9d817baa9be850f9da41cdbd9db49b2bc3fbfc394bb
 AUX postinstall-en.txt 620 BLAKE2B a57e1a705fa31a2c5abb080be8e9ddea41017132c51429eb89b2ccf6f39b2052cab9d3b04b99aa0eb403187db809c8c0b35d13aa72123a0e1ec7fb75cc308383 SHA512 473acd53f962299a96b012b6c6e044590feb347efed208158ac8a1d4722c673fcddde2487556cf40fb97d201608fe066a9c243cd3f1682bea5e4039a4b5fb8dd
 AUX reconfig 2133 BLAKE2B fb5fdf3d68c1ff06b0e1becd25594b4544515aea3399ef2a563cbc541aa8ccf18f0781cbd08f97504bba0980010a7756a657c5ca0d7caa227cebf15b0d0f3231 SHA512 bfeedd02918240fb1b79fe9a5f62b6bda85e3f9df2c55dd9a93deb490495bb269579a999a71bd135fe43f247774039e34947c39689461ef4083b482f02fa3c56
 AUX rt-makefile-serialize-install-prereqs.patch 596 BLAKE2B 65427cbc4425fe47bd4ee5a624df45f802ff1153fa778493a619120db0ce5082876e05d802c411e2cbeb6293fa7899e374c462f7e2c83225a8d423baec162316 SHA512 0ae2ad3ac5faf7ecc65545cfbba210034a2f532c4b1fa82b37956731b35d7e42e3d3ca4714834f2797ecec7292f19dca0be295ad92ed3931374d07af02ed10a1
-AUX rt.conf.d.2 229 BLAKE2B f9f1e67deb83e281be98273ab2ac472c5463851fc24d8bac55914435eff1c0c55fe05b68e06648c62cbbdf170b076f8b0430ac9a7134857aa6c94c035bae4beb SHA512 4823a8241837d3b642149f3f81c16258811132bdcc515096de347ca1da14cf18d7791f10851682e55205e206f335c322926c4dd01ace30f7cb254995b48ea8e9
-AUX rt.init.d.2 1318 BLAKE2B 4932f1f4ed1b61774859c1ec705dbd92943342d0dcdecef3b8947c41261fcdcd6b509c721cafafef297e8f8b61313214691a62c2d9547f67b4d0561f68f27aad SHA512 ec7249e73e9efdcb1716e8ba3bf33d4791bf4e386b3c60207f5c1a37b8b456be8c0cd550bbe0645a9aa46afeb1c3331b3425bb9f5ef8b95b71f52f99f1244b91
-DIST rt-4.2.12.tar.gz 7537620 BLAKE2B 3dc678a99f00fe26bbf483c73211563a121b77f06f6414d1ba67dff2c95b168f299c2a7e665256c8c9e8d0bd3c0eddfca505c1fb3648244a157412428b256132 SHA512 e816c5481bdb158209bd78bc82af4abc0243af500abe55ae3aac666259e983282d82577de6207899745b4781fb0a50d3094901a248e7ac958dd852343b6f2676
-DIST rt-4.4.1.tar.gz 9057212 BLAKE2B faaf27bdfe131dc02cc308dcada674885fbe7d2711bab70e0c0dfdb18bdcf2aaf1e10c82b5064626965be04313a2693e9c36a34ed58c28adc55586e5575ae203 SHA512 2cb797e013b14201ececec2c408257fe3a998fefdafd0944efda0236caac40be4cc45878cbda7bf9ae82b3757de6167263db2b90331d925db1f916a8420adf94
-EBUILD rt-4.2.12-r2.ebuild 7511 BLAKE2B 7bdfe6c0a53a69f87b7a7661470ffee12ecb7c03ea813007813d1921e3be741d6a54f449cfc9586ed160492ad484ed51549eeef2ed89fbd46261e3fa5c97648e SHA512 dcf02e62b49babd83d6f747062972243cd13c8b9b528861f6f09e76229ae7ad5fa1750ffd1e34ef7c90f7724f4caf1826d3b770d4a06540947b6225ae4b8b8ac
-EBUILD rt-4.4.1-r1.ebuild 7632 BLAKE2B 8ddf4480d7b4511d9c06aa8a20f5acaf344cd34533ae9f88aeaba2a3f927f012056cee493f3f037ddeb2b03ccde12ce09532e8badf55632927f1233c4615495e SHA512 54e4c18a05dae9ec7e7a8021706c47d40af76b521ea2986710287119a5f3bafa375e85f20c3813bffd8028ad10ed32c76b5590fd249d7f6aa36b1ef51ab88043
+DIST rt-4.4.2.tar.gz 9572361 BLAKE2B 26e14c187a6d1d741706e4ec1d3a0c718238c63faea6de6ace7c48fb54581b039897c3244f70421d915f5986fa60aa2c19df5f1a0504658f4b00fc4e7f72151d SHA512 23e318d10c49d39c1542664efa2b9f98d1dcd613c279dc8ceca0ad9aed89a5d989316e833492ed3281543ec85f6e0f5141a86f70852776bf0d54166aa126431e
+EBUILD rt-4.4.2.ebuild 7785 BLAKE2B eb4fab639a12cee5eda4f500ef8b2d766428085a5b9f00665483bc10ec65a8146e98adf29ed83f8a7c0e3a02b987bb457d15d47101face74236da7b91caa012d SHA512 92c58b3af3c8a2560369bfae25a719f8474967d84ffd5504c75d9eee5e74b6c5b243b580cecd49cb8a4928951a4eab1a1b280232a73b043d3d986980030c35df
 MISC metadata.xml 533 BLAKE2B 4079ad55dec8f19dee943bd9c70e023b4ddd3beb71b7d324ef19e5fc18a386c814f8cba39efbc68f359cde2822787011196b9c1b7850d1ea717940bb8f234c3e SHA512 8235050bdbd8d443e8765563f52b3bfc5424d16d295ff0427175c053f5d1b1ec8218f76c514cd9f2423d6b8e8f50655a58a55b80d2f45471de8d1622f82f4c39
diff --git a/www-apps/rt/files/rt.conf.d.2 b/www-apps/rt/files/rt.conf.d.2
deleted file mode 100644
index d5bc65394734..000000000000
--- a/www-apps/rt/files/rt.conf.d.2
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Config file for /etc/init.d/rt
-
-RTUSER=rt
-RTGROUP=lighttpd
-
-# set RTPATH to rt's root
-RTPATH=/var/www/localhost/@@PF@@
diff --git a/www-apps/rt/files/rt.init.d.2 b/www-apps/rt/files/rt.init.d.2
deleted file mode 100644
index 84e304efe17d..000000000000
--- a/www-apps/rt/files/rt.init.d.2
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	use mysql postgresql lighttpd
-}
-
-FCGI_SOCKET_PATH=${RTPATH}/var/appSocket
-PIDFILE=${RTPATH}/var/pid
-
-start() {
-	checkpath -d "${RTPATH}/var" -m 0755 -o "${RTUSER}:${RTGROUP}"
-
-	ebegin "Starting RT"
-	rm -f ${FCGI_SOCKET_PATH}
-        start-stop-daemon --start \
-	    --exec ${RTPATH}/bin/mason_handler.fcgi \
-	    --pidfile ${PIDFILE} --user "${RTUSER}:${RTGROUP}" \
-            --background --make-pidfile --chdir ${RTPATH}  \
-            --stdout "${RTPATH}/var/service.log" \
-            --stderr "${RTPATH}/var/service.log" \
-            --env "PATH=$PATH" --env "FCGI_SOCKET_PATH=${FCGI_SOCKET_PATH}" \
-            --wait 1500
-
-        if [ "$?" != "0" ]; then
-            eerror "${SVCNAME} failed to start. Please see ${RTPATH}/var/service.log for the reason."
-            eend 1
-            return 1
-        fi
-
-	# make sure lighttpd can use the socket
-        for i in {0..10}; do
-		[ -a ${FCGI_SOCKET_PATH} ] && break
-		sleep 1
-	done
-
-        if [ -a ${FCGI_SOCKET_PATH} ]; then
-	    chmod g+rwx ${FCGI_SOCKET_PATH}
-            eend 0
-        else
-            eend 1
-        fi
-}
-
-stop() {
-	ebegin "Stopping RT"
-	start-stop-daemon --stop --pidfile ${PIDFILE}
-	eend $?
-}
diff --git a/www-apps/rt/rt-4.2.12-r2.ebuild b/www-apps/rt/rt-4.2.12-r2.ebuild
deleted file mode 100644
index 73babc3acf9b..000000000000
--- a/www-apps/rt/rt-4.2.12-r2.ebuild
+++ /dev/null
@@ -1,295 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit webapp eutils depend.apache user
-
-DESCRIPTION="RT is an enterprise-grade ticketing system"
-HOMEPAGE="http://www.bestpractical.com/rt/"
-SRC_URI="http://download.bestpractical.com/pub/${PN}/release/${P}.tar.gz"
-
-KEYWORDS="~amd64"
-LICENSE="GPL-2"
-IUSE="mysql +postgres fastcgi lighttpd"
-REQUIRED_USE="^^ ( mysql postgres )"
-
-RESTRICT="test"
-
-DEPEND="
-	>=dev-lang/perl-5.10.1
-
-	>=dev-perl/Apache-Session-1.53
-	>=dev-perl/CGI-4
-	>=dev-perl/CSS-Squish-0.06
-	>=dev-perl/Class-Accessor-0.34
-	>=dev-perl/Class-ReturnValue-0.550.0-r1
-	>=dev-perl/DBI-1.37
-	>=dev-perl/Date-Extract-0.02
-	>=dev-perl/DateTime-Format-Natural-0.67
-	>=dev-perl/Devel-StackTrace-1.19
-	>=dev-perl/HTML-FormatText-WithLinks-0.14
-	>=dev-perl/HTML-Mason-1.43
-	>=dev-perl/HTML-Scrubber-0.08
-	>=dev-perl/HTTP-Server-Simple-0.34
-	>=dev-perl/HTTP-Server-Simple-Mason-0.14
-	>=dev-perl/Locale-Maketext-Lexicon-0.32
-	>=dev-perl/Log-Dispatch-2.410.0
-	>=dev-perl/MIME-tools-5.425
-	>=dev-perl/MailTools-1.60
-	>=dev-perl/Module-Versions-Report-1.05
-	>=dev-perl/Role-Basic-0.12
-	>=dev-perl/Symbol-Global-Name-0.04
-	>=dev-perl/Text-Quoted-2.80.0
-	>=dev-perl/Text-WikiFormat-0.76
-	>=dev-perl/Tree-Simple-1.04
-	>=dev-perl/XML-RSS-1.05
-	>=dev-perl/DBIx-SearchBuilder-1.660.0
-	>=virtual/perl-Digest-MD5-2.27
-	>=virtual/perl-Encode-2.730.0
-	>=virtual/perl-File-Spec-0.8
-	>=virtual/perl-Getopt-Long-2.24
-	>=virtual/perl-Locale-Maketext-1.06
-	>=virtual/perl-Storable-2.08
-	dev-perl/CGI-Emulate-PSGI
-	dev-perl/CGI-PSGI
-	dev-perl/Cache-Simple-TimedExpiry
-	dev-perl/Calendar-Simple
-	dev-perl/Convert-Color
-	dev-perl/Crypt-Eksblowfish
-	dev-perl/Crypt-SSLeay
-	dev-perl/Crypt-X509
-	dev-perl/DBD-SQLite
-	dev-perl/Data-GUID
-	dev-perl/Data-ICal
-	dev-perl/Date-Manip
-	dev-perl/Devel-GlobalDestruction
-	dev-perl/Email-Address
-	dev-perl/Email-Address-List
-	dev-perl/File-ShareDir
-	dev-perl/File-Which
-	dev-perl/GDGraph
-	dev-perl/GDTextUtil
-	dev-perl/GD[png,gif]
-	dev-perl/GnuPG-Interface
-	dev-perl/GraphViz
-	dev-perl/HTML-Formatter
-	dev-perl/HTML-FormatText-WithLinks-AndTables
-	dev-perl/HTML-Mason-PSGIHandler
-	dev-perl/HTML-Parser
-	dev-perl/HTML-Quoted
-	dev-perl/HTML-RewriteAttributes
-	dev-perl/HTML-Tree
-	dev-perl/IPC-Run3
-	dev-perl/JSON
-	dev-perl/JavaScript-Minifier
-	dev-perl/MIME-Types
-	dev-perl/Module-Refresh
-	dev-perl/Mozilla-CA
-	dev-perl/Net-CIDR
-	dev-perl/PerlIO-eol
-	dev-perl/Plack
-	dev-perl/Regexp-Common-net-CIDR
-	dev-perl/Regexp-IPv6
-	dev-perl/Starlet
-	dev-perl/String-ShellQuote
-	dev-perl/TermReadKey
-	dev-perl/Text-Autoformat
-	dev-perl/Text-Password-Pronounceable
-	dev-perl/Time-ParseDate
-	dev-perl/TimeDate
-	dev-perl/UNIVERSAL-require
-	dev-perl/libwww-perl
-	dev-perl/Locale-Maketext-Fuzzy
-	dev-perl/Net-Server
-	dev-perl/Regexp-Common
-	dev-perl/Text-Template
-	dev-perl/Text-Wrapper
-	virtual/perl-Digest
-	virtual/perl-File-Temp
-	virtual/perl-Scalar-List-Utils
-	virtual/perl-Time-HiRes
-	virtual/perl-libnet
-
-	fastcgi? (
-		dev-perl/FCGI
-		dev-perl/FCGI-ProcManager
-	)
-	!lighttpd? (
-		dev-perl/Apache-DBI
-		!fastcgi? ( >=www-apache/mod_perl-2 )
-	)
-	lighttpd? ( dev-perl/FCGI )
-	mysql? ( >=dev-perl/DBD-mysql-2.1018 )
-	postgres? ( >=dev-perl/DBD-Pg-1.43 )
-"
-
-RDEPEND="${DEPEND}
-	virtual/mta
-	!lighttpd? ( ${APACHE2_DEPEND} )
-	lighttpd? (
-		>=www-servers/lighttpd-1.3.13
-		sys-apps/openrc
-	)
-"
-
-need_httpd_cgi
-
-add_user_rt() {
-	# add new user
-	# suexec2 requires uid >= 1000; enewuser is of no help here
-	# From: Mike Frysinger <vapier@gentoo.org>
-	# Date: Fri, 17 Jun 2005 08:41:44 -0400
-	# i'd pick a 5 digit # if i were you
-
-	local euser="rt"
-
-	# first check if username rt exists
-	if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
-		# check uid
-		rt_uid=$(egetent passwd "${euser}" | cut -d: -f3)
-		if $(expr ${rt_uid} '<' 1000 > /dev/null); then
-			ewarn "uid of user rt is less than 1000. suexec2 will not work."
-			ewarn "If you want to use FastCGI, please delete the user 'rt'"
-			ewarn "from your system and re-emerge www-apps/rt"
-		fi
-		return 0 # all is well
-	fi
-
-	# add user
-	# stolen from enewuser
-	local pwrange euid
-
-	pwrange=$(seq 10001 11001)
-	for euid in ${pwrange} ; do
-		[[ -z $(egetent passwd ${euid}) ]] && break
-	done
-	if [[ ${euid} == "11001" ]]; then
-		# she gets around, doesn't she?
-		die "No available uid's found"
-	fi
-
-	elog " - Userid: ${euid}"
-
-	enewuser rt ${euid} -1 /dev/null rt
-	return 0
-}
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	ewarn
-	ewarn "If you are upgrading from an existing RT installation"
-	ewarn "make sure to read the related upgrade documentation in"
-	ewarn "${ROOT}usr/share/doc/${PF}."
-	ewarn
-
-	enewgroup rt
-	add_user_rt || die "Could not add user"
-}
-
-src_prepare() {
-	# add Gentoo-specific layout
-	cat "${FILESDIR}"/config.layout-gentoo >> config.layout
-	sed -e "s|PREFIX|${ED}/${MY_HOSTROOTDIR}/${PF}|g" \
-		-e "s|HTMLDIR|${ED}/${MY_HTDOCSDIR}|g" \
-		-e 's|/\+|/|g' \
-		-i ./config.layout || die 'config sed failed'
-
-	# don't need to check dev dependencies
-	sed -e "s|\$args{'with-DEV'} =1;|#\$args{'with-DEV'} =1;|" \
-		-i sbin/rt-test-dependencies.in || die 'dev sed failed'
-
-	epatch "${FILESDIR}/rt-makefile-serialize-install-prereqs.patch"
-}
-
-src_configure() {
-	local web
-	local myconf
-	local depsconf
-
-	if use mysql ; then
-		myconf="--with-db-type=mysql --with-db-dba=root"
-		depsconf="--with-MYSQL"
-	elif use postgres ; then
-		myconf="--with-db-type=Pg --with-db-dba=postgres"
-		depsconf="--with-PG"
-	else
-		die "Pick a database backend"
-	fi
-
-	if use fastcgi ; then
-		myconf+=" --with-web-handler=fastcgi"
-		web="apache"
-		depsconf+=" --with-FASTCGI"
-	elif use lighttpd ; then
-		myconf+=" --with-web-handler=fastcgi"
-		web="lighttpd"
-		depsconf+=" --with-FASTCGI"
-	else
-		myconf+=" --with-web-handler=modperl2"
-		web="apache"
-		depsconf+=" --with-MODPERL2"
-	fi
-	# Any loading Date::Manip from here on
-	# may fail if TZ=Factory as it is on gentoo install
-	# media ( affects install as well )
-	export TZ=UTC
-
-	./configure --enable-layout=Gentoo \
-		--with-bin-owner=rt \
-		--with-libs-owner=rt \
-		--with-libs-group=rt \
-		--with-rt-group=rt \
-		--with-web-user=${web} \
-		--with-web-group=${web} \
-		${myconf}
-
-	# check for missing deps and ask to report if something is broken
-	/usr/bin/perl ./sbin/rt-test-dependencies ${depsconf} > "${T}"/t
-	if grep -q "MISSING" "${T}"/t; then
-		ewarn "Missing Perl dependency!"
-		ewarn
-		cat "${T}"/t | grep MISSING
-		ewarn
-		ewarn "Please run perl-cleaner. If the problem persists,"
-		ewarn "please file a bug in the Gentoo Bugzilla with the information above"
-		die "Missing dependencies."
-	fi
-}
-
-src_compile() { :; }
-
-src_install() {
-	webapp_src_preinst
-	emake install
-
-	dodoc -r docs/*
-	# Disable compression because `perldoc` doesn't decompress transparently
-	docompress -x /usr/share/doc
-
-	# make sure we don't clobber existing site configuration
-	rm -f "${ED}"/${MY_HOSTROOTDIR}/${PF}/etc/RT_SiteConfig.pm
-
-	# fix paths
-	find "${ED}" -type f -print0 | xargs -0 sed -i -e "s:${ED}::g"
-
-	# copy upgrade files
-	insinto "${MY_HOSTROOTDIR}/${PF}"
-	doins -r etc/upgrade
-
-	if use lighttpd ; then
-		newinitd "${FILESDIR}"/${PN}.init.d.2 ${PN}
-		newconfd "${FILESDIR}"/${PN}.conf.d.2 ${PN}
-		sed -i -e "s/@@PF@@/${PF}/g" "${ED}"/etc/conf.d/${PN} || die
-	fi
-
-	# require the web server's permissions
-	webapp_serverowned "${MY_HOSTROOTDIR}"/${PF}/var
-	webapp_serverowned "${MY_HOSTROOTDIR}"/${PF}/var/mason_data/obj
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	webapp_hook_script "${FILESDIR}"/reconfig
-
-	webapp_src_install
-}
diff --git a/www-apps/rt/rt-4.4.1-r1.ebuild b/www-apps/rt/rt-4.4.2.ebuild
index 3914f8393742..3148082aaf36 100644
--- a/www-apps/rt/rt-4.4.1-r1.ebuild
+++ b/www-apps/rt/rt-4.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -28,6 +28,7 @@ DEPEND="
 	>=dev-perl/Date-Extract-0.02
 	>=dev-perl/DateTime-Format-Natural-0.67
 	>=dev-perl/Devel-StackTrace-1.19
+	>=dev-perl/Email-Address-1.908.0
 	>=dev-perl/HTML-FormatText-WithLinks-0.14
 	>=dev-perl/HTML-Mason-1.43
 	>=dev-perl/HTML-Scrubber-0.08
@@ -67,7 +68,6 @@ DEPEND="
 	dev-perl/Data-ICal
 	dev-perl/Date-Manip
 	dev-perl/Devel-GlobalDestruction
-	dev-perl/Email-Address
 	dev-perl/Email-Address-List
 	dev-perl/File-ShareDir
 	dev-perl/File-Which
@@ -283,12 +283,6 @@ src_install() {
 	insinto "${MY_HOSTROOTDIR}/${PF}"
 	doins -r etc/upgrade
 
-	if use lighttpd ; then
-		newinitd "${FILESDIR}"/${PN}.init.d.2 ${PN}
-		newconfd "${FILESDIR}"/${PN}.conf.d.2 ${PN}
-		sed -i -e "s/@@PF@@/${PF}/g" "${ED}"/etc/conf.d/${PN} || die
-	fi
-
 	# require the web server's permissions
 	webapp_serverowned "${MY_HOSTROOTDIR}"/${PF}/var
 	webapp_serverowned "${MY_HOSTROOTDIR}"/${PF}/var/mason_data/obj
@@ -298,3 +292,15 @@ src_install() {
 
 	webapp_src_install
 }
+
+pkg_postinst() {
+	webapp_pkg_postinst
+
+	if use lighttpd ; then
+		elog "We no longer install initscripts as Best Practical's recommended"
+		elog "implementation is to let Lighttpd manage the FastCGI instance."
+		elog
+		elog "You may find the following helpful:"
+		elog "   perldoc /usr/share/doc/${P}/web_deployment.pod"
+	fi
+}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 75eb06660038..b2c73175802c 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index 788c7e687c0f..be885fb77f37 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -3,5 +3,5 @@ AUX epiphany-3.16.0-unittest-1.patch 972 BLAKE2B bf27a8b68a9526ed3b481bae00c614d
 DIST epiphany-3.22.7.tar.xz 2293224 BLAKE2B 2b3cde7d8eec1d539614e54c4ee5911f8673bedfb59d44207dff9d5196e0b79ccba0f2ee4e42e82d9d2d08de5bfdb9a625d5ea9c3dc984f76443e680b3c55121 SHA512 8150952e89b86d05958bd9f9a0c78ba583764ec878220c8e328cb936108faf25a10837e038bd1a0ba1279555d2f95f819477cfddcb67c31e5b4c3533daf446bd
 DIST epiphany-3.24.5.tar.xz 3216736 BLAKE2B 8a4dd668606521d1b0144afc9ace8607f52eac457f0059e6087216323ec1132dbe1c755e40dfe9993bf685e5444db1268ada1cdf55edc04c51058fdd256c6047 SHA512 a8f203d182b8c87878a3272f8b4f642b0cf4128476e0727208135cfdffeb293425cf662c58820f0d3aed2e1b20fe6dc4cf5cbb8277a398c6f533a0bea34f40f2
 EBUILD epiphany-3.22.7.ebuild 1743 BLAKE2B 3245a8a6bb57ff535e9294ce96c72caeec5f130241eae1c9e7ed060e5471a99becbbc5a3f2b7598bb9b9abc72813022dcf2e63c488d2836a011ad376b803ee4b SHA512 c8eca05bdffc6a2f0907059d17e96e9abb93084694197f00bb4371596c5cd59d94f16d47f831e1a5bccb41b028007758436f2480900ec25baa3fa0d1bfd15f8b
-EBUILD epiphany-3.24.5.ebuild 1950 BLAKE2B a598e25092053ae6edda34bd6d0f27972eceffa986a2faf8c0a1c893132d2954a48ce9c566ff8576f531314a0ad256e39ac5cb827652ec820cc3c4b7476d63d3 SHA512 fdbfd2e17ec53adaeff2a89a3bc37649b0c8ea5ac6ae907367bd4ce5d18f881355dd08aecbd9d4443c8117c73628f68968ca81a463e8b2bf22e5e37195f136cf
+EBUILD epiphany-3.24.5.ebuild 1949 BLAKE2B f17b4603d8f1dbfc26cde3be0c333fa50d3147b61255d1d1618180d5578330a388ed866439e4506c83fb2b06dbc37cf767cd4e25cf2b2a971c222ab0613afecb SHA512 49dabbd617bf90f4af2dbb45d08d6c9a0854555a58a933872b15dca299e7bce9e9084fe07a51571be96d3310651475b0e95e4babf4cf0f7456aea0313fa42f3a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/www-client/epiphany/epiphany-3.24.5.ebuild b/www-client/epiphany/epiphany-3.24.5.ebuild
index c2c9f47a75f6..873a5036a2b4 100644
--- a/www-client/epiphany/epiphany-3.24.5.ebuild
+++ b/www-client/epiphany/epiphany-3.24.5.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Web"
 LICENSE="GPL-3+"
 SLOT="0"
 IUSE="test"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.46.0:2[dbus]
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 7cc360274064..03597142b1b6 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -469,6 +469,6 @@ DIST firefox-57.0.4.source.tar.xz 250217612 BLAKE2B 59ccf9c52d3af0888e13996dba74
 EBUILD firefox-52.2.0.ebuild 12768 BLAKE2B 09516c567cbc290729345b2f5eddd341d20243d3c83e30b01e05ef380e66f9fcd009a0814a62694ae7934cc52ce98211cb0a56fcd5bfa8df4ef35e956fc983f7 SHA512 1b51a9a28d17d920c3b27e0056c9d5cc1ced4cd8e29d25e212ea78015803e472d645b9757de263f1ea78740819db07708560d7c5f95f3dbc7a482192c4c11bc0
 EBUILD firefox-52.4.0.ebuild 12873 BLAKE2B ccf9e89c9fa6f28c7e3876c1919fc6765ed0a808d08b2806705ba3c1b31e996b7b500f9fab42a45cd6fdc45717292d5709949f92434fa78b388fe46241a09e53 SHA512 e983781f1cc85441f3875399eee7677d73319ae343d815cd343b8928ed1f886844227c4f93acea8aac18316e652d91488b7fd1ef46da1e2115f9037827f5a8a2
 EBUILD firefox-52.5.2.ebuild 12875 BLAKE2B 8947bc6d96ddff5a44aceada7dc1c0b186d067819ab0b32fd712811481a4a7cd8b5d9413feeac3feac0106443e0c3aa1715285aa2d2e09c255bf436929ec53ab SHA512 acc937612676a42cefdeb1b6ad999e7d25ee65fe8fbbc93d1d60784962618264e7b45997598a886787ab7019616b125581db46b20b8840588c832a11439dace4
-EBUILD firefox-52.6.0.ebuild 12934 BLAKE2B 206b8b6f02a0249219a256c127ff73e60b9e6d16f5c2ea50aadc19579ab32eeafb8f0439c99413ebbd138eed94dd3f5046f80f5dcda71f09528478d1f1a5f7b1 SHA512 54f2eebe3a68e583b588e7cfdaf4bc30441e312ad07e9ba44b6c0d428947add372017b1f23f6ae32f6e8bb1cfcd72e20998145f0c0847e643c6fed30dbf787d0
+EBUILD firefox-52.6.0.ebuild 12933 BLAKE2B 449b4e216364ea0384932d4c508768e3918972c0ba1a8f2362f0f2657d59d7cc89a36282b5475af361e1bfe7876c908895eca76075543dd01fdda1d99035c92d SHA512 893378a112172506b406f9bd6fadc33a861ddb94e9e3184260b82c11e1b33a0bfeb4eaac965bca7dc97b8771bfcb04afe4972a83fd4acaa739a9b9c6f9bbbbd8
 EBUILD firefox-57.0.4.ebuild 13024 BLAKE2B cd7bb56e2e9ba87a2a4f077780ac12ed488d237f55d0cb516f49997231b37fb0c05bbdd0c11b26a9c6e649e037c31864c629c3c058aa4a9cad0f170e00edf24f SHA512 953f5ad3b2b16a87b1245eb7680c3b7c173a4ef90ba658682e5d15e4bc59f0be0fe649358f538b637083cda617ba7ada94c429be23eae411bac31bdf6a775734
 MISC metadata.xml 2097 BLAKE2B 48891b46d3fbb16b3e0355ac35bea758fb24e6d1fd5d6123bc5b62ba4416c814daa8761dcd439d8c77ea30ceca5eb07306c10e7110fbc3ad063519ec97f7adc6 SHA512 563e087dfc1f413dbc1d97d81f3187666e2cad46acd87e579e8cd1c0ffb01f49402c71e06856056cf08be14beb62f1e0ed67044fd8afa09c4e8558127cef7bc2
diff --git a/www-client/firefox/firefox-52.6.0.ebuild b/www-client/firefox/firefox-52.6.0.ebuild
index 0d16477bdb08..4a5987883b3a 100644
--- a/www-client/firefox/firefox-52.6.0.ebuild
+++ b/www-client/firefox/firefox-52.6.0.ebuild
@@ -35,7 +35,7 @@ inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-v6
 DESCRIPTION="Firefox Web Browser"
 HOMEPAGE="http://www.mozilla.com/firefox"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index 59059b9be9ce..d8b303842aed 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_64.0.3282.99-1_amd64.deb 52711654 BLAKE2B b06f9e4379988de37fe357d933e84dac0866e81cdcfe0270ba16a48cc79aa192fc65f2576c809b4ed41f4e54c59d5ad58b51fd12d8bf91cf1b85e0d240e2ccac SHA512 4d52c6de2e6bfe1a82cb8bccabf32d0cf15fba481da8a888da36ac7b00f721b5d8ba985ddb4041abb4a58f310d23cff2363cdadcf521027218698c4a6cd93d3c
-EBUILD google-chrome-beta-64.0.3282.99.ebuild 3593 BLAKE2B bc6a87fae269cce9f7fc44957ec4bf9b0d410204a1e3cc7774c4301ef5b804de042f69ac7e5e89adb3f64ee24fb320115f207317e1046bfcf2e8515ed7f6469c SHA512 c8267d0725d52f925bd923e172e2d73651112a5992e1716ae057cd021a39fc6d291f1c92e13ed19b807bfaa6696b9572699a5088e27c686001cdf9556f73802a
+DIST google-chrome-beta_64.0.3282.119-1_amd64.deb 52849306 BLAKE2B 7459cff0039ff73e85d6da7ceedfc9066548c220a5fbf69d74e3038d40fd0931e1828f1d49cb4d73ede3b1518cef6c8e76c536b8dc358577f8e6a356c2212109 SHA512 1c7d1084b0b7fde0f3e66e1cf145838416c474fc77ce14b3008c6cc7466830fd943e64905dec92e3af995c0d47884e2c30d72a291573baae5131094ec2aa62f9
+EBUILD google-chrome-beta-64.0.3282.119.ebuild 3593 BLAKE2B bc6a87fae269cce9f7fc44957ec4bf9b0d410204a1e3cc7774c4301ef5b804de042f69ac7e5e89adb3f64ee24fb320115f207317e1046bfcf2e8515ed7f6469c SHA512 c8267d0725d52f925bd923e172e2d73651112a5992e1716ae057cd021a39fc6d291f1c92e13ed19b807bfaa6696b9572699a5088e27c686001cdf9556f73802a
 MISC metadata.xml 517 BLAKE2B dfd840aa3f7845f67c8d6cca488d89845ca7c259eb4df00f8458ae48b1962df91ca8299ef34785f635dcab25b445246e999fbbfef3bdd7117a4ee1b14beca420 SHA512 837becd9e41aca24694cd10a7bddbc5ca501aca983832daccb4c091a7712267ef20051e7a19af02bc3b48eed89c9e18aa0d46ca2411e1d58d045ceb732a180af
diff --git a/www-client/google-chrome-beta/google-chrome-beta-64.0.3282.99.ebuild b/www-client/google-chrome-beta/google-chrome-beta-64.0.3282.119.ebuild
index de7c15f9a485..de7c15f9a485 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-64.0.3282.99.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-64.0.3282.119.ebuild
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index 562e7fedfa60..43240abd2f6d 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-unstable_65.0.3322.3-1_amd64.deb 53388158 BLAKE2B 460db1e4c0a82565e626c57c0bb2f94a3689e2fc8e884fb5a2884ba57fdbde06120817ba210416b90635258ee44f849b294d2e522b44e9987088c62362303634 SHA512 c91aef303086e1d7a188c4f7ca06a62d324b9d3055fb97074369e85698ce7c35dfc58745622231a296edaf9ecc9501e7e6858e05104a2fa8661e462eb2e529d8
-EBUILD google-chrome-unstable-65.0.3322.3.ebuild 3592 BLAKE2B af60284f4aaacc4a596ee16638d6e5743e9da3d4c675c70fc1a23bb52a77ce4bc6244fcf33180ad56785636e7adcb1c7d2632b9a3e79183a8b12db097fc8f2ca SHA512 22dd0e15181c6f9ebd5fa0eba67198ea9fa6c68433ae95431b6e4477330273ec2571867bb648e867599bff6663818d0f56817e91018d3d99fdf2a939b46fa2ee
+DIST google-chrome-unstable_65.0.3325.18-1_amd64.deb 53125400 BLAKE2B ab0940c909965a71a57f5434fe50cab8cbc34bbc106e8db6f233738f6964e0bae6f6f43c92045e9d7c9752555e26ce38a0743628a5d9f4d42d6a499507f092a1 SHA512 3dc9ec6c46f13d01a0fa114cc5b95a2ff1b622061ad413b470203fd29e5efb7693d08cee0a804fbcd148fa7e3257fc6877e309d8da0f6cb17e1f9936b2a9d591
+EBUILD google-chrome-unstable-65.0.3325.18.ebuild 3592 BLAKE2B af60284f4aaacc4a596ee16638d6e5743e9da3d4c675c70fc1a23bb52a77ce4bc6244fcf33180ad56785636e7adcb1c7d2632b9a3e79183a8b12db097fc8f2ca SHA512 22dd0e15181c6f9ebd5fa0eba67198ea9fa6c68433ae95431b6e4477330273ec2571867bb648e867599bff6663818d0f56817e91018d3d99fdf2a939b46fa2ee
 MISC metadata.xml 517 BLAKE2B dfd840aa3f7845f67c8d6cca488d89845ca7c259eb4df00f8458ae48b1962df91ca8299ef34785f635dcab25b445246e999fbbfef3bdd7117a4ee1b14beca420 SHA512 837becd9e41aca24694cd10a7bddbc5ca501aca983832daccb4c091a7712267ef20051e7a19af02bc3b48eed89c9e18aa0d46ca2411e1d58d045ceb732a180af
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-65.0.3322.3.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-65.0.3325.18.ebuild
index 83a0297e3596..83a0297e3596 100644
--- a/www-client/google-chrome-unstable/google-chrome-unstable-65.0.3322.3.ebuild
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-65.0.3325.18.ebuild
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index aa69ec3abe8d..e654087bd875 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-stable_63.0.3239.132-1_amd64.deb 49565326 BLAKE2B 827949d0de954f3be5717674b4d1ed7d81147e23634144625c20c23274f468a8e2be7567efae0a52ddefa9bb130e2d5c00f46924104ed04c8ea1258680a2a368 SHA512 d3be097e7cc7f40038f3318eed6fac2feef890157ebc50b9b4936b941ceb4cce13ae46e76d78c82788e360b6abbe3ba69b11925bbfc4211c68665fc82659fada
-EBUILD google-chrome-63.0.3239.132.ebuild 3560 BLAKE2B b396fd04290d7c47f9ca38b7775a98dc9799474d0f35d47268a1d72ca8658c4ee73e0fc4d53f5c323f850e6c5af04d3af459f64c1ce6d827f1929679ca15572a SHA512 a8d079f2dd765f03e1a0b53ffab09d90628acbdbc57d49b1e838c99e7dfd0a7c0e87c055f6a709d40d27f913d4943ec03abe35808ac33c42694574f9a2a9e88f
+DIST google-chrome-stable_64.0.3282.119-1_amd64.deb 51690924 BLAKE2B 295fb0aa2a5dbd855414cc7c7382fee8b9ee4936cee56c583e57ec13cbfa4744e9491207f5966e1ae79d39b75da2fa0c33ac495d632e14bad48016e73495f1d5 SHA512 7bf351e7840a1c7d7e3fddb9c38d392c39dfadd5a8e2624ec434e4d3f5815682317234858cfd493c537e4695ecdf1d57bed3caaece9eb1bc9ac2ec90fa86f0b6
+EBUILD google-chrome-64.0.3282.119.ebuild 3587 BLAKE2B 419cf481beeb511151513e4579fea2c8b0262c081023d28f08eb89118e54aa11b74711a11fc0964f8471d0aa19a4033e6d60e9ad2d7bce2875707637a8c95964 SHA512 eafe1bdf4704c58343645defcc46bcabcb21bbd0febf97229bb00fb3ab6f5970553eac04f908759669212eab3dcc4e509e2f9297f1f2bea1d6cf33f01bd3c5a2
 MISC metadata.xml 517 BLAKE2B dfd840aa3f7845f67c8d6cca488d89845ca7c259eb4df00f8458ae48b1962df91ca8299ef34785f635dcab25b445246e999fbbfef3bdd7117a4ee1b14beca420 SHA512 837becd9e41aca24694cd10a7bddbc5ca501aca983832daccb4c091a7712267ef20051e7a19af02bc3b48eed89c9e18aa0d46ca2411e1d58d045ceb732a180af
diff --git a/www-client/google-chrome/google-chrome-63.0.3239.132.ebuild b/www-client/google-chrome/google-chrome-64.0.3282.119.ebuild
index c8982c8fdbb1..e31bc7ad4066 100644
--- a/www-client/google-chrome/google-chrome-63.0.3239.132.ebuild
+++ b/www-client/google-chrome/google-chrome-64.0.3282.119.ebuild
@@ -30,13 +30,14 @@ RESTRICT="bindist mirror strip"
 
 DEPEND=""
 RDEPEND="
+	app-accessibility/at-spi2-atk:2
 	app-arch/bzip2
 	app-misc/ca-certificates
+	dev-libs/atk
 	dev-libs/expat
 	dev-libs/glib:2
 	dev-libs/nspr
 	>=dev-libs/nss-3.26
-	gnome-base/gconf:2
 	media-libs/alsa-lib
 	media-libs/fontconfig
 	media-libs/freetype:2
diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz
index f7f9032bf657..0fca1706ee38 100644
--- a/www-misc/Manifest.gz
+++ b/www-misc/Manifest.gz
diff --git a/www-misc/monitorix/Manifest b/www-misc/monitorix/Manifest
index 48c0cfbedc8c..ba16e769f550 100644
--- a/www-misc/monitorix/Manifest
+++ b/www-misc/monitorix/Manifest
@@ -1,7 +1,9 @@
 AUX monitorix.init 659 BLAKE2B 2e27776bc3b992b2962aabf315f6baebd4c316fcd228edfaeca174e6d48d87a7d45ced4837aa49055f02ebaf52042c429ada3acb6a8132310f66955c033ca663 SHA512 a33a62d698ae799d444bb8cc30b452ff78541fd7d721428e82943fb6cb898d84aa276b75fa069aa010ae712dcdba587ccd4ca6a211c87e36bb7674bc716f4fb8
+DIST monitorix-3.10.0.tar.gz 309688 BLAKE2B 58345fbe02e24be48baecb1b91b4c24de8bec1960557e4713c4007c7c1649627d79caf823893eba4f9c9bc1330cc739f2c4e248421795235107ddf5164e998f5 SHA512 a313b25c4b8a614d62d67e9649227461a0faf83704baebb01318acb8d42dc336b747dd5f4a9fc5ddbd7ef10598d96577d1265c0022dfb0a94826e1da5cfc33d2
 DIST monitorix-3.5.1.tar.gz 218548 BLAKE2B 3424e391fed25cf9dd400abe7c2acbba3ad7103fb4bb9c464e921ed6b8ef320639b98956afe0aeaff9522857eef31ba0e55b755de9a21f8b7dbde2755f33e3fc SHA512 cf64f89e147f3ddf31d48e593d5a5f09be827fd9a104c5cc28b1146e491507476d4f86bf249fda24ce92d7e37a3699dd94501d441c3767d12dfbabe4d782c37c
 DIST monitorix-3.8.1.tar.gz 270985 BLAKE2B 554b391aa4427f194eecde22f70a99fd45f7d295c381eb14d85cda795b9a0f4cd1647231882ede84919d0a1e35f15dd1df8abe2bcd4016b51b0a353c2030da1a SHA512 d07f6b2fc69efffd3fccd76db7ca94640d68fd016979b41fd19f1aa5951c0da7dd5513fe82482c020d4b60ab5187e3c7b704cca80331bd826d050f2ac8538b02
 DIST monitorix-3.9.0.tar.gz 288443 BLAKE2B 6203f2950e0061d1ff268a2c42c31e7e14b5103e09ec82411f3ee3b957212c8799ba00710b269e0097ed0a3c060eb2d6972dd7b2c1af820bb09de2281113238c SHA512 599f3fa004c2e9657f255ca0ef0ae69ca63623976d17ebf8883a8c19b8a76193916634844f794da508439336edc37e424263aa6ccd8e06bb3584b6cf3cda783b
+EBUILD monitorix-3.10.0.ebuild 2654 BLAKE2B 13bd911e0323a50fda071571fe2a30aa241542a3c3cdf0081dab069422da60a3532d1e42caa2163b301bfea3524c6d1c25e250d0e16a8b566521e8a6cd14a3cc SHA512 2cea6e2f3327a3a45b9cd5568df0acec9cef36656158bc7c0528552450ba4a062910cd01f98e8583c3ca6e3db31fa8df80e161993f16bd352b4e93da5d3e328d
 EBUILD monitorix-3.5.1.ebuild 2446 BLAKE2B d92d145d1e008bf1e2e1762339e11f5b282fd0c20a87dee0ee0b5bbab3299862757e5a19bdf80bd75d17bea146ff14faa396fa09061558b7cd59808efab27367 SHA512 1465b39ed3cadd34d347bf6297b53de7f71598144b7bbde4e688f6023e011beebfceb7c5156b34abe4ba66751ea743875faca45c8ae3bd3f9c44e36c29b6923e
 EBUILD monitorix-3.8.1-r1.ebuild 2614 BLAKE2B 10cdc025e0bf1cec51620a8bddd8b0f5a40cd2431f9fc942bb639eed692a3df385aadf8cbdb2247c74b1106b87f23a5a6b253dfc4387c451fd875c75877b4801 SHA512 0b5681b3328bd6802bf8439409dfa02a14dd299b16d49440a75f5f9b927823548d6b6f8d46df971eb9c56a9cd696bddfd54da5fd09b80e9ec7c42b6881b63808
 EBUILD monitorix-3.9.0.ebuild 2654 BLAKE2B 6cc43f4fb9538b44dd57dc51ecc7d2a399b90fa0ff86484dc805eb28d7b959905aafffbbdecbc7d40ff4d67243710d3b20832d479a7ce88b94b9bb6041bd80e1 SHA512 c43839a7b5d16f45cdf0fadcab14c223cfe1e052bcfb73750257e471df7352a8ac79a64f9f9ad1a8562d2b1d31a13c4ffa37f597b18120698a6219b52b5055d8
diff --git a/www-misc/monitorix/monitorix-3.10.0.ebuild b/www-misc/monitorix/monitorix-3.10.0.ebuild
new file mode 100644
index 000000000000..52fd90b802b0
--- /dev/null
+++ b/www-misc/monitorix/monitorix-3.10.0.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit systemd user
+
+DESCRIPTION="A lightweight system monitoring tool"
+HOMEPAGE="http://www.monitorix.org/"
+SRC_URI="https://github.com/mikaku/Monitorix/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="apcupsd hddtemp httpd lm_sensors postfix"
+S="${WORKDIR}/Monitorix-${PV}"
+
+RDEPEND="dev-perl/Config-General
+	dev-perl/DBI
+	dev-perl/HTTP-Server-Simple
+	dev-perl/IO-Socket-SSL
+	dev-perl/libwww-perl
+	dev-perl/MIME-Lite
+	dev-perl/XML-Simple
+	net-analyzer/rrdtool[graph,perl]
+	dev-perl/CGI
+	apcupsd? ( sys-power/apcupsd )
+	hddtemp? ( app-admin/hddtemp )
+	httpd? ( virtual/httpd-cgi )
+	lm_sensors? ( sys-apps/lm_sensors )
+	postfix? ( net-mail/pflogsumm dev-perl/MailTools )"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+}
+
+src_prepare() {
+	# Put better Gentoo defaults in the configuration file.
+	sed -e "s|\(base_dir.*\)/usr/share/${PN}|\1/usr/share/${PN}/htdocs|" \
+		-e "s|\(secure_log.*\)/var/log/secure|\1/var/log/auth.log|" \
+		-e "s|nobody|${PN}|g" -i ${PN}.conf || die
+	eapply_user
+}
+
+# Override compile phase
+src_compile() { :; }
+
+src_install() {
+	dosbin ${PN}
+
+	newinitd "${FILESDIR}"/${PN}.init ${PN}
+
+	insinto /etc/monitorix
+	doins ${PN}.conf
+
+	keepdir /etc/${PN}/conf.d
+
+	insinto /etc/logrotate.d
+	newins docs/${PN}.logrotate ${PN}
+
+	dodoc Changes README{,.nginx} docs/${PN}-{alert.sh,apache.conf,lighttpd.conf}
+	doman man/man5/${PN}.conf.5
+	doman man/man8/${PN}.8
+
+	insinto /var/lib/${PN}/www
+	doins logo_bot.png logo_top.png ${PN}ico.png
+
+	keepdir /var/lib/${PN}/www/imgs
+	fowners monitorix:monitorix /var/lib/${PN}/www/imgs
+
+	exeinto /var/lib/${PN}/www/cgi
+	doexe ${PN}.cgi
+
+	dodir /usr/lib/${PN}
+	exeinto /usr/lib/${PN}
+	doexe lib/*.pm
+
+	keepdir /var/lib/${PN}/usage
+	insinto /var/lib/${PN}/reports
+	doins -r reports/*
+
+	systemd_dounit docs/${PN}.service
+}
+
+pkg_postinst() {
+	elog "WARNING: ${PN} has changed its config format twice, in versions"
+	elog "3.0.0 and 3.4.0; this format may be incompatible with your existing"
+	elog "config file. Please take care if upgrading from an old version."
+	elog ""
+
+	elog "${PN} includes its own web server as of version 3.0.0."
+	elog "For this reason, the dependency on the webapp framework"
+	elog "has been removed. If you wish to use your own web server,"
+	elog "the ${PN} web data can be found at:"
+	elog "${EROOT%/}/var/lib/${PN}/www/"
+
+	elog ""
+	elog "If you are not using monitorix built-in web server, please set"
+	elog "the correct user and group ownership of ${EROOT%/}/var/lib/${PN}/www/imgs/"
+}
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index e7b208cf88c2..005694502aef 100644
--- a/www-plugins/Manifest.gz
+++ b/www-plugins/Manifest.gz
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index cbc0db432be8..318a153165d7 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,7 +1,7 @@
-DIST google-chrome-beta_64.0.3282.99-1_amd64.deb 52711654 BLAKE2B b06f9e4379988de37fe357d933e84dac0866e81cdcfe0270ba16a48cc79aa192fc65f2576c809b4ed41f4e54c59d5ad58b51fd12d8bf91cf1b85e0d240e2ccac SHA512 4d52c6de2e6bfe1a82cb8bccabf32d0cf15fba481da8a888da36ac7b00f721b5d8ba985ddb4041abb4a58f310d23cff2363cdadcf521027218698c4a6cd93d3c
-DIST google-chrome-stable_63.0.3239.132-1_amd64.deb 49565326 BLAKE2B 827949d0de954f3be5717674b4d1ed7d81147e23634144625c20c23274f468a8e2be7567efae0a52ddefa9bb130e2d5c00f46924104ed04c8ea1258680a2a368 SHA512 d3be097e7cc7f40038f3318eed6fac2feef890157ebc50b9b4936b941ceb4cce13ae46e76d78c82788e360b6abbe3ba69b11925bbfc4211c68665fc82659fada
-DIST google-chrome-unstable_65.0.3322.3-1_amd64.deb 53388158 BLAKE2B 460db1e4c0a82565e626c57c0bb2f94a3689e2fc8e884fb5a2884ba57fdbde06120817ba210416b90635258ee44f849b294d2e522b44e9987088c62362303634 SHA512 c91aef303086e1d7a188c4f7ca06a62d324b9d3055fb97074369e85698ce7c35dfc58745622231a296edaf9ecc9501e7e6858e05104a2fa8661e462eb2e529d8
-EBUILD chrome-binary-plugins-63.0.3239.132.ebuild 1438 BLAKE2B 25df8bdde008f7711eb41c4f616ba55ad4fee20604ba67ffd3e0b55b016896b1e71258cd894f1060e69b3ba65499ed16218bc835f5bff1318fe6529c01e9b8da SHA512 bf8818ec496fb2be1edda7f6e84920e048f8f7017e53a4d14bd52329b458f38efd2d5cc3b39190385a5e0926c8cbd6f73f2433c7abd259fdb70d51e0e245c0bb
-EBUILD chrome-binary-plugins-64.0.3282.99_beta.ebuild 1439 BLAKE2B 5f77619a2d3be3c2840d7f0dd9e4e5b74fb89d9218e04c61c49047155c4124efcf6b78b4549207ed0211dbc27f4fe57626511e5f1dcc6daed062aefdc2481b17 SHA512 265ee07635c092c6c7d84b1e6276730416f87e513bfbfa70b5943a2790aa62ba4c4b184fb772794fc4e9e9765dc86099665a50d339a89b2ac360176493a2ef9f
-EBUILD chrome-binary-plugins-65.0.3322.3_alpha.ebuild 1439 BLAKE2B 5f77619a2d3be3c2840d7f0dd9e4e5b74fb89d9218e04c61c49047155c4124efcf6b78b4549207ed0211dbc27f4fe57626511e5f1dcc6daed062aefdc2481b17 SHA512 265ee07635c092c6c7d84b1e6276730416f87e513bfbfa70b5943a2790aa62ba4c4b184fb772794fc4e9e9765dc86099665a50d339a89b2ac360176493a2ef9f
+DIST google-chrome-beta_64.0.3282.119-1_amd64.deb 52849306 BLAKE2B 7459cff0039ff73e85d6da7ceedfc9066548c220a5fbf69d74e3038d40fd0931e1828f1d49cb4d73ede3b1518cef6c8e76c536b8dc358577f8e6a356c2212109 SHA512 1c7d1084b0b7fde0f3e66e1cf145838416c474fc77ce14b3008c6cc7466830fd943e64905dec92e3af995c0d47884e2c30d72a291573baae5131094ec2aa62f9
+DIST google-chrome-stable_64.0.3282.119-1_amd64.deb 51690924 BLAKE2B 295fb0aa2a5dbd855414cc7c7382fee8b9ee4936cee56c583e57ec13cbfa4744e9491207f5966e1ae79d39b75da2fa0c33ac495d632e14bad48016e73495f1d5 SHA512 7bf351e7840a1c7d7e3fddb9c38d392c39dfadd5a8e2624ec434e4d3f5815682317234858cfd493c537e4695ecdf1d57bed3caaece9eb1bc9ac2ec90fa86f0b6
+DIST google-chrome-unstable_65.0.3325.18-1_amd64.deb 53125400 BLAKE2B ab0940c909965a71a57f5434fe50cab8cbc34bbc106e8db6f233738f6964e0bae6f6f43c92045e9d7c9752555e26ce38a0743628a5d9f4d42d6a499507f092a1 SHA512 3dc9ec6c46f13d01a0fa114cc5b95a2ff1b622061ad413b470203fd29e5efb7693d08cee0a804fbcd148fa7e3257fc6877e309d8da0f6cb17e1f9936b2a9d591
+EBUILD chrome-binary-plugins-64.0.3282.119.ebuild 1438 BLAKE2B 25df8bdde008f7711eb41c4f616ba55ad4fee20604ba67ffd3e0b55b016896b1e71258cd894f1060e69b3ba65499ed16218bc835f5bff1318fe6529c01e9b8da SHA512 bf8818ec496fb2be1edda7f6e84920e048f8f7017e53a4d14bd52329b458f38efd2d5cc3b39190385a5e0926c8cbd6f73f2433c7abd259fdb70d51e0e245c0bb
+EBUILD chrome-binary-plugins-64.0.3282.119_beta.ebuild 1439 BLAKE2B 5f77619a2d3be3c2840d7f0dd9e4e5b74fb89d9218e04c61c49047155c4124efcf6b78b4549207ed0211dbc27f4fe57626511e5f1dcc6daed062aefdc2481b17 SHA512 265ee07635c092c6c7d84b1e6276730416f87e513bfbfa70b5943a2790aa62ba4c4b184fb772794fc4e9e9765dc86099665a50d339a89b2ac360176493a2ef9f
+EBUILD chrome-binary-plugins-65.0.3325.18_alpha.ebuild 1439 BLAKE2B 5f77619a2d3be3c2840d7f0dd9e4e5b74fb89d9218e04c61c49047155c4124efcf6b78b4549207ed0211dbc27f4fe57626511e5f1dcc6daed062aefdc2481b17 SHA512 265ee07635c092c6c7d84b1e6276730416f87e513bfbfa70b5943a2790aa62ba4c4b184fb772794fc4e9e9765dc86099665a50d339a89b2ac360176493a2ef9f
 MISC metadata.xml 341 BLAKE2B da1d1a85bb21e659671b98e12d0b3b31760dab269f8d298b44923f6936a4c43a27b67bff50adf76cb883460d5fe3112027d9b678826eeb220448cd114805320e SHA512 253960d995af2946bafa0bcd96a874e50197aa629efd0dfe7ce404dc72180a2298119b9cabd0b605c65b0894fe0316f7b3bdab602bdfade4323a0bdd70311fdd
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-63.0.3239.132.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-64.0.3282.119.ebuild
index c62a441fcb51..c62a441fcb51 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-63.0.3239.132.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-64.0.3282.119.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-64.0.3282.99_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-64.0.3282.119_beta.ebuild
index e94c35d47021..e94c35d47021 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-64.0.3282.99_beta.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-64.0.3282.119_beta.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-65.0.3322.3_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-65.0.3325.18_alpha.ebuild
index e94c35d47021..e94c35d47021 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-65.0.3322.3_alpha.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-65.0.3325.18_alpha.ebuild
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 23ec53b03976..383bc7136e79 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/fusion-icon/Manifest b/x11-apps/fusion-icon/Manifest
deleted file mode 100644
index a2881cc42430..000000000000
--- a/x11-apps/fusion-icon/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX fusion-icon-0.1-qt4-interface-subprocess-call.patch 1078 BLAKE2B d21307065b2028590b4fa24cf627224035ea93f24043a0775c63319bb9243fdcc61a685b80f8d6ce56ab91e47f0f7aaa7a30128ffd5fa8c003d66ed8a41618c8 SHA512 f144178a25dc3d22a6e5d43f939a77215f8b6b9be99366043567e3e9a1b1969fc7d45f376d8879fc6636295b8a2a090068ffcac56150bc0309c79b2c762326e7
-DIST fusion-icon-0.1.tar.gz 30508 BLAKE2B 8ab8c0eb1ff63c7d6dce128a8e20983028e8ef5bae6a5a7affcbcf2da87a552046fc57afaf9c469a566b7cd7f93322b8e277b67cab2a4072b2acf6371b50c7a6 SHA512 0c22d0c7a22a9c20f1285114f8b785aff6cf863d4fe3ea1198618b13d7144f459f131dccf885442908fcd82ab4ff69e5fc42e95314836725b0e51fa3190c2bcc
-DIST fusion-icon-0.2.4.tar.xz 29264 BLAKE2B 0c236c04ec870ee1d583bb4bcc3efcfa26c218af55214b214fc79c528decb0fe1a2c8a00646c52d64afe4c8dd67fab4bd6495fa5b2846894161aa54d6b5bdcb1 SHA512 dbdc68abef3ed243db30a72f367dc0ed8f875fa614c85e24235cbf06a8e1433bc30b175d43abbd8b5adf3150275f619a992602f1475cbdf235ae9cd9e1545848
-EBUILD fusion-icon-0.1-r4.ebuild 1093 BLAKE2B a12103b976a303c6c96f0fe4a77d058b0249cc85f03cd34022a9451a6e715a10199e0f72c722878c2f470e1189ba3e949cbddbb355afa3c2da675ab9086a1c92 SHA512 418c2b7deb6763b860b59e24b6929f2034b74a1286cce17b4b5139b0c9872cdb7069271ea4d72b3a6a30d4e5b5b382ae38910fc28922516ce65b59a5dc6af276
-EBUILD fusion-icon-0.2.4.ebuild 873 BLAKE2B b0899a7ac92857f82bb45ed5d988bcde7445fdd50e12fffa072a67fc54ddb6b0a8323319985a6b42eafe8da637054a09be5c619f9d595f9c17b10465f9094458 SHA512 536d31f6f401c27621c31342b4fca5f7282357099ac635dd47259badc197564f4d3755766f74fd4d8a6eb6f0e409315162937148117d18e557720b3e3442ff82
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/x11-apps/fusion-icon/files/fusion-icon-0.1-qt4-interface-subprocess-call.patch b/x11-apps/fusion-icon/files/fusion-icon-0.1-qt4-interface-subprocess-call.patch
deleted file mode 100644
index 4829e18e60e6..000000000000
--- a/x11-apps/fusion-icon/files/fusion-icon-0.1-qt4-interface-subprocess-call.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- FusionIcon/interface_qt4/main.py.orig	2012-06-05 17:54:13.000000000 +0400
-+++ FusionIcon/interface_qt4/main.py		2012-06-05 18:01:13.000000000 +0400
-@@ -19,6 +19,7 @@
- import sys, os, time
- from PyQt4 import QtGui, QtCore
- from FusionIcon.start import wms, apps, options, decorators, init
-+import subprocess
- 
- class Build(QtGui.QApplication):
- 	def reload_wm(self):
-@@ -63,9 +64,9 @@
- 				actionWD.setChecked(True)
- 		self.Tray.menu = QtGui.QMenu()
- 		if 'ccsm' in apps:
--			self.Tray.menu.addAction(apps['ccsm'].label, lambda: run(['ccsm']))
-+			self.Tray.menu.addAction(apps['ccsm'].label, lambda: subprocess.call(['ccsm']))
- 		if 'emerald theme manager' in apps:
--			self.Tray.menu.addAction(apps['emerald theme manager'].label, lambda: run(apps['emerald theme manager'].command))
-+			self.Tray.menu.addAction(apps['emerald theme manager'].label, lambda: subprocess.call(apps['emerald theme manager'].command))
- 		if 'ccsm' in apps or 'emerald theme manager' in apps:
- 			self.Tray.menu.addSeparator()
- 		self.Tray.menu.addAction("Reload Window Manager", self.reload_wm)
diff --git a/x11-apps/fusion-icon/fusion-icon-0.1-r4.ebuild b/x11-apps/fusion-icon/fusion-icon-0.1-r4.ebuild
deleted file mode 100644
index d781541f333d..000000000000
--- a/x11-apps/fusion-icon/fusion-icon-0.1-r4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils gnome2-utils
-
-MINIMUM_COMPIZ_RELEASE=0.6.0
-
-DESCRIPTION="Compiz Fusion Tray Icon and Manager"
-HOMEPAGE="http://compiz.org"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+gtk qt4"
-
-REQUIRED_USE="|| ( gtk qt4 )"
-
-RDEPEND="
-	>=dev-python/compizconfig-python-${MINIMUM_COMPIZ_RELEASE}
-	>=x11-wm/compiz-${MINIMUM_COMPIZ_RELEASE}
-	x11-apps/xvinfo
-	gtk? ( >=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}] )
-	qt4? ( dev-python/PyQt4[X,${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=( "${FILESDIR}"/${P}-qt4-interface-subprocess-call.patch )
-
-python_install() {
-	distutils-r1_python_install
-	use gtk || rm -r "${D}$(python_get_sitedir)/FusionIcon/interface_gtk" || die
-	use qt4 || rm -r "${D}$(python_get_sitedir)/FusionIcon/interface_qt4" || die
-}
-
-pkg_postinst() {
-	use gtk && gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	use gtk && gnome2_icon_cache_update
-}
diff --git a/x11-apps/fusion-icon/fusion-icon-0.2.4.ebuild b/x11-apps/fusion-icon/fusion-icon-0.2.4.ebuild
deleted file mode 100644
index 16d202465323..000000000000
--- a/x11-apps/fusion-icon/fusion-icon-0.2.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 gnome2-utils
-
-DESCRIPTION="Compiz Fusion Tray Icon and Manager"
-HOMEPAGE="http://compiz.org"
-SRC_URI="https://github.com/compiz-reloaded/${PN}/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+gtk qt5"
-
-REQUIRED_USE="|| ( gtk qt5 )"
-
-RDEPEND="
-	dev-python/compizconfig-python[${PYTHON_USEDEP}]
-	x11-apps/xvinfo
-	x11-wm/compiz
-	gtk? ( dev-python/pygobject:3[${PYTHON_USEDEP}] )
-	qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-python_configure_all() {
-	esetup.py build \
-		$(use gtk && echo --with-gtk=3) \
-		$(use qt5 && echo --with-qt=5)
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/x11-apps/fusion-icon/metadata.xml b/x11-apps/fusion-icon/metadata.xml
deleted file mode 100644
index 7a38bb900964..000000000000
--- a/x11-apps/fusion-icon/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index d8a722cc9995..49a4086a1d80 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/compiz-bcop/Manifest b/x11-libs/compiz-bcop/Manifest
deleted file mode 100644
index b10ba838e5c7..000000000000
--- a/x11-libs/compiz-bcop/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST compiz-bcop-0.8.8.tar.bz2 75886 BLAKE2B 39ea833799fe9b8846200441e4d14cf7f27a9e54d1dd4c8fe4d6c9469cb40f20f015ea134f026643b3e6b02771cfb47a434b23bac3eacb053954220db704c759 SHA512 6b24400d6a347adbdf2f8d2a3c63f1371101d8dc6d4119547079b8a554d4ac9d5ff46cdeecd486886b4c5afe56a881111d877c73f4dde85978442ac45b539b7c
-EBUILD compiz-bcop-0.8.8.ebuild 431 BLAKE2B bcfdf872c4fc1f4dbdd0fd3ed8283dcc50c273a2e0b2c25a1531c39b9ca9529af9df9665f7010dd8b2ebb90c2d9bdf6549ce58e953bf1fcb2199eafe769346bf SHA512 399cb69a24ba3a47196a0c69c0937ba6e27d8f579dccb3c9f22561ae71e8f783bc545302a4e2a236d49f1875c38d73cc9206eac2b1a8723154b3903f66ff0daf
-MISC metadata.xml 364 BLAKE2B 00dbe268b638d33f7da01924d471f2272b0434af495a91e122af844037961b497e1697ca482f78458bde65df37329461ebfec308181c7f4bd338956cbc5014bc SHA512 1b5e72aca80016149fa21e56fa2bb93dc58748e91472a591aa3544d5dd9a5a5b9296ae9fc07d537f0e2c8dd00c672a63601c9392aaed2216b6d1016d07a44a85
diff --git a/x11-libs/compiz-bcop/compiz-bcop-0.8.8.ebuild b/x11-libs/compiz-bcop/compiz-bcop-0.8.8.ebuild
deleted file mode 100644
index 71c4cf713133..000000000000
--- a/x11-libs/compiz-bcop/compiz-bcop-0.8.8.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Compiz Option code Generator"
-HOMEPAGE="http://www.compiz.org/"
-SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/libxslt"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS="AUTHORS ChangeLog INSTALL NEWS README"
diff --git a/x11-libs/compiz-bcop/metadata.xml b/x11-libs/compiz-bcop/metadata.xml
deleted file mode 100644
index 512bda99f2f5..000000000000
--- a/x11-libs/compiz-bcop/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!--maintainer-needed-->
-<longdescription lang="en">
-BCOP is a code generator that provides an easy way to handle plugin options by
-generating parts of the plugin code directly from the xml metadata file. 
-</longdescription>
-</pkgmetadata>
diff --git a/x11-libs/compizconfig-backend-gconf/Manifest b/x11-libs/compizconfig-backend-gconf/Manifest
deleted file mode 100644
index 670a176d7755..000000000000
--- a/x11-libs/compizconfig-backend-gconf/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST compizconfig-backend-gconf-0.8.8.tar.bz2 248650 BLAKE2B 9957c59e4fe1f6ba2a137204a6e70fac01b609e4b854b10dcbf11825147d6576e69d414f85797b8da8172a36a372353011e25b2c1a09eb35b36c915635c4caf3 SHA512 b8405660dfc93d7615b491523e7dd07c585e14f51f5de8237a88dbdefbf5fc8a338ceecc5ab10daef262add8a98fb4db5f3b9658d42b833b76fc0f486be51b92
-EBUILD compizconfig-backend-gconf-0.8.8.ebuild 619 BLAKE2B d24c7861193136fe7d1223bf67b37aa90206567af767faff68403ba415bdcf2c72b458199562e0f9b40653018e97e6ed141e7b4aa5465c3196e578240b87b30b SHA512 30ff37cfe10771594b3c6af6c284b33b0d8fd9541e5499354e5a46fb78df9eadbcbbb03c54fabf7e374749681c951839800084f607988b43eaeac3b54145d9ec
-MISC metadata.xml 249 BLAKE2B 1754355a901058a885f183e6edfb02e01b523cda65942f8f777d67ba0a3a111634ded8d7d6e33f6bd9080212defc456b9aa9ce83b7eb6410efc2ce1a8edf78f6 SHA512 482ef543c7b1ede05705e00771ef3b47b6c3d62fe96c2418f188923b24d2090594667fcca493829c6e420700b2b852897cf65f5256997cac0fd0021cd346aa65
diff --git a/x11-libs/compizconfig-backend-gconf/compizconfig-backend-gconf-0.8.8.ebuild b/x11-libs/compizconfig-backend-gconf/compizconfig-backend-gconf-0.8.8.ebuild
deleted file mode 100644
index a47d6c4b4e52..000000000000
--- a/x11-libs/compizconfig-backend-gconf/compizconfig-backend-gconf-0.8.8.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="Compizconfig Gconf Backend"
-HOMEPAGE="http://www.compiz.org/"
-SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=gnome-base/gconf-2.0:2
-	>=x11-libs/libcompizconfig-${PV}
-	>=x11-wm/compiz-${PV}
-"
-RDEPEND="${DEPEND}"
-
-DOCS="AUTHORS ChangeLog INSTALL NEWS README"
-
-src_configure() {
-	econf \
-		--enable-fast-install \
-		--disable-static
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/x11-libs/compizconfig-backend-gconf/metadata.xml b/x11-libs/compizconfig-backend-gconf/metadata.xml
deleted file mode 100644
index 2a469e3b0c68..000000000000
--- a/x11-libs/compizconfig-backend-gconf/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">The gconf backend for CompizConfig.</longdescription>
-</pkgmetadata>
diff --git a/x11-libs/gtksourceview/Manifest b/x11-libs/gtksourceview/Manifest
index a3abb2193ead..337d5c290bec 100644
--- a/x11-libs/gtksourceview/Manifest
+++ b/x11-libs/gtksourceview/Manifest
@@ -5,5 +5,5 @@ DIST gtksourceview-3.22.2.tar.xz 1596384 BLAKE2B d638cdec2aaa510c0039d9cbda3105e
 DIST gtksourceview-3.24.6.tar.xz 1623288 BLAKE2B 2332b31534f4fb7e4115e3827c3d57fe4d465eda67c977d238521fc68e0390809e1f0fc46e75adec2b966c83fe5ce0caa3cf312eba97bba76b9b7719b94ca42b SHA512 1b7621dbc1effc979fe08af8e6683ef43cc25563aab37a87abce15a0aa74bd0698bf10377a3fc2539b0cba1ad2f4bce2bb3981ef2dd4245bfe2fcba866d72f5d
 EBUILD gtksourceview-2.10.5-r3.ebuild 1353 BLAKE2B e019389cd3e530c9f1d696d3574d7641125a0e10ad542d61949eb89d4a4f46bbfba1f37e2565f938228c43bba9cf34e611eadec8c222530c113ec17766e55c6b SHA512 1d8dfed14a7bca7114fd4641949144781775cf02344e4b4fc886c82374f92a73b61a81666cd1c7ab5ff75daaff71ed368d4f80a18480237a32129b17ce086fb6
 EBUILD gtksourceview-3.22.2.ebuild 1323 BLAKE2B 8ecf0ab49a768d96515df5c4790c30cb6a1d8382b45c9aa2110c392274af1f9b05987ace8ba9e5c787cae3b7c4248c37c33aac2070cfd7d9d60654e212191e2b SHA512 ff2ca2a7344608b335d59bb2391e85342e082a523ef1a799dd47c4c989f8e7bb294027f551b13546c2d84aac35913b2e0d122d52a1df03b5df289b652159fc45
-EBUILD gtksourceview-3.24.6.ebuild 1329 BLAKE2B a2540c93f9c772270fe68ab0e0a0a0c721968db930ef4da3a160ebea44e2ef083f56c8240affe44ccf3c28deeca81aab0007ccb4e219e80d08fd63956b58b75c SHA512 47879782b79c25f90c2db6ef4c75a2929ecdf55fa62914f1fd3fa3d5079a16d5841449c3627a2c2f7292d1f106f001bc1dd8d1dc6380e259e15b23ce70dd8f17
+EBUILD gtksourceview-3.24.6.ebuild 1328 BLAKE2B d62337dc91b4d18faa1bf336c7be20dcb3e5e3c53b7085b3a8ebd2069158c55f0cb1fe868a6fb7c7e80b3a2172d148ccbdbc85725e0909ca4188f73a94a17785 SHA512 257d4031ce633330662fa70cd809f459700b189838701829392a066a4cfcc1ae3d1c6c57b5710505222518c17de22a865341f7094e2c6abb61b0f38de6596b41
 MISC metadata.xml 318 BLAKE2B 63b73a76e8f01503afd3f29f3329056ce6b95614aceef233ee4308ab7589dd5f0f35b84f317ecdf5829847a01bdf18987ca87e345ea7e92bf9556d81b15dde1f SHA512 c0954dc93b8b12dbad5d31805afc40d8075c55aafc209d6292cdbc50727f4e17a24353d115004e1e6974fdbb4bdfdb1588ff86ad93b6a60cd1ed430c13865ac5
diff --git a/x11-libs/gtksourceview/gtksourceview-3.24.6.ebuild b/x11-libs/gtksourceview/gtksourceview-3.24.6.ebuild
index 1b8819dfcaed..6a1f23cbd062 100644
--- a/x11-libs/gtksourceview/gtksourceview-3.24.6.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-3.24.6.ebuild
@@ -16,7 +16,7 @@ SLOT="3.0/3"
 IUSE="glade +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.48:2
diff --git a/x11-libs/libcompizconfig/Manifest b/x11-libs/libcompizconfig/Manifest
deleted file mode 100644
index 7a6d699a862b..000000000000
--- a/x11-libs/libcompizconfig/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX libcompizconfig-0.8.8-avoid-using-templates-in-c-code.patch 891 BLAKE2B 2bbf827a4a6d2bc14738e4445f8932266c31e2dbbc290bdd8d0c2cb8ba928993a538b5ef2e085182c0a2176a3ce4995e1b8c4678aee644c1a591ec9d02f8a26e SHA512 db732c5560e52a71eacc7bd4268fd0ef443b74df498409861bdd98b4ccfee96e597c852017ee47ec9085c11e1c29f44687704287dce440ab9f3761be347ef142
-DIST libcompizconfig-0.8.8.tar.bz2 318176 BLAKE2B f0c5d8fc8749b1c5682a531c9aee8acc16988c3d3d8247558676c97134cd0d9d5bbcd7c2715610109468e7a149801cc64522bd3f8db8619121d69c0a76d72838 SHA512 1ba2f6143870d981e174c47fddb9fdd072a1c64a5a5f07779bd6261767a2c1a7612bdcb3f62a76c203f4ab630542c8ae750fff3ec30a0305f8851584c6a5d6bb
-EBUILD libcompizconfig-0.8.8-r1.ebuild 760 BLAKE2B 42bfb713624b2356bd89e70ef1227d7b2506662929fda937c5f028de20d590589f198e41db5343745200af9d059aefe748e4d4b460c08e11a808cf9b6cb29c23 SHA512 778482d7297a993b56badee8f6515f0350db60c239f2b3c3e034b1fca342877ba2a64c5e7029ac4a912cb48c9918c31644e8e83e2a86a22e298f381670d971d4
-MISC metadata.xml 280 BLAKE2B 85918f56209eb79e80123feaaf9403e94ae1978e9596676dd933d6bcffa80af5e39b87664d0c11a9375745770cce67f595bf38caf19de0a295d94815c79d8fb6 SHA512 ed98d8c9940bb34caffe9f419c28dc9934ff5c16e3d40186a3ce5900f67758da1883aa521e91ec81f3014b6d65000a4dd9898b69b2b9bad46b649b0182ba15f9
diff --git a/x11-libs/libcompizconfig/files/libcompizconfig-0.8.8-avoid-using-templates-in-c-code.patch b/x11-libs/libcompizconfig/files/libcompizconfig-0.8.8-avoid-using-templates-in-c-code.patch
deleted file mode 100644
index 498a4bfa4d12..000000000000
--- a/x11-libs/libcompizconfig/files/libcompizconfig-0.8.8-avoid-using-templates-in-c-code.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 1e42ea0e629d6a013e6e7ad7f5d1bbfd2ea11338 Mon Sep 17 00:00:00 2001
-From: Scott Moreau <oreaus@gmail.com>
-Date: Wed, 9 Dec 2015 12:51:12 -0700
-Subject: [PATCH] Avoid using templates in C code
-
-libxslt uses templates and we cannot use templates in C code. Move the headers
-using templates outside extern "C" clause.
----
- src/compiz.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/compiz.cpp b/src/compiz.cpp
-index 43da02f..e5aba0f 100644
---- a/src/compiz.cpp
-+++ b/src/compiz.cpp
-@@ -23,6 +23,9 @@
- #include <google/protobuf/io/zero_copy_stream_impl.h>
- #endif
- 
-+#include <libxslt/transform.h>
-+#include <libxslt/xsltutils.h>
-+
- extern "C"
- {
- #ifdef HAVE_CONFIG_H
-@@ -36,9 +39,6 @@ extern "C"
- #include <sys/stat.h>
- #include <errno.h>
- 
--#include <libxslt/transform.h>
--#include <libxslt/xsltutils.h>
--
- #include <locale.h>
- 
- #include <compiz-core.h>
diff --git a/x11-libs/libcompizconfig/libcompizconfig-0.8.8-r1.ebuild b/x11-libs/libcompizconfig/libcompizconfig-0.8.8-r1.ebuild
deleted file mode 100644
index a7fc1f919967..000000000000
--- a/x11-libs/libcompizconfig/libcompizconfig-0.8.8-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="Compiz Configuration System"
-HOMEPAGE="http://www.compiz.org/"
-SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/libxml2
-	dev-libs/protobuf
-	>=x11-wm/compiz-${PV}
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.41
-	virtual/pkgconfig
-	x11-proto/xproto"
-
-RESTRICT="test"
-
-#602286
-PATCHES=( "${FILESDIR}/${P}-avoid-using-templates-in-c-code.patch" )
-
-src_configure() {
-	econf \
-		--enable-fast-install \
-		--disable-static
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc TODO
-	prune_libtool_files --all
-}
diff --git a/x11-libs/libcompizconfig/metadata.xml b/x11-libs/libcompizconfig/metadata.xml
deleted file mode 100644
index 30804a862776..000000000000
--- a/x11-libs/libcompizconfig/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">Libcompizconfig is an alternative configuration system for compiz.</longdescription>
-</pkgmetadata>
diff --git a/x11-libs/libwnck/Manifest b/x11-libs/libwnck/Manifest
index 3c666187d207..39325da57031 100644
--- a/x11-libs/libwnck/Manifest
+++ b/x11-libs/libwnck/Manifest
@@ -3,5 +3,5 @@ DIST libwnck-3.20.1.tar.xz 693932 BLAKE2B 6a411ce9aa721ad158ba4c6cde6ca33892f834
 DIST libwnck-3.24.1.tar.xz 821508 BLAKE2B 18bc01a08107e0b2b040cb6036a80cb289955aa9365b7568292aa1c29dc77758bc9b11caa57b8cff6bebb75dd1d0bf7135b0cebed1e42c6ccc1c1372c6a224b5 SHA512 e8a31ab2dc0c282f1e0994ce6a2ccd18678dc5c140943399262e795052b7f5da2d6a5d388a74f4b10f8fac66ab138983a9caaee4e72c92a17c01ca5c39b731e1
 EBUILD libwnck-2.31.0.ebuild 1259 BLAKE2B edd3433c026c1403b11f3fb7a7dc75c1c2110e843f025db21a00590549ce060349b6f10dd689b1d28b04aec7d9eaa835f80ccedb806af78f0a302b404f53629c SHA512 f950573e13c676f6f7a802a7773b2b5bf1e6fc09d9c87e106edb4e94322ba3ae22fe39d1944803cba9011dc0ed05ab9e05230f31051a36f0c6d3b9288556f908
 EBUILD libwnck-3.20.1.ebuild 1165 BLAKE2B 20830076f1e238c26302ff8caa9174684f452598835f990b9c9cdc2dc8bcbccb2cd556fa30712d6d8de174949dea0ac3d162197bc640be37e9dbe513f4663e48 SHA512 32f9bca3d0a1b8dcfc3a086f0572d8a042ef7779dba599304caef2bdbf717565d05cae8ad3205cdd48a744e7a18429506c1b44c9325a542b4e682d78a841f25e
-EBUILD libwnck-3.24.1.ebuild 1161 BLAKE2B 475d06b6f47b2b38913bc1aba27952f985cb90436148309f007b9e5d923732b00fb5da9debbc473338c07f254486a6ba724b473298cfacd68f0c740730def7cf SHA512 9d9cc351965f67b63edd37a843a7eb2b9ae8e926406c9f32d65fe48a52cf28ba63d5e47c014853931286686603bec00fe35db7299773bdcd52ae7defd79193e7
+EBUILD libwnck-3.24.1.ebuild 1160 BLAKE2B be87a5ea1c2c75e9f8ded990c3ef5dc0c073cd30c38d44d5b6d6579d65178e773d3f8a956f21796f3d8046b01e8c36feec4e03a587d480c17795e7f92247e0cc SHA512 6868c5340bf239564ff75a2a3f00b106021eaa9bfa046fb699cd83e9b90cf59142eb58308c408819ca3ea2c5fc00ac117621bcb5bb31a201f027c7b420c2a22b
 MISC metadata.xml 364 BLAKE2B c8583191e40b2bf98262fbd4401a0ac47e53ec64294178a919499695b014f3ae8ee623de803cfffde58b4d63eda4572035703c5f1d550f14f4dcc974e9035c65 SHA512 47cae64c0f13376c312169703c6213582e37ccc70f00599754d7fa3daf0511e5da4221cd659e9ad98fe90d7791b0d513db45d2d0b7f1d833ef125f64ba40f2ce
diff --git a/x11-libs/libwnck/libwnck-3.24.1.ebuild b/x11-libs/libwnck/libwnck-3.24.1.ebuild
index c792f34e2def..1e847e8ce4d7 100644
--- a/x11-libs/libwnck/libwnck-3.24.1.ebuild
+++ b/x11-libs/libwnck/libwnck-3.24.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://developer.gnome.org/libwnck/stable/"
 
 LICENSE="LGPL-2+"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 IUSE="+introspection startup-notification tools"
 
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index a6b7f080d319..ab457d0badf0 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -2,6 +2,6 @@ DIST pango-1.40.12.tar.xz 856228 BLAKE2B c6fe562f64ac7b641b5b8519f831b999418ab06
 DIST pango-1.40.14.tar.xz 858388 BLAKE2B 1afcff08c38aa59ec57cdf43aa503e70a8c03b7d59c730060c9e3537f78ffe9a63e3aa1cb74ce9ce8d72541b5a5be8becb951f665f4663b108114686c41452c8 SHA512 35ba7bc8be3992f206ccc2cc5aca0b94e2a3832f887fc9c45b0e29fddcb9051ce05a74377de0ca4ff95a87983b15688fa5d379d592faf87aa8eaca25ac18b7ea
 DIST pango-1.40.3.tar.xz 1061044 BLAKE2B 79acd03144b58a3c160888cf4e3638faaf622cfcb406ddcd6a17907bddb7b3c6bf8c4a8ffbedb095664b7d19daa6837239e317d03e9a485f01b832227d1c3b7d SHA512 ff82395e8487624dffe212975b72b3383dcebb197a8675c8b409665e3e2e30fc23d9a6c25c3129a115adb7182b2a71a49550dbe881eb7ee9bbc572de6ba18d27
 EBUILD pango-1.40.12.ebuild 1701 BLAKE2B 08661b1dbc7dac4666817a1ab895b5eb0d7d30e2312c7bafe95c608bee0db22d2600480061461c4d59d6d0039ef7eb0b24573b7ce7090ec2d3d351038c0c1fc4 SHA512 285956d3935c0ac69d0ce7279bed589b6005342081deb22f5bc5708e08b289135c32a3edfde903ad34b2aeec45a829c0fcc48f1ab3cb00f60985b1e6e2faa771
-EBUILD pango-1.40.14.ebuild 1708 BLAKE2B bc9e4c990b9c287c11717a8ead023c389d645cbb2f471376a195be01f553b07dac053ab9776952d3b93973d8e2b067ec145e77d8b683ecf0ff3d1bfcd9d5d4a1 SHA512 2711e19a05d454b13c1915ca062dc02e20859c6e58804aadb855513db314e0af70af83306135bca1973394e5f5bd71d69de61e43d29b9bfbc7d2835626ea9781
+EBUILD pango-1.40.14.ebuild 1707 BLAKE2B e14c5ce97ce1b118ede6d3c4ed2e8ba949d7abe02c1f10fe0ed626d059972aee31565dcee97b2a9ea0881d970b2bf6de39f32f19e9aae5fca1aa7e3992154b4d SHA512 dcf9a1f1b61075b08ffabd83ed8f4cfd44eceb57fec13e6e05d6f581a66b5bd1c564308c21b03a9d082777672db68f586ce62ef54089d7e2b4f5b1b62b1a53b6
 EBUILD pango-1.40.3.ebuild 1710 BLAKE2B bf310621d2b86abf1162aa80788b5d6c6db33bb05ce13f398705cb0fe45389007f7494ecff8f1d6fb6f1752ef94ee358b27baef1052e4bdb725a6c47c820da70 SHA512 6fbbf1ba010f5d5d527822ff2f4f43a6184dbb61b4c3c9e61507bf65c17f815caea1bfa8793dacd7f902d0d42c66d1beb31ec66ac70452730b6c1d08f6a1f139
 MISC metadata.xml 412 BLAKE2B a35a48a5b045c8d88090806f3ae50702a22a89828429c18682810ab492f743b4c1ef48369a7cb3b2a473eb059da899d20810d7533a63295ae848ac1b1c44f490 SHA512 bf95749c7606d0556904e6a6db1636fe93a919b35c6ab8252087f11658c40dcb08aa0dfce74fafe67e609b2c20f9e8ec632dc878a80e467442b7994d03dea27e
diff --git a/x11-libs/pango/pango-1.40.14.ebuild b/x11-libs/pango/pango-1.40.14.ebuild
index 3519ed6f05b7..c0aa5eda8367 100644
--- a/x11-libs/pango/pango-1.40.14.ebuild
+++ b/x11-libs/pango/pango-1.40.14.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.pango.org/"
 
 LICENSE="LGPL-2+ FTL"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="X +introspection test"
 
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index 58b5d0fc4129..5500453bf0b4 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -13,5 +13,5 @@ EBUILD vte-0.28.2-r208.ebuild 2973 BLAKE2B 7ee8e830fd6499df69012a9d69cfe21343f46
 EBUILD vte-0.36.5.ebuild 1695 BLAKE2B 3d83e03aa9a8aea1e17db966f44f33e500a60a99c0d2e8fe9113f66ff3b30e8cc9800f5889b6b94140b096bffc8103bc105c6ed9556fa680558b98cdbe52dcb3 SHA512 b0665651664f07d69741836d0e870710ec271807fd2da982b544eab42d48da74bb5800324c91cce1ca21080488606d2f5e3263ed3e73357812d5680f3cad91ba
 EBUILD vte-0.46.2.ebuild 1898 BLAKE2B 663e631d3d2b638b0bc1f1f5d8cd30bf9509bb8419b0293cc14b49b65a0548e2a218ccaf05ef7942210ddb69fb4b21d47e99b7dd16d6e1d6404e048b31d965dd SHA512 e966d45f6d46ca821ee4891fdfc7f03d01db9c64327b2146178407cf1adb8730d02723c205043d7bda68ec49d851d34412d4bb8d35908dcaebaf733e3ee5021d
 EBUILD vte-0.48.3.ebuild 2343 BLAKE2B dea244e7833cacf5afd7ee1e4e3f2fcf0a918b925d58e234ad7a8f5b653129284a27ba4600a191649e537e13d96123a9d9659b4f75ccf91a7938b583314ef80d SHA512 33aacf93302abd2f25d7ea7db14e57a30064ad26459077a670ec69dd0b629d37aa5574ae9c2b4b76f83583b411152dd4db6516b4274e059617afcee1dbe27deb
-EBUILD vte-0.48.4.ebuild 2329 BLAKE2B 337d646599bee898d2526a4af7a53b15efcfa658215b8494e274e3894a3eadd838df46719e1ae1f5bb23408ec40fc726a58655771e6cd673eef82e44b35c0578 SHA512 de96a8e04d8fd187f4deca0e845896d963e849a9844177b6848699901d4b5f4cfec04423323bb743979107d0e66c4da16d62820b0d52f85ac94cf5e0623ef7de
+EBUILD vte-0.48.4.ebuild 2328 BLAKE2B deb78534c31faf544847e371c6edfd95e6d231d188fc0f3ef233c72656c66be702cb4eb050a239d1d2fc0a416c5254f5a6b654177aecbefb9c04e55b796a6991 SHA512 ff2d5e94772513a72261c5317c527ad0f41c2c69a5d6ac41d3a0a2b6f284eebbe2eff918f33016c70f54006ebe64719fbefbcd7d4d375b6fbfa89db6319382f1
 MISC metadata.xml 348 BLAKE2B 3bf56ab8eced6c72e3d4dcb9979464b9652010b09d6576da3f1b9061f92b508d9bfa11ae081083ff07b2d7ec05c8e72123e25d6ec8c6edfa738b241a9f4339cb SHA512 3e3da8172df02c72e955968530e757124b502cb2b3ff750fdc3c52f28c763f22d918fa9b2f08da7d1b87bf3719e4cc726528c9496adde96eee3111f08a54d8d4
diff --git a/x11-libs/vte/vte-0.48.4.ebuild b/x11-libs/vte/vte-0.48.4.ebuild
index e6a7e717f2e4..a1c46ca06822 100644
--- a/x11-libs/vte/vte-0.48.4.ebuild
+++ b/x11-libs/vte/vte-0.48.4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE"
 LICENSE="LGPL-2+"
 SLOT="2.91"
 IUSE="+crypt debug glade +introspection vala vanilla"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
 REQUIRED_USE="vala? ( introspection )"
 
 SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~eva/distfiles/${PN}/${P}-command-notify.patch.xz )"
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 60df87c82235..fb9b5689be82 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/albert/Manifest b/x11-misc/albert/Manifest
index 4e9978cd7dae..b6e1dbb5f2b0 100644
--- a/x11-misc/albert/Manifest
+++ b/x11-misc/albert/Manifest
@@ -1,6 +1,9 @@
 DIST albert-0.12.0.tar.gz 404748 BLAKE2B f6f62201a104b51a381036ba44197adc157a472b75636a3e7c391f3cd79ab9cb8f8b5951142df02b9b249e950a2482070e05c81deb779d5442d22dbe363d835c SHA512 56d141a2c6b98744c0b34a7adbbca8b6af93545a7b067263acf59fc63d99ec7d9f19f2f3c73f477e5f35448ae8a563c9f132bed87be135467f8f0c1462f9b031
 DIST albert-0.14.14-plugins.tar.gz 540053 BLAKE2B eeb63b8c884d832907938015c5e444289a04c33fdbec1106fe75259abc031cff579b1137b3d68b786b4af797ce59938a96bd81e7e27e3fb1db0bcef84cb11ec7 SHA512 6e7942911da26672cbf0789ccae06af237794190f10bf91cb261e77c2c6be61201385a202de2798ac2794fb96737ea5055588a4efb1fb5266b0dc09364c4aa1e
 DIST albert-0.14.14.tar.gz 84931 BLAKE2B bf2a6cf7c0a05597fd0c3baf01fafab92e8783d4fde85bb80ebb85692d3166c8d451ffa61f3508cd4f4c99559ad1f0905b96d88ef2c39fc9f6f80e48b69968a0 SHA512 f48357b0611928398c4b55236472bac2db842d971288e863df9d35956864145a1ba22f6e264c6f50357c791064bd5bde1a84f7db5a54bd9c48a91093c830dccf
+DIST albert-0.14.15-plugins.tar.gz 540189 BLAKE2B b8243917cdd30c74f26ad852421cf525047694aaae2ec170a31d6239f7fa704de72f9ef67564282136ca15ec1960a1c882c193a2339541e0bf40986ee10588cb SHA512 1af59c65bd91ac626abd8777b350c92a4532a88119bd9ec6ff55f9f3ad72e5cfd6987c9b34f1c32ca854891e91f79ffbea04ed23fa85a18826e9aa890b400079
+DIST albert-0.14.15.tar.gz 84875 BLAKE2B 80e173100a0d135a18b20482ef0eb103634207b1e1a7284b2c5245750bc22478026b25982b714b3fcd079ed7674075a6853917d789f99628a368c6a9c6fd344d SHA512 9a6efd9203f7b96aa14c063a9de8c59e6b4bb0a5c55a64662ec170b75fc71247b7313a1252f71ab2516b4b62538f4c89778a43b8804915996636f49d4e0a6d31
 EBUILD albert-0.12.0.ebuild 1016 BLAKE2B 54f8d09b961bc677a6df82470c592ff98368e569c89aea2f2b14a0c21dfe9e13a3ee9ae550583a5ce6fc05b41a317a90c866e380b631689935c1da554bba69c9 SHA512 7047299581650cf9f31a3c71259dcab00707b73e9ae22115c512c47b536bf3103cdb120691e80caaef98714d3f70b1467930600f5c911565f4e5658a7cc11796
 EBUILD albert-0.14.14.ebuild 1347 BLAKE2B bf4d3ce890c415b3518dfdf8a548cd8245e838d959e26b0fe5239ecc85aad20d4ed65e96b817c0db1a4deba4603cd848b4cbd27265f283855dfa7edc2724654a SHA512 26c312d14894f43a5e948b09f1f9bde313552c527d13322cb60b8591189c0fd80e32bf47c790ea854a32fbebb0d9c854d8768b408a74f1937a4bcb27202b09bb
+EBUILD albert-0.14.15.ebuild 1347 BLAKE2B 1c33a88c32578369efb8265c4ed1be182750a6f734b3ca766fe5d8e94e398fe8dc10125032981fd0269c66933c4eb1ce078bf6fa0de17371349f5f31d3934733 SHA512 cd990c1e0eb6b32aceac853a1f05b7e96c069602382cc02f810c2a4cc7966165654a339a3aa325ef5865f3bb98094904809ffaae34b75dc274a0475997a4dd10
 MISC metadata.xml 307 BLAKE2B 8113fd9d5c144840eca96ffa19f81d1406343eb5fd60030739bce0a1fe3b469dfbda7066137a3347a4743abbfbbbb08a61712ca2fd681dd6f60e8d7f166336c7 SHA512 2e041e46839e742b36835304388ab2504f46a1a0f9fde76bca26e06e5db570a55e929310a7a06661ee115f5957c089a39125c5c41e42927263551e07d1c5b31a
diff --git a/x11-misc/albert/albert-0.14.15.ebuild b/x11-misc/albert/albert-0.14.15.ebuild
new file mode 100644
index 000000000000..f2b0faa7ea21
--- /dev/null
+++ b/x11-misc/albert/albert-0.14.15.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLUGINS_HASH="caa38cfa1ba6289ee2fc4913ea70d49fd761244e"
+inherit cmake-utils gnome2-utils
+
+DESCRIPTION="Desktop agnostic launcher"
+HOMEPAGE="https://albertlauncher.github.io/"
+# plugins is a git submodule. the hash is taken from the submodule reference in the ${PV} tag.
+SRC_URI="https://github.com/albertlauncher/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+https://github.com/albertlauncher/plugins/archive/${PLUGINS_HASH}.tar.gz -> ${P}-plugins.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug"
+
+RDEPEND="
+	dev-cpp/muParser
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	mv "${WORKDIR}"/plugins-${PLUGINS_HASH}/* "${S}"/plugins/ || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DEBUG=$(usex debug)
+		-DBUILD_PYTHON=OFF #plugin directory is empty causing build failure
+		-DBUILD_VIRTUALBOX=OFF #plugin needs virtualbox installed to build, untested
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-misc/ccsm/Manifest b/x11-misc/ccsm/Manifest
deleted file mode 100644
index e0be0558c3ac..000000000000
--- a/x11-misc/ccsm/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX ccsm-0.8.4-pygobject-glib-fix.patch 637 BLAKE2B 52ba467e0ec723dc38cc1fcc962e7b867b2a1a4702f0e4898490abcff89c1581b203d8e989e570c7d924a1591a808d439908cde99c7eaff6550791001eb2d9ea SHA512 fac2a97bcb0883ab3c0a24040f88b354653a3e507c306fb89e58f1a1d1aba46d65ed92a0094b3ebe312095ffc53af717fd43e284f13a1785dd3c45b907e38672
-DIST ccsm-0.8.4.tar.bz2 475864 BLAKE2B 6ccfaa4329dd33b78efd43f98e08d10c5909e1ef36a9fe096c4a1f123f92bf7623f7a73b724ec8146e544dd523022170ba83f4d35d0cd486bdbeabdcddea90ee SHA512 1991f25ca4f04363006bacd5267cb54c7e24817b263996c7172f58180ca0acf94050220938d4fa87081c93fde23ca0b44a333f9b675950e4c5187903a03692c5
-EBUILD ccsm-0.8.4-r5.ebuild 1256 BLAKE2B 74bd5c71086fdf8332b2a0191539fc6de4f6abe3314c8e3e505ffd7b7d2e0deb96e24a5bedd8c135b98f7d386eede7ea2e88cd9807b876232a0eaa9b863aa056 SHA512 087587ccf3c85cdba8e82874a06f5f8d477f54cef6dae0fa358bc98b074317490e6743699ed09cbcb4f693268928fa8bb9687320fe5d8ac2331c093e189034a7
-MISC metadata.xml 244 BLAKE2B 5f0afd0057d3801f32054c2da72fd9ab5c94e20e8a83ae9233c07ca50cfc8cd4044e21fda629435ed749a7738fb4f95b9c5d809b576c3259c768c763a2ab601e SHA512 cd993582cf1cfbf6bcff4c936bd1a8ad4633a2df771378d45eb18d835c39d2efa7d3fab77ac48ad00078c2c072ed1b13c39537193eb147f543f6c88aebeaf56d
diff --git a/x11-misc/ccsm/ccsm-0.8.4-r5.ebuild b/x11-misc/ccsm/ccsm-0.8.4-r5.ebuild
deleted file mode 100644
index 235de9f1687f..000000000000
--- a/x11-misc/ccsm/ccsm-0.8.4-r5.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-DESCRIPTION="Compizconfig Settings Manager"
-HOMEPAGE="http://www.compiz.org/"
-SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-RDEPEND="
-	>=dev-python/compizconfig-python-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/pygtk-2.12:2[${PYTHON_USEDEP}]
-	gnome-base/librsvg
-"
-
-# missing icons and text fix, bug #487106
-PATCHES=( "${FILESDIR}/${P}-pygobject-glib-fix.patch" )
-
-DOCS=( AUTHORS )
-
-python_prepare_all() {
-	# return error if wrong arguments passed to setup.py
-	sed -i -e 's/raise SystemExit/\0(1)/' setup.py || die 'sed on setup.py failed'
-	# fix desktop file
-	sed -i \
-		-e '/Categories/s/Compiz/X-\0/' \
-		-e '/Encoding/d' \
-		ccsm.desktop.in || die 'sed on ccsm.desktop.in failed'
-
-	# correct gettext behavior
-	if [[ -n "${LINGUAS+x}" ]] ; then
-		for i in $(cd po ; echo *po | sed 's/\.po//g') ; do
-		if ! has ${i} ${LINGUAS} ; then
-			rm po/${i}.po || die
-		fi
-		done
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	#set prefix
-	mydistutilsargs=( build --prefix=/usr )
-}
diff --git a/x11-misc/ccsm/files/ccsm-0.8.4-pygobject-glib-fix.patch b/x11-misc/ccsm/files/ccsm-0.8.4-pygobject-glib-fix.patch
deleted file mode 100644
index 9b325af7f341..000000000000
--- a/x11-misc/ccsm/files/ccsm-0.8.4-pygobject-glib-fix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix missing icon and text with new PyGObject
-Gentoo bugreport - https://bugs.gentoo.org/show_bug.cgi?id=487106
-Patch by  Small_Penguin <dark.shadow AT gmx.at>
-
-diff -Naur ccsm-0.8.4~/ccm/Utils.py ccsm-0.8.4/ccm/Utils.py
---- ccsm-0.8.4~/ccm/Utils.py	2009-10-14 03:05:30.000000000 +0200
-+++ ccsm-0.8.4/ccm/Utils.py	2013-10-05 10:16:10.050030522 +0200
-@@ -184,7 +184,7 @@
-         if has_focus:
-             self.unset_flags (gtk.HAS_FOCUS)
- 
--        ret = super (PrettyButton, self).do_expose_event (self, event)
-+        ret = gtk.Button.do_expose_event (self, event)
- 
-         if has_focus:
-             self.set_flags (gtk.HAS_FOCUS)
diff --git a/x11-misc/ccsm/metadata.xml b/x11-misc/ccsm/metadata.xml
deleted file mode 100644
index 3f57497447fb..000000000000
--- a/x11-misc/ccsm/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">Compizconfig Settings Manager.</longdescription>
-</pkgmetadata>
diff --git a/x11-misc/simple-ccsm/Manifest b/x11-misc/simple-ccsm/Manifest
deleted file mode 100644
index d64e634805c0..000000000000
--- a/x11-misc/simple-ccsm/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST simple-ccsm-0.8.4.tar.bz2 62423 BLAKE2B ffffb5df6716fe7a5f39f2972090c217e81424ebf6f3e67d3107e76e6ba19946b276c3d2587dd46c23f184453f5030a1b501f1ee7e1abceda88d46acdb641003 SHA512 f60a689e18fcea494eacc4eaa8718d77b846af6790cb5de056ecd432fd8b5190ebd4ce6669744b3da408e492f68012503f420e28e66be83b747b2e532b152158
-EBUILD simple-ccsm-0.8.4-r2.ebuild 1162 BLAKE2B 573efbf7fb7e189f6a1983ea2142bd1ead79a9e7030e7ba2a4fe44ca864b593471fc0e617fcbd3abbd5abf73111b449f87a15dc93cb8b2ae57fa8e395c38227c SHA512 af4243ea4764b5d1ef52a7eecd062badf2518d816f224be184e1331f0bf53b2a684964a153ff2450a8faa7f2e72877c60c0fcffe091d71cb8d9a9d3de322a3d3
-MISC metadata.xml 255 BLAKE2B 87ea394bfc01a932e9347251c9337944d9649cbac7abed973219bce3524335e5fa68a1ffda4037e4f3e05216a684578d82fa2ab38e231148a295effdf8818011 SHA512 aebbe0fa1825be6065600fc5289c5751d3d8a16b07d83201b772bb6561114e5d2b1d1d5e53488a55e3458272723a28374cdd1221a87d585161e09ed5d71a6e9d
diff --git a/x11-misc/simple-ccsm/metadata.xml b/x11-misc/simple-ccsm/metadata.xml
deleted file mode 100644
index 173985d43602..000000000000
--- a/x11-misc/simple-ccsm/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">Simplified Compizconfig Settings Manager.</longdescription>
-</pkgmetadata>
diff --git a/x11-misc/simple-ccsm/simple-ccsm-0.8.4-r2.ebuild b/x11-misc/simple-ccsm/simple-ccsm-0.8.4-r2.ebuild
deleted file mode 100644
index a56e4fee0107..000000000000
--- a/x11-misc/simple-ccsm/simple-ccsm-0.8.4-r2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1 gnome2-utils
-
-DESCRIPTION="Simplified Compizconfig Settings Manager"
-HOMEPAGE="http://www.compiz.org/"
-SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-DEPEND="
-	dev-util/intltool
-	virtual/pkgconfig"
-RDEPEND="
-	>=dev-python/compizconfig-python-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
-	>=x11-misc/ccsm-${PV}[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	# return error if wrong arguments passed to setup.py
-	sed -i -e 's/raise SystemExit/\0(1)/' setup.py || die 'sed on setup.py failed'
-	# fix desktop file
-	sed -i \
-		-e '/Categories/s/Compiz/X-\0/' \
-		-e '/Encoding/d' \
-		"${PN}".desktop.in || die "sed on ${PN}.desktop.in failed"
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	mydistutilsargs=( build --prefix=/usr )
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 29de2028fd93..4b3653e9c40e 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/compiz-plugins-extra/Manifest b/x11-plugins/compiz-plugins-extra/Manifest
deleted file mode 100644
index 8a28c6a7bd99..000000000000
--- a/x11-plugins/compiz-plugins-extra/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX compiz-plugins-extra-0.8.8-libnotify.patch 1088 BLAKE2B 3703caf1fb95accea5693537a1efe4a398718e4e984493301d7e5ede8561227de6e3487e7e1329cb09a4c02a0bb017d00352c78317ca1fafc8b5bcb2aed148dc SHA512 26bb4d5f9d0f82ac1aa0c5cecdf2643f35e99a79c3c1fa758ecfda514007129c64c632479b24ad4d777db874e9430581bb1ee02bb7ff36a8cd38a275e98854de
-AUX compiz-plugins-extra-no-gconf.patch 585 BLAKE2B 175aa3aa77d4ed6ed46fe17ad810c47e60e61b09ece5677c6f631f33b32584beece32162fbc25af8920e7e8b2274046f991d90d9e1515bb17112d80a5cb2d602 SHA512 71ea3c642bae33789e530c9007bd9a7f94c4ace17dd378bb84b034bac6a049249f8783cb78c4b06c0602a8b1d5cc01825bf67a5babbe314d8620958bbf074d63
-DIST compiz-plugins-extra-0.8.8.tar.bz2 2689953 BLAKE2B a18784a2bf08153a4ae451b105706e0a771e4751e9fbdde0aa83984dc1897366931c94a05538697f0d0fdb0838113c347bd2f0a4c21f205484480eed73520b07 SHA512 de72d688648e5426e8967cc88d9439d19c0bc57dcd4de7c5a78fbf2e1dcec85f5f69c89e6affa06f8df1534dad4b347041d023ea9eeabb034df485825815ca22
-EBUILD compiz-plugins-extra-0.8.8.ebuild 1230 BLAKE2B c5dfd8f6b2786628b8286c164282861dea6f3bd8a86babed7d10529be0338d392ce089ac9c1842bb1ef17a93d4e4cd79b57be2a699a21d7d81fa60a244a41d3d SHA512 4d9ed5ee819c0fdfec1614ee946eba206ec5d2246b32f8b9dbc4db68af4663c414f59da79fc068bda4b63686691b69ac9321a16cf3ded17cc993a97597f1e06c
-MISC metadata.xml 635 BLAKE2B af93827f787585a84a3b3884e35b90b9c6f95262968ec9f5582ce89ace5f093c904108b5fab668dbd9b2e20d719dccf0375dfb558082882e6b329e6991f492d7 SHA512 baa7c9ec3630f5ed6df09f920648dcb44707ffd075925acc8a92f7e7126ef26209dc52529b51727ca20c94644858d61d23a62801b2a3958dd9fa53a95750ee7f
diff --git a/x11-plugins/compiz-plugins-extra/compiz-plugins-extra-0.8.8.ebuild b/x11-plugins/compiz-plugins-extra/compiz-plugins-extra-0.8.8.ebuild
deleted file mode 100644
index 5f8a05ae4ccd..000000000000
--- a/x11-plugins/compiz-plugins-extra/compiz-plugins-extra-0.8.8.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit autotools eutils gnome2-utils
-
-DESCRIPTION="Compiz Fusion Window Decorator Extra Plugins"
-HOMEPAGE="http://www.compiz.org/"
-SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="gconf libnotify"
-
-RDEPEND="
-	>=gnome-base/librsvg-2.14.0:2
-	virtual/jpeg:0
-	>=x11-libs/compiz-bcop-${PV}
-	>=x11-plugins/compiz-plugins-main-${PV}
-	>=x11-wm/compiz-${PV}[gconf?]
-	libnotify? ( x11-libs/libnotify )
-"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.15
-	x11-libs/cairo
-	gconf? ( gnome-base/gconf:2 )
-"
-
-DOCS="AUTHORS ChangeLog INSTALL NEWS README TODO"
-
-src_prepare() {
-	if ! use gconf; then
-		epatch "${FILESDIR}"/${PN}-no-gconf.patch
-	fi
-	epatch "${FILESDIR}/${P}-libnotify.patch"
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-fast-install \
-		--disable-static \
-		$(use_enable gconf schemas) \
-		$(use_with libnotify notifications)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
-
-pkg_preinst() {
-	use gconf && gnome2_gconf_savelist
-}
-
-pkg_postinst() {
-	use gconf && gnome2_gconf_install
-}
diff --git a/x11-plugins/compiz-plugins-extra/files/compiz-plugins-extra-0.8.8-libnotify.patch b/x11-plugins/compiz-plugins-extra/files/compiz-plugins-extra-0.8.8-libnotify.patch
deleted file mode 100644
index 9287d706ac8e..000000000000
--- a/x11-plugins/compiz-plugins-extra/files/compiz-plugins-extra-0.8.8-libnotify.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- configure.ac	2011-04-21 15:51:08.000000000 +0400
-+++ configure.ac	2012-08-16 21:37:46.894173595 +0400
-@@ -136,7 +136,15 @@
- PKG_CHECK_MODULES(COMPIZMOUSEPOLL, compiz-mousepoll, [have_compiz_mousepoll=yes], [have_compiz_mousepoll=no])
- AM_CONDITIONAL(SHOWMOUSE_PLUGIN, test "x$have_compiz_mousepoll" = "xyes")
- 
--PKG_CHECK_MODULES(LIBNOTIFY, libnotify gtk+-2.0, [have_libnotify=yes], [have_libnotify=no])
-+AC_ARG_ENABLE(notifications, AS_HELP_STRING([--enable-notifications], [Build notification plugin]), [enable_notifications=$enableval], [enable_notification=auto])
-+if test "$enable_notification" = auto; then
-+    PKG_CHECK_MODULES(LIBNOTIFY, libnotify gtk+-2.0, [have_libnotify=yes], [have_libnotify=no])
-+fi
-+if test "$enable_notification" = yes; then
-+    PKG_CHECK_MODULES(LIBNOTIFY, libnotify gtk+-2.0, [have_libnotify=yes], AC_MSG_ERROR([Libnotify is not installed]))
-+else
-+    have_libnotify=no
-+fi
- AM_CONDITIONAL(NOTIFICATION_PLUGIN, test "x$have_libnotify" = "xyes")
- if test "$have_libnotify" = yes; then
-   AC_DEFINE(USE_NOTIFICATION, 1, [Build notification plugin])
diff --git a/x11-plugins/compiz-plugins-extra/files/compiz-plugins-extra-no-gconf.patch b/x11-plugins/compiz-plugins-extra/files/compiz-plugins-extra-no-gconf.patch
deleted file mode 100644
index 49bf16be4b10..000000000000
--- a/x11-plugins/compiz-plugins-extra/files/compiz-plugins-extra-no-gconf.patch
+++ /dev/null
@@ -1,21 +0,0 @@
- configure.ac |    5 ++---
- 1 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 0a3d7c1..6f8356d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -150,11 +150,10 @@ if test x"$use_schemas" = x"yes"; then
-   fi
-   xsltdir=`$PKG_CONFIG --variable=xsltdir compiz-gconf`
-   AC_SUBST(xsltdir)
-+else
-+  AM_CONDITIONAL(GCONF_SCHEMAS_INSTALL, test "x$use_gconf" = "xyes")
- fi
- 
--AM_GCONF_SOURCE_2
--
--
- AM_CONDITIONAL(USE_SCHEMAS, test "x$use_schemas" = "xyes")
- if test "$use_schemas" = yes; then
-   AC_DEFINE(USE_SCHEMAS, 1, [Build gconf schemas])
diff --git a/x11-plugins/compiz-plugins-extra/metadata.xml b/x11-plugins/compiz-plugins-extra/metadata.xml
deleted file mode 100644
index 34693565222f..000000000000
--- a/x11-plugins/compiz-plugins-extra/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription lang="en">
-&gt;Package with several compiz-fusion plugins:
-addhelper, bench, crashhandler, cubecaps, cubereflex, extrawm, fadedesktop, firepaint, gears,
-goto-viewport, group, mblur, reflex, scalefilter, showdesktop, splash, trailfocus, widget.
-</longdescription>
-  <use>
-    <flag name="gconf">
-      Install GConf schemas for the plugins, needed when using the GConf-based
-      configuration backend in <pkg>x11-wm/compiz</pkg>.
-    </flag>
-  </use>
-</pkgmetadata>
diff --git a/x11-plugins/compiz-plugins-main/Manifest b/x11-plugins/compiz-plugins-main/Manifest
deleted file mode 100644
index fe0aa01f9bc5..000000000000
--- a/x11-plugins/compiz-plugins-main/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX compiz-plugins-main-no-gconf.patch 586 BLAKE2B f18f628b06d120714c266b611036c4daffbe50555ccaada5a1c12a13ec7938b59f8f77082f86e5da845d620b3e3ffe697737c1d8b211c818ff58b7e253f97469 SHA512 bcfa935550cef196fea909bcf33a9e8cdae020288408deec56c09f64b912dc23cd080a689e3dda0cc89fbbfb71a1c3d6b5756866db926bc45470bf908e379e3a
-DIST compiz-plugins-main-0.8.8.tar.bz2 1230627 BLAKE2B add2ef5997351503bf1920fb876135a5aa0849dd490469a042c3a537e474d5db301fa0caf5a7f5cfa1780534da38f042b6f2deb0dae49c7c42970c91dbea9468 SHA512 217af2968821d8204c8baffd000ae04d0083559ff874fe32ff92007b62445e2d3ed6d7e82aec552513439f19cde586c8aaa9d490bc14b2378d1aa957119f78a1
-EBUILD compiz-plugins-main-0.8.8.ebuild 1068 BLAKE2B 0e6789941bc520b69b73df447ca56767410f6d2e96a1349c3db2d4d31a4fc962a0bfb0ada10127491fb06218331c89049febf66e9387edf3243df263c111e322 SHA512 9fd40825ed74c8a5c3fb9f7696b2cc486d0ce126421a974fb6b53d495651cfc5f66481fc92105312186649ae0f397c7cba6cc5d0e4a0dd3dfdd00bbfc27ec341
-MISC metadata.xml 610 BLAKE2B bd868ab0a715aba4367ee5b5e24f1cd3c638b2b4f0aec21dfe007fd3b444a9de05dc67a643f640ffe60d629addd65b740aa56d077a9695e355ee7a737292fa65 SHA512 8258dc3459ec661422b0a65f74d940b80e7202d4e4bb79663ef2f309b4663d5f2d50d4419bb7f8ffef1702665d2dae49e75d4ede4049ebd6a096cc59ce80232a
diff --git a/x11-plugins/compiz-plugins-main/compiz-plugins-main-0.8.8.ebuild b/x11-plugins/compiz-plugins-main/compiz-plugins-main-0.8.8.ebuild
deleted file mode 100644
index aa45f1a94331..000000000000
--- a/x11-plugins/compiz-plugins-main/compiz-plugins-main-0.8.8.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit autotools eutils gnome2-utils
-
-DESCRIPTION="Compiz Fusion Window Decorator Plugins"
-HOMEPAGE="http://www.compiz.org/"
-SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="gconf"
-
-RDEPEND="
-	>=gnome-base/librsvg-2.14.0:2
-	x11-libs/cairo
-	>=x11-libs/compiz-bcop-${PV}
-	>=x11-wm/compiz-${PV}[gconf?]
-	virtual/jpeg:0
-	virtual/glu
-"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.15
-	gconf? ( gnome-base/gconf:2 )
-"
-
-DOCS="AUTHORS ChangeLog INSTALL NEWS README TODO"
-
-src_prepare() {
-	if ! use gconf; then
-		epatch "${FILESDIR}"/${PN}-no-gconf.patch
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	econf \
-		--enable-fast-install \
-		--disable-static \
-		$(use_enable gconf schemas)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
-
-pkg_preinst() {
-	use gconf && gnome2_gconf_savelist
-}
-
-pkg_postinst() {
-	use gconf && gnome2_gconf_install
-}
diff --git a/x11-plugins/compiz-plugins-main/files/compiz-plugins-main-no-gconf.patch b/x11-plugins/compiz-plugins-main/files/compiz-plugins-main-no-gconf.patch
deleted file mode 100644
index 63222a5f1ce6..000000000000
--- a/x11-plugins/compiz-plugins-main/files/compiz-plugins-main-no-gconf.patch
+++ /dev/null
@@ -1,22 +0,0 @@
- configure.ac |    5 ++---
- 1 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 297a8cf..290e92b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -171,11 +171,10 @@
- if test x"$use_schemas" = x"yes"; then
-   fi
-   xsltdir=`$PKG_CONFIG --variable=xsltdir compiz-gconf`
-   AC_SUBST(xsltdir)
-+else
-+  AM_CONDITIONAL(GCONF_SCHEMAS_INSTALL, test "x$use_gconf" = "xyes")
- fi
- 
--AM_GCONF_SOURCE_2
--
--
- AM_CONDITIONAL(USE_SCHEMAS, test "x$use_schemas" = "xyes")
- if test "$use_schemas" = yes; then
-   AC_DEFINE(USE_SCHEMAS, 1, [Build gconf schemas])
diff --git a/x11-plugins/compiz-plugins-main/metadata.xml b/x11-plugins/compiz-plugins-main/metadata.xml
deleted file mode 100644
index d0cae3a592b1..000000000000
--- a/x11-plugins/compiz-plugins-main/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription lang="en">
-Package with the base compiz-fusion plugins:
-animation, colourfilter, expo, ezoom, jpeg, neg, opacify, put, resizeinfo, ring,
-scaleaddon, shift, snap, text, thumbnail, vpswitch,, wall, winrules, workarounds.
-</longdescription>
-  <use>
-    <flag name="gconf">
-      Install GConf schemas for the plugins, needed when using the GConf-based
-      configuration backend in <pkg>x11-wm/compiz</pkg>.
-    </flag>
-  </use>
-</pkgmetadata>
diff --git a/x11-plugins/compiz-plugins-unsupported/Manifest b/x11-plugins/compiz-plugins-unsupported/Manifest
deleted file mode 100644
index 2fabe30284e8..000000000000
--- a/x11-plugins/compiz-plugins-unsupported/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST compiz-plugins-unsupported-0.8.8.tar.bz2 1155793 BLAKE2B e518e98cf222c535ef53c52c1be08ca289944f4d259db832408ac131e825d3e21b80b5ddc93dbf18ab1b28c5a55e9f587a2f585c000a3b8198ccc62291dd20d2 SHA512 5e2f305873c3e9a9994334006d186d3353afbf37f082f364c3d309bb11f693de319047cfb65121bf1a1293d48eaedde767907ecaad8026689226c067671b8852
-EBUILD compiz-plugins-unsupported-0.8.8.ebuild 658 BLAKE2B 445e1127c221b0c71f706c7e5fba9bcd3c3ae50c625df7b9ad5dafafd132ff0ebbe69e5c2150e2d80655e24ab174a8a46543c683231ef686049d53e9791a7fee SHA512 95d92ceb591d363cedb355a4600c9f6a69605ce36121d7f89e5f7076b61490f61ae4d1ae0721ebe4c0c34efeb784f6e89a3911375035744f59de7e2fa55ce0a6
-MISC metadata.xml 286 BLAKE2B f6dbd64b3d302b7eebb115762130fcb1969b4377a42a9a6be2aff171b762c8efbb63d241d62d2ef7149cdd17c0ea458dad1f8b9e971b321c5240a05cf8f019cd SHA512 59216a23a6ddae8cf908c45842e6327ccba7687c9e83568d2e06d15f031d5630f83c790e13cec3372a0cb510f476a91a30214cadeea5db67a7933d520c8af3e5
diff --git a/x11-plugins/compiz-plugins-unsupported/compiz-plugins-unsupported-0.8.8.ebuild b/x11-plugins/compiz-plugins-unsupported/compiz-plugins-unsupported-0.8.8.ebuild
deleted file mode 100644
index ef74aad927ce..000000000000
--- a/x11-plugins/compiz-plugins-unsupported/compiz-plugins-unsupported-0.8.8.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Compiz Fusion Window Decorator Unsupported Plugins"
-HOMEPAGE="http://www.compiz.org/"
-SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-RDEPEND="
-	>=gnome-base/librsvg-2.14.0:2
-	virtual/jpeg:0
-	>=x11-libs/compiz-bcop-${PV}
-	>=x11-plugins/compiz-plugins-main-${PV}
-	>=x11-wm/compiz-${PV}
-"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.15
-	x11-libs/cairo
-"
-
-DOCS=( AUTHORS ChangeLog INSTALL NEWS README TODO )
diff --git a/x11-plugins/compiz-plugins-unsupported/metadata.xml b/x11-plugins/compiz-plugins-unsupported/metadata.xml
deleted file mode 100644
index 8be4dc2c122c..000000000000
--- a/x11-plugins/compiz-plugins-unsupported/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!--maintainer-needed-->
-<longdescription lang="en">
-Package with several compiz-fusion plugins:
-fakeargb, mswitch, snow, tile.
-</longdescription>
-</pkgmetadata>
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 9f64e90ca1aa..5ad49c79329d 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index 927b79429d8e..50e895d286bc 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -3,5 +3,5 @@ DIST gnome-terminal-3.22.2.tar.xz 1952372 BLAKE2B eddaa5b3900211a2823c86353c68b9
 DIST gnome-terminal-3.24.2.tar.xz 1960952 BLAKE2B c94303cd8b322a37c70487fbab0f6ecd27b8e831cf44cdc80c82b31d2758f7c6927704d31c229cbbe41be565748238bbfcfae72470f273f7f3a9378c218af8b5 SHA512 08cd7b1b08cf22618554b1a051dcfee4a967165bfe93b77a6bc8b0c935695101e773e8d53a482d71aadb9ba7be7ac991d82dbf53b7a6f74f1f5144e4158f8a93
 DIST gnome-terminal-notify-open-title-transparency.patch.xz 37448 BLAKE2B 159bbcf6ca387af8ae2f05c23b48afcdf11351025420ecfd10d1b8a1dd9c2c8016d1c89c6fca20dde3bf8ffe3a6091232a989cfd520fa6761f65eec29b569d84 SHA512 9af0d56df105a5bdb81b2609794669557a7f442f71b240ee10a6411fab20ad74c14489dbb9a536e208515053ea17776b3a15afb3b949a75a66f8c2ab3dbbff96
 EBUILD gnome-terminal-3.22.2.ebuild 2120 BLAKE2B 4a8700e79ada5c404385154b3a7e27eea5388fa68a41eb477b6a9fda167ee7898f3044ee4f77411398eb28a85665539a862c6f46449d017ea11d38e6860f341b SHA512 3d92988db6fa83333666f08a7b329ecc8b405dcb7acc0e2c81dfd23a84ee30db940905936de4405efb61944cda7b617b68512c0bca3b6beb67bb61191b0a13e5
-EBUILD gnome-terminal-3.24.2.ebuild 2616 BLAKE2B a16d0f0c0b02f12b67282dff8181a03dba587387311e411984f017ba1b090d346a7abc506a8124445db8a74fe93ae4647800d0fe9faf28ab8bdd092915e91570 SHA512 e1106cc0659b8c7ee7ca5eb21d00417303e3a1035ff0cf3a56d1c163525d3de5f0293cf2674eaf58229e2b3fc4ec44ebf11c8c69de192022943c59e77e292341
+EBUILD gnome-terminal-3.24.2.ebuild 2615 BLAKE2B 3cbaecbc1543bb9fdd9f576f144dd19075056711720755d175852417a22676e04271cfdf4aa6c4c8da75d0e5971cf21414af090600db7710b42829637298c4eb SHA512 54b3962641799103003be60d238a81180eeaafb8cacee32b05c52d026988fa6e642c32f91716ba67e914863569ab4c5b2126d36e942cf3cb2163d502d9b71d38
 MISC metadata.xml 417 BLAKE2B ddec99c80b9ff060709ef724996eb8e73a8e587e022947b9f237adcd1ecb049fc48b8f7e8b6cd725d2f5e3276b9aecdcdb5acacddadfbd7edcc61dd9346789ae SHA512 a41ea1b6fc9d3dcbdf296590b206f924cb42c7dea27b68f593eb3e50aa37c6dd3df20b47c34f8cca2671dacd4fba6ec0f86caebebe6f66d496b7936d3cf0a688
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.24.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.24.2.ebuild
index e77c56298db5..f4d33ea911a1 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-3.24.2.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.24.2.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 IUSE="debug +gnome-shell +nautilus vanilla"
 SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~leio/distfiles/gnome-terminal-notify-open-title-transparency.patch.xz )"
 
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 
 # FIXME: automagic dependency on gtk+[X], just transitive but needs proper control, bug 624960
 # Needed vte in 3.24.2 is 0.48.2, but we add desktop notification patches in 0.48.3 that non-vanilla needs
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 905184003839..f158003d098f 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/adwaita-icon-theme/Manifest b/x11-themes/adwaita-icon-theme/Manifest
index 5427892d84f2..170d41c50081 100644
--- a/x11-themes/adwaita-icon-theme/Manifest
+++ b/x11-themes/adwaita-icon-theme/Manifest
@@ -3,5 +3,5 @@ DIST adwaita-icon-theme-3.22.0.tar.xz 18395856 BLAKE2B 8b6a7f10b1598803db431eb43
 DIST adwaita-icon-theme-3.24.0.tar.xz 20717972 BLAKE2B cce76731e7c33d42330eb2e0039979db3f2280fe84ef427ac6295244f750eedb93584efddb4299260846facb7c3afb9d1baa86a5ddd8d36f3d81220d18dc49a1 SHA512 d415859bc46deb3dcf5e845af88689c507d6b110d6312af75145d6c46cc277ca2d17ae6a0f506c09ca7d543c5eca47b2506169bb0482ae68f2e3baef70889090
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
 EBUILD adwaita-icon-theme-3.22.0-r2.ebuild 1488 BLAKE2B db0463bdc5502471613fc6cf96406db5cc75654975e19f14452cf64d8447848f5a36b5c5cd6b9bbc3703256e083117e68fdaedf8d21d9e02b2419aa5bab5026f SHA512 49569b7fcd8a51e573bb8213344c27ddcde529f7f87b4cb1a9288cc423f98220e5b5f3f991cafca177027c645df55c8d28b89bbef14bef3b6c92e0c6a9ca5cfe
-EBUILD adwaita-icon-theme-3.24.0.ebuild 1693 BLAKE2B b74caf01a5e6af902c46b77eaae97de8ed381932156c9859b1628fe64762f145f62c7932d1ccac84204f88c454f6bfd32d674856b0051ab0a4fef54875cbe778 SHA512 120b3fd8f01791fc98b6e8cbfcbd42f5cecb8f22c5325ea8fce1f84328d7999ab5f81b3e3935533c528cee4a71facd23a5e3b99e7f8ca47dac783c9dd83a3a73
+EBUILD adwaita-icon-theme-3.24.0.ebuild 1692 BLAKE2B f39a70688ab0160269b36e137d7c920fc4f93f6c70ca69af74cd43d02e061a235cd14f75713e0642e3985109b94c4cee90a1b7e8eb3d5f18ce15a5e47061cc2e SHA512 c9308430a0a8665474586aa378b38ac036b8a1b3ac6ae4392b250274b2c8bbc3d0ee2bf9316b50b0114da0a7a5ae05f2c12cee10231afe61093c104e165439d0
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.24.0.ebuild b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.24.0.ebuild
index 4c2b527dd761..5638713fb891 100644
--- a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.24.0.ebuild
+++ b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.24.0.ebuild
@@ -17,7 +17,7 @@ LICENSE="
 "
 SLOT="0"
 IUSE="branding"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 # gtk+:3 is needed for build for the gtk-encode-symbolic-svg utility
 # librsvg is needed for gtk-encode-symbolic-svg to be able to read the source SVG via its pixbuf loader and at runtime for rendering scalable icons shipped by the theme
diff --git a/x11-themes/emerald-themes/Manifest b/x11-themes/emerald-themes/Manifest
deleted file mode 100644
index e770b384a4c3..000000000000
--- a/x11-themes/emerald-themes/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST emerald-themes-0.5.2.tar.bz2 1563758 BLAKE2B bac24c8a52a56142ef2979451ca6f4a450eaeb1f1207520e3927d454f189c8727c1c2f34ef7fc1fd5edce2b3b5d690384d37f7548972b9eb7bd8826504a83cb4 SHA512 534a4856f0318315c3e6773d68d8c0e3de689bc4f160f237b3912289a2cc58331e9f3fe4d7875ced731729367e91ae2efdaef994bdd1582670e3c12acd8f0615
-EBUILD emerald-themes-0.5.2.ebuild 403 BLAKE2B 14bc811dc2b124d5459653f0509b5d06fb6c1d74e47ea08909e4fb330a90bf4de894c78f461966c8fb707da990f5678916d93c8c6871de891f67a92d10b83671 SHA512 a0733c208247e5e2f434622c0274896b1b095caa1c3c050e250f16d608fb4d69b66b93d30ad4031ef8db065bd259683f5454004c01dfbacaea5b49a5deb1871d
-MISC metadata.xml 255 BLAKE2B 520f575bbfc2e5699a496603c9be3b2685d8e2f94d4f5e13af010cb551dd0ad1605fb7db7e845e1bd9e15e3d18dfe3d5fdbe828616fb4fd7fbc53eda8a57b2b9 SHA512 1670d544f8c2794d424d02ca55fc72e990722fb245c06aa326c1d0d5c840203e1d95de0fa6cb719abd5aff9c9bcd6aeb2afd95b7ccfe8e75387cd79351aad761
diff --git a/x11-themes/emerald-themes/emerald-themes-0.5.2.ebuild b/x11-themes/emerald-themes/emerald-themes-0.5.2.ebuild
deleted file mode 100644
index 4d0ba6276021..000000000000
--- a/x11-themes/emerald-themes/emerald-themes-0.5.2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-DESCRIPTION="Emerald window decorator themes"
-HOMEPAGE="http://compiz.org"
-SRC_URI="http://cgit.compiz.org/fusion/decorators/${PV}/snapshot/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-DEPEND="x11-wm/emerald"
-
-DOCS="ChangeLog INSTALL NEWS README"
diff --git a/x11-themes/emerald-themes/metadata.xml b/x11-themes/emerald-themes/metadata.xml
deleted file mode 100644
index 7035e9d628ba..000000000000
--- a/x11-themes/emerald-themes/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">Emerald themes are the themes for emerald</longdescription>
-</pkgmetadata>
diff --git a/x11-themes/gnome-backgrounds/Manifest b/x11-themes/gnome-backgrounds/Manifest
index 7312cd4f4169..975735993e99 100644
--- a/x11-themes/gnome-backgrounds/Manifest
+++ b/x11-themes/gnome-backgrounds/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-backgrounds-3.22.1.tar.xz 14847496 BLAKE2B d8f1601ae88f5fcb4efce076993618e765d542c22eb5c1214e32adeaea6555da69067d76028dc37541f4747f575be522b49130b77deaded1a6818be843bf1e99 SHA512 277d65228e2be0211f7ee15aeb3262c7e43c4788fec74ac857beacb414d527eb612f9e2999765e9ecba67ea6e3921dc94605a2934f10b0bb6377ea7f149a5a0c
 DIST gnome-backgrounds-3.24.0.tar.xz 15223020 BLAKE2B 5a4bf10bb767da9ac1b89e426a517c0ad9b76d62d764b4398e3381cb9b1bd425ab8f36835a681e1586bbd95f5f2d08307a2680d2aae45bcfc400fa0c61e3938d SHA512 ba044cd21d4c22dd6bf1a93a17579f2bc5f2b9198e40331486772f4fcb81a1c0179949a162e5a1e332f49cd833ca773cf27c1592966e94afbecd8b4d0728c24b
 EBUILD gnome-backgrounds-3.22.1.ebuild 471 BLAKE2B 29578bd5b0853df70fa7f536dc2002c50346008e78ed935d2a9110763a4961fd35f123a2521f1bca1e464a75b001e2d4d5d596b5f4752ca4a3cf31101c3c89fb SHA512 2d8e101a7b63bb9bfad93dbc2c8bd21eb0de537e9081e0c9aadb21c78e5ea020493225e6ee28366a89e04b61b4dd8292f2dfd7f96be5a79a39fb4bafc6408d47
-EBUILD gnome-backgrounds-3.24.0.ebuild 472 BLAKE2B 6258b72a2439f89a041f54457af563cbcdb89c9a2a6b860583a0103a1026916c749098cb732e6ca32297bda34b7bf136168fcbb0c1e3969036008d6a2325c11b SHA512 6c8e97b7b7e4f3291db062f4b7c36c4e8042b76521558eaa743996902c46b5eab1fabcdc95cbfb3e16e980894d33521b98730e9eeeff2ee599baaa3fcdf45265
+EBUILD gnome-backgrounds-3.24.0.ebuild 471 BLAKE2B 1663953d7c6de873193b5055fdc99ccc130ece72462c30c161ec7a89166693080337e6269c6c3787643c61b9e1099a0bb8027725d0a4441ab5301f2b46f212b4 SHA512 fb99037fea4eb191e784996e24a8484e81a770e6eb038c442017f0176fcbbabae65fe777a532c74fe73b259ef962fcaa4f408325001f526772338958421b638a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-themes/gnome-backgrounds/gnome-backgrounds-3.24.0.ebuild b/x11-themes/gnome-backgrounds/gnome-backgrounds-3.24.0.ebuild
index c761bec3332a..cc430be80293 100644
--- a/x11-themes/gnome-backgrounds/gnome-backgrounds-3.24.0.ebuild
+++ b/x11-themes/gnome-backgrounds/gnome-backgrounds-3.24.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-backgrounds"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="!<x11-themes/gnome-themes-standard-3.14"
diff --git a/x11-themes/silver-xcursors/Manifest b/x11-themes/silver-xcursors/Manifest
index e6096d131770..f2b1d39d90de 100644
--- a/x11-themes/silver-xcursors/Manifest
+++ b/x11-themes/silver-xcursors/Manifest
@@ -1,5 +1,5 @@
 AUX README.gentoo 576 BLAKE2B 18c54a2b3ef37f8c5fcf0ad3ef652d7e48d026b425c9e1f6e979f97f353e4860ad7c922173aae9dc2ad70d3554d7f5082a78d582553c6cbdb2c782815763cfaa SHA512 6fb30188e9a1c6041b70ad43e94adb3ffb6cba401fb4b03c8669c46ce16ade806226215f47ada2bb39e2970bafa887fe7436962991cc5f1b4eab009c33f2732c
 DIST 5533-Silver-XCursors-3D-0.4.tar.bz2 756159 BLAKE2B 7d90a44a022512e685b592e6285786e5b4898df723cba9deb52100e66c76865b5d2ed07968901656fc5c1ef565c54f281138e9e6f323e94bcb6c1b7884c792c5 SHA512 b5b44a796d5d9341a0e92f8f4351b84eb3974d1908eb2fdb012c0490e4374404e3d33b35873f49c1f7ccd56bdced4fff14338319edabab7d11ddf31cb46fd245
-EBUILD silver-xcursors-0.4-r1.ebuild 666 BLAKE2B 74ef2cfd0c0faa61787a1b4f5ca116ae66b75d05959666526d6ed2e6d46881c447a7275dcfc2f82a140625564b61deb98ab275ef2a67293344ca3d158c732bce SHA512 202531e152ab29c30eb252cba835549d231461ae7b35fc234c7ab2d447077a06009a989aa7b8c8ef769bc397e9c1b6d5d9925c2e47921e870bbe0587949091b1
-EBUILD silver-xcursors-0.4.ebuild 1460 BLAKE2B 79d65cdc2fc9658e399cf0176a9410184a66c55d350b97bec5f0e8b1bffd7e50a375f62b40d9bbb0c3f39d9f86b0a9181dd31810ffb15f6b7d29bd151479ff43 SHA512 a86d4db245e11710d9b23ca11d6dc88d1273c90d3d6c1749a834a4527e0299d232fad1e07a5e12c7ac6adc7f8c0b579085d6bbcf17a983e60174d5daad936f46
+EBUILD silver-xcursors-0.4-r1.ebuild 668 BLAKE2B b1426c0e4f222f0d4cb9ad289ad468a32cc1be5bc9e1c63571a0e6eeccc33045ff05504c12e90fe0c2d24584a3d45461fd340316bb8095ba3643c9f30a40b0b7 SHA512 fe9db9dfb47e21512e9329b1063f7c37d82a2cc434b05c002aca3a5d5960c9ba8c590b27269d849519f4a11bdc958accb633940b6150906ffc791e799d312120
+EBUILD silver-xcursors-0.4.ebuild 1388 BLAKE2B 8018c943b3f0e98001123dbfe1ca802ba36b40cc9f903c3a1d11f5d10f4a7dfd93ab0b109d12bbdf05b6a3adc891288e8d5ddd8f76aa616fe32d582a0be6c9a8 SHA512 5f8ede783f9db1faa5e385c4434b48c16926c4f6e534513036e375e438a0a7fc954330bea1d0c40b7a509c652e59719f0202938a7be48ef89e3a37338ce67ff8
 MISC metadata.xml 272 BLAKE2B 4dbd2b5ae92564a97b2a06ab0ec6562e8dce2dd636aaf0788ee09f8688ca5d5b6483084a65366dfbe6d144d30170e5558bc5759adecb96abb405ea96a5147285 SHA512 ebe67da08587903b5b82fc194aa3c8f1ab65371f60d2c134928362e089550d9e9fd9531bffe8b676a345b5bf0ab209ce7f50d37d98201a88176f002e17582493
diff --git a/x11-themes/silver-xcursors/silver-xcursors-0.4-r1.ebuild b/x11-themes/silver-xcursors/silver-xcursors-0.4-r1.ebuild
index 2ccc6d42f3ca..992984f80adc 100644
--- a/x11-themes/silver-xcursors/silver-xcursors-0.4-r1.ebuild
+++ b/x11-themes/silver-xcursors/silver-xcursors-0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd"
 
-S=${WORKDIR}/${MY_P:5}
+S="${WORKDIR}/${MY_P:5}"
 
 src_install() {
 	dodir /usr/share/cursors/xorg-x11/Silver/cursors/
diff --git a/x11-themes/silver-xcursors/silver-xcursors-0.4.ebuild b/x11-themes/silver-xcursors/silver-xcursors-0.4.ebuild
index 05b59f73bb3d..b01150131ce7 100644
--- a/x11-themes/silver-xcursors/silver-xcursors-0.4.ebuild
+++ b/x11-themes/silver-xcursors/silver-xcursors-0.4.ebuild
@@ -1,6 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
+inherit readme.gentoo-r1
+
 MY_P="5533-Silver-XCursors-3D-${PV}"
 DESCRIPTION="A high quality set of Xfree 4.3.0 animated mouse cursors"
 HOMEPAGE="http://www.kde-look.org/content/show.php?content=5533"
@@ -14,31 +18,39 @@ IUSE=""
 RDEPEND=""
 DEPEND="${RDEPEND}"
 
+S="${WORKDIR}/${MY_P:5}"
+
+DOC_CONTENTS="To use this set of cursors, edit or create the file ~/.Xdefaults
+and add the following line:
+Xcursor.theme: Silver
+
+You can change the size by adding a line like:
+Xcursor.size: 48
+
+Also, to globally use this set of mouse cursors edit the file:
+	  /usr/share/cursors/xorg-x11/default/index.theme
+and change the line:
+	Inherits=[current setting]
+to
+	Inherits=Silver
+
+Note this will be overruled by a user's ~/.Xdefaults file."
+
 src_install() {
-	dodir /usr/share/cursors/xorg-x11/Silver/cursors/
-	cp -R  "${WORKDIR}"/${MY_P:5}/Silver/cursors "${D}"/usr/share/cursors/xorg-x11/Silver/ || die
-	dodoc "${WORKDIR}"/${MY_P:5}/README
+	insinto /usr/share/cursors/xorg-x11/Silver
+	doins -r Silver/cursors
+	einstalldocs
+
+	DISABLE_AUTOFORMATTING="yes"
+	readme.gentoo_create_doc
 }
 
 pkg_postinst() {
-	einfo "To use this set of cursors, edit or create the file ~/.Xdefaults"
-	einfo "and add the following line:"
-	einfo "Xcursor.theme: Silver"
-	einfo ""
-	einfo "You can change the size by adding a line like:"
-	einfo "Xcursor.size: 48"
-	einfo ""
-	einfo "Also, to globally use this set of mouse cursors edit the file:"
-	einfo "   /usr/share/cursors/xorg-x11/default/index.theme"
-	einfo "and change the line:"
-	einfo "    Inherits=[current setting]"
-	einfo "to"
-	einfo "    Inherits=Silver"
-	einfo ""
-	einfo "Note this will be overruled by a user's ~/.Xdefaults file."
-	einfo ""
+	DISABLE_AUTOFORMATTING="yes"
+	readme.gentoo_print_elog
+
 	ewarn "If you experience flickering, try setting the following line in"
-	ewarn ""
 	ewarn "the Device section of your xorg.conf file:"
-	ewarn "    Option  \"HWCursor\"  \"false\""
+	ewarn "    Option \"HWCursor\" \"false\""
+
 }
diff --git a/x11-themes/zuki-themes/Manifest b/x11-themes/zuki-themes/Manifest
index f0fe39176e00..8bfc819ebc1a 100644
--- a/x11-themes/zuki-themes/Manifest
+++ b/x11-themes/zuki-themes/Manifest
@@ -3,5 +3,5 @@ DIST zuki-themes-3.24.2.tar.gz 906520 BLAKE2B 2114d0236c9e5314d431d1a93bd06ac987
 DIST zuki-themes-3.24.3.tar.gz 906469 BLAKE2B 443e99711fe9908fef976f0609401413f90e54f0bc0aa1bf8ddd65085ad755457402618336884be354030c6548e39a8cc0c5a5079b7b64d17760fadb0792319f SHA512 79ce43816db11dcd4be383bf4e0512aac0863214aa3fd3a545f06b922d441d3d1ddaf63ace166736b7598bf6f4ebdd1568092622eea3ef48b2ce37fbefd312ba
 EBUILD zuki-themes-3.20.ebuild 1108 BLAKE2B 1f8f05c49361e0be246efb9f4eba7c6f1a518f6d671a783ceb94fd1cac8af7c498a23926919a087b88fcce7f5bb83204417c261f4d95ce35587a6a28ac7edd4a SHA512 28b5f6074e24f745ec5453644d10b5c716b3122b1458744ecfce716f8a24949d2bf272373aa14b874db7f4bf9fb8e233b2be4db262906673c2209b4ad405160f
 EBUILD zuki-themes-3.24.2.ebuild 1164 BLAKE2B b0b1e730c782a3f7458c28cb03c024c26fb6338a07c41b0e70c7b7c05b2d4dfc7289b23f9fb02c83fba6c8f8709efa43196284fe4d2c0f0df4c6bec909fea5b9 SHA512 ce920e463426742334a8799eec0e275356f80f7a4f5194a203ffc49601174633737dc78b97618796c6b9b386d88ce9baa11faf63aa6c4e6b23e8f1b458c414a1
-EBUILD zuki-themes-3.24.3.ebuild 1145 BLAKE2B 59bc64f1f5a353d3da4283c21f5b8b9286fab50699124584e0a9ef3c88a82ce22b0ba5c8263946d25c4b243b28a33580322996d8e767759e5e0592013fdd40bb SHA512 0f721cc76ffc291138c89e75c955fb9a4c26e0698234620f2a30a70e7d1ec2e6416ecd492ef1b8ac824d84cea418164877fdac4ab91b11d840832aa3b40368b5
+EBUILD zuki-themes-3.24.3.ebuild 1144 BLAKE2B cf35fb4fe4a02f383125d2b5620a365cca7d53284ec61a558093021ee7d99d89ca788840cba439ead321b62321ddcb207be885988067423e0f8de348d12da54f SHA512 e09712f2337a0db0e217db965822e9774f9a40147a2be783cb59e86e0221bfa6fa8c97f5c9498e448d316569b887891c0ffc62ef4a263df8b70f2bdc0c706992
 MISC metadata.xml 595 BLAKE2B 8731760b856c74ba0bf4a58a6f99e9f9c369f86892aa55ec6a60b92abc13a1b29bbbb3364b83e3a2e8b191304e858cb37eaa9f633b4f4abc1d1563e6b5c614c4 SHA512 909d1681fb7e4b6557d47a629fc7153133684f54cb854109b85ba2301fd3a91f5baa0ba51c11f766364610f8923c02e79effcfc27b81edd3b4a2f7e168e7e895
diff --git a/x11-themes/zuki-themes/zuki-themes-3.24.3.ebuild b/x11-themes/zuki-themes/zuki-themes-3.24.3.ebuild
index 738af4a3954d..8e1965884624 100644
--- a/x11-themes/zuki-themes/zuki-themes-3.24.3.ebuild
+++ b/x11-themes/zuki-themes/zuki-themes-3.24.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/lassekongo83/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnome-shell mate xfce"
 
 RDEPEND="
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 2097c386556d..24beb0a53a56 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest
index a7926b021598..d6b7dff23eac 100644
--- a/x11-wm/awesome/Manifest
+++ b/x11-wm/awesome/Manifest
@@ -17,13 +17,13 @@ DIST awesome-3.5.9.tar.xz 723084 BLAKE2B 96f4c5df98147399f28d1b1455ac53800f22229
 DIST awesome-4.0.tar.xz 930664 BLAKE2B b30f410272b1d1224a1a145523f71ac6779c9592b572f798ff924bc26e62bd55ee5a0d45bc9d0ea8faa8362333b8eea51fccf954a49c71ee3090a4ebbf7e4de7 SHA512 80bdfe5f9166f5e9b0266cd630b48607d17605330d0f172666dbfa3f239ef04aeafafebe8949c3bf1c31a7bd372b60252d56c815048a24e015858585c3d0432b
 DIST awesome-4.1.tar.xz 960768 BLAKE2B e3d77fdbfca7ddb041069fa6a9bf1406b4bfbe96b09b26b6ecf7a7ea081e4f6d7d7766b2f06a7e3cd4c59bb7e16450bdde5bfb9d9c0b6a3760500b25fe44b733 SHA512 e0c1ed5fc8f0455258ec2566e430b24e52b78d1ae54357f5de1bf08f2e44682e9b2c5548905a90cc4526d98d2b6700e087b679abc9e620d3751ea420df9434f6
 DIST awesome-4.2.tar.xz 987024 BLAKE2B b2aaa993bafa83121d165d21083dfcac825e373be9547490f8b93b8e8b0f90470395a0238affaf9990f719b8bd2f36a255f6468b6422406787a3c96946c4e831 SHA512 134dd3625c86243861b3d0701cc8bfd8c00986d7027f0832016c3f5e59e6b9a1ef2f677bb0d1d66ece63449533e4b13d8d7388e96e6f9014212030a79f163e09
-EBUILD awesome-3.5.6-r2.ebuild 3258 BLAKE2B 14a7d55e719ec88e11c1a9221a1748dda59edbbf2acfc1eb6307ff01b86a26f041a4587e0ed2df4795b513f5651a4390538fe819b9b3e93d7ea74de2753943f3 SHA512 1b86f1e13001f9fd0a20638d75d8c4f8ea6bf8bc9377b255ea709859fcecedf3f23293518f9ee856362bf85c7d8af0d9835833eda7bc34f5f872ecfc6aa91e1f
-EBUILD awesome-3.5.7.ebuild 3290 BLAKE2B 3a6cf99c8619122351eab49bf0e3c328ef17f09ee6a6c16cce4e74390aa6e019cdfaad5c07218968581e5d3f0e8bd8a41d513b2f44a16338ed2df95fb5eb06e8 SHA512 11e2bb8263f33ae6335ef058bafa726bd1cca3980de27f3e76f3b2a51bb625019a163e0ab8418051a152620605cea68f46487b9495e4c081d5fe7d1a67c597e0
-EBUILD awesome-3.5.8.ebuild 3290 BLAKE2B 3a6cf99c8619122351eab49bf0e3c328ef17f09ee6a6c16cce4e74390aa6e019cdfaad5c07218968581e5d3f0e8bd8a41d513b2f44a16338ed2df95fb5eb06e8 SHA512 11e2bb8263f33ae6335ef058bafa726bd1cca3980de27f3e76f3b2a51bb625019a163e0ab8418051a152620605cea68f46487b9495e4c081d5fe7d1a67c597e0
-EBUILD awesome-3.5.9.ebuild 3290 BLAKE2B 3a6cf99c8619122351eab49bf0e3c328ef17f09ee6a6c16cce4e74390aa6e019cdfaad5c07218968581e5d3f0e8bd8a41d513b2f44a16338ed2df95fb5eb06e8 SHA512 11e2bb8263f33ae6335ef058bafa726bd1cca3980de27f3e76f3b2a51bb625019a163e0ab8418051a152620605cea68f46487b9495e4c081d5fe7d1a67c597e0
-EBUILD awesome-4.0-r1.ebuild 3038 BLAKE2B caf8794df4f1d46a30157ef006db00f98d80ec1d8b074812178e217acb234c0ad834b93cd7398300a6b8e1a6310d1e57022591f91f9d49394dd85c9ee517c787 SHA512 0b27b64a823bd8d61214a0d405031b466b0886f351ecbcb3fc02483f88dd1e4e4b2e796c0b6da91d92bba9267cb241723b2f28d61a862a7cba94d49c529db26e
-EBUILD awesome-4.0.ebuild 2839 BLAKE2B 04c2a2b739de4866eebd50e5fbb6b1b922a507e942e1feb4aa15c29596599bbbd5da75f679012c64a64462c64bd72effbedfa6fb94df2bc7fa8dbad9c3693b27 SHA512 a083ed4b9ae277e8e4059031d8fd1e8ed37885bc0019ea8c44155ecfcee5e036432623e07951dcb5f38e3ec431bd7f99b257b42efde949c44a83e08e4eb42674
-EBUILD awesome-4.1.ebuild 3022 BLAKE2B 0934e4f6717846f0f35b394180b094e2ea5e00731a48ed66e1dee2953bf4be05814a7892d1b5c02deaa4a896fcc90aaa511cdc23d028540139450c1be68a3133 SHA512 b42632f71c5075dc83608b7d3b61d430f2e805b777bd1833f93eb1848307c71e4887ba445378cafd50a4c238c0d2290a0436515e7132c7edd16436a6b59dfbaf
-EBUILD awesome-4.2.ebuild 3027 BLAKE2B 6157bb753de7cf7f21210edb06ddcad806893daa32f5b133bbc1b0a23bc919a5abeb89fe551276de4449bde7b572cddafb3568e4d4c5396c58ad701096bc292c SHA512 588e1f7847d304c67563f66ea457b0d9c7880bbfc1aa0c9bf36e7428a9ccdd3d1ee396a2cf6ae8996a1085f61c329364dec36e3a7390093df81666ca03fd8922
-EBUILD awesome-9999.ebuild 2998 BLAKE2B 5d2bf333630b9f284a9e03641bb34c7ac1528b8fae70a21705f83795d0829891b5187e86a3f050adb182d0d0ca84847f4a19565f9d055a7fe6b1e9722d0ae535 SHA512 e8c24a3a9a290ae90bc6bde550c564ec85dac3237603e875382c552e6ae3661572732a526f1e02951f187da13b093288550448aadd107dfd3d01ce51f26d1b1c
+EBUILD awesome-3.5.6-r2.ebuild 3296 BLAKE2B 175df7a0d594d5e75bbfab520e08279a1bd5457f2db16350f94c298489591362c56ef863b835aee5f2cfc4cc06b3230a6cc5118d222c1a47987f2db410a7dc16 SHA512 c86b35ccb4a459bcef7c63af82a0de219148d2f0da1cad713c605e762a6d9ea3bc191807cf3994643989c12a341d08c5223122c406470ae60fa5c68bc39b092a
+EBUILD awesome-3.5.7.ebuild 3328 BLAKE2B 366e1c3659ae3236d2f1a0560710ab30f29c8b0e13a775906f61d19c429ff5b54c34f105b5afaa16097308bae8cc4eb78fe08aa32d09c4f59e8b5d08fabd2ba3 SHA512 bc152185f11d256b872c113a9fda5db94e1d7916c5afa7d0cfa0872b0abc00d21f8d7f104c35fdb330b5ce366d47b44b9aa07dd5bf28d2f82bd80a34d7c8a179
+EBUILD awesome-3.5.8.ebuild 3328 BLAKE2B 366e1c3659ae3236d2f1a0560710ab30f29c8b0e13a775906f61d19c429ff5b54c34f105b5afaa16097308bae8cc4eb78fe08aa32d09c4f59e8b5d08fabd2ba3 SHA512 bc152185f11d256b872c113a9fda5db94e1d7916c5afa7d0cfa0872b0abc00d21f8d7f104c35fdb330b5ce366d47b44b9aa07dd5bf28d2f82bd80a34d7c8a179
+EBUILD awesome-3.5.9-r1.ebuild 3328 BLAKE2B 366e1c3659ae3236d2f1a0560710ab30f29c8b0e13a775906f61d19c429ff5b54c34f105b5afaa16097308bae8cc4eb78fe08aa32d09c4f59e8b5d08fabd2ba3 SHA512 bc152185f11d256b872c113a9fda5db94e1d7916c5afa7d0cfa0872b0abc00d21f8d7f104c35fdb330b5ce366d47b44b9aa07dd5bf28d2f82bd80a34d7c8a179
+EBUILD awesome-4.0-r1.ebuild 3076 BLAKE2B 030077553d5d7c1cd1ddc10ba96dc4f69108ca024c94734dd4bbfbb94f5b2cfb2873a6263a9c039beb5aff944e7ffe7e2ab7302dc5b4ba95ecfdbe158e6eb44a SHA512 f5034489d448cf22e5109f3b72a6c124f4abcaeb848bc38ad6e1c26e7abd6eaa4dc362c4811b3f2acba36be1db4aa7b176e78e905882f64bad242da66078f532
+EBUILD awesome-4.0.ebuild 2877 BLAKE2B da62c6f864b75b4b01fbdef8b84eb29e6d0165d4676cbaa8672887be39d8653718d561372cc1645a5e6ef8bc0356da3af2b75355c8110a3e8a1595fcd3bcd332 SHA512 acc26e8d979e7d0b823021d0036b903907eb8706bf9937d49a33bd797f6fdfdea4680052cdb0c68c898aaa82a7554b04e449276a9080495a3ba16d83bc1eff44
+EBUILD awesome-4.1.ebuild 3060 BLAKE2B d54dfc50dad0cc9c6ac1ec30c6a3b47c80139a7f129a490b316b3fb6ee8a41d1724569ab919b9aca189285e6f5381cf99320924faf4005d70d78a718bf4a216a SHA512 3badbe13e5fc9a4036cde1453ce9dd91c7201ae8ff791763164dbabae4640bcd145759a4ed5a28b211edc43e49dcfe70424517e6874593dd5e74421e13310a21
+EBUILD awesome-4.2.ebuild 3065 BLAKE2B a33abec87e5eff8b561ade7a2f251749860b2a1930e14cd68c6730fb9141062d3e4b6c96e8c24630c79639264af96a4850edc346f93f789fe279f5b4a2aec973 SHA512 afb5a47b4c9031ffd6a243069b572234e29934cc9a0adc8ef0d99a17f0676382ca8e6b11950f711dafb36826e9d1b710a811eaa5eadecb4723080f050679720d
+EBUILD awesome-9999.ebuild 3036 BLAKE2B 5d5697c6cf1e558131aaa87617c1d95d8e4730e7bc27e05682156aecdfc101f27c3ba93ed597e93fb2b42a6a61c3c4b7a93e791bc93fd7290550922f53c370a5 SHA512 8741e66a1e5667485b017925d4b1648c2ecd2fe108bbb2d18d0c3c301849d9d3eaea643bb2c600e3a9f003711eabc167cb313485d2932cc478cadaae3c3d79ab
 MISC metadata.xml 678 BLAKE2B 4ef555e57fed17cdc504cb597fbc7702d617d506dcefc3a25471bdaf947209e9a973ef21b49dbf46c678b6da7a1d2a9881e6439a438ac842e4b325b789b62759 SHA512 c50888d616bc887cdf1aec26469da7d8a0041f7f1904e7aeed4b763866827def72f5a06d30ac2da3d04b7d0c05929d87fac60b45c9e6aa5d107e464b92ee6ff9
diff --git a/x11-wm/awesome/awesome-3.5.6-r2.ebuild b/x11-wm/awesome/awesome-3.5.6-r2.ebuild
index ada253ff8f8e..cd7b7ca16cae 100644
--- a/x11-wm/awesome/awesome-3.5.6-r2.ebuild
+++ b/x11-wm/awesome/awesome-3.5.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -28,7 +28,7 @@ COMMON_DEPEND="
 	x11-libs/libXcursor
 	>=x11-libs/libX11-1.3.99.901
 	dbus? ( >=sys-apps/dbus-1 )
-	elibc_FreeBSD? ( dev-libs/libexecinfo )"
+	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )"
 
 # graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
 DEPEND="${COMMON_DEPEND}
diff --git a/x11-wm/awesome/awesome-3.5.7.ebuild b/x11-wm/awesome/awesome-3.5.7.ebuild
index c3473fd22bd5..839456e65e9c 100644
--- a/x11-wm/awesome/awesome-3.5.7.ebuild
+++ b/x11-wm/awesome/awesome-3.5.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -28,7 +28,7 @@ COMMON_DEPEND="
 	x11-libs/libXcursor
 	>=x11-libs/libX11-1.3.99.901
 	dbus? ( >=sys-apps/dbus-1 )
-	elibc_FreeBSD? ( dev-libs/libexecinfo )"
+	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )"
 
 # graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
 DEPEND="${COMMON_DEPEND}
diff --git a/x11-wm/awesome/awesome-3.5.8.ebuild b/x11-wm/awesome/awesome-3.5.8.ebuild
index c3473fd22bd5..839456e65e9c 100644
--- a/x11-wm/awesome/awesome-3.5.8.ebuild
+++ b/x11-wm/awesome/awesome-3.5.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -28,7 +28,7 @@ COMMON_DEPEND="
 	x11-libs/libXcursor
 	>=x11-libs/libX11-1.3.99.901
 	dbus? ( >=sys-apps/dbus-1 )
-	elibc_FreeBSD? ( dev-libs/libexecinfo )"
+	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )"
 
 # graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
 DEPEND="${COMMON_DEPEND}
diff --git a/x11-wm/awesome/awesome-3.5.9.ebuild b/x11-wm/awesome/awesome-3.5.9-r1.ebuild
index c3473fd22bd5..839456e65e9c 100644
--- a/x11-wm/awesome/awesome-3.5.9.ebuild
+++ b/x11-wm/awesome/awesome-3.5.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -28,7 +28,7 @@ COMMON_DEPEND="
 	x11-libs/libXcursor
 	>=x11-libs/libX11-1.3.99.901
 	dbus? ( >=sys-apps/dbus-1 )
-	elibc_FreeBSD? ( dev-libs/libexecinfo )"
+	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )"
 
 # graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
 DEPEND="${COMMON_DEPEND}
diff --git a/x11-wm/awesome/awesome-4.0-r1.ebuild b/x11-wm/awesome/awesome-4.0-r1.ebuild
index 3dddc28075a9..826268e38185 100644
--- a/x11-wm/awesome/awesome-4.0-r1.ebuild
+++ b/x11-wm/awesome/awesome-4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,7 +33,7 @@ RDEPEND="
 	x11-libs/libxkbcommon[X]
 	>=x11-libs/libX11-1.3.99.901
 	dbus? ( >=sys-apps/dbus-1 )
-	elibc_FreeBSD? ( dev-libs/libexecinfo )"
+	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )"
 
 # graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
 DEPEND="${RDEPEND}
diff --git a/x11-wm/awesome/awesome-4.0.ebuild b/x11-wm/awesome/awesome-4.0.ebuild
index eed4554091af..ee9a7cf8b691 100644
--- a/x11-wm/awesome/awesome-4.0.ebuild
+++ b/x11-wm/awesome/awesome-4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,7 +33,7 @@ RDEPEND="
 	x11-libs/libxkbcommon[X]
 	>=x11-libs/libX11-1.3.99.901
 	dbus? ( >=sys-apps/dbus-1 )
-	elibc_FreeBSD? ( dev-libs/libexecinfo )"
+	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )"
 
 # graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
 DEPEND="${RDEPEND}
diff --git a/x11-wm/awesome/awesome-4.1.ebuild b/x11-wm/awesome/awesome-4.1.ebuild
index 65af18c4d489..2e8cefe90f62 100644
--- a/x11-wm/awesome/awesome-4.1.ebuild
+++ b/x11-wm/awesome/awesome-4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,7 +33,7 @@ RDEPEND="
 	x11-libs/libxkbcommon[X]
 	>=x11-libs/libX11-1.3.99.901
 	dbus? ( >=sys-apps/dbus-1 )
-	elibc_FreeBSD? ( dev-libs/libexecinfo )"
+	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )"
 
 # graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
 DEPEND="${RDEPEND}
diff --git a/x11-wm/awesome/awesome-4.2.ebuild b/x11-wm/awesome/awesome-4.2.ebuild
index 61644c037673..170a680ce24f 100644
--- a/x11-wm/awesome/awesome-4.2.ebuild
+++ b/x11-wm/awesome/awesome-4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,7 +33,7 @@ RDEPEND="
 	x11-libs/libxkbcommon[X]
 	>=x11-libs/libX11-1.3.99.901
 	dbus? ( >=sys-apps/dbus-1 )
-	elibc_FreeBSD? ( dev-libs/libexecinfo )"
+	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )"
 
 # graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
 DEPEND="${RDEPEND}
diff --git a/x11-wm/awesome/awesome-9999.ebuild b/x11-wm/awesome/awesome-9999.ebuild
index 243752a5d4a3..d26ba4a2ba97 100644
--- a/x11-wm/awesome/awesome-9999.ebuild
+++ b/x11-wm/awesome/awesome-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -32,7 +32,7 @@ RDEPEND="
 	x11-libs/libxkbcommon[X]
 	>=x11-libs/libX11-1.3.99.901
 	dbus? ( >=sys-apps/dbus-1 )
-	elibc_FreeBSD? ( dev-libs/libexecinfo )"
+	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )"
 
 # graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
 DEPEND="${RDEPEND}
diff --git a/x11-wm/compiz-fusion/Manifest b/x11-wm/compiz-fusion/Manifest
deleted file mode 100644
index 4a0e6bd3e241..000000000000
--- a/x11-wm/compiz-fusion/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD compiz-fusion-0.8.8-r1.ebuild 741 BLAKE2B 05af5e3b435e33cbc96700b268e62630a751a9827a6ace81764424829aada0e02b9a29f97599a234e0a58c9513fa6708115688558f09efa64f8da1bd25c77065 SHA512 55ea1d89e96bae8450345a82abf6cfc377cc174f30d01c500b2765451a0397482f75539a7f3658efbb741ff7308c6cc546e63da6d821b6022deed26a7f784c26
-MISC metadata.xml 496 BLAKE2B badb6cdf863f2a53c564899354d164499dab0e36c83a49005789fa1517473210ea00c9395094752138ebe1d4411a0c5bbef0de153490f780ffeca539aed95bcf SHA512 4319841dc5d6e2bf1f93f451431279d7df82a716654fca252fda3436ac3a7fb9944aac2e906981b18615a86ffdb8f65b579d33034e929b53c97514f8d0a0b0a6
diff --git a/x11-wm/compiz-fusion/compiz-fusion-0.8.8-r1.ebuild b/x11-wm/compiz-fusion/compiz-fusion-0.8.8-r1.ebuild
deleted file mode 100644
index 115d647215f9..000000000000
--- a/x11-wm/compiz-fusion/compiz-fusion-0.8.8-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Compiz Fusion (meta)"
-HOMEPAGE="http://www.compiz.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="emerald gnome unsupported"
-
-RDEPEND="
-	>=x11-wm/compiz-${PV}
-	>=x11-plugins/compiz-plugins-main-${PV}
-	>=x11-plugins/compiz-plugins-extra-${PV}
-	>=x11-misc/ccsm-0.8.4
-	emerald? ( >=x11-wm/emerald-${PV} )
-	gnome? ( >=x11-libs/compizconfig-backend-gconf-${PV} )
-	unsupported? ( >=x11-plugins/compiz-plugins-unsupported-${PV} )"
-
-pkg_postinst() {
-	ewarn "If you want to try out simple-ccsm, you'll need to emerge it"
-	ewarn "If you want to use emerald, set the emerald use flag"
-}
diff --git a/x11-wm/compiz-fusion/metadata.xml b/x11-wm/compiz-fusion/metadata.xml
deleted file mode 100644
index 3913b8881187..000000000000
--- a/x11-wm/compiz-fusion/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-<use>
-  <flag name="emerald">Install the <pkg>x11-wm/emerald</pkg> package.</flag>
-  <flag name="unsupported">Install the <pkg>x11-plugins/compiz-plugins-unsupported</pkg> package.</flag>
-</use>
-<longdescription>
-compiz-fusion is a community-driven project that is aimed at extending the compiz window manager.
-</longdescription>
-</pkgmetadata>
diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
deleted file mode 100644
index 3add2240e711..000000000000
--- a/x11-wm/compiz/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX compiz-gcc-4.7.patch 999 BLAKE2B 015326252bb0c9132bbfdf71151ba0b669f91989a0e007b64201f0b8fce5a61ac5493371bac999adef6eac1f9c2f9019c4c6055ea67982a11696cf831e6587af SHA512 e08563d928578ad74faa29168b3c3442cc0ab4e908ff4f430a7e23bcb2057e3da10f9742e8abbdaad9df6f56a039134e8a32f73ae214e240065d6d4ddd3a92bf
-AUX compiz-manager 9835 BLAKE2B a77c11f00ac02d8b8d955e585a4bfb1dcea331844659e7f40a87d068458a9bb5c8b330a8cb2978ae79f9117e96c1b3a23305a26dac3afe91ac52dc1f58c152c8 SHA512 5cf4c1023754128c456d48db257a308461de0cbd9ebd427a4c281ada0b77659013723362959ae39fa31f24de36929fdfe6ea96d9788cba568f35d2dc86bc263a
-AUX compiz-no-gconf.patch 630 BLAKE2B 65147cc70530482a35ce309984f6090b28f991286e277aedb1eb4b9c4d5caab1a8cceb0da7abdfaf644803cf04e0cb78b17c347376c4ae665a07f4e2e23eaf46 SHA512 3c3789852db56be06d553dcdddb68c94e68b9290c74e5a9e642f266d1688c18eb4ce01b6835f267c84d3a213ec61266159d5891b10d80cb79e17bc9683163bf9
-AUX compiz.desktop 258 BLAKE2B ee7464d4e0ac53ecfc0731b063ec3b6a2530a909521f8a9df5ef380ce26bf9e84e23aef69390ca977d2db53edd3bdb7cbaa288f210da38bea1cf1151108c5876 SHA512 ab9084fe8d44a9a053e84483774d9db2b1b8def4fbb16ca9c74af18271ec0f7d3d7dbe607fa7e0687bbe6f6d9ef8ee17701e1a88c15adea822f45450f4ebb291
-DIST compiz-0.8.8.tar.bz2 1123892 BLAKE2B 0de05006efca091cc136c018fa265c42364d7c97654f8fc75e5b5ed80b0b30f50f20b1acd273dafccd2bfb592b1e7d4652ad45c4d3290c16edf5d5138a5be184 SHA512 6e3bad018835fdbc1b0e5ecb51a46a77a6531d46d77ee3ae4169273632ea9a6839c78300b18e2198c41698517efa65ded75387785b0c5bbbb6da41498451b644
-EBUILD compiz-0.8.8-r3.ebuild 3466 BLAKE2B 694eb0d03e0fb9c4644f6e65be7beb6a6cf2cbad416c951786c170ab708bae4cdc477fec0f820dd01778b7dae04015c354abdb1d74edfe5ddae06dbbe4ef5825 SHA512 6565dc9124563e8dfde7dac09dacfb2d017d937e3aed5982222f4195871984b4b1f3ea089f220dde73355cafe397ff25abba11233b02247cd2714bb423a9f850
-MISC metadata.xml 630 BLAKE2B 565c4597c33e3c26a59b163a5f05941caafbbbb00d0725ebf4c17bc50756e47da2c92bc6f8646053b199419627f0a3f1ebcbc7640054579598ddfc774d21d5a9 SHA512 6640ccef9ce07714d737e9dc682177c34e36927082c3a5fb1af1c115c2b173bc914a650f122a5845179b2f927d0b03538c0a3481790a9ea97966f9973309308f
diff --git a/x11-wm/compiz/compiz-0.8.8-r3.ebuild b/x11-wm/compiz/compiz-0.8.8-r3.ebuild
deleted file mode 100644
index 36d5c22ae14c..000000000000
--- a/x11-wm/compiz/compiz-0.8.8-r3.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils gnome2-utils
-
-DESCRIPTION="OpenGL window and compositing manager"
-HOMEPAGE="http://www.compiz.org/"
-SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="+cairo dbus fuse gnome gconf gtk +svg"
-
-COMMONDEPEND="
-	>=dev-libs/glib-2
-	dev-libs/libxml2
-	dev-libs/libxslt
-	media-libs/libpng:0=
-	>=media-libs/mesa-6.5.1-r1
-	>=x11-base/xorg-server-1.1.1-r1
-	>=x11-libs/libX11-1.4
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libICE
-	x11-libs/libSM
-	>=x11-libs/libXrender-0.8.4
-	>=x11-libs/startup-notification-0.7
-	virtual/glu
-	cairo? (
-		x11-libs/cairo[X]
-	)
-	dbus? (
-		>=sys-apps/dbus-1.0
-		dev-libs/dbus-glib
-	)
-	fuse? ( sys-fs/fuse )
-	gnome? (
-		>=gnome-base/gnome-control-center-2.16.1:2
-		gnome-base/gnome-desktop:2
-		gconf? ( gnome-base/gconf:2 )
-	)
-	gtk? (
-		>=x11-libs/gtk+-2.8.0:2
-		>=x11-libs/libwnck-2.18.3:1
-		x11-libs/pango
-	)
-	svg? (
-		>=gnome-base/librsvg-2.14.0:2
-		>=x11-libs/cairo-1.0
-	)
-"
-
-DEPEND="${COMMONDEPEND}
-	virtual/pkgconfig
-	x11-proto/damageproto
-	x11-proto/xineramaproto
-"
-
-RDEPEND="${COMMONDEPEND}
-	x11-apps/mesa-progs
-	x11-apps/xdpyinfo
-	x11-apps/xset
-	x11-apps/xvinfo
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-src_prepare() {
-	echo gtk/gnome/compiz-wm.desktop.in >> po/POTFILES.skip
-	echo metadata/core.xml.in >> po/POTFILES.skip
-
-	# Patch for compatibility with gcc 4.7
-	epatch "${FILESDIR}"/${PN}-gcc-4.7.patch
-
-	if ! use gnome || ! use gconf; then
-		epatch "${FILESDIR}"/${PN}-no-gconf.patch
-	fi
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# We make gconf optional by itself, but only if gnome is also
-	# enabled, otherwise we simply disable it.
-	if use gnome; then
-		myconf="${myconf} $(use_enable gconf)"
-	else
-		myconf="${myconf} --disable-gconf"
-	fi
-
-	econf \
-		--enable-fast-install \
-		--disable-static \
-		--disable-gnome-keybindings \
-		--with-default-plugins \
-		$(use_enable svg librsvg) \
-		$(use_enable cairo annotate) \
-		$(use_enable dbus) \
-		$(use_enable dbus dbus-glib) \
-		$(use_enable fuse) \
-		$(use_enable gnome) \
-		$(use_enable gnome metacity) \
-		$(use_enable gtk) \
-		--disable-kde4 \
-		--disable-kde \
-		${myconf}
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-
-	# Install compiz-manager
-	dobin "${FILESDIR}"/compiz-manager
-
-	# Add the full-path to lspci
-	sed -i "s#lspci#/usr/sbin/lspci#" "${D}/usr/bin/compiz-manager" || die
-
-	# Fix the hardcoded lib paths
-	sed -i "s#/lib/#/$(get_libdir)/#g" "${D}/usr/bin/compiz-manager" || die
-
-	# Create gentoo's config file
-	dodir /etc/xdg/compiz
-
-	cat <<- EOF > "${D}/etc/xdg/compiz/compiz-manager"
-	COMPIZ_BIN_PATH="/usr/bin/"
-	PLUGIN_PATH="/usr/$(get_libdir)/compiz/"
-	LIBGL_NVIDIA="/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.so.1.2"
-	LIBGL_FGLRX="/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.so.1.2"
-	KWIN="$(type -p kwin)"
-	METACITY="$(type -p metacity)"
-	SKIP_CHECKS="yes"
-	EOF
-
-	domenu "${FILESDIR}"/compiz.desktop
-}
-
-pkg_preinst() {
-	use gnome && use gconf && gnome2_gconf_savelist
-}
-
-pkg_postinst() {
-	use gnome && use gconf && gnome2_gconf_install
-
-	ewarn "If you update to x11-wm/metacity-2.24 after you install ${P},"
-	ewarn "gtk-window-decorator will crash until you reinstall ${PN} again."
-}
-
-pkg_prerm() {
-	use gnome && gnome2_gconf_uninstall
-}
diff --git a/x11-wm/compiz/files/compiz-gcc-4.7.patch b/x11-wm/compiz/files/compiz-gcc-4.7.patch
deleted file mode 100644
index 28315baec5b8..000000000000
--- a/x11-wm/compiz/files/compiz-gcc-4.7.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- kde/window-decorator-kde4/window.cpp	2010-05-21 11:18:14.000000000 +0000
-+++ kde/window-decorator-kde4/window.cpp	2012-09-12 18:05:00.000000000 +0000
-@@ -59,6 +59,9 @@
- 
- #include "paintredirector.h"
- 
-+// header for gcc-4.7 compatibility
-+#include "unistd.h"
-+
- KWD::Window::Window (WId  parentId,
- 		     WId  clientId,
- 		     WId  frame,
---- configure.ac.orig	2012-09-12 23:39:54.093812000 +0400
-+++ configure.ac	2012-09-12 23:40:37.253686000 +0400
-@@ -72,11 +72,6 @@
-   *) CFLAGS="$CFLAGS -Wnested-externs" ;;
-   esac
- 
--  case " $CFLAGS " in
--  *[[\ \	]]-D_FORTIFY_SOURCE=2[[\ \	]]*) ;;
--  *) CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2" ;;
--  esac
--
-   if test "x$enable_ansi" = "xyes"; then
-     case " $CFLAGS " in
-     *[[\ \	]]-ansi[[\ \	]]*) ;;
-@@ -95,11 +90,6 @@
-   *[[\ \	]]-Wall[[\ \	]]*) ;;
-   *) CXXFLAGS="$CXXFLAGS -Wall" ;;
-   esac
--
--  case " $CXXFLAGS " in
--  *[[\ \	]]-D_FORTIFY_SOURCE=2[[\ \	]]*) ;;
--  *) CXXFLAGS="$CXXFLAGS -D_FORTIFY_SOURCE=2" ;;
--  esac
- fi
- 
- AC_C_BIGENDIAN
diff --git a/x11-wm/compiz/files/compiz-manager b/x11-wm/compiz/files/compiz-manager
deleted file mode 100644
index 74d45da2590e..000000000000
--- a/x11-wm/compiz/files/compiz-manager
+++ /dev/null
@@ -1,384 +0,0 @@
-#!/bin/sh
-# Compiz Manager wrapper script
-# 
-# Copyright (c) 2007 Kristian Lyngstøl <kristian@bohemians.org>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-#
-#
-# Contributions by: Treviño (3v1n0) <trevi55@gmail.com>, Ubuntu Packages
-#
-# Much of this code is based on Beryl code, also licensed under the GPL.
-# This script will detect what options we need to pass to compiz to get it
-# started, and start a default plugin and possibly window decorator.
-# 
-
-
-COMPIZ_BIN_PATH="/usr/bin/" # For window decorators and compiz
-PLUGIN_PATH="/usr/lib/compiz/" 
-GLXINFO="/usr/bin/glxinfo"
-KWIN="/usr/bin/kwin"
-METACITY="/usr/bin/metacity"
-COMPIZ_NAME="compiz" # Final name for compiz (compiz.real) 
-
-# For Xgl LD_PRELOAD
-LIBGL_NVIDIA="/usr/lib/nvidia/libGL.so.1.2.xlibmesa"
-LIBGL_FGLRX="/usr/lib/fglrx/libGL.so.1.2.xlibmesa"
-
-# Minimum amount of memory (in kilo bytes) that nVidia cards need
-# to be allowed to start
-# Set to 262144 to require 256MB
-NVIDIA_MEMORY="65536" # 64MB
-NVIDIA_SETTINGS="nvidia-settings" # Assume it's in the path by default
-
-# For detecting what driver is in use, the + is for one or more /'s
-XORG_DRIVER_PATH="/usr/lib/xorg/modules/drivers/+"
-
-FALLBACKWM="${METACITY}"
-FALLBACKWM_OPTIONS="--replace $@"
-
-# Driver whitelist
-WHITELIST="nvidia intel ati radeon i810"
-
-# blacklist based on the pci ids 
-# See http://wiki.compiz-fusion.org/Hardware/Blacklist for details
-T="   1002:5954 1002:5854 1002:5955" # ati rs480
-T="$T 1002:4153" # ATI Rv350
-T="$T 8086:2982 8086:2992 8086:29a2 8086:2a02 8086:2a12"  # intel 965
-BLACKLIST_PCIIDS="$T"
-unset T
-
-COMPIZ_OPTIONS="--ignore-desktop-hints --replace"
-COMPIZ_PLUGINS=""
-ENV=""
-
-# Use emerald by default if it exist
-USE_EMERALD="yes"
-
-# No indirect by default
-INDIRECT="no"
-
-# Default X.org log if xset q doesn't reveal it
-XORG_DEFAULT_LOG="/var/log/Xorg.0.log"
-
-# Set to yes to enable verbose
-VERBOSE="yes"
-
-# Echos the arguments if verbose
-verbose()
-{
-	if [ "x$VERBOSE" = "xyes" ]; then
-		printf "$*"
-	fi
-}
-
-# abort script and run fallback windowmanager
-abort_with_fallback_wm()
-{
-	if [ "x$SKIP_CHECKS" = "xyes" ]; then
-		verbose "SKIP_CHECKS is yes, so continuing despite problems.\n"
-		return 0;
-	fi
-
-	verbose "aborting and using fallback: $FALLBACKWM \n"
-
-	if [ -x $FALLBACKWM ]; then
-		exec $FALLBACKWM $FALLBACKWM_OPTIONS
-	else
-		printf "no $FALLBACKWM found, exiting\n"
-		exit 1
-	fi
-}
-
-# Check for non power of two texture support
-check_npot_texture()
-{
-	verbose "Checking for non power of two support: "
-	if glxinfo 2> /dev/null | egrep -q '(GL_ARB_texture_non_power_of_two|GL_NV_texture_rectangle|GL_EXT_texture_rectangle|GL_ARB_texture_rectangle)' ; then
-		verbose "present. \n";
-		return 0;
-	else
-		verbose "Not present. \n"
-		return 1;
-	fi
-
-}
-
-# Check for presence of FBConfig
-check_fbconfig()
-{
-	verbose "Checking for FBConfig: "
-	if [ "$INDIRECT" = "yes" ]; then
-		$GLXINFO -i | grep -q GLX.*fbconfig 
-		FB=$?
-	else
-		$GLXINFO | grep -q GLX.*fbconfig 
-		FB=$?
-	fi
-
-	if [ $FB = "0" ]; then
-		unset FB
-		verbose "present. \n"
-		return 0;
-	else
-		unset FB
-		verbose "not present. \n"
-		return 1;
-	fi
-}
-
-
-# Check for TFP
-check_tfp()
-{
-	verbose "Checking for texture_from_pixmap: "
-	if [ $($GLXINFO 2>/dev/null | grep GLX_EXT_texture_from_pixmap -c) -gt 2 ] ; then
-		verbose "present. \n"
-		return 0;
-	else
-		verbose "not present. \n"
-		if [ "$INDIRECT" = "yes" ]; then
-			unset LIBGL_ALWAYS_INDIRECT
-			INDIRECT="no"
-			return 1;
-		else
-			verbose "Trying again with indirect rendering:\n";
-			INDIRECT="yes"
-			export LIBGL_ALWAYS_INDIRECT=1
-			check_tfp;
-			return $?
-		fi
-	fi
-}
-
-# Check wether the composite extension is present
-check_composite()
-{
-	verbose "Checking for Composite extension: "
-	if xdpyinfo -queryExtensions | grep -q Composite ; then
-		verbose "present. \n";
-		return 0;
-	else
-		verbose "not present. \n";
-		return 1;
-	fi
-}
-
-# Detects if Xgl is running
-check_xgl()
-{
-	verbose "Checking for Xgl: "
-	if xvinfo | grep -q Xgl ; then
-		verbose "present. \n"
-		return 0;
-	else
-		verbose "not present. \n"
-		return 1;
-	fi
-}
-
-# Check if the nVidia card has enough video ram to make sense
-check_nvidia_memory()
-{
-	MEM=$(${NVIDIA_SETTINGS} -q VideoRam | egrep Attribute\ \'VideoRam\'\ .*: | cut -d: -f3 | sed 's/[^0-9]//g')
-	if [ $MEM -lt $NVIDIA_MEMORY ]; then
-		verbose "Less than ${NVIDIA_MEMORY}kb of memory and nVidia";
-		return 1;
-	fi
-	return 0;
-}
-
-# Check for existence if NV-GLX
-check_nvidia()
-{
-	if [ ! -z $NVIDIA_INTERNAL_TEST ]; then
-		return $NVIDIA_INTERNAL_TEST;
-	fi
-	verbose "Checking for nVidia: "
-	if xdpyinfo | grep -q NV-GLX ; then
-		verbose "present. \n"
-		NVIDIA_INTERNAL_TEST=0
-		return 0;
-	else
-		verbose "not present. \n"
-		NVIDIA_INTERNAL_TEST=1
-		return 1;
-	fi
-}
-
-# Check if the max texture size is large enough compared to the resolution
-check_texture_size()
-{
-	TEXTURE_LIMIT=$(glxinfo -l | grep -m1 GL_MAX_TEXTURE_SIZE | sed 's/.*=[^0-9]//g')
-	RESOLUTION=$(xdpyinfo  | grep -i dimensions: | sed 's/[^0-9]*pixels.*(.*).*//' | sed 's/[^0-9x]*//')
-	VRES=$(echo $RESOLUTION | sed 's/.*x//')
-	HRES=$(echo $RESOLUTION | sed 's/x.*//')
-	verbose "Comparing resolution ($RESOLUTION) to maximum 3D texture size ($TEXTURE_LIMIT): ";
-	if [ $VRES -gt $TEXTURE_LIMIT ] || [ $HRES -gt $TEXTURE_LIMIT ]; then
-		verbose "Failed.\n"
-		return 1;
-	fi
-	verbose "Passed.\n"
-	return 0
-}
-
-# check driver whitelist
-running_under_whitelisted_driver()
-{
-	LOG=$(xset q|grep "Log file"|awk '{print $3}')
-	if [ "$LOG" = "" ]; then
-	    verbose "xset q doesn't reveal the location of the log file. Using fallback $XORG_DEFAULT_LOG \n"
-	    LOG=$XORG_DEFAULT_LOG;
-	fi
-	if [ -z "$LOG" ];then
-		verbose "AIEEEEH, no Log file found \n"
-		verbose "$(xset q) \n"
-	return 0
-	fi
-	for DRV in ${WHITELIST}; do
-		if egrep -q "Loading ${XORG_DRIVER_PATH}${DRV}_drv\.so" $LOG &&
-		   ! egrep -q "Unloading ${XORG_DRIVER_PATH}${DRV}_drv\.so" $LOG; 
-		then
-			return 0
-		fi
-	done
-	verbose "No whitelisted driver found\n"
-	return 1
-}
-
-# check pciid blacklist
-have_blacklisted_pciid()
-{
-	OUTPUT=$(lspci -n)
-	for ID in ${BLACKLIST_PCIIDS}; do
-		if echo "$OUTPUT" | egrep -q "$ID"; then
-			verbose "Blacklisted PCIID '$ID' found \n"
-			return 0
-		fi
-	done
-	OUTPUT=$(lspci -vn | grep -i VGA)
-	verbose "Detected PCI ID for VGA: $OUTPUT\n"
-	return 1
-}
-
-build_env()
-{
-	if check_nvidia; then
-		ENV="__GL_YIELD=NOTHING "
-	fi
-	if [ "$INDIRECT" = "yes" ]; then
-		ENV="$ENV LIBGL_ALWAYS_INDIRECT=1 "
-	fi
-	if check_xgl; then
-		if [ -f ${LIBGL_NVIDIA} ]; then
-			ENV="$ENV LD_PRELOAD=${LIBGL_NVIDIA}"
-			verbose "Enabling Xgl with nVidia drivers...\n"
-		fi
-		if [ -f ${LIBGL_FGLRX} ]; then
-			ENV="$ENV LD_PRELOAD=${LIBGL_FGLRX}"
-			verbose "Enabling Xgl with fglrx ATi drivers...\n"
-		fi
-	fi
-
-	ENV="$ENV FROM_WRAPPER=yes"
-
-	if [ -n "$ENV" ]; then
-		export $ENV
-	fi
-}
-
-build_args()
-{
-	if [ $INDIRECT = "yes" ]; then
-		COMPIZ_OPTIONS="$COMPIZ_OPTIONS --indirect-rendering "
-	fi
-	if check_nvidia; then
-		COMPIZ_OPTIONS="$COMPIZ_OPTIONS --loose-binding"
-	fi
-}
-
-####################
-# Execution begins here.
-
-# Read configuration from XDG paths
-if [ -z "$XDG_CONFIG_DIRS" ]; then
-	test -f /etc/xdg/compiz/compiz-manager && . /etc/xdg/compiz/compiz-manager
-else
-	test -f $XDG_CONFIG_DIRS/compiz/compiz-manager && . $XDG_CONFIG_DIRS/compiz/compiz-manager
-fi
-
-if [ -z "$XDG_CONFIG_HOME" ]; then
-	test -f $HOME/.config/compiz/compiz-manager && . $HOME/.config/compiz/compiz-manager
-else
-	test -f $XDG_CONFIG_HOME/compiz/compiz-manager && .  $XDG_CONFIG_HOME/compiz/compiz-manager
-fi
-
-# Don't use compiz when running the failsafe session
-if [ "x$GNOME_DESKTOP_SESSION_ID" = "xFailsafe" ]; then
-	abort_with_fallback_wm
-fi
-
-if [ "x$LIBGL_ALWAYS_INDIRECT" = "x1" ]; then
-	INDIRECT="yes";
-fi
-
-# if we run under Xgl, we can skip some tests here
-if ! check_xgl; then
-	# if vesa or vga are in use, do not even try glxinfo (LP#119341)
-	if ! running_under_whitelisted_driver || have_blacklisted_pciid; then
-		abort_with_fallback_wm
-	fi
-	# check if we have the required bits to run compiz and if not, 
-	# fallback
-	if ! check_tfp || ! check_npot_texture || ! check_composite || ! check_texture_size; then
-		abort_with_fallback_wm
-	fi
-
-	if check_nvidia && ! check_nvidia_memory; then
-		abort_with_fallback_wm
-	fi
-
-	if ! check_fbconfig; then
-		abort_with_fallback_wm
-	fi
-fi
-
-# load the ccp plugin if present and fallback to plain gconf if not
-if [ -f ${PLUGIN_PATH}libccp.so ]; then
-	COMPIZ_PLUGINS="$COMPIZ_PLUGINS ccp"
-elif [ -f ${PLUGIN_PATH}libgconf.so ]; then
-	COMPIZ_PLUGINS="$COMPIZ_PLUGINS glib gconf"
-fi
-
-# get environment
-build_env
-build_args
-
-# start the gtk-window-decorator if present
-if [ -x ${COMPIZ_BIN_PATH}emerald ] && [ "$USE_EMERALD" = "yes" ]; then
-	verbose "Starting emerald\n"
-	${COMPIZ_BIN_PATH}emerald --replace &
-elif [ -x ${COMPIZ_BIN_PATH}gtk-window-decorator ] && [ -n "$GNOME_DESKTOP_SESSION_ID" ]; then
-	verbose "Starting gtk-window-decorator\n"
-	${COMPIZ_BIN_PATH}gtk-window-decorator --replace &
-elif [ -x ${COMPIZ_BIN_PATH}kde-window-decorator ] && [ -n "$KDE_FULL_SESSION" ]; then
-	verbose "Starting kde-window-decorator\n"
-	${COMPIZ_BIN_PATH}kde-window-decorator --replace &
-	FALLBACKWM="${KWIN}"
-fi
-
-${COMPIZ_BIN_PATH}${COMPIZ_NAME} $COMPIZ_OPTIONS "$@" $COMPIZ_PLUGINS || exec $FALLBACKWM $FALLBACKWM_OPTIONS
-
diff --git a/x11-wm/compiz/files/compiz-no-gconf.patch b/x11-wm/compiz/files/compiz-no-gconf.patch
deleted file mode 100644
index d43e84de6815..000000000000
--- a/x11-wm/compiz/files/compiz-no-gconf.patch
+++ /dev/null
@@ -1,20 +0,0 @@
- configure.ac |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 7b09153..9c22ea0 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -192,10 +192,10 @@ if test "x$use_gconf" = "xyes"; then
-   if test x"$GCONFTOOL" = xno; then
-     AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
-   fi
-+else
-+  AM_CONDITIONAL(GCONF_SCHEMAS_INSTALL, test "x$use_gconf" = "xyes")
- fi
- 
--AM_GCONF_SOURCE_2
--
- AM_CONDITIONAL(USE_GCONF, test "x$use_gconf" = "xyes")
- if test "$use_gconf" = yes; then
-   AC_DEFINE(USE_GCONF, 1, [Build gconf plugin])
diff --git a/x11-wm/compiz/files/compiz.desktop b/x11-wm/compiz/files/compiz.desktop
deleted file mode 100644
index 22cf642b2360..000000000000
--- a/x11-wm/compiz/files/compiz.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Compiz
-Name[en_GB]=Compiz
-Exec=compiz ccp
-NoDisplay=true
-# name we put on the WM spec check window
-X-GNOME-WMName=Compiz
-X-GNOME-Autostart-Phase=WindowManager
-X-GNOME-Provides=windowmanager
-X-GNOME-Autostart-Notify=true
diff --git a/x11-wm/compiz/metadata.xml b/x11-wm/compiz/metadata.xml
deleted file mode 100644
index 3c7523d47903..000000000000
--- a/x11-wm/compiz/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <use>
-    <flag name="fuse">
-      Enables support for the filesystem in userspace plugin through <pkg>sys-fs/fuse</pkg>.
-    </flag>
-    <flag name="gconf">
-      Enable the GConf-based configuration backend; it is not required
-      to work with GNOME, and might actually be faster if it's not
-      used.
-    </flag>
-  </use>
-  <longdescription>
-    compiz is a compositing window manager that uses 3D graphics acceleration via OpenGL.
-  </longdescription>
-</pkgmetadata>
diff --git a/x11-wm/emerald/Manifest b/x11-wm/emerald/Manifest
deleted file mode 100644
index 9bd344d3151a..000000000000
--- a/x11-wm/emerald/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX emerald-0.8.8-fix-cairo-crash.patch 460 BLAKE2B 8120a4e243ca5afa1f78e1613f1df07f100b8e47f1aa46e32efa0e160d63cd63f154a8a3b2ed2c1f149750f50975e5f46841bf1ac194315cba38edaf9be3cb58 SHA512 64859292aa31c52ae7ee02a650d5a156404aa595567a24b4b3ae8098f670f663fbaea5e69f9526ffef4dd8111326bf1900937ed239aefce4c13bb7e6c1029ab8
-AUX emerald-0.8.8-pkgconfig-pollution.patch 357 BLAKE2B 67bc0bccc1cee7d372ea1a2c3bc99a042e1fee0c7a575ea4198bada1500ba7815cba6288639e1d9c8bf4d13c4ccb85bb8156b4b1f3fc39ad4132086e99e1d173 SHA512 f3041aeb5e00476e6cf2f612427f33a28d28718fd20352f4bfc7cc19d246769b2db254f02bf3f2f26ecc2f47c7b6a9e945846a9b56a40dc8ff96bd904bc6d2bf
-DIST emerald-0.8.8.tar.bz2 528715 BLAKE2B a33443088011da93c139de4d35dbfb5bce3b287e3bec746a0c5a24b299fbf039a85c6d2a7bcab7d446c324282e7edca6a15afbbaa6f4a302c6e4dc6711c1b527 SHA512 c19300ed03b168a01d3c8b7fd90e9f594d5a8165b04d5228de2294301f31619f1126e9ce618e49d666e5b5609eb52ea1434f165f67dc6843ae17b6664305427e
-EBUILD emerald-0.8.8-r1.ebuild 1205 BLAKE2B fb9ec1ec65d949200f570ba03a1337c6170f73036cf0d51a74860e6df0ef81208004183fd4a91b6dffadef2c751909176feb2ca7b6b6872484c00f407d36868f SHA512 c018167e65d74b8faf0cd03e7f115208601c265ee5bcc49abc54dfcdabb0d14dd78c088c3a6590ce0bf996c1773c5e794b2aaad5320d4bd1bbed4d1d8eedada7
-MISC metadata.xml 294 BLAKE2B 930045cf8d7a81bc1fdc984ab3f3c8b06cf7fa2e89f5aeef3c72f8018be08ef10aec4a1908c18f48caab429e1618e2e522057103d7dfa19822eb373eafd44dac SHA512 f242070859c227a491ff306797f546b70e4ebbcc8c2d4753dec4df9db92fd3daedde225da9b5dd8391af1ecc45b6378dc3c22d2bc763e2b8d6859767089c51ac
diff --git a/x11-wm/emerald/emerald-0.8.8-r1.ebuild b/x11-wm/emerald/emerald-0.8.8-r1.ebuild
deleted file mode 100644
index 0c2f0e94a1af..000000000000
--- a/x11-wm/emerald/emerald-0.8.8-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic
-
-THEMES_RELEASE=0.5.2
-
-DESCRIPTION="Emerald Window Decorator"
-HOMEPAGE="http://www.compiz.org/"
-SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-PDEPEND="~x11-themes/emerald-themes-${THEMES_RELEASE}"
-
-RDEPEND="
-	>=x11-libs/gtk+-2.8.0:2
-	>=x11-libs/libwnck-2.14.2:1
-	>=x11-wm/compiz-${PV}
-"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.15
-"
-
-DOCS=( AUTHORS ChangeLog INSTALL NEWS README TODO )
-
-src_prepare() {
-	# Fix pkg-config file pollution wrt #380197
-	eapply "${FILESDIR}/${P}-pkgconfig-pollution.patch"
-	# Fix crashes with some UTF-8 characters in window title
-	eapply "${FILESDIR}/${P}-fix-cairo-crash.patch"
-	# fix build with gtk+-2.22 - bug 341143
-	sed -i -e '/#define G[DT]K_DISABLE_DEPRECATED/s:^://:' \
-		include/emerald.h || die
-	# Fix underlinking
-	append-libs -ldl -lm
-
-	eapply_user
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		--enable-fast-install \
-		--disable-mime-update
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/x11-wm/emerald/files/emerald-0.8.8-fix-cairo-crash.patch b/x11-wm/emerald/files/emerald-0.8.8-fix-cairo-crash.patch
deleted file mode 100644
index 34ba3585c963..000000000000
--- a/x11-wm/emerald/files/emerald-0.8.8-fix-cairo-crash.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-https://github.com/compiz-reloaded/emerald/commit/7f712c5f4fb2dbc8bbe298acc8fef239815aea08
-
---- a/src/main.c	2011-04-21 16:06:20.000000000 +0400
-+++ b/src/main.c	2016-09-01 14:35:08.142020100 +0300
-@@ -1644,6 +1644,7 @@
- 
- 	    /* ===================active text colors */
- 	    cairo_set_source_alpha_color(cr, &fs->text_halo);
-+	    pango_cairo_update_layout(cr, d->layout);
- 	    pango_cairo_layout_path(cr, d->layout);
- 	    cairo_stroke(cr);
- 
diff --git a/x11-wm/emerald/files/emerald-0.8.8-pkgconfig-pollution.patch b/x11-wm/emerald/files/emerald-0.8.8-pkgconfig-pollution.patch
deleted file mode 100644
index 7d8a784853fd..000000000000
--- a/x11-wm/emerald/files/emerald-0.8.8-pkgconfig-pollution.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/libengine/emeraldengine.pc.in
-+++ b/libengine/emeraldengine.pc.in
-@@ -7,6 +7,7 @@
- Description: Library for Emerald Engines
- Version: @VERSION@
- 
--Requires: @EMERALD_REQUIRES@
--Libs: @EMERALD_LIBS@
-+Requires.private: @EMERALD_REQUIRES@
-+Libs: -L${libdir} -lemeraldengine
-+Libs.private: @EMERALD_LIBS@
- Cflags: @EMERALD_CFLAGS@ -I${includedir}/emerald
diff --git a/x11-wm/emerald/metadata.xml b/x11-wm/emerald/metadata.xml
deleted file mode 100644
index 8243e00ccf6b..000000000000
--- a/x11-wm/emerald/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">Emerald is a 3D window decorator for compositing window managers such as compiz.</longdescription>
-</pkgmetadata>
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index e501cd52fd42..4b246c6d799a 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -8,5 +8,5 @@ AUX 3.24.4-gudev-232.patch 1034 BLAKE2B 8f6bfbaa50dca872c6ad21eaef5b23af8d757491
 DIST mutter-3.22.4.tar.xz 3536792 BLAKE2B e395dec6a8f5f46864ab5d7da3c345c20adf65f7609547d296036b0cb4be79e451387395f32d3d9a736a5b8c4be5a03a9fa56d5fbebeedaef3c35ea6e5c16302 SHA512 849e98186cecb4ffcab3da055febf72ef76fa87ecbdc506c696c2c7debd5183361c4b3b31d00d3c85e45d7f47aa5abf748d999571b147c831eb999116919023c
 DIST mutter-3.24.4.tar.xz 3583916 BLAKE2B 86a9e16ed96270713e400ccb4dc64b91c263125ea4a04373ed1f8364e906031ef26dc991fa13d01cf0e50895360c87be6773e3332d823c2ce1991cd57d59b292 SHA512 7ae579ab3e9df09cae37fbc1b277e382c9f610058b914b69a7bdb89f3bec510403210c0cded16a6487111507151f4d7075d161e051c0b88585d6ab6b4575b8d3
 EBUILD mutter-3.22.4-r1.ebuild 4117 BLAKE2B 4d526168d3a2f353d03a3b7ce40f6f4d7cb26bfa11127b7c4c776c62db73e2510ff7703ba2ea6fd82b31dbec51606098213b3fcaa70a590fd26f24aae2c66b60 SHA512 36e28f4334d87b8d2319c19ec384593b2d8bba8e206b21d13e043ba3381cb8215ee5836d8427e0b4bb025efa23ea0f89175e6c04c278cb340f40d6961152d8a7
-EBUILD mutter-3.24.4.ebuild 3716 BLAKE2B d3dbc0238d89b4e85640c26e0edcb7989bcfe76048c67b826b80a6be32206992126e518a8f0b8f6bcc90f083932f9b9e07abea68ffeaa83b117b91b0cc8f6e79 SHA512 700111bb0ab9547013f42438de65aa025ea7c7c04058f08a7c2c39f42c8ad7d65a841fa0aed1e3708f834046ce07200e12cc366e27dca1b4d563f7d61ae5f95a
+EBUILD mutter-3.24.4.ebuild 3715 BLAKE2B 1f247be1fa63f9b81cf47b4160b74ac26255b0a4b4186d1420ca5d29f8217e9bfec07e3c650bd9cbba2a5de37fdfa26aa56353385aac0e0bba20ab8f2c791699 SHA512 81790eeba90028413e43bba871946516ab7a890ad36df1f7442acc4525fbee6b9178f7df6a8d27b8e80c0d78fa8f1b14d613e0001222f8078fe9e051b56b03f3
 MISC metadata.xml 325 BLAKE2B 3ee20e50b2bbbab4ac5083cf64dd2817b397a0e8a77895f5aa7197f016af1e958d6debe92e6e69c10319b1d468f80f16831aa57a0dda1f57173732056b5856c4 SHA512 2732e366e7870b21a854e6bccf57d479c754fe5a9cf17673c3a78e231a1b476b684fd97497f8ab51c57137d066f9bfa6590458f56e5f42c5c38e1cd00962fe80
diff --git a/x11-wm/mutter/mutter-3.24.4.ebuild b/x11-wm/mutter/mutter-3.24.4.ebuild
index f52fd7fb8eb0..8f31f1764842 100644
--- a/x11-wm/mutter/mutter-3.24.4.ebuild
+++ b/x11-wm/mutter/mutter-3.24.4.ebuild
@@ -12,7 +12,7 @@ SLOT="0/0"
 
 IUSE="debug gles2 input_devices_wacom +introspection test udev wayland"
 
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 # libXi-1.7.4 or newer needed per:
 # https://bugzilla.gnome.org/show_bug.cgi?id=738944
diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index 760f93edfd9c..d60580a3f75a 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/thunar/Manifest b/xfce-base/thunar/Manifest
index dc420f8c06ab..b0c3ece9a4f7 100644
--- a/xfce-base/thunar/Manifest
+++ b/xfce-base/thunar/Manifest
@@ -6,5 +6,5 @@ DIST Thunar-1.7.0.tar.bz2 2235806 BLAKE2B dfe81012dd0c8e760497f5c919bc2e7d4dd5e3
 EBUILD thunar-1.6.10-r1.ebuild 1817 BLAKE2B 6005a4b1583bf2ae8f67156a82db6f7506652afb6c572ed9608727adddedb466e4aea40b60906eb262d3764b9b3510a4d7dec9486511fb70d89b800ac4db219c SHA512 d888e8e5e7d00291d085b4dd1cbdfe96b55b5d26c3b6252d450b0d31729b0a21e5a251de49507416d4592e9913c7861d568398fb946c9e3613844a7f3ea88cea
 EBUILD thunar-1.6.12-r1.ebuild 2030 BLAKE2B b7f132c61e3ba532caf540d59f9ec050efc8c183fbb04f1a9963e29994869a4731ebf2ecc451c268c551ccb9249b942b43f468f9db1bbbfaaed498f7294b829a SHA512 6b3f91e3c2acf44c6f1475e253d1a7911fe735ecf2a9a1617d80415eb7789f95703cda6a92319c759f218969170399cd8cddcbdf7cbde434745a52e982cb108e
 EBUILD thunar-1.6.13.ebuild 2025 BLAKE2B bb6449c71aa31a5785a1a6cbaadd344ea0fa32aa84af494137f511f3e2173368ba84fc4218bf5389c9963e8984dfad04218dfb4d06332edc483f42d624e90ad7 SHA512 d9898fb715df81d196d8c0fd109b479667e2f111d68079d55000e2b7aeac21d35d489271b7800e6143c444f5e6d305e2649e62a5f1a6fe16d2ffd2074edc02f3
-EBUILD thunar-1.7.0.ebuild 2057 BLAKE2B 1ed9adb5ce299072ce29b504d727635e3a68f7bf846aed4c8e8373ba42f1ab7c817dd86cd49c02e3b393b15b9dd4bd8a46acb55fbb875d1799652e4f98d6d337 SHA512 e13b1ba0524f82c0bc1ecd1bb6f110b3fe003b03478a2a1ae47d3c239b1b7c920f2a7518b7cb693ebc2254184b9e0f383e426963d592566829cc613ae0ee3e42
+EBUILD thunar-1.7.0.ebuild 2057 BLAKE2B 122db5daa730b3b886ed6ed837b1906b08b6e52c25ab43844383094dceafaca9a7051870b1560480d0c05e01f40cf6eb6372a022718ab6db0d10971d713bc94c SHA512 fe4ff2a101548a82eaa449d462cf3475214e4a4db34af986dc527c344e4a5826b0a20a5030216e426b93826951a25d225b19cf0d524fb07bfbc9e90611cb8a6a
 MISC metadata.xml 372 BLAKE2B e681d80da66f68cf89aea0e932d2a2c3008e388abcc40f20ffe31e859dd677fdd002c37af8c71912e1836bb6d008fe2b6f838453dc5c1e944fc66e9216b3708e SHA512 3ecb379e314ff3f9c745b61707c6df0a912b1466bd56abeebdba0ee138e14ee331fcd61acb3c5b64ace4daa42cbaaec8331cc83d6ae5d0bdc1fa5a69a258ef17
diff --git a/xfce-base/thunar/thunar-1.7.0.ebuild b/xfce-base/thunar/thunar-1.7.0.ebuild
index d76ea4e85dea..3d5de7d48448 100644
--- a/xfce-base/thunar/thunar-1.7.0.ebuild
+++ b/xfce-base/thunar/thunar-1.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ COMMON_DEPEND=">=dev-lang/perl-5.6
 	>=dev-libs/glib-2.30:=
 	>=x11-libs/gdk-pixbuf-2.14:=
 	>=x11-libs/gtk+-3.20:3=
-	>=xfce-base/exo-0.10:=
+	>=xfce-base/exo-0.11:=
 	>=xfce-base/libxfce4ui-4.12:=
 	>=xfce-base/libxfce4util-4.12:=
 	>=xfce-base/xfconf-4.12:=
author	V3n3RiX <venerix@redcorelinux.org>	2018-01-27 18:07:28 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-01-27 18:07:28 +0000
commit	67f76a858f1ac826bd8a550d756d9ec6e340ed4f (patch)
tree	45f4ada6be05bc180a14e017c9d5c6b58a0eec6e
parent	38b7258d086dd5e263c3bbe3880c8c956676bc71 (diff)