Sync with portage [Wed Jan 3 01:01:15 MSK 2018].

2018-01-03 01:01:15 +03:00 · 2018-01-03 01:01:15 +03:00 · 5e3a6875d8
commit 5e3a6875d8
parent 7560766cb6
4819 changed files with 13401 additions and 24237 deletions
--- a/30
+++ b/30
@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512

-MANIFEST Manifest.files.gz 28812 BLAKE2B 1cd24311610a3586b6134ccc87ab2f56bc118eda02ad15961c3b038a1c95bf34092085889ba4dae8045ef10bb0fdf17a486389b884546bf90003df0c110562c7 SHA512 3d3d613b1abedccdfb380008d22708d627466913435aa1d2eaa41acb5df8fbde6fcd51a7685172b96aa575f508aeed176dd5cc5565bd1809de85a292a505e00c
-TIMESTAMP 2018-01-02T10:09:44Z
+MANIFEST Manifest.files.gz 28801 BLAKE2B 7db46669ac46f9ec01517a326ed6c3df4a15986638d4594800df26eadec110326e786bd409b6012241d64d73efc69b6fb322ff674a225b8f4c1bc5d8466fbd49 SHA512 98060968a8de25f2ec2c8fb019b00aa826375130ebe02e9e2319b13e5b731e794f16738d81838590b1f0b8c72d521f99d7ac7c6abd28d802494ebbec3364771c
+TIMESTAMP 2018-01-02T21:09:53Z
 -----BEGIN PGP SIGNATURE-----

-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlpLWmhfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlpL9SFfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAlOxAAnpQz8NkfMvoA9lCLNMfldQCDgfs8GKSTCBWA1ry4PFqiwFU+Vp6Pw25G
-5mEtukqp4Gdv5GwzXteeUx1uZ2mxaLugydLxcSWTq+JnVTW66xrmE4M6V/75ARxE
-A92o0gg4NeGY+jWMGgChWCgDLWGTFbIX7dOYSxhkC3wU7TnIZ4tyfQ2IxNpK3Xj5
-9GkGyjw3L2stTPTH4owhQxGj4p0FM6s/AT8DIavM8iOUmKVJwmOeOi7sxLes8RG9
-7RQ1A1mTn5inAA3o1qSH4l9MNCvOzjFZxUUowfzxvcsWqYq/uv/KyH1l2Lr/4h4e
-l3BcSQ86Vwql1rskEAgFYtbyAucZUv1Vna8L/fApV1lc/Fa7EdfapgqVT80sW1O9
-p8g/GN8kMnDc4f1cJNPFjIAXsK80kD1ZdaJc3ALMKLwIhDzESBFsxErZO/cEuN3a
-3PziAKX6VqYt6jt+UJtZklVF0y5Ag6PjPQ5oVUtCjI+Pa3/9+MTXxTY+qEMEIW80
-4MrQTEbZiL7pF1/wyuCR2HhqIS46YG8JczwYGT3DkItCsbVwxsjve95gXCHL30wn
-s+A9uwoZfzXHvo6zlOjikT72fkIcExY0JJAXRSUY3swmLUkoFIu//iW/oYvVrNyy
-sVw9+ofJKh8P6QbdVgdi/kkdSK+njVzIcu5MJXy8FyoGGxId2b4=
-=LwuF
+klB2YA/9GrNV0P8YiDLneF74kn466dKg4TvuVJMwzWp7xUmDX2C4X99vYFi0ARhp
+gy4CThPS2CGEDyiyeNWYAhuKcp0Y5ycK0bszBjFgeH5zMt3Ql4MYBoCSaJXVTNm9
+hXFjE/4OEEGzKxXFDWAtTbmm2gA7nVBxXcmcfjazRwhHok6DzES+1hvPfgcgMkV3
+d9mRMY0T1mlKYaFigyPQpKBbs2hoEC0ZLKLYq1X9fvchUZAHbmsM+QoLZZlLqK0m
+zL2ysGv6WhBl20xeXv/DW1kRss7KRHN+MgjbhNqrdgH+kgxXpq7pVNwHeITjn6RD
+ZuSZQYBvsafHVlgBtW2h4Mwx8J1rPJjaeKYLH2SaRutX0+Bd4jnNWUHx2P8hc0s4
+acRjbpWf7VLeGqntuzsXU+67DiKKbCfROi5lSchFaR6IOgj3zvK5iEbvmGE3Nfbw
+w3AQt2OfZnOWAHwtLWOv2zwanQ1+5s/cJQv27MsgccUg10hqp1ULYR/BYXLXNnPn
+xsHaxAPIHqdoM5lvQIGohx/gpG4dRRiOTymZVlf4DSNegVjD+CE3W4e6Ai17P6C0
+dQlWrfrQOjrVBUuURA9cNgQhWSdfSsNDWs14Mz+GNuKY2Ew3nFt6TzdKxJNVCE1j
+KZs2LUT844NbNtl6xJ3sThpzk8JSmDJSaqdvu9Ra5o/d355eDIo=
+=sOBc
 -----END PGP SIGNATURE-----
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@ -1,4 +1,6 @@
 AUX calamares-pkexec 43 BLAKE2B 432999808da0fdde0e5d9c88887a5f112ac00c90af51f3d907d02ab4f9eb4fae7348856028bcfff98ced8698d0d039bd9506f50baa90f5b12b43c1b72885f230 SHA512 768148cd58cdfb5c6791b76ec60c21a4ca852120f53ed31a83bc7a2e0a26aa77b10bd3756182d3dff03208e820def4b83c45edba0484fa2f5a33c93880c3f4bb
+DIST calamares-3.1.11.tar.gz 2273213 BLAKE2B da746957ca583db2cf2b89814e9b6b8a94130b890263a851248aa83ebb0ac481805a4193e2ca2fc6fdae3e86c871a6dd9b922aa3f06b4af73db28dd6bdc093cc SHA512 5aa47b07c238d7de89aac4417b577fb6cf87d2ede7fd3d4e272381cb1f90ce967f5478134e9fe728adaf32361335f2f590956200c8daf265bfeab9d979057e8c
 DIST calamares-3.1.7.tar.gz 2275893 BLAKE2B b60127a34b2f79be78540c5fd9affabde2889d335a3a41a61950adc48c9200e357f3e0b23e6c94f117c64a08fa4312ae8cbcb5e42e0ea5893d38378a583e4b7e SHA512 eaf516db4d97b89a5854c5dac5fd556a2deb47bebb88e7c55e2bb7d4ce050e913afbf08c6536503f5c3af7427a43b75f67bfa317e1601bb5a6f05f17c5bf6760
-EBUILD calamares-3.1.7.ebuild 1974 BLAKE2B 4f4aaa52cec0d35c8f9379554b96ff6267e3d318c1cc6c18cdf906e29d119bb23ebefd2769a514443a68b854e84720967abbf1c2c111cd018dbc749af9ac9f70 SHA512 e6b308f8fe540fc520d4f071e6276e924dfbff7c0176a3b27bd0ca9ebf400ffdcbf54483cbcdcc2eaca11bf72463ceb80505262f5dfa06c4c02f519d645c8b38
+EBUILD calamares-3.1.11.ebuild 1978 BLAKE2B ff0120d844b300801e503d463726c225971e004c4b21a2c034b6075de79867ec49e2378f0c69e7586952628ef9150f20091f50b7be405189d6cb599100084c98 SHA512 41985191e83e6450fdae964e382449facbe1c331b82a723ed15165f1cd483912f2afcc331ea52eb5d58bcd8a65eb52292ddce8baecb3fd740740abce4026193d
+EBUILD calamares-3.1.7.ebuild 1978 BLAKE2B ff0120d844b300801e503d463726c225971e004c4b21a2c034b6075de79867ec49e2378f0c69e7586952628ef9150f20091f50b7be405189d6cb599100084c98 SHA512 41985191e83e6450fdae964e382449facbe1c331b82a723ed15165f1cd483912f2afcc331ea52eb5d58bcd8a65eb52292ddce8baecb3fd740740abce4026193d
 MISC metadata.xml 1055 BLAKE2B a6c7974103baa5a646cb1d594e3f224903df9ce5c618ad4ed46c0b3d4df5d3437be570eda0d55e3b0ca8f6df4af9627b088ace2a3f0efc802528aeb49fc7bce6 SHA512 0269dad0b0a05e7c729ad5b9f1f7d6790c117b0d76b904dc909b868b1c298ff3352faafe91104b39cfc3c2e4f5e1a20244d3f5321c937d2334bd15bd910dc89f
--- a/app-admin/calamares/calamares-3.1.11.ebuild
+++ b/app-admin/calamares/calamares-3.1.11.ebuild
@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+inherit kde5 python-r1
+
+DESCRIPTION="Distribution-independent installer framework"
+HOMEPAGE="https://calamares.io"
+if [[ ${KDE_BUILD_TYPE} == live ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+IUSE="+networkmanager pythonqt +upower"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwebengine 'widgets')
+	$(add_qt_dep qtwidgets)
+	>=dev-cpp/yaml-cpp-0.5.1
+	>=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
+	sys-apps/dbus
+	sys-apps/dmidecode
+	sys-auth/polkit-qt[qt5(+)]
+	>=sys-libs/kpmcore-3.0.3:5=
+	pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] )
+"
+
+RDEPEND="${DEPEND}
+	app-admin/sudo
+	dev-libs/libatasmart
+	net-misc/rsync
+	>=sys-block/parted-3.0
+	|| ( sys-boot/grub:2 sys-boot/systemd-boot )
+	sys-boot/os-prober
+	sys-fs/squashfs-tools
+	virtual/udev
+	networkmanager? ( net-misc/networkmanager )
+	upower? ( sys-power/upower )
+"
+
+src_prepare() {
+	python_setup
+	export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
+	       PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
+	       PYTHON_CFLAGS="$(python_get_CFLAGS)"\
+	       PYTHON_LIBS="$(python_get_LIBS)"
+
+	eapply_user
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWEBVIEW_FORCE_WEBKIT=OFF
+		-DWITH_PYTHONQT=$(usex pythonqt)
+	)
+
+	kde5_src_configure
+	sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' "${S}"/calamares.desktop
+	sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' "${S}"/calamares.desktop
+}
+
+src_install() {
+	kde5_src_install
+	dobin "${FILESDIR}"/calamares-pkexec
+}
--- a/app-admin/calamares/calamares-3.1.7.ebuild
+++ b/app-admin/calamares/calamares-3.1.7.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{3_4,3_5} )
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
 inherit kde5 python-r1

 DESCRIPTION="Distribution-independent installer framework"
--- 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.22b1.tar.gz 3000952 BLAKE2B afe485e31e48ad6022b831fc088abcc80f78ab927436e932c3659be3956d2ae5be893fe1f602fcfbe2d64cb70d1d056c2c28020c05fe24db6a494037b5370cae SHA512 2289e0203898feccb31529899230b7e1f5e634af5e71d252628dc9a6f1bc73257f3b44d0068f1cba244cc33fa677538c327fcd291537811ac57fd4b65dc5a4ea
+DIST sudo-1.8.22b3.tar.gz 3021539 BLAKE2B 8e6c207fe2e56e76b46040ce7a468089a1ecdbc02c1fc514926c2b129c1d7869d307be79d8567d42d38eb2a3df9abae0864a14954fb8da4fb880f9fc223ad9f7 SHA512 e80c7a0f10aaacfb875503e35b7f16c8fe5c019848338e6d8a4c354a42f5613a23713a12ec7a5ceba78bc428223c3d9ccfc285703f8cd04d0c34658d4a21f45e
 EBUILD sudo-1.8.20_p2.ebuild 5753 BLAKE2B 4c8b048a045082c5d6218d3e0a5d39e5017da924b5cab5d05f3e1b0cfeea64c9bc315d5f0217f58f37e7889e04fb311c122fe0f6cd8399f6fa078458cfafe9f3 SHA512 dac3f07f7c4a6ad493535fa9a753424ff9bd03777cc4330eb5575cf7c0a862b5b2c60e5229a9634e80dd001f8498b4effd5c3ef5b33b4e9723d919657162904e
 EBUILD sudo-1.8.21_p2.ebuild 5819 BLAKE2B f41a745952896b5b3a6b1cd07808af308402db5cc7405fa040f205755e333fdddd0f6195b664c4db630fad8d011e9e613bae08c3bb955a819a5ba454c5d29612 SHA512 a49951e2e639839c0e95f99c6091c1e02f25e5d072337dab9ebacb491f556f60e0ac3552eba482c33c0c3737ac50efd8c12f6326c14357bff9a37a8fafdba2b0
-EBUILD sudo-1.8.22_beta1.ebuild 5819 BLAKE2B f41a745952896b5b3a6b1cd07808af308402db5cc7405fa040f205755e333fdddd0f6195b664c4db630fad8d011e9e613bae08c3bb955a819a5ba454c5d29612 SHA512 a49951e2e639839c0e95f99c6091c1e02f25e5d072337dab9ebacb491f556f60e0ac3552eba482c33c0c3737ac50efd8c12f6326c14357bff9a37a8fafdba2b0
+EBUILD sudo-1.8.22_beta3.ebuild 5819 BLAKE2B 424998594187730de2794a8d8bf3468b754281e6b15ec61c4610a29a22339624dc5419949506c7f608c43c6a17e0b6bbe007e4d8ea42d9e3ddedf1fbc8c98d8d SHA512 2415707df16bd21e491ecbacc53cb914caecffcc9ad109188a1309b9294018006f70d6d2b2a55a8ff249eb7db51bac852fceda22c2476c0cc4365958b6e7ca73
 EBUILD sudo-9999.ebuild 5959 BLAKE2B 5b11f68280f6ce261b9579101726164a38c9bf68e67a1df47562ea356dbe68a80e10d30af1332092731c59e7f33bb0df6ac8731970dff2b200e080c0904ab98c SHA512 ea1939a94dda5eb85ba5bcb963c76c54da6ca0f5eb8785964cfcf700391049b57d18a6397556d9213f988d3d7292dd9a6c76d2531fef2c6e319c63e2b26cc33c
 MISC metadata.xml 989 BLAKE2B c7f7d49fda7750b172dd4b2e5c3fc5f1f3dd602b6347479834bf6444c9311738bcd10fbbba100cee45c97bb899e53f3c113abc61ee89b3353b50876c30966589 SHA512 bc9addd017e474acbc753d6d2cce5d77281a3c1f0857de538168eb1a7b80e0d0b313ad2b03cc710b483cc9588dcaf0208a5b8aaccea18e2ca51b567020bea9ec
--- a/app-admin/sudo/sudo-1.8.22_beta3.ebuild
+++ b/app-admin/sudo/sudo-1.8.22_beta3.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
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/brotli/Manifest
+++ b/app-arch/brotli/Manifest
@ -1,4 +1,8 @@
 AUX brotli-0.6.0-no-rpath.patch 1196 BLAKE2B 500af6b17e36f13b26d075b1fdc964e98e170ccfe4721ed274db56fd5229cc025a76b1cd1b333b87010c43036ec8404d35b5aeae9d1a17930b6535b0c2fd9c4d SHA512 8dddddc2d44bc9af9c4bbe277ece69ac22e6e77661d3982cc67b2a681ce01c03afb63e6796ae3a6c81cd6495bd39e64a0955c189dba1cc4bd43335ab3fc70123
+AUX brotli-1.0.2-no-rpath.patch 865 BLAKE2B 2c9720427c9751586b36580be629d3820757055dfb07b37f4933eacaf78973e14a7a861b0e7eb43a1980e889ee7c6988926fae9c31af90f962f502f17be416f6 SHA512 5da97caa16a910aebd4ce85e0805809dd97b6f36cd71636c72f284e6550bcff1a5f614a902d5363c35be2b46e8986dc74beb93f3fc6158a29f719e49d68a83c0
 DIST brotli-0.6.0.tar.gz 19838761 BLAKE2B 0630e9afcb04ecfd7cc6ba8dcbbe10c5ff16d9a975e13f48bd9b519bcf006afdd672aed542768590e2c5481e808e4f49c520e8a0294ce15e72cb3810a576fdde SHA512 36caa277790efeb5bff0fdc090cdcf00fd9995c4e81a60ed31d36af2e13848ec1afe5d84e6926eebbee013525191e9404e112cb7fbede16097221c5bc3dfb5d5
+DIST brotli-1.0.2.tar.gz 23736359 BLAKE2B c5467dc52f97942d790b835d5e2c06d2046c3df249446b775d58e56feeb5d5fdd3e1e8e42c5eff92df2bc2b47afabd36389e14afead5fd376e18c8517d1e67f7 SHA512 b3ec98159e63b4169dea3e958d60d89247dc1c0f78aab27bfffb2ece659fa024df990d410aa15c12b2082d42e3785e32ec248dce2b116c7f34e98bb6337f9fc9
 EBUILD brotli-0.6.0.ebuild 1259 BLAKE2B c2d7225ff86752110a1047e4c1449efe364dd9401185e90a8b6eb441bc25478b870eb4c09bba707036f3bb4e3339e1a591b2f567c2613742f745109e1883dd3b SHA512 e35ee2605f957fcca40cc892d097f1f80b361fb1b651c1e037fb3f50b6cb6a9ab294d3908066c9d6afdf5511244fed769faa8081a3b8023025059936d7612eda
-MISC metadata.xml 690 BLAKE2B 889b23470c1fa169c073e0be3de4d9e64e5952b1fa118c030ffe1cf6504bba8ebf3db9ec40bacb95d8f31c9f306674b8107e161661a8fd71c5cbca5ef8c75e10 SHA512 8d98e22ce2ac4f69876e378773415f65ab8c5846e6d4952a6ce104b07343a5486abc9b88c49b54a3187bdedf880e0b2a3b6d06448fdd8c10f692718de6355dba
+EBUILD brotli-1.0.2.ebuild 1383 BLAKE2B 23a1e700f140aaa030c30831b1218db65a436b53cdacc7bd804f9f0dba7955c0bb3483f0567cad0a2b44fb63abfdb0cad19da80aa1c759e356ae354fdb3d26dd SHA512 e86805ac0e5dc7101c82a88d727b50628bd1535d120eef6226dfef38c8a15ab16569d46b7242c38e04b525c01bacee55a2ade17187e1b1ed3194223b9be8e071
+EBUILD brotli-9999.ebuild 1336 BLAKE2B 920c9159f284dcbf0246e52d28048aad22c4803c0950a101093afeabf45bc7b109216ac8bd54676a27ec579cfa49e4ed791cb944c7a9d4ce9e376e85f22cdebc SHA512 2686041468cf95c7dafa9571c6c4997f5ddc9440593e35f6d8526af7df8a2cd249af9e5b0ddf04a272cc8f6497db5de77c628641d2867e47cce6b099e3b187af
+MISC metadata.xml 686 BLAKE2B 192c9019f79840dfcc409e8244eac99f3bd793ea91bb8f5f26fcf1a9dbb6ba34273ea2221e0e18322dccec1674929cdf1bfd7ca19628a3e69fc4bdd6f60ba932 SHA512 4057d0834db13baf716500e6d8fa80b9d6ee854f7e9620462ed1162d2bc6ff88d2bb2f81902c6730df337afc38c8eb378fa5b85debd2a5a57597c0faf58132dc
--- a/app-arch/brotli/brotli-1.0.2.ebuild
+++ b/app-arch/brotli/brotli-1.0.2.ebuild
@ -0,0 +1,67 @@
+# 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} pypy )
+DISTUTILS_OPTIONAL="1"
+
+inherit cmake-utils distutils-r1
+
+DESCRIPTION="Generic-purpose lossless compression algorithm"
+HOMEPAGE="https://github.com/google/brotli"
+
+SLOT="0/${PV}"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+
+IUSE="python test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+LICENSE="MIT python? ( Apache-2.0 )"
+
+DOCS=( README.md CONTRIBUTING.md )
+
+if [[ ${PV} == "9999" ]] ; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/google/${PN}.git"
+	inherit git-r3
+else
+	PATCHES=( "${FILESDIR}"/${P}-no-rpath.patch )
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+src_prepare() {
+	cmake-utils_src_prepare
+	use python && distutils-r1_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_TESTING="$(usex test)"
+	)
+	cmake-utils_src_configure
+	use python && distutils-r1_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use python && distutils-r1_src_compile
+}
+
+python_test(){
+	esetup.py test || die
+}
+
+src_test() {
+	cmake-utils_src_test
+	use python && distutils-r1_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+	use python && distutils-r1_src_install
+}
--- a/app-arch/brotli/brotli-9999.ebuild
+++ b/app-arch/brotli/brotli-9999.ebuild
@ -0,0 +1,66 @@
+# 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} pypy )
+DISTUTILS_OPTIONAL="1"
+
+inherit cmake-utils distutils-r1
+
+DESCRIPTION="Generic-purpose lossless compression algorithm"
+HOMEPAGE="https://github.com/google/brotli"
+
+SLOT="0/${PV}"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+
+IUSE="python test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+LICENSE="MIT python? ( Apache-2.0 )"
+
+DOCS=( README.md CONTRIBUTING.md )
+
+if [[ ${PV} == "9999" ]] ; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/google/${PN}.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+src_prepare() {
+	cmake-utils_src_prepare
+	use python && distutils-r1_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_TESTING="$(usex test)"
+	)
+	cmake-utils_src_configure
+	use python && distutils-r1_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use python && distutils-r1_src_compile
+}
+
+python_test(){
+	esetup.py test || die
+}
+
+src_test() {
+	cmake-utils_src_test
+	use python && distutils-r1_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+	use python && distutils-r1_src_install
+}
--- a/app-arch/brotli/files/brotli-1.0.2-no-rpath.patch
+++ b/app-arch/brotli/files/brotli-1.0.2-no-rpath.patch
@ -0,0 +1,21 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ac55f6b3..2dc7232c 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -24,16 +24,6 @@ mark_as_advanced(BROTLI_BUNDLED_MODE)
+ 
+ include(GNUInstallDirs)
+ 
+-# When building shared libraries it is important to set the correct rpath.
+-# See https://cmake.org/Wiki/CMake_RPATH_handling#Always_full_RPATH
+-set(CMAKE_SKIP_BUILD_RPATH FALSE)
+-set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+-list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_LIBDIR}" isSystemDir)
+-if ("${isSystemDir}" STREQUAL "-1")
+-  set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_LIBDIR}")
+-endif()
+-
+ # Parse version information from common/version.h. Normally we would
+ # define these values here and write them out to configuration file(s)
+ # (i.e., config.h), but in this case we parse them from
--- a/app-arch/brotli/metadata.xml
+++ b/app-arch/brotli/metadata.xml
@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="person">
-    <email>bicatali@gentoo.org</email>
-    <name>Sébastien Fabbro</name>
+    <email>candrews@gentoo.org</email>
+    <name>Craig Andrews</name>
  </maintainer>
  <longdescription>
    Brotli is a generic-purpose lossless compression algorithm that
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@ -1,9 +1,6 @@
-AUX CVE-2017-5601.patch 979 BLAKE2B 4ecf3f2dfa52f5d5efcce3807072dda9cf4a1f680743a0bea5859bef4480dff05155f98cc68f16c81a9ba11ec5190b0f7ea5b9ab19b7670a5cd14516aeab7fb7 SHA512 a2c8507698166b3d4bbd197323a15cb82d53a647f2d0c74e17e9b229e4f1fd44c3f0468b674c0dfb693ddad7fc7c5cc4f00fbce1e607d0c02fb90d59cc9e09a0
 AUX libarchive-3.3.1-libressl.patch 825 BLAKE2B 63babd383dce64f836a84db3c336c865d1740f30df45838a7cba178499f110aae1883dc52189694ce52f8c7966dbe1af043a8043586a2476395168935713c3e7 SHA512 2418a281562ee5f0e4f54ca181c68265f6b72a80786d17f45547222a3fde83597a17d88075e5f9c5d52a2688d8890006f592a129ddc634397a9160d16724a12c
-DIST libarchive-3.2.2.tar.gz 5458241 BLAKE2B 99a3f01e780a3cac1142645887f31fc4d68c9a60a3539c259745274ea612373b41a7e93d95c27739c87c6050a0304ff069a0f1435fdbf0a13d47935209547c20 SHA512 a67920c37d49cf9478032d77fc4fa21827cebb96e9b83d9ecb8466328834052e4ab3d3a9bc4e2edf405d6cb14ffd648c9fa100b578257f6e5842c99bbea558a7
 DIST libarchive-3.3.1.tar.gz 6219943 BLAKE2B fc951a613098060d55c000436ccdc6997126be2e1eeb41f348ca20c1ae3e54936ae053404fdd3211de90a2a223b29f5a80c580a937878a37265401d55655fff1 SHA512 90702b393b6f0943f42438e277b257af45eee4fa82420431f6a4f5f48bb846f2a72c8ff084dc3ee9c87bdf8b57f4d8dddf7814870fe2604fe86c55d8d744c164
 DIST libarchive-3.3.2.tar.gz 6236562 BLAKE2B da26474b4fd8111561c1e5ac12a6333a8ba8a23cce9e9cdce7b50647ab8dbae08609ea1bffbab60da74c6555ebf0815c456fe69c72129eb6071fb845141d0beb SHA512 1e538cd7d492f54b11c16c56f12c1632ba14302a3737ec0db786272aec0c8020f1e27616a7654d57e26737e5ed9bfc9a62f1fdda61a95c39eb726aa7c2f673e4
-EBUILD libarchive-3.2.2-r1.ebuild 3429 BLAKE2B eacd04939285d3354a28150396a3f8e70c65b1492869a592e04bb9c3d3f2cc007c38689490c9105887a3b7ac2943a747d908682e48397d736101ef4fae43135a SHA512 0b3e1059ff5b1118934591f2a8c9c00c36c4104c72eddc9d831a66e6ce0254db04513c05e3856e53b27e5ba422b6e5ded6238da56f9d9c23f66dfa7f4907feef
 EBUILD libarchive-3.3.1.ebuild 3300 BLAKE2B 10bce3600696bbcafbb17267ab7139958d0b810acbbfb56e476e873a138770ff5b5b96216387e97a3281f06df01ec67fdd573ea6351ca9a46344c33c1d1d881c SHA512 3c8bd5989c8b6f5554f98e35243a88b3d132779c59bd9d74ee77c7971dba7784345d4c3da2c1294d57384d8034a3461bf5e794a5c15060115bd1451bd7cd879b
 EBUILD libarchive-3.3.2.ebuild 3314 BLAKE2B b864f34e27ee57395cce46578d23880c64b0544f0661b34c50b36fa7138d92b221835e643420279950154c0642118c6e042fea8b7b6c38fd990d094e37c99db3 SHA512 465cedc1ad9b10c83a8a218af0b4fc50207dbf9593a25bb0292781a8b7f141950496b1909ce355174020a97c63b88322c41806f9215765b7a8e5fa6743bbb5e2
 MISC metadata.xml 1322 BLAKE2B 71089cf0e8324981233467ce2a07d13689731ecb01b50b319081b442eae55f7b9c879826b572be84123d3decaab2672fd68f5494021559a36de1cd3f152010cc SHA512 0da2a58ed4e5ee5ee41c0bde97473fb50a7ea0248ade72a16b9b7ba2d9da811b68ab183c4d2e615a51954cd8338ba0a810529f47738847f6f9711628823a5680
