Sync with portage [Fri Aug 3 15:44:17 MSK 2018].

6 years ago · 92b4c63b24
parent 5d2e9cfba1
commit 92b4c63b24
736 changed files with 10399 additions and 7693 deletions
--- a/30
+++ b/30
@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512

-MANIFEST Manifest.files.gz 28816 BLAKE2B 9a59e1901a4ead639e5dc1d3ae52ac949e4687ead9cad0b2b85dc41ab949ad766c73c22268bbff33415b8be14ed1451afa37494c660708d7ed41161dc2580ca5 SHA512 d2730c9f06935dd6c4d33a2c532415f94da9228a71a7081deb11a746bffa0899747684df32799eeafac9c778a37b7142e3452ad856593b35fe452eed94c40a51
-TIMESTAMP 2018-08-01T17:38:46Z
+MANIFEST Manifest.files.gz 28794 BLAKE2B 36d54017c35f0767e9467e3e6c102f42e2e1d0017f1793fd114fcda96e9bb43cbfe05f71388dc5e12852e5220a2498412e55eceeafaeb5ccbb2bc516d1ac3dec SHA512 1f2b7d12103a692452458be808d78293366e0861904b6d36df52f2d587e5ce547b3452369689a645da2099bb6b2f9e39f80b7b5f13400ce396a9f8fc5a5455d9
+TIMESTAMP 2018-08-03T12:08:40Z
 -----BEGIN PGP SIGNATURE-----

-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlth8CZfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAltkRchfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDLmA//ZAJQhzzyNK3lPtNZcREMY4nMZ8MvdLF1SQ5gdhMHv4VgAgK5pXQUvcAG
-/tKsRoxLayM0gRHPXmDn/Q4F4TzQh1D5GdjDwIrN60Q87W+qkNyUTPReg9mHnaOl
-1qREjeD/Upl34ysqF3FPmvIp94id41NWqOWqsrJXNoldTJAZthdSodnYuRzvvUEN
-3Rqt1jRoYta6OmNX7dOzlvyYCYJk10qx7xlVHnvsdjXyphrgPPWfbDNKFfc1o/2l
-a9KhH++2OhBjCsDmtPH5J/oRCXRcr93aoJz3pcTehiHyQU78agsiHZlWVBIyimwZ
-kcRth1NT/8Rh8wo+7/P8ryW/1WVDspSxjQ8LfwcXNV2b2IlbJTgYQrasHiWSJ6/6
-dVrjiA+3pUYm7pvGInLf8s7gEuOvlGjzByYee+UCAQNE/zVh22qcWuou/0SnJwb2
-u8qJX/mslyTtifvqexoAg9LC3a0WvLqZuhH00aEQy9SKuAzzsBI4A1rVN2fElyws
-Em5H1q/X0bTnIkvYnS99i8z5EpAmTdiQ9oI1L8B2E7Noo0TLlop/7dMx33uJVell
-YRnxrCrtf22s7FJXT0B6cFxX8Mc6GKwn1GlQf4OKHTLsj5stxs4E7KnlJINkc2PS
-SyzXYVvg6uqg+RVyUwyj3oUMuq8eg9l+iNLgEFarYeqAvpWcT5s=
-=cbYM
+klAd5xAArPxklXM0nx2DPd6wwjf9zUX02OmxY1DL2TLHCF8z6b2dE3vGyxrddrsA
+PYZmpBl2MFXbN1/vqMANpKSramSffQIiVZJIUFBJr71FE4BTP0OM+IeJWelF91Fa
+xk3WjSIXuKFUW/zZsHwIuPkuuHu9OlfG2aX8l2rBS4UPclDOlejjDDQeJnaDtBbL
+ZB6MiIc/g1zlUgDakCBkHiRYhfqTvj9uTpGVPSyXbJbC6dPSZRIAwwr1fUqSY7/+
+cUp5hVkEIz5RP7SaJ52XvJY2aIArp4FsS67EnMyyHBhV8+ZyVCdCoP/4DOQC9w3C
+Npuq09Pm00717jW2+9VJ6Xf7eO5WAq4Gau8ydguYxC3yOxJg8vsjB8OvnfTqFj9Z
+d48h5xIK6c3ye8rbr8ICtWYp8xV4AeooRC0MG+3NpC6kTp3ADSZ9lVEPECsudLGW
+5F85woN4YBE67YOOhn6MrX4RpWypXHZk4vm0siPTcULJ6PsqMwZ1cQ5KzIziFVHh
+bfvdl3oAybI0iEyB+ILsDzIlZeYmAL51798/cB3qUXTW9EzuLuAz0njQzpYFZFbQ
+YGCoawcRED+vJvLrJj1e8zyq32Q1iRbSG03pxU6CY8aGEfCkpxH/mKoTVB5u86Fl
+0uTPwuImi9kwBwRhsqRp+Zi1VuJ95VliV5rB1wbG/cKvKTOsrC0=
+=QUT2
 -----END PGP SIGNATURE-----
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/mongo-tools/Manifest
+++ b/app-admin/mongo-tools/Manifest
@ -6,10 +6,12 @@ DIST mongo-tools-3.4.10.tar.gz 4719399 BLAKE2B 8165248bf58f2ea2b02e365a3609c72b7
 DIST mongo-tools-3.4.13.tar.gz 4719488 BLAKE2B 27c7716b21f1a23408d0f31aee111c5877f5172121a987c234ff01eb2690bbc71bca4e00fc13b701ca6b91dce0c9aaae43c2239a60a52e130e1390bf5bafef60 SHA512 c233268328ef868ec06c9a9d83009141b39c84ba642e7de7dece3210717ba8de600f39896a30ed23d1577db9f4697c3a8d720cf35248bca2b00a17642b043237
 DIST mongo-tools-3.4.14.tar.gz 4719370 BLAKE2B 2add25ddf9b5b7d2ebecdd647dfb2c818643b16f623fd1faba36a8d6f5a181e80ad47de45fc56e462290f61f6c16c27a6b0587542315981537627256e69b4958 SHA512 a0d715fe36769740ba25e92b742b157dc264b141ddd56d64ca4c6f8ffea11df291ce871aaa723acdb8b7f5318ac1edb8c5fb9dd7bf2edfe08d4e7cef343abea7
 DIST mongo-tools-3.4.15.tar.gz 4697188 BLAKE2B 690ec3187cb781c9cae903a27eca9d1d504e2e52cc7f48790b5d5b5a1dfe18cff95dd52f8fa03854548a2e634d2aed56e626b8702f2fcd27a10952a37dff9120 SHA512 f7c8655f56a1f5fedad00fbadd26b150d6fea071edccaa7ac18e80c9051ed2324691e98e799e6a9ca09e944ebe340b63a2ac0b9caeffbcc8c8dee0744cba1af7
+DIST mongo-tools-3.4.16.tar.gz 4697191 BLAKE2B 2e9a0e7dc8016d3e7d7c7f8d0cf80a97d3d199603c0b8b791df5a0d79d418ffaa232eee694047a7ca11fa7623023b4123becd437cfe3dec11e26cd525720bcad SHA512 b40c6dee75d860de1da73faf79f5f68c098ce7c80681486c66fff04a937474dcede91c7be907a8e36033b3898f7499e8f53271944c0df3360756c27361efb6f5
 DIST mongo-tools-3.6.2.tar.gz 4693924 BLAKE2B 61c44d579f6eb4013ee6c0118ebe89a2d454ef8cf6ad933479885cb71d169185272b03d9c63fa738d67bbd1b9efd4bc964eb17adcc5002508589d198cdb17752 SHA512 5ac2b1d2b33271f63c406c69bd8a576a21f4dcaa6f75839e0f907ebc9968f0e121eb3800e88da050c120856e7ddda4f12d551bb731d4acac0f5cf09f66fc948a
 DIST mongo-tools-3.6.3.tar.gz 4693833 BLAKE2B fc7139984cf3dcb7b4ce6f6c2028296651aa59ac68d7068bdf748e28eeb65b1fd9b07580d0c93f3f41dbb01030a12433a07a04deadf28e0ff792387fa78ae4aa SHA512 7dba782c84a728aa9ceb28cbd9934f58b615dccfb238a9dbd63b18661ba4e74ddba21f93d9f12e6d80d293ebe42a82d31fa64448aacdba75bd07d964a5f631fc
 DIST mongo-tools-3.6.4.tar.gz 4693872 BLAKE2B 5d72b32fa8ad7bc106c6ea3c09a27a093b9a1ae2392b4fa534042c5461fdc2b958dcbbf32e0ed596be234921e2ee21cc8f6132d57ae870a234abfc7adbb3b2e9 SHA512 53d06fa4a1b58de8001d6bf6e85f7edc97ce2cfbbb69c1ab05219deaa05ad9dd77d93f98c5526b4f58644a766e1b0f123686358095f059c71a4277634603f23f
 DIST mongo-tools-3.6.5.tar.gz 4720814 BLAKE2B 5dd064f70557ec1ab979d08523f3dd305fb310c533b69bc99be3ad3d006036354f62b9f3d61c242e1481a254bed538a5e1cf5662f0e35705f1c50a76f31fddbb SHA512 dd2d7cc64043b42a70b5de0ea493f94722a4476248bfd77d6892861e4be6ab20175992367965dfd687bf8b7ebece6113b7f7a3e59256497e3ecd7e2678875965
+DIST mongo-tools-3.6.6.tar.gz 4723751 BLAKE2B 876d46c47190398d1218a760bdeb8167c9224ef000a96b5f6080d6dcd44fe8187fdfbc38b1a61dbf437132e16e053212cf122daec3915647448d114983e51fc3 SHA512 b8cc02626accb90d8dacf50ea851619885a01503e28b17ed6a12cc9ccec2680a8cd12a566b32187d472f74c9625bf013afcdebed1a42d78ff613c49d3fc838b2
 DIST mongo-tools-4.0.0.tar.gz 10872217 BLAKE2B 84e92178c0e4827926de525a70d6124635d59e270a3d37e23ec8653cc64d99bb7489fa6266917437ca45aa3ca5e00bc59b81e65c5b72e717db2701c6f7327bec SHA512 d67c4aca9b41266109adc39bb1a642206738fda393e1f9f05570c02a00a02e29ec71c71e67ad232c72d66543ae7e7bfe07fbcf26958d48ed0e631da452c1904d
 EBUILD mongo-tools-3.0.14.ebuild 1096 BLAKE2B c5cc1d28947e0453483d2429c1b1556e880c84e62d563505e420ba5ddf2b64ee1e54b9bdb609ae43091aec967d24cdd2c350c67f9b2f55347cbf334edd7c2004 SHA512 55b66e2872741425cccb75b367e37b4fca28404d63e77a39920246b6a946bf75335d55ea15c7878eb4382ade2cd95bedec4da9a647968a5e27e577073ff7e82f
 EBUILD mongo-tools-3.0.15.ebuild 1098 BLAKE2B ff13b5f35493bead934b47f56a302467346e50d3c6bbfe5958ece13d223da85aae0fa3dcaf991c79dd6694facd4a58657960260352ffa9ff395e4b0ec8dad6b4 SHA512 a36184581a7cff9543a4a63c13549e9096321c558a983a46bb4248541b777a5e4a2e1323f3c140b3fc2b8176a480042d2140e44b488ac69403524410b4115d8d
@ -18,9 +20,11 @@ EBUILD mongo-tools-3.4.10.ebuild 1237 BLAKE2B 27690fa59a8165db8200ec332171396d23
 EBUILD mongo-tools-3.4.13.ebuild 1217 BLAKE2B b0a7490c786d39639f0b018887f5e9b111279bc80d440a6c49fe8d6444642c61d7700b5865a3e8b9ce28c5af187e47b57a0f79240ea8582a2663f02d01fa2d76 SHA512 f4f00020f3cc9250078770423d40dabfc8054b4205b946c9fc10d580ef5dfcc9a0fec86173c12f3942e332d5c5cac882fc9a23b0fa4944446402a87cd68e77a4
 EBUILD mongo-tools-3.4.14.ebuild 1217 BLAKE2B b0a7490c786d39639f0b018887f5e9b111279bc80d440a6c49fe8d6444642c61d7700b5865a3e8b9ce28c5af187e47b57a0f79240ea8582a2663f02d01fa2d76 SHA512 f4f00020f3cc9250078770423d40dabfc8054b4205b946c9fc10d580ef5dfcc9a0fec86173c12f3942e332d5c5cac882fc9a23b0fa4944446402a87cd68e77a4
 EBUILD mongo-tools-3.4.15.ebuild 1217 BLAKE2B 36dbc749a3052b6d3ac3c55205078f8c7fb9d60f6dc403850d7d32f36b64aeb69de12f1ee689e7b9611695e9ce5896d1b63bfc93abb2026f27aa7f52b007fe72 SHA512 e3d3376f48844f46178d7652df941faa7d8306c370b267478e2439d81ac94842d1682ec4dc7c9acaf1d90516b406b48d9300fa893b90b446c31b8ee2d1067e11
+EBUILD mongo-tools-3.4.16.ebuild 1195 BLAKE2B 6e650a085da6e60e7f268e074ac45373a3a9948e4b69d88ece630697c48f8e85e856cbc324dc342097c9c5c7cd903c12dbee415c3fd8582b3acf205eb4301ed6 SHA512 fc8709a1d3ab755e61bbd01db2ade678082aca0c97715dd882ebb09a2ad8bfea8ec7f21ec0572863fec70d34346dfcc47ec8ab47725c910d92715ab74cf5cd62
 EBUILD mongo-tools-3.6.2.ebuild 1257 BLAKE2B c9f6bf6e4e5aaf602e65f9dae6dc406506e4d590e392bc96cba776eaed1c4053e596ed6b1f55664b474e7b302d2032a9627fcf01b237ce06ec214275715d9fc2 SHA512 12eca5b3936d64a8cf0252c3cfa10594be9a7c5bfb22b4734c0ebbd9782e13249a9b389fd2e5d338cef721b4b1cf90c15237b8fda37b1e7e5a58a423a26af97c
 EBUILD mongo-tools-3.6.3.ebuild 1257 BLAKE2B c9f6bf6e4e5aaf602e65f9dae6dc406506e4d590e392bc96cba776eaed1c4053e596ed6b1f55664b474e7b302d2032a9627fcf01b237ce06ec214275715d9fc2 SHA512 12eca5b3936d64a8cf0252c3cfa10594be9a7c5bfb22b4734c0ebbd9782e13249a9b389fd2e5d338cef721b4b1cf90c15237b8fda37b1e7e5a58a423a26af97c
 EBUILD mongo-tools-3.6.4.ebuild 1257 BLAKE2B c9f6bf6e4e5aaf602e65f9dae6dc406506e4d590e392bc96cba776eaed1c4053e596ed6b1f55664b474e7b302d2032a9627fcf01b237ce06ec214275715d9fc2 SHA512 12eca5b3936d64a8cf0252c3cfa10594be9a7c5bfb22b4734c0ebbd9782e13249a9b389fd2e5d338cef721b4b1cf90c15237b8fda37b1e7e5a58a423a26af97c
 EBUILD mongo-tools-3.6.5.ebuild 1252 BLAKE2B af486064720907f298f0e22b075284696dd78c01a84fcf9e7a5a5767d11aeed929d57d2f6e6539934ad8083b271606aec522dde38cdb865cf917384e02646315 SHA512 94709a1740d7894b3143daf193c8f067d3e52ca4f7f3f4ae98aea4c63ea65c62178ff9db9f3a82cdd7ddea3e0cdb26162e5954a7b089434960eade7b39ae0b39
+EBUILD mongo-tools-3.6.6.ebuild 1213 BLAKE2B 32b017e79aade027f199eb34cf16f5852387c3dea2c1c1b57257c3634e7f39b0c31e939a00fe9985e5ed6c9629504ab76f5e38e7b14993cca235caaa1ae73563 SHA512 bdc2ce46cdf7dc56265ac5640b0ba69c17cbe37977828b2ab7167d35acae41a2fe0712b3eef65ba064b1166e6aee91c7c785e6a1adf54f780181890380356fc2
 EBUILD mongo-tools-4.0.0.ebuild 1252 BLAKE2B af486064720907f298f0e22b075284696dd78c01a84fcf9e7a5a5767d11aeed929d57d2f6e6539934ad8083b271606aec522dde38cdb865cf917384e02646315 SHA512 94709a1740d7894b3143daf193c8f067d3e52ca4f7f3f4ae98aea4c63ea65c62178ff9db9f3a82cdd7ddea3e0cdb26162e5954a7b089434960eade7b39ae0b39
 MISC metadata.xml 463 BLAKE2B 1e4d37c222538ce5d55e6f5c05ecbe85f57ac74eacaf5935540797f03c4c069b2ce2bd0cbb6b433eb86de9b2480058013759db3d504982df908c2ba9e1b4d2ec SHA512 f09474b3932dd6ae36da20c64a394acf65ad1e3a875e7ca743efa22db8b7e3109c9ebe4c489e62eda12c5bdd4d689ede61eca8a4cc89c42d0a08a270f041fcdc
