Sync with portage [Thu Nov 29 10:10:54 MSK 2018].

2018-11-29 10:10:54 +03:00 · 2018-11-29 10:10:54 +03:00 · 195486d162
commit 195486d162
parent e36e749925
716 changed files with 4733 additions and 9839 deletions
--- a/30
+++ b/30
@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512

-MANIFEST Manifest.files.gz 28804 BLAKE2B af9cde796d0b001ad568d2f58e2e870c6c452dd04c94c079894f44b6441fa9643de7a0e3730f85a21a9d837dac085a172a23a1316e17f71d1465441a12be16e4 SHA512 bc237781d36df724417265a1f1f7ad93c876b135591d5189ae9b22f141f5339baea1a196cd445a47b619eee78464d07bb533e0dc90f8c6d143eecc4ed3ad9b85
-TIMESTAMP 2018-11-28T08:38:42Z
+MANIFEST Manifest.files.gz 28842 BLAKE2B 65f2b08ef951b3cb98d4b6ac7ad356681a22b17df3d499ac9e321a826d9e72d8963cb7fcd3f4fb7bf642c6e4126e167555175afe3727571ffc691bcd188db79e SHA512 c1eb9c59e66f692acb6871dfe47591fa6b7db6f152ba5b45905bc04e4a2323bda756ab78963a624b7beae1c1d8c018b285aef753cb6456155d7b698e8ef63a9e
+TIMESTAMP 2018-11-29T06:38:37Z
 -----BEGIN PGP SIGNATURE-----

-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlv+VBJfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlv/iW1fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCJ5A/6AnmQ1ONgR3BQxui4cLd7A+42Ws6Yb01EB89XM9hSWPJRfQWCiuG6FLyA
-vIQFGhy87ZLE2MdatAoCuyVWBdiy2LHMC/D6wyvS0WppS+C8+yeNeaGMlfYXXSuV
-Vol2b4rvxAyieAN8VYK65xjp7lw7UL9f+EsbwCkGSzUX+BvQQ9nalCcrXEy2YCvC
-2goRi/ZXTxx9VyPUvecj85a50Z1AuYwk/q1RiwUgVBpzUCKHIZTJawpoNKE3XeTt
-UYN1AGYcfGgPA9jx+CwfVqadbcA/7Gda6JU7CAV7JB1sHHHG+vk+skr2DixhyxLl
-O5giO2HmcsEF7+uxVLXMwStl3H+PNAQPuJW/4D12O1jeX1P95FH8rqDI6eJ/TpU6
-O3VkfMsujQJNa05v5+Bi6HR5HDmqfiWhnnRLwNKgEohtsJZihJAtp5UGKMR/LQoZ
-IIxXNtzzMf5E4p29O+pkzVnMJ7SzVcOxlBs4ALmTcWb3OQcVAiDEJiPBnQLhKmKZ
-zTufJiftBy/U3NJxMMdGQwizupjUiaHVgrxpjNfL/YeLt5hekq8xt4so9aNuUzAh
-hKslYwIjYvUW41T9JVOEuDKt4nhY+gXMNt4Yavh/XM01KOlTfwTX69yH20G0o9LQ
-oK93KXmAV/RGrBkWUWu9pe9sURlvnW1C+uSE/uNeblyPWs1AVi8=
-=Scxs
+klBvXA/9Gry71vqLZC7RwguDtXMmwGAQ4RedbrSwCKR/xLg71jgPOJz2llBJAglb
+3TlYKtTmngeAJqkFQ5IxaSRWJGevVmO3jelWlymfkYyABWB9yXXtQTpmFfVRzfMd
+6Nckqa2DlrAvIFNgAhz71xk1LdoYWdJXKYjCpkXNisyDvMdPFkFcYsFHzmxlO2eS
+k0zFyKkt242rGr63gzVC+VWZ8/lPmMRPrw6hASXurUOrpBEOSK8FiZtMqlwF2d1X
+hYemHW8d97cMm2MgEMeQh0D6rafiEXWLsBKfn07yFg+uOSziKQoAwgR8yNy3ase9
+535QuwAAH1SGhWI4T1/riKiL+zRfGbBOgoJJwV+xDTKoItkenLVNhiSrUCvlS3Y5
+F1UIdeu7DYp2vO7ngHJF4cofDVpxHwwXWR8xI15+NdyX+x75fHsdSGfjVGNKo98X
+TQwdepBmyR/3NSUXL9OKtzY+/s5YJ+TTxAon2mlkKqQwQ5rO1K6LRrcBXQeDx3iL
+fvsIqTDyCM8swqxI/W5XDVvCJ2aQkeDHShhIq24fASggjoxe1/xrSyyrbbqdz8EY
+njpspzYKhhyIcpTe2+CLgEg0MwG6mVbWgrPVpQr391XBI4n2OjCdf/FBzNLmiExP
+TR66CxG6GmdfJV7fGQEbnkhS5+jsMIcfFnJmto+9VN4Sq9VRJl4=
+=n6ZT
 -----END PGP SIGNATURE-----
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@ -2,7 +2,7 @@ DIST sudo-1.8.23.tar.gz 3150674 BLAKE2B 11b1c7bfa372005cda8baf651c4662f6fd15e94c
 DIST sudo-1.8.25p1.tar.gz 3189951 BLAKE2B ebfedaad62e60f625db8c46a5c8f19977a5ec0a86bab3b34d91096c08e8b8ece056ba312f9fecd4cdd704fc17d49a36681b41cd40269df7c67cd66d80c0d8efb SHA512 b1445be688d3c1dd7efbdfab68977a7a9b6fd6887191dc99ca717117eec0a550492642556cd55ca5873d054ddc5ccc2b87b2c34602e1ffc729ab6fbc4e523a72
 DIST sudo-1.8.26.tar.gz 3286368 BLAKE2B 8df947f3dfa32081020b8a19921ea5daf6f9250c1ae34aa29900e85e80669223f28573217cd7e0a28393c6f30aa2117347014aa0cb554f2b85632e335ae790be SHA512 f5596cdf753ffa54f651bb30126e690640125b2ee54e8022f3740bfbe2e5a23e1bee86ce52879e863b9386babbbcf33d3e2882c573995a7d4612e9eea14d8791
 EBUILD sudo-1.8.23-r2.ebuild 6366 BLAKE2B 54ac988d6be3e7e93dc13a45ada40a627e3ffeff4515d181a18ea9b2ad411d4c2a9e107fe718217668033bedec23e57216d4295d0df12c40ff5871c3ae9f9ec0 SHA512 3e7b3f21c550724a6ed048b0639d2630015c401dbe8c51d31310a26394b1a371ab18e438dc13357ff82b05715443f24f6cb42b1daac7ec5cc9d3776d6cbc96d7
-EBUILD sudo-1.8.25_p1-r1.ebuild 6420 BLAKE2B df52bbdb79039a404432aeb51f425f5b793f4f528c8f5df873076d3169a3c7c91bdbaf15045995c0038c94f7f979147fdf9dd710452cdfa8bffc4b3386b316fc SHA512 788ee83a8684e2d6621afb976f31dd58466ea2f49499cbf4626fb7c657a51d299c747c0f1fde99e81fc6c18f8c5d836e9963346a7de1a37ea56be3a3d570cbb9
+EBUILD sudo-1.8.25_p1-r1.ebuild 6419 BLAKE2B bca34e2c44cb05413e944fbd404a9eea11437f0bbdd2d19277ce944549139249f35e9035e2e26db166284bfc119c72f0a49e360860b6a97e3436b1f975199dec SHA512 20194f0df5182f0d38d5ce2b021abd1688abb5b7fc86fe1f62c1301880922f4afcea10b5afb83e1a3a116075a311964c81a8b14de72a83e4927ba3d34117062e
 EBUILD sudo-1.8.26.ebuild 6431 BLAKE2B 7fc4cf65f44a71e5d7af3592b594a1453ac35b36d9d78ac34be974331b181ae4819a52fdc5616f501a28c2e14c6b0db999314ed8711fa97984b9eaa73b70aa3a SHA512 f5086673217867bd68ba1af5feacffee0f0c8232502d289fb187f0768ad4044a013b077e647202a1a7e3128e79df1a4d664293663c64afb4ab5a7fd1bb420ddc
 EBUILD sudo-9999.ebuild 6379 BLAKE2B 9300c549acd5a013d3cfcbc0ce2fb0ae4375cf9858928dbc92f2fa7d1cb2979f19a7ec43026dcfab87a51bd87ce0f886030426a431c7acbe3bec3715b6778523 SHA512 f1c124e5658fd55d7bbb84b9d06d0cf123479cf96b1d95fae610d36fa583069d7ceab30b59116da18a71f3dc822aeef75bd099f93ac0f2e0fac92f0bd491ae8a
 MISC metadata.xml 1060 BLAKE2B 9d18c75cd15621433e2391bceaff27f7bafcf9fe39691b62ee040e894055193eb1d68acef48b467244978dcac79bc1bfb20af11952f641eab75104b2350b3d7c SHA512 e229a2df28f8bb87efb05a2980860fc37f8e324633444e26d9eb303397e16ca12e9e17ed6939e8e8044f03ab45eda4cb0401e38fdb9409229fc99a64c6da007e
--- a/app-admin/sudo/sudo-1.8.25_p1-r1.ebuild
+++ b/app-admin/sudo/sudo-1.8.25_p1-r1.ebuild
@ -23,7 +23,7 @@ if [[ ${PV} != "9999" ]] ; then
 	SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
 		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
 	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
+		KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
 	fi
 fi

--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@ -37,7 +37,7 @@ EBUILD syslog-ng-3.13.2.ebuild 4701 BLAKE2B 4bc557a7545796a5c0c883ac3cee06739663
 EBUILD syslog-ng-3.14.1.ebuild 4807 BLAKE2B fda2a0d6d3c0c23e867b4162d062557b49949216e56831316b41475c0da1f0f4d41f3880e28a6558b17baa8f3a35310d389e778c88a7f5daeb58065b9b198119 SHA512 314185268f92097b76f1055c8a98b502f2e7e40d9f00e6dc18584c5433841cfe1656750f7a5ad30c96a08834dbab00153c151e3d5fc438353541d053da04065e
 EBUILD syslog-ng-3.15.1.ebuild 4774 BLAKE2B 1110e1c8b94f2085fcdc600fed136283ca74c9541b6ab20c237c49296a41f4e78babe79d1681fb3f58f691979a408362b69f17a441c61f454a1c93b987e04cf2 SHA512 083d58fbecdd5ef717468053f106ab9d2ed0a7064b1e8725341a447c8b40c4af138752f8e1216d16abac311c7ccbae857a43d4e68ee8d54efa852e45615c8112
 EBUILD syslog-ng-3.16.1.ebuild 4857 BLAKE2B 02ca3e2f022170afdc56ca066e1ad070b5d6bfa8242b4283eb1c967b82055b57612a585333f5e10ffcb25cdcdd4a4d5fe618c5f4896f9d4697d55c93d3d8a665 SHA512 c9c0b6dcf1a4007df67656d3277ddaa1906c275f14d7aca5490d008643103e35948cba77747f55e2a3df402de452eca3e44b0ff28f68165c24eaf0040f2f200d
-EBUILD syslog-ng-3.17.2.ebuild 4914 BLAKE2B d39b439013818442b9524f8fe515acd2583f4cee9c0e4a545c7f1eec751929b0a205f26d134c44438efac86219cc480de350cc948b5e3bd2122d68d55034ff8b SHA512 737b481ef658f25a23a99ac7704ff104db175cb1c7b54402881944dbdf5ef76cce6e0f0589cb28452c4e9270bc67b55943871163a3d2e925d4aafdf7fd415b9e
+EBUILD syslog-ng-3.17.2.ebuild 4913 BLAKE2B ea21a55a3d20627dcf544f83549b8b7530389c7fd31c06b626a8250a32cd99fbd2be137c568ce875b92ca3bb8dc09e7cfb6dce6cfbc44a265b2012cece771746 SHA512 73f2f71b5fb064bd9bb32e0db71b8d9fbbeec84cc1deb50c17cf9e25476a83353fcf2098b77ddebf9a57513a6cd590efe97d59c32dbd6a7bf8b96fc1169123c6
 EBUILD syslog-ng-3.18.1.ebuild 4888 BLAKE2B 7c5354362dace4443e1a7137765cdce2a4c15891319370d4b0ee7edadda3a5438b546addedd85dfdd78255333b4231fde2beadbc6a1c60e588089b098e884eca SHA512 515d7bc671aa54c71da0910a75600d5c9a2f1a422699c86bc48a77c34172f55b39b7937879b88cf5faaf57459d5c68083276983ad8674432ac5605ece6dc9850
 EBUILD syslog-ng-3.7.3.ebuild 3974 BLAKE2B caa4bbf5823b17ebd2a7409294508712c16927ae7211b364b0462edfbd954d97c83b223a84a0370b54daa819d6490c92c0d88d657948cd3ec6d11f0da011a59d SHA512 1d8cd3d4e81963d0edbfde50d8c137d70fc8cce664cb1696504111d50a355659d87e3ad5d85040b4b89c026a57931ad2184adffb3b7642319cc3f317fc63a158
 MISC metadata.xml 1186 BLAKE2B 8fc7edd7e310b01dc6080332a62ed4ffc5d690d4082f800d8306232c138fac46f07ab7cebcbd40e91c2c41467880bbf61b4bbec0907e84f26cde51d24277f47c SHA512 5d8a62c83706e3bcb01b67e6873f7052c941518d566667e5b50aacdc8fcaf07a02c76ca3705369181795c2c62b5ea990cdb93501e1719d0693d597b5e6f8bee2
--- a/app-admin/syslog-ng/syslog-ng-3.17.2.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.17.2.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz

 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86"
 IUSE="amqp caps dbi geoip geoip2 http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 # unit tests require https://github.com/Snaipe/Criterion with additional deps
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/createrepo/Manifest
+++ b/app-arch/createrepo/Manifest
@ -2,5 +2,4 @@ AUX createrepo-0.10.3-ten-changelog-limit.patch 525 BLAKE2B 6e79c87e8865bab43721
 AUX createrepo-0.10.4-lzma.patch 406 BLAKE2B effb1ad86dce44a95a66b93c653accfd0231c224a2884d85727463788667e359a386cb7d838ca5031ea10ce548c385c6cd038bf1fc3fa18c8980abc25eb0b15e SHA512 122cd697c497a70abec140275e273de7976d4afee059e0dee4329aa10d149b9e2e622598fdede900bcf1404f983129d9ef5ac3d3381180e4694b695a938366d0
 DIST createrepo-0.10.4.tar.gz 71186 BLAKE2B ddd15305c6861e9872bf55683035c311a22aea062d27ba4e06bbe4e09598c85fbbaf4b874cbbd1e4c521610a7faa4097a7062ac52752ab2916c14ffca70a817d SHA512 28858d7d886e1132d001bb1bd847657502eb132133e39a4d19a4c8a080728c6b6f344283bc6ee21ce8def5b7980cbca7ed78299adeb71ce1012751268f6740ec
 EBUILD createrepo-0.10.4-r1.ebuild 1201 BLAKE2B 76236e720e015c9446ff1eac9b7126b673cba98cafcfea1eb9047041e74c86eb892a84ecaf2f1f02c8634ae1341772c1622d52fc4b98fc5a4c241273e3fc71ea SHA512 fa626175152a80e96717c62ba41965e853b13fea792ec3b47d3670a7632798f870a66d4bc53ba6e80df01d2d90ee9ed85c2db39d90b24fab33c5b1ff1f97b8b6
-EBUILD createrepo-0.10.4.ebuild 1165 BLAKE2B 3446ad3d1fe82c4bdacf58f163b0ea9c6044ca9d2390450fc6b9216729dfdafb25a7e67815d879e14af0d0ea614f5555a6ad990943cc65e89f20d163b5c6f1fd SHA512 848e9e4eeaee11a93602aa7742e1246f6a7f390cb0712192bb9ca2d32efedacd9669d89f868cf05d736991b530ff5a53246c6054cc408d861f01bd2a077e25d4
 MISC metadata.xml 241 BLAKE2B da02aaf50e60432544b6c8832b7711764b2aa8b5d296dd64f19208832042de36daabc30c8310468cc604013b69c0cc3817f4a14aadd0dad4142c6bf68d4cb767 SHA512 d0c9844a236b2be2bb08d8aecf429dca028b0199db4c5c26c5a9cc2d9e13e21214ae110deb2b0d56e1caeae4ba0367effacbb542890e599bf4ebc6ffb4a369d8
--- a/app-arch/createrepo/createrepo-0.10.4.ebuild
+++ b/app-arch/createrepo/createrepo-0.10.4.ebuild
@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='xml'
-
-inherit python-single-r1 bash-completion-r1
-
-DESCRIPTION="Creates a common rpm-metadata repository"
-HOMEPAGE="http://createrepo.baseurl.org/"
-SRC_URI="http://createrepo.baseurl.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/urlgrabber-2.9.0[${PYTHON_USEDEP}]
-	>=app-arch/rpm-4.1.1[python,${PYTHON_USEDEP}]
-	dev-libs/libxml2[python,${PYTHON_USEDEP}]
-	>=app-arch/deltarpm-3.6_pre20110223[python,${PYTHON_USEDEP}]
-	dev-python/pyliblzma[${PYTHON_USEDEP}]
-	>=sys-apps/yum-3.4.3
-	${PYTHON_DEPS}"
-DEPEND="${PYTHON_DEPS}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.10.3-ten-changelog-limit.patch"
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	python_export PYTHON_SITEDIR
-}
-
-src_install() {
-	emake install \
-		DESTDIR="${ED}" \
-		PYTHON=true \
-		compdir="$(get_bashcompdir)" \
-		PKGDIR="${PYTHON_SITEDIR}/${PN}"
-	einstalldocs
-	python_fix_shebang "${ED}"
-	python_optimize
-	python_optimize "${ED}/usr/share/createrepo"
-}
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
--- a/app-cdr/cdrdao/Manifest
+++ b/app-cdr/cdrdao/Manifest
@ -8,5 +8,5 @@ AUX cdrdao-1.2.4-wformat-security.patch 4864 BLAKE2B fa300eefe5d714de0245a9e745d
 DIST cdrdao-1.2.3.tar.bz2 1428695 BLAKE2B d5d8e9f2f17b4e4a385e226233d219afdf48fa98bade0dad57292ba45fc4f25c3bb146289884c9ad35224c26a826b305c6f8a1e43c22fe7f1cbd812f1a69790a SHA512 36b14180acf476de062f5f31e2b9dece39e3cc7a84552e80a6714931fa35d6090ec90ddfcdbd2651d690be8ce3fc78d483aa13856c3c311bcc2f571f0040adf6
 DIST cdrdao-1.2.4.tar.bz2 1442181 BLAKE2B e1163b25c165a7acd7ec8c53069794724d93f09a486150255a58985e3fd0a222ba7ac5c124cb7a6991cf440ac701651be38754615fd3d0d295affa93595dc388 SHA512 41f20275ca44ec9003d0e3ed280cc98012353005cda6f544ebfa44f3f79f991845c0ef17af74db9456f1bacc342a7fd48c9e942d757927a4a9ff91808f7bbb09
 EBUILD cdrdao-1.2.3-r4.ebuild 1363 BLAKE2B 39976860881ab6c78968cbc03705cc52d693a25f82ca444567d7904ac6c517bc0e68c73279caf7b76cec3c663095435ec3907dbb842c61fb5e87c79fbbac96d8 SHA512 61bf45c88cb48a58375cee24fa82df7d45d2e4f3ca1d9712d087e625b8aee20c014a4954be6e47a2dd1a8d7466e72a7b1b47f39cab5e8821f0beb0ebc5b2786c
-EBUILD cdrdao-1.2.4.ebuild 1290 BLAKE2B 41b676feef649573584a4e36cb0948790554b80bd600ed363c71141af40cd39123adfcb7e7b00e903b56eed0166c85edbbfbc4ac01d46e4cc5bd708ae3e923d3 SHA512 2fcb96514e0c9719bed727a44a74928a35b425b2e81bf518aed70b289756862343002bda5a2b9d5646937f5977c13849677eb2db8456711686bdbfc8390dd982
+EBUILD cdrdao-1.2.4.ebuild 1289 BLAKE2B 3c0dabf1b62adf469d1de919d2d28d2ecb7c8ebf9d9a3dc14b2dc48fd28a2ddad426b1663526bd16dea4be778c9f7227cb23bc972efcd4128b554dd3f44a1c78 SHA512 5e999168da00262af7e73803f70724e3f397fe3b48ed70c99011a350767197f7341b4c0b93f7c948c647251b15058edc968e7ea1cbf875660570c971bba4b4d8
 MISC metadata.xml 395 BLAKE2B 271ac8836e1bc4bd8b8405ab9fdfdaaa4046b47bb44b07bdb78d063853a82433117d69d4dd46e89b4f42008b55f10e69d8262340bd29fe396061add32ed9959a SHA512 66d6f12a07e09dd91c828d34941963b1a498e1be14f0cadcb145b47471e148559280fb237a68c1d99ba3c2360e0603a231f124b950b3debde76fe476a5491351
--- a/app-cdr/cdrdao/cdrdao-1.2.4.ebuild
+++ b/app-cdr/cdrdao/cdrdao-1.2.4.ebuild
@ -16,7 +16,7 @@ fi

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
 IUSE="encode mad vorbis"

 COMMON_DEPEND="
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/rainbowcrack/Manifest
+++ b/app-crypt/rainbowcrack/Manifest
@ -1,4 +1,6 @@
 DIST rainbowcrack-1.6.1-linux32.zip 138833 BLAKE2B 1c4143aa4dcbe644c4d6f436d6624cd9b4b714c2efd95387fe3657251d05c214f2126a7f6f396ddd83eeb8ea83fdf8e758513609b082abee308d94aea5bfbf82 SHA512 0fc163c4a8a875149b479d74fbabbfbb5247b9e621e5362a27a8fb6d5dd64263ce89213b5f5a578ce09018cb2c93f2af51eae954e19fd448c490bcd0524612dd
 DIST rainbowcrack-1.6.1-linux64.zip 134268 BLAKE2B 3c3e8d1a385a3c973839d19a19ce8f16a12540ba2d461197e8363b2feb3380d931728761b3404de9e80b5c6a9df9e51d5463476088cffdc1fbccd5888bb85231 SHA512 6fd5a0356b76ed5e8062888aeb26755588d11aa5dab7fbb54ea92dbeac02e606b082e00b93a44203c158ee620d61c0f9051ecf62b60d8a83c4fca852af22144d
+DIST rainbowcrack-1.7-linux64.zip 208726 BLAKE2B 842e0a3ee74a8576a5331cc86259178b382e82f465f3093e7d1fa1b44907c1c30a73f53c2f7f527e052bc6266ceffd350c42b9b80b1298072a02c0cbd25e660d SHA512 068fe9d31004e08c0fcbe5a11500bd6248eca2f204a8d99a7343824ebc1dd847a01eb459f28d77fdd84eae98b05169a69e10b8893b9b5dd027381965c19b7bdb
 EBUILD rainbowcrack-1.6.1.ebuild 992 BLAKE2B 9c9c096bc1dfc0a35ba1d952598ebfc557601006aa6c88c947ede17841bb1e890649bb97452ea561c0be7c2b262a95bd8bfbc11003efbc69cf9c2bde465f5105 SHA512 610aeb389d8ae04c09e3f1b4d27bd8ed508d4c3a262fc3e404a23b15cda112fabc9a84fa441212eaee7f0d4d72e6b01874d1e5ecea22f65f0bce576548917816
+EBUILD rainbowcrack-1.7.ebuild 955 BLAKE2B ec3864d6ea73fbc86459d16d93ab254c71a26dddd9aef2696eeda0f609fc0968eb7e07d7e93970d730abd8525d73604f55efc2e22a0d57023afb3e0afc6e2a4f SHA512 f269c621d2b06d0c967364a410459be648a997f3d5be4cd572fe5b4452901104ca2cf3aed0b4e4d7de04991b8e7d5717446053c44384da971e2dfa7d4801e92e
 MISC metadata.xml 982 BLAKE2B fbc05af924e12a9682024c9e24cb1c35f84874ad36b11c705a5810cab63f83e3c2abd89e828f231fb82fcf7e672ebaa9511b80fe749274d2b5e4e2ee1add26b8 SHA512 c76947d085f4c322baa8f15112f2e7a64887a025c5871f95f934f52778d0d714061fddbd2a8ed66b31e5cde92045cba77817c708533ba83fab89c9e46d6c8a0c