--- a/app-arch/libarchive/files/CVE-2017-5601.patch
+++ b/app-arch/libarchive/files/CVE-2017-5601.patch
@ -1,24 +0,0 @@
-From 98dcbbf0bf4854bf987557e55e55fff7abbf3ea9 Mon Sep 17 00:00:00 2001
-From: Martin Matuska <martin@matuska.org>
-Date: Thu, 19 Jan 2017 22:00:18 +0100
-Subject: [PATCH] Fail with negative lha->compsize in lha_read_file_header_1()
- Fixes a heap buffer overflow reported in Secunia SA74169
-
---
- libarchive/archive_read_support_format_lha.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/libarchive/archive_read_support_format_lha.c b/libarchive/archive_read_support_format_lha.c
-index 52a5531..d77a7c2 100644
--- a/libarchive/archive_read_support_format_lha.c
-+++ b/libarchive/archive_read_support_format_lha.c
-@@ -924,6 +924,9 @@ lha_read_file_header_1(struct archive_read *a, struct lha *lha)
- 	/* Get a real compressed file size. */
- 	lha->compsize -= extdsize - 2;
- 
-+	if (lha->compsize < 0)
-+		goto invalid;	/* Invalid compressed file size */
-+
- 	if (sum_calculated != headersum) {
- 		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
- 		    "LHa header sum error");
--- a/app-arch/libarchive/libarchive-3.2.2-r1.ebuild
+++ b/app-arch/libarchive/libarchive-3.2.2-r1.ebuild
@ -1,124 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils libtool multilib-minimal toolchain-funcs
-
-DESCRIPTION="BSD tar command"
-HOMEPAGE="http://www.libarchive.org/"
-SRC_URI="http://www.libarchive.org/downloads/${P}.tar.gz"
-
-LICENSE="BSD BSD-2 BSD-4 public-domain"
-SLOT="0/13"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-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="acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib"
-
-RDEPEND="
-	acl? ( virtual/acl[${MULTILIB_USEDEP}] )
-	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
-	expat? ( dev-libs/expat[${MULTILIB_USEDEP}] )
-	!expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] )
-	iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] )
-	kernel_linux? (
-		xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] )
-	)
-	!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
-	lzma? ( app-arch/xz-utils[threads=,${MULTILIB_USEDEP}] )
-	lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] )
-	nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	kernel_linux? (
-		virtual/os-headers
-		e2fsprogs? ( sys-fs/e2fsprogs )
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/CVE-2017-5601.patch
-)
-
-src_prepare() {
-	default
-	elibtoolize  # is required for Solaris sol2_ld linker fix
-}
-
-multilib_src_configure() {
-	export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923
-
-	local myconf=()
-	myconf=(
-		$(use_enable acl)
-		$(use_enable static-libs static)
-		$(use_enable xattr)
-		$(use_with bzip2 bz2lib)
-		$(use_with expat)
-		$(use_with !expat xml2)
-		$(use_with iconv)
-		$(use_with lz4)
-		$(use_with lzma)
-		$(use_with lzo lzo2)
-		$(use_with nettle)
-		$(use_with zlib)
-	)
-	if multilib_is_native_abi ; then myconf+=(
-		--enable-bsdcat=$(tc-is-static-only && echo static || echo shared)
-		--enable-bsdcpio=$(tc-is-static-only && echo static || echo shared)
-		--enable-bsdtar=$(tc-is-static-only && echo static || echo shared)
-	); else myconf+=(
-		--disable-bsdcat
-		--disable-bsdcpio
-		--disable-bsdtar
-	); fi
-
-	# We disable lzmadec because we support the newer liblzma from xz-utils
-	# and not liblzmadec with this version.
-	myconf+=(
-		--without-lzmadec
-	)
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi ; then
-		emake
-	else
-		emake libarchive.la
-	fi
-}
-
-multilib_src_test() {
-	# Replace the default src_test so that it builds tests in parallel
-	multilib_is_native_abi && emake check
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi ; then
-		emake DESTDIR="${D}" install
-
-		# Create symlinks for FreeBSD
-		if ! use prefix && [[ ${CHOST} == *-freebsd* ]]; then
-			# Exclude cat for the time being #589876
-			for bin in cpio tar; do
-				dosym bsd${bin} /usr/bin/${bin}
-				echo '.so bsd${bin}.1' > "${T}"/${bin}.1
-				doman "${T}"/${bin}.1
-			done
-		fi
-	else
-		emake DESTDIR="${D}" \
-			install-includeHEADERS \
-			install-libLTLIBRARIES \
-			install-pkgconfigDATA
-	fi
-
-	# Libs.private: should be used from libarchive.pc instead
-	prune_libtool_files
-}
-
-multilib_src_install_all() {
-	cd "${S}" || die
-	einstalldocs
-}
--- a/app-arch/lz4/Manifest
+++ b/app-arch/lz4/Manifest
@ -3,6 +3,6 @@ DIST lz4-1.8.0.tar.gz 222840 BLAKE2B 0b33f920f59a5ec9576051baa9ba887b320d424f8f6
 DIST lz4-r131.tar.gz 133784 BLAKE2B f072d1f97ac6f804140c3896dfa95c16eb3c2c2208cfeb35a07535bb345fa100e4169ea91b2aa05655fb61f6f2d64a7c25444778b99841d3e3d0f09b10f570d8 SHA512 60bd95d529691ffee2c43f0d8a62484c3cff74c0154094f073192606806ac8182dced61e0534ffa7e0ccf5f18e9a8cfd2738883a83814c0711a6d7f1d1b252e5
 EBUILD lz4-0_p131.ebuild 1521 BLAKE2B 5748445c1b995930382c846a6ffdca206f008a447b63660f07b6817f9710f0c434c29e775f635e1928d781053dc16142546f5c9d9606df3ee4465eaa85f4d799 SHA512 466cf8f24471af82f9789dc02ff9b93d69a450f7ec768e3d5c4f2a374ae36a46209d39859701cbd7856b7600dc1d33fbf993d1651cc56338601390f72f78e61c
 EBUILD lz4-1.7.5-r1.ebuild 1033 BLAKE2B 1e6724ddeb18f9e4ffe78a84e96d0593b2501e96bad632db32e10082559c1ea77c38686ec77b953dc0c981796a14bbabf38985ed953617e02ea0d704cdebe59e SHA512 763b64264b063b7066052ead680c262ce1019ddd41dd627dc76d38eb72b2ba9e1da23df7356188901fc92984822563179df9e06df975976c988e7bfd86c7b9ee
-EBUILD lz4-1.8.0.ebuild 1052 BLAKE2B be63c9aa301361c6430c57b9499dc202e81929a298480ee1fbba185f9006c5e134569d42bff62b906e27d1e5ba905ccb40a5005a3a411df0a3b3f7dac61a8722 SHA512 a9b240f98944d91c0fc8dcfe998398b5ec3017d9a49a985975e7950df456e35fd75bada3e01b921e4ee456c2683bd29f8c010564fb8fb2e907179b3c091288d4
+EBUILD lz4-1.8.0.ebuild 1051 BLAKE2B d5bc640b951eb7225fe902aa80c3261afa6210d9bfca8d0c186ea3f101862e547fcef7aecd47fe13a673c0b56df981084acabe4f09ed0a33538657de172e9271 SHA512 fdb265f0382197b17704ca21c171e3ab49eca041705d70c3bb51c05b903bcd67ff8f3e2942c6151e003c1f07c49d4fe688c9170b9dbc94063178357a8649828b
 EBUILD lz4-9999.ebuild 824 BLAKE2B dbc4eeaf3f65d527eaafd48a1083c43b76fd564b9dec1e6393c93445be4a0d9b56e540a4dd24df5438ea9b2ffeeb8a53a113a69b40f9b1ded3af4567b00122d8 SHA512 f28250733aa50bab0d908f5288d69d3d78af865433864716474d6d8fc639a44de61fb25dff06614bee003b9fee1d1a71528f9b96d2347c3562a5eb5736a340a9
 MISC metadata.xml 516 BLAKE2B 89b858097e6409d3b6f9855c0eb82ef02ee9c705516a1c32d1eb81730b03733e7abca122e59e43c193367429bb277dc1f044d09276f7b3db37f79d6f5c3a8054 SHA512 b559b65a4eebe71824ad3cd46c1ef3aabcc1c43f4312cb2e1072f0e7ab4396890696ef7450d7a41a2e03498db9da9e6823f9d8de4d413a0244607b85192efaa8
--- a/app-arch/lz4/lz4-1.8.0.ebuild
+++ b/app-arch/lz4/lz4-1.8.0.ebuild
@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_BRANCH=dev
 else
 	SRC_URI="https://github.com/Cyan4973/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi

 DESCRIPTION="Extremely Fast Compression algorithm"
--- a/app-arch/unzip/Manifest
+++ b/app-arch/unzip/Manifest
@ -5,6 +5,6 @@ DIST unzip60.tar.gz 1376845 BLAKE2B 5016d300b4452018a391f4ebc03c6960c068df400a04
 DIST unzip_6.0-20.debian.tar.xz 16680 BLAKE2B 17ce9234ac485eab4e5188b555af31dcb0db577b199e0c58991ba7211c4c80edce52b72e89cc4d82b000b70bed1ac90262c0972507f28f054af2cebd0ca33b48 SHA512 7212cb110291581c2e465dc8ea5130eabffc4e0369d6245e8c26fa9d350bed904847d6e1191afaaa2d3fc23bd05fda7da80439d0c06b88f5331b01c9eff97fbe
 DIST unzip_6.0-21.debian.tar.xz 17740 BLAKE2B 098a84e5b05f819f9c8c6a6656fdb2359dfb5b93f63444e55347e0bef9735fa48bf1631a658a2cb6d0c604e7e740e47b57910d251b74e5df7c8b9468acfe55f4 SHA512 f7bce4156ac13c34da3f991df3ae88b0db99b0810c7f8904ea3ac666a4cb2788d7182056f2bbd82d7519d0e0ee31a10af47bee08f360ceb859e5fbfc6e15ef36
 EBUILD unzip-6.0_p20.ebuild 2557 BLAKE2B 55203420f8676c64899a6e8572ea31ce3318018402e7f02790f7510d955d69fd3371e08ffa50bcb2867025e8542e6d745f20a0ba60562b2f8f7e7b42c25f53b8 SHA512 72014935da1e7acec784f189568fbec2756968811d348594d98e5a4f440579471b9e6348aa57877a18e0e34b6434aa144cd7015a88c5b999805428d4192dd212
-EBUILD unzip-6.0_p21-r2.ebuild 2609 BLAKE2B 5d13ddb0dc77f1406008067a8770d1c303edaf6759c2a88ec1f66f2450777a5e1212f01daddf436e2eec5b0b94742adab7265ece60a187b5f424fd5d64acf504 SHA512 f444813b642ea887c04faf61f95cbc65e81c4677a6544f45bf4da14da9e0063145e7c69d4e3e4a86639ff16c7537601ce92a9f2d412c834aac030e452b20c9be
+EBUILD unzip-6.0_p21-r2.ebuild 2608 BLAKE2B db3c85b41054613af35b0de892203a87dada5162ee43cac939220f49aaf633598e0bd43eef416da8ba3f3c06ce76adbb063b5e913bf6ded5fa738a0d332bc08c SHA512 baa5ed192aa3f4d7f601a15d130d2710e5ebe467c0f5602966b173200a16e3bb8fc466c7e930d34bd0daf1d72314c4aa7258fae328e5843bc16868f94f006315
 EBUILD unzip-6.0_p21.ebuild 2539 BLAKE2B 10ad8ccadfbd15b18449b61c3e3ed2c73d428ed85595e0065f2e397a4821221fd6dcb20be3c6d41b13c99f6b20de57fda263eabab2b842204e09ecde1f729d56 SHA512 df4efaf0e18777f9ffacc1e72100b33c60a35f535f15934fd9b1a5c5d287a3dd1fe9ab0442ca03fb316b7a792ab737bc130cae75116cb5b8adf7d825fceebdd5
 MISC metadata.xml 476 BLAKE2B 4cd0cc36008b6ec9ee618ef2e8a9c48e7fc6228e051a5c24e922faace6645de951a6836cc5d49a6041102944bf5b1901a5febcd6db86b67eb4182cad46a2a100 SHA512 0b82799f21ec8d57451ce8f231d24eabb02f637ee6fd2c32af12f9806f104ea53dc4d848b29950c1d5e848ea81f04a58422fa37f39287937dfb54e186f30b653
--- a/app-arch/unzip/unzip-6.0_p21-r2.ebuild
+++ b/app-arch/unzip/unzip-6.0_p21-r2.ebuild
@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz

 LICENSE="Info-ZIP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="bzip2 natspec unicode"

 DEPEND="bzip2? ( app-arch/bzip2 )
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/argon2/Manifest
+++ b/app-crypt/argon2/Manifest
@ -1,9 +1,6 @@
-AUX argon2-20160821-makefile-install-target.patch 1170 BLAKE2B 982fa117ba37f579ad10226d0f9c4aae4bb1ffcd4fb6358f7ea2ceb36573bdd54df4da84031d8f219f3cc42885341c4d5ff558ffc9131c5bae115d4bb6e5a078 SHA512 33650ebcda89330aaaff917fcc699f3192c1a59fcd1b639f20fced6dc18d8286f83488e88aa11ebdf0dc0b7405dbfb36081951b5b9d946d15c895895036c0187
-AUX argon2-20160821-makefile-soname-symlinks.patch 807 BLAKE2B 128d7f8db6bc85839ba243a821ab4ba2a40708e8a4dd30be4f264b6280375defa716b430cd4a029f047e08a06a8a29ab4a07abbec50619155fa5e015bd59b48e SHA512 de2e9e0f5b378700aa01004684f7aa9fc60d6e49cd6f994663bb8bb7c357732cbf19c31a563c44b485d5b85a75ea76c283f606ce1d453864b987febd2cbeaa27
 AUX argon2-20161029-makefile-soname-symlinks.patch 807 BLAKE2B 128d7f8db6bc85839ba243a821ab4ba2a40708e8a4dd30be4f264b6280375defa716b430cd4a029f047e08a06a8a29ab4a07abbec50619155fa5e015bd59b48e SHA512 de2e9e0f5b378700aa01004684f7aa9fc60d6e49cd6f994663bb8bb7c357732cbf19c31a563c44b485d5b85a75ea76c283f606ce1d453864b987febd2cbeaa27
-DIST argon2-20160821.tar.gz 1170019 BLAKE2B c69e918376ec064702fc59dd92f1b240c66686932db7fcbf0b475307cd96e2354aaa06dfa5493744b71749b90d5935265990bea93ab6734a51085fbe74f1a48d SHA512 e5b7484a2f3212d78481e7994457d69e5f42d6132b31f86d8de106e8e3fa8ffa3b7244fd74b63d15846be3a0fd407e6c57c6f766cdfa0ee1e3d7706124853b5f
 DIST argon2-20161029.tar.gz 1506864 BLAKE2B fbb0588439e811666af027710d1e5ef182b4d1c9012ca2c60d22ce103ceca14bb392dd8916b37c1c07799dc97f9401aa66d3bd08b250dd48314aa57a8599dff5 SHA512 e1f947a97e8b5f292dd32a6f1ea0ef3f2e411629218653821886ec4e1d5f8289d5b8f4b8bf0a37e69c344a83b975c695947d6b49fd2001a0e4273bebd4792892
-EBUILD argon2-20160821.ebuild 1000 BLAKE2B 8f2f5ad5ab64772f42f89eb0b4a03316e28a9b5e1abc9e7b40b45cd3d750f7809a0e1f54e3cf6672a33fe41eb3e920436d04f0d8384f8bbd25def92dff3f9ad8 SHA512 31d61e573417378f1b913c107c32c1951f4aae0a876c249bd615a1c6d2cb6ebe3943347cf4d2a2b86e61959d43bbbbb74012e518ce662b35d1c561953873d4bc
-EBUILD argon2-20161029-r1.ebuild 1057 BLAKE2B 6b3a84ed9851f12c28814115ab06ec9b6d9c20c3a0a91c6e44f52f544cf4d8b1ee21a13f8f68945da6538ab5635b443892b5066b8f11c39407340c75625c2270 SHA512 adc2295e0d61355a451ba0bc330b11379448af73e5702090bb16ef765396438080477b3e5e56d63752a32e139ceda45050a8e58481ee966d3bfb73724ade554e
-EBUILD argon2-20161029.ebuild 950 BLAKE2B 0a0ad624228a086c8b8b3f020a831d04c48d865691d3b423f9c24d760cff67d0d1ce82f74f7db282443fc75e82f22b78b470f50c7165ffbda0f3a311b797cbf7 SHA512 02bc9f738cb35cc7df1a69cdc3549b4429d5c3b0d612924856ab0e409665aa81a061fba23559ab304713a5e7377ddb3994e7e0ba8d2267384fc2b66365b33153
-MISC metadata.xml 589 BLAKE2B f12ccc184378df6249ad590fcc0b8cff3a384f9bed308b30e2fb8892c2cf736265af5f5ab71d65b1a25665fd7598e34790aaadc43494c88f8da2ccfe91c99104 SHA512 929d78d8436196e717c57041b83fd01e48619a74e740c75148f8c347902aa154cfb350df5c294866c8e125363808b1b125731865a9f702b9a1e611cccb310d16
+DIST argon2-20171227.tar.gz 1503745 BLAKE2B 70171ce1b446974e18e6f7077f436c6b78f29fd3eb075314014219280fd984e51b00137d901175da5fcb8a8472df0cbb16ff0333a2f2f098e52d3e0ea496e2cc SHA512 9c9e1a3905e61ac6913d1e073c104477e419ddd0506adc4487e88e98d19165ed8901fe8bb11246ed0cc71b3523c190da9692d5926642f86be09c3e67510afe4d
+EBUILD argon2-20161029-r1.ebuild 1059 BLAKE2B 5af6cfcc657b155477979103e641b1449c3c95430aed7594d5a7678b6c1622672e4b8581b6465721a8645065dd3bbf8c9be9bcd6d58f8f44c8844c9a4de09992 SHA512 bf74945ccbea5cd3017a91502a4ce67c5b39b02df1882b175c9d3c857b70914f3f91d41b10c7c46fc82ee4ab8e03b4b0b291e9f16a3a41f8f54f28216533ffec
+EBUILD argon2-20171227.ebuild 869 BLAKE2B 54a9530e4dcc946160b058c6252cdd9f4ab6b1ed321b817e08d8fd93fe0729f66269d4acecc153dd2735159630881a1ee05cba59853097c5cca070936a3db5d9 SHA512 4595e3d98fcfe017c655de638496df4cee7b9b44805a653f23d40b33a2fc54a8363e699298004be52b8163e126832055f14f85613e67e8f19a5eafa2c97af912
+MISC metadata.xml 660 BLAKE2B 1843f019c2cf7e8438209df6d90a20a9bcc88f5346aa02c953a28d84d712983fe3880b39b4b1766819bb88c670245447c37dc0c1da3b02b3f800a3d9706c4287 SHA512 76c1048a35a75b60d9e5fd56da50ba4bfe9537457e2021c226671d72e0456d2533f05361cad607cc86b8e01fd00a137a4cbc26a6d70c122918fe4e0f2ae3bee5
--- a/app-crypt/argon2/argon2-20160821.ebuild
+++ b/app-crypt/argon2/argon2-20160821.ebuild
@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Password hashing software that won the Password Hashing Competition (PHC)"
-HOMEPAGE="https://github.com/P-H-C/phc-winner-argon2"
-SRC_URI="https://github.com/P-H-C/phc-winner-argon2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 CC0-1.0 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-S="${WORKDIR}/phc-winner-${P}"
-PATCHES=(
-	"${FILESDIR}/${P}-makefile-install-target.patch"
-	"${FILESDIR}/${P}-makefile-soname-symlinks.patch"
-	)
-src_prepare() {
-	default
-	if ! use static-libs; then
-		sed -i -e 's/LIBRARIES = \$(LIB_SH) \$(LIB_ST)/LIBRARIES = \$(LIB_SH)/' Makefile || die "sed failed!"
-	fi
-	sed -i -e 's/-O3 //' Makefile || die "sed failed"
-	sed -i -e 's/-g //' Makefile || die "sed failed"
-	sed -i -e "s/-march=\$(OPTTARGET) /${CFLAGS} /" Makefile || die "sed failed"
-	sed -i -e 's/CFLAGS += -march=\$(OPTTARGET)//' Makefile || die "sed failed"
-}
--- a/app-crypt/argon2/argon2-20161029-r1.ebuild
+++ b/app-crypt/argon2/argon2-20161029-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 @@ HOMEPAGE="https://github.com/P-H-C/phc-winner-argon2"
 SRC_URI="https://github.com/P-H-C/phc-winner-argon2/archive/${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="|| ( Apache-2.0 CC0-1.0 )"
-SLOT="0"
+SLOT="0/0"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="static-libs"