--- a/app-admin/mongo-tools/mongo-tools-3.4.16.ebuild
+++ b/app-admin/mongo-tools/mongo-tools-3.4.16.ebuild
@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="sasl ssl"
+
+RDEPEND="!<dev-db/mongodb-3.0.0"
+DEPEND="${RDEPEND}
+	dev-lang/go:=
+	net-libs/libpcap
+	sasl? ( dev-libs/cyrus-sasl )
+	ssl? ( dev-libs/openssl:0= )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+
+	# 1) ensure we use bash wrt #582906
+	# 2) do not substitute version because it uses git
+	sed -e 's@/bin/sh@/bin/bash@g' \
+		-e '/^sed/,+3d' \
+		-e '/^mv/d' \
+		-i build.sh || die
+
+	# build pie to avoid text relocations wrt #582854
+	# skip on ppc64 wrt #610984
+	if ! use ppc64; then
+		sed -i 's/\(go build\)/\1 -buildmode=pie/g' build.sh || die
+	fi
+}
+
+src_compile() {
+	local myconf=()
+
+	if use sasl; then
+		myconf+=(sasl)
+	fi
+
+	if use ssl; then
+		myconf+=(ssl)
+	fi
+
+	./build.sh "${myconf[@]}" || die "build failed"
+}
+
+src_install() {
+	dobin bin/*
+}
--- a/app-admin/mongo-tools/mongo-tools-3.6.6.ebuild
+++ b/app-admin/mongo-tools/mongo-tools-3.6.6.ebuild
@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="sasl ssl"
+
+RDEPEND="!<dev-db/mongodb-3.0.0"
+DEPEND="${RDEPEND}
+	dev-lang/go:=
+	net-libs/libpcap
+	sasl? ( dev-libs/cyrus-sasl )
+	ssl? ( dev-libs/openssl:0= )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+
+	# 1) ensure we use bash wrt #582906
+	# 2) do not substitute version because it uses git
+	sed -e 's@/bin/sh@/bin/bash@g' \
+		-e '/^sed/,+3d' \
+		-e '/^stty/d' \
+		-e '/^mv/d' \
+		-i build.sh || die
+
+	# build pie to avoid text relocations wrt #582854
+	# skip on ppc64 wrt #610984
+	if ! use ppc64; then
+		sed -i 's/\(go build\)/\1 -buildmode=pie/g' build.sh || die
+	fi
+}
+
+src_compile() {
+	local myconf=()
+
+	if use sasl; then
+		myconf+=(sasl)
+	fi
+
+	if use ssl; then
+		myconf+=(ssl)
+	fi
+
+	./build.sh "${myconf[@]}" || die "build failed"
+}
+
+src_install() {
+	dobin bin/*
+}
--- a/app-admin/pass/Manifest
+++ b/app-admin/pass/Manifest
@ -1,6 +1,5 @@
 AUX 50pass-gentoo.el 491 BLAKE2B 30c24a820e877e74d4308b42fab036c3c670353af6eb79454c18b471ab62134074765c313be5633e5fc8d1d9105a51d4dc648e3e08f200487ea62e3b9cd4e4a1 SHA512 eaba952f7b080bb44f1a415ee3fa1e71469177a993116b890a0788b177ec70948c1ea6923f17ddddf5f1c01af2fca03e98a71e06a5dff32ff6ebe0b73a79f659
-DIST password-store-1.7.2.tar.xz 63620 BLAKE2B a1fe0b7ee1fdb94d2b76773653462d14c07c8fb239ffbcae210cc3c9c829fc5c0bd0bf85d8d44343a0cec50aae953b13a70d67aa7c94abf6c02f84bfd0d7c4ff SHA512 e6719a7125af6ecd80fdbeb38b4e2e89e7358ff16e18739d68a04b72dfdf860294b54f7ec0ec9676a62d2e270db8f54784a357c82217a478694472f8136e3657
-EBUILD pass-1.7.2-r1.ebuild 2168 BLAKE2B ab139e2fcfdaf672fc4d4c2a1da1810824c3d13f3422aebd4c427b1815e922fd154a3991b7d75b3de8cc53cf5a5a62c8561045b95e9999bca7c6ae71076b5ed6 SHA512 a408b84987175940dbe645d5d224f48d48e05a91b89dddb0eacbdeda865b8fdc0f77aa4928d922cbe8f54657f53f9cd97be645f16445a200efa3e72787d90d8a
-EBUILD pass-1.7.2.ebuild 2056 BLAKE2B 45beac312a1acc149c67dac9801377f6722f5eff67a834e84e1a44fd5c7687a9f0c4f7e69fdca21b9cc070018ff2bf4e7dca1827222ce5261e5ed451c567b531 SHA512 27c994e62a3917be3ab836bff56e380cc3573a87ae62fabd8deba8c7e5b9b195812677799f378ff1290c39ef92e22922082761da59f7f24176fbcd811c73f918
+DIST password-store-1.7.3.tar.xz 63416 BLAKE2B 5931608e0208dfe6965b79f586c153a4930d1c3d3b74433d026ee0bc5889fcc29334c637ca4fb68308d0169bad7c8235b6632e9f80eda1e24f0f5721353f88e3 SHA512 89755a7b02f05d75055a9fc14fd3f456c0a49ec31bdffd097a027f91228c64a98b18c1e80017aeda811773ae3287ff1b9737532da8ded06799d8fe3979ca06f7
+EBUILD pass-1.7.3.ebuild 2179 BLAKE2B 7073c414ca7f9f03f50ab2c120660e61ba32162cc843ee8c3bafe374923f9aa921ad2986632cae5c02c23980da36222e540e1818d54c05206cd5ff80154f6122 SHA512 1037c2940f5359e2545a8b68374a934abf1af6e488a13b736ab83a89f24e1106af0cf414808f3c56c09999f580fe574f2c333c5fd0ba1548ca44b32f2167e807
 EBUILD pass-9999.ebuild 1960 BLAKE2B e06b86833158fb55e9656a1bbc2168bbdfb0cc1fa48924437e2a05b81dc79c0f110cc2edf664610b43b29cb67c4563db568bbbf3cb6edd7f135b5db0d027751f SHA512 b170aaa7a41a628684735cd24994f40a95abd8e7c1ffa9bd52d381f4d94be246c7465cb617404eb61bc6221fede56f43dc76f18517329b83d00c0ebff02e4580
 MISC metadata.xml 881 BLAKE2B 59fee6aeadb16d050eeaedc6d5081963e3ffa8316ddd00afb67661d721fa60b80483c16348e0c3d6c20fdb6513fd5840552c3a95724b619e07122d8755c4e7c1 SHA512 49df1e24751818d46a0c23fcdc9e41d965dca29f9964f7d142e4dba9b076b472c860d9b3eafc15b04a983f49d2cd78eb6b529742469549209c7e4160a15f1323
--- a/app-admin/pass/pass-1.7.2.ebuild
+++ b/app-admin/pass/pass-1.7.2.ebuild
@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 elisp-common
-
-DESCRIPTION="Stores, retrieves, generates, and synchronizes passwords securely"
-HOMEPAGE="https://www.passwordstore.org/"
-SRC_URI="https://git.zx2c4.com/password-store/snapshot/password-store-${PV}.tar.xz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm x86 ~x86-macos"
-IUSE="+git X zsh-completion fish-completion emacs dmenu importers elibc_Darwin"
-
-RDEPEND="
-	app-crypt/gnupg
-	media-gfx/qrencode
-	>=app-text/tree-1.7.0
-	git? ( dev-vcs/git )
-	X? ( x11-misc/xclip )
-	elibc_Darwin? ( app-misc/getopt )
-	zsh-completion? ( app-shells/gentoo-zsh-completions )
-	fish-completion? ( app-shells/fish )
-	dmenu? ( x11-misc/dmenu x11-misc/xdotool )
-	emacs? ( virtual/emacs )
-"
-
-S="${WORKDIR}/password-store-${PV}"
-
-src_prepare() {
-	default
-
-	use elibc_Darwin || return
-	# use coreutils'
-	sed -i -e 's/openssl base64/base64/g' src/platform/darwin.sh || die
-	# host getopt isn't cool, and we aren't brew (rip out brew reference)
-	sed -i -e '/^GETOPT=/s/=.*$/=getopt-long/' src/platform/darwin.sh || die
-	# make sure we can find "mount"
-	sed -i -e 's:mount -t:/sbin/mount -t:' src/platform/darwin.sh || die
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	emake install \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		BASHCOMPDIR="$(get_bashcompdir)" \
-		WITH_BASHCOMP=yes \
-		WITH_ZSHCOMP=$(usex zsh-completion) \
-		WITH_FISHCOMP=$(usex fish-completion)
-	use dmenu && dobin contrib/dmenu/passmenu
-	if use emacs; then
-		elisp-install ${PN} contrib/emacs/*.el
-		elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el"
-	fi
-	if use importers; then
-		exeinto /usr/share/${PN}/importers
-		doexe contrib/importers/*
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	if use importers; then
-		einfo "To import passwords from other password managers, you may use the"
-		einfo "various importer scripts found in:"
-		einfo "    ${EROOT%/}/usr/share/${PN}/importers/"
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
--- a/app-admin/pass/pass-1.7.2-r1.ebuild
+++ b/app-admin/pass/pass-1.7.2-r1.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://git.zx2c4.com/password-store/snapshot/password-store-${PV}.tar.

 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~x86 ~x86-macos"
 IUSE="+git X zsh-completion fish-completion emacs dmenu importers elibc_Darwin"

 RDEPEND="
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@ -1,32 +1,15 @@
-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.27.0-fix-mmnormalize-tests.patch 509 BLAKE2B e50fd76f239be9fe15a0a7c8dd2b5984af69487c5ffe5a4f12e415f9c4040e600c5552dbe66c32879729c0f497bf74f1f63730b2f4c6a9a658fd385cb684cf05 SHA512 70bfe4f95b23e4e88e5b7535a1b86742a02438f2eadc6fd2e82c66ebdc9d59d983c1ded7d4902dd5d7ef9413847398c1318df82bace3b7e5b1ca8bd23ca9e8e4
-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-8.35.0-fix-issue2719.patch 7561 BLAKE2B 4adc0643dcb42bcc33ba3f8fc878ea4996d22e06865680fad6c9f0bff9da27d55293732e17678a36ce33d4ff1d76049d8b9b55bd0eb6b4987c893b48bf5daddc SHA512 54ad784c328a4def4c46777ba3b4ebe3d451d9a5a6883e3e6bd912070c52aaf2e85fefd938d64cbbd87ef9ae4ac0b4685ad1c0e74ad2bdf02bfa247ddcca939d
-AUX 8-stable/rsyslog-8.35.0-fix-issue2726.patch 1726 BLAKE2B 3b406319098637b81f85127494fb921529eb2704ae9ac6a90e89e4655412220748bba6584f010de1ca17c0a19fbd01b5c56314f43c7eec329b71884d24f3df93 SHA512 421a6b67372b1b4cac459f6fae7a6e839d96c363f8cb5fa4d38b7c64b53752a9a6ae2c050dd8cc18464475a0601d5451ac51719bd85df9ac40eaebb498a4c23c
-AUX 8-stable/rsyslog-r1.logrotate 994 BLAKE2B 36dee881c2cb79ce69678c7cb12c71fb70d970e5e10728a8d2b8acf2c08f613cea9c2a74d78ed7b75333147a6b1a553fe281956990e044a9db651c7486690dee SHA512 5ca68b4eec5bebaed48edb69c85f8338273db847ab1cc6999ce7cfe06644dc3854c3040e0ebd8a4900c213b267b2a081e7901ceb4e58f9dfdc7dc036aff02b6c
-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.28.0.tar.gz 2471122 BLAKE2B 48ed55cbf02eca22591c3d1d59db8f956e4d852cbabb4ae8837767a2c843209a53becbe2a9f595290b44d79c8813414c20954ce1ccaa08bf0786423df79344e3 SHA512 e27ba0ff22e945393536abc5bc6e234d8849db291a5056429b59b47abe15fb060fc5c26efedcfe347b386d438b3f8a029ae4577a1d803666701431677f628cb1
-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-8.34.0.tar.gz 2545544 BLAKE2B 66caf277a814563027183ecf267d76067c384adf8d6d7b8543203df9a7c37242722dd35445e4446aacf1e680f5f3957cea40ece8a284ef2a393b4a71e3a2b49c SHA512 69eaececa2f8b98799deac8e6cb2cf635a5117da7a21cbb0b880b7df1d83c6ccf16133dab099a6e5fb865f34c2dad164a1bf1952d16ca116af3b1dd35d15065e
+AUX 50-default-r1.conf 1952 BLAKE2B dca027ea6073384a2ec5867722028f70599c51fd8c46672ce647e84a7de4b3a0dc5bfaf43f7317eddb902c4987266ae67f88b43375a51e82a3ffefbb61c4d099 SHA512 1bc4d8059d83de57ff44d34265b0c3881bab7889f51c044728ba462c9105c89425187f95b6b01d6d6d103abde22a9dff063e5d6b90027ed87e9f851f9b1ad5b3
+AUX README.gentoo 1126 BLAKE2B b7e3881605c2bacda7f415b3f3195e1ef405a8e9fc7fd627fd35b0ab90966cbb29c9a85fcf2df6092062c5af353d44a02d3451e3caa072f4fa44d681702e9807 SHA512 46fdf3350e2005d3ef588d50dfc6d474a1b5d3010329b656879a43cbbd7be0cd91944b88d3838f45f69c830fc28c42e7fac2cd52e0a4b24bb6780562d59ae384
+AUX rsyslog-8.35.0-fix-issue2719.patch 7561 BLAKE2B 4adc0643dcb42bcc33ba3f8fc878ea4996d22e06865680fad6c9f0bff9da27d55293732e17678a36ce33d4ff1d76049d8b9b55bd0eb6b4987c893b48bf5daddc SHA512 54ad784c328a4def4c46777ba3b4ebe3d451d9a5a6883e3e6bd912070c52aaf2e85fefd938d64cbbd87ef9ae4ac0b4685ad1c0e74ad2bdf02bfa247ddcca939d
+AUX rsyslog-8.35.0-fix-issue2726.patch 1726 BLAKE2B 3b406319098637b81f85127494fb921529eb2704ae9ac6a90e89e4655412220748bba6584f010de1ca17c0a19fbd01b5c56314f43c7eec329b71884d24f3df93 SHA512 421a6b67372b1b4cac459f6fae7a6e839d96c363f8cb5fa4d38b7c64b53752a9a6ae2c050dd8cc18464475a0601d5451ac51719bd85df9ac40eaebb498a4c23c
+AUX rsyslog-r1.logrotate 994 BLAKE2B 36dee881c2cb79ce69678c7cb12c71fb70d970e5e10728a8d2b8acf2c08f613cea9c2a74d78ed7b75333147a6b1a553fe281956990e044a9db651c7486690dee SHA512 5ca68b4eec5bebaed48edb69c85f8338273db847ab1cc6999ce7cfe06644dc3854c3040e0ebd8a4900c213b267b2a081e7901ceb4e58f9dfdc7dc036aff02b6c
+AUX rsyslog.conf 1562 BLAKE2B 3abbc4c13c8c1d3817ac9a7c7f048aa1a8d7f279bf638dc91d15a785ad42c1b34a61de0be33b4ffa218a655849aeceff3e8686384e1d77472417235ce453b546 SHA512 1720174fab020e2de590f3d6bbb03784aca1928fe05f7e75e02fb4597cb8b2ee755e6deb8e8f989060511044ae483f791f496f24e0eecaf27eb9e0b5e20a2c7a
+AUX rsyslog.confd-r1 1145 BLAKE2B 06e63c7500238dd31abddd105269714387b990a3530ad11443a8502ad68221c3f8e8b0db02ba3ad2b7010483364d36a5b526a461d3465972b74d2cd36ff08747 SHA512 a7f8621bdd490596b09f9a7583dd0c992006c55335b2e6e687bef4141bb18cd4bb43e23f590a138e9c8d5a3cbac0cc46c3b01c7d3ff9f9dd3c53418b13b0dd4a
+AUX rsyslog.initd-r1 1758 BLAKE2B ff5fb6f9d2d6a5702f5fdacfae8037bbc4015f29a1ce94dfc5f331f64dd43a860dbabc9e4118c9d0d1c8b5bcb4ee3c95cc949ddd7864eaebbeec705f6d5c97d8 SHA512 ecbfad8588796f1600fa7a43dc0ea1a1107c676851f5a8c6f43399308999e9a0559af47675ab529b18a63ccb472ab6e3b80b9d072444854b4618c27db5e79aec
 DIST rsyslog-8.35.0.tar.gz 2590108 BLAKE2B e201c1366b8ab96c070829d51de079212e82216a793eb7622aa91c66e2330981de8be547b1ee7f102ed7d8c8de054d58ba151e95238146a61fba8fe908c5f929 SHA512 3b8845fc057147c2dd740b3bb432e7fb101ad60be5c6bc86a2c2796bcd3f3526c617d45b9e8301388d51047a125ca18ba4ac54f8be2a13eabbbe8fb9361beecc
 DIST rsyslog-8.36.0.tar.gz 2639477 BLAKE2B 9c7343d853f79e2955a8999e2871a2a9b008cb3ef75b94e2381a3a0ff3e49445593d852d7de3819851dc0d4c17a91d966ca2fbfd52e8215ebdbaf6b7ccd68bdf SHA512 b0c8689374b5b0fb5ad9675ad8983ce67bd04d34ad07d39cf8f91498fd2fd21a173f1077e5fa1b66a89a9d93ab011fc6345ac1a3be9961f4794fc9e152c32a50
-DIST rsyslog-docs-8.28.0.tar.gz 4424901 BLAKE2B 9753b1a48b9d3bb045f2d088de5df0bbe5bc9045a82a5cab98b27c2df7648ac312929a173ec34c81ced46cb0eba336d708204b73b57413686769afa882dceaa5 SHA512 c085e09149cfc27ce0cd22edf9ad3f81b111f491fbea79afbc3172882065bd8324e366e3b5d09c885c1a3aa63fe8fbbe154d66488319d4ffc0867f938e1ab07d
-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
-DIST rsyslog-docs-8.34.0.tar.gz 7419160 BLAKE2B 928e6a4044d6d2161483f934e6c2cd5e489a3ec95b823419d7d57b98a7dd6c73f4d28d17c238471592fe1c692b626b57c7bf647e926c1c38ff5a774e5d2defd5 SHA512 edf9aa63c777624c3dc27dfd64b38893b9b4c9b56941df1d7a8c6bc3cb4cbbfb83e8c356cbefeab7c688ecb6017b66ed99931cb71b69b7c927b4743548dd40d4
-DIST rsyslog-docs-8.35.0.tar.gz 7427270 BLAKE2B 5441080c07a8398cd5d513ba6abe0335f62762f105354105549f0440c0429c62a4f28a4cc84a71d049bc8134cd64bda2c2210a2f30fd5b94f53e0bc783e7c8d1 SHA512 f78d0451eef789d60f7c5ae1eed46c4a9f7a6ade73b829f65aa2373aa786b00e84e8957089532b1b652838bd9f62b41d92530276a0d27e21b8e94d5f0e4728a6
-DIST rsyslog-docs-8.36.0.tar.gz 7570338 BLAKE2B 031f94b88fb97e6c8b01d224279138c371a5f54ecc5d7a9298b4ec6351c5d380065877888ab1969386b76b9e715937b7335bee59c3d5b8ddd4910392a58d08cb SHA512 a93f56c9c9464a9ca87f61169c6fcfaa94608f31210eaac77e882e64bf5f514c887765db6bb57e4defafeb2a6e552506f0274c1ed275306efc1656f5520b5efa
-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 12867 BLAKE2B 87c372d138bda89e41a32e9732c733d03ea9a7da8e296e127a843568a9d6b58bc068dd5273a1d627b91b6062c8eab9a0dab2293cef950a3d4ac69eb59a3323d8 SHA512 14058cf62a65e191098e034c2e061112203b1dcb01658684dfbf178d2d26c2a390b4a3b40acfb01dd62363d8dfe87e86e040541341f3125c422a04e3bf464010
-EBUILD rsyslog-8.35.0-r1.ebuild 12932 BLAKE2B 08cc1faa8d1e8ad2fb55a66bd001b64689f4ac0152ac1f298c84c3842ca84c926a2ed1761d79d5b5456a09e7fdfda2eb6f90bb5a93ee170f5584f24ac11b3b0b SHA512 3fe9be1038a944e9c4e60535e70323a69006e53b7327f05d92f6c26205b6dac2f469d5d84799d13f6bed8b897b9ca0cbd94fb4b94af682d47613573e7bd6912b
-EBUILD rsyslog-8.36.0-r1.ebuild 13028 BLAKE2B 35fc40fbdd8eae6f8868e70a42efc35f0f2393f533b13584180991fc4d567fce8af361eb30a91e2c49366392aefaa103035f4087b8b423a39f75488c26bf546d SHA512 d4d9a7c1fc4af8bedf6daec4ab7b0be21864e0a9924593bf13b5bb52fd06e22d31e076ee79c9cbdc5809232eee8a654d28741d92421e9b5fe2c7ba717d8c7f1f
+DIST rsyslog-doc-8.35.0.tar.gz 7427270 BLAKE2B 5441080c07a8398cd5d513ba6abe0335f62762f105354105549f0440c0429c62a4f28a4cc84a71d049bc8134cd64bda2c2210a2f30fd5b94f53e0bc783e7c8d1 SHA512 f78d0451eef789d60f7c5ae1eed46c4a9f7a6ade73b829f65aa2373aa786b00e84e8957089532b1b652838bd9f62b41d92530276a0d27e21b8e94d5f0e4728a6
+DIST rsyslog-doc-8.36.0.tar.gz 7570338 BLAKE2B 031f94b88fb97e6c8b01d224279138c371a5f54ecc5d7a9298b4ec6351c5d380065877888ab1969386b76b9e715937b7335bee59c3d5b8ddd4910392a58d08cb SHA512 a93f56c9c9464a9ca87f61169c6fcfaa94608f31210eaac77e882e64bf5f514c887765db6bb57e4defafeb2a6e552506f0274c1ed275306efc1656f5520b5efa
+EBUILD rsyslog-8.35.0-r1.ebuild 11938 BLAKE2B 9275bcf376d28607c381b049e2b152c9f7ed14b32834a9b90cd0c45dc5edfa584bc3f18f754140c30471dac1207dd85f01612ab47ee82dcc09dafb69ba3eab53 SHA512 1d9eb2ad4dd408a69a108dc47d805d677a0151f77dc5485bfdf35202340341188e9449f76112c910f29483542e506cc0871c1e5527ba31e6daf3cf021f830258
+EBUILD rsyslog-8.36.0-r1.ebuild 12113 BLAKE2B bc15f57f63da43c5b3a2d3121bcb8e2ce00c14d8173c53d0912b424c2b2ee3ce936fc4fe75885da4a520615a220625a543f7c3a2e6807fcdf2d118a6a3728a38 SHA512 6fe8a096cbbf06f0748d8545577f9752a92466a33a2785332ba057686ce9b489f78263de65b670e21b163dfb52928b1fdbe0e9a46d29622bf9f05012c154b31d
 MISC metadata.xml 3850 BLAKE2B 1de60aef00ce700d8d2c05d93d3237170399c65ddfbd37f86e95dd0ef89c7910335b6fdbfc0e806345bb3dbd52212f0bdab45b57acf31b2241ed7d3bf52a64d4 SHA512 c66217bd3a1dd613d49fca4d42267e276bb4f085b14a452da0484ec508cfd45eb36049006cdb6ad58c7c74d88dd6512e922c8bdf07ac01602fbbaf7606215b82
--- a/app-admin/rsyslog/files/8-stable/50-default-r1.conf
+++ b/app-admin/rsyslog/files/8-stable/50-default-r1.conf
--- a/app-admin/rsyslog/files/8-stable/50-default.conf
+++ b/app-admin/rsyslog/files/8-stable/50-default.conf
@ -1,95 +0,0 @@
-#######################
-### DEFAULT ACTIONS ###
-#######################
-
-auth,authpriv.* action(
-	type="omfile"
-	File="/var/log/auth.log"
-	FileCreateMode="0600"
-	FileOwner="root"
-	FileGroup="adm"
-	Sync="off"
-)
-
-cron.* action(
-	type="omfile"
-	File="/var/log/cron.log"
-	FileOwner="root"
-	FileGroup="adm"
-)
-
-daemon.* action(
-	type="omfile"
-	File="/var/log/daemon.log"
-	FileOwner="root"
-	FileGroup="adm"
-)
-
-kern.* action(
-	type="omfile"
-	File="/var/log/kern.log"
-	FileOwner="root"
-	FileGroup="adm"
-)
-
-lpr.* action(
-	type="omfile"
-	File="/var/log/lpr.log"
-	FileOwner="root"
-	FileGroup="adm"
-)
-
-mail.* action(
-	type="omfile"
-	File="/var/log/mail.log"
-	FileOwner="root"
-	FileGroup="adm"
-)
-
-news.* action(
-	type="omfile"
-	File="/var/log/news.log"
-	FileOwner="root"
-	FileGroup="adm"
-)
-
-user.* action(
-	type="omfile"
-	File="/var/log/user.log"
-	FileOwner="root"
-	FileGroup="adm"
-)
-
-*.=debug;auth,authpriv,news,mail.none action(
-	type="omfile"
-	File="/var/log/debug.log"
-	FileOwner="root"
-	FileGroup="adm"
-)
-
-*.info;auth,authpriv,cron,daemon,lpr,mail,news.none action(
-	type="omfile"
-	File="/var/log/messages"
-	FileOwner="root"
-	FileGroup="adm"
-)
-
-# Uncomment the following directive to re-enable the
-# deprecated "/var/log/syslog" log file (don't forget to re-enable log
-# rotation in "/etc/logrotate.d/rsyslog" if you do that!)
-#*.*;auth,authpriv.none action(
-#	type="omfile"
-#	File="/var/log/syslog"
-#	FileOwner="root"
-#	FileGroup="adm"
-#)
-
-*.emerg action(
-	type="omusrmsg"
-	Users="*"
-	action.execOnlyOnceEveryInterval="10"
-)
-
-# Create an additional socket for the default chroot location
-# (used by net-misc/openssh[hpn], see https://bugs.gentoo.org/490744)
-input(type="imuxsock" Socket="/var/empty/dev/log")
--- a/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-mmnormalize-tests.patch
+++ b/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-mmnormalize-tests.patch
@ -1,23 +0,0 @@
-https://github.com/rsyslog/rsyslog/pull/1791
---
- tests/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
--- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -498,7 +498,6 @@ TESTS += msgvar-concurrency-array.sh \
- 	mmnormalize_processing_test2.sh \
- 	mmnormalize_processing_test3.sh \
- 	mmnormalize_processing_test4.sh
-endif
- 
- if ENABLE_IMPTCP
- TESTS +=  \
-@@ -512,6 +511,7 @@ if LOGNORM_REGEX_SUPPORTED
- TESTS += \
- 	mmnormalize_regex.sh
- endif
-+endif
- 
- if ENABLE_MMJSONPARSE
- TESTS += \
--- a/app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r3.patch
+++ b/app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r3.patch
@ -1,137 +0,0 @@
-https://github.com/rsyslog/rsyslog/commit/d9475f133e3c79875a7c4ccd92038b7123c1f155
-https://github.com/rsyslog/rsyslog/commit/468eeb79b8da91fb71dfef6bfb25476b2a37f446
-https://github.com/rsyslog/rsyslog/commit/50205ced0fc22e74f26f2a07b557b69c5d30e168
-
--- a/grammar/rainerscript.c
-+++ b/grammar/rainerscript.c
-@@ -1935,6 +1935,7 @@ num2ipv4(struct svar *__restrict__ const sourceVal) {
- 	return(estr);
- }
- 
-+#ifdef HAVE_LIBCURL
- /* curl callback for doFunc_http_request */
- static size_t
- curlResult(void *ptr, size_t size, size_t nmemb, void *userdata)
-@@ -2010,6 +2011,7 @@ doFunc_http_request(struct cnffunc *__restrict__ const func,
- 	}
- 	RETiRet;
- }
-+#endif
- 
- static int ATTR_NONNULL(1,3,4)
- doFunc_is_time(const char *__restrict__ const str,
-@@ -2513,11 +2515,16 @@ doFuncCall(struct cnffunc *__restrict__ const func, struct svar *__restrict__ co
- 		if(bMustFree2) free(str2);
- 		break;
- 	case CNFFUNC_HTTP_REQUEST:
-+#ifdef HAVE_LIBCURL
- 		cnfexprEval(func->expr[0], &r[0], usrptr, pWti);
- 		str = (char*) var2CString(&r[0], &bMustFree);
- 		doFunc_http_request(func, ret, str);
- 		if(bMustFree) free(str);
- 		varFreeMembers(&r[0]);
-+#else
-+		LogError(0, RS_RET_INTERNAL_ERROR,
-+			"rainerscript: internal error: HTTP_Fetch not supported, not built with libcurl support");
-+#endif
- 		break;
- 	default:
- 		if(Debug) {
-
--- a/configure.ac
-+++ b/configure.ac
-@@ -454,6 +454,8 @@ if test "$enable_libcurl" = "yes"; then
- 	)
- fi
- 
-+AM_CONDITIONAL(ENABLE_LIBCURL, test "x${enable_libcurl}" = "xyes")
-+
- # klog
- AC_ARG_ENABLE(klog,
-         [AS_HELP_STRING([--enable-klog],[Integrated klog functionality @<:@default=yes@:>@])],
-
--- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -226,7 +226,6 @@ TESTS +=  \
- 	rscript_contains.sh \
- 	rscript_bare_var_root.sh \
- 	rscript_bare_var_root-empty.sh \
-	rscript_http_request.sh \
- 	rscript_ipv42num.sh \
- 	rscript_field.sh \
- 	rscript_stop.sh \
-@@ -305,7 +304,11 @@ TESTS +=  \
- 	lookup_table_rscript_reload.sh \
- 	lookup_table_rscript_reload_without_stub.sh \
- 	multiple_lookup_tables.sh
-endif
-+if ENABLE_LIBCURL
-+TESTS +=  \
-+	rscript_http_request.sh
-+endif # ENABLE_LIBCURL
-+endif # ENABLE_TESTBENCH2
- 
- if HAVE_VALGRIND
- TESTS +=  \
-@@ -313,7 +316,6 @@ TESTS +=  \
- 	mmexternal-InvldProg-vg.sh \
- 	internal-errmsg-memleak-vg.sh \
- 	rscript_set_memleak-vg.sh \
-	rscript_http_request-vg.sh \
- 	no-parser-vg.sh \
- 	discard-rptdmsg-vg.sh \
- 	discard-allmark-vg.sh \
-@@ -338,6 +340,10 @@ TESTS +=  \
- 	multiple_lookup_tables-vg.sh \
- 	fac_local0-vg.sh \
- 	rscript_trim-vg.sh
-+if ENABLE_LIBCURL
-+TESTS +=  \
-+	rscript_http_request-vg.sh
-+endif # ENABLE_LIBCURL
- endif # HAVE_VALGRIND
- 
- if ENABLE_ROOT_TESTS
-
--- a/grammar/Makefile.am
-+++ b/grammar/Makefile.am
-@@ -12,8 +12,11 @@ libgrammar_la_SOURCES = \
- 	parserif.h \
- 	grammar.h
- libgrammar_la_CPPFLAGS =  $(RSRT_CFLAGS) $(LIBLOGGING_STDLOG_CFLAGS)
-#libgrammar_la_LIBADD = $(CURL_LIBS) $(RSRT_LIBS) $(SOL_LIBS)
-libgrammar_la_LIBADD = $(CURL_LIBS)
-+libgrammar_la_LIBADD =
-+if ENABLE_LIBCURL
-+libgrammar_la_CPPFLAGS += $(CURL_CFLAGS)
-+libgrammar_la_LIBADD += $(CURL_LIBS)
-+endif
- 
- #testdriver_SOURCES = testdriver.c libgrammar.la
- #testdriver_CPPFLAGS =  $(RSRT_CFLAGS)
-
--- a/plugins/omelasticsearch/Makefile.am
-+++ b/plugins/omelasticsearch/Makefile.am
-@@ -1,7 +1,7 @@
- pkglib_LTLIBRARIES = omelasticsearch.la
- 
- omelasticsearch_la_SOURCES = omelasticsearch.c
-omelasticsearch_la_CPPFLAGS =  $(RSRT_CFLAGS) $(PTHREADS_CFLAGS)
-+omelasticsearch_la_CPPFLAGS = $(RSRT_CFLAGS) $(PTHREADS_CFLAGS) $(CURL_CFLAGS)
- omelasticsearch_la_LDFLAGS = -module -avoid-version
- omelasticsearch_la_LIBADD =  $(CURL_LIBS) $(LIBM)
- 
--- a/grammar/rainerscript.c
-+++ b/grammar/rainerscript.c
-@@ -36,7 +36,11 @@
- #include <sys/types.h>
- #include <libestr.h>
- #include <time.h>
-+
-+#ifdef HAVE_LIBCURL
- #include <curl/curl.h>
-+#endif
-+
- #include "rsyslog.h"
- #include "rainerscript.h"
- #include "conf.h"
--- 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
@ -1,13 +0,0 @@
-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/files/8-stable/rsyslog.logrotate
+++ b/app-admin/rsyslog/files/8-stable/rsyslog.logrotate
@ -1,37 +0,0 @@
-# Uncomment the following directive if you have re-enabled
-# "/var/log/syslog" in "/etc/rsyslog.d/50-default.conf"
-#/var/log/syslog
-#{
-#	rotate 7
-#	daily
-#	missingok
-#	notifempty
-#	delaycompress
-#	compress
-#	postrotate
-#		test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null
-#	endscript
-#}
-
-/var/log/auth.log
-/var/log/cron.log
-/var/log/daemon.log
-/var/log/kern.log
-/var/log/lpr.log
-/var/log/mail.log
-/var/log/news.log
-/var/log/user.log
-/var/log/debug.log
-/var/log/messages
-{
-	rotate 4
-	weekly
-	missingok
-	notifempty
-	compress
-	delaycompress
-	sharedscripts
-	postrotate
-		test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null
-	endscript
-}
--- a/app-admin/rsyslog/files/8-stable/README.gentoo
+++ b/app-admin/rsyslog/files/8-stable/README.gentoo
--- a/app-admin/rsyslog/files/8-stable/rsyslog-8.35.0-fix-issue2719.patch
+++ b/app-admin/rsyslog/files/8-stable/rsyslog-8.35.0-fix-issue2719.patch
--- a/app-admin/rsyslog/files/8-stable/rsyslog-8.35.0-fix-issue2726.patch
+++ b/app-admin/rsyslog/files/8-stable/rsyslog-8.35.0-fix-issue2726.patch
--- a/app-admin/rsyslog/files/8-stable/rsyslog-r1.logrotate
+++ b/app-admin/rsyslog/files/8-stable/rsyslog-r1.logrotate
--- a/app-admin/rsyslog/files/8-stable/rsyslog.conf
+++ b/app-admin/rsyslog/files/8-stable/rsyslog.conf
--- a/app-admin/rsyslog/files/8-stable/rsyslog.confd-r1
+++ b/app-admin/rsyslog/files/8-stable/rsyslog.confd-r1
--- a/app-admin/rsyslog/files/8-stable/rsyslog.initd-r1
+++ b/app-admin/rsyslog/files/8-stable/rsyslog.initd-r1
@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 RSYSLOG_CONFIGFILE=${RSYSLOG_CONFIGFILE:-"/etc/rsyslog.conf"}
--- a/app-admin/rsyslog/rsyslog-8.28.0-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.28.0-r1.ebuild
@ -1,451 +0,0 @@
-# Copyright 1999-2018 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="https://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="hppa"
-	fi
-
-	SRC_URI="
-		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 )
-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/libmysqlclient:= )
-	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/
-	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.32.0-r4.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.32.0-r4.ebuild
@ -1,459 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit autotools eutils linux-info python-any-r1 systemd
-
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
-HOMEPAGE="https://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="
-		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 )
-fi
-
-LICENSE="GPL-3 LGPL-3 Apache-2.0"
-SLOT="0"
-IUSE="curl 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.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:= )
-	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/mongo-c-driver-1.1.10:= )
-	mysql? ( virtual/libmysqlclient:= )
-	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/czmq-3.0.2
-	)"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-archive-2015.02.24
-	virtual/pkgconfig
-	test? (
-		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
-		!jemalloc? ( sys-libs/libfaketime )
-		${PYTHON_DEPS}
-	)"
-
-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!"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-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)
-		$(use_enable curl libcurl)
-		# 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 omczmq)
-		--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.33.1-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.33.1-r1.ebuild
@ -1,457 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit autotools eutils linux-info python-any-r1 systemd
-
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
-HOMEPAGE="https://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="
-		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
-
-LICENSE="GPL-3 LGPL-3 Apache-2.0"
-SLOT="0"
-IUSE="curl 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.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:= )
-	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/mongo-c-driver-1.1.10:= )
-	mysql? ( virtual/libmysqlclient:= )
-	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/czmq-3.0.2
-	)"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-archive-2015.02.24
-	virtual/pkgconfig
-	test? (
-		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
-		!jemalloc? ( sys-libs/libfaketime )
-		${PYTHON_DEPS}
-	)"
-
-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!"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-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)
-		$(use_enable curl libcurl)
-		# 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 omczmq)
-		--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.34.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.34.0.ebuild
@ -1,464 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit autotools eutils linux-info python-any-r1 systemd
-
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
-HOMEPAGE="https://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:      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
-		_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="
-		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}"/${BRANCH}/${PN}-8.34.0-fix-issue2612.patch )
-fi
-
-LICENSE="GPL-3 LGPL-3 Apache-2.0"
-SLOT="0"
-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.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:= )
-	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 )
-	kubernetes? ( >=net-misc/curl-7.35.0 )
-	mdblookup? ( dev-libs/libmaxminddb:= )
-	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
-	mysql? ( virtual/libmysqlclient:= )
-	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/czmq-3.0.2
-	)"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-archive-2015.02.24
-	virtual/pkgconfig
-	test? (
-		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
-		!jemalloc? ( sys-libs/libfaketime )
-		${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"
-	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!"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-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)
-		$(use_enable curl libcurl)
-		# 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 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)
-		$(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 omczmq)
-		--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 " https://www.rsyslog.com/doc/rsyslog_tls.html"
-}
--- a/app-admin/rsyslog/rsyslog-8.35.0-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.35.0-r1.ebuild
@ -2,15 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2

 EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )

 inherit autotools eutils linux-info python-any-r1 systemd

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

-BRANCH="8-stable"
-
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"

@ -18,39 +16,16 @@ if [[ ${PV} == "9999" ]]; then

 	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:      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
-		_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
+	KEYWORDS="amd64 arm ~arm64 hppa x86"

 	SRC_URI="
-		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} )
+		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
+		doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
 	"

 	PATCHES=(
-		"${FILESDIR}"/${BRANCH}/${PN}-8.35.0-fix-issue2719.patch
-		"${FILESDIR}"/${BRANCH}/${PN}-8.35.0-fix-issue2726.patch
+		"${FILESDIR}"/${PN}-8.35.0-fix-issue2719.patch
+		"${FILESDIR}"/${PN}-8.35.0-fix-issue2726.patch
 	)
 fi

@ -151,7 +126,7 @@ src_unpack() {
 			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}
+			unpack ${PN}-doc-${PV}.tar.gz
 		fi
 	fi
 }
@ -183,7 +158,6 @@ 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
@ -221,7 +195,6 @@ src_configure() {
 		$(use_enable debug)
 		$(use_enable debug diagtools)
 		$(use_enable debug memcheck)
-		$(use_enable debug rtinst)
 		$(use_enable debug valgrind)
 		# Misc
 		$(use_enable curl fmhttp)
@ -298,15 +271,15 @@ src_install() {
 	local DOCS=(
 		AUTHORS
 		ChangeLog
-		"${FILESDIR}"/${BRANCH}/README.gentoo
+		"${FILESDIR}"/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}
+	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}

 	keepdir /var/empty/dev
 	keepdir /var/spool/${PN}
@ -314,13 +287,13 @@ src_install() {
 	keepdir /etc/${PN}.d

 	insinto /etc
-	newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf
+	newins "${FILESDIR}/${PN}.conf" ${PN}.conf

 	insinto /etc/rsyslog.d/
-	newins "${FILESDIR}/${BRANCH}/50-default-r1.conf" 50-default.conf
+	newins "${FILESDIR}/50-default-r1.conf" 50-default.conf

 	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${BRANCH}/${PN}-r1.logrotate" ${PN}
+	newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}

 	if use mysql; then
 		insinto /usr/share/doc/${PF}/scripts/mysql
--- a/app-admin/rsyslog/rsyslog-8.36.0-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.36.0-r1.ebuild
@ -2,15 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2

 EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )

 inherit autotools eutils linux-info python-any-r1 systemd

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

-BRANCH="8-stable"
-
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"

@ -18,34 +16,11 @@ if [[ ${PV} == "9999" ]]; then

 	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:      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
-		_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
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"

 	SRC_URI="
-		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} )
+		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
+		doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
 	"

 	PATCHES=()
@ -158,7 +133,7 @@ src_unpack() {
 			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}
+			unpack ${PN}-doc-${PV}.tar.gz
 		fi
 	fi
 }
@ -307,15 +282,15 @@ src_install() {
 	local DOCS=(
 		AUTHORS
 		ChangeLog
-		"${FILESDIR}"/${BRANCH}/README.gentoo
+		"${FILESDIR}"/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}
+	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}

 	keepdir /var/empty/dev
 	keepdir /var/spool/${PN}
@ -323,13 +298,13 @@ src_install() {
 	keepdir /etc/${PN}.d

 	insinto /etc
-	newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf
+	newins "${FILESDIR}/${PN}.conf" ${PN}.conf

 	insinto /etc/rsyslog.d/
-	newins "${FILESDIR}/${BRANCH}/50-default-r1.conf" 50-default.conf
+	newins "${FILESDIR}/50-default-r1.conf" 50-default.conf

 	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${BRANCH}/${PN}-r1.logrotate" ${PN}
+	newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}

 	if use mysql; then
 		insinto /usr/share/doc/${PF}/scripts/mysql
--- a/app-admin/spectre-meltdown-checker/Manifest
+++ b/app-admin/spectre-meltdown-checker/Manifest
@ -0,0 +1,4 @@
+DIST spectre-meltdown-checker-0.37.tar.gz 40472 BLAKE2B 93d83605c2d410a176d944cbf7c83549cc70075dbd7ef1f90d4a9710d8fdafd0393c0ad6a9a46eba12f753a3b14d486ba093f9b7fb1dd6c08d17042a94f97b44 SHA512 f621e81a783e8e01caae25d76fae6ab7bd091990cd0a0f93de2e29e1964b6f0952c221c64e4e045f26231f800b0ba1b8152aac71a7348e8577ac6b9bd7e31cf2
+EBUILD spectre-meltdown-checker-0.37.ebuild 604 BLAKE2B ba0beb4835deaa3f5fcfb7bc077f0f56763e28b64276e85cb74620c6458c7210b5ad028079d922366afae4e481e931137c5634ca2598efba80a01c03a6ef8b25 SHA512 ec885585c8c9d4867b27448db21b121a01c2c0c8eec887a2911a1bfdb560404230e269dcad15d2873470d41ee8943142cb07bde132eebd94df054dd197051903
+EBUILD spectre-meltdown-checker-9999.ebuild 604 BLAKE2B ba0beb4835deaa3f5fcfb7bc077f0f56763e28b64276e85cb74620c6458c7210b5ad028079d922366afae4e481e931137c5634ca2598efba80a01c03a6ef8b25 SHA512 ec885585c8c9d4867b27448db21b121a01c2c0c8eec887a2911a1bfdb560404230e269dcad15d2873470d41ee8943142cb07bde132eebd94df054dd197051903
+MISC metadata.xml 461 BLAKE2B ffd3a0e87b161c95e73d98acfb9ce11068ff5698ad095703e48ff7a95bd9c65379bdfa87ed19f6a1c5e10458cb10042f33e986d58741f8667b49409c1d7083ad SHA512 9e59c70f06c412ef1a742d2edbf62ef5e69e3997e8ba713e61a91dfcdb4a399035e60d9ce6fad43a1568cec658f05d33bc3aaa5fd2efc1cf70eb0f5fd98e1dbc
--- a/app-admin/spectre-meltdown-checker/metadata.xml
+++ b/app-admin/spectre-meltdown-checker/metadata.xml
@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>lucianposton@pm.me</email>
+		<name>Lucian Poston</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">speed47/spectre-meltdown-checker</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.37.ebuild
+++ b/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.37.ebuild
@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/speed47/spectre-meltdown-checker.git"
+else
+	SRC_URI="https://github.com/speed47/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Spectre & Meltdown vulnerability/mitigation checker for Linux"
+HOMEPAGE="https://github.com/speed47/spectre-meltdown-checker"
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+src_install() {
+	default
+	newbin spectre-meltdown-checker.sh spectre-meltdown-checker
+}
--- a/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-9999.ebuild
+++ b/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-9999.ebuild
@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/speed47/spectre-meltdown-checker.git"
+else
+	SRC_URI="https://github.com/speed47/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Spectre & Meltdown vulnerability/mitigation checker for Linux"
+HOMEPAGE="https://github.com/speed47/spectre-meltdown-checker"
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+src_install() {
+	default
+	newbin spectre-meltdown-checker.sh spectre-meltdown-checker
+}
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
--- a/app-benchmarks/i7z/Manifest
+++ b/app-benchmarks/i7z/Manifest
@ -8,6 +8,5 @@ AUX nehalem.patch 477 BLAKE2B e0f30d54f1da1cac0aafaea91641d5e626bbbdea6bc2abc6e1
 AUX qt5.patch 365 BLAKE2B 4aa56d2b643ecc119122f549678d4cd1525bdba923067366c92fa0ef3a3b183b17668ad593d825223cb69bba883ede461439b05ecda1da29d27e6b3085a54f52 SHA512 fc38423e82f774aff588023b45154ea3bf3fd553ee6bc4261dcd0e7911d1d589754461a1734e0da969d03d6d94e2b844da6f09a388ce4508090d4ba5c75c7df0
 AUX use_stdbool.patch 885 BLAKE2B 10365e67f43418213e8f38ab74d3588aab2783329d447834ad795f8973cdd53fdc40862d8f9abc723acaddfe03f49f3c471046ae865ed72f041db23ee1337c37 SHA512 5df3d042a580268971e6da0878bd070d2054e9a9732b518a88a489d6b3d62acae58f697fe44634ee6c847b108cae25df6592ed9e1f20ea4d7c6b36adb516830d
 DIST i7z-93_p20131012.tar.gz 879969 BLAKE2B 73b1f2e777cef9799fc9e11d366c989c37f4bad03676409855fdd8229a66d1075805068ad424ab0b46bb9bb4fe62431fb6c79b414fde0c1b1d29935ca4566839 SHA512 ef2dfc36407b18a2081413d423cc3d38c38121e386d9068eee9a794b810232727b3abbd22d3b36bc32206f4dc89dd881a4550df19108c439a91f01369bf74d5a