--- a/app-crypt/rainbowcrack/rainbowcrack-1.7.ebuild
+++ b/app-crypt/rainbowcrack/rainbowcrack-1.7.ebuild
@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils
+
+DESCRIPTION="Hash cracker that precomputes plaintext - ciphertext pairs in advance"
+HOMEPAGE="http://project-rainbowcrack.com/"
+SRC_URI="amd64? ( http://project-${PN}.com/${P}-linux64.zip )"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE=""
+
+RESTRICT="bindist mirror" #444426
+
+RAINBOW_DESTDIR="opt/${PN}"
+
+QA_FLAGS_IGNORED="${RAINBOW_DESTDIR}/.*"
+QA_PRESTRIPPED="${RAINBOW_DESTDIR}/.*"
+
+DEPEND="app-arch/unzip"
+
+DOCS=(
+	readme.txt
+)
+
+src_unpack() {
+	default
+	mv ${P}-linux* "${S}"
+}
+
+src_install() {
+	einstalldocs
+
+	local bin bins="
+		rcrack
+		rt2rtc
+		rtc2rt
+		rtgen
+		rtmerge
+		rtsort
+	"
+
+	exeinto "/${RAINBOW_DESTDIR}"
+	doexe alglib0.so ${bins}
+
+	for bin in ${bins}; do
+		make_wrapper ${bin} ./${bin} "/${RAINBOW_DESTDIR}" "/${RAINBOW_DESTDIR}"
+	done
+
+	insinto "/${RAINBOW_DESTDIR}"
+	doins charset.txt
+}
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
--- a/app-doc/cantera-docs/Manifest
+++ b/app-doc/cantera-docs/Manifest
@ -0,0 +1,3 @@
+DIST cantera-docs-2.4.0.tar.xz 4915944 BLAKE2B c7c40651ec8b4c6f6488c49cc991a115f08d6053b3383e28660028e72a55b2c231bfcfde976bec5e2be85828e642668d71730bdc803198bdcdee0631c09208ec SHA512 182475b180e65bb8bd7d5259a3b2a385b2b7c7db61a258a460c3e5fa91ae101306702ea3f00c6996a65ae8ebd1985dcc84b6d8291434578938efbb584db94c40
+EBUILD cantera-docs-2.4.0.ebuild 831 BLAKE2B d9a095ee817e46ea3c6d150d602d693971d519edb07936802c4253668393658cf76ba49eeb983442829cbcce3e69e28187814ce031caab581033a8ab74fe238e SHA512 5028e20ed26a2620895ec0ab97aaf3fc26f4998254b7714c0eed259fd1b41d10d3a50114f56d0af8de7973bb8a56e9b6159da8b85e3181736f0f411ec238d74f
+MISC metadata.xml 556 BLAKE2B 92adebd88552dd951baf150654d1178a76ef694389b153f53b37c51fea550b09769bdf0a1089a64746a81507131bc17c7f7d69f519460793bd5d4ff728fa65c3 SHA512 e6e3aa0e314da217e54d1073704cad4220d45ac1b3f573bbf711c1f30242140aa243de3fbe716b7ead35dee2bb77e45b9ed80500044661f45255e457d543b873
--- a/app-doc/cantera-docs/cantera-docs-2.4.0.ebuild
+++ b/app-doc/cantera-docs/cantera-docs-2.4.0.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop
+
+DESCRIPTION="Documentation API reference for Cantera package libraries"
+HOMEPAGE="https://cantera.org"
+SRC_URI="https://github.com/band-a-prend/gentoo-overlay/releases/download/ct-docs-${PV}/${P}_modified_menu.tar.xz -> ${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	x11-misc/xdg-utils
+"
+
+S="${WORKDIR}/"
+
+src_install() {
+	insinto /usr/share/cantera/doc/
+	doins -r "${S}/."
+
+	make_desktop_entry "/usr/bin/xdg-open /usr/share/cantera/doc/doxygen/html/index.html" "Cantera Doxygen Documentation" "text-html" "Development"
+	make_desktop_entry "/usr/bin/xdg-open /usr/share/cantera/doc/sphinx/html/index.html" "Cantera Sphinx Documentation" "text-html" "Development"
+}
--- a/app-doc/cantera-docs/metadata.xml
+++ b/app-doc/cantera-docs/metadata.xml
@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>torokhov_s_a@mail.ru</email>
+    <name>Sergey Torokhov</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+<longdescription lang="en">
+Cantera Doxygen API Documentation for C++ library
+and Sphinx API Documentation for CTI tool, Python module and Matlab interface.
+</longdescription>
+</pkgmetadata>
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@ -11,4 +11,4 @@ EBUILD gvim-8.0.1699-r1.ebuild 10441 BLAKE2B 2a57da613526835bace267032a7c8d24375
 EBUILD gvim-8.1.0034.ebuild 10440 BLAKE2B feab87a2dda8d2e59c79179f3736963e645da9d6045ad591b8b4141181c9d52dcc417e0569cd4b60e91bedb662b2be84cffa053848108cf23973a150b8878036 SHA512 1f7b34f98fac3c68b0aa866e7c6cdb50a3f2a3cb6be2b24bf1b9006e01131b3d1d88576c6195ddafe5ee3e234c4b39d45c94fc5d81a2b2bb83de9a26e019fa53
 EBUILD gvim-8.1.0412.ebuild 10428 BLAKE2B 69352c472327a455a501766af33297e991f85bb6521e35df2e2e9615bb415c744a5579e7367582fee7d93e637afeb169f68b2de8d595005d5bbd636c3d76364b SHA512 67b6e99586afadefe1b48c93f76526a52f47d619bcfb7e33f3ec93032e976c30209ac9f42ad4000fb3b45c6ea335598bd6e664bbdc09acb4bce56f9f01a9348e
 EBUILD gvim-9999.ebuild 10428 BLAKE2B 69352c472327a455a501766af33297e991f85bb6521e35df2e2e9615bb415c744a5579e7367582fee7d93e637afeb169f68b2de8d595005d5bbd636c3d76364b SHA512 67b6e99586afadefe1b48c93f76526a52f47d619bcfb7e33f3ec93032e976c30209ac9f42ad4000fb3b45c6ea335598bd6e664bbdc09acb4bce56f9f01a9348e
-MISC metadata.xml 578 BLAKE2B a0b7e41324455706748f79109affec89e72dece0b41346d0cc804742cc7e5aa88f89556623b1aac4f53387afe6e6145049079b1cd44d3411bcf2f8ee8c7c2bfd SHA512 b2db961a6e59b803e2371c4e6dda496917d6c5e332f36062be8dbfa4fb47b4b640d8deb6871c9ff3c5a527fdf9c16aa13f14b9e0a37f93a3a10c6f6b57808126
+MISC metadata.xml 633 BLAKE2B adc5dc111999d95087e2ef224b82e931b2baa638eb377a08197bcc1114a83efd6c09bd6ce09e821dc1534fe0dc925116bc48dba74cee4579c414a99da09d8dd6 SHA512 f6388b8d254f166dd5c8a03117f3f0448a7e5ac196577aed5c05081d702cf611733f1ca9ad6e93e026c025e73132066dff5b75e3ada68d83746d6519e99e3036
--- a/app-editors/gvim/metadata.xml
+++ b/app-editors/gvim/metadata.xml
@ -6,6 +6,7 @@
    <name>Gentoo Vim Project</name>
  </maintainer>
  <use>
+    <flag name="cscope">Enable cscope interface</flag>
    <flag name="gtk3">Enable GTK+3 interface</flag>
    <flag name="netbeans">Include netbeans external editor integration support</flag>
    <flag name="racket">Enable support for Scheme using <pkg>dev-scheme/racket</pkg></flag>
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@ -9,4 +9,4 @@ EBUILD vim-8.0.1699.ebuild 8781 BLAKE2B b03fe734f6acb466b5573d4dad7a36f5415c3c8b
 EBUILD vim-8.1.0034.ebuild 8781 BLAKE2B 8a40f45dc7395141259e1cf7339c815a3526159181f8c3d9e61e451fd743593171bba5ccd58251ef4f57bbae45457c2612bb4d52369bffb3ac672276ce662dea SHA512 7f45c30ad45f9abdd1cfb2186c021c4f203a94ec8f9dda7d5522c7688c6b803c18baab774edae20278ce726e5eb2368cace3dd1ee79fb7e8e534aa9e6e14e6e8
 EBUILD vim-8.1.0412.ebuild 8806 BLAKE2B 23bdf54e6bb94d325be60c6512fe7f750bfc2f0073c566d5db499179bf70b8590f9ceb494cf41bf25cd88f6f647f199dfaa8431e6d61dd17860b5b6e06a15d59 SHA512 227b7214e1301312d98ae6400f0a53351e95ab902c46e37aede8496d67f879bed70ba47f403842374aac8e520d2d949e7656706a99734d8cc63f77d53cc54dce
 EBUILD vim-9999.ebuild 8806 BLAKE2B 23bdf54e6bb94d325be60c6512fe7f750bfc2f0073c566d5db499179bf70b8590f9ceb494cf41bf25cd88f6f647f199dfaa8431e6d61dd17860b5b6e06a15d59 SHA512 227b7214e1301312d98ae6400f0a53351e95ab902c46e37aede8496d67f879bed70ba47f403842374aac8e520d2d949e7656706a99734d8cc63f77d53cc54dce
-MISC metadata.xml 752 BLAKE2B 91fa465837da7fef20719826bbee3592d1d0f72f0015accaf425dad3999ee5f6d6f1ff6cdaa539dc1621d9735e1e97156824fb2e74e8707bae9c213719b20d4e SHA512 e49f531537dc14352cfd1550f77e830599addc6cfc9bc9f4a3a20449b0bab2ec5bfeb8923eab15a0585ff156c4b61cfcb5795caf0b9f6fcf14054559a1cd5476
+MISC metadata.xml 807 BLAKE2B e876f33c06a0bb165a43a7c50ff9bbfa0513e43287f54dbcee396af736034e4cefba8831226b47cc8a334599632a94344623ae2343f0162dbbcd511f749d524a SHA512 a7801a4483b08944c01848593354322c406a929296075617736755c0b62852b76c30467cee2c360ea211521274f2019b495309bffb5a3285d73940aac45e4a53
--- a/app-editors/vim/metadata.xml
+++ b/app-editors/vim/metadata.xml
@ -6,6 +6,7 @@
    <name>Gentoo Vim Project</name>
  </maintainer>
  <use>
+    <flag name="cscope">Enable cscope interface</flag>
    <flag name="racket">Enable support for Scheme using <pkg>dev-scheme/racket</pkg></flag>
    <flag name="terminal">Enable terminal emulation support</flag>
    <flag name="vim-pager">Install vimpager and vimmanpager links</flag>
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@ -13,4 +13,4 @@ DIST xemacs-21.5.34.tar.gz 15816932 BLAKE2B e3be282717b91308c94d3d4bee74527d0b31
 EBUILD xemacs-21.4.24-r1.ebuild 6734 BLAKE2B eb95f30b81f5d1305ab90089fe4feccce6b1b541949195d44c44e55b9631cc780768ecffc89b6228c540cd132e8ed2495dbe852aa264cf1080753e82553cde51 SHA512 e1bc6158ba44b478434b92a9470944a176161f57229a3fac99e15b91aa88ce1f0473eecc0cc6eb5f222ea75cde962157b9d23b4b64489ee95c1b8404eea0d052
 EBUILD xemacs-21.4.24.ebuild 6782 BLAKE2B e7a1fa73200db2829c9573d406b810b316a706cc9a9a70503ccb774a8278846348d8927e7d0005422bd79ba50ded393b72390f29b8b42987f8673cbc82ee64a4 SHA512 198a075e31cef8c28c359b56588414e0d19c317b1640e3c215aa7483f5c2782f82b6318327dc23448831a98c6a3a713242fb52d7977857db0a2ccc36b401e3a4
 EBUILD xemacs-21.5.34-r4.ebuild 7227 BLAKE2B c9e14730c039248883a8147e1deaa07d1a2937069823d1493072955bf362c4849c583b0d4b0a5d3914feb8f86ee34371b934ba5305396e12b193aad7c27df840 SHA512 89428a0b8e3ea66ef0e8418cf5fffa9ccbab351bfac48abc9c6ce479b7c88bd42dd90c1a1728a10d6dc42d7afcbbbb01bef95882e4251d56bcdce15ca1de1f62
-MISC metadata.xml 616 BLAKE2B e54bf1e7e4860e0de6e017e5456ebfbb392b33e8f768928f051f75b3e1c3431cdfeee8c4da5b8618b623585127cf2a5b2990f42d7b68dfe930db7c1bd15c09b3 SHA512 8c6e5e61099adf6af109681bf6ce31408ff468dec60403155e5998574dfd095b77156d669e8f54b09bfee5ba71346f4657e15b7d8c4cc34511696a5e97370522
+MISC metadata.xml 682 BLAKE2B e6b1655f31d4e58fb4c0d35f8b410af6a17d590fac336c4e17091619629d948d9a9aeba4e579ed4a793c79506afdc9aa77f43db8ece9e5e04dc98fc90291e27d SHA512 51c021269b2f5f9483ff5a743ba5c7a20d60f5e59fd063bee7355468d69528da0d77c1e3b25f320be024beaf4d94130afa16b5a8f151043895371a16cae3fcf7
--- a/app-editors/xemacs/metadata.xml
+++ b/app-editors/xemacs/metadata.xml
@ -10,6 +10,7 @@
      drag-n-drop library</flag>
    <flag name="eolconv">Support detection and translation of newline
      conventions</flag>
+    <flag name="mule">Add multi-language support to XEmacs</flag>
    <flag name="pop">Support POP for mail retrieval</flag>
    <flag name="xim">Enable X11 XiM input method</flag>
  </use>
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/fuse/Manifest
+++ b/app-emulation/fuse/Manifest
@ -2,4 +2,4 @@ DIST fuse-1.5.5.tar.gz 1629577 BLAKE2B b4765047507049b2fa3547d47384df2c5e6de75b7
 DIST fuse-1.5.6.tar.gz 1634711 BLAKE2B a581c106c668f0342b4a3b4ebbc0e92e750806e59d067798e23da02284cbb9a17cf580c5b6369144863fbf64b12326ea2982e4d83e87354d62ff51926e3293de SHA512 84312e4f83883b36d06f2b96ded1bfc71675cba71a0848f4cbb5a233a1d1c06466013d2655d759397f32d6d67d6ba26b2b6a5041796cb9143cd0b354a88fd589
 EBUILD fuse-1.5.5.ebuild 1711 BLAKE2B d81e148140fb353bb82cfef956bc946272e49f6c3e4fb121dfc0e75d472c3e0821b244529eaed00b4b4a251e776dbab62fbd99d042134ba0f88e501cc44fcfda SHA512 d2274c47e7ef1ee7a29c12d59033a2f2f34b33d7d7e9cd8a3a80402a7f5c38bd8b16e5a72cc1b71cd6d9cb334c56077571b719d6e85e89c3959f957c675d2c6a
 EBUILD fuse-1.5.6.ebuild 1709 BLAKE2B 4b993e540c8510a608912b733b8bd42311fe4e1afd392255fa1be316f424ef4efd375ef5dd16893d6298ca261ac6a816e04c338473619e211a147fbeed6091d2 SHA512 d2deeb6bed41cc69ca423d91261cdf84f2ce027d91d54fb9805cdf142674173766033a75616be58ab22c950dabbce215fcff786662da23862a4ba7cc42faaa1f
-MISC metadata.xml 731 BLAKE2B d157625420632cf041ce0d877f243e6d2fcfd62f8b487691bca757ed38e5d5173aaec623528b3e33cbcc09347464f9c26c3c50190dd28ebdd2f3b86ea0609d51 SHA512 c0a922b5cc6900b9fa7d219dc1cecbed616af7f77d018065e8b5d6f6da6350c4d9d4ba3004b8f34ebc97da22c7d4f4f8b59119098877c199abcc334dff933342
+MISC metadata.xml 801 BLAKE2B 0a1504d02b423a72ad2d087489f9a0808dd2fb60643dc5c4a90625ce888cb6e9469195c919a3f9827bc0731afdf3ba739c2649692070c9d468a391e77eb9117a SHA512 dcb8d6a43cea89804e932e07dedf7d0fa3cabaf31aaa697f062e6e22a24c3c49e12a918e0cfd353d814ce1973c643b08f27710f95e696736bba2f174fbda76d5
--- a/app-emulation/fuse/metadata.xml
+++ b/app-emulation/fuse/metadata.xml
@ -17,5 +17,6 @@
 		<flag name="backend-sdl">Use SDL rendering backend</flag>
 		<flag name="backend-svga">Use svgalib rendering backend</flag>
 		<flag name="backend-X">Use X11 rendering backend</flag>
+		<flag name="memlimit">Add compile-time memory usage limiting</flag>
 	</use>
 </pkgmetadata>
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@ -1,9 +1,5 @@
-DIST VBoxGuestAdditions_5.2.14.iso 57978880 BLAKE2B de5cb3c5b7e2f3ee018588308573389fd973820e87d5b2e6640499c96dc21db95e71eb4e5e2469455febba8b2ccb4a7c6014176e784613218fa7eccabefe9e53 SHA512 1fd878f9e7fc1687907ac8dff6827bfd7aefe3ed48012b0dbbaf42ced21695ce52be6fe146128a6d1c67c7a0c5c39c9ef24e8ee562271fda117d13cca81427cb
-DIST VBoxGuestAdditions_5.2.20.iso 58013696 BLAKE2B 1a0df07f2a086c41741d884a3eabd43d6f1fee368b143fbae4c8dbc930834fb8d5dd82e8563fe7c9e4c562a58e79c25e9603847d9eca908943e525505bf2f697 SHA512 a8b8f12a8f0b26bb88745d33aa419c45adb4a1e682c3af9a34b0556ac1d8bdf33044253ede41d894e0dba1857f8f3c5cc234006149771a25133c6112ec4aa4c3
 DIST VBoxGuestAdditions_5.2.22.iso 58013696 BLAKE2B 196f0048b685200328bcf753f3df23eac6477ce863885e93a54951795368bf62bdaa497589001ec203d75809b1f74ebbaa80419406d26bc7db43a131f5b9d698 SHA512 b320174b2f2ef796ac2c9c920579be38f0cedaa037d21992863ac355ecf6e99ae2aea56c70fb2034e9e03afac2cd7297f7717b447a6981701755593110164d37
 DIST VBoxGuestAdditions_6.0.0_BETA2.iso 73023488 BLAKE2B 87a756c13686b49e0f80c332e3daf8033a60b65a1e658d6baf8be2e86c38dca7a46371774b8ebc6ffe57ac14ea4ebb83552a3583abb7a63091590f62b963933b SHA512 7588efd3ef578465716adb0f9c277e4fbe9d08ca39c85cae0583cf30dc60036ceb2233ab3e56d17fc168e8c97e7d210517650b79829ece886249bd116a8d22a2
-EBUILD virtualbox-additions-5.2.14.ebuild 713 BLAKE2B a15e47b3d4c380d7fcf8c10a9bef4a16ccb0c34e0cad6fcdc7ccbbe20bb6a869a3d9906f98169219e7b6e6e77fc1f18d93859c133fe50dfae34899ddbbf9de44 SHA512 4898ace6d451998c593dffcbaf841c7e6b0944d96e364bde9c301d600f00dd8c0037e96bc0b42c4d0e5f5e5a35d1eb7ed1f8260541505ba8cf88cb17e9fb0e26
-EBUILD virtualbox-additions-5.2.20.ebuild 712 BLAKE2B 62074cbfee8bd9076c9413172381a77df8c4ab84bbfb6912337aa87930b4b90ec155ec52af68db593fc96c1de39bc38d9e4660ed570b5e0b33b201660049994d SHA512 a226e6b4188eef4ba7a5cc32c61c7a27981b104df9d5716772c2dd9887332e2c88119c538b5ffcc6cac16ce5e6faf7f484f1419b89c634257d32fc5967febcaa
 EBUILD virtualbox-additions-5.2.22.ebuild 710 BLAKE2B 1dfdfb7943723926e5d78af8a313f1faa238b1fe09a097ae2ba9b722d78fc205d0928817d416a3012b92ceb32e269d348f3b778b562c07f82a55d3518ff2b8de SHA512 0b0506759c3a98953082ae8babd433522454ade47af62984eefffb1cd37b860ca3423e04386cef219533bd01fd8109c2b2b1ec29aacc82a8228115717e49e8ae
 EBUILD virtualbox-additions-6.0.0_beta2.ebuild 768 BLAKE2B 5f69263610ef425399c0fab670ec4341c642b25cc572f3282177958c299d2587b01a0ce85aa5b358dd57deb7a5485ddb92b3783c28f0e30b0fbf91359c5c3dc7 SHA512 aaea93c1a095efa4ad23b9bbc2e9b08b4f0280ada15c69828a2cb740bb355435684388b2d48a73984dab9ef1003ed6dc059d69e42c1a813086248eb714fd2877
 MISC metadata.xml 260 BLAKE2B 55d9eb1793faf23ffb69c904a9daf755cefe1b1e04fc2331e792a81acc1b699591acb85e005a96e70167e4eba8444e0cfc8f03be4fcdc19487ad6b1cea356f4a SHA512 443c9c27369b12fa4d23ac7e9add34dbf93b54d560ca946dac97801698b79401a80d88c6570530e641ad4f7231a8c1419682e1e11af2b171ca2854c598e05635
--- a/app-emulation/virtualbox-additions/virtualbox-additions-5.2.14.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-5.2.14.ebuild
@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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="https://www.virtualbox.org/"
-SRC_URI="https://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-additions/virtualbox-additions-5.2.20.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-5.2.20.ebuild
@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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="https://www.virtualbox.org/"
-SRC_URI="https://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,13 @@ 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.2.14-123301.tar.gz 19589209 BLAKE2B 385bdfb4cef67788a1dd3e758f52dab7a367f56ca8d286e465af9a7674ffe3bc0f6187a66d7d19bb8f2a8fc0e23e0ce7ef35ac2d46fd6971dc2df96e8a61ca11 SHA512 a47a7173685b72995e5012386fc8f6c55f9106049a28ecaea223f58f1bb40077e0929cf05102a2588e516fe90891428b8e569ec9351fcaf235eb9f8293e45b92
-DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.20-125813.tar.gz 19641208 BLAKE2B ffe4e89b88609d575f7e9f5aed5330de5024462ae564684cf3f565b62649d022c8fc9368cfd1685e3e4fc34e9a23cb0651c483f129b533f9afec38bcae89d587 SHA512 df9ae6af9ad1c1106bf8bf0595fdcdd3ec45bc74b90655e762fb18a4c8ea268bed366ce3caaf0f95682577b61b337650a6fe7ef901f6925fa38679ccd885c21c
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.22-126460.tar.gz 19640932 BLAKE2B 162ab40da6b2cd30d00e020666a1f4fb026e29af2ca9d6c36c294e5fa299b61ab8fd147f24d2b500426c768808db2c7693c30e88519e695d7759f8eedf1c52c5 SHA512 85b8552668b6580bea24f051ad861c82b9ba32177fb7fa37fe2980d8bab32a84325d02bfa9c8f55c2021a4000ef2546d8996ca8b99ca7fc19f8281a92108dfb0
 DIST Oracle_VM_VirtualBox_Extension_Pack-6.0.0_BETA2-126642.tar.gz 23239583 BLAKE2B f5444d2472152f3f0701f8e4e29f28c6f86fdd95d15c469d84af42bf5d5f4fb226c26dfe9ce152f0fdfe95537213f68897183c9f9519e795312838fcf9a80a2f SHA512 d2b64456558c48688460f874512ce9c08abd06f06a4a1c8d8548cfd8d17c408ba6344390716add606b3a4a519aab59591a8a454ab6384b8082db07fbc37a275d
-DIST VirtualBox-5.2.14-123301-Linux_amd64.run 88749523 BLAKE2B 5a2791a1258adcdc82f8776fb0d5502d525faa0083b808f1875f0c61b848aa371fa0b6b73ca024c244b36dfb074a8839747ad27a87cb8dfbaad09096a0cec887 SHA512 8c4633ef0e3a9f7f26603009a23244696a6f91baffa9777a0daf8f09abd80b4aca944dabfd2a10acddf4759e64ec719948d73ecaaf187a60a15e097467060ea9
-DIST VirtualBox-5.2.14-123301-Linux_x86.run 87776718 BLAKE2B 609c24ad2ba5b005f7cb619fbe2c2a82f026a7ae4ef74cda800c526c8c3552a2a1ed1af5a2a2b3d9c56f0dfbcdda493c2cc92b58156cbf41ebfb1d43bfee8aca SHA512 820c2b6c97a48c125b69e1f749a3b1473d5fe672726ae2cec30f20a6652186a28b3900d4aeffca701415275229232925d1c8c347aefa7a86840a2c5bf13f21a7
-DIST VirtualBox-5.2.20-125813-Linux_amd64.run 88841683 BLAKE2B a3cce78d5a90187ece0eda11032a36096a05b0a7020ec729c07963510db6fa4e436edbf03b5e385d826c7e2ddeae84e4138273b6b5876be2b33c7a8f259753f3 SHA512 28614d71b564e138526cf75662d5e0ce2c083bfa4bc0124f7b0d20532b5a09391d00609a2c003ac5311220c844f2b1fffdee46f53e1018f0df5b6ff1b7a6ba12
-DIST VirtualBox-5.2.20-125813-Linux_x86.run 87889359 BLAKE2B bc66cf6af5e7a92c642e028bc82830641bed02f5e7daa4c607b165af9f707b3ec359a0ab40f68822472e0087a9a17723de20567f08f14125f8c74d058eecbc88 SHA512 8a7cba49194a7dcb86b3b908e9b8f83d3ad83cfd057e75bda6bb16da1f62ec65e10892696f94f0bc0f4bff4f4f055aa2bdc250e10b46d06b3f8f616000dad48a
 DIST VirtualBox-5.2.22-126460-Linux_amd64.run 88821201 BLAKE2B 1b0433844247ee9531af915dcbb740183fa29fb296f8c78b4165cc3b48300da71f7d329026983da581ffff0d7b8976a2e5e32d5e948861a557ddfa2437813ea0 SHA512 22b20a68884a114818fcdfe9a459a7c3b1b3598526a74cc66407f5bcdc6eb6bcbe022b820477ccdc081e22349777b73fac9d6126585ee3c8fa0d3d24624006f3
 DIST VirtualBox-5.2.22-126460-Linux_x86.run 87817677 BLAKE2B 5f11e5f92386c9524869082cf1a5af413c69fe5b36b1ace58887076000c7b928267eb7c3be22282885d6871ccdcee981ec79a526c71f281f0e8ada5858194851 SHA512 32d44b6d691e33a1ee1426cb7a3cb3648722709c588d177951b8be802546faadfd612567981bbbfed3d782b18260e6e638e7879813f3b06bb5a8387b052b0227
 DIST VirtualBox-6.0.0_BETA2-126642-Linux_amd64.run 143635921 BLAKE2B 7bc6193bf306dc2e2c8e55b0070020c5854d257aa662f169f3daaa2ea759bf024b0a35a9d21caa8c67c09ef56b78be9700aa2666dfe0d39f28c7750af2db7c5a SHA512 1d17d5abef701554706b0b8cdc83679a112ff6213346bacc84ac8424626e7c6630866921b567f62d074bb6959aa9edfe59e4c559c31c9120b51d6506435b0807
 DIST VirtualBox-6.0.0_BETA2-126642-Linux_x86.run 142960077 BLAKE2B 9ae39b14c2371e7c744e02b3ea8819ab5685dca8da65578905090084bed81552a32c392df1804227d5394a56f1e243e0abd51ab49edbaca5055c3cf74093c67a SHA512 846eaa692c87e48541236fb3fa383da6cfa771c37ca430054a7aa79808ef9fc79bf502f10d4244f53acb7a56f7fd01b6b6f0ff7bca672014ab47204ccd098d57