--- a/app-crypt/argon2/argon2-20171227.ebuild
+++ b/app-crypt/argon2/argon2-20171227.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
@ -8,21 +8,20 @@ HOMEPAGE="https://github.com/P-H-C/phc-winner-argon2"
 SRC_URI="https://github.com/P-H-C/phc-winner-argon2/archive/${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="|| ( Apache-2.0 CC0-1.0 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="static-libs"

 S="${WORKDIR}/phc-winner-${P}"
-PATCHES=(
-	"${FILESDIR}/${P}-makefile-soname-symlinks.patch"
-	)
+
 src_prepare() {
 	default
 	if ! use static-libs; then
 		sed -i -e 's/LIBRARIES = \$(LIB_SH) \$(LIB_ST)/LIBRARIES = \$(LIB_SH)/' Makefile || die "sed failed!"
 	fi
-	sed -i -e 's/-O3 //' Makefile || die "sed failed"
-	sed -i -e 's/-g //' Makefile || die "sed failed"
-	sed -i -e "s/-march=\$(OPTTARGET) /${CFLAGS} /" Makefile || die "sed failed"
-	sed -i -e 's/CFLAGS += -march=\$(OPTTARGET)//' Makefile || die "sed failed"
+	sed -i -e 's/-O3 //' -e 's/-g //' -e "s/-march=\$(OPTTARGET) /${CFLAGS} /" -e 's/CFLAGS += -march=\$(OPTTARGET)//' Makefile || die "sed failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" LIBRARY_REL="$(get_libdir)" install || die
 }
--- a/app-crypt/argon2/files/argon2-20160821-makefile-install-target.patch
+++ b/app-crypt/argon2/files/argon2-20160821-makefile-install-target.patch
@ -1,44 +0,0 @@
-diff --git a/Makefile b/Makefile
-index e9d27c8..90c1818 100644
--- a/Makefile
-+++ b/Makefile
-@@ -80,11 +80,25 @@ endif
- 
- LIB_SH := lib$(LIB_NAME).$(LIB_EXT)
- LIB_ST := lib$(LIB_NAME).a
-+LIBRARIES = $(LIB_SH) $(LIB_ST)
-+HEADERS = include/argon2.h
- 
-.PHONY: clean dist format $(GENKAT)
-+INSTALL = install
-+
-+DESTDIR =
-+PREFIX = /usr
-+INCLUDE_REL = include
-+LIBRARY_REL = lib
-+BINARY_REL = bin
-+
-+INST_INCLUDE = $(DESTDIR)$(PREFIX)/$(INCLUDE_REL)
-+INST_LIBRARY = $(DESTDIR)$(PREFIX)/$(LIBRARY_REL)
-+INST_BINARY = $(DESTDIR)$(PREFIX)/$(BINARY_REL)
-+
-+.PHONY: clean dist format $(GENKAT) all install
- 
- all: clean $(RUN) libs 
-libs: $(LIB_SH) $(LIB_ST)
-+libs: $(LIBRARIES)
- 
- $(RUN):	        $(SRC) $(SRC_RUN)
- 		$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@
-@@ -129,3 +143,11 @@ testci:   $(SRC) src/test.c
- format:
- 		clang-format -style="{BasedOnStyle: llvm, IndentWidth: 4}" \
- 			-i include/*.h src/*.c src/*.h src/blake2/*.c src/blake2/*.h
-+
-+install: $(RUN) libs
-+	$(INSTALL) -d $(INST_INCLUDE)
-+	$(INSTALL) $(HEADERS) $(INST_INCLUDE)
-+	$(INSTALL) -d $(INST_LIBRARY)
-+	$(INSTALL) $(LIBRARIES) $(INST_LIBRARY)
-+	$(INSTALL) -d $(INST_BINARY)
-+	$(INSTALL) $(RUN) $(INST_BINARY)
--- a/app-crypt/argon2/files/argon2-20160821-makefile-soname-symlinks.patch
+++ b/app-crypt/argon2/files/argon2-20160821-makefile-soname-symlinks.patch
@ -1,28 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 1838c13..85aa710 100644
--- a/Makefile
-+++ b/Makefile
-@@ -87,8 +87,10 @@ endif
- endif
- 
- LIB_SH := lib$(LIB_NAME).$(LIB_EXT)
-+LIB_SH_VERSION := $(LIB_SH).0
- LIB_ST := lib$(LIB_NAME).a
- LIBRARIES = $(LIB_SH) $(LIB_ST)
-+INSTALL_LIBRARIES = $(LIBRARIES) $(LIB_SH_VERSION)
- HEADERS = include/argon2.h
- 
- INSTALL = install
-@@ -153,9 +155,11 @@ format:
- 			-i include/*.h src/*.c src/*.h src/blake2/*.c src/blake2/*.h
- 
- install: $(RUN) libs
-+	mv $(LIB_SH) $(LIB_SH_VERSION)
-+	ln -sf $(LIB_SH_VERSION) $(LIB_SH)
- 	$(INSTALL) -d $(INST_INCLUDE)
- 	$(INSTALL) $(HEADERS) $(INST_INCLUDE)
- 	$(INSTALL) -d $(INST_LIBRARY)
-	$(INSTALL) $(LIBRARIES) $(INST_LIBRARY)
-+	$(INSTALL) $(INSTALL_LIBRARIES) $(INST_LIBRARY)
- 	$(INSTALL) -d $(INST_BINARY)
- 	$(INSTALL) $(RUN) $(INST_BINARY)
--- a/app-crypt/argon2/metadata.xml
+++ b/app-crypt/argon2/metadata.xml
@ -10,6 +10,9 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<longdescription>Argon2 is a password hashing tool and library that won the Password Hashing Competition (PHC)</longdescription>
+	<slots>
+		<subslots>Reflect ABI of libargon2.so.</subslots>
+	</slots>
 	<upstream>
 		<remote-id type="github">P-H-C/phc-winner-argon2</remote-id>
 	</upstream>
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@ -1,9 +1,7 @@
-DIST containerd-0.2.9_p20170605.tar.gz 1229549 BLAKE2B 9dd68595694b5b624007ecd8a8a6546abeacbd45c6f4bd79754c275a2148938f17f7313f59567a7095d3d292807bf0eda9b79a5c9129a36f05eaa2478b97fde5 SHA512 900cf9c251c4de0f9848fb5bf26537226c1361d1a64a0fba853bda3805cb141fc2a849442fe885f0ee228b3e3a7018440af18898b484a54a7b75b4a86538aaa9
 DIST containerd-0.2.9_p20170917.tar.gz 1140788 BLAKE2B 96effa85f9cb03c3e416d53438376af6c7965660bf9c9931fdfa7fee94cca9386f2732e70dc88ee32b83e902b7d4a3072e22a817d9970ed1e07dc1271e8b33ab SHA512 c749bda691197ec8a7603db9ad92f2800a3f065143430a660333b7862518deb4c158a1c1fd01671dff438b40988d4a64d8f06bab05496b8728c6e2f57cd7da0a
 DIST containerd-1.0.0.tar.gz 3763785 BLAKE2B cd4af679c9028b616aeedd594518f796a350523899c13da5a848a5843b318394166ddfbf5e7ed1f473a3759b26d134659f928d8e15da17ebdf65a41d2fd5f914 SHA512 8c1a03de7f30976675e4482b4f18f4b87da56108de4d92f2e33b4cb4f8c188af5b3fad87971a294eac8442a0fb6ddae48cda81334c363203a8c8bdfc09176a7a
 DIST containerd-1.0.0_beta2_p20171019.tar.gz 3682585 BLAKE2B a67b581e3e5ddf2e95d551a9cca3dafa14772dc6ec1f1b1226ce21b0d7f88f3f80669b21f471fede50d5dd68d3916ef8696d0551c333c57e87a8ee2db3d25488 SHA512 290dcc97c47dccc6af424f5bcdfa2b59ae29eda135f71fb68a456245017a7ce5262150088f91b9edcaa19886d8919e5b6246f2816d6947c0a9b33ec6b58185e9
-EBUILD containerd-0.2.9_p20170605.ebuild 1000 BLAKE2B 16ffbe24d43a2a8a46023a1a2d454e06141ceeab94f559986960fc285f31d954a166f609c11b021d44d6d36d7d4198b84ea70768a30aa2c16d9a044e17f78fac SHA512 adec8a0e7d4d2e4dc200d470c1cbd2dbd38daf2ae2b931c9d32f5cd1b7c580cc1222c628c2e9b22fb64098c800c956a636e6167d6c7a6f391ec280b77a438a04
-EBUILD containerd-0.2.9_p20170917.ebuild 1001 BLAKE2B 3cd479b76dc812f5dec2b85e40bb52d4ce856bcada67d42cb1816cd4cd0a6afdc39cd0ac373f44453d5776911e1ca292608aed81cddcedb92877f8729cacd7f8 SHA512 d206822a85e56f2226b1099b98605800bb3f1aad7aac1846ece87c75b740e6e6aacee0def14925c96ea8ff86cf21622e5821e6112a39ea75edef1dfbeaf71b1f
+EBUILD containerd-0.2.9_p20170917.ebuild 1000 BLAKE2B e207ebb992d1c1e47a13c5ebae2004a6e8bb887ab605d9aaf7ac053762aecb58224b0d21cf13cc59fd1d9bc508fc6c0be5d3f7c4fd6a22136059a1a12b0df072 SHA512 c258fd617c1006ccc09506c1ff28d2edfe2e15966cacc62ea4e1194f3cdf96d74a60db5bf1f009a05b97f84bac44c23cef33e73e77ba272b8861244be7dbbe36
 EBUILD containerd-1.0.0.ebuild 1239 BLAKE2B 93aeb4bb834e6d79835d9eee995d0e8ec82d042d344eb2082366c71e56dc3f9376f3621a57b050f88478f5f9874c6cfd458a3c04a4866d3e583ed925bd49726f SHA512 b68d0bf59a5bdcbb98a8d480e5db49b182fcedf16962a6d9570dfeef22670d84215b8dd2b1c372108f92e6dd3b0f6c0b5478b1ce2c61ab2a2f4063820fcce97e
 EBUILD containerd-1.0.0_beta2_p20171019.ebuild 1250 BLAKE2B f0f6b831f90be916ef5841d4da3a5f14ea9569c978fbb250cd47df39020badc540eec2fa1a165e9b4e93d705bbcdd40d83317eac6db113c80ce66ff1ad1cfa00 SHA512 31eaa813c4ed0cf942d9b5b8d6b42acb33838b606d74706d02affe7eca3393f1f45644e496b7353b517a051c982111b872ea58a12c6644664d88ba023e2de185
 EBUILD containerd-9999.ebuild 965 BLAKE2B b671ff0dd3c5b8c72f2d713c04926047a304b7eec201051b5051a4ce49550176683a934d0b03350d5302fdff242e8e11f31b3db0b3962b73bcac85a0ed1a116d SHA512 b2acd6bd1c237a1058cec02875877d82e2e8c568bf3143cca020c64e13a0649975e3adcdb68540216e8ce1bcdbc7141eda8476c1c01ee2ca313120eca2850012
--- a/app-emulation/containerd/containerd-0.2.9_p20170605.ebuild
+++ b/app-emulation/containerd/containerd-0.2.9_p20170605.ebuild
@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN="github.com/${PN}/${PN}"
-
-inherit toolchain-funcs
-
-if [[ ${PV} == *9999 ]]; then
-	inherit golang-vcs
-else
-	MY_PV="${PV/_/-}"
-	EGIT_COMMIT="6e23458c129b551d5c9871e5174f6b1b7f6d1170"
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~ppc64"
-	inherit golang-vcs-snapshot
-fi
-
-DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.tools"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="hardened +seccomp"
-
-DEPEND=""
-RDEPEND=">=app-emulation/docker-runc-1.0.0_rc3_p20170706
-	seccomp? ( sys-libs/libseccomp )"
-
-S=${WORKDIR}/${P}/src/${EGO_PN}
-
-RESTRICT="test"
-
-src_compile() {
-	local options=( $(usex seccomp "seccomp" '') )
-	export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
-	LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') emake GIT_COMMIT="$EGIT_COMMIT" BUILDTAGS="${options[@]}"
-}
-
-src_install() {
-	dobin bin/containerd* bin/ctr
-}
--- a/app-emulation/containerd/containerd-0.2.9_p20170917.ebuild
+++ b/app-emulation/containerd/containerd-0.2.9_p20170917.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 @@ else
 	MY_PV="${PV/_/-}"
 	EGIT_COMMIT="06b9cb35161009dcb7123345749fef02f7cea8e0"
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc64"
+	KEYWORDS="amd64 ~arm ~ppc64"
 	inherit golang-vcs-snapshot
 fi

--- a/app-emulation/docker-proxy/Manifest
+++ b/app-emulation/docker-proxy/Manifest
@ -1,6 +1,6 @@
 DIST docker-proxy-0.8.0_p20161111.tar.gz 2150464 BLAKE2B a752ad0170cab2aebe2d5e826db22f5e21135a8fbfa835f62804c303be9f136fee941942e7d07e82e19033a62d51f37a41e9c36b48df48947d2885c351584f4f SHA512 86293b9cafc3c468760266b47412040f21309baad27765f584cfa1e93bc2ad88068832ed55f2ae8e4f16825e9f44619e89985fd36d98b3d47eaf1d1160f76c8e
 DIST docker-proxy-0.8.0_p20170917.tar.gz 2177045 BLAKE2B 0fed1328e8216ab83b23e8e1fe1793da6e874eced7ad18d101b0b7757f1de4fa7d321fb78620a349a4ed492abb4d85c3ecbf49311698b6af156a6255dec5740e SHA512 673ea638fa5c560d8238d7c1d88f114430f9d8efe701804bfe30044d0c059a688cbf6b62922be50834e16ee055ef6cf015f6232f76f0d942768f9e84e95496cd
 EBUILD docker-proxy-0.8.0_p20161111.ebuild 811 BLAKE2B 52fea3672054a214e08d3bf0f5392ec40620eb21c90e2b1535ce2ae327f544b6c852df93eb799217f42d4baaed927df7a266e12946d8efee84c5871471795d00 SHA512 f9fbd5faa13fc3f32fa8b23188dc242b11a8e7933a382552e80d0cc17dae3c2c2302ff42a0502acf55fd660bdbd4cb6e82f60ad977b0ed31873509ffb3a18462
-EBUILD docker-proxy-0.8.0_p20170917.ebuild 845 BLAKE2B c0ccb3363493ceffdbd2bfdae9bdb4a6eee9568f66df1d3c0b46f8fd6f2849fc46f38ad2d6443838a88b8ca6540c8698411dd0ab871451717188f939bb4a7302 SHA512 bf5d6aa116d1b6a59d33bb9168baf3a24b20bc34706a65ee6ef02378399d73843cd16580118287201310ec13657cd35dcee16e08fe8fa26f747368c818027d57
+EBUILD docker-proxy-0.8.0_p20170917.ebuild 844 BLAKE2B d9bb516d405a741229ffacefab421d80a44c9524d11ec17d0e5f67fb7560587791d90144b6822e189da137b8ddf77dfc0e91490318b04cface43813bd8554c43 SHA512 ac2d561d877731632d839d728a8b02021e6a80cd97274914abdd25c4b35f42e2ee23b3dfbcc15e96b411dfa20cdf6838b354f0da8eb495a3b0783069a246aa79
 EBUILD docker-proxy-9999.ebuild 767 BLAKE2B f78b475830edd0e33139d9f46a75629b9375ca1c2efc0e5e6c78447fd2bded0f2d1face48e8a0a8da92f6ea724eec843d2d96eb8e94a6881615926ceab6811df SHA512 07c829f9d6e5a2c64512fba2c6cef66bf33e15818d905f9b9fb3e412a98d651ac32c2fb9c07da57c7f8de963c4919f621021929375adf72afa485da9a69051ed
 MISC metadata.xml 543 BLAKE2B 69df333c0432bae7b2211dfa93683e3aee83fd63283fd7e34e0917e3292bd5d8947580fe7977fbc6f5d60fa0ca2d7902416bf4b878e27cbf2cf3413abacd18d6 SHA512 8580076d68f5803bc66fb9cdc088d13be2610ce1f200e614efcdabe75cfbeae5b72bcc4d043ce18844b4774f18e7861c3b6c788fa294c29e856bbcdd091677f6
--- a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20170917.ebuild
+++ b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20170917.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
 else
 	EGIT_COMMIT="7b2b1feb1de4817d522cc372af149ff48d25028e"
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc64"
+	KEYWORDS="amd64 ~arm ~ppc64"
 	inherit golang-vcs-snapshot
 fi

--- a/app-emulation/docker-runc/Manifest
+++ b/app-emulation/docker-runc/Manifest
@ -1,7 +1,7 @@
-DIST docker-runc-1.0.0_rc3_p20170706.tar.gz 1042839 BLAKE2B b0d5d3788cdbaf17af23fe102a3b5ebba9324505d2389e2acd3300680cfdff682dc170b214e1a000d081e791943c160c7d797acb90173f4549caa554493c86e5 SHA512 8e937e8ccaa114913d61a450b030496668c1e2d80eecccf5e4914c5685d7dde9a0d50bc2aef9be844dc69eab81621aa1c043abbc72ba28ab6bdb9db5e86daeaf
 DIST docker-runc-1.0.0_rc4_p20170917.tar.gz 1094599 BLAKE2B fed7b3cb3bbf214c61f9bc84752f143de9f18aa1ad1720c80df171eaa82f545cdafdbd58f64ee21e05db67f7fcfa139622fc8356aa7584db87b72d46e3285907 SHA512 0cb0748812296294a87dda257dbf0947897a1ada2aa861ff3e65309a6bbecebbe798929845fca6f23b66fd0dc019bca0a032737c7192fe20618d8e1849866f3d
 DIST docker-runc-1.0.0_rc4_p20170926.tar.gz 1188421 BLAKE2B ba21aaed4c434358876e9a1656a0592e5df90e16ebd52b69a2ddd3344aba2db5e335de1c88aeed27101ec5441174da148d0da02ade0b517d36d45e0aff53ca9e SHA512 bad4643ce37dbba168cc3b0820cf7dc8166ff2d7970de519f86ca09123b59999174dd98b7bc550b714dc8235732923e0090031c789deb603f310e042a39f1d76
-EBUILD docker-runc-1.0.0_rc3_p20170706.ebuild 1383 BLAKE2B caf99dfd6f7168ff3973cee36512fdf06cf75c7ac2351a5bd6b78bd465bb5d2fe0882fdfd095b8111457470b6db716d985314bc953f0a37ece2afd2dc30b0950 SHA512 e06eafdf1d1f6af0b6c994bdf7cd278b6f7d1f0a9e649a0dcbf2a41c79c5b298418cfde46a47db85105140012871c9ba57d0dbf8c1d6d3f191da7547ec911b0c
-EBUILD docker-runc-1.0.0_rc4_p20170917.ebuild 1386 BLAKE2B 2ba72209d0db389e3f80f07e4bab4e217148ccbc7f5caebadc4e093cd15cdda827477e3f3d5a88d3935f253d996f626ec60823fbe6c97bb3d056fce4df398c13 SHA512 06d41f7d5a6a1fc20e4a6d2a284a00131d5290fd9b305cf7bdf7ffbb9878449a3a9316ec70ebb0e5eef7df57d976fe6774b4ee4e768d491b08572e2fbce95133
+DIST docker-runc-1.0.0_rc4_p20171108.tar.gz 1189298 BLAKE2B e213955ef59e7d5a43f1567c67d72b99d7de503340ed8c777a43a70c4f2b1dbfce2905377c912958f736cf31247334d1c2ab29fae203a297561c26ad43a4e4c1 SHA512 a5bf97ce284317e03e63ee0e39228d77848fcde2f6322de06eebc2536978b5d87fd8c3fbccb2e74ef8c80fbaa28f3d0b24074cb9fde01e268593332aacd57695
+EBUILD docker-runc-1.0.0_rc4_p20170917.ebuild 1385 BLAKE2B 03aab7b27952ff4dc2e1e84c6e3edb599b03df34dc1a82c7b7cbff6a3f36324cd191e723f4700c58761f221b395f443ba84a09ed5310af15d35a3bbbc43ed7a8 SHA512 466f519c03e8df4d71bf9b95149d9e4e15ed0858b999840f7d80d8ad9ccb7339b25a726451d9f08e4820ed09a6cd873e1d21a1de6e041d23202290a7da3e98cc
 EBUILD docker-runc-1.0.0_rc4_p20170926.ebuild 1385 BLAKE2B 90e1005077667c7f2f4b1e77543d50d266cd0fcddb020dc3a349c7071beacf2a9d5ae2ebdd88a79870684700fb843860e2c9c2257dd08928b28f84a62c10092b SHA512 91b1981d8660f91d376662ffbc87ef7afa77e00adeae8a87b8014093e930669f5d7da38710a41c227619ff30b22fb6e5bdd8fd8128366ebd07f4883dba4be88d
+EBUILD docker-runc-1.0.0_rc4_p20171108.ebuild 1385 BLAKE2B 02cd7e8361f69cb4e37bc97f81c1069e2ef9928ce335bcddc1755a32e0a67a77f236e03fe6126db4870122a0d9798b925b463e6616ff29c719d05674e8de3ab7 SHA512 fddf7cb0b5df213c14d5d832c683e8b5721c54c5f787688b08ff106561724d1e5cd4223b266ef71e1419ab248eddbfeb5d96909139105c4f83c39192e6fe0e32
 MISC metadata.xml 627 BLAKE2B af677935e5cb5c43d3b0e4d8a204bcfb14f4b77dc386fd2a756923457ae88cdc33fd85a84879b7908662c3c1b20ce0ba5598ae708d764bd36a071e32d9beb2c8 SHA512 1038519441e238a48dafd9a0827d931cc3ca2618e57f7f1300bdc138e6bc2b768ae47f936456bf2aa5c434e617b628344aa4071fe805e698671d5f74ffb10163
--- a/app-emulation/docker-runc/docker-runc-1.0.0_rc4_p20170917.ebuild
+++ b/app-emulation/docker-runc/docker-runc-1.0.0_rc4_p20170917.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 @@ else
 	EGIT_COMMIT="3f2f8b84a77f73d38244dd690525642a72156c64"
 	RUNC_COMMIT="3f2f8b84" # Change this when you update the ebuild
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc64"
+	KEYWORDS="amd64 ~arm ~ppc64"
 	inherit golang-vcs-snapshot
 fi

--- a/app-emulation/docker-runc/docker-runc-1.0.0_rc4_p20171108.ebuild
+++ b/app-emulation/docker-runc/docker-runc-1.0.0_rc4_p20171108.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
@ -8,10 +8,10 @@ if [[ ${PV} == *9999 ]]; then
 	inherit golang-vcs
 else
 	MY_PV="${PV/_/-}"
-	EGIT_COMMIT="810190ceaa507aa2727d7ae6f4790c76ec150bd2"
-	RUNC_COMMIT="810190" # Change this when you update the ebuild
+	EGIT_COMMIT="b2567b37d7b75eb4cf325b77297b140ea686ce8f"
+	RUNC_COMMIT="b2567b3" # Change this when you update the ebuild
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~ppc64"
+	KEYWORDS="~amd64 ~arm ~ppc64"
 	inherit golang-vcs-snapshot
 fi

--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@ -1,10 +1,8 @@
-DIST docker-17.06.2.tar.gz 9684548 BLAKE2B bfe36c5fbc98bb2b1e8534cb59b54aef9b371fd46f7585c99c16c46d391356302fe9e3e064c7561cde617b8a5b97a07f994eb2452452a61a4c6ed38c434d9665 SHA512 0a9b7b122aadef911141ec1f606759e892c0673821ddf5f3247a5b2d4476a20018add84a22c5aca32f0f91c1046e5be6d8d3f9ce65c3e4244896bf061b1eac6b
-DIST docker-17.09.0.tar.gz 10132253 BLAKE2B 2964f20fd0badbea7961ccc4026fa107edbb42e92a63bfba18aed456c474990d76d118baec423c6d3cb6a89215a802b822b245222b73552569f03f0f30684819 SHA512 d96570825fb3dc24516b3b9666e935d5277674221452d8a23e6bcd1116f0bb3a2b8b315f47b98f52e681ab79309c099bb3b5c437af942539708ff3126c993638
 DIST docker-17.09.1.tar.gz 10135978 BLAKE2B 4c2dea48b3593332ac7b02bfcc7bf037b858adf87e5dd8ff84b03aca75d711375fafb06683a6a57cd2549c1a0a0edb2d7c7c1d4cf1b9ceefce18f4f91164b931 SHA512 e968ced32c379b74602053d1e9fe9ee5abe595078bb8d5f0d994c7eafd1557158d58fa48489ca8d7d578dbc7a5241182288b3ab37885b53abb8364d7aa9d2a4f
 DIST docker-17.11.0.tar.gz 10649392 BLAKE2B fff44885f535020bfd8cd6ab9c347df12610779de90290330e1315a2570c1e85a8d0c497320528f44187389b61c3f177f8032c3edc236347900034dfe3eaf764 SHA512 b9444775fd7bca1e1ec5b2fdeba063f7a7ead4a5b1fd60c836f42f98a8fe9a3a2fe963332e225491280772c9e4024fec5ebfa9b89ab9fa1b83cd60b5afd0333e
-EBUILD docker-17.06.2.ebuild 8711 BLAKE2B da8da6b779f54d9058191cd3888c79c523122bd729baa66e82c9a68226ab0b9cb46d8e22cbe2bd0be05f0494b8731349a55b8e44c65abc482a1da102c0668154 SHA512 6037ebc36e28e89905a3e15b4816114c16c624fc0072bdbda628fccfff5574509099923c15cc33cc7a39d0b67eabfb1511d7650ead4d5fcd360c7ac9b97408c4
-EBUILD docker-17.09.0.ebuild 8767 BLAKE2B 5c23044a93abb2728b9955158ba0475ca2c0f6e70d4e3d2ec10aae72f5831f08b19c5b99a4d7288f859c3d0807c2802b3fb0b95a3c2516f665c457636ee65c3c SHA512 5455e549fbcfa75082e1e0f4211d75439d26b028306ebc9bbecfec36fa951e52d7014e78d8893043194047ddcecbcb0b7fa1c4e2ad947373b1945576b270279f
-EBUILD docker-17.09.1.ebuild 8767 BLAKE2B deddd036ff353e11809f7a84b453be4f9b15331749a3aa7263f0ff3768c75c79288b9b1c9551b3ff164cd922cbe30527c4c682d60386f071b69db16cd14099f8 SHA512 6dd4d987080d778a3bd5bdb2bde8086a4fbf5a07036b0e08e74d8afa070a214a5e78e3623677c8a466816d3a7ca445a7625106c3dd936ac8cb645d10fe7fff1f
+DIST docker-17.12.0.tar.gz 11011208 BLAKE2B aee4a1b8af69b2418c62b0f5fc8cf6b1a0945ccbc870572e5835ec23bd9b6d5919fe9e8170b9d3c20eea479fec05aa97f380e1229b09cccbdbca9ed2baaa9f0b SHA512 1a4dfc86dc6c85c78d2abf4f559e5efe0fb22d915997f047fa6641e2aefb3e2fc6cb0124b6a0fc69abfc09ac8b261ebbd4d80b380cf9eb4304d3e1a423957b67
+EBUILD docker-17.09.1.ebuild 8766 BLAKE2B 79466ae75ff1b04af6fa51414d0d63b56f400d8c5879bd53ce37a99f824720559c323fad6129da7720ed252c9b5f70d3cb2d63afe25eaa177072272b98e5da3b SHA512 744bf909f82262827d04307bc71f9ec18ce194e3e213ce8f0ebfe172565d84d9c31ccf92ccf9ccadf7457780246427e82cd1f2082a49524e6b35d17ffec6131e
 EBUILD docker-17.11.0.ebuild 8772 BLAKE2B b912ef908bd41857144ef72076da4a14ada29edafb26662b8f5c2ae3e377e10f35d8e6113d7ced3a4bdfd29273f1f9a94e92313b8e844423dfea9cf85bd5536f SHA512 a7617ac4beef9492a918d0e7379c3a1b3ba38970a079ba96492851cec05346a629e2fe84a9bfed487c49442c257b14db5f60fed22c9546ea267f4a9aff0014ab
+EBUILD docker-17.12.0.ebuild 8773 BLAKE2B 223c867de2b3d14e1b997eb03f24384cadb4d1d6f2f1e8e3b66ac1e34864fe9d63062123c2f14b247b306edb62d1b5c0077eed6219f2e13c511293693350964d SHA512 e1b393ef6ea4e371e80c317e6852bf3fecd3dfa51e901ee79eb9ef7754d41441f2c2df45890019b55cd6690dda305f542b889e517783e6ea87273035e7ac83b1
 EBUILD docker-9999.ebuild 8077 BLAKE2B c6ee72c20ec0275500268b0c50af3609f164058ee69fd4dbd855c13d3fdeace8fb556750530e3517f769d5b24002ef6f457d3ea02041ec62d1069dfa06a45a4f SHA512 a2ec513765edbfb246460aaf41beae4a24e4fc8413ce20702785ac7403de7a0567017dc205b864d343dabfdeff7405e734a9ea9a9584322862b9b19005c285a4
 MISC metadata.xml 1637 BLAKE2B 14c56a84e41ebd76827cf37c27fe21259ca06e00d8c7fe318bd5eca609a77a9e23fc5ea13caba1616e47d17978402f715e6a8bc40643ce0cfb3ee87494ee6858 SHA512 bdaea32036a7f65f7015634d45bdf4f13322f3266cda389b49d2c57ad86e9811731194af5786e312d5ea40dab8b8eb78fc7b79a2ffee186b8eaabae9cc3c7a1b
--- a/app-emulation/docker/docker-17.06.2.ebuild
+++ b/app-emulation/docker/docker-17.06.2.ebuild
@ -1,314 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/docker/docker-ce"
-
-if [[ ${PV} = *9999* ]]; then
-	# Docker cannot be fetched via "go get", thanks to autogenerated code
-	EGIT_REPO_URI="https://${EGO_PN}.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
-	inherit git-r3
-else
-	inherit versionator
-	if [ "$(get_version_component_count)" = 4 ]; then
-		MY_PV="$(replace_version_separator 3 '-ce-')"
-	else
-		MY_PV="$PV-ce"
-	fi
-	DOCKER_GITCOMMIT="cec0b72"
-	EGIT_COMMIT="v${MY_PV}"
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm"
-	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
-	inherit golang-vcs-snapshot
-fi
-inherit bash-completion-r1 golang-base linux-info systemd udev user
-
-DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
-HOMEPAGE="https://dockerproject.org"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="apparmor aufs btrfs +container-init +device-mapper hardened overlay pkcs11 seccomp"
-
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
-CDEPEND="
-	>=dev-db/sqlite-3.7.9:3
-	device-mapper? (
-		>=sys-fs/lvm2-2.02.89[thin]
-	)
-	seccomp? ( >=sys-libs/libseccomp-2.2.1 )
-	apparmor? ( sys-libs/libapparmor )
-"
-
-DEPEND="
-	${CDEPEND}
-
-	dev-go/go-md2man
-
-	btrfs? (
-		>=sys-fs/btrfs-progs-3.16.1
-	)
-"
-
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
-RDEPEND="
-	${CDEPEND}
-	>=net-firewall/iptables-1.4
-	sys-process/procps
-	>=dev-vcs/git-1.7
-	>=app-arch/xz-utils-4.9
-
-	~app-emulation/containerd-0.2.9_p20170605
-	~app-emulation/docker-runc-1.0.0_rc3_p20170706[apparmor?,seccomp?]
-	app-emulation/docker-proxy
-	container-init? ( >=sys-process/tini-0.15.0[static] )
-"
-
-RESTRICT="installsources strip"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-# see "contrib/check-config.sh" from upstream's sources
-CONFIG_CHECK="
-	~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
-	~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
-	~KEYS
-	~VETH ~BRIDGE ~BRIDGE_NETFILTER
-	~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
-	~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK
-	~NF_NAT ~NF_NAT_NEEDED
-	~POSIX_MQUEUE
-
-	~USER_NS
-	~SECCOMP
-	~CGROUP_PIDS
-	~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
-
-	~BLK_CGROUP ~BLK_DEV_THROTTLING ~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED
-	~CGROUP_PERF
-	~CGROUP_HUGETLB
-	~NET_CLS_CGROUP
-	~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
-	~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
-
-	~VXLAN
-	~XFRM_ALGO ~XFRM_USER
-	~IPVLAN
-	~MACVLAN ~DUMMY
-"
-
-ERROR_KEYS="CONFIG_KEYS: is mandatory"
-ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
-ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
-
-ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering"
-ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering"
-ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
-ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering"
-ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks"
-ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks"
-
-pkg_setup() {
-	if kernel_is lt 3 10; then
-		ewarn ""
-		ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported."
-		ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies"
-	fi
-
-	# for where these kernel versions come from, see:
-	# https://www.google.com/search?q=945b2b2d259d1a4364a2799e80e8ff32f8c6ee6f+site%3Akernel.org%2Fpub%2Flinux%2Fkernel+file%3AChangeLog*
-	if ! {
-		kernel_is ge 3 16 \
-		|| { kernel_is 3 15 && kernel_is ge 3 15 5; } \
-		|| { kernel_is 3 14 && kernel_is ge 3 14 12; } \
-		|| { kernel_is 3 12 && kernel_is ge 3 12 25; }
-	}; then
-		ewarn ""
-		ewarn "There is a serious Docker-related kernel panic that has been fixed in 3.16+"
-		ewarn "  (and was backported to 3.15.5+, 3.14.12+, and 3.12.25+)"
-		ewarn ""
-		ewarn "See also https://github.com/docker/docker/issues/2960"
-	fi
-
-	if kernel_is le 3 18; then
-		CONFIG_CHECK+="
-			~RESOURCE_COUNTERS
-		"
-	fi
-
-	if kernel_is le 3 13; then
-		CONFIG_CHECK+="
-			~NETPRIO_CGROUP
-		"
-	else
-		CONFIG_CHECK+="
-			~CGROUP_NET_PRIO
-		"
-	fi
-
-	if kernel_is lt 4 5; then
-		CONFIG_CHECK+="
-			~MEMCG_KMEM
-		"
-		ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
-	fi
-
-	if kernel_is lt 4 7; then
-		CONFIG_CHECK+="
-			~DEVPTS_MULTIPLE_INSTANCES
-		"
-	fi
-
-	if use aufs; then
-		CONFIG_CHECK+="
-			~AUFS_FS
-			~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
-		"
-		ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3"
-	fi
-
-	if use btrfs; then
-		CONFIG_CHECK+="
-			~BTRFS_FS
-			~BTRFS_FS_POSIX_ACL
-		"
-	fi
-
-	if use device-mapper; then
-		CONFIG_CHECK+="
-			~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
-		"
-	fi
-
-	if use overlay; then
-		CONFIG_CHECK+="
-			~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL
-		"
-	fi
-
-	linux-info_pkg_setup
-
-	# create docker group for the code checking for it in /etc/group
-	enewgroup docker
-}
-
-src_compile() {
-	export GOPATH="${WORKDIR}/${P}"
-
-	# setup CFLAGS and LDFLAGS for separate build target
-	# see https://github.com/tianon/docker-overlay/pull/10
-	export CGO_CFLAGS="-I${ROOT}/usr/include"
-	export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
-
-	# if we're building from a tarball, we need the GITCOMMIT value
-	[ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT
-
-	# fake golang layout
-	ln -s docker-ce/components/engine ../docker || die
-	ln -s docker-ce/components/cli ../cli || die
-
-	# let's set up some optional features :)
-	export DOCKER_BUILDTAGS=''
-	for gd in aufs btrfs device-mapper overlay; do
-		if ! use $gd; then
-			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
-		fi
-	done
-
-	for tag in apparmor pkcs11 seccomp; do
-		if use $tag; then
-			DOCKER_BUILDTAGS+=" $tag"
-		fi
-	done
-
-	pushd components/engine || die
-
-	if use hardened; then
-		sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
-		grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
-		sed  "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
-			-i hack/make/dynbinary-daemon || die
-		grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed'
-	fi
-
-	# build daemon
-	./hack/make.sh dynbinary || die 'dynbinary failed'
-
-	popd || die # components/engine
-
-	pushd components/cli || die
-
-	# build cli
-	emake \
-		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
-		VERSION="$(cat ../../VERSION)" \
-		GITCOMMIT="${DOCKER_GITCOMMIT}" \
-		dynbinary || die
-
-	# build man pages
-	go build -o gen-manpages github.com/docker/cli/man || die
-	./gen-manpages --root . --target ./man/man1 || die
-	./man/md2man-all.sh -q || die
-	rm gen-manpages || die
-	# see "components/cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man) 
-
-	popd || die # components/cli
-}
-
-src_install() {
-	dosym containerd /usr/bin/docker-containerd
-	dosym containerd-shim /usr/bin/docker-containerd-shim
-	dosym runc /usr/bin/docker-runc
-	use container-init && dosym tini /usr/bin/docker-init
-
-	pushd components/engine || die
-	newbin "$(readlink -f bundles/latest/dynbinary-daemon/dockerd)" dockerd
-
-	newinitd contrib/init/openrc/docker.initd docker
-	newconfd contrib/init/openrc/docker.confd docker
-
-	systemd_dounit contrib/init/systemd/docker.{service,socket}
-
-	udev_dorules contrib/udev/*.rules
-
-	dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
-	dodoc -r docs/*
-
-	insinto /usr/share/vim/vimfiles
-	doins -r contrib/syntax/vim/ftdetect
-	doins -r contrib/syntax/vim/syntax
-
-	# note: intentionally not using "doins" so that we preserve +x bits
-	dodir /usr/share/${PN}/contrib
-	cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
-	popd || die # components/engine
-
-	pushd components/cli || die
-
-	newbin build/docker-* docker
-
-	doman man/man*/*
-
-	dobashcomp contrib/completion/bash/*
-	insinto /usr/share/zsh/site-functions
-	doins contrib/completion/zsh/_*
-	popd || die # components/cli
-}
-
-pkg_postinst() {
-	udev_reload
-
-	elog
-	elog "To use Docker, the Docker daemon must be running as root. To automatically"
-	elog "start the Docker daemon at boot, add Docker to the default runlevel:"
-	elog "  rc-update add docker default"
-	elog "Similarly for systemd:"
-	elog "  systemctl enable docker.service"
-	elog
-	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
-	elog "  usermod -aG docker youruser"
-	elog
-}
--- a/app-emulation/docker/docker-17.09.1.ebuild
+++ b/app-emulation/docker/docker-17.09.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
@ -20,7 +20,7 @@ else
 	DOCKER_GITCOMMIT="19e2cf6"
 	EGIT_COMMIT="v${MY_PV}"
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
+	KEYWORDS="amd64 ~arm"
 	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
 	inherit golang-vcs-snapshot
 fi
--- a/app-emulation/docker/docker-17.12.0.ebuild
+++ b/app-emulation/docker/docker-17.12.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
@ -17,7 +17,7 @@ else
 	else
 		MY_PV="$PV-ce"
 	fi
-	DOCKER_GITCOMMIT="afdb6d4"
+	DOCKER_GITCOMMIT="486a48d"
 	EGIT_COMMIT="v${MY_PV}"
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm"
@ -60,9 +60,9 @@ RDEPEND="
 	sys-process/procps
 	>=dev-vcs/git-1.7
 	>=app-arch/xz-utils-4.9
-
-	~app-emulation/containerd-0.2.9_p20170917
-	~app-emulation/docker-runc-1.0.0_rc4_p20170917[apparmor?,seccomp?]
+	dev-libs/libltdl
+	~app-emulation/containerd-1.0.0
+	~app-emulation/docker-runc-1.0.0_rc4_p20171108[apparmor?,seccomp?]
 	>=app-emulation/docker-proxy-0.8.0_p20170917
 	container-init? ( >=sys-process/tini-0.16.1[static] )
 "
@ -254,7 +254,7 @@ src_compile() {
 	./gen-manpages --root . --target ./man/man1 || die
 	./man/md2man-all.sh -q || die
 	rm gen-manpages || die
-	# see "components/cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man) 
+	# see "components/cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man)

 	popd || die # components/cli
 }
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@ -1,8 +1,6 @@
-DIST VBoxGuestAdditions_5.1.26.iso 59496448 BLAKE2B c2ea9dac192b09efb41daf57fd12541fc86ae13a21eb5650e2b2bb2256c13b3cfd00f0020d12d92eaa3dead9b3a7928cf766be7d58e2e2b7d5116d5b0d7d7c9c SHA512 5329ce9bb787efed088a9f89412974cef3a982a351c0053b3daf15a9c95c55f99556e2b86cdcd39c168042503eb00eaa83fb99f8f5c4c97d177dd2b61bb33f5d
 DIST VBoxGuestAdditions_5.1.30.iso 59494400 BLAKE2B 37f70eb8dd17e0492a106fa5e2cea1ed93b0a0a955e75a3a32d5bd45c447c6c4ff8e78e13b19922a34e8e982d1de5bbf0815a8e81c2a8ea2596477318d7acbf5 SHA512 3205444339a0c85a3b234ba462add21033b5b3eee18eecc15b150b21f5f9f1aadb92b7049bef6be1201e1acfd1edd6f2924c38d56a52770113c8401bcca9abcb
 DIST VBoxGuestAdditions_5.2.2.iso 60481536 BLAKE2B 560dc43a901cfaad4d9d6ca6f065614751765de7d78575c0dfe7d8ebcb0bf828a2b676ae91f6b346f179065e0f093e54742821c8a60765ec347d07288ae7b9fe SHA512 3c75468821287e4abe80e319ea8d4cd66c3075061610f74619c474b8c5bd8542ab55fe8747cb710e34863fcbc056b03c9256ad7d4b32fe9b0b56d74c4d93f3b5
 DIST VBoxGuestAdditions_5.2.4.iso 57868288 BLAKE2B 8affaa8a4bfdc434081e62a194b751fc143f748995b769cf565497751787a15fafc627b994ef8d30ea98275039cf8d85e6e5cdc3a7d806961f063c9c6fd1423d SHA512 51445f43ed337f7ea850b599c7dc80837e697de0ef1eb33e79b2dccadda50c1cb1fd37e98387648564cb47c4d593f7138e68410033c83ec0a4a65f04a057723d
-EBUILD virtualbox-additions-5.1.26.ebuild 727 BLAKE2B 6d7493b2ff01130ecc416dca8fa0fa11813904787a0707729ca7e179a573bc8024328b260e3eee67141672e2ba0c4fcedad1a49451cefec01d07487c85fe58de SHA512 7b86aa30735d2282551667ff47ffeb1fb2fb10af9ba05315c73407dc19ac4b9a7e2dca6515b748ab89f6546d5b5a7c206a0e53ab421ed949c404394e6be9999d
 EBUILD virtualbox-additions-5.1.30.ebuild 727 BLAKE2B 6d7493b2ff01130ecc416dca8fa0fa11813904787a0707729ca7e179a573bc8024328b260e3eee67141672e2ba0c4fcedad1a49451cefec01d07487c85fe58de SHA512 7b86aa30735d2282551667ff47ffeb1fb2fb10af9ba05315c73407dc19ac4b9a7e2dca6515b748ab89f6546d5b5a7c206a0e53ab421ed949c404394e6be9999d
 EBUILD virtualbox-additions-5.2.2.ebuild 729 BLAKE2B 9d3eaae2546cdc5a3b174b250100e1b894cf227dfe64583239a17de8a7324ccc8b1de14532cc16da695c38eecfcd8ff1958fb7508f3e0d0b145f5becb30912ce SHA512 b3c4774741bc62a014e57f26de9cb0ee4366d8ad31a6ffa51101085e591af034f44e1de156227719d7bf8bf12120528524380b0c782777f2bc98b0e8e11cd0b8
 EBUILD virtualbox-additions-5.2.4.ebuild 729 BLAKE2B 9d3eaae2546cdc5a3b174b250100e1b894cf227dfe64583239a17de8a7324ccc8b1de14532cc16da695c38eecfcd8ff1958fb7508f3e0d0b145f5becb30912ce SHA512 b3c4774741bc62a014e57f26de9cb0ee4366d8ad31a6ffa51101085e591af034f44e1de156227719d7bf8bf12120528524380b0c782777f2bc98b0e8e11cd0b8
--- a/app-emulation/virtualbox-additions/virtualbox-additions-5.1.26.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-5.1.26.ebuild
@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-MY_PN=VBoxGuestAdditions
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=${MY_PN}_${MY_PV}
-
-DESCRIPTION="CD image containing guest additions for VirtualBox"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
-
-LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-RESTRICT="mirror"
-
-RDEPEND="!app-emulation/virtualbox-bin
-	!=app-emulation/virtualbox-9999"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	return 0
-}
-
-src_install() {
-	insinto /usr/share/${PN/-additions}
-	newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
-}
--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@ -4,23 +4,18 @@ AUX vboxwebsrv-initd 674 BLAKE2B be1cb2574ff5e9e1efc6a137d18e67b2ecbe0e94b6a3a2d
 AUX virtualbox-bin-3-wrapper 2931 BLAKE2B bb8a72f749996b945d42a3d94ab895ee5b234bed907e6d1e055993f34a2459720bd8b0c56b61eae9c2e159e2b820d5117a6f9bed6ebfc3b327fa133c8f3aa812 SHA512 adb6ba2b3252b19b4c0331c10a025d05fd2399642530ba9aec2efa2dc8dbea4188a95806935532ad8229db29f0767c3098ef7646204f5e540e291ceb350b76ac
 AUX virtualbox-bin-config 28 BLAKE2B 86d452db92ceb19e9389ca83c800955066b84f4c3a289ff56cd0d7638a0a3d47891e670e070be9f3bcc30d730982237fc9211d1a9bbdbf8429c7ca80d25fbcc1 SHA512 8086ef107aff0aa3e17f5fcb8ee5de4dd8a24cb119c3523e3e3a302819eb4258328adead1b6f40b96706539f4e1c43dbd5c055a16a304ac29f7f302ebf2e4c4c
 AUX virtualbox-bin.desktop-2 205 BLAKE2B cb0ab2e87d0e82e88656f3288eb4af255fd1c9f732dbd6e1aa545d30d4176526fa38aebd3eccb4acb46c638056504be37231dc042fa030fcb04020e00d7d401c SHA512 7e9555aaa317e1cb551e5ff591b9d20bbb76a738f9e923c13d206e02c1e6bfc8f4eb17b498b235ac0aa2062e4acbd5f24d2522de2da3cff2e12c264875bc476d
-DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.26-117224.tar.gz 19624237 BLAKE2B 593d70c49e47b49cc64d1c4c8f78703e6cd608f4ef6ab836492822429d213c1b70323cfe7847a206d284821572431423a841e8d802a3f47519818906cee63e39 SHA512 c6e31e8fb26b8ca32c423d14e85e15f6372a030ec40e9f06ce1e1234913d3586cc58d46819684c99cf3ced37f35d0a964339199cad5cf43580c88bf1afa63ef6
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.30-118389.tar.gz 19624724 BLAKE2B de52acef8ad0785e576b361721d3a2f0b3d7e3820964d7e47fb6ffa7fd33bc4126f0e496396a412994e5eadc17fbd72699295865aa520f5e4b7a8ca53007e905 SHA512 6b468879f0fb6d6f916c40fb60f418457c526c20ebb1a6253bfc38392e0ae965e3b54590173b0d974070ced1646db82035950fb7dd54b22e20f4ad29850d6cf4
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.2-119230.tar.gz 19504049 BLAKE2B ff3be5b81c409c33d7c831e2bba6df7d7ab87e6422d8cc4cbc3599f75c84100fceec5547b8f9b44d204941b48102a23a4c2183340ec017159ae7c37e07d21813 SHA512 cf3f08f7ee966b5a991fe029b3d4014f333678f0fddb9d75589695811dc4d780651a6dbdddf55a6466631bf8a9dce099256468490847229ac2c26dba9fc57d27
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.4-119785.tar.gz 19465971 BLAKE2B eb37636ba0c856654ee0a06fb09fea848cef834cf75dcabf92d2a52994b0e2add74539213d9c3f7793496ffeaa35e623ebd9068e5dd5c7cfa8944e6a14ad2448 SHA512 97f496c9e3ef63a513c6fc31127459136b2bbef885a277d30c832831f079e3fbe8c6900b1799db1a4497a32b116cafb2fe982bd28a201da8d6f4222f70c548d8
-DIST VirtualBox-5.1.26-117224-Linux_amd64.run 87981522 BLAKE2B a1067daca90eb45509aa314d8e346f565cca845c8ec2fdbe6d27ec6d12e4cf6a288638a083295da62858bcda44b2f97720475b246e9e03013ab68c9c5e191720 SHA512 9b486fd52918469fdffaa39bbef234d22fad9d3b562fa04443bf6c1040e744db6dc9bd103ead299127b82c5d4bc96c1e05f677cacd623affa6569408c8d26df5
-DIST VirtualBox-5.1.26-117224-Linux_x86.run 87090639 BLAKE2B 89ec5ed5a9c0a5c16fbe4e3bbab5035c027d1c24ca561536a9c7e1924a5b7b5ddd180aa798212a3dc213439dc844761b73212d7fb1ed7611b0a91b078e96c950 SHA512 3aafad5374dc79c0fdd9bf1da6708ae4ce2f43d9fce3222326424bf03d6b73a7283ba5ebeb01a9ab6b24eeb8a8ec7c23af84e40f3edeb512c2101c329f4091e7
 DIST VirtualBox-5.1.30-118389-Linux_amd64.run 88186323 BLAKE2B 4700613906658a223134130e99eb4f669ffc875e732e9b43d237926b9a33d385d6056240ae5f498d13b6a0cf26c600b293657fc64c838db498bd3935fa23a8e4 SHA512 b6312abbf5c0e4bf22aca50a81d297a0ed21d5b4b72242e21750ac088c56817dc90ac1ae068dd9006f4f736130510f26f55793b8c09999c590da09908e304280
 DIST VirtualBox-5.1.30-118389-Linux_x86.run 87397839 BLAKE2B cc0fb245f98883dc19cfc9a64d8c7a9593d8ae784895a9a8224c146779ab65901052ba5d62f57c9cd5bc46d23e208cc97046fd6641eb8848e90c4828bd745813 SHA512 643ef90453e3a6a6d3fbb365176a72de1743230a58ee45f1cb22fd8bb57c9cfe6013ec1ffdb0076a248d1987a1e3fea13ca71ef9ca983cb8e6378d30c76451fb
 DIST VirtualBox-5.2.2-119230-Linux_amd64.run 90346949 BLAKE2B f6ae64b7b9b5ad41865a12792bd611d05c8899250c1740fcfabc0c6c07ce495e143b29c8bc8b5b2c2dbe690076c8593c030de4374af9d31a82e99dc9c58fec40 SHA512 a99d0922b341b821976bc944a5882d2804ca7ceb565a9512ce86c3968fb0d27dc533009dde51bea4881d729c97277597d329927183be4ffd081b5ed73c8f5ec3
 DIST VirtualBox-5.2.2-119230-Linux_x86.run 89548224 BLAKE2B de4cfd7a21caa49bc5752bfe097e99ec5e55eb9abcfafc34eb9f74e88c12fb6d0af1754e88180daf7f420ca3b968a25a3a0d6b878ebe6f7eb51c543ed24fbb1d SHA512 cd83828fdde57ac6c9b1bed58a8500c7ad2d2e83b83a4ffe304addd1d5df277dbddebc1e9c779030e5352b66b6a7505309fb0b5cfbbb575f122a7f126c397591
 DIST VirtualBox-5.2.4-119785-Linux_amd64.run 88575441 BLAKE2B c0cdf3cb1c17f1de000926e0b1db9902c965040723a62de95ef518bd4180ce95d4c2c5830abbdbf65823447af22d71f574b85e8ccc322ddc05137556f4381401 SHA512 f5741e29348a7a307146b8f34e0e9c4bccd8368879ba7c4e3836de21ad014f31ecf1bb7033173f8651483d4a11ffca7c8b475f9149474533cd7ab8c31ba8cbb9
 DIST VirtualBox-5.2.4-119785-Linux_x86.run 87653837 BLAKE2B 069005e59da03e9cc6d8ef3cc296c192095c4b37bc17de5e768d13f46e1d8bdd7573e6b1a2b359cee5a37c2a2bb9808707317c07b4dd3d76cbbc0ed0824f55bb SHA512 245a90b8312988d6b19765ecd404bc569b370c400353294a564dde4ab57a006fda3e24dd423d7ba3afdfcd20484b95adc86d598ebbd640f1742d9c92ed010021
-DIST VirtualBoxSDK-5.1.26-117224.zip 9860247 BLAKE2B 6525792471a71aca9824e2fa9a0c9b722f248bf4873f3f683a04ab335bb06257fd051e1baeb2c106d663c09e805f88784bb01614042660949566766002183b4e SHA512 d2bef837d61bfb35ba550f004345c2c412c2f62da23ffded6dff8aa33281fdce7c0a8f6b70c131b35e04c34ca0a4221bf97a78e65a470c657980572ebedb0774
 DIST VirtualBoxSDK-5.1.30-118389.zip 9861374 BLAKE2B 4890a76c5bdf6ec8215095ce3246ee518a6cf527136fd896bec3503175115de05e52f946b5c44fa82ecb087900a5eb4f2bbd0cfa79a4eba94ba4d48f757f9604 SHA512 89d3407860f202329e5958e724b848884a9047f01000090d1000bce22005311b3650c1ef1fb1fc998c29cc77887af856b64a5ac76154408cae7b921860d8a9f1
 DIST VirtualBoxSDK-5.2.2-119230.zip 10146673 BLAKE2B 8bdb6ffcd9e0a59c5a27676a9cd71c402b6a8dd7c03fc7e543e620e3f96b02f252e46432b3724fad508953636a9643731fe60c7cad2ef79a107d83ea154aca3b SHA512 2bfd6e391af3ad55dfced0dcf551112c364317b226bdc29bab42420055c2dc6053f9ab5ce28eace15bb9c7680ddc83c0bc77c53938d05d507cdd51a6c781a27f
 DIST VirtualBoxSDK-5.2.4-119785.zip 10150272 BLAKE2B 58b16d12f6d2939ef0a45e0bf627f7977740ef9c3f277935c624f6b226cfa84390ea3d74a840c9da85bfc392b60ecebb2a8bc1dae51db92848bea42deaaea536 SHA512 b23637d9eb086c999733a5a0725a8a97ade5af11ccb7fa6e74bd20281270333d551ea22ae404f462726a2250593b624cbbb8169af9d16a07bd2383bdc74da92e
-EBUILD virtualbox-bin-5.1.26.117224.ebuild 8374 BLAKE2B 6ede0b42eae71f3cb90571607182fdedebd609642a1086a88990d31487db9688719271c068d9aedf3cb70a75dc59175b0456682415d22577ba8d09d9448fa1cb SHA512 f56f6be68888456ff843aa4c0d104026b2d17dcd32259e8ef2a716407494314952fc03560c14e5f13af96885587310d2d38404163745c1dc0a3c089b1d3444fe
 EBUILD virtualbox-bin-5.1.30.118389.ebuild 8374 BLAKE2B 6ede0b42eae71f3cb90571607182fdedebd609642a1086a88990d31487db9688719271c068d9aedf3cb70a75dc59175b0456682415d22577ba8d09d9448fa1cb SHA512 f56f6be68888456ff843aa4c0d104026b2d17dcd32259e8ef2a716407494314952fc03560c14e5f13af96885587310d2d38404163745c1dc0a3c089b1d3444fe
 EBUILD virtualbox-bin-5.2.2.119230.ebuild 8376 BLAKE2B 396e12d24098e7274d5b538a3b656b6bc5b28ccf965e297fc9ea18b3b090408d006e34da46970a75d6d3f40653528c74fa7151893ef112f850ad444f80d06ae7 SHA512 40a0618b48b9981fb9295e1e2a0b3373dd7145022b32aecc497ec7321534887c50c45645e5b6a22c5962c8e892c213a3cd8540711566b2f2b0e73ae63cb6ff61
 EBUILD virtualbox-bin-5.2.4.119785.ebuild 8376 BLAKE2B 396e12d24098e7274d5b538a3b656b6bc5b28ccf965e297fc9ea18b3b090408d006e34da46970a75d6d3f40653528c74fa7151893ef112f850ad444f80d06ae7 SHA512 40a0618b48b9981fb9295e1e2a0b3373dd7145022b32aecc497ec7321534887c50c45645e5b6a22c5962c8e892c213a3cd8540711566b2f2b0e73ae63cb6ff61
--- a/app-emulation/virtualbox-bin/virtualbox-bin-5.1.26.117224.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-5.1.26.117224.ebuild
@ -1,287 +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 xdg-utils gnome2 pax-utils python-r1 udev unpacker versionator
-
-MAIN_PV="$(get_version_component_range 1-3)"
-if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
-	MY_PV="${MAIN_PV}_$(get_version_component_range 5)"
-	MY_PV="${MY_PV/beta/BETA}"
-	MY_PV="${MY_PV/rc/RC}"
-else
-	MY_PV="${MAIN_PV}"
-fi
-VBOX_BUILD_ID="$(get_version_component_range 4)"
-VBOX_PV="${MY_PV}-${VBOX_BUILD_ID}"
-MY_P="VirtualBox-${VBOX_PV}-Linux"
-# needed as sometimes the extpack gets another build ID
-EXTP_PV="${VBOX_PV}"
-EXTP_PN="Oracle_VM_VirtualBox_Extension_Pack"
-EXTP_P="${EXTP_PN}-${EXTP_PV}"
-# needed as sometimes the SDK gets another build ID
-SDK_PV="${VBOX_PV}"
-SDK_P="VirtualBoxSDK-${SDK_PV}"
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="amd64? ( http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_amd64.run )
-	x86? ( http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_x86.run )
-	http://download.virtualbox.org/virtualbox/${MY_PV}/${EXTP_P}.vbox-extpack -> ${EXTP_P}.tar.gz"
-
-LICENSE="GPL-2 PUEL"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+additions +chm headless python vboxwebsrv rdesktop-vrdp"
-RESTRICT="mirror"
-
-if [[ "${PV}" != *beta* ]] ; then
-	SRC_URI+="
-		sdk? ( http://download.virtualbox.org/virtualbox/${MY_PV}/${SDK_P}.zip )"
-	IUSE+=" sdk"
-fi
-
-DEPEND="app-arch/unzip
-	${PYTHON_DEPS}"
-
-RDEPEND="!!app-emulation/virtualbox
-	!app-emulation/virtualbox-additions
-	~app-emulation/virtualbox-modules-${MAIN_PV}
-	!headless? (
-		dev-libs/glib
-		media-libs/fontconfig
-		media-libs/freetype
-		media-libs/libpng
-		media-libs/libsdl[X]
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXft
-		x11-libs/libXi
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		chm? ( dev-libs/expat )
-	)
-	dev-libs/libxml2
-	sys-fs/lvm2
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXt
-	x11-libs/libXmu
-	x11-libs/libSM
-	x11-libs/libICE
-	x11-libs/libXdmcp
-	${PYTHON_DEPS}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-S=${WORKDIR}
-
-QA_PREBUILT="opt/VirtualBox/*"
-
-PYTHON_UPDATER_IGNORE="1"
-
-src_unpack() {
-	unpack_makeself ${MY_P}_${ARCH}.run
-	unpack ./VirtualBox.tar.bz2
-
-	mkdir "${S}"/${EXTP_PN} || die
-	pushd "${S}"/${EXTP_PN} &>/dev/null || die
-	unpack ${EXTP_P}.tar.gz
-	popd &>/dev/null || die
-
-	if [[ "${PV}" != *beta* ]] && use sdk ; then
-		unpack VirtualBoxSDK-${SDK_PV}.zip
-	fi
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	# create virtualbox configurations files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-config" vbox.cfg
-
-	if ! use headless ; then
-		newmenu "${FILESDIR}"/${PN}.desktop-2 ${PN}.desktop
-
-		# set up symlinks (bug #572012)
-		dosym ../../../../opt/VirtualBox/virtualbox.xml /usr/share/mime/packages/virtualbox.xml
-
-		local size ico icofile
-		for size in 16 24 32 48 64 72 96 128 256 ; do
-			pushd "${S}"/icons/${size}x${size} &>/dev/null || die
-			if [[ -f "virtualbox.png" ]] ; then
-				doicon -s ${size} virtualbox.png
-			fi
-			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
-				icofile="virtualbox-${ico}.png"
-				if [[ -f "${icofile}" ]] ; then
-					doicon -s ${size} ${icofile}
-				fi
-			done
-			popd &>/dev/null || die
-		done
-		doicon -s scalable "${S}"/icons/scalable/virtualbox.svg
-		insinto /usr/share/pixmaps
-		newins "${S}"/icons/48x48/virtualbox.png ${PN}.png
-	fi
-
-	pushd "${S}"/${EXTP_PN} &>/dev/null || die
-	insinto /opt/VirtualBox/ExtensionPacks/${EXTP_PN}
-	doins -r linux.${ARCH}
-	doins ExtPack* PXE-Intel.rom
-	popd &>/dev/null || die
-	rm -rf "${S}"/${EXTP_PN}
-
-	insinto /opt/VirtualBox
-	dodir /opt/bin
-
-	doins UserManual.pdf
-
-	if [[ "${PV}" != *beta* ]] && use sdk ; then
-		doins -r sdk
-	fi
-
-	if use additions; then
-		doins -r additions
-	fi
-
-	if use vboxwebsrv; then
-		doins vboxwebsrv
-		fowners root:vboxusers /opt/VirtualBox/vboxwebsrv
-		fperms 0750 /opt/VirtualBox/vboxwebsrv
-		dosym ../../opt/VirtualBox/VBox.sh /opt/bin/vboxwebsrv
-		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-	fi
-
-	if use rdesktop-vrdp; then
-		doins rdesktop-vrdp
-		doins -r rdesktop-vrdp-keymaps
-		fperms 0750 /opt/VirtualBox/rdesktop-vrdp
-		dosym ../../opt/VirtualBox/rdesktop-vrdp /opt/bin/rdesktop-vrdp
-	fi
-
-	if ! use headless && use chm; then
-		doins kchmviewer VirtualBox.chm
-		fowners root:vboxusers /opt/VirtualBox/kchmviewer
-		fperms 0750 /opt/VirtualBox/kchmviewer
-	fi
-
-	# This ebuild / package supports only py2.7.  When py3 comes is unknown.
-	# The compile phase makes VBoxPython2_7.so.
-	# py3 support would presumably require a binary pre-compiled by py3.
-	use python && doins VBoxPython.so VBoxPython2_7.so
-
-	rm -rf src rdesktop* deffiles install* routines.sh runlevel.sh \
-		vboxdrv.sh VBox.sh VBox.png vboxnet.sh additions VirtualBox.desktop \
-		VirtualBox.tar.bz2 LICENSE VBoxSysInfo.sh rdesktop* vboxwebsrv \
-		webtest kchmviewer VirtualBox.chm vbox-create-usb-node.sh \
-		90-vbox-usb.fdi uninstall.sh vboxshell.py vboxdrv-pardus.py \
-		VBoxPython?_*.so
-
-	if use headless ; then
-		rm -rf VBoxSDL VirtualBox VBoxKeyboard.so
-	fi
-
-	doins -r * || die
-
-	# create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid)
-	dosym ../VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
-	dosym ../VBoxREM.so /opt/VirtualBox/components/VBoxREM.so
-	dosym ../VBoxRT.so /opt/VirtualBox/components/VBoxRT.so
-	dosym ../VBoxDDU.so /opt/VirtualBox/components/VBoxDDU.so
-	dosym ../VBoxXPCOM.so /opt/VirtualBox/components/VBoxXPCOM.so
-
-	local each
-	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,NetNAT,TestOGL,ExtPackHelperApp}; do
-		fowners root:vboxusers /opt/VirtualBox/${each}
-		fperms 0750 /opt/VirtualBox/${each}
-		pax-mark -m "${D}"/opt/VirtualBox/${each}
-	done
-	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
-	fperms 4750 /opt/VirtualBox/VBoxNetAdpCtl
-	fperms 4750 /opt/VirtualBox/VBoxNetDHCP
-	fperms 4750 /opt/VirtualBox/VBoxNetNAT
-
-	if ! use headless ; then
-		# Hardened build: Mark selected binaries set-user-ID-on-execution
-		for each in VBox{SDL,Headless} VirtualBox; do
-			fowners root:vboxusers /opt/VirtualBox/${each}
-			fperms 4510 /opt/VirtualBox/${each}
-			pax-mark -m "${D}"/opt/VirtualBox/${each}
-		done
-
-		dosym ../VirtualBox/VBox.sh /opt/bin/VirtualBox
-		dosym ../VirtualBox/VBox.sh /opt/bin/VBoxSDL
-	else
-		# Hardened build: Mark selected binaries set-user-ID-on-execution
-		fowners root:vboxusers /opt/VirtualBox/VBoxHeadless
-		fperms 4510 /opt/VirtualBox/VBoxHeadless
-		pax-mark -m "${D}"/opt/VirtualBox/VBoxHeadless
-	fi
-
-	exeinto /opt/VirtualBox
-	newexe "${FILESDIR}/${PN}-3-wrapper" "VBox.sh"
-	fowners root:vboxusers /opt/VirtualBox/VBox.sh
-	fperms 0750 /opt/VirtualBox/VBox.sh
-
-	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxManage
-	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxVRDP
-	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxHeadless
-	dosym ../VirtualBox/VBoxTunctl /opt/bin/VBoxTunctl
-
-	# set an env-variable for 3rd party tools
-	echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox"
-	doenvd "${T}/90virtualbox"
-
-	local udevdir="$(get_udevdir)"
-	insinto ${udevdir}/rules.d
-	doins "${FILESDIR}"/10-virtualbox.rules
-	sed "s@%UDEVDIR%@${udevdir}@" \
-		-i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die
-	# move udev scripts into ${udevdir} (bug #372491)
-	mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"${udevdir} || die
-	fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	gnome2_icon_cache_update
-
-	udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
-
-	elog ""
-	if ! use headless ; then
-		elog "To launch VirtualBox just type: \"VirtualBox\""
-		elog ""
-	fi
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "For advanced networking setups you should emerge:"
-	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
-	elog ""
-	elog "Please visit http://www.virtualbox.org/wiki/Editions for"
-	elog "an overview about the different features of ${PN}"
-	elog "and virtualbox-ose"
-	if [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
-		elog ""
-		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
-		elog "or else USB in ${PN} won't work."
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@ -1,8 +1,6 @@
-DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.26-117224.tar.gz 19624237 BLAKE2B 593d70c49e47b49cc64d1c4c8f78703e6cd608f4ef6ab836492822429d213c1b70323cfe7847a206d284821572431423a841e8d802a3f47519818906cee63e39 SHA512 c6e31e8fb26b8ca32c423d14e85e15f6372a030ec40e9f06ce1e1234913d3586cc58d46819684c99cf3ced37f35d0a964339199cad5cf43580c88bf1afa63ef6
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.30-118389.tar.gz 19624724 BLAKE2B de52acef8ad0785e576b361721d3a2f0b3d7e3820964d7e47fb6ffa7fd33bc4126f0e496396a412994e5eadc17fbd72699295865aa520f5e4b7a8ca53007e905 SHA512 6b468879f0fb6d6f916c40fb60f418457c526c20ebb1a6253bfc38392e0ae965e3b54590173b0d974070ced1646db82035950fb7dd54b22e20f4ad29850d6cf4
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.2-119230.tar.gz 19504049 BLAKE2B ff3be5b81c409c33d7c831e2bba6df7d7ab87e6422d8cc4cbc3599f75c84100fceec5547b8f9b44d204941b48102a23a4c2183340ec017159ae7c37e07d21813 SHA512 cf3f08f7ee966b5a991fe029b3d4014f333678f0fddb9d75589695811dc4d780651a6dbdddf55a6466631bf8a9dce099256468490847229ac2c26dba9fc57d27
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.4-119785.tar.gz 19465971 BLAKE2B eb37636ba0c856654ee0a06fb09fea848cef834cf75dcabf92d2a52994b0e2add74539213d9c3f7793496ffeaa35e623ebd9068e5dd5c7cfa8944e6a14ad2448 SHA512 97f496c9e3ef63a513c6fc31127459136b2bbef885a277d30c832831f079e3fbe8c6900b1799db1a4497a32b116cafb2fe982bd28a201da8d6f4222f70c548d8
-EBUILD virtualbox-extpack-oracle-5.1.26.117224.ebuild 1085 BLAKE2B aa3c98d0f7816f32be63ef9ae0f5839e86693fbdb5a388bfcf3bb35a7b5750d99d8aa817bb07f40e99b219264a192b5b5bac5445c3fc65fe26c5ace6e92fb94f SHA512 a018d8881652c86d254cb87b68bd134d51930009f815001a6e06a3f40539305dcc3846395f8f59312506a74a9e517c0bb63c1a22d53be60b14a999f66617b79a
 EBUILD virtualbox-extpack-oracle-5.1.30.118389.ebuild 1085 BLAKE2B aa3c98d0f7816f32be63ef9ae0f5839e86693fbdb5a388bfcf3bb35a7b5750d99d8aa817bb07f40e99b219264a192b5b5bac5445c3fc65fe26c5ace6e92fb94f SHA512 a018d8881652c86d254cb87b68bd134d51930009f815001a6e06a3f40539305dcc3846395f8f59312506a74a9e517c0bb63c1a22d53be60b14a999f66617b79a
 EBUILD virtualbox-extpack-oracle-5.2.2.119230.ebuild 1087 BLAKE2B 7438822221f0c3f20dafc2460dfd0831d83fd8b1819b91c4e6dd21c827611f0adbd23b6d1fc05f11856724e8c97d163b3b17de6b6d0a5e54f7fd83b2df03a5c2 SHA512 dcf3ae05bd9bad1806fed11baa6a182971f2dfd448b7b015cd5191d984dc1f8335b206030feac3fc64e1e21a9d55ab1ad5c4f6d9ed806cb25770c92f1eb110d9
 EBUILD virtualbox-extpack-oracle-5.2.4.119785.ebuild 1087 BLAKE2B 7438822221f0c3f20dafc2460dfd0831d83fd8b1819b91c4e6dd21c827611f0adbd23b6d1fc05f11856724e8c97d163b3b17de6b6d0a5e54f7fd83b2df03a5c2 SHA512 dcf3ae05bd9bad1806fed11baa6a182971f2dfd448b7b015cd5191d984dc1f8335b206030feac3fc64e1e21a9d55ab1ad5c4f6d9ed806cb25770c92f1eb110d9
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.26.117224.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.26.117224.ebuild
@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib versionator
-
-MAIN_PV="$(get_version_component_range 1-3)"
-if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
-	MY_PV="${MAIN_PV}_$(get_version_component_range 5)"
-	DEP_PV="${MY_PV}"
-	MY_PV="${MY_PV/beta/BETA}"
-	MY_PV="${MY_PV/rc/RC}"
-else
-	MY_PV="${MAIN_PV}"
-	DEP_PV="${MAIN_PV}"
-fi
-VBOX_BUILD_ID="$(get_version_component_range 4)"
-MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
-MY_P="${MY_PN}-${MY_PV}-${VBOX_BUILD_ID}"
-
-DESCRIPTION="PUEL extensions for VirtualBox"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
-
-LICENSE="PUEL"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-RESTRICT="mirror strip"
-
-RDEPEND="~app-emulation/virtualbox-${DEP_PV}"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="/usr/lib*/virtualbox/ExtensionPacks/${MY_PN}/.*"
-
-src_install() {
-	insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}
-	doins -r linux.${ARCH}
-	doins ExtPack* PXE-Intel.rom
-}
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@ -4,13 +4,10 @@ AUX virtualbox-guest-additions-5-localconfig 937 BLAKE2B 4ad7e6520572ed5b3ee29c0
 AUX virtualbox-guest-additions-8.initd 538 BLAKE2B f720a0f9de10c5240f1ac8a590c4e5de2ada767a06341f9259a9e491660e796640dd4a251fbbf85f66786b8ec829357aa51546e502ca99452fa998ce20031637 SHA512 e01579b0ce980517a7b9e163915977a58c73594cf4c8484d20941449b9a21a4346ab1bb031b248ee438b350fa23b4bc78a1d6e501986b329564a4df487f5d3ca
 AUX virtualbox-guest-additions.service 411 BLAKE2B f5f1c24a94764ca72a04879c27cd9fdc1e0c8a1440ac87674dad44a1493a9347e6e2b351ae2b71e050ba06ae9848168220d62981a9e0c984ea68bf48ea06b485 SHA512 b6226146f3591a778551e94ae2661e2ae3c6b761d20600d741eaaa03f43f0a2b841d2a44d9eec3a3768edb23b021cee94c7849d998ee4104ad60dad2df88df83
 AUX xorg.conf.vbox 274 BLAKE2B 3a3035fcbdbd5810c54505f5a5e6deefa1540e5e01a038babb62a40bd5b2de2dc5b228cabe55612d92a522e6ae92aa7ff4ff2ab26772c3b54ce95ebac4e7fc5a SHA512 ac2b14970dc6667ceec2dbdae52bc92cbad4aff020898ede156454e8a8a703354f15c7e19cfbd2bdd15e251493fd05cacfe814cabee0f9b4cf155e44860ed4c9