-EBUILD i7z-93_p20131012-r1.ebuild 1491 BLAKE2B 3d22e3168929e2270577126f13437f1d3d994cb14ec36708cda9ae8b65a0f3d6b5243eb139df07e027bb9a84fe3fe47d67eaaa23061b6a9f6599d946eb80cee7 SHA512 03d5d125dd335d23844ac76d9153114da9b785dd0bbd37bf35751b87a840522fa4256ac77e0a0d6a7ade67f108631c7f9ade486ce12b89397f15e3f648287318
 EBUILD i7z-93_p20131012-r2.ebuild 1307 BLAKE2B 62d44601edf4d3a29e13cc4fd3135e5b3cdb81d62ef2dd37e6cf4cb98b84bbc7dc96bdc6296a9f751e325518640a5799068e0d1fa5f494f9fae24f833330ff1f SHA512 0c4a0e169f0c9d0ece0fd7272d416994cda58196a0961906080d0e0e561407453bcb780222051aedfd00e1d62c2cae91ccf5688ea358a56f1269dcdc93b36d33
 MISC metadata.xml 296 BLAKE2B c58dcfad78dd439c5fb57ba43d2c7694eee04f21dd6feef0af39c06d4980c37a02da0a1cea423d41cc2d32265be75b731a1a3866cda1e855af8efd71917900fb SHA512 a73fd853e9d6da0d414da279e6fea520e9f1f1ff76c73295640be542ed81391871a83f30f5739271c7044692398182217e42b59d75fe65ad4c5d949015009668
--- a/app-benchmarks/i7z/i7z-93_p20131012-r1.ebuild
+++ b/app-benchmarks/i7z/i7z-93_p20131012-r1.ebuild
@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic qmake-utils toolchain-funcs
-
-COMMIT="5023138d7c35c4667c938b853e5ea89737334e92"
-DESCRIPTION="A better i7 (and now i3, i5) reporting tool for Linux"
-HOMEPAGE="https://github.com/ajaiantilal/i7z"
-SRC_URI="https://github.com/ajaiantilal/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="qt5"
-
-RDEPEND="
-	sys-libs/ncurses:0=
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/i7z-0.27.2-ncurses.patch
-	"${FILESDIR}"/qt5.patch
-	"${FILESDIR}"/gcc5.patch
-
-	# From Debian
-	"${FILESDIR}"/fix-insecure-tempfile.patch
-	"${FILESDIR}"/fix_cpuid_asm.patch
-	"${FILESDIR}"/hyphen-used-as-minus-sign.patch
-	"${FILESDIR}"/install-i7z_rw_registers.patch
-	"${FILESDIR}"/use_stdbool.patch
-)
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-src_configure() {
-	# The GUI segfaults with -O1. None of the documented flags make a
-	# difference. There may not be a specific flag for the culprit.
-	# Looks to work fine for me with -O2 (pacho - 20170530)
-#	filter-flags "-O*"
-
-	tc-export CC PKG_CONFIG
-	cd GUI || die
-
-	use qt5 && eqmake5 ${PN}_GUI.pro
-}
-
-src_compile() {
-	default
-
-	if use qt5; then
-		emake -C GUI clean
-		emake -C GUI
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${ED}" docdir=/usr/share/doc/${PF} install
-
-	if use qt5; then
-		dosbin GUI/i7z_GUI
-	fi
-}
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/glep63-check/Manifest
+++ b/app-crypt/glep63-check/Manifest
@ -1,3 +1,7 @@
 DIST glep63-check-4.tar.gz 5898 BLAKE2B b28dd0843138bb54c81142959a28b121b043b7da4e3dc797b8ad3ebabfde6f850a11c40e94e3d20b9cf152b2138165733ba36754859081eb59bbbd5e99f2b98e SHA512 65a40ce097937df0517f86d1b32fd47e23d39abc6a49fa45dfa9075e7f7a163c2c2e25f6e39538a5e47c295bfdb2390bc4909e14a06b21f2bf14edf8cf43f199
+DIST glep63-check-5.tar.gz 61234 BLAKE2B 15b2e38e00ec044c963f4aaea9be4bf0659441a94ba9958aa1e70ecd425cc9f3dada31ab194092abdf9953ca10d711aa0cdd615365a6e78761b07fb0739fadd5 SHA512 d79a2e2a92dc4f123fbfa73df501fb9a0829a879e0d3674e8d6a854b8a2b437698b77793d92c6862d646a58ef302638cb9e5d152f60e634c9ec06e804dea79b4
+DIST glep63-check-6.tar.gz 61318 BLAKE2B 9310a70556deabf90003c154c326480e7a5fb58992bf79201100c21fbbeb17ebfdb560d861586d1c206a8d4ed3e64500a8eca4d99dacd072dce121736cdb2d3e SHA512 f0729683095222f60243923bcb7d9c1b984eb10cb0d8a0da2ec756b40a11c3f4f3de466fa533a66d4f645a2de09137a12a47eda5e80d7d5d562b0926a30b1a72
 EBUILD glep63-check-4.ebuild 603 BLAKE2B b062189a109fb0227031fba2c627065b8badf676f9b2db60d8e1b847dc59e3e801ea392a47c2d67e7eb801b44df689f3dc486cef33496c62baaeb387f4821e59 SHA512 65ec1371049758b84c7f50f3afc3042df99ead045cfeafd4e61beae02ba36bab4802b1ffce8ee94ccdf32bf7c993b4d1f9f1b872d631640549e0be449e64c72d
+EBUILD glep63-check-5.ebuild 643 BLAKE2B 72915256273a72d0f55c1a7b8ffa0cf778304ebcdeca731ecef29669f051193cf86927bd79bc3aea45d7382afaffe05e01f71cfcb008fb02f75b917cf81dbefd SHA512 24bbf7e9b7589c6cdd3de5c6bf4000d4464f539943e84398524331f26e873a3b04d722aae65bf528cf94a105fd4a8b3651c9f449af9c48810620507bd4411dce
+EBUILD glep63-check-6.ebuild 665 BLAKE2B bee30971b92dfd8f54b3ed5e97accaab4fd5b90f5ac6304c389e3b3279402042d13c9499e646d2b3f007121927edd9bc8a7e9eaf8e7eef2a1ef5ea58491507a5 SHA512 b9c90d5f74e37de3ffaf0c1da2d5b80c368aead33b7036fd6530e39b774ca8f801f04a08e9976fe9774214032d139a84fdfc9df2f7d88276ae7d4e5da5d97e2b
 MISC metadata.xml 513 BLAKE2B dc5036a6556ebfefbbfc1ad01f436b9793c5c0c51e7cbda49ee896ff364a30761f92ec63531317b4bd55bb9cc018d6ee62d07776a61ba75d7d1245c3d0c1339a SHA512 44aac823dedeb848696d166e28d151449b59d30a7dd87a0c2c339c044e2704908a1882e3b818ad7007822b5fd2efc52ad81564fad953862851b44480d61642fe
--- a/app-crypt/glep63-check/glep63-check-5.ebuild
+++ b/app-crypt/glep63-check/glep63-check-5.ebuild
@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6,7} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="GLEP 63 compliance checker for OpenPGP keys"
+HOMEPAGE="https://github.com/mgorny/glep63-check/"
+SRC_URI="https://github.com/mgorny/glep63-check/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-crypt/gnupg"
+DEPEND="test? ( ${RDEPEND} )"
+
+python_test() {
+	"${EPYTHON}" -m unittest -v || die "Tests fail with ${EPYTHON}"
+}
--- a/app-crypt/glep63-check/glep63-check-6.ebuild
+++ b/app-crypt/glep63-check/glep63-check-6.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="GLEP 63 compliance checker for OpenPGP keys"
+HOMEPAGE="https://github.com/mgorny/glep63-check/"
+SRC_URI="https://github.com/mgorny/glep63-check/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-crypt/gnupg"
+DEPEND="
+	test? (
+		${RDEPEND}
+		sys-libs/libfaketime
+	)"
+
+python_test() {
+	"${EPYTHON}" -m unittest -v || die "Tests fail with ${EPYTHON}"
+}
--- a/app-crypt/openpgp-keys-gentoo-release/Manifest
+++ b/app-crypt/openpgp-keys-gentoo-release/Manifest
@ -1,10 +1,4 @@
 DIST gentoo-release-test-sigs-20180706.tar.gz 1437 BLAKE2B 00fb0a491c84853068ea578e68e8ab0a57842f6098c14da7ec44faf20abb23deef480aca958a7e352b9c55a024681eabc0c9aaf400e5dcbf8873277a3a940e38 SHA512 2a7cc2c650693c0e1fdf7083d77bf975e05ece3ab1495ed03362d02e8411481c80a62a9f21b23861bdc602d74c656a618e9a39d2bdef7ccd253ea9f3e4c7531a
-DIST gentoo-release.asc.20180323.gz 40546 BLAKE2B 7fed70d734a73368e4772cbca7810e8d61ad3b483e0e0c115072de9f96332b0c8c3c9f091b0ee1cdd056c775db1121deee77d6a629e0b99a4c67d485ccacdfe6 SHA512 31ffdf1e23ea6a36c5f4ab6bd49b9c0323b6b03627a9001589030b2b10e95459b959ee931762bcd43fb94b28eaba5d5ede290b1a41ce3ec0ad1b7b8b0f98d48a
-DIST gentoo-release.asc.20180530.gz 47465 BLAKE2B de37e8e84570debd8b39003bc65ada276f730e8a792b8990c87f4ffd7bbefd2cf49e44b53d3554fc6ecc302da65c8fc480821fd6e9f11324d5ed08a5fac861ef SHA512 63fcb06ae84657cde66fa74bd2b499936906d7aef36c46d19439c72a8c0f199cdc273d7e25004c60b23c50684365192b2a304f26c2b173564a216316eb22f66a
-DIST gentoo-release.asc.20180703.gz 46676 BLAKE2B 934db8c5896aa9fc268820c3349a60854e0a99586c84dbb16e92528b2fac7c043033f68f790bf737fa6835138bdf4dc7ae0df4d67ed96bd8664b16cd42db50a1 SHA512 85ceed12ca105a8dc9767c61b6ff391ed9d3ec2a116ed39b130aa75fa60998d0c2569677b783937bf4cae1cf91f472c9f16fb87abee051fa26f3c7b96bef0b27
 DIST gentoo-release.asc.20180706.gz 44805 BLAKE2B 1ba26b90e564738a1282c5febe426628144ab70e526397b866f97214254c73bbb517cdaa48ba0e83ca75a7d88cd622375fda0f362c43d13b66720ffb682682d2 SHA512 ba48cb6d7e72c6a720df3ff2430a4b4dd261f947c23762cd0c1255a93391d10becfb491db1bb80b295edd1f8192580315d5c7be3670b8689ef702ed228b05894
-EBUILD openpgp-keys-gentoo-release-20180323.ebuild 597 BLAKE2B b8296757f86faabba07fc698f2386a2d1d4738e68edb29c93cde7b922c4b799ca4eeba111ea707131e99ccab45838aaa88b5b84c780648109e0af86a2d17e485 SHA512 967c6ea7620e97213347c2bfd70a6ee2dc8ec7a0aebd11d6db0973937dd7f89e8fc10ba3c2ca0115866c96d24a2ee9c6891b63cdaa91c8a077caa800fd880b3a
-EBUILD openpgp-keys-gentoo-release-20180530.ebuild 597 BLAKE2B b8296757f86faabba07fc698f2386a2d1d4738e68edb29c93cde7b922c4b799ca4eeba111ea707131e99ccab45838aaa88b5b84c780648109e0af86a2d17e485 SHA512 967c6ea7620e97213347c2bfd70a6ee2dc8ec7a0aebd11d6db0973937dd7f89e8fc10ba3c2ca0115866c96d24a2ee9c6891b63cdaa91c8a077caa800fd880b3a
-EBUILD openpgp-keys-gentoo-release-20180703.ebuild 597 BLAKE2B b8296757f86faabba07fc698f2386a2d1d4738e68edb29c93cde7b922c4b799ca4eeba111ea707131e99ccab45838aaa88b5b84c780648109e0af86a2d17e485 SHA512 967c6ea7620e97213347c2bfd70a6ee2dc8ec7a0aebd11d6db0973937dd7f89e8fc10ba3c2ca0115866c96d24a2ee9c6891b63cdaa91c8a077caa800fd880b3a
 EBUILD openpgp-keys-gentoo-release-20180706.ebuild 1145 BLAKE2B 937f2632087e94da638b49d8eda2af8344d1bfc9599b53450159bf6310e5a3ccb779d54ee7b692168a4e23568f148af275eb4fde4d907f0f69c8b80220cb4672 SHA512 d288fbfa00b490fa833ac744fd58ff3ed2219b5d5c69c9d23efe548cf0629ab4afb3925f907080083fb6d8205424c15477e029ec99df81aa279530a560cfa028
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
--- a/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20180323.ebuild
+++ b/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20180323.ebuild
@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="OpenPGP keys used for Gentoo releases (snapshots, stages)"
-HOMEPAGE="https://www.gentoo.org/downloads/signatures/"
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release.asc.${PV}.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-S=${WORKDIR}
-
-src_install() {
-	insinto /usr/share/openpgp-keys
-	newins "gentoo-release.asc.${PV}" gentoo-release.asc
-}
--- a/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20180530.ebuild
+++ b/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20180530.ebuild
@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="OpenPGP keys used for Gentoo releases (snapshots, stages)"
-HOMEPAGE="https://www.gentoo.org/downloads/signatures/"
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release.asc.${PV}.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-S=${WORKDIR}
-
-src_install() {
-	insinto /usr/share/openpgp-keys
-	newins "gentoo-release.asc.${PV}" gentoo-release.asc
-}
--- a/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20180703.ebuild
+++ b/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20180703.ebuild
@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="OpenPGP keys used for Gentoo releases (snapshots, stages)"
-HOMEPAGE="https://www.gentoo.org/downloads/signatures/"
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release.asc.${PV}.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-S=${WORKDIR}
-
-src_install() {
-	insinto /usr/share/openpgp-keys
-	newins "gentoo-release.asc.${PV}" gentoo-release.asc
-}
--- a/app-crypt/xca/Manifest
+++ b/app-crypt/xca/Manifest
@ -2,5 +2,5 @@ AUX xca-1.0.0-desktop.patch 391 BLAKE2B 1cbec5681df8da9230b783c8ea048a199bd31a38
 DIST xca-1.4.1.tar.gz 959107 BLAKE2B 7437cdbaa5277998de200e9a5ad3a7d44aed9ae8af8fd926d7ed1917d49bec79562455ca2e82557149d748840f299ffd66edfc7f265be7d5bdcd6e4fe8dbaf9b SHA512 8294669c4887ba7a9060c3c2c06014b8a1807898569842ed61c066e8a864de014fba51a2ff867b579048083fdd4934cc7f97c92268de4944bf4aafea9c2e7b42
 DIST xca-2.1.0.tar.gz 1055745 BLAKE2B c3ea2953be7cacb8c4c6fb6911f2e51806d40f294d8c9daef1d47da4f3e6ffa4933d199b8b92cab828286ececab2ea7195d5a46455e4d4703f0a67d0d7861db9 SHA512 ad46b290067b0a22bb6baeb0d065879bea74cd2c853f67c2be3d0c2bdaa5ca4ebef606c0f08bd0b130df4ec13418d470062b708ab479800eab7c18dffa46af03
 EBUILD xca-1.4.1.ebuild 1205 BLAKE2B f99cee8ebf2a07078045f01b4adf8db7736376b20536f00fe458824cc03f87c264a566cefdac56a2705ab5f4fc45d783ba6ca085eee7126e452d09ef2da7a4c0 SHA512 a59498a8576994a5cb9dfec0c204d65e5a2cdd2f0963c5c93ad2148fccfff93fab7658b512c40d7fe8364a39fe5d023332008308aeff35acf96dc18ad3079a6a
-EBUILD xca-2.1.0.ebuild 1428 BLAKE2B ef6b6696cd6702b42d6176675e7e123c5fa378249fa2ac393faae0eea71841547729ec5bc96cdcd5f7a8b6763555534eccd1109517ea583cc831c506faa2067e SHA512 43ce3a5d054d90920829a3d96d7ff0721fef9fb0d2ce08044ccb5271215b73b1b5036921308d038167b13fa3a5ef0f31a5da8d3d1d6deb9cc6c1486abfbc9581
+EBUILD xca-2.1.0.ebuild 1452 BLAKE2B e4c94fca222d135959d2a897460177a0a804ec52fe557cd9ab61ac33571e9da6819a7b6d985d0b3182678a822bbc1d393f44d7d1b7633ddddf5d25451e420ba7 SHA512 e008114523bdd00806571cbbde4bac62f14201c0c02195f25a035a575c089fbee87b40cfd0606d26f6aab44f9eda2e3f0c367ff1253ad16aab2ce3fb7685ff30
 MISC metadata.xml 313 BLAKE2B 6e1376d870ee5ab083ed80dcc19c1acd60d487e285e9bdba7b92c13e97cb05a3a6fa8bc4c6107d5d54470e6ca93889fca15c1a2f7e690a169ca7aff64bd2499e SHA512 ebc38746afd94878384ef0e4d7933e2a7433216716b1854cfc0227c3f0abf0847d784d36de4b04a778743e442298abd3769329deecdc771003681ecd3dbf3fa1
--- a/app-crypt/xca/xca-2.1.0.ebuild
+++ b/app-crypt/xca/xca-2.1.0.ebuild
@ -17,6 +17,7 @@ IUSE="bindist doc libressl"
 RDEPEND="
 	dev-libs/libltdl:0=
 	dev-qt/qtgui:5
+	dev-qt/qtsql:5[sqlite]
 	dev-qt/qtwidgets:5
 	!libressl? ( dev-libs/openssl:0=[bindist=] )
 	libressl? ( dev-libs/libressl:0= )
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/wine-any/Manifest
+++ b/app-emulation/wine-any/Manifest
@ -14,6 +14,7 @@ DIST wine-staging-3.13.tar.gz 9936353 BLAKE2B f5791c6f1bc43395860ea938cfadefe88e
 EBUILD wine-any-2.0-r1.ebuild 20915 BLAKE2B 7ff1002e303dd2a083267fbf24e4b6cb0e3ff620d6bbf78b8fb15d66fb4d11669812233f1edeea0f46e75b9a0c8a9e63244aa4bebb594b95d158d55fc2506e6d SHA512 8e1bd0d4391f1e9336f9c39ce46d97f921f70cae75d961bc8fe8c7ec6c51bbba621c19a3171f0c351ce6e038d37a7f9a73f6f0bb4622f176e5a994e4a989b2e7
 EBUILD wine-any-3.11.ebuild 20850 BLAKE2B 602ff47811c6b486aa28f338d6b8838b303ee9b0078b6d7b775cb62c2fa3bb864ac9c4ee39122be4c4a8f40de72b512e701fe8ec83ab27463a7df4c7c5fe6b67 SHA512 0240bfd7bb01322ed053118fd3a65cec336493e33ecbb8f5db10505e8500a50b4136e2d323ce7af3a58c53396e2c7635203fddef21343924007e59c519ee8820
 EBUILD wine-any-3.12.ebuild 20957 BLAKE2B d31df15a6217a94c2ca9b0a6f377dc41d39d400bdc3c67a5d7b45274085b1ce6a362630a7f1fce1100d5500d2ca79042a00faff7e64213eb03d4b18067bc2686 SHA512 dfb9c90b227a78cbd939268e65ae2641bdc06d5e7b1b80d97b707c30cd9b962a2eeb1c2651eb05bbb6284ec2b42791d066dac6d469301d597529f3d2860d46b1
+EBUILD wine-any-3.13-r1.ebuild 20957 BLAKE2B d775aef9f6fb05ecd1ed7e1d0500a4e31839a0290a9372663f636babdc859237b8b44e64e1de0b8b80bfded2cb8cf472471ca99a3142c0fa248c6122adb5f7a5 SHA512 191c03e280fdaf8c3a371d65f5cd3540c02264f4d52665d3c5f150160f95f0bfaa73760f1ee4fb2a0c31b52461a4ea4297d2d205a13ff41f01480c32f5341d60
 EBUILD wine-any-3.13.ebuild 20957 BLAKE2B d31df15a6217a94c2ca9b0a6f377dc41d39d400bdc3c67a5d7b45274085b1ce6a362630a7f1fce1100d5500d2ca79042a00faff7e64213eb03d4b18067bc2686 SHA512 dfb9c90b227a78cbd939268e65ae2641bdc06d5e7b1b80d97b707c30cd9b962a2eeb1c2651eb05bbb6284ec2b42791d066dac6d469301d597529f3d2860d46b1
-EBUILD wine-any-9999.ebuild 20957 BLAKE2B d31df15a6217a94c2ca9b0a6f377dc41d39d400bdc3c67a5d7b45274085b1ce6a362630a7f1fce1100d5500d2ca79042a00faff7e64213eb03d4b18067bc2686 SHA512 dfb9c90b227a78cbd939268e65ae2641bdc06d5e7b1b80d97b707c30cd9b962a2eeb1c2651eb05bbb6284ec2b42791d066dac6d469301d597529f3d2860d46b1
+EBUILD wine-any-9999.ebuild 20957 BLAKE2B d775aef9f6fb05ecd1ed7e1d0500a4e31839a0290a9372663f636babdc859237b8b44e64e1de0b8b80bfded2cb8cf472471ca99a3142c0fa248c6122adb5f7a5 SHA512 191c03e280fdaf8c3a371d65f5cd3540c02264f4d52665d3c5f150160f95f0bfaa73760f1ee4fb2a0c31b52461a4ea4297d2d205a13ff41f01480c32f5341d60
 MISC metadata.xml 3938 BLAKE2B 229f46077b9df226c74b9001708696aec52d9d52cc14707caae883e6a8d4e16c7cb50cba84caa6c17ff13ff26d3bdc1327630dd03263922c0ca1e79922e8614c SHA512 c3c2d969dae75796e689395def7e18cd3c7988b6fee62841757a616f288a05117ea2fded37d71a5cbbe1fb59df8ff888a764230c218fcf98f2b9ae84e320d07d