-DIST VirtualBoxSDK-5.2.14-123301.zip 10154044 BLAKE2B 273219029c59ffd685fffb7e14fff914a5397acc0676c8b4ccaee9cecee51e90880e68d883125e061d6c02e09b53235821ff89a265e937c9b4e67365452a97d2 SHA512 c69e6f537af611b9a4bcbab3e014fa25c6593f754940c6596e451cf895cb088186d037ac4816a3bae793213c774befd54ffa86d43948fa546f753a37fcdabd51
-DIST VirtualBoxSDK-5.2.20-125813.zip 10152506 BLAKE2B 0a0fe51b22391430b5f67f4dfa24e2985beb364f69acf67f19154bbd5acca00260abdc8ade32c245e1a19340c88ee49776442b036dccdb5f932c052c9701c7e3 SHA512 e87b41bc23de5aae3a368834dc33e4b0eff63e945f81323886491cd6139089c29dc113d5d2144ac76650d501d3a6f0fc858ff2e1afe29df4396ed7cc7552762d
 DIST VirtualBoxSDK-5.2.22-126460.zip 10154660 BLAKE2B e0a0106f695ca7198d4b2ac5c62bb435fe7934858115dcb3aed57b40d82655bd54cbbae63b279132c23762a227c53affe68131a0bf9452c69dcaf2162b1e4ebf SHA512 1d34b8f7f32602b5656fdb6184e6c35cc54d6ecb36bc41d7df3e154f18c27ea5938635969feb69defe86a53897eee87792514967f15810224ee89e8e523d2b29
-EBUILD virtualbox-bin-5.2.14.123301.ebuild 8330 BLAKE2B 6eb8f7e32b98ebede7cfe40e8dc4cfaaa91937b0a119226828b06edd207703981570eda551c78295d5cc78c65338c806ce5ceaa158fe7a219037e8af41753c47 SHA512 e7efb17b49257d1d0a4cec26bf229013e46aae6076dbeef0238faf21f84b81f7223e9986a3c6107ccb202a7aeeaa97ed8ac40d787d5e5e22ba9c8b06bfaae24e
-EBUILD virtualbox-bin-5.2.20.125813.ebuild 8329 BLAKE2B 2a35d5607dae7906042d693f6474d50fa90b8df6f95fd67ec46def27b02502421d34e36e56964573823a81f2746f53285138f70880af343dc31c50e146d2fcc3 SHA512 f027acf8007331bf7d73fd1f430bf55d3046dc4df3658a709e015efabea2b25d94717392c50be40f04e952a54651312a0ca45dd59e77d232fb7d58c87c773095
 EBUILD virtualbox-bin-5.2.22.126460.ebuild 8327 BLAKE2B 02bf2b29c01c69a3e8321964f494c274c0d22fd1e360235a919ebdc0a0d4c716a51540c51ff85aec6ea7f5a7cc4bb4b4625eca877e23458bb8e57fdf2c5e300b SHA512 b9a91b54c1d0a368b98a021cd24af53c452cc5731fb3495dc7f6e26578bab84d297cc7dd4e0847e8ecf696aa0057c103e1b241fa90d0dfdb11954ea15786438f
 EBUILD virtualbox-bin-6.0.0.126642_beta2.ebuild 8334 BLAKE2B e573049b563358b60b42dc4c993fb870d807f62564a28680dd12cf2c9e6a3639aeb49627fc14d93fe41d5702a271d710601207f9dbbad56182003c4b89ddb910 SHA512 89155909c0e86d8ae6aa6faa1070a215eb13f94e2072a1ee6cd642dd4b3723d8556de7b1ff97ac1169d37575eff09dd738add751fbaec854c70df720b63dbfd9
 MISC metadata.xml 599 BLAKE2B 2af2e738880f4fb9b684baa124df483d90548177fc8f5a8223dc13a5c96a3bf7f84754a41c4d2bd5821140dd2479874b4d7c8b99b04a83febc5027f4370fb70f SHA512 4306caf88c97be9f63238727dd70ad834011dc33650aa809eaf4ac285febecd7604dc030b285a31167ecb338434fc68eff011528533cda53acdd72ad6a5b5aa0
--- a/app-emulation/virtualbox-bin/virtualbox-bin-5.2.14.123301.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-5.2.14.123301.ebuild
@ -1,287 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit xdg-utils gnome2 pax-utils python-r1 udev unpacker eapi7-ver
-
-MAIN_PV="$(ver_cut 1-3)"
-if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
-	MY_PV="${MAIN_PV}_$(ver_cut 5)"
-	MY_PV="${MY_PV/beta/BETA}"
-	MY_PV="${MY_PV/rc/RC}"
-else
-	MY_PV="${MAIN_PV}"
-fi
-VBOX_BUILD_ID="$(ver_cut 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="https://www.virtualbox.org/"
-SRC_URI="amd64? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_amd64.run )
-	x86? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_x86.run )
-	https://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? ( https://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 "${ED%/}"/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 "${ED%/}"/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 "${ED%/}"/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 "${ED%/}"${udevdir}/rules.d/10-virtualbox.rules || die
-	# move udev scripts into ${udevdir} (bug #372491)
-	mv "${ED%/}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${ED%/}"${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-bin/virtualbox-bin-5.2.20.125813.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-5.2.20.125813.ebuild
@ -1,287 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit xdg-utils gnome2 pax-utils python-r1 udev unpacker eapi7-ver
-
-MAIN_PV="$(ver_cut 1-3)"
-if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
-	MY_PV="${MAIN_PV}_$(ver_cut 5)"
-	MY_PV="${MY_PV/beta/BETA}"
-	MY_PV="${MY_PV/rc/RC}"
-else
-	MY_PV="${MAIN_PV}"
-fi
-VBOX_BUILD_ID="$(ver_cut 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="https://www.virtualbox.org/"
-SRC_URI="amd64? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_amd64.run )
-	x86? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_x86.run )
-	https://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? ( https://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 "${ED%/}"/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 "${ED%/}"/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 "${ED%/}"/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 "${ED%/}"${udevdir}/rules.d/10-virtualbox.rules || die
-	# move udev scripts into ${udevdir} (bug #372491)
-	mv "${ED%/}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${ED%/}"${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,9 +1,5 @@
-DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.14-123301.tar.gz 19589209 BLAKE2B 385bdfb4cef67788a1dd3e758f52dab7a367f56ca8d286e465af9a7674ffe3bc0f6187a66d7d19bb8f2a8fc0e23e0ce7ef35ac2d46fd6971dc2df96e8a61ca11 SHA512 a47a7173685b72995e5012386fc8f6c55f9106049a28ecaea223f58f1bb40077e0929cf05102a2588e516fe90891428b8e569ec9351fcaf235eb9f8293e45b92
-DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.20-125813.tar.gz 19641208 BLAKE2B ffe4e89b88609d575f7e9f5aed5330de5024462ae564684cf3f565b62649d022c8fc9368cfd1685e3e4fc34e9a23cb0651c483f129b533f9afec38bcae89d587 SHA512 df9ae6af9ad1c1106bf8bf0595fdcdd3ec45bc74b90655e762fb18a4c8ea268bed366ce3caaf0f95682577b61b337650a6fe7ef901f6925fa38679ccd885c21c
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.22-126460.tar.gz 19640932 BLAKE2B 162ab40da6b2cd30d00e020666a1f4fb026e29af2ca9d6c36c294e5fa299b61ab8fd147f24d2b500426c768808db2c7693c30e88519e695d7759f8eedf1c52c5 SHA512 85b8552668b6580bea24f051ad861c82b9ba32177fb7fa37fe2980d8bab32a84325d02bfa9c8f55c2021a4000ef2546d8996ca8b99ca7fc19f8281a92108dfb0
 DIST Oracle_VM_VirtualBox_Extension_Pack-6.0.0_BETA2-126642.tar.gz 23239583 BLAKE2B f5444d2472152f3f0701f8e4e29f28c6f86fdd95d15c469d84af42bf5d5f4fb226c26dfe9ce152f0fdfe95537213f68897183c9f9519e795312838fcf9a80a2f SHA512 d2b64456558c48688460f874512ce9c08abd06f06a4a1c8d8548cfd8d17c408ba6344390716add606b3a4a519aab59591a8a454ab6384b8082db07fbc37a275d
-EBUILD virtualbox-extpack-oracle-5.2.14.123301.ebuild 1008 BLAKE2B 5f2de91f90e5eb060a0eb3982b676ddf8956ed2cd730686740198bb5836f373949064c7db28cc699a00f2e40a643fd662bb9b3217bb61dc19ed343589856fb46 SHA512 ac29c2a036b7fdb9088a3ff1d77f1148f6ef8e05783e667b616bfb4243cf6a8f082b282ce76aea06296af56605c65f4c9429de6e5cfed71f905e4b619516e2a5
-EBUILD virtualbox-extpack-oracle-5.2.20.125813.ebuild 1007 BLAKE2B befd34ce4cb647bf650941e2c387391d978a6cbbfced35edb215d3e74d177aa21ecd1f758852784633cfe5aac2ea5bb42eed382d81e2827133ac6146550253fc SHA512 9bfa70d3ca567d03dc84518d9bc7fb835d15964bd8a34c364bd6c4da557d43d9ebe9b84b75e876e9261688a4c1f3585d5fc7224c1022fbf1b8a67a9eec057869
 EBUILD virtualbox-extpack-oracle-5.2.22.126460.ebuild 1005 BLAKE2B b351b31f86d398933afbb8961b07050c9c1d4915eb1679a2a01db45dd6d55bc88ff832add19e2bb1b71731022a180e46830458a18489c0bfed9b9828ea438cbc SHA512 c3aadd73eaefa8c3283eb84a10c53da0d9ebb0e03e86baaea25170f9728b131f093cc14a531d83180072c4692cf62d55ffc7be073bdff03b16d69d37430a2784
 EBUILD virtualbox-extpack-oracle-6.0.0.126642_beta2.ebuild 1065 BLAKE2B 5aa610967f7fff026a9dc48d093376fdf6df0d8fb330faf9604eb8799149ae33a8c7a85071236be49285a05f618a59819d16a8a8f977da897433c44eb7e1cf33 SHA512 17910c0b5fdc745a3013fdcb791fd4f99cf7b5b85fceda8a116fe4f75a02de3087d28ded850de257ec55e6252d68f27a337fb4fa2a993755bc2184d2e98e5a6e
 MISC metadata.xml 260 BLAKE2B 55d9eb1793faf23ffb69c904a9daf755cefe1b1e04fc2331e792a81acc1b699591acb85e005a96e70167e4eba8444e0cfc8f03be4fcdc19487ad6b1cea356f4a SHA512 443c9c27369b12fa4d23ac7e9add34dbf93b54d560ca946dac97801698b79401a80d88c6570530e641ad4f7231a8c1419682e1e11af2b171ca2854c598e05635
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.14.123301.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.14.123301.ebuild
@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib
-
-MAIN_PV="$(ver_cut 1-3)"
-if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
-	MY_PV="${MAIN_PV}_$(ver_cut 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="$(ver_cut 4)"
-MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
-MY_P="${MY_PN}-${MY_PV}-${VBOX_BUILD_ID}"
-
-DESCRIPTION="PUEL extensions for VirtualBox"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://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-extpack-oracle/virtualbox-extpack-oracle-5.2.20.125813.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.20.125813.ebuild
@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib
-
-MAIN_PV="$(ver_cut 1-3)"
-if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
-	MY_PV="${MAIN_PV}_$(ver_cut 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="$(ver_cut 4)"
-MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
-MY_P="${MY_PN}-${MY_PV}-${VBOX_BUILD_ID}"
-
-DESCRIPTION="PUEL extensions for VirtualBox"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://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
@ -1,19 +1,13 @@
 AUX vboxclient.desktop 145 BLAKE2B c01f4c307cd965d271e19f31cab5f902126bdf49bd947329c9ffad4955665b142576438dd124bc323d540cb2f6229c722b2611d4ba405521432965d9d0bddd8f SHA512 90e2ff4b8a67120f7f3c116676c7553243a1bf3c9a76f71ef471bc556c4eee55953e6a5dde952688d4892d469149db8704a921a14755eea66b1789805fe3ca42
 AUX vboxguest-4.1.0-log-use-c99.patch 393 BLAKE2B 5363bcc98696e06d64e232043f89e4881390f43efafe8624ab23d78338e64bfee385c18a160553f17cfa36e81151d1c5d1889d31abd7caf942d7034043ab1288 SHA512 7327faccd5095706d097f2b47acfea21736291ed54ee7b605670fdfddf5f09815759dc49f9497d06e5920043e0b5b9af1b4ee0993ea13e5055641cbeedd66d6f
 AUX virtualbox-guest-additions-5-localconfig 937 BLAKE2B 4ad7e6520572ed5b3ee29c03b77fb1a4df5279e38929c4e6e446387f30eef9fd8f32b9f877db1074c0e28f9a461ec3114e7120f636e02ce41a72a81b1e69c62e SHA512 ccbc2db825060fd5044e42bf4e53271d6e64a7a400b09705230006367e696dd3bff384f1e4873bf2aedfec8e6fdc8f8ecc537cd5a1fe629727c2943371d13e40
-AUX virtualbox-guest-additions-5.2.18-linux-4.18.patch 1064 BLAKE2B e8097cb1556ba056357fce53e603f073c11f9b170e6744073ef4373f5aaa5d27b0d7d87b11c46702954c1139bd1bed8bb2335b57b20da7b76b3c074fda4dc86e SHA512 5f833601fcebfe909f87d2af184cb00311bb574adaf7a027f3b5fc6a4dd8c9388a2dcc1e1ce86f580d24bdcb2cc2bda003461f478939ecb3a4b9ea38a74681d0
 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.2.14.tar.bz2 118597539 BLAKE2B 5e0a8d92405378eb438cae375041609f7a0e1288b040d3a0bcc06157f16ddd48b3537f2f026aa12a71c5319bdef56d6f3907785ac51ebe05a8b7143e04f22d0a SHA512 b8202eccd83e9f2c92a77548d003082b6b3ff7838bb32ae48c3a25dcd622bfdc8ceca42cc49b855eeabf4439c55ad42df9b3959dd1bab77de154468e139c904e
-DIST VirtualBox-5.2.20.tar.bz2 118760364 BLAKE2B 7a5f72340796d3278ef5f3210f4b25bf4d999ec93cdd0449853faf68b38c45a6ffd00fe2c88f12296029882f7715c012d1793cfff9d1c2441aa4db414fa3225e SHA512 ff039e487c43b584c5c5959df1622151d82f6c39101af869262f800d07e68a68005ed442112e36ebe249ed79de34c0b974bbd43e7889a5d40df2ebe7dec77a15
 DIST VirtualBox-5.2.22.tar.bz2 118757134 BLAKE2B be795cdbfb09d3d443f63e190b63898239622f5a57aefdd90f382d9a849d09cc1abc2624071fbc60b2c04a12f33376184540cc362c19225733f99a3bcc8ff6a3 SHA512 4f6c4611a3114778f45419587dc1519ca07410c1ea6474cdb18ecd3b068639a4fdac3f25146fe9b8e006e30f19eba134ce9f665182008b033f6f78497e1ea722
 DIST VirtualBox-6.0.0_BETA2.tar.bz2 150947619 BLAKE2B 53ed4cfea4a9e62cb8ba68089e3b6cea04b33950496e8aa945591f0d30bb69bbf02428b6bd6dd67afbc916d612b0135ea10124741c0538b917749f46935cf834 SHA512 10f7bd5c7c14d79ed1bf4662fce76d66f4f61bba1a9c8c7dfff57dad2dd6eaf2ae03911fdc994d53769f872079d7a04a1732126fc1aa9907237cbdccefda3348
-DIST virtualbox-5.2.12-patches-01.tar.xz 2616 BLAKE2B 5731484d185414d83588ee227bbc1eef266451d1a3a710adf1b769cd6404ef1750dba7a60549f2ab9f3fb81ef15809db9ea0190127caefc72d7bc9bb8b741fb0 SHA512 712b55392a8e8357e95abb42ea4f8dac3391ecbf9cbecf27c7dbf674c40f42a1eb19d227a1b3adcf621384a9f64a6438d20fb43866c736189097fb5770c5c654
 DIST virtualbox-5.2.16-patches-02.tar.xz 3152 BLAKE2B c8d8f3872f544a465c7d1aa07291599307120ac9eabfb299ddd788a11f85ca6c2d84b8e7306ee4ad436270dad0dd39f101ee68a549eac15afd1e3cdc03f23c6c SHA512 85ee8c4045de562d71ab2d761695ea48b6726a6f0c4bcaa2562bb0d147542d3f1a1b5b47cf593a7f22dac1b86f87b59a56bef421dce3e1fa8e5260cd41998450
 DIST virtualbox-6.0.0_beta2-patches-01.tar.xz 2732 BLAKE2B a138e715d99f135f16ca21c92781bf6cd8913f7f766bb598eddcd63e98280e568e646f56bbd0a3714f273457ca90db0b77ec7940ba25028506a22891f1af7b2d SHA512 954e4b40d6e272efe756ee0965adb4110d45f764433a89080fda7ebaebbc20031f86a3e0027dfdaa1c6a7d6379a1af557cea71512504e4b57b5f5adbfc86b56e
-EBUILD virtualbox-guest-additions-5.2.14.ebuild 6162 BLAKE2B 387d7b3c897d68db498014ff54490b4c2b40683e4a37d53e9f1a93a42c71b04dffdd964344bc5a01a659e5f173d0996552a92eabe3c7273f6d82db4c3eb9596a SHA512 ec620e474c1906ae7bb0d2c1d57d22dbc0055e3e432daf67acefd1198a2fab0d078c1568b64bd86d7734ac94674c4cd326b8de0c64ca1ccf5806c61b86a4dce4
-EBUILD virtualbox-guest-additions-5.2.20.ebuild 6012 BLAKE2B 3bd29aa5b1464d3c511df21f0415e1b10c597c4c867fcbe11a1477b22990f3e1b418e4845bd848820b475ccf420a1e4a238707f192df7736a2038ad8f465e714 SHA512 9ee2e007b7534effb72caf52b7fdadcd8f6692b62492d493ad1185ef0a33509925b1e38fb149b121d1af36bc9bf883b4927a28ec233775fa12f9030dfd4099bc
 EBUILD virtualbox-guest-additions-5.2.22.ebuild 6010 BLAKE2B fdf621c8d0f93220553c81b877571144c1bb2fdf000db0a45350fbc98f0cf96b703029874459fc56cec303d7c63c2046a1225a964b58fb45c234a4a679829e11 SHA512 acda6a782e5ebc605ff37c7c814192f87f607a67fba5ac49bdab201faf7326352c4153c0f74bd4431789763641879d781631d5c52cf23c1b583d91da4c9e2ebe
 EBUILD virtualbox-guest-additions-6.0.0_beta2.ebuild 6073 BLAKE2B 5190c5b2f7bb43768c5c383946fc32c8ab558a4695b431706baa31fe32f17643daa6915c4cb2a3d76abc006dbd463eb3d32f1ad0036c7d00dbc62dd75e33ea51 SHA512 827bb031a87b240a0da583d077839afe834947c25c6f03dbd54cc18b494524522a1a65a8bee56d5533c2a6fb1f2dff53d2be313b5b1d736ada7694272a93db9e
 MISC metadata.xml 260 BLAKE2B 55d9eb1793faf23ffb69c904a9daf755cefe1b1e04fc2331e792a81acc1b699591acb85e005a96e70167e4eba8444e0cfc8f03be4fcdc19487ad6b1cea356f4a SHA512 443c9c27369b12fa4d23ac7e9add34dbf93b54d560ca946dac97801698b79401a80d88c6570530e641ad4f7231a8c1419682e1e11af2b171ca2854c598e05635
--- a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-5.2.18-linux-4.18.patch
+++ b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-5.2.18-linux-4.18.patch
@ -1,29 +0,0 @@
-Author: Larry Finger
-Origin: https://www.mail-archive.com/vbox-dev@virtualbox.org/msg09363.html
-
--- a/src/VBox/Additions/linux/sharedfolders/utils.c
-+++ b/src/VBox/Additions/linux/sharedfolders/utils.c
-@@ -50,7 +50,11 @@ static void sf_timespec_from_ftime(RTTIMESPEC *ts, time_t *time)
-     RTTimeSpecSetNano(ts, t);
- }
- #else /* >= 2.6.0 */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 18, 0)
-+static void sf_ftime_from_timespec(struct timespec64 *tv, RTTIMESPEC *ts)
-+#else
- static void sf_ftime_from_timespec(struct timespec *tv, RTTIMESPEC *ts)
-+#endif
- {
-     int64_t t = RTTimeSpecGetNano(ts);
-     int64_t nsec;
-@@ -60,7 +64,11 @@ static void sf_ftime_from_timespec(struct timespec *tv, RTTIMESPEC *ts)
-     tv->tv_nsec = nsec;
- }
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 18, 0)
-+static void sf_timespec_from_ftime(RTTIMESPEC *ts, struct timespec64 *tv)
-+#else
- static void sf_timespec_from_ftime(RTTIMESPEC *ts, struct timespec *tv)
-+#endif
- {
-     int64_t t = (int64_t)tv->tv_nsec + (int64_t)tv->tv_sec * 1000000000;
-     RTTimeSpecSetNano(ts, t);
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.14.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.14.ebuild
@ -1,228 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit 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="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.2.12-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 )
-	sys-apps/dbus
-"
-DEPEND="
-	${RDEPEND}
-	>=dev-util/kbuild-0.1.9998.3127
-	>=dev-lang/yasm-0.6.2
-	sys-devel/bin86
-	sys-libs/pam
-	sys-power/iasl
-	x11-base/xorg-proto
-"
-PDEPEND="
-	X? ( x11-drivers/xf86-video-vboxvideo )
-"
-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}
-
-	# Apply before we create archive with Linux guest kernel modules
-	pushd "${S}" &>/dev/null || die
-	eapply "${FILESDIR}"/virtualbox-guest-additions-5.2.18-linux-4.18.patch # 663488
-	popd &>/dev/null || die
-
-	# 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.sh "${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"' \
-		>> "${ED%/}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
-		|| die
-	echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${ED%/}/${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-guest-additions/virtualbox-guest-additions-5.2.20.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.20.ebuild
@ -1,227 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit 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="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.2.16-patches-02.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 )
-	sys-apps/dbus
-"
-DEPEND="
-	${RDEPEND}
-	>=dev-util/kbuild-0.1.9998.3127
-	>=dev-lang/yasm-0.6.2
-	sys-devel/bin86
-	sys-libs/pam
-	sys-power/iasl
-	x11-base/xorg-proto
-"
-PDEPEND="
-	X? ( x11-drivers/xf86-video-vboxvideo )
-"
-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=/lib/modules/${KV_FULL}/build KERNOUT=${KV_OUT_DIR}"
-}
-
-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.sh "${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...
-	local vboxheader mdir
-	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"' \
-		>> "${ED%/}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
-		|| die
-	echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${ED%/}/${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_preinst() {
-	enewgroup vboxguest
-	enewuser vboxguest -1 /bin/sh /dev/null vboxguest
-	# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
-	enewgroup vboxsf
-}
-
-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
@ -3,12 +3,8 @@ AUX virtualbox-modules-4.1.4-pax-const.patch 1729 BLAKE2B 3cada201a2bfde671c073a
 AUX virtualbox-modules-5.1.30-udp.patch 1239 BLAKE2B d49d96894bae2fdedc2b8a825c849a99ad0cf36a92cc4d89881ce72a0b7ebd53174f39e298c119670654932b790113fe7fbc3a3bae552f2c597cad20a370141f SHA512 f22e6c8edc360e0f97b207ba9a046042ef1898c10c724d9519badef004858720040caef12bffa1ed0f07517ae2d0b831973a0e4ef8ffb239a26faf62706b0618
 AUX virtualbox-modules-5.2.8-pax-const.patch 1728 BLAKE2B 1a2e8c5946af5abcf443c8cea08a6dbe78f75dd89aa072ac2ac0d745e598e8195ef321eaee53d31bedf52013d94efc046863e65c9fac0d61a507b292b04c7fb9 SHA512 600fd557992efb1fb5db9db64914becd5a86f81a42d70bbc3823533df941881f2289a6ccf630adb8346419499dd48b84ed43c21d0aba183a780daa99fcafddbd
 AUX virtualbox.conf 38 BLAKE2B 4f03cb09a1cca36013beb2a38220115d63510fd0aa63e2df1f0dc755a9162f7c2efed32d8f9c98fcc1e36d48067471085d5b038c6e8b3118508fbaaaab3790f7 SHA512 63eba0963b3344ea7e7a0035560406899d878a0761cddef9853bec95deb9812b221e98f446f240070d6448d61d6ecbcf7a990bcd52863660e8f21cf9a98c0e1d
-DIST vbox-kernel-module-src-5.2.14.tar.xz 637352 BLAKE2B 7ccefbb13f25fe995e0f769192a93baa91358c09e7126d6a6c8bef7fceeab50082f78843140d23cf88c4931c561552c4131b17625e7a3821766571387d78d2a3 SHA512 920eca67fb10ed4d1eeab95b14e65c585dd96df82a4690c34c9d85366ec6dd9835f9a772eb4718a80e6ffb2637de2a698151a6bdfd7984fc2070cd0bade5c077
-DIST vbox-kernel-module-src-5.2.20.tar.xz 638452 BLAKE2B f8fa29e21a77ebfec765ce0e006aaba9fdc76773e216d0c24c705e688730598e85b2c191406acd376f4020c67e296b6f22b0acecb7f15f3e343233b4a7da62fa SHA512 5378be30ab697ded6c07e74b15a38331914b19f72c55847e92e6e89541c25d89aeb6020aaaa3820e84902efb10a5b7ba7190a5271da93cd490b25fcbd787bf28
 DIST vbox-kernel-module-src-5.2.22.tar.xz 638492 BLAKE2B 71aba29b056bb3dfeffbf4632fbf7f15d89b988267ba24c766b78b1d9c50a4d27fb1b8e699108b973af68024f9f77ca0a8ad787355d7342fe1400f14189487ff SHA512 3361bb536af8e8d490377be04d1b1b9af478538e23ec409d3e0205ad930c16e5228c57ae7d92d214ac533ae64298d9eaff3c9284ff9bb308108d1ad7d69fb507
 DIST vbox-kernel-module-src-6.0.0_beta2.tar.xz 664280 BLAKE2B b309b38cfb3986ed9efa38e70998977d14d79b4b8b6796e735be16c957cc7248714eb94e14b6a7ec8be2f7b7ccf555fb556bd8884bfe66d599a23742ed40a8fe SHA512 56267c1c37f1c4cd549777c53533fa7063f95df47d59eaa890f6fda90dddaa768c8cb51313591ba5d3509e5c59597062866efba492a55d8554dafd95b316e42e
-EBUILD virtualbox-modules-5.2.14.ebuild 1197 BLAKE2B ea60276403c90846417bbf24cd2df6bccc67403900987e07697bcdb0a4801422690a7e413be9e87fe2be93eec4fa491d50e4fe1c3035145725bf432738cb0e86 SHA512 cfc1fec4a8fbc000bb40cdc68f66ab7f6b0da91d956fabd462e44fcb7ba7dd2a22b798a8cc129d9abd492d1f04e994da2ab1680467a6d94fa1b23f90381ef548
-EBUILD virtualbox-modules-5.2.20.ebuild 1189 BLAKE2B ded291957f85a194492d5c43bf9e9733b03466323d74d5a37932a0a35d86cc585106f7910893ffb88751a01de9cc2fc00f6743225e8820b501ed892f50644dc9 SHA512 106126714a5b82a5ebd02733d8dc8e48844543eba33297a0a4e507031a0bd34ed6d44675a588f1401e32f19845a93d492e6bd1e5033d056b04cea3fa0c6678c0
 EBUILD virtualbox-modules-5.2.22.ebuild 1187 BLAKE2B e6e3307a1b856612c589f498f536d1ae864a3ba22dfe97845f8d596f6f8d7a80b82c9e6173392d56962b62e745b0881a8cdda1146f7529187d8d1fd6c0c05708 SHA512 7d35b69bc75414c7195161531bc065e788e3f8fcb79e89fe8df2138339735571fef79ba0fc25ac39b954842995b22af9ea6fa28166027da2a8d39439cf33930f
 EBUILD virtualbox-modules-6.0.0_beta2.ebuild 1245 BLAKE2B d6196f90bf25c7faf01fcd6830c8f036642b4cd0c9a624121faabb45868119fe4fe4d7967442875a6bb96240aca4244440311d33c56532001866f9cc7e149d7f SHA512 0c44aba646f7639b99ef8bd774978ab2027118a6b158161e0df7d7a0383d0e153658ed7de68e48ec75f37747dfa362266455094c4e5005239b0fdce2140cbc97
 MISC metadata.xml 353 BLAKE2B d7de13b3a8966ab3bca54ae77f7f6c7dfd57f2c5941f09ab1b5f79ac798687ffaaa183afdf9c034a9d50fda8507a3aaa2ef0c11d0fdfa6e09a55a1bdb9f30f4a SHA512 40029c9a246dde5ed51119f42ec5448b7ae08a47ee4d6be201fef282305c809d7d3182abf807dd2444ffe1a980abcd670878567d948bcd3661a55c6848a37000
--- a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.14.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.14.ebuild
@ -1,51 +0,0 @@
-# Copyright 1999-2018 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="https://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
-	linux-mod_pkg_setup
-	BUILD_PARAMS="CC=$(tc-getBUILD_CC) KERN_DIR=${KV_DIR} KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
-}
-
-src_prepare() {
-	if use pax_kernel && kernel_is -ge 3 0 0 ; then
-		eapply -p0 "${FILESDIR}"/${PN}-5.2.8-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
-}
--- a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.20.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.20.ebuild
@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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=7
-
-inherit linux-mod user
-
-MY_P="vbox-kernel-module-src-${PV}"
-DESCRIPTION="Kernel Modules for Virtualbox"
-HOMEPAGE="https://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
-	linux-mod_pkg_setup
-	BUILD_PARAMS="CC=$(tc-getBUILD_CC) KERN_DIR=${KV_DIR} KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
-}
-
-src_prepare() {
-	if use pax_kernel && kernel_is -ge 3 0 0 ; then
-		eapply -p0 "${FILESDIR}"/${PN}-5.2.8-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
-}
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@ -9,15 +9,10 @@ AUX virtualbox-6.0.0_beta2-no_libopus.patch 1306 BLAKE2B 4e89c323a8fe8e54efb1c97
 AUX virtualbox-ose-5-wrapper 3405 BLAKE2B 92001ed3397a22abb5955617451bfb78d1f1f62f9be99cf87c57c42d118abb42b9436a0a83736d882b34360c9f8e67f9a8adaeffe7e9a3456c4ddc93a7850e53 SHA512 96f9ab8e2a83b5aebbb66916cbca0a7af0e2d69285296fe87869f096149791e0491dec2408f21f7249b68d928eebe396ab710a4ec6b6d6bc9c67120d323effa0
 AUX virtualbox-ose.desktop-2 201 BLAKE2B 05fbf657e8c1d8ec46f1b88e681efd50a4e5ab2a0f32f3fd25ca956e1e9bff6357c69a96628e3eba26b01869b6dc596f68f739f9330fa3018c186dfa0fdcea06 SHA512 a678e237ad0451e8785f242ebf822b4f3b03d2e2280a62f71728f79bdcfc84d3465ee60cad90db75e64b2c89a1b0b224de00519728fb605df67ca7c9aee0874c
 AUX virtualbox-vboxusb_tmpfilesd 35 BLAKE2B 56937e236a0e4d1a2aa085271e8ae0af9553fdf7c3b804af4d3fda3aa8dbc32d63762fee90bc949390cb9cd67f2f0111894c8af084731dab6920ae1675c69a64 SHA512 72e4602f5f214f8833486f5c787c263a10390e8bdf65b5615d67c35ec44048f02add12fe43b19f9c57a9d2f12d768c52e54fcfb9052c0611d06cc988a698c171