-DIST VirtualBox-5.1.26.tar.bz2 115915813 BLAKE2B c770420804fd0bcbe5582fccfefc55b6d69a603a99cc9ba26e72f6c1947a3e2bcbc5e9e1aa0185d544fb37b10db8233aa4c5cd14777138f63c2959a3ca5e6954 SHA512 680e9646a51a0a5923b3ded10007ee1c1e2a41c6d8a961d2b2540db6578bed2847154f4cac87e3cfe1118a62595b47c7df99da854f6c340e173b9eb8cacf2add
 DIST VirtualBox-5.1.30.tar.bz2 116510730 BLAKE2B fe1d9ea37aa33a6aa6a78aebb469e267b9412e96cadc0a5287c263e8be21fdd0c9035a03e31ca954bef99eb5c05416de2bdfde5a657daa9a61eb795815d33542 SHA512 6c44d9593f4815644a484b306e621fe7eca224002f85d89c00f2470300f2c78dbfe50ffda61d2c2465df14ca77c70a2ab86f1a05116feeee9f5833857eb18dee
 DIST VirtualBox-5.2.2.tar.bz2 118424845 BLAKE2B c918ff1d3989d2d94cec807b596b5daceece6388575f40c70b3581288be664e39cd0f0dae974516d1122110d5660185bac7bcf336418d8f44455290cafb52a7d SHA512 415956cfe987a20eb0a372288c29f0e388bd706a3b94ff69b92ef5bbf2e9aecd75761a56f5421ef97d165f756cd7fd46b9eaf16b74b7d2460b831d7f03aae7dc
 DIST VirtualBox-5.2.4.tar.bz2 118481693 BLAKE2B 874f5e65d97befaf72767626a1f3271a0b7c30f8dc998dc10aee9478039cecd14ce11c9c624ba596c09641aae9a41ca91ae33e5a82218bc8acd8cd32ebb727e1 SHA512 19cb168393098fd28ab2017a27d09a558721d57b31c5d3610deb68a17dfa7fd7ffe9ad7be18714a314724ab5ecb54e7ab5fb76183e8e89afbed2da79649e2798