--- a/app-emulation/wine-any/wine-any-3.13-r1.ebuild
+++ b/app-emulation/wine-any/wine-any-3.13-r1.ebuild
@ -0,0 +1,640 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+
+MY_PN="${PN%%-*}"
+MY_P="${MY_PN}-${PV}"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	MAJOR_V=$(get_version_component_range 1)
+	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
+	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+fi
+S="${WORKDIR}/${MY_P}"
+
+STAGING_P="wine-staging-${PV}"
+STAGING_DIR="${WORKDIR}/${STAGING_P}"
+D3D9_P="wine-d3d9-${PV}"
+D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}"
+GWP_V="20180120"
+PATCHDIR="${WORKDIR}/gentoo-wine-patches"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, with optional external patchsets"
+HOMEPAGE="https://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
+"
+
+if [[ ${PV} == "9999" ]] ; then
+	STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git"
+	D3D9_EGIT_REPO_URI="https://github.com/sarnex/wine-d3d9-patches.git"
+else
+	SRC_URI="${SRC_URI}
+	staging? ( https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )
+	d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/${D3D9_P}.tar.gz )"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="${PV}"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc ffmpeg +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+	X? ( truetype )
+	elibc_glibc? ( threads )
+	ffmpeg? ( staging )
+	osmesa? ( opengl )
+	pipelight? ( staging )
+	test? ( abi_x86_32 )
+	themes? ( staging )
+	vaapi? ( staging )" # osmesa-opengl #286560 # X-truetype #551124
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+COMMON_DEPEND="
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
+	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+	d3d9? (
+		media-libs/mesa[d3d9,egl,${MULTILIB_USEDEP}]
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libxcb[${MULTILIB_USEDEP}]
+	)
+	ffmpeg? ( >=media-video/ffmpeg-4:=[${MULTILIB_USEDEP}] )
+	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
+	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
+	)
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] )
+	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
+	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
+	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
+	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	opengl? (
+		virtual/glu[${MULTILIB_USEDEP}]
+		virtual/opengl[${MULTILIB_USEDEP}]
+	)
+	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	themes? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/cairo[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	)
+	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
+	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
+	vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] )
+	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
+	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	xml? (
+		dev-libs/libxml2[${MULTILIB_USEDEP}]
+		dev-libs/libxslt[${MULTILIB_USEDEP}]
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	app-emulation/wine-desktop-common
+	>app-eselect/eselect-wine-0.3
+	!app-emulation/wine:0
+	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
+	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
+	mono? ( app-emulation/wine-mono:4.7.3 )
+	perl? (
+		dev-lang/perl
+		dev-perl/XML-Simple
+	)
+	pulseaudio? (
+		realtime? ( sys-auth/rtkit )
+	)
+	samba? ( >=net-fs/samba-3.0.25[winbind] )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+	sys-devel/flex
+	>=sys-kernel/linux-headers-2.6
+	virtual/pkgconfig
+	virtual/yacc
+	X? ( x11-base/xorg-proto )
+	prelink? ( sys-devel/prelink )
+	staging? (
+		dev-lang/perl
+		dev-perl/XML-Simple
+	)
+	xinerama? ( x11-base/xorg-proto )"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+PATCHES=(
+	"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
+	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
+	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
+)
+PATCHES_BIN=()
+
+# https://bugs.gentoo.org/show_bug.cgi?id=635222
+if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
+	DEPEND+=" dev-util/patchbin"
+fi
+
+wine_compiler_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	# GCC-specific bugs
+	if tc-is-gcc; then
+		# bug #549768
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+			ebegin "Checking for gcc-5 ms_abi compiler bug"
+			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
+			# Run in subshell to prevent "Aborted" message
+			( "${T}"/pr66838 || false ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/549768"
+				eerror
+				return 1
+			fi
+		fi
+		# bug #574044
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
+			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
+			# Compile in subshell to prevent "Aborted" message
+			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "Wine cannot be built with this version of gcc-5.3"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/574044"
+				eerror
+				return 1
+			fi
+		fi
+	fi
+
+	# Ensure compiler support
+	if use abi_x86_64; then
+		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
+		# Compile in subshell to prevent "Aborted" message
+		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
+		if ! eend $?; then
+			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
+			eerror
+			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
+			eerror
+			return 1
+		fi
+	fi
+}
+
+wine_build_environment_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	if use abi_x86_64; then
+		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
+			eerror "You need gcc-4.4+ to compile 64-bit wine"
+			die
+		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
+			eerror "You need clang-3.8+ to compile 64-bit wine"
+			die
+		fi
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
+		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
+		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
+		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
+		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
+			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
+			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
+			ewarn "See package.env in man 5 portage for more information on how to do this."
+			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
+		fi
+	fi
+
+	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
+		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+		eerror "See https://bugs.gentoo.org/487864 for more details."
+		eerror
+		return 1
+	fi
+}
+
+wine_env_vcs_vars() {
+	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+	local pn_live_val="${pn_live_var}"
+	eval pn_live_val='$'${pn_live_val}
+	if [[ ! -z ${pn_live_val} ]]; then
+		if use staging || use d3d9; then
+			eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}"
+			eerror "cannot be used to set the commit. Instead, you may use the"
+			eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT."
+			eerror
+			return 1
+		fi
+	fi
+	if [[ ! -z ${EGIT_COMMIT} ]]; then
+		eerror "Commits must now be specified using the environmental variables"
+		eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT"
+		eerror
+		return 1
+	fi
+}
+
+pkg_pretend() {
+	wine_build_environment_check || die
+
+	# Verify OSS support
+	if use oss && ! use kernel_FreeBSD; then
+		if ! has_version ">=media-sound/oss-4"; then
+			eerror "You cannot build wine with USE=oss without having support from a"
+			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
+			eerror
+			die
+		fi
+	fi
+}
+
+pkg_setup() {
+	wine_build_environment_check || die
+	wine_env_vcs_vars || die
+
+	WINE_VARIANT="${PN#wine}-${PV}"
+	WINE_VARIANT="${WINE_VARIANT#-}"
+
+	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
+	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
+	MY_DATADIR="${MY_DATAROOTDIR}"
+	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
+	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
+	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
+	MY_MANDIR="${MY_DATADIR}/man"
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
+		if use staging; then
+			local CURRENT_WINE_COMMIT=${EGIT_VERSION}
+
+			git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}"
+			git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}"
+
+			local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
+
+			if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then
+				einfo "The current Staging patchset is not guaranteed to apply on this WINE commit."
+				einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT."
+				einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine"
+			fi
+		fi
+		if use d3d9; then
+			git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}"
+			git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}"
+		fi
+	fi
+
+	default
+
+	l10n_find_plocales_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+
+	eapply_bin(){
+		local patch
+		for patch in ${PATCHES_BIN[@]}; do
+			patchbin --nogit < "${patch}" || die
+		done
+	}
+
+	local md5="$(md5sum server/protocol.def)"
+
+	if use staging; then
+		ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
+		ewarn "Wine bugzilla should explicitly state that staging was used."
+
+		local STAGING_EXCLUDE=""
+		use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
+
+		# Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches
+		ebegin "Running Wine-Staging patch installer"
+		(
+			set -- DESTDIR="${S}" --backend=eapply --no-autoconf --all ${STAGING_EXCLUDE}
+			cd "${STAGING_DIR}/patches"
+			source "${STAGING_DIR}/patches/patchinstall.sh"
+		)
+		eend $? || die "Failed to apply Wine-Staging patches"
+	fi
+	if use d3d9; then
+		if use staging; then
+			PATCHES+=( "${D3D9_DIR}/staging-helper.patch" )
+		else
+			PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" )
+		fi
+		PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" )
+	fi
+
+	default
+	eapply_bin
+	eautoreconf
+
+	# Modification of the server protocol requires regenerating the server requests
+	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+		einfo "server/protocol.def was patched; running tools/make_requests"
+		tools/make_requests || die #432348
+	fi
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+	if ! use run-exes; then
+		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
+	fi
+
+	# Edit wine.desktop to work for specific variant
+	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
+
+	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
+	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
+
+	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+
+	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
+
+	# Duplicate manpages input files for wine64
+	local f
+	for f in loader/*.man.in; do
+		cp ${f} ${f/wine/wine64} || die
+	done
+	# Add wine64 manpages to Makefile
+	if use abi_x86_64; then
+		sed -i "/wine.man.in/i \
+			\\\twine64.man.in \\\\" loader/Makefile.in || die
+		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
+\164\2/' loader/Makefile.in || die
+	fi
+
+	rm_man_file(){
+		local file="${1}"
+		loc=${2}
+		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
+	}
+
+	while read f; do
+		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
+}
+
+src_configure() {
+	wine_compiler_check || die
+
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--prefix="${MY_PREFIX}"
+		--datarootdir="${MY_DATAROOTDIR}"
+		--datadir="${MY_DATADIR}"
+		--docdir="${MY_DOCDIR}"
+		--includedir="${MY_INCLUDEDIR}"
+		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
+		--libexecdir="${MY_LIBEXECDIR}"
+		--localstatedir="${MY_LOCALSTATEDIR}"
+		--mandir="${MY_MANDIR}"
+		--sysconfdir=/etc/wine
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with lcms cms)
+		$(use_with cups)
+		$(use_with ncurses curses)
+		$(use_with udisks dbus)
+		$(use_with ffmpeg)
+		$(use_with fontconfig)
+		$(use_with ssl gnutls)
+		$(use_enable gecko mshtml)
+		$(use_with gphoto2 gphoto)
+		$(use_with gsm)
+		$(use_with gssapi)
+		$(use_with gstreamer)
+		--without-hal
+		$(use_with jpeg)
+		$(use_with kerberos krb5)
+		$(use_with ldap)
+		$(use_enable mono mscoree)
+		$(use_with mp3 mpg123)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with openal)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		$(use_with oss)
+		$(use_with pcap)
+		$(use_with png)
+		$(use_with pulseaudio pulse)
+		$(use_with threads pthread)
+		$(use_with scanner sane)
+		$(use_with sdl)
+		$(use_enable test tests)
+		$(use_with truetype freetype)
+		$(use_with udev)
+		$(use_with v4l)
+		$(use_with vkd3d)
+		$(use_with vulkan)
+		$(use_with X x)
+		$(use_with X xfixes)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+		$(use_with xml)
+		$(use_with xml xslt)
+	)
+
+	use staging && myconf+=(
+		--with-xattr
+		$(use_with themes gtk3)
+		$(use_with vaapi va)
+	)
+	use d3d9 && myconf+=( $(use_with d3d9 d3d9-nine) )
+
+	local PKG_CONFIG AR RANLIB
+	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+	# set AR and RANLIB to make QA scripts happy; #483342
+	tc-export PKG_CONFIG AR RANLIB
+
+	if use amd64; then
+		if [[ ${ABI} == amd64 ]]; then
+			myconf+=( --enable-win64 )
+		else
+			myconf+=( --disable-win64 )
+		fi
+
+		# Note: using --with-wine64 results in problems with multilib.eclass
+		# CC/LD hackery. We're using separate tools instead.
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+	emake depend
+}
+
+multilib_src_test() {
+	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+	if [[ ${ABI} == x86 ]]; then
+		if [[ $(id -u) == 0 ]]; then
+			ewarn "Skipping tests since they cannot be run under the root user."
+			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
+			return
+		fi
+
+		WINEPREFIX="${T}/.wine-${ABI}" \
+		Xemake test
+	fi
+}
+
+multilib_src_install_all() {
+	local DOCS=( ANNOUNCE AUTHORS README )
+	add_locale_docs() {
+		local locale_doc="documentation/README.$1"
+		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+	}
+	l10n_for_each_locale_do add_locale_docs
+
+	einstalldocs
+	prune_libtool_files --all
+
+	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
+		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
+			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
+	fi
+
+	# Remove wineconsole if neither backend is installed #551124
+	if ! use X && ! use ncurses; then
+		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
+		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
+		rm_wineconsole() {
+			rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
+		}
+		multilib_foreach_abi rm_wineconsole
+	fi
+
+	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
+	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
+
+	if use abi_x86_64 && ! use abi_x86_32; then
+		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
+		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
+	fi
+
+	# Failglob for binloops, shouldn't be necessary, but including to stay safe
+	eshopts_push -s failglob #615218
+	# Make wrappers for binaries for handling multiple variants
+	# Note: wrappers instead of symlinks because some are shell which use basename
+	local b
+	for b in "${D%/}${MY_PREFIX}"/bin/*; do
+		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
+	done
+	eshopts_pop
+}
+
+pkg_postinst() {
+	eselect wine register ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine register --vanilla ${P} || die
+	else
+		if use staging; then
+			eselect wine register --staging ${P} || die
+		fi
+		if use d3d9; then
+			eselect wine register --d3d9 ${P} || die
+		fi
+	fi
+
+	eselect wine update --all --if-unset || die
+
+	xdg_desktop_database_update
+
+	if ! use gecko; then
+		ewarn "Without Wine Gecko, wine prefixes will not have a default"
+		ewarn "implementation of iexplore.  Many older windows applications"
+		ewarn "rely upon the existence of an iexplore implementation, so"
+		ewarn "you will likely need to install an external one, like via winetricks"
+	fi
+	if ! use mono; then
+		ewarn "Without Wine Mono, wine prefixes will not have a default"
+		ewarn "implementation of .NET.  Many windows applications rely upon"
+		ewarn "the existence of a .NET implementation, so you will likely need"
+		ewarn "to install an external one, like via winetricks"
+	fi
+}
+
+pkg_prerm() {
+	eselect wine deregister ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine deregister --vanilla ${P} || die
+	else
+		if use staging; then
+			eselect wine deregister --staging ${P} || die
+		fi
+		if use d3d9; then
+			eselect wine deregister --d3d9 ${P} || die
+		fi
+	fi
+
+	eselect wine update --all --if-unset || die
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
--- a/app-emulation/wine-any/wine-any-9999.ebuild
+++ b/app-emulation/wine-any/wine-any-9999.ebuild
@ -138,7 +138,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:4.7.1 )
+	mono? ( app-emulation/wine-mono:4.7.3 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
--- a/app-emulation/wine-d3d9/Manifest
+++ b/app-emulation/wine-d3d9/Manifest
@ -10,6 +10,7 @@ DIST wine-d3d9-3.13.tar.gz 50546 BLAKE2B 2773503ad2c952c47982258c8b7d7486b5822bf
 EBUILD wine-d3d9-2.0-r1.ebuild 18408 BLAKE2B d076c6114c7a8044803c22cc9e3b2ade886c2c5fe95f476fcb69558058733d1e75f178a956ebd5fde2c753690cc120df3c3161293af97031043d59a5f4ba4e7c SHA512 c6e0d90d32af5981ab83093680c0119c39c0843d818672270a83e9d40c5cf368641818fc8e82f29c7de07759cfc18d94990f400564987693c17bd24acb18f413
 EBUILD wine-d3d9-3.11.ebuild 18573 BLAKE2B 8bc4d2359a4652beaee2ac1b7b459ad03408f2c0d2ff9145ff3889ffa5660797d8378f9e73c612e923d5121ba5af79b5f85fc2d4e81f0129033e5c6147e264c1 SHA512 8558b0e5c6f06bdbca8f26c9a47c9e0befba46a0a80282a90911e416f5b21f2f08a1299a0b4919ae701df1e5ad1db541d50058e3b55b03744e9643c1f1b96c46
 EBUILD wine-d3d9-3.12.ebuild 18573 BLAKE2B 8bc4d2359a4652beaee2ac1b7b459ad03408f2c0d2ff9145ff3889ffa5660797d8378f9e73c612e923d5121ba5af79b5f85fc2d4e81f0129033e5c6147e264c1 SHA512 8558b0e5c6f06bdbca8f26c9a47c9e0befba46a0a80282a90911e416f5b21f2f08a1299a0b4919ae701df1e5ad1db541d50058e3b55b03744e9643c1f1b96c46
+EBUILD wine-d3d9-3.13-r1.ebuild 18573 BLAKE2B 2a0d981c8d827a908d74231224893a08216b35aa92985c7dfafe9a09029be4fa323cd899c3f2c0db407ceeb861a49343e5ed00d002ec09e358ed3c28ccafe2ef SHA512 1a561075c0193b47fb6debd8f4a70985635ca1580b87d4367668a2ee6f8278e3af8a15f47fd1b0e0a61e03ab14c2a8f68bbb69678efcfa3f8414bfc4121ec34c
 EBUILD wine-d3d9-3.13.ebuild 18573 BLAKE2B 8bc4d2359a4652beaee2ac1b7b459ad03408f2c0d2ff9145ff3889ffa5660797d8378f9e73c612e923d5121ba5af79b5f85fc2d4e81f0129033e5c6147e264c1 SHA512 8558b0e5c6f06bdbca8f26c9a47c9e0befba46a0a80282a90911e416f5b21f2f08a1299a0b4919ae701df1e5ad1db541d50058e3b55b03744e9643c1f1b96c46
-EBUILD wine-d3d9-9999.ebuild 18573 BLAKE2B 8bc4d2359a4652beaee2ac1b7b459ad03408f2c0d2ff9145ff3889ffa5660797d8378f9e73c612e923d5121ba5af79b5f85fc2d4e81f0129033e5c6147e264c1 SHA512 8558b0e5c6f06bdbca8f26c9a47c9e0befba46a0a80282a90911e416f5b21f2f08a1299a0b4919ae701df1e5ad1db541d50058e3b55b03744e9643c1f1b96c46
+EBUILD wine-d3d9-9999.ebuild 18573 BLAKE2B 2a0d981c8d827a908d74231224893a08216b35aa92985c7dfafe9a09029be4fa323cd899c3f2c0db407ceeb861a49343e5ed00d002ec09e358ed3c28ccafe2ef SHA512 1a561075c0193b47fb6debd8f4a70985635ca1580b87d4367668a2ee6f8278e3af8a15f47fd1b0e0a61e03ab14c2a8f68bbb69678efcfa3f8414bfc4121ec34c
 MISC metadata.xml 3320 BLAKE2B bbf5e79928f29d124d8a7dd947aa42fdf690d0d7f8905a0e0f43185b7026d4dde787809844ce230c3ab285a3c476c807973b899589d0d383931c96c9f1d54966 SHA512 14e380383fa5345cbd6c5366456f8d122c7bccbf54db863945e5c7673457f29f97e629ec3538030bd991f254d0262045a2d97a467cb100e80e1989728ba65c96
--- a/app-emulation/wine-d3d9/wine-d3d9-3.13-r1.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.13-r1.ebuild
@ -0,0 +1,574 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+
+MY_PN="${PN%%-*}"
+MY_P="${MY_PN}-${PV}"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	MAJOR_V=$(get_version_component_range 1)
+	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
+	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+fi
+S="${WORKDIR}/${MY_P}"
+
+D3D9_P="wine-d3d9-${PV}"
+D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}"
+GWP_V="20180120"
+PATCHDIR="${WORKDIR}/gentoo-wine-patches"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, with Gallium Nine patchset"
+HOMEPAGE="https://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
+"
+
+if [[ ${PV} == "9999" ]] ; then
+	D3D9_EGIT_REPO_URI="https://github.com/sarnex/wine-d3d9-patches.git"
+else
+	SRC_URI="${SRC_URI}
+	d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/${D3D9_P}.tar.gz )"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="${PV}"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vkd3d vulkan +X +xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+	X? ( truetype )
+	elibc_glibc? ( threads )
+	osmesa? ( opengl )
+	test? ( abi_x86_32 )" # osmesa-opengl #286560 # X-truetype #551124
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+COMMON_DEPEND="
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
+	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+	d3d9? (
+		media-libs/mesa[d3d9,egl,${MULTILIB_USEDEP}]
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libxcb[${MULTILIB_USEDEP}]
+	)
+	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
+	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
+	)
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] )
+	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
+	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
+	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
+	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	opengl? (
+		virtual/glu[${MULTILIB_USEDEP}]
+		virtual/opengl[${MULTILIB_USEDEP}]
+	)
+	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
+	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] )
+	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
+	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	xml? (
+		dev-libs/libxml2[${MULTILIB_USEDEP}]
+		dev-libs/libxslt[${MULTILIB_USEDEP}]
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	app-emulation/wine-desktop-common
+	>app-eselect/eselect-wine-0.3
+	!app-emulation/wine:0
+	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
+	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
+	mono? ( app-emulation/wine-mono:4.7.3 )
+	perl? (
+		dev-lang/perl
+		dev-perl/XML-Simple
+	)
+	pulseaudio? (
+		realtime? ( sys-auth/rtkit )
+	)
+	samba? ( >=net-fs/samba-3.0.25[winbind] )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+	sys-devel/flex
+	>=sys-kernel/linux-headers-2.6
+	virtual/pkgconfig
+	virtual/yacc
+	X? ( x11-base/xorg-proto )
+	prelink? ( sys-devel/prelink )
+	xinerama? ( x11-base/xorg-proto )"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+PATCHES=(
+	"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
+	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
+	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
+)
+PATCHES_BIN=()
+
+# https://bugs.gentoo.org/show_bug.cgi?id=635222
+if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
+	DEPEND+=" dev-util/patchbin"
+fi
+
+wine_compiler_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	# GCC-specific bugs
+	if tc-is-gcc; then
+		# bug #549768
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+			ebegin "Checking for gcc-5 ms_abi compiler bug"
+			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
+			# Run in subshell to prevent "Aborted" message
+			( "${T}"/pr66838 || false ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/549768"
+				eerror
+				return 1
+			fi
+		fi
+		# bug #574044
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
+			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
+			# Compile in subshell to prevent "Aborted" message
+			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "Wine cannot be built with this version of gcc-5.3"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/574044"
+				eerror
+				return 1
+			fi
+		fi
+	fi
+
+	# Ensure compiler support
+	if use abi_x86_64; then
+		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
+		# Compile in subshell to prevent "Aborted" message
+		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
+		if ! eend $?; then
+			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
+			eerror
+			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
+			eerror
+			return 1
+		fi
+	fi
+}
+
+wine_build_environment_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	if use abi_x86_64; then
+		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
+			eerror "You need gcc-4.4+ to compile 64-bit wine"
+			die
+		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
+			eerror "You need clang-3.8+ to compile 64-bit wine"
+			die
+		fi
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
+		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
+		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
+		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
+		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
+			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
+			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
+			ewarn "See package.env in man 5 portage for more information on how to do this."
+			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
+		fi
+	fi
+
+	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
+		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+		eerror "See https://bugs.gentoo.org/487864 for more details."
+		eerror
+		return 1
+	fi
+}
+
+wine_env_vcs_vars() {
+	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+	local pn_live_val="${pn_live_var}"
+	eval pn_live_val='$'${pn_live_val}
+	if [[ ! -z ${pn_live_val} ]]; then
+		if use d3d9; then
+			eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}"
+			eerror "cannot be used to set the commit. Instead, you may use the"
+			eerror "environmental variables WINE_COMMIT, and D3D9_COMMIT."
+			eerror
+			return 1
+		fi
+	fi
+	if [[ ! -z ${EGIT_COMMIT} ]]; then
+		eerror "Commits must now be specified using the environmental variables"
+		eerror "WINE_COMMIT, and D3D9_COMMIT"
+		eerror
+		return 1
+	fi
+}
+
+pkg_pretend() {
+	wine_build_environment_check || die
+
+	# Verify OSS support
+	if use oss && ! use kernel_FreeBSD; then
+		if ! has_version ">=media-sound/oss-4"; then
+			eerror "You cannot build wine with USE=oss without having support from a"
+			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
+			eerror
+			die
+		fi
+	fi
+}
+
+pkg_setup() {
+	wine_build_environment_check || die
+	wine_env_vcs_vars || die
+
+	WINE_VARIANT="${PN#wine}-${PV}"
+	WINE_VARIANT="${WINE_VARIANT#-}"
+
+	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
+	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
+	MY_DATADIR="${MY_DATAROOTDIR}"
+	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
+	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
+	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
+	MY_MANDIR="${MY_DATADIR}/man"
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
+		if use d3d9; then
+			git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}"
+			git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}"
+		fi
+	fi
+
+	default
+
+	l10n_find_plocales_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+
+	eapply_bin(){
+		local patch
+		for patch in ${PATCHES_BIN[@]}; do
+			patchbin --nogit < "${patch}" || die
+		done
+	}
+
+	local md5="$(md5sum server/protocol.def)"
+
+	if use d3d9; then
+		PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" )
+		PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" )
+	fi
+
+	default
+	eapply_bin
+	eautoreconf
+
+	# Modification of the server protocol requires regenerating the server requests
+	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+		einfo "server/protocol.def was patched; running tools/make_requests"
+		tools/make_requests || die #432348
+	fi
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+	if ! use run-exes; then
+		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
+	fi
+
+	# Edit wine.desktop to work for specific variant
+	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
+
+	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
+	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
+
+	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+
+	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
+
+	# Duplicate manpages input files for wine64
+	local f
+	for f in loader/*.man.in; do
+		cp ${f} ${f/wine/wine64} || die
+	done
+	# Add wine64 manpages to Makefile
+	if use abi_x86_64; then
+		sed -i "/wine.man.in/i \
+			\\\twine64.man.in \\\\" loader/Makefile.in || die
+		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
+\164\2/' loader/Makefile.in || die
+	fi
+
+	rm_man_file(){
+		local file="${1}"
+		loc=${2}
+		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
+	}
+
+	while read f; do
+		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
+}
+
+src_configure() {
+	wine_compiler_check || die
+
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--prefix="${MY_PREFIX}"
+		--datarootdir="${MY_DATAROOTDIR}"
+		--datadir="${MY_DATADIR}"
+		--docdir="${MY_DOCDIR}"
+		--includedir="${MY_INCLUDEDIR}"
+		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
+		--libexecdir="${MY_LIBEXECDIR}"
+		--localstatedir="${MY_LOCALSTATEDIR}"
+		--mandir="${MY_MANDIR}"
+		--sysconfdir=/etc/wine
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with lcms cms)
+		$(use_with cups)
+		$(use_with ncurses curses)
+		$(use_with udisks dbus)
+		$(use_with fontconfig)
+		$(use_with ssl gnutls)
+		$(use_enable gecko mshtml)
+		$(use_with gphoto2 gphoto)
+		$(use_with gsm)
+		$(use_with gssapi)
+		$(use_with gstreamer)
+		--without-hal
+		$(use_with jpeg)
+		$(use_with kerberos krb5)
+		$(use_with ldap)
+		$(use_enable mono mscoree)
+		$(use_with mp3 mpg123)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with openal)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		$(use_with oss)
+		$(use_with pcap)
+		$(use_with png)
+		$(use_with pulseaudio pulse)
+		$(use_with threads pthread)
+		$(use_with scanner sane)
+		$(use_with sdl)
+		$(use_enable test tests)
+		$(use_with truetype freetype)
+		$(use_with udev)
+		$(use_with v4l)
+		$(use_with vkd3d)
+		$(use_with vulkan)
+		$(use_with X x)
+		$(use_with X xfixes)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+		$(use_with xml)
+		$(use_with xml xslt)
+	)
+
+	use d3d9 && myconf+=( $(use_with d3d9 d3d9-nine) )
+
+	local PKG_CONFIG AR RANLIB
+	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+	# set AR and RANLIB to make QA scripts happy; #483342
+	tc-export PKG_CONFIG AR RANLIB
+
+	if use amd64; then
+		if [[ ${ABI} == amd64 ]]; then
+			myconf+=( --enable-win64 )
+		else
+			myconf+=( --disable-win64 )
+		fi
+
+		# Note: using --with-wine64 results in problems with multilib.eclass
+		# CC/LD hackery. We're using separate tools instead.
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+	emake depend
+}
+
+multilib_src_test() {
+	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+	if [[ ${ABI} == x86 ]]; then
+		if [[ $(id -u) == 0 ]]; then
+			ewarn "Skipping tests since they cannot be run under the root user."
+			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
+			return
+		fi
+
+		WINEPREFIX="${T}/.wine-${ABI}" \
+		Xemake test
+	fi
+}
+
+multilib_src_install_all() {
+	local DOCS=( ANNOUNCE AUTHORS README )
+	add_locale_docs() {
+		local locale_doc="documentation/README.$1"
+		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+	}
+	l10n_for_each_locale_do add_locale_docs
+
+	einstalldocs
+	prune_libtool_files --all
+
+	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
+		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
+			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
+	fi
+
+	# Remove wineconsole if neither backend is installed #551124
+	if ! use X && ! use ncurses; then
+		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
+		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
+		rm_wineconsole() {
+			rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
+		}
+		multilib_foreach_abi rm_wineconsole
+	fi
+
+	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
+	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
+
+	if use abi_x86_64 && ! use abi_x86_32; then
+		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
+		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
+	fi
+
+	# Failglob for binloops, shouldn't be necessary, but including to stay safe
+	eshopts_push -s failglob #615218
+	# Make wrappers for binaries for handling multiple variants
+	# Note: wrappers instead of symlinks because some are shell which use basename
+	local b
+	for b in "${D%/}${MY_PREFIX}"/bin/*; do
+		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
+	done
+	eshopts_pop
+}
+
+pkg_postinst() {
+	eselect wine register ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine register --vanilla ${P} || die
+	else
+		if use d3d9; then
+			eselect wine register --d3d9 ${P} || die
+		fi
+	fi
+
+	eselect wine update --all --if-unset || die
+
+	xdg_desktop_database_update
+
+	if ! use gecko; then
+		ewarn "Without Wine Gecko, wine prefixes will not have a default"
+		ewarn "implementation of iexplore.  Many older windows applications"
+		ewarn "rely upon the existence of an iexplore implementation, so"
+		ewarn "you will likely need to install an external one, like via winetricks"
+	fi
+	if ! use mono; then
+		ewarn "Without Wine Mono, wine prefixes will not have a default"
+		ewarn "implementation of .NET.  Many windows applications rely upon"
+		ewarn "the existence of a .NET implementation, so you will likely need"
+		ewarn "to install an external one, like via winetricks"
+	fi
+}
+
+pkg_prerm() {
+	eselect wine deregister ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine deregister --vanilla ${P} || die
+	else
+		if use d3d9; then
+			eselect wine deregister --d3d9 ${P} || die
+		fi
+	fi
+
+	eselect wine update --all --if-unset || die
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
--- a/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild
@ -122,7 +122,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:4.7.1 )
+	mono? ( app-emulation/wine-mono:4.7.3 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
--- a/app-emulation/wine-mono/Manifest
+++ b/app-emulation/wine-mono/Manifest
@ -1,7 +1,9 @@
 DIST wine-mono-4.6.4.msi 45592064 BLAKE2B 30099b7f02276e47e350a96af07bf64b43c857b3b3323d0cab85864b753e9810c0d7b5d496e2f53f5b2c3a434eb440a19f9928707c4127303aa0335928e39097 SHA512 1d50df5d4d000998c74fbee79b8ffc691d88ee3b34db9fd7124e0df68d6f84768ece489ac8c3f5f3141c2073c8666b93ae23ca6cd652a6542a821df3d1b66b6d
 DIST wine-mono-4.7.0.msi 64625152 BLAKE2B 9c533d9f9a5cec6aefa66ed916e88f0a03ab76e8292f112a669208c5b26855a314657c9950993a205941cd314f0c93a55f621ed71ebb4846a66d30fa9af3c855 SHA512 07cd2b26f3bfe6fc796a126b83e9c0aa655d3e8152af536ae2e8ae419013742706ddae6f93cc2341c94a2f3b8ae7d1b27d12f891d371928189291428f9ed877c
 DIST wine-mono-4.7.1.msi 56470528 BLAKE2B b1b9dd832f725cb70b80889c08db524540c389c4eb8c990415f0c1b4a17274fc96390808c943bd0ff42c79f4bbb376b3d599d31ed42b5ebcb4be79dbc273eeec SHA512 d47f21fa3ddb31522366056a2062cf7b77eec0a12f96dc05326561c9d2604405128441ff40d1b9567a6e6cd1c19ee03444d2ba02dd3b8dd2d150030dfb52f765
+DIST wine-mono-4.7.3.msi 56470528 BLAKE2B 59397f851bd0883f060fd359228fcdedea5a32ce06349fd563411dfa603a6c8700496111821fd9e571cfd4586e829acb12321528a4a8330d1fb6f92855482225 SHA512 d51c0e21c8448a4d11c3e4fd530bda340cc93cd420080e08aadd7b704183dcadf8553b0937e02c7a54a8a2fb46a395718a3e807b85f19936b0e4ee7b92052dfe
 EBUILD wine-mono-4.6.4.ebuild 504 BLAKE2B 1a454ab2e605655328cc00e7ae539b83fcb8f3f3efca9e4873cb5b9c7036e71e696005a21ab0420cf110a07496b3772a8164eafe1dda7591d02155538ea75367 SHA512 cd729b803383bd1416152ac70567ed6a8231b87ccec1bbd47768abf08dd1bbced711c9356c42759d1e9458fb35b9edd438f2b58c40ef80d15f9bdf5a8b7b4605
 EBUILD wine-mono-4.7.0.ebuild 506 BLAKE2B 6219e5761bf91cfc349d872085991688cfee7b9ed5b5aad964f7580e26fa0cc213e21e20a0afcf7f0dae315a27c022511d089f2c2aaea8c7d8cd97033e7b81c1 SHA512 64b8eceae407dba1f415c113c2f1c0a5342a178850d940c22e49bc483e8c4eab2efcb34a1a053d28e8fa0637f3386a9846b1a90ab4baaa84e3b9fb9d71267bc3
 EBUILD wine-mono-4.7.1.ebuild 504 BLAKE2B 6f8fa48c32e6ea7e3a768fb04b8255ddf503b5a584ad2015358dd35476ddac5b092bb5d887bde7ca89928442bb03d6f6e398998a7fc30d3fcde958fadb66fab7 SHA512 8531ae9d10aa4d40c7fe2c59eea82007b494bcb6c546253d9211e773c23d8bc61cc67e3dc563219957f9d6364572c00400ae5178bc2ea88e23b9915ae47e4258
+EBUILD wine-mono-4.7.3.ebuild 506 BLAKE2B 1e661c78fd619232d98ecc239126f97e7b0f3a99d472e99c8ad99398c85318f9f827bb2b224747cc621531870c5dec3328c8947a791d29d37b84ab3185e58902 SHA512 823f6a18b5d87dff909817011e6505417c636901a02af09180f7a0d4881d13c4b1322f57ba8d0454facb597e0aa36a1a2e2893e4d63c0607a18b8f9ebc8e09f0
 MISC metadata.xml 614 BLAKE2B e45f9e8581cec69afc21a5af29aa71eec05ba7fa626624e6c06000a5f013a3606674074beec999a0f8f91c91fc8912995b20cb88f8ad8a40bffbd964c5bf020f SHA512 5655c4bd737975334e66b4ea0c6cdb447dd647a7a3c76c0cd9782c405c9540ae396c87677bde408d3977b838813e00f12249f0f84267b75894e5554b2c6bcb6c
--- a/app-emulation/wine-mono/wine-mono-4.7.3.ebuild
+++ b/app-emulation/wine-mono/wine-mono-4.7.3.ebuild
@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Wine Mono is a replacement for the .NET runtime and class libraries in Wine"
+HOMEPAGE="https://www.winehq.org/"
+SRC_URI="https://dl.winehq.org/wine/${PN}/${PV}/${P}.msi"
+
+LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="!!app-emulation/wine:0"
+
+S="${WORKDIR}"
+
+src_install() {
+	insinto /usr/share/wine/mono
+	doins "${DISTDIR}/${P}.msi"
+}
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@ -10,6 +10,7 @@ DIST wine-staging-3.13.tar.gz 9936353 BLAKE2B f5791c6f1bc43395860ea938cfadefe88e
 EBUILD wine-staging-2.0-r1.ebuild 19947 BLAKE2B 44adc4926d0a93bdcb8ef176d0c058eb2a7ec6896ebc00f253e417f541fdd14e7236e4c1123b8aa93e7b386e15a34b356103e573e2a06ca2be4449073180d2ad SHA512 0d1173b27696344bd491f53fe2e6b11e88ba9d5d1b55869c9907ab292c20e248e48fc05b776c573a6f4dd6a49b8cbc247535e59c39990d80633bcbc55ef7c31c
 EBUILD wine-staging-3.11.ebuild 19882 BLAKE2B 7db7a015866bfdd71263b163c525bdb74307712ac6a32b8b499278cb948f41addf9e122cd2d01553f97eff7f06614679cd0be6ed80ce388b6dc7de942704a66f SHA512 cf53120963fd78fa5c5dcebce9632f5363317cc0761817cea9ace6d2197da8453736b54127026b392c4cb6a69af630ea83fc13d8a981e5a6690ab2b90698c8da
 EBUILD wine-staging-3.12.ebuild 19989 BLAKE2B f0795b778938a606485b6c46689e1581f307031726a1360e934b9697f1a718ff67cab2207cf3c9371615bf0b4c02f0520c002b7c657bc16c1dd54c3280541d04 SHA512 5ff3744b85e543a105c80a498430fbe40aa82472767f942dd852079f4207f08a1cb71f548b6e2f53fcd56f6aa53c89c7b93d2f95e6e49fad7ae690d7edcd990c
+EBUILD wine-staging-3.13-r1.ebuild 19989 BLAKE2B b54f5945ccff622d025a1e199cf8d13978689a19c3ec7cecc8216fa82b0f3a635fc1661441a3bf454700948a2cc77e20f49eeaef272f61914f9a70e046bff017 SHA512 42e601fbf3ba284aedb358f5ab42eafa2a32c55b20aac50e30e9f4fecf4e917c3b305d4d82f63e1266be7cb08203e358da62de9baaabedebc25c588fe2807119
 EBUILD wine-staging-3.13.ebuild 19989 BLAKE2B f0795b778938a606485b6c46689e1581f307031726a1360e934b9697f1a718ff67cab2207cf3c9371615bf0b4c02f0520c002b7c657bc16c1dd54c3280541d04 SHA512 5ff3744b85e543a105c80a498430fbe40aa82472767f942dd852079f4207f08a1cb71f548b6e2f53fcd56f6aa53c89c7b93d2f95e6e49fad7ae690d7edcd990c
-EBUILD wine-staging-9999.ebuild 19989 BLAKE2B f0795b778938a606485b6c46689e1581f307031726a1360e934b9697f1a718ff67cab2207cf3c9371615bf0b4c02f0520c002b7c657bc16c1dd54c3280541d04 SHA512 5ff3744b85e543a105c80a498430fbe40aa82472767f942dd852079f4207f08a1cb71f548b6e2f53fcd56f6aa53c89c7b93d2f95e6e49fad7ae690d7edcd990c
+EBUILD wine-staging-9999.ebuild 19989 BLAKE2B b54f5945ccff622d025a1e199cf8d13978689a19c3ec7cecc8216fa82b0f3a635fc1661441a3bf454700948a2cc77e20f49eeaef272f61914f9a70e046bff017 SHA512 42e601fbf3ba284aedb358f5ab42eafa2a32c55b20aac50e30e9f4fecf4e917c3b305d4d82f63e1266be7cb08203e358da62de9baaabedebc25c588fe2807119
 MISC metadata.xml 3591 BLAKE2B 748c2fc43338e250665dc5c18cef4aaa96b95b3f4a64768eb4fa97da65ecc3e65713833eb9fdb67f27e102221e621ee6fabc90babf982c97b455a2e9638ecfc1 SHA512 d60cc92fcd7391ffc92a5107b1e294bdb9f1bf6c02bc3495af67dfa9c30f06ee7868802ca7fa8c0e2a79c52edcd088e071d5d12663b3ea83c9112002e01ea524
--- a/app-emulation/wine-staging/wine-staging-3.13-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-3.13-r1.ebuild
@ -0,0 +1,611 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+
+MY_PN="${PN%%-*}"
+MY_P="${MY_PN}-${PV}"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	MAJOR_V=$(get_version_component_range 1)
+	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
+	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+fi
+S="${WORKDIR}/${MY_P}"
+
+STAGING_P="wine-staging-${PV}"
+STAGING_DIR="${WORKDIR}/${STAGING_P}"
+GWP_V="20180120"
+PATCHDIR="${WORKDIR}/gentoo-wine-patches"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
+HOMEPAGE="https://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
+"
+
+if [[ ${PV} == "9999" ]] ; then
+	STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git"
+else
+	SRC_URI="${SRC_URI}
+	staging? ( https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="${PV}"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc ffmpeg +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+	X? ( truetype )
+	elibc_glibc? ( threads )
+	ffmpeg? ( staging )
+	osmesa? ( opengl )
+	pipelight? ( staging )
+	test? ( abi_x86_32 )
+	themes? ( staging )
+	vaapi? ( staging )" # osmesa-opengl #286560 # X-truetype #551124
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+COMMON_DEPEND="
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
+	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+	ffmpeg? ( >=media-video/ffmpeg-4:=[${MULTILIB_USEDEP}] )
+	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
+	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
+	)
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] )
+	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
+	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
+	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
+	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	opengl? (
+		virtual/glu[${MULTILIB_USEDEP}]
+		virtual/opengl[${MULTILIB_USEDEP}]
+	)
+	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	themes? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/cairo[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	)
+	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
+	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
+	vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] )
+	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
+	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	xml? (
+		dev-libs/libxml2[${MULTILIB_USEDEP}]
+		dev-libs/libxslt[${MULTILIB_USEDEP}]
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	app-emulation/wine-desktop-common
+	>app-eselect/eselect-wine-0.3
+	!app-emulation/wine:0
+	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
+	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
+	mono? ( app-emulation/wine-mono:4.7.3 )
+	perl? (
+		dev-lang/perl
+		dev-perl/XML-Simple
+	)
+	pulseaudio? (
+		realtime? ( sys-auth/rtkit )
+	)
+	samba? ( >=net-fs/samba-3.0.25[winbind] )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+	sys-devel/flex
+	>=sys-kernel/linux-headers-2.6
+	virtual/pkgconfig
+	virtual/yacc
+	X? ( x11-base/xorg-proto )
+	prelink? ( sys-devel/prelink )
+	staging? (
+		dev-lang/perl
+		dev-perl/XML-Simple
+	)
+	xinerama? ( x11-base/xorg-proto )"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+PATCHES=(
+	"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
+	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
+	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
+)
+PATCHES_BIN=()
+
+# https://bugs.gentoo.org/show_bug.cgi?id=635222
+if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
+	DEPEND+=" dev-util/patchbin"
+fi
+
+wine_compiler_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	# GCC-specific bugs
+	if tc-is-gcc; then
+		# bug #549768
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+			ebegin "Checking for gcc-5 ms_abi compiler bug"
+			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
+			# Run in subshell to prevent "Aborted" message
+			( "${T}"/pr66838 || false ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/549768"
+				eerror
+				return 1
+			fi
+		fi
+		# bug #574044
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
+			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
+			# Compile in subshell to prevent "Aborted" message
+			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "Wine cannot be built with this version of gcc-5.3"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/574044"
+				eerror
+				return 1
+			fi
+		fi
+	fi
+
+	# Ensure compiler support
+	if use abi_x86_64; then
+		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
+		# Compile in subshell to prevent "Aborted" message
+		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
+		if ! eend $?; then
+			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
+			eerror
+			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
+			eerror
+			return 1
+		fi
+	fi
+}
+
+wine_build_environment_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	if use abi_x86_64; then
+		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
+			eerror "You need gcc-4.4+ to compile 64-bit wine"
+			die
+		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
+			eerror "You need clang-3.8+ to compile 64-bit wine"
+			die
+		fi
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
+		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
+		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
+		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
+		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
+			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
+			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
+			ewarn "See package.env in man 5 portage for more information on how to do this."
+			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
+		fi
+	fi
+
+	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
+		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+		eerror "See https://bugs.gentoo.org/487864 for more details."
+		eerror
+		return 1
+	fi
+}
+
+wine_env_vcs_vars() {
+	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+	local pn_live_val="${pn_live_var}"
+	eval pn_live_val='$'${pn_live_val}
+	if [[ ! -z ${pn_live_val} ]]; then
+		if use staging; then
+			eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}"
+			eerror "cannot be used to set the commit. Instead, you may use the"
+			eerror "environmental variables WINE_COMMIT, and STAGING_COMMIT."
+			eerror
+			return 1
+		fi
+	fi
+	if [[ ! -z ${EGIT_COMMIT} ]]; then
+		eerror "Commits must now be specified using the environmental variables"
+		eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT"
+		eerror
+		return 1
+	fi
+}
+
+pkg_pretend() {
+	wine_build_environment_check || die
+
+	# Verify OSS support
+	if use oss && ! use kernel_FreeBSD; then
+		if ! has_version ">=media-sound/oss-4"; then
+			eerror "You cannot build wine with USE=oss without having support from a"
+			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
+			eerror
+			die
+		fi
+	fi
+}
+
+pkg_setup() {
+	wine_build_environment_check || die
+	wine_env_vcs_vars || die
+
+	WINE_VARIANT="${PN#wine}-${PV}"
+	WINE_VARIANT="${WINE_VARIANT#-}"
+
+	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
+	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
+	MY_DATADIR="${MY_DATAROOTDIR}"
+	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
+	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
+	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
+	MY_MANDIR="${MY_DATADIR}/man"
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
+		if use staging; then
+			local CURRENT_WINE_COMMIT=${EGIT_VERSION}
+
+			git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}"
+			git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}"
+
+			local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
+
+			if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then
+				einfo "The current Staging patchset is not guaranteed to apply on this WINE commit."
+				einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT."
+				einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine"
+			fi
+		fi
+	fi
+
+	default
+
+	l10n_find_plocales_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+
+	eapply_bin(){
+		local patch
+		for patch in ${PATCHES_BIN[@]}; do
+			patchbin --nogit < "${patch}" || die
+		done
+	}
+
+	local md5="$(md5sum server/protocol.def)"
+
+	if use staging; then
+		ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
+		ewarn "Wine bugzilla should explicitly state that staging was used."
+
+		local STAGING_EXCLUDE=""
+		use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
+
+		# Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches
+		ebegin "Running Wine-Staging patch installer"
+		(
+			set -- DESTDIR="${S}" --backend=eapply --no-autoconf --all ${STAGING_EXCLUDE}
+			cd "${STAGING_DIR}/patches"
+			source "${STAGING_DIR}/patches/patchinstall.sh"
+		)
+		eend $? || die "Failed to apply Wine-Staging patches"
+	fi
+
+	default
+	eapply_bin
+	eautoreconf
+
+	# Modification of the server protocol requires regenerating the server requests
+	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+		einfo "server/protocol.def was patched; running tools/make_requests"
+		tools/make_requests || die #432348
+	fi
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+	if ! use run-exes; then
+		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
+	fi
+
+	# Edit wine.desktop to work for specific variant
+	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
+
+	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
+	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
+
+	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+
+	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
+
+	# Duplicate manpages input files for wine64
+	local f
+	for f in loader/*.man.in; do
+		cp ${f} ${f/wine/wine64} || die
+	done
+	# Add wine64 manpages to Makefile
+	if use abi_x86_64; then
+		sed -i "/wine.man.in/i \
+			\\\twine64.man.in \\\\" loader/Makefile.in || die
+		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
+\164\2/' loader/Makefile.in || die
+	fi
+
+	rm_man_file(){
+		local file="${1}"
+		loc=${2}
+		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
+	}
+
+	while read f; do
+		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
+}
+
+src_configure() {
+	wine_compiler_check || die
+
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--prefix="${MY_PREFIX}"
+		--datarootdir="${MY_DATAROOTDIR}"
+		--datadir="${MY_DATADIR}"
+		--docdir="${MY_DOCDIR}"
+		--includedir="${MY_INCLUDEDIR}"
+		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
+		--libexecdir="${MY_LIBEXECDIR}"
+		--localstatedir="${MY_LOCALSTATEDIR}"
+		--mandir="${MY_MANDIR}"
+		--sysconfdir=/etc/wine
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with lcms cms)
+		$(use_with cups)
+		$(use_with ncurses curses)
+		$(use_with udisks dbus)
+		$(use_with ffmpeg)
+		$(use_with fontconfig)
+		$(use_with ssl gnutls)
+		$(use_enable gecko mshtml)
+		$(use_with gphoto2 gphoto)
+		$(use_with gsm)
+		$(use_with gssapi)
+		$(use_with gstreamer)
+		--without-hal
+		$(use_with jpeg)
+		$(use_with kerberos krb5)
+		$(use_with ldap)
+		$(use_enable mono mscoree)
+		$(use_with mp3 mpg123)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with openal)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		$(use_with oss)
+		$(use_with pcap)
+		$(use_with png)
+		$(use_with pulseaudio pulse)
+		$(use_with threads pthread)
+		$(use_with scanner sane)
+		$(use_with sdl)
+		$(use_enable test tests)
+		$(use_with truetype freetype)
+		$(use_with udev)
+		$(use_with v4l)
+		$(use_with vkd3d)
+		$(use_with vulkan)
+		$(use_with X x)
+		$(use_with X xfixes)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+		$(use_with xml)
+		$(use_with xml xslt)
+	)
+
+	use staging && myconf+=(
+		--with-xattr
+		$(use_with themes gtk3)
+		$(use_with vaapi va)
+	)
+
+	local PKG_CONFIG AR RANLIB
+	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+	# set AR and RANLIB to make QA scripts happy; #483342
+	tc-export PKG_CONFIG AR RANLIB
+
+	if use amd64; then
+		if [[ ${ABI} == amd64 ]]; then
+			myconf+=( --enable-win64 )
+		else
+			myconf+=( --disable-win64 )
+		fi
+
+		# Note: using --with-wine64 results in problems with multilib.eclass
+		# CC/LD hackery. We're using separate tools instead.
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+	emake depend
+}
+
+multilib_src_test() {
+	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+	if [[ ${ABI} == x86 ]]; then
+		if [[ $(id -u) == 0 ]]; then
+			ewarn "Skipping tests since they cannot be run under the root user."
+			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
+			return
+		fi
+
+		WINEPREFIX="${T}/.wine-${ABI}" \
+		Xemake test
+	fi
+}
+
+multilib_src_install_all() {
+	local DOCS=( ANNOUNCE AUTHORS README )
+	add_locale_docs() {
+		local locale_doc="documentation/README.$1"
+		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+	}
+	l10n_for_each_locale_do add_locale_docs
+
+	einstalldocs
+	prune_libtool_files --all
+
+	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
+		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
+			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
+	fi
+
+	# Remove wineconsole if neither backend is installed #551124
+	if ! use X && ! use ncurses; then
+		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
+		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
+		rm_wineconsole() {
+			rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
+		}
+		multilib_foreach_abi rm_wineconsole
+	fi
+
+	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
+	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
+
+	if use abi_x86_64 && ! use abi_x86_32; then
+		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
+		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
+	fi
+
+	# Failglob for binloops, shouldn't be necessary, but including to stay safe
+	eshopts_push -s failglob #615218
+	# Make wrappers for binaries for handling multiple variants
+	# Note: wrappers instead of symlinks because some are shell which use basename
+	local b
+	for b in "${D%/}${MY_PREFIX}"/bin/*; do
+		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
+	done
+	eshopts_pop
+}
+
+pkg_postinst() {
+	eselect wine register ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine register --vanilla ${P} || die
+	else
+		if use staging; then
+			eselect wine register --staging ${P} || die
+		fi
+	fi
+
+	eselect wine update --all --if-unset || die
+
+	xdg_desktop_database_update
+
+	if ! use gecko; then
+		ewarn "Without Wine Gecko, wine prefixes will not have a default"
+		ewarn "implementation of iexplore.  Many older windows applications"
+		ewarn "rely upon the existence of an iexplore implementation, so"
+		ewarn "you will likely need to install an external one, like via winetricks"
+	fi
+	if ! use mono; then
+		ewarn "Without Wine Mono, wine prefixes will not have a default"
+		ewarn "implementation of .NET.  Many windows applications rely upon"
+		ewarn "the existence of a .NET implementation, so you will likely need"
+		ewarn "to install an external one, like via winetricks"
+	fi
+}
+
+pkg_prerm() {
+	eselect wine deregister ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine deregister --vanilla ${P} || die
+	else
+		if use staging; then
+			eselect wine deregister --staging ${P} || die
+		fi
+	fi
+
+	eselect wine update --all --if-unset || die
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@ -128,7 +128,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:4.7.1 )
+	mono? ( app-emulation/wine-mono:4.7.3 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@ -8,6 +8,7 @@ EBUILD wine-vanilla-3.0.1.ebuild 17123 BLAKE2B 5aef4adb2ece22b4abaee6fcff8fc28aa
 EBUILD wine-vanilla-3.0.2.ebuild 17125 BLAKE2B 51d4eeb0ef880774cfd8ffce30c8482e9c0a847cbfbecb15159e95497c9a56f62a7ecb1c941bda4f31fe4d89bd11fb740d747f28df28275ead43503af994eaf5 SHA512 011941555712a3a02ff08bdab12b467da71a151efdeb0bce060b9c51c02f8ffec5368b70969a36424b9272ad981e2e8a4725f7de35a8d6064e9e8ad00ccb0f35
 EBUILD wine-vanilla-3.11.ebuild 17329 BLAKE2B 4e0f08f51a31405ea56bcd7fa6e27c6e2060bc34fcb23dc7c6342d33abac6d62b5b664da6727094e9cc5105ccef9e026d75bc24a9c3aaa266069fe5fcddd29e1 SHA512 44d9a8470cfd621237c1f7fc389040b11eb0439429804f6472b1488b6372a091b123159f6ea32f2b911df320f303983ea94449e87814cc6840cefbbfedd7887c
 EBUILD wine-vanilla-3.12.ebuild 17329 BLAKE2B 4e0f08f51a31405ea56bcd7fa6e27c6e2060bc34fcb23dc7c6342d33abac6d62b5b664da6727094e9cc5105ccef9e026d75bc24a9c3aaa266069fe5fcddd29e1 SHA512 44d9a8470cfd621237c1f7fc389040b11eb0439429804f6472b1488b6372a091b123159f6ea32f2b911df320f303983ea94449e87814cc6840cefbbfedd7887c
+EBUILD wine-vanilla-3.13-r1.ebuild 17329 BLAKE2B 5ed8456f9f3e5961eb828e58f7829b4de2a5f2e4eb30430fecc98968acb0660b2fa1534672018d871222fca26cc9b667b9d570f8bc02121db6ae333322942db3 SHA512 660dcd599cfd1fda4f63d2dbf1bf5e3a8c22efa2a3954e311113b551c9974c23a8ffcf25075f13fcf231ff7076d902e0b739f31704fe7af5ceb3d3e3ddcf85db
 EBUILD wine-vanilla-3.13.ebuild 17329 BLAKE2B 4e0f08f51a31405ea56bcd7fa6e27c6e2060bc34fcb23dc7c6342d33abac6d62b5b664da6727094e9cc5105ccef9e026d75bc24a9c3aaa266069fe5fcddd29e1 SHA512 44d9a8470cfd621237c1f7fc389040b11eb0439429804f6472b1488b6372a091b123159f6ea32f2b911df320f303983ea94449e87814cc6840cefbbfedd7887c
-EBUILD wine-vanilla-9999.ebuild 17329 BLAKE2B 4e0f08f51a31405ea56bcd7fa6e27c6e2060bc34fcb23dc7c6342d33abac6d62b5b664da6727094e9cc5105ccef9e026d75bc24a9c3aaa266069fe5fcddd29e1 SHA512 44d9a8470cfd621237c1f7fc389040b11eb0439429804f6472b1488b6372a091b123159f6ea32f2b911df320f303983ea94449e87814cc6840cefbbfedd7887c
+EBUILD wine-vanilla-9999.ebuild 17329 BLAKE2B 5ed8456f9f3e5961eb828e58f7829b4de2a5f2e4eb30430fecc98968acb0660b2fa1534672018d871222fca26cc9b667b9d570f8bc02121db6ae333322942db3 SHA512 660dcd599cfd1fda4f63d2dbf1bf5e3a8c22efa2a3954e311113b551c9974c23a8ffcf25075f13fcf231ff7076d902e0b739f31704fe7af5ceb3d3e3ddcf85db
 MISC metadata.xml 3082 BLAKE2B 5ddadb49dd2e5b9da259d3313e2406e37871271f8261e9501508a50220a8ea31a68185d5fcecce968bc4f4915de6901060d980476ce2ddd61d1866d2766b0cfe SHA512 fa40b440a418dd442bdebb7914c84f648f74a18286f91d59726cbfefa1bebec8afab1f9a7b6ed8c7ae2788253dcaea9dc13cb4eff09ca6da56370e280952be70
--- a/app-emulation/wine-vanilla/wine-vanilla-3.13-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.13-r1.ebuild
@ -0,0 +1,531 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+
+MY_PN="${PN%%-*}"
+MY_P="${MY_PN}-${PV}"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	MAJOR_V=$(get_version_component_range 1)
+	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
+	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+fi
+S="${WORKDIR}/${MY_P}"
+
+GWP_V="20180120"
+PATCHDIR="${WORKDIR}/gentoo-wine-patches"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
+HOMEPAGE="https://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
+"
+
+LICENSE="LGPL-2.1"
+SLOT="${PV}"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vkd3d vulkan +X +xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+	X? ( truetype )
+	elibc_glibc? ( threads )
+	osmesa? ( opengl )
+	test? ( abi_x86_32 )" # osmesa-opengl #286560 # X-truetype #551124
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+COMMON_DEPEND="
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
+	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
+	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
+	)
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
+	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
+	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
+	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	opengl? (
+		virtual/glu[${MULTILIB_USEDEP}]
+		virtual/opengl[${MULTILIB_USEDEP}]
+	)
+	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
+	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] )
+	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
+	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	xml? (
+		dev-libs/libxml2[${MULTILIB_USEDEP}]
+		dev-libs/libxslt[${MULTILIB_USEDEP}]
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	app-emulation/wine-desktop-common
+	>app-eselect/eselect-wine-0.3
+	!app-emulation/wine:0
+	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
+	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
+	mono? ( app-emulation/wine-mono:4.7.3 )
+	perl? (
+		dev-lang/perl
+		dev-perl/XML-Simple
+	)
+	pulseaudio? (
+		realtime? ( sys-auth/rtkit )
+	)
+	samba? ( >=net-fs/samba-3.0.25[winbind] )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+	sys-devel/flex
+	>=sys-kernel/linux-headers-2.6
+	virtual/pkgconfig
+	virtual/yacc
+	X? ( x11-base/xorg-proto )
+	prelink? ( sys-devel/prelink )
+	xinerama? ( x11-base/xorg-proto )"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+PATCHES=(
+	"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
+	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
+	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
+)
+PATCHES_BIN=()
+
+# https://bugs.gentoo.org/show_bug.cgi?id=635222
+if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
+	DEPEND+=" dev-util/patchbin"
+fi
+
+wine_compiler_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	# GCC-specific bugs
+	if tc-is-gcc; then
+		# bug #549768
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+			ebegin "Checking for gcc-5 ms_abi compiler bug"
+			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
+			# Run in subshell to prevent "Aborted" message
+			( "${T}"/pr66838 || false ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/549768"
+				eerror
+				return 1
+			fi
+		fi
+		# bug #574044
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
+			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
+			# Compile in subshell to prevent "Aborted" message
+			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "Wine cannot be built with this version of gcc-5.3"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/574044"
+				eerror
+				return 1
+			fi
+		fi
+	fi
+
+	# Ensure compiler support
+	if use abi_x86_64; then
+		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
+		# Compile in subshell to prevent "Aborted" message
+		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
+		if ! eend $?; then
+			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
+			eerror
+			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
+			eerror
+			return 1
+		fi
+	fi
+}
+
+wine_build_environment_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	if use abi_x86_64; then
+		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
+			eerror "You need gcc-4.4+ to compile 64-bit wine"
+			die
+		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
+			eerror "You need clang-3.8+ to compile 64-bit wine"
+			die
+		fi
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
+		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
+		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
+		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
+		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
+			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
+			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
+			ewarn "See package.env in man 5 portage for more information on how to do this."
+			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
+		fi
+	fi
+
+	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
+		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+		eerror "See https://bugs.gentoo.org/487864 for more details."
+		eerror
+		return 1
+	fi
+}
+
+wine_env_vcs_vars() {
+	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+	local pn_live_val="${pn_live_var}"
+	eval pn_live_val='$'${pn_live_val}
+	if [[ ! -z ${EGIT_COMMIT} ]]; then
+		eerror "Commits must now be specified using the environmental variables"
+		eerror "WINE_COMMIT"
+		eerror
+		return 1
+	fi
+}
+
+pkg_pretend() {
+	wine_build_environment_check || die
+
+	# Verify OSS support
+	if use oss && ! use kernel_FreeBSD; then
+		if ! has_version ">=media-sound/oss-4"; then
+			eerror "You cannot build wine with USE=oss without having support from a"
+			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
+			eerror
+			die
+		fi
+	fi
+}
+
+pkg_setup() {
+	wine_build_environment_check || die
+	wine_env_vcs_vars || die
+
+	WINE_VARIANT="${PN#wine}-${PV}"
+	WINE_VARIANT="${WINE_VARIANT#-}"
+
+	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
+	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
+	MY_DATADIR="${MY_DATAROOTDIR}"
+	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
+	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
+	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
+	MY_MANDIR="${MY_DATADIR}/man"
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
+	fi
+
+	default
+
+	l10n_find_plocales_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+
+	eapply_bin(){
+		local patch
+		for patch in ${PATCHES_BIN[@]}; do
+			patchbin --nogit < "${patch}" || die
+		done
+	}
+
+	local md5="$(md5sum server/protocol.def)"
+
+	default
+	eapply_bin
+	eautoreconf
+
+	# Modification of the server protocol requires regenerating the server requests
+	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+		einfo "server/protocol.def was patched; running tools/make_requests"
+		tools/make_requests || die #432348
+	fi
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+	if ! use run-exes; then
+		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
+	fi
+
+	# Edit wine.desktop to work for specific variant
+	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
+
+	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
+	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
+
+	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+
+	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
+
+	# Duplicate manpages input files for wine64
+	local f
+	for f in loader/*.man.in; do
+		cp ${f} ${f/wine/wine64} || die
+	done
+	# Add wine64 manpages to Makefile
+	if use abi_x86_64; then
+		sed -i "/wine.man.in/i \
+			\\\twine64.man.in \\\\" loader/Makefile.in || die
+		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
+\164\2/' loader/Makefile.in || die
+	fi
+
+	rm_man_file(){
+		local file="${1}"
+		loc=${2}
+		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
+	}
+
+	while read f; do
+		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
+}
+
+src_configure() {
+	wine_compiler_check || die
+
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--prefix="${MY_PREFIX}"
+		--datarootdir="${MY_DATAROOTDIR}"
+		--datadir="${MY_DATADIR}"
+		--docdir="${MY_DOCDIR}"
+		--includedir="${MY_INCLUDEDIR}"
+		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
+		--libexecdir="${MY_LIBEXECDIR}"
+		--localstatedir="${MY_LOCALSTATEDIR}"
+		--mandir="${MY_MANDIR}"
+		--sysconfdir=/etc/wine
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with lcms cms)
+		$(use_with cups)
+		$(use_with ncurses curses)
+		$(use_with udisks dbus)
+		$(use_with fontconfig)
+		$(use_with ssl gnutls)
+		$(use_enable gecko mshtml)
+		$(use_with gphoto2 gphoto)
+		$(use_with gsm)
+		$(use_with gssapi)
+		$(use_with gstreamer)
+		--without-hal
+		$(use_with jpeg)
+		$(use_with kerberos krb5)
+		$(use_with ldap)
+		$(use_enable mono mscoree)
+		$(use_with mp3 mpg123)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with openal)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		$(use_with oss)
+		$(use_with pcap)
+		$(use_with png)
+		$(use_with pulseaudio pulse)
+		$(use_with threads pthread)
+		$(use_with scanner sane)
+		$(use_with sdl)
+		$(use_enable test tests)
+		$(use_with truetype freetype)
+		$(use_with udev)
+		$(use_with v4l)
+		$(use_with vkd3d)
+		$(use_with vulkan)
+		$(use_with X x)
+		$(use_with X xfixes)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+		$(use_with xml)
+		$(use_with xml xslt)
+	)
+
+	local PKG_CONFIG AR RANLIB
+	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+	# set AR and RANLIB to make QA scripts happy; #483342
+	tc-export PKG_CONFIG AR RANLIB
+
+	if use amd64; then
+		if [[ ${ABI} == amd64 ]]; then
+			myconf+=( --enable-win64 )
+		else
+			myconf+=( --disable-win64 )
+		fi
+
+		# Note: using --with-wine64 results in problems with multilib.eclass
+		# CC/LD hackery. We're using separate tools instead.
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+	emake depend
+}
+
+multilib_src_test() {
+	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+	if [[ ${ABI} == x86 ]]; then
+		if [[ $(id -u) == 0 ]]; then
+			ewarn "Skipping tests since they cannot be run under the root user."
+			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
+			return
+		fi
+
+		WINEPREFIX="${T}/.wine-${ABI}" \
+		Xemake test
+	fi
+}
+
+multilib_src_install_all() {
+	local DOCS=( ANNOUNCE AUTHORS README )
+	add_locale_docs() {
+		local locale_doc="documentation/README.$1"
+		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+	}
+	l10n_for_each_locale_do add_locale_docs
+
+	einstalldocs
+	prune_libtool_files --all
+
+	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
+		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
+			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
+	fi
+
+	# Remove wineconsole if neither backend is installed #551124
+	if ! use X && ! use ncurses; then
+		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
+		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
+		rm_wineconsole() {
+			rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
+		}
+		multilib_foreach_abi rm_wineconsole
+	fi
+
+	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
+	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
+
+	if use abi_x86_64 && ! use abi_x86_32; then
+		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
+		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
+	fi
+
+	# Failglob for binloops, shouldn't be necessary, but including to stay safe
+	eshopts_push -s failglob #615218
+	# Make wrappers for binaries for handling multiple variants
+	# Note: wrappers instead of symlinks because some are shell which use basename
+	local b
+	for b in "${D%/}${MY_PREFIX}"/bin/*; do
+		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
+	done
+	eshopts_pop
+}
+
+pkg_postinst() {
+	eselect wine register ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine register --vanilla ${P} || die
+	fi
+
+	eselect wine update --all --if-unset || die
+
+	xdg_desktop_database_update
+
+	if ! use gecko; then
+		ewarn "Without Wine Gecko, wine prefixes will not have a default"
+		ewarn "implementation of iexplore.  Many older windows applications"
+		ewarn "rely upon the existence of an iexplore implementation, so"
+		ewarn "you will likely need to install an external one, like via winetricks"
+	fi
+	if ! use mono; then
+		ewarn "Without Wine Mono, wine prefixes will not have a default"
+		ewarn "implementation of .NET.  Many windows applications rely upon"
+		ewarn "the existence of a .NET implementation, so you will likely need"
+		ewarn "to install an external one, like via winetricks"
+	fi
+}
+
+pkg_prerm() {
+	eselect wine deregister ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine deregister --vanilla ${P} || die
+	fi
+
+	eselect wine update --all --if-unset || die
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@ -107,7 +107,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:4.7.1 )
+	mono? ( app-emulation/wine-mono:4.7.3 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
--- a/app-i18n/poedit/Manifest
+++ b/app-i18n/poedit/Manifest
@ -3,5 +3,5 @@ DIST poedit-2.0.7.tar.gz 2558220 BLAKE2B e4a958e516a5c4b56331b6f9f37d9fa627072a4
 DIST poedit-2.0.9.tar.gz 2567156 BLAKE2B 29e616256a19430cb3efd3db5d6c2cc450155009e30ee056f6be712bac9e631e5aa20b0758262e9fbe00937eedf6ac777cd8e7407a3060f04503e3fa4d9cd6d0 SHA512 9981339ae0c3f11f972ed2f25e0c96e5c0cc0210771cc44d163e219c32eb951fa4180c8a03acdd7f0232a5e4b535f3202dda703b57ccfb02773eb24e6a1eb02d
 EBUILD poedit-2.0.6.ebuild 1273 BLAKE2B 9f2a627317290fb4ac7acb8b80f29297ec20c2a8c31b8f38bf995f461e7518bc767d49fed66c5953d2dbe4ffbe5dd1c981189601aaed8516ce7059aa372f9f7c SHA512 97cbb993e0b2583277d2ba88accf36e4bcf4b113d95b87140d80b3c07b705a0f38eb85721b81e1aced2b27e24ec6905308a916d3caa6b2ab7ad494957adcc0a5
 EBUILD poedit-2.0.7.ebuild 1278 BLAKE2B 345e579a3447a333c4633cee6f1742f64082549aeef84dcbcb32407e219a7edd68aeef53d883ae6269a464b6e6a41cd124d6403fce8645c7f95c44a55da34ada SHA512 c1b7cddd4c5051e142bf1e663cf4df22543f16168ab4413fcba9a56ec9c1ef5ec507d462dd46e773bd92d89e1a9c51ebe0d9ed536cc4b111cfd6314f67993e84
-EBUILD poedit-2.0.9.ebuild 1369 BLAKE2B a758a6d4a7290c05409f4e21503839414e56707553b9eaf1fcb306bdcca806e4683715dfb49ea711230a9b13bacfa1a7d00bd72d85d3d8905e98e446663b3f2c SHA512 76cb2475edadd233c53e7184f3185de521dca96d49327a95836b814bc9f64b1128e687f948d6cae8b6385e231486da9f6aae2d93fd75c100e40358b8c3bd3495
+EBUILD poedit-2.0.9.ebuild 1368 BLAKE2B 53b43c2c472a675c9e56d4c8050efd4cf3bba8352ef07b090fccc013a39ec207564305b1e10251b1cebe91128ee168b4bd3c3da7310b8a8053a2e1dcb6340630 SHA512 a68062e81ad4684d0dbef35ade3afc120b3eec0f5d462756782dd8a9029fd02ed75b0a35c92d3727e098c4d9d732b7cd53ecc59ef784690f4d55de1488f40345
 MISC metadata.xml 611 BLAKE2B 7eda7aaa83b70b383879068c765a142c5e18bb79865a88c325c0a4ab8aa7f6ca00b197030f7a73baa4bbcb87dbb14097dd218d30dd6475705552500d6d0fb4f7 SHA512 96dfc2db0caf0915cca3997cff6fc021a3c196f4b7a5b9f2007c6284d9dfecfc66c1d5e0f44928a98810f6a23a7d5c6fc9db2ee3b24ce7ff7b9cb42afafd5f2f
--- a/app-i18n/poedit/poedit-2.0.9.ebuild
+++ b/app-i18n/poedit/poedit-2.0.9.ebuild
@ -12,7 +12,7 @@ DESCRIPTION="GUI gettext translations editor"
 HOMEPAGE="https://poedit.net"
 SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}-oss/${P}.tar.gz"

-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 sparc ~x86"
 LICENSE="MIT"
 SLOT="0"

--- a/app-leechcraft/Manifest.gz
+++ b/app-leechcraft/Manifest.gz
--- a/app-leechcraft/lc-core/Manifest
+++ b/app-leechcraft/lc-core/Manifest
@ -1,2 +1,2 @@
-EBUILD lc-core-9999.ebuild 1190 BLAKE2B 235595fe3dc8c4abbaf2e28c63e20e7b887830eb2fd22d25f532e8da5fc8c2f56c44f718ac7a7946cd00082e52c67d3ddba822079549251793bb663c88b95d1a SHA512 45df8aa3158f56ef8d82cf7a2f6b2c9417783b3b6b8cec2afb9825fb0a5e8d526904d81f93a4475fa13c7dada5da91e09d16da3aecc8c519562e2359cb9b58ef
+EBUILD lc-core-9999.ebuild 1185 BLAKE2B df633e13dfdff59a7932a079da5913b5d4c2b3d581cf7d83cf93c43c8e2b969a736f9f1eefc1ca2e6964e175a1cb258d285f283e21020a7ae9a1b0bdfaa9c920 SHA512 16d5a9a3a9daa3c106ccbc1cc22e20488e592e8a965caca694e204f403c83f0ea8208a5cb09ad35e1f37306ab6884b9cadcd03b5c8af49f0d8ff2f9d4cee8f47
 MISC metadata.xml 633 BLAKE2B 62070ab45e1be6576733dedf35c3778a28876138617bab4868f0b8bae1df3b54921e278048e1b55b4e558194b21f9d82a8390a977d551ef5c3c7878f9bba4288 SHA512 45cc0f9aa42538cd9f9232e5981c9dbbc457e4dd89c9c82ab5dcfdb139df67d83149b6aafdaad4d04d03efda32b187c99605c30da5477a3de67eee9608a26e90
--- a/app-leechcraft/lc-core/lc-core-9999.ebuild
+++ b/app-leechcraft/lc-core/lc-core-9999.ebuild
@ -27,7 +27,7 @@ COMMON_DEPEND=">=dev-libs/boost-1.62
 	dev-qt/qtx11extras:5
 	dev-qt/qtconcurrent:5
 	dev-qt/linguist-tools:5
-	qwt? ( x11-libs/qwt:6[qt5] )"
+	qwt? ( x11-libs/qwt:6 )"
 DEPEND="${COMMON_DEPEND}
 	doc? ( app-doc/doxygen )"
 RDEPEND="${COMMON_DEPEND}
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
--- a/app-metrics/collectd/Manifest
+++ b/app-metrics/collectd/Manifest
@ -1,13 +1,8 @@
-AUX collectd-5.6.0-gentoo.patch 4294 BLAKE2B 99274b5a2734910a35ab6a0003d6fe257e239fc0a3b1f3ca398c82b0e28b9365729980999af0db417b3818c7b4de47f48c0118eea88a43f8de162ae40eeb68be SHA512 088f65e2d90c29092621693847f165be7024caa2237a2129dbffcedba3c1f93baa8169de9d3c2979c709219ec12ee0d3b6dd36586ede92062d1a14a28b8611c8
-AUX collectd-5.7.2-CVE-2017-16820.patch 1326 BLAKE2B 0dbd15e6c52531423b47d25b0fab0319c867482fbcd7f9e5a59c9ae6908ce1844f9ed41590a048ff247acf2bfdb8ddd34723dd289074269fb8bd7133ae324d40 SHA512 13e7ad198c88538a8bdcdd1d0ee8ed3ebe7b8ac00df98341a1248a4e5fd02b44b24d239c6c3ac70fce6492674163371755f126e2f4a0099159032514a842ea0b
-AUX collectd-5.7.2-issue-2443.patch 4628 BLAKE2B 357f4171c4cc5e13e43da0709bcecff8d9c7d529c1c2c910e14ec2502ea4abd3df2e1be591b2d98b06d6dd5f984e9dd5615f7cd7e14cad79d49adc6f369cf37b SHA512 16c7bc99a6401c96fb3b2cda5ad6e540024ae13d66268b4d5ada4c65c456a5dbd210ea58d116463381dbac953f9f8d4907d2185a24195a304e0f5a645829755e
-AUX collectd-5.7.2-varnish-5.2+.patch 40982 BLAKE2B a1f90a27e95b2665626fc2112646f5fb092472f32b58fb6bcc2a6a15e2916bb067b7f8aa7c85fba12eaf839d10b94004a1847f537d5f5535d9a7aac0fe2fe5a7 SHA512 eea0fd89f65b14ba6012160c4d2560e8c6339f7aeb873d93ed35b9c3551d76d6087c6cdbe986610502e8a73b144fba945f1efd1db31e5be792b9ecead2d0eeec
+AUX collectd-5.8.0-disk-plugin-udev-fix.patch 2659 BLAKE2B 9b787040e34e62f06993d5bc2ccf92032b9880a1ba65f69c351300ad61ffa6e1ff5ace074285abf3e05962b61a2aa15f355f48ab9f789357197dc24d50138025 SHA512 bdac64df91de88d0cb8220a9cd5a9d303a5d9f3551484bf6319c8a2987ef69c2becc4dfb37350836767aed06704be3da9500433c21f1363c80c6d3faac13e1e5
 AUX collectd.confd-r2 2001 BLAKE2B fbf1a64aab6ec60111553466c3a8b725200ab13d0e09c1ba1d71e68213e8f978c3cad0dfc5eb2c536ced8213f172804f0596b3494f9b42b0cacf3432105cab5a SHA512 729f2b4e06c4a8c95d32c03c6f3f292eaa4895780ace180b74fcf139a949e9c28a2b3ae823bdebec0014f9b4d919adb399bc7f019c68c0e268b263326959edb7
 AUX collectd.initd-r2 1843 BLAKE2B ccb12e55de72565aa7b6bb0f2c4e7a5a6d15ff23d5bc75e9cb36e1f2dba85b3b2b587336f976059af165ae89333d681ffe0cf53bbcd8098eaeff75228cb80b68 SHA512 8f0a73f0f2b2280c0f2e35894a9dfa38af937930eb090eab52cbe81089a146bd974f6a2a3062b7147611f9c13b770a945a1a9228a026405d31578e27a3fd3b80
 AUX collectd.logrotate 115 BLAKE2B ce2a79787096b04af6ecd128633dde68fb868a02cc1d246c3e512c1733133fcc8da41b3ab2a0051b4da78c53e6629b2ad8085872dec1d4c28e397c88cafe3a90 SHA512 87ec01784d415f00834c2b20614f11f7e08b70f88d7c87509a8b8fd7e1af8758565b9ed6a6840af7bf1006cb941a61a6ff4f3176f6ded722728f24483b08bc8e
 AUX collectd.tmpfile 39 BLAKE2B 0d1ee2f02e539e854b62b47032308d08505fa31d8428e98f8d150c924201074c5edae22eea3990edf3a7837f1473193fe009a501645bf064638c532ec53a36cc SHA512 55fb70da9ece74b143c3e971b890954842230691039f8ad2240cc4c8d699e4e7a21efcbfd0b3cb2503e90af0bbdd0c7d886e09baf9fc86ec26c115a0bce6a668
-DIST collectd-5.7.2.tar.bz2 1798777 BLAKE2B 4af359a773457bb9c05b6a301d7728eea7598c200f7ca534875b07d1d011b280ab138f680d9607723f14523dd71dcbec3a41e0d8d183848c8ef809cef86c2b8f SHA512 8844b67159f8da2203b5ac57ef19fce0a01050a016174d196b48b5fb24925ad2935af9bdd9af06097ff663499abc496cdcc2d9e9a10f403f8d707c465c1a88f3
 DIST collectd-5.8.0.tar.bz2 1686017 BLAKE2B 26d995cdb9c25869bf96a056e6ba879de9f009fd4bbf1364a7dedba93b822e57c4b606ca8c84da68cc29db8e77333047695e85d7eb101080de9cee783240f5ea SHA512 1b3d0cc44e2ca54e13eebf292074f1efa8b33d6800d04405e0eaaa2dd1cb2416c6eae580729fb5aead23a5039f41ffe8a9989a907a8c18be8f867f1099fc0008
-EBUILD collectd-5.7.2-r3.ebuild 19604 BLAKE2B a8029a04105fc974d7509caec64d4ac4b36cc0f4c94ab626a73a9e9097076618c26c0fc69c8b3f0af4cee6c4834bac0425fd3905caf9356cd864f0c810f2fb79 SHA512 e8359fc8644c775fe5c9158fa26fd7b0c63aef1f68d2f0dc242043a6dd223338c2544d8680377243c2939fb74b998fb5530febe4f1d0376c6ec3771d47303af7
-EBUILD collectd-5.8.0.ebuild 19352 BLAKE2B 5d139a18f23412015375c01123ee63ac04b4d5a49efccf92dfb057b2d86cb79416820f8263bbaf978a9c195d3b87ead3cf9664917b723d8ba404bd98a00d505d SHA512 8f894043466399d5f563eb7774af5e2cba76574be12188d5ebd60139a7bec36f162d47318700deacffe3e01f94abf13ab7e27ca189054d0dfa92bf13482ede8a
+EBUILD collectd-5.8.0-r1.ebuild 19415 BLAKE2B 1dfcc4d012ebc4b075896d0917325d31079eb1345ad6e10f336bf71f47637964b000aa34d6c9fcd33f4411cd42bab4ee4dbaeeb30d96d8c194d053346bc2f6e8 SHA512 483d9f72ec422b55ca9868e452bd2f014de3cd691d8572b00b2029d976cffefd3d93ed70dca7fd939b22c3296ba9e9704147ff70d9b6184d7d500c6e10641095
 MISC metadata.xml 1515 BLAKE2B 5525766b822463f94f7c2cddbdf78b4c4ea5a473880a473d0b51481d948569cfc7f51bd2e74eb67065ab2be1b23e4fb7ee99512d018c6e6b5ac1ee7331eae9eb SHA512 51c17c16d27b722d729d036d67c562ab76e212dac9bcd004a7e43c2c5e041b8c46e74f9a130f30c2e18cc95ca1b367034246eff02cfaf55f6f9375ff836749e5
--- a/app-metrics/collectd/collectd-5.7.2-r3.ebuild
+++ b/app-metrics/collectd/collectd-5.7.2-r3.ebuild
@ -1,548 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-JAVA_PKG_OPT_USE="collectd_plugins_java"
-
-inherit autotools fcaps flag-o-matic java-pkg-opt-2 linux-info multilib perl-functions python-single-r1 systemd tmpfiles user
-
-DESCRIPTION="Collects system statistics and provides mechanisms to store the values"
-
-HOMEPAGE="https://collectd.org/"
-SRC_URI="${HOMEPAGE%/}/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm x86"
-IUSE="contrib debug java kernel_Darwin kernel_FreeBSD kernel_linux perl selinux static-libs udev xfs"
-
-# The plugin lists have to follow here since they extend IUSE
-
-# Plugins that don't build (e.g. dependencies not in Gentoo)
-# apple_sensors: Requires libIOKit
-# aquaero:       Requires aerotools-ng/libaquaero5
-# barometer:     Requires libi2c (i2c_smbus_read_i2c_block_data)
-# dpdkstat:      Requires dpdk
-# grpc:          Requires libgrpc
-# intel_rdt      Requires libpqos from intel-cmt-cat project
-# lpar:          Requires libperfstat (AIX only)
-# mic:           Requires Intel Many Integrated Core Architecture API
-#                (part of Intel's  Xeon Phi software)
-# netapp:        Requires libnetapp (http://communities.netapp.com/docs/DOC-1110)
-# pf:            Requires BSD packet filter
-# pinba:         Requires MySQL Pinba engine (http://pinba.org/)
-# tape:          Requires libkstat (Solaris only)
-# write_mongodb: https://github.com/collectd/collectd/issues/492
-# write_riemann: Requires riemann-c-client
-# xmms:          Requires libxmms (v1)
-# zone:          Solaris only...
-COLLECTD_IMPOSSIBLE_PLUGINS="apple_sensors aquaero barometer dpdkstat grpc
-	intel_rdt lpar mic netapp pf pinba tape write_mongodb
-	write_riemann xmms zone"
-
-# Plugins that have been (compile) tested and can be enabled via COLLECTD_PLUGINS
-COLLECTD_TESTED_PLUGINS="aggregation amqp apache apcups ascent battery bind
-	ceph cgroups chrony conntrack contextswitch cpu cpufreq cpusleep
-	csv curl curl_json curl_xml dbi df disk dns drbd email
-	entropy ethstat exec fhcount filecount fscache gmond gps hddtemp
-	hugepages interface ipc ipmi iptables ipvs irq java lua
-	load logfile log_logstash lvm madwifi match_empty_counter
-	match_hashed match_regex match_timediff match_value mbmon md
-	memcachec memcached memory modbus mqtt multimeter mysql netlink
-	network network nfs nginx notify_desktop notify_email notify_nagios
-	ntpd numa nut olsrd onewire openldap openvpn oracle perl ping
-	postgresql powerdns processes protocols python python redis
-	routeros rrdcached rrdtool sensors serial sigrok smart snmp statsd
-	swap syslog table tail tail_csv target_notification target_replace
-	target_scale target_set tcpconns teamspeak2 ted thermal threshold
-	tokyotyrant turbostat unixsock uptime users uuid varnish virt
-	vmem vserver wireless write_graphite write_http write_kafka
-	write_log write_prometheus write_redis write_sensu write_tsdb
-	xencpu zfs_arc zookeeper"
-
-COLLECTD_DISABLED_PLUGINS="${COLLECTD_IMPOSSIBLE_PLUGINS}"
-
-COLLECTD_ALL_PLUGINS=${COLLECTD_TESTED_PLUGINS}
-
-for plugin in ${COLLECTD_ALL_PLUGINS}; do
-	IUSE="${IUSE} collectd_plugins_${plugin}"
-done
-unset plugin
-
-# Now come the dependencies.
-
-COMMON_DEPEND="
-	dev-libs/libgcrypt:=
-	dev-libs/libltdl:0=
-	perl?					( dev-lang/perl:=[ithreads] )
-	udev?					( virtual/udev )
-	xfs?					( sys-fs/xfsprogs )
-	collectd_plugins_amqp?			( net-libs/rabbitmq-c )
-	collectd_plugins_apache?		( net-misc/curl:0= )
-	collectd_plugins_ascent?		( net-misc/curl:0= dev-libs/libxml2:2= )
-	collectd_plugins_bind?			( net-misc/curl:0= dev-libs/libxml2:2= )
-	collectd_plugins_ceph?			( dev-libs/yajl:= )
-	collectd_plugins_curl?			( net-misc/curl:0= )
-	collectd_plugins_curl_json?		( net-misc/curl:0= dev-libs/yajl:= )
-	collectd_plugins_curl_xml?		( net-misc/curl:0= dev-libs/libxml2:2= )
-	collectd_plugins_dbi?			( dev-db/libdbi )
-	collectd_plugins_dns?			( net-libs/libpcap )
-	collectd_plugins_gmond?			( sys-cluster/ganglia )
-	collectd_plugins_gps?			( sci-geosciences/gpsd:= )
-	collectd_plugins_ipmi?			( >=sys-libs/openipmi-2.0.16-r1 )
-	collectd_plugins_iptables?		( >=net-firewall/iptables-1.4.13:0= )
-	collectd_plugins_log_logstash?		( dev-libs/yajl:= )
-	collectd_plugins_lua?			( dev-lang/lua:0= )
-	collectd_plugins_lvm?			( sys-fs/lvm2 )
-	collectd_plugins_memcachec?		( dev-libs/libmemcached )
-	collectd_plugins_modbus?		( dev-libs/libmodbus )
-	collectd_plugins_mqtt?			( app-misc/mosquitto )
-	collectd_plugins_mysql?			( virtual/libmysqlclient:= )
-	collectd_plugins_netlink?		( net-libs/libmnl )
-	collectd_plugins_nginx?			( net-misc/curl:0= )
-	collectd_plugins_notify_desktop?	( x11-libs/libnotify )
-	collectd_plugins_notify_email?		( net-libs/libesmtp )
-	collectd_plugins_nut?			( >=sys-power/nut-2.7.2-r2 )
-	collectd_plugins_openldap?		( net-nds/openldap )
-	collectd_plugins_onewire?		( >=sys-fs/owfs-3.1:= )
-	collectd_plugins_oracle?		( dev-db/oracle-instantclient-basic )
-	collectd_plugins_perl?			( dev-lang/perl:=[ithreads] )
-	collectd_plugins_ping?			( net-libs/liboping )
-	collectd_plugins_postgresql?		( dev-db/postgresql:= )
-	collectd_plugins_python?		( ${PYTHON_DEPS} )
-	collectd_plugins_redis?			( dev-libs/hiredis:= )
-	collectd_plugins_routeros?		( net-libs/librouteros )
-	collectd_plugins_rrdcached?		( net-analyzer/rrdtool:= )
-	collectd_plugins_rrdtool?		( net-analyzer/rrdtool:= )
-	collectd_plugins_sensors?		( sys-apps/lm_sensors )
-	collectd_plugins_sigrok?		( <sci-libs/libsigrok-0.4:= dev-libs/glib:2 )
-	collectd_plugins_smart?			( dev-libs/libatasmart )
-	collectd_plugins_snmp?			( net-analyzer/net-snmp )
-	collectd_plugins_tokyotyrant?		( net-misc/tokyotyrant )
-	collectd_plugins_varnish?		( www-servers/varnish )
-	collectd_plugins_virt?			( app-emulation/libvirt:= dev-libs/libxml2:2= )
-	collectd_plugins_write_http?		( net-misc/curl:0= dev-libs/yajl:= )
-	collectd_plugins_write_kafka?		( >=dev-libs/librdkafka-0.9.0.99:= dev-libs/yajl:= )
-	collectd_plugins_write_prometheus?	( >=dev-libs/protobuf-c-1.2.1-r1:= net-libs/libmicrohttpd:= )
-	collectd_plugins_write_redis?		( dev-libs/hiredis:= )
-	collectd_plugins_xencpu?		( app-emulation/xen-tools:= )
-
-	kernel_FreeBSD? (
-		collectd_plugins_disk?		( sys-libs/libstatgrab:= )
-		collectd_plugins_interface?	( sys-libs/libstatgrab:= )
-		collectd_plugins_load?		( sys-libs/libstatgrab:= )
-		collectd_plugins_memory?	( sys-libs/libstatgrab:= )
-		collectd_plugins_swap?		( sys-libs/libstatgrab:= )
-		collectd_plugins_users?		( sys-libs/libstatgrab:= )
-	)"
-
-# Enforcing !=sys-kernel/linux-headers-4.5 > due to #577846
-DEPEND="${COMMON_DEPEND}
-	collectd_plugins_iptables?		( || ( <=sys-kernel/linux-headers-4.4 >=sys-kernel/linux-headers-4.6 ) )
-	collectd_plugins_java?			( >=virtual/jdk-1.6 )
-	virtual/pkgconfig"
-
-RDEPEND="${COMMON_DEPEND}
-	collectd_plugins_java?			( >=virtual/jre-1.6 )
-	collectd_plugins_syslog?		( virtual/logger )
-	selinux?				( sec-policy/selinux-collectd )
-	!<sys-apps/openrc-0.18.2"
-
-REQUIRED_USE="
-	collectd_plugins_python?		( ${PYTHON_REQUIRED_USE} )
-	collectd_plugins_smart?			( udev )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.6.0-gentoo.patch
-	"${FILESDIR}"/${PN}-5.7.2-issue-2443.patch
-	"${FILESDIR}"/${PN}-5.7.2-CVE-2017-16820.patch
-	"${FILESDIR}"/${PN}-5.7.2-varnish-5.2+.patch
-)
-
-# @FUNCTION: collectd_plugin_kernel_linux
-# @DESCRIPTION:
-# USAGE: <plugin name> <kernel_options> <severity>
-# kernel_options is a list of kernel configurations options; the check tests whether at least
-#   one of them is enabled. If no, depending on the third argument an elog, ewarn, or eerror message
-#   is emitted.
-collectd_plugin_kernel_linux() {
-	local multi_opt opt
-	if has ${1} ${COLLECTD_ALL_PLUGINS}; then
-		if use collectd_plugins_${1}; then
-			for opt in ${2}; do
-				if linux_chkconfig_present ${opt}; then
-					return 0;
-				fi
-			done
-			multi_opt=${2//\ /\ or\ }
-			case ${3} in
-				(info)
-					elog "The ${1} plugin can use kernel features that are disabled now; enable ${multi_opt} in your kernel"
-				;;
-				(warn)
-					ewarn "The ${1} plugin uses kernel features that are disabled now; enable ${multi_opt} in your kernel"
-				;;
-				(error)
-					eerror "The ${1} plugin needs kernel features that are disabled now; enable ${multi_opt} in your kernel"
-				;;
-				(*)
-					die "function collectd_plugin_kernel_linux called with invalid third argument"
-				;;
-			esac
-		fi
-	fi
-}
-
-collectd_linux_kernel_checks() {
-	if ! linux_chkconfig_present PROC_FS; then
-		ewarn "/proc file system support is disabled, many plugins will not be able to read any statistics from your system unless you enable PROC_FS in your kernel"
-	fi
-
-	if ! linux_chkconfig_present SYSFS; then
-		ewarn "/sys file system support is disabled, many plugins will not be able to read any statistics from your system unless you enable SYSFS in your kernel"
-	fi
-
-	# battery.c: /proc/pmu/battery_%i
-	# battery.c: /proc/acpi/battery
-	collectd_plugin_kernel_linux battery ACPI_BATTERY warn
-
-	# cgroups.c: /sys/fs/cgroup/
-	collectd_plugin_kernel_linux cgroups CGROUPS warn
-
-	# cpufreq.c: /sys/devices/system/cpu/cpu%d/cpufreq/
-	collectd_plugin_kernel_linux cpufreq SYSFS warn
-	collectd_plugin_kernel_linux cpufreq CPU_FREQ_STAT warn
-
-	# drbd.c: /proc/drbd
-	collectd_plugin_kernel_linux drbd BLK_DEV_DRBD warn
-
-	# conntrack.c: /proc/sys/net/netfilter/*
-	collectd_plugin_kernel_linux conntrack NETFILTER warn
-
-	# fscache.c: /proc/fs/fscache/stats
-	collectd_plugin_kernel_linux fscache FSCACHE warn
-
-	# nfs.c: /proc/net/rpc/nfs
-	# nfs.c: /proc/net/rpc/nfsd
-	collectd_plugin_kernel_linux nfs NFS_COMMON warn
-
-	# serial.c: /proc/tty/driver/serial
-	# serial.c: /proc/tty/driver/ttyS
-	collectd_plugin_kernel_linux serial SERIAL_CORE warn
-
-	# swap.c: /proc/meminfo
-	collectd_plugin_kernel_linux swap SWAP warn
-
-	# thermal.c: /proc/acpi/thermal_zone
-	# thermal.c: /sys/class/thermal
-	collectd_plugin_kernel_linux thermal ACPI_THERMAL warn
-
-	# turbostat.c: /dev/cpu/%d/msr
-	collectd_plugin_kernel_linux turbostat X86_MSR warn
-
-	# vmem.c: /proc/vmstat
-	collectd_plugin_kernel_linux vmem VM_EVENT_COUNTERS warn
-
-	# vserver.c: /proc/virtual
-	collectd_plugin_kernel_linux vserver VSERVER warn
-
-	# uuid.c: /sys/hypervisor/uuid
-	collectd_plugin_kernel_linux uuid SYSFS info
-
-	# wireless.c: /proc/net/wireless
-	collectd_plugin_kernel_linux wireless "WIRELESS MAC80211 IEEE80211" warn
-
-	# zfs_arc.c: /proc/spl/kstat/zfs/arcstats
-	collectd_plugin_kernel_linux zfs_arc "SPL ZFS" warn
-}
-
-pkg_setup() {
-	if use kernel_linux; then
-		linux-info_pkg_setup
-
-		if linux_config_exists; then
-			einfo "Checking your linux kernel configuration:"
-			collectd_linux_kernel_checks
-		else
-			elog "Cannot find a linux kernel configuration. Continuing anyway."
-		fi
-	fi
-
-	if use collectd_plugins_java; then
-		java-pkg-opt-2_pkg_setup
-	fi
-
-	use collectd_plugins_python && python-single-r1_pkg_setup
-
-	enewgroup collectd
-	enewuser collectd -1 -1 /var/lib/collectd collectd
-}
-
-src_prepare() {
-	default
-
-	# There's some strange prefix handling in the default config file, resulting in
-	# paths like "/usr/var/..."
-	sed -i -e "s:@prefix@/var:/var:g" src/collectd.conf.in || die
-
-	# fix installdirs for perl, bug 444360
-	sed -i -e 's/INSTALL_BASE=$(DESTDIR)$(prefix) //' bindings/Makefile.am || die
-
-	# Adjust upstream's systemd unit
-	#   - Get rid of EnvironmentFile directive; These files don't exist on Gentoo!
-	#   - Add User=collectd to run collectd as user "collectd" per default
-	sed -i \
-		-e '/^EnvironmentFile=.*/d' \
-		-e '/^\[Service\]/aUser=collectd' \
-		contrib/systemd.${PN}.service || die
-
-	if use collectd_plugins_java; then
-		# Set javac -source and -target flags according to (R)DEPEND.
-		sed -i -e "s/\$(JAVAC)/\0 $(java-pkg_javac-args)/g" bindings/java/Makefile.am || die
-	fi
-
-	ebegin "Removing bundled libltdl"
-	rm -rf libltdl || die
-	eend 0
-
-	eautoreconf
-}
-
-src_configure() {
-	# Now come the lists of os-dependent plugins. Any plugin that is not listed anywhere here
-	# should work independent of the operating system.
-
-	local linux_plugins="barometer battery cpu cpufreq disk
-		drbd entropy ethstat hugepages interface iptables
-		ipvs irq ipc load memory md netlink nfs numa processes
-		serial swap tcpconns thermal turbostat users vmem wireless
-		zfc_arc"
-
-	local need_libstatgrab=0
-	local libstatgrab_plugins="cpu disk interface load memory swap users"
-	local bsd_plugins="cpu tcpconns ${libstatgrab_plugins} zfc_arc"
-
-	local darwin_plugins="apple_sensors battery cpu disk interface memory processes tcpconns"
-
-	local osdependent_plugins="${linux_plugins} ${bsd_plugins} ${darwin_plugins}"
-	local myos_plugins=""
-	if use kernel_linux; then
-		einfo "Enabling Linux plugins."
-		myos_plugins=${linux_plugins}
-	elif use kernel_FreeBSD; then
-		einfo "Enabling FreeBSD plugins."
-		myos_plugins=${bsd_plugins}
-	elif use kernel_Darwin; then
-		einfo "Enabling Darwin plugins."
-		myos_plugins=${darwin_plugins}
-	fi
-
-	local myconf="--disable-werror"
-
-	# Do we debug?
-	myconf+=" $(use_enable debug)"
-
-	# udev support?
-	# Required for smart plugin via REQUIRED_USE; Optional for disk plugin
-	if use udev; then
-		myconf+=" --with-libudev"
-	else
-		myconf+=" --without-libudev"
-	fi
-
-	local plugin
-
-	# Disable what needs to be disabled.
-	for plugin in ${COLLECTD_DISABLED_PLUGINS}; do
-		myconf+=" --disable-${plugin}"
-	done
-
-	# Set enable/disable for each single plugin.
-	for plugin in ${COLLECTD_ALL_PLUGINS}; do
-		if has ${plugin} ${osdependent_plugins}; then
-			# plugin is os-dependent ...
-			if has ${plugin} ${myos_plugins}; then
-				# ... and available in this os
-				myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
-				# ... must we link against libstatgrab? Bug #541518
-				if use kernel_FreeBSD && has ${plugin} ${libstatgrab_plugins}; then
-					einfo "We must link against libstatgrab due to plugin \"${plugin}\" ..."
-					need_libstatgrab=1
-				fi
-			else
-				# ... and NOT available in this os
-				if use collectd_plugins_${plugin}; then
-					ewarn "You try to enable the ${plugin} plugin, but it is not available for this"
-					ewarn "kernel. Disabling it automatically."
-				fi
-				myconf+=" --disable-${plugin}"
-			fi
-		elif [[ "${plugin}" = "collectd_plugins_perl" ]]; then
-			if use collectd_plugins_perl && ! use perl; then
-				ewarn "Perl plugin disabled as perl bindings disabled by -perl use flag"
-				myconf+= --disable-perl
-			else
-				myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
-			fi
-		else
-			myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
-		fi
-	done
-
-	if [ "${need_libstatgrab}" -eq 1 ]; then
-		myconf+=" --with-libstatgrab"
-	else
-		myconf+=" --without-libstatgrab"
-	fi
-
-	# JAVA_HOME is set by eclasses.
-	if use collectd_plugins_java; then
-		myconf+=" --with-java"
-	fi
-
-	# Need libiptc ONLY for iptables. If we try to use it otherwise bug 340109 happens.
-	# lots of libs are only needed for plugins, if they are disabled, also disable the lib
-	use collectd_plugins_iptables || myconf+=" --with-libiptc=no"
-	use collectd_plugins_openldap || myconf+=" --with-libldap=no"
-	use collectd_plugins_redis    || use collectd_plugins_write_redis || myconf+=" --with-libhiredis=no"
-	use collectd_plugins_smart    || myconf+=" --with-libatasmart=no"
-	use collectd_plugins_gps      || myconf+=" --with-libgps=no"
-
-	if use perl; then
-		myconf+=" --with-perl-bindings=INSTALLDIRS=vendor"
-	else
-		myconf+=" --without-perl-bindings"
-	fi
-
-	# No need for v5upgrade
-	myconf+=" --disable-target_v5upgrade"
-
-	# Python
-	if use collectd_plugins_python; then
-		myconf+=" --with-libpython=yes"
-		export PYTHON_CONFIG=$(python_get_PYTHON_CONFIG)
-	else
-		myconf+=" --with-libpython=no"
-	fi
-
-	# XFS support
-	myconf+=" $(use_enable xfs)"
-
-	# Finally, run econf.
-	KERNEL_DIR="${KERNEL_DIR}" econf --config-cache \
-		$(use_enable static-libs static) \
-		--localstatedir=/var ${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D%/}" install
-
-	perl_delete_localpod
-
-	find "${ED}"usr/ -name "*.la" -delete || die
-
-	if use collectd_plugins_java; then
-		java-pkg_regjar "${ED}"usr/share/${PN}/java/*.jar
-	fi
-
-	fowners root:collectd /etc/collectd.conf
-	fperms u=rw,g=r,o= /etc/collectd.conf
-
-	dodoc AUTHORS ChangeLog README
-
-	if use contrib ; then
-		insinto /usr/share/doc/${PF}
-		doins -r contrib
-	fi
-
-	keepdir /var/lib/${PN}
-	fowners collectd:collectd /var/lib/${PN}
-
-	newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r2" ${PN}
-	systemd_newunit "contrib/systemd.${PN}.service" ${PN}.service
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
-
-	sed -i -e 's:^.*PIDFile     "/var/run/collectd.pid":#PIDFile     "/run/collectd.pid":' "${ED}"etc/collectd.conf || die
-	sed -i -e 's:^#	SocketFile "/var/run/collectd-unixsock":#	SocketFile "/run/collectd/collectd.socket":' "${ED}"etc/collectd.conf || die
-	sed -i -e 's:^.*LoadPlugin perl$:# The new, correct way to load the perl plugin -- \n# <LoadPlugin perl>\n#   Globals true\n# </LoadPlugin>:' "${ED}"etc/collectd.conf || die
-	sed -i -e 's:^.*LoadPlugin python$:# The new, correct way to load the python plugin -- \n# <LoadPlugin python>\n#   Globals true\n# </LoadPlugin>:' "${ED}"etc/collectd.conf || die
-}
-
-pkg_postinst() {
-	tmpfiles_process "${PN}.conf"
-
-	if use filecaps; then
-		local caps=()
-		use collectd_plugins_ceph      && caps+=('CAP_DAC_OVERRIDE')
-		use collectd_plugins_exec      && caps+=('CAP_SETUID' 'CAP_SETGID')
-		use collectd_plugins_iptables  && caps+=('CAP_NET_ADMIN')
-		use collectd_plugins_filecount && caps+=('CAP_DAC_READ_SEARCH')
-
-		if use collectd_plugins_dns || use collectd_plugins_ping; then
-			caps+=('CAP_NET_RAW')
-		fi
-
-		if use collectd_plugins_turbostat || use collectd_plugins_smart; then
-			caps+=('CAP_SYS_RAWIO')
-		fi
-
-		if [ ${#caps[@]} -gt 0 ]; then
-			local caps_str=$(IFS=","; echo "${caps[*]}")
-			fcaps ${caps_str} usr/sbin/collectd
-			elog "Capabilities for ${EROOT}usr/sbin/collectd set to:"
-			elog "  ${caps_str}+EP"
-			elog
-
-			local systemd_unit="$(systemd_get_systemunitdir)/collectd.service"
-			if [[ -e "${systemd_unit}" ]]; then
-				caps_str="${caps[*]}"
-				sed -i -e "s:^CapabilityBoundingSet=.*:CapabilityBoundingSet=${caps_str}:" "${systemd_unit}" || \
-					die "Failed to set CapabilityBoundingSet in '${systemd_unit}'"
-
-				elog "CapabilityBoundingSet in '${systemd_unit}'"
-				elog "updated to match capabilities set above."
-				elog
-			else
-				if has_version "sys-apps/systemd"; then
-					# Bug 596852
-					ewarn "Failed to update CapabilityBoundingSet in '${systemd_unit}'"
-					ewarn "because unit was not found. Please file a bug about this."
-				fi
-			fi
-		fi
-	fi
-
-	elog "Note: Collectd is only the collector."
-	elog "      You need to install 'data' sources (applications) locally or"
-	elog "      remotely on your own."
-
-	elog
-	elog "Collectd is configured to run as unprivileged user by default."
-	elog "You may want to revisit the configuration."
-	elog
-
-	if use collectd_plugins_email; then
-		ewarn "The email plug-in is deprecated. To submit statistics please use the unixsock plugin."
-	fi
-
-	if use collectd_plugins_smart; then
-		elog ""
-		elog "If you are using smart plugin and don't run collectd as root make sure"
-		elog "that the collectd user is allowed to access the disk you want to monitor"
-		elog "(can be done via udev rule for example) and that collectd has the required"
-		elog "capabilities set (which is the default when package was emerged with"
-		elog "'filecaps' USE flag set)."
-	fi
-
-	if use contrib; then
-		elog "The scripts in /usr/share/doc/${PF}/collection3 for generating graphs need dev-perl/HTML-Parser,"
-		elog "dev-perl/config-general, dev-perl/regexp-common, and net-analyzer/rrdtool[perl] to be installed."
-	fi
-}
--- a/app-metrics/collectd/collectd-5.8.0-r1.ebuild
+++ b/app-metrics/collectd/collectd-5.8.0-r1.ebuild
@ -3,7 +3,7 @@

 EAPI="6"

-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 JAVA_PKG_OPT_USE="collectd_plugins_java"

 inherit autotools fcaps flag-o-matic java-pkg-opt-2 linux-info multilib perl-functions python-single-r1 systemd tmpfiles user
@ -159,6 +159,8 @@ REQUIRED_USE="
 	collectd_plugins_python?		( ${PYTHON_REQUIRED_USE} )
 	collectd_plugins_smart?			( udev )"

+PATCHES=( "${FILESDIR}"/${P}-disk-plugin-udev-fix.patch )
+
 # @FUNCTION: collectd_plugin_kernel_linux
 # @DESCRIPTION:
 # USAGE: <plugin name> <kernel_options> <severity>
--- a/app-metrics/collectd/files/collectd-5.6.0-gentoo.patch
+++ b/app-metrics/collectd/files/collectd-5.6.0-gentoo.patch
@ -1,153 +0,0 @@
-From 8fe20883e248572690798e4dd1423511aa2f4e5d Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@gentoo.org>
-Date: Thu, 22 Sep 2016 00:53:58 +0200
-Subject: [PATCH 1/3] Remove bundled libltdl
-
---
- Makefile.am  | 6 ------
- configure.ac | 8 ++++----
- 2 files changed, 4 insertions(+), 10 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 03bdd39..ad04a3c 100644
--- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,11 +1,5 @@
-ACLOCAL_AMFLAGS = -I libltdl/m4
-
- SUBDIRS =
- 
-if BUILD_INCLUDED_LTDL
-SUBDIRS += libltdl
-endif
-
- SUBDIRS += proto src bindings .
- 
- AM_CPPFLAGS = $(LTDLINCL)
-diff --git a/configure.ac b/configure.ac
-index 9a6da11..68e15e0 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -3,7 +3,6 @@ AC_PREREQ([2.60])
- AC_INIT([collectd],[m4_esyscmd(./version-gen.sh)])
- AC_CONFIG_SRCDIR(src/target_set.c)
- AC_CONFIG_HEADERS(src/config.h)
-AC_CONFIG_AUX_DIR([libltdl/config])
- 
- dnl older automake's default of ARFLAGS=cru is noisy on newer binutils;
- dnl we don't really need the 'u' even in older toolchains.  Then there is
-@@ -13,7 +12,6 @@ m4_divert_text([DEFAULTS], [: "${ARFLAGS=cr} ${AR_FLAGS=cr}"])
- m4_ifdef([LT_PACKAGE_VERSION],
- 	# libtool >= 2.2
- 	[
-	 LT_CONFIG_LTDL_DIR([libltdl])
- 	 LT_INIT([dlopen])
- 	 LTDL_INIT([convenience])
- 	 AC_DEFINE(LIBTOOL_VERSION, 2, [Define to used libtool version.])
-@@ -25,12 +23,14 @@ m4_ifdef([LT_PACKAGE_VERSION],
- 	 AC_SUBST(LTDLINCL)
- 	 AC_SUBST(LIBLTDL)
- 	 AC_LIBTOOL_DLOPEN
-	 AC_CONFIG_SUBDIRS(libltdl)
- 	 AC_DEFINE(LIBTOOL_VERSION, 1, [Define to used libtool version.])
- 	]
- )
- 
-AM_CONDITIONAL([BUILD_INCLUDED_LTDL], [test "x$LTDLDEPS" != "x"])
-+if test "x$LTDLDEPS" != "x"
-+then
-+	AC_MSG_ERROR(["system's libltdl is too old! Should never happen. Please file a bug at https://bugs.gentoo.org"])
-+fi
- 
- AM_INIT_AUTOMAKE([subdir-objects tar-pax dist-bzip2 no-dist-gzip foreign])
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-- 
-2.10.0
-
-
-From 0b00f519ce183b8ceaab5cf8e56f574ecd2cb7c4 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@gentoo.org>
-Date: Thu, 22 Sep 2016 00:54:08 +0200
-Subject: [PATCH 2/3] Remove libhal dependency
-
-X-Gentoo-Bug: 353839
-X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=353839
---
- configure.ac | 24 ------------------------
- 1 file changed, 24 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 68e15e0..1700c44 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -1663,30 +1663,6 @@ AM_CONDITIONAL(BUILD_WITH_LIBRESOLV, test "x$with_libresolv" = "xyes")
- 
- dnl Check for HAL (hardware abstraction library)
- with_libhal="no"
-PKG_CHECK_MODULES([HAL], [hal],
-  [
-    SAVE_LIBS="$LIBS"
-    LIBS="$HAL_LIBS $LIBS"
-    AC_CHECK_LIB([hal], [libhal_device_property_exists],
-      [
-        SAVE_CPPFLAGS="$CPPFLAGS"
-        CPPFLAGS="$HAL_CFLAGS $CPPFLAGS"
-        AC_CHECK_HEADERS([libhal.h],
-        [
-          with_libhal="yes"
-          BUILD_WITH_LIBHAL_CFLAGS="$HAL_CFLAGS"
-          BUILD_WITH_LIBHAL_LIBS="$HAL_LIBS"
-        ])
-        CPPFLAGS="$SAVE_CPPFLAGS"
-      ],
-      [ : ]
-    )
-    LIBS="$SAVE_LIBS"
-  ],
-  [ : ]
-)
-AC_SUBST(BUILD_WITH_LIBHAL_CFLAGS)
-AC_SUBST(BUILD_WITH_LIBHAL_LIBS)
- 
- 
- SAVE_LIBS="$LIBS"
-- 
-2.10.0
-
-
-From 380c61888bed5856319fa32816d8f2f4c88ee7bc Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@gentoo.org>
-Date: Thu, 22 Sep 2016 00:54:19 +0200
-Subject: [PATCH 3/3] Link Oracle plug-in against libocci
-
-Author: Aurelien Minet
-X-Gentoo-Bug: 347607
-X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=347607
---
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1700c44..83909a0 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -3587,14 +3587,14 @@ AC_ARG_WITH(oracle, [AS_HELP_STRING([--with-oracle@<:@=ORACLE_HOME@:>@], [Path t
- ])
- if test "x$ORACLE_HOME" != "x"
- then
-	with_oracle_cppflags="-I$ORACLE_HOME/rdbms/public"
-+	with_oracle_cppflags="-I$ORACLE_HOME/rdbms/public -locci"
- 
- 	if test -e "$ORACLE_HOME/lib/ldflags"
- 	then
- 		with_oracle_libs=`cat "$ORACLE_HOME/lib/ldflags"`
- 	fi
- 	#with_oracle_libs="-L$ORACLE_HOME/lib $with_oracle_libs -lclntsh"
-	with_oracle_libs="-L$ORACLE_HOME/lib -lclntsh"
-+	with_oracle_libs="-L$ORACLE_HOME/lib -lclntsh -locci"
- fi
- if test "x$with_oracle" = "xyes"
- then
-- 
-2.10.0
-
--- a/app-metrics/collectd/files/collectd-5.7.2-CVE-2017-16820.patch
+++ b/app-metrics/collectd/files/collectd-5.7.2-CVE-2017-16820.patch
@ -1,39 +0,0 @@
-CVE-2017-16820: Fix double free of request PDU
-
-https://github.com/collectd/collectd/commit/d16c24542b2f96a194d43a73c2e5778822b9cb47
-
--- a/src/snmp.c
-+++ b/src/snmp.c
-@@ -1357,11 +1357,13 @@ static int csnmp_read_table(host_definition_t *host, data_definition_t *data) {
-     if (oid_list_todo_num == 0) {
-       /* The request is still empty - so we are finished */
-       DEBUG("snmp plugin: all variables have left their subtree");
-+      snmp_free_pdu(req);
-       status = 0;
-       break;
-     }
- 
-     res = NULL;
-+    /* snmp_sess_synch_response always frees our req PDU */
-     status = snmp_sess_synch_response(host->sess_handle, req, &res);
-     if ((status != STAT_SUCCESS) || (res == NULL)) {
-       char *errstr = NULL;
-@@ -1376,8 +1378,6 @@ static int csnmp_read_table(host_definition_t *host, data_definition_t *data) {
-         snmp_free_pdu(res);
-       res = NULL;
- 
-      /* snmp_synch_response already freed our PDU */
-      req = NULL;
-       sfree(errstr);
-       csnmp_host_close_session(host);
- 
-@@ -1492,9 +1492,6 @@ static int csnmp_read_table(host_definition_t *host, data_definition_t *data) {
-     snmp_free_pdu(res);
-   res = NULL;
- 
-  if (req != NULL)
-    snmp_free_pdu(req);
-  req = NULL;
- 
-   if (status == 0)
-     csnmp_dispatch_table(host, data, instance_list_head, value_list_head);
--- a/app-metrics/collectd/files/collectd-5.7.2-issue-2443.patch
+++ b/app-metrics/collectd/files/collectd-5.7.2-issue-2443.patch
@ -1,160 +0,0 @@
-turbostat: import msr-index header from linux to allow building against
-    >=linux-4.12
-
-Backport of https://github.com/collectd/collectd/pull/2446
-
--- a/configure.ac
-+++ b/configure.ac
-@@ -805,28 +805,6 @@ AC_CACHE_CHECK([whether clock_boottime and clock_monotonic are supported],
- 
- 
- # For the turbostat plugin
-have_asm_msrindex_h="no"
-AC_CHECK_HEADERS(asm/msr-index.h, [have_asm_msrindex_h="yes"])
-
-if test "x$have_asm_msrindex_h" = "xyes"
-then
-  AC_CACHE_CHECK([whether asm/msr-index.h has MSR_PKG_C10_RESIDENCY],
-                 [c_cv_have_usable_asm_msrindex_h],
-                 AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-[[[
-#include<asm/msr-index.h>
-]]],
-[[[
-int y = MSR_PKG_C10_RESIDENCY;
-return(y);
-]]]
-  )],
-                 [c_cv_have_usable_asm_msrindex_h="yes"],
-                 [c_cv_have_usable_asm_msrindex_h="no"],
-                                  )
-                 )
-fi
-
- have_cpuid_h="no"
- AC_CHECK_HEADERS(cpuid.h, [have_cpuid_h="yes"])
- 
-@@ -6108,7 +6086,7 @@ then
- 	then
- 		plugin_ipvs="yes"
- 	fi
-	if test "x$c_cv_have_usable_asm_msrindex_h" = "xyes" && test "x$have_cpuid_h" = "xyes"
-+	if test "x$have_cpuid_h" = "xyes"
- 	then
- 		plugin_turbostat="yes"
- 	fi
--- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1212,7 +1212,9 @@ endif
- 
- if BUILD_PLUGIN_TURBOSTAT
- pkglib_LTLIBRARIES += turbostat.la
-turbostat_la_SOURCES = turbostat.c
-+turbostat_la_SOURCES = \
-+	turbostat.c \
-+	msr-index.h
- turbostat_la_LDFLAGS = $(PLUGIN_LDFLAGS)
- endif
- 
--- /dev/null
-+++ b/src/msr-index.h
-@@ -0,0 +1,88 @@
-+/*
-+ * Partial header file imported from the linux kernel
-+ * (arch/x86/include/asm/msr-index.h)
-+ * as it is not provided by the kernel sources anymore
-+ *
-+ * Only the minimal blocks of macro have been included
-+ * ----
-+ * This program is free software; you can redistribute it and/or modify it
-+ * under the terms and conditions of the GNU General Public License,
-+ * version 2, as published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-+ * more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along with
-+ * this program; if not, write to the Free Software Foundation, Inc.,
-+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-+ * ----
-+ */
-+
-+#ifndef _ASM_X86_MSR_INDEX_H
-+#define _ASM_X86_MSR_INDEX_H
-+
-+/*
-+ * CPU model specific register (MSR) numbers.
-+ *
-+ * Do not add new entries to this file unless the definitions are shared
-+ * between multiple compilation units.
-+ */
-+
-+/* Intel MSRs. Some also available on other CPUs */
-+
-+/* C-state Residency Counters */
-+#define MSR_PKG_C3_RESIDENCY		0x000003f8
-+#define MSR_PKG_C6_RESIDENCY		0x000003f9
-+#define MSR_ATOM_PKG_C6_RESIDENCY	0x000003fa
-+#define MSR_PKG_C7_RESIDENCY		0x000003fa
-+#define MSR_CORE_C3_RESIDENCY		0x000003fc
-+#define MSR_CORE_C6_RESIDENCY		0x000003fd
-+#define MSR_CORE_C7_RESIDENCY		0x000003fe
-+#define MSR_KNL_CORE_C6_RESIDENCY	0x000003ff
-+#define MSR_PKG_C2_RESIDENCY		0x0000060d
-+#define MSR_PKG_C8_RESIDENCY		0x00000630
-+#define MSR_PKG_C9_RESIDENCY		0x00000631
-+#define MSR_PKG_C10_RESIDENCY		0x00000632
-+
-+/* Run Time Average Power Limiting (RAPL) Interface */
-+
-+#define MSR_RAPL_POWER_UNIT		0x00000606
-+
-+#define MSR_PKG_POWER_LIMIT		0x00000610
-+#define MSR_PKG_ENERGY_STATUS		0x00000611
-+#define MSR_PKG_PERF_STATUS		0x00000613
-+#define MSR_PKG_POWER_INFO		0x00000614
-+
-+#define MSR_DRAM_POWER_LIMIT		0x00000618
-+#define MSR_DRAM_ENERGY_STATUS		0x00000619
-+#define MSR_DRAM_PERF_STATUS		0x0000061b
-+#define MSR_DRAM_POWER_INFO		0x0000061c
-+
-+#define MSR_PP0_POWER_LIMIT		0x00000638
-+#define MSR_PP0_ENERGY_STATUS		0x00000639
-+#define MSR_PP0_POLICY			0x0000063a
-+#define MSR_PP0_PERF_STATUS		0x0000063b
-+
-+#define MSR_PP1_POWER_LIMIT		0x00000640
-+#define MSR_PP1_ENERGY_STATUS		0x00000641
-+#define MSR_PP1_POLICY			0x00000642
-+
-+
-+
-+/* Intel defined MSRs. */
-+#define MSR_IA32_TSC			0x00000010
-+#define MSR_SMI_COUNT			0x00000034
-+
-+#define MSR_IA32_MPERF			0x000000e7
-+#define MSR_IA32_APERF			0x000000e8
-+
-+#define MSR_IA32_THERM_STATUS		0x0000019c
-+
-+#define MSR_IA32_TEMPERATURE_TARGET	0x000001a2
-+
-+#define MSR_IA32_PACKAGE_THERM_STATUS		0x000001b1
-+
-+
-+#endif /* _ASM_X86_MSR_INDEX_H */
--- a/src/turbostat.c
-+++ b/src/turbostat.c
-@@ -41,7 +41,7 @@
- #include "plugin.h"
- #include "utils_time.h"
- 
-#include <asm/msr-index.h>
-+#include "msr-index.h"
- #include <cpuid.h>
- #ifdef HAVE_SYS_CAPABILITY_H
- #include <sys/capability.h>
--- a/app-metrics/collectd/files/collectd-5.7.2-varnish-5.2+.patch
+++ b/app-metrics/collectd/files/collectd-5.7.2-varnish-5.2+.patch
--- a/app-metrics/collectd/files/collectd-5.8.0-disk-plugin-udev-fix.patch
+++ b/app-metrics/collectd/files/collectd-5.8.0-disk-plugin-udev-fix.patch
@ -0,0 +1,98 @@
+From ed696c1b3adcb42d55759efe6f8034337f0fd243 Mon Sep 17 00:00:00 2001
+From: Dylan Stephano-Shachter <dylan@wopr.nasuni.net>
+Date: Thu, 15 Feb 2018 16:37:33 -0500
+Subject: [PATCH] change HAVE_UDEV_H to HAVE_LIBUDEV_H for bug 2651
+
+---
+ src/disk.c | 20 ++++++++++----------
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/src/disk.c b/src/disk.c
+index 004ce9e2d7..04f337415f 100644
+--- a/src/disk.c
+++ b/src/disk.c
+@@ -139,7 +139,7 @@ static int pnumdisk;
+ #error "No applicable input method."
+ #endif
+ 
+-#if HAVE_UDEV_H
+#if HAVE_LIBUDEV_H
+ #include <libudev.h>
+ 
+ static char *conf_udev_name_attr = NULL;
+@@ -173,7 +173,7 @@ static int disk_config(const char *key, const char *value) {
+             "on Mach / Mac OS X and will be ignored.");
+ #endif
+   } else if (strcasecmp("UdevNameAttr", key) == 0) {
+-#if HAVE_UDEV_H
+#if HAVE_LIBUDEV_H
+     if (conf_udev_name_attr != NULL) {
+       free(conf_udev_name_attr);
+       conf_udev_name_attr = NULL;
+@@ -209,7 +209,7 @@ static int disk_init(void) {
+ /* #endif HAVE_IOKIT_IOKITLIB_H */
+ 
+ #elif KERNEL_LINUX
+-#if HAVE_UDEV_H
+#if HAVE_LIBUDEV_H
+   if (conf_udev_name_attr != NULL) {
+     handle_udev = udev_new();
+     if (handle_udev == NULL) {
+@@ -217,7 +217,7 @@ static int disk_init(void) {
+       return -1;
+     }
+   }
+-#endif /* HAVE_UDEV_H */
+#endif /* HAVE_LIBUDEV_H */
+ /* #endif KERNEL_LINUX */
+ 
+ #elif KERNEL_FREEBSD
+@@ -260,10 +260,10 @@ static int disk_init(void) {
+ 
+ static int disk_shutdown(void) {
+ #if KERNEL_LINUX
+-#if HAVE_UDEV_H
+#if HAVE_LIBUDEV_H
+   if (handle_udev != NULL)
+     udev_unref(handle_udev);
+-#endif /* HAVE_UDEV_H */
+#endif /* HAVE_LIBUDEV_H */
+ #endif /* KERNEL_LINUX */
+   return 0;
+ } /* int disk_shutdown */
+@@ -325,7 +325,7 @@ static counter_t disk_calc_time_incr(counter_t delta_time,
+ }
+ #endif
+ 
+-#if HAVE_UDEV_H
+#if HAVE_LIBUDEV_H
+ /**
+  * Attempt to provide an rename disk instance from an assigned udev attribute.
+  *
+@@ -841,7 +841,7 @@ static int disk_read(void) {
+ 
+     output_name = disk_name;
+ 
+-#if HAVE_UDEV_H
+#if HAVE_LIBUDEV_H
+     char *alt_name = NULL;
+     if (conf_udev_name_attr != NULL) {
+       alt_name =
+@@ -852,7 +852,7 @@ static int disk_read(void) {
+ #endif
+ 
+     if (ignorelist_match(ignorelist, output_name) != 0) {
+-#if HAVE_UDEV_H
+#if HAVE_LIBUDEV_H
+       /* release udev-based alternate name, if allocated */
+       sfree(alt_name);
+ #endif
+@@ -878,7 +878,7 @@ static int disk_read(void) {
+         submit_io_time(output_name, io_time, weighted_time);
+     } /* if (is_disk) */
+ 
+-#if HAVE_UDEV_H
+#if HAVE_LIBUDEV_H
+     /* release udev-based alternate name, if allocated */
+     sfree(alt_name);
+ #endif
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/bijiben/Manifest
+++ b/app-misc/bijiben/Manifest
@ -1,3 +1,5 @@
 DIST bijiben-3.24.2.tar.xz 843548 BLAKE2B 2441e3e9f672c7a9796dd1786bedf29ae1b5a6c4563b07943c4bfc252dc2ad9be0e8ab0569cbceb2b2c839a93d45ef3cd671d68d9b6717f880ffbb3f80d3392f SHA512 e5571c793fc75b1038a024f0f73b539079ca4415c7f4fd0756314a14baa1fe679d9513bf8c291aa20170f35616be409ebd0360e3d3ec8f962f2d3d143e02185e
+DIST bijiben-3.26.1.tar.xz 864676 BLAKE2B 8c15939d356af70ed30c8bf7dcb9cb8d81ac6f1ad5969b0b6e9fefd08efd267c65454f582e368d5183425d3cfba9fe6d2d227d1825f1c7be52fbdc5ff53ef0ff SHA512 a057fcd0400eecff90bd8feb67c775ca036d0f40e92b44cc1f35fe418288ad9aec5cfb080c8c47ba862bfbecfd94ec69a0bbd811e0364d2e273901b7d4a8b2f9
 EBUILD bijiben-3.24.2.ebuild 746 BLAKE2B 7412677816ed6c312d161368aaad02a409b0305ae7bb18146f490cb76026bbfd09c65a77e8fa7725afa85e938ac7289856e608905df8bf4d5e21f68233a6fc34 SHA512 d46b0891c5fa2c9268f8f667be70bb9a95b7fa7df75b090837d7cf1f156df09977ba1879b139f1a913324da3bac70f84328c5d8a21c415e5c16323ddc5f4142d
+EBUILD bijiben-3.26.1.ebuild 695 BLAKE2B 04654cb51f822a9bae0542fbe5c868557e11765ab7a551a81731a52d208238f70c740353b0343beb86f51e46cfbde6fbf1f0f835d863f74310c15292ec4e435b SHA512 4aad745279633e09caa3fe35c16940b98d3053c1a741b4197d31b52717dd0d170fc484085e857131944c41f2f2aa3a6e68d45bf3840c47f084c666da62cd5ee5
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
--- a/app-misc/bijiben/bijiben-3.26.1.ebuild
+++ b/app-misc/bijiben/bijiben-3.26.1.ebuild
@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="Note editor designed to remain simple to use"
+HOMEPAGE="https://wiki.gnome.org/Apps/Bijiben"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.53.4:2
+	>=x11-libs/gtk+-3.11.4:3
+	>=gnome-extra/evolution-data-server-3.13.90:=
+	>=net-libs/webkit-gtk-2.10.0:4
+	net-libs/gnome-online-accounts:=
+	dev-libs/libxml2:2
+	>=app-misc/tracker-1:=
+	sys-apps/util-linux
+"
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	dev-util/gdbus-codegen
+	>=dev-util/intltool-0.50.1
+	sys-devel/gettext
+	virtual/pkgconfig
+"
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
--- a/app-portage/gemato/Manifest
+++ b/app-portage/gemato/Manifest
@ -1,11 +1,7 @@
-DIST gemato-12.2.tar.gz 66897 BLAKE2B 85ca439620afdb2045e571ed7a11f3eb8ce85e41c0984ad51af3b9d22c0926138eda0c7b02e1d70e200eb8c93cf4003e61f901e0fd5fd28861217b02a1e3ab64 SHA512 10ba7da5de3b90722b0bdcf9d3766a7c83c68d29d23e49744a31b0c8ad80eaa4917dff2fbd9f12ef2fa4fde03244e79f6fe5e9c108db7fb64fd6ea68fa0eb81c
 DIST gemato-13.0.tar.gz 66899 BLAKE2B e75a16d6a26f010801df072154897a485e9aee6434cf60962d59d11fda70b790284a734d9137ccc7910b0a95278d922640aece45e42ca497d1118e01992c2a15 SHA512 0ca17f1df8606e09a88411d75d144094bd13e440b04721175c8d9a3ea92fc616b34de0c80c817898ee94a1d82e37e4de50319634a351a52bccaec9653ad2f166
-DIST gemato-13.1.tar.gz 66699 BLAKE2B f779efc2ad00c2bb6ad7eb2bbab8f6fbc8b8bc026b593bfc830844ba50a6d5ff260ca0b73190b1739268b2181461fbd4c4c45adf244b23b8ade7803d90c6773f SHA512 2cda08cee937cfdf4ff46d60b44d49e4de7af5c57bfc12ba5394e967fcdae6e4cb9ceaf131b379a2c90e92b14d8b1ec375362415fc81e16efcb3279a0ff1e46a
 DIST gemato-14.0-multiprocessing.tar.gz 71359 BLAKE2B b8c6fbcf8a83c8e85db4045ad23296944b94623d132a6c5f15b8388662fd092cb589600fda1d11c9645541106dc735dceaeed87d642b1fadf0f352f4a9b3f108 SHA512 2f1a1cbd837ab316bf544f713470f570286a313e002a4dcc075e464e77a3b10ba86410f805aad3d5702f3deedda48f8270f1274a67d76086b4ad5cd597426c5e
 DIST gemato-14.0.tar.gz 70754 BLAKE2B e66d63a20e144e809555b2eeff6a24f899e1f488c95a14b2250c6eb45c39a6e6b0e614afe30a64f5a353720ab38371ba3e4bf9948052dae3e06f9f82ac3d04a2 SHA512 0494b8fab720b4e5ad2b190fab128baf997073137b933bc113dddc8c5f2c54f53d09bc640b01565e9757b41197d039c8487cb2b78de77313722d19baf008b51f
-EBUILD gemato-12.2.ebuild 1209 BLAKE2B bdf78ce5cddb0d78e20048fbbef5eb9011900e00b7b9d91e21eb86d0b81fb315f7fbc4831b17759dacfc5e168957a6d6d07b49a5e50a77160dee02063544bd36 SHA512 321077315648ca61ef1ff4083c8ea0d651cf919e1008a2a0f74f94d9032e255b513b2e0bb68577c2fa0f5c5dad441a9cc67853538d99823412576c59afbad5c8
 EBUILD gemato-13.0-r1.ebuild 1348 BLAKE2B 51a605d710a59a6d4ae044aa2cb9921dacdccc89d3be16f43b9f2d52569990d7f43f71ec5c88950d368ab10c1afc318dc4ed14531909ef740c018cce7fd1740c SHA512 617a34511750626d0323ec1924e73508465d5d8da42db882f6135fb62101f6fb5c83eae4f163a33caa1c755f08a3c8e3a0716dba385596adafd1daa8cbe38577
-EBUILD gemato-13.1.ebuild 1363 BLAKE2B 3317fc9836c948377a652130f6628151240a0db9df937bbc478f72763c31d4d3c8cf006e76e6ef91c764cf1463557749f997f5bcba4e9b48561988a9d9d73fef SHA512 33ad8a3917f90ba214132ba5ab35c56dac6a17b53d442ad2646de9cfb2458d437d4c154fd9f066613fb25eb5a94b2ff6ab1bda272b37cbad2b4952e7bfbadc4e
 EBUILD gemato-14.0.ebuild 1363 BLAKE2B 3317fc9836c948377a652130f6628151240a0db9df937bbc478f72763c31d4d3c8cf006e76e6ef91c764cf1463557749f997f5bcba4e9b48561988a9d9d73fef SHA512 33ad8a3917f90ba214132ba5ab35c56dac6a17b53d442ad2646de9cfb2458d437d4c154fd9f066613fb25eb5a94b2ff6ab1bda272b37cbad2b4952e7bfbadc4e
 EBUILD gemato-14.0m.ebuild 1640 BLAKE2B e2e71f13997755fe1f4588cbcc551d851f09249009a9cc67b418cc96931c552b734d2cddfe2390c664c1555ed978067ab24945a83c47a628f81a46e9efb8ac61 SHA512 191730041d653dcfe0ded09b3380c6d5441eb2ccc3e3854e78461cb8f2271db20560a00e1b91a791131188ce508a57fc8477b068643a3e15f6fe1bcf9aa34502
 EBUILD gemato-9999.ebuild 1286 BLAKE2B 402b7ce64483e1225768e61a1d69ac59641158d42932ed86e08655c4d473664adc7e3ffbd7dc6e9349be54e8563d004deea07a0b1ad0b32b79573ae7770e86c7 SHA512 18b749bd0745a502dce6f0fd802800a36d13fe2c75d150975924eeb8da37e48aa05ef94008c2e4ca129e536c3ddcbb03030e456a6654807ab5732bf038b51dcc
--- a/app-portage/gemato/gemato-12.2.ebuild
+++ b/app-portage/gemato/gemato-12.2.ebuild
@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# pyblake2 & pysha3 are broken with pypy3
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
-PYTHON_REQ_USE='threads(+)'
-inherit distutils-r1
-
-DESCRIPTION="Stand-alone Manifest generation & verification tool"
-HOMEPAGE="https://github.com/mgorny/gemato"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin ~amd64-fbsd"
-IUSE="+blake2 bzip2 +gpg lzma sha3 test"
-
-MODULE_RDEPEND="
-	blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )
-	bzip2? ( $(python_gen_cond_dep 'dev-python/bz2file[${PYTHON_USEDEP}]' python2_7 pypy) )
-	gpg? ( app-crypt/gnupg )
-	lzma? ( $(python_gen_cond_dep 'dev-python/backports-lzma[${PYTHON_USEDEP}]' python2_7 pypy) )
-	sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )"
-
-RDEPEND="${MODULE_RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND=">=dev-python/setuptools-34[${PYTHON_USEDEP}]
-	test? ( ${MODULE_RDEPEND} )"
-
-python_test() {
-	esetup.py test
-}
--- a/app-portage/gemato/gemato-13.1.ebuild
+++ b/app-portage/gemato/gemato-13.1.ebuild
@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# pyblake2 & pysha3 are broken with pypy3
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} pypy )
-PYTHON_REQ_USE='threads(+)'
-inherit distutils-r1
-
-DESCRIPTION="Stand-alone Manifest generation & verification tool"
-HOMEPAGE="https://github.com/mgorny/gemato"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-fbsd"
-IUSE="+blake2 bzip2 +gpg lzma sha3 test tools"
-
-MODULE_RDEPEND="
-	blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )
-	bzip2? ( $(python_gen_cond_dep 'dev-python/bz2file[${PYTHON_USEDEP}]' python2_7 pypy) )
-	gpg? ( app-crypt/gnupg )
-	lzma? ( $(python_gen_cond_dep 'dev-python/backports-lzma[${PYTHON_USEDEP}]' python2_7 pypy) )
-	sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )"
-
-RDEPEND="${MODULE_RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND=">=dev-python/setuptools-34[${PYTHON_USEDEP}]
-	test? ( ${MODULE_RDEPEND} )"
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use tools; then
-		exeinto /usr/share/gemato
-		doexe utils/*.{bash,py}
-	fi
-}
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@ -5,6 +5,6 @@ DIST gentoolkit-0.4.2.tar.gz 3215652 BLAKE2B 97b4dcac7293b50161169a6c777623cb1c5
 EBUILD gentoolkit-0.3.3.ebuild 2187 BLAKE2B 21cfa614cef616b3f6326cde3fb52d1cf0a21a0b1e1201d27ac358c3fda79d08cfa4857ecfcf0b5f70c3d152855cab59f131a14d1e6327299d74b23f3085819e SHA512 76d206fb0c32e075cd4fef87ff8c4497f1f566b8ee5de07bbc5608f32c42777308619d13fb179081726920a59480010e9b53c4bf178f4e335017bcbe0cd35885
 EBUILD gentoolkit-0.4.0.ebuild 2164 BLAKE2B 7a4d91380523e5355a68e4320907375e49b69acd3f48a549a46576277da776c5be47113828f757affe0439b6803a2a0ebef7c7f6a7c4438f1800584e4439d321 SHA512 aa0fe594f28562a24ee73cb2eae52f1797758ec4c80d0db24f52de3f81aac7a64de5f59b6b273ce4f84d88a88b058f0f880b5498fc118e4b2f4572c459b99fca
 EBUILD gentoolkit-0.4.1.ebuild 2180 BLAKE2B f141489aaf43bf65d686166a4fc66f1acb58c16d4eab35566d323077ad8730b413f11beed94af79f03f30b1daf7bf6954d2b0ef791504c7f47c3c90e222e506c SHA512 92016e7cab3aa9c2a2fcdc42d9958f47a1bb41da5c88664128aeb0c9a86fa00ff79c99cb100be03f056df23a506e2e52b6b4068b828885ee08173a4ef4404726
-EBUILD gentoolkit-0.4.2-r1.ebuild 2206 BLAKE2B 7bf64e1730af382efcd97bcc36fe182c166ed706f773f0470bc2dff4f73eaffa39a5ab932ec78421dd4c3ce45bc8669ea8bc4fbb6d27938dad43654353f7b517 SHA512 32e06caad05b2b9c257e162478380f578bb94b1653f992b21bdf63a0ed0ec9630d48ff58a59902e7336a93aaa2f3449a049537fc39a40d84373898dfedf067e8
+EBUILD gentoolkit-0.4.2-r1.ebuild 2212 BLAKE2B d91339dd6d7597224d43e82d402f91ed77b0e63b9cec8fc7591ed410c7296a6fa6b788fd76f33bf7146b5870badd31741f59e0c31a91d3d256629e4d4b3a7a1e SHA512 99b9a3f959145bdcc73490232d8a01aed2c6d0bd5d2ef6ae8f99efa536492208e660dc6da90d5f95eb110436197ff8cc6ffcaec8c8d7c42c205b392aeb20c2ab
 EBUILD gentoolkit-9999.ebuild 2038 BLAKE2B b73ca2d3af0a6d7adf65e489cceb6bd4ff29c61e2e657dd28c0ab17e3050cc1031d0db237ff9467dc80f3c463ad0c1f3efdd9ec5d13f35ca0983a435c61329d0 SHA512 d0110f470a871858b3ffad3617714db71b1b015c72fc9f3c39921f3c4b6ab80192c1b060f2de3fdc673a8a8ccca7b5be92a43fb52b5dfe664d832ae093bec7f2
 MISC metadata.xml 558 BLAKE2B 2ede18c080565469ba0be5ac6f2e34ab02f9367947ef1e380deed006c5ca2900468e142ee1d7c8664d62ed49caeb64069726f0426251a00d48a848af745128b4 SHA512 8e57275ae720065361529af42999f9bfe871007e45592ee6f539eec4ce61e6b141f44c65316ee10798bfaecc86a814fa18353becbb31ffc5e2c38df100ac3704
--- a/app-portage/gentoolkit/gentoolkit-0.4.2-r1.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.4.2-r1.ebuild
@ -3,7 +3,7 @@

 EAPI="6"

-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6} pypy)
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
 PYTHON_REQ_USE="xml(+),threads(+)"

 inherit distutils-r1
--- a/app-portage/gverify/Manifest
+++ b/app-portage/gverify/Manifest
@ -0,0 +1,3 @@
+DIST gverify-1.tar.gz 4558 BLAKE2B 193fb63dd3816b4577314199e4f8606a20f60d883f22f36636f1dba4c3fe4a701e89fd352b33ee3ce5bfb10b39e351f971aa55c8cd6eef493fc492e2c4c5d17e SHA512 f666306973bf173683edd845499ea1b244ffc9254ed0d816660022f871e7cec480d452fd962db5417b23d3101496b80a49caece29cbddf3058e2a21ec945a268
+EBUILD gverify-1.ebuild 625 BLAKE2B a37a88fc21a5a5882f323e8d6d52c6166baa6ea7e232e6c98af155b3730393272b34f49a8a2debaa50a3529ae2320f82d87105f7f2232e5460eb79e77e84e69a SHA512 86358f642922dafdbae848c075da6bbd6294f22e174e83b36d6b8f33bd8b42685b31e08b7d3f1953d2a33ab2666679ffd361d6570ca1604f48bd7363de68c9ec
+MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
--- a/app-portage/gverify/gverify-1.ebuild
+++ b/app-portage/gverify/gverify-1.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+inherit python-single-r1
+
+DESCRIPTION="gentoo.git signature verification tool"
+HOMEPAGE="https://github.com/mgorny/gverify"
+SRC_URI="https://github.com/mgorny/gverify/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+	app-crypt/gnupg
+	dev-vcs/git"
+DEPEND="${PYTHON_DEPS}"
+
+src_compile() {
+	emake PREFIX="${EPREFIX}"/usr
+}
+
+src_install() {
+	emake install DESTDIR="${D}" PREFIX=/usr
+	dodoc README
+}
--- a/app-portage/gverify/metadata.xml
+++ b/app-portage/gverify/metadata.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+</pkgmetadata>
--- a/app-portage/portpeek/Manifest
+++ b/app-portage/portpeek/Manifest
@ -5,6 +5,6 @@ DIST portpeek-2.1.26.tar.gz 13004 BLAKE2B 1de44e9cc3f097154c5374c2619367d20bba62
 EBUILD portpeek-2.1.21.ebuild 692 BLAKE2B 30e2e87dfe6088945b51c93d67a69798503266774b094517cd29d8a408f7bfb27716dad8026a01b10e88e15ff1e91b5ecc14034b87d24346f3e8dd8122f525fa SHA512 02c5df14a945e8703ae9f99ee7d61083dd6b125ff5bc7d12c9f09cb0c8006335696de9113a8d490ce6460bd59d5b91f71af50119efb943e62b5d6ad196149045
 EBUILD portpeek-2.1.24.ebuild 694 BLAKE2B 78f2e828f1f25bf4a430a050faaa9795a3328e35839bb57090c397a16966317a19f6e38df261f20ee5bad64e28b97efa574cd2147df993a69ec7190652337675 SHA512 2de0c56eade803cfde62c396d3347a4a3242ad36c10d5dcd4895d3c7fe2b20c62fb9c8272e6558c6b7a64b25301575a9416a5e1dc788002825f3f9a8c3c5ce6b
 EBUILD portpeek-2.1.25.ebuild 694 BLAKE2B 7ce31d63bec751641bf74868e04df23064b72f7ffae9ba11a30b89b64e7c28588fbf39669407aa55732c9dac196044cf398f65f42134e44318367ba6a712a8ff SHA512 464d37757a6f770369b445fab9588e948590e7929d5528255ccece45941e79cbecbe6bf88c8d4dcdd9f31d7065393a183e49e64ebde501c8b84340be6a5b886a
-EBUILD portpeek-2.1.26-r1.ebuild 756 BLAKE2B 0237f012275b1de58b1cb9c7497a1e115550bbcacb2ad63c4313363863d0a4a903c3cb4e265fa94fecc6ec9cb48efe3bb8a65f0eb0586b7a5dfd22fe6763a54b SHA512 fba92d9cf82681e4bfcf5b8707657ed02c9726e1b98b6a9f7f403f03c0c8a14b7b2578b195ba0a4c9466e04a616a21de7215a18417f0c0008ee66ead92f58b4c
-EBUILD portpeek-2.1.26.ebuild 712 BLAKE2B c6a539332fa2d7d90723bce8721e004557ef1b9d77d1bfe814d57ce015073a3122cc167c1c1fef9884c719698648ddb3a108fddd4f13d5faeadaca4c356911ab SHA512 a054bbaaa443406ee70ecb8473d36113b14057e8622d066eb22517c08015e3a214756bba8c4e4bc6d2361a703477f4fb3da8dace7ed4677b6a36e1df876aae14
+EBUILD portpeek-2.1.26-r1.ebuild 760 BLAKE2B 45bd0d4a777b5292470c21fce5017589299f47d942484a6ea97845500552441b0327634a346cfea528026713011150f79353dee190cacccaf51a1dd655461f92 SHA512 51de071c4ebbf5439c0aaaf73a0e147be438291a32065e12373acd43e52c220696748f32a5b11986c98e522a1287df66cf41ed25f40c81320be0df18087075a9
+EBUILD portpeek-2.1.26.ebuild 716 BLAKE2B 8786aa84b88d7ee02c6147070683cfd373f24c4a89d911d9ae947e17844a96db62a258dc80ec8534ab5ae08e0582c4f4b70cce84aa830fc2e4f403b042d01985 SHA512 533afba3d15de73b3a9dcb01037ecef85934cb135e339b9d1e6a3ebac9ecc6d4998e116c75278ee389ec802f47b578411950637a4a87d3f651861082ab732cef
 MISC metadata.xml 222 BLAKE2B 5192d31072923545c8f760f9c3b3274f610b7a94a53cf55bc85c5c20a953b227b7cdb64cb5f5921b8b2822ec6563479b5d4883ec2b569a066d8ab569713fa8be SHA512 3d793038a1abf5bb86eeb23fee623f27db1d8e529372adc51eb4ffd1d0c2deb6df1c4d637954cc68e07d590c25e3d74a8437d02c1864a21c96f63597192cfef9
--- a/app-portage/portpeek/portpeek-2.1.26-r1.ebuild
+++ b/app-portage/portpeek/portpeek-2.1.26-r1.ebuild
@ -3,7 +3,7 @@

 EAPI="6"

-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )

 inherit python-r1

--- a/app-portage/portpeek/portpeek-2.1.26.ebuild
+++ b/app-portage/portpeek/portpeek-2.1.26.ebuild
@ -3,7 +3,7 @@

 EAPI="6"

-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )

 inherit python-r1

--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/gspell/Manifest
+++ b/app-text/gspell/Manifest
@ -1,3 +1,5 @@
 DIST gspell-1.4.2.tar.xz 407356 BLAKE2B f2ee6ae43be55e8ad7253e10893868a8d7857bbe41e14d71103b27a0faf40b0ed247e9fa38ed7bc75039fe0f1f600fe739f538d50f69fb063d0932df6c0b1c27 SHA512 00f53d3ca47a4ba1af1e8b4983a41dc6df8a9788898b45ffdd161a3fc8de28024cc985f49fbb872912c0a94addbca3b28ce2edda70eeb206a794e2bcf65e4a5e
+DIST gspell-1.6.1.tar.xz 416704 BLAKE2B 2a180bc52d3f09813d8de362e5bf900f831663c09530c8a9b993baf55f852a3939447a71c9c9dc0caafba7e8b74a2a5aad4443cf248eb87da4e15e0481e74262 SHA512 f1ffbd0d23d9743bcf924c25b3a3d7bf93c6a5e4ea5e362fb7300f657d8c1d0117e847f3dec29de377947f850e003b24a3231e88e99b313c955dd94ce358c23e
 EBUILD gspell-1.4.2.ebuild 984 BLAKE2B 34d49bf58ed3d59cbb94f95739fa8e03985f3e93be328251e5f1a080ea2e0eec734e9ab036e096f37c873da24c4fdea98c09b98bb010d9c9fc7b455e6ef7ad74 SHA512 43c47b3b112301aa1876e805999bb1631f6add794a7ab68d5ba162f7d12b741fadf2486458294f4b2b5bfd78f3143d9f9ca16631ba8020aad92ff1fbefc2cd92
+EBUILD gspell-1.6.1.ebuild 1006 BLAKE2B 411c9733da9d9c1b391fa9b1870a3e5cfcba4e87ca7d7ed921c735568ae93e155164e2b014e20d9b0eaa64abb50e28541611308720b2653eb47b794808254505 SHA512 dd4c5aa2efeb64e726baf14d4797a06d344d9f3f3872eb6caa2fb300e4070d3c3ea7bde773b6474c4f253e907491504b88132a474ae46bfb7b814e9918740d9d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
--- a/app-text/gspell/gspell-1.6.1.ebuild
+++ b/app-text/gspell/gspell-1.6.1.ebuild
@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala virtualx
+
+DESCRIPTION="Spell check library for GTK+ applications"
+HOMEPAGE="https://wiki.gnome.org/Projects/gspell"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/1" # subslot = libgspell-1 soname version
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-fbsd"
+
+IUSE="+introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	app-text/iso-codes
+	>=app-text/enchant-1.6.0
+	>=dev-libs/glib-2.44:2
+	>=x11-libs/gtk+-3.20:3[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
+	vala? ( $(vala_depend) )
+"
+DEPEND="${RDEPEND}
+	dev-libs/libxml2:2
+	>=dev-util/gtk-doc-am-1.25
+	>=sys-devel/gettext-0.19.4
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable introspection) \
+		$(use_enable vala)
+}
+
+src_test() {
+	virtx emake check
+}
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@ -29,10 +29,12 @@ DIST mongodb-src-r3.4.10.tar.gz 39959937 BLAKE2B f14f081525f694b939bc21f8cb6364c
 DIST mongodb-src-r3.4.13.tar.gz 39992720 BLAKE2B 5620711c5ffddd9a96c29be1f2801a37f30536d1b7afe5a7b339a41cacf1f97caf8d03aafdf1d6b71cc488e48f5066ebc49a63a6bf318483d552863cd47a0c0e SHA512 295dbb38d44c99e0dce46c5e4aa5d73c64d813a3767e71a7187aff05e30f896d283ca7ef19c0a7bbd036eecf3d419e38ea3bc7d98ba93d12296c49e565df0f66
 DIST mongodb-src-r3.4.14.tar.gz 40017360 BLAKE2B 617ebf0346b9ea5034d05ba607b21b745a44e70edb347c6bf0cd8b273b448caef7da2d5f11036d48add6f452883a9b15259fe8ad466e58199be5eb9512167b6d SHA512 f8c38d12e24ae332221db15aab646725ef666012837b8127a1ab128ac2d6da2ab702f3edd17fdf3e6a840f603c8c66acf2a87fe74adf30bd9c4fe6b873c98186
 DIST mongodb-src-r3.4.15.tar.gz 40063153 BLAKE2B 7912a1b0450337c8b9935deb6abfbda6080f8fec68222b6eb9fbbd278e4d8a1ffb873c7c4a63c78c3eadc722c694d4d48b3f5d9247531f1731d7713a527daec5 SHA512 8b29c1cef4c34e9c2e16bbaf50aa10574eb63c9692ab248849a0cc476acc637794c3be27df0663a27ee4ced28c6d80bb0e11ac00fcd6d0a8babfc835b78fce59
+DIST mongodb-src-r3.4.16.tar.gz 40093657 BLAKE2B 7123444dbdd0b2ad3adfb3391e0177d33c1b6c6a4ea83027821c564faad047a736e52926bc15c58bef59c18282436e913fd3bc9963705e030da01356f83ea367 SHA512 e22eb1fe2a832fed8305200614988c5ecfd619cee44fe2263bffa151732c0e26584084e64065dbc65152be6e5c1767a538193770359bea92f3703c72239075db
 DIST mongodb-src-r3.6.2.tar.gz 39999539 BLAKE2B 3e38917ebaf79b63bf054279fbb91a648fe52e69d8194998dc74453ad6766688929a80456f6cb4801f2806ac938a5dfc0407e5f46345b47a80ecce0ba03d7fde SHA512 7acfbcc68c1bd4e6e63eee09be1dfbb064be6f8b0144418105100a065f8162cafc9b776fe0429fd64c79b958561aa42d0bdef56588dda65acee27ccc98631f39
 DIST mongodb-src-r3.6.3.tar.gz 40093607 BLAKE2B bb21bf0487661eec6140ade22526617b26b2499bd36e138d955d14a4b13a0685ec7308bccfc11ef17c785cd8a71c5b6cd9d154d461b8973410b03952b93953ec SHA512 94aa9955f99d5f6bbbe65dc3755583952525398308ca7cb9224b91d1fa403de5bb3abb63a651583815cbecaff58966b5cfe7334a36ef6583f73d8c213410ddbc
 DIST mongodb-src-r3.6.4.tar.gz 40159916 BLAKE2B d3878d4e6bbf331de672768b2c92a4d71f758232170432d757f7e61849e6e1ef3b190e6a089101c9ea23c4ce23087c684c86fc6ea0f32f6fe052ce322d47e438 SHA512 02c2a697af9fdcbb16d19792be17d987e18c684418a63ed4750471c7ec22eb2eabf84e93cb1d298f67898b7e23687f668bb333c50ffc4e1b8adf8859f856ad95
 DIST mongodb-src-r3.6.5.tar.gz 40310152 BLAKE2B 72110ae47b17ec8b1f60636a5ef8491b076e1cc019513fd872ea38b3bb8393efff4bddc7b795b3da711f258d21be9fa23e24d396a9429349c51ce05fff180a53 SHA512 6ecb3140ee4a7929fabe62d698f23e87cb5030cf31abefe7f82374f407fb87dc05f712089998f96bc40e23698836a86e7f3590892bde9d2d6f2c4bcc15cc3ebf
+DIST mongodb-src-r3.6.6.tar.gz 40391572 BLAKE2B 1cee1ad5431d2941cf2f0ee31290b2b5bc1c628f2cb5041d4d5a1427d342ecc3bbfb123e540581d81a1c5b018464abb9dcd1ead8df0de6a01a1462ca0c258e83 SHA512 cd91979ba29538c9e1645fe81e03ac56101b0fa8980ea2bdf89a4987ee8f7f6ddc97e2b27495500548a4424f155a1847471c7a5715beabf75ff894edf05c546b
 DIST mongodb-src-r4.0.0.tar.gz 49138467 BLAKE2B 616e267c737729103de544d82db60489e7a32c5f9847ffd2d643a9025c18aa867718216f5de9f18a93fb2a7930c3dbe9ec3850eef09dbec084570328a99f2865 SHA512 11d00cdde606cfea268471cffccedb6d003e421aeffda2303aff4d4126c386aaec50a1de733d7a1d5fb6605403cf9f2218dae50374c7b5e8625fa80317804589
 EBUILD mongodb-3.0.14.ebuild 4559 BLAKE2B e72ff73baaa3b6a5bb4bbb33f3153d2aeaa9458b6e7f48419f5fd0f9b7fe43dfbcd93bf0824555e688faa461839a8c3cb5e4d1a24219a395f1a245828d639777 SHA512 747424cae955229f6affd867961171d9ad3fe9c34553ddb94e034db76d4e389ba0c6dc47db23c291212b893b7377d1bfac52e79ae4ab1b9dfd8f4c89743e1a19
 EBUILD mongodb-3.0.15.ebuild 4561 BLAKE2B 85e994c18b57a0278059eb0e2e141842b551a96e1a030b5d84e0bb4c1524bacff7ed1a1576093b0336ed042f8bcbf01d37ba725392c077a400fdefc2705ec2ab SHA512 d5b77ede0ab5d9fa814542e831ec93d5854f0aaa55930c5e445410d347787be96294a741f30089764ea23cdab52413d1d82c6796b3d7133796d28de95726e294
@ -41,9 +43,11 @@ EBUILD mongodb-3.4.10.ebuild 5133 BLAKE2B e6b3742a9bff53afd63eae4fe3b9574e43f700
 EBUILD mongodb-3.4.13.ebuild 4256 BLAKE2B e4caf3957d5bea1811879828abb9a1407afcb9646e4e91911369d8e43564412e0fa19ec84264d1ad5dbea758fb32c5dfe2fb4dca60636b7838f4c3d4ef3832d2 SHA512 dee3412d989c9d00e1097a2ebb8d05e7d77d14e8399d7bf570da37904ec90de86d62807383c95caa057b2c2cfe2057be0b208b262bf488687b201a2f38ea7bac
 EBUILD mongodb-3.4.14.ebuild 4256 BLAKE2B e4caf3957d5bea1811879828abb9a1407afcb9646e4e91911369d8e43564412e0fa19ec84264d1ad5dbea758fb32c5dfe2fb4dca60636b7838f4c3d4ef3832d2 SHA512 dee3412d989c9d00e1097a2ebb8d05e7d77d14e8399d7bf570da37904ec90de86d62807383c95caa057b2c2cfe2057be0b208b262bf488687b201a2f38ea7bac
 EBUILD mongodb-3.4.15.ebuild 4256 BLAKE2B e4caf3957d5bea1811879828abb9a1407afcb9646e4e91911369d8e43564412e0fa19ec84264d1ad5dbea758fb32c5dfe2fb4dca60636b7838f4c3d4ef3832d2 SHA512 dee3412d989c9d00e1097a2ebb8d05e7d77d14e8399d7bf570da37904ec90de86d62807383c95caa057b2c2cfe2057be0b208b262bf488687b201a2f38ea7bac
+EBUILD mongodb-3.4.16.ebuild 4087 BLAKE2B 34b35ec68a95e64077516baf2159d0a45592d93e6c401c9f09e94e83c8359561324311cd15ef35948be21bbc081b308ebe99d1a64f0ad1bbbe8892d7fbb9b609 SHA512 61f600b20d5b16f97ca3e989547fac7265bfc2335e9b2ba5f6a40ecbf4360298cbe2ef71346b6777ba232b0ae75f79c1cc07bcf974852fd0d9bab3ff9f86b757
 EBUILD mongodb-3.6.2-r1.ebuild 4446 BLAKE2B 23e7edab8f84fac52f1dd5289017f6a27a6151deafd53cb8f0eccb229653704c780eda604bf3c08291d6cc7d20962d733c6b44e5ea659e0b5fb7e44ef8e0ed30 SHA512 70e7443ad7de93688bb58382f6a311500f580354111ce60f8bc0848862963e86be1d742fce95918f2fccce7583dc22e12940b1ca004e5f148fa0a72d512fe99a
 EBUILD mongodb-3.6.3-r1.ebuild 4446 BLAKE2B 23e7edab8f84fac52f1dd5289017f6a27a6151deafd53cb8f0eccb229653704c780eda604bf3c08291d6cc7d20962d733c6b44e5ea659e0b5fb7e44ef8e0ed30 SHA512 70e7443ad7de93688bb58382f6a311500f580354111ce60f8bc0848862963e86be1d742fce95918f2fccce7583dc22e12940b1ca004e5f148fa0a72d512fe99a
 EBUILD mongodb-3.6.4-r1.ebuild 4446 BLAKE2B 23e7edab8f84fac52f1dd5289017f6a27a6151deafd53cb8f0eccb229653704c780eda604bf3c08291d6cc7d20962d733c6b44e5ea659e0b5fb7e44ef8e0ed30 SHA512 70e7443ad7de93688bb58382f6a311500f580354111ce60f8bc0848862963e86be1d742fce95918f2fccce7583dc22e12940b1ca004e5f148fa0a72d512fe99a
 EBUILD mongodb-3.6.5-r1.ebuild 4446 BLAKE2B 23e7edab8f84fac52f1dd5289017f6a27a6151deafd53cb8f0eccb229653704c780eda604bf3c08291d6cc7d20962d733c6b44e5ea659e0b5fb7e44ef8e0ed30 SHA512 70e7443ad7de93688bb58382f6a311500f580354111ce60f8bc0848862963e86be1d742fce95918f2fccce7583dc22e12940b1ca004e5f148fa0a72d512fe99a
+EBUILD mongodb-3.6.6.ebuild 4242 BLAKE2B 5310eccf90fe32fcd15ab0ec9b9b5aa07db79d61c9cd65ce38d082f7ece684dffd4a75cdabec383514036d6de507a3f653292b537a3acf1b3b9dc0a551e7d18d SHA512 7897c881140a41851da4453e039875d6ae43190f14b18bf2e262197888d5ccebdcb66df1f194677f34acee1239643fdc428b6e027e714c4840ead8f3d0325bfa
 EBUILD mongodb-4.0.0-r1.ebuild 4445 BLAKE2B b6e7e01a6fd89ac0db97172a6c8257232089b1bd2c22ef8c1e5d689827d8b9c4b4ba384b68b63e8bb3038a25d2592b3cd13e38bdf3930bfd962d57a7262fef4c SHA512 961fcccb68ae8364172471f985c46b8e4d04c57a9620661810587f7e069cf521c6c0f0a5c50e7d015cbef1ded0cdcb983890d0564c7f8a8706fe7c6e6cc44750
 MISC metadata.xml 1053 BLAKE2B f2104654da3600c3d10882bb600d9002c015c7fb5dcfc8bdb98ab1fcb06d384ead4af990d55d6596d4bd602e5c4e9978a11cc66382ee01bab006f817ba44bdc2 SHA512 9ab708e294e25487ceeeeac7500a64684c914e95aa593c3a1f06d845b6b629766a5b98d972bf0802f3713b89bd6c81e293fc45205604980164542442438b13a2
--- a/dev-db/mongodb/mongodb-3.4.16.ebuild
+++ b/dev-db/mongodb/mongodb-3.4.16.ebuild
@ -0,0 +1,160 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+SCONS_MIN_VERSION="2.3.0"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit check-reqs eapi7-ver eutils flag-o-matic multilib multiprocessing pax-utils python-single-r1 scons-utils systemd toolchain-funcs user
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug kerberos libressl mms-agent ssl test +tools"
+
+RDEPEND=">=app-arch/snappy-1.1.3
+	>=dev-cpp/yaml-cpp-0.5.3
+	>=dev-libs/boost-1.60:=[threads(+)]
+	>=dev-libs/libpcre-8.41[cxx]
+	dev-libs/snowball-stemmer
+	net-libs/libpcap
+	>=sys-libs/zlib-1.2.8:=
+	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
+	mms-agent? ( app-admin/mms-agent )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1g:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-util/scons
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	debug? ( dev-util/valgrind )
+	test? (
+		dev-python/pymongo[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	)"
+PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.4.0-fix-scons.patch"
+	"${FILESDIR}/${PN}-3.4.6-sysmacros-include.patch"
+	"${FILESDIR}/${PN}-3.4.7-no-boost-check.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+pkg_pretend() {
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		if ver_test "$REPLACING_VERSIONS" -lt 3.2; then
+			ewarn "To upgrade from a version earlier than the 3.2-series, you must"
+			ewarn "successively upgrade major releases until you have upgraded"
+			ewarn "to 3.2-series. Then upgrade to 3.4 series."
+		fi
+	fi
+}
+
+pkg_setup() {
+	enewgroup mongodb
+	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
+
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# remove bundled libs
+	rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die
+}
+
+src_configure() {
+	# https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
+	# --use-system-icu fails tests
+	# --use-system-tcmalloc is strongly NOT recommended:
+	scons_opts=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+
+		--disable-warnings-as-errors
+		--use-system-boost
+		--use-system-pcre
+		--use-system-snappy
+		--use-system-stemmer
+		--use-system-yaml
+		--use-system-zlib
+	)
+
+	use debug && scons_opts+=( --dbg=on )
+	use kerberos && scons_opts+=( --use-sasl-client )
+	use ssl && scons_opts+=( --ssl )
+
+	# respect mongoDB upstream's basic recommendations
+	# see bug #536688 and #526114
+	if ! use debug; then
+		filter-flags '-m*'
+		filter-flags '-O?'
+	fi
+
+	default
+}
+
+src_compile() {
+	escons "${scons_opts[@]}" core tools
+}
+
+# FEATURES="test -usersandbox" emerge dev-db/mongodb
+src_test() {
+	# this one test fails
+	rm jstests/core/jsHeapLimit.js || die
+
+	"${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed"
+}
+
+src_install() {
+	escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
+
+	doman debian/mongo*.1
+	dodoc README docs/building.md
+
+	newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
+	newinitd "${FILESDIR}/mongos.initd-r3" ${PN/db/s}
+	newconfd "${FILESDIR}/mongos.confd-r3" ${PN/db/s}
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+	newins "${FILESDIR}/mongos.conf-r2" ${PN/db/s}.conf
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	# see bug #526114
+	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+
+	local x
+	for x in /var/{lib,log}/${PN}; do
+		diropts -m0750 -o mongodb -g mongodb
+		keepdir "${x}"
+	done
+}
+
+pkg_postinst() {
+	ewarn "Make sure to read the release notes and follow the upgrade process:"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
+}
--- a/dev-db/mongodb/mongodb-3.6.6.ebuild
+++ b/dev-db/mongodb/mongodb-3.6.6.ebuild
@ -0,0 +1,164 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+SCONS_MIN_VERSION="2.5.0"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit check-reqs eapi7-ver eutils flag-o-matic multilib multiprocessing pax-utils python-single-r1 scons-utils systemd toolchain-funcs user
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug kerberos libressl mms-agent ssl test +tools"
+
+RDEPEND=">=app-arch/snappy-1.1.3
+	>=dev-cpp/yaml-cpp-0.5.3
+	>=dev-libs/boost-1.60:=[threads(+)]
+	>=dev-libs/libpcre-8.41[cxx]
+	dev-libs/snowball-stemmer
+	net-libs/libpcap
+	>=sys-libs/zlib-1.2.8:=
+	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
+	mms-agent? ( app-admin/mms-agent )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1g:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-python/cheetah[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	virtual/python-typing[${PYTHON_USEDEP}]
+	dev-util/scons
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	debug? ( dev-util/valgrind )
+	test? (
+		dev-python/pymongo[${PYTHON_USEDEP}]
+	)"
+PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.4.7-no-boost-check.patch"
+	"${FILESDIR}/${PN}-3.6.1-fix-scons.patch"
+	"${FILESDIR}/${PN}-3.6.1-no-compass.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+pkg_pretend() {
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		if ver_test "$REPLACING_VERSIONS" -lt 3.4; then
+			ewarn "To upgrade from a version earlier than the 3.4-series, you must"
+			ewarn "successively upgrade major releases until you have upgraded"
+			ewarn "to 3.4-series. Then upgrade to 3.6 series."
+		else
+			ewarn "Be sure to set featureCompatibilityVersion to 3.4 before upgrading."
+		fi
+	fi
+}
+
+pkg_setup() {
+	enewgroup mongodb
+	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
+
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# remove bundled libs
+	rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die
+
+	# remove compass
+	rm -r src/mongo/installer/compass || die
+}
+
+src_configure() {
+	# https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
+	# --use-system-icu fails tests
+	# --use-system-tcmalloc is strongly NOT recommended:
+	scons_opts=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+
+		--disable-warnings-as-errors
+		--use-system-boost
+		--use-system-pcre
+		--use-system-snappy
+		--use-system-stemmer
+		--use-system-yaml
+		--use-system-zlib
+	)
+
+	use debug && scons_opts+=( --dbg=on )
+	use kerberos && scons_opts+=( --use-sasl-client )
+	use ssl && scons_opts+=( --ssl )
+
+	# respect mongoDB upstream's basic recommendations
+	# see bug #536688 and #526114
+	if ! use debug; then
+		filter-flags '-m*'
+		filter-flags '-O?'
+	fi
+
+	default
+}
+
+src_compile() {
+	escons "${scons_opts[@]}" core tools
+}
+
+# FEATURES="test -usersandbox" emerge dev-db/mongodb
+src_test() {
+	"${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed"
+}
+
+src_install() {
+	escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
+
+	doman debian/mongo*.1
+	dodoc README docs/building.md
+
+	newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
+	newinitd "${FILESDIR}/mongos.initd-r3" ${PN/db/s}
+	newconfd "${FILESDIR}/mongos.confd-r3" ${PN/db/s}
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+	newins "${FILESDIR}/mongos.conf-r2" ${PN/db/s}.conf
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	# see bug #526114
+	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+
+	local x
+	for x in /var/{lib,log}/${PN}; do
+		diropts -m0750 -o mongodb -g mongodb
+		keepdir "${x}"
+	done
+}
+
+pkg_postinst() {
+	ewarn "Make sure to read the release notes and follow the upgrade process:"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
+}
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
--- a/dev-java/idm-console-framework/Manifest
+++ b/dev-java/idm-console-framework/Manifest
@ -1,3 +1,3 @@
 DIST idm-console-framework-1.1.7.tar.bz2 708770 BLAKE2B 82e69ced74e92bcd0cae30a7c58ba37d890ed56694e23d464dd8ce91be5aab80a2a48ec91608a83a4e8f5892ba242c273e266c431aa00ab172b894fe04d8a841 SHA512 ce4441cbc9917f6ffd0ef6ced44c7ebc542c14db60e7c6eeb844f8c68cbb15fe533916b9ea363d1e865759138d92d38365e9172206c7cd0fa385f4bf443aa739
 EBUILD idm-console-framework-1.1.7.ebuild 1597 BLAKE2B e61a3819ffd6519a2aaf1b67c36c69a09ac8d5a0706f6b478d7f21d9b9b937ffd92c60fba01b4ad64f2fefc16dae9fde8957d24d13c5a8fd5aada236fb84b6ee SHA512 d9a8e630971d16262b9a519f9bc4853fa2676a87c363e944083d9d81e8fc718bb99eadbee679110e9795d711f4e6942520c93dcc6de86294c3301762e9065095
-MISC metadata.xml 571 BLAKE2B 87ece50943597b058ab1fda6f7a96c34ca2ca391d71303da9701baee68c471ceb104633ddf7bd883fdd9a65ff181a4cdfe0b7996a968de389727decd00ba9f11 SHA512 0332dc27ea58f9ab191783fc12ce14e47a7680ef232601901c7b33a10b672c13bbb9c8ba75a0ef0eaac1ce31e4e7d1c62ac3a701160e2ae9aa5de4915cde9b23
+MISC metadata.xml 463 BLAKE2B a8386117008d8a1ca0cff5d966188558776723de6dc5fe8ad338619e1c7759d92aff019fd4200bb2e8665d58ad6089786ab4334d2fe86e9838bd89e331f50121 SHA512 e1027ac25c797f7006d3f355b7eefcbfb9fb7947ede77338128044233eebdcf92985131f23ba3acf0754b83c0e01c9f90a8f669f5cc4b60fc570566e74e0e1c6
--- a/Show More
+++ b/Show More