-DIST VirtualBox-5.2.14.tar.bz2 118597539 BLAKE2B 5e0a8d92405378eb438cae375041609f7a0e1288b040d3a0bcc06157f16ddd48b3537f2f026aa12a71c5319bdef56d6f3907785ac51ebe05a8b7143e04f22d0a SHA512 b8202eccd83e9f2c92a77548d003082b6b3ff7838bb32ae48c3a25dcd622bfdc8ceca42cc49b855eeabf4439c55ad42df9b3959dd1bab77de154468e139c904e
-DIST VirtualBox-5.2.20.tar.bz2 118760364 BLAKE2B 7a5f72340796d3278ef5f3210f4b25bf4d999ec93cdd0449853faf68b38c45a6ffd00fe2c88f12296029882f7715c012d1793cfff9d1c2441aa4db414fa3225e SHA512 ff039e487c43b584c5c5959df1622151d82f6c39101af869262f800d07e68a68005ed442112e36ebe249ed79de34c0b974bbd43e7889a5d40df2ebe7dec77a15
 DIST VirtualBox-5.2.22.tar.bz2 118757134 BLAKE2B be795cdbfb09d3d443f63e190b63898239622f5a57aefdd90f382d9a849d09cc1abc2624071fbc60b2c04a12f33376184540cc362c19225733f99a3bcc8ff6a3 SHA512 4f6c4611a3114778f45419587dc1519ca07410c1ea6474cdb18ecd3b068639a4fdac3f25146fe9b8e006e30f19eba134ce9f665182008b033f6f78497e1ea722
 DIST VirtualBox-6.0.0_BETA2.tar.bz2 150947619 BLAKE2B 53ed4cfea4a9e62cb8ba68089e3b6cea04b33950496e8aa945591f0d30bb69bbf02428b6bd6dd67afbc916d612b0135ea10124741c0538b917749f46935cf834 SHA512 10f7bd5c7c14d79ed1bf4662fce76d66f4f61bba1a9c8c7dfff57dad2dd6eaf2ae03911fdc994d53769f872079d7a04a1732126fc1aa9907237cbdccefda3348
-DIST virtualbox-5.2.12-patches-01.tar.xz 2616 BLAKE2B 5731484d185414d83588ee227bbc1eef266451d1a3a710adf1b769cd6404ef1750dba7a60549f2ab9f3fb81ef15809db9ea0190127caefc72d7bc9bb8b741fb0 SHA512 712b55392a8e8357e95abb42ea4f8dac3391ecbf9cbecf27c7dbf674c40f42a1eb19d227a1b3adcf621384a9f64a6438d20fb43866c736189097fb5770c5c654
 DIST virtualbox-5.2.16-patches-02.tar.xz 3152 BLAKE2B c8d8f3872f544a465c7d1aa07291599307120ac9eabfb299ddd788a11f85ca6c2d84b8e7306ee4ad436270dad0dd39f101ee68a549eac15afd1e3cdc03f23c6c SHA512 85ee8c4045de562d71ab2d761695ea48b6726a6f0c4bcaa2562bb0d147542d3f1a1b5b47cf593a7f22dac1b86f87b59a56bef421dce3e1fa8e5260cd41998450
 DIST virtualbox-6.0.0_beta2-patches-01.tar.xz 2732 BLAKE2B a138e715d99f135f16ca21c92781bf6cd8913f7f766bb598eddcd63e98280e568e646f56bbd0a3714f273457ca90db0b77ec7940ba25028506a22891f1af7b2d SHA512 954e4b40d6e272efe756ee0965adb4110d45f764433a89080fda7ebaebbc20031f86a3e0027dfdaa1c6a7d6379a1af557cea71512504e4b57b5f5adbfc86b56e
-EBUILD virtualbox-5.2.14-r1.ebuild 13790 BLAKE2B 7c8a3104b1c3753da92251d3b19df32b6c9aad0fb9a5e63c5325f0ed9baabed05c474c1d8fd38755a298fceb031e33c9b5a2fea072199f96b213b56d43859a16 SHA512 23bc6ef62a11e9c268c5561d7bca81c80f5e81ff5f9386a0c6fd95316444de90cc9bbbeb709776d9ec0955943c4bed921aa9eb07dd42d009f766cd7a613099c7
-EBUILD virtualbox-5.2.20.ebuild 13859 BLAKE2B 0e1beb65698594fde62eb6d628615da0749aa3f176164d704fd01d8641d0847de4f7369011394615b5365145c64c3008fdb6f7aa178c7b978be8da240df45656 SHA512 77801420fca64c392ab80e2eca8107b597fa3d02ef33032d60ddd07933239d8ec987744566da015a10ccc256a7b7fe025dc6ca7cf405b02dd6d4434882649a2e
 EBUILD virtualbox-5.2.22.ebuild 13857 BLAKE2B 2b27ee756ccb7b3dc03228c236768d2c07a282ae04d18184ebf523c5846edbf68f035546c3bc93720e3e5647d5334a2326455718cb98ea2ebcd6d356f6f822b7 SHA512 dd9d340c9f438f1f7d7d10fdbefea54dc2e38c5a40bb8d02739a38fb5098700805950bb3dc45418ea99ff04fe4f05d019d4dfbea99044eec4e231d44f9ccd7af
 EBUILD virtualbox-6.0.0_beta2.ebuild 13962 BLAKE2B 853086b30290c705f44568658951efaa996f455fb02a7493c892ada60a9e0dc647fad76d373794a4213388715784b6fde78d8bd891014a41750831088c1ac0bd SHA512 76f9bed9433dde4b8610695e446942d1b055a9ba239bd00e217a7634e52dbb6f9aa27062b42737dda15ed2796fe19e88564896ac0e75b4f1397a86ccf39c64ce
 MISC metadata.xml 715 BLAKE2B 76ee0065ae39b8775af3837eea940291bfd584ddc92b03629c138013d342c8e388ed61fe2dc6f22caaec093f1aa5dabddb6b8c3ae5f7e07150dd063a1e567b47 SHA512 8997ad296ccb4100bc34551601b5361b8ac0d4f2f863bb5a85f55d5b6eeb6b3fcc3dee9c91bd731f52009a2892936e170db8674bf453b59fe4768a5a1c94b2b2