-DIST virtualbox-5.1.24-patches-01.tar.xz 2708 BLAKE2B 6779a7ad1b013cf2e735817eae9785451c6a91e4a61558a650cfdc67d80b63db0eb33992a3207b0acc1e80b75caef14d9d291705ca7b3c96c4185c31e585e92d SHA512 0028e593818013f809831ac5a73eec63988c0aefb4b309fb3c928efbea8db8b8f46bd7c82f156396adc704f0567474df262dfe9bb6e09af0b2c23528fe2c6e2d
 DIST virtualbox-5.1.30-patches-02.tar.xz 2608 BLAKE2B 08b05a26622a7acec455f6d0dc72858f5f2758488e50d219f83c3d12606419d48e9d99302cde5a275929fe79af900c1b3ea3957fe9dfdaa952aaa0da9933291a SHA512 8a490f7cc44e40262fc47819736251c177adb635256794e9500f52729197c85211d5b0c0d000268089953a4c185872a8ba03c5d42df6b80f05eac8b81335320a
-EBUILD virtualbox-guest-additions-5.1.26.ebuild 6048 BLAKE2B adbf24bb4de0120426b51c42b7f1897769f64fc72c353593ca38917e1d834b9788a0a1ced9a049d1dcb18108ecaa01c0daa980b6518fd503219b3b4e1a76f791 SHA512 490852f4835df995de2160e565d9e87bfb0b51c06b3bb30a2a7abc871d75d2724e7edd820a600b0455adb6d2fad7a39d1ed3a84be538c0d535a011ea8c026578
 EBUILD virtualbox-guest-additions-5.1.30.ebuild 6048 BLAKE2B b6541f7ccd93d301d76515945533474f87e51c8b85d3434bf9b090b9e99ac4bdca083d19dc2408c37746c38b0ab169f3b103da12468cab2a45f848352367fbca SHA512 75b70e9f6c2c05d1c7840473e1f5b2d2764c12393832a8a9570f98c3b0aef88c39a44c30311ea7bfa4153b303addb25d66795d73bcff964407d2086568ce3d7f
 EBUILD virtualbox-guest-additions-5.2.2.ebuild 6152 BLAKE2B 5f146f8df88f13991d0332d5b6f573e240041b77450216e917d28773ede08008b3038d2d70644bcfa54c880030fddb299732086403e126acf2839ea84b89c83d SHA512 cb5772b2c311acd106a24358ca9516318c480e133bbc3dfd01f76aaab4adf215db37a1c38afdf70dc88c9ba7642952b20e0cb9e23acb419c1e447cfa40fa4eae
 EBUILD virtualbox-guest-additions-5.2.4.ebuild 6152 BLAKE2B 5f146f8df88f13991d0332d5b6f573e240041b77450216e917d28773ede08008b3038d2d70644bcfa54c880030fddb299732086403e126acf2839ea84b89c83d SHA512 cb5772b2c311acd106a24358ca9516318c480e133bbc3dfd01f76aaab4adf215db37a1c38afdf70dc88c9ba7642952b20e0cb9e23acb419c1e447cfa40fa4eae
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.26.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.26.ebuild
@ -1,221 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils linux-mod systemd user toolchain-funcs
-
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=VirtualBox-${MY_PV}
-DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.1.24-patches-01.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="X"
-
-RDEPEND="X? ( x11-apps/xrandr
-		x11-apps/xrefresh
-		x11-libs/libXmu
-		x11-libs/libX11
-		x11-libs/libXt
-		x11-libs/libXext
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libSM
-		x11-libs/libICE
-		x11-proto/glproto )
-	sys-apps/dbus
-	!!x11-drivers/xf86-input-virtualbox"
-DEPEND="${RDEPEND}
-	>=dev-util/kbuild-0.1.9998_pre20131130
-	>=dev-lang/yasm-0.6.2
-	sys-devel/bin86
-	sys-libs/pam
-	sys-power/iasl
-	X? ( x11-proto/renderproto )
-	!X? ( x11-proto/xproto )"
-PDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV} )"
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest)
-		vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)"
-	use X && MODULE_NAMES+=" vboxvideo(misc:${WORKDIR}/vboxvideo::${WORKDIR}/vboxvideo)"
-
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KERN_DIR=${KV_OUT_DIR} KERNOUT=${KV_OUT_DIR}"
-	enewgroup vboxguest
-	enewuser vboxguest -1 /bin/sh /dev/null vboxguest
-	# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
-	enewgroup vboxsf
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Create and unpack a tarball with the sources of the Linux guest
-	# kernel modules, to include all the needed files
-	"${S}"/src/VBox/Additions/linux/export_modules "${WORKDIR}/vbox-kmod.tar.gz"
-	unpack ./vbox-kmod.tar.gz
-
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	cd "${S}"
-	rm -rf kBuild/bin tools
-}
-
-src_prepare() {
-	# PaX fixes (see bug #298988)
-	pushd "${WORKDIR}" &>/dev/null || die
-	eapply "${FILESDIR}"/vboxguest-4.1.0-log-use-c99.patch
-	popd &>/dev/null || die
-
-	# Disable things unused or splitted into separate ebuilds
-	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
-	use X || echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk
-
-	# stupid new header references...
-	for vboxheader in {product,revision,version}-generated.h ; do
-		for mdir in vbox{guest,sf} ; do
-			ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
-				"${WORKDIR}/${mdir}/${vboxheader}"
-		done
-	done
-
-	# Remove pointless GCC version check
-	sed -e '/^check_gcc$/d' -i configure || die
-
-	eapply "${WORKDIR}/patches"
-
-	eapply_user
-}
-
-src_configure() {
-	# build the user-space tools, warnings are harmless
-	local cmd=(
-		./configure
-		--nofatal
-		--disable-xpcom
-		--disable-sdl-ttf
-		--disable-pulse
-		--disable-alsa
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-		--target-arch=${ARCH}
-		--with-linux="${KV_OUT_DIR}"
-		--build-headless
-	)
-	echo "${cmd[@]}"
-	"${cmd[@]}" || die "configure failed"
-	source ./env.sh
-	export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}"
-}
-
-src_compile() {
-	MAKE="kmk" \
-	emake TOOL_YASM_AS=yasm \
-	VBOX_ONLY_ADDITIONS=1 \
-	KBUILD_VERBOSE=2
-
-	# Now creating the kernel modules. We must do this _after_
-	# we compiled the user-space tools as we need two of the
-	# automatically generated header files. (>=3.2.0)
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	cd "${S}"/out/linux.${ARCH}/release/bin/additions || die
-
-	insinto /sbin
-	newins mount.vboxsf mount.vboxsf
-	fperms 4755 /sbin/mount.vboxsf
-
-	newinitd "${FILESDIR}"/${PN}-8.initd ${PN}
-
-	insinto /usr/sbin/
-	newins VBoxService vboxguest-service
-	fperms 0755 /usr/sbin/vboxguest-service
-
-	insinto /usr/bin
-	doins VBoxControl
-	fperms 0755 /usr/bin/VBoxControl
-
-	# VBoxClient user service and xrandr wrapper
-	if use X ; then
-		doins VBoxClient
-		fperms 0755 /usr/bin/VBoxClient
-
-		pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null \
-			|| die
-		newins 98vboxadd-xclient VBoxClient-all
-		fperms 0755 /usr/bin/VBoxClient-all
-		popd &>/dev/null || die
-	fi
-
-	# udev rule for vboxdrv
-	local udev_rules_dir="/lib/udev/rules.d"
-	dodir ${udev_rules_dir}
-	echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${D}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
-		|| die
-	echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${D}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
-		|| die
-
-	# VBoxClient autostart file
-	insinto /etc/xdg/autostart
-	doins "${FILESDIR}"/vboxclient.desktop
-
-	# sample xorg.conf
-	insinto /usr/share/doc/${PF}
-	doins "${FILESDIR}"/xorg.conf.vbox
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	if ! use X ; then
-		elog "use flag X is off, enable it to install the"
-		elog "X Window System video driver."
-	fi
-	elog ""
-	elog "Please add users to the \"vboxguest\" group so they can"
-	elog "benefit from seamless mode, auto-resize and clipboard."
-	elog ""
-	elog "The vboxsf group has been added to make automount services work."
-	elog "These services are part of the shared folders support."
-	elog ""
-	elog "Please add:"
-	elog "/etc/init.d/${PN}"
-	elog "to the default runlevel in order to start"
-	elog "needed services."
-	elog "To use the VirtualBox X driver, use the following"
-	elog "file as your /etc/X11/xorg.conf:"
-	elog "    /usr/share/doc/${PF}/xorg.conf.vbox"
-	elog ""
-	elog "Also make sure you use the Mesa library for OpenGL:"
-	elog "    eselect opengl set xorg-x11"
-	elog ""
-	elog "An autostart .desktop file has been installed to start"
-	elog "VBoxClient in desktop sessions."
-	elog ""
-	elog "You can mount shared folders with:"
-	elog "    mount -t vboxsf <shared_folder_name> <mount_point>"
-	elog ""
-	elog "Warning:"
-	elog "this ebuild is only needed if you are running gentoo"
-	elog "inside a VirtualBox Virtual Machine, you don't need"
-	elog "it to run VirtualBox itself."
-	elog ""
-}
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@ -2,11 +2,9 @@ AUX create_vbox_modules_tarball.sh 896 BLAKE2B 4153a8fa67cd8fe7187f3c4232691b1de
 AUX virtualbox-modules-4.1.4-pax-const.patch 2335 BLAKE2B 9d23df0a04e70765b0eb1ec123e7b835a8e3c35d5c89c08239cc3dedcbcf7a34ce49324ab607490738639a1b5d7febef9083ee4b6c3344112695bc2ee079081b SHA512 8f5ffcd53f34e616b895013660e269e6031837411471abf69711df4fd5d745299dcb08d361eda0979dcfde7d9aafa0d24c99fcc9f3875fbf35771945f6b224a1
 AUX virtualbox-modules-5.1.30-udp.patch 1239 BLAKE2B d49d96894bae2fdedc2b8a825c849a99ad0cf36a92cc4d89881ce72a0b7ebd53174f39e298c119670654932b790113fe7fbc3a3bae552f2c597cad20a370141f SHA512 f22e6c8edc360e0f97b207ba9a046042ef1898c10c724d9519badef004858720040caef12bffa1ed0f07517ae2d0b831973a0e4ef8ffb239a26faf62706b0618
 AUX virtualbox.conf 38 BLAKE2B 853f2ba0ac1627100241e778fa6c35ff4fc86e8c9c753f8aa23cb053ffacf966c131c5630d1fafd481d7b057acc3e9d6f8f1a22766db5d1cf61fffa38de7c01b SHA512 b61936fff57426d31efa6928eadb572cafe40a65d3e31a0eecb53dc784ba9d0a9e0ad5e419df74418b977f89c17873240c38e2ada95949e5252d879110d6094a
-DIST vbox-kernel-module-src-5.1.26.tar.xz 625384 BLAKE2B f3f0676854e7c597281c4937e2753a117844f584248c824bce2f931adb3f1ee234b71b60f701da7043916fe716c3973ede0f39d6614c60a483fedf34cc70d49e SHA512 c77e0d8dfade2abac95162e7e7a424be4875e44d43bcf2a13e0e50caa69f5fd0d21c77f03bb2cd4cbd5df4ab31e9fbd49ecd9220a49af8cd10081b960e014010
 DIST vbox-kernel-module-src-5.1.30.tar.xz 625424 BLAKE2B 00d33cad237af1f0d5b4dbea38f84e0327d10d97fc309a8c7536433cb4fddf3614e6de160646077040b4fdc6dd126cfa2250081084ca0243cc572d9f5e9d5dfd SHA512 8e2113584e63e2ace71b708dc77428fd09167a1bded12b47312a5a8f85ef448e17f76b4300dba4c8ec99d7f8cb278cef039c6282c676e35b8f200bafb5c4770a
 DIST vbox-kernel-module-src-5.2.2.tar.xz 633924 BLAKE2B 85307332f3b0eaea1832b357c4f44a90c38165caaf3dae5d073a92f04f7d1ddf440e8a53fecf2dab4f0179002051382fa4fe1af8be12279bfc921f578c1743a1 SHA512 ec513912567bf58f367f08e212a5d3b82e7caae5fec6985f2253ee9405907b567c8cbd2dea277ddef1344711927eb75525f95d6204ef07cb1325d22185ccb5a4
 DIST vbox-kernel-module-src-5.2.4.tar.xz 634212 BLAKE2B d8be416f958f672c2ab50b5197f708bc1febca292d5262eec710c07561be7de810fb1dfd5961ef9367c91e0ac1b6033419f85444471e8d40406d4ab860de2a23 SHA512 3c2113a8781cde1a44954267ee469db91c843305a5b1468b1fd346af3f3626a3d98c8a958ec0e255401f569f75e652dbbb1a85fd6cc6b203cf170745c630cee1
-EBUILD virtualbox-modules-5.1.26.ebuild 1656 BLAKE2B f4f00b5fc80875046f5339c4d29340eb4d14ecece2de7fdbd51c73f0c1928e5dcadc58737aec3cc157d698ffd279e62602855ebaa1e889b0597a7296fdaf5c05 SHA512 bdb8d8f9f6ef4db63fb6039b136e49d5e7e52cff9a6ed476ad404c81d161655d9458caa267c8705ed4bfb84bf1677622584973f6b0adb413601d57810fab6690
 EBUILD virtualbox-modules-5.1.30.ebuild 1739 BLAKE2B ee506a122a4f99f714d23f2ec8cf4c094d5bc9a591b1a6465110e78623944c1922dbab68bdaf388bffbc59cbf426a6c31cf46179a87e8e7fce5fe7f462d8e6c6 SHA512 3282bab435ac11bc356cb8aedc384c5686d8480dbec352b39e80331c488c1a8f8dd87e80dfa2ac778a95f345f4f706c297ed360ff3b5d41c6c67b6e07a16d510
 EBUILD virtualbox-modules-5.2.2.ebuild 1539 BLAKE2B 7373f5601523925aa857f6bfab1a9e02f5ad661268a35863ac517eee2f9a031bde56d2421781d7ecdde57d2e1d97a97f89ecde20465b75e9c08fb1d5d3f34e06 SHA512 2552d089f4bfaf70baee371235e169eb33706d293daf17a35f6ad810ad3eecd323a480863474a4d0908c6a0d2e1d0800daf4d5de326d70a4b59add75f9002f00
 EBUILD virtualbox-modules-5.2.4.ebuild 1499 BLAKE2B b5a34d365a0b3372c72b7c9a56e5a7ebcd86ab799731dca63b5e074c9010cd44af554add0cb5b0aa74dcfea7c5c7bd3f19bdbc152681f1c7fa43e970f8a8d8c1 SHA512 1a72712277d4517fa8dc6c5fad96032ef1792a3cea95703d7e66c43816e13e00c1ac232f3b0404e27726fcaa12ab7b6ea5006df76b5cc961043630b811acd116
--- a/app-emulation/virtualbox-modules/virtualbox-modules-5.1.26.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.1.26.ebuild
@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# XXX: the tarball here is just the kernel modules split out of the binary
-#      package that comes from virtualbox-bin
-
-EAPI=6
-
-inherit eutils linux-mod user
-
-MY_P=vbox-kernel-module-src-${PV}
-DESCRIPTION="Kernel Modules for Virtualbox"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="pax_kernel"
-
-RDEPEND="!=app-emulation/virtualbox-9999"
-
-S=${WORKDIR}
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vboxpci(misc:${S})"
-
-pkg_setup() {
-	enewgroup vboxusers
-
-	CONFIG_CHECK="!TRIM_UNUSED_KSYMS"
-	ERROR_TRIM_UNUSED_KSYMS="The kernel option CONFIG_TRIM_UNUSED_KSYMS removed kernel symbols that are needed by ${PN} to load correctly."
-
-	linux-mod_pkg_setup
-
-	BUILD_PARAMS="KERN_DIR=${KV_DIR} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
-}
-
-src_prepare() {
-	if kernel_is -ge 2 6 33 ; then
-		# evil patch for new kernels - header moved
-		grep -lR linux/autoconf.h *  | xargs sed -i -e 's:<linux/autoconf.h>:<generated/autoconf.h>:'
-	fi
-
-	if use pax_kernel && kernel_is -ge 3 0 0 ; then
-		epatch "${FILESDIR}"/${PN}-4.1.4-pax-const.patch
-	fi
-
-	default
-}
-
-src_install() {
-	linux-mod_src_install
-	insinto /usr/lib/modules-load.d/
-	doins "${FILESDIR}"/virtualbox.conf
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	elog "If you are using sys-apps/openrc, please add \"vboxdrv\", \"vboxnetflt\","
-	elog "\"vboxnetadp\" and \"vboxpci\" to:"
-	elog "  /etc/conf.d/modules"
-}
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@ -7,15 +7,12 @@ AUX virtualbox-5-localconfig 1553 BLAKE2B dc1e946e97eb6b19a99b5ecf34640ef09c4446
 AUX virtualbox-5.1.4-paxmark-bldprogs.patch 2642 BLAKE2B f8c25139dc58f6f2a9def4c3535457013a8f9ab9065d23ab858daede5d32b90a6387a0daab1fa39fad706f809799ba58405c2994c902d224cbf07118fe1af5b9 SHA512 40971ee2a2453cd830b118ee2d1d05468beec60b5c15fc36b2a01c30a454823bfc666149671f03ccbfd82abe1041e50c7d36d670da506cfb9b9faab9edcc83ee
 AUX virtualbox-ose-5-wrapper 3405 BLAKE2B 92001ed3397a22abb5955617451bfb78d1f1f62f9be99cf87c57c42d118abb42b9436a0a83736d882b34360c9f8e67f9a8adaeffe7e9a3456c4ddc93a7850e53 SHA512 96f9ab8e2a83b5aebbb66916cbca0a7af0e2d69285296fe87869f096149791e0491dec2408f21f7249b68d928eebe396ab710a4ec6b6d6bc9c67120d323effa0
 AUX virtualbox-ose.desktop-2 201 BLAKE2B 05fbf657e8c1d8ec46f1b88e681efd50a4e5ab2a0f32f3fd25ca956e1e9bff6357c69a96628e3eba26b01869b6dc596f68f739f9330fa3018c186dfa0fdcea06 SHA512 a678e237ad0451e8785f242ebf822b4f3b03d2e2280a62f71728f79bdcfc84d3465ee60cad90db75e64b2c89a1b0b224de00519728fb605df67ca7c9aee0874c
-DIST VirtualBox-5.1.26.tar.bz2 115915813 BLAKE2B c770420804fd0bcbe5582fccfefc55b6d69a603a99cc9ba26e72f6c1947a3e2bcbc5e9e1aa0185d544fb37b10db8233aa4c5cd14777138f63c2959a3ca5e6954 SHA512 680e9646a51a0a5923b3ded10007ee1c1e2a41c6d8a961d2b2540db6578bed2847154f4cac87e3cfe1118a62595b47c7df99da854f6c340e173b9eb8cacf2add
 DIST VirtualBox-5.1.30.tar.bz2 116510730 BLAKE2B fe1d9ea37aa33a6aa6a78aebb469e267b9412e96cadc0a5287c263e8be21fdd0c9035a03e31ca954bef99eb5c05416de2bdfde5a657daa9a61eb795815d33542 SHA512 6c44d9593f4815644a484b306e621fe7eca224002f85d89c00f2470300f2c78dbfe50ffda61d2c2465df14ca77c70a2ab86f1a05116feeee9f5833857eb18dee
 DIST VirtualBox-5.2.2.tar.bz2 118424845 BLAKE2B c918ff1d3989d2d94cec807b596b5daceece6388575f40c70b3581288be664e39cd0f0dae974516d1122110d5660185bac7bcf336418d8f44455290cafb52a7d SHA512 415956cfe987a20eb0a372288c29f0e388bd706a3b94ff69b92ef5bbf2e9aecd75761a56f5421ef97d165f756cd7fd46b9eaf16b74b7d2460b831d7f03aae7dc
 DIST VirtualBox-5.2.4.tar.bz2 118481693 BLAKE2B 874f5e65d97befaf72767626a1f3271a0b7c30f8dc998dc10aee9478039cecd14ce11c9c624ba596c09641aae9a41ca91ae33e5a82218bc8acd8cd32ebb727e1 SHA512 19cb168393098fd28ab2017a27d09a558721d57b31c5d3610deb68a17dfa7fd7ffe9ad7be18714a314724ab5ecb54e7ab5fb76183e8e89afbed2da79649e2798
