Sync with portage [Thu Apr 5 08:06:25 MSK 2018].

6 years ago · cfd11e6353
parent f629c1edb3
commit cfd11e6353
1282 changed files with 12053 additions and 12618 deletions
--- a/30
+++ b/30
@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512

-MANIFEST Manifest.files.gz 28982 BLAKE2B 342df25092c5decf86a54f1a4595d7c9fd40c5f149e68fe2667fc2b74f4c12edff85841db56bf469a0a7c0ca41c4b9616cd4cc2f79b1ff39876387dae9465967 SHA512 f657888526223e9f2b3643767bb64df50d47279d030d7efb46cc646cea7ccfc4dfc180756daa734080b9e6a4562da5c6630453bf34ea93ef1e2ff7b75bb9e210
-TIMESTAMP 2018-04-03T09:38:24Z
+MANIFEST Manifest.files.gz 28952 BLAKE2B d103c6566473e609fd58a4f8b3189abc37d5fcf29bc879e46ebae4ecda0050118092248909bd26a60f572daba76acc85a3a40431d7a1cff803afb23cb7450590 SHA512 f2c42c6d6aac109ce90bc6a38620fcd62c10fd4e7309ec3e47ad4e4402a15f29928b18181b40cd6ffbc4362d7bd16506cbdb8eecdc53ed277efacfd4785a4057
+TIMESTAMP 2018-04-05T04:38:25Z
 -----BEGIN PGP SIGNATURE-----

-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlrDS5BfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlrFqEFfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAkUQ//V9SK8YXHBV1kc/bEfzhp+LYII4y82hG5X2Y9NlDgslHsxlc2Ag+LYdst
-vGbvoUkVjr9yZZ8yViEF721GTeHAdeqiRQ4anQtwY0KK+1Bre9aRFEtcOrJFERd5
-tyVMGUEYM46qrljr3NwSmVc4jCf5mtDhz5yuPf3b1yiqlYJfExqI0ZqdVnM5mOEE
-mTcv3EVGj0/RLYcuBhSuqk+b0ZQgQ0qqBmmRmIP0KrPxVQPULVH+1nk6mZZaDSos
-d9BFAp6HdElx21zGPEhXmNr9zY7FjHLCe2OUBADFKEc8G3IWnoZSYrj6VC9sIYLe
-AOQDRvaZmMpW07WmvqVRPv3pdlx8rO9njGT4Krhp1m4g/FjN33Dgnnvzvv5Z5oyN
-6bIW9UaicnHbV5sIGCNwI9NJwzNfPDPlkdtb9LK2gj+M3xlKL2ECtFWjMQd3Poxi
-K6gkonJWg2qy4dMNo4qyqga16tsmbGOxo7T36WTs9QCkqbm+p2i1CvRqM2N0VA27
-k2p75400UB8EjY0X9Gxz/OpJba7Ztpjx+DeT0fQwSK9KHMK4M8LhFsVq8FlD0Ge1
-RmUHVe9A0gtzJXeO1WYEkfVBQlBTNM5oDPdP81wJntJmuPq6HuNbL3232FQYq9IX
-c/Psy508otiSCNy/zntQH2IG40OQJcmakTGTEDfta3a0c/G8kGA=
-=Asfj
+klCm6g/+O7pmHSFwWpNYmhy/AdLgLiyVIANpDef32/QrEpyX1tL3P+u0Mxwzlece
+pj0j1juRMjypxw5qxgOG5CCI24XY/7yEQxUBQW3O7fvlJhsgUp3BIRXxt3dh2RGJ
+nvbaJ3yIQaFEpJsOaPBNEO4pdHX+Fd5TXqI5UOcPrfmT+LCmzBB5+4RPMM57FUWA
+0Bgm+3CoHwjX5i9M8ocQ5R1bUQNPb+cJFXS5ptXEpJ+eEzemh0sMylQfDkeYTi/p
+lM23gnVlZoYXYRmA4oSYU7zUA/yomwq/WVkFlM0wQ/SfgT7z5ulsH4fcqvLZoz8u
+9+7QTJYRmBti1iurMHlQA61VDKFbgaLA0C2cGjJSYCKZDJhvwfCH2BSKMHDJ+vCv
+AQFzlCjVJs4wm6lKCD6gx6cg2r11foQ3OhzAobYe6zCO6VgzIMD8j2TgYzecuIa3
+ke7dWswLJleZznnbYXwPc9L7sxXvqKvxGff+4nfAWbyZ7PEqiJQ1p8cEgpruBqeC
+FLlyNcm+4hJutFVru6/XTe68Z4l81/m6++uAIT0o7fYZ0wMqhSAq3EwJMxIyq3q
+8q2bMOq3W1njQuHys4PXflZTw3hyoy3pzuMOxerro2QKAh1CQW2KWRqRPXynyG+K
+JxZ/TFd7qBsIcnlsmaIxY4vKP1hhhEKf6H55uHj8OMU4F8E+Q4E=
+=z402
 -----END PGP SIGNATURE-----
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
--- a/app-accessibility/epos/Manifest
+++ b/app-accessibility/epos/Manifest
@ -3,7 +3,8 @@ AUX epos-2.5.37-disable-tests.patch 401 BLAKE2B 1b5d6de2a7ac1f27910e58e311c550ea
 AUX epos-2.5.37-gcc43.patch 454 BLAKE2B 6a3db8a49d3368c50bc78b2f3eadd83e46e3408b84b5a2784849f72d073db59b322356e39962fed9c822b8c3baf62f958e0943cd58dbb77b50316467f6b05794 SHA512 34c0b51a722c75e088315202c62dbf42086bd4fa4da19b1c788c759f4c21fee26a6d7c1a414af34c4ec10d30ac8bf7ea7b65c9f3b96779dce5b40201e3611e4d
 AUX epos-2.5.37-gcc45.patch 507 BLAKE2B 03760db124cfc94c69512f710b3e84704c2bf910e54b632a4cc5a3c563fa15fbd2fcb244cdd770b34873ec7d42bf77ac3784f22a561250926aa85da98aa4636c SHA512 7dfd25ebab3bbe2cd91ccb61945d444215b7ae0f087637d47b5ce422a9b8ab6bf392a614983a49037ac937fdfcb0e6c3091fa39e443e6084348baa0c4f1fb360
 AUX epos-2.5.37-gcc47.patch 333 BLAKE2B 0ad7975a408e97aab6761b362063b61b2d914e071b3ce9d2b188c05dda89845f07d545f4b22fab9c74900ccb1c79310bc34dbf6363f6654bf1e184cb786571c4 SHA512 84a5d979fa59eaeef6f560494d67918580eb4574dada052cbf926440a0a960027c50b36284e0870f746b2a5f13f909946661174ce8d6f155d1ea0f6d202c334f
+AUX epos-2.5.37-gcc7.patch 593 BLAKE2B 10d992f2f886318904dbbaab4707f453ee846e469415b9467ff0e05d586466b5bc176f41b5805f744dc7873fd7223372a59909fedc946cd9d950efd7b4bc7c8d SHA512 b19d218dc3387efb2e9ea8d444692821c53a9cc77ab8541ad7b95a280478983fd8644fbe8dca305539c487c06c60a2b67dae09bd1e3776e3f2a07cb26631b46c
 AUX eposd 442 BLAKE2B ac420143183e28654de3289fe0d27c9582a2b53024048c7beb4fce4287d38ef0f585cd9a449f92d999bfcf4c382ea8f86d25750655d222e87e2f28416fad076d SHA512 3a60ab455b7c00ece42a759fb98bc3e9948134839f709ed16123e39a323f24fa166907f981f65510d83f2fcc52697a2535cfafb4e7ccbb0f3d8c116123f662ed
 DIST epos-2.5.37.tar.gz 976240 BLAKE2B 9304ea32f9506f130d13f5c1d14ad2dcc448cf978d0f7cd26f6bc97397f4590bd5456c9a529dbb941eb53f19cd64b849a1cbf5aee402a8eb171dbacfc85ada03 SHA512 870718a5e7b5048eafd62c478963de92fe8a90b3e755f79ea665dc33ad762c0ec4ebaf7c99d5f2be8983a0deacba284ae07b24d9a31bdd1a1eff5924327255ef
-EBUILD epos-2.5.37-r2.ebuild 898 BLAKE2B 2f8a3c0f61b7bb3a4a94bec5de3e0be4c7fbb2fa97a2c374d7eb0671adb4b32f6593dbf99735e1c4792a8b515dd1c9f6d2b6553bdc4c82e9618548f1bf4df954 SHA512 c911d5602f9de366b72e35dfa3d32b1b66cb1f2d5d0577c40eea233074231c442978ca637ef8cc2ecb1b0768849ba8b63cac52f49607df7263bd5a0f41143f6d
+EBUILD epos-2.5.37-r2.ebuild 937 BLAKE2B 38e6e60a5b6e25e8259aee75a531de07be3a72864d84eabf8a30050f1386f12330d3aebf63c1b1c41e2f13495db7d94f11dc7f19e7befd981e13969c07d5cfbe SHA512 363f4fde319b70dbf4d2bddf64c0556b1db225ca5b5dc171600a0c46f219ab1c50a255ef56e6ff3bdffa2dd5f16ca14867c348d58fe9316f61f546fb73b4080c
 MISC metadata.xml 343 BLAKE2B 77d619d13082c8c8248f671c4e29031867028a05373e9ae48950a1d88540f3b1e5529739ef6e1a1479e04e3e6abd4556d1fd8cf39e5f10481d97110ecb0373d6 SHA512 0a3cbb37dfe8c2627ad7082f9f910c949d9f2477068ad7c68bb17658f0331bc7c736e84c452afa2204eb7fbd01c2edd68583800fcaec6962e456743999b0457d
--- a/app-accessibility/epos/epos-2.5.37-r2.ebuild
+++ b/app-accessibility/epos/epos-2.5.37-r2.ebuild
@ -23,6 +23,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.5.37-gcc45.patch
 	"${FILESDIR}"/${PN}-2.5.37-gcc47.patch
 	"${FILESDIR}"/${PN}-2.5.37-disable-tests.patch
+	"${FILESDIR}"/${PN}-2.5.37-gcc7.patch
 )

 src_prepare() {
--- a/app-accessibility/epos/files/epos-2.5.37-gcc7.patch
+++ b/app-accessibility/epos/files/epos-2.5.37-gcc7.patch
@ -0,0 +1,22 @@
+Bug: https://bugs.gentoo.org/638596
+
+--- a/src/nnet/matrix.cc
+++ b/src/nnet/matrix.cc
+@@ -63,7 +63,7 @@
+ template<class T> void CMatrix<T>::multiplyByTransponed (const CMatrix &y, CMatrix &retval)
+ {
+ 	int i,j,k;
+-	assert (cols == y.cols);
+	this->assert (cols == y.cols);
+ 	if (cols != y.cols) { retval.Realloc (0,0); return; }
+ 
+ 	T sum;
+@@ -80,7 +80,7 @@
+ template<class T> void CMatrix<T>::transponedMultiply (const CMatrix &y, CMatrix &retval)
+ {
+ 	int i,j,k;
+-	assert (rows == y.rows);
+	this->assert (rows == y.rows);
+ 	if (rows != y.rows) { retval.Realloc (0,0); return; }
+ 
+ 	T sum;
--- a/app-accessibility/speech-tools/Manifest
+++ b/app-accessibility/speech-tools/Manifest
@ -4,5 +4,5 @@ DIST speech_tools-2.1-r3-patches.tar.gz 6876 BLAKE2B 84ddc30de90459f913cc32d4338
 DIST speech_tools-2.1-release.tar.gz 1681999 BLAKE2B 572e7877e195c098dd2df03cda86fe58b7a55379cd01adcc22faf5e12b8c004e8c006b852cfe88c5c20df4a0e54e357b445050cdb63088edd55714a98e3eda90 SHA512 6ef9a7dd01ede152c4dafd0b2037312d62a79d875813d74ea048899a52eee505b93ffbabef9b6c0a1d15aeadb5508fd18a2f392e85276847fe071173aec5db96
 EBUILD speech-tools-2.1-r2.ebuild 2702 BLAKE2B 9842d6916cb0e63163c012196f508c0377a473ddaeef30a670e815d96ae30b43a60c838aca9980360c416c9265db32f94fbd2ab9eb150051f43f0b32bd1afe97 SHA512 35d8852ae1e0e94ae7663e489cbb7277efe155fce213d2a323e56b1225950b8455b4e83a824aea84b39a244eebc22f2c6b94820574692c8da276181a57b933da
 EBUILD speech-tools-2.1-r3.ebuild 2985 BLAKE2B 7ed28e6f05a49c83495e85c8f2c8376fdc5eec78fe548f7308cc260174e0dbcb76edfce511a2e1176836a5ca2a7aa5e979a06fc0e2e8d20ed9780089aa02e853 SHA512 90950552bb5d5634bd28d5d538b452b86a9246b92142f591faed49587b010f461721df7092f986dec05081d340222f2d324f899278fcd38fd6d29b7478d95ff3
-EBUILD speech-tools-2.1-r4.ebuild 3068 BLAKE2B 67ad3974c96272f359911b1ef7aaf98607ecb66e3649acd7c80cdcf3ceaeb2a295bed5e2b7050df85455672bcf1ecf7590195ed165547493691fe4ea61f974eb SHA512 2bd37315aac301e1a5960263340afcc934d156fd391b242d2e534742554c837216b4e21e4295b1041a5c5b388cb8aca18974da2bd0456b9f9c1810ebf9324faa
+EBUILD speech-tools-2.1-r4.ebuild 3066 BLAKE2B cabc14a9c833735a6ca8b837d2f2c6801e6b7161fe2589adf7b7ed27f32a7bbe75b6b5116370bf62175110eb49ee0df0ed92074a9796a73b5a533111ae2c9657 SHA512 5181b6731fb5f3d86404cdacda1a4d833d3918677b694a8dfb0ac77ee79a37238ea9947fcdb70f6e7f7107a7a60e3a32263c8de8edc0f6f4d8afd32bda27a6ea
 MISC metadata.xml 375 BLAKE2B 53b765bc4fadaebf85eb9f48a7613a0ca9a9280ffa716accabeadbbf41eca5001f1c70f1ea7b5731345e375adbbb386669c201a7658485d30b296144eb2d98fb SHA512 affeb58d8d6f6659fc2d00b01bb627307920575589c7c78358b26074c94831af9a40bc2b0ba9e55758f968adf7b6a15bbc1542db83b1457107fd9fbdd2a3d224
--- a/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild
+++ b/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI="5"
@ -15,7 +15,7 @@ SRC_URI="http://www.festvox.org/packed/festival/${PV}/${MY_P}-release.tar.gz

 LICENSE="FESTIVAL HPND BSD rc regexp-UofT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~x86-fbsd"
 IUSE="nas X"

 RDEPEND="
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/go-updater/Manifest
+++ b/app-admin/go-updater/Manifest
@ -0,0 +1,3 @@
+DIST go-updater-0.1.0.tar.gz 1754 BLAKE2B 720a328e8f28d2f0b28400053776ff8dbe52e24be7b20812d01b148bde72eda948acb5867b8ca16af7b40d20e36d36d3ffbd846c4992bb1dbe2af6db0069e765 SHA512 321f7faaec62b653c2b01f6f2e2c0104b536e63dfeb6aacd72c493d3fdc7b3bc5b96d6eff02ec1603adde1879dacbd51f4ced37c3cd94361120cc482432cb8a5
+EBUILD go-updater-0.1.0.ebuild 484 BLAKE2B 7a8413ef6a49557411bd98527880b63bd1e06ab26b3da010dbc02105de4216cf697e428d9e6d60181872a7279dd428689424363bd9a85d916b1d5b15521303ae SHA512 ffaf2957d335ebde1c981d0593d0f239740fbc155d5f28b8fd744a3c1ab193bbf6cb1ce35d5beea40ffe45a5461582be38d7c336ec235b1026cc1dd2e3f269a4
+MISC metadata.xml 326 BLAKE2B 6da205ed08b301f995aefb59116b618e24495abd172c9a152acb99d9d3e118500c9c3e55a5abb8987f33bb7d334516fa1595829e35ca9835df6622b4318d8a88 SHA512 55cfe9cb2c45438ace6fa2915828d032dfb377af270f024d78008bf5912e2527d88662f79b4b6aedbe2e9870cb52262b25624a4c598f94c4e0e4cb9f649aec92
--- a/app-admin/go-updater/go-updater-0.1.0.ebuild
+++ b/app-admin/go-updater/go-updater-0.1.0.ebuild
@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Checks if Gentoo go packages are compiled with the system's golang version"
+HOMEPAGE="https://github.com/mrueg/go-updater"
+SRC_URI="https://github.com/mrueg/go-updater/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-go/goversion"
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc README.md
+}
--- a/app-admin/go-updater/metadata.xml
+++ b/app-admin/go-updater/metadata.xml
@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">mrueg/go-updater</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/app-admin/kube-bench/Manifest
+++ b/app-admin/kube-bench/Manifest
@ -21,5 +21,7 @@ DIST github.com-spf13-jwalterweatherman-12bd96e66386c1960ab0f74ced1362f66f552f7b
 DIST github.com-spf13-pflag-4c012f6dcd9546820e378d0bdda4d8fc772cdfea.tar.gz 40078 BLAKE2B 4a15afdf122a58dd006d57da88176fd2804d98706ac3d8c496dc14b084851288dd28bad95f7871d738f0487db46aa7969dffbdf005c14fc6f46bcd0ad7e0f673 SHA512 4f4d606bfe94ea51a6cde535f16078602f1d63bd2896aed52bb53b3d219510ab38ad4bdc692da2eb355c9361041d7322db6424f63783bcc367343a1666cdf297
 DIST github.com-spf13-viper-25b30aa063fc18e48662b86996252eabdcf2f0c7.tar.gz 30849 BLAKE2B 8e66dbb5c90c47e66ea72848d86602861791fe3198ce6cde5ea87330f15dd19cdd249788bebc31b2a66577c20edeef01c8beb59a4140d57167c4b13d33118a04 SHA512 4acd37411683d753d81d839e83c2257bc424c42b8e295868da84cb045db131be063b0e5a0fb88c587332582f356186659d5a181e65ae1838e868576543c1fecd
 DIST kube-bench-0.0.11.tar.gz 175361 BLAKE2B 844e252ccf270561154f1bab9c02144ff10a0594d71a2cd6e63a828ecabee2132a8756848642c475bfa705f360a5d69812519f705ad7c4717d5a4bf9d84cbd1b SHA512 52debf132bae38588f0b49c54f07d2550fc254665a0549b7369fb34b6884724624a44d14e6ea1120dc0c2586f2647b56d30e66695f2d8829c3f26ec5f2443f38
+DIST kube-bench-0.0.12.tar.gz 175549 BLAKE2B f909caa4735ed4c6698b756bea24ffbf176c1ff111130ed17f421c894dbefbec28e88305701ab42e40c255dbc4f4a748db2d3ede29951cf38715afd1f61cefe6 SHA512 c91de2ca9b1cb5769885dfb7691c95680f2a82d22e0df3b0060135281c3e42a8824302ec14b3f462ad2f76fa39c32bf93721428c2f3e9a50dbebcacfc6d840a4
 EBUILD kube-bench-0.0.11.ebuild 2382 BLAKE2B e07d33ac0bc2f6802742deb31bc1958e0ae86383fe73f64e03b409603cd0a23bacda46cd9ae3e2252142c5f69dff0e1fb3249fe0f26f789f46c95a9efa6fd3ab SHA512 f9e32a20fcc8612a3061457d309900726b91fcbfc2b80da549aeb6e5d8b2d2c0ee2cd7300fec27b3191f0cf35e7307f5f01bcecc1eda53a5a11300b5ace7f199
+EBUILD kube-bench-0.0.12.ebuild 2382 BLAKE2B e07d33ac0bc2f6802742deb31bc1958e0ae86383fe73f64e03b409603cd0a23bacda46cd9ae3e2252142c5f69dff0e1fb3249fe0f26f789f46c95a9efa6fd3ab SHA512 f9e32a20fcc8612a3061457d309900726b91fcbfc2b80da549aeb6e5d8b2d2c0ee2cd7300fec27b3191f0cf35e7307f5f01bcecc1eda53a5a11300b5ace7f199
 MISC metadata.xml 333 BLAKE2B c8437977b6a07e36929b13f767af0f09158bedd1ea7a0bee1da52dd1b83acb2929248c3c385a5fba14362721ab6871d399ddfba53d15bbe84a87af0ad771b73b SHA512 295cae435555436e9091195ac585fd30d022aba0b76244c85927f19f14b38dde95fb14192c832f00f52e3cf71aa3d95f7527b22a90690f85206178c49d620c8d
--- a/app-admin/kube-bench/kube-bench-0.0.12.ebuild
+++ b/app-admin/kube-bench/kube-bench-0.0.12.ebuild
@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/aquasecurity/kube-bench"
+
+EGO_VENDOR=(
+	"github.com/fatih/color 570b54cabe6b8eb0bc2dfce68d964677d63b5260"
+	"github.com/fsnotify/fsnotify 4da3e2cfbabc9f751898f250b49f2439785783a1"
+	"github.com/golang/glog 23def4e6c14b4da8ac2ed8007337bc5eb5007998"
+	"github.com/hashicorp/hcl 23c074d0eceb2b8a5bfdbb271ab780cde70f05a8"
+	"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
+	"github.com/jinzhu/gorm 5174cc5c242a728b435ea2be8a2f7f998e15429b"
+	"github.com/jinzhu/inflection 1c35d901db3da928c72a72d8458480cc9ade058f"
+	"github.com/lib/pq 83612a56d3dd153a94a629cd64925371c9adad78"
+	"github.com/magiconair/properties 49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934"
+	"github.com/mattn/go-colorable 5411d3eea5978e6cdc258b30de592b60df6aba96"
+	"github.com/mattn/go-isatty 57fdcb988a5c543893cc61bce354a6e24ab70022"
+	"github.com/mitchellh/mapstructure 06020f85339e21b2478f756a78e295255ffa4d6a"
+	"github.com/pelletier/go-toml 0131db6d737cfbbfb678f8b7d92e55e27ce46224"
+	"github.com/spf13/afero 57afd63c68602b63ed976de00dd066ccb3c319db"
+	"github.com/spf13/cast acbeb36b902d72a7a4c18e8f3241075e7ab763e4"
+	"github.com/spf13/cobra 7b2c5ac9fc04fc5efafb60700713d4fa609b777b"
+	"github.com/spf13/jwalterweatherman 12bd96e66386c1960ab0f74ced1362f66f552f7b"
+	"github.com/spf13/pflag 4c012f6dcd9546820e378d0bdda4d8fc772cdfea"
+	"github.com/spf13/viper 25b30aa063fc18e48662b86996252eabdcf2f0c7"
+	"golang.org/x/sys e24f485414aeafb646f6fca458b0bf869c0880a1 github.com/golang/sys"
+	"golang.org/x/text e19ae1496984b1c655b8044a65c0300a3c878dd3 github.com/golang/text"
+	"gopkg.in/yaml.v2 c95af922eae69f190717a0b7148960af8c55a072 github.com/go-yaml/yaml"
+)
+
+inherit golang-build golang-vcs-snapshot bash-completion-r1
+
+ARCHIVE_URI="https://github.com/aquasecurity/kube-bench/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Bench for Security runs the CIS Kubernetes Benchmark"
+HOMEPAGE="https://github.com/aquasecurity/kube-bench"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" go build -o ${PN} . || die
+	popd || die
+}
+
+src_install() {
+	dobin src/${EGO_PN}/${PN}
+	insinto /etc/kube-bench
+	doins -r src/${EGO_PN}/cfg
+}
--- a/app-admin/kubectx/Manifest
+++ b/app-admin/kubectx/Manifest
@ -1,5 +1,3 @@
-DIST kubectx-0.4.0_p20180118.tar.gz 398084 BLAKE2B fda8cae93e221fc4732b7cedbd44465541cdd7f31b29fbbfde781ea34b2c2d644ad6735d6bf7fa1ebcf04cc2b9dc3ac8e883808cd04c8a256b004a3293cee240 SHA512 04123596724dfc4dacc0beb578c716a3909d98d7df7dbf3c1439b5bb29ac14ea7b366be3e2252550ed89474c58ce83b028af79b0cd288f1ecd62c6c3f2729f62
 DIST kubectx-0.4.1.tar.gz 397910 BLAKE2B 60b0ac75cf6358a3660c3e59f85e5c27a670095ad973edbf2b53350726b48f1036aa90dd999cf149c10956a43692389ab2e87c63bce3b711ae2c7cb894157753 SHA512 dcaf1c8f71f69037f9341ff29befb2507d7bfa11a25e6e864000b802fe1221d6b47f2f78faa6c490711e65d0dda4b289e5ed1ffc261e4d2142054f48d1aac140
-EBUILD kubectx-0.4.0_p20180118.ebuild 789 BLAKE2B 199715ce5c3fab1bc97580c7625888ae244585bb6d1f9efc24ee99188258c8540086b386e9efaaf77eb129f425fcb646c42e7908196a5b370d823846c404c50f SHA512 9b59c77fe6d81d3d794d0d21a6ae4441ce1546a587bb6dd27516c8741293ead21ebd5011237235e578f24ec3bee6d396a53de48fd38fa0dea55fbb24ada96bcd
 EBUILD kubectx-0.4.1.ebuild 695 BLAKE2B 7d577b4d94e9deb6ce514fc3997052526670ce9c4d9df60d90136388b04f80c360957ed46d3ca83093d73fe6ab696433d099ad853e3299ad897cd4d7460d2419 SHA512 ac6b600bbdb46ddb0bb2d4d4fffe25bd41217d231ccef053169bac0e5f5e8b0ff0ec85fa67bc73996c590845b6768dddea4cbc2b3afa53077a93a5f341597a40
 MISC metadata.xml 324 BLAKE2B 78b22be6aaf9e018d9e75f572304e37680db02da78e20dd603c0c0c1eaaafdf37ae7b4d1534c743581e319cede030c25ce77fc701b10e4359522fe1cfe48ce04 SHA512 0361b6396f21c195af41c0f2fac3030071ad28d736ec3b7b731346b4cde955be334deb1ab0974f9b273d4dec63e6fffcaf288aa707e517bea6971cfc9e07b551
--- a/app-admin/kubectx/kubectx-0.4.0_p20180118.ebuild
+++ b/app-admin/kubectx/kubectx-0.4.0_p20180118.ebuild
@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vcs-snapshot bash-completion-r1
-
-COMMIT="b2992aa0df9143c25d64843b3ee40fbcd7332f07"
-
-DESCRIPTION="Fast way to switch between clusters and namespaces in kubectl"
-HOMEPAGE="https://github.com/ahmetb/kubectx"
-SRC_URI="https://github.com/ahmetb/kubectx/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="sys-cluster/kubectl"
-
-src_install() {
-	insinto /usr/include
-	doins utils.bash
-	dobin kubectx kubens
-
-	insinto /usr/share/zsh/site-functions
-	newins completion/kubectx.zsh _kubectx
-	newins completion/kubens.zsh _kubens
-
-	newbashcomp completion/kubectx.bash kubectx
-	newbashcomp completion/kubens.bash kubens
-}
--- a/app-admin/logsentry/Manifest
+++ b/app-admin/logsentry/Manifest
@ -1,4 +1,4 @@
 DIST logsentry-1.1.1.tar.gz 30267 BLAKE2B e81fb68484fb05f40d61e2d34bc6e0953e99a46b299f4384592bb4a5a1b53874ca382dfaf68f60ee232d56a9c23ec4840ddc71033fb20b88f653d2fc00384869 SHA512 4be045289259655e7b4da05dd1a07c649b2289fbc6f15dd424dc48ab980478f3ae49501f0e9e2035fddb9a40acaf2f4ab310ff8d95355196d82d41d6fc860143
-EBUILD logsentry-1.1.1-r2.ebuild 1673 BLAKE2B 4143d0b78ecd4f44ef3a922f5d874437c184e1830ce168ae049e111853634608b3f8b6b13d883b2b01b096b361a6b3ec4675e7bb163e81dcacacd33cc5897efa SHA512 02911e9068401f4d6928a87d2951eabf55fcd31fb37be590aab738c86d17d2111b3c98f01a9567ad74b136c4a5ac0d453f6d8dd4e6510383146caeaa9d3614ee
+EBUILD logsentry-1.1.1-r2.ebuild 1672 BLAKE2B 2fe664d750585d2c9bf6ed4917a8f75e5c9d2fba637d5b216328ed9030bc1bc35bab12a55f3b0f87eff6d4a35095a5eed3c58a8dbcd3b0d0555373cd0fe6c4d0 SHA512 037e49a772278c28745bbe72c5d8cdae5bdb3f77476bf0a55c1b26fa3f9aeb321f33be358c13dd07a0d3186860c6beb85f9678fd81d1d76ab269caeeee0cad48
 EBUILD logsentry-1.1.1.ebuild 1538 BLAKE2B e41bbcc95a1753d8d4e73601537a9294db2873609745eacf7fc752b3d00d570e029112470912da1ba75a9588b6c4c510a650ff547c2b4db70412b4f612752646 SHA512 69d37361a5d87fd1051a2742ffea623f49afbac03a9ee7b8e1ff256f985500cceb42072c7bd3c13f8b052d78afdd7d22d646489d4ec52681e177f476d365392e
 MISC metadata.xml 248 BLAKE2B 495eba242dfadfd944d3f74a526162dc04de2d8fcebcb6d5dce43c20500407485c24fe61d537f8015739463543b53ed6fbd9d07242a45782df2c2a8d68e053ab SHA512 52d286d2ecc5d8b66e2468683db28439cdcbcc96c88d8dba8a415049def3c53bc130783853aee9918c6b0dc4ae295aba44d601687d440196399903b25e92b5f9
--- a/app-admin/logsentry/logsentry-1.1.1-r2.ebuild
+++ b/app-admin/logsentry/logsentry-1.1.1-r2.ebuild
@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~mips ~ppc ~s390 ~sh sparc x86"
+KEYWORDS="amd64 arm ~mips ppc ~s390 ~sh sparc x86"
 IUSE=""

 DEPEND=">=sys-apps/sed-4"
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@ -1,48 +1,23 @@
 AUX 8-stable/50-default-r1.conf 1952 BLAKE2B dca027ea6073384a2ec5867722028f70599c51fd8c46672ce647e84a7de4b3a0dc5bfaf43f7317eddb902c4987266ae67f88b43375a51e82a3ffefbb61c4d099 SHA512 1bc4d8059d83de57ff44d34265b0c3881bab7889f51c044728ba462c9105c89425187f95b6b01d6d6d103abde22a9dff063e5d6b90027ed87e9f851f9b1ad5b3
 AUX 8-stable/50-default.conf 1701 BLAKE2B b14c89f70d405b206818d077190cf8fefd1a01db4cdd38f5012b09b4e3440e16b6a3ca7ff20cfa616622565b3477e7f4d44252d72d1c3cdf148a1b59f629442a SHA512 33e4e63239b9112fec1a37115ac80ab8dbd6e7189d9d29b1bc743c433e0124ea0d1a4cf6f7ada9e5b92e9b0025b6617a1a16f4c491e743bbf4327a5f376a1ea9
 AUX 8-stable/README.gentoo 1126 BLAKE2B b7e3881605c2bacda7f415b3f3195e1ef405a8e9fc7fd627fd35b0ab90966cbb29c9a85fcf2df6092062c5af353d44a02d3451e3caa072f4fa44d681702e9807 SHA512 46fdf3350e2005d3ef588d50dfc6d474a1b5d3010329b656879a43cbbd7be0cd91944b88d3838f45f69c830fc28c42e7fac2cd52e0a4b24bb6780562d59ae384
-AUX 8-stable/rsyslog-8.24.0-fix-tcpflood-without-librelp-r1.patch 4660 BLAKE2B 82d7ff7b24049e8d437ad27800d0a6bbd79787311747396578ead38f52ceb37f34abec93f3df15e302676fe0891e9d0729ba8418a01d39bfeb25f0af47bbeeeb SHA512 231030532a126dade0fa2c98d9bd8ef610d3059210cabfc6b0a51adfb610b61eb57b7926a2a51f01f196d196a9134b4c1db7105aeedc4d35eb70abac97301378
-AUX 8-stable/rsyslog-8.26.0-fix-zmq3-format-security.patch 1982 BLAKE2B 5b8c6971231b16e0ba23c20998d05b691b6e73562571fa74453c77691d2d8c2141ba64b87fcdc5786d62a4234b2d35fc45a1309d5b7729dde8e5e5d9efe89644 SHA512 b426c3eaa2adc2de14e129125ccd630e2fa2132c6ca774f3e18ee784f0622573a95339d901a1b9c2877e8b77d00f8be9f9d17f92769136c356aaab58358d2159
-AUX 8-stable/rsyslog-8.27.0-fix-hostname-detection-when-getaddrinfo-fails.patch 990 BLAKE2B e711765882e8bad81101a9b0d6b7d52b6d97ec7877b38584669057fb5bd60dca5a9d9a0ef46743f34060c3a19a7982b4add710418a6cd2a580b1ea56ae4f1157 SHA512 95d72879973c9d20c4c0c66e3e065590475d0aae96680a627b05735c8a66b69bf9b9a93888fa6a802e094bf37ac90099c7e6732699d439d44d6c39d461201351
-AUX 8-stable/rsyslog-8.27.0-fix-librdkafka-detection.patch 1556 BLAKE2B b8a7d1ccb3854f91a676b57332d4a944f5c781b82451b2d36f19e4237226da44cb41fc220260b1fd8bb2b46b62cbb81a4d392a1f116d31d50224ca781bb3b10f SHA512 374de4fb9a4e3c3b9e28ff2e5eca48b7744afc9a5ba222508661fdfa30037967b6a2497d0e82266010de27c1a540ebb300c15bf6049a1af9dcf019353c04acdc
 AUX 8-stable/rsyslog-8.27.0-fix-mmnormalize-tests.patch 509 BLAKE2B e50fd76f239be9fe15a0a7c8dd2b5984af69487c5ffe5a4f12e415f9c4040e600c5552dbe66c32879729c0f497bf74f1f63730b2f4c6a9a658fd385cb684cf05 SHA512 70bfe4f95b23e4e88e5b7535a1b86742a02438f2eadc6fd2e82c66ebdc9d59d983c1ded7d4902dd5d7ef9413847398c1318df82bace3b7e5b1ca8bd23ca9e8e4
-AUX 8-stable/rsyslog-8.30.0-fix-kerberos.patch 736 BLAKE2B fb404b5435d861934c70677baec2c552ba576c989996431650df1f55d1a172d9e78fda6d74fc59c32c918a43affc4dec991a8e2808d41bc37f898ae7bdd08615 SHA512 8d72cad0106afdf953ce0cf8a5dd0ecfb7daf63c3e274c26e3283ac486de1fc4ce10a450019f1a11f067d320d299dc2b350e4cd5eda283c3b514864e924465a9
 AUX 8-stable/rsyslog-8.32.0-fix-building-without-curl-r3.patch 3878 BLAKE2B 9f1a030807a312801ce6c66bb5120029b935bf5ba2029b4d7297713f865f509fd1761595ba05c479a1aa860c8564fe38bdebe51c3c36ab278aa518de0f2285dd SHA512 19765cbd9aa13cce9590ab08c4a626eba06b94fd4345b3fc3b77149ed9401ea91c41f00b105a5b7f15bae611f5b718abdac23fff9ec205c3385686203e6aa701
+AUX 8-stable/rsyslog-8.34.0-fix-issue2612.patch 558 BLAKE2B ad05cd0a3b3570821465faf9f01541164eb18b1355363ad2208d9ee148971e1b86fb47fa2a81da2050a13c750342b3643e24dcb4db78149e6495353805180e10 SHA512 5249be1b70070ae30a41feacce83feea1a97f76eda0b5b60c29e4db6d50f4d27be8ab66de6187343d5b881eaf19414c2b8766fc99523c52e51f6a7c9b62e7d94
 AUX 8-stable/rsyslog.conf 1562 BLAKE2B 3abbc4c13c8c1d3817ac9a7c7f048aa1a8d7f279bf638dc91d15a785ad42c1b34a61de0be33b4ffa218a655849aeceff3e8686384e1d77472417235ce453b546 SHA512 1720174fab020e2de590f3d6bbb03784aca1928fe05f7e75e02fb4597cb8b2ee755e6deb8e8f989060511044ae483f791f496f24e0eecaf27eb9e0b5e20a2c7a
 AUX 8-stable/rsyslog.confd-r1 1145 BLAKE2B 06e63c7500238dd31abddd105269714387b990a3530ad11443a8502ad68221c3f8e8b0db02ba3ad2b7010483364d36a5b526a461d3465972b74d2cd36ff08747 SHA512 a7f8621bdd490596b09f9a7583dd0c992006c55335b2e6e687bef4141bb18cd4bb43e23f590a138e9c8d5a3cbac0cc46c3b01c7d3ff9f9dd3c53418b13b0dd4a
 AUX 8-stable/rsyslog.initd-r1 1758 BLAKE2B 1af0e2371067ac2c51bff7b9c4442abba8d8a14714b7604e2f49d244fb08bef7614e73cbad201e6f4902504abd78ab32fdd093acb5714d53238353c8a9bd977e SHA512 0ddd385e77759370344032f52f945b1e90d4961140db63e2562e4be78dfc2bae16ac9439d40fe078110593999b5c5efd7680b402fc0771b1261ff28b1725e265
 AUX 8-stable/rsyslog.logrotate 682 BLAKE2B cb6a4a00895c5801c15621e52fb16c4b046a46f27bd21c5e76c253e62421f07826f603ab529e8a95f260925d58948a78c89f41c9b9f61e142217403ab454c02f SHA512 6c58abd2f02157177a61695f53eccbf201c514821b0c551a4812621e8d3dd2da9b5cd651d93860cb51ebdbdc7056d0ef0dde99c2a57ac3c43aa968a141805912
-DIST rsyslog-8.19.0.tar.gz 2279714 BLAKE2B ae736b72e00ba6ba338476d8fc349f2b958f0c8f8b08417ed6cc192fcb17182f4c95018fbe973355b90833fab723211d653f4ac2a0fe9ef385ebe6d34251e4de SHA512 77c40c9d76591ed3561ec76242be2c647848533df5599320ea988cbc200614c47930e0b63f190d31a0c1cec2443d57ca374f07e0909f11eba8a4bd4b8eee0e44
-DIST rsyslog-8.24.0.tar.gz 2374240 BLAKE2B a708ed52dcc0182acbfb6d7adee8f1670c60e65e87b2240f88330622b515dbe1cc45a2bb3233cb630be4658b8cae394bab7839167808dd41d75632c76932a77e SHA512 b25b8ae72133376f732f54863c97aea3c8dfbf37c62c6a61840932996913c9d4e63155a24ffc577db48a18514f3e35b6fb109b1864380ba93ddf3fa6d84d728d
-DIST rsyslog-8.25.0.tar.gz 2386720 BLAKE2B 192f0084b0aa9588606c458494634d6f1445598371de4ce160ade647b44abdbd6456125060f46fc62bbaa8f981c31247a91b8dedd41f89e83a4ee021c9828dad SHA512 0e97db84cc8fe9fd6e3ffb5a78b32fd213e22833c6ed605329c579132d127b7d65b3f66c64e6bddeb1967aa9ed90645a7c24b9d5e643f95bdaf48ed9fc82cb5f
-DIST rsyslog-8.26.0.tar.gz 2393148 BLAKE2B 660853aae1f0853b0df66755cb64c569692b849816b92d41421c3650502eab069163d65445fe49e7c005a7bba9ead6cfe36b125a715b4fd8cd24a78dae7d2484 SHA512 96cb3af0e05b3e2941f7d2b3558e36836818037ef424f13a8ae2ac8a1e2aa0c7a4eedf3366c8360c7d8eb4515aecc7f3665690646009c650b66689067069af19
-DIST rsyslog-8.27.0.tar.gz 2435123 BLAKE2B ebd95d5995d604a16495c2c760bfc65348a2b696a2aec838ba06d2eac379627d2b8495f03177aa8813d012d6163073cde71d442a63fe2da173bdcb55c90f458a SHA512 dad957c21d9f7ed3a97a1ed87658fe9381dad00365bd2f5af2396dde3dc4a9f96db17c4df9eb9bd02562cc538f99bf8e2ca00229680d6b7892179161265db753
 DIST rsyslog-8.28.0.tar.gz 2471122 BLAKE2B 48ed55cbf02eca22591c3d1d59db8f956e4d852cbabb4ae8837767a2c843209a53becbe2a9f595290b44d79c8813414c20954ce1ccaa08bf0786423df79344e3 SHA512 e27ba0ff22e945393536abc5bc6e234d8849db291a5056429b59b47abe15fb060fc5c26efedcfe347b386d438b3f8a029ae4577a1d803666701431677f628cb1
-DIST rsyslog-8.29.0.tar.gz 2447907 BLAKE2B dd3a34e4c1b4edc989d58369933b94b11d89c044ca81715062cebaacae5003463ed233f26358418651f63643bd6d7cdfb4f3192324d59d596c87480e37f40493 SHA512 6e0a69f2ac36fcfd0714b2b7053bd263ca8875d2aba7ad6452223eb8677edfa1cf4978989661614dd65dd1822f0123599d565679c8faa3960f136c8d9472e952
-DIST rsyslog-8.30.0.tar.gz 2468224 BLAKE2B 3c5c94661abc2e34d688ca08d6dea0d2bcca9f287f45328a0d1b240bcb1b9223800207ce8759da823fa3acd974fcc70f01565f95fbcec108f8f71c7cb14a2409 SHA512 90e172d08ba7548252fc9744f71259dadf5a40afef405516e7b1601620913ca4b2ffc4859b16f369b9c1974ea10f4e41bc2d987e3d6bf9aabeb979f7de6aefe0
-DIST rsyslog-8.31.0.tar.gz 2498675 BLAKE2B 8b80394ea3919dba29a431f3c5c1fc337a9e60a886a3c258c3895eb4341a941d8af6370ceb0d2e212934f64ab38c7238e99f40e1dc27e648bd4b75e158586a28 SHA512 aab888dda8df3ad7ff404767a58539cdc0bb92d0e537b703cf5833555688dd6d8223889b8d70bf8c594339a51831b57df7a65b397d8b40cded608dfb007befe7
 DIST rsyslog-8.32.0.tar.gz 2478990 BLAKE2B 21bfc93b55da107bec2eddb89cb42d76990ced2675caeb6e73183a109f9bc8293bde43f202bb56007f9ea4e49de385b004c158059cb13e8d3d376bf050ca445a SHA512 eea85d77bf3624fbad6f0838fa2a4af7c14d853c8f120f14cf697cdfda7f7e0692dab684d2ddd07fe44a0bcd50cf91baf69af1bb63dc9d60e19146f1150155ac
 DIST rsyslog-8.33.1.tar.gz 2494338 BLAKE2B 680ad2c062386e4e3e6c6e1a83cf0001d63da305edae9df527d1079a2fa13b8715e3cbfa211ca908e0005f1762becfd88369a7cd1488134564980137f0e98d86 SHA512 c4b426409e89463a8e8f7f9d0267f2fa1df1a84e947ce7bf91255db88b4cad5b7e607c476ba2db0543af069c44cdbb35330e0839696bf83668200e8ac009c6a0
-DIST rsyslog-docs-8.19.0.tar.gz 4271094 BLAKE2B c866f66fc1ae9ef8c227a2e03bab4a815e408ccaafe9da97f8b6b6f6b89bb33d0c8a9e004552d5a1287a19bc8f3677517259a4f9bcebffbbeff506d80454945b SHA512 120f229a641119649fc897948fb0934039a95d0ef63e68b10ab635620d84988d794fd5dc33617353028e786513a86b3a1cd0c4fef9c755dab5bedd8e0246532e
-DIST rsyslog-docs-8.24.0.tar.gz 4344877 BLAKE2B a3d9ea90580c3e24e3c40c07f871740cdf33ad4206627586bfb42523a758cbd18f5303f35f2fa036e492dece9a83d9c151b60023aed99f63c42ed8f9bf7da9f1 SHA512 b55cde1485a7baec6d4c4928107c22a078cf412a2994c0dfcbb12c47b49c3b263af8a64011b1329567cf86e04927b9e383581dc868eaea81d554adada6b3786b
-DIST rsyslog-docs-8.25.0.tar.gz 4359583 BLAKE2B 349e057d3c94ca6fc92753459f8fca011927e82a787cc50685ebe1c5a40a624e4f74764b04cf00f5c250cd65eb6e2862d7225790cc029cd7256c072d63db1726 SHA512 e0068ec00bbda2d1cf7f14105ad83e82bea9291ed5d5fda3ffcff2db32747b65e7b6d65743a3221aeca03be9c6efcee1db7f03c2da115a3aed60848556befa71
-DIST rsyslog-docs-8.26.0.tar.gz 4381345 BLAKE2B d90a4af06b3b48e5bab75751e0bd06564b6a846068ce324aa9e9b26c1e5e1d40841f573806444f290d3227e31d1fb498265437341be946badfe35c8455427352 SHA512 5c05c13b3ae6be431343b7a5b3b2cb8676804d6d58d98826e6b44d685bb30fdaf3ced27d66a29908b40f1839bac45d1834d060ddf05d01477474ab3f45f973c8
-DIST rsyslog-docs-8.27.0.tar.gz 4411093 BLAKE2B 67f6e3cf77973b07c9a19816beb16c9cce4b32b4609ab458501e7b0be9795c2138a83756d9590f03b0acde23f8b762df1c308c0ab7210a24122476ad14860770 SHA512 08d935ecad070d65e7169a56c6a4d35d49e895b4f7cfe4d747939d8a92bdadd0fc3be7cc47d23d233a33b964f2a4d809a34b37419d2e42c3f8c183120412ab2c
+DIST rsyslog-8.34.0.tar.gz 2545544 BLAKE2B 66caf277a814563027183ecf267d76067c384adf8d6d7b8543203df9a7c37242722dd35445e4446aacf1e680f5f3957cea40ece8a284ef2a393b4a71e3a2b49c SHA512 69eaececa2f8b98799deac8e6cb2cf635a5117da7a21cbb0b880b7df1d83c6ccf16133dab099a6e5fb865f34c2dad164a1bf1952d16ca116af3b1dd35d15065e
 DIST rsyslog-docs-8.28.0.tar.gz 4424901 BLAKE2B 9753b1a48b9d3bb045f2d088de5df0bbe5bc9045a82a5cab98b27c2df7648ac312929a173ec34c81ced46cb0eba336d708204b73b57413686769afa882dceaa5 SHA512 c085e09149cfc27ce0cd22edf9ad3f81b111f491fbea79afbc3172882065bd8324e366e3b5d09c885c1a3aa63fe8fbbe154d66488319d4ffc0867f938e1ab07d
-DIST rsyslog-docs-8.29.0.tar.gz 4473644 BLAKE2B 18fc4aea0551f1ad770cd882aaf512424f8d4fc9f00ba6c4c8e9bbbcb0ea4d4da4ba31c53bad23e28ed761e27e6378657b085cb0d72cebdc233ba25160023daa SHA512 791633b93693c1eacde965e07ced863b96d1bfa488fc5c4770424825ab702cae7babd5286e552da5e17d1d7779f228c61a1527b9726dffea31bbb3b4e80525dc
-DIST rsyslog-docs-8.30.0.tar.gz 4487378 BLAKE2B 7d39fc7642ec2122f254dd6660a13efa4b214ee669fe5772b4d68a8ce94ed5ac3ca2500c23b5752924b5befca2a66c228b6f2bb48c7b9f72a2a4b98e2a14810b SHA512 8068bb9bb8408447bff49730e9aac105eab1bd610592dd524e7639b668b2d05a4836d3a9862622445a0bb8d8b140db67c861dad6ec207d11049ac368e363684d
-DIST rsyslog-docs-8.31.0.tar.gz 4484950 BLAKE2B 8ee4346a095942133bb473509f275c625fdb4a1aa81293a15604bdb95670ff0676677fe5481be3bc2ea7097b2c8de7fd3b0eb8033701522b372bffe44325a10a SHA512 51a63fa520d8176e183afa44ccf889374810dddfd5fdb363ed06b134bfbe0d1a94085e4836cf3bb2a07cb83564bbb87cef3763ac9429a5efc50aff276542defa
 DIST rsyslog-docs-8.32.0.tar.gz 5368254 BLAKE2B 6d1efb191698bb1cfb03660167e5dcf9eea8f2fd2e459c350cd55aa24afcc5fb44d2bc0ef5590c6951326fbd0215aecbd59a6122e88ff449f566b37d1ee00d56 SHA512 e64eba3c40eab35e266826fb7e183418f38eb008f2a21ddf2c523d1e42aacaa20f882a561e5df67a979463048b58232fa82759645a21dc6962f6836ac8f57bce
 DIST rsyslog-docs-8.33.1.tar.gz 6770438 BLAKE2B e076688d7559c16986241149c00f6df603e2c90771222f4f91dc944fbdeace3dbc6e47fc82602f852a7407e064fe31df0a1c2940d521ae6ae21f5663518bfeb7 SHA512 fcc8ffee372c0b0dc2ab1b76dcf68a66ce820996cf2d46a2b5c6fd40e6fad5ef3c33da97a2e88956751597c20cf0c4a9b6537c22db0b3b46d1a734a9d9f95df5
-EBUILD rsyslog-8.19.0.ebuild 12240 BLAKE2B c5de14a1f8dd0b12bb2e2b90707d86647766fcb3df54bc1a8c7428781248a5a1617b57990953037c3e6c8bc24751cc245e7a6faae520571a0fbef40b30828ce0 SHA512 7363c435c65394abda4a4f576e8433d8038a6e420534f3bb0419477ab3b4e3ab179f53bae016b372522884ac12eab467d3ece7db15303b3cc33d954f963fda8b
-EBUILD rsyslog-8.24.0-r2.ebuild 12396 BLAKE2B 0c0456e8d54b24a02e0d07e0672f81156afce8deff1094e9644bcc3dcee3aab0bd7c43ea70957504308563bb51419c9a24436fff36a1be450e1e0078ec23d739 SHA512 2acbc370ca468dcfc021b66a31b2617dc5093b518c5c486487e306548445c1bb472dd48458a3171a99f1bc82276bed39ccaff5be31603191d261d11c2cd521c9
-EBUILD rsyslog-8.25.0-r2.ebuild 12487 BLAKE2B 3e2715a63afe272a18b172ac7d67d2ad738d18d3c6f469cbc8642e4f75a5679f627f1dd768fb7301e1a37be4434f8f51fb1709217a5165dff99fbe218b3d84f5 SHA512 1a73a37139e8af1017f7cc53bbd35238130cfa30a7e3236f304a4d079931d0304fbde4f026254a951253c4060bcb6e774b6643f42ad14ef431b697833450f521
-EBUILD rsyslog-8.26.0-r1.ebuild 12480 BLAKE2B 7c3d7ac596b2abcaa35daac1e917b91a0564f818cb399d560a90ae255dd8b7a7f432c0bf79dcb34db8501a9b2769b58bc0365ec49bb21913797e2ffde086ea98 SHA512 8036baf097b54006d6350a52ab08a222a0896a955c48d5b984f5f284b5603ebcf732a58493cebfa1c8469b7a1f9cbf8bf42d90e44454488c206873243af3630e
-EBUILD rsyslog-8.27.0-r1.ebuild 12736 BLAKE2B f12cf7bdba7aba23bffd40a4f625710fd287407eac886d6dba41e63ed256ea1bbed2ff4f5ead966c7101ebbe3fc95ba4c196b7873068744db801ac53005e335c SHA512 497c4df7601980431f093bdbe9e95513374ba171565acc7fe8bb4dda40142ffea1443a4d10d79ae938c423e03879286a1a550abde5be919bb5d6032486425b13
-EBUILD rsyslog-8.28.0.ebuild 12504 BLAKE2B 7fbd8ed2298fce7926f40963571d4b38c03a36384c8dd626dc6e94445a8066184191f9103ab11d9a48734575b799e9c77a2b341e523ffdfd99810b26997b5e9e SHA512 e21e89e5c365c3b6de7c7057113010dc5c9f4a6d713ffe52a4a3a6519db85de8ce1c54e7d88b7de47457e4bcc10e9873d52059e4a5b3216f9ad4f9aee66267a5
-EBUILD rsyslog-8.29.0.ebuild 12527 BLAKE2B c992fcb0783af6c15d89f8455ff47dc11248f5245b1a682f62b468150d814c672715d853acf31d3f551cb8c97dec1a02f9a676737033fe3e128d39a4b7412d71 SHA512 8f7593cca44eaa50929e03978dd9f066cc73aa9f725ce36585d274da925e0cc9a6a8791ab199c38b496e857335b8359c8cf19cc9ea3fae2ced4267ae69b05ef8
-EBUILD rsyslog-8.30.0.ebuild 12518 BLAKE2B d50e7a8dbeb492e8339d2b6f6fc237554059db89b0b9593bfc34111d1ffbef1cc518282f0b1b3c90dd04828fba7639dffab49c50e2ba779b4e4009886d5a2ce1 SHA512 aade46a36a893585f63d11a6030f6ad1ec0529e6cd79650ed96278a1a12f943d1710a1c853bcf54d528cff34dc8a706ab6d69823cab861f8a5c3f2f58b8f588f
-EBUILD rsyslog-8.31.0.ebuild 12565 BLAKE2B 29ca871aa60781bacec26e4809b8b3710958120011a5b3c7f31867c992faaab2f6b66707e013e855563e875104bb7e9fb93dac60836903c1a2f031600f2083fc SHA512 cb044ac578f29e7332191af95113882b2973870e37994b216eeb54b816e05cb42dae6e492c53b18d54dcac7425f6228aa1ac805f267dd6bf4fa344019c2b121f
-EBUILD rsyslog-8.32.0-r3.ebuild 12702 BLAKE2B 7e534f7d0beeafffbe57c0c9bdc6861d3da9ee978dcd2cec16a544b585a67e83bd82c6df20883dade66b5b5c6c8270b7f52bdf44fb449d71eec508059bd5b3d1 SHA512 1d5d877785061d9188947aae0144eab16b8fa08ad61d8638d4820b7a3f15d16a7ca76d5d0faffa1c38f224d462329f65c013fe1edf00125edbc9a3ee310ee1f6
-EBUILD rsyslog-8.33.1.ebuild 12620 BLAKE2B 6f6c4c1bdeb252bb32eec2764647bf74f4e94a2a88334aa7c4be58f5f77fb7c16c71f3485b4e1311232f035254268405d1bb140384e9160825eb44f8fab0e36b SHA512 2b898600948e94f98051eba4eeb41b409a8616f85c03b7894a1874677f48d4c67ba627612915835ed74114b48db3efd7c287a70b60a5d14c5c6c3102bcd28f3d
-MISC metadata.xml 3397 BLAKE2B 368cc15a6a51952b0aeed7314e0d8cf4be6a82f0bb5275f87f09b8707353543d26d839be016e7ae9523e8594e2ddf85f2f26e36ce2332b95131729f4da959a90 SHA512 8d5f78dafe981b3874fe60a54d3f041ab163e3e94a5f3ceb943bfe075e55dbdc260aa2dd035c7d241708f21b8f8f1f9d268ffd65538b0fc5b36c43a59f5a0f27
+DIST rsyslog-docs-8.34.0.tar.gz 7419160 BLAKE2B 928e6a4044d6d2161483f934e6c2cd5e489a3ec95b823419d7d57b98a7dd6c73f4d28d17c238471592fe1c692b626b57c7bf647e926c1c38ff5a774e5d2defd5 SHA512 edf9aa63c777624c3dc27dfd64b38893b9b4c9b56941df1d7a8c6bc3cb4cbbfb83e8c356cbefeab7c688ecb6017b66ed99931cb71b69b7c927b4743548dd40d4
+EBUILD rsyslog-8.28.0-r1.ebuild 12496 BLAKE2B 6389d72e3018fc1df8c7fa1f2a511360f1cd708534eaa2969a8418abdc92cee03934a5e2f9865bfe0ae462a6f3b49e17acf0434403e402f5ed149ae05203a366 SHA512 54e9cdef851779a9b2f8034474fb5c17e66a27679f24c50c6cc74fbdd8ff92a06a30998a40c5264ac4123b9f8860487b6e2a87607d00f38591fe7ac251623bc0
+EBUILD rsyslog-8.32.0-r4.ebuild 12716 BLAKE2B 9bbfe2d1395a6b298dded2c36d0393e1b11f8b11b0b05c87d2fbe7d1d72d52956b46b2a1a65048daed2a21ba2ed897023dc419f7dca242febbc70b54f4dc0112 SHA512 b8b14edcc03b268699a2e727a942ba34706d95a953426c8a9e2fde33f2aab44a4588d8b8c21627b0b8bd2fa95c295d5e1d84f83ccb3de857c46a768a72093451
+EBUILD rsyslog-8.33.1-r1.ebuild 12634 BLAKE2B efd3e3c908e293ff50a3ff7102c42068627403b912393edfd970271e2974083280839a16bce4175ce4cc946f2d01ff2d516428c18c5f157b541d24c2b316e38e SHA512 ac770033e43c6f5d7d9f93c5586a29389436bc4b479ff1d2a81f7b63121ccd3bff3f9726b7395244a5384d4a3844968b9c8f0bd11ea1f56a381616d231b66fbf
+EBUILD rsyslog-8.34.0.ebuild 12870 BLAKE2B 89d1341a6aee64b37678048f1682bea4387c08862f5a67a4804210b686486ef5caf8c83fe2e505c77250260912b22f6d43775284a2f0c6565e93f6337d66f93c SHA512 8523e0ca4e1fd67b03b6a2079b8d32b6f31f86795f6115197f6f4a15da3dc6c965079e7747b3624af954a75f995e6017b88efaa560ae897defe063d00bd72788
+MISC metadata.xml 3501 BLAKE2B c9fb5e712f905e55b44cf43322a24bda7d1d0063f560029e0c3fb5da464f9e2f35c5031ab592ff958db262f48b511d8c1a0267ce0d8a9e47a14b03588351bdd4 SHA512 c167c0829aa16e2baf1758a75762cfe7aa1a9c48c6d9cbc32a1a3338ba7c0ba71f112d27173bb126bb1a6fbb75716d478e0b69539a735f8cb8f020a555a5907d
--- a/app-admin/rsyslog/files/8-stable/rsyslog-8.24.0-fix-tcpflood-without-librelp-r1.patch
+++ b/app-admin/rsyslog/files/8-stable/rsyslog-8.24.0-fix-tcpflood-without-librelp-r1.patch
@ -1,160 +0,0 @@
-Patch to allow building of tcpflood without librelp
-
-Cherry pick of
-https://github.com/rsyslog/rsyslog/commit/73e3b7ab2f8a3974d31844b492ad02d61ed5727f
-https://github.com/rsyslog/rsyslog/pull/1493
-
-
-Gentoo-Bug: https://bugs.gentoo.org/613264
-Gentoo-Bug: https://bugs.gentoo.org/614424
-
-diff -u b/tests/tcpflood.c b/tests/tcpflood.c
--- b/tests/tcpflood.c
-+++ b/tests/tcpflood.c
-@@ -96,7 +96,9 @@
- #include <string.h>
- #include <netinet/in.h>
- #include <pthread.h>
-+#ifdef ENABLE_RELP
- #include <librelp.h>
-+#endif
- #include <sys/resource.h>
- #include <sys/time.h>
- #include <errno.h>
-@@ -149,7 +151,9 @@
- static int numConnections = 1; /* number of connections to create */
- static int softLimitConnections  = 0; /* soft connection limit, see -c option description */
- static int *sockArray;  /* array of sockets to use */
-+#ifdef ENABLE_RELP
- static relpClt_t **relpCltArray;  /* array of sockets to use */
-+#endif
- static int msgNum = 0;	/* initial message number to start with */
- static int bShowProgress = 1; /* show progress messages */
- static int bSilent = 0; /* completely silent operation */
-@@ -216,6 +220,7 @@
- static int sendTLS(int i, char *buf, int lenBuf);
- static void closeTLSSess(int __attribute__((unused)) i);
- 
-+#ifdef ENABLE_RELP
- /* RELP subsystem */
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wformat-security"
-@@ -235,6 +240,7 @@
- 	CHKRELP(relpEngineSetEnableCmd(pRelpEngine, (unsigned char*)"syslog",
- 		eRelpCmdState_Required));
- }
-+#endif /* #ifdef ENABLE_RELP */
- 
- /* prepare send subsystem for UDP send */
- static int
-@@ -273,6 +279,7 @@
- 		port = targetPort;
- 	}
- 	if(transport == TP_RELP_PLAIN) {
-+		#ifdef ENABLE_RELP
- 		relpRetVal relp_r;
- 		relpClt_t *relpClt;
- 		char relpPort[16];
-@@ -286,6 +293,7 @@
- 			return(1);
- 		}
- 		*fd = 1; /* mimic "all ok" state */
-+		#endif
- 	} else { /* TCP, with or without TLS */
- 		if((sock=socket(AF_INET, SOCK_STREAM, 0))==-1) {
- 			perror("\nsocket()");
-@@ -336,8 +344,10 @@
- 	sessArray = calloc(numConnections, sizeof(gnutls_session_t));
- #	endif
- 	sockArray = calloc(numConnections, sizeof(int));
-+	#ifdef ENABLE_RELP
- 	if(transport == TP_RELP_PLAIN)
- 		relpCltArray = calloc(numConnections, sizeof(relpClt_t*));
-+	#endif
- 	for(i = 0 ; i < numConnections ; ++i) {
- 		if(i % 10 == 0) {
- 			if(bShowProgress)
-@@ -356,8 +366,10 @@
- 					 * at least something.
- 					 */
- 					if(transport == TP_RELP_PLAIN) {
-+						#ifdef ENABLE_RELP
- 						CHKRELP(relpEngineCltDestruct(pRelpEngine,
- 							relpCltArray+i));
-+						#endif
- 					} else { /* TCP and TLS modes */
- 						if(transport == TP_TLS)
- 							closeTLSSess(i);
-@@ -403,14 +415,13 @@
- 
- 	if(bShowProgress)
- 		if(write(1, "      close connections", sizeof("      close connections")-1)){}
-	//if(transport == TP_RELP_PLAIN)
-		//sleep(10);	/* we need to let librelp settle a bit */
- 	for(i = 0 ; i < numConnections ; ++i) {
- 		if(i % 10 == 0 && bShowProgress) {
- 			lenMsg = sprintf(msgBuf, "\r%5.5d", i);
- 			if(write(1, msgBuf, lenMsg)){}
- 		}
- 		if(transport == TP_RELP_PLAIN) {
-+			#ifdef ENABLE_RELP
- 			relpRetVal relpr;
- 			if(sockArray[i] != -1) {
- 				relpr = relpEngineCltDestruct(pRelpEngine, relpCltArray+i);
-@@ -419,6 +430,7 @@
- 				}
- 				sockArray[i] = -1;
- 			}
-+			#endif
- 		} else { /* TCP and TLS modes */
- 			if(sockArray[i] != -1) {
- 				/* we try to not overrun the receiver by trying to flush buffers
-@@ -610,6 +622,7 @@
- 				offsSendBuf = lenBuf;
- 			}
- 		} else if(transport == TP_RELP_PLAIN) {
-+			#ifdef ENABLE_RELP
- 			relpRetVal relp_ret;
- 			if(sockArray[socknum] == -1) {
- 				/* connection was dropped, need to re-establish */
-@@ -627,6 +640,7 @@
- 				printf("\nrelpCltSendSyslog() failed with relp error code %d\n",
- 					   relp_ret);
- 			}
-+			#endif
- 		}
- 		if(lenSend != lenBuf) {
- 			printf("\r%5.5d\n", i);
-@@ -1106,7 +1120,9 @@
- 						transport = TP_RELP_PLAIN;
- #					else
- 						fprintf(stderr, "compiled without RELP support: "
-							"\"-Trelp-plain\" not supported!\n");
-+							"\"-Trelp-plain\" not supported!\n"
-+							"(add --enable-relp to ./configure options "
-+							"if desired)\n");
- 						exit(1);
- #					endif
- 				} else {
-@@ -1168,7 +1184,9 @@
- 	if(transport == TP_TLS) {
- 		initTLS();
- 	} else if(transport == TP_RELP_PLAIN) {
-+		#ifdef ENABLE_RELP
- 		initRELP_PLAIN();
-+		#endif
- 	}
- 
- 	if(openConnections() != 0) {
-@@ -1183,9 +1201,11 @@
- 
- 	closeConnections(); /* this is important so that we do not finish too early! */
- 
-+	#ifdef ENABLE_RELP
- 	if(transport == TP_RELP_PLAIN) {
- 		CHKRELP(relpEngineDestruct(&pRelpEngine));
- 	}
-+	#endif
- 
- 	if(nConnDrops > 0 && !bSilent)
- 		printf("-D option initiated %ld connection closures\n", nConnDrops);
--- a/app-admin/rsyslog/files/8-stable/rsyslog-8.26.0-fix-zmq3-format-security.patch
+++ b/app-admin/rsyslog/files/8-stable/rsyslog-8.26.0-fix-zmq3-format-security.patch
@ -1,39 +0,0 @@
--- a/contrib/imzmq3/imzmq3.c
-+++ b/contrib/imzmq3/imzmq3.c
-@@ -403,7 +403,7 @@ static rsRetVal createSocket(instanceConf_t* info, void** sock) {
- 
-     /* Do the bind/connect... */
-     if (info->action==ACTION_CONNECT) {
-        rv = zsocket_connect(*sock, info->description);
-+        rv = zsocket_connect(*sock, "%s", info->description);
-         if (rv == -1) {
-             errmsg.LogError(0,
-                             RS_RET_INVALID_PARAMS,
-@@ -413,7 +413,7 @@ static rsRetVal createSocket(instanceConf_t* info, void** sock) {
-         }
-         DBGPRINTF("imzmq3: connect for %s successful\n",info->description);
-     } else {
-        rv = zsocket_bind(*sock, info->description);
-+        rv = zsocket_bind(*sock, "%s", info->description);
-         if (rv == -1) {
-             errmsg.LogError(0,
-                             RS_RET_INVALID_PARAMS,
--- a/contrib/omzmq3/omzmq3.c
-+++ b/contrib/omzmq3/omzmq3.c
-@@ -242,14 +242,14 @@ static rsRetVal initZMQ(instanceData* pData) {
-     if (pData->action == ACTION_BIND) {
-         /* bind asserts, so no need to test return val here
-            which isn't the greatest api -- oh well */
-        if(-1 == zsocket_bind(pData->socket, (char*)pData->description)) {
-+        if(-1 == zsocket_bind(pData->socket, "%s", (char*)pData->description)) {
-             errmsg.LogError(0, RS_RET_NO_ERRCODE, "omzmq3: bind failed for %s: %s",
-                             pData->description, zmq_strerror(errno));
-             ABORT_FINALIZE(RS_RET_NO_ERRCODE);
-         }
-         DBGPRINTF("omzmq3: bind to %s successful\n",pData->description);
-     } else {
-        if(-1 == zsocket_connect(pData->socket, (char*)pData->description)) {
-+        if(-1 == zsocket_connect(pData->socket, "%s", (char*)pData->description)) {
-             errmsg.LogError(0, RS_RET_NO_ERRCODE, "omzmq3: connect failed for %s: %s", 
-                             pData->description, zmq_strerror(errno));
-             ABORT_FINALIZE(RS_RET_NO_ERRCODE);
--- a/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-hostname-detection-when-getaddrinfo-fails.patch
+++ b/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-hostname-detection-when-getaddrinfo-fails.patch
@ -1,27 +0,0 @@
-From 1a7d3a088969b47798bc1da712ca2772f91a7c02 Mon Sep 17 00:00:00 2001
-From: Jiri Vymazal <jvymazal@redhat.com>
-Date: Wed, 31 May 2017 16:26:56 +0200
-Subject: [PATCH] Ignoring NONAME error from getaddrinfo so we have hostname
- set even without working network
-
---
- runtime/net.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/runtime/net.c b/runtime/net.c
-index 2d8de9429..edffc677a 100644
--- a/runtime/net.c
-+++ b/runtime/net.c
-@@ -1188,7 +1188,11 @@ getLocalHostname(uchar **ppName)
- 		memset(&flags, 0, sizeof(flags));
- 		flags.ai_flags = AI_CANONNAME;
- 		int error = getaddrinfo((char*)hnbuf, NULL, &flags, &res);
-		if (error != 0) {
-+		if (error != 0 &&
-+		    error != EAI_NONAME && error != EAI_AGAIN && error != EAI_FAIL) {
-+			/* If we get one of errors above, network is probably
-+			 * not working yet, so we fall back to local hostname below
-+			 */
- 			dbgprintf("getaddrinfo: %s\n", gai_strerror(error));
- 			ABORT_FINALIZE(RS_RET_IO_ERROR);
- 		}
--- a/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-librdkafka-detection.patch
+++ b/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-librdkafka-detection.patch
@ -1,43 +0,0 @@
--- a/configure.ac
-+++ b/configure.ac
-@@ -1695,12 +1695,14 @@ AM_CONDITIONAL(ENABLE_KAFKA_TESTS, test x$enable_kafka_tests = xyes)
- 
- # omkafka works with older library
- if test "x$enable_omkafka" = "xyes"; then
-	PKG_CHECK_MODULES([LIBRDKAFKA], [librdkafka],, [
-		AC_CHECK_LIB([rdkafka], [rd_kafka_produce], [
-			AC_MSG_WARN([librdkafka is missing but library present, using -lrdkafka])
-			LIBRDKAFKA_LIBS=-lrdkafka
-		], [
-			AC_MSG_ERROR([could not find rdkafka library])
-+	PKG_CHECK_MODULES([LIBRDKAFKA], [rdkafka],, [
-+		PKG_CHECK_MODULES([LIBRDKAFKA], [librdkafka],, [
-+			AC_CHECK_LIB([rdkafka], [rd_kafka_produce], [
-+				AC_MSG_WARN([librdkafka is missing but library present, using -lrdkafka])
-+				LIBRDKAFKA_LIBS=-lrdkafka
-+			], [
-+				AC_MSG_ERROR([could not find rdkafka library])
-+			])
- 		])
- 	])
- 	AC_CHECK_HEADERS([librdkafka/rdkafka.h])
-@@ -1708,12 +1710,13 @@ fi
- 
- # imkafka needs newer library
- if test "x$enable_imkafka" = "xyes"; then
-	PKG_CHECK_MODULES(LIBRDKAFKA, rdkafka >= 0.9.1)
-	AC_CHECK_LIB([rdkafka], [rd_kafka_produce], [
-		AC_MSG_WARN([librdkafka is missing but library present, using -lrdkafka])
-		LIBRDKAFKA_LIBS=-lrdkafka
-	], [
-		AC_MSG_ERROR([could not find rdkafka library])
-+	PKG_CHECK_MODULES([LIBRDKAFKA], [rdkafka >= 0.9.1],, [
-+		AC_CHECK_LIB([rdkafka], [rd_kafka_produce], [
-+			AC_MSG_WARN([librdkafka is missing but library present, using -lrdkafka])
-+			LIBRDKAFKA_LIBS=-lrdkafka
-+		], [
-+			AC_MSG_ERROR([could not find rdkafka library])
-+		])
- 	])
- 	AC_CHECK_HEADERS([librdkafka/rdkafka.h])
- fi
--- a/app-admin/rsyslog/files/8-stable/rsyslog-8.30.0-fix-kerberos.patch
+++ b/app-admin/rsyslog/files/8-stable/rsyslog-8.30.0-fix-kerberos.patch
@ -1,22 +0,0 @@
-https://github.com/rsyslog/rsyslog/issues/1838
-
--- a/plugins/imgssapi/imgssapi.c
-+++ b/plugins/imgssapi/imgssapi.c
-@@ -291,7 +291,7 @@ finalize_it:
- 
- 
- static rsRetVal
-doRcvData(tcps_sess_t *pSess, char *buf, size_t lenBuf, ssize_t *piLenRcvd)
-+doRcvData(tcps_sess_t *pSess, char *buf, size_t lenBuf, ssize_t *piLenRcvd, int *const oserr)
- {
- 	DEFiRet;
- 	int allowedMethods;
-@@ -307,7 +307,7 @@ doRcvData(tcps_sess_t *pSess, char *buf, size_t lenBuf, ssize_t *piLenRcvd)
- 		CHKiRet(TCPSessGSSRecv(pSess, buf, lenBuf, piLenRcvd));
- 	} else {
- 		*piLenRcvd = lenBuf;
-		CHKiRet(netstrm.Rcv(pSess->pStrm, (uchar*) buf, piLenRcvd) != RS_RET_OK);
-+		CHKiRet(netstrm.Rcv(pSess->pStrm, (uchar*) buf, piLenRcvd, oserr));
- 	}
- 
- finalize_it:
--- a/app-admin/rsyslog/files/8-stable/rsyslog-8.34.0-fix-issue2612.patch
+++ b/app-admin/rsyslog/files/8-stable/rsyslog-8.34.0-fix-issue2612.patch
@ -0,0 +1,13 @@
+https://github.com/rsyslog/rsyslog/issues/2612
+
+--- a/configure.ac
+++ b/configure.ac
+@@ -254,7 +254,7 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM(, return __builtin_expect(main != 0, 1))],
+ # speeds up processig.
+ # note that when automic operations are enabled but not available, they
+ # will silently NOT be used!
+-AC_ARG_ENABLE(regexp,
+AC_ARG_ENABLE(atomic_operations,
+         [AS_HELP_STRING([--enable-atomic-operations],[Enable atomic operation support @<:@default=yes@:>@])],
+         [case "${enableval}" in
+          yes) enable_atomic_operations="yes" ;;
--- a/app-admin/rsyslog/metadata.xml
+++ b/app-admin/rsyslog/metadata.xml
@ -14,6 +14,7 @@
 		<flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations.</flag>
 		<flag name="kafka">Build the Apache Kafka input/output module (requires <pkg>dev-libs/librdkafka</pkg>)</flag>
 		<flag name="kerberos">Build the GSSAPI input and output module (requires <pkg>virtual/krb5</pkg>)</flag>
+		<flag name="kubernetes">Build the kubernetes modify plugin (requires <pkg>net-misc/curl</pkg>)</flag>
 		<flag name="libressl">Use <pkg>dev-libs/libressl</pkg> for building the rfc5424hmac modify module (requires rfc5424hmac USE flag)</flag>
 		<flag name="mdblookup">Build the MaxMind DB lookup message modify plugin using <pkg>dev-libs/libmaxminddb</pkg></flag>
 		<flag name="mongodb">Build the MongoDB output module (requires <pkg>dev-libs/libmongo-client</pkg>)</flag>
--- a/app-admin/rsyslog/rsyslog-8.19.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.19.0.ebuild
@ -1,444 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils linux-info systemd
-
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
-HOMEPAGE="http://www.rsyslog.com/"
-
-BRANCH="8-stable"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
-
-	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
-
-	inherit git-r3
-else
-	MY_PV=${PV%_rc*}
-	MY_FILENAME="${PN}-${PV}.tar.gz"
-	MY_FILENAME_DOCS="${PN}-docs-${PV}.tar.gz"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-
-	# Upstream URL schema:
-	# RC:      http://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz
-	#          http://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz
-	# Release: http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz
-
-	MY_URL_PREFIX=
-	if [[ ${PV} = *_rc* ]]; then
-		_tmp_last_index=$(($(get_last_version_component_index ${PV})+1))
-		_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${PV})
-		if [[ ${_tmp_suffix} = *rc* ]]; then
-			MY_URL_PREFIX="${_tmp_suffix}/"
-		fi
-
-		# Cleaning up temporary variables
-		unset _tmp_last_index
-		unset _tmp_suffix
-	else
-		KEYWORDS="amd64 arm ~arm64 hppa x86"
-	fi
-
-	SRC_URI="
-		http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME}
-		doc? ( http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} )
-	"
-fi
-
-LICENSE="GPL-3 LGPL-3 Apache-2.0"
-SLOT="0"
-IUSE="dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mongodb mysql normalize omhttpfs"
-IUSE+=" omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid zeromq"
-
-RDEPEND="
-	>=dev-libs/libfastjson-0.99.2:=
-	>=dev-libs/libestr-0.1.9
-	>=dev-libs/liblogging-1.0.1:=[stdlog]
-	>=sys-libs/zlib-1.2.5
-	dbi? ( >=dev-db/libdbi-0.8.3 )
-	elasticsearch? ( >=net-misc/curl-7.35.0 )
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
-	grok? ( >=dev-libs/grok-0.9.2 )
-	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
-	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
-	kerberos? ( virtual/krb5 )
-	mongodb? ( >=dev-libs/libmongo-client-0.1.4 )
-	mysql? ( virtual/mysql )
-	normalize? (
-		>=dev-libs/libee-0.4.0
-		>=dev-libs/liblognorm-2.0.1:=
-	)
-	omhttpfs? ( >=net-misc/curl-7.35.0 )
-	omudpspoof? ( >=net-libs/libnet-1.1.6 )
-	postgres? ( >=dev-db/postgresql-8.4.20:= )
-	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
-	redis? ( >=dev-libs/hiredis-0.11.0:= )
-	relp? ( >=dev-libs/librelp-1.2.5:= )
-	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
-	rfc5424hmac? (
-		!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
-	ssl? ( >=net-libs/gnutls-2.12.23:0= )
-	systemd? ( >=sys-apps/systemd-208 )
-	uuid? ( sys-apps/util-linux:0= )
-	zeromq? (
-		>=net-libs/zeromq-4.1.1:=
-		>=net-libs/czmq-3.0.0
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( sys-libs/libfaketime )"
-
-if [[ ${PV} == "9999" ]]; then
-	DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
-	DEPEND+=" >=sys-devel/flex-2.5.39-r1"
-	DEPEND+=" >=sys-devel/bison-2.4.3"
-	DEPEND+=" >=dev-python/docutils-0.12"
-fi
-
-CONFIG_CHECK="~INOTIFY_USER"
-WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]]; then
-		git-r3_fetch
-		git-r3_checkout
-	else
-		unpack ${P}.tar.gz
-	fi
-
-	if use doc; then
-		if [[ ${PV} == "9999" ]]; then
-			local _EGIT_BRANCH=
-			if [[ -n "${EGIT_BRANCH}" ]]; then
-				# Cannot use rsyslog commits/branches for documentation repository
-				_EGIT_BRANCH=${EGIT_BRANCH}
-				unset EGIT_BRANCH
-			fi
-
-			git-r3_fetch "${DOC_REPO_URI}"
-			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
-
-			if [[ -n "${_EGIT_BRANCH}" ]]; then
-				# Restore previous EGIT_BRANCH information
-				EGIT_BRANCH=${_EGIT_BRANCH}
-			fi
-		else
-			cd "${S}" || die "Cannot change dir into '${S}'"
-			mkdir docs || die "Failed to create docs directory"
-			cd docs || die "Failed to change dir into '${S}/docs'"
-			unpack ${MY_FILENAME_DOCS}
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	# Maintainer notes:
-	# * Guardtime support is missing because libgt isn't yet available
-	#   in portage.
-	# * Hadoop's HDFS file system output module is currently not
-	#   supported in Gentoo because nobody is able to test it
-	#   (JAVA dependency).
-	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
-	#   upstream PR 129 and 136) so we need to export HIREDIS_*
-	#   variables because rsyslog's build system depends on pkg-config.
-
-	if use redis; then
-		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
-		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
-	fi
-
-	local myeconfargs=(
-		--disable-debug-symbols
-		--disable-generate-man-pages
-		--without-valgrind-testbench
-		$(use_enable test testbench)
-		# Input Plugins without depedencies
-		--enable-imdiag
-		--enable-imfile
-		--enable-impstats
-		--enable-imptcp
-		# Message Modificiation Plugins without depedencies
-		--enable-mmanon
-		--enable-mmaudit
-		--enable-mmcount
-		--enable-mmfields
-		--enable-mmjsonparse
-		--enable-mmpstrucdata
-		--enable-mmsequence
-		--enable-mmutf8fix
-		# Output Modification Plugins without dependencies
-		--enable-mail
-		--enable-omprog
-		--enable-omruleset
-		--enable-omstdout
-		--enable-omuxsock
-		# Misc
-		--enable-pmaixforwardedfrom
-		--enable-pmciscoios
-		--enable-pmcisconames
-		--enable-pmlastmsg
-		--enable-pmsnare
-		# DB
-		$(use_enable dbi libdbi)
-		$(use_enable mongodb ommongodb)
-		$(use_enable mysql)
-		$(use_enable postgres pgsql)
-		$(use_enable redis omhiredis)
-		# Debug
-		$(use_enable debug)
-		$(use_enable debug diagtools)
-		$(use_enable debug memcheck)
-		$(use_enable debug rtinst)
-		$(use_enable debug valgrind)
-		# Misc
-		$(use_enable elasticsearch)
-		$(use_enable gcrypt libgcrypt)
-		$(use_enable jemalloc)
-		$(use_enable kafka omkafka)
-		$(use_enable kerberos gssapi-krb5)
-		$(use_enable normalize mmnormalize)
-		$(use_enable grok mmgrok)
-		$(use_enable omhttpfs)
-		$(use_enable omudpspoof)
-		$(use_enable rabbitmq omrabbitmq)
-		$(use_enable relp)
-		$(use_enable rfc3195)
-		$(use_enable rfc5424hmac mmrfc5424addhmac)
-		$(use_enable snmp)
-		$(use_enable snmp mmsnmptrapd)
-		$(use_enable ssl gnutls)
-		$(use_enable systemd imjournal)
-		$(use_enable systemd omjournal)
-		$(use_enable usertools)
-		$(use_enable uuid)
-		$(use_enable zeromq imczmq)
-		$(use_enable zeromq imzmq3)
-		$(use_enable zeromq omczmq)
-		$(use_enable zeromq omzmq3)
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use doc && [[ "${PV}" == "9999" ]]; then
-		einfo "Building documentation ..."
-		local doc_dir="${S}/docs"
-		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
-		sphinx-build -b html source build || die "Building documentation failed!"
-	fi
-}
-
-src_test() {
-	local _has_increased_ulimit=
-
-	# Sometimes tests aren't executable (i.e. when added via patch)
-	einfo "Adjusting permissions of test scripts ..."
-	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
-		die "Failed to adjust test scripts permission"
-
-	if ulimit -n 3072; then
-		_has_increased_ulimit="true"
-	fi
-
-	if ! emake --jobs 1 check; then
-		eerror "Test suite failed! :("
-
-		if [[ -z "${_has_increased_ulimit}" ]]; then
-			eerror "Probably because open file limit couldn't be set to 3072."
-		fi
-
-		if has userpriv ${FEATURES}; then
-			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
-				"before you submit a bug report."
-		fi
-
-	fi
-}
-
-src_install() {
-	local DOCS=(
-		AUTHORS
-		ChangeLog
-		"${FILESDIR}"/${BRANCH}/README.gentoo
-	)
-
-	use doc && local HTML_DOCS=( "${S}/docs/build/." )
-
-	default
-
-	newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN}
-	newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN}
-
-	keepdir /var/empty/dev
-	keepdir /var/spool/${PN}
-	keepdir /etc/ssl/${PN}
-	keepdir /etc/${PN}.d
-
-	insinto /etc
-	newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf
-
-	insinto /etc/rsyslog.d/
-	doins "${FILESDIR}/${BRANCH}/50-default.conf"
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN}
-
-	if use mysql; then
-		insinto /usr/share/doc/${PF}/scripts/mysql
-		doins plugins/ommysql/createDB.sql
-	fi
-
-	if use postgres; then
-		insinto /usr/share/doc/${PF}/scripts/pgsql
-		doins plugins/ompgsql/createDB.sql
-	fi
-
-	prune_libtool_files --modules
-}
-
-pkg_postinst() {
-	local advertise_readme=0
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		advertise_readme=1
-
-		if use mysql || use postgres; then
-			echo
-			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
-			elog "  /usr/share/doc/${PF}/scripts"
-		fi
-
-		if use ssl; then
-			echo
-			elog "To create a default CA and certificates for your server and clients, run:"
-			elog "  emerge --config =${PF}"
-			elog "on your logging server. You can run it several times,"
-			elog "once for each logging client. The client certificates will be signed"
-			elog "using the CA certificate generated during the first run."
-		fi
-	fi
-
-	if [[ ${advertise_readme} -gt 0 ]]; then
-		# We need to show the README file location
-
-		echo ""
-		elog "Please read"
-		elog ""
-		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
-		elog ""
-		elog "for more details."
-	fi
-}
-
-pkg_config() {
-	if ! use ssl ; then
-		einfo "There is nothing to configure for rsyslog unless you"
-		einfo "used USE=ssl to build it."
-		return 0
-	fi
-
-	# Make sure the certificates directory exists
-	local CERTDIR="${EROOT}/etc/ssl/${PN}"
-	if [[ ! -d "${CERTDIR}" ]]; then
-		mkdir "${CERTDIR}" || die
-	fi
-	einfo "Your certificates will be stored in ${CERTDIR}"
-
-	# Create a default CA if needed
-	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
-		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = Portage automated CA
-		ca
-		cert_signing_key
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-self-signed \
-			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		# Create the server certificate
-		echo
-		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
-		read -r CN
-
-		einfo "Creating private key and certificate for server ${CN}..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = ${CN}
-		tls_www_server
-		dns_name = ${CN}
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-certificate \
-			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	else
-		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
-	fi
-
-	# Create a client certificate
-	echo
-	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
-	read -r CN
-
-	einfo "Creating private key and certificate for client ${CN}..."
-	certtool --generate-privkey \
-		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
-	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-	cat > "${T}/${PF}.$$" <<- _EOF
-	cn = ${CN}
-	tls_www_client
-	dns_name = ${CN}
-	expiration_days = 3650
-	_EOF
-
-	certtool --generate-certificate \
-		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-		--template "${T}/${PF}.$$" &>/dev/null
-	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	rm -f "${T}/${PF}.$$"
-
-	echo
-	einfo "Here is the documentation on how to encrypt your log traffic:"
-	einfo " http://www.rsyslog.com/doc/rsyslog_tls.html"
-}
--- a/app-admin/rsyslog/rsyslog-8.24.0-r2.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.24.0-r2.ebuild
@ -1,448 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools eutils linux-info systemd
-
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
-HOMEPAGE="http://www.rsyslog.com/"
-
-BRANCH="8-stable"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
-
-	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
-
-	inherit git-r3
-else
-	MY_PV=${PV%_rc*}
-	MY_FILENAME="${PN}-${PV}.tar.gz"
-	MY_FILENAME_DOCS="${PN}-docs-${PV}.tar.gz"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-
-	# Upstream URL schema:
-	# RC:      http://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz
-	#          http://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz
-	# Release: http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz
-
-	MY_URL_PREFIX=
-	if [[ ${PV} = *_rc* ]]; then
-		_tmp_last_index=$(($(get_last_version_component_index ${PV})+1))
-		_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${PV})
-		if [[ ${_tmp_suffix} = *rc* ]]; then
-			MY_URL_PREFIX="${_tmp_suffix}/"
-		fi
-
-		# Cleaning up temporary variables
-		unset _tmp_last_index
-		unset _tmp_suffix
-	else
-		KEYWORDS="amd64 arm ~arm64 hppa x86"
-	fi
-
-	SRC_URI="
-		http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME}
-		doc? ( http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} )
-	"
-
-	PATCHES=( "${FILESDIR}"/8-stable/${PN}-8.24.0-fix-tcpflood-without-librelp-r1.patch )
-fi
-
-LICENSE="GPL-3 LGPL-3 Apache-2.0"
-SLOT="0"
-IUSE="dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mongodb mysql normalize omhttpfs"
-IUSE+=" omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid zeromq"
-
-RDEPEND="
-	>=dev-libs/libfastjson-0.99.3:=
-	>=dev-libs/libestr-0.1.9
-	>=dev-libs/liblogging-1.0.1:=[stdlog]
-	>=sys-libs/zlib-1.2.5
-	dbi? ( >=dev-db/libdbi-0.8.3 )
-	elasticsearch? ( >=net-misc/curl-7.35.0 )
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
-	grok? ( >=dev-libs/grok-0.9.2 )
-	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
-	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
-	kerberos? ( virtual/krb5 )
-	mongodb? ( >=dev-libs/libmongo-client-0.1.4 )
-	mysql? ( virtual/mysql )
-	normalize? (
-		>=dev-libs/libee-0.4.0
-		>=dev-libs/liblognorm-2.0.1:=
-	)
-	omhttpfs? ( >=net-misc/curl-7.35.0 )
-	omudpspoof? ( >=net-libs/libnet-1.1.6 )
-	postgres? ( >=dev-db/postgresql-8.4.20:= )
-	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
-	redis? ( >=dev-libs/hiredis-0.11.0:= )
-	relp? ( >=dev-libs/librelp-1.2.12:= )
-	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
-	rfc5424hmac? (
-		!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
-	ssl? ( >=net-libs/gnutls-2.12.23:0= )
-	systemd? ( >=sys-apps/systemd-208 )
-	uuid? ( sys-apps/util-linux:0= )
-	zeromq? (
-		>=net-libs/zeromq-4.1.1:=
-		>=net-libs/czmq-3.0.0
-	)"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-archive-2015.02.24
-	virtual/pkgconfig
-	test? ( sys-libs/libfaketime )"
-
-if [[ ${PV} == "9999" ]]; then
-	DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
-	DEPEND+=" >=sys-devel/flex-2.5.39-r1"
-	DEPEND+=" >=sys-devel/bison-2.4.3"
-	DEPEND+=" >=dev-python/docutils-0.12"
-fi
-
-CONFIG_CHECK="~INOTIFY_USER"
-WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]]; then
-		git-r3_fetch
-		git-r3_checkout
-	else
-		unpack ${P}.tar.gz
-	fi
-
-	if use doc; then
-		if [[ ${PV} == "9999" ]]; then
-			local _EGIT_BRANCH=
-			if [[ -n "${EGIT_BRANCH}" ]]; then
-				# Cannot use rsyslog commits/branches for documentation repository
-				_EGIT_BRANCH=${EGIT_BRANCH}
-				unset EGIT_BRANCH
-			fi
-
-			git-r3_fetch "${DOC_REPO_URI}"
-			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
-
-			if [[ -n "${_EGIT_BRANCH}" ]]; then
-				# Restore previous EGIT_BRANCH information
-				EGIT_BRANCH=${_EGIT_BRANCH}
-			fi
-		else
-			cd "${S}" || die "Cannot change dir into '${S}'"
-			mkdir docs || die "Failed to create docs directory"
-			cd docs || die "Failed to change dir into '${S}/docs'"
-			unpack ${MY_FILENAME_DOCS}
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	# Maintainer notes:
-	# * Guardtime support is missing because libgt isn't yet available
-	#   in portage.
-	# * Hadoop's HDFS file system output module is currently not
-	#   supported in Gentoo because nobody is able to test it
-	#   (JAVA dependency).
-	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
-	#   upstream PR 129 and 136) so we need to export HIREDIS_*
-	#   variables because rsyslog's build system depends on pkg-config.
-
-	if use redis; then
-		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
-		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
-	fi
-
-	local myeconfargs=(
-		--disable-debug-symbols
-		--disable-generate-man-pages
-		--without-valgrind-testbench
-		$(use_enable test testbench)
-		# Input Plugins without depedencies
-		--enable-imdiag
-		--enable-imfile
-		--enable-impstats
-		--enable-imptcp
-		# Message Modificiation Plugins without depedencies
-		--enable-mmanon
-		--enable-mmaudit
-		--enable-mmcount
-		--enable-mmfields
-		--enable-mmjsonparse
-		--enable-mmpstrucdata
-		--enable-mmrm1stspace
-		--enable-mmsequence
-		--enable-mmutf8fix
-		# Output Modification Plugins without dependencies
-		--enable-mail
-		--enable-omprog
-		--enable-omruleset
-		--enable-omstdout
-		--enable-omuxsock
-		# Misc
-		--enable-pmaixforwardedfrom
-		--enable-pmciscoios
-		--enable-pmcisconames
-		--enable-pmlastmsg
-		--enable-pmsnare
-		# DB
-		$(use_enable dbi libdbi)
-		$(use_enable mongodb ommongodb)
-		$(use_enable mysql)
-		$(use_enable postgres pgsql)
-		$(use_enable redis omhiredis)
-		# Debug
-		$(use_enable debug)
-		$(use_enable debug diagtools)
-		$(use_enable debug memcheck)
-		$(use_enable debug rtinst)
-		$(use_enable debug valgrind)
-		# Misc
-		$(use_enable elasticsearch)
-		$(use_enable gcrypt libgcrypt)
-		$(use_enable jemalloc)
-		$(use_enable kafka omkafka)
-		$(use_enable kerberos gssapi-krb5)
-		$(use_enable normalize mmnormalize)
-		$(use_enable grok mmgrok)
-		$(use_enable omhttpfs)
-		$(use_enable omudpspoof)
-		$(use_enable rabbitmq omrabbitmq)
-		$(use_enable relp)
-		$(use_enable rfc3195)
-		$(use_enable rfc5424hmac mmrfc5424addhmac)
-		$(use_enable snmp)
-		$(use_enable snmp mmsnmptrapd)
-		$(use_enable ssl gnutls)
-		$(use_enable systemd imjournal)
-		$(use_enable systemd omjournal)
-		$(use_enable usertools)
-		$(use_enable uuid)
-		$(use_enable zeromq imczmq)
-		$(use_enable zeromq imzmq3)
-		$(use_enable zeromq omczmq)
-		$(use_enable zeromq omzmq3)
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use doc && [[ "${PV}" == "9999" ]]; then
-		einfo "Building documentation ..."
-		local doc_dir="${S}/docs"
-		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
-		sphinx-build -b html source build || die "Building documentation failed!"
-	fi
-}
-
-src_test() {
-	local _has_increased_ulimit=
-
-	# Sometimes tests aren't executable (i.e. when added via patch)
-	einfo "Adjusting permissions of test scripts ..."
-	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
-		die "Failed to adjust test scripts permission"
-
-	if ulimit -n 3072; then
-		_has_increased_ulimit="true"
-	fi
-
-	if ! emake --jobs 1 check; then
-		eerror "Test suite failed! :("
-
-		if [[ -z "${_has_increased_ulimit}" ]]; then
-			eerror "Probably because open file limit couldn't be set to 3072."
-		fi
-
-		if has userpriv ${FEATURES}; then
-			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
-				"before you submit a bug report."
-		fi
-
-	fi
-}
-
-src_install() {
-	local DOCS=(
-		AUTHORS
-		ChangeLog
-		"${FILESDIR}"/${BRANCH}/README.gentoo
-	)
-
-	use doc && local HTML_DOCS=( "${S}/docs/build/." )
-
-	default
-
-	newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN}
-	newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN}
-
-	keepdir /var/empty/dev
-	keepdir /var/spool/${PN}
-	keepdir /etc/ssl/${PN}
-	keepdir /etc/${PN}.d
-
-	insinto /etc
-	newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf
-
-	insinto /etc/rsyslog.d/
-	doins "${FILESDIR}/${BRANCH}/50-default.conf"
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN}
-
-	if use mysql; then
-		insinto /usr/share/doc/${PF}/scripts/mysql
-		doins plugins/ommysql/createDB.sql
-	fi
-
-	if use postgres; then
-		insinto /usr/share/doc/${PF}/scripts/pgsql
-		doins plugins/ompgsql/createDB.sql
-	fi
-
-	prune_libtool_files --modules
-}
-
-pkg_postinst() {
-	local advertise_readme=0
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		advertise_readme=1
-
-		if use mysql || use postgres; then
-			echo
-			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
-			elog "  /usr/share/doc/${PF}/scripts"
-		fi
-
-		if use ssl; then
-			echo
-			elog "To create a default CA and certificates for your server and clients, run:"
-			elog "  emerge --config =${PF}"
-			elog "on your logging server. You can run it several times,"
-			elog "once for each logging client. The client certificates will be signed"
-			elog "using the CA certificate generated during the first run."
-		fi
-	fi
-
-	if [[ ${advertise_readme} -gt 0 ]]; then
-		# We need to show the README file location
-
-		echo ""
-		elog "Please read"
-		elog ""
-		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
-		elog ""
-		elog "for more details."
-	fi
-}
-
-pkg_config() {
-	if ! use ssl ; then
-		einfo "There is nothing to configure for rsyslog unless you"
-		einfo "used USE=ssl to build it."
-		return 0
-	fi
-
-	# Make sure the certificates directory exists
-	local CERTDIR="${EROOT}/etc/ssl/${PN}"
-	if [[ ! -d "${CERTDIR}" ]]; then
-		mkdir "${CERTDIR}" || die
-	fi
-	einfo "Your certificates will be stored in ${CERTDIR}"
-
-	# Create a default CA if needed
-	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
-		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = Portage automated CA
-		ca
-		cert_signing_key
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-self-signed \
-			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		# Create the server certificate
-		echo
-		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
-		read -r CN
-
-		einfo "Creating private key and certificate for server ${CN}..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = ${CN}
-		tls_www_server
-		dns_name = ${CN}
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-certificate \
-			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	else
-		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
-	fi
-
-	# Create a client certificate
-	echo
-	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
-	read -r CN
-
-	einfo "Creating private key and certificate for client ${CN}..."
-	certtool --generate-privkey \
-		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
-	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-	cat > "${T}/${PF}.$$" <<- _EOF
-	cn = ${CN}
-	tls_www_client
-	dns_name = ${CN}
-	expiration_days = 3650
-	_EOF
-
-	certtool --generate-certificate \
-		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-		--template "${T}/${PF}.$$" &>/dev/null
-	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	rm -f "${T}/${PF}.$$"
-
-	echo
-	einfo "Here is the documentation on how to encrypt your log traffic:"
-	einfo " http://www.rsyslog.com/doc/rsyslog_tls.html"
-}
--- a/app-admin/rsyslog/rsyslog-8.25.0-r2.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.25.0-r2.ebuild
@ -1,450 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools eutils linux-info systemd
-
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
-HOMEPAGE="http://www.rsyslog.com/"
-
-BRANCH="8-stable"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
-
-	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
-
-	inherit git-r3
-else
-	MY_PV=${PV%_rc*}
-	MY_FILENAME="${PN}-${PV}.tar.gz"
-	MY_FILENAME_DOCS="${PN}-docs-${PV}.tar.gz"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-
-	# Upstream URL schema:
-	# RC:      http://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz
-	#          http://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz
-	# Release: http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz
-
-	MY_URL_PREFIX=
-	if [[ ${PV} = *_rc* ]]; then
-		_tmp_last_index=$(($(get_last_version_component_index ${PV})+1))
-		_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${PV})
-		if [[ ${_tmp_suffix} = *rc* ]]; then
-			MY_URL_PREFIX="${_tmp_suffix}/"
-		fi
-
-		# Cleaning up temporary variables
-		unset _tmp_last_index
-		unset _tmp_suffix
-	else
-		KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
-	fi
-
-	SRC_URI="
-		http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME}
-		doc? ( http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} )
-	"
-
-	PATCHES=( "${FILESDIR}"/8-stable/${PN}-8.24.0-fix-tcpflood-without-librelp-r1.patch )
-fi
-
-LICENSE="GPL-3 LGPL-3 Apache-2.0"
-SLOT="0"
-IUSE="dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mdblookup mongodb mysql normalize omhttpfs"
-IUSE+=" omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid zeromq"
-
-RDEPEND="
-	>=dev-libs/libfastjson-0.99.3:=
-	>=dev-libs/libestr-0.1.9
-	>=dev-libs/liblogging-1.0.1:=[stdlog]
-	>=sys-libs/zlib-1.2.5
-	dbi? ( >=dev-db/libdbi-0.8.3 )
-	elasticsearch? ( >=net-misc/curl-7.35.0 )
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
-	grok? ( >=dev-libs/grok-0.9.2 )
-	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
-	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
-	kerberos? ( virtual/krb5 )
-	mdblookup? ( dev-libs/libmaxminddb:= )
-	mongodb? ( >=dev-libs/libmongo-client-0.1.4 )
-	mysql? ( virtual/mysql )
-	normalize? (
-		>=dev-libs/libee-0.4.0
-		>=dev-libs/liblognorm-2.0.1:=
-	)
-	omhttpfs? ( >=net-misc/curl-7.35.0 )
-	omudpspoof? ( >=net-libs/libnet-1.1.6 )
-	postgres? ( >=dev-db/postgresql-8.4.20:= )
-	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
-	redis? ( >=dev-libs/hiredis-0.11.0:= )
-	relp? ( >=dev-libs/librelp-1.2.12:= )
-	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
-	rfc5424hmac? (
-		!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
-	ssl? ( >=net-libs/gnutls-2.12.23:0= )
-	systemd? ( >=sys-apps/systemd-208 )
-	uuid? ( sys-apps/util-linux:0= )
-	zeromq? (
-		>=net-libs/zeromq-4.1.1:=
-		>=net-libs/czmq-3.0.0
-	)"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-archive-2015.02.24
-	virtual/pkgconfig
-	test? ( sys-libs/libfaketime )"
-
-if [[ ${PV} == "9999" ]]; then
-	DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
-	DEPEND+=" >=sys-devel/flex-2.5.39-r1"
-	DEPEND+=" >=sys-devel/bison-2.4.3"
-	DEPEND+=" >=dev-python/docutils-0.12"
-fi
-
-CONFIG_CHECK="~INOTIFY_USER"
-WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]]; then
-		git-r3_fetch
-		git-r3_checkout
-	else
-		unpack ${P}.tar.gz
-	fi
-
-	if use doc; then
-		if [[ ${PV} == "9999" ]]; then
-			local _EGIT_BRANCH=
-			if [[ -n "${EGIT_BRANCH}" ]]; then
-				# Cannot use rsyslog commits/branches for documentation repository
-				_EGIT_BRANCH=${EGIT_BRANCH}
-				unset EGIT_BRANCH
-			fi
-
-			git-r3_fetch "${DOC_REPO_URI}"
-			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
-
-			if [[ -n "${_EGIT_BRANCH}" ]]; then
-				# Restore previous EGIT_BRANCH information
-				EGIT_BRANCH=${_EGIT_BRANCH}
-			fi
-		else
-			cd "${S}" || die "Cannot change dir into '${S}'"
-			mkdir docs || die "Failed to create docs directory"
-			cd docs || die "Failed to change dir into '${S}/docs'"
-			unpack ${MY_FILENAME_DOCS}
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	# Maintainer notes:
-	# * Guardtime support is missing because libgt isn't yet available
-	#   in portage.
-	# * Hadoop's HDFS file system output module is currently not
-	#   supported in Gentoo because nobody is able to test it
-	#   (JAVA dependency).
-	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
-	#   upstream PR 129 and 136) so we need to export HIREDIS_*
-	#   variables because rsyslog's build system depends on pkg-config.
-
-	if use redis; then
-		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
-		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
-	fi
-
-	local myeconfargs=(
-		--disable-debug-symbols
-		--disable-generate-man-pages
-		--without-valgrind-testbench
-		$(use_enable test testbench)
-		# Input Plugins without depedencies
-		--enable-imdiag
-		--enable-imfile
-		--enable-impstats
-		--enable-imptcp
-		# Message Modificiation Plugins without depedencies
-		--enable-mmanon
-		--enable-mmaudit
-		--enable-mmcount
-		--enable-mmfields
-		--enable-mmjsonparse
-		--enable-mmpstrucdata
-		--enable-mmrm1stspace
-		--enable-mmsequence
-		--enable-mmutf8fix
-		# Output Modification Plugins without dependencies
-		--enable-mail
-		--enable-omprog
-		--enable-omruleset
-		--enable-omstdout
-		--enable-omuxsock
-		# Misc
-		--enable-pmaixforwardedfrom
-		--enable-pmciscoios
-		--enable-pmcisconames
-		--enable-pmlastmsg
-		--enable-pmsnare
-		# DB
-		$(use_enable dbi libdbi)
-		$(use_enable mongodb ommongodb)
-		$(use_enable mysql)
-		$(use_enable postgres pgsql)
-		$(use_enable redis omhiredis)
-		# Debug
-		$(use_enable debug)
-		$(use_enable debug diagtools)
-		$(use_enable debug memcheck)
-		$(use_enable debug rtinst)
-		$(use_enable debug valgrind)
-		# Misc
-		$(use_enable elasticsearch)
-		$(use_enable gcrypt libgcrypt)
-		$(use_enable jemalloc)
-		$(use_enable kafka omkafka)
-		$(use_enable kerberos gssapi-krb5)
-		$(use_enable normalize mmnormalize)
-		$(use_enable mdblookup mmdblookup)
-		$(use_enable grok mmgrok)
-		$(use_enable omhttpfs)
-		$(use_enable omudpspoof)
-		$(use_enable rabbitmq omrabbitmq)
-		$(use_enable relp)
-		$(use_enable rfc3195)
-		$(use_enable rfc5424hmac mmrfc5424addhmac)
-		$(use_enable snmp)
-		$(use_enable snmp mmsnmptrapd)
-		$(use_enable ssl gnutls)
-		$(use_enable systemd imjournal)
-		$(use_enable systemd omjournal)
-		$(use_enable usertools)
-		$(use_enable uuid)
-		$(use_enable zeromq imczmq)
-		$(use_enable zeromq imzmq3)
-		$(use_enable zeromq omczmq)
-		$(use_enable zeromq omzmq3)
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use doc && [[ "${PV}" == "9999" ]]; then
-		einfo "Building documentation ..."
-		local doc_dir="${S}/docs"
-		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
-		sphinx-build -b html source build || die "Building documentation failed!"
-	fi
-}
-
-src_test() {
-	local _has_increased_ulimit=
-
-	# Sometimes tests aren't executable (i.e. when added via patch)
-	einfo "Adjusting permissions of test scripts ..."
-	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
-		die "Failed to adjust test scripts permission"
-
-	if ulimit -n 3072; then
-		_has_increased_ulimit="true"
-	fi
-
-	if ! emake --jobs 1 check; then
-		eerror "Test suite failed! :("
-
-		if [[ -z "${_has_increased_ulimit}" ]]; then
-			eerror "Probably because open file limit couldn't be set to 3072."
-		fi
-
-		if has userpriv ${FEATURES}; then
-			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
-				"before you submit a bug report."
-		fi
-
-	fi
-}
-
-src_install() {
-	local DOCS=(
-		AUTHORS
-		ChangeLog
-		"${FILESDIR}"/${BRANCH}/README.gentoo
-	)
-
-	use doc && local HTML_DOCS=( "${S}/docs/build/." )
-
-	default
-
-	newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN}
-	newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN}
-
-	keepdir /var/empty/dev
-	keepdir /var/spool/${PN}
-	keepdir /etc/ssl/${PN}
-	keepdir /etc/${PN}.d
-
-	insinto /etc
-	newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf
-
-	insinto /etc/rsyslog.d/
-	doins "${FILESDIR}/${BRANCH}/50-default.conf"
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN}
-
-	if use mysql; then
-		insinto /usr/share/doc/${PF}/scripts/mysql
-		doins plugins/ommysql/createDB.sql
-	fi
-
-	if use postgres; then
-		insinto /usr/share/doc/${PF}/scripts/pgsql
-		doins plugins/ompgsql/createDB.sql
-	fi
-
-	prune_libtool_files --modules
-}
-
-pkg_postinst() {
-	local advertise_readme=0
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		advertise_readme=1
-
-		if use mysql || use postgres; then
-			echo
-			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
-			elog "  /usr/share/doc/${PF}/scripts"
-		fi
-
-		if use ssl; then
-			echo
-			elog "To create a default CA and certificates for your server and clients, run:"
-			elog "  emerge --config =${PF}"
-			elog "on your logging server. You can run it several times,"
-			elog "once for each logging client. The client certificates will be signed"
-			elog "using the CA certificate generated during the first run."
-		fi
-	fi
-
-	if [[ ${advertise_readme} -gt 0 ]]; then
-		# We need to show the README file location
-
-		echo ""
-		elog "Please read"
-		elog ""
-		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
-		elog ""
-		elog "for more details."
-	fi
-}
-
-pkg_config() {
-	if ! use ssl ; then
-		einfo "There is nothing to configure for rsyslog unless you"
-		einfo "used USE=ssl to build it."
-		return 0
-	fi
-
-	# Make sure the certificates directory exists
-	local CERTDIR="${EROOT}/etc/ssl/${PN}"
-	if [[ ! -d "${CERTDIR}" ]]; then
-		mkdir "${CERTDIR}" || die
-	fi
-	einfo "Your certificates will be stored in ${CERTDIR}"
-
-	# Create a default CA if needed
-	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
-		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = Portage automated CA
-		ca
-		cert_signing_key
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-self-signed \
-			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		# Create the server certificate
-		echo
-		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
-		read -r CN
-
-		einfo "Creating private key and certificate for server ${CN}..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = ${CN}
-		tls_www_server
-		dns_name = ${CN}
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-certificate \
-			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	else
-		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
-	fi
-
-	# Create a client certificate
-	echo
-	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
-	read -r CN
-
-	einfo "Creating private key and certificate for client ${CN}..."
-	certtool --generate-privkey \
-		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
-	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-	cat > "${T}/${PF}.$$" <<- _EOF
-	cn = ${CN}
-	tls_www_client
-	dns_name = ${CN}
-	expiration_days = 3650
-	_EOF
-
-	certtool --generate-certificate \
-		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-		--template "${T}/${PF}.$$" &>/dev/null
-	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	rm -f "${T}/${PF}.$$"
-
-	echo
-	einfo "Here is the documentation on how to encrypt your log traffic:"
-	einfo " http://www.rsyslog.com/doc/rsyslog_tls.html"
-}
--- a/app-admin/rsyslog/rsyslog-8.26.0-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.26.0-r1.ebuild
@ -1,452 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools eutils linux-info systemd
-
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
-HOMEPAGE="http://www.rsyslog.com/"
-
-BRANCH="8-stable"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
-
-	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
-
-	inherit git-r3
-else
-	MY_PV=${PV%_rc*}
-	MY_FILENAME="${PN}-${PV}.tar.gz"
-	MY_FILENAME_DOCS="${PN}-docs-${PV}.tar.gz"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-
-	# Upstream URL schema:
-	# RC:      http://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz
-	#          http://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz
-	# Release: http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz
-
-	MY_URL_PREFIX=
-	if [[ ${PV} = *_rc* ]]; then
-		_tmp_last_index=$(($(get_last_version_component_index ${PV})+1))
-		_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${PV})
-		if [[ ${_tmp_suffix} = *rc* ]]; then
-			MY_URL_PREFIX="${_tmp_suffix}/"
-		fi
-
-		# Cleaning up temporary variables
-		unset _tmp_last_index
-		unset _tmp_suffix
-	else
-		KEYWORDS="amd64 ~arm ~arm64 hppa x86"
-	fi
-
-	SRC_URI="
-		http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME}
-		doc? ( http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} )
-	"
-
-	PATCHES=(
-		"${FILESDIR}"/8-stable/${PN}-8.26.0-fix-zmq3-format-security.patch
-	)
-fi
-
-LICENSE="GPL-3 LGPL-3 Apache-2.0"
-SLOT="0"
-IUSE="dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mdblookup mongodb mysql normalize omhttpfs"
-IUSE+=" omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid zeromq"
-
-RDEPEND="
-	>=dev-libs/libfastjson-0.99.3:=
-	>=dev-libs/libestr-0.1.9
-	>=dev-libs/liblogging-1.0.1:=[stdlog]
-	>=sys-libs/zlib-1.2.5
-	dbi? ( >=dev-db/libdbi-0.8.3 )
-	elasticsearch? ( >=net-misc/curl-7.35.0 )
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
-	grok? ( >=dev-libs/grok-0.9.2 )
-	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
-	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
-	kerberos? ( virtual/krb5 )
-	mdblookup? ( dev-libs/libmaxminddb:= )
-	mongodb? ( >=dev-libs/libmongo-client-0.1.4 )
-	mysql? ( virtual/mysql )
-	normalize? (
-		>=dev-libs/libee-0.4.0
-		>=dev-libs/liblognorm-2.0.3:=
-	)
-	omhttpfs? ( >=net-misc/curl-7.35.0 )
-	omudpspoof? ( >=net-libs/libnet-1.1.6 )
-	postgres? ( >=dev-db/postgresql-8.4.20:= )
-	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
-	redis? ( >=dev-libs/hiredis-0.11.0:= )
-	relp? ( >=dev-libs/librelp-1.2.12:= )
-	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
-	rfc5424hmac? (
-		!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
-	ssl? ( >=net-libs/gnutls-2.12.23:0= )
-	systemd? ( >=sys-apps/systemd-208 )
-	uuid? ( sys-apps/util-linux:0= )
-	zeromq? (
-		>=net-libs/zeromq-4.1.1:=
-		>=net-libs/czmq-3.0.0
-	)"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-archive-2015.02.24
-	virtual/pkgconfig
-	test? ( sys-libs/libfaketime )"
-
-if [[ ${PV} == "9999" ]]; then
-	DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
-	DEPEND+=" >=sys-devel/flex-2.5.39-r1"
-	DEPEND+=" >=sys-devel/bison-2.4.3"
-	DEPEND+=" >=dev-python/docutils-0.12"
-fi
-
-CONFIG_CHECK="~INOTIFY_USER"
-WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]]; then
-		git-r3_fetch
-		git-r3_checkout
-	else
-		unpack ${P}.tar.gz
-	fi
-
-	if use doc; then
-		if [[ ${PV} == "9999" ]]; then
-			local _EGIT_BRANCH=
-			if [[ -n "${EGIT_BRANCH}" ]]; then
-				# Cannot use rsyslog commits/branches for documentation repository
-				_EGIT_BRANCH=${EGIT_BRANCH}
-				unset EGIT_BRANCH
-			fi
-
-			git-r3_fetch "${DOC_REPO_URI}"
-			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
-
-			if [[ -n "${_EGIT_BRANCH}" ]]; then
-				# Restore previous EGIT_BRANCH information
-				EGIT_BRANCH=${_EGIT_BRANCH}
-			fi
-		else
-			cd "${S}" || die "Cannot change dir into '${S}'"
-			mkdir docs || die "Failed to create docs directory"
-			cd docs || die "Failed to change dir into '${S}/docs'"
-			unpack ${MY_FILENAME_DOCS}
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	# Maintainer notes:
-	# * Guardtime support is missing because libgt isn't yet available
-	#   in portage.
-	# * Hadoop's HDFS file system output module is currently not
-	#   supported in Gentoo because nobody is able to test it
-	#   (JAVA dependency).
-	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
-	#   upstream PR 129 and 136) so we need to export HIREDIS_*
-	#   variables because rsyslog's build system depends on pkg-config.
-
-	if use redis; then
-		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
-		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
-	fi
-
-	local myeconfargs=(
-		--disable-debug-symbols
-		--disable-generate-man-pages
-		--without-valgrind-testbench
-		$(use_enable test testbench)
-		# Input Plugins without depedencies
-		--enable-imdiag
-		--enable-imfile
-		--enable-impstats
-		--enable-imptcp
-		# Message Modificiation Plugins without depedencies
-		--enable-mmanon
-		--enable-mmaudit
-		--enable-mmcount
-		--enable-mmfields
-		--enable-mmjsonparse
-		--enable-mmpstrucdata
-		--enable-mmrm1stspace
-		--enable-mmsequence
-		--enable-mmutf8fix
-		# Output Modification Plugins without dependencies
-		--enable-mail
-		--enable-omprog
-		--enable-omruleset
-		--enable-omstdout
-		--enable-omuxsock
-		# Misc
-		--enable-pmaixforwardedfrom
-		--enable-pmciscoios
-		--enable-pmcisconames
-		--enable-pmlastmsg
-		--enable-pmsnare
-		# DB
-		$(use_enable dbi libdbi)
-		$(use_enable mongodb ommongodb)
-		$(use_enable mysql)
-		$(use_enable postgres pgsql)
-		$(use_enable redis omhiredis)
-		# Debug
-		$(use_enable debug)
-		$(use_enable debug diagtools)
-		$(use_enable debug memcheck)
-		$(use_enable debug rtinst)
-		$(use_enable debug valgrind)
-		# Misc
-		$(use_enable elasticsearch)
-		$(use_enable gcrypt libgcrypt)
-		$(use_enable jemalloc)
-		$(use_enable kafka omkafka)
-		$(use_enable kerberos gssapi-krb5)
-		$(use_enable normalize mmnormalize)
-		$(use_enable mdblookup mmdblookup)
-		$(use_enable grok mmgrok)
-		$(use_enable omhttpfs)
-		$(use_enable omudpspoof)
-		$(use_enable rabbitmq omrabbitmq)
-		$(use_enable relp)
-		$(use_enable rfc3195)
-		$(use_enable rfc5424hmac mmrfc5424addhmac)
-		$(use_enable snmp)
-		$(use_enable snmp mmsnmptrapd)
-		$(use_enable ssl gnutls)
-		$(use_enable systemd imjournal)
-		$(use_enable systemd omjournal)
-		$(use_enable usertools)
-		$(use_enable uuid)
-		$(use_enable zeromq imczmq)
-		$(use_enable zeromq imzmq3)
-		$(use_enable zeromq omczmq)
-		$(use_enable zeromq omzmq3)
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use doc && [[ "${PV}" == "9999" ]]; then
-		einfo "Building documentation ..."
-		local doc_dir="${S}/docs"
-		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
-		sphinx-build -b html source build || die "Building documentation failed!"
-	fi
-}
-
-src_test() {
-	local _has_increased_ulimit=
-
-	# Sometimes tests aren't executable (i.e. when added via patch)
-	einfo "Adjusting permissions of test scripts ..."
-	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
-		die "Failed to adjust test scripts permission"
-
-	if ulimit -n 3072; then
-		_has_increased_ulimit="true"
-	fi
-
-	if ! emake --jobs 1 check; then
-		eerror "Test suite failed! :("
-
-		if [[ -z "${_has_increased_ulimit}" ]]; then
-			eerror "Probably because open file limit couldn't be set to 3072."
-		fi
-
-		if has userpriv ${FEATURES}; then
-			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
-				"before you submit a bug report."
-		fi
-
-	fi
-}
-
-src_install() {
-	local DOCS=(
-		AUTHORS
-		ChangeLog
-		"${FILESDIR}"/${BRANCH}/README.gentoo
-	)
-
-	use doc && local HTML_DOCS=( "${S}/docs/build/." )
-
-	default
-
-	newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN}
-	newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN}
-
-	keepdir /var/empty/dev
-	keepdir /var/spool/${PN}
-	keepdir /etc/ssl/${PN}
-	keepdir /etc/${PN}.d
-
-	insinto /etc
-	newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf
-
-	insinto /etc/rsyslog.d/
-	doins "${FILESDIR}/${BRANCH}/50-default.conf"
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN}
-
-	if use mysql; then
-		insinto /usr/share/doc/${PF}/scripts/mysql
-		doins plugins/ommysql/createDB.sql
-	fi
-
-	if use postgres; then
-		insinto /usr/share/doc/${PF}/scripts/pgsql
-		doins plugins/ompgsql/createDB.sql
-	fi
-
-	prune_libtool_files --modules
-}
-
-pkg_postinst() {
-	local advertise_readme=0
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		advertise_readme=1
-
-		if use mysql || use postgres; then
-			echo
-			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
-			elog "  /usr/share/doc/${PF}/scripts"
-		fi
-
-		if use ssl; then
-			echo
-			elog "To create a default CA and certificates for your server and clients, run:"
-			elog "  emerge --config =${PF}"
-			elog "on your logging server. You can run it several times,"
-			elog "once for each logging client. The client certificates will be signed"
-			elog "using the CA certificate generated during the first run."
-		fi
-	fi
-
-	if [[ ${advertise_readme} -gt 0 ]]; then
-		# We need to show the README file location
-
-		echo ""
-		elog "Please read"
-		elog ""
-		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
-		elog ""
-		elog "for more details."
-	fi
-}
-
-pkg_config() {
-	if ! use ssl ; then
-		einfo "There is nothing to configure for rsyslog unless you"
-		einfo "used USE=ssl to build it."
-		return 0
-	fi
-
-	# Make sure the certificates directory exists
-	local CERTDIR="${EROOT}/etc/ssl/${PN}"
-	if [[ ! -d "${CERTDIR}" ]]; then
-		mkdir "${CERTDIR}" || die
-	fi
-	einfo "Your certificates will be stored in ${CERTDIR}"
-
-	# Create a default CA if needed
-	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
-		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = Portage automated CA
-		ca
-		cert_signing_key
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-self-signed \
-			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		# Create the server certificate
-		echo
-		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
-		read -r CN
-
-		einfo "Creating private key and certificate for server ${CN}..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = ${CN}
-		tls_www_server
-		dns_name = ${CN}
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-certificate \
-			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	else
-		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
-	fi
-
-	# Create a client certificate
-	echo
-	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
-	read -r CN
-
-	einfo "Creating private key and certificate for client ${CN}..."
-	certtool --generate-privkey \
-		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
-	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-	cat > "${T}/${PF}.$$" <<- _EOF
-	cn = ${CN}
-	tls_www_client
-	dns_name = ${CN}
-	expiration_days = 3650
-	_EOF
-
-	certtool --generate-certificate \
-		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-		--template "${T}/${PF}.$$" &>/dev/null
-	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	rm -f "${T}/${PF}.$$"
-
-	echo
-	einfo "Here is the documentation on how to encrypt your log traffic:"
-	einfo " http://www.rsyslog.com/doc/rsyslog_tls.html"
-}
--- a/app-admin/rsyslog/rsyslog-8.27.0-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.27.0-r1.ebuild
@ -1,456 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools eutils linux-info systemd
-
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
-HOMEPAGE="http://www.rsyslog.com/"
-
-BRANCH="8-stable"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
-
-	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
-
-	inherit git-r3
-else
-	MY_PV=${PV%_rc*}
-	MY_FILENAME="${PN}-${PV}.tar.gz"
-	MY_FILENAME_DOCS="${PN}-docs-${PV}.tar.gz"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-
-	# Upstream URL schema:
-	# RC:      http://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz
-	#          http://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz
-	# Release: http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz
-
-	MY_URL_PREFIX=
-	if [[ ${PV} = *_rc* ]]; then
-		_tmp_last_index=$(($(get_last_version_component_index ${PV})+1))
-		_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${PV})
-		if [[ ${_tmp_suffix} = *rc* ]]; then
-			MY_URL_PREFIX="${_tmp_suffix}/"
-		fi
-
-		# Cleaning up temporary variables
-		unset _tmp_last_index
-		unset _tmp_suffix
-	else
-		KEYWORDS="amd64 ~arm ~arm64 ~hppa x86"
-	fi
-
-	SRC_URI="
-		http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME}
-		doc? ( http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} )
-	"
-
-	PATCHES=(
-		"${FILESDIR}"/8-stable/${PN}-8.26.0-fix-zmq3-format-security.patch
-		"${FILESDIR}"/8-stable/${PN}-8.27.0-fix-librdkafka-detection.patch
-		"${FILESDIR}"/8-stable/${PN}-8.27.0-fix-hostname-detection-when-getaddrinfo-fails.patch
-		"${FILESDIR}"/8-stable/${PN}-8.27.0-fix-mmnormalize-tests.patch
-	)
-fi
-
-LICENSE="GPL-3 LGPL-3 Apache-2.0"
-SLOT="0"
-IUSE="dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mdblookup mongodb mysql normalize omhttpfs"
-IUSE+=" omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid zeromq"
-
-RDEPEND="
-	>=dev-libs/libfastjson-0.99.3:=
-	>=dev-libs/libestr-0.1.9
-	>=dev-libs/liblogging-1.0.1:=[stdlog]
-	>=sys-libs/zlib-1.2.5
-	dbi? ( >=dev-db/libdbi-0.8.3 )
-	elasticsearch? ( >=net-misc/curl-7.35.0 )
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
-	grok? ( >=dev-libs/grok-0.9.2 )
-	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
-	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
-	kerberos? ( virtual/krb5 )
-	mdblookup? ( dev-libs/libmaxminddb:= )
-	mongodb? ( >=dev-libs/libmongo-client-0.1.4 )
-	mysql? ( virtual/mysql )
-	normalize? (
-		>=dev-libs/libee-0.4.0
-		>=dev-libs/liblognorm-2.0.3:=
-	)
-	omhttpfs? ( >=net-misc/curl-7.35.0 )
-	omudpspoof? ( >=net-libs/libnet-1.1.6 )
-	postgres? ( >=dev-db/postgresql-8.4.20:= )
-	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
-	redis? ( >=dev-libs/hiredis-0.11.0:= )
-	relp? ( >=dev-libs/librelp-1.2.12:= )
-	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
-	rfc5424hmac? (
-		!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
-	ssl? ( >=net-libs/gnutls-2.12.23:0= )
-	systemd? ( >=sys-apps/systemd-208 )
-	uuid? ( sys-apps/util-linux:0= )
-	zeromq? (
-		>=net-libs/zeromq-4.1.1:=
-		>=net-libs/czmq-3.0.0
-	)"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-archive-2015.02.24
-	virtual/pkgconfig
-	test? ( sys-libs/libfaketime )"
-
-if [[ ${PV} == "9999" ]]; then
-	DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
-	DEPEND+=" >=sys-devel/flex-2.5.39-r1"
-	DEPEND+=" >=sys-devel/bison-2.4.3"
-	DEPEND+=" >=dev-python/docutils-0.12"
-fi
-
-CONFIG_CHECK="~INOTIFY_USER"
-WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]]; then
-		git-r3_fetch
-		git-r3_checkout
-	else
-		unpack ${P}.tar.gz
-	fi
-
-	if use doc; then
-		if [[ ${PV} == "9999" ]]; then
-			local _EGIT_BRANCH=
-			if [[ -n "${EGIT_BRANCH}" ]]; then
-				# Cannot use rsyslog commits/branches for documentation repository
-				_EGIT_BRANCH=${EGIT_BRANCH}
-				unset EGIT_BRANCH
-			fi
-
-			git-r3_fetch "${DOC_REPO_URI}"
-			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
-
-			if [[ -n "${_EGIT_BRANCH}" ]]; then
-				# Restore previous EGIT_BRANCH information
-				EGIT_BRANCH=${_EGIT_BRANCH}
-			fi
-		else
-			cd "${S}" || die "Cannot change dir into '${S}'"
-			mkdir docs || die "Failed to create docs directory"
-			cd docs || die "Failed to change dir into '${S}/docs'"
-			unpack ${MY_FILENAME_DOCS}
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	# Maintainer notes:
-	# * Guardtime support is missing because libgt isn't yet available
-	#   in portage.
-	# * Hadoop's HDFS file system output module is currently not
-	#   supported in Gentoo because nobody is able to test it
-	#   (JAVA dependency).
-	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
-	#   upstream PR 129 and 136) so we need to export HIREDIS_*
-	#   variables because rsyslog's build system depends on pkg-config.
-
-	if use redis; then
-		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
-		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
-	fi
-
-	local myeconfargs=(
-		--disable-debug-symbols
-		--disable-generate-man-pages
-		--without-valgrind-testbench
-		$(use_enable test testbench)
-		# Input Plugins without depedencies
-		--enable-imdiag
-		--enable-imfile
-		--enable-impstats
-		--enable-imptcp
-		# Message Modificiation Plugins without depedencies
-		--enable-mmanon
-		--enable-mmaudit
-		--enable-mmcount
-		--enable-mmfields
-		--enable-mmjsonparse
-		--enable-mmpstrucdata
-		--enable-mmrm1stspace
-		--enable-mmsequence
-		--enable-mmutf8fix
-		# Output Modification Plugins without dependencies
-		--enable-mail
-		--enable-omprog
-		--enable-omruleset
-		--enable-omstdout
-		--enable-omuxsock
-		# Misc
-		--enable-pmaixforwardedfrom
-		--enable-pmciscoios
-		--enable-pmcisconames
-		--enable-pmlastmsg
-		--enable-pmsnare
-		# DB
-		$(use_enable dbi libdbi)
-		$(use_enable mongodb ommongodb)
-		$(use_enable mysql)
-		$(use_enable postgres pgsql)
-		$(use_enable redis omhiredis)
-		# Debug
-		$(use_enable debug)
-		$(use_enable debug diagtools)
-		$(use_enable debug memcheck)
-		$(use_enable debug rtinst)
-		$(use_enable debug valgrind)
-		# Misc
-		$(use_enable elasticsearch)
-		$(use_enable gcrypt libgcrypt)
-		$(use_enable jemalloc)
-		$(use_enable kafka imkafka)
-		$(use_enable kafka omkafka)
-		$(use_enable kerberos gssapi-krb5)
-		$(use_enable normalize mmnormalize)
-		$(use_enable mdblookup mmdblookup)
-		$(use_enable grok mmgrok)
-		$(use_enable omhttpfs)
-		$(use_enable omudpspoof)
-		$(use_enable rabbitmq omrabbitmq)
-		$(use_enable relp)
-		$(use_enable rfc3195)
-		$(use_enable rfc5424hmac mmrfc5424addhmac)
-		$(use_enable snmp)
-		$(use_enable snmp mmsnmptrapd)
-		$(use_enable ssl gnutls)
-		$(use_enable systemd imjournal)
-		$(use_enable systemd omjournal)
-		$(use_enable usertools)
-		$(use_enable uuid)
-		$(use_enable zeromq imczmq)
-		$(use_enable zeromq imzmq3)
-		$(use_enable zeromq omczmq)
-		$(use_enable zeromq omzmq3)
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use doc && [[ "${PV}" == "9999" ]]; then
-		einfo "Building documentation ..."
-		local doc_dir="${S}/docs"
-		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
-		sphinx-build -b html source build || die "Building documentation failed!"
-	fi
-}
-
-src_test() {
-	local _has_increased_ulimit=
-
-	# Sometimes tests aren't executable (i.e. when added via patch)
-	einfo "Adjusting permissions of test scripts ..."
-	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
-		die "Failed to adjust test scripts permission"
-
-	if ulimit -n 3072; then
-		_has_increased_ulimit="true"
-	fi
-
-	if ! emake --jobs 1 check; then
-		eerror "Test suite failed! :("
-
-		if [[ -z "${_has_increased_ulimit}" ]]; then
-			eerror "Probably because open file limit couldn't be set to 3072."
-		fi
-
-		if has userpriv ${FEATURES}; then
-			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
-				"before you submit a bug report."
-		fi
-
-	fi
-}
-
-src_install() {
-	local DOCS=(
-		AUTHORS
-		ChangeLog
-		"${FILESDIR}"/${BRANCH}/README.gentoo
-	)
-
-	use doc && local HTML_DOCS=( "${S}/docs/build/." )
-
-	default
-
-	newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN}
-	newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN}
-
-	keepdir /var/empty/dev
-	keepdir /var/spool/${PN}
-	keepdir /etc/ssl/${PN}
-	keepdir /etc/${PN}.d
-
-	insinto /etc
-	newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf
-
-	insinto /etc/rsyslog.d/
-	doins "${FILESDIR}/${BRANCH}/50-default.conf"
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN}
-
-	if use mysql; then
-		insinto /usr/share/doc/${PF}/scripts/mysql
-		doins plugins/ommysql/createDB.sql
-	fi
-
-	if use postgres; then
-		insinto /usr/share/doc/${PF}/scripts/pgsql
-		doins plugins/ompgsql/createDB.sql
-	fi
-
-	prune_libtool_files --modules
-}
-
-pkg_postinst() {
-	local advertise_readme=0
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		advertise_readme=1
-
-		if use mysql || use postgres; then
-			echo
-			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
-			elog "  /usr/share/doc/${PF}/scripts"
-		fi
-
-		if use ssl; then
-			echo
-			elog "To create a default CA and certificates for your server and clients, run:"
-			elog "  emerge --config =${PF}"
-			elog "on your logging server. You can run it several times,"
-			elog "once for each logging client. The client certificates will be signed"
-			elog "using the CA certificate generated during the first run."
-		fi
-	fi
-
-	if [[ ${advertise_readme} -gt 0 ]]; then
-		# We need to show the README file location
-
-		echo ""
-		elog "Please read"
-		elog ""
-		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
-		elog ""
-		elog "for more details."
-	fi
-}
-
-pkg_config() {
-	if ! use ssl ; then
-		einfo "There is nothing to configure for rsyslog unless you"
-		einfo "used USE=ssl to build it."
-		return 0
-	fi
-
-	# Make sure the certificates directory exists
-	local CERTDIR="${EROOT}/etc/ssl/${PN}"
-	if [[ ! -d "${CERTDIR}" ]]; then
-		mkdir "${CERTDIR}" || die
-	fi
-	einfo "Your certificates will be stored in ${CERTDIR}"
-
-	# Create a default CA if needed
-	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
-		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = Portage automated CA
-		ca
-		cert_signing_key
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-self-signed \
-			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		# Create the server certificate
-		echo
-		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
-		read -r CN
-
-		einfo "Creating private key and certificate for server ${CN}..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = ${CN}
-		tls_www_server
-		dns_name = ${CN}
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-certificate \
-			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	else
-		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
-	fi
-
-	# Create a client certificate
-	echo
-	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
-	read -r CN
-
-	einfo "Creating private key and certificate for client ${CN}..."
-	certtool --generate-privkey \
-		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
-	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-	cat > "${T}/${PF}.$$" <<- _EOF
-	cn = ${CN}
-	tls_www_client
-	dns_name = ${CN}
-	expiration_days = 3650
-	_EOF
-
-	certtool --generate-certificate \
-		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-		--template "${T}/${PF}.$$" &>/dev/null
-	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	rm -f "${T}/${PF}.$$"
-
-	echo
-	einfo "Here is the documentation on how to encrypt your log traffic:"
-	einfo " http://www.rsyslog.com/doc/rsyslog_tls.html"
-}
--- a/app-admin/rsyslog/rsyslog-8.28.0-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.28.0-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI="6"
@ -6,7 +6,7 @@ EAPI="6"
 inherit autotools eutils linux-info systemd

 DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
-HOMEPAGE="http://www.rsyslog.com/"
+HOMEPAGE="https://www.rsyslog.com/"

 BRANCH="8-stable"

@ -39,12 +39,12 @@ else
 		unset _tmp_last_index
 		unset _tmp_suffix
 	else
-		KEYWORDS="amd64 ~arm ~arm64 hppa x86"
+		KEYWORDS="hppa"
 	fi

 	SRC_URI="
-		http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME}
-		doc? ( http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} )
+		https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME}
+		doc? ( https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} )
 	"

 	PATCHES=( "${FILESDIR}"/8-stable/${PN}-8.27.0-fix-mmnormalize-tests.patch )
@ -69,7 +69,7 @@ RDEPEND="
 	kerberos? ( virtual/krb5 )
 	mdblookup? ( dev-libs/libmaxminddb:= )
 	mongodb? ( >=dev-libs/libmongo-client-0.1.4 )
-	mysql? ( virtual/mysql )
+	mysql? ( virtual/libmysqlclient:= )
 	normalize? (
 		>=dev-libs/libee-0.4.0
 		>=dev-libs/liblognorm-2.0.3:=
--- a/app-admin/rsyslog/rsyslog-8.29.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.29.0.ebuild
@ -1,451 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools eutils linux-info systemd
-
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
-HOMEPAGE="http://www.rsyslog.com/"
-
-BRANCH="8-stable"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
-
-	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
-
-	inherit git-r3
-else
-	MY_PV=${PV%_rc*}
-	MY_FILENAME="${PN}-${PV}.tar.gz"
-	MY_FILENAME_DOCS="${PN}-docs-${PV}.tar.gz"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-
-	# Upstream URL schema:
-	# RC:      http://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz
-	#          http://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz
-	# Release: http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz
-
-	MY_URL_PREFIX=
-	if [[ ${PV} = *_rc* ]]; then
-		_tmp_last_index=$(($(get_last_version_component_index ${PV})+1))
-		_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${PV})
-		if [[ ${_tmp_suffix} = *rc* ]]; then
-			MY_URL_PREFIX="${_tmp_suffix}/"
-		fi
-
-		# Cleaning up temporary variables
-		unset _tmp_last_index
-		unset _tmp_suffix
-	else
-		KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
-	fi
-
-	SRC_URI="
-		http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME}
-		doc? ( http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} )
-	"
-
-	PATCHES=( "${FILESDIR}"/8-stable/${PN}-8.27.0-fix-mmnormalize-tests.patch )
-fi
-
-LICENSE="GPL-3 LGPL-3 Apache-2.0"
-SLOT="0"
-IUSE="dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mdblookup mongodb mysql normalize omhttpfs"
-IUSE+=" omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid zeromq"
-
-RDEPEND="
-	>=dev-libs/libfastjson-0.99.3:=
-	>=dev-libs/libestr-0.1.9
-	>=dev-libs/liblogging-1.0.1:=[stdlog]
-	>=sys-libs/zlib-1.2.5
-	dbi? ( >=dev-db/libdbi-0.8.3 )
-	elasticsearch? ( >=net-misc/curl-7.35.0 )
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
-	grok? ( >=dev-libs/grok-0.9.2 )
-	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
-	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
-	kerberos? ( virtual/krb5 )
-	mdblookup? ( dev-libs/libmaxminddb:= )
-	mongodb? ( >=dev-libs/libmongo-client-0.1.4 )
-	mysql? ( virtual/mysql )
-	normalize? (
-		>=dev-libs/libee-0.4.0
-		>=dev-libs/liblognorm-2.0.3:=
-	)
-	omhttpfs? ( >=net-misc/curl-7.35.0 )
-	omudpspoof? ( >=net-libs/libnet-1.1.6 )
-	postgres? ( >=dev-db/postgresql-8.4.20:= )
-	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
-	redis? ( >=dev-libs/hiredis-0.11.0:= )
-	relp? ( >=dev-libs/librelp-1.2.14:= )
-	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
-	rfc5424hmac? (
-		!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
-	ssl? ( >=net-libs/gnutls-2.12.23:0= )
-	systemd? ( >=sys-apps/systemd-208 )
-	uuid? ( sys-apps/util-linux:0= )
-	zeromq? (
-		>=net-libs/zeromq-4.1.1:=
-		>=net-libs/czmq-3.0.0
-	)"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-archive-2015.02.24
-	virtual/pkgconfig
-	test? ( sys-libs/libfaketime )"
-
-if [[ ${PV} == "9999" ]]; then
-	DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
-	DEPEND+=" >=sys-devel/flex-2.5.39-r1"
-	DEPEND+=" >=sys-devel/bison-2.4.3"
-	DEPEND+=" >=dev-python/docutils-0.12"
-fi
-
-CONFIG_CHECK="~INOTIFY_USER"
-WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]]; then
-		git-r3_fetch
-		git-r3_checkout
-	else
-		unpack ${P}.tar.gz
-	fi
-
-	if use doc; then
-		if [[ ${PV} == "9999" ]]; then
-			local _EGIT_BRANCH=
-			if [[ -n "${EGIT_BRANCH}" ]]; then
-				# Cannot use rsyslog commits/branches for documentation repository
-				_EGIT_BRANCH=${EGIT_BRANCH}
-				unset EGIT_BRANCH
-			fi
-
-			git-r3_fetch "${DOC_REPO_URI}"
-			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
-
-			if [[ -n "${_EGIT_BRANCH}" ]]; then
-				# Restore previous EGIT_BRANCH information
-				EGIT_BRANCH=${_EGIT_BRANCH}
-			fi
-		else
-			cd "${S}" || die "Cannot change dir into '${S}'"
-			mkdir docs || die "Failed to create docs directory"
-			cd docs || die "Failed to change dir into '${S}/docs'"
-			unpack ${MY_FILENAME_DOCS}
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	# Maintainer notes:
-	# * Guardtime support is missing because libgt isn't yet available
-	#   in portage.
-	# * Hadoop's HDFS file system output module is currently not
-	#   supported in Gentoo because nobody is able to test it
-	#   (JAVA dependency).
-	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
-	#   upstream PR 129 and 136) so we need to export HIREDIS_*
-	#   variables because rsyslog's build system depends on pkg-config.
-
-	if use redis; then
-		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
-		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
-	fi
-
-	local myeconfargs=(
-		--disable-debug-symbols
-		--disable-generate-man-pages
-		--without-valgrind-testbench
-		$(use_enable test testbench)
-		# Input Plugins without depedencies
-		--enable-imdiag
-		--enable-imfile
-		--enable-impstats
-		--enable-imptcp
-		# Message Modificiation Plugins without depedencies
-		--enable-mmanon
-		--enable-mmaudit
-		--enable-mmcount
-		--enable-mmfields
-		--enable-mmjsonparse
-		--enable-mmpstrucdata
-		--enable-mmrm1stspace
-		--enable-mmsequence
-		--enable-mmutf8fix
-		# Output Modification Plugins without dependencies
-		--enable-mail
-		--enable-omprog
-		--enable-omruleset
-		--enable-omstdout
-		--enable-omuxsock
-		# Misc
-		--enable-pmaixforwardedfrom
-		--enable-pmciscoios
-		--enable-pmcisconames
-		--enable-pmlastmsg
-		--enable-pmsnare
-		# DB
-		$(use_enable dbi libdbi)
-		$(use_enable mongodb ommongodb)
-		$(use_enable mysql)
-		$(use_enable postgres pgsql)
-		$(use_enable redis omhiredis)
-		# Debug
-		$(use_enable debug)
-		$(use_enable debug diagtools)
-		$(use_enable debug memcheck)
-		$(use_enable debug rtinst)
-		$(use_enable debug valgrind)
-		# Misc
-		$(use_enable elasticsearch)
-		$(use_enable gcrypt libgcrypt)
-		$(use_enable jemalloc)
-		$(use_enable kafka imkafka)
-		$(use_enable kafka omkafka)
-		$(use_enable kerberos gssapi-krb5)
-		$(use_enable normalize mmnormalize)
-		$(use_enable mdblookup mmdblookup)
-		$(use_enable grok mmgrok)
-		$(use_enable omhttpfs)
-		$(use_enable omudpspoof)
-		$(use_enable rabbitmq omrabbitmq)
-		$(use_enable relp)
-		$(use_enable rfc3195)
-		$(use_enable rfc5424hmac mmrfc5424addhmac)
-		$(use_enable snmp)
-		$(use_enable snmp mmsnmptrapd)
-		$(use_enable ssl gnutls)
-		$(use_enable systemd imjournal)
-		$(use_enable systemd omjournal)
-		$(use_enable usertools)
-		$(use_enable uuid)
-		$(use_enable zeromq imczmq)
-		$(use_enable zeromq imzmq3)
-		$(use_enable zeromq omczmq)
-		$(use_enable zeromq omzmq3)
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use doc && [[ "${PV}" == "9999" ]]; then
-		einfo "Building documentation ..."
-		local doc_dir="${S}/docs"
-		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
-		sphinx-build -b html source build || die "Building documentation failed!"
-	fi
-}
-
-src_test() {
-	local _has_increased_ulimit=
-
-	# Sometimes tests aren't executable (i.e. when added via patch)
-	einfo "Adjusting permissions of test scripts ..."
-	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
-		die "Failed to adjust test scripts permission"
-
-	if ulimit -n 3072; then
-		_has_increased_ulimit="true"
-	fi
-
-	if ! emake --jobs 1 check; then
-		eerror "Test suite failed! :("
-
-		if [[ -z "${_has_increased_ulimit}" ]]; then
-			eerror "Probably because open file limit couldn't be set to 3072."
-		fi
-
-		if has userpriv ${FEATURES}; then
-			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
-				"before you submit a bug report."
-		fi
-
-	fi
-}
-
-src_install() {
-	local DOCS=(
-		AUTHORS
-		ChangeLog
-		"${FILESDIR}"/${BRANCH}/README.gentoo
-	)
-
-	use doc && local HTML_DOCS=( "${S}/docs/build/." )
-
-	default
-
-	newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN}
-	newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN}
-
-	keepdir /var/empty/dev
-	keepdir /var/spool/${PN}
-	keepdir /etc/ssl/${PN}
-	keepdir /etc/${PN}.d
-
-	insinto /etc
-	newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf
-
-	insinto /etc/rsyslog.d/
-	newins "${FILESDIR}/${BRANCH}/50-default-r1.conf" 50-default.conf
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN}
-
-	if use mysql; then
-		insinto /usr/share/doc/${PF}/scripts/mysql
-		doins plugins/ommysql/createDB.sql
-	fi
-
-	if use postgres; then
-		insinto /usr/share/doc/${PF}/scripts/pgsql
-		doins plugins/ompgsql/createDB.sql
-	fi
-
-	prune_libtool_files --modules
-}
-
-pkg_postinst() {
-	local advertise_readme=0
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		advertise_readme=1
-
-		if use mysql || use postgres; then
-			echo
-			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
-			elog "  /usr/share/doc/${PF}/scripts"
-		fi
-
-		if use ssl; then
-			echo
-			elog "To create a default CA and certificates for your server and clients, run:"
-			elog "  emerge --config =${PF}"
-			elog "on your logging server. You can run it several times,"
-			elog "once for each logging client. The client certificates will be signed"
-			elog "using the CA certificate generated during the first run."
-		fi
-	fi
-
-	if [[ ${advertise_readme} -gt 0 ]]; then
-		# We need to show the README file location
-
-		echo ""
-		elog "Please read"
-		elog ""
-		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
-		elog ""
-		elog "for more details."
-	fi
-}
-
-pkg_config() {
-	if ! use ssl ; then
-		einfo "There is nothing to configure for rsyslog unless you"
-		einfo "used USE=ssl to build it."
-		return 0
-	fi
-
-	# Make sure the certificates directory exists
-	local CERTDIR="${EROOT}/etc/ssl/${PN}"
-	if [[ ! -d "${CERTDIR}" ]]; then
-		mkdir "${CERTDIR}" || die
-	fi
-	einfo "Your certificates will be stored in ${CERTDIR}"
-
-	# Create a default CA if needed
-	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
-		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = Portage automated CA
-		ca
-		cert_signing_key
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-self-signed \
-			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		# Create the server certificate
-		echo
-		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
-		read -r CN
-
-		einfo "Creating private key and certificate for server ${CN}..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = ${CN}
-		tls_www_server
-		dns_name = ${CN}
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-certificate \
-			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	else
-		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
-	fi
-
-	# Create a client certificate
-	echo
-	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
-	read -r CN
-
-	einfo "Creating private key and certificate for client ${CN}..."
-	certtool --generate-privkey \
-		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
-	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-	cat > "${T}/${PF}.$$" <<- _EOF
-	cn = ${CN}
-	tls_www_client
-	dns_name = ${CN}
-	expiration_days = 3650
-	_EOF
-
-	certtool --generate-certificate \
-		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-		--template "${T}/${PF}.$$" &>/dev/null
-	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	rm -f "${T}/${PF}.$$"
-
-	echo
-	einfo "Here is the documentation on how to encrypt your log traffic:"
-	einfo " http://www.rsyslog.com/doc/rsyslog_tls.html"
-}
--- a/app-admin/rsyslog/rsyslog-8.30.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.30.0.ebuild
@ -1,451 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools eutils linux-info systemd
-
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
-HOMEPAGE="http://www.rsyslog.com/"
-
-BRANCH="8-stable"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
-
-	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
-
-	inherit git-r3
-else
-	MY_PV=${PV%_rc*}
-	MY_FILENAME="${PN}-${PV}.tar.gz"
-	MY_FILENAME_DOCS="${PN}-docs-${PV}.tar.gz"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-
-	# Upstream URL schema:
-	# RC:      http://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz
-	#          http://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz
-	# Release: http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz
-
-	MY_URL_PREFIX=
-	if [[ ${PV} = *_rc* ]]; then
-		_tmp_last_index=$(($(get_last_version_component_index ${PV})+1))
-		_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${PV})
-		if [[ ${_tmp_suffix} = *rc* ]]; then
-			MY_URL_PREFIX="${_tmp_suffix}/"
-		fi
-
-		# Cleaning up temporary variables
-		unset _tmp_last_index
-		unset _tmp_suffix
-	else
-		KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
-	fi
-
-	SRC_URI="
-		http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME}
-		doc? ( http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} )
-	"
-
-	PATCHES=( "${FILESDIR}"/8-stable/${PN}-8.30.0-fix-kerberos.patch )
-fi
-
-LICENSE="GPL-3 LGPL-3 Apache-2.0"
-SLOT="0"
-IUSE="dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mdblookup mongodb mysql normalize omhttpfs"
-IUSE+=" omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid zeromq"
-
-RDEPEND="
-	>=dev-libs/libfastjson-0.99.7:=
-	>=dev-libs/libestr-0.1.9
-	>=dev-libs/liblogging-1.0.1:=[stdlog]
-	>=sys-libs/zlib-1.2.5
-	dbi? ( >=dev-db/libdbi-0.8.3 )
-	elasticsearch? ( >=net-misc/curl-7.35.0 )
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
-	grok? ( >=dev-libs/grok-0.9.2 )
-	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
-	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
-	kerberos? ( virtual/krb5 )
-	mdblookup? ( dev-libs/libmaxminddb:= )
-	mongodb? ( >=dev-libs/libmongo-client-0.1.4 )
-	mysql? ( virtual/mysql )
-	normalize? (
-		>=dev-libs/libee-0.4.0
-		>=dev-libs/liblognorm-2.0.3:=
-	)
-	omhttpfs? ( >=net-misc/curl-7.35.0 )
-	omudpspoof? ( >=net-libs/libnet-1.1.6 )
-	postgres? ( >=dev-db/postgresql-8.4.20:= )
-	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
-	redis? ( >=dev-libs/hiredis-0.11.0:= )
-	relp? ( >=dev-libs/librelp-1.2.14:= )
-	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
-	rfc5424hmac? (
-		!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
-	ssl? ( >=net-libs/gnutls-2.12.23:0= )
-	systemd? ( >=sys-apps/systemd-234 )
-	uuid? ( sys-apps/util-linux:0= )
-	zeromq? (
-		>=net-libs/zeromq-4.1.1:=
-		>=net-libs/czmq-3.0.0
-	)"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-archive-2015.02.24
-	virtual/pkgconfig
-	test? ( sys-libs/libfaketime )"
-
-if [[ ${PV} == "9999" ]]; then
-	DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
-	DEPEND+=" >=sys-devel/flex-2.5.39-r1"
-	DEPEND+=" >=sys-devel/bison-2.4.3"
-	DEPEND+=" >=dev-python/docutils-0.12"
-fi
-
-CONFIG_CHECK="~INOTIFY_USER"
-WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]]; then
-		git-r3_fetch
-		git-r3_checkout
-	else
-		unpack ${P}.tar.gz
-	fi
-
-	if use doc; then
-		if [[ ${PV} == "9999" ]]; then
-			local _EGIT_BRANCH=
-			if [[ -n "${EGIT_BRANCH}" ]]; then
-				# Cannot use rsyslog commits/branches for documentation repository
-				_EGIT_BRANCH=${EGIT_BRANCH}
-				unset EGIT_BRANCH
-			fi
-
-			git-r3_fetch "${DOC_REPO_URI}"
-			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
-
-			if [[ -n "${_EGIT_BRANCH}" ]]; then
-				# Restore previous EGIT_BRANCH information
-				EGIT_BRANCH=${_EGIT_BRANCH}
-			fi
-		else
-			cd "${S}" || die "Cannot change dir into '${S}'"
-			mkdir docs || die "Failed to create docs directory"
-			cd docs || die "Failed to change dir into '${S}/docs'"
-			unpack ${MY_FILENAME_DOCS}
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	# Maintainer notes:
-	# * Guardtime support is missing because libgt isn't yet available
-	#   in portage.
-	# * Hadoop's HDFS file system output module is currently not
-	#   supported in Gentoo because nobody is able to test it
-	#   (JAVA dependency).
-	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
-	#   upstream PR 129 and 136) so we need to export HIREDIS_*
-	#   variables because rsyslog's build system depends on pkg-config.
-
-	if use redis; then
-		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
-		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
-	fi
-
-	local myeconfargs=(
-		--disable-debug-symbols
-		--disable-generate-man-pages
-		--without-valgrind-testbench
-		$(use_enable test testbench)
-		# Input Plugins without depedencies
-		--enable-imdiag
-		--enable-imfile
-		--enable-impstats
-		--enable-imptcp
-		# Message Modificiation Plugins without depedencies
-		--enable-mmanon
-		--enable-mmaudit
-		--enable-mmcount
-		--enable-mmfields
-		--enable-mmjsonparse
-		--enable-mmpstrucdata
-		--enable-mmrm1stspace
-		--enable-mmsequence
-		--enable-mmutf8fix
-		# Output Modification Plugins without dependencies
-		--enable-mail
-		--enable-omprog
-		--enable-omruleset
-		--enable-omstdout
-		--enable-omuxsock
-		# Misc
-		--enable-pmaixforwardedfrom
-		--enable-pmciscoios
-		--enable-pmcisconames
-		--enable-pmlastmsg
-		--enable-pmsnare
-		# DB
-		$(use_enable dbi libdbi)
-		$(use_enable mongodb ommongodb)
-		$(use_enable mysql)
-		$(use_enable postgres pgsql)
-		$(use_enable redis omhiredis)
-		# Debug
-		$(use_enable debug)
-		$(use_enable debug diagtools)
-		$(use_enable debug memcheck)
-		$(use_enable debug rtinst)
-		$(use_enable debug valgrind)
-		# Misc
-		$(use_enable elasticsearch)
-		$(use_enable gcrypt libgcrypt)
-		$(use_enable jemalloc)
-		$(use_enable kafka imkafka)
-		$(use_enable kafka omkafka)
-		$(use_enable kerberos gssapi-krb5)
-		$(use_enable normalize mmnormalize)
-		$(use_enable mdblookup mmdblookup)
-		$(use_enable grok mmgrok)
-		$(use_enable omhttpfs)
-		$(use_enable omudpspoof)
-		$(use_enable rabbitmq omrabbitmq)
-		$(use_enable relp)
-		$(use_enable rfc3195)
-		$(use_enable rfc5424hmac mmrfc5424addhmac)
-		$(use_enable snmp)
-		$(use_enable snmp mmsnmptrapd)
-		$(use_enable ssl gnutls)
-		$(use_enable systemd imjournal)
-		$(use_enable systemd omjournal)
-		$(use_enable usertools)
-		$(use_enable uuid)
-		$(use_enable zeromq imczmq)
-		$(use_enable zeromq imzmq3)
-		$(use_enable zeromq omczmq)
-		$(use_enable zeromq omzmq3)
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use doc && [[ "${PV}" == "9999" ]]; then
-		einfo "Building documentation ..."
-		local doc_dir="${S}/docs"
-		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
-		sphinx-build -b html source build || die "Building documentation failed!"
-	fi
-}
-
-src_test() {
-	local _has_increased_ulimit=
-
-	# Sometimes tests aren't executable (i.e. when added via patch)
-	einfo "Adjusting permissions of test scripts ..."
-	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
-		die "Failed to adjust test scripts permission"
-
-	if ulimit -n 3072; then
-		_has_increased_ulimit="true"
-	fi
-
-	if ! emake --jobs 1 check; then
-		eerror "Test suite failed! :("
-
-		if [[ -z "${_has_increased_ulimit}" ]]; then
-			eerror "Probably because open file limit couldn't be set to 3072."
-		fi
-
-		if has userpriv ${FEATURES}; then
-			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
-				"before you submit a bug report."
-		fi
-
-	fi
-}
-
-src_install() {
-	local DOCS=(
-		AUTHORS
-		ChangeLog
-		"${FILESDIR}"/${BRANCH}/README.gentoo
-	)
-
-	use doc && local HTML_DOCS=( "${S}/docs/build/." )
-
-	default
-
-	newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN}
-	newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN}
-
-	keepdir /var/empty/dev
-	keepdir /var/spool/${PN}
-	keepdir /etc/ssl/${PN}
-	keepdir /etc/${PN}.d
-
-	insinto /etc
-	newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf
-
-	insinto /etc/rsyslog.d/
-	newins "${FILESDIR}/${BRANCH}/50-default-r1.conf" 50-default.conf
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN}
-
-	if use mysql; then
-		insinto /usr/share/doc/${PF}/scripts/mysql
-		doins plugins/ommysql/createDB.sql
-	fi
-
-	if use postgres; then
-		insinto /usr/share/doc/${PF}/scripts/pgsql
-		doins plugins/ompgsql/createDB.sql
-	fi
-
-	prune_libtool_files --modules
-}
-
-pkg_postinst() {
-	local advertise_readme=0
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		advertise_readme=1
-
-		if use mysql || use postgres; then
-			echo
-			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
-			elog "  /usr/share/doc/${PF}/scripts"
-		fi
-
-		if use ssl; then
-			echo
-			elog "To create a default CA and certificates for your server and clients, run:"
-			elog "  emerge --config =${PF}"
-			elog "on your logging server. You can run it several times,"
-			elog "once for each logging client. The client certificates will be signed"
-			elog "using the CA certificate generated during the first run."
-		fi
-	fi
-
-	if [[ ${advertise_readme} -gt 0 ]]; then
-		# We need to show the README file location
-
-		echo ""
-		elog "Please read"
-		elog ""
-		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
-		elog ""
-		elog "for more details."
-	fi
-}
-
-pkg_config() {
-	if ! use ssl ; then
-		einfo "There is nothing to configure for rsyslog unless you"
-		einfo "used USE=ssl to build it."
-		return 0
-	fi
-
-	# Make sure the certificates directory exists
-	local CERTDIR="${EROOT}/etc/ssl/${PN}"
-	if [[ ! -d "${CERTDIR}" ]]; then
-		mkdir "${CERTDIR}" || die
-	fi
-	einfo "Your certificates will be stored in ${CERTDIR}"
-
-	# Create a default CA if needed
-	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
-		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = Portage automated CA
-		ca
-		cert_signing_key
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-self-signed \
-			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		# Create the server certificate
-		echo
-		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
-		read -r CN
-
-		einfo "Creating private key and certificate for server ${CN}..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = ${CN}
-		tls_www_server
-		dns_name = ${CN}
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-certificate \
-			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	else
-		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
-	fi
-
-	# Create a client certificate
-	echo
-	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
-	read -r CN
-
-	einfo "Creating private key and certificate for client ${CN}..."
-	certtool --generate-privkey \
-		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
-	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-	cat > "${T}/${PF}.$$" <<- _EOF
-	cn = ${CN}
-	tls_www_client
-	dns_name = ${CN}
-	expiration_days = 3650
-	_EOF
-
-	certtool --generate-certificate \
-		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-		--template "${T}/${PF}.$$" &>/dev/null
-	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	rm -f "${T}/${PF}.$$"
-
-	echo
-	einfo "Here is the documentation on how to encrypt your log traffic:"
-	einfo " http://www.rsyslog.com/doc/rsyslog_tls.html"
-}
--- a/app-admin/rsyslog/rsyslog-8.32.0-r4.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.32.0-r4.ebuild
@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit autotools eutils linux-info python-any-r1 systemd

 DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
-HOMEPAGE="http://www.rsyslog.com/"
+HOMEPAGE="https://www.rsyslog.com/"

 BRANCH="8-stable"

@ -44,8 +44,8 @@ else
 	fi

 	SRC_URI="
-		http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME}
-		doc? ( http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} )
+		https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME}
+		doc? ( https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} )
 	"

 	PATCHES=( "${FILESDIR}"/8-stable/${PN}-8.32.0-fix-building-without-curl-r3.patch )
@ -71,7 +71,7 @@ RDEPEND="
 	kerberos? ( virtual/krb5 )
 	mdblookup? ( dev-libs/libmaxminddb:= )
 	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
-	mysql? ( virtual/mysql )
+	mysql? ( virtual/libmysqlclient:= )
 	normalize? (
 		>=dev-libs/libee-0.4.0
 		>=dev-libs/liblognorm-2.0.3:=
--- a/app-admin/rsyslog/rsyslog-8.33.1-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.33.1-r1.ebuild
@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit autotools eutils linux-info python-any-r1 systemd

 DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
-HOMEPAGE="http://www.rsyslog.com/"
+HOMEPAGE="https://www.rsyslog.com/"

 BRANCH="8-stable"

@ -44,8 +44,8 @@ else
 	fi

 	SRC_URI="
-		http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME}
-		doc? ( http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} )
+		https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME}
+		doc? ( https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} )
 	"
 fi

@ -69,7 +69,7 @@ RDEPEND="
 	kerberos? ( virtual/krb5 )
 	mdblookup? ( dev-libs/libmaxminddb:= )
 	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
-	mysql? ( virtual/mysql )
+	mysql? ( virtual/libmysqlclient:= )
 	normalize? (
 		>=dev-libs/libee-0.4.0
 		>=dev-libs/liblognorm-2.0.3:=
--- a/app-admin/rsyslog/rsyslog-8.34.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.34.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI="6"
@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit autotools eutils linux-info python-any-r1 systemd

 DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
-HOMEPAGE="http://www.rsyslog.com/"
+HOMEPAGE="https://www.rsyslog.com/"

 BRANCH="8-stable"

@ -24,9 +24,9 @@ else
 	S="${WORKDIR}/${PN}-${MY_PV}"

 	# Upstream URL schema:
-	# RC:      http://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz
-	#          http://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz
-	# Release: http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz
+	# RC:      https://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz
+	#          https://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz
+	# Release: https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz

 	MY_URL_PREFIX=
 	if [[ ${PV} = *_rc* ]]; then
@ -44,23 +44,24 @@ else
 	fi

 	SRC_URI="
-		http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME}
-		doc? ( http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} )
+		https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME}
+		doc? ( https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} )
 	"

-	PATCHES=()
+	PATCHES=( "${FILESDIR}"/${BRANCH}/${PN}-8.34.0-fix-issue2612.patch )
 fi

 LICENSE="GPL-3 LGPL-3 Apache-2.0"
 SLOT="0"
-IUSE="dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mdblookup mongodb mysql normalize omhttpfs"
-IUSE+=" omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid zeromq"
+IUSE="curl dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos kubernetes libressl mdblookup mongodb mysql"
+IUSE+=" normalize omhttpfs omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid zeromq"

 RDEPEND="
-	>=dev-libs/libfastjson-0.99.7:=
+	>=dev-libs/libfastjson-0.99.8:=
 	>=dev-libs/libestr-0.1.9
 	>=dev-libs/liblogging-1.0.1:=[stdlog]
 	>=sys-libs/zlib-1.2.5
+	curl? ( >=net-misc/curl-7.35.0 )
 	dbi? ( >=dev-db/libdbi-0.8.3 )
 	elasticsearch? ( >=net-misc/curl-7.35.0 )
 	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
@ -68,9 +69,10 @@ RDEPEND="
 	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
 	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
 	kerberos? ( virtual/krb5 )
+	kubernetes? ( >=net-misc/curl-7.35.0 )
 	mdblookup? ( dev-libs/libmaxminddb:= )
 	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
-	mysql? ( virtual/mysql )
+	mysql? ( virtual/libmysqlclient:= )
 	normalize? (
 		>=dev-libs/libee-0.4.0
 		>=dev-libs/liblognorm-2.0.3:=
@ -102,6 +104,8 @@ DEPEND="${RDEPEND}
 		${PYTHON_DEPS}
 	)"

+REQUIRED_USE="kubernetes? ( normalize )"
+
 if [[ ${PV} == "9999" ]]; then
 	DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
 	DEPEND+=" >=sys-devel/flex-2.5.39-r1"
@ -176,6 +180,7 @@ src_configure() {
 		--disable-generate-man-pages
 		--without-valgrind-testbench
 		$(use_enable test testbench)
+		$(use_enable curl libcurl)
 		# Input Plugins without depedencies
 		--enable-imdiag
 		--enable-imfile
@ -216,12 +221,14 @@ src_configure() {
 		$(use_enable debug rtinst)
 		$(use_enable debug valgrind)
 		# Misc
+		$(use_enable curl fmhttp)
 		$(use_enable elasticsearch)
 		$(use_enable gcrypt libgcrypt)
 		$(use_enable jemalloc)
 		$(use_enable kafka imkafka)
 		$(use_enable kafka omkafka)
 		$(use_enable kerberos gssapi-krb5)
+		$(use_enable kubernetes mmkubernetes)
 		$(use_enable normalize mmnormalize)
 		$(use_enable mdblookup mmdblookup)
 		$(use_enable grok mmgrok)
@ -453,5 +460,5 @@ pkg_config() {

 	echo
 	einfo "Here is the documentation on how to encrypt your log traffic:"
-	einfo " http://www.rsyslog.com/doc/rsyslog_tls.html"
+	einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
 }
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@ -4,24 +4,11 @@ AUX master-confd-1 188 BLAKE2B 8ac416a7ff64c73556f07a08268ea7d91547e242becd345ac
 AUX master-initd-4 311 BLAKE2B 302e71b0328d47addd1508e1992ee56c719463d4b99af37b626835fefd28f9c3184e8441035f055992489b1084f1fdd45542466b359c206305e8174fef853478 SHA512 d44ea9fdf962ded6d0c6ac5a1f89ec8729a9a70517ba0f132c54696d32bc96030c64af09f48037867006bd3acdf4b6db759ca873717cd5a88701e42d06885bcc
 AUX minion-confd-1 188 BLAKE2B ad20094c30f9aa573397d347f9fb11acafba2f724b6c836d7ec57f10d4182c300a4b0ec572b5f3301174febdfc69c30752c3b0eabdfdf9f4963b03531db23523 SHA512 0051e13351cef8db81dc075a194bb384723f07d5591b5b4d3f3adf4180afaf7beced470ab79ceca9d1ec0dae62dbd72084eb76af009fc78411a011050a94a2ed
 AUX minion-initd-4 317 BLAKE2B 4c207bd26a72d5dded38e40f7869f46263272a841b978f138248d016a06e837c3aebebabd15314e3896b404058c3f5dd5e6a1cca48450b07b88b6edef6a8d7d2 SHA512 80790ed1b5f86b713ca6384d60253676b16b10c122810ed07b7119c3860bedfe40102f6b7de86d832f084d84f87bf9405ec282629f981767a534d2a53144845f
-AUX salt-2014.7.1-remove-pydsl-includes-test.patch 3605 BLAKE2B 1e43a692afebee14ec62873ad718126be09447eeeb949074d5aa6c6186cad4aa4cea2a3df814ce150414b8ec200b996fad6c21eca66d1a1dbe0e3de9e7660e39 SHA512 fe56cb6b5f91586e9acba136601c9380f158a4dc3a0316a00b23703a5e5de7b8ae3cec7b3bd606e0b7a927f8a7fc28c57e5dd5f10755f34e9dbd6052c9dc9b50
-AUX salt-2015.5.10-buggy-tests.patch 2034 BLAKE2B c3437ec0686a026c2d50ae758ae550b5d61005a638745c64a0fc81995606d9938c585f092012e164c5387141a8aef7aae7da46d5dd8a467042328f671eaccf50 SHA512 f848262c8ce2338cc847b5c8038eb40f6ec15f4ce07d58e9a70503fcbe2b8651edb411621697a1c5aaf663e4dd821b396ca16088846e3ec6f2a64c78ecf9ac64
-AUX salt-2015.5.5-auth-tests.patch 1572 BLAKE2B 59584a38091cbff17bcbf5fd1cb54d6ba2c4e720a9b5c2d45d00bf2f8bd60ec2b326970cf99944d62bb2d0a6357a2d8ed8ef26097355ad3bae56be02aaa213b5 SHA512 6cab8a7c2a405420f6b2df7cd21773852ef1582f8a2f54bcbd120fa4966ac390447e907555b4b82764d8ae406cee095b5dd1dd0070d5a67a4ab10329bed39c3a
-AUX salt-2015.5.5-cron-tests.patch 961 BLAKE2B 018aa48d769e2d6a822310f4941952260b6e4882b8f87964431bcb3eb02fb649ff3a9086c7db7b861bc609ce62d64eceae7aed2a40a7e2ea78f0bf8791e8b87c SHA512 d6ddb67d91ac0ec8c9256dba6e7d9efd15c892b6a8396b571b6aa849393d19e3a74e48906e1e03ddc9301b8fe7e1811eb1c88048daedcd8737e5edf0c4e62d74
-AUX salt-2015.5.5-remove-buggy-tests.patch 2114 BLAKE2B 10e699b5d0cb78e2421f69ac232f42c79369218d89aaed9c13ab56c7cb677e66f0963d26936c5573bec0e5e472c3b61d94794222e28fe7c2382167857f1ed029 SHA512 8669e2ffa926578e238cc8f18fbbc6e691cf9a4029e4a90c92214bfbd99c878efe749041912c7ad6ba90afee2baa8a4047318105b579babbf349186c8b9302a9
-AUX salt-2015.5.7-tmpdir.patch 1489 BLAKE2B c52240ef70302e31e6f4d3e84230e99c660f9a5979dde3efe5d17e9251d2f84113e309f16077865078bec4909d6d5753e11630bb99372b2045378caccff99664 SHA512 37d2af5375384dfe1e0b5d45eb6a51576767420e0bacd13f7ea5da801c359743ac420c0d6b258aa237d4dab82290a832b3ea6c96aa7547ecc8eb8f0c0f047b4a
-AUX salt-2015.8.0-remove-buggy-tests.patch 2552 BLAKE2B 10c4d615e76f64c0f3504e3999509cc4947cdbef4c4d33180f9dc27c12f17353ca614fbca8dcf9ad06ba07bf7be163a706a8503c8717f800bcf88117d9a025e0 SHA512 31b8509feb6262e3211263571d9a006879a136c8c0ea5202ebf314ea6aeb3279b0ac63bb3800244ddb6ba9eb9159ee3ad8e389fa3e68f4d414d89cddb792a056
-AUX salt-2015.8.10-remove-failing-boto-test.patch 2058 BLAKE2B 33b72ed7f5eee1f7e5a9ae82da022244887e736979122b13f777dafd94e0130fb663d28804985bbd8c8d55aadb005e72099cdf283c00a12fc27cc23eb2cc269a SHA512 98aed5c1ba1fc2647ed4771a57b7d2fe0f66e4da7936bf013c305f014e5c9f7158e9d966b961b9d6ba4fba57a1c8101d3c053598f0ebcac023016e9dbb1e765f
-AUX salt-2015.8.13-failing-gateway-tests.patch 3539 BLAKE2B 0f25e5edb41cd932fe8c0a06c4022b8b9b612a7022578002f64885cb71689e914e455e4404d1840a1ce1b9432a450361399f1da0934e55a0b455722092250cac SHA512 577825438e0193edc7df0234fba66dc61e56c74ae6e50b998072374a93052151d987def04d3a618c5a68b9ef2c8e84559adfcc25428b701418521d5f01a57466
-AUX salt-2015.8.13-sanitize-minion-name.patch 1003 BLAKE2B 0446565484fbf00dc3fe9acd72b90353447b6e892172111c794a3475a03132183d2bd8ec6c6b60cb84863dd366e3e1fae84d7ad41dca3c9530d78ee4a37ffd3c SHA512 04f50936896b83804cc25ca329cb32a7f388be9ec5fd6f9d0cf452e3af3f6c8c3f025c119ed29a2399e11669b9eec373d77fce17d1ea64107f9268f9741cb73c
-AUX salt-2015.8.2-tmpdir.patch 2502 BLAKE2B 97cd158e92cde16d653f590a3902471e46b2c6f9c522fbccf42c09288388a56539eb518309db448f3698e5cab042affb80b34cc528bbbc65ea51be6d34ab2ffc SHA512 ed8eed9e2fa36718d7320e1ae650a990ae2d95d7c6a544ffd96f358750158231c334ab1eee6fe3e5e6a25d3b62c1fc0a149508eb3bd23f7ad152a82ec7efa1ac
 AUX salt-2016.11.0-broken-tests.patch 1092 BLAKE2B 5ab3cccc024b5cdc4e6eecd5f164c9f931aa25b23264151ef15645e63e1586f2a093f29a9835685482d831b98e131a385799d39b9158c865af83724a994bbdb1 SHA512 d23c16a5ed8c0fbd4287d73e45b700d465224c5f3b32c47bb2994703a4b4c261053b9c79444973cfaf86afa2850b8499a6b7923317fde3de43840a575ada74b4
 AUX salt-2016.11.0-remove-file-tree-test.patch 1480 BLAKE2B ad2285dd37d5a727feac291c5598b4dc56c98674566c3816fb17577ce44da4d20ddb60c1f0b8a8c8f7d2fe6f33918d00e5010c47c4441728f6a1a9ca94cf4015 SHA512 0503b4ecd16c2f67b53f1ce52b5f77cacf8de420024c5c7751d3caa06de2d1e685eef8d4021dfe86a5850ac23f58705a375e87922b3c5fbeb8c11290690624bc
 AUX salt-2016.11.0-tmpdir.patch 1480 BLAKE2B c5501459ba32a5ef08317f4e1a247a7ac2ad563be100f80bfb97a14821af43134dce76d46d9c9431f8b2866eec0272e6de62e281c9a469f8177f214e7c5f6a7e SHA512 ef654d871178618dab68ad9b4062560cfa57fa421834b142639a11d12679ebc97afc27fa572dd77b74d86ba722bb8575b64045bbf3cab9f2d0e2cefeca38c4bd
 AUX salt-2016.3.1-dont-realpath-tmpdir.patch 853 BLAKE2B e78c50d1050adad0d21523229034a24f1fd2c977172f3135dbf09440ed6d7e292f0dd9c267c3277edfe8528bf38d269939d068b4af8671da08c64f5712c0d7e1 SHA512 a6bc22959975ac25df84c54437a1638e95d78c057920ced38b0accddca11eb33ad39f2a43dd05648584cd10b140f7ee509a8c6739c4d89d30500452c91795b79
-AUX salt-2016.3.4-dont-test-ordering.patch 1485 BLAKE2B 4075d7c43d7f6b419357aed1f6a3efd82a4bdace1416f3702e3d51bcd5e4d359d20fd6e2f584a6faee30c4f14d993ae58f4b4f0241bfa8eff0c081c7c6b395c3 SHA512 4cc5a4d4380e6ae795aed7650667f1ea89315b429c495128f3e6eb311977bfb713d3d4536785ff1f087188ed14e81792daf73225cdce0fcb4ff0ffa170f1cbe3
 AUX salt-2016.3.4-test-nonexist-dirs.patch 1655 BLAKE2B 5e7907e0a10c4ee78b599ec98d38088c97889ae2002602db0c207fb210e2960e7b4b92c08f027854e6dd9205b000bb09e7b243346af755e6824561752e3ef2e9 SHA512 ee81b8104f066e1d161207fe82d8349eb8c40701544784a2b6e66842fe9e07d7edffa24cad8c5d2037e2e7fa0368c614ed177fdf7359c89255d068767968e8fd
-AUX salt-2016.3.5-tmpdir.patch 1982 BLAKE2B b8d587e6139ac49b78892572070d0985fb78de3986fedfc8df04276da69a6f7f0c28fcb1f41df282747c80bfaba266fdcfeb58890e494f32873d870add388d98 SHA512 755ac34298c6cbc57cf7404b209bd45ad216c07bb55b303e97375e1912aead765dddddbe3331314e4f245c6848e62447a5bb16b04367f20bb8387e89d0254859
 AUX salt-2017.7.0-dont-realpath-tmpdir.patch 834 BLAKE2B e70496f3ab18b954e7cacd29dbdee6ccbe0a07f139903360312db247926867a78513cd9022f492ce370eeafcc81bc4db545359036f8f5b0d2d64d3c5bb8aefc0 SHA512 33b69954e8112c0f76654d507df74a4cdd37e8227848f2ce0652b3ecee8b847253ccad33cada0e3dd1471c54c780dcc12d5e546c4ec43868511b95b0c7f71e17
 AUX salt-2017.7.2-fix_disk_format.patch 2111 BLAKE2B e8a1c24cd780e29092e3112256bbe3cf518dac49479abfcac0b2432b8528c448241bfc0cce5bbf20b1be674cd49766c151547cfb4d5ef0894b3c9a1d28ad332e SHA512 33c73a70e163135c238b85ad6a0beaed5ed5d339fee19dfa15f7dd073200cb788ec5234d89939eab1a8b080ccd0b22ed0a5409cfaad27ac1abbbda3f018f3d75
 AUX salt-2017.7.3-tests.patch 3096 BLAKE2B bde978ec7d9ca3f303e859d8ecc728ee16e6b1753afe2325f95b0938ed2828ac5b3f80ac92451f6ab4bf7f08f141b71df88641da9694828657dd358059df9826 SHA512 0db8e8dffeabd9f7c0c619480425c58f4b58a486e1866062c8a482489bb79fd6f31c06020ed83e1903a346cbacb221ba541a2363d4e983e583313adb4652d22f
@ -31,12 +18,10 @@ AUX salt-minion.service 162 BLAKE2B 6f7b6b72e26d1651dbcb324b1e0cfef9f4b5a794f405
 AUX salt-syndic.service 169 BLAKE2B 0d00f20b4663804eaa4b6a1a1b32ed87b04d1f4df6a8e8e0b2a0e3d17f71e1bb53f71f6168446aaf3765692cd540217c4cdf5ab8dd9cb7032801aa798d8a9bc3 SHA512 b45509a22a18f573726a868fda1591eaf42ef44220960dda698274ba8ff1db8cdc302605133ab61b188e15017ba15c5f409f3ee64e026b635ac359eea7aad7d0
 AUX syndic-confd-1 188 BLAKE2B ad20094c30f9aa573397d347f9fb11acafba2f724b6c836d7ec57f10d4182c300a4b0ec572b5f3301174febdfc69c30752c3b0eabdfdf9f4963b03531db23523 SHA512 0051e13351cef8db81dc075a194bb384723f07d5591b5b4d3f3adf4180afaf7beced470ab79ceca9d1ec0dae62dbd72084eb76af009fc78411a011050a94a2ed
 AUX syndic-initd-4 311 BLAKE2B aab3b44f65dedb30ea4eb573872c0253e4d7b438a533f22a4e887c1e6487682efce7f5b75d3bcf366ef706a9fb1578dce537ac5b50324239378cecbd0715ad5d SHA512 69cc10fa7d9f0f4a68d223272c08ee33af242a50eb9bbea919d61f6cb5baf1ce986b07d69fc0e47e2f6dffc0a11100c3bc0d836d2938c46aa364beecb47f07ef
-DIST salt-2016.11.8.tar.gz 10142142 BLAKE2B e6805dae84c0d2e39109c95f603fcb54e1b7d7ff6c27ce555379b69274b3a5d72a1e372081a62c18440deb0955c1ef24a41c5d855a5e622f2ffe51276bd87b25 SHA512 0adc544ca460d13d2adb11b04575bd079a3dad1be3468bea7d32d0b74416b78546e4c86c75551bba09786be8e9810a6e30232414c4f5851cbc9a0fb4b894e0de
 DIST salt-2016.11.9.tar.gz 10062996 BLAKE2B 5176d04d07a69de21c9c136c201d334614c5675fd78e306a0160fae829b633441cd859f4ba1a0822dfbb9ae716475c53f6eb058187d4acc8a5770dd4ceace577 SHA512 896fd27c111e926e246b51d00b69d41c8f4d25ec0c034c9ff3dc5414f5e93592fd637cdeaecf02b3b98a4e5a7ce478bfda86b15497961078374608d76516593d
-DIST salt-2017.7.2.tar.gz 11471191 BLAKE2B 0b7184eb4dcb29f2a9603117d1c6fb9c729093c1ff11e18370929ec3fdbfe7bf8c0914f17260c3f613842c23359205a4a84d3e0bcd67476705e50f805bcd7b69 SHA512 959cec404f0fa7c00f78427cba902b8b9c2c0d95016fc70925d8da6d0b97a0284fc034ac92a5c5c313763db4fdcbd1b0391318596b77fe8e0cd1c7e4b3fa928b
-DIST salt-2017.7.4.tar.gz 11718327 BLAKE2B c197284ee56d039ee7942534af979f0606093ebdf40e0b11a55ca28a2f64c4b584b09b0901d5cb2c350f4ede52636e7927bbed48355d731472970eda5e32632f SHA512 79d7853c2614ed581e441babe6fbb73809816ec53aa47016b5066b771de449d4dcc999927d7e1c92c5ca68c816d27779e34e31ec1408d473a07120d62846de73
-EBUILD salt-2016.11.8-r1.ebuild 4715 BLAKE2B 32ce9ffe4698b20c9d0d73acc56ed01cf9bcc232c14b509a406f31ddadceed70e30ecd03368768f7e2c41e280adb5a8486e825d4597bbbff309f73e3b724b8c4 SHA512 e0a194c95bdc17e92d481612f171876925aea54eead946206e4b65632bde29b4da15d8ea7951e617aebf888958d708f5f3c9a6fde0004d56822ad6da8fcc209f
+DIST salt-2017.7.5.tar.gz 11043026 BLAKE2B 9cae4e6ca3b0bac0dc0b9b9a5ae01e0bfb8e8b899aa029b324ac10c8c84024bbc419ace068cd0d2bff84ec6ddf1d13faf68ce34c68c19892c700c38e81da8c7c SHA512 684ffde7d98c73349b386c94de3d9fc09631a78c5d74e37e6dfd90fbb0c94decc529f56b1eba1559ce9932b16083f88e6495ff6cdf071b32a23028e9db47cc3d
+DIST salt-2018.3.0.tar.gz 13448567 BLAKE2B 9048f9e507ded238bfd54d0aabfefb56522b20ba2479c3bf5aefc47fff0b6ce516709ad6e9109441941a60596d4f06a43c1448a149225f3f87715327a190d313 SHA512 3d64a4d12d4ff7effe644b682b138d8f49fd00523e9cfe3e80bebff9c944a089fb41cbac92e63139633425f49c1eebeb99145290a0bdd1b4f306da86abe9b2e5
 EBUILD salt-2016.11.9-r1.ebuild 4715 BLAKE2B 32ce9ffe4698b20c9d0d73acc56ed01cf9bcc232c14b509a406f31ddadceed70e30ecd03368768f7e2c41e280adb5a8486e825d4597bbbff309f73e3b724b8c4 SHA512 e0a194c95bdc17e92d481612f171876925aea54eead946206e4b65632bde29b4da15d8ea7951e617aebf888958d708f5f3c9a6fde0004d56822ad6da8fcc209f
-EBUILD salt-2017.7.2-r2.ebuild 4472 BLAKE2B 53e91df5216b70e39b0fb37d607f912f781cc784e95ad70c4ffd52dbb6d335121ea84ed77dc0067f7777362a623773332959731420db6bd45e31ff5ee7d0e852 SHA512 a77a72b91b62c7ec615c79a1634cd869d881b9fffe34d3fd5965a1a21e59a87b76298623c89f65b1e4afb590f7f75de4b20cdc47ae29fcb022d427e9ca03dd82
-EBUILD salt-2017.7.4-r2.ebuild 4617 BLAKE2B 6998d5cf0e486f5941f25ac22f949239f15ee896d74845e3ff8701b49d07fcd1ce5e4c2b87acc2e856ac4ea242c206c00196c05f9a0fefb12af0c49ff182e6ea SHA512 113d6ca37a3829b024588827876ae2b7c03ebe47b9bf6ce484a7a7e454844ba8895dd53ea09d7910c2afc967eaebe5ad44ae1a9381c7c5e391f59318640fea0b
+EBUILD salt-2017.7.5.ebuild 4727 BLAKE2B 2b1a53cca64ed98ae9999f84bbb7da5dafad5e9b74b4248bf3728a07db3bff77c5ac959ebadb907ae31a15569390c2f01bfe288ea296e7f27df169258643836c SHA512 013670dec20115ca9e23e8f545abd3dbd66af5ab1b09a4c6118f3106caa2747b3000ffa47928427a5b8690e1e9bb647e44f8000275dcc07cee949915b3821ea4
+EBUILD salt-2018.3.0.ebuild 4892 BLAKE2B dffbb8de5ed43477c02b177e80528ed2c51f66e59f033da4d7e57bc2af13dab6a854cc3025d4cdcd63446ed7f873e3db1f2216bfe82802428d6d5f0fc598088c SHA512 8862e90908e207ef72fa7783739a279cf8315de4c2c76fb3624043cfd0e8f8adb23885d40a7e66b2dce26a1c7f1b9f55b86e5a8c0a5dd51ca53575d0dc13d497
 MISC metadata.xml 2288 BLAKE2B dbe7f76af8cd8a97d852536684e914e3759bd1f17e4bdea3c8c16da7c6485eee08151a8d4e41919c1ae89ba4f786783f899e23147159a4bade0009c7a668f741 SHA512 fdcea2f80fc87ab2a0db1643d71dd6d54e91d898594570af6a7505343c5d9a5a0ce4803d11460d7d3f6f533509b072819f958cbe31ca9183fabf811982526969
--- a/app-admin/salt/files/salt-2014.7.1-remove-pydsl-includes-test.patch
+++ b/app-admin/salt/files/salt-2014.7.1-remove-pydsl-includes-test.patch
@ -1,104 +0,0 @@
-diff --git a/tests/unit/pydsl_test.py b/tests/unit/pydsl_test.py
-index 57ba81e..b26154e 100644
--- a/tests/unit/pydsl_test.py
-+++ b/tests/unit/pydsl_test.py
-@@ -298,99 +298,6 @@ class PyDSLRendererTestCase(TestCase):
-         finally:
-             shutil.rmtree(dirpath, ignore_errors=True)
- 
-    def test_rendering_includes(self):
-        dirpath = tempfile.mkdtemp(dir=integration.SYS_TMP_DIR)
-        if not os.path.isdir(dirpath):
-            self.skipTest(
-                'The temporary directory {0!r} was not created'.format(
-                    dirpath
-                )
-            )
-        output = os.path.join(dirpath, 'output')
-        try:
-            write_to(os.path.join(dirpath, 'aaa.sls'), textwrap.dedent('''\
-                #!pydsl|stateconf -ps
-
-                include('xxx')
-                yyy = include('yyy')
-
-                # ensure states in xxx are run first, then those in yyy and then those in aaa last.
-                extend(state('yyy::start').stateconf.require(stateconf='xxx::goal'))
-                extend(state('.start').stateconf.require(stateconf='yyy::goal'))
-
-                extend(state('yyy::Y2').cmd.run('echo Y2 extended >> {0}'))
-
-                __pydsl__.set(ordered=True)
-
-                yyy.hello('red', 1)
-                yyy.hello('green', 2)
-                yyy.hello('blue', 3)
-                '''.format(output)))
-
-            write_to(os.path.join(dirpath, 'xxx.sls'), textwrap.dedent('''\
-                #!stateconf -os yaml . jinja
-
-                include:
-                  - yyy
-
-                extend:
-                  yyy::start:
-                    stateconf.set:
-                      - require:
-                        - stateconf: .goal
-
-                  yyy::Y1:
-                    cmd.run:
-                      - name: 'echo Y1 extended >> {0}'
-
-                .X1:
-                  cmd.run:
-                    - name: echo X1 >> {1}
-                    - cwd: /
-                .X2:
-                  cmd.run:
-                    - name: echo X2 >> {2}
-                    - cwd: /
-                .X3:
-                  cmd.run:
-                    - name: echo X3 >> {3}
-                    - cwd: /
-
-                '''.format(output, output, output, output)))
-
-            write_to(os.path.join(dirpath, 'yyy.sls'), textwrap.dedent('''\
-                #!pydsl|stateconf -ps
-
-                include('xxx')
-                __pydsl__.set(ordered=True)
-
-                state('.Y1').cmd.run('echo Y1 >> {0}', cwd='/')
-                state('.Y2').cmd.run('echo Y2 >> {1}', cwd='/')
-                state('.Y3').cmd.run('echo Y3 >> {2}', cwd='/')
-
-                def hello(color, number):
-                    state(color).cmd.run('echo hello '+color+' '+str(number)+' >> {3}', cwd='/')
-                '''.format(output, output, output, output)))
-
-            state_highstate({'base': ['aaa']}, dirpath)
-            expected = textwrap.dedent('''\
-                X1
-                X2
-                X3
-                Y1 extended
-                Y2 extended
-                Y3
-                hello red 1
-                hello green 2
-                hello blue 3
-                ''')
-
-            with salt.utils.fopen(output, 'r') as f:
-                self.assertEqual(sorted(f.read()), sorted(expected))
-
-        finally:
-            shutil.rmtree(dirpath, ignore_errors=True)
-
-     def test_compile_time_state_execution(self):
-         if not sys.stdin.isatty():
-             self.skipTest('Not attached to a TTY')
--- a/app-admin/salt/files/salt-2015.5.10-buggy-tests.patch
+++ b/app-admin/salt/files/salt-2015.5.10-buggy-tests.patch
@ -1,38 +0,0 @@
-diff --git a/tests/unit/modules/boto_vpc_test.py b/tests/unit/modules/boto_vpc_test.py
-index 82dfe28..ced9ee5 100644
--- a/tests/unit/modules/boto_vpc_test.py
-+++ b/tests/unit/modules/boto_vpc_test.py
-@@ -441,9 +441,9 @@ class BotoVpcTestCase(BotoVpcTestCaseBase):
-         describe_vpc = boto_vpc.describe(vpc_id=vpc.id, **conn_parameters)
- 
-         vpc_properties = dict(cidr_block=unicode(cidr_block),
-                              is_default=None,
-+                              is_default=False,
-                               state=u'available',
-                              tags={'Name': 'test', 'test': 'testvalue'},
-+                              tags={u'Name': u'test', u'test': u'testvalue'},
-                               dhcp_options_id=u'dopt-7a8b9c2d',
-                               instance_tenancy=u'default')
- 
-diff --git a/tests/unit/states/pip_test.py b/tests/unit/states/pip_test.py
-index 6e7d083..9a83951 100644
--- a/tests/unit/states/pip_test.py
-+++ b/tests/unit/states/pip_test.py
-@@ -37,17 +37,6 @@ class PipStateTest(TestCase, integration.SaltReturnAssertsMixIn):
-     def test_install_requirements_parsing(self):
-         mock = MagicMock(return_value={'retcode': 0, 'stdout': ''})
-         pip_list = MagicMock(return_value={'pep8': '1.3.3'})
-        with patch.dict(pip_state.__salt__, {'cmd.run_all': mock,
-                                             'pip.list': pip_list}):
-            with patch.dict(pip_state.__opts__, {'test': True}):
-                ret = pip_state.installed('pep8=1.3.2')
-                self.assertSaltFalseReturn({'test': ret})
-                self.assertInSaltComment(
-                    'Invalid version specification in package pep8=1.3.2. '
-                    '\'=\' is not supported, use \'==\' instead.',
-                    {'test': ret}
-                )
-
-         mock = MagicMock(return_value={'retcode': 0, 'stdout': ''})
-         pip_list = MagicMock(return_value={'pep8': '1.3.3'})
-         pip_install = MagicMock(return_value={'retcode': 0})
--- a/app-admin/salt/files/salt-2015.5.5-auth-tests.patch
+++ b/app-admin/salt/files/salt-2015.5.5-auth-tests.patch
@ -1,34 +0,0 @@
-diff --git a/tests/unit/auth_test.py b/tests/unit/auth_test.py
-index 10b77e9..c40f439 100644
--- a/tests/unit/auth_test.py
-+++ b/tests/unit/auth_test.py
-@@ -38,12 +38,12 @@ class LoadAuthTestCase(TestCase):
- 
-         # Test a case with valid params
-         with patch('salt.utils.format_call') as format_call_mock:
-            expected_ret = call('fake_func_str', {
-+            expected_ret = [call('fake_func_str', {
-                 'username': 'test_user',
-                 'test_password': '',
-                 'show_timeout': False,
-                 'eauth': 'pam'
-            }, expected_extra_kws=auth.AUTH_INTERNAL_KEYWORDS)
-+            }, expected_extra_kws=auth.AUTH_INTERNAL_KEYWORDS)]
-             ret = self.lauth.load_name(valid_eauth_load)
-             format_call_mock.assert_has_calls(expected_ret)
- 
-@@ -53,12 +53,12 @@ class LoadAuthTestCase(TestCase):
-                             'test_password': '',
-                             'eauth': 'pam'}
-         with patch('salt.utils.format_call') as format_call_mock:
-            expected_ret = call('fake_groups_function_str', {
-+            expected_ret = [call('fake_groups_function_str', {
-                 'username': 'test_user',
-                 'test_password': '',
-                 'show_timeout': False,
-                 'eauth': 'pam'
-                }, expected_extra_kws=auth.AUTH_INTERNAL_KEYWORDS)
-+                }, expected_extra_kws=auth.AUTH_INTERNAL_KEYWORDS)]
-             self.lauth.get_groups(valid_eauth_load)
-             format_call_mock.assert_has_calls(expected_ret)
- 
--- a/app-admin/salt/files/salt-2015.5.5-cron-tests.patch
+++ b/app-admin/salt/files/salt-2015.5.5-cron-tests.patch
@ -1,17 +0,0 @@
-diff --git a/tests/unit/modules/cron_test.py b/tests/unit/modules/cron_test.py
-index 017eabd..dac0122 100644
--- a/tests/unit/modules/cron_test.py
-+++ b/tests/unit/modules/cron_test.py
-@@ -573,10 +573,10 @@ class PsTestCase(TestCase):
-     @patch('salt.modules.cron._write_cron_lines')
-     @patch('salt.modules.cron.list_tab', new=MagicMock(return_value=STUB_SIMPLE_CRON_DICT))
-     def test_set_special(self, write_cron_lines_mock):
-        expected_write_call = call('DUMMY_USER',
-+        expected_write_call = [call('DUMMY_USER',
-                                    ['5 0 * * * /tmp/no_script.sh\n',
-                                     '# Lines below here are managed by Salt, do not edit\n',
-                                    '@hourly echo Hi!\n'])
-+                                    '@hourly echo Hi!\n'])]
-         ret = cron.set_special('DUMMY_USER', '@hourly', 'echo Hi!')
-         write_cron_lines_mock.assert_has_calls(expected_write_call)
- 
--- a/app-admin/salt/files/salt-2015.5.5-remove-buggy-tests.patch
+++ b/app-admin/salt/files/salt-2015.5.5-remove-buggy-tests.patch
@ -1,46 +0,0 @@
-diff --git a/tests/unit/modules/darwin_sysctl_test.py b/tests/unit/modules/darwin_sysctl_test.py
-index 51e8f23..36d005f 100644
--- a/tests/unit/modules/darwin_sysctl_test.py
-+++ b/tests/unit/modules/darwin_sysctl_test.py
-@@ -64,18 +64,6 @@ class DarwinSysctlTestCase(TestCase):
-                 'net.inet.icmp.icmplim', 50), ret)
- 
-     @patch('os.path.isfile', MagicMock(return_value=False))
-    def test_persist_no_conf_failure(self):
-        '''
-        Tests adding of config file failure
-        '''
-        with patch('salt.utils.fopen', mock_open()) as m_open:
-            helper_open = m_open()
-            helper_open.write.assertRaises(CommandExecutionError,
-                                           darwin_sysctl.persist,
-                                           'net.inet.icmp.icmplim',
-                                           50, config=None)
-
-    @patch('os.path.isfile', MagicMock(return_value=False))
-     def test_persist_no_conf_success(self):
-         '''
-         Tests successful add of config file when previously not one
-diff --git a/tests/unit/modules/linux_sysctl_test.py b/tests/unit/modules/linux_sysctl_test.py
-index 08fc80f..c6e40b8 100644
--- a/tests/unit/modules/linux_sysctl_test.py
-+++ b/tests/unit/modules/linux_sysctl_test.py
-@@ -82,18 +82,6 @@ class LinuxSysctlTestCase(TestCase):
-                 'net.ipv4.ip_forward', 1), ret)
- 
-     @patch('os.path.isfile', MagicMock(return_value=False))
-    def test_persist_no_conf_failure(self):
-        '''
-        Tests adding of config file failure
-        '''
-        with patch('salt.utils.fopen', mock_open()) as m_open:
-            helper_open = m_open()
-            helper_open.write.assertRaises(CommandExecutionError,
-                                           linux_sysctl.persist,
-                                           'net.ipv4.ip_forward',
-                                           1, config=None)
-
-    @patch('os.path.isfile', MagicMock(return_value=False))
-     def test_persist_no_conf_success(self):
-         '''
-         Tests successful add of config file when previously not one
--- a/app-admin/salt/files/salt-2015.5.7-tmpdir.patch
+++ b/app-admin/salt/files/salt-2015.5.7-tmpdir.patch
@ -1,37 +0,0 @@
-diff --git a/tests/unit/modules/grains_test.py b/tests/unit/modules/grains_test.py
-index 3473c03..ea37d66 100644
--- a/tests/unit/modules/grains_test.py
-+++ b/tests/unit/modules/grains_test.py
-@@ -1,6 +1,8 @@
- # -*- coding: utf-8 -*-
- 
- import copy
-+import os.path
-+import tempfile
- 
- # Import Salt Testing libs
- from salttesting import TestCase, skipIf
-@@ -20,8 +22,8 @@ from salt.modules import grains as grainsmod
- from salt.utils import dictupdate
- 
- grainsmod.__opts__ = {
-  'conf_file': '/tmp/__salt_test_grains',
-  'cachedir':  '/tmp/__salt_test_grains_cache_dir'
-+  'conf_file': os.path.join(tempfile.gettempdir(), '__salt_test_grains'),
-+  'cachedir':  os.path.join(tempfile.gettempdir(), '__salt_test_grains_cache_dir')
- }
- 
- grainsmod.__salt__ = {}
-diff --git a/tests/unit/states/archive_test.py b/tests/unit/states/archive_test.py
-index 3cfb2f0..b3f3bee 100644
--- a/tests/unit/states/archive_test.py
-+++ b/tests/unit/states/archive_test.py
-@@ -69,7 +69,7 @@ class ArchiveTest(TestCase):
-                                                    'cmd.run_all': mock_run}):
-                     filename = os.path.join(
-                         tmp_dir,
-                        'files/test/_tmp_test_archive_.tar'
-+                        'files/test/' + tempfile.gettempdir().replace('/', '_') + '_test_archive_.tar'
-                     )
-                     for test_opts, ret_opts in zip(test_tar_opts, ret_tar_opts):
-                         ret = archive.extracted(tmp_dir,
--- a/app-admin/salt/files/salt-2015.8.0-remove-buggy-tests.patch
+++ b/app-admin/salt/files/salt-2015.8.0-remove-buggy-tests.patch
@ -1,56 +0,0 @@
-diff --git a/tests/unit/modules/mount_test.py b/tests/unit/modules/mount_test.py
-index 282539d..c88a7a8 100644
--- a/tests/unit/modules/mount_test.py
-+++ b/tests/unit/modules/mount_test.py
-@@ -103,12 +103,6 @@ class MountTestCase(TestCase):
-             self.assertTrue(mount.rm_fstab('name', 'device'))
- 
-         mock = MagicMock(return_value={'name': 'name'})
-        with patch.object(mount, 'fstab', mock):
-            with patch('salt.utils.fopen', mock_open()) as m_open:
-                helper_open = m_open()
-                helper_open.write.assertRaises(CommandExecutionError,
-                                               mount.rm_fstab,
-                                               config=None)
- 
-     def test_set_fstab(self):
-         '''
-@@ -143,12 +137,6 @@ class MountTestCase(TestCase):
-             self.assertTrue(mount.rm_automaster('name', 'device'))
- 
-         mock = MagicMock(return_value={'name': 'name'})
-        with patch.object(mount, 'fstab', mock):
-            with patch('salt.utils.fopen', mock_open()) as m_open:
-                helper_open = m_open()
-                helper_open.write.assertRaises(CommandExecutionError,
-                                               mount.rm_automaster,
-                                               'name', 'device')
- 
-     def test_set_automaster(self):
-         '''
-diff --git a/tests/unit/modules/puppet_test.py b/tests/unit/modules/puppet_test.py
-index 6a43fd4..3be039c 100644
--- a/tests/unit/modules/puppet_test.py
-+++ b/tests/unit/modules/puppet_test.py
-@@ -91,10 +91,6 @@ class PuppetTestCase(TestCase):
-                     with patch('salt.utils.fopen', mock_open()):
-                         self.assertTrue(puppet.disable())
- 
-                    with patch('salt.utils.fopen', mock_open()) as m_open:
-                        helper_open = m_open()
-                        helper_open.write.assertRaises(CommandExecutionError,
-                                                       puppet.disable)
- 
-     def test_status(self):
-         '''
-@@ -154,10 +150,6 @@ class PuppetTestCase(TestCase):
-                            mock_open(read_data="resources: 1")):
-                     self.assertDictEqual(puppet.summary(), {'resources': 1})
- 
-                with patch('salt.utils.fopen', mock_open()) as m_open:
-                    helper_open = m_open()
-                    helper_open.write.assertRaises(CommandExecutionError,
-                                                   puppet.summary)
- 
-     def test_plugin_sync(self):
-         '''
--- a/app-admin/salt/files/salt-2015.8.10-remove-failing-boto-test.patch
+++ b/app-admin/salt/files/salt-2015.8.10-remove-failing-boto-test.patch
@ -1,35 +0,0 @@
-diff --git a/tests/unit/modules/boto_secgroup_test.py b/tests/unit/modules/boto_secgroup_test.py
-index f1c6bb1..07fd8ec 100644
--- a/tests/unit/modules/boto_secgroup_test.py
-+++ b/tests/unit/modules/boto_secgroup_test.py
-@@ -192,30 +192,6 @@ class BotoSecgroupTestCase(TestCase):
-                                                         **conn_parameters)
-         self.assertEqual(group_vpc.id, retrieved_group_id)
- 
-    @mock_ec2
-    def test_get_config_single_rule_group_name(self):
-        '''
-        tests return of 'config' when given group name. get_config returns an OrderedDict.
-        '''
-        group_name = _random_group_name()
-        ip_protocol = u'tcp'
-        from_port = 22
-        to_port = 22
-        cidr_ip = u'0.0.0.0/0'
-        rules_egress = [{'to_port': -1, 'from_port': -1, 'ip_protocol': u'-1', 'cidr_ip': u'0.0.0.0/0'}]
-
-        conn = boto.ec2.connect_to_region(region, **boto_conn_parameters)
-        group = conn.create_security_group(name=group_name, description=group_name)
-        group.authorize(ip_protocol=ip_protocol, from_port=from_port, to_port=to_port, cidr_ip=cidr_ip)
-        # setup the expected get_config result
-        expected_get_config_result = OrderedDict([('name', group.name), ('group_id', group.id), ('owner_id', u'111122223333'),
-                                                 ('description', group.description),
-                                                 ('rules', [{'to_port': to_port, 'from_port': from_port,
-                                                  'ip_protocol': ip_protocol, 'cidr_ip': cidr_ip}]),
-                                                 ('rules_egress', rules_egress)])
-        secgroup_get_config_result = boto_secgroup.get_config(group_id=group.id, **conn_parameters)
-        self.assertEqual(expected_get_config_result, secgroup_get_config_result)
-
-     @skipIf(True, 'test skipped due to error in moto return - fixed in '
-                   'https://github.com/spulec/moto/commit/cc0166964371f7b5247a49d45637a8f936ccbe6f')
-     @mock_ec2
--- a/app-admin/salt/files/salt-2015.8.13-failing-gateway-tests.patch
+++ b/app-admin/salt/files/salt-2015.8.13-failing-gateway-tests.patch
@ -1,69 +0,0 @@
-diff --git a/tests/unit/states/boto_vpc_test.py b/tests/unit/states/boto_vpc_test.py
-index 53b6a24e4d..96b5630627 100644
--- a/tests/unit/states/boto_vpc_test.py
-+++ b/tests/unit/states/boto_vpc_test.py
-@@ -179,16 +179,6 @@ class BotoVpcResourceTestCaseMixin(BotoVpcTestCaseMixin):
-         self.assertTrue(exists)
- 
-     @mock_ec2
-    def test_present_when_resource_exists(self):
-        vpc = self._create_vpc(name='test')
-        resource = self._create_resource(vpc_id=vpc.id, name='test')
-        with patch.dict('salt.utils.boto.__salt__', funcs):
-            resource_present_result = salt_states['boto_vpc.{0}_present'.format(self.resource_type)](
-                    name='test', vpc_name='test', **self.extra_kwargs)
-        self.assertTrue(resource_present_result['result'])
-        self.assertEqual(resource_present_result['changes'], {})
-
-    @mock_ec2
-     @skipIf(True, 'Disabled pending https://github.com/spulec/moto/issues/493')
-     def test_present_with_failure(self):
-         vpc = self._create_vpc(name='test')
-@@ -210,18 +200,6 @@ class BotoVpcResourceTestCaseMixin(BotoVpcTestCaseMixin):
-         self.assertEqual(resource_absent_result['changes'], {})
- 
-     @mock_ec2
-    def test_absent_when_resource_exists(self):
-        vpc = self._create_vpc(name='test')
-        self._create_resource(vpc_id=vpc.id, name='test')
-
-        with patch.dict('salt.utils.boto.__salt__', funcs):
-            resource_absent_result = salt_states['boto_vpc.{0}_absent'.format(self.resource_type)]('test')
-        self.assertTrue(resource_absent_result['result'])
-        self.assertEqual(resource_absent_result['changes']['new'][self.resource_type], None)
-        exists = funcs['boto_vpc.resource_exists'](self.resource_type, 'test').get('exists')
-        self.assertFalse(exists)
-
-    @mock_ec2
-     @skipIf(True, 'Disabled pending https://github.com/spulec/moto/issues/493')
-     def test_absent_with_failure(self):
-         vpc = self._create_vpc(name='test')
-@@ -293,28 +271,3 @@ class BotoVpcRouteTableTestCase(BotoVpcStateTestCaseBase, BotoVpcResourceTestCas
- 
-         new_subnets = changes['new']['subnets_associations']
-         self.assertEqual(new_subnets[0]['subnet_id'], subnet2.id)
-
-    @mock_ec2
-    def test_present_with_routes(self):
-        vpc = self._create_vpc(name='test')
-        igw = self._create_internet_gateway(name='test', vpc_id=vpc.id)
-
-        route_table_present_result = salt_states['boto_vpc.route_table_present'](
-                name='test', vpc_name='test', routes=[{'destination_cidr_block': '0.0.0.0/0',
-                                                       'gateway_id': igw.id},
-                                                      {'destination_cidr_block': '10.0.0.0/24',
-                                                       'gateway_id': 'local'}])
-        routes = [x['gateway_id'] for x in route_table_present_result['changes']['new']['routes']]
-
-        self.assertEqual(set(routes), set(['local', igw.id]))
-
-        route_table_present_result = salt_states['boto_vpc.route_table_present'](
-                name='test', vpc_name='test', routes=[{'destination_cidr_block': '10.0.0.0/24',
-                                                       'gateway_id': 'local'}])
-
-        changes = route_table_present_result['changes']
-
-        old_routes = [x['gateway_id'] for x in changes['old']['routes']]
-        self.assertEqual(set(routes), set(old_routes))
-
-        self.assertEqual(changes['new']['routes'][0]['gateway_id'], 'local')
--- a/app-admin/salt/files/salt-2015.8.13-sanitize-minion-name.patch
+++ b/app-admin/salt/files/salt-2015.8.13-sanitize-minion-name.patch
@ -1,36 +0,0 @@
-From aa87d67258a5b6742fc53d06c7bdac0f643bc9f1 Mon Sep 17 00:00:00 2001
-From: Ch3LL <megan.wilhite@gmail.com>
-Date: Tue, 1 Aug 2017 13:44:32 -0400
-Subject: [PATCH] Add clean_id function to salt.utils.verify.py
-
---
- salt/utils/verify.py | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/salt/utils/verify.py b/salt/utils/verify.py
-index 5cac0fa651b..a3dc67db336 100644
--- a/salt/utils/verify.py
-+++ b/salt/utils/verify.py
-@@ -484,12 +484,21 @@ def clean_path(root, path, subdir=False):
-     return ''
- 
- 
-+def clean_id(id_):
-+    '''
-+    Returns if the passed id is clean.
-+    '''
-+    if re.search(r'\.\.{sep}'.format(sep=os.sep), id_):
-+        return False
-+    return True
-+
-+
- def valid_id(opts, id_):
-     '''
-     Returns if the passed id is valid
-     '''
-     try:
-        return bool(clean_path(opts['pki_dir'], id_))
-+        return bool(clean_path(opts['pki_dir'], id_)) and clean_id(id_)
-     except (AttributeError, KeyError) as e:
-         return False
- 
--- a/app-admin/salt/files/salt-2015.8.2-tmpdir.patch
+++ b/app-admin/salt/files/salt-2015.8.2-tmpdir.patch
@ -1,56 +0,0 @@
-diff --git a/tests/unit/modules/qemu_nbd_test.py b/tests/unit/modules/qemu_nbd_test.py
-index 615e6b5..fbd24aa 100644
--- a/tests/unit/modules/qemu_nbd_test.py
-+++ b/tests/unit/modules/qemu_nbd_test.py
-@@ -77,6 +77,7 @@ class QemuNbdTestCase(TestCase):
-         Test if it mount the named image via qemu-nbd
-         and return the mounted roots
-         '''
-+        tmpdir = os.environ.get('TMPDIR', '/tmp')
-         mock = MagicMock(return_value=True)
-         with patch.dict(qemu_nbd.__salt__, {'cmd.run': mock}):
-             self.assertEqual(qemu_nbd.init('/srv/image.qcow2'), '')
-@@ -89,7 +90,7 @@ class QemuNbdTestCase(TestCase):
-                                  'mount.mount': mock,
-                                  'cmd.retcode': MagicMock(side_effect=[1, 0])}):
-                     self.assertDictEqual(qemu_nbd.init('/srv/image.qcow2'),
-                                         {'/tmp/nbd/nbd0/nbd0': '/dev/nbd0'})
-+                                         {os.path.join(tmpdir, 'nbd/nbd0/nbd0'): '/dev/nbd0'})
- 
-     # 'clear' function tests: 1
- 
-diff --git a/tests/unit/states/archive_test.py b/tests/unit/states/archive_test.py
-index 63e4a53..20b196f 100644
--- a/tests/unit/states/archive_test.py
-+++ b/tests/unit/states/archive_test.py
-@@ -26,7 +26,7 @@ from salt.ext.six.moves import zip  # pylint: disable=import-error,redefined-bui
- 
- # Globals
- archive.__salt__ = {}
-archive.__opts__ = {"cachedir": "/tmp", "test": False}
-+archive.__opts__ = {"cachedir": os.environ.get('TMPDIR', "/tmp"), "test": False}
- archive.__env__ = 'test'
- 
- 
-@@ -75,7 +75,7 @@ class ArchiveTestCase(TestCase):
-                                                    'cmd.run_all': mock_run}):
-                     filename = os.path.join(
-                         tmp_dir,
-                        'files/test/_tmp_test_archive_.tar'
-+                        'files/test/' + tempfile.gettempdir().replace('/', '_') + '_test_archive_.tar'
-                     )
-                     for test_opts, ret_opts in zip(test_tar_opts, ret_tar_opts):
-                         ret = archive.extracted(tmp_dir,
-diff --git a/tests/unit/utils/context_test.py b/tests/unit/utils/context_test.py
-index 71e4330..d6f3f30 100644
--- a/tests/unit/utils/context_test.py
-+++ b/tests/unit/utils/context_test.py
-@@ -18,7 +18,7 @@ import salt.payload
- import salt.utils
- 
- __context__ = {'a': 'b'}
-__opts__ = {'cachedir': '/tmp'}
-+__opts__ = {'cachedir': os.environ.get('TMPDIR', '/tmp')}
- 
- 
- @skipIf(NO_MOCK, NO_MOCK_REASON)
--- a/app-admin/salt/files/salt-2016.3.4-dont-test-ordering.patch
+++ b/app-admin/salt/files/salt-2016.3.4-dont-test-ordering.patch
@ -1,33 +0,0 @@
-diff --git a/tests/unit/modules/inspect_collector_test.py b/tests/unit/modules/inspect_collector_test.py
-index 9d2fa3ada7..710bbd75a5 100644
--- a/tests/unit/modules/inspect_collector_test.py
-+++ b/tests/unit/modules/inspect_collector_test.py
-@@ -36,28 +36,6 @@ class InspectorCollectorTestCase(TestCase):
-         self.assertEqual(inspector.dbfile, '/foo/cache/_minion_collector.db')
-         self.assertEqual(inspector.pidfile, '/foo/pid/bar.pid')
- 
-    def test_file_tree(self):
-        '''
-        Test file tree.
-
-        :return:
-        '''
-
-        inspector = Inspector(cachedir='/test', piddir='/test', pidfilename='bar.pid')
-        tree_root = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'inspectlib', 'tree_test')
-        expected_tree = (['/a/a/dummy.a', '/a/b/dummy.b', '/b/b.1', '/b/b.2', '/b/b.3'],
-                         ['/a', '/a/a', '/a/b', '/a/c', '/b', '/c'],
-                         ['/a/a/dummy.ln.a', '/a/b/dummy.ln.b', '/a/c/b.1', '/b/b.4',
-                          '/b/b.5', '/c/b.1', '/c/b.2', '/c/b.3'])
-        tree_result = []
-        for chunk in inspector._get_all_files(tree_root):
-            buff = []
-            for pth in chunk:
-                buff.append(pth.replace(tree_root, ''))
-            tree_result.append(buff)
-        tree_result = tuple(tree_result)
-        self.assertEqual(expected_tree, tree_result)
-
-     def test_get_unmanaged_files(self):
-         '''
-         Test get_unmanaged_files.
--- a/app-admin/salt/files/salt-2016.3.5-tmpdir.patch
+++ b/app-admin/salt/files/salt-2016.3.5-tmpdir.patch
@ -1,47 +0,0 @@
-diff --git a/tests/unit/modules/qemu_nbd_test.py b/tests/unit/modules/qemu_nbd_test.py
-index 615e6b5670..fbd24aab86 100644
--- a/tests/unit/modules/qemu_nbd_test.py
-+++ b/tests/unit/modules/qemu_nbd_test.py
-@@ -77,6 +77,7 @@ class QemuNbdTestCase(TestCase):
-         Test if it mount the named image via qemu-nbd
-         and return the mounted roots
-         '''
-+        tmpdir = os.environ.get('TMPDIR', '/tmp')
-         mock = MagicMock(return_value=True)
-         with patch.dict(qemu_nbd.__salt__, {'cmd.run': mock}):
-             self.assertEqual(qemu_nbd.init('/srv/image.qcow2'), '')
-@@ -89,7 +90,7 @@ class QemuNbdTestCase(TestCase):
-                                  'mount.mount': mock,
-                                  'cmd.retcode': MagicMock(side_effect=[1, 0])}):
-                     self.assertDictEqual(qemu_nbd.init('/srv/image.qcow2'),
-                                         {'/tmp/nbd/nbd0/nbd0': '/dev/nbd0'})
-+                                         {os.path.join(tmpdir, 'nbd/nbd0/nbd0'): '/dev/nbd0'})
- 
-     # 'clear' function tests: 1
- 
-diff --git a/tests/unit/states/archive_test.py b/tests/unit/states/archive_test.py
-index e699362d8a..c7c7e8a965 100644
--- a/tests/unit/states/archive_test.py
-+++ b/tests/unit/states/archive_test.py
-@@ -25,7 +25,7 @@ from salt.ext.six.moves import zip  # pylint: disable=import-error,redefined-bui
- 
- # Globals
- archive.__salt__ = {}
-archive.__opts__ = {"cachedir": "/tmp", "test": False}
-+archive.__opts__ = {"cachedir": os.environ.get('TMPDIR', "/tmp"), "test": False}
- archive.__env__ = 'test'
- 
- 
-diff --git a/tests/unit/utils/context_test.py b/tests/unit/utils/context_test.py
-index 5249d56747..a27ee9ab61 100644
--- a/tests/unit/utils/context_test.py
-+++ b/tests/unit/utils/context_test.py
-@@ -18,7 +18,7 @@ import salt.payload
- import salt.utils
- 
- __context__ = {'a': 'b'}
-__opts__ = {'cachedir': '/tmp'}
-+__opts__ = {'cachedir': os.environ.get('TMPDIR', '/tmp')}
- 
- 
- @skipIf(NO_MOCK, NO_MOCK_REASON)
--- a/app-admin/salt/salt-2016.11.8-r1.ebuild
+++ b/app-admin/salt/salt-2016.11.8-r1.ebuild
@ -1,149 +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 eutils systemd distutils-r1
-
-DESCRIPTION="Salt is a remote execution and configuration manager"
-HOMEPAGE="https://saltstack.com/community/"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git"
-	EGIT_BRANCH="develop"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~x86 ~amd64"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova"
-IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax"
-
-RDEPEND="sys-apps/pciutils
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/markupsafe[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.2.1[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
-	libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
-	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
-	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
-	libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
-	openssl? (
-		dev-libs/openssl:*[-bindist]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-	)
-	raet? (
-		>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
-		>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
-	)
-	zeromq? (
-		>=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
-	)
-	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
-	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
-	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
-	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
-	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
-	selinux? ( sec-policy/selinux-salt )
-	timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )
-	nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
-	neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
-	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
-	profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
-	vim-syntax? ( app-vim/salt-vim )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pip[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/timelib[${PYTHON_USEDEP}]
-		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
-		!x86? ( dev-python/boto3[${PYTHON_USEDEP}] )
-		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
-		>=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}]
-		>=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
-		${RDEPEND}
-	)"
-
-DOCS=( README.rst AUTHORS )
-
-REQUIRED_USE="|| ( raet zeromq )"
-RESTRICT="x86? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2016.11.0-tmpdir.patch"
-	"${FILESDIR}/${PN}-2016.3.1-dont-realpath-tmpdir.patch"
-	"${FILESDIR}/${PN}-2016.3.4-test-nonexist-dirs.patch"
-	"${FILESDIR}/${PN}-2016.11.0-remove-file-tree-test.patch"
-	"${FILESDIR}/${PN}-2016.11.0-broken-tests.patch"
-)
-
-python_prepare() {
-	# this test fails because it trys to "pip install distribute"
-	rm tests/unit/{modules,states}/zcbuildout_test.py \
-		tests/unit/modules/{rh_ip,win_network,random_org}_test.py || die
-
-	# https://github.com/saltstack/salt/issues/39095
-	rm tests/unit/utils/parsers_test.py
-
-	# apparently libcloud does not know about this?
-	rm tests/unit/cloud/clouds/dimensiondata_test.py || die
-
-	# seriously? "ValueError: Missing (or not readable) key file: '/home/dany/PRIVKEY.pem'"
-	rm tests/unit/cloud/clouds/gce_test.py || die
-
-	# allow the use of the renamed msgpack
-	sed -i '/^msgpack/d' requirements/base.txt || die
-}
-
-python_install_all() {
-	local svc
-	USE_SETUPTOOLS=1 distutils-r1_python_install_all
-
-	for svc in minion master syndic api; do
-		newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
-		newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
-		systemd_dounit "${FILESDIR}"/salt-${svc}.service
-	done
-
-	insinto /etc/${PN}
-	doins -r conf/*
-}
-
-python_test() {
-	local tempdir
-	# testsuite likes lots of files
-	ulimit -n 3072 || die
-
-	# ${T} is too long a path for the tests to work
-	tempdir="$(mktemp -dup /tmp salt-XXX)"
-	mkdir "${T}/$(basename "${tempdir}")"
-
-	(
-		cleanup() { rm -f "${tempdir}"; }
-		trap cleanup EXIT
-
-		addwrite "${tempdir}"
-		ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}"
-
-		USE_SETUPTOOLS=1 SHELL="/bin/bash" \
-			TMPDIR="${tempdir}" \
-			${EPYTHON} tests/runtests.py \
-			--unit-tests --no-report --verbose
-
-	) || die "testing failed"
-}
--- a/app-admin/salt/salt-2017.7.4-r2.ebuild
+++ b/app-admin/salt/salt-2017.7.4-r2.ebuild
@ -28,6 +28,7 @@ IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-synt
 RDEPEND="sys-apps/pciutils
 	dev-python/jinja[${PYTHON_USEDEP}]
 	>=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
+	<dev-python/msgpack-0.5.5[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/markupsafe[${PYTHON_USEDEP}]
 	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
@ -50,7 +51,10 @@ RDEPEND="sys-apps/pciutils
 	)
 	zeromq? (
 		>=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
+		|| (
+			dev-python/pycryptodome[${PYTHON_USEDEP}]
+			>=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
+		)
 	)
 	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
 	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
@ -77,7 +81,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/pip[${PYTHON_USEDEP}]
 		dev-python/virtualenv[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
 		dev-python/timelib[${PYTHON_USEDEP}]
 		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
 		!x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] )
--- a/app-admin/salt/salt-2017.7.2-r2.ebuild
+++ b/app-admin/salt/salt-2017.7.2-r2.ebuild
@ -27,12 +27,15 @@ IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-synt

 RDEPEND="sys-apps/pciutils
 	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/libnacl[${PYTHON_USEDEP}]
 	>=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
+	<dev-python/msgpack-0.5.5[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/markupsafe[${PYTHON_USEDEP}]
 	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=www-servers/tornado-4.2.1[${PYTHON_USEDEP}]
+	<www-servers/tornado-5.0[${PYTHON_USEDEP}]
 	virtual/python-futures[${PYTHON_USEDEP}]
 	libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
 	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
@ -49,11 +52,19 @@ RDEPEND="sys-apps/pciutils
 	)
 	zeromq? (
 		>=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
+		|| (
+			dev-python/pycryptodome[${PYTHON_USEDEP}]
+			>=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
+		)
 	)
 	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
 	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
+	portage? (
+		|| (
+			sys-apps/portage[${PYTHON_USEDEP}]
+			sys-apps/portage-mgorny[${PYTHON_USEDEP}]
+		)
+	)
 	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
 	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
 	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
@ -69,9 +80,10 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		dev-python/pytest-salt[${PYTHON_USEDEP}]
 		dev-python/psutil[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-catchlog[${PYTHON_USEDEP}]
 		dev-python/pip[${PYTHON_USEDEP}]
 		dev-python/virtualenv[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
 		dev-python/timelib[${PYTHON_USEDEP}]
 		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
 		!x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] )
@ -87,14 +99,17 @@ REQUIRED_USE="|| ( raet zeromq )"
 RESTRICT="x86? ( test )"

 PATCHES=(
-	"${FILESDIR}/salt-2017.7.0-dont-realpath-tmpdir.patch"
-	"${FILESDIR}/salt-2017.7.2-fix_disk_format.patch"
+	"${FILESDIR}/${PN}-2017.7.0-dont-realpath-tmpdir.patch"
+	"${FILESDIR}/${PN}-2017.7.3-tests.patch"
 )

 python_prepare() {
+	# remove tests with external dependencies that may not be available
 	rm tests/unit/{test_zypp_plugins.py,utils/test_extend.py} || die
 	rm tests/unit/modules/test_boto_{vpc,secgroup,elb}.py || die
 	rm tests/unit/states/test_boto_vpc.py || die
+	rm tests/unit/modules/test_{kubernetes,vsphere}.py || die
+
 	# allow the use of the renamed msgpack
 	sed -i '/^msgpack/d' requirements/base.txt || die
 }
--- a/app-admin/systemrescuecd-x86/Manifest
+++ b/app-admin/systemrescuecd-x86/Manifest
@ -31,6 +31,7 @@ DIST systemrescuecd-x86-5.1.1.iso 517359616 BLAKE2B f139a521076f0345a65bddfd999f
 DIST systemrescuecd-x86-5.1.2.iso 523479040 BLAKE2B abf6f1e3e05e382b48dcfd4ecde9f70896462418cf36057e3a42dc2366e0b56133deeb6f00363d15d94238c22fb8ac5c88b57ca6c213c9dcc299fa04def5e2cd SHA512 516e60632459dd5408f83035aa265ed4169b13f978a23960a85837c9c8b5bbab70776e22a6e6727184bd9df81cbbeff4a5819d5927ff0ff3a79036bc4c54cfdc
 DIST systemrescuecd-x86-5.2.0.iso 569669632 BLAKE2B fe31a68df650b46bd875b91c643c8f1daaa60042ea6c59ac452bb99a2792dcdcee62f1b60c329a70c95689af22c1a0fc52a966631af347258d665f55d2f6d8c0 SHA512 42da80a419aa27bea891339dc163a62bff8ba34d74c202a7fd0317592e8870a71ddc7fa9e9ded5e9d2f75dc36ec8417673074ffde60ea472815405456e34876c
 DIST systemrescuecd-x86-5.2.1.iso 570523648 BLAKE2B 9bb6b2ff7b9930f658baddbf60ef89e86171febcfb48eb0a6ce1bfea8fd3348773a9da948370f9f310dd0e992c40aa64a4ef1442f5cd7f408f847d147074cf1f SHA512 6820f079c9e97ac0d383ed9096a120e7e31771e1d41465f4cf7f5db36a7cb83ccfaae5c5e561181c3b3cb169d4cc4a9a6904a707ecde06a6de4f2456d2a658e4
+DIST systemrescuecd-x86-5.2.2.iso 572006400 BLAKE2B 2cc95acc529ae8e0525664ffbdfefaf6e4513e8135fa6af120121b0b7930b0203bd17d5d70ccafacfe0064bb8615f45aa22b6e6e3fcee8a005a0315fd9b5cf62 SHA512 7dd1ccd63775e35f6589808416468c4a9314f4a7a5d0cb1f2bc34ffb9eef3a450b0da244dfc9e325d828c39404c0cdcce27cc990eade33762c17a1e32f8db9b5
 EBUILD systemrescuecd-x86-4.4.1.ebuild 1590 BLAKE2B 70a1114c8833e2df3fe54905b8dfd91abedc3873c59cc585617330e89295de77652af349c5d1ce113ee60c0b0d3249b6415c5c70fe8bf65ff790db85241b440c SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860
 EBUILD systemrescuecd-x86-4.5.0.ebuild 1590 BLAKE2B 70a1114c8833e2df3fe54905b8dfd91abedc3873c59cc585617330e89295de77652af349c5d1ce113ee60c0b0d3249b6415c5c70fe8bf65ff790db85241b440c SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860
 EBUILD systemrescuecd-x86-4.5.1.ebuild 1590 BLAKE2B 70a1114c8833e2df3fe54905b8dfd91abedc3873c59cc585617330e89295de77652af349c5d1ce113ee60c0b0d3249b6415c5c70fe8bf65ff790db85241b440c SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860
@ -64,4 +65,5 @@ EBUILD systemrescuecd-x86-5.1.1.ebuild 1590 BLAKE2B 8addcff756be5ff7bc9359ed5f0e
 EBUILD systemrescuecd-x86-5.1.2.ebuild 1588 BLAKE2B 88c93971c0fd71928de91c7d2d37079ef46537e92abdf7f8aeba30b272325ab3cd889a64f16aef63226bc59dd690ec9b545c0c78cba361a1c156a45560aaab5d SHA512 0a36c0954f88b29305844d133ee8d3171a8be0bbc66e22595daca50568a9ba50d715829d0deec34babeba5791819d89a767c1a197c7efd64b776b3c2f5f1fa5d
 EBUILD systemrescuecd-x86-5.2.0.ebuild 1590 BLAKE2B 5d509c43812e1012ecd4ae154caf450b27713e03a0005926aff8995d098bf49ce487c4f090b5032b5e2bf25fe03174199e7af1ad4608de955e8aadc464b86ed4 SHA512 087629ec3bee8ab3326df039262db4a07ebf9bbb98ebc9cfa00056f4fdc08f069c49a8cfecc5b2e6bb0c355037b1d34a754294339a8df9a3f0db9619117761f6
 EBUILD systemrescuecd-x86-5.2.1.ebuild 1588 BLAKE2B 88c93971c0fd71928de91c7d2d37079ef46537e92abdf7f8aeba30b272325ab3cd889a64f16aef63226bc59dd690ec9b545c0c78cba361a1c156a45560aaab5d SHA512 0a36c0954f88b29305844d133ee8d3171a8be0bbc66e22595daca50568a9ba50d715829d0deec34babeba5791819d89a767c1a197c7efd64b776b3c2f5f1fa5d
+EBUILD systemrescuecd-x86-5.2.2.ebuild 1590 BLAKE2B 5d509c43812e1012ecd4ae154caf450b27713e03a0005926aff8995d098bf49ce487c4f090b5032b5e2bf25fe03174199e7af1ad4608de955e8aadc464b86ed4 SHA512 087629ec3bee8ab3326df039262db4a07ebf9bbb98ebc9cfa00056f4fdc08f069c49a8cfecc5b2e6bb0c355037b1d34a754294339a8df9a3f0db9619117761f6
 MISC metadata.xml 585 BLAKE2B e0ce16c78e84339e1171bbf2e0aee7e27c3c32d4f795b1d176d872596330c531e6f960acd52526707464da2ad8d058035c42f3b9ff440bce139ce4b5703933d6 SHA512 51a7820398c4c637017c4a38bc0cd7b8b157e5dca57af0495a05c3df0bf09662287954bc04b24995585e8ecf3ff510177561db4dae3fadc64490d184319c18b6
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.2.2.ebuild
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.2.2.ebuild
@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto "/usr/share/${PN%-*}"
+	doins "${DISTDIR}/${P}.iso"
+
+	if use isohybrid; then
+		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+		echo "${@}"
+		"${@}" || die "${*} failed"
+	fi
+}
+
+pkg_postinst() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# no version newer than ours? we're the newest!
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		ln -f -s -v "${P}.iso" "${f}" || die
+	fi
+}
+
+pkg_postrm() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# if there is no version newer than ours installed
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		# and we are truly and completely uninstalled...
+		if [[ ! ${REPLACED_BY_VERSION} ]]; then
+			# then find an older version to set the symlink to
+			local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+			if [[ ${newest_version} ]]; then
+				# update the symlink
+				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+			else
+				# last version removed? clean up the symlink
+				rm -v "${f}" || die
+				# and the parent directory
+				rmdir "${f%/*}" || die
+			fi
+		fi
+	fi
+}
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/unace/Manifest
+++ b/app-arch/unace/Manifest
@ -4,5 +4,5 @@ DIST unace-nonfree_2.5-9.debian.tar.xz 16900 BLAKE2B f7120278d0bd7b5ccccd76b4ffb
 DIST unace-nonfree_2.5.orig.tar.gz 122509 BLAKE2B b395139e2f58bf0ef65774a0725bd3340eb1aca4a6680915eaecb93d5d744fca9f5e53a8866e861421b4fa08f462571d7662f68c091c35ed84e3bc367d9f846c SHA512 f7e9f3431f882160693cb55a90449e881aead9dc501bb4bb8303f04530bd3f6e1d84bbc2775d23e7c680e1e2d55a06872658c4b14c7bf51dd2db73fdcdea953b
 EBUILD unace-2.5-r3.ebuild 737 BLAKE2B 01bfcd31d54fd225a0adbe86203ec7a7c615bacc9ed27496511181313d0f68f942f15bb4240cde22fbfc7bcb031e6a34ab0969b43d4ebc190ce7a8d5c4c8a04e SHA512 5fae9bb1a6c8ab462faf143282a2276f1d523a28a20b3d4e73e417e1ef5b47b2fee88f66b065456d54b2e03a27f5ed5470ebd15d1646a8c28c47730306307ab1
 EBUILD unace-2.5-r4.ebuild 745 BLAKE2B 1670cffdd677a2ed4890852a7e132e98221a8c89e6b094b83e0bb4d26244a6001bbd8dde7a703c0f5da6e17df99e39dc176072f7e0e657078f65e262ec8447f7 SHA512 98543d7914ec4c5113585018750f5cbb4bcc0f5e16c30b19c017cfa09fb4f6c525610065e79f49c73901491f67308212919275d3548c9241e3342a4a97f81230
-EBUILD unace-2.5-r5.ebuild 680 BLAKE2B d32fc448a7d15865f4401d97259884310d32d705f906fad76cb614c071fdbbfc51ce07371f4355fb2306d86e6f6abb866b516369bb2077083b439f71ac208e52 SHA512 37dfc24995e4bf62c4c8935f6dee2a09d5bc4a81649fedfcb061fa643f1802697cde4ea23a2326b5ff7dca1da80793ccb36d097943726b5e2a79cda1c7b487d8
+EBUILD unace-2.5-r5.ebuild 679 BLAKE2B f1c6f8715e2f9397f47613b609f2251770bd70b13e128974e0fb80d625d37c72d8f6e672cd3bdc272588a29834d672f91920c9c7d03a376a8b1d3b25b865283b SHA512 0527523ab0104633089085b7eb022eea632911d2fa732f23974b2f7b482ce1eea2f1134445167caa64feaf3f4e0ee360bf044746c32e2022e8489ba7718538ca
 MISC metadata.xml 334 BLAKE2B 70154980d5673f6a7b222729a9d122d52b6a9eeb273105a0a99f8c8a334f9b2ce7b723e0055de15205177da6c833a989c5c19c60a551e9df9041e559096b53ea SHA512 13504f823b15124d38de0d351767169e9b51ed0f397175b3bb59ee7c16684c494d1adf2dc2be5cdea91e2f9186c5e318ee514d37b821eeec73f9f14ed5d731c4
--- a/app-arch/unace/unace-2.5-r5.ebuild
+++ b/app-arch/unace/unace-2.5-r5.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://debian/pool/non-free/u/unace-nonfree/unace-nonfree_${PV}.orig.

 LICENSE="freedist"
 SLOT="1"
-KEYWORDS="alpha amd64 arm ~hppa ~ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~sparc-solaris"
 IUSE=""

 PATCHES=( "${WORKDIR}"/debian/patches/ )
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
--- a/app-backup/backintime/Manifest
+++ b/app-backup/backintime/Manifest
@ -1,4 +1,6 @@
 DIST backintime-1.1.24.tar.gz 658961 BLAKE2B 88255ea138f31c4540f54d2053616d4c8ce35f7c969b15a9c46422bfed4f0fd2cabb01e0cd4d1505fb84eee31daacb9da36c6bf71225f5b9a1d47d6941e571b2 SHA512 d16b6d3a710154ca8bddf80a8f06835efe84dd2f2435102e06a732f7e6e291b1954864298542658bab2b7bc42d5a6bf1d9338a98c66fd3f888c450b9685cc011
+DIST backintime-1.2.0_pre20180221.tar.gz 712330 BLAKE2B 9ba40c5f89b9fbdf0b1c381bf2e3edce13553b2c301792627fc037bd2de181804b2dc6cad6e78a02844f8835dcd6415a35590125e832d55187fa2ed1a5fa864b SHA512 ad1bb11ea411904027952809c577de1a5317f40430af9b91b16a2c157d560c72b65c879bb880b557e9b5e333e76a44977a26486f4ed4f45281a5e8b0d4583c2a
 EBUILD backintime-1.1.24.ebuild 1813 BLAKE2B 60766b823aa74012c76716da47e526b1b46889a4b536c1cc9414a99535cb922419bf5b3266e30d452bd34ea99da32cc591cf14b4ea5374050d746d5b7479719e SHA512 d4b76c90a12c31741dbaec30c881fee6458970921aa54465b0bd503e2bbca3f1801e2bc2cbffc1df7ad58a7a306d6fa0a7957c0f7e79dbe806a66801d2da7a37
-EBUILD backintime-9999.ebuild 1780 BLAKE2B 04c66c0db49c28cabc939192dbee09272533f13a4ef3f975cda5c8c58a3dbf1b35b9b6cdf8c2994a32d1a331238f42916cd70dfd17d0803e10867506ebc4e9c2 SHA512 6c037745cd124111a1f823512b8e34a84aa15568a52aa44e30375e5a2d3e2ca5265f33a9a268d2a9ff706d536b2a56d1ee2cd7070a2379703d46531c35dafa10
+EBUILD backintime-1.2.0_pre20180221.ebuild 1835 BLAKE2B d017cea7a86598f04f151c449c67426d76d592452f8ac855986fceda0a1053e966003299c321709826da3e33184307ebb87287ba24b063d56ab104ad58a6c211 SHA512 c6b5475bc8c8ef9095db09e7c5263e2ac8cd0fdadf8271f83b4df461b9969120ac296fdf53a0f2680516d575ded7380ab5091a2be05a2dae64b30293c9881cc8
+EBUILD backintime-9999.ebuild 1742 BLAKE2B 2f898508c8297374a05f3c5a69bd5cdc1ca306729a1ee79fed8d60d319b2f4ff788a882bc789fd1be6c9a8d61413a84b2b055b55dead2845f68c317960065867 SHA512 acbbee1a19b0c627cfe7268770e1c51d41059c375ed022d94983b530d06f83e5d05f53a189a0a3e844d8baf77fb1df2ef62312e583dcd94245215ae3ae6b2015
 MISC metadata.xml 716 BLAKE2B 469a4318ff5607d74bb1d2166feba52686891921e59c117e15d54057eeafc1d5d3a2c9232e434c3783b04716b8784fcd092bc2d77553e1e56d27939ffb89dd50 SHA512 377471e000a0cb8f034f7c6a20596e48f7fe380c7910f0a97b6a47b779eb466efb6a02b4eef10569a9b9baf7e3eca03d6e22f87e36e4f11836ffb05fa38f7f0a
--- a/app-backup/backintime/backintime-1.2.0_pre20180221.ebuild
+++ b/app-backup/backintime/backintime-1.2.0_pre20180221.ebuild
@ -0,0 +1,88 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+COMMIT=45ec81c185789b2dbafd7348d1af039b5183c9ff
+inherit python-single-r1 gnome2-utils vcs-snapshot
+
+DESCRIPTION="Backup system inspired by TimeVault and FlyBack"
+HOMEPAGE="https://backintime.readthedocs.io/ https://github.com/bit-team/backintime/"
+SRC_URI="https://github.com/bit-team/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="qt5"
+
+DEPEND="${PYTHON_DEPS}
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/keyring[${PYTHON_USEDEP}]
+	net-misc/openssh
+	net-misc/rsync[xattr,acl]"
+RDEPEND="${DEPEND}
+	qt5? ( dev-python/PyQt5 )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_prepare() {
+	#fix doc install location
+	sed -e "s:/doc/${PN}-common:/doc/${PF}:g" \
+		-i common/configure || die
+	sed -e "s:/doc/${PN}-qt:/doc/${PF}:g" \
+		-i qt/configure || die
+	sed -e "/addInstallFile \"..\/VERSION/d" \
+		-e "/addInstallFile \"..\/LICENSE/d" \
+		-e "/addInstallFile \"..\/debian\/copyright/d" \
+		-i {qt,common}/configure || die
+
+	if [ -n ${LINGUAS+x} ] ; then
+		cd common/po || die
+		for po in *.po ; do
+			if ! has ${po/.po} ${LINGUAS} ; then
+				rm ${po} || die
+			fi
+		done
+	fi
+
+	default
+}
+
+src_configure() {
+	cd "${S}"/common || die
+	./configure --python3 --no-fuse-group || die
+	if use qt5 ; then
+		cd "${S}"/qt || die
+		./configure --python3 || die
+	fi
+}
+
+src_compile() {
+	cd "${S}"/common || die
+	emake
+	if use qt5 ; then
+		cd "${S}"/qt || die
+		emake
+	fi
+}
+
+src_install() {
+	cd "${S}"/common || die
+	emake DESTDIR="${D}" install
+	if use qt5 ; then
+		cd "${S}"/qt || die
+		emake DESTDIR="${D}" install
+	fi
+
+	python_optimize "${D}"
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
--- a/app-backup/backintime/backintime-9999.ebuild
+++ b/app-backup/backintime/backintime-9999.ebuild
@ -1,13 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6

 PYTHON_COMPAT=( python3_{4,5,6} )

-inherit eutils python-single-r1 gnome2-utils git-r3
+inherit python-single-r1 gnome2-utils git-r3

-DESCRIPTION="Backup system inspired by TimeVault and FlyBack, with a GUI for GNOME and KDE4"
+DESCRIPTION="Backup system inspired by TimeVault and FlyBack"
 HOMEPAGE="https://backintime.readthedocs.io/ https://github.com/bit-team/backintime/"
 EGIT_REPO_URI="https://github.com/bit-team/backintime/"

--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
--- a/app-benchmarks/bonnie++/Manifest
+++ b/app-benchmarks/bonnie++/Manifest
@ -3,5 +3,5 @@ AUX bonnie++-1.97-zcav-array-indexing-fix.patch 1474 BLAKE2B c31575b33594c310884
 DIST bonnie++-1.97.2.tgz 102533 BLAKE2B 019182c08b9ff7ba60e421f94039c09d27855f9e5b313f451721afdaedc9dc694b468bb30e78a04b655ec9a358ace3d68b13fc8f4d80ca3c48e0ff9387525b57 SHA512 e8303720be9a4ebcc454dbc8906a6843d63909c5101d66524a126ce0db3db7113d01edb7ed2f292bf9d08a6799579c4960f0ee4595019fbacda1601eba52a170
 DIST bonnie++-1.97.3.tgz 100166 BLAKE2B 30feca43a2ec37b795168d37bb941241777718222d7e0681dc85a34f8691e76b4306850e41dc6bbfb3f0ad34123ecd1c12396efea99e2ade12206aa6e78708e8 SHA512 44de20b5e46aeaf7f7214766b3c555b8799138f6fd92f87fe9b7dfa6f19815c629d6122c2ef4e4d98a5528dbfcd4c70b3b850eeba05739f6dd20251bf8d7c893
 EBUILD bonnie++-1.97.2.ebuild 965 BLAKE2B 1eb3c87ffc61ba3d9aa790ffdabb767f1eaeb96d929a155428d6edfe5a02124ea4f072e3ab43f95dd53cca58047c2540dafdbd1241615b2f44659c991767d0c7 SHA512 e8de81bf2a36c84a479c9632792b830ad589cc22a758b0f05ee650a6c62a5b998b283489219b4e3deadf7ad9baf1ef8edebbfa9e4bf1514cda80949c241afe8b
-EBUILD bonnie++-1.97.3.ebuild 965 BLAKE2B 1da60c99f8a0650567f425acab51e966d0cb1e7cc13d940b78d5ddb78114e5ffd8ccf9784458261f30aa6128136e017cdad97a162fb2cadd5b73dcfdeda12241 SHA512 984b535193e9db48b0963ed57009d5de46f21548e01760a0bc0c7fce77f8280d7f24867eed5937d11d3d680355cb41f52115ca72f15a89568ce3361f4d359b55
+EBUILD bonnie++-1.97.3.ebuild 964 BLAKE2B f5bf7dfd5d015e6226fdb9625403cc5aafd2088f2f6272f0b13cdd9d444d11c7d7623d60d72ed423864adb9f034481fff9f6d1b4ffbe51f7714101da2ca81570 SHA512 a182e252546d1d8ef98b4ec5031dab9b2a7b050df5a01f3018dd5752b231050f927ca2c64754421d121ab6bf990f83448c43619b437d7806592dd00257f77492
 MISC metadata.xml 610 BLAKE2B f9248e7f0ed78f7b1beffc4fcf133e76b09a7140bfa1b6d4aa42278181362223f272d3b6444075b51cc4f553fdad7ed9d092c6edca604475bffb890a278d6e98 SHA512 2914ce1d553546237acfec2ef0ba8689a81105fc9414f543cd9080f56090027107e698c1ac0f98f26e5b9658ea16ed27123f23b518fd91ddd0b4a858f6ac98bc
--- a/app-benchmarks/bonnie++/bonnie++-1.97.3.ebuild
+++ b/app-benchmarks/bonnie++/bonnie++-1.97.3.ebuild
@ -9,7 +9,7 @@ SRC_URI="http://www.coker.com.au/bonnie++/experimental/${P}.tgz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="debug"

 S="${WORKDIR}/${P}"
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
--- a/app-cdr/nrg2iso/Manifest
+++ b/app-cdr/nrg2iso/Manifest
@ -2,5 +2,5 @@ DIST nrg2iso-0.4.tar.gz 8553 BLAKE2B 2bd7907dc027c1bf602447c32f24f82d1627a90922a
 DIST nrg2iso-test.iso 55452 BLAKE2B c4bd651bde0bc66b781332cc186828fbe3fbff2c77150f5ac5cea5f42824b0016fd8b007991d94801a64edc43ce84e050a2db654380e3a0497b33d3abb11cdf5 SHA512 905c0b30482a3b411e786a4cc225dab7513a33c32bfd312717f4666543323456d2b6b6ddbeee75ed194e04cf28d472c87ffbdbf783c63abd06fae7e433601fba
 DIST nrg2iso-test.nrg 362652 BLAKE2B c122ae3b0c310e5c823ccbf33906135aa74f1001b02dc31f7fc0fa77b87b5627d31ea8746a64f0e8a2450e0ec20dc25f5fd72e202113237a95bc219f321c79df SHA512 c29f7e7d3f692a03fdbc5d0c1a112ead73efb45b102302f7f1685f9f2ccfe1eed9b690a3c3f1c7d7d79da9197fdb40dd06ca7bab4187e5dfca81d47268b550b7
 EBUILD nrg2iso-0.4-r1.ebuild 605 BLAKE2B 9e89e6ed10385f37c93a63e68ca6cf1ad56a1267258009ba43d2794e86df13bf8cfd7854963e9445f05faae36f9bf47dc6b5b5f44ad658fc070f3170b6244e4e SHA512 2b7c582b8d78b701974457a00440e347393de25771a5c149427a668205f98ce1a550f143c6782846b25d9c8f185f9172f742245aaa5ead67afc8f3cd44c082e9
-EBUILD nrg2iso-0.4-r2.ebuild 967 BLAKE2B 701dc7bbcb2d56bd0522b94e38255366693a52d53144d7bdcde9177f097c11ad8ca0174899bdac75562eb21e05972d66f7faa640f28e8d19dbe8371daa829b6a SHA512 96dfaa61caf373955a3db6301678fc9c91fd583a9462d7873f84852491ef7bb9769d6c7b9d5378fbb7629ae74ecfc7f4e07183702f81a4491a245b5cc54cf7d0
+EBUILD nrg2iso-0.4-r2.ebuild 966 BLAKE2B 2ca8a75f0be3aba7270951936f3e0183a542201e1e602dbdc2a92381c09a03eb092c5aa5c1bc9d04f580efd754a5637946dd4b4d794f1e52bca787c7935d336c SHA512 f527992d3ce7e31dda39147318a96d52a9ed271ed06015aefa1918078b78cd24d99ee128a95c4c5c232e1e4adf276dd131aef0c2492eaab9f34db36a817ff170
 MISC metadata.xml 165 BLAKE2B ed7e2ebe9f71491aa6163627bdb6606e798b98ca85c053b50442182a245074a9e09b290835e7c8fb4a10e4e8227c16ec306fd16f337cb66904095d864e698e8b SHA512 bebe508b4e0a7ca4a046f9befd3d7ddb702756024756a5f0d9fb5ace5fe3f5a98f9d42afda4597b7d1338607b8d43e41c8fcd6d20d31da3ebad2b420edd2cb59
--- a/app-cdr/nrg2iso/nrg2iso-0.4-r2.ebuild
+++ b/app-cdr/nrg2iso/nrg2iso-0.4-r2.ebuild
@ -15,7 +15,7 @@ SRC_URI="http://gregory.kokanosky.free.fr/v4/linux/${P}.tar.gz

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ppc ~ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 DOCS=( CHANGELOG )

--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/libu2f-server/Manifest
+++ b/app-crypt/libu2f-server/Manifest
@ -3,5 +3,5 @@ AUX libu2f-server-1.1.0-disable-help2man-gengetopt-checks.patch 1137 BLAKE2B fc1
 DIST libu2f-server-1.0.1.tar.xz 268648 BLAKE2B 9c6c2e5bafb2a95fcc5c2773de49b4db197ee6283e90cf0e4e62ff3982bdde8a51635cd9771e4dd35d27c71634367197d3b01b9c26d8a3847fccf1daf676f04b SHA512 51020722f49f787c793808b667e91923bde46e9137bfe5065106f83bcdb678e8d11cca12cb605d9622cafc15a9794c9080cf08e2a704293a791ab6f27ac47f47
 DIST libu2f-server-1.1.0.tar.xz 269128 BLAKE2B 084b177a878e8216f2ee5af9eeee11e691edcd12b7ed1b1c57f74bcc45f0418a0d44a9e72423c41b4104aa9f69807a0289172d08d21d168c6be5b36ee8c70bc3 SHA512 ebdb7c8c20727f37f4e31d8f16df7966603374f78478ada723a7b9bec1b0b0622caf6d12a65067ac8651f6088aaad61b2ad6ed51b9d6ef0dc45f031c974d8ff9
 EBUILD libu2f-server-1.0.1.ebuild 1141 BLAKE2B 940d5c772e94a0e77a72b56330a1c013da2588d573edb999a2d0af4cda5c8b62f07ea92eba0b45fb763200f6c7edf7f47bd115cf8bd4972e1681a6b0d9145bcc SHA512 6050266c78936ca416549483ded7beeb8866a23ca7cdebf0b5a973191bf27af0ece5cecf27c784c4abe8d1edbcd073baa7150236531d45dba18036dd20315459
-EBUILD libu2f-server-1.1.0.ebuild 1189 BLAKE2B 60714dc0ad14aebecc66c7053c87da0cca583e381af7435ada3a3cf8de4883042cd7c0ef55e0130e55ba97cd04da6df94ee4200a98e7e6fa9e69fff079dc7f84 SHA512 bb2effcb226d6e00c234678613d1b17b9cd498eb51b27bbf907f941b7bc2555ca9824a2c4b0a9cbba3defbdbf781523c658bdfcb0e9e0c456ccbe0a42f2a65eb
+EBUILD libu2f-server-1.1.0.ebuild 1188 BLAKE2B 59052e3f17f8f791706fdc0a1965ace969e642405130eb70d843bbd7e0d1af313a7300cf07b8d5a270d45f6de9cad7899ac41f0661d18201498b619104049f21 SHA512 437f7d002ece509e16b0ffde1d30f751699d4024f570699fc36846a352753fe9b33d3e11f7bee5bfcc35b11b1379b4e774e41f11ed8d5f60c243a46b79ab1b9c
 MISC metadata.xml 471 BLAKE2B 7fcdf8c4250dc67abb3e25e21dc602281b4030f38d3c2ed005685d0f9e1446bde39b451bf1240b3f1ee21b1622a01bd46ee838a03159eab24d3ac49a9c828688 SHA512 fd084dc4df2cdfbe25c7818605264e89e430a84f4c74ab1db5d798f510848a1d0208f178b5536be2f86ce3dbd8ba028f34e342363dffdc09f01544f748799db0
--- a/app-crypt/libu2f-server/libu2f-server-1.1.0.ebuild
+++ b/app-crypt/libu2f-server/libu2f-server-1.1.0.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.xz"

 LICENSE="BSD-2"
 SLOT="0/0.1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="libressl static-libs test"

 RDEPEND="
--- a/app-crypt/veracrypt/Manifest
+++ b/app-crypt/veracrypt/Manifest
@ -1,9 +1,12 @@
 AUX veracrypt-1.19-execstack-fix.patch 1682 BLAKE2B ce050f900ac6504242941322b910c74c79128d132a372b89070cf6939b5b55c6853617a8c2e49019d4cc4bc1eb872b0753c9287b3e500613bef63f74ef5ba48e SHA512 df7e64a7badfdf97447991cba7c7f87c291c89735b1ffc72b2cc882da05b2df2e2c31ee9aef4415c4d0316bc6e0a9c6c10e01406c00bd0f032931e55cd6465bc
 AUX veracrypt-1.19-makefile-archdetect.patch 743 BLAKE2B 3eda2de96eb095cf51a806d7a8b06a79edeb03425ad6106a6ec72de0d76da8988dd953e58b4b5b321ee64d3d810ff8d312efddaabea0c8083b858430525a7ae0 SHA512 aa805312c5e3782452ac936a3772a0877e866e1116f2da56747b72a6f585538fd1e45a7c7531c426ff0245b5b3ac4964065e1196874aea4c11e91ac59bd6fffd
 AUX veracrypt-1.19-remove-packaging-from-makefile.patch 2098 BLAKE2B 7588a0de42a5e561dea67c04b0056bd483ffdac0e407a640440d0b7d2723a66368c1eeebaf10c95e31a0114acd013e4d24d138a4aebc876fae51b2da0c9bcffe SHA512 e6485ce39ca009cfabe5656b3ed81cd72ca0207d9b1c310738be60705e3c94f2364cacf393b7f1d0d3e79a1ee58794dfda1d01aaa03778597c149a9dfc5634dc
+AUX veracrypt-1.22-sysmacros-fix.patch 1190 BLAKE2B 33130133b9bf3708eed0d2fa304850e216db9918c326be1aa78d06fa6ace1566fb03928731b096948a5dd9ee47accd10698496f6b1f1626acf2c6eceeefad9df SHA512 fbb1d411755669849fc343c8dd729cb804ec70f0ff1736faf864850e496628b6697dc3e4a821f31e31462e833391c30ff7c8883d014cb5b4ff3b853c6769fc15
 AUX veracrypt.init 387 BLAKE2B 7f16dee40bceed81ca092a3be6a2cd71f24f5cc8b4e4b143bd6ddde046e1ecce0cd674f52e7adb406893ef57c5b73462157832ff279114a2079c0ff84839e0dc SHA512 986b52c454abd9a64a6e8eb93247983c48d9524c396f253bc16f68894fed0abe87614343ce9c9127f8fb180f12912b21f57063f8f3b43bdca5344c130eb6c72d
 DIST VeraCrypt_1.19.tar.gz 23235780 BLAKE2B 0d02b3c6783d233f7cc64956eef58077e8a125fd5db28c1374921d8f2ca6dc9e1cde5402917c1ed4e4a626901e24c566ee834a12e41b6bcd150b8d64851f1ebc SHA512 ebce681099e04d938ff0dc10a1af848c82dafd80b165b2431ec355d64e29be4e60d1d63f0d5c9fd1182394080d00f0f573e3ae90f3e2167533dea2b895bd0164
 DIST VeraCrypt_1.21.tar.gz 24106162 BLAKE2B 5afe48830bde81d91d16f0bdf16010bdbdb885df84b9cd3e48191e468be51a485dfb3fc4f95da71d6d973a2f22dfbb92ee2b912dcf019921b37e1d4479c8c8d8 SHA512 5186d339f8fb0d88acfc35b1e7a916f797e30be93e8f252cca542b6d5c1cd916110111ef7b859d66b1790ce05d7d02bc72def26857eb003ea114a911fcec6c41
+DIST VeraCrypt_1.22.tar.gz 24820384 BLAKE2B 52fb822d07af96a9f47c17f8aacf13a949fb5a7c5d064a720e003e6d1bfbb5f221a5823720527e1f2c82f08547d77349cc90bc839336a622efcf1836dd97bb88 SHA512 83cdaf673bc9cdeadeb70b2beeabf87a2a9a65d3b0b0cc7fdf9c87671714af1e207ddd1db716302919e2d14414f5d4dd9d8f5203847d72834f53544a04c1a62a
 EBUILD veracrypt-1.19.ebuild 1988 BLAKE2B 20e3a4725dc5b8d319a11cb44d5865afcdcc6f956ff8c3390ed225f605e01b01537db1af5aa1c82deb7c236b27eea69cbc0c29b2f2f4b770fae4514360c45a2d SHA512 b9829bad13c5ba781d9ec2e8353ed72f30a23459d3e9eaa7384a5718be051f1eeff70c3c097225c8f557c57634d7b14b5db83bb189671630c673568667e67da0
 EBUILD veracrypt-1.21.ebuild 1921 BLAKE2B 1adf1a612afa33dc2cdbed7f0bc971e84e3ec45236ee6d7d7bf317c00a6b03a57eda5b30c85f8aeb4684abbd9879b9dab40b9dc2ceb6cffe36946a74ba1544dd SHA512 1766b6db76015cc6fb6f147a8ba1f75795b7038d402c38129c60cbdb09831dd0aed2241d4ec9d403cffa8dfe38f3481085c64ae653a49362be39c08f462de1dc
+EBUILD veracrypt-1.22.ebuild 2066 BLAKE2B f092deec3e48e6b0dfe50d8c5768770b1aaca5e2a65adffd8ac4a7f86ff458f8927267f36b53b7a3e2878920b3f1e393476f9b3bed7bd52cdcce9fa5cc19d09a SHA512 1a455b646f8ebe271f8e5493113a82007562e1cd7f7fca6ec984da95229674a9dee068b4778f2f07a399a491f2272ac20953d82edb574d4c767903a8332a4fd9
 MISC metadata.xml 726 BLAKE2B f70a62997301172fd3e6928dd694720fe1e7a8a41a2eb842800a220bed3531828423e2b4bcbb6c6d7f2d1d8ec96f74d1a987fac64390323662028efe57fe5d72 SHA512 7898d7a419ba57600609578ae308d558d2aacf6b7dcc625adb6adfadca9b6f580123650d63ed8a618131459f71fc9a1b2b367745e2f07da75cbdf6ef9c1595bb
--- a/app-crypt/veracrypt/files/veracrypt-1.22-sysmacros-fix.patch
+++ b/app-crypt/veracrypt/files/veracrypt-1.22-sysmacros-fix.patch
@ -0,0 +1,36 @@
+From 0a50becec3a3cca71e575dfec35d69ab295c85cc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?G=C3=B6kt=C3=BCrk=20Y=C3=BCksek?= <gokturk@gentoo.org>
+Date: Tue, 3 Apr 2018 23:06:20 -0400
+Subject: [PATCH] Platform/Unix: include <sys/sysmacros.h> for major/minor
+ macros
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Starting with glibc 2.26, macros "major" and "minor" are only
+available from <sys/sysmacros.h> [0]. The build fails with the
+following without including this header:
+
+Unix/FilesystemPath.cpp:84:49: error: ‘major’ was not declared in this scope
+Unix/FilesystemPath.cpp:84:113: error: ‘minor’ was not declared in this scope
+
+[0] https://sourceware.org/ml/libc-alpha/2017-02/msg00079.html
+---
+ src/Platform/Unix/FilesystemPath.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/Platform/Unix/FilesystemPath.cpp b/src/Platform/Unix/FilesystemPath.cpp
+index d6c9cd2..7c28af4 100644
+--- a/Platform/Unix/FilesystemPath.cpp
+++ b/Platform/Unix/FilesystemPath.cpp
+@@ -15,6 +15,7 @@
+ #include "Platform/StringConverter.h"
+ #include <stdio.h>
+ #include <sys/stat.h>
+#include <sys/sysmacros.h>
+ 
+ namespace VeraCrypt
+ {
+-- 
+2.16.3
+
--- a/app-crypt/veracrypt/veracrypt-1.22.ebuild
+++ b/app-crypt/veracrypt/veracrypt-1.22.ebuild
@ -0,0 +1,90 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils linux-info pax-utils toolchain-funcs wxwidgets
+
+DESCRIPTION="Disk encryption with strong security based on TrueCrypt"
+HOMEPAGE="https://www.veracrypt.fr/en/Home.html"
+SRC_URI="https://github.com/${PN}/VeraCrypt/archive/VeraCrypt_${PV}.tar.gz"
+
+LICENSE="Apache-2.0 truecrypt-3.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+asm cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 +doc X"
+RESTRICT="bindist mirror"
+
+WX_GTK_VER="3.0"
+
+RDEPEND="
+	sys-fs/lvm2
+	sys-fs/fuse:0
+	x11-libs/wxGTK:${WX_GTK_VER}[X?]
+	app-admin/sudo
+	dev-libs/pkcs11-helper
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	asm? ( dev-lang/yasm )
+"
+
+S="${WORKDIR}/VeraCrypt-VeraCrypt_${PV}/src"
+HTML_DOCS=( "${S}"/../doc/html/. )
+DOCS=( Readme.txt )
+PATCHES=( "${FILESDIR}"/${PN}-1.22-sysmacros-fix.patch )
+
+pkg_setup() {
+	local CONFIG_CHECK="~BLK_DEV_DM ~CRYPTO ~CRYPTO_XTS ~DM_CRYPT ~FUSE_FS"
+	linux-info_pkg_setup
+
+	setup-wxwidgets
+}
+
+src_compile() {
+	local myemakeargs=(
+		NOSTRIP=1
+		NOTEST=1
+		VERBOSE=1
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		AR="$(tc-getAR)"
+		RANLIB="$(tc-getRANLIB)"
+		TC_EXTRA_CFLAGS="${CFLAGS}"
+		TC_EXTRA_CXXFLAGS="${CXXFLAGS}"
+		TC_EXTRA_LFLAGS="${LDFLAGS}"
+		WX_CONFIG="${WX_CONFIG}"
+		$(usex X "" "NOGUI=1")
+		$(usex asm "" "NOASM=1")
+		$(usex cpu_flags_x86_sse4_1 "SSE41=1" "")
+		$(usex cpu_flags_x86_ssse3 "SSSE3=1" "")
+	)
+
+	emake "${myemakeargs[@]}"
+}
+
+src_test() {
+	"${S}/Main/veracrypt" --text --test || die "tests failed"
+}
+
+src_install() {
+	dobin Main/veracrypt
+	use doc && einstalldocs
+
+	newinitd "${FILESDIR}/${PN}.init" ${PN}
+
+	if use X; then
+		local s
+		for s in 16 48 128 256; do
+			newicon -s ${s} Resources/Icons/VeraCrypt-${s}x${s}.xpm veracrypt.xpm
+		done
+		make_desktop_entry ${PN} "VeraCrypt" ${PN} "Utility;Security"
+	fi
+
+	pax-mark -m "${D%/}/usr/bin/veracrypt"
+}
+
+pkg_postinst() {
+	ewarn "VeraCrypt has a very restrictive license. Please be explicitly aware"
+	ewarn "of the limitations on redistribution of binaries or modified source."
+}
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
--- a/app-doc/jargon/Manifest
+++ b/app-doc/jargon/Manifest
@ -1,4 +1,4 @@
 DIST jargon-4.4.7.tar.gz 9061260 BLAKE2B f2e29464d0ed946a5a2f0529eba3110f55ae068796522c05402ff2addc626501a43cbc633aecee15d6289e7a5236ce196f065ab782e4686142c51ba21658b517 SHA512 afc8c44994f22de3fbae325e315fa101c04a5db2ef6af7c5592b4c072cc0e94a2bc523042ab9c894977c34f8321aea77c8208ae57040a4e3419cd240ce169803
-EBUILD jargon-4.4.7-r1.ebuild 598 BLAKE2B 03e77ee4760ffdf7942f8d2ac90dcece35f9e9ba9c531b11172dce62003fa7a5fa31caa2e65d33047356179ffcb62b9314d67d988c5dd4f1f808e09a3837835a SHA512 f28344985b4a14bc8a73ed0516c25fa7c18e731ad14088a9720df1a694185ddc2702c93f43096da1aabaf72b7583a049f4e107d1ef26c7ca6db18b21cb3481c3
+EBUILD jargon-4.4.7-r1.ebuild 597 BLAKE2B 95c8e31e573e5a7f590f153b160e16b2bfb26c61e6bd16fbf12532a3ee1a86dffa4b576023ba13ae2ea805e4da3624c36c8b5cd92178f409c9a5ce5e9a1c3387 SHA512 ab2ce7706e6c8917e34eb89c1dd8d33fc17d8f9bc61e0ad002afc9d894782e2494dee40c42e5468eff531458b81c0d5f40f682958f9eee630220d4788f875683
 EBUILD jargon-4.4.7.ebuild 602 BLAKE2B 977b6df3fd38534acc879fcb567d3488a88a3c344eca8b4517636a767b346cba46b64203bcf63d69a18dcee6a159897ee34543bbb2458d6a6f597dddefbdfd8e SHA512 ef9f1e5cee8130882ae2c02bb0af1245c2e2ae1d89c20ac6d726249d254d686e36bf560cf2e99ea5c4e98fbbd25baa45c57c9470c4a9ebdd9200712cf2600204
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
--- a/app-doc/jargon/jargon-4.4.7-r1.ebuild
+++ b/app-doc/jargon/jargon-4.4.7-r1.ebuild
@ -9,7 +9,7 @@ SRC_URI="http://www.catb.org/~esr/jargon/${P}.tar.gz"

 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ~ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""

 src_prepare() {
--- a/app-doc/linux-kernel-in-a-nutshell/Manifest
+++ b/app-doc/linux-kernel-in-a-nutshell/Manifest
@ -1,5 +1,5 @@
 DIST lkn_pdf.tar.bz2 3533339 BLAKE2B d67708c7b100707b6a74f1a983bc396f1068e60d74c63eb2ed99830f0ea4b37b4260504d45f27ceae70e9c01b92b65d9e5076476466eade84f9dbe8d1b384fbf SHA512 5a0815148b379347675e2c8f71476e8e950a8028fd625044457773c4e7b62fb886edc7151a46a9dd0cba47729c99317f779974e395149d87c4c9483c7404ede0
 DIST lkn_xml.tar.bz2 1058278 BLAKE2B f85cc277e7f313e00d26f53218d315c6b741b584a597b2b0adf3a9bf3dc13ddaa2203b1d6976e4189aa8dbeb167709f7ed3522a7c9cf8111e62b6f8d0425de2e SHA512 831b19f67b50f897f93720c19b7bbf90673c420c2b1ce257de3c656a01cb12ebee8499dc86c673cba9c14fb6fc50e644fbf84156d9d2580127affeabda87a83c
-EBUILD linux-kernel-in-a-nutshell-1-r1.ebuild 664 BLAKE2B dc7d9ff8e80e47fdd0cdd9a48532555ca27349e8fc4ee3e6f53c59b9e2b9ff754c956a0cbaa87035913c0bf2b058146f966b2346efebfcca72b0a322eb9f2cba SHA512 4496ffd2aa066865856a7f6d82871674f66a996d8bdf3d0b0066c3eeb40c3ddd00b4fb7741d83919314265c727b6addb567fe496e8faba08bf989d55a5f166ef
+EBUILD linux-kernel-in-a-nutshell-1-r1.ebuild 663 BLAKE2B 8aff176a9164daaf568327a48feed7ff38e5b551bfc3c6111d4d0f963a5cad05d6e161c2297c986aaf10fb1db6e61d32c1f6fcd9fb7253e4d528a9e5175ade4b SHA512 802e77c2bd54c6653f9af2714d4367cf89fdac26b903d573efdbf6a74f6924c2a3ec9741ee39d8807ed5eccd414de6b94c002c734d4ec82c93a920447495f652
 EBUILD linux-kernel-in-a-nutshell-1.ebuild 644 BLAKE2B 228bce01ce5ecf7c8bc8c441e5b1a9722c056d6e02004c6de56dd597c058d4baf7885b321e82c320a25eae14e2c78801b273eee7f17e8e202c03ee900e8daeac SHA512 de7e025ebefe5fbfd920411948524ad3261f7460c6f0eb1ef7f6bdb07f9f04f3383692de514a09ed6858f273ce5156eab51a5f90a98319a36f6103c11814e1b6
 MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
--- a/app-doc/linux-kernel-in-a-nutshell/linux-kernel-in-a-nutshell-1-r1.ebuild
+++ b/app-doc/linux-kernel-in-a-nutshell/linux-kernel-in-a-nutshell-1-r1.ebuild
@ -12,7 +12,7 @@ SRC_URI="mirror://kernel/linux/kernel/people/gregkh/lkn/lkn_pdf.tar.bz2

 LICENSE="CC-BY-SA-2.5"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE=""

 RDEPEND=""
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/leafpad/Manifest
+++ b/app-editors/leafpad/Manifest
@ -1,5 +1,5 @@
-AUX leafpad-0.8.18.1-fdo.patch 553 BLAKE2B 5ff80867ce1e325adfdbf08aa4be605842fd5db7ea74b91e9a6ff677d7882239245b8f876d46f284f5a968fb93a597f795ae4418ebc13831cf5844e36e782b03 SHA512 b22900988573d962068d4e328e208aac2495c1b463151ec43f5fe1d7159a69a317f3ba1d882bf8d471908951852631bdecbbfee3c2eea5ca4ef1072e3c411268
-AUX leafpad-0.8.18.1-format-security.patch 813 BLAKE2B 2f9eb76f90ed1e17b4958d369631234a83f809160b8142ea418db60712f268b59b35780bcdea3e484ab7091583d8559ca12eb92622ff08ac1085dce7e355c238 SHA512 934c29cab4684fa9d33a6028d7edbf5b15bdf4591ea2ae5f9d071d2252a32670a8fda3ec44d55e026b0897814113234942423d886c2d479e73aa45c96272a99b
+AUX leafpad-0.8.18.1-fdo.patch 557 BLAKE2B be91b5e3c6159701303254d6c7c753dce3b19eb05046f097470b83ac0f21c52bc05da4862dedb05f658fd47efa8d349a4ee5b3361192076abe6ed451497ae7e3 SHA512 db3badb11cb1244035f988c7a512a0fc2559fdd0afa4c7fe432e3d600648526f9f19d42c939466325931819e229eecafb49b4c75837a01d122eac214fd66de32
+AUX leafpad-0.8.18.1-format-security.patch 821 BLAKE2B 2b26cdc2ddc6cd0047c40fcf0b4c1f4bab4aedd422169ccfcf88c58db60320f7fa75367ba6a6d46ba9fa28c6d7275f79dbadafb393e0e7e8f78352ebc7574c03 SHA512 d8a39dc2412055a41eeb7966ff7e3884489d584726501233f67d8d56bded6e50467bcc60a4c2d0be972c0eb6732d9bdc7d00f69845737b049e8b0cc046f87a64
 DIST leafpad-0.8.18.1.tar.gz 289117 BLAKE2B 41f01f9b9e031c749a4b1a06d32edbcf9b0f0a694141c79bb462fce29d59f87efa52bc4a7faf270ce28f04697deb6350fe4e26317d28450d7d785a01007c06c2 SHA512 1caad712967f634f585ab32e406534b5ce2c5621008c1eb5b2b48f17ca0f48cd834ea2ea1c67eda4053fa84e8727ff0e708e99d3b5dad838dcf0701389788257
-EBUILD leafpad-0.8.18.1.ebuild 940 BLAKE2B b8f35e9ed93ebae4bbc2a134243a0abfdd18f0993dc0a4e4f97035d0c64703a20a57fb9fa448c3d7617ace31eefeeea25d84be5d13fcc65f49fa0a5da3e5eb95 SHA512 c69c9dd650f368ef0525b971ae51f9e760b5abeb04d95e0e7b862b0f4428ed12b894cac2e2523644f040d10b09981eae693799f7ec2acbe79acf83f5e18931ca
+EBUILD leafpad-0.8.18.1.ebuild 826 BLAKE2B 51a19dda328c9d214a88a45f1df00462730fcfc758cf29650c4e587d2e8b2e0c6371f556f2aec9150ad6eb2dec2d6534122d63cfeed4701d7e9a0c2e9cef075b SHA512 08dc550cdec48dc11200f548341120674c6f81c17808dd99792f14d9b67191335a60d6b28b7ef80b86434d11fc3dbc7a7382944228bfed678e74f1b769a6e840
 MISC metadata.xml 205 BLAKE2B 14c07c010c87fb27c21a84c8c1a03a4f7a145a8de84571b9a112a7bbf9f0677a8cb7e02a61d9d9dc322174839e0f5e6c721a07988a835b189ac6fb97c39527ce SHA512 e94eb3d2eec0ffa8543112e75899eb7f2c582d2e5615a82b568e907e488f0a8b400946550ae39c7d278a8fa8c8912e6221e3013868ce7e218abbcf76b57cb693
--- a/app-editors/leafpad/files/leafpad-0.8.18.1-fdo.patch
+++ b/app-editors/leafpad/files/leafpad-0.8.18.1-fdo.patch
@ -5,8 +5,8 @@ does not have a semicolon (';') as trailing character

 leafpad.desktop: warning: key "Encoding" in group "Desktop Entry" is deprecated

--- data/leafpad.desktop.in
-+++ data/leafpad.desktop.in
+--- a/data/leafpad.desktop.in
+++ b/data/leafpad.desktop.in
@@ -1,10 +1,9 @@
 [Desktop Entry]
 -Encoding=UTF-8
--- a/app-editors/leafpad/files/leafpad-0.8.18.1-format-security.patch
+++ b/app-editors/leafpad/files/leafpad-0.8.18.1-format-security.patch
@ -1,7 +1,7 @@
 - dialog.c:39:3: error: format not a string literal and no format arguments [-Werror=format-security]

--- src/dialog.c
-+++ src/dialog.c
+--- a/src/dialog.c
+++ b/src/dialog.c
@@ -36,6 +36,7 @@
 		GTK_DIALOG_DESTROY_WITH_PARENT,
 		type,
@ -18,8 +18,8 @@
 		str);
 	gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
 	gtk_dialog_add_buttons(GTK_DIALOG(dialog),
--- src/gtkprint.c
-+++ src/gtkprint.c
+--- a/src/gtkprint.c
+++ b/src/gtkprint.c
@@ -165,6 +165,7 @@
 		GTK_DIALOG_DESTROY_WITH_PARENT,
 		GTK_MESSAGE_ERROR,
--- a/app-editors/leafpad/leafpad-0.8.18.1.ebuild
+++ b/app-editors/leafpad/leafpad-0.8.18.1.ebuild
@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

-EAPI=5
-inherit eutils fdo-mime gnome2-utils
+EAPI=6
+
+inherit gnome2-utils xdg-utils

 DESCRIPTION="A simple GTK2 text editor"
 HOMEPAGE="http://tarot.freeshell.org/leafpad/"
@ -20,13 +21,10 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig"

-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-fdo.patch \
-		"${FILESDIR}"/${P}-format-security.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-fdo.patch
+	"${FILESDIR}"/${P}-format-security.patch
+)

 src_configure() {
 	econf \
@ -35,16 +33,12 @@ src_configure() {
 		$(use_enable emacs)
 }

-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 	gnome2_icon_cache_update
 }

 pkg_postrm() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 	gnome2_icon_cache_update
 }
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
--- a/app-emacs/magit-popup/Manifest
+++ b/app-emacs/magit-popup/Manifest
@ -1,4 +1,4 @@
 AUX 50magit-popup-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
 DIST magit-popup-2.12.3.tar.gz 40195 BLAKE2B a351e949207b674c734f66b0431fa4c137293ccff880e3f457dfb825d7a36afd37f59197170a86d52606d371c181cd8a23be54d74aeee192a2d1a56588a55b3d SHA512 50620ce1d364ae28f30658dedd8f235bb1055be5cf4320142b7648e2ff6137f84cf865ea8f41e34ad7fb42612ff5d36fc0c4f6caa0aa0d2071bf775c15be5833
-EBUILD magit-popup-2.12.3.ebuild 593 BLAKE2B 80350ddfae333109b8ec89b58c5381bd10303c79e0ffa9171216d8f7792202571088848ca9ac3e1b7758ec442c96afba1e744689dcce3e4828389c4b8cdb4726 SHA512 ad170abb5727e6f5155514ef5f2c48c8554be31a037f88915f4790d8bb1749adc53a54c34e9d5bdc86238733c61360dcf699455524ad883fffdacef5b2b387fa
+EBUILD magit-popup-2.12.3.ebuild 596 BLAKE2B 39e54e5f14d5648c2e8d1c30f2da09cfb7345d1cf80650a4fd226dc7dbbdb0560ca24761ed46a4910a47bc46bd6a5a403edab90afc051b7ea60c5af813106191 SHA512 60cf12225cf6a27a5ecbe0afe7ff6d3e6c20b351aae312518a150bd8bfbb485e7310b2a17ab4743f413f3cb7da35aef5ccc00d3a99fa23ee675eeb11e181a204
 MISC metadata.xml 1147 BLAKE2B 68fe5e7240434621fe4d1148e8f05d162771f8c90123790d757fec03d3c54dd686630860eec299371bf2f5356e0b8880a8ec46e1c7bff3d697d477fc095f58e1 SHA512 1e1aac2080140c50012bb3e35cb62c53fb782f9ac3041df3b7d1f8c86822bd7eba2f773c65205a58c65c791a095fc82bd39265dd05cdff52ace51e38a58666e0
--- a/app-emacs/magit-popup/magit-popup-2.12.3.ebuild
+++ b/app-emacs/magit-popup/magit-popup-2.12.3.ebuild
@ -20,4 +20,5 @@ DOCS="README.md"

 CDEPEND=">=app-emacs/dash-2.13.0"
 DEPEND="${CDEPEND} sys-apps/texinfo"
-RDEPEND="!!<app-emacs/magit-2.13.0 $CDEPEND"
+RDEPEND="!!<app-emacs/magit-2.12.1
+	${CDEPEND}"
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@ -19,5 +19,5 @@ EBUILD lxc-1.0.11.ebuild 5899 BLAKE2B 015dd027c8ac9e51f7f93a0fe6e82ac66122929179
 EBUILD lxc-1.0.8.ebuild 5932 BLAKE2B f8f4843c5da5405e69ebee0b3c5e1d50057d15baa841f4b20edf8acc22cc6f761d1723fe1f9cac93b4129ce10ab5eec0c52c44172dd724f0f2c65d24e293e7e1 SHA512 6af1e114ecc64264eafb85e77fba744e4b8dfdf19c8d2b769959d642df237e29813f71bcf370ea75685cb728592c6b9f9a9637d0b4b00f13d40ee8c110045619
 EBUILD lxc-2.0.7.ebuild 6343 BLAKE2B 9b93d611f9ab364779579bbab92b0e11245f2df2bce41e2c0aa87dc3886278eda9d41466c8922cbc587bbb34933341e6afd26ed675df1571504629d2176c1814 SHA512 91312a9209a731026aa53f3d7bb73a0dc8f90f9fc37680cf56439067bd63aa3f35c60d2d320d5fae3d8469ea1a3fcd8e83ee5093ea4252643fd82e776ea5d58f
 EBUILD lxc-2.0.9.ebuild 6597 BLAKE2B 33bef88cb3a507674824f6dc38a61a633d16a2da037c40d06455a5b5b11cdcfa73e7f7975bf52bab6288017261bc031d0407fdbe4a5ce001d18c59f4bc77bf88 SHA512 def7c5c687e8a91fc3b763747ce7a311fb000c8fc1d9cf8270c2863694e79a7b6e84b578eb441139c9051c93bba90a82821d3cc930b171d53a6c4c7fd9ad514d
-EBUILD lxc-2.1.1.ebuild 6749 BLAKE2B 9d0090eecbadcace30a4ff6cf6c287b28d12c4483798f50b31b7d3d5e082ef365840612800850075bb5f1a5bc0cac3d104631b0b2245ff4d54eb3f8c35d9be1d SHA512 09b9ca583bc81bcd7a1962db22de636d4ae452bda70991b071a2458df3970387f3a574a8d101fa9ab396029232b139c73afdf500d03ea842564fd62ab250152f
+EBUILD lxc-2.1.1.ebuild 6766 BLAKE2B 229ebab9afd710c885c08794463464c8acbc11eb4fb47a4fc0747ad65d80da71960bbfea46292819fdbfedcf4fcbce8434067a36898e42f0842d191c08c79ddf SHA512 ae74ded64f600cb6034169c7dfbdbbacc98a7cbdd283743a7d4b95087868e286d91aa653795467a3989d7fdf3133052e709f802e48133fbccdccb44cfd31d8b8
 MISC metadata.xml 811 BLAKE2B 433a5cbe39002614c88eae4829c998493e95cb0b8eeb0a9f546e08e33a82fe5edb384e9a9f747d1129e0cdb7b8a634bdf4a0b7cf385bc3d243dc83cab06b899c SHA512 fea5f647ca7eb616307378375af86051034e03170f6ce62e2219f78343797072902102515f93cc0f809558fbfbca88eb81e9f8d0fa621ae18381d39a12c31aa2
--- a/app-emulation/lxc/lxc-2.1.1.ebuild
+++ b/app-emulation/lxc/lxc-2.1.1.ebuild
@ -146,7 +146,7 @@ src_configure() {
 }

 python_compile() {
-	distutils-r1_python_compile build_ext -I ../ -L ../${PN}
+	distutils-r1_python_compile build_ext -I.. -L../lxc/.libs --no-pkg-config
 }

 src_compile() {
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@ -6,12 +6,10 @@ AUX qemu-2.5.0-cflags.patch 410 BLAKE2B 1d072b5dd00369bb565b30c2aa7047de92b441bf
 AUX qemu-2.5.0-sysmacros.patch 333 BLAKE2B 8c38410c6ea789f669d89c7321cdc9e5c734bb3db332272657302977241f157b04fb07e27bda4f67ee560e39a7494344ad79616835e6ff483927f2b72ed9c597 SHA512 329632c5bff846ca3ffcdb4bc94ae62f17c6bdbb566f9bec0784357c943523e8ca7773790b83a9617734cab3b003baa3d636cbd08f7385810a63b0fa0383c4f0
 AUX qemu-binfmt.initd.head 1445 BLAKE2B 5762a38034331a13e308f6fc8cb979e38ae01a053691726edfc1d99e1bca1698919ad564a593e018308f1fd00e2f887865fd9db157d8de83941295bc47c1db6c SHA512 a735268ae9ac84d8f2f2893bf018ee6de33231fa94a823bd8502b529bb456635c1ab5cf9b440df5ede8e414291f8bf45fc53898c2f3939c50d5ec4ffa554396a
 AUX qemu-binfmt.initd.tail 245 BLAKE2B dd59f2944c6e3f0c4d282b94b687a9b5c51dd77c5103fb9889bd9ce56874495397676ae6c8375d9e9e23094828477240778d9e0f361e68cdd63fdad574851561 SHA512 bcca16805f8380d52cc591ea3d65a8f6e5de456730618f6aee301510edb75d235a22d4d7aeed224882210392840adb403eb53234b6cb76a4cb24533852a8b737
-DIST qemu-2.11.0-patches-r0.tar.xz 16140 BLAKE2B 2e23908075195a7c28df574525a159e171277a2da6d7c0656a341a2db6a622237106d2dd8de5c9d61b5fb62fa5a163e9657406a2996cebc05baa53d42c5f5d15 SHA512 f7d92c2232398565b8cde294d38dc281c13503fb5967cc7871a2233b7fa354799619445e9ec89c285ef051f62ecef0bd38a135b0093bf5528c0b28c6e580c839
-DIST qemu-2.11.0.tar.bz2 32816398 BLAKE2B 2014a8246f3cba9069186629d9ec8c221672fcfd3e8cd28a7e57f467add81f7bd84363183ef5cc5d18af91bde9186a4da49c0133c8ead83eae4626b9fc364e99 SHA512 3681700833573c0aa6283af950bfa298970056f1b44489088d8863840a7694512138321f86961ef43b256abf15eddd2612fb9cdbe3d9a358542d4e7037cc2004
 DIST qemu-2.11.1-patches-r1.tar.xz 2064 BLAKE2B 533c916b01c014bcfa6c733b76aa6da1f12cdf5f0d4ae33136453705a8aca9fdfeef998747cfdc72d19e08fa40ea97e2fd4c21412c030af314605059282f49ef SHA512 12de7b4777ec98871d0786291534f61b37534feef64b556caeab72e020ff14d61fe19d24cb151ebfdb912df2a7ba72c0d882566b368d88d02c9f1354c2adae4a
+DIST qemu-2.11.1-patches-r2.tar.xz 3652 BLAKE2B 4c3bf7503a838c2a978bcc973ee7d8909d662980aa2ccb71f3bff69a7aa79cc2ed405ed4648914808c64a538c0ceeef2904380cae38ee6c94176a11c9ebdbed3 SHA512 35d3aaeffe7655e739cd6d7c420692fcc6d2d76e49a8fd288f09bec81146075485675d1f912a7fc531ac8497977bcd259e97c260b61a7e854c378f6b9b2d4a79
 DIST qemu-2.11.1.tar.bz2 32819412 BLAKE2B 6b6d4e7b8dcf33aeedb0b33bad267da07ad17c2eeeb5fbd2c038d760bc03224e55ba0f03eb248c62bc0e8636c2c660ea76b367eaea96bee16388053f82c8b8a9 SHA512 1b692bbdfc3dc785738c7192aa2a3f9cf53d9f5bf3b3f49fa8692050dc50f7056c8a4d1b527d48ffb2a674a0fd3a46d87addd1eaaa758f35eec1ab5adfe32354
-EBUILD qemu-2.11.0.ebuild 23630 BLAKE2B 0a6a289e37840774e92c506ad332d39213dc692ea5cfab4b3f54c45e159e0c3eb07f4831b27a808aefa1184697810336985cc79039773d40e1a50fd6780e6013 SHA512 74cb6375469740801198daa99606f26cf570a2298c8cd78eff362105474128d082d59aaefef627abb16484feee901f53c3b37b958d8c32843437dadb1655cb0e
-EBUILD qemu-2.11.1-r1.ebuild 23630 BLAKE2B f081ef952d4ca075474d62bd60ac9a0ecfe82c6f8032d64386cfef8d23bc891c00369d8a6646eed9fcea69f696c388236970b96b793be9123541a8f50b3ad19f SHA512 21c831ece5422d66074874e3e0c19bb449631f402f9718c402862550c84e723edcf52b8688b3447cc996ee613877dca9d41011f25e58ae77154373fe9962903a
-EBUILD qemu-2.11.1-r52.ebuild 23723 BLAKE2B 30b62d91f4e6e2a09822ebcb404b809c0ffaea8bf84c5cacb8c5c63b34875886542622466602e23497e46a4af7477b490599fb945911854742bd8480b2a36498 SHA512 7c439a895d64cd64f5ea892978a8283dea90b767cb303ec51bd2c301a99652d3485f679d7153c2f5cf630a408025c11e3f5de830ba64f77245db40a3efe4c300
-EBUILD qemu-9999.ebuild 23576 BLAKE2B 851d4d1ea9b7a92339ca280f9f9806ef7839cf13cba9a97c5d78a5641668725e37212af380d20c23b5bef1d3cd6c06d77889c0c5a662595543edafa4811e273b SHA512 44d44335d6fb4c60d389072ac7779602f7b94caff6871456f4ff2b0b0219de3d552f4d36f183325e882feb5f8c7ae2f213da4c815bd075be719d8ed1116e7e20
+EBUILD qemu-2.11.1-r2.ebuild 23622 BLAKE2B cd2249a4ae34c67ccadfce510e9def671a147d0eb921db68b02d0a5d13ff45548cdbfcca1dd086be1436bed77ddec3c9215139ed361c485fbd5e87de7177177d SHA512 af5677ff0fd37b77305b41f963767cceff6d4dd5074eefc2239447607e64587464f3fb989c3cee7110c65c1aecabd29b47ab48bfee25705007a9edffac533af5
+EBUILD qemu-2.11.1-r53.ebuild 23715 BLAKE2B 6961fcb404b94bd7ade1223ef10b9347f87b927079798de996b80f5bdb344ce5cfdce67699c5a0f37241612636049f6bcdfd2a14f51cdf64d6ab382e51f5a706 SHA512 2bfdbe8ff483476e40a0f6a0d7069304bdd0f8150d77865647fa312eefaafa273e6aa9749d1dd3a1d62c038acdeb5089eccfddf07d0246404154447e956768ab
+EBUILD qemu-9999.ebuild 23566 BLAKE2B 54612e651b7b71a07d4b918ce9d7f0cc5fe3583eda3e36bee4ee01c6a8a7b3df95188ba551f09c14a70396bd138335097d14f614979932431d16887b2552b96f SHA512 6273eb8b09a6305306b00f532c4205a2c9511573ea5537855e7f55ee746b377b9abc4c39fbfa6c726f5247d0d2ea875ee927e7b04622dcf7a15c15f5819be743
 MISC metadata.xml 3886 BLAKE2B cdb2e81e36f77af3faba1142d5d58360d2cf9e7bd832bff49a7c0968066093c42e0d032d85a6a2aacbe6b1daa56d2ea42d918a2d75cf8a3a202dd8d0ce71239e SHA512 f1c489986c357f17b36686705d58378550684a43660522298f73283e2caffd2f68239b30d43999f04b7e71092c79d58169583d95f77a9fd5160080dd91f8bee5
--- a/app-emulation/qemu/qemu-2.11.0.ebuild
+++ b/app-emulation/qemu/qemu-2.11.0.ebuild
@ -1,805 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ncurses,readline"
-
-PLOCALES="bg de_DE fr_FR hu it tr zh_CN"
-
-FIRMWARE_ABI_VERSION="2.9.0-r52"
-
-inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
-	user udev fcaps readme.gentoo-r1 pax-utils l10n
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="git://git.qemu.org/qemu.git"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2"
-	KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd"
-
-	# Gentoo specific patchsets:
-	SRC_URI+=" https://dev.gentoo.org/~tamiko/distfiles/${P}-patches-r0.tar.xz"
-fi
-
-DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
-
-LICENSE="GPL-2 LGPL-2 BSD-2"
-SLOT="0"
-IUSE="accessibility +aio alsa bluetooth bzip2 +caps +curl debug +fdt
-	glusterfs gnutls gtk gtk2 infiniband iscsi +jpeg kernel_linux
-	kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png
-	pulseaudio python rbd sasl +seccomp sdl sdl2 selinux smartcard snappy
-	spice ssh static static-user systemtap tci test usb usbredir vde
-	+vhost-net virgl virtfs +vnc vte xattr xen xfs"
-
-COMMON_TARGETS="aarch64 alpha arm cris i386 m68k microblaze microblazeel
-	mips mips64 mips64el mipsel nios2 or1k ppc ppc64 s390x sh4 sh4eb sparc
-	sparc64 x86_64"
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS}
-	lm32 moxie ppcemb tricore unicore32 xtensa xtensaeb"
-IUSE_USER_TARGETS="${COMMON_TARGETS}
-	armeb hppa mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus tilegx"
-
-use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
-use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
-IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
-
-# Allow no targets to be built so that people can get a tools-only build.
-# Block USE flag configurations known to not work.
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	gtk2? ( gtk )
-	qemu_softmmu_targets_arm? ( fdt )
-	qemu_softmmu_targets_microblaze? ( fdt )
-	qemu_softmmu_targets_mips64el? ( fdt )
-	qemu_softmmu_targets_ppc? ( fdt )
-	qemu_softmmu_targets_ppc64? ( fdt )
-	sdl2? ( sdl )
-	static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio )
-	virtfs? ( xattr )
-	vte? ( gtk )"
-
-# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
-# and user/softmmu targets (qemu-*, qemu-system-*).
-#
-# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
-#
-# The attr lib isn't always linked in (although the USE flag is always
-# respected).  This is because qemu supports using the C library's API
-# when available rather than always using the extranl library.
-ALL_DEPEND="
-	>=dev-libs/glib-2.0[static-libs(+)]
-	sys-libs/zlib[static-libs(+)]
-	python? ( ${PYTHON_DEPS} )
-	systemtap? ( dev-util/systemtap )
-	xattr? ( sys-apps/attr[static-libs(+)] )"
-
-# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
-# softmmu targets (qemu-system-*).
-SOFTMMU_TOOLS_DEPEND="
-	>=x11-libs/pixman-0.28.0[static-libs(+)]
-	accessibility? (
-		app-accessibility/brltty[api]
-		app-accessibility/brltty[static-libs(+)]
-	)
-	aio? ( dev-libs/libaio[static-libs(+)] )
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	bluetooth? ( net-wireless/bluez )
-	bzip2? ( app-arch/bzip2[static-libs(+)] )
-	caps? ( sys-libs/libcap-ng[static-libs(+)] )
-	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
-	fdt? ( >=sys-apps/dtc-1.4.2[static-libs(+)] )
-	glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
-	gnutls? (
-		dev-libs/nettle:=[static-libs(+)]
-		>=net-libs/gnutls-3.0:=[static-libs(+)]
-	)
-	gtk? (
-		gtk2? (
-			x11-libs/gtk+:2
-			vte? ( x11-libs/vte:0 )
-		)
-		!gtk2? (
-			x11-libs/gtk+:3
-			vte? ( x11-libs/vte:2.91 )
-		)
-	)
-	infiniband? ( sys-fabric/librdmacm:=[static-libs(+)] )
-	iscsi? ( net-libs/libiscsi )
-	jpeg? ( virtual/jpeg:0=[static-libs(+)] )
-	lzo? ( dev-libs/lzo:2[static-libs(+)] )
-	ncurses? (
-		sys-libs/ncurses:0=[unicode]
-		sys-libs/ncurses:0=[static-libs(+)]
-	)
-	nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] )
-	numa? ( sys-process/numactl[static-libs(+)] )
-	opengl? (
-		virtual/opengl
-		media-libs/libepoxy[static-libs(+)]
-		media-libs/mesa[static-libs(+)]
-		media-libs/mesa[egl,gbm]
-	)
-	png? ( media-libs/libpng:0=[static-libs(+)] )
-	pulseaudio? ( media-sound/pulseaudio )
-	rbd? ( sys-cluster/ceph[static-libs(+)] )
-	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
-	sdl? (
-		!sdl2? (
-			media-libs/libsdl[X]
-			>=media-libs/libsdl-1.2.11[static-libs(+)]
-		)
-		sdl2? (
-			media-libs/libsdl2[X]
-			media-libs/libsdl2[static-libs(+)]
-		)
-	)
-	seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
-	smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
-	snappy? ( app-arch/snappy:=[static-libs(+)] )
-	spice? (
-		>=app-emulation/spice-protocol-0.12.3
-		>=app-emulation/spice-0.12.0[static-libs(+)]
-	)
-	ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] )
-	usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
-	usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
-	vde? ( net-misc/vde[static-libs(+)] )
-	virgl? ( media-libs/virglrenderer[static-libs(+)] )
-	virtfs? ( sys-libs/libcap )
-	xen? ( app-emulation/xen-tools:= )
-	xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
-
-X86_FIRMWARE_DEPEND="
-	pin-upstream-blobs? (
-		~sys-firmware/edk2-ovmf-2017_pre20170505[binary]
-		~sys-firmware/ipxe-1.0.0_p20160620
-		~sys-firmware/seabios-1.10.2[binary,seavgabios]
-		~sys-firmware/sgabios-0.1_pre8
-	)
-	!pin-upstream-blobs? (
-		sys-firmware/edk2-ovmf
-		sys-firmware/ipxe
-		>=sys-firmware/seabios-1.10.2[seavgabios]
-		sys-firmware/sgabios
-	)"
-PPC64_FIRMWARE_DEPEND="
-	pin-upstream-blobs? (
-		~sys-firmware/seabios-1.10.2[binary,seavgabios]
-	)
-	!pin-upstream-blobs? (
-		>=sys-firmware/seabios-1.10.2[seavgabios]
-	)
-"
-
-CDEPEND="
-	!static? (
-		${ALL_DEPEND//\[static-libs(+)]}
-		${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]}
-	)
-	qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
-	qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
-	qemu_softmmu_targets_ppc64? ( ${PPC64_FIRMWARE_DEPEND} )
-"
-DEPEND="${CDEPEND}
-	dev-lang/perl
-	=dev-lang/python-2*
-	sys-apps/texinfo
-	virtual/pkgconfig
-	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
-	gtk? ( nls? ( sys-devel/gettext ) )
-	static? (
-		${ALL_DEPEND}
-		${SOFTMMU_TOOLS_DEPEND}
-	)
-	static-user? ( ${ALL_DEPEND} )
-	test? (
-		dev-libs/glib[utils]
-		sys-devel/bc
-	)"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-qemu )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.5.0-cflags.patch
-	"${FILESDIR}"/${PN}-2.5.0-sysmacros.patch
-	"${FILESDIR}"/${PN}-2.11.0-glibc-2.27.patch
-	"${WORKDIR}"/patches
-)
-
-STRIP_MASK="/usr/share/qemu/palcode-clipper"
-
-QA_PREBUILT="
-	usr/share/qemu/openbios-ppc
-	usr/share/qemu/openbios-sparc64
-	usr/share/qemu/openbios-sparc32
-	usr/share/qemu/palcode-clipper
-	usr/share/qemu/s390-ccw.img
-	usr/share/qemu/s390-netboot.img
-	usr/share/qemu/u-boot.e500"
-
-QA_WX_LOAD="usr/bin/qemu-i386
-	usr/bin/qemu-x86_64
-	usr/bin/qemu-alpha
-	usr/bin/qemu-arm
-	usr/bin/qemu-cris
-	usr/bin/qemu-m68k
-	usr/bin/qemu-microblaze
-	usr/bin/qemu-microblazeel
-	usr/bin/qemu-mips
-	usr/bin/qemu-mipsel
-	usr/bin/qemu-or1k
-	usr/bin/qemu-ppc
-	usr/bin/qemu-ppc64
-	usr/bin/qemu-ppc64abi32
-	usr/bin/qemu-sh4
-	usr/bin/qemu-sh4eb
-	usr/bin/qemu-sparc
-	usr/bin/qemu-sparc64
-	usr/bin/qemu-armeb
-	usr/bin/qemu-sparc32plus
-	usr/bin/qemu-s390x
-	usr/bin/qemu-unicore32"
-
-DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the
-kernel module loaded before running kvm. The easiest way to ensure that the
-kernel module is loaded is to load it on boot.
-	For AMD CPUs the module is called 'kvm-amd'.
-	For Intel CPUs the module is called 'kvm-intel'.
-Please review /etc/conf.d/modules for how to load these.
-
-Make sure your user is in the 'kvm' group. Just run
-	$ gpasswd -a <USER> kvm
-then have <USER> re-login.
-
-For brand new installs, the default permissions on /dev/kvm might not let
-you access it.  You can tell udev to reset ownership/perms:
-	$ udevadm trigger -c add /dev/kvm
-
-If you want to register binfmt handlers for qemu user targets:
-For openrc:
-	# rc-update add qemu-binfmt
-For systemd:
-	# ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf"
-
-pkg_pretend() {
-	if use kernel_linux && kernel_is lt 2 6 25; then
-		eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
-	elif use kernel_linux; then
-		if ! linux_config_exists; then
-			eerror "Unable to check your kernel for KVM support"
-		else
-			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
-			ERROR_KVM="You must enable KVM in your kernel to continue"
-			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
-			ERROR_KVM_AMD+=" your kernel configuration."
-			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
-			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
-			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
-			ERROR_TUN+=" into your kernel or loaded as a module to use the"
-			ERROR_TUN+=" virtual network device if using -net tap."
-			ERROR_BRIDGE="You will also need support for 802.1d"
-			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
-			use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
-			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
-			ERROR_VHOST_NET+=" support"
-
-			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
-				if grep -q AuthenticAMD /proc/cpuinfo; then
-					CONFIG_CHECK+=" ~KVM_AMD"
-				elif grep -q GenuineIntel /proc/cpuinfo; then
-					CONFIG_CHECK+=" ~KVM_INTEL"
-				fi
-			fi
-
-			use python && CONFIG_CHECK+=" ~DEBUG_FS"
-			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
-
-			# Now do the actual checks setup above
-			check_extra_config
-		fi
-	fi
-
-	if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
-		eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
-		eerror "instances are still pointing to it.  Please update your"
-		eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
-		eerror "and the right system binary (e.g. qemu-system-x86_64)."
-		die "update your virt configs to not use qemu-kvm"
-	fi
-}
-
-pkg_setup() {
-	enewgroup kvm 78
-}
-
-# Sanity check to make sure target lists are kept up-to-date.
-check_targets() {
-	local var=$1 mak=$2
-	local detected sorted
-
-	pushd "${S}"/default-configs >/dev/null || die
-
-	# Force C locale until glibc is updated. #564936
-	detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
-	sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
-	if [[ ${sorted} != "${detected}" ]] ; then
-		eerror "The ebuild needs to be kept in sync."
-		eerror "${var}: ${sorted}"
-		eerror "$(printf '%-*s' ${#var} configure): ${detected}"
-		die "sync ${var} to the list of targets"
-	fi
-
-	popd >/dev/null
-}
-
-handle_locales() {
-	# Make sure locale list is kept up-to-date.
-	local detected sorted
-	detected=$(echo $(cd po && printf '%s\n' *.po | grep -v messages.po | sed 's:.po$::' | sort -u))
-	sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u))
-	if [[ ${sorted} != "${detected}" ]] ; then
-		eerror "The ebuild needs to be kept in sync."
-		eerror "PLOCALES: ${sorted}"
-		eerror " po/*.po: ${detected}"
-		die "sync PLOCALES"
-	fi
-
-	# Deal with selective install of locales.
-	if use nls ; then
-		# Delete locales the user does not want. #577814
-		rm_loc() { rm po/$1.po || die; }
-		l10n_for_each_disabled_locale_do rm_loc
-	else
-		# Cheap hack to disable gettext .mo generation.
-		rm -f po/*.po
-	fi
-}
-
-src_prepare() {
-	check_targets IUSE_SOFTMMU_TARGETS softmmu
-	check_targets IUSE_USER_TARGETS linux-user
-
-	# Alter target makefiles to accept CFLAGS set via flag-o
-	sed -i -r \
-		-e 's/^(C|OP_C|HELPER_C)FLAGS=/\1FLAGS+=/' \
-		Makefile Makefile.target || die
-
-	default
-
-	# Fix ld and objcopy being called directly
-	tc-export AR LD OBJCOPY
-
-	# Verbose builds
-	MAKEOPTS+=" V=1"
-
-	# Run after we've applied all patches.
-	handle_locales
-
-	# Remove bundled copy of libfdt
-	rm -r dtc || die
-}
-
-##
-# configures qemu based on the build directory and the build type
-# we are using.
-#
-qemu_src_configure() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	local buildtype=$1
-	local builddir="${S}/${buildtype}-build"
-
-	mkdir "${builddir}"
-
-	local conf_opts=(
-		--prefix=/usr
-		--sysconfdir=/etc
-		--libdir=/usr/$(get_libdir)
-		--docdir=/usr/share/doc/${PF}/html
-		--disable-bsd-user
-		--disable-guest-agent
-		--disable-strip
-		--disable-werror
-		# We support gnutls/nettle for crypto operations.  It is possible
-		# to use gcrypt when gnutls/nettle are disabled (but not when they
-		# are enabled), but it's not really worth the hassle.  Disable it
-		# all the time to avoid automatically detecting it. #568856
-		--disable-gcrypt
-		--python="${PYTHON}"
-		--cc="$(tc-getCC)"
-		--cxx="$(tc-getCXX)"
-		--host-cc="$(tc-getBUILD_CC)"
-		$(use_enable debug debug-info)
-		$(use_enable debug debug-tcg)
-		--enable-docs
-		$(use_enable tci tcg-interpreter)
-		$(use_enable xattr attr)
-	)
-
-	# Disable options not used by user targets. This simplifies building
-	# static user targets (USE=static-user) considerably.
-	conf_notuser() {
-		if [[ ${buildtype} == "user" ]] ; then
-			echo "--disable-${2:-$1}"
-		else
-			use_enable "$@"
-		fi
-	}
-	conf_opts+=(
-		$(conf_notuser accessibility brlapi)
-		$(conf_notuser aio linux-aio)
-		$(conf_notuser bzip2)
-		$(conf_notuser bluetooth bluez)
-		$(conf_notuser caps cap-ng)
-		$(conf_notuser curl)
-		$(conf_notuser fdt)
-		$(conf_notuser glusterfs)
-		$(conf_notuser gnutls)
-		$(conf_notuser gnutls nettle)
-		$(conf_notuser gtk)
-		$(conf_notuser infiniband rdma)
-		$(conf_notuser iscsi libiscsi)
-		$(conf_notuser jpeg vnc-jpeg)
-		$(conf_notuser kernel_linux kvm)
-		$(conf_notuser lzo)
-		$(conf_notuser ncurses curses)
-		$(conf_notuser nfs libnfs)
-		$(conf_notuser numa)
-		$(conf_notuser opengl)
-		$(conf_notuser png vnc-png)
-		$(conf_notuser rbd)
-		$(conf_notuser sasl vnc-sasl)
-		$(conf_notuser sdl)
-		$(conf_notuser seccomp)
-		$(conf_notuser smartcard)
-		$(conf_notuser snappy)
-		$(conf_notuser spice)
-		$(conf_notuser ssh libssh2)
-		$(conf_notuser usb libusb)
-		$(conf_notuser usbredir usb-redir)
-		$(conf_notuser vde)
-		$(conf_notuser vhost-net)
-		$(conf_notuser virgl virglrenderer)
-		$(conf_notuser virtfs)
-		$(conf_notuser vnc)
-		$(conf_notuser vte)
-		$(conf_notuser xen)
-		$(conf_notuser xen xen-pci-passthrough)
-		$(conf_notuser xfs xfsctl)
-	)
-
-	if [[ ! ${buildtype} == "user" ]] ; then
-		# audio options
-		local audio_opts="oss"
-		use alsa && audio_opts="alsa,${audio_opts}"
-		use sdl && audio_opts="sdl,${audio_opts}"
-		use pulseaudio && audio_opts="pa,${audio_opts}"
-		conf_opts+=(
-			--audio-drv-list="${audio_opts}"
-		)
-		use gtk && conf_opts+=( --with-gtkabi=$(usex gtk2 2.0 3.0) )
-		use sdl && conf_opts+=( --with-sdlabi=$(usex sdl2 2.0 1.2) )
-	fi
-
-	case ${buildtype} in
-	user)
-		conf_opts+=(
-			--enable-linux-user
-			--disable-system
-			--disable-blobs
-			--disable-tools
-		)
-		local static_flag="static-user"
-		;;
-	softmmu)
-		conf_opts+=(
-			--disable-linux-user
-			--enable-system
-			--disable-tools
-		)
-		local static_flag="static"
-		;;
-	tools)
-		conf_opts+=(
-			--disable-linux-user
-			--disable-system
-			--disable-blobs
-			--enable-tools
-		)
-		local static_flag="static"
-		;;
-	esac
-
-	local targets="${buildtype}_targets"
-	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
-
-	# Add support for SystemTAP
-	use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
-
-	# We always want to attempt to build with PIE support as it results
-	# in a more secure binary. But it doesn't work with static or if
-	# the current GCC doesn't have PIE support.
-	if use ${static_flag}; then
-		conf_opts+=( --static --disable-pie )
-	else
-		tc-enables-pie && conf_opts+=( --enable-pie )
-	fi
-
-	#bug #647570
-	conf_opts+=( --disable-capstone )
-
-	echo "../configure ${conf_opts[*]}"
-	cd "${builddir}"
-	../configure "${conf_opts[@]}" || die "configure failed"
-
-	# FreeBSD's kernel does not support QEMU assigning/grabbing
-	# host USB devices yet
-	use kernel_FreeBSD && \
-		sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
-}
-
-src_configure() {
-	local target
-
-	python_setup
-
-	softmmu_targets= softmmu_bins=()
-	user_targets= user_bins=()
-
-	for target in ${IUSE_SOFTMMU_TARGETS} ; do
-		if use "qemu_softmmu_targets_${target}"; then
-			softmmu_targets+=",${target}-softmmu"
-			softmmu_bins+=( "qemu-system-${target}" )
-		fi
-	done
-
-	for target in ${IUSE_USER_TARGETS} ; do
-		if use "qemu_user_targets_${target}"; then
-			user_targets+=",${target}-linux-user"
-			user_bins+=( "qemu-${target}" )
-		fi
-	done
-
-	softmmu_targets=${softmmu_targets#,}
-	user_targets=${user_targets#,}
-
-	[[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
-	[[ -n ${user_targets}    ]] && qemu_src_configure "user"
-	qemu_src_configure "tools"
-}
-
-src_compile() {
-	if [[ -n ${user_targets} ]]; then
-		cd "${S}/user-build"
-		default
-	fi
-
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		default
-	fi
-
-	cd "${S}/tools-build"
-	default
-}
-
-src_test() {
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		pax-mark m */qemu-system-* #515550
-		emake -j1 check
-		emake -j1 check-report.html
-	fi
-}
-
-qemu_python_install() {
-	python_domodule "${S}/scripts/qmp/qmp.py"
-
-	python_doscript "${S}/scripts/kvm/vmxcap"
-	python_doscript "${S}/scripts/qmp/qmp-shell"
-	python_doscript "${S}/scripts/qmp/qemu-ga-client"
-}
-
-# Generate binfmt support files.
-#   - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc)
-#   - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt)
-generate_initd() {
-	local out="${T}/qemu-binfmt"
-	local out_systemd="${T}/qemu.conf"
-	local d="${T}/binfmt.d"
-
-	einfo "Generating qemu binfmt scripts and configuration files"
-
-	# Generate the debian fragments first.
-	mkdir -p "${d}"
-	"${S}"/scripts/qemu-binfmt-conf.sh \
-		--debian \
-		--exportdir "${d}" \
-		--qemu-path "${EPREFIX}/usr/bin" \
-		|| die
-	# Then turn the fragments into a shell script we can source.
-	sed -E -i \
-		-e 's:^([^ ]+) (.*)$:\1="\2":' \
-		"${d}"/* || die
-
-	# Generate the init.d script by assembling the fragments from above.
-	local f qcpu package interpreter magic mask
-	cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die
-	for f in "${d}"/qemu-* ; do
-		source "${f}"
-
-		# Normalize the cpu logic like we do in the init.d for the native cpu.
-		qcpu=${package#qemu-}
-		case ${qcpu} in
-		arm*)   qcpu="arm";;
-		mips*)  qcpu="mips";;
-		ppc*)   qcpu="ppc";;
-		s390*)  qcpu="s390";;
-		sh*)    qcpu="sh";;
-		sparc*) qcpu="sparc";;
-		esac
-
-		cat <<EOF >>"${out}"
-	if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then
-		echo ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register
-	fi
-EOF
-
-		echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}"
-
-	done
-	cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die
-}
-
-src_install() {
-	if [[ -n ${user_targets} ]]; then
-		cd "${S}/user-build"
-		emake DESTDIR="${ED}" install
-
-		# Install binfmt handler init script for user targets.
-		generate_initd
-		doinitd "${T}/qemu-binfmt"
-
-		# Install binfmt/qemu.conf.
-		insinto "/usr/share/qemu/binfmt.d"
-		doins "${T}/qemu.conf"
-	fi
-
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		emake DESTDIR="${ED}" install
-
-		# This might not exist if the test failed. #512010
-		[[ -e check-report.html ]] && dohtml check-report.html
-
-		if use kernel_linux; then
-			udev_newrules "${FILESDIR}"/65-kvm.rules-r1 65-kvm.rules
-		fi
-
-		if use python; then
-			python_foreach_impl qemu_python_install
-		fi
-	fi
-
-	cd "${S}/tools-build"
-	emake DESTDIR="${ED}" install
-
-	# Disable mprotect on the qemu binaries as they use JITs to be fast #459348
-	pushd "${ED}"/usr/bin >/dev/null
-	pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594
-	popd >/dev/null
-
-	# Install config file example for qemu-bridge-helper
-	insinto "/etc/qemu"
-	doins "${FILESDIR}/bridge.conf"
-
-	cd "${S}"
-	dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
-	newdoc pc-bios/README README.pc-bios
-
-	if [[ -n ${softmmu_targets} ]]; then
-		# Remove SeaBIOS since we're using the SeaBIOS packaged one
-		rm "${ED}/usr/share/qemu/bios.bin"
-		rm "${ED}/usr/share/qemu/bios-256k.bin"
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-			dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
-			dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin
-		fi
-
-		# Remove vgabios since we're using the seavgabios packaged one
-		rm "${ED}/usr/share/qemu/vgabios.bin"
-		rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
-		rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
-		rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
-		rm "${ED}/usr/share/qemu/vgabios-virtio.bin"
-		rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
-		# PPC64 loads vgabios-stdvga
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc64; then
-			dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin
-			dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
-			dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
-			dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
-			dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin
-			dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
-		fi
-
-		# Remove sgabios since we're using the sgabios packaged one
-		rm "${ED}/usr/share/qemu/sgabios.bin"
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-			dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
-		fi
-
-		# Remove iPXE since we're using the iPXE packaged one
-		rm "${ED}"/usr/share/qemu/pxe-*.rom
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-			dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
-			dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
-			dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
-			dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
-			dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
-			dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
-		fi
-	fi
-
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_create_doc
-}
-
-firmware_abi_change() {
-	local pv
-	for pv in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least ${FIRMWARE_ABI_VERSION} ${pv}; then
-			return 0
-		fi
-	done
-	return 1
-}
-
-pkg_postinst() {
-	if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
-		udev_reload
-	fi
-
-	fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
-
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_print_elog
-
-	if use pin-upstream-blobs && firmware_abi_change; then
-		ewarn "This version of qemu pins new versions of firmware blobs:"
-		ewarn "	$(best_version sys-firmware/edk2-ovmf)"
-		ewarn "	$(best_version sys-firmware/ipxe)"
-		ewarn "	$(best_version sys-firmware/seabios)"
-		ewarn "	$(best_version sys-firmware/sgabios)"
-		ewarn "This might break resume of hibernated guests (started with a different"
-		ewarn "firmware version) and live migration to/from qemu versions with different"
-		ewarn "firmware. Please (cold) restart all running guests. For functional"
-		ewarn "guest migration ensure that all"
-		ewarn "hosts run at least"
-		ewarn "	app-emulation/qemu-${FIRMWARE_ABI_VERSION}."
-	fi
-}
-
-pkg_info() {
-	echo "Using:"
-	echo "  $(best_version app-emulation/spice-protocol)"
-	echo "  $(best_version sys-firmware/edk2-ovmf)"
-	if has_version 'sys-firmware/edk2-ovmf[binary]'; then
-		echo "    USE=binary"
-	else
-		echo "    USE=''"
-	fi
-	echo "  $(best_version sys-firmware/ipxe)"
-	echo "  $(best_version sys-firmware/seabios)"
-	if has_version 'sys-firmware/seabios[binary]'; then
-		echo "    USE=binary"
-	else
-		echo "    USE=''"
-	fi
-	echo "  $(best_version sys-firmware/sgabios)"
-}
--- a/app-emulation/qemu/qemu-2.11.1-r2.ebuild
+++ b/app-emulation/qemu/qemu-2.11.1-r2.ebuild
@ -59,7 +59,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	qemu_softmmu_targets_ppc? ( fdt )
 	qemu_softmmu_targets_ppc64? ( fdt )
 	sdl2? ( sdl )
-	static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio )
+	static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio !snappy )
 	virtfs? ( xattr )
 	vte? ( gtk )"

@ -140,7 +140,7 @@ SOFTMMU_TOOLS_DEPEND="
 	)
 	seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
 	smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
-	snappy? ( app-arch/snappy:=[static-libs(+)] )
+	snappy? ( app-arch/snappy:= )
 	spice? (
 		>=app-emulation/spice-protocol-0.12.3
 		>=app-emulation/spice-0.12.0[static-libs(+)]
--- a/app-emulation/qemu/qemu-2.11.1-r53.ebuild
+++ b/app-emulation/qemu/qemu-2.11.1-r53.ebuild
@ -22,7 +22,7 @@ else
 	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd"

 	# Gentoo specific patchsets:
-	SRC_URI+=" https://dev.gentoo.org/~tamiko/distfiles/${P}-patches-r1.tar.xz"
+	SRC_URI+=" https://dev.gentoo.org/~tamiko/distfiles/${P}-patches-r2.tar.xz"
 fi

 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
@ -59,7 +59,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	qemu_softmmu_targets_ppc? ( fdt )
 	qemu_softmmu_targets_ppc64? ( fdt )
 	sdl2? ( sdl )
-	static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio )
+	static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio !snappy )
 	virtfs? ( xattr )
 	vte? ( gtk )"

@ -141,7 +141,7 @@ SOFTMMU_TOOLS_DEPEND="
 	)
 	seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
 	smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
-	snappy? ( app-arch/snappy:=[static-libs(+)] )
+	snappy? ( app-arch/snappy:= )
 	spice? (
 		>=app-emulation/spice-protocol-0.12.3
 		>=app-emulation/spice-0.12.0[static-libs(+)]
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@ -57,7 +57,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	qemu_softmmu_targets_ppc? ( fdt )
 	qemu_softmmu_targets_ppc64? ( fdt )
 	sdl2? ( sdl )
-	static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio )
+	static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio !snappy )
 	virtfs? ( xattr )
 	vte? ( gtk )"

@ -139,7 +139,7 @@ SOFTMMU_TOOLS_DEPEND="
 	)
 	seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
 	smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
-	snappy? ( app-arch/snappy:=[static-libs(+)] )
+	snappy? ( app-arch/snappy )
 	spice? (
 		>=app-emulation/spice-protocol-0.12.3
 		>=app-emulation/spice-0.12.0[static-libs(+)]
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
--- a/app-forensics/sleuthkit/Manifest
+++ b/app-forensics/sleuthkit/Manifest
@ -2,15 +2,18 @@ AUX sleuthkit-3.2.3-tools-shared-libs.patch 1685 BLAKE2B d7293ec0d58a4341c0901fc
 AUX sleuthkit-4.0.0-system-sqlite.patch 940 BLAKE2B b87e0fc6852ec23249ed05e4a43d4a892491c37eed591eb221ac713331c74ee1eec479e506091591a142b24fc11d91cecb5bac4d52d54ad7368e6c8d452f0ef7 SHA512 c73324bc73fa90b657deb634825c846c751913ff39f1613975b633eb6255b207fac3307ee575e0e683d4664b6809f792b8a7d6ef1cb9846f03c2338edc70f0f9
 AUX sleuthkit-4.1.0-system-sqlite.patch 934 BLAKE2B 264b67ea82005c89fb4a6d5b4473ac358e1d7b7e5b001af49cd726bbbbcbb9aa0d88d205dedcfdeba9ac9e579f430989bfe9b81d615bd053d4f5625165f768fb SHA512 401c312fb62505aeea23e7f95215580fc7a2a47b5428f762420b3402bb0fb75073ca2b9698378e93de1a0ef8476d258ad74140404b2db67fd2bd0b000245d737
 AUX sleuthkit-4.1.0-tools-shared-libs.patch 1678 BLAKE2B f60496480425fd78bc211a663be80db2472a9683f1ff76c747f8190d5544df532857f6e1fb4343d0405f8bf51aa7b7bf86ed55fffbeea0153341ce9f2dca077b SHA512 b559f669837194bed447ac269884ab50e6ea746aba2df799688964245c22814567871f12f96d43ba74016d5c448247b02bef5d7bdfd32fd782ef5e668686238e
+DIST libewf-20130128.tar.gz 1978794 BLAKE2B e5d2bd8f4a8b878e13536b89b032d8cee6982272065b2bf325f8a811dff258264118a79496912377337ceb9ad630138b6bedb89e3c3be89a5f6a6fea85ab586b SHA512 94cdd0c3f0d8f535f3462c5adba266302f9b129abacda077ed429fa38af6862fca5a90ba2e606b78607b509769305cc6134c483c7033c20e226596cca2d42b90
 DIST sleuthkit-4.0.2.tar.gz 7577570 BLAKE2B 7199adce8b85d75a031e7f133ba175ff3ef1f87cae9ba9a3ce02a321b11f0a5bcb9023730df1b35956dc61c15025f9a4a141255f62698800938c90376feed8c9 SHA512 acf1d6006db3e75675eb769034ea78fd78133ac0f83c9caa74ec720c0dd25f95fb1a5df2c652027eeeac53e1fca6a3096b5248db95e3a01ce95e72e779e44f37
 DIST sleuthkit-4.1.0.tar.gz 7974564 BLAKE2B c736b26713abf7df45b873099fe7886825be3c0fc5cb288e9a207fb9b404df890420ac1664ab45cc3866cb6a69ad31fe9c8e4cb6caa662e5dfc8ee36acdb4670 SHA512 1cfa96bd3746c59c92c3e3f07f5f3f0f6896239bcaec012c43958654bb63794ecf9d7bd28bb9b4ab939558f4b27f03cd87f645ea91a8f9cfbb9037df93ef5223
 DIST sleuthkit-4.1.2.tar.gz 7990136 BLAKE2B 02aa1545261f6b8a9c03c3f78563aea9e2cf521622fba2b91140de1162c10b5d1f3f7110bef598d45be5612d44e2bf6d4096fd731c486498e2524566a75a8300 SHA512 1f64acf42e86adf275bcd86c63c097210a498ac34ce69e64b3c120d86dffae65b5d57ed9618692dd510f637e940a48a60912dd57c8de840bf3a2b4428baabab8
 DIST sleuthkit-4.1.3.tar.gz 7952733 BLAKE2B ffdf19904275a6a9f96a822e33097db60ae0c8e9a034813c6a6f917845811ee9e2b7c52db85aacdd3d4d9bf7c2ae8974840849f6922248af5104298952d6ad3a SHA512 66f6ac32da5a21b3505390557ed6cf7bbcfcca69f231e20a7086fd48c5de45a3f064a716837d25eb582d0a89bae3b6ba7e89dcf3159e1cacdb4b5d452d0ce9a2
 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 sqlite-jdbc-3.8.11.jar 5131732 BLAKE2B 1a04fa9e9cb97fdddc19af2de9efa7b54c0b527642e6e325e31054e4e294e3bc6af00ea291087ed9dd26668d48dae356035fc85212c0eb81656550d552103ed0 SHA512 5f4705101992e8916e29742c560aef0d01eba9dc0d2d984b75a77e56be3c9fd20b284390fe8f9bb54bf9d1f8528c3413922684c446212ca8961ac731543fb179
 EBUILD sleuthkit-4.0.2.ebuild 894 BLAKE2B 71a17c346c54e8fec7a86989817767f24cff1ca493fb0a80fe62c6214993dbdd2dfb498efec94e667c106a067d8c79796cbe318a9f92d4ff89efe94bdc39813a SHA512 8c91db56a591f0570d9d2ed25857767bbfac0aebe028e13a121e842c2a93837495a6f182038bdf3ca630be779276dd698d6edee2ee971169042e584114ddb148
 EBUILD sleuthkit-4.1.0.ebuild 884 BLAKE2B e73c3ef90f25e3ef882809d333567977a722108ad2289967381e47e503f341ef6c78d885cfb742ee55f2df1795934f43f029fa1a2d4717ca5a2ca121e7ee1068 SHA512 2e246a8164b677b854a4f3ee6e60031520a1847804cef0652289235d40cba686183c0f14adff0a8b7a8291738f231b74aeed49a27f24715f3d7374654eda7bb5
 EBUILD sleuthkit-4.1.2.ebuild 898 BLAKE2B d9e999949965ee029082ce322a74b09b0e21a1d3334dda1bec7d2ccebd9ef3245b9613b731a54a660f68349a2e956a37a910da5555367fe9d8655730833fa7de SHA512 b1e69b3da2b19b389c4dd1017229b9d1ef5301ee0f17dcb40847eff3b480ae0355dfb5423a264ab022fa8c2619915259d992623e334fc0d10e672c5d1911cf41
 EBUILD sleuthkit-4.1.3.ebuild 898 BLAKE2B d9e999949965ee029082ce322a74b09b0e21a1d3334dda1bec7d2ccebd9ef3245b9613b731a54a660f68349a2e956a37a910da5555367fe9d8655730833fa7de SHA512 b1e69b3da2b19b389c4dd1017229b9d1ef5301ee0f17dcb40847eff3b480ae0355dfb5423a264ab022fa8c2619915259d992623e334fc0d10e672c5d1911cf41
 EBUILD sleuthkit-4.5.0.ebuild 3949 BLAKE2B 9dcb0a68160ef9b20a4797cd93167ce80cb766cc92e3eb043489fef80f3517bc833408af2de88a85270172b3a8875bcffd40994b104da07ca4403318730810b2 SHA512 7b856a82fe5c8faf17e3562db3953fdf48791381fd3675d3c20dd3962dbc1b62878265ec9681e39200d7d053db7100c3b994c1c99511b12a4d3f4669c0f3a18c
+EBUILD sleuthkit-4.6.0.ebuild 5607 BLAKE2B 614f3183afbc167dee2aad4bb7483358cc98af8c6851d020ef6838fc51e4b9f5dadaf2c0615923e88a6188a78523b93b19d2abf87b388ec0fec56c26e740d9e3 SHA512 69e2a25b8cc77c4789b7d501604a8017d7059249de21b15e0bf108c4f42a7350e3a57d4adc24de19ed235a3cc67ce4d0d86719bf4ef0e6016bc3aa30cc3bfc4c
 MISC metadata.xml 607 BLAKE2B 2c651da1253ec986eb766b6949ea9a9059d76351081e805aba5f795971bb3b9368987cc9d39fc335c1e65c12de9347471686984e2753487cafab431488762064 SHA512 2dbce141f133a9172c6ba61924a9fac2674394096063b899be5a90111a9741789e2a09aa06cc49e17a253d088d20c1ddad1c748b6e09f650131ec0f91116ae08
--- a/app-forensics/sleuthkit/sleuthkit-4.6.0.ebuild
+++ b/app-forensics/sleuthkit/sleuthkit-4.6.0.ebuild
@ -0,0 +1,229 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 )
+	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 static-libs test +threads zlib"
+
+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
+	)
+	zlib? ( sys-libs/zlib )
+"
+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
+)
+
+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="${S}/bindings/java/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
+}
+
+src_prepare() {
+	if use ewf; then
+		# 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
+	fi
+
+	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
+
+		# Disable dependency retrieval using ivy
+		# We will handle it ourselves
+		sed -e '/name="compile"/ s/, retrieve-deps//' \
+			-e '/name="dist-/ s/, init-ivy//g' \
+			-i build.xml || 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
+
+	popd &>/dev/null || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable java)
+		$(use_enable static-libs static)
+		$(use_enable threads multithreading)
+		$(use_with aff afflib)
+		$(use_with ewf libewf)
+		$(use_with zlib)
+	)
+
+	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_dojar dist/${P}.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-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
--- a/Show More
+++ b/Show More