--- a/app-emulation/virtualbox/virtualbox-5.2.14-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.2.14-r1.ebuild
@ -1,474 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit flag-o-matic gnome2-utils java-pkg-opt-2 linux-info pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg-utils
-
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=VirtualBox-${MY_PV}
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.2.12-patches-01.tar.xz"
-
-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/libxcb:=
-		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
-		)
-	)
-	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.3127
-	>=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/jdk-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}"
-RDEPEND="${RDEPEND}
-	java? ( >=virtual/jre-1.6 )"
-
-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"
-
-S="${WORKDIR}/${MY_P}"
-
-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
-
-	# 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.2.8-nopie.patch"
-	fi
-
-	# Only add paxmark patch when we're on pax_kernel
-	if use pax_kernel ; then
-		eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch
-	fi
-
-	eapply "${WORKDIR}/patches"
-
-	eapply_user
-}
-
-doecho() {
-	echo "$@"
-	"$@" || die
-}
-
-src_configure() {
-	local myconf=(
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-		--disable-dbus
-		--disable-kmods
-		$(usex alsa '' --disable-alsa)
-		$(usex debug --build-debug '')
-		$(usex doc '' --disable-docs)
-		$(usex java '' --disable-java)
-		$(usex lvm '' --disable-devmapper)
-		$(usex pulseaudio '' --disable-pulse)
-		$(usex python '' --disable-python)
-		$(usex vboxwebsrv --enable-webservice '')
-		$(usex vnc --enable-vnc '')
-	)
-	if ! use headless ; then
-		myconf+=(
-			$(usex opengl '' --disable-opengl)
-			$(usex qt5 '' --disable-qt)
-		)
-	else
-		myconf+=(
-			--build-headless
-			--disable-opengl
-		)
-	fi
-	if use amd64 && ! has_multilib_profile ; then
-		myconf+=( --disable-vmmraw )
-	fi
-	# not an autoconf script
-	doecho ./configure ${myconf[@]}
-}
-
-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 "${ED%/}"/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 "${ED%/}"${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
-
-	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"
-	doenvd "${T}/90virtualbox"
-
-	if ! use headless ; then
-		vbox_inst VBoxSDL 4750
-		pax-mark -m "${ED%/}"${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 "${ED%/}"${vbox_inst_path}/VirtualBox
-
-			if use opengl ; then
-				vbox_inst VBoxTestOGL
-				pax-mark -m "${ED%/}"${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
-			doins -r UnattendedTemplates
-
-			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 "${ED%/}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
-			java-pkg_regso "${ED%/}/${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
-
-	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-
-	if use udev ; then
-		udevadm control --reload-rules \
-			&& udevadm trigger --subsystem-match=usb
-	fi
-
-	tmpfiles_process /usr/lib/tmpfiles.d/virtualbox-vboxusb.conf
-
-	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 "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() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
--- a/app-emulation/virtualbox/virtualbox-5.2.20.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.2.20.ebuild
@ -1,476 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit flag-o-matic gnome2-utils java-pkg-opt-2 linux-info pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg-utils
-
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=VirtualBox-${MY_PV}
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.2.16-patches-02.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug doc headless java libressl lvm +opus 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/libxcb:=
-		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
-		)
-	)
-	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:0= )
-	lvm? ( sys-fs/lvm2 )
-	opus? ( media-libs/opus )
-	udev? ( >=virtual/udev-171 )
-	vnc? ( >=net-libs/libvncserver-0.9.9 )"
-DEPEND="${RDEPEND}
-	>=dev-util/kbuild-0.1.9998.3127
-	>=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/jdk-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}"
-RDEPEND="${RDEPEND}
-	java? ( >=virtual/jre-1.6 )"
-
-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"
-
-S="${WORKDIR}/${MY_P}"
-
-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
-
-	# 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.2.8-nopie.patch"
-	fi
-
-	# Only add paxmark patch when we're on pax_kernel
-	if use pax_kernel ; then
-		eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch
-	fi
-
-	eapply "${WORKDIR}/patches"
-
-	eapply_user
-}
-
-doecho() {
-	echo "$@"
-	"$@" || die
-}
-
-src_configure() {
-	local myconf=(
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-		--disable-dbus
-		--disable-kmods
-		$(usex alsa '' --disable-alsa)
-		$(usex debug --build-debug '')
-		$(usex doc '' --disable-docs)
-		$(usex java '' --disable-java)
-		$(usex lvm '' --disable-devmapper)
-		$(usex opus --build-libopus '')
-		$(usex pulseaudio '' --disable-pulse)
-		$(usex python '' --disable-python)
-		$(usex vboxwebsrv --enable-webservice '')
-		$(usex vnc --enable-vnc '')
-	)
-	if ! use headless ; then
-		myconf+=(
-			$(usex opengl '' --disable-opengl)
-			$(usex qt5 '' --disable-qt)
-		)
-	else
-		myconf+=(
-			--build-headless
-			--disable-opengl
-		)
-	fi
-	if use amd64 && ! has_multilib_profile ; then
-		myconf+=( --disable-vmmraw )
-	fi
-	# not an autoconf script
-	doecho ./configure ${myconf[@]}
-}
-
-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 "${ED%/}"/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 "${ED%/}"${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
-
-	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"
-	doenvd "${T}/90virtualbox"
-
-	if ! use headless ; then
-		vbox_inst VBoxSDL 4750
-		pax-mark -m "${ED%/}"${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 "${ED%/}"${vbox_inst_path}/VirtualBox
-
-			if use opengl ; then
-				vbox_inst VBoxTestOGL
-				pax-mark -m "${ED%/}"${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
-			doins -r UnattendedTemplates
-
-			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 "${ED%/}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
-			java-pkg_regso "${ED%/}/${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
-
-	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-
-	if use udev ; then
-		udevadm control --reload-rules \
-			&& udevadm trigger --subsystem-match=usb
-	fi
-
-	tmpfiles_process /usr/lib/tmpfiles.d/virtualbox-vboxusb.conf
-
-	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 "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() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
--- a/app-forensics/sleuthkit/Manifest
+++ b/app-forensics/sleuthkit/Manifest
@ -1,8 +1,12 @@
 AUX sleuthkit-4.1.0-tools-shared-libs.patch 1678 BLAKE2B f60496480425fd78bc211a663be80db2472a9683f1ff76c747f8190d5544df532857f6e1fb4343d0405f8bf51aa7b7bf86ed55fffbeea0153341ce9f2dca077b SHA512 b559f669837194bed447ac269884ab50e6ea746aba2df799688964245c22814567871f12f96d43ba74016d5c448247b02bef5d7bdfd32fd782ef5e668686238e
+AUX sleuthkit-4.6.4-default-jar-location-fix.patch 1768 BLAKE2B d9a0675223506649a5db7aa4e0ef883ecea84c8484836d2020528696f13e14bbe9334c2967c7b698126fb1cedd6a6719fbbe3fb945b4ea9b89d643a61232d5e8 SHA512 acc076ca74d3e5d7c75425292730783801a7afe858ea119186229a319ba4fd2e076c1214daca3e4aa3d5a7717c5ed08a9ca0bf11bb4dc2a04d3aad190dbf57c6
+DIST SparseBitSet-1.1.jar 23706 BLAKE2B 8623a723f11f97386a108c775fefddd324997b68bea7f7ade0581ec5800bfa8d32f699ab903ad66c631b7b5c69ba1ef377243653f5044f39234dac07543eb129 SHA512 cf75431c5f705961800ce5cbca2acb9b2459eaf98ec37b5ee21c5a90d204ffb466fa25457b0560fbb024489777efbea0276201024c7b1b2853124930ac490983
 DIST libewf-20130128.tar.gz 1978794 BLAKE2B e5d2bd8f4a8b878e13536b89b032d8cee6982272065b2bf325f8a811dff258264118a79496912377337ceb9ad630138b6bedb89e3c3be89a5f6a6fea85ab586b SHA512 94cdd0c3f0d8f535f3462c5adba266302f9b129abacda077ed429fa38af6862fca5a90ba2e606b78607b509769305cc6134c483c7033c20e226596cca2d42b90
 DIST sleuthkit-4.5.0.tar.gz 8611141 BLAKE2B a1ae66bfcb74ce1fec24f80dfe60cd68f1de53119331c38848f7f82de8052eda49d78fdea49e42ada5843094939ef212dece42a5ceb85931a79e02adccda30e6 SHA512 911890cacca739f121681514197104cb2dc3bd219f3e068c4ce61264498c56989359976fc75172e1f456c94e4e25c6206413b0234c36e55736a577b8e664e4b3
 DIST sleuthkit-4.6.0.tar.gz 8634432 BLAKE2B b45721cdee798d84f0caa0bfe38645346539bb497f5a492c72016a6b3b0246b362ecea676a7a0e788d66cc0dc32335e719912434bd61aa205b7d51b8d4bd7c14 SHA512 dbf880e8503dccb0a686f1d9658d56e9cb40f452127f9b713cf2a4941f4083fa1cf80a886994d58421307a679242cd4ee005b3e874cf429cfb140a597a0dc739
+DIST sleuthkit-4.6.4.tar.gz 8655341 BLAKE2B 9d8a2884d1c90e9be3104221c22fdc4346c8f288a13384ef8205cea46bbda2249691b548b7d19a1b34d6d0d1fc6d5390aa0fc8c8b28ea75b53de946b62c8e25c SHA512 0dd3fc3659fd6dee49ababd8033bcc5ce218c9154b61eb072a943e8d1a96fb04dcabc85124583bc69ad0ced2609fed11812164a3db6587446255a9c507f08762
 DIST sqlite-jdbc-3.8.11.jar 5131732 BLAKE2B 1a04fa9e9cb97fdddc19af2de9efa7b54c0b527642e6e325e31054e4e294e3bc6af00ea291087ed9dd26668d48dae356035fc85212c0eb81656550d552103ed0 SHA512 5f4705101992e8916e29742c560aef0d01eba9dc0d2d984b75a77e56be3c9fd20b284390fe8f9bb54bf9d1f8528c3413922684c446212ca8961ac731543fb179
 EBUILD sleuthkit-4.5.0.ebuild 3948 BLAKE2B 33f4f1e2e5b1031557bc8b7c029bee10024cf32b6da46f966249aac1f476bd08bb6b721ced23ce3f289e5a666f456553f03d5977b05ff01d36d61da7bca93ed7 SHA512 a3bed0d219bf0b2768e3cacbcee2707152a5589cda3eb2810449b23fe89f21a7f8d1c237fed7e34ac2fbf249f1d2485b4b9e394a890d254c6a65793b3fac3326
 EBUILD sleuthkit-4.6.0.ebuild 5607 BLAKE2B 614f3183afbc167dee2aad4bb7483358cc98af8c6851d020ef6838fc51e4b9f5dadaf2c0615923e88a6188a78523b93b19d2abf87b388ec0fec56c26e740d9e3 SHA512 69e2a25b8cc77c4789b7d501604a8017d7059249de21b15e0bf108c4f42a7350e3a57d4adc24de19ed235a3cc67ce4d0d86719bf4ef0e6016bc3aa30cc3bfc4c
+EBUILD sleuthkit-4.6.4.ebuild 6531 BLAKE2B f3a1301ea2b51f13d15830d6f513dc3da6f43979a39837dc5e27575b7d03d1e31d54b56d0876e27fdf5c3778afce54ec5b95350b734b65e1096c0c444038310c SHA512 248e3721ce7bdb2bcad8d157a1f05526607347f34ab3b8d6b75b881fd63cb5501178e1bb677c3048229a78458fcde5f5125147ee61ed2021ec59cca85eac7346
 MISC metadata.xml 607 BLAKE2B 2c651da1253ec986eb766b6949ea9a9059d76351081e805aba5f795971bb3b9368987cc9d39fc335c1e65c12de9347471686984e2753487cafab431488762064 SHA512 2dbce141f133a9172c6ba61924a9fac2674394096063b899be5a90111a9741789e2a09aa06cc49e17a253d088d20c1ddad1c748b6e09f650131ec0f91116ae08
--- a/app-forensics/sleuthkit/files/sleuthkit-4.6.4-default-jar-location-fix.patch
+++ b/app-forensics/sleuthkit/files/sleuthkit-4.6.4-default-jar-location-fix.patch
@ -0,0 +1,58 @@
+From f8c1cada7f01826b15a82b20600b8df7562fa2ed Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?G=C3=B6kt=C3=BCrk=20Y=C3=BCksek?= <gokturk@gentoo.org>
+Date: Wed, 28 Nov 2018 21:33:46 -0500
+Subject: [PATCH v1] Allow --enable-offline to accept a directory argument for
+ jar libs
+
+Allow the hardcoded default_jar_location in build.xml to
+/usr/share/java to be changed using the argument provided to
+--enable-offline. Note that this changes the behavior of the switch
+from "anything other than yes or no is incorrect" to "anything other
+than no implies offline mode".
+---
+ bindings/java/Makefile.am |  4 ++++
+ configure.ac              | 10 +++++++++-
+ 2 files changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/bindings/java/Makefile.am b/bindings/java/Makefile.am
+index ad27526e..f0bb9f68 100644
+--- a/bindings/java/Makefile.am
+++ b/bindings/java/Makefile.am
+@@ -7,6 +7,10 @@ jar_DATA = $(tsk_jar)
+ 
+ if OFFLINE
+  ant_args=-Doffline=true
+if CUSTOM_DEFAULT_JAR_LOCATION
+  ant_args+= -Ddefault-jar-location="@DEFAULT_JAR_LOCATION@"
+else
+endif
+ else
+ 
+ endif
+diff --git a/configure.ac b/configure.ac
+index dc9026ed..d3d41646 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -221,10 +221,18 @@ AC_ARG_ENABLE([offline],
+     [case "${enableval}" in
+ 	yes) offline=true ;;
+ 	no) offline=false ;;
+-	*) AC_MSG_ERROR([bad value ${enableval} for --enable-online]) ;;
+	*)
+	    offline=true
+	    default_jar_location="${enableval}"
+	    ;;
+      esac],[offline=false])
+ 
+ AM_CONDITIONAL([OFFLINE], [test "x$offline" = xtrue])
+AM_CONDITIONAL([CUSTOM_DEFAULT_JAR_LOCATION], [test "x$default_jar_location" != "x"])
+AM_COND_IF([CUSTOM_DEFAULT_JAR_LOCATION],
+    [AC_SUBST([DEFAULT_JAR_LOCATION], [$default_jar_location])]
+)
+
+ 
+ 
+ dnl Check if we should link libewf.
+-- 
+2.19.1
+
--- a/app-forensics/sleuthkit/sleuthkit-4.6.4.ebuild
+++ b/app-forensics/sleuthkit/sleuthkit-4.6.4.ebuild
@ -0,0 +1,254 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_BSFIX_NAME="build.xml build-unix.xml"
+inherit autotools java-pkg-opt-2 java-ant-2
+
+DESCRIPTION="A collection of file system and media management forensic analysis tools"
+HOMEPAGE="https://www.sleuthkit.org/sleuthkit/"
+# TODO: sqlite-jdbc does not exist in the tree, we bundle it for now
+# TODO: Upstream uses a very specific version of libewf which is not in
+#       the tree anymore. So we statically compile and link to sleuthkit.
+#       Hopefully upstream will figure something out in the future.
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz
+	java? (
+		http://repo1.maven.org/maven2/org/xerial/sqlite-jdbc/3.8.11/sqlite-jdbc-3.8.11.jar
+		http://repo1.maven.org/maven2/com/zaxxer/SparseBitSet/1.1/SparseBitSet-1.1.jar
+	)
+	ewf? ( https://dev.gentoo.org/~gokturk/distfiles/app-forensics/libewf/libewf-20130128.tar.gz )"
+
+LICENSE="BSD CPL-1.0 GPL-2+ IBM java? ( Apache-2.0 )"
+SLOT="0/13" # subslot = major soname version
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE="aff doc ewf java postgres static-libs test +threads zlib"
+
+# Note: It is not possible to move the dep on dev-java/jdbc-postgresql
+# inside a conditional postgres? block because java sources import
+# org.postgres unconditionally as of writing this (version 4.6.4). The
+# postgres USE flag will be used for the TSK postgresql support however.
+DEPEND="
+	dev-db/sqlite:3
+	dev-lang/perl:*
+	aff? ( app-forensics/afflib )
+	ewf? ( sys-libs/zlib )
+	java? (
+		>=virtual/jdk-1.8:*
+		>=dev-java/c3p0-0.9.5:0
+		>=dev-java/jdbc-postgresql-9.4:0
+	)
+	postgres? ( dev-db/postgresql:= )
+	zlib? ( sys-libs/zlib )
+"
+# TODO: add support for not-in-tree libraries libvhdi and libvmdk
+# libvhdi: https://github.com/libyal/libvhdi
+# libvmdk: https://github.com/libyal/libvmdk
+# DEPEND="${DEPEND}
+# 	vhdi? ( dev-libs/libvhdi )
+# 	vmdk? ( dev-libs/libvmdk )
+# "
+
+RDEPEND="${DEPEND}
+	java? ( >=virtual/jre-1.8:= )
+"
+DEPEND="${DEPEND}
+	doc? ( app-doc/doxygen )
+	test? ( >=dev-util/cppunit-1.2.1 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.1.0-tools-shared-libs.patch
+	"${FILESDIR}"/${PN}-4.6.4-default-jar-location-fix.patch
+)
+
+src_unpack() {
+	local f
+
+	unpack ${P}.tar.gz
+
+	# Ick, the upstream is stuck at libewf-20130128 which is
+	# not even in the tree anymore. So we have to bundle it.
+	if use ewf; then
+		pushd "${T}" &>/dev/null || die
+		unpack libewf-20130128.tar.gz
+		export TSK_LIBEWF_SRCDIR="${T}"/libewf-20130128
+		popd &>/dev/null || die
+	fi
+
+	# Copy the jar files that don't exist in the tree yet
+	if use java; then
+		TSK_JAR_DIR="${T}/lib"
+		mkdir "${TSK_JAR_DIR}" || die
+		for f in ${A}; do
+			if [[ ${f} =~ .jar$ ]]; then
+				cp "${DISTDIR}"/"${f}" "${TSK_JAR_DIR}" || die
+			fi
+		done
+		export TSK_JAR_DIR
+	fi
+}
+
+tsk_prepare_libewf() {
+	# Yeah, libewf-20130128 obviously doesn't just nicely compile
+	sed -e 's/LIBUNA_INLINE inline/LIBUNA_INLINE/' \
+		-i "${TSK_LIBEWF_SRCDIR}"/libuna/libuna_inline.h || die
+}
+
+src_prepare() {
+	use ewf && tsk_prepare_libewf
+
+	if use java; then
+		pushd "${S}"/bindings/java &>/dev/null || die
+
+		# Prevent "make install" from installing
+		# jar files under /usr/share/java
+		# We'll use the java eclasses for this
+		sed -e '/^jar_DATA/ d;' -i Makefile.am || die
+
+		java-pkg-opt-2_src_prepare
+
+		popd &>/dev/null || die
+	fi
+
+	# Override the doxygen output directories
+	if use doc; then
+		sed -e "/^OUTPUT_DIRECTORY/ s|=.*$|= ${T}/doc|" \
+			-i tsk/docs/Doxyfile \
+			-i bindings/java/doxygen/Doxyfile || die
+	fi
+
+	# It's safe to call this even after java-pkg-opt-2_src_prepare
+	# because future calls to eapply_user do nothing and return 0
+	default
+
+	eautoreconf
+}
+
+tsk_compile_libewf() {
+	local myeconfargs=(
+		--prefix=/
+		--libdir=/lib
+		--enable-static
+		--disable-shared
+		--disable-winapi
+		--without-libbfio
+		--with-zlib
+		--without-bzip2
+		--without-libhmac
+		--without-openssl
+		--without-libuuid
+		--without-libfuse
+	)
+	# We want to contain our build flags
+	local CFLAGS="${CFLAGS}"
+	local LDFLAGS="${LDFLAGS}"
+
+	pushd "${TSK_LIBEWF_SRCDIR}" &>/dev/null || die
+
+	# Produce relocatable code
+	CFLAGS+=" -fPIC"
+	LDFLAGS+=" -fPIC"
+	econf "${myeconfargs[@]}"
+
+	# Do not waste CPU cycles on building ewftools
+	sed -e '/ewftools/ d' -i Makefile || die
+	emake
+
+	# Only install the headers and the library
+	emake -C libewf DESTDIR="${T}"/image install
+	emake -C include DESTDIR="${T}"/image install
+	find "${T}"/image -name '*.la' -delete || die
+
+	popd &>/dev/null || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-offline="${TSK_JAR_DIR}"
+		$(use_enable java)
+		$(use_enable static-libs static)
+		$(use_enable threads multithreading)
+		$(use_with aff afflib)
+		$(use_with zlib)
+	)
+	# Workaround the automagic detection of postgresql
+	local -x ac_cv_lib_pq_PQlibVersion="$(usex postgres)"
+	# TODO: add support for non-existing libraries libvhdi and libvmdk
+	# myeconfargs+=(
+	# 	$(use_with vhdi libvhdi)
+	# 	$(use_with vmdk libvmdk)
+	# )
+	myeconfargs+=(
+		--without-libvhdi
+		--without-libvmdk
+	)
+
+	if use ewf; then
+		tsk_compile_libewf
+		myeconfargs+=( $(use_with ewf libewf "${T}"/image) )
+	fi
+
+	if use java; then
+		pushd "${S}"/bindings/java &>/dev/null || die
+		java-ant-2_src_configure
+		popd &>/dev/null || die
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# Create symlinks of jars for the required dependencies
+	if use java; then
+		pushd "${S}"/bindings/java &>/dev/null || die
+
+		java-pkg_jar-from --into "${TSK_JAR_DIR}" c3p0
+		java-pkg_jar-from --into "${TSK_JAR_DIR}" jdbc-postgresql
+
+		popd &>/dev/null || die
+	fi
+
+	# Create the doc output dirs if requested
+	if use doc; then
+		mkdir -p "${T}"/doc/{api-docs,jni-docs} || die
+	fi
+
+	emake all $(usex doc api-docs "")
+}
+
+src_install() {
+	local f
+
+	if use java; then
+		pushd "${S}"/bindings/java &>/dev/null || die
+
+		java-pkg_newjar "dist/${P}.jar" "${PN}.jar"
+
+		# Install the bundled jar files
+		pushd "${TSK_JAR_DIR}" &>/dev/null || die
+		for f in *; do
+			# Skip the symlinks java-pkg_jar-from created
+			[[ -f ${f} ]] || continue
+
+			# Strip the version numbers as per eclass recommendation
+			[[ ${f} =~ -([0-9]+\.)+jar$ ]] || continue
+
+			java-pkg_newjar "${f}" "${f/${BASH_REMATCH[0]}/.jar}"
+		done
+		popd &>/dev/null || die
+
+		popd &>/dev/null || die
+	fi
+
+	default
+
+	# It unconditionally builds both api and jni docs
+	# We install conditionally based on the provided use flags
+	if use doc; then
+		dodoc -r "${T}"/doc/api-docs
+		use java && dodoc -r "${T}"/doc/jni-docs
+	fi
+
+	find "${D}" -name '*.la' -delete || die
+}
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@ -3,5 +3,6 @@ DIST gnucash-3.2.tar.bz2 13383942 BLAKE2B ce4beb9eab290bbc85c4b3bf68b205a8ebb274
 DIST gnucash-3.3.tar.bz2 13440713 BLAKE2B a308af90d8a8e50eb732d29c7eadac1fb75b63006da5bbaa9044039c43c1c17976c6b6fdb1706a08a527b75b1300df3a8ed469151370097b0308a173a170e41b SHA512 4bf0369ca9b3c91c98a0d916f0befc7e5675a246559a6a72dba6592b64f56f3cbd1885b0711e44e8d9cca290be742812763691ae2f639ea31ec534e52e17b3f9
 DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B ac052b4d0eb0d8ded03a8c7dff05177818627b8a51f2dbc2c162b2ee2a5d1323539e7d0d02236d9ebb799995e018f0171c2fdaeb4de3bb339548265e50de79e6 SHA512 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d
 EBUILD gnucash-3.2-r2.ebuild 3959 BLAKE2B 37cdc89d7db8903b4b89332d7f9b47cef47fb29588a443b979a49d43bad5e883158a939898368afc02cae89402b25a7498a5a373c51cb8fb9c5265c7d05c15ae SHA512 97da97ae88ed1aa564ec605d5e8d24852869745521457d98e76adbb4b72a2a28025bcddad413e2f85a2d3f6c4116c40a889438428c9c5197a873e1834077235b
+EBUILD gnucash-3.3-r1.ebuild 4018 BLAKE2B 17e75c78e4c6c9f45a36297765a512f4972670048358f745cad46a320004487621f145d8b9279ad8629a533e72f1259a39f4a42bfed501fc039b3a6e68ccbbac SHA512 66660f2357731b28a130de0c01cad1d30ea1a36aff30f02a144aa4d2e60945ba12f3847e0827d1548a9477f1f53b1293fefe28004db3e0875cce8495081b5767
 EBUILD gnucash-3.3.ebuild 3960 BLAKE2B fb2ce5241798a3aa3f7c1c69608c5707f44bcb847d73d64efc690478a1958ceb01f36d749377dc13502cc6e160875f62bbae40f79e4299aefb5b2f8c5d5e9d3c SHA512 a6bdc6f366cbcf8cec17f3772c45d8ed081d926326870ab966653eba405d693f20677a1dfb4db44f077fc673b42d96689ee71ee4bd7f47a7a78ad5c93edcd22d
 MISC metadata.xml 877 BLAKE2B 0fcba4a83ba82aa6634bc2e3d71da766f2890340e827ba478157fae994456daaecd12722991626069e04086d670a77f156e378a5b0d7b8ee35717561ca944a03 SHA512 1654790fbffc4ec76fc9520221877ad7eaa8fc774f4a05e9e250e44c0fb989081bafcacb018c8d2f6a4787d1794672a87e09c1687919b544a8f1fb36bb449bdc