-DIST virtualbox-5.1.24-patches-01.tar.xz 2708 BLAKE2B 6779a7ad1b013cf2e735817eae9785451c6a91e4a61558a650cfdc67d80b63db0eb33992a3207b0acc1e80b75caef14d9d291705ca7b3c96c4185c31e585e92d SHA512 0028e593818013f809831ac5a73eec63988c0aefb4b309fb3c928efbea8db8b8f46bd7c82f156396adc704f0567474df262dfe9bb6e09af0b2c23528fe2c6e2d
 DIST virtualbox-5.1.30-patches-02.tar.xz 2608 BLAKE2B 08b05a26622a7acec455f6d0dc72858f5f2758488e50d219f83c3d12606419d48e9d99302cde5a275929fe79af900c1b3ea3957fe9dfdaa952aaa0da9933291a SHA512 8a490f7cc44e40262fc47819736251c177adb635256794e9500f52729197c85211d5b0c0d000268089953a4c185872a8ba03c5d42df6b80f05eac8b81335320a
 DIST virtualbox-5.2.0-patches-01.tar.xz 2460 BLAKE2B d3f973dc7ee0557c360f801c3bf84065a7e7bc9960984398b8f86d71fab32c59774e970c6cf873be07bcb9666af168570e8a78705a5999b1fc5d863dbbc6e538 SHA512 b91278dd81a50e412f5a281c72949f591a1c53303080549b74b28763cab9e3948948afb0256e0453d17736683cca3372a8e9c6d63f02f3eff3ef92c2a1ea332b
-EBUILD virtualbox-5.1.26.ebuild 13854 BLAKE2B 31cab7cbb9711d56ded8c764ad520031b813a3340ca5855504f73c81f6f55305df8052b0870f732ac5fbbd69d3aa0a523baf8d6b83ab914513f48970806af099 SHA512 565ae4bb7ab2139ea3ab8ae80f613ef758d60d1fb77599334276d46f3c30ad3c0ac5a6a54ab3c5e5fb78bfafdffe169418e6ddd6c45890ff7ff7b2e13b9d6b2b
-EBUILD virtualbox-5.1.30.ebuild 13854 BLAKE2B 0ea8cc8370f5610eb59567ff9009f83ff336d956cd9b5514f09550a6f84ad0a97067be93e9f5f9d971570c8c1eca9deace412d8cc4f35de02517f6d69272deff SHA512 ba06613be809eb4539f743ac5dccb29e38df5b5d734f304a40c5700f1d377cfdaceb884728b1ed5a42545cf0e9f38da7c80980b286ce71b43eca783c87e24970
-EBUILD virtualbox-5.2.2.ebuild 13845 BLAKE2B 2cd7c3030520556b792c82c0517fbc0f8a724da4b2faa6dacdebb8cdf6f57282ec45a324615c5b927cb40e9d4f99bc519fee73f6f618de0cbdbfc6c6f0a27884 SHA512 d03cae82af1b6065411f0f124b8aeab674d3864eaa02bd4da8c29d0788369f0960ad54e26e98673cde70f554a3ef5bc755735bbf14de7b3fdfa37e9e404537f0
-EBUILD virtualbox-5.2.4.ebuild 13845 BLAKE2B 2cd7c3030520556b792c82c0517fbc0f8a724da4b2faa6dacdebb8cdf6f57282ec45a324615c5b927cb40e9d4f99bc519fee73f6f618de0cbdbfc6c6f0a27884 SHA512 d03cae82af1b6065411f0f124b8aeab674d3864eaa02bd4da8c29d0788369f0960ad54e26e98673cde70f554a3ef5bc755735bbf14de7b3fdfa37e9e404537f0
+EBUILD virtualbox-5.1.30.ebuild 13879 BLAKE2B 710bc0860cb92d07f23863550306e58ef464f6e1c57d125771b691a7caa88f0ee08ef0c6d56b3fb7390500354a823d944ca32b3f3e9fc99bd7db29b135752a11 SHA512 6ac9319d23c3dfeea7855ca3cb3f97662033d118e94d4eebe388b1d73235d274ebb12980d38d0b3030cf62c20119ecf21a5b0b1da6fb82fbf116ae7423a6bc0a
+EBUILD virtualbox-5.2.2.ebuild 13870 BLAKE2B a309ccb4e128a738c42afc4537d5e8c4a9430a4671c2963871a11eb7d762b867bda6f298f913bd6726aecda3db913798a21291a837b4bb1a551cbe55aea79546 SHA512 8d343dd8c173ed96a93f8f7fb518b048a3082cadf32fe949a6e4cdb48c272ad44e85c44df55c0dd9d12606ec0a89da83a8dd5429661a94e684f1f375f8bb8021
+EBUILD virtualbox-5.2.4.ebuild 13870 BLAKE2B a309ccb4e128a738c42afc4537d5e8c4a9430a4671c2963871a11eb7d762b867bda6f298f913bd6726aecda3db913798a21291a837b4bb1a551cbe55aea79546 SHA512 8d343dd8c173ed96a93f8f7fb518b048a3082cadf32fe949a6e4cdb48c272ad44e85c44df55c0dd9d12606ec0a89da83a8dd5429661a94e684f1f375f8bb8021
 MISC metadata.xml 950 BLAKE2B 98d5a25b631c928a86d8b716936c497aaba8f7bcbb0441c771acbf9998a89168bdfcb5d09e03d58e3403b3d90dd6acb611b1d47f4a0e4bf87a17c2f03ecc78ec SHA512 f09b74c1738a060749799ef652162824b40812de13558582cc660b57f1c379eb2d915ab53c1f2d55bb0c6cf4f917e0a6e55dabb5bde8b592a1eeaf34c3078363
--- a/app-emulation/virtualbox/virtualbox-5.1.26.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.1.26.ebuild
@ -1,459 +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 flag-o-matic java-pkg-opt-2 linux-info multilib pax-utils python-single-r1 toolchain-funcs udev xdg-utils
-
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=VirtualBox-${MY_PV}
-SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.1.24-patches-01.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
-HOMEPAGE="http://www.virtualbox.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa debug doc headless java libressl lvm pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
-
-RDEPEND="!app-emulation/virtualbox-bin
-	~app-emulation/virtualbox-modules-${PV}
-	dev-libs/libIDL
-	>=dev-libs/libxslt-1.1.19
-	net-misc/curl
-	dev-libs/libxml2
-	media-libs/libpng:0=
-	media-libs/libvpx:0=
-	sys-libs/zlib
-	!headless? (
-		media-libs/libsdl:0[X,video]
-		x11-libs/libX11
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXmu
-		x11-libs/libXt
-		opengl? ( virtual/opengl media-libs/freeglut )
-		qt5? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtprintsupport:5
-			dev-qt/qtwidgets:5
-			dev-qt/qtx11extras:5
-			opengl? ( dev-qt/qtopengl:5 )
-			x11-libs/libXinerama
-		)
-	)
-	java? ( >=virtual/jre-1.6:= )
-	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:0= )
-	lvm? ( sys-fs/lvm2 )
-	udev? ( >=virtual/udev-171 )
-	vnc? ( >=net-libs/libvncserver-0.9.9 )"
-DEPEND="${RDEPEND}
-	>=dev-util/kbuild-0.1.9998_pre20131130-r1
-	>=dev-lang/yasm-0.6.2
-	sys-devel/bin86
-	sys-libs/libcap
-	sys-power/iasl
-	virtual/pkgconfig
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	doc? (
-		app-text/docbook-sgml-dtd:4.4
-		dev-texlive/texlive-basic
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-fontsextra
-	)
-	!headless? ( x11-libs/libXinerama )
-	java? ( >=virtual/jre-1.6:= )
-	pam? ( sys-libs/pam )
-	pax_kernel? ( sys-apps/elfix )
-	pulseaudio? ( media-sound/pulseaudio )
-	qt5? ( dev-qt/linguist-tools:5 )
-	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
-	${PYTHON_DEPS}"
-
-QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
-	usr/lib/virtualbox/VBoxSDL.so
-	usr/lib/virtualbox/VBoxSharedFolders.so
-	usr/lib/virtualbox/VBoxDD2.so
-	usr/lib/virtualbox/VBoxOGLrenderspu.so
-	usr/lib/virtualbox/VBoxPython.so
-	usr/lib/virtualbox/VBoxDD.so
-	usr/lib/virtualbox/VBoxDDU.so
-	usr/lib/virtualbox/VBoxREM64.so
-	usr/lib/virtualbox/VBoxSharedClipboard.so
-	usr/lib/virtualbox/VBoxHeadless.so
-	usr/lib/virtualbox/VBoxRT.so
-	usr/lib/virtualbox/VBoxREM.so
-	usr/lib/virtualbox/VBoxSettings.so
-	usr/lib/virtualbox/VBoxKeyboard.so
-	usr/lib/virtualbox/VBoxSharedCrOpenGL.so
-	usr/lib/virtualbox/VBoxVMM.so
-	usr/lib/virtualbox/VirtualBox.so
-	usr/lib/virtualbox/VBoxOGLhosterrorspu.so
-	usr/lib/virtualbox/components/VBoxC.so
-	usr/lib/virtualbox/components/VBoxSVCM.so
-	usr/lib/virtualbox/components/VBoxDDU.so
-	usr/lib/virtualbox/components/VBoxRT.so
-	usr/lib/virtualbox/components/VBoxREM.so
-	usr/lib/virtualbox/components/VBoxVMM.so
-	usr/lib/virtualbox/VBoxREM32.so
-	usr/lib/virtualbox/VBoxPython2_7.so
-	usr/lib/virtualbox/VBoxXPCOMC.so
-	usr/lib/virtualbox/VBoxOGLhostcrutil.so
-	usr/lib/virtualbox/VBoxNetDHCP.so
-	usr/lib/virtualbox/VBoxNetNAT.so"
-
-REQUIRED_USE="
-	java? ( sdk )
-	python? ( sdk )
-	vboxwebsrv? ( java )
-	${PYTHON_REQUIRED_USE}
-"
-
-pkg_setup() {
-	if ! use headless && ! use qt5 ; then
-		einfo "No USE=\"qt5\" selected, this build will not include any Qt frontend."
-	elif use headless && use qt5 ; then
-		einfo "You selected USE=\"headless qt5\", defaulting to"
-		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
-	fi
-
-	if ! use opengl ; then
-		einfo "No USE=\"opengl\" selected, this build will lack"
-		einfo "the OpenGL feature."
-	fi
-	if ! use python ; then
-		einfo "You have disabled the \"python\" USE flag. This will only"
-		einfo "disable the python bindings being installed."
-	fi
-	java-pkg-opt-2_pkg_setup
-	python-single-r1_pkg_setup
-
-	tc-ld-disable-gold #bug 488176
-	tc-export CC CXX LD AR RANLIB
-	export HOST_CC="$(tc-getBUILD_CC)"
-}
-
-src_prepare() {
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	rm -r kBuild/bin tools || die
-
-	# Replace pointless GCC version check with something less stupid.
-	# This is needed for the qt5 version check.
-	sed -e 's@^check_gcc$@cc_maj="$(gcc -dumpversion | cut -d. -f1)" ; cc_min="$(gcc -dumpversion | cut -d. -f2)"@' -i configure || die
-
-	# Don't use "echo -n"
-	sed 's@ECHO_N="echo -n"@ECHO_N="printf"@' -i configure || die
-
-	# Disable things unused or split into separate ebuilds
-	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
-		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
-
-	# Respect LDFLAGS
-	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
-		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
-
-	# Do not use hard-coded ld (related to bug #488176)
-	sed -e '/QUIET)ld /s@ld @$(LD) @' \
-		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
-
-	# Use PAM only when pam USE flag is enbaled (bug #376531)
-	if ! use pam ; then
-		elog "Disabling PAM removes the possibility to use the VRDP features."
-		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
-		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
-			src/VBox/HostServices/Makefile.kmk || die
-	fi
-
-	# add correct java path
-	if use java ; then
-		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
-			-i "${S}"/Config.kmk || die
-		java-pkg-opt-2_src_prepare
-	fi
-
-	# Only add nopie patch when we're on hardened
-	if  gcc-specs-pie ; then
-		eapply "${FILESDIR}/050_virtualbox-5.1.24-nopie.patch"
-	fi
-
-	# Only add paxmark patch when we're on pax_kernel
-	if use pax_kernel ; then
-		eapply "${FILESDIR}"/virtualbox-5.1.4-paxmark-bldprogs.patch
-	fi
-
-	eapply "${WORKDIR}/patches"
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf=(
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-		--disable-dbus
-		--disable-kmods
-	)
-	use alsa       || myconf+=( --disable-alsa )
-	use debug      && myconf+=( --build-debug )
-	use doc        || myconf+=( --disable-docs )
-	use java       || myconf+=( --disable-java )
-	use lvm        || myconf+=( --disable-devmapper )
-	use opengl     || myconf+=( --disable-opengl )
-	use pulseaudio || myconf+=( --disable-pulse )
-	use python     || myconf+=( --disable-python )
-	use vboxwebsrv && myconf+=( --enable-webservice )
-	use vnc        && myconf+=( --enable-vnc )
-	if ! use headless ; then
-		use qt5 || myconf+=( --disable-qt )
-	else
-		myconf+=( --build-headless --disable-opengl )
-	fi
-	if use amd64 && ! has_multilib_profile ; then
-		myconf+=( --disable-vmmraw )
-	fi
-	# not an autoconf script
-	./configure ${myconf[@]} || die "configure failed"
-}
-
-src_compile() {
-	source ./env.sh || die
-
-	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
-	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
-	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
-	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
-	MAKE="kmk" emake \
-		VBOX_BUILD_PUBLISHER=_Gentoo \
-		TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
-		TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
-		TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
-		TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
-		VBOX_GCC_OPT="${CXXFLAGS}" \
-		TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \
-		all
-}
-
-src_install() {
-	local binpath="release"
-	use debug && binpath="debug"
-	cd "${S}"/out/linux.${ARCH}/${binpath}/bin || die
-
-	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each fwfile size ico icofile
-
-	vbox_inst() {
-		local binary="${1}"
-		local perms="${2:-0750}"
-		local path="${3:-${vbox_inst_path}}"
-
-		[[ -n "${binary}" ]] || die "vbox_inst: No binray given!"
-		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
-
-		insinto ${path}
-		doins ${binary}
-		fowners root:vboxusers ${path}/${binary}
-		fperms ${perms} ${path}/${binary}
-	}
-
-	# Create configuration files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
-
-	# Set the correct libdir
-	sed \
-		-e "s@MY_LIBDIR@$(get_libdir)@" \
-		-i "${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
-
-	# Install the wrapper script
-	exeinto ${vbox_inst_path}
-	newexe "${FILESDIR}/${PN}-ose-5-wrapper" "VBox"
-	fowners root:vboxusers ${vbox_inst_path}/VBox
-	fperms 0750 ${vbox_inst_path}/VBox
-
-	# Install binaries and libraries
-	insinto ${vbox_inst_path}
-	doins -r components
-
-	# *.rc files for x86_64 are only available on multilib systems
-	local rcfiles="*.rc"
-	if use amd64 && ! has_multilib_profile ; then
-		rcfiles=""
-	fi
-	for each in VBox{ExtPackHelperApp,Manage,SVC,Tunctl,XPCOMIPCD} *so *r0 ${rcfiles} ; do
-		vbox_inst ${each}
-	done
-
-	# These binaries need to be suid root.
-	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
-		vbox_inst ${each} 4750
-	done
-
-	# Install EFI Firmware files (bug #320757)
-	pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
-	for fwfile in VBoxEFI{32,64}.fd ; do
-		vbox_inst ${fwfile} 0644
-	done
-	popd &>/dev/null || die
-
-	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
-	# VBoxXPCOMIPCD (bug #524202)
-	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
-		pax-mark -m "${D}"${vbox_inst_path}/${each}
-	done
-
-	# Symlink binaries to the shipped wrapper
-	for each in vbox{headless,manage} VBox{Headless,Manage,VRDP} ; do
-		dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-	done
-	dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl
-
-	# VRDPAuth only works with this (bug #351949)
-	dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
-
-	# set an env-variable for 3rd party tools
-	echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
-	doenvd "${T}/90virtualbox"
-
-	if ! use headless ; then
-		vbox_inst VBoxSDL 4750
-		pax-mark -m "${D}"${vbox_inst_path}/VBoxSDL
-
-		for each in vboxsdl VBoxSDL ; do
-			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-		done
-
-		if use qt5 ; then
-			vbox_inst VirtualBox 4750
-			pax-mark -m "${D}"${vbox_inst_path}/VirtualBox
-
-			if use opengl ; then
-				vbox_inst VBoxTestOGL
-				pax-mark -m "${D}"${vbox_inst_path}/VBoxTestOGL
-			fi
-
-			for each in virtualbox VirtualBox ; do
-				dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-			done
-
-			insinto /usr/share/${PN}
-			doins -r nls
-
-			newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop
-		fi
-
-		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
-		for size in 16 32 48 64 128 ; do
-			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
-		done
-		newicon ${PN}-48px.png ${PN}.png
-		doicon -s scalable ${PN}.svg
-		popd &>/dev/null || die
-		pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
-		for size in 16 24 32 48 64 72 96 128 256 512 ; do
-			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
-				icofile="${PN}-${ico}-${size}px.png"
-				if [[ -f "${icofile}" ]] ; then
-					newicon -s ${size} ${icofile} ${PN}-${ico}.png
-				fi
-			done
-		done
-		popd &>/dev/null || die
-	fi
-
-	if use lvm ; then
-		vbox_inst VBoxVolInfo 4750
-		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
-	fi
-
-	if use sdk ; then
-		insinto ${vbox_inst_path}
-		doins -r sdk
-
-		if use java ; then
-			java-pkg_regjar "${D}${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
-			java-pkg_regso "${D}${vbox_inst_path}/libvboxjxpcom.so"
-		fi
-	fi
-
-	if use udev ; then
-		# New way of handling USB device nodes for VBox (bug #356215)
-		local udevdir="$(get_udevdir)"
-		insinto ${udevdir}
-		doins VBoxCreateUSBNode.sh
-		fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh
-		fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
-		insinto ${udevdir}/rules.d
-		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/10-virtualbox.rules \
-			> "${T}"/10-virtualbox.rules || die
-		doins "${T}"/10-virtualbox.rules
-	fi
-
-	if use vboxwebsrv ; then
-		vbox_inst vboxwebsrv
-		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
-		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-	fi
-
-	if use doc ; then
-		dodoc UserManual.pdf
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	if use udev ; then
-		udevadm control --reload-rules \
-			&& udevadm trigger --subsystem-match=usb
-	fi
-
-	if ! use headless && use qt5 ; then
-		elog "To launch VirtualBox just type: \"virtualbox\"."
-	fi
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "The latest user manual is available for download at:"
-	elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
-	elog ""
-	elog "For advanced networking setups you should emerge:"
-	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
-	elog ""
-	elog "IMPORTANT!"
-	elog "If you upgrade from app-emulation/virtualbox-ose make sure to run"
-	elog "\"env-update\" as root and logout and relogin as the user you wish"
-	elog "to run ${PN} as."
-	elog ""
-	elog "Starting with version 4.0.0, ${PN} has USB-1 support."
-	elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
-	elog "  app-emulation/virtualbox-extpack-oracle"
-	elog "package."
-	elog "Starting with version 5.0.0, ${PN} no longer has the \"additions\" and"
-	elog "the \"extension\" USE flag. For installation of the guest additions ISO"
-	elog "image, please emerge"
-	elog "  app-emulation/virtualbox-additions"
-	elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please emerge"
-	elog "  app-emulation/virtualbox-extpack-oracle"
-	if ! use udev ; then
-		elog ""
-		elog "WARNING!"
-		elog "Without USE=udev, USB devices will likely not work in ${PN}."
-	elif [ -e "${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
-		elog ""
-		elog "Please remove \"${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules\""
-		elog "or else USB in ${PN} won't work."
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
--- a/app-emulation/virtualbox/virtualbox-5.1.30.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.1.30.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
@ -316,8 +316,10 @@ src_install() {
 	done
 	dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl

-	# VRDPAuth only works with this (bug #351949)
-	dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
+	if use pam ; then
+		# VRDPAuth only works with this (bug #351949)
+		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
+	fi

 	# set an env-variable for 3rd party tools
 	echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
--- a/app-emulation/virtualbox/virtualbox-5.2.2.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.2.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
@ -316,8 +316,10 @@ src_install() {
 	done
 	dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl

-	# VRDPAuth only works with this (bug #351949)
-	dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
+	if use pam ; then
+		# VRDPAuth only works with this (bug #351949)
+		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
+	fi

 	# set an env-variable for 3rd party tools
 	echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
--- a/app-emulation/virtualbox/virtualbox-5.2.4.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.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
@ -316,8 +316,10 @@ src_install() {
 	done
 	dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl

-	# VRDPAuth only works with this (bug #351949)
-	dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
+	if use pam ; then
+		# VRDPAuth only works with this (bug #351949)
+		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
+	fi

 	# set an env-variable for 3rd party tools
 	echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
--- a/app-office/qchartdiary/Manifest
+++ b/app-office/qchartdiary/Manifest
@ -1,3 +0,0 @@
-DIST QChartDiary-0.6.4.1-src.tar.gz 72683 BLAKE2B adaa070e3befdc495ffb341d92390b0dc2ef5028c193a25a856c4a7b61b9ef407a8bdd4f8b28a6b44851ba4d409c4712a199ab2b1b04f4817191e00dff1dcc3d SHA512 8f804daf4fc8f61c0f584f667ac109771976808ae03f1d5fa9debe4bee3ce4010906fcb337b0007bcf0058ec83f5f9381187155c42ba118915ae64857982fd89
-EBUILD qchartdiary-0.6.4.1-r2.ebuild 719 BLAKE2B ee73a232f19813aefc58e5c64d243009f05e8370eedd8dfb981b87ecbf56a9fa8c413c86dd2f869db054133c672cd25f4b99ce64b4bf5ef578ae3372027e27d9 SHA512 281f2a56b730f3e090398116eb7403a14d9f94c8c335f2d7811cb4122d4158050bb4248f0d1b496856897522ee6f169a4e2c6b1c35506013600972bb054424a4
-MISC metadata.xml 331 BLAKE2B cdfa193ad6745abe4b0a9031536d0424950dffa998545db240ab30c024c9eb9e048087ba14bb440cf9f2cd638cda7a6cfc0fe4959715425692183f1cdff6c2d0 SHA512 7c9764228eb3be50b287c3cbd0bb653c1217e783f5e1634a9a44be8173a44ac2d2f5c864779e4c28d73572a01d77387d728fdb0bbca45d15acc8b88dfa327aaf
--- a/app-office/qchartdiary/metadata.xml
+++ b/app-office/qchartdiary/metadata.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>hwoarang@gentoo.org</email>
-		<name>Markos Chandras</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">qchartdiary</remote-id>
-	</upstream>
-</pkgmetadata>
--- a/app-office/qchartdiary/qchartdiary-0.6.4.1-r2.ebuild
+++ b/app-office/qchartdiary/qchartdiary-0.6.4.1-r2.ebuild
@ -1,36 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit qt4-r2
-
-MY_PN="QChartDiary"
-
-DESCRIPTION="Free Qt4 diary/agenda application"
-HOMEPAGE="http://qt-apps.org/content/show.php?content=99294"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-DEPEND="dev-qt/qtgui:4
-	dev-qt/qtsql:4"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_PN}"
-
-DOCS="AUTHORS CHANGELOG README"
-
-src_prepare() {
-	sed -i "s/doc\/${MY_PN}/doc\/${PF}/" ${MY_PN}.pro \
-		|| die "failed to fix documentation path"
-	qt4-r2_src_prepare
-}
-
-src_install() {
-	qt4-r2_src_install
-	dobin ${MY_PN} || die "dobin failed"
-}
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
--- a/dev-db/repmgr/Manifest
+++ b/dev-db/repmgr/Manifest
@ -2,4 +2,4 @@ DIST repmgr-3.0.1.tar.gz 91724 BLAKE2B be0ac2d54dbaae7a45abaa90ed1a851e22f05a1bb
 DIST repmgr-3.3.2.tar.gz 162107 BLAKE2B b1029297fa548241dc5d58bcdcffc0a6f749725eba2d3c7d2cb70b1f46a96b491dc27deb7baf8459e91eae9663df000a1713e80f05e7e0e39afc020b4136c9a4 SHA512 98fba8fc0d9074e496c66762dbec45734fe279f39c9c51adb3e66dca929ac37f66a609789c8c658545856fd81f5afc5b35f6b5e389e52bce8c04ce8c52acd8dd
 EBUILD repmgr-3.0.1.ebuild 1093 BLAKE2B b1bea77367d0485c85243730480fb97acc476606aa0db0587f1e3f2c70557456a489b84c88b70c17d14fb781bd27d505bd416ad57172ee0f56c2f47a67280105 SHA512 20196fa1f8819d40fb9eb2d72b76e4fe152ed1ac4ee4c35fd6b052af19ad8f3704888ffcae008869635661880a9e81076b012a2ecbd271e4553f74db1904930f
 EBUILD repmgr-3.3.2.ebuild 1093 BLAKE2B 8cce7fa79f044e9f5c5d459ee443f4d49b1dedb36e42e62670a39bb824d6e654dfd7c9c072a64dc40fa3ec9b89ea2c18d8f0e55954277877aabc89de781157db SHA512 6412c5cc1a9bde4fc6cac191146c0a529a67016690353b733547270198515b13ac56f9ecc081fb58eebe93b4afd03095001a9b4986e5f2ce55e3175c6893955b
-MISC metadata.xml 308 BLAKE2B 23716b246de778722fff1e3228bcda8ead9db5fbd4a3ddca4bb5a6fdf257c30c254e75b819c219ca1b994ed61940ef398497bbb9a51d88678c6602fa8dff642b SHA512 ac1061c181c1cd49f0c7e4e3769d46969132c10ff6d44c35bdb8d504b6e25acc80c5f19d43fdb3cd6226baad6703412e6b42604645e8b286270a8aac623eec5a
+MISC metadata.xml 224 BLAKE2B e14c5e39ad6d95b550997301c1ff5fe7b690fc3a146c1b0811fd4d0441c09622fb029728028b464152abd3bb36b467dd4299fccd03d666a8755070b90e99d107 SHA512 823068733b2edd6bd6d3d211f2ec383dbc3571bb4f9a57fd0dd0f48633a99e90e4ee979cc82e9a8aca6667b0ebe6a66c1c76551dce88ed25f163ce9a25a9cd41
--- a/dev-db/repmgr/metadata.xml
+++ b/dev-db/repmgr/metadata.xml
@ -4,7 +4,4 @@
  <maintainer type="person">
    <email>robbat2@gentoo.org</email>
  </maintainer>
-  <maintainer type="person">
-    <email>betelgeuse@gentoo.org</email>
-  </maintainer>
-</pkgmetadata>
+  </pkgmetadata>
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@ -13,5 +13,5 @@ EBUILD php-7.0.25.ebuild 21560 BLAKE2B 4898540287e3dd350526f9f13c6e066795dc3ab18
 EBUILD php-7.0.26.ebuild 21569 BLAKE2B 18f434e838abeb4a288c6585ce0c31e2ffe3319e780c8bc1b6e3ee8bfb8779a2db9a4dbf1775e6be8c08e7c36a513a56a298ddce773857568b4fc904cc40e30c SHA512 73e213711ad2c1aceed3656978f4ab185197bf1632462b2737154701342e12d67534da445f48192c617c3f94ad7cfb465101a2550541a09a65bab2d7e7706373
 EBUILD php-7.1.11.ebuild 21443 BLAKE2B a6da3a5efbcae6b3d33d6c40e430137536ecee35d7ad2a2eb47da71041092037edf92f69ab1d642dd5b759619eb37fb1a44425d49284f3230f66cb59e85d968e SHA512 f62a2592c57d0c6641df2ed3388aa3a4fe1097e8f635066b7c3b6070b2e57e10e23f4ded9e3b79cee7876324efd0ca1feab13365eef9848457ca03cc6d7411c2
 EBUILD php-7.1.12.ebuild 21450 BLAKE2B 1b577b45db7242cf4b296452adc5e1d0f1bdea6b1d3c20d20eddb39b0a714487e0d029a88e310971ece6cd2b85b5df6458470db8d7ffa8cd124f59bc9e08d080 SHA512 c9a1438f5f997bacd9058c564ca07aaa072fa4171fb48787cd3cac144607628589e136d9978548c03753deec7b17ed8e11603536feeb88891fcbe91cb731c117
-EBUILD php-7.2.0.ebuild 21979 BLAKE2B 880f02d3aabce191172a4a908ceb9ffafd8a66303c7af09a2f8fbf7837a351b195ad605795c50d8cf3004305d175ed7072b617b36371751269aa131a623ae869 SHA512 c6eef90b55c49b2bb66a9874528c8b5eab8835383ad2df4181d7cd67112cec28647d183bd5f3a630041096afc35597fd31271ae570dd170439fbad08524a05b7
+EBUILD php-7.2.0.ebuild 21981 BLAKE2B 468a5929e9dcc312d105f85b8ee09cb6dbcc42b250d0994ee74ec480ddd6fc1d95e759cefcbc62cd7963d04980d4ad90e0f32a1681bb76dc30be97344acad866 SHA512 124fb90c89323f253c1e360a743bb2dcced06460a1a421b55c5abcd8e5d6cc6f529781f5188717294341d70cd6316cefb6e7cee63cdc7949bb59ec72d4f83868
 MISC metadata.xml 2439 BLAKE2B 7f3cb5f5eab3664c48b951bbf2cdb03b2ce5d119008bbb41dd2c59a34fffbac8c8911738b4988e7e58bf36a520f6c35f46e9383e6845747380109a2f2f3011a6 SHA512 5d0221b77317e021231a2c1ae1dc407dca0e7ad144f5648d9d1abf98434689d375b04c9c45795e38517ca3c3d6077acbe4ff79f3551b20adaeb06325e363ebee
--- a/dev-lang/php/php-7.2.0.ebuild
+++ b/dev-lang/php/php-7.2.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
@ -49,7 +49,7 @@ COMMON_DEPEND="
 	acl? ( sys-apps/acl )
 	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
 		<www-servers/apache-2.4[threads=] ) )
-	argon2? ( app-crypt/argon2 )
+	argon2? ( app-crypt/argon2:= )
 	berkdb? ( || (	sys-libs/db:5.3
 					sys-libs/db:5.1
 					sys-libs/db:4.8
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- a/dev-libs/blitz/Manifest
+++ b/dev-libs/blitz/Manifest
@ -4,4 +4,4 @@ AUX blitz-0.10-set-default-arg-value.patch 4809 BLAKE2B cc0b67bf45b9735520b23a89
 DIST blitz-0.10.tar.gz 3777276 BLAKE2B 0817a5189c0967c073a3da8fecef6159d53c058e93222bf03f9b33a51bc9b5a6a1976f94d8a6ca6f33ddcefe222eece011443fb2f29555ee2e156c24749249ba SHA512 04fb0c8735d8ae173e6e907bd04fd739c482b7816c25b7dfe58c8641b90c17321e9a6849ced73a04ca9cc55439070de1a1e395497887317b553b0550fa0a2462
 EBUILD blitz-0.10-r1.ebuild 1620 BLAKE2B 5ddd7fbac1cd92c40961180929f415dc41a33323781ec3c269d5111aca9d60a772a8daea69bb5c10debb71f5657ad9b4fb92ef3eb97f1bcd550bf401e00a889b SHA512 2979767087474edf5cd565c29a3889341a2693fc6731593e09df23babd9beedd93a1d8e31918fa2fbfa40752cbb1d7295edc8d95fa8b7868db6bd3bd4fce3692
 EBUILD blitz-0.10.ebuild 1556 BLAKE2B 7ccd37706a64dfd643d4d009b681b8eec0f7ccdf3b1abd2ab93f3b4052654131fc0d289ba92d13f54f2dd36901cf6247458d6f37bcdcaae18668babd8fbed5bf SHA512 94358c22d0aa0cb652a5372e962ddd35932f7e8cd6d52e86e397c8e8a3663b678aca4875580aea19f66092f454740e193bacc64e18b580dfa640d5dc786e7e84
-MISC metadata.xml 1083 BLAKE2B 24285aed586b34544bba6adea8a1a4bdacdfe5cc9f9e0e1dcb5f8fe79d9ca09ac2c1d1637d9575c9dca6eae5ba145239bbc0a0a5e303d817fe0c1ded4489ea6b SHA512 db7dcb78a97a5ed3486e8fe38ae19fa7f39b79ce0acd42c763d11aeee466ee6bc7de1b474897305711ab0a429cc6dcb2d9e71653ee75816fc59859816691f649
+MISC metadata.xml 950 BLAKE2B 9b19f47d88c5569d38de494da4e263c860bf1c19baf9193d190109d42b9c5c311a2d90a4796837f8f118f4c9b2929afa730a32030af7cbb8a5223c6c8dc86953 SHA512 9d38d81706a42f393c66b34dbfd292daf3e16556ca47c55039abaa1a6dfe18201a3420698a1a93310a1cb5f8c2ca6956737c9811aefb2dd79e95482c9cc9d91b
--- a/dev-libs/blitz/metadata.xml
+++ b/dev-libs/blitz/metadata.xml
@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>bicatali@gentoo.org</email>
-		<description>feel free to fix/update</description>
-	</maintainer>
 	<maintainer type="project">
 		<email>cpp@gentoo.org</email>
 		<name>Gentoo C++ Project</name>
--- a/dev-libs/libunistring/Manifest
+++ b/dev-libs/libunistring/Manifest
@ -2,7 +2,9 @@ AUX libunistring-nodocs.patch 287 BLAKE2B b351d572e702a17cc4b1df97f182b6fa5ca232
 DIST libunistring-0.9.5.tar.gz 3487957 BLAKE2B 31c345d503476467ac0178cb127d85d2af343bc7d65504600b2950d44e50996d84d77750cc89af643667568f1d01beb2742aba5122bd4e4a50ab8c8225f1cf63 SHA512 89404b8f0fde264c3faa4285e4717487f2b6c348fa9374ccff2251eb3db6dda208fe013056a22f496c1fb099abe7e79b72a203d15499c641e3ac48e7957ba1b4
 DIST libunistring-0.9.6.tar.gz 3565883 BLAKE2B 8cd9e05f78e37246036ae134ae7d6c570da46c04822f749297ffeec7ec529ad17cee22a9d9ebbf3f1e36398efde41714c3953efdc3859d3f1e454281ad591249 SHA512 244f4ef6343047d2dedfdbe536a7a29584a58f668a41ba3183fc86d2f167186acf120708e024e31551ee2f035b9bee35e9ed24a276a4de9359cf08aec198c20a
 DIST libunistring-0.9.7.tar.gz 3589989 BLAKE2B 5ba029be96adf3804e9591ee0c271f41111a9c48c773d50adbf2408577e98ddd06d54dc665d3791a835698012021384c9290da0e3ce3d331f20283462c6a3c75 SHA512 43cb60163299a781b57bca326ddeb6333cde0b12d274fcd2b176971c8080ee8868f8c11bf9c524596d3a56dc0213ed1d3246fb805db1de950257c3764eb34ae0
+DIST libunistring-0.9.8.tar.gz 3720294 BLAKE2B 873dbccbe869c9dd6fe72f17759aefadc6495f97ba26e2cc62a1d94c9ca966a5f35d8d40a480077b90018602abf04342de51dfd64a4034db2ef0ff8a0f102c03 SHA512 91c0da429cc13272bf94cc1afa2bcc6cb0afa2af8b9c05fde2c1cd3ed0f54c6571803c303e20579bba51600d0e63fe917b415ccbb3751353cd8310388dddb72f
 EBUILD libunistring-0.9.5.ebuild 795 BLAKE2B 145d00d7494f389ca53e39519541db49c39172a2938ce0af435d2446ac4eec21442f26c6cf49066214f938ddbdc05d566c94016f43c788cbf70b428059339e60 SHA512 6e1b1580c92232f461c186effcc67ee340a3b8b47eaa7361fe57532a4cf4f451c9f46375fb7b488cf113787270ad80d420be0742b552396f6849a714a88366e6
 EBUILD libunistring-0.9.6.ebuild 719 BLAKE2B 47f5e802086e99639a9caa845a37982c1cc62e4f873575c72ba6ba06372c9b4cc529b0f224f6cd9e26531dc3b82682a04c0a1b9900d636f6da51e0d760deb504 SHA512 2d057f8397697b6bb8212fc4ed47b44c09607f8e8cd44cebb5da617a1aa91c77bb29636fb90eb6969bd23906cc924d574f5a6a8e2f43cae85e336352427630a9
 EBUILD libunistring-0.9.7.ebuild 998 BLAKE2B 75ab1eb5ac3e5099677cfb03dfac09c9b1a4851754a5633d94de4c925c8f44b56ed23a06b4b39a6fb8b4329eeb0344887a4f1582fe77987670f27c4bf75e25b1 SHA512 fe39a9540299c3cf1d8538aa8eecb0f9824e67ea460d05abe458df6cc7f9ac0f8a239d944e2f1029566c8f26d610529ea90002beb6856e545e323945a3949bf0
+EBUILD libunistring-0.9.8.ebuild 1011 BLAKE2B 1dcbc1efc9937a5a225a1b26c25df2162a304f7fe1d6834adb47aeba2998ae0404449a14c59866deaf652fe860c50623a34edd82c683321c891212fe13a140b2 SHA512 4282f418c75273ceb2fcbf52109e460c60ac278e5ca126affd5d363b9d31f1abc74e5598fecedcce8c33300d9271b447dac962f23e8d8c58bd1901ca09849f6a
 MISC metadata.xml 941 BLAKE2B 8234694090eba5e3506623b298b69657ece0a7c84d04b7dae238322112a74859e8c7bfebe40877f172a449ab8dc2095edc147f01040c949c704a54fc7a606617 SHA512 f4a8e3611f2e109b281e5777a0b7a30e14b64393af8c320be8fd18f293b9b8e1a732061e0b6598da24547dc71f068efc8f397bcdbefc4b286084d8f72478d4cf
--- a/dev-libs/libunistring/libunistring-0.9.8.ebuild
+++ b/dev-libs/libunistring/libunistring-0.9.8.ebuild
@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils multilib-minimal libtool
+
+DESCRIPTION="Library for manipulating Unicode and C strings according to Unicode standard"
+HOMEPAGE="https://www.gnu.org/software/libunistring/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3 GPL-3"
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc static-libs"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-nodocs.patch
+)
+
+src_prepare() {
+	default
+	elibtoolize  # for Solaris shared libraries
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" \
+	econf $(use_enable static-libs static)
+}
+
+multilib_src_install() {
+	default
+
+	prune_libtool_files
+}
+
+multilib_src_install_all() {
+	default
+
+	if use doc; then
+		dohtml doc/*.html
+		doinfo doc/*.info
+	fi
+}
--- a/dev-libs/starpu/Manifest
+++ b/dev-libs/starpu/Manifest
@ -1,4 +1,4 @@
 DIST starpu-1.1.5.tar.gz 5209660 BLAKE2B 3caf313402a840b8196dc94b6c4f973f87a21878bcbfe1a44ce14218c02290c8701eb3829ce0b89f3029f768c7760ea94c4f307c850e6e42ec877be017c50b4a SHA512 e22a51c601c1997f6a9279e87b22a96f2b25a9c8bb4b715ee3a048ed8af638997610ba72c7b42f61d9401464464c57402feebc76368f9df6ca84fa1305baeedd
 EBUILD starpu-1.1.5-r1.ebuild 2118 BLAKE2B 7197f5bada5250292746379f45ef41bdf8c9d48caf76f91d9b4591863248256961f08276fe7808ca84a2699fc64063dd7f22bb4fedefc82ebff507d1c407fb72 SHA512 553d55a66ed6ce32aa0cd328ae5003daaf4d3603267f69aed67b442f79d4861c9f4b5f11c257e6f07be46dc85607b6f2177c1e393fa5957124e494920b963bdb
 EBUILD starpu-1.1.5.ebuild 2173 BLAKE2B 981d681eb1b75210b0e6088d88436e7d60f17e2ff52bbc51af4fbd7fc6757e349299e346888dd76f3f35a8795516fdb2745e7d2517b4e6a6dfc0324b8b2b2bb7 SHA512 d85b0e808edea0b80c88f44bcec9e34df726dff2ad2f9be89fbe1e446c8899e56ecb7ee0a68f07646a07f426fee9e1ba67f82e47052f64460ecb2e6dbf29553e
-MISC metadata.xml 964 BLAKE2B 76e6a1f995e1f6a9af27e68f9204908bc087823c20507b1a6634a2991865c763dac60697dda823906b7af765a868d10d459e1726a51b2715c846beaa11e5a8a1 SHA512 a5fa0a163d88cbd775453708965088bf7e941d3337800ed4760245fc64655ac1d31b3175066ae8e9bf251b9363251bdc3a4e7a410f98c332043e64d58de7a262
+MISC metadata.xml 853 BLAKE2B 5873820e19a10507aa381bdc5e80defaa2dac2e65fc923aff907c7c28795205c271b82f756c5255e64ec0147726b2a305573a49d0a7694bf583b59a3e1c5eddd SHA512 43b79ddb2dbc234bf4715ee5d7c7dbd78dd9828f1fbd930198eed2a8dea66ebc28d09c105d2d3fc0685ae8123496b360f20e11b4a199c99743373ad9774bc964
--- a/dev-libs/starpu/metadata.xml
+++ b/dev-libs/starpu/metadata.xml
@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>bicatali@gentoo.org</email>
-  <description>Feel free to update and/or fix</description>
-</maintainer>
+<!-- maintainer-needed -->
 <longdescription lang="en">
  StarPU is a runtime system that offers support for heterogeneous
  multicore machines. While many efforts are devoted to design efficient
--- a/dev-python/Babel/Babel-2.1.1.ebuild
+++ b/dev-python/Babel/Babel-2.1.1.ebuild
@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A collection of tools for internationalizing Python applications"
-HOMEPAGE="http://babel.edgewall.org/ https://pypi.python.org/pypi/Babel"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-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"
-IUSE="doc test"
-
-RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( >=dev-python/pytest-2.3.5[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# Make the tests use implementation-specific datadir,
-	# because they try to write in it.
-	sed -e '/datadir =/s:os\.path\.dirname(__file__):os.environ["BUILD_DIR"]:' \
-		-i tests/messages/test_frontend.py || die
-	sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Create implementation-specific datadir for tests.
-	cp -R -l tests/messages/data "${BUILD_DIR}"/ || die
-	export BUILD_DIR
-	py.test || die
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
--- a/dev-python/Babel/Babel-2.3.4.ebuild
+++ b/dev-python/Babel/Babel-2.3.4.ebuild
@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A collection of tools for internationalizing Python applications"
-HOMEPAGE="http://babel.edgewall.org/ https://pypi.python.org/pypi/Babel"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-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"
-IUSE="doc test"
-
-RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( >=dev-python/pytest-2.3.5[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}"/2.3-Fix-the-way-local-time-is-constructed-in-tests.patch
-)
-
-python_prepare_all() {
-	# Make the tests use implementation-specific datadir,
-	# because they try to write in it.
-	sed -e '/datadir =/s:os\.path\.dirname(__file__):os.environ["BUILD_DIR"]:' \
-		-i tests/messages/test_frontend.py || die
-	sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Create implementation-specific datadir for tests.
-	cp -R -l tests/messages/data "${BUILD_DIR}"/ || die
-	py.test || die
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
--- a/dev-python/Babel/Babel-2.4.0.ebuild
+++ b/dev-python/Babel/Babel-2.4.0.ebuild
@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of tools for internationalizing Python applications"
-HOMEPAGE="http://babel.edgewall.org/ https://pypi.python.org/pypi/Babel"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-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"
-IUSE="doc test"
-
-RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# Make the tests use implementation-specific datadir,
-	# because they try to write in it.
-	sed -e '/datadir =/s:os\.path\.dirname(__file__):os.environ["BUILD_DIR"]:' \
-		-i tests/messages/test_frontend.py || die
-	sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Create implementation-specific datadir for tests.
-	cp -R -l tests/messages/data "${BUILD_DIR}"/ || die
-	py.test || die
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
--- a/dev-python/Babel/Manifest
+++ b/dev-python/Babel/Manifest
@ -1,10 +1,3 @@
-AUX 2.3-Fix-the-way-local-time-is-constructed-in-tests.patch 1297 BLAKE2B 05a873821aab060c5ade38e587dcbe3f83819c68d82655875b8bb422a635436de8535bc48d6b2f696b562605901e07c1ba892336a500b413fdeb3e224f7b2939 SHA512 271219651c716d5224887de5ea2c1f49cba9d4a9f2177a3f902bf59cb32a639803db39cb5b4af4e4fc201d1188ca94d0a27bd0ec0a583562eb02bbfc263e4147
-DIST Babel-2.1.1.tar.gz 3437647 BLAKE2B 0007a2225e99e5643d36527d3b84f330df5e9010a4ef8e920da90bce7389a0504fc889fe6e149e756f51db2ebd77eff04c7e5c6295e01f4225bfef9d6e1de790 SHA512 ec7ebb8648101588eecc72913adc45c0593ed6ee5f10874edcd4b932959f9552edcecc8e2ec966dae6ef5e8adb23341f1a4f87ea2d9e6cbba57a9b8b0a352a94
-DIST Babel-2.3.4.tar.gz 6866920 BLAKE2B 2f4b5d33364e20aef2ef47fe606dd0d531fc00ea80556584d3493c4b5af497a096c45c79683405a878a64c119730789f51ddcb993ee75e403f0097878b95871a SHA512 1fdba01946e7a8ebe3fef23843e23707cd060b0a179d775e29f938318d824e8779df2852fb8bbd18f61fc47de33af5d988c509dc67f54ea4cb3a4a66767869a5
-DIST Babel-2.4.0.tar.gz 6607513 BLAKE2B 2936a0eb1ea0ecae827681f1a86e3fd66c4952c4563b1b5e01c81695a233abe59c2b63c4c2aa6c0e71934f004aaea459ad0ecee73aab0780c47d7d41b2ee00db SHA512 4e1341144dfb319c172a446facc47204c9b9f49972c8646b62e082975d8ec41c35e503e610d7114ef5346a5c073e87ed8d40a65a60d9540fb7ca947681cc0beb
 DIST Babel-2.5.0.tar.gz 6612353 BLAKE2B 85268f0226f1db019fb906da0dfbbc6b6aa199ab491e9d767c932fb5ca77cb6d86328ebaa9c6eb61fb8d28c8e566babd435cdcee9b900c3c680d0dfb49c2bcac SHA512 b24b74121695e0068fb28a6294d4b5b2065e94dcd62ca0d70c8fde3a00cb5ff111480505594460989c6f67a75935f55e153b1b493f917317d2c5ee0f0d7921fc
-EBUILD Babel-2.1.1.ebuild 1495 BLAKE2B ed244b2540d2dd2d3e710ba9d1f460f5770ff983f630392b28891c5535635e7cd80ec92b78d57865ed48ab7a7100979335b43be156082a414e70a7d1d4f12380 SHA512 85b81166d42016f337e903680a762f4eb7affc4eda2318b59cdc96552ba75185486eaa1071a82a13a60946e8a90fcbd7fb89cadfb538310bdd8fb2cd6c7fb5dc
-EBUILD Babel-2.3.4.ebuild 1560 BLAKE2B f0c4bd4d9dbea63742ef4d08baea9854cac7ccb9c3d03545db9dfc2f5034a2556aadbdc6610cd5430934b2ffc750cca507e9a4a3b12160356d9036948f5830bd SHA512 a88248213a2e4aaf0a9573b361fc1630546ffc2a2663dccba5ca069532a58196b05e144be534a26f20a11cc1b4ae3683ec42f035d4ae1bacaebf80c92221da7e
-EBUILD Babel-2.4.0.ebuild 1474 BLAKE2B e864707240604b5b75ef481cae5576ceb35df789066b19750271e20d6f2115c9866e7626f5d81dce9b140641389e1fd56fba01ff525511a0fc821bcd8067bef6 SHA512 1afd189043b07ad3881de87fd5c38c1432dfae22b4375457dc7135d420a4fd3e0f12062f7011828835ce580de81263865255c83ee25ecaf66e1742005388f93d
 EBUILD Babel-2.5.0.ebuild 1478 BLAKE2B da47fe484e7ba77accc70eeb238fe0fa4a6b019c5492fa38cfc1748e5bac99a4c2b5d5ccb523247bac9135e3239eb102465c702959d63c07504e558ea61adfc4 SHA512 ba5ca1a1b6f0d2c4fcb9cd99c2b884e1b2538e6da545cc3d7b5d20c2ae7b2e4aedcfd910ba128401a970215d21851a6919765008e37e38e4ad1e1fa38160abc4
 MISC metadata.xml 691 BLAKE2B 9e0ec2fb9848f2994ed990ba0e9de14963eac7f1847fe7918e64030af2c3189ed194775a9ae7c506cb923ca7421f309fda970a8c97cf3bf8d7feab55ac15045a SHA512 91b4f1fa5ceebae1ded51ef3bee9a5c47380709eb3ededd83f8cbb20a85c45acd0603fb8c7244910c15037036056047b074b79c5d6668f68c44d29cb507e76e7
--- a/dev-python/Babel/files/2.3-Fix-the-way-local-time-is-constructed-in-tests.patch
+++ b/dev-python/Babel/files/2.3-Fix-the-way-local-time-is-constructed-in-tests.patch
@ -1,30 +0,0 @@
-From 476515c2418039e471656f47efbfc43e5230c1fd Mon Sep 17 00:00:00 2001
-From: Isaac Jurado <diptongo@gmail.com>
-Date: Sun, 29 May 2016 10:50:42 +0200
-Subject: [PATCH] Fix the way local time is constructed in tests
-
-In summer time zones, the test for "get_timezone_name" failed because the
-construct used to obtain a local time did not deal properly with DST offsets.
-As recommended by pytz, it is better to convert to local time from UTC.
---
- tests/test_dates.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/tests/test_dates.py b/tests/test_dates.py
-index 3bb9e8b..b0d093e 100644
--- a/tests/test_dates.py
-+++ b/tests/test_dates.py
-@@ -624,8 +624,9 @@ def test_get_timezone_name():
-     assert dates.get_timezone_name(tz, locale='en', width='long',
-                                    zone_variant='daylight') == u'Pacific Daylight Time'
- 
-+    localnow = datetime.utcnow().replace(tzinfo=timezone('UTC')).astimezone(dates.LOCALTZ)
-     assert (dates.get_timezone_name(None, locale='en_US') ==
-            dates.get_timezone_name(datetime.now().replace(tzinfo=dates.LOCALTZ), locale='en_US'))
-+            dates.get_timezone_name(localnow, locale='en_US'))
- 
-     assert (dates.get_timezone_name('Europe/Berlin', locale='en_US') == "Central European Time")
- 
-- 
-2.13.0
-
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
--- a/dev-python/PyContracts/Manifest
+++ b/dev-python/PyContracts/Manifest
@ -1,7 +1,5 @@
-DIST PyContracts-1.7.15.tar.gz 89602 BLAKE2B 76cf500392bb06e649a1f6c5715709728ded871920e3e3a1e4fc1c239e04e0425e8d250638d9157db7abfbcd378a793cfa85481ac9f8e3a6740ca92615e4b845 SHA512 db52b0de04e28913068b072eb9bcd2913b121c65a975a2d5b27cb093f1c131aecb0c36360b4e1a34ec16890dc1055a4bd64f1a88e8f581b804d65536d878e717
 DIST PyContracts-1.7.9.tar.gz 61033 BLAKE2B 5202d39c91d7dff6e07058f3f7dcc29baa750f69ed9b4abb059de67f3be98e568270eb3d977a6e7a18f232880225fcc532fbd576e94dc3483bde9b8fbe68d526 SHA512 1db6491d4be3df96753dcdd6f85329d47409a2424177a52d1e35f5a1d58f671290d22d807b70f632f0376c86c58c093118f7223b7ad59893a85dccdb91d29f50
 DIST PyContracts-1.8.0.tar.gz 90577 BLAKE2B 988662274e3bbea1ede6d00f4a69b3eb23dad439f5355a9b0a2c5a2f76a6250254303b060ef720d13d9a297ded77f7713271a79a810227aa883dc6d4d46ea725 SHA512 7de933dc8b5992be670b4b34fce7d6f51769d3d2dd02a2400eff5991e9e686e36791234588d2dbdeccf437fd5d6abc6461240645e6d3f665394f390bb727413a
-EBUILD PyContracts-1.7.15.ebuild 1083 BLAKE2B 4c16c2a067f82d57a7f3cf70e5d8e19be7b4121520627235b951c471506e4c8b981b81f3a9abde4b6bbcb72542c67786fc8eb00be1be119822d8ba4f9ec218fc SHA512 078e6b88ac948424b846d3ed471ba4037158b3aa3602cefdc60a87869c22a9a12ef792f7f1737a1b459bc451c5b7b74d7853041d6e0e1082a88523400ca9cd05
 EBUILD PyContracts-1.7.9.ebuild 1073 BLAKE2B 6c837dd274562c95e7a4a3d33004415329c65a7f84c30b5702e21692980737400b8e43c229ae28193108d4b228695b66f9361d090935ef5724c781010960e9f9 SHA512 584c68b750dca3c839b5892b4d4324be67ee981f754c39d5cfdc3039a64793357c5ffd0f234a9f80867b1421f3c514f0a8d22d80cdfb66153b2148ad458a3d5a
 EBUILD PyContracts-1.8.0.ebuild 1083 BLAKE2B 724d18a880b8b0fd48cbe5078333c49ee45245fbfb915f58ceba723b6251b27bceb98cf00cb421bada88dbca4d89cc7e786a20bb16fba0e9192edd8490d4ceba SHA512 996ec9f99087c5333cb9a64c27ea588fa91d1ced155350d6778d408334b76783265a2034d8b3c27d51773e249b8dabe5e50bfed1533ef2201ff9188df8822ebf
 MISC metadata.xml 387 BLAKE2B e1a27603eeb8fdd909b3b7d8052c69b4f0c4aae087140d36e5b49ce470ee486706fa3bd6a8fea1354a50c17499157e540e3e9ed514802b9cb2640b396905b500 SHA512 b4c9caf597b04617af6bc61357be01e6687ba5b45258dc2f76bf02e3dbc126afe2f44e1298bf62ef502110a56cf6f0932fbe7b1a043a99a61a4d56a87ca17b27
--- a/dev-python/PyContracts/PyContracts-1.7.15.ebuild
+++ b/dev-python/PyContracts/PyContracts-1.7.15.ebuild
@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Declare constraints on function parameters and return values"
-HOMEPAGE="http://andreacensi.github.com/contracts/ https://pypi.python.org/pypi/PyContracts/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2"
-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="test"
-
-RDEPEND="
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-# Upstream allows tests to fail
-RESTRICT=test
-
-python_test() {
-	nosetests \
-		$(python_is_python3 || echo "--ignore-files=test_py3k_annotations.py") \
-		|| die
-}
--- a/dev-python/PyECLib/Manifest
+++ b/dev-python/PyECLib/Manifest
@ -1,5 +1,3 @@
-DIST pyeclib-1.4.0.tar.gz 6682441 BLAKE2B 284c7b7357b42e758878496dcf795c737e63579eca28d7bc8dc35ef055a693f5bee235e34778850bc373300da3da3f8fc78c4065aab5d59b3efbd840dc9e12a1 SHA512 849da9ad32e26ca4e923bc00482734d6431bdcf402eff6b0c5ead4264c7be9e8502eb0bea6e60fa8565d361d9d7d81e01e38fd3c85c4e87c4d6b8b30be328e0c
 DIST pyeclib-1.5.0.tar.gz 6682493 BLAKE2B 3f3a595b67a8e216b90c61f8119be6f40de0863a0d77c4e65c41e699aad0d9a5f1d621e8bb9510d78b9eb495acc5fc5af7178afe127780151b9be60ca246fbff SHA512 89831fc8b04a1488504b632f75da8f2f29bc6b4e33b35d0d4305b4d5ec4bc25c0e16d149580badb15be7dbf8aeb2bdebef81f78f7b7871233afaaf96823e3a3e
-EBUILD PyECLib-1.4.0.ebuild 604 BLAKE2B 2d6ae62e4a7010f82d7fb0ceb9e15ef259ebe8fc5e7101823117fa4384a1d2067fe834fafa9f5e73991e15078a9542fcaf4aabd69bfac42cba3f0512f02fb9d5 SHA512 ee5df1fa0a999108b737c1c0e9a247d049ac0eb1783e316f4d97d28321989eee86b2908db8e93207fda8b4dffe7736828d593627eeb8bf01ee725549889d9159
 EBUILD PyECLib-1.5.0.ebuild 604 BLAKE2B 2d6ae62e4a7010f82d7fb0ceb9e15ef259ebe8fc5e7101823117fa4384a1d2067fe834fafa9f5e73991e15078a9542fcaf4aabd69bfac42cba3f0512f02fb9d5 SHA512 ee5df1fa0a999108b737c1c0e9a247d049ac0eb1783e316f4d97d28321989eee86b2908db8e93207fda8b4dffe7736828d593627eeb8bf01ee725549889d9159
 MISC metadata.xml 674 BLAKE2B 82076810eced6e375c341ec804b814d8d9bbad8e02c22a233f1c7891d75e6af7afcb23e835dd49c366e50c56f715b1e8d45675504bb6080347cf826ee66eeb44 SHA512 864d9c85e024752e0060644f9feca3b0d81c6f64610ca60be06c3218e1efc82be66b24bb61b966de238ab6e9278618013f613693fa1fca082287d4f53b4f98e5
--- a/dev-python/PyECLib/PyECLib-1.4.0.ebuild
+++ b/dev-python/PyECLib/PyECLib-1.4.0.ebuild
@ -1,23 +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 eutils multilib
-
-DESCRIPTION="Messaging API for RPC and notifications over different messaging transports"
-HOMEPAGE="https://pypi.python.org/pypi/PyECLib"
-SRC_URI="mirror://pypi/p/pyeclib/pyeclib-${PV}.tar.gz"
-S="${WORKDIR}/pyeclib-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-
-CDEPEND="dev-libs/jerasure"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="dev-libs/liberasurecode
-	${CDEPEND}"
--- a/dev-python/PyPDF2/Manifest
+++ b/dev-python/PyPDF2/Manifest
@ -1,6 +1,4 @@
 AUX PyPDF2-1.26.0-py3-tests.patch 1452 BLAKE2B bdeb36156cf9b6eec975f0b92f85cb6794259081ec8766b316e94efdf90ddf4bd2401fe1954d87e841628aa90b0978e9899f7562c5c15d71c2c271c6e8537894 SHA512 434d1cb0fb934149054d16521ca414291cbb83618de1468a2a9e630e75fddad4c33c3ba254ae00315b2075faad333b9b027625adda3a0cf064df3366989ea399
-DIST PyPDF2-1.24.tar.gz 59891 BLAKE2B 6d36949a956b26f37ea9a5f1b5fe9be8cb0406dc9e461e8f54eb46ee28711d83746e6ed1cfdb6c051ac6eac70199cfe26c3611176ab73577dea88b5854fca1e0 SHA512 91a9338b0338eee1cfddc25dd0f21494f73696e630b08a71ff9195fe7b0fc77cf6c07b38a0c6aa4856536be6fe0a474c3b292c13fdd0187b62cb8848e69b29f9
 DIST PyPDF2-1.26.0.tar.gz 77556 BLAKE2B 8ce9b95165a3841154b6e38e24ca5a4db434ceef9c55fbf2d146b379586160cb985948e0feb7aed135f601535d034ef79ddc1af58a670b07ff7d3621907022ec SHA512 7b427f1d099dcd687a718fb8d86e6f677ad45257414c6367e4dfacd8dfef7e3dbe3816027359868764981f36a30721f1731b4c23cbe2f35cfab1c64fb290b034
-EBUILD PyPDF2-1.24.ebuild 530 BLAKE2B 3a97b6e818c7ff26286cb7a0825ec194e1ce6f90c5d47bba87d58ff754c1ece509db223193eb4bf2be7ea52959f8b418349082e6693bc760ea2ee66fed15fec8 SHA512 7cbc92890486dc3c906f0ef41f525ffa9a53eacae98fddbafd8f3d17d3893bc0179dd0ef1dcedfb60678aa20de90c41e5ec0e53c0fa8bd8d12aba3c78863a7b5
 EBUILD PyPDF2-1.26.0.ebuild 750 BLAKE2B 71043940d5ad08b3457341e4e12a99f4f2f12a733711898626b1b1a5bd8fae60c93857bf2947371fbdf56dcb7df02904aa769b65ad8cbea622fac601e02ea5bc SHA512 5cad2921a1cf55c56d3efaf02e9e6531aab4c62ef0ae4ecdb4e83a92301a72882a51aafe1799df307fbb12f7e3b3e9ad597e49bcad2add608c6ce335bcedf572
 MISC metadata.xml 375 BLAKE2B 70bd4053cc8b7a65a31c3480f4205ff4945af86675b5f58a22efd3d27947b40cf49591746ae90d314e24d69d44dce606ef32b2c6fd7fac8aa1d431c6256c6c59 SHA512 9da6355a60e212e6e5ee3ac1c5cd1c357b243ab3131b2f6d261a4039c6cbc67c1e375be8685c900c533a0273b017b6d4428c7521539b917a2c380f9435b3cefa
--- a/dev-python/PyPDF2/PyPDF2-1.24.ebuild
+++ b/dev-python/PyPDF2/PyPDF2-1.24.ebuild
@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to work with pdf files"
-HOMEPAGE="https://pypi.python.org/pypi/${PN}/ https://mstamy2.github.com/PyPDF2"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples"
-
-python_install_all() {
-	use examples && local EXAMPLES=( Sample_Code/. )
-	distutils-r1_python_install_all
-}
--- a/dev-python/PySocks/Manifest
+++ b/dev-python/PySocks/Manifest
@ -1,5 +1,3 @@
-DIST PySocks-1.5.6.tar.gz 9189 BLAKE2B 50833088e06bc3b4de5be7c0bd7ad7044f291a655cfb548e12353fdc1563750712f261dc6105343f6bed242690bfd9224e23b2e32cbc6672ed78496da7930eb0 SHA512 3255591864c532f9ce3c0304d7b33165bb09c0a332fb0d126f61315e98f50e1af0f792517533166558fe457dce2d08f2b320adf9dd87b58618e0941d72daee49
 DIST PySocks-1.6.7.tar.gz 282874 BLAKE2B 9e4ecf57f6cb9b7690ba68e21b3e52a535a08490b78ad5d8bd90384acf26f16e6a08018eaa7e91763b94182119217404b235425fce146af7e989c5e39e5e07dc SHA512 e49ce2f4ce23fd84ce30a62a5585af3c63980db46e7d427571d8fb8f6b85f4b6aeb37066863491496dd322555a5ce261123d613b8e5819dbdcef8a4e17e5dca0
-EBUILD PySocks-1.5.6.ebuild 495 BLAKE2B 9156c7ccd2004bfbdc73642a56a357da10b04e6b56f155f33f43625c9aed704a8d30756279337c27c053f0e1f337469549c567280cd424340607dfe95b0d9a11 SHA512 a3af1e5e7ce367a389ce73f7252623531911108d4bb6b5cd526b45d63acd1ffd332f103accfe6c51650c0d769ed8f215f2b27808e819206ed5eb6276504a2251
 EBUILD PySocks-1.6.7.ebuild 574 BLAKE2B 14dd042f02fc3a3e4b843eee945a5e4078bc8d8b88da4fb9d9099ec82b3eade8b35272911851489bc1d21df41d3e01a51db3c4cf0968c9630af21af94ee88e3d SHA512 fdfb0e14767e95243a160987cecafeb77a6daef62f03d7b0c45784970181ec97545548a6a0522c326e2f4b3a587f35afd597abaaec8ae420e6780dad408f06f8
 MISC metadata.xml 499 BLAKE2B 6eeb0c4905d8f0d6c2d276b36a74ac9e1aaf3f5066ba79ea3b821fa31440a46c4ba49f88be096850032cf8598f6abee09182d84a35345fa53e1001a05137dbe0 SHA512 ec9cc3e4f9a050f78cb0c073efd3698b47aee2ce14d438163b5037509a5d8076509b4954bec0afc7f1e05bc790f26a6a520bb671b1c8590db966456dcf53b9aa
--- a/dev-python/PySocks/PySocks-1.5.6.ebuild
+++ b/dev-python/PySocks/PySocks-1.5.6.ebuild
@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="SOCKS client module"
-HOMEPAGE="https://github.com/Anorov/PySocks http://pypi.python.org/pypi/PySocks"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
--- a/dev-python/SaltTesting/Manifest
+++ b/dev-python/SaltTesting/Manifest
@ -1,7 +1,5 @@
 DIST SaltTesting-2015.7.10.tar.gz 77163 BLAKE2B 974c0f336da7c7222501cce31e5ebd5946901337bc185b24ce6e3efa5780924894e4293a8fc80dedbc85ea3e442dd6c793d75d1a4094c5f4e6960a60f3a9000d SHA512 8f8979fcbb13ff6f56c67d726aaa95a5e9fb0e73338487b87d72acdf4621f327bdc6944f5e27baee46f15d3537c7b37321aa5535d1b6d4b88c79c0c72acfb099
-DIST SaltTesting-2017.2.23.tar.gz 91715 BLAKE2B 477f1c633842b48e084630bd4f4c18f9345a48c7755e024dc13d57ee09222e1317add5edfddb14541a513d257bbdf4a741c6003a409278a0c33bbfeec23ec116 SHA512 d45085463dadcce3ab91b496cd580c5d091d875258e791d7c9c60746d8c1367471aea6ea855551116f505a43afbead83d14a44e2f40f1acd0d55d5367bcccd03
 DIST SaltTesting-2017.6.1.tar.gz 90438 BLAKE2B 2d24dc88e8e352d027cf7bdf58a05afe7ec189c20312d821401fcb93fa1d2098078e6b3eb6e9bc86a7bca732b767553f1130cfedd93b91b8bc516fe72243cc1d SHA512 1d1a33385e9313450a17912440671567c957b74bfe6fea2e11921c8fde30ad5fc54b147b2c9d12763b946eac89e37346e1e5547fe310ee6a8bdb17ca601a09fb
 EBUILD SaltTesting-2015.7.10.ebuild 647 BLAKE2B c26dc3ae5911c67b3df0c9ebfcb961c0864d55f24a398d05bb0c0fbe99bb9ddd2b3abe7ed107c4f864f4c07907dab42c1688d4ac9a45af6b2613415f1e55d72b SHA512 03e3246de4ac6eaf1af587d4c9142c3ae6ee9b89e8791fcacfd2e3ff887d14da682250e27c9f29d614895ccb87c78908f175d59a7fd99b44cfe1f5437686334e
-EBUILD SaltTesting-2017.2.23.ebuild 687 BLAKE2B 6848659735f7461602a2fb88f4a95c02016412c37f6b4aa204ff0c371115c2b4e8788342a003c2bebcb67c65cc63df484599387bf98183cf60fc71d5b26a3f39 SHA512 d6dd18cf26f2c81555d180efb11da36254cf813cd489729e4b03225e5bf136fdc276aff1460be21669c7a15842ba210809a0bdf900df9ab34a607a66867c5984
 EBUILD SaltTesting-2017.6.1.ebuild 687 BLAKE2B 6848659735f7461602a2fb88f4a95c02016412c37f6b4aa204ff0c371115c2b4e8788342a003c2bebcb67c65cc63df484599387bf98183cf60fc71d5b26a3f39 SHA512 d6dd18cf26f2c81555d180efb11da36254cf813cd489729e4b03225e5bf136fdc276aff1460be21669c7a15842ba210809a0bdf900df9ab34a607a66867c5984
 MISC metadata.xml 440 BLAKE2B c1e25f228c59fc89508e0a67def40ad27d42f679a8ef63e2a64db91e2c087208ae37d929c28cecff704be813fab5e9365a274e7c33065cf652b9986555a450eb SHA512 66e2e15e61bff62daa00dd1462249b7631b213fb1abd1da2deca72114cd16d296cb7add9eaacad0851a31a9cab01311bb83a8ae09e9741e3b3401b22c054264c
--- a/dev-python/SaltTesting/SaltTesting-2017.2.23.ebuild
+++ b/dev-python/SaltTesting/SaltTesting-2017.2.23.ebuild
@ -1,29 +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 distutils-r1
-
-DESCRIPTION="Required testing tools needed in the several Salt Stack projects"
-HOMEPAGE="https://saltstack.com/community/"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-2
-	EGIT_REPO_URI="https://github.com/saltstack/salt-testing.git"
-	EGIT_BRANCH="develop"
-	SRC_URI=""
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND="
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.4.2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
--- a/dev-python/aioeventlet/Manifest
+++ b/dev-python/aioeventlet/Manifest
@ -1,4 +1,3 @@
 DIST aioeventlet-0.5.1.tar.gz 62371 BLAKE2B f9f6ec222649fab7e69694214af424992f19008572ad9639fdaeb480970ea5dd80a55b454dde07fe1fa87a06560e220128b02f7738a0527b6fec23d559807721 SHA512 b89d99c2ac1f59ed599f01bfaee6b1eb60fc7f3332cb64b7061e67b0c1de15c38b3787100c176995750b7f8debd04bc8651362c6c2d43beff6af35bc15b64204
 EBUILD aioeventlet-0.5.1-r1.ebuild 927 BLAKE2B 97e553a68efce31696537bb55fe6ed698c111adcfa6a30306151a429e131347745ea305e07110359d8266b55760360c036d0e9dd13288130a98b040ad7a33ffc SHA512 225460af14ccf66c75fc36d0c038dacfc75776ed6e0348dcb8e98751dbb819da24126491b90b9f77a2141f13b21d395643067868ce5da02aac84f78982bb1491
-EBUILD aioeventlet-0.5.1.ebuild 628 BLAKE2B aed89814739dbed1e087265b9c9b87acf0c275ba7b1a0ccf1ffb42ebef3b80e7fe559a6a398c4804473fd93fd1ad34576afcdfb748193068c00568c71d125208 SHA512 2d6da5b2e581fe304b875a5e6fd9f0a1d0019464b841e39b8d0aaf265d8af258beced65c8301ba468f6851b54195a608054a3959a2b66c76655dba4e7c5c65ea
 MISC metadata.xml 711 BLAKE2B f184bd1795c342943118a94ea27e9746d6c35c8dd7aee97d4315259677ba16cb563795704c16ecbf90093a042bde4db7914a8fe0cb7856ec2ba239521458dee5 SHA512 8d3f849a43a211485e664c422ef5cc290c80bbbdf027fa6c5a551ca1848103acc0b2ae81055f274a88f49c38054708036bc92aa44dd5b8684ed3077647ee3738
--- a/dev-python/aioeventlet/aioeventlet-0.5.1.ebuild
+++ b/dev-python/aioeventlet/aioeventlet-0.5.1.ebuild
@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="asyncio event loop scheduling callbacks in eventlet"
-HOMEPAGE="https://pypi.python.org/pypi/aioeventlet https://bitbucket.org/haypo/aioeventlet"
-SRC_URI="mirror://pypi/a/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/eventlet[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/trollius-0.3[${PYTHON_USEDEP}]' 'python2_7')"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
--- a/dev-python/aiosmtpd/Manifest
+++ b/dev-python/aiosmtpd/Manifest
@ -1,5 +1,3 @@
-DIST aiosmtpd-1.0.tar.gz 49930 BLAKE2B 7c8f845746b51e2b77f2ff00de2c88c3a090a4cd65e55fa69fc371f8ac5a2966c31e3e7184188a1b4af1f5c3d22b7af5655c5673d199b9920865ddf56c119a06 SHA512 874b3505dd35cbb176cba058a8816329eb4177db705b10c3883f88d76e3f587efc35543812fd36a03f453c8c1ee359bb3f0239d8a246908c5c17b59be134d933
 DIST aiosmtpd-1.1.tar.gz 50722 BLAKE2B c7d21eea7816a758fb69061c0f1c4c5dbb7bd28a6daddc436211e4d8066380847255af537904ad5c09badb813269d0bc4b54dbb527b7b0c717d498c9475c8c2d SHA512 b61df616f2e14d1da67ac05149543bf48b14a31d44437d9a1dd11b166b98b56220c00e7c55e18d4fd99872d724e23f272922dd3548150632a189d9cb9b652883
-EBUILD aiosmtpd-1.0.ebuild 549 BLAKE2B 14c6ffe28a888a76e22b11eee177a78de96cfc16a23776703b49eb3e43564b2a1ead75b5e8e24170ea8cd61a5b1b68ff1caa465077a39258af7b173f7b1e9c67 SHA512 7bac181a777c81f32a89b9a22cd62f0f5ba5b2cbb287e0677cbd0cb144ea478a201a60e6dae19cabbedaeb36d3b19305b2a3ceb53d15cd0cf006737b738da439
 EBUILD aiosmtpd-1.1.ebuild 549 BLAKE2B 14c6ffe28a888a76e22b11eee177a78de96cfc16a23776703b49eb3e43564b2a1ead75b5e8e24170ea8cd61a5b1b68ff1caa465077a39258af7b173f7b1e9c67 SHA512 7bac181a777c81f32a89b9a22cd62f0f5ba5b2cbb287e0677cbd0cb144ea478a201a60e6dae19cabbedaeb36d3b19305b2a3ceb53d15cd0cf006737b738da439
 MISC metadata.xml 451 BLAKE2B 71e452a1b393808879ead1ea59d7b7a7136a39810533db9a43e1da155724ae75ff4cdfa1019fdec699fc4d4a0b7fe2291af27877a60867a63c300d4b6f089e51 SHA512 15ade72252545bff264b5504ac70210b8f8a1fc9b816b9d00bc1fbcda685efd4f1cdd6dfdd01ec27888b59d7098c0e6f64d4781a8b9ba697f4613775d0b966a1
--- a/dev-python/aiosmtpd/aiosmtpd-1.0.ebuild
+++ b/dev-python/aiosmtpd/aiosmtpd-1.0.ebuild
@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_4 python3_5 python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="asyncio based SMTP server"
-HOMEPAGE="http://aiosmtpd.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/atpublic[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	rm -r examples
-	distutils-r1_python_prepare_all
-}
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@ -1,7 +1,5 @@
-DIST alembic-0.8.10.tar.gz 976028 BLAKE2B d9309b5ea4be7b42394e1273e3113f9eb1c181806fb21eb414f4b2102e8df25b4f123538c96891d28a9f7d16904b42f6a1980a2f7a93297d170d28dd3448d879 SHA512 28456eb41a2b2d0d870f34cfddf46c25ed01fd1ee99b1a3697e6c0c5369f49245e54db0d7232cc839cf03a5c48efb48a8b967586b3a81ba9462b485b6782a415
 DIST alembic-0.9.3.tar.gz 991744 BLAKE2B 2d18836fee1bd9a57cdc1b8f6159b9c1dc79b82a1bccd8cb62a597dfe47751992929630b9460e430be38bfd43d48cd1981858fa6b924a7283a48c12226867ef5 SHA512 1f39521a1cc9e1e8f8d344f2e48e1f656aed2ffda8e0608b9c5a9a7a1f0e4d16865ae0fba903023512a198afc70e72c683b0ff2bd1bc2e9ba6667009e940a63e
 DIST alembic-0.9.5.tar.gz 990808 BLAKE2B a8155d15a9de2acb7a2f01829a0d01eeae5a7981a72aaa95e0d9d53433f52d0695d7e5414dbded1e5d53253a5e2d1cef67b12ed6be58d901859f3eae137486c1 SHA512 7588a681a6cf50a58ad697cb879d465d259880a473647d598242609c6321a8be7f53fc0d9a24fe976c4c65750eb0acc1a8e60253d4ccda33c87319ac9985e8b8
-EBUILD alembic-0.8.10.ebuild 1350 BLAKE2B 23101d6ad1a7da8fa7d7ba90ee1193c03b38337ee2cfcfeb7033f22096496f2409a7767d5b3a1df69f7f815f15dde791e2459c7227cb0fd714404ffb70987a96 SHA512 0f35458bdfa151de6095bcc4e234f7014ff7b11ded3652b3faef410a025167cf3884da59a506435e6cff338d61e3bbed67b6c958adb6ace2771c0a08e5b9bca7
 EBUILD alembic-0.9.3.ebuild 1396 BLAKE2B 93319592ebc29ce633dd7517577c65c94c1046104b41e820a28925f335d964be7f3b8272d0f20c3d8a3c249a7678ed3bff470b437c85bc7e9bc2971d45e3ffaf SHA512 194f68fb4364bf625f414dfee1e3aff268f24f4d2505a0d201ebd466563a5e8a7a86a617a790eb6a369df078c8f7f3d9545978dd5a739aecebc9ff3bf5d6e19b
 EBUILD alembic-0.9.5.ebuild 1398 BLAKE2B 9a935aab7770383adb4e43139bbb2eed13247e44e236c2bd23315a77bcef44c2d48939c5e1eee602460540e3c89083b3670ac9b2ed20f3130d97795f90f7a6af SHA512 52e82d8a19e6112df9ceec510b35c0a7f5c46ba3e1e75d5a1940bc4292be510ec98604be584f50a44dd67d36d771ae9f398dec0b1f1c12ef34e1fcd2660b0b0e
 MISC metadata.xml 379 BLAKE2B 8fcdef99cd9d57757692cf72b6f43bf874b7657899197d754ad81866f77d0a48d0fdaf168eeb37ad29ec975ddd7533be90f1e9926de9faf1bb56c3ad4e1d7513 SHA512 809c3f1585e85726feefc7f8493ec83ee31a9f7aa99aacf82026742f278726ad960a63b40c701a1a2453d46fd64d8245b83f2bd7511b5cc077c44bc62dda3e83
--- a/dev-python/alembic/alembic-0.8.10.ebuild
+++ b/dev-python/alembic/alembic-0.8.10.ebuild
@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="database migrations tool, written by the author of SQLAlchemy"
-HOMEPAGE="https://bitbucket.org/zzzeek/alembic"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test doc"
-
-# requires.txt cites 'SQLAlchemy>=0.7.3' which is really both old and silly
-# because it shatters the testsuite.  If 'someone' cares to adhere to correct form
-# and edit to -0.7.3, feel free, and then pick up the pieces.
-RDEPEND=">=dev-python/sqlalchemy-0.8.4[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	>=dev-python/python-editor-0.3[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}] )"
-# For test phase
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# suite passes all if run from source. The residual fail & error are quite erroneous
-	rm tests/test_script_consumption.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	${EPYTHON} run_tests.py || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/. )
-
-	distutils-r1_python_install_all
-}
--- a/dev-python/appdirs/Manifest
+++ b/dev-python/appdirs/Manifest
@ -1,6 +1,4 @@
 AUX appdirs-1.4.3-distutils.patch 782 BLAKE2B fcb1553424c0d22f4b60702ed7f771897cbb6e3f39078169bd1afe24a5c5825d629a286e620f5692414cd3f2aab9c38ae5ee20c2a18baee540ca685cc40a385e SHA512 e23630772b76f1a339ee74354f74f5d25d7c07a16db2b5ce307dbfd33f665c187aef86d7b7ec9e92bd43a3d8363fb40686d2bf49c10baa3b2825c8835e149905
-DIST appdirs-1.4.0.tar.gz 14358 BLAKE2B de0248d7ca8211a287bb76f516d5ae5d3b3ac0a5c3e2060fe0fbdf3fa9131e6ab26d0b0d293cdec4cf86f26e852fad7534eb44c386797d18964232fe85239bde SHA512 a16fbad419e593acf1b58a3f8f893d206b3fc1a269757213a34d129e6fc39aa041efacb7964d326b82376373315357c93e85b272f374a096d9a63e73e3ce1dac
 DIST appdirs-1.4.3.tar.gz 9641 BLAKE2B edd7f6372e25279f6ba0f36cda595649cab7e69430e22bfdfd1bb5aa8d566a4a2fbf24c281adf80ab3eafea93f0f4f79b396688134395c3e5565476f24db75df SHA512 787f551ef5af355bbc77ffb3059553fab77614cce466b4145e4b55fecb8553d329f8748865fd69005d13451a9b11229a65721095a122db83a8433a2661503dfc
-EBUILD appdirs-1.4.0.ebuild 746 BLAKE2B f5d0a2b32c78382df027f26a8a9630e0b91d01a97053c733363f792e94a2e7b269e546aecc754cb45ca0bf8e6a7135cb734f5bdcfd90c89a552ba80b31c7f8ca SHA512 2c665d99c5767e12395d4e8f2efd65c5976c1e865d75d475e830cffb467d9be0d84b31004277d0967af57f1ade0bcd828c89087d6e48814ecbdffc9e81357408
 EBUILD appdirs-1.4.3.ebuild 1190 BLAKE2B e4ca960043fec64cc379571e9e9d26f0a56fe3ef893e2af78521116e16b89393d0b0a7d1f63fb2fcfe8e790e06a2b2412aae67c36e0cd10693cd2a54f6f67365 SHA512 8a1526f09c8445277a2bbd3a5819bc558d313ee233eefaca7c3391ee2b5e269b532717bc8a3d8657f5493df148f7766de6e9d886ffb96d45f2e7885d3366f08e
 MISC metadata.xml 742 BLAKE2B 4731940c3aa6e3e0616487d4600c77f31712455aa70eff1bb900ec121cb062e45e1551206b86a5716b49f6163612096cb5ab9e3cf693af2d1fedaac023de29e6 SHA512 c1e35e090d6e3af99b8879a8a553c89989b149617857696fccecb4ea0435979f547049db2cdb7c505b50c20dc9f081233990f6fc0ee05de8ee27c7629292244e
--- a/dev-python/appdirs/appdirs-1.4.0.ebuild
+++ b/dev-python/appdirs/appdirs-1.4.0.ebuild
@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Module for determining appropriate platform-specific dirs"
-HOMEPAGE="https://github.com/ActiveState/appdirs"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# api.doctests is missing in the dist zipfile
-# and the 'internal' doctest does nothing
-RESTRICT=test
-
-python_test() {
-	cd test || die
-	"${PYTHON}" test.py \
-		|| die "Tests fail with ${EPYTHON}"
-}
--- a/dev-python/google-apitools/Manifest
+++ b/dev-python/google-apitools/Manifest
@ -1,3 +1,5 @@
+DIST google-apitools-0.5.16.tar.gz 405331 BLAKE2B 9bd086a68e5787f6dcd426887bb5e0af23ac985f851471da61567266fe52dc254054f0f2fb49e08b461c9281a32c25a764a7b751e10fe6ccca13c2758cdc4637 SHA512 cda60ec21622368c67cc47900218ceaa4137e6d602ee5196f59dac82aa87d35382785323971cc7e4aedf9d69e0a1baf8017c5d941d05171df9e1d5eea15570eb
 DIST google-apitools-0.5.4.tar.gz 255413 BLAKE2B 549aca8a2ef41f5f6de408efcd9ad3dc3c27fb9d0ce6c2c93794bd89355b0ed19499ad602aa79cac88d4aacf3c4e2820accbeb3e9c156caf3466bc36d5b0a7ec SHA512 63953a3ce4e7485344f54434ae4e6de75e4ca1ca380858143735b02560a5ac808d5f2ffed346b09402c156632a34ea1ded27d152538a98ec40981230f7d38764
+EBUILD google-apitools-0.5.16.ebuild 772 BLAKE2B cc645f6a373240dfd8d9eb5ecd3206604e99cec1477b54b0e343732b99a5e0e4ea8f21577d4c6498a1e9a7a8486cf3f82693233e7463b6737cbe540224ddd8ad SHA512 025f4583be50f927853dd96e2b6f22f840c6cb4301636297c3eb3917065509a2cdfd49b89a03b9caf0cab56ac517187b8cbb91759a329acb6a85869437a5f7f3
 EBUILD google-apitools-0.5.4.ebuild 770 BLAKE2B f073c844f94e9cf8527e5d3ae847e084ddac6499796cbdac32a8adc4b70751e20e3a16bf7453f985a70f62d5b7699a8be522162a92ba8e14d6cae13ebf3baa01 SHA512 5b441733cc1930ecc8cb571b87f78b13b848700fe299e64b0b4fa6ae10b7b4d74490aad4687bf306aec8212468654fd9fed0be66a64f90fb13ce4318fa9feb2f
 MISC metadata.xml 330 BLAKE2B cea2ae09b3468b95764b84c8891b9840e918db4961a77f4d514a4c15a33248a011b79f235728883e31a968c69a07c436a31a282f1e4a2baed2cbb2c7ba3c4982 SHA512 a4b6c01f3d8c411c5e96b911585770af30c8a1f262e92bf01748447111798a8e6ede7aa5979f16c3cf7068b3f158842023546e234049e2345f1a2f2891e51296
--- a/dev-python/google-apitools/google-apitools-0.5.16.ebuild
+++ b/dev-python/google-apitools/google-apitools-0.5.16.ebuild
@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library to manipulate Google APIs"
+HOMEPAGE="https://github.com/google/apitools"
+SRC_URI="https://github.com/google/apitools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
+	>=dev-python/oauth2client-1.5.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/google-apputils-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/python-gflags-3.0.6[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-18.5[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/apitools-${PV}"
--- a/Show more
+++ b/Show more