--- a/app-office/gnucash/gnucash-3.3-r1.ebuild
+++ b/app-office/gnucash/gnucash-3.3-r1.ebuild
@ -0,0 +1,167 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# google{test,mock} version
+GV="1.8.0"
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
+
+DESCRIPTION="A personal finance manager"
+HOMEPAGE="http://www.gnucash.org/"
+SRC_URI="https://github.com/Gnucash/${PN}/releases/download/${PV}/${P}.tar.bz2
+	https://github.com/google/googletest/archive/release-${GV}.tar.gz -> gtest-${GV}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+IUSE="aqbanking chipcard debug doc examples gnome-keyring mysql nls ofx postgres python quotes -register2 sqlite +gui"
+REQUIRED_USE="
+	chipcard? ( aqbanking )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+# libdbi version requirement for sqlite taken from bug #455134
+#
+# dev-libs/boost must always be built with nls enabled.
+# guile[deprecated] because of SCM_LIST*() use
+RDEPEND="
+	>=dev-libs/glib-2.46.0:2
+	>=dev-libs/libxml2-2.7.0:2
+	>=sys-libs/zlib-1.1.4
+	>=dev-scheme/guile-2.2.0:12=[deprecated,regex]
+	dev-libs/boost:=[icu,nls]
+	dev-libs/icu:=
+	dev-libs/libxslt
+	aqbanking? (
+		>=net-libs/aqbanking-5[gtk,ofx?]
+		sys-libs/gwenhywfar[gtk]
+		chipcard? ( sys-libs/libchipcard )
+	)
+	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
+	gui? (
+		gnome-base/dconf
+		net-libs/webkit-gtk:4=
+		>=x11-libs/gtk+-3.14.0:3
+	)
+	mysql? (
+		dev-db/libdbi
+		dev-db/libdbi-drivers[mysql]
+	)
+	ofx? ( >=dev-libs/libofx-0.9.1 )
+	postgres? (
+		dev-db/libdbi
+		dev-db/libdbi-drivers[postgres]
+	)
+	python? ( ${PYTHON_DEPS} )
+	quotes? (
+		>=dev-perl/Finance-Quote-1.11
+		dev-perl/Date-Manip
+		dev-perl/HTML-TableExtract
+	)
+	sqlite? (
+		>=dev-db/libdbi-0.9.0
+		>=dev-db/libdbi-drivers-0.9.0[sqlite]
+	)
+"
+
+DEPEND="${RDEPEND}
+	~dev-cpp/gtest-${GV}
+	>=sys-devel/gettext-0.19.6
+	dev-lang/perl
+	dev-perl/XML-Parser
+	sys-devel/libtool
+	virtual/pkgconfig
+"
+
+PDEPEND="doc? (
+	~app-doc/gnucash-docs-${PV}
+	gnome-extra/yelp
+)"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.2-no-gui.patch )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	xdg_environment_reset
+}
+
+src_configure() {
+	local sql_on_off="OFF"
+	if use mysql || use postgres || use sqlite ; then
+		sql_on_off="ON"
+	fi
+
+	local mycmakeargs=(
+		-DGMOCK_ROOT="${WORKDIR}"/googletest-release-${GV}/googlemock
+		-DGTEST_ROOT="${WORKDIR}"/googletest-release-${GV}/googletest
+		# Disable fallback to guile-2.0
+		-DCMAKE_DISABLE_FIND_PACKAGE_GUILE2=ON
+		-DCOMPILE_GSCHEMAS=OFF
+		-DDISABLE_NLS=$(usex !nls)
+		-DENABLE_REGISTER2=$(usex register2)
+		-DWITH_AQBANKING=$(usex aqbanking)
+		-DWITH_OFX=$(usex ofx)
+		-DWITH_PYTHON=$(usex python)
+		-DWITH_SQL=${sql_on_off}
+		-DWITH_GNUCASH=$(usex gui)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	if use python ; then
+		cp common/test-core/unittest_support.py \
+		   "${BUILD_DIR}"/common/test-core/ || die
+	fi
+
+	cd "${BUILD_DIR}" || die
+	XDG_DATA_HOME="${T}/$(whoami)" emake check
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	rm "${ED%/}"/usr/share/doc/${PF}/README.dependencies || die
+
+	if use examples ; then
+		mv "${ED%/}"/usr/share/doc/gnucash \
+		   "${ED%/}"/usr/share/doc/${PF}/examples || die
+		pushd "${ED%/}"/usr/share/doc/${PF}/examples/ > /dev/null || die
+		rm AUTHORS DOCUMENTERS LICENSE NEWS projects.html ChangeLog* \
+		   *win32-bin.txt || die
+		popd > /dev/null || die
+		docompress -x /usr/share/doc/${PF}/examples/
+	else
+		rm -r "${ED%/}"/usr/share/doc/gnucash || die
+	fi
+
+	use aqbanking && dodoc doc/README.HBCI
+	use ofx && dodoc doc/README.OFX
+}
+
+pkg_postinst() {
+	if use gui ; then
+		gnome2_icon_cache_update
+		gnome2_schemas_update
+	fi
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
+	ewarn "Backup all financial files or databases before using GnuCash >=2.7.0!"
+	ewarn
+	ewarn "GnuCash 2.7.0 introduced large changes in its file format and database"
+	ewarn "schema that WILL prevent you from reverting back to GnuCash 2.6."
+}
+
+pkg_postrm() {
+	if use gui ; then
+		gnome2_icon_cache_update
+		gnome2_schemas_update
+	fi
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@ -1,8 +1,7 @@
 DIST eix-0.33.2.tar.xz 614192 BLAKE2B dcbbdb9b9ccf6f780d89c791c34cc588700720b7f015fb0db7ea86dd78a383892266b0e96c49282fdea58e78293c69e8acc153cea631443c35d3ee29dd4c016f SHA512 28ca4cc57e5c7ef81feb37fa90d598e681e192c442c7446c93a442908d2a9744340f7a93c71135ec3083fb85c48a65638c8929b6e1e632464132f4320225d637
 DIST eix-0.33.5.tar.xz 626628 BLAKE2B 2bb102279084f6bb6871bb4bbe55100708866337501c6043508ee13bdb92064c3a4a41d067b9d4c03af1a5ffbece53d9c66cf89639adf0c555a9511cae3d702f SHA512 7a71a411d4428ee491b9aee0f414e038a08f2195db58466db9b96f0d80edca7eaa153e63534c832c71e1b488e21fbd869a96bd10a21e06a93ce7eba1f808b684
 DIST eix-0.33.6.tar.xz 625512 BLAKE2B 3f27e3cfa00dc4979bbebbd3b31dfa29e7dcd527fdf7b3ca3fdc6a4ce45a64d7f07fe20ea4a526533aa506c2d9e7fcbbf7b5e83ad6a2d4bbacd1ce75b6cde4ae SHA512 3f04f06533d4e7a0acd5b6e85d1194c8f9b013595ebe75c3dda06cce42e7721a57393aed17e9dd6437780b48378691d84b6e595999ce4321ad114b239313c7cf
-EBUILD eix-0.33.2-r1.ebuild 2776 BLAKE2B 6ff924d24b45fa270c7ffdfddb9ba9806677e34ff84d9e63e1af2bdbc1ee9775b360f141818196c687e07e7bb955628c51d6b662bdc55815112e854d8b594a73 SHA512 abb4ddd7351e692096318c3429b668953f9fa8358b2c91f4bf49a7bdfdad3ab8d1e2227309ce5fb0e89e920146fa9c3f34a5a527e1600e9cd26c665100c868eb
-EBUILD eix-0.33.2.ebuild 2768 BLAKE2B d59af74153b93857e720ae9c5a98d2c19973bb6fec156144ee5505bdadf1a0c141fe4402df7bd21fd1b1e345b039ea5914288ad382880e393cfebee22dc9456c SHA512 727be8859fc5854ffd1dd69c5c448a3acc4d65bdb79631b24b10d16200042018f327af98852df6c0a75ff79341dbb9a286dd032a8932473da096acbc782a86bf
-EBUILD eix-0.33.5.ebuild 2776 BLAKE2B 6ff924d24b45fa270c7ffdfddb9ba9806677e34ff84d9e63e1af2bdbc1ee9775b360f141818196c687e07e7bb955628c51d6b662bdc55815112e854d8b594a73 SHA512 abb4ddd7351e692096318c3429b668953f9fa8358b2c91f4bf49a7bdfdad3ab8d1e2227309ce5fb0e89e920146fa9c3f34a5a527e1600e9cd26c665100c868eb
-EBUILD eix-0.33.6.ebuild 2776 BLAKE2B 6ff924d24b45fa270c7ffdfddb9ba9806677e34ff84d9e63e1af2bdbc1ee9775b360f141818196c687e07e7bb955628c51d6b662bdc55815112e854d8b594a73 SHA512 abb4ddd7351e692096318c3429b668953f9fa8358b2c91f4bf49a7bdfdad3ab8d1e2227309ce5fb0e89e920146fa9c3f34a5a527e1600e9cd26c665100c868eb
+EBUILD eix-0.33.2.ebuild 2646 BLAKE2B 3ad92e6cdac3d31adb3c8a3a914030265659a73322fbdadb0ae211bd0312685b1969f09c3af73239ddf2acd566922f86dae629c54c570f703a36e232805fc2bd SHA512 88ed2a920e0d5cc6e8d633f21b3990045a1b70453dd858902f82b84474bd2b3e4fb3e58748983c0c9dc74086b9f7deb278fdf6afa9188027cb18062b71452c18
+EBUILD eix-0.33.5.ebuild 2653 BLAKE2B ff7ef6867f661f1707d0dfbbffdf6f6e59aa8f131e2e7df4f1c6b20b9364d5e974560714f27bebac496bf13d7381cb0e3b9fba397cb1eb54469fb34a29cfc977 SHA512 8d339a07b11b200f0dac90bdf7cb34befad17f3effa8e239f9cf1fe023354561d13bc4c21d773459cd9c658159684a9a6fdef86e8f11f6debe2175b54c8f562a
+EBUILD eix-0.33.6.ebuild 2654 BLAKE2B 2923f5cf4b6db39cb1007e8b7b531c883ed02523afe53fefa4653e0e30ab2cbcc30f5d35c84dd07d347b85a894ce362410893b9db5d4204f1a9c506e2f0c963e SHA512 5445aae967a808d08b888f95be38df115c6db0f993dfad69f52eb480f5cbde14ffe670778412cd7a1edb6a773050e19f00def9fc2aa2b746abf36ebeb8116245
 MISC metadata.xml 1051 BLAKE2B b77439c3a8d8eab9fc711c96ce2b2ccaf307f2eca4cfee32bfb75279ff4da31fd05b3319136af38e70d274c28cb2f1c2567916390d81425b7b7daf956815c7e4 SHA512 208b3db2b2e5afb5667a29e6b18538f3cea5e3fb2758d3c9b30823d7b2a22f31f150d6a01abec6a6c8ca62486c975b47002de9e1bac89ded31eb7013bdbb38c6
--- a/app-portage/eix/eix-0.33.2-r1.ebuild
+++ b/app-portage/eix/eix-0.33.2-r1.ebuild
@ -1,108 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools bash-completion-r1 flag-o-matic tmpfiles
-
-DESCRIPTION="Search and query ebuilds"
-HOMEPAGE="https://github.com/vaeth/eix/"
-SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug doc nls sqlite"
-
-BOTHDEPEND="nls? ( virtual/libintl )
-	sqlite? ( >=dev-db/sqlite-3:= )"
-RDEPEND="${BOTHDEPEND}
-	>=app-shells/push-2.0-r1
-	>=app-shells/quoter-3.0_p2-r1"
-DEPEND="${BOTHDEPEND}
-	app-arch/xz-utils
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	# remove stale cache file to prevent collisions
-	local old_cache=${EROOT%/}/var/cache/${PN}
-	if [[ -f ${old_cache} ]]; then
-		rm "${old_cache}" || die
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
-
-	sed -e "/eixf_source=/s:push.sh:cat \"${EROOT}usr/share/push/push.sh\":" \
-		-e "/eixf_source=/s:quoter_pipe.sh:cat \"${EROOT}usr/share/quoter/quoter_pipe.sh\":" \
-		-i src/eix-functions.sh.in || die
-	sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EROOT}usr/share/eix/eix-functions\\\\\":" \
-		-i src/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable debug paranoic-asserts)
-		$(use_enable nls)
-		$(use_with doc extra-doc)
-		$(use_with sqlite)
-
-		# default configuration
-		$(use_with prefix always-accept-keywords)
-		--with-dep-default
-		--with-required-use-default
-
-		# paths
-		--with-portage-rootpath="${ROOTPATH}"
-		--with-eprefix-default="${EPREFIX}"
-
-		# build a single executable with symlinks
-		--disable-separate-binaries
-		--disable-separate-tools
-
-		# used purely to control/disrespect *FLAGS
-		--disable-debugging
-		--disable-new_dialect
-		--disable-optimization
-		--disable-strong-optimization
-		--disable-security
-		--disable-nopie-security
-		--disable-strong-security
-	)
-
-	# https://github.com/vaeth/eix/issues/35
-	append-cxxflags -std=c++14
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	dobashcomp bash/eix
-	dotmpfiles tmpfiles.d/eix.conf
-
-	rm -r "${ED%/}"/usr/bin/eix-functions.sh || die
-
-}
-
-pkg_postinst() {
-	if ! use prefix; then
-		# note: if this is done in src_install(), portage:portage
-		# ownership may be reset to root
-		tmpfiles_process eix.conf
-	fi
-
-	local obs=${EROOT%/}/var/cache/eix.previous
-	if [[ -f ${obs} ]]; then
-		ewarn "Found obsolete ${obs}, please remove it"
-	fi
-}
-
-pkg_postrm() {
-	if [[ ! -n ${REPLACED_BY_VERSION} ]]; then
-		rm -rf "${EROOT%/}/var/cache/${PN}" || die
-	fi
-}
--- a/app-portage/eix/eix-0.33.2.ebuild
+++ b/app-portage/eix/eix-0.33.2.ebuild
@ -89,11 +89,7 @@ src_install() {
 }

 pkg_postinst() {
-	if ! use prefix; then
-		# note: if this is done in src_install(), portage:portage
-		# ownership may be reset to root
 		tmpfiles_process eix.conf
-	fi

 	local obs=${EROOT%/}/var/cache/eix.previous
 	if [[ -f ${obs} ]]; then
--- a/app-portage/eix/eix-0.33.5.ebuild
+++ b/app-portage/eix/eix-0.33.5.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc nls sqlite"

 BOTHDEPEND="nls? ( virtual/libintl )
@ -89,11 +89,7 @@ src_install() {
 }

 pkg_postinst() {
-	if ! use prefix; then
-		# note: if this is done in src_install(), portage:portage
-		# ownership may be reset to root
 		tmpfiles_process eix.conf
-	fi

 	local obs=${EROOT%/}/var/cache/eix.previous
 	if [[ -f ${obs} ]]; then
--- a/app-portage/eix/eix-0.33.6.ebuild
+++ b/app-portage/eix/eix-0.33.6.ebuild
@ -89,11 +89,7 @@ src_install() {
 }

 pkg_postinst() {
-	if ! use prefix; then
-		# note: if this is done in src_install(), portage:portage
-		# ownership may be reset to root
 		tmpfiles_process eix.conf
-	fi

 	local obs=${EROOT%/}/var/cache/eix.previous
 	if [[ -f ${obs} ]]; then
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/hunspell/Manifest
+++ b/app-text/hunspell/Manifest
@ -5,6 +5,6 @@ DIST hunspell-1.6.1.tar.gz 706893 BLAKE2B 5e5047aceb7510c2cfaa05d540f8faad2fb844
 DIST hunspell-1.6.2.tar.gz 721165 BLAKE2B f377596d2031e89ad902a0f5da85e77948bd5d582bb4c558cc7c379d803a00787237d2feed9d26e037cebb77958709f41fb01d5f8bfed6ae21047a2da83c8f51 SHA512 a23127f1271da95ac06a1fb2f57b659485e959567b61da05b2bb350684003a0fb7e882b5e524c465fd890f79f513ed03174f38611989a1c09081147c47d6da11
 DIST hunspell-1.7.0.tar.gz 482156 BLAKE2B daf689ab44872c78d27bd035d996c61da9b01b7bbe5ced120034b2d64bbead573ad3807dfe5a06ecdbd96c610f42e4ea015be4b2046ebafad13347c08e60913a SHA512 8149b2e8b703a0610c9ca5160c2dfad3cf3b85b16b3f0f5cfcb7ebb802473b2d499e8e2d0a637a97a37a24d62424e82d3880809210d3f043fa17a4970d47c903
 EBUILD hunspell-1.6.1-r1.ebuild 2366 BLAKE2B d566bfed5c322566fdb30ff31f266020b1eb4ce9a0dd6920c5e340b2b922cb5bb3eba4a44dc458c0516c425b4c309cd13b6bf3225ef24b604b5c6d72245a2bc6 SHA512 c4e793a89c9ec4aad6bc2f7fb2036f5c251b329ec597976d07d607364df0de3c22a80903bbca5bfe03416b84bf3416a16691f78524cfc8f90c4519ecc3a89bb9
-EBUILD hunspell-1.6.2-r1.ebuild 2384 BLAKE2B 907764e9ebd21c637146a363e2edf94ceb4f63b104aea66a3cb1dc42e228ff6f06793f67f928e1b34c7098fd442c46ca85168f515599ff8f6bb0b15a1b29153f SHA512 0bdc565fb2ccf8937521bd0d815c9b1e321f38b2c0a0484f394859be2decbe10bd030d919a0f6d7c716e331e2df9e7e5e14d9a3b47c62603765ece9450b204ab
+EBUILD hunspell-1.6.2-r1.ebuild 2383 BLAKE2B 7ef52fd2c661ce65496350ebf7f33e550b9e2645183cea6a3801e7bea81045da4b9846dbedc6b933cb30a3876df87d434785ee4a39292aa2fb3093310b565b59 SHA512 41e296e4a093edc5ef757cec31fd93fcd9a6b08ea18e5b5086477f4f4b351a93fa9ff03a7cb6884da17236985c0d3e5ece154da8aba8557f56cff37c73efc3b7
 EBUILD hunspell-1.7.0.ebuild 2293 BLAKE2B 6a2053dd8f5cf3211521236ae7e027d99349b7864655b81c65a2f3614070b53818b3932c70ffa25cc09ed8c9b935c78243cfaf8923e4975d0e8ddef2621dcf64 SHA512 4dc99a1b623fbd8da6492bedea1d2d80c9c93fcae334ac1fee70769aaba17581ced12e3097a930324344d20d5a7e72f19df31364c665add74802163efe941d3d
 MISC metadata.xml 274 BLAKE2B 6631c0f576279afaf4cd444df14acd118e393977058e957bd3e41103554a756c43860f75f7550346815f6d8a4320d3d86fb069c9451fbad268bedbde18ed5ec0 SHA512 09ac7c3282788aae9fe48dc86a3bec7d2a5b651b22d6ea06108f9ca5a86e96dddf9ab80433d0f16549649665d9a582d6c44217b73a000ee83995aad922f3caa8
--- a/app-text/hunspell/hunspell-1.6.2-r1.ebuild
+++ b/app-text/hunspell/hunspell-1.6.2-r1.ebuild
@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/hunspell"
 SLOT="0/$(get_version_component_range 1-2)"
 LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
 IUSE="ncurses nls readline static-libs"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"

 RDEPEND="
 	ncurses? ( sys-libs/ncurses:0= )
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@ -12,5 +12,5 @@ DIST mupdf-1.13.0-source.tar.gz 51425034 BLAKE2B 7f4a1c84b5840991cc7879f36171655
 DIST mupdf-1.14.0-source.tar.xz 41602372 BLAKE2B bb680038344af16c7231a18a009c0d04c5f50b3fcbaf061c9f5907f35d79eea93eeced7c2a43a06a963b93b39c74d0246c5fdad35655953d1aa5efb79737265a SHA512 bd41125dac1a81b7dbbfbb5f5e06e70bb601854731e0945983688da5d8d7c0bca9771fff2e4b6d9c36dbead6146f0a866ed7427d58e13d02ed6dfd94dcfe54bf
 EBUILD mupdf-1.13.0-r1.ebuild 5204 BLAKE2B f62442ec438a0f3245fb8a543a6f68c1474c11ebe2633c1460175c0c700575a6236ac1f4f747f5e85966577cf32d903f56c80353aef8cfa53570b204423ab154 SHA512 753f2e08443b4982f44a644d2be9fd769f9162ca387dae7ac49baaa4a12d906be6741f959bac14a78780085559e92d8ae2722fe2fe8a630d7983c37a171b53c3
 EBUILD mupdf-1.13.0.ebuild 5136 BLAKE2B deb1d486417e37df66461924632349d443f1b4b79a6a1c148c77cf5fc84799ce946a08d8bea7d79948b4a33914d96b30890e353d73cc49791cb6e16d8728ec8a SHA512 c9989b3ec1a39bfda215c798928723d1d099444e1695da24ed3709b355ccd99dc660ab6e7a245c3a5384376810c93649095c09255a6e8106ae599ae5bd55a343
-EBUILD mupdf-1.14.0-r2.ebuild 3048 BLAKE2B 777e6c9ba6f77aa93dbf5f82d52cc9eeb6d5542829282d6dcb096d9cd206233437a8386a2ec375c11cbdb6c83bb4dd7094e03ce635717f46f30da2811f2bb8c5 SHA512 36548d5530753e8142100b8b95c412c8c4afc36100ef3296c2af5078de8907ea25a143614700e8d742762bdddafad05e53bcfdeefbbbac51e300b799f2150ae3
+EBUILD mupdf-1.14.0-r2.ebuild 3047 BLAKE2B 77de715726e54162f6f3bd767c0c0fe3a98fc828dc8408b096b544dc7d2cbdf4c7d28dc5b1409e7d1d81d8da98eff76591ccf2773c8a600147fb34061748418c SHA512 f38ce66e2903d0762f113a6208e5700a0305592595445252271de8a0298303e37a3cf797b452c5e95de0fc74f72051f42adf5700086fa1dc8c323eeb11904ed1
 MISC metadata.xml 325 BLAKE2B b1481395199609bf3f4f01f21946866005eeb2a5df124c1ded940702808cfba176494e7b801ad5fef4ea61c93ce47e7415548a3e86d0d41b28c16ea1d064a152 SHA512 8b7c565857b47f585fa4059e99087efdbf1a88cc61fc2370a489ebf6c46e3a1271eb23b2173354054c82317ce7305d9372f6d05afd4749b0467635030cd5ea1e
--- a/app-text/mupdf/mupdf-1.14.0-r2.ebuild
+++ b/app-text/mupdf/mupdf-1.14.0-r2.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz"

 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X curl +javascript libressl opengl +openssl static-libs +vanilla"

 RDEPEND="
--- a/app-xemacs/Manifest.gz
+++ b/app-xemacs/Manifest.gz
--- a/app-xemacs/xemacs-packages-all/Manifest
+++ b/app-xemacs/xemacs-packages-all/Manifest
@ -1,4 +1,4 @@
 EBUILD xemacs-packages-all-2007.04.27-r1.ebuild 3677 BLAKE2B 1de81b1dcc451288572169d759f4ef117a6f74df5ce9b7ffab2d85cb7568e73cbacffb38e36f2405cba0f745511d1d268e5d9c0f3cbeb5748f0323213b453b16 SHA512 43b96eef5984f77199f6c91a2760320037564f45982f9ba25730ca176b40e01220dcefd16c1f4c6dbfcee3ecf2c6db7c4288cbb939f5be57ca0268949f80c4bb
 EBUILD xemacs-packages-all-2010.07.29.ebuild 3789 BLAKE2B d3fa5aa3ee1cc3d90eae67031bc8d4f45f3f84f7d8e9413729d96b2fa97168d2b965927073a11b1dfc22cef375bec75b5fd4bb3c97bf7d116bfbdc2fb33fa3e7 SHA512 ce4c7079aeeec6f76fabaa7a6c384fad28bb2d64e93dd8e271a882abba1149f083f014bdd5835c878ba21eb01b10a747a683b3212f8785cdea16293d627cd01d
 EBUILD xemacs-packages-all-2018.08.11.ebuild 3752 BLAKE2B 7a3297bdc77e1be9d96ced4818f4d00b180160e7946d77491961232f265bd087854367fd710fc7503a8b3bd0212fccf545072d614f453f1ccd5a238ec5265311 SHA512 067ad223b4a6a5ce20c1fbe16e27a1fabc4ac507ffcb73a43bd8bf04231549947e19ed3d8147c818715f15ed1996ba30aeee44a77b352e0b1e5db3382d92a9c6
-MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
+MISC metadata.xml 344 BLAKE2B 808a5e7a0b09be9885af060dc60027006de909ae86380dd60fab3b44e2ce5939146923f881591fc05b05e3cac9a5010334e567c5be63a59dc68bb9a63dec936a SHA512 875ed7c42eb8600a678a85ce56ecfae8bcb6c177baaed5e5432c4b098e027fe23aad46dcd5c4ba23ea10cf7e71a615c567ddbf181dd1b6edcca186d5cee98e8f
--- a/app-xemacs/xemacs-packages-all/metadata.xml
+++ b/app-xemacs/xemacs-packages-all/metadata.xml
@ -5,4 +5,7 @@
    <email>xemacs@gentoo.org</email>
    <name>Gentoo XEmacs project</name>
  </maintainer>
+  <use>
+    <flag name="mule">Add multi-language support to XEmacs</flag>
+  </use>
 </pkgmetadata>
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@ -15,9 +15,9 @@ DIST mariadb-5.5.62.tar.gz 45938380 BLAKE2B aa17d0e5740805d74f7f74f54605e04c4e29
 DIST mysql-extras-20180809-1700Z.tar.bz2 322999 BLAKE2B 8b5feb32085dc35b2f68dae985b2d266c4eaa0e956b490050a2df04bbff99bf8623b67e75af9326d84e3ad625c4d86b0d21d23c9a96df5a0c9cd5ed730958970 SHA512 fbd7af9284bbf09d55f128361e7cc52d94f24ac491aac800cd6d61f2e444aeca66a4d5e6ae94c2fb4044e00cec9b232bae9a76a229f87f19d90b7aecf70792ec
 DIST mysql-extras-20181104-2252Z.tar.bz2 328613 BLAKE2B c869dbdd8eb8ab6706b52815fae88e0789b955b9d3e89eac305e6de6e1bc9e78ea10ac58efeac0d6478c7f83587910834e9b4c44e3621224f006daae44dc2bf3 SHA512 e0dff23aa6420a9cfcf2f60464381d4b08194759dcd96910cdf94075fa71e90b74fa3dae700f279f421fee68315af37e47054c9422adeb6cc757fa968a1b65bf
 EBUILD mariadb-10.0.35-r2.ebuild 27520 BLAKE2B 09bb435fc35e43e9d5a9f0bb234d7583d8ceb55f19e46176def7d1d4370fe99aedb89e28860cc49134f693bf0f49ff4333916441742da72cf65ad7ef6353c72a SHA512 159b2c09d0da83841f77822b4501cc4302758711c9db9447e6c34ebe6185801cbacb4774060d238f7c5aee4595ccc4e0e05f062300f38e27ff86a54a2dce4a95
-EBUILD mariadb-10.0.37.ebuild 27523 BLAKE2B 02710b45e4ccf28a66905112e28b9378798530f658f20049123e49e2d978a6a70fe5a82376ae2964f23842736b00389e12a053f3c86dd51ae5cfacfbda1210ab SHA512 4e3564c516d75ede2c6ebf8ba6692a3ab7b36de4ea09ba88db57924707b2ecc27a9a2a872fe19825d62c7b0fde1308f26ae73972df39dc133cc6cf415ba2d223
+EBUILD mariadb-10.0.37.ebuild 27521 BLAKE2B 2dee454767b07e9ef957a3d44d3abebb3bace6a7119b81c7662051a3db9315382d3ea1f73dd03380da695ba16d724560d2b03eea3dd09eb206abcaee1358de7a SHA512 d90e140866541db92272855beb315aea7f037304e018efa6ac090b9d838864de0b7efe24d63ffdc2bc605ce659e0a8b722e2c7650ba21d740ab7d337ddd2c9d2
 EBUILD mariadb-10.1.34.ebuild 29472 BLAKE2B 859741b70abf8c2347395b26b7543f36be94165141227bb7dc75f054768490bf891eea5bd2f171aa0c0f8caed7603abf1347a0087caa10e55ce920aaa9c6677b SHA512 ff30a1fcdcc72b8324dec1be29db63a1792ca58474744f0c02014b1fba28d856ac0f154235b0889aedcc95cf24c4b58fcfd681458be726609861ba6f4220ad8f
-EBUILD mariadb-10.1.37.ebuild 29475 BLAKE2B 725de7702957058a9ad1b0f35cdd0bca5b70ae629cd3e0a21478734d18806a8679e3cc305989d158f32c8148d06e675d48d3e1984cc99ce835ad080125d03059 SHA512 a6918be9f9202f171689648f0ac2ba741d039059dc9833ce2210a33fd619edf008e90d1f4c42707a446c739af66bef124d136000600e02d91205f4ac19510510
+EBUILD mariadb-10.1.37.ebuild 29474 BLAKE2B dba8dc78e78319041edbf8583ed9584f74964ee114a55a2e77702b086e878905d098dacbf01a8fa802f69c8252cfc0a763fbce7412fc69ccdb8dc78b20bd1a56 SHA512 0cc0d703727393dd5c601027c156b194ff6957e46935077fda1312da37ae6b0aa4282b51666b849ac7414ed3d4ead2640b530ffc8e6cd04bc5c9df2d3502848a
 EBUILD mariadb-10.2.19.ebuild 34504 BLAKE2B f6269aa1a93d89d39ffd0fe57a67899692ee5ad670a308aee8e7d4cbaa7878064db879fca718e65ec1343ab85649eab7fe29ec03a4e4d9670905034dcb07e170 SHA512 766367854b21972954736c450a39759f545b24ca60ec3f6d015bb117de40cf38af5144998cd63e2afef0d4a5d0d395a69c42bfb5e6eb67ded64b1863bd7512db
 EBUILD mariadb-10.3.10.ebuild 32157 BLAKE2B 9d3229c8de1910799d951b8a57315fba6271b70ec11810f2c0df2bb39a47e2b80e2046b06187a276ae85bf21c9c0b90283a626f065f4da983b4b72bd595be988 SHA512 9f1c3412ab863fa2b70371bdd4c090b9d4ded4e8a3575e2a8e0ea48cf0b3a78f5a9c154e0eb67bdae5e4a28ab5a7a3ad9db08d89678af511a93948a638cd85f0
 EBUILD mariadb-5.5.62.ebuild 27071 BLAKE2B 528f4e740b597cad24ecfd5c03137bae7fd65fb6adaa615a9b5ceeeb9f8d138ad47e2c034f9b4a2727d0059148b06985e3dc9cc9223ef756959d730f319c4b07 SHA512 e79e999633aef9b04558d71ed6e3398d372816b3a343429c521c44b33d3bf7e0afece3723d2557aaf03106dfc880fcc0c1504e6d12eb2dbff9c08927af716b2e
--- a/dev-db/mariadb/mariadb-10.0.37.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.37.ebuild
@ -40,7 +40,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
 	?? ( tcmalloc jemalloc )
 	static? ( yassl !pam )"

-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"

 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
--- a/dev-db/mariadb/mariadb-10.1.37.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.37.ebuild
@ -40,7 +40,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
 	?? ( tcmalloc jemalloc )
 	static? ( yassl !pam )"

-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"

 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@ -18,7 +18,7 @@ EBUILD mysql-5.5.61.ebuild 25515 BLAKE2B 2e8a5ff36ec6003ff7e4d746157afe8af9d4625
 EBUILD mysql-5.5.62.ebuild 25693 BLAKE2B abb1400994767e1a29259fda70531e27e9160b849a6228802baa440f8a5c8244393cb155ac9985f04353c8b35516e653a563c2eb84b72a714c5ee81d016e5d27 SHA512 759b82802fdeb7840b0da3e4ef1d6e7b1f32d7bd815ba780b11e57143b52bcb7eb483c008d25670f4626968028a46f7080abff247e5d2047f6b500ac67888ad4
 EBUILD mysql-5.6.40-r2.ebuild 25714 BLAKE2B c78b1d8b2a77d095302f7e203c3ee6c0c2014770944072b87bd77f97972fcb6db52b05088adacbc821ce2e8f3dbb780bd40d850e381b866458b0d530fd11ea5d SHA512 b6301834c7813714f18f9763922d10e6faa33675705ba479c6d76e3c5673d903b0683f64a8281836bd6be396f398ed1bee14f9e6c8ddfe30b84ad1ac66a8be48
 EBUILD mysql-5.6.41.ebuild 25721 BLAKE2B babbbcf2b0004de259843b201af56ed5513d3c61e484164aff8ff8dc8266bad491628b5f4805a2deda373af6a39e0b086e23dec53799546e35dbb4f51a3c645e SHA512 5933bf59434bf7fdc2ff8d119d2c1cf58284bfda94ec2adbd4340e2958a6ac325bcbdd2106f538e26bcddf8c93ac3d9d0646757ba3e4c32f7dbc5336320a6df1
-EBUILD mysql-5.6.42.ebuild 25957 BLAKE2B 2c897c45bcf601594dc78f124fa76bb8ae2d1a57eb10cc300796417ae08e465072baac4eb4bfa89a7eadfca09d0a624bbb26bd55d0e1e7f1bc7c6ce802bde48c SHA512 937ef514a4f23c41eb5867b6237b87b5c8d5411c2fb2379dddd50b1e58a07f22ca3ad7b45671245c0a777576d0384a4523be9a29126533fb3dc510b04cdf002b
+EBUILD mysql-5.6.42.ebuild 25956 BLAKE2B 688d39cba41385111fe1f07e6a2735e5ff338b6c0ba4589ef3a46eb74fbb39f6f2d48fdd3067860fb638b1d11799e5598519c188e3a9db31d8fec884792f5c86 SHA512 5f9b1469f3e4be7a93cd768ce293afa8f93cd1544f3944fdb4d5951dd031c2ce70628b8fd48ce0ec5d6bf0c4cceecc7f149e1ac74b58d1db395330504b763957
 EBUILD mysql-5.7.23-r2.ebuild 30078 BLAKE2B 57bf58e862639e651335a10a8c4dfc5f7f0f76bfb0545414d697875906d917131fedd3e9d0e58f57b886d8cae55adbd2a104ee3632d49b4ba0669b93a1a68bff SHA512 dfbb88e79b717ceb615246a806123ee2d30c1632cfb40d0bb9e04a9204565a92afbb2b37245794c15985e99a60d2adc46723b97e455fb85e137079d6192b148c
-EBUILD mysql-5.7.24.ebuild 30388 BLAKE2B 78b99e8761e7ad9c73f5425224d8ee09d02a5c9b6a014907d72429421a01343a9f65cbdab59cef9c6e5245851db8f7ba33dddca61bf4a227b7e246bf7a4d390c SHA512 0b011f3b8afc8a3ee8870c0bf19049bd915d5312550b0b1c572229cb028af7524e38ecd6249bd93a6d897652f3d6fef0ae03f9375ae62105026609724f3a8dff
+EBUILD mysql-5.7.24.ebuild 30387 BLAKE2B 78992c12c96c20c1632816c3af1a401f606740c5aca652ae70ad9e1f63dca232be075f700e05d9327dcf4a756e210e4cac5ce28ce5b4031ae0a9b05b0d700523 SHA512 4b6e8533c49c2c18518916f10a9afe725b63ee098b3aaba297e1fdbeb32c7c9da96cf544212651e515593b660e2fed6abbbcb0538a5e80faee010ab5ed5a54d3
 MISC metadata.xml 1539 BLAKE2B 0bc66c5855bd1f4353a7f0b551229d68a940478687b4f38653f973e4a5cfcb946c86bdc2d8318aa96aba43598eb476b995005f26727dfa176ced00fbe2b129a1 SHA512 bc0ce8a3de5e55d954f65eec657930af069d3550f485334f80dfa4c6d17c6298d0609d1ba4fe8b6c988f8ad007858f147c17f1354c207891ac1a062a36af50ad
--- a/dev-db/mysql/mysql-5.6.42.ebuild
+++ b/dev-db/mysql/mysql-5.6.42.ebuild
@ -37,7 +37,7 @@ RESTRICT="libressl? ( test )"

 REQUIRED_USE="?? ( tcmalloc jemalloc ) static? ( yassl )"

-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"

 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
--- a/dev-db/mysql/mysql-5.7.24.ebuild
+++ b/dev-db/mysql/mysql-5.7.24.ebuild
@ -34,7 +34,7 @@ RESTRICT="libressl? ( test )"

 REQUIRED_USE="?? ( tcmalloc jemalloc ) static? ( yassl )"

-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"

 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
--- a/dev-db/pgpool2/Manifest
+++ b/dev-db/pgpool2/Manifest
@ -9,9 +9,13 @@ DIST pgpool-II-3.7.0.tar.gz 3269076 BLAKE2B f7a396e82022a35e5f46fb644ca4a9007db3
 DIST pgpool-II-3.7.1.tar.gz 3237755 BLAKE2B ec196e384c9c4c03a28081fbb74b820c7480e2a98427441572142bd80bff6d2adbbda9bc19df1c70f4699af28fcac5f09161a5938df633bb9eba52c0d9dc24ac SHA512 2a83f573ca2a720ee7beb75d8d1380747e29b2bb3c809f51bd0f8e4423d67f882ce2acb7d9ea118c55313e969aba3bf94a0d5b190eb905123d43c09df25e00ef
 DIST pgpool-II-3.7.3.tar.gz 3259752 BLAKE2B 398257b2a647039a634d52b0e23ab1584aaa67f58d6f234f03bf2e99380b346b4ff51647f876d0789c484e88fc149a2af5a5b1b8fd3aa48323aada064ea3421d SHA512 c7fea570f11dfc348b0099fde074f61a15e6979b6f16526d24d73b26d723edfdbadbcf10e90c2111aeb72599970718d3cda4abed3e99e8a711cf03b715c29624
 DIST pgpool-II-3.7.5.tar.gz 3276279 BLAKE2B d9c52684985e0a74ef115792f79a71305fbcc5f44663971e5fee41d543c7c290999091c387f5da6c73c88466880a24b21d469046de7981983d9984a606ae357e SHA512 4840047f11b5e176803c03073d1ef6ef54f9d0be3d9bd622fedc9fd0ad4f835090fbf671bfd71cda0d994af6ea9a1658b0d5e5d09ec317b345c41fb0fa4b7b70
+DIST pgpool-II-3.7.7.tar.gz 3325039 BLAKE2B 47f4d48b811af0fb6626a6ea4b46bd81d13997fa8756f533711f733eed7526ea79bbc929cf894911cc5697c37fd5fde0306eaee485f00b6c41c2701bf08c972c SHA512 9766d011f8a93ae292770b24915f6825d037d55ad3f75be131a58a9dcfb4d1a61f572f2c48f69ee0d3c6cbdfe76da15e417c26f102c646c3d9e1a2f71d205374
+DIST pgpool-II-4.0.2.tar.gz 3576212 BLAKE2B 4027b8d02f4422900e674ee49a1946521b0737e73c9cd73363cd1ad1328de294bdec219bb8df55db58c6b2da365f8094e6b2228e13f1d24f35f7fb373280bd66 SHA512 9014c34f69cdcb3064a3713ed97fa0847f5572866db709c53f703b2ff996dbb31988d6573fcd85c9bb715bb54b9c215adaf11eb2f90193371be804ec37ac955e
 EBUILD pgpool2-3.7.0.ebuild 2489 BLAKE2B 79706764ecb54cd2e682bb200640f6635f9a2f6ff8d26f9129a290ea68cb43adef5ba6f6622c591bd9cd5e996456f396d2f936ed8d4d303367fef0032bf2cd56 SHA512 7f74ded58782b8657b3c3f1de92a7a268a806019978e73ed3f4ed93c160d75d9e251acc2bbc39ee266dbc23f662fad8678b98f31b9a476d1b9f0c6b6719377c6
 EBUILD pgpool2-3.7.1.ebuild 2491 BLAKE2B f31a347236dacc779b0c019663205b5472a994da5be4136919a4fc3c86cf730a48abbb2741224855a3fd284a937ad97b1b1a7f0b8e6741ea6570974841d5d6e6 SHA512 42026cf2f0d76578b8324b14af12b0fb53c21a75b33d04ef997589878943fb29887488219f175d4481833854dfdf3f6d91c804b54f73157b72d6f786173d6950
 EBUILD pgpool2-3.7.3.ebuild 2491 BLAKE2B f31a347236dacc779b0c019663205b5472a994da5be4136919a4fc3c86cf730a48abbb2741224855a3fd284a937ad97b1b1a7f0b8e6741ea6570974841d5d6e6 SHA512 42026cf2f0d76578b8324b14af12b0fb53c21a75b33d04ef997589878943fb29887488219f175d4481833854dfdf3f6d91c804b54f73157b72d6f786173d6950
 EBUILD pgpool2-3.7.5.ebuild 2636 BLAKE2B 1d4b4147857c2d5f181d455ade1bc8c2879c6b368b5394cdd0ec01afc68af668855432bafd76d1f01832908323efbbd2532c13b65109288ff32cb4e1983258b9 SHA512 ff1fbf75a9bd7281166546e9f04462062c033a052fb83a299e6fe266b5e018d76819ad9a347f1130015f784718f636ea3f070fffadde299219cb04301e2de845
+EBUILD pgpool2-3.7.7.ebuild 2638 BLAKE2B 554f9cf5bba88a23e09efec63bb6daaa24a29cf31738f2d177750bcfe3b5c2d938a01c28f0a37ac2aa0c2a20e6722050e8a69c52c6f7336dc01e3326ae982311 SHA512 7e150e36e77df5c44c991a51aa34a87762dddd9e15953f676c10ce5eb2d8107064a8a50247cb1d18062c5fbbc421f256a022c134683906fa73a0103f5860da7f
+EBUILD pgpool2-4.0.2.ebuild 2644 BLAKE2B b2f3c100bd902c2e7d1c937544c5199fa3b47ff67aa71ee29f8ecc79701dabba4fd1ab6dc3b5e50cb68bb90a4153e554fd022b04e5cf02b25ea5f36869c33346 SHA512 da03de0e0d76641814ca1de20e8b90e0ab14ae8b7561997e1692f827a6b8e4afbc3f4ab25bffa8d1f6486805649beff57c9b9aee7e71943fe5c096766a5ab52a
 EBUILD pgpool2-9999.ebuild 2722 BLAKE2B a9589fdfa37dc5650bce8cc5c7758b6956fba3670e5629308bc34d1b9e9642bb92fdc7e069231cd7fad1d2185afe8b763de6093b0e97446ddb4a7186915149e5 SHA512 ea19202c508243bb2801266cae49d7e8939a6d7ee51fc4d9a02fe7ba3c7464cf440dd712c098ddb183c56839b9e8093f9222f8348bb52bac921003f601a8514b
 MISC metadata.xml 390 BLAKE2B d6a0560051449e95bb43e81589eee966a477a75d7ec8211ae96b15f2d51ce9555181b8640d9d830f2b42f8159989e9126423c6ccbbc2bf2dd8121f4920a87a16 SHA512 ce26ee116c3c7ff77a771294ed07f38d8f940dc380915c339eb4c543d86fa5bde025ba83e70af2b7bf4a1bef1e51957f151131836855e0dae2e1daed73ffae8d
--- a/dev-db/pgpool2/pgpool2-3.7.7.ebuild
+++ b/dev-db/pgpool2/pgpool2-3.7.7.ebuild
@ -0,0 +1,104 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+POSTGRES_COMPAT=( 9.{3..6} 10 )
+
+inherit autotools postgres-multi
+
+MY_P="${PN/2/-II}-${PV}"
+
+DESCRIPTION="Connection pool server for PostgreSQL"
+HOMEPAGE="http://www.pgpool.net/"
+SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+IUSE="doc libressl memcached pam ssl static-libs"
+
+RDEPEND="
+	${POSTGRES_DEP}
+	net-libs/libnsl:0=
+	memcached? ( dev-libs/libmemcached )
+	pam? ( sys-auth/pambase )
+	ssl? (
+		!libressl? ( dev-libs/openssl:* )
+		libressl? ( dev-libs/libressl:= )
+	)
+"
+DEPEND="${RDEPEND}
+	!!dev-db/pgpool
+	sys-devel/bison
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	postgres_new_user pgpool
+
+	postgres-multi_pkg_setup
+}
+
+src_prepare() {
+	eapply \
+		"${FILESDIR}/pgpool-configure-memcached.patch" \
+		"${FILESDIR}/pgpool-configure-pam.patch" \
+		"${FILESDIR}/pgpool-configure-pthread.patch" \
+		"${FILESDIR}/pgpool_run_paths-3.6.5.patch"
+
+	eautoreconf
+
+	postgres-multi_src_prepare
+}
+
+src_configure() {
+	postgres-multi_foreach econf \
+		--disable-rpath \
+		--sysconfdir="${EROOT%/}/etc/${PN}" \
+		--with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
+		--with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
+		$(use_enable static-libs static) \
+		$(use_with memcached) \
+		$(use_with pam) \
+		$(use_with ssl openssl)
+}
+
+src_compile() {
+	# Even though we're only going to do an install for the best slot
+	# available, the extension bits in src/sql need some things outside
+	# of that directory built, too.
+	postgres-multi_foreach emake
+	postgres-multi_foreach emake -C src/sql
+}
+
+src_install() {
+	# We only need the best stuff installed
+	postgres-multi_forbest emake DESTDIR="${D}" install
+
+	# Except for the extension and .so files that each PostgreSQL slot needs
+	postgres-multi_foreach emake DESTDIR="${D}" -C src/sql install
+
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+
+	# Documentation!
+	dodoc NEWS TODO
+	doman doc/src/sgml/man{1,8}/*
+	use doc && dodoc -r doc/src/sgml/html
+
+	# Examples and extras
+	# mv some files that get installed to /usr/share/pgpool-II so that
+	# they all wind up in the same place
+	mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die
+	into "/usr/share/${PN}"
+	dobin src/sample/{pgpool_recovery,pgpool_recovery_pitr,pgpool_remote_start}
+	insinto "/usr/share/${PN}"
+	doins src/sample/{{pcp,pgpool,pool_hba}.conf.sample*,pgpool.pam}
+
+	# One more thing: Evil la files!
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}
--- a/dev-db/pgpool2/pgpool2-4.0.2.ebuild
+++ b/dev-db/pgpool2/pgpool2-4.0.2.ebuild
@ -0,0 +1,104 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+POSTGRES_COMPAT=( 9.{3..6} {10..11} )
+
+inherit autotools postgres-multi
+
+MY_P="${PN/2/-II}-${PV}"
+
+DESCRIPTION="Connection pool server for PostgreSQL"
+HOMEPAGE="http://www.pgpool.net/"
+SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+IUSE="doc libressl memcached pam ssl static-libs"
+
+RDEPEND="
+	${POSTGRES_DEP}
+	net-libs/libnsl:0=
+	memcached? ( dev-libs/libmemcached )
+	pam? ( sys-auth/pambase )
+	ssl? (
+		!libressl? ( dev-libs/openssl:* )
+		libressl? ( dev-libs/libressl:= )
+	)
+"
+DEPEND="${RDEPEND}
+	!!dev-db/pgpool
+	sys-devel/bison
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	postgres_new_user pgpool
+
+	postgres-multi_pkg_setup
+}
+
+src_prepare() {
+	eapply \
+		"${FILESDIR}/pgpool-configure-memcached.patch" \
+		"${FILESDIR}/pgpool-configure-pam.patch" \
+		"${FILESDIR}/pgpool-configure-pthread.patch" \
+		"${FILESDIR}/pgpool_run_paths-3.6.5.patch"
+
+	eautoreconf
+
+	postgres-multi_src_prepare
+}
+
+src_configure() {
+	postgres-multi_foreach econf \
+		--disable-rpath \
+		--sysconfdir="${EROOT%/}/etc/${PN}" \
+		--with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
+		--with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
+		$(use_enable static-libs static) \
+		$(use_with memcached) \
+		$(use_with pam) \
+		$(use_with ssl openssl)
+}
+
+src_compile() {
+	# Even though we're only going to do an install for the best slot
+	# available, the extension bits in src/sql need some things outside
+	# of that directory built, too.
+	postgres-multi_foreach emake
+	postgres-multi_foreach emake -C src/sql
+}
+
+src_install() {
+	# We only need the best stuff installed
+	postgres-multi_forbest emake DESTDIR="${D}" install
+
+	# Except for the extension and .so files that each PostgreSQL slot needs
+	postgres-multi_foreach emake DESTDIR="${D}" -C src/sql install
+
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+
+	# Documentation!
+	dodoc NEWS TODO
+	doman doc/src/sgml/man{1,8}/*
+	use doc && dodoc -r doc/src/sgml/html
+
+	# Examples and extras
+	# mv some files that get installed to /usr/share/pgpool-II so that
+	# they all wind up in the same place
+	mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die
+	into "/usr/share/${PN}"
+	dobin src/sample/{pgpool_recovery,pgpool_recovery_pitr,pgpool_remote_start}
+	insinto "/usr/share/${PN}"
+	doins src/sample/{{pcp,pgpool,pool_hba}.conf.sample*,pgpool.pam}
+
+	# One more thing: Evil la files!
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}
--- a/dev-db/pgtap/Manifest
+++ b/dev-db/pgtap/Manifest
@ -1,3 +1,5 @@
 DIST pgtap-0.98.0.zip 270583 BLAKE2B 25d409f5fc63bc7059e8a4ffd3cb460885648f8569cd10ca05d4c5fbe09af323ecc719d663f81389d45f4a4910ca77beef968e264a0d3f4fabf63fa30b8b98ac SHA512 478841aa9cf378120713b90f33dc16d40fdd030ee1856edd4bfa288a7803cabad09661cf5219925335d9220e12b6202a1fcd8cc0fc55d1974d1e98dc0f6ddac0
+DIST pgtap-0.99.0.zip 275915 BLAKE2B 33499dacc0019ecbe85ff3dc4fcc243b6102e0b7e7018d70b17cda44b8d22d8260229ab732db9900296232e0801070722bf97a752734ea7d389dc8ae57198b6f SHA512 c1b39bf2c041d759006d692229a67af1520b6a3d23fdac43f0781cac9ce69e7714fc854d1e45f1cb3ee188a20dccfb7904bc4dd1513699189fae70f425c13b5f
 EBUILD pgtap-0.98.0.ebuild 488 BLAKE2B 4c9e215882a272b5cfd2c58c75cc3e589cabf79f1653d1eaf259fb198316dd3fb98b0d7792e742af88e9931039c29a5c459205c9624d15f8cb1e212bb39b46a7 SHA512 ccb8d89695c5ac7d4eaf8cd281bb4f29fdd85e490e7d6aac4a78b62c09c4d1a6f0601f728ed52a83e0cac543e1f862836872ea9717967190f06f169e31353e9b
+EBUILD pgtap-0.99.0.ebuild 590 BLAKE2B e9a8511a2ee4a2f5c251a2a4ccbe2e12f3d7185640b8de221bca1189db0638a17fc1d0606da728aa938fd1acd9f5e1e3b61a2a01256fac3e0a368e14b186f82b SHA512 9c27784cd2eae449e43427adb38db81150cb0a8441e0961fd80c3786ea27fc2519379f84c9a1af26c6ace6aece7f4fc5c5055e58c955f49e2389cfc1f092e922
 MISC metadata.xml 628 BLAKE2B 8a671273bb0de6f11d5ea56a3bf38e9eee05c0a70ff8cefe183f0eb798afbead29e96d5a45f764e2afc437cc97d91590e648c6716a8dd8fa7a6cc9f072332e0c SHA512 1c06c14ea5af9248950e6c10ab877b0725c4885082211db94b8a195fdf0dd115dc584a325655b7155895ec4382008e03511aa238d43179310fbe3dc835f5270a
--- a/dev-db/pgtap/pgtap-0.99.0.ebuild
+++ b/dev-db/pgtap/pgtap-0.99.0.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+POSTGRES_COMPAT=( 9.{3..6} {10..11} )
+
+inherit postgres-multi
+
+DESCRIPTION="Unit testing for PostgreSQL"
+HOMEPAGE="https://pgtap.org/"
+SRC_URI="https://api.pgxn.org/dist/${PN}/${PV}/${P}.zip"
+
+LICENSE="POSTGRESQL"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="${POSTGRES_DEP}
+		app-arch/unzip
+		dev-perl/TAP-Parser-SourceHandler-pgTAP
+"
+RDEPEND="${DEPEND}"
+
+# Tests requires a running database that match up with the current testing slot.
+RESTRICT="test"
+
+src_configure() {
+	:
+}
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@ -22,15 +22,15 @@ DIST postgresql-9.5.15.tar.bz2 18707696 BLAKE2B f1be26085953d5a15a6545aed3527b9e
 DIST postgresql-9.6.10.tar.bz2 19991204 BLAKE2B 3d99296b5045a0b56b89257b2aa3f0c8be1108428acd77469b8db94200ad6b0b8d2fa84c73f652f79db56620c46928524d2f3a1a265ac332eb36c0625b800f76 SHA512 960a32c86466f9d5f5491ef163f5c4a99cb5de7312d13371e2223b1d156e31eb2a23ed478e6654bcbb7bd19db9470aaf63473ff661c11c60971b92af5e9daf82
 DIST postgresql-9.6.11.tar.bz2 20009048 BLAKE2B aa3e5b1e63c983226ea71737982e62eaff655af7e0f55f20ec886f5d7406b1e30e2fe5378b0dd1ef59e777f862ccc2386121653853d4c186a1b4853a9bbb1591 SHA512 a4314f92d1a661af4076d8c120533ecae76d91461043b8a6ad22dd6e5b562e0bf019bc7f3157a26d9666ba5866e254613ae5b690310168b029795dc088f8c060
 EBUILD postgresql-10.5.ebuild 13694 BLAKE2B cbc3b1250d2b50dd7a9c318a9c610506db4b2593b013b2d89a573276ab8604cff741a1a3ca03a97e3c9a6bd7392762f821caf90d642c9a05cc9ca0b411340bbf SHA512 4b6fb894e8d5196139a56b897d3a06169c35def0d7e472ac8332987445f7c7ce72568b3b7a45bd7e8dac651108731761c413296864b0c9be4a617217d49ef3ec
-EBUILD postgresql-10.6.ebuild 13815 BLAKE2B d2276827f49832a9dd9b6f3e145779ad74fcc235424edf3f4262e4af1d43b3496368b45ad871f77b474a591dac51707c078b334a2b06f63f6715df5db50aebef SHA512 0675e0cad387cdc45574c798e2bd1af7a2a7e1844ca3d7be9d3a7d9eac015cff846bdf6edc39bed014c35c206ec4f06bdb83dc332e45241aeb252022792acb55
+EBUILD postgresql-10.6.ebuild 13813 BLAKE2B c5b6ef7c257632a9c296a40c845c9b147c6b04e327e0706629b9e832775013208cf0f03585a57d6a4979d005f8bb17dd6160cc6669085869748a9c433b9a2ec5 SHA512 8196ba1dc122a0d1c88aa428322f56eea3b6ec5f6e3588b07da2082780dbda5f78df8d095d850fe9ad72e7590c356ebe563662b13d32ab5a0178305b8ccdcd2b
 EBUILD postgresql-11.1.ebuild 13751 BLAKE2B c86eb35ea10ad4cdb7910fb89b6fdb733bb2594960257d2023aee0741389818f339f0dc646a1b4d8310d84982c95a1ccac7ae90dda126dd9a8e8999f20a8ad11 SHA512 f74e3d23c3c8b4abb6fba146199dad2be2014d950d2cc7038782a4c2d78cb73389e7332b43ae216a5fd3baa0bac763fe4d343aa7b2e4f118da53095d1886d29f
 EBUILD postgresql-9.3.24.ebuild 13747 BLAKE2B 12e74f2f7bc2b18507b5c4e07d093cebd96406c6d981fbcaa6c2851004183acfac3e3fb882e1eea662e8cf1d35c10a1bcd6ad2820a5770874f04ad9cf508c387 SHA512 c89150f9b09e18b196d267dbec2c6539d3eb1ed6326193681249770c5d1ad42e48cffcad160121497dc8dbdd692994bd2704f581d52d029ba4dff5178a773746
-EBUILD postgresql-9.3.25.ebuild 13563 BLAKE2B 9022ad545996ac838da06df09359399a43cce9933340dad8944d37423d936a72ea5d53c42f2039e99b18437269e7e4a29f91cb1772b2f468d99dd7f47109a470 SHA512 2bc48d235f98e0d1dcd0c97328c7b097b88d4255f22b58f00701c511ae57b6e46fddf8866e891a7419497597164eca9fdd0e4a236d17b025a98262612b3f4f72
+EBUILD postgresql-9.3.25.ebuild 13561 BLAKE2B 8f3e75179dec828e49786bb1fb52ecb5488c5edab4dcc775b42e2343261f1f1cc55088121d40074cca5b89c243cbad42d8468b175a17bd86f8042e8b191f04c1 SHA512 7bddfe493a2295730e690f431f94b6f2d713cf9261fbea08c1dc380ebc7f29e60c96a045144d10ef6183473a340c2b8668f52e5fa05107822ba0e5493c208c40
 EBUILD postgresql-9.4.19.ebuild 14557 BLAKE2B 57446276df8b11ebe12ef5a4b3e95dfc2892cdf93cb1a40117f0e7ae5774e0ba1a4a08b2306d971625636d4f0bddb4d0395bc6671397ef291c0251a31bc37256 SHA512 05b6604f17b63442a1eda4673a702eab7bb0ac4af87dce7c9f56085573768aec408aa441873317cf610e379972221f68d49c19f47f7be48b1e6a74809d13c407
-EBUILD postgresql-9.4.20.ebuild 14373 BLAKE2B dfb3c4be4032e56c49a9fac51cfced371a14085e638c229bb137eb9a25f72e3c7b60fd053a8f22441645c2836024b841cca3f5a2117e07906dd95d1820263b28 SHA512 a97e30b1b4eeb1e460cb9f1e6f288df5c67921bd4792d784c6824f97d09d3871e7179b33394ad2886c4d99414fe0080d8df1d221990d04454946951f696529d1
+EBUILD postgresql-9.4.20.ebuild 14371 BLAKE2B 7f595656f7d398f89e9c34423dfefc97b5474dc8ff2cec61734041b62b1681e7055210eee5ccbad1a2e0ab364a44438310e93ec9d7937dd8910e03320ad88204 SHA512 e720d9f3bc8d4791cf38b7015498f90a2408ac5d243bd0ec3471fa3ad5ec1587fdab17fdb244cde35ae80b7bc322bf639c7160e84b7d64cda6a5cd1fd8af3f21
 EBUILD postgresql-9.5.14.ebuild 14785 BLAKE2B bbd02c18eb7e6b6c9bb2f3e4b4010bc1aadc0aaabe158accac75b1f692c8905d565647bac95c46b69003f70ce6608017a877e74e37e915a2827f5a6f35a732a5 SHA512 2ae77b20602445192062ab5930cc518c3524aa8c57c4aaa4923ec15b924f3b166dcd51dca32a19618d3055214bfed7977c4630dd40b6967aaf491f1688aaf717
-EBUILD postgresql-9.5.15.ebuild 14601 BLAKE2B 7533c769f59006981b4f6f7db9d2a7340dac925e743925d967c08fe31b85b554c738ea1e762bf5c5249c870125996f6fb60cd64aa004733affd6dcd21030a69b SHA512 e04c3baa1ad167023409321b2f3b77c8e9ee5f39e773681b49e6dbec3fdba0f0e7d5169238068f02aeb54a9347021c9728fa76647341df75b9bb09a328dede44
+EBUILD postgresql-9.5.15.ebuild 14599 BLAKE2B 8f0b7fc2b6b49a04996ed19cdf6a6b212c8f1aea60cbc9ea6809ed6913e67831cfe98ebc266ff7379f69be58b1f672ce0028e9d453932244759f75598c04d8a7 SHA512 522a170ce59a87e09ad8656ba1047b41ba41104edfcf5950260389e278725f076cd4ebb02ea5a95c8d9c8b372a80ec66d18be9bb7e08c70fea7116bf09a8fd1a
 EBUILD postgresql-9.6.10.ebuild 14927 BLAKE2B 36ba33cfc700526cd716243a838a9b52a3823feabf53fe7045aca86e54c048a0c1e5c7c4950e33d131e29a96e7f00eebe2a366e46912a942c871b799c5df8a29 SHA512 0e547e8a39b0c96ff4d100d42ba1113aa87f537f14ccd242436270a6972db3c09690a9925d869c0256342e89687421b26e18fd210313dce3b23dd4062c1ad1c6
-EBUILD postgresql-9.6.11.ebuild 14743 BLAKE2B 0cc59dd10e3e3982885ce9be39f1a122d840833eadd3baa1750e4c6c0fe32ce91114a5c575ceb8fd22071101da8fce4f528d18583916c50619ece85d69084b21 SHA512 87284b68f4cff5a0c9d5afe018d88a3a862f0e3cad4f8646d2bc9ace28dcee0145205ccb739a523166b817d4e7a98ca3c10b8806e834fd1ec449952fc30c914b
+EBUILD postgresql-9.6.11.ebuild 14741 BLAKE2B b720b399b96f67923906a3dc1ddaa71610113d42eb3c301f03ef9fc67dbf7dc46b7ddfb2d252b8685b16382813b7e4890f838e8660988c334d457f1d2c7784fa SHA512 ceb1cf6e13e24dfc80d68c5af141adf04b8abfddc11aad9ec7433ea28625071a10cf89241842b7f087f564c0666592413110711fafa66f455cd1dd3bac11b218
 EBUILD postgresql-9999.ebuild 14262 BLAKE2B 43b6b2ab7b5137e8a0ca2edf28781d30f7a27afbf01ab718f4742c4ec981071797074f6dcad9995796d30bbd0b1e39d4ee7a63a404e7246a9bafbb5298a12c47 SHA512 29e5bcb9463c6cb8a43e8ba04840aacda074ddbfdcccd1dafcbd66e13d5c20a765c53f637e1c8993fe6647c286f7ef40254f3211f3341054c96bec1f327393fa
 MISC metadata.xml 715 BLAKE2B 59ad51ae06a697fe649054d9fe13040423f425b95abdcf3797e1d0d5abba8c62d54cc8c1afb0be0d0a29d1a39d379912bd931925b5df480fb0bb9b238c36e598 SHA512 03027757eaf95313a6825710b1054a9671aa8396381789397006dfe2f66cd41e85cde418e792bf7d71d7db2413905816ff39685774219c1ea5e8b8d35c5cffd0
--- a/dev-db/postgresql/postgresql-10.6.ebuild
+++ b/dev-db/postgresql/postgresql-10.6.ebuild
@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
 inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator

-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"

 SLOT=$(get_major_version)

--- a/dev-db/postgresql/postgresql-9.3.25.ebuild
+++ b/dev-db/postgresql/postgresql-9.3.25.ebuild
@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
 inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator

-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"

 SLOT="$(get_version_component_range 1-2)"

--- a/dev-db/postgresql/postgresql-9.4.20.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.20.ebuild
@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
 inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator

-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"

 SLOT="$(get_version_component_range 1-2)"

--- a/dev-db/postgresql/postgresql-9.5.15.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.15.ebuild
@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
 inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator

-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"

 SLOT="$(get_version_component_range 1-2)"

--- a/dev-db/postgresql/postgresql-9.6.11.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.11.ebuild
@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
 inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator

-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"

 SLOT="$(get_version_component_range 1-2)"

--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- a/dev-libs/ivykis/Manifest
+++ b/dev-libs/ivykis/Manifest
@ -1,5 +1,5 @@
 DIST ivykis-0.42.2.tar.gz 653885 BLAKE2B e4a5310ce6fd15aea79091edd56221f77c64a68472fa9bd44715da8c21b4b54f55c2e8c886491afcb8c206107b78b20cd7ad727a96690e8c718f2a2aaeb32aac SHA512 0a166869b434668219c379a8acf7b2da17cb1e29aef74f9dde869a322d3b34e36c84bd67800f7fb234a29bf9372061329189f02ab6d7f85bb2622b4c43185270
 DIST ivykis-0.42.3.tar.gz 654302 BLAKE2B 75a143b71bf69371b0b58c8ce342f404c8b67604480523e91b37541c74305950996696dae1c8b03277c240c7ff259560ce26a2899c52fb804f0114b8575918ed SHA512 d67560775d236dd205ef0f5de42bb7fedf52855ff0624f8abcb4ac80a75d4695650fcfbdf88b0e7339bf5c250df741428941881c3d7a2551ffe987cc31dff514
 EBUILD ivykis-0.42.2.ebuild 402 BLAKE2B 9fe4f5097ce2060c52b99c925cd12a9e79742396c7bb3ae84a7a89a1d7d082fc88152a4e06032ad988366f4323a2c10a329f6ff690a2278d0f6bfa4c3f5a6c09 SHA512 ca5974208c11a02c33f7a66c2336e64e054be78b9ed1bad43b55de065ab9a4b939f893c3286544dd87965dcc9a0b1e02a1435b36d02f8b657c41fc0a7c4e7da0
-EBUILD ivykis-0.42.3-r1.ebuild 550 BLAKE2B dc9e9f38bfda990ce888fb7debe26651d73dba428add1c764efbaa87a833b9bab92d269ee30c14f636bf869b4b7e089ffd0f295aeb1ba88098bfc9274e7b6cfe SHA512 5acafc339a023306914b3edb7da22c3a6bd1fd790ddd9db0cd821c46630430af1f44114ce4c81ccb4cbbaf963028ffc4287e92609a63ff8a566b519f998b6db7
+EBUILD ivykis-0.42.3-r1.ebuild 549 BLAKE2B e5318164c5f5914856683eb5983531e1817605b984f6a2f0b4a2905b470b1e66e701c46398221d5ef65787516c2f8b944bf99eb802541d0ddb7f99aca27d26b9 SHA512 a51c129669dda6211b33edf136dbcfdc6ef6f7f0dc5757c4d9770853e29a458e58ede0b7d06ea586988be2753a10f842d2713003d3648443be1162a78f50727d
 MISC metadata.xml 462 BLAKE2B 64b01c11fccd36c0d1c027c8c904ea843adcd233cea786bac604d81044929f420a64ceb9b6a713bfea8637710899254981b44213ac3832173b556026d51b2ee9 SHA512 70b8289fc39f3a8132f8d85577c8795d9ae44fc72934765fa12226f147b43d28472afa77d9a39e65d48d123dfc9a69f509090956317258de3e3cdf8f95a03e9e
--- a/dev-libs/ivykis/ivykis-0.42.3-r1.ebuild
+++ b/dev-libs/ivykis/ivykis-0.42.3-r1.ebuild
@ -9,7 +9,7 @@ SRC_URI="https://github.com/buytenh/ivykis/archive/v${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="static-libs"

 src_configure() {
--- a/dev-libs/libcdio/Manifest
+++ b/dev-libs/libcdio/Manifest
@ -10,6 +10,6 @@ EBUILD libcdio-0.93.ebuild 1757 BLAKE2B 1149aead21159668e3f89c703b67e0e21520d75e
 EBUILD libcdio-0.94-r1.ebuild 1766 BLAKE2B a04ab2d78db793aff7738da80db945b159e367c47ddd88b3d1bcd3d8ef108d79074952d58f90a737589a246b55d03c8c57b1d77a2f9b25cbacdbdb7c9e460411 SHA512 0baafcfb707d39df24a23da80356415aa450637c0a70751c08ce7ce1eae2180bbd39e6cfe58c28359cee86c0ed54fa132f0a84efaafbe8130696b5aff5494bf3
 EBUILD libcdio-1.0.0-r1.ebuild 1867 BLAKE2B 6c5c7e85d381822cb8ab25d4e0c69b59160588d98e68e038e09816b686c7d57766d9bc9ed4697400f1fd8c06ddfcd3a2515e8896d4d5f09d251b354a34b87dea SHA512 af06569b609761255605ddc89fae69fe1e9a4e831023f8e5219de2ee19c6247d53e468e79d530f7935661fccf51cea1fac2f70d7b814abfaa396327248a15f0b
 EBUILD libcdio-1.1.0.ebuild 1790 BLAKE2B 1a0ddc06dff2c7a3f42f07f6877b0a76fd4ee4e6c32297c7d606afee07a3e78bdd77886c4ff07a783fadbcbc805427cff41d47211195b353212b6f3f0341dff9 SHA512 20f6efba15c4b0b9b86b54bd720e69cc25a9e87e54963f6c431b25634fd1624ea5277797fa5a2080341b55fea6de4cd0fc15c3e412e1ac70e1f6b8adf7af8456
-EBUILD libcdio-2.0.0-r1.ebuild 1846 BLAKE2B 879c62e2365d99c41a90653681dd3b6b36c764b740a7037a6075d3461a8555a7a698a4c2ba5077490e63b16a7ae28f90fe34ef19cabb8aa7a67e4ebe1d3ec91f SHA512 d9c8c45a158e0754e264a3c4188d36ac851cd90ae65ba12a2abe9be65e54dee8e0525c339864a9fcc0767ee75a1b6a7ea321c0a02b6a042fafea76fcf13376ff
+EBUILD libcdio-2.0.0-r1.ebuild 1843 BLAKE2B 8572b05d974d3f8e782ec81bc0c734a2c14e4b960172af00836b4ecaafe4fd2163cc0122cda01b2cc5eb5c568bf86b36a74479a7e57c652320beab5b2ec37c5f SHA512 38d67ec55cbdc4d11723a3351594ceae1e7025408eb21b61acf8f9281b520df4f79e214f47fb56f383b1548de20d9581e98b23f035927d79a892c376bbf68a97
 EBUILD libcdio-2.0.0.ebuild 1789 BLAKE2B bd3747ef0f97375640f5a81ab756492564687a97292d74c75946b4f08ef22ab1e1f590f9db7d89ef4a98f4c4ca49afa1a306a1919da593b33f3e97ad0bd17037 SHA512 20bee0c8ef079f8597b7aa9a1b8dab14e5ca03423e5990fe89abbd7a9e0dd09d6d377e72158031df890ce9361e8067337e82db74d6459be1d7d9b1be86cdc611
 MISC metadata.xml 528 BLAKE2B c36309be516242be4eec641d3f81ed67c0f840154bb8a47983a6fb8340a72bcacb1b2eb4f46610a2e341c5c64494fa620c730a44c306b9334b102edf9884e9ca SHA512 17b0f73a4496400d46b3485909fc6c6b3da85e99b5fc03335e9b6ce50233ac075edbe2fc97eee8bc817e632f53238d1c33c3166d33d0d10d745a31dac3797de9
--- a/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild
+++ b/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild
@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"

 LICENSE="GPL-3"
 SLOT="0/18" # subslot is based on SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cddb +cxx minimal static-libs test"

 RDEPEND="
--- a/dev-libs/libfilezilla/Manifest
+++ b/dev-libs/libfilezilla/Manifest
@ -1,7 +1,9 @@
 DIST libfilezilla-0.12.3.tar.bz2 398275 BLAKE2B 0ba30e64b6aeae0bed58913248992b7152b389fc560291174388196a02a583dcbc485c9fb9680e0541e788c2d6691a6050f465e8719c2c3e7974eb5fd293bf8a SHA512 a08343a418b4147b42d38afd04c66a26c405770109818b48a291c127a5fde6c98515b716990fb056b319c3be859f44060d4ee83e96ec5c4bfa40c755ddc01bba
 DIST libfilezilla-0.14.0.tar.bz2 399398 BLAKE2B 25c1397769adaf532823f85abcc8bec0a885f5c92af49219a1aa9379c12692bdcc94d223ac2ddeefbb221f0ce0d709b058b7018f3c358a40cc046e7c45c4ee82 SHA512 f20932e14ab81df9562e030ce10009b9ab55b6798f7bfff7249e9f472fc8cae4278eb142a655dffb63fec53894783874973eb33444bfdacdb06fa682c2dd66a6
 DIST libfilezilla-0.15.0.tar.bz2 404535 BLAKE2B 9390025ef14553ce6ce9494ba84c888efbf78799b681eb6d6f6ae3f3a626026587eca1898aef907adbbbe970ef6f1cd30aef66a94fc287331e6e29f66761ff3e SHA512 64b0e2a8dd4dd06a1c2daf52f3036fcaed60b95240672f28032ec390361ddb1a59cd26a91b7b7c525cfc8262381db09a081a29c723f487cc5b41454ce4e9d47e
+DIST libfilezilla-0.15.1.tar.bz2 404746 BLAKE2B 644f4b8949670d5b07f9e7b861d388ce70eae6612e34bf938cb628b65724a527e33c1f039087fd8381c06a15c12cc2b4fc6f616cc5949bf325e2eebf41abdf2d SHA512 d557f7636bfc3958b8558fab3384b0ea84caea594566d39c051f20f02dfd71213369c50df282a3f7d2dd757038bd26e9722214839dab965cb7cde9733d59883a
 EBUILD libfilezilla-0.12.3.ebuild 921 BLAKE2B ddbbfbb499653641009d4ce494b7308bc92d6ffb58ae13888dfe892761c993fe03b5ead34638b238e96a171310d21f794981051d321d01f1d4b64ef63a47afa4 SHA512 7d04b1cd40129c05ffef86da072ef5da8fc91420ebe5444c6e5f8c471c0627502ee0575d19d3de2903e7bf8dc2a256aaaf7369cf165f62b868d35b54baa0f34e
 EBUILD libfilezilla-0.14.0.ebuild 920 BLAKE2B 43c040cd73c96a0dc869b0bc7d32b2eefc5dcc636cd22f6ad5922ba4b302b67fc8b77485cabbba891a3067dc7a8c4c48af5d5429fa6d2c7a85186a96cde2209b SHA512 322fd404e89418b1219115d1bf7652100f2c2d79639a032e0d7387f580712f1e0c3d9de88e998475efcfdaf9019aa5a4fef8bc23ec2b6b0a698c631494911a66
 EBUILD libfilezilla-0.15.0.ebuild 920 BLAKE2B 43c040cd73c96a0dc869b0bc7d32b2eefc5dcc636cd22f6ad5922ba4b302b67fc8b77485cabbba891a3067dc7a8c4c48af5d5429fa6d2c7a85186a96cde2209b SHA512 322fd404e89418b1219115d1bf7652100f2c2d79639a032e0d7387f580712f1e0c3d9de88e998475efcfdaf9019aa5a4fef8bc23ec2b6b0a698c631494911a66
+EBUILD libfilezilla-0.15.1.ebuild 920 BLAKE2B 43c040cd73c96a0dc869b0bc7d32b2eefc5dcc636cd22f6ad5922ba4b302b67fc8b77485cabbba891a3067dc7a8c4c48af5d5429fa6d2c7a85186a96cde2209b SHA512 322fd404e89418b1219115d1bf7652100f2c2d79639a032e0d7387f580712f1e0c3d9de88e998475efcfdaf9019aa5a4fef8bc23ec2b6b0a698c631494911a66
 MISC metadata.xml 1135 BLAKE2B df349738b526f415335acdb239b0d567b2e86c835fc8faba17513a9cad40427b50d1822ee7f2d5931571cb02a26dc4a26831c44563ae3d9a6f999c8a63a23404 SHA512 f0a35af200bbaca778c066720f1c4bb8680418196ac996cf09158c2ff881612132c85a926d4881437c332bb7e1698c5f02c44be9e9cc9b976e5170813ecd8151
--- a/dev-libs/libfilezilla/libfilezilla-0.15.1.ebuild
+++ b/dev-libs/libfilezilla/libfilezilla-0.15.1.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic
+
+DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
+HOMEPAGE="https://lib.filezilla-project.org/"
+SRC_URI="mirror://sourceforge/filezilla/${P}.tar.bz2
+	http://download.filezilla-project.org/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? ( dev-util/cppunit )"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if ! test-flag-CXX -std=c++14; then
+			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
+			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
+			eerror "to gcc-4.9 or an equivalent version supporting C++14."
+			die "Currently active compiler does not support -std=c++14"
+		fi
+	fi
+}
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@ -7,5 +7,5 @@ EBUILD libinput-1.10.7.ebuild 1440 BLAKE2B 203a9e8e20785cb93d221d8614aec3488a316
 EBUILD libinput-1.11.3.ebuild 1439 BLAKE2B cc85d565853414eccf8252139a4e2cfeef5c09ecdd783de11093049dc11ce16dd1a631a1ef23016cc15fe3732914362b63c1fc27641859ea33d66802440d2083 SHA512 834a1701ff87843527c772ffb43b194c0fb8d1cde5a6409026cab3a58eedf3cad0d17a749610a2dd48b697a2d22eee8f3abd1a5849bb3c08e0ad5e37618cc81d
 EBUILD libinput-1.12.1.ebuild 1460 BLAKE2B 066dfe5ee976f24475f2572d040c685b2a429cc27d22d2199bcaaa0e92886a9e76b2dc489457e5657f8b4ac6a0e61af75cd7041af96647bc1dd911d5c84e3585 SHA512 3bd9c1fb51fee929bcf85349996e679b202d2e064bcb88926a4d0cda0453f82c7ec9f8bd0ba0e4870781fc936a36da034b91e23223ad3f9764b4781468bf8b19
 EBUILD libinput-1.12.2.ebuild 1860 BLAKE2B 10a278346e6f1acf237b68be86537244b72621a32e3a806e1c8141638d9e4e7049377fbb7d04801a1793c0d5c5c254521564a7e116a9f9891d6caf1d052a83be SHA512 87930976319b00b134ae86bdc48d0ef2885bebf8bdb321f2f07eeeb5894ce41d7057d7c1c5fb0093984ab3b5d68f015724d061fd8b5cbec35eba30e19ebeebe3
-EBUILD libinput-1.12.3.ebuild 2010 BLAKE2B 892672e4c7228686736dfbc2b169952d915eb0ffedc2326715a1ae7a099fa665d19b81ec7c73f087627fe234d91522fd4b1a7db6abf9000551d79d081504f9ae SHA512 23566007263c5fa27ed5373b77df40fcfafd171c6d4e54793487e46b42d0cd3807187935e74a47a48d9545426de71be637ff59b1a285a6f9dd245e81f54cae2e
+EBUILD libinput-1.12.3.ebuild 2023 BLAKE2B d76d9b71d668379ade2dd7d251343224a10272c3772f99a614f03e234123e475155cf38222ee9c25daa69a0ea29f58a4978a802415fe22600ff78828fcbdbcd2 SHA512 03f2517d8298708ec6e7f9360f48e6f90559844fdb3c3a4cd0c45c21ff8a369f5a54d157a142c61ff1239f8362a78cc61ed206722b4c7eb8f29914eaf5341f97
 MISC metadata.xml 448 BLAKE2B c7a735047f8d22e10d1094dc4bbcbd118c025f318280dafd36029484956465c5e459326fb765f04fbdddc03743760a9008c6ac2494ad113387134fb4e79c4c48 SHA512 945c1005dccddac8085fd8b2be635c08d5b4da1f8264d564d10526d11cf814131d1fa5fd7620f35811a90b43686517519f4e9aba9253f5d5d5b69daa25be52bf
--- a/dev-libs/libinput/libinput-1.12.3.ebuild
+++ b/dev-libs/libinput/libinput-1.12.3.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"

 LICENSE="MIT"
 SLOT="0/10"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc input_devices_wacom"
 # Tests require write access to udev rules directory which is a no-no for live system.
 # Other tests are just about logs, exported symbols and autotest of the test library.
--- a/dev-libs/libxmlb/Manifest
+++ b/dev-libs/libxmlb/Manifest
@ -1,3 +1,5 @@
 DIST libxmlb-0.1.4.tar.gz 82036 BLAKE2B 26adc2a33e0e63c6340127cb25dffa62d88d1c1ea6c760fcd54189ecd899f4d27547194e3e6ebc9d638dcba384fb2435e832915d5e75018f9f03ca7dbecdd878 SHA512 58b5f51fe0d6c6bc9f8e960f26ef79f3fb437f6802505d4e216e6bb32f95bd134f3230056dbc922bd5cf734ce1ef2278a2931653c1653cfca9baf6ddcdf38b78
+DIST libxmlb-0.1.5.tar.gz 82894 BLAKE2B 37918d06938ff2a33efbcca712c1424767e88e0a0471a6458f41d97a5004fc3c93be67e3a47f031186fe157ccc610de5101e254dca8a0e9fb2d908c4f466e418 SHA512 c396ff647b6c0d86c8a1cfa5926699c0d16e0d62ae29afc542bcf4a148d7c1daa9239636222dae04c1236553d09257c7440ac383efb8912bfa9ccd761f3b59bb
 EBUILD libxmlb-0.1.4.ebuild 930 BLAKE2B f193bec72b41e589643ec1eee0856bd09ab8236357c71f8c57562d3425408d77bc799949a07497edcdc0effadd67febb5415decfc8b9b998de7e6f44cb1d5804 SHA512 b54cd8542667a35fea53d58b88643a8f9134fb0f1576f2378b2b793cc5e266720b2adc972fa16810123d8ce26071269646437d297e60f8c4405152b6223a9de0
+EBUILD libxmlb-0.1.5.ebuild 891 BLAKE2B 59caaa4e69c05ed265fb19d2ebe1476c615fa0358c2da1c8a138e35cca84cf2f6579a4c9d1da57e9ad8c8595d8282e5e947571c68a2b939726b11c8dca2ba35a SHA512 f7ca17456bad539fd71a3be24fd3fc3f30fe2562a2fa41dfa38a1191249bb02832a042500c4a38b0f69c60e33f0af639a454bec6875ed628910f014c89bb1d37
 MISC metadata.xml 423 BLAKE2B 4f6fce646b2b255484b20c506f3a192ddfe0748987d76b4010bbc4efb69db159acfd8dff07e851f6c009aa2afac24ed2b252b7ee2a817fb583b11924d9f865a2 SHA512 b1d47209f5bb217313f0a4f6b27d0c54e4968f010c066c95b6f2df889b0914a5eae7ef8758b965f69475a4c8ce955120d6f452db5060b5f1bd93d5ca7d87e8c9
--- a/dev-libs/libxmlb/libxmlb-0.1.5.ebuild
+++ b/dev-libs/libxmlb/libxmlb-0.1.5.ebuild
@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="Library to help create and query binary XML blobs"
+HOMEPAGE="https://github.com/hughsie/libxmlb"
+SRC_URI="https://github.com/hughsie/libxmlb/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="LGPL-2.1+"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="doc introspection stemmer test"
+
+RDEPEND="
+	dev-libs/glib:2
+	sys-apps/util-linux
+	stemmer? ( dev-libs/snowball-stemmer )
+"
+
+DEPEND="
+	${RDEPEND}
+	doc? ( dev-util/gtk-doc )
+	introspection? ( dev-libs/gobject-introspection )
+"
+
+BDEPEND="
+	>=dev-util/meson-0.47.0
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dgtkdoc="$(usex doc true false)"
+		-Dintrospection="$(usex introspection true false)"
+		-Dstemmer="$(usex stemmer true false)"
+		-Dtests="$(usex test true false)"
+	)
+	meson_src_configure
+}
--- a/dev-libs/oniguruma/Manifest
+++ b/dev-libs/oniguruma/Manifest
@ -1,5 +1,5 @@
 DIST onig-6.8.2.tar.gz 979775 BLAKE2B c055e943d5b38e10a32f2a30094089d7ca7f72b8fcb58e8d1b4a4674285e208bdc6b5c8694e2a8415f19ae1515d13810c7fd96d27c18e360a69159cbcf0004be SHA512 1bfa6688c67b684afd558ce9f0654f484acbb733972382fccc0b3d1a05a2c2075e349d9d9c8f86371ee07221b45e5ef28ed238b5807be6fbc49d1f53b14e1596
 DIST onig-6.9.0.tar.gz 869809 BLAKE2B a60b0f99e3a6cda81f09a4dd1af98d0ca98b9127090723d50f4c22874042719a31bcd23f2e3b1fac1daf62d723b1c8884036b8543c4c83a7fe5e2ad8e4daf625 SHA512 75d0f0406ad4313332a10990157cede5c2738d2b9b6aa780a99d2651f185e1de12dba57c919ee58ccef0633b1d703e67935af5ea4b36895279457a189b8825df
 EBUILD oniguruma-6.8.2.ebuild 970 BLAKE2B 5925f193741dfb7f8da7be4389c6bddfc8bb618d537edd2ac9e2477287f18e9997fdf282872b30f846cf92aec1c30fcd1aeb4c6e58cdacb069acf6220ed01602 SHA512 37c46f50bfd281fd331e9f799b7f9957aee3fba71824f69b6e2bb3d7b078125c53976a0c6651956034f47c6dca8a2885939b1334a6719a8d9d44e0265b2b97d2
-EBUILD oniguruma-6.9.0.ebuild 970 BLAKE2B a32146f168127081285225dde034a28715503e6e83085291eb6d21ab9b4d8e92dca7c30f9a320ade1485e4f853a45cfc476adb99f481adf1f535e11f2c0d4ed3 SHA512 89f9d1e1b4313d10cb74822054cc742a2cab597dfe286048948ef4697cc874a0d5629f048f79d317dde2ccf0bc99e35dd1d1ea48d7ab247b85fdcd653c7a78d5
+EBUILD oniguruma-6.9.0.ebuild 969 BLAKE2B bbe4e48363cc2d415b47b606c01df7f6ec341262053be758f1903613086d01264937e82c6bad911a5762d73cb5cd3c6f9fca80987702b00b13baac16e59f9056 SHA512 6ca00b1a01ded594a8a3ea7818381e47e16da02b987d024d1cd009e32b94a762f4323998f26258236d17b7c7e59fda248a57881fd07c56a7d2e2917c7ad81002
 MISC metadata.xml 799 BLAKE2B 862b6b8ec3f6707fa10fd2cb79858481e9537a542632c26828b52ea7afc099c315e3cdac59fc3c55aa384288735e653104a3fe7abd165482d1c443ea128b24a3 SHA512 62bb6686582652a9215a0548d3400e0f864e86040625dc608eea9d644937738b6fcb9c060034a85d27b31797068c05dcf78b18d8b411c3f8b3ef96e2cec99d2c
--- a/Show more
+++ b/Show more