gentoo resync 08.09.2018

28 files changed, 942 insertions, 897 deletions

diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 2144da96f8e6..05d1202fedde 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/authenticator/Manifest b/sys-auth/authenticator/Manifest
new file mode 100644
index 000000000000..b69b1745e309
--- /dev/null
+++ b/sys-auth/authenticator/Manifest
@@ -0,0 +1,5 @@
+AUX disable-failing-tests.patch 784 BLAKE2B 67367ef35234046a2fdedd8d82c0c2037ecbe8005e9972d05c9654645225f42d23a4fbe0b819daa6fdf219d4852284fc068d24227a89bd4afc4c15e4792c2d8d SHA512 226bce7609fedf6cf9a3459d5945f0ca31004df595fd6717781dce142bd53f5c552821031b3de516964a97abc91efaadf902b943aa0a149ed3603ae26aa0355e
+DIST authenticator-0.2.1.tar.gz 147693 BLAKE2B b9f3a7fd5b3b7867120b9ed17b90cea4c07a271dc4d75a845ad539e15453a606d48e8637d44d12cecf9b91e5fb351d081c1add48c1a4a955444f39addd51b075 SHA512 aebf3ce147d5ccd404de6af52e130e9a85a3d5d86140d73026dac00219853652e7aa1e67db5838f9ac4d147021cd07b3ebfb86a1ab4b413ec3b98360097d1d6e
+EBUILD authenticator-0.2.1.ebuild 1133 BLAKE2B 3dd8465ce850e81a2994472b4d73530a5e3982dde4899a776902bf30b733bea0d8036e441ecc11a19ce3cac2cbfb9d95746c165397ca84695aba50461c946ff0 SHA512 affef8c5c3dfa2890373cdc5cc9a3c9639db9e7a5e70487469c6b809ab64eb775516450cfd6e759e8aa24fe7e98bf4f06d41b24e580b8b2ea61ec5b8e0a50ceb
+EBUILD authenticator-9999.ebuild 1133 BLAKE2B 3dd8465ce850e81a2994472b4d73530a5e3982dde4899a776902bf30b733bea0d8036e441ecc11a19ce3cac2cbfb9d95746c165397ca84695aba50461c946ff0 SHA512 affef8c5c3dfa2890373cdc5cc9a3c9639db9e7a5e70487469c6b809ab64eb775516450cfd6e759e8aa24fe7e98bf4f06d41b24e580b8b2ea61ec5b8e0a50ceb
+MISC metadata.xml 615 BLAKE2B 6e7f20b374a19cf14cfaa2df3ffcc4f98df79bcdb2c2bd128482dbb9a44d118295b8ac76dd668c4675aa900ac24fc0d38115967ff73cbaa4b4771e62ca0434ac SHA512 9e6e905369b669cf8e2d337db0ea84f600bd874ca24d3624fd3a37a08ac5d132ca0f9b12bb1c80105fdc46a8a15bc85d4af2bd0681b128109de92536d83bd2e7
diff --git a/sys-auth/authenticator/authenticator-0.2.1.ebuild b/sys-auth/authenticator/authenticator-0.2.1.ebuild
new file mode 100644
index 000000000000..f11556202d24
--- /dev/null
+++ b/sys-auth/authenticator/authenticator-0.2.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6} )
+inherit gnome2-utils meson python-r1 virtualx xdg-utils
+
+DESCRIPTION="Two-factor authentication code generator for GNOME"
+HOMEPAGE="https://github.com/bilelmoussaoui/Authenticator"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="${HOMEPAGE}"
+else
+	SRC_URI="https://github.com/bilelmoussaoui/Authenticator/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/Authenticator-${PV}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+DEPEND="
+	app-crypt/libsecret
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pyotp[${PYTHON_USEDEP}]
+	dev-python/pyzbar[${PYTHON_USEDEP}]
+	media-gfx/gnome-screenshot
+	x11-libs/gtk+:3
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/disable-failing-tests.patch" )
+
+pkg_preinst() {
+	gnome2_icon_savelist
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
+
+src_test() {
+	xdg_environment_reset
+	virtx meson_src_test
+}
diff --git a/sys-auth/authenticator/authenticator-9999.ebuild b/sys-auth/authenticator/authenticator-9999.ebuild
new file mode 100644
index 000000000000..f11556202d24
--- /dev/null
+++ b/sys-auth/authenticator/authenticator-9999.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6} )
+inherit gnome2-utils meson python-r1 virtualx xdg-utils
+
+DESCRIPTION="Two-factor authentication code generator for GNOME"
+HOMEPAGE="https://github.com/bilelmoussaoui/Authenticator"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="${HOMEPAGE}"
+else
+	SRC_URI="https://github.com/bilelmoussaoui/Authenticator/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/Authenticator-${PV}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+DEPEND="
+	app-crypt/libsecret
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pyotp[${PYTHON_USEDEP}]
+	dev-python/pyzbar[${PYTHON_USEDEP}]
+	media-gfx/gnome-screenshot
+	x11-libs/gtk+:3
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/disable-failing-tests.patch" )
+
+pkg_preinst() {
+	gnome2_icon_savelist
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
+
+src_test() {
+	xdg_environment_reset
+	virtx meson_src_test
+}
diff --git a/sys-auth/authenticator/files/disable-failing-tests.patch b/sys-auth/authenticator/files/disable-failing-tests.patch
new file mode 100644
index 000000000000..0c17070d9106
--- /dev/null
+++ b/sys-auth/authenticator/files/disable-failing-tests.patch
@@ -0,0 +1,24 @@
+diff --git a/data/meson.build b/data/meson.build
+index d21a6d1..b2a849b 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -50,10 +50,12 @@ endif
+ 
+ appstreamcli = find_program(['appstreamcli', 'appstream-util'], required:false)
+ 
+-if appstreamcli.found()
+-  test (
+-    'Validate appdata file',
+-    appstreamcli,
+-    args: ['validate', join_paths(meson.current_build_dir (), meson.project_name() + '.appdata.xml')]
+-  )
+-endif
++# This test fails because screenshot images do not comply with restrictions.
++# See https://github.com/bilelmoussaoui/Authenticator/issues/67
++#if appstreamcli.found()
++#  test (
++#    'Validate appdata file',
++#    appstreamcli,
++#    args: ['validate', join_paths(meson.current_build_dir (), meson.project_name() + '.appdata.xml')]
++#  )
++#endif
diff --git a/sys-auth/authenticator/metadata.xml b/sys-auth/authenticator/metadata.xml
new file mode 100644
index 000000000000..3950af1a3351
--- /dev/null
+++ b/sys-auth/authenticator/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>oleksandr.trotsenko@gmail.com</email>
+		<name>Oleksandr Trotsenko</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">bilelmoussaoui/Authenticator</remote-id>
+		<maintainer>
+			<name>Bilal Elmoussaoui</name>
+		</maintainer>
+		<bugs-to>https://github.com/bilelmoussaoui/Authenticator/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/sys-auth/keystone/Manifest b/sys-auth/keystone/Manifest
index 30fa7df436bf..510043d8e417 100644
--- a/sys-auth/keystone/Manifest
+++ b/sys-auth/keystone/Manifest
@@ -1,7 +1,14 @@
 DIST keystone-12.0.1.tar.gz 1492793 BLAKE2B db2d9292be475b73398e767505bbd73d33397a4d7a4bd671877c4a4b7ee22b1e4aa63d86b7a251c1de51bfc74f06d384f2c25242e0b25901db93d627f993e660 SHA512 e6fc4b3c26c58adfe896070fb5034b9ad1fa8c281824177b9ffd0d3aa5f0d5cec7ed3e6e91d404f2bd3bb1cd913819941b25edd0e5c414fa9a9c5f403575141e
 DIST keystone-13.0.1.tar.gz 1460979 BLAKE2B 9a22b0ba0c66cab9a65f3197c08f93a4c592f4bd67ae59b3dec182db589ff50c2bbf8e269706859d285a4811a1cd32533b7c07b595d2697bba1c487908b1a975 SHA512 cfe89be9b49dd54095ff38b5d2f13eba0e41ecf111ce0dcd40cfc64eaccc1f1105f870f866a2cc49f89c72d0981d5112ee0f8444fc5810f79b65c0f5de7bfc15
+DIST keystone-14.0.0.tar.gz 1525077 BLAKE2B a91071c7a5ead2ec31039a216a434c85623c76cf3409da049d23726c7ff051a729c925d6107b745b47a67a52b6d07e8853def7f7823d63f055532dfa2bbf3a0b SHA512 90f61c5d408dafddffb41b1dcfcc9372366129558df538606abfd3716a41b88d9430ffb0d1dc20f31ca0a82b1a691b7dc5d47a448dadbe970773902c898e2cf8
+DIST keystone.conf.sample-14.0.0 119794 BLAKE2B 3f3c43b0972230a57b444ffe3ca41fa94a0886831941c8c259738e6575b74776a6add907fac833ba178769bbecd4bc16fe383b53344c1e3cebf3d4eacdbcb50d SHA512 5513b4e3bed869d6fa56bf6163355de2dcbf859dd8f7e76ffa3a0e7b644fe367bbde75a4e090098faba473e1fb26b061d434771e9e6bb8cb105ca609c161e5c1
+DIST keystone.conf.sample-2018.2.9999 119794 BLAKE2B 3f3c43b0972230a57b444ffe3ca41fa94a0886831941c8c259738e6575b74776a6add907fac833ba178769bbecd4bc16fe383b53344c1e3cebf3d4eacdbcb50d SHA512 5513b4e3bed869d6fa56bf6163355de2dcbf859dd8f7e76ffa3a0e7b644fe367bbde75a4e090098faba473e1fb26b061d434771e9e6bb8cb105ca609c161e5c1
+DIST keystone.policy.yaml.sample-14.0.0 38318 BLAKE2B a27e4ea59c99dc91dde9d1cc62340faa4b91e644dc6b8725c2d7de731e44684d8d59571e6470da3ab9fa191087a890a0b417b58b1473038bf39cfc75e5b2bad4 SHA512 95fad079d1fb77d15b9f8e507be8b1e01b493c3f1dd4e992567fe9c905bae01a058e93d59677d472ae47856b13d5cffa213d89e8e267f081a2bad1bf8e1f6036
+DIST keystone.policy.yaml.sample-2018.2.9999 38318 BLAKE2B a27e4ea59c99dc91dde9d1cc62340faa4b91e644dc6b8725c2d7de731e44684d8d59571e6470da3ab9fa191087a890a0b417b58b1473038bf39cfc75e5b2bad4 SHA512 95fad079d1fb77d15b9f8e507be8b1e01b493c3f1dd4e992567fe9c905bae01a058e93d59677d472ae47856b13d5cffa213d89e8e267f081a2bad1bf8e1f6036
 EBUILD keystone-12.0.1.ebuild 6280 BLAKE2B ffb752f981b0e72674cd6dac474a9f475123994cc2eba0ea24eed4d01acccdba9f9ec009c38a42e8e4084e0e6a95e03d794ef4b6be0328e3c87e8e0a17f4f5fa SHA512 32b5582c8e4bb24c3799b3716ac9cc62a254ed694e10e2c72ff275b69535639c442f66baa5eecd81fdca0d8007e1c4e2154eeaa00f07c3f169a7b698aec49230
 EBUILD keystone-13.0.1.ebuild 6185 BLAKE2B dc880b6445ed20b3f50e062b338a92576ae8d9d267021550dc817e7d527078715af0521ea8ce910a69c26fd1cee1225e99a7536837ba0a2ceb0e9c01c8b47e15 SHA512 fbc2762108c126f086dbeebb829e0417f54bdccc936c2f72c9667100776b4b94ba4e9c9fca22bc850cb339d54130e3f7b4dc8de936009ab0efb2b92ce9e8c3b3
+EBUILD keystone-14.0.0.ebuild 6750 BLAKE2B 6036789299ec6679527ed0a862310ea34d85540d09c82ac13b5deae92dd55654b669bf46f6cc80a0e88c2abb9137713704290063dc65759abbbea11d5e3c05bb SHA512 c7394c367e842abcef65887f9dc66701352c50dd330f4f0738bf70c35fb6414028369426cfa19dd08b1e520db3c722c918182f256b15398ba9601b32caff33f6
 EBUILD keystone-2017.2.9999.ebuild 6298 BLAKE2B 0ffe1ffd9ce957b38693ae38470823461b2f88741e679788ab149d545584e12fd244c8f7c648bd3de0dd1903b9b12e029e7583087a3d4a4861dceacc63bbf6b3 SHA512 c1d8594a094dd25bbbb7119d41a9ce32d302b1af7b6ccf7e59fc1ecc7a2f72c99dfd07a40aed8e2338f20511d019592753c4bd491f9e3405557d694f0fbcf9c0
 EBUILD keystone-2018.1.9999.ebuild 6187 BLAKE2B 14d660926e2c4063ede68932eccf12a32a5ca8970d42b858614acb985167b797a9fd47d50ace7b06114f971243886ade20b1c32b5bac237cb36171d2657a8b43 SHA512 ff7fdb04866207596c3923a92b42fdab4bcf9ad1eb6ceb5958d23c0c6fb2eb98c2ca0ce06c92c1c4abfc0f8d561d8021a80acf0ad3c3d486e2223cc5075f8d93
+EBUILD keystone-2018.2.9999.ebuild 6750 BLAKE2B 6036789299ec6679527ed0a862310ea34d85540d09c82ac13b5deae92dd55654b669bf46f6cc80a0e88c2abb9137713704290063dc65759abbbea11d5e3c05bb SHA512 c7394c367e842abcef65887f9dc66701352c50dd330f4f0738bf70c35fb6414028369426cfa19dd08b1e520db3c722c918182f256b15398ba9601b32caff33f6
 MISC metadata.xml 807 BLAKE2B 2e674e33b20a046cbe09e98474f3fc36dadac01f7438acbdc4bb8729b16cf8ca9bc8717b000b798d8d5501cdc14dd4365a5fa2f3e0326e160b74d7a0f8bcdbf7 SHA512 3738ac4fde08eb90daea5aeb9731cf6e303b3ad6838f07732e707d5597ee2d96ac6530f691b6ac8c0f347946b75695be98a19e224496d137bf1968bccfe156ad
diff --git a/sys-auth/keystone/keystone-14.0.0.ebuild b/sys-auth/keystone/keystone-14.0.0.ebuild
new file mode 100644
index 000000000000..3fe0e204e8f3
--- /dev/null
+++ b/sys-auth/keystone/keystone-14.0.0.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 user
+
+DESCRIPTION="The Openstack authentication, authorization, and service catalog"
+HOMEPAGE="https://launchpad.net/keystone"
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/rocky/keystone.conf.sample -> keystone.conf.sample-${PV}
+	https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/rocky/keystone.policy.yaml.sample -> keystone.policy.yaml.sample-${PV}"
+	EGIT_REPO_URI="https://github.com/openstack/keystone.git"
+	EGIT_BRANCH="stable/rocky"
+else
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/rocky/keystone.conf.sample -> keystone.conf.sample-${PV}
+	https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/rocky/keystone.policy.yaml.sample -> keystone.policy.yaml.sample-${PV}
+	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+sqlite ldap memcached mongo mysql postgres test"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/flask-1.0.2[${PYTHON_USEDEP}]
+	>=dev-python/flask-restful-0.3.5[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	sqlite? (
+		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/passlib-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
+	>=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
+	>=dev-python/scrypt-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.21.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/oauthlib-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/pysaml2-4.5.0[${PYTHON_USEDEP}]
+	>=dev-python/dogpile-cache-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
+	!~dev-python/pycadf-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+	memcached? (
+		>=dev-python/python-memcached-1.56[${PYTHON_USEDEP}]
+	)
+	mongo? (
+		>=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}]
+		!~dev-python/pymongo-3.1[${PYTHON_USEDEP}]
+	)
+	ldap? (
+		>=dev-python/pyldap-2.4.20[${PYTHON_USEDEP}]
+		>=dev-python/ldappool-2.0.0[${PYTHON_USEDEP}]
+	)
+	|| (
+		www-servers/uwsgi[python,${PYTHON_USEDEP}]
+		www-apache/mod_wsgi[${PYTHON_USEDEP}]
+		www-servers/gunicorn[${PYTHON_USEDEP}]
+	)"
+
+#PATCHES=(
+#)
+
+pkg_setup() {
+	enewgroup keystone
+	enewuser keystone -1 -1 /var/lib/keystone keystone
+}
+
+python_prepare_all() {
+	# it's in git, but not in the tarball.....
+	sed -i '/^hacking/d' test-requirements.txt || die
+	mkdir -p ${PN}/tests/tmp/ || die
+	cp etc/keystone-paste.ini ${PN}/tests/tmp/ || die
+	sed -i 's|/usr/local|/usr|g' httpd/keystone-uwsgi-* || die
+	sed -i 's|python|python27|g' httpd/keystone-uwsgi-* || die
+	# allow useage of renamed msgpack
+	sed -i '/^msgpack/d' requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -I 'test_keystoneclient*' \
+		-e test_static_translated_string_is_Message \
+		-e test_get_token_id_error_handling \
+		-e test_provider_token_expiration_validation \
+		-e test_import --process-restartworker --process-timeout=60 || die "testsuite failed under python2.7"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	diropts -m 0750
+	keepdir /etc/keystone /var/log/keystone
+	insinto /etc/keystone
+	insopts -m0640 -okeystone -gkeystone
+	newins "${DISTDIR}/keystone.conf.sample-${PV}" keystone.conf.sample
+	newins "${DISTDIR}/keystone.policy.yaml.sample-${PV}" keystone.policy.yaml.sample
+	doins etc/logging.conf.sample
+	doins etc/default_catalog.templates
+	doins etc/policy.v3cloudsample.json
+	doins etc/keystone-paste.ini
+	insinto /etc/keystone/httpd
+	doins httpd/*
+
+	fowners keystone:keystone /etc/keystone /etc/keystone/httpd /var/log/keystone
+}
+
+pkg_postinst() {
+	elog "You might want to run:"
+	elog "emerge --config =${CATEGORY}/${PF}"
+	elog "if this is a new install."
+	elog "If you have not already configured your openssl installation"
+	elog "please do it by modifying /etc/ssl/openssl.cnf"
+	elog "BEFORE issuing the configuration command."
+	elog "Otherwise default values will be used."
+}
+
+pkg_config() {
+	if [ ! -d "${ROOT}"/etc/keystone/ssl ] ; then
+		einfo "Press ENTER to configure the keystone PKI, or Control-C to abort now..."
+		read
+		"${ROOT}"/usr/bin/keystone-manage pki_setup --keystone-user keystone --keystone-group keystone
+	else
+		einfo "keystone PKI certificates directory already present, skipping configuration"
+	fi
+}
diff --git a/sys-auth/keystone/keystone-2018.2.9999.ebuild b/sys-auth/keystone/keystone-2018.2.9999.ebuild
new file mode 100644
index 000000000000..3fe0e204e8f3
--- /dev/null
+++ b/sys-auth/keystone/keystone-2018.2.9999.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 user
+
+DESCRIPTION="The Openstack authentication, authorization, and service catalog"
+HOMEPAGE="https://launchpad.net/keystone"
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/rocky/keystone.conf.sample -> keystone.conf.sample-${PV}
+	https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/rocky/keystone.policy.yaml.sample -> keystone.policy.yaml.sample-${PV}"
+	EGIT_REPO_URI="https://github.com/openstack/keystone.git"
+	EGIT_BRANCH="stable/rocky"
+else
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/rocky/keystone.conf.sample -> keystone.conf.sample-${PV}
+	https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/rocky/keystone.policy.yaml.sample -> keystone.policy.yaml.sample-${PV}
+	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+sqlite ldap memcached mongo mysql postgres test"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/flask-1.0.2[${PYTHON_USEDEP}]
+	>=dev-python/flask-restful-0.3.5[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	sqlite? (
+		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/passlib-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
+	>=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
+	>=dev-python/scrypt-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.21.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/oauthlib-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/pysaml2-4.5.0[${PYTHON_USEDEP}]
+	>=dev-python/dogpile-cache-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
+	!~dev-python/pycadf-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+	memcached? (
+		>=dev-python/python-memcached-1.56[${PYTHON_USEDEP}]
+	)
+	mongo? (
+		>=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}]
+		!~dev-python/pymongo-3.1[${PYTHON_USEDEP}]
+	)
+	ldap? (
+		>=dev-python/pyldap-2.4.20[${PYTHON_USEDEP}]
+		>=dev-python/ldappool-2.0.0[${PYTHON_USEDEP}]
+	)
+	|| (
+		www-servers/uwsgi[python,${PYTHON_USEDEP}]
+		www-apache/mod_wsgi[${PYTHON_USEDEP}]
+		www-servers/gunicorn[${PYTHON_USEDEP}]
+	)"
+
+#PATCHES=(
+#)
+
+pkg_setup() {
+	enewgroup keystone
+	enewuser keystone -1 -1 /var/lib/keystone keystone
+}
+
+python_prepare_all() {
+	# it's in git, but not in the tarball.....
+	sed -i '/^hacking/d' test-requirements.txt || die
+	mkdir -p ${PN}/tests/tmp/ || die
+	cp etc/keystone-paste.ini ${PN}/tests/tmp/ || die
+	sed -i 's|/usr/local|/usr|g' httpd/keystone-uwsgi-* || die
+	sed -i 's|python|python27|g' httpd/keystone-uwsgi-* || die
+	# allow useage of renamed msgpack
+	sed -i '/^msgpack/d' requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -I 'test_keystoneclient*' \
+		-e test_static_translated_string_is_Message \
+		-e test_get_token_id_error_handling \
+		-e test_provider_token_expiration_validation \
+		-e test_import --process-restartworker --process-timeout=60 || die "testsuite failed under python2.7"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	diropts -m 0750
+	keepdir /etc/keystone /var/log/keystone
+	insinto /etc/keystone
+	insopts -m0640 -okeystone -gkeystone
+	newins "${DISTDIR}/keystone.conf.sample-${PV}" keystone.conf.sample
+	newins "${DISTDIR}/keystone.policy.yaml.sample-${PV}" keystone.policy.yaml.sample
+	doins etc/logging.conf.sample
+	doins etc/default_catalog.templates
+	doins etc/policy.v3cloudsample.json
+	doins etc/keystone-paste.ini
+	insinto /etc/keystone/httpd
+	doins httpd/*
+
+	fowners keystone:keystone /etc/keystone /etc/keystone/httpd /var/log/keystone
+}
+
+pkg_postinst() {
+	elog "You might want to run:"
+	elog "emerge --config =${CATEGORY}/${PF}"
+	elog "if this is a new install."
+	elog "If you have not already configured your openssl installation"
+	elog "please do it by modifying /etc/ssl/openssl.cnf"
+	elog "BEFORE issuing the configuration command."
+	elog "Otherwise default values will be used."
+}
+
+pkg_config() {
+	if [ ! -d "${ROOT}"/etc/keystone/ssl ] ; then
+		einfo "Press ENTER to configure the keystone PKI, or Control-C to abort now..."
+		read
+		"${ROOT}"/usr/bin/keystone-manage pki_setup --keystone-user keystone --keystone-group keystone
+	else
+		einfo "keystone PKI certificates directory already present, skipping configuration"
+	fi
+}
diff --git a/sys-auth/libfprint/Manifest b/sys-auth/libfprint/Manifest
index 6ca56a2463be..e35dee7405aa 100644
--- a/sys-auth/libfprint/Manifest
+++ b/sys-auth/libfprint/Manifest
@@ -1,14 +1,8 @@
-AUX libfprint-0.5.0-automake-1.13.patch 797 BLAKE2B f84501e22e85efd9e9992bfbbe89191d86dd8353efe821f457f13090ff9e19ae2899dc8ab934d26b532270ed1054daa9e6e42519dee52ea16b5ba66aea486b0e SHA512 76e059f076348beb720e4f7bf8802b101aaf1d281429cdeb8f54ca67c23a1bf198b0220e4ff67421005cc8797c310f624265d5c91e9160fd78a2a3cf9ef4a39e
-AUX libfprint-0.5.0-support-147e_2020.patch 1443 BLAKE2B 77e57f424d5727d00baa82b1d50f145dbf7e464af7739d2ed8fbdf4dab367e575f8d10d9623f960f0d00689ab5619f56ed124e1a2f3f479f23faae3da7e671a3 SHA512 e8e47563fc09f5ac018a52577db4998c259884a9251b6c7c2709d4e214a1ebe5820b92739da0b1cac88114545d450409454e882591a59fd27ca981172682af9e
 AUX libfprint-0.6.0-fix-udev-rules.patch 1436 BLAKE2B 0e1d31c33ba0a1462e4c5482545802a253fad032a2148debe1be9a99452257e15c3a84df7ff74c5834718aeaa404a154a23f0f8cce634bc568a6f60b6327f4b7 SHA512 b3b191814e0decccaa6e6b1edad70db23e756c319e512f0f236a62845de41ba1982b510f3b0edd699202ba8de9f56afa68a9fef000ac88a61c1ae9d8d5d8a55d
-DIST libfprint-0.4.0.tar.bz2 228518 BLAKE2B 6a40eed5c4aa1e6f4365862fbe4abca3c0d220cfd7ed0395020957602d592529a61d0e8aea21a02c50b65897411a9ce69599261a23f5478e41954dfc1ea3368e SHA512 26361101f5b73f722c14109d7e9cb78738968d2cfc6fcb824dc56f0044c8cd866fcb57e7f432e3ec3eeba956d92b2a091b5daed77c992f61d75cb3ed323adc09
-DIST libfprint-0.5.0.tar.bz2 277118 BLAKE2B a90db33daa3be287c2e68edd12547c9a42ce8a557a8cbbb53779b88b7e732b02cd484445d6e48cc2a4bc2c8b8013deafbb4e9c67e4a3955b1ab1c00f6f33679d SHA512 2a5a4d45bd11060964e34c70b2a41e45d220e3b97d07a962c939ec84988a85a4d97898c86b1e7f7c571d85bb7f4333231cf327f62907b40e6a1262cc5b365981
-DIST libfprint-0.5.1-add-vfs5011-driver.patch 338763 BLAKE2B e86e22f76f0a261e6f4bc80e23ef9af8305eb8b9f382016786cdd3ed0e4d0db5f9c1f102d696153f3d2f9730da24f52aabee09133ce2ce54be390454fcf13ae7 SHA512 446de6dea67c4b4d257f5427b5981f28ba6ab422dcd022862541e6216c1733f146f86ee5a8ad855c142ce1bc7795c72820112d68d68bb74bd68751a02dd42fb5
-DIST libfprint-0.5.1.tar.bz2 277342 BLAKE2B ebf653f147d3c75ab9885ffc4a30fb07235ba80cf2fc1dfaa2db6e9b9afa52b20a9c4ec8d73fb15089731d20a6945b1e9920096ffbc7f9dadba88068efa7958e SHA512 e1596e28f2730501b5957d2b4365f8eead7c0941434d064ceb6e5321d0e8495e71ab576b214881441bf1abc6ecba2b3ffafe5027f738f80c8c38b4e95866c8c7
+AUX libfprint-0.8.2-fix-implicit-declaration.patch 4831 BLAKE2B ec61d1ee189549f4456634b5b0157f32c61b2255330681b96bc50c73d9a5d51c1058f4f82b979ca4695d9d1065b0623e86be943f98c1582725bcddda0630156b SHA512 afd4e7c5ee65a91b17aa8bec4c6a0ba5b972e9f2586a0cfa7adc823d2a1f8d2378ed28928c5108870d2347f3edb2f343a24b2eaef6c015b7650834b4d76ceb73
 DIST libfprint-0.6.0.tar.bz2 323590 BLAKE2B 8a592241ded8826337db075dd26960a9712e1a01855c6fd2c461b73ea6e2fac5248bce16165144b48271b368d0b2a82963eab00a64a88c27539e19aee54b9ba4 SHA512 2ab9ceec0c357779c94d3b8e94c11a733825bd735bec0e5c762d215d69bf295da0c5db7fd365e2a7efdcf25747777371f793b5e99d5c98e1bf9dcb1170e10ef9
 DIST libfprint-0.6.0_vfs0050.patch.gz 9944 BLAKE2B b53a74f64c9691cee7c4e7f2f54afcffe2b00b63914900ed107426a9e42721548caa1ec80e1e39251ee6a0daec6ecf7f80d6704d37bc984dd1ac76320d0b4256 SHA512 658f936c462cf50d4325d33da6c8298768dfbe4bf442933fc197c8f4bebd741ef6878bcfe123606790c3ddcc3e217fd5f97b3755d36b181c5837dc28e146d674
-EBUILD libfprint-0.4.0-r1.ebuild 1068 BLAKE2B e80c359e0bd4afed41063b0bad4aa7144a342520fdffda10f2ebbea630fabcbba8422474005c82de28d065fe2f349f863d20cc664af1ff9550c8a1445f781f32 SHA512 8c94812ca690945c455dd71f34b50c323e966e2f7997326c003c33ff5403ffde3953efa9fbd8b8c75a50fd9cad805a6e9aa92d0fb6c0ab20da987ff3789a11f9
-EBUILD libfprint-0.5.0-r2.ebuild 1200 BLAKE2B 3f26892b852549d6ce13c5808518afb791239cfa8242bb10ab0d8a3a05058f0fc458a421c6b6a6f5e6cd247092ddf4e07585ab9aada9e52983978a553daa6ca6 SHA512 ff419c47707d1a26835bcf25d412d92b1dab2ac15927d86107f09200f85a849f9f647799b472b3697f908cdc7d9fd2cd01b9d5b8da579158a274bb74ee2fbf6f
-EBUILD libfprint-0.5.1-r2.ebuild 1257 BLAKE2B d9cf70ff5315eb87402db4e63c268f3b835a2dfb34751c03cf6bfdbabf96d16e7599db754349ff802f9a4e2bba63b3005f6826b4f71ee39107ab23f35abe92d9 SHA512 e51fd3caabcd5e3a1db0ce22ac74cf7221428584fd3160232c4a430c4bb2fc378847b8ad8e1548a1f2ca535d892146f2eaa49d13d7fc48d0a095b252f15b7800
+DIST libfprint-0.8.2.tar.gz 418437 BLAKE2B 396fee3b84958f273462fe92553a6a2dbefcadfc54c56531855fcef94613cd03ba68705585802992f86aa8175cb7dda0e80e96931de4a11da973b1f9ce2c4777 SHA512 56f7927adcb40866bfef67624221b921ba3d68e770e707c432f47c0bb1f5e233fd2427bacb448544167257b6ad9edf9008a188f408142288f4dbfee2115e9a8f
 EBUILD libfprint-0.6.0-r2.ebuild 1273 BLAKE2B 4e5371e38e79e1dfe0c25e36cfa79d03c2b823c145110fd9c8e13a241534cce708e7a67090bdacd203aab33693c46f494780ec46b6dea6a486b88b4a9a01487b SHA512 4e6d1285e871c53be91dc4ae834cd040dd5932d61c38cccb628c86d8b7cad5652faf498943ab8941041a32b5138a033b934a9d6ebaa5662dbfff285f458ba759
-MISC metadata.xml 348 BLAKE2B e32864052d6e6ce6c7f9acb93908a337c47811334e279d20d23bfc6939c993593caed200b9e403e0fb9b37fc0339224d14342c631949af8ce3ed5fcb6387d266 SHA512 2f678a8d401f6823cbcd351316428e571a0cc1026656dd249abda031f690feef55f2628b79bea4c0b44c6f70af099717d04bdb854f17a20ee41d46860fd28eff
+EBUILD libfprint-0.8.2.ebuild 1062 BLAKE2B 3bba972cd7430dee34580eb55edeff675f37e3a4fa84d34c36cd10fb6ec2100816b1c04dd9aa80d2f661fc2ae795e0f138eccda479e561214a030a3532d5943a SHA512 841e8e8782def4748405ab0014460c5db155332979a74166299c5c5ea70419a51d3b23db002986896164061b64c718260080f5d3c7d6625c6bbbb4cdbb765732
+MISC metadata.xml 447 BLAKE2B e0f443394ed8326d9077c7d8cedec0430d7faa1c4df14d10714ad82b53f5cf35f3c5867648ef8ce8ae6bdaea19975792d061bd9ca1ebe9308e105f3a46eb9a9d SHA512 d0a3100d7eb26bc5164172a541e9d0541a75f0a1caeb5631900820a2c020becf96e237e45e1dd60a1d1b1f08015f56f2110cc94631816d73befca0d0fcbdfa2d
diff --git a/sys-auth/libfprint/files/libfprint-0.5.0-automake-1.13.patch b/sys-auth/libfprint/files/libfprint-0.5.0-automake-1.13.patch
deleted file mode 100644
index e82082ab6d6a..000000000000
--- a/sys-auth/libfprint/files/libfprint-0.5.0-automake-1.13.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 43eca622cd49b58c87157e1ff1a2fcfdfba0934e Mon Sep 17 00:00:00 2001
-From: Vasily Khoruzhick <anarsoul@gmail.com>
-Date: Sun, 13 Jan 2013 13:42:13 +0000
-Subject: configure.ac: Use AC_CONFIG_HEADERS
-
-AM_CONFIG_HEADER is obsolete, use AC_CONFIG_HEADERS instead of it.
-
-https://bugs.freedesktop.org/show_bug.cgi?id=59320
----
-diff --git a/configure.ac b/configure.ac
-index 6737256..978ef0d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2,7 +2,7 @@ AC_INIT([libfprint], [0.5.0])
- AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz check-news])
- AC_CONFIG_MACRO_DIR([m4])
- AC_CONFIG_SRCDIR([libfprint/core.c])
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- 
- # Enable silent build when available (Automake 1.11)
- m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
---
-cgit v0.9.0.2-2-gbebe
diff --git a/sys-auth/libfprint/files/libfprint-0.5.0-support-147e_2020.patch b/sys-auth/libfprint/files/libfprint-0.5.0-support-147e_2020.patch
deleted file mode 100644
index 98f72aed5a0d..000000000000
--- a/sys-auth/libfprint/files/libfprint-0.5.0-support-147e_2020.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 3b3679c900f6739f7067f8d720e15d548bb39be9 Mon Sep 17 00:00:00 2001
-From: Vasily Khoruzhick <anarsoul@gmail.com>
-Date: Sun, 13 Jan 2013 13:43:38 +0000
-Subject: upeke2: Add support for 147e:2020 ID
-
-https://bugs.freedesktop.org/show_bug.cgi?id=59320
----
-diff --git a/libfprint/drivers/upeke2.c b/libfprint/drivers/upeke2.c
-index ed8f43d..a7db54d 100644
---- a/libfprint/drivers/upeke2.c
-+++ b/libfprint/drivers/upeke2.c
-@@ -46,6 +46,11 @@
- #define MSG_READ_BUF_SIZE 0x40
- #define MAX_DATA_IN_READ_BUF (MSG_READ_BUF_SIZE - 9)
- 
-+enum {
-+        UPEKE2_2016,
-+        UPEKE2_2020,
-+};
-+
- struct upeke2_dev {
- 	gboolean enroll_passed;
- 	gboolean first_verify_iteration;
-@@ -848,8 +853,10 @@ static struct fpi_ssm *deinitsm_new(struct fp_dev *dev)
- 
- static int discover(struct libusb_device_descriptor *dsc, uint32_t *devtype)
- {
--	/* Revision 2 is what we're interested in */
--	if (dsc->bcdDevice == 2)
-+	if (dsc->idProduct == 0x2016 && dsc->bcdDevice == 2)
-+		return 1;
-+
-+	if (dsc->idProduct == 0x2020 && dsc->bcdDevice == 1)
- 		return 1;
- 
- 	return 0;
-@@ -1453,7 +1460,8 @@ static int verify_stop(struct fp_dev *dev, gboolean iterating)
- }
- 
- static const struct usb_id id_table[] = {
--	{ .vendor = 0x147e, .product = 0x2016 },
-+	{ .vendor = 0x147e, .product = 0x2016, .driver_data = UPEKE2_2016 },
-+	{ .vendor = 0x147e, .product = 0x2020, .driver_data = UPEKE2_2020 },
- 	{ 0, 0, 0, }, /* terminating entry */
- };
- 
---
-cgit v0.9.0.2-2-gbebe
diff --git a/sys-auth/libfprint/files/libfprint-0.8.2-fix-implicit-declaration.patch b/sys-auth/libfprint/files/libfprint-0.8.2-fix-implicit-declaration.patch
new file mode 100644
index 000000000000..15b49597238c
--- /dev/null
+++ b/sys-auth/libfprint/files/libfprint-0.8.2-fix-implicit-declaration.patch
@@ -0,0 +1,194 @@
+From 17cbe376872d8a0f579a0497942a5d2f19facaf5 Mon Sep 17 00:00:00 2001
+From: Mikle Kolyada <zlogene@gentoo.org>
+Date: Sun, 2 Sep 2018 17:20:03 +0300
+Subject: [PATCH] Fix implicit declaration warnings
+
+---
+ libfprint/drivers/aes1610.c    | 2 ++
+ libfprint/drivers/aes2501.c    | 2 ++
+ libfprint/drivers/aes2550.c    | 2 ++
+ libfprint/drivers/aesx660.c    | 2 ++
+ libfprint/drivers/etes603.c    | 2 ++
+ libfprint/drivers/upeksonly.c  | 2 ++
+ libfprint/drivers/upektc.c     | 2 ++
+ libfprint/drivers/upektc_img.c | 2 ++
+ libfprint/drivers/upekts.c     | 2 ++
+ libfprint/drivers/vfs0050.c    | 2 ++
+ libfprint/drivers/vfs101.c     | 3 +++
+ libfprint/drivers/vfs301.c     | 3 +++
+ libfprint/drivers/vfs5011.c    | 2 ++
+ 13 files changed, 28 insertions(+)
+
+diff --git a/libfprint/drivers/aes1610.c b/libfprint/drivers/aes1610.c
+index f307a3b..9dc3383 100644
+--- a/libfprint/drivers/aes1610.c
++++ b/libfprint/drivers/aes1610.c
+@@ -25,6 +25,8 @@
+ 
+ #define FP_COMPONENT "aes1610"
+ 
++#include <string.h>
++
+ #include "drivers_api.h"
+ #include "aeslib.h"
+ 
+diff --git a/libfprint/drivers/aes2501.c b/libfprint/drivers/aes2501.c
+index 87879a4..caaf3ea 100644
+--- a/libfprint/drivers/aes2501.c
++++ b/libfprint/drivers/aes2501.c
+@@ -23,6 +23,8 @@
+ 
+ #define FP_COMPONENT "aes2501"
+ 
++#include <string.h>
++
+ #include "drivers_api.h"
+ #include "aeslib.h"
+ #include "aes2501.h"
+diff --git a/libfprint/drivers/aes2550.c b/libfprint/drivers/aes2550.c
+index ab4acaa..c838e54 100644
+--- a/libfprint/drivers/aes2550.c
++++ b/libfprint/drivers/aes2550.c
+@@ -23,6 +23,8 @@
+ 
+ #define FP_COMPONENT "aes2550"
+ 
++#include <string.h>
++
+ #include "drivers_api.h"
+ #include "aes2550.h"
+ #include "aeslib.h"
+diff --git a/libfprint/drivers/aesx660.c b/libfprint/drivers/aesx660.c
+index e443e21..17c0245 100644
+--- a/libfprint/drivers/aesx660.c
++++ b/libfprint/drivers/aesx660.c
+@@ -23,6 +23,8 @@
+ 
+ #define FP_COMPONENT "aesX660"
+ 
++#include <string.h>
++
+ #include "drivers_api.h"
+ #include "aeslib.h"
+ #include "aesx660.h"
+diff --git a/libfprint/drivers/etes603.c b/libfprint/drivers/etes603.c
+index fdaf7f2..0782f9e 100644
+--- a/libfprint/drivers/etes603.c
++++ b/libfprint/drivers/etes603.c
+@@ -35,6 +35,8 @@
+ 
+ #define FP_COMPONENT "etes603"
+ 
++#include <string.h>
++
+ #include "drivers_api.h"
+ #include "driver_ids.h"
+ 
+diff --git a/libfprint/drivers/upeksonly.c b/libfprint/drivers/upeksonly.c
+index 9cccb86..e035408 100644
+--- a/libfprint/drivers/upeksonly.c
++++ b/libfprint/drivers/upeksonly.c
+@@ -25,6 +25,8 @@
+ 
+ #define FP_COMPONENT "upeksonly"
+ 
++#include <string.h>
++
+ #include "drivers_api.h"
+ #include "upeksonly.h"
+ 
+diff --git a/libfprint/drivers/upektc.c b/libfprint/drivers/upektc.c
+index ffa31f3..e4d7de5 100644
+--- a/libfprint/drivers/upektc.c
++++ b/libfprint/drivers/upektc.c
+@@ -20,6 +20,8 @@
+ 
+ #define FP_COMPONENT "upektc"
+ 
++#include <string.h>
++
+ #include "drivers_api.h"
+ #include "upektc.h"
+ 
+diff --git a/libfprint/drivers/upektc_img.c b/libfprint/drivers/upektc_img.c
+index f0f2f18..a500623 100644
+--- a/libfprint/drivers/upektc_img.c
++++ b/libfprint/drivers/upektc_img.c
+@@ -19,6 +19,8 @@
+ 
+ #define FP_COMPONENT "upektc_img"
+ 
++#include <string.h>
++
+ #include "drivers_api.h"
+ #include "aeslib.h"
+ #include "upektc_img.h"
+diff --git a/libfprint/drivers/upekts.c b/libfprint/drivers/upekts.c
+index b448e36..1094e66 100644
+--- a/libfprint/drivers/upekts.c
++++ b/libfprint/drivers/upekts.c
+@@ -27,6 +27,8 @@
+ 
+ #define FP_COMPONENT "upekts"
+ 
++#include <string.h>
++
+ #include "drivers_api.h"
+ 
+ #define EP_IN (1 | LIBUSB_ENDPOINT_IN)
+diff --git a/libfprint/drivers/vfs0050.c b/libfprint/drivers/vfs0050.c
+index dcf5d69..60a720e 100644
+--- a/libfprint/drivers/vfs0050.c
++++ b/libfprint/drivers/vfs0050.c
+@@ -19,6 +19,8 @@
+ 
+ #define FP_COMPONENT "vfs0050"
+ 
++#include <string.h>
++
+ #include "drivers_api.h"
+ #include "vfs0050.h"
+ 
+diff --git a/libfprint/drivers/vfs101.c b/libfprint/drivers/vfs101.c
+index 3304b1f..473adf2 100644
+--- a/libfprint/drivers/vfs101.c
++++ b/libfprint/drivers/vfs101.c
+@@ -19,6 +19,9 @@
+ 
+ #define FP_COMPONENT "vfs101"
+ 
++#include <stdlib.h>
++#include <string.h>
++
+ #include "drivers_api.h"
+ 
+ /* Input-Output usb endpoint */
+diff --git a/libfprint/drivers/vfs301.c b/libfprint/drivers/vfs301.c
+index a34ee31..6f52316 100644
+--- a/libfprint/drivers/vfs301.c
++++ b/libfprint/drivers/vfs301.c
+@@ -21,6 +21,9 @@
+ 
+ #define FP_COMPONENT "vfs301"
+ 
++#include <stdlib.h>
++#include <string.h>
++
+ #include "drivers_api.h"
+ #include "vfs301_proto.h"
+ 
+diff --git a/libfprint/drivers/vfs5011.c b/libfprint/drivers/vfs5011.c
+index 8b460ac..1355394 100644
+--- a/libfprint/drivers/vfs5011.c
++++ b/libfprint/drivers/vfs5011.c
+@@ -18,6 +18,8 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
++#include <string.h>
++
+ #include "drivers_api.h"
+ #include "vfs5011_proto.h"
+ 
+-- 
+2.16.4
diff --git a/sys-auth/libfprint/libfprint-0.4.0-r1.ebuild b/sys-auth/libfprint/libfprint-0.4.0-r1.ebuild
deleted file mode 100644
index d6f8ebcf26e0..000000000000
--- a/sys-auth/libfprint/libfprint-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools eutils udev
-
-MY_PV="v_${PV//./_}"
-DESCRIPTION="library to add support for consumer fingerprint readers"
-HOMEPAGE="https://cgit.freedesktop.org/libfprint/libfprint/"
-SRC_URI="https://cgit.freedesktop.org/${PN}/${PN}/snapshot/${MY_PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
-IUSE="debug static-libs"
-
-RDEPEND="virtual/libusb:1
-	dev-libs/nss
-	|| ( virtual/imagemagick-tools x11-libs/gdk-pixbuf )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_PV}
-
-src_prepare() {
-	mkdir m4 || die
-	eautoreconf
-}
-
-pkg_setup() {
-	einfo
-	elog "This version does not support fdu2000 and upektc (yet)."
-	einfo
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug debug-log) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		udev_rulesdir="$(get_udevdir)/rules.d" \
-		install
-
-	prune_libtool_files
-	dodoc AUTHORS HACKING NEWS README THANKS TODO
-}
diff --git a/sys-auth/libfprint/libfprint-0.5.0-r2.ebuild b/sys-auth/libfprint/libfprint-0.5.0-r2.ebuild
deleted file mode 100644
index 9e1a994e4533..000000000000
--- a/sys-auth/libfprint/libfprint-0.5.0-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools eutils udev vcs-snapshot
-
-MY_PV="v_${PV//./_}"
-DESCRIPTION="library to add support for consumer fingerprint readers"
-HOMEPAGE="https://cgit.freedesktop.org/libfprint/libfprint/"
-SRC_URI="https://cgit.freedesktop.org/${PN}/${PN}/snapshot/${MY_PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 x86"
-IUSE="debug static-libs"
-
-RDEPEND="virtual/libusb:1
-	dev-libs/nss
-	|| ( virtual/imagemagick-tools x11-libs/gdk-pixbuf )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-automake-1.13.patch"
-	epatch "${FILESDIR}/${P}-support-147e_2020.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-drivers=all \
-		$(use_enable debug debug-log) \
-		$(use_enable static-libs static) \
-		-enable-udev-rules \
-		--with-udev-rules-dir=$(get_udevdir)/rules.d
-	# --disable-udev-rules fails https://bugs.freedesktop.org/show_bug.cgi?id=59076
-	# $(use_enable udev udev-rules) \
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	prune_libtool_files
-
-	dodoc AUTHORS HACKING NEWS README THANKS TODO
-}
diff --git a/sys-auth/libfprint/libfprint-0.5.1-r2.ebuild b/sys-auth/libfprint/libfprint-0.5.1-r2.ebuild
deleted file mode 100644
index 4aacb0111500..000000000000
--- a/sys-auth/libfprint/libfprint-0.5.1-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils udev vcs-snapshot
-
-MY_PV="v_${PV//./_}"
-DESCRIPTION="library to add support for consumer fingerprint readers"
-HOMEPAGE="https://cgit.freedesktop.org/libfprint/libfprint/"
-SRC_URI="https://cgit.freedesktop.org/${PN}/${PN}/snapshot/${MY_PV}.tar.bz2 -> ${P}.tar.bz2
-	https://dev.gentoo.org/~patrick/libfprint-0.5.1-add-vfs5011-driver.patch"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="debug static-libs"
-
-RDEPEND="virtual/libusb:1
-	dev-libs/glib:2
-	dev-libs/nss
-	|| ( virtual/imagemagick-tools x11-libs/gdk-pixbuf )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${DISTDIR}/${P}-add-vfs5011-driver.patch" || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-drivers=all \
-		$(use_enable debug debug-log) \
-		$(use_enable static-libs static) \
-		-enable-udev-rules \
-		--with-udev-rules-dir=$(get_udevdir)/rules.d
-	# --disable-udev-rules fails https://bugs.freedesktop.org/show_bug.cgi?id=59076
-	# $(use_enable udev udev-rules) \
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	prune_libtool_files
-
-	dodoc AUTHORS HACKING NEWS README THANKS TODO
-}
diff --git a/sys-auth/libfprint/libfprint-0.8.2.ebuild b/sys-auth/libfprint/libfprint-0.8.2.ebuild
new file mode 100644
index 000000000000..da49365cca3f
--- /dev/null
+++ b/sys-auth/libfprint/libfprint-0.8.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eapi7-ver meson udev
+
+DESCRIPTION="library to add support for consumer fingerprint readers"
+HOMEPAGE="https://cgit.freedesktop.org/libfprint/libfprint/ https://github.com/freedesktop/libfprint"
+SRC_URI="https://github.com/freedesktop/libfprint/archive/V_$(ver_rs 0-3 '_').tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc examples"
+
+RDEPEND="dev-libs/glib:2
+	 dev-libs/nss
+	 virtual/libusb:1=
+	 x11-libs/pixman
+	 x11-libs/libX11
+	 x11-libs/libXv"
+
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc
+	virtual/pkgconfig"
+
+PATCHES=( ${FILESDIR}/${P}-fix-implicit-declaration.patch )
+
+S="${WORKDIR}/${PN}-V_$(ver_rs 0-3 '_')"
+
+src_configure() {
+		local emesonargs=(
+			-Ddoc=$(usex doc true false)
+			-Dx11-examples=$(usex examples true false)
+			-Ddrivers=all
+			-Dudev_rules=true
+			-Dudev_rules_dir=$(get_udevdir)/rules.d
+			--libdir=/usr/$(get_libdir)
+		)
+		meson_src_configure
+}
diff --git a/sys-auth/libfprint/metadata.xml b/sys-auth/libfprint/metadata.xml
index 8fe32539538d..94aee5a2fc69 100644
--- a/sys-auth/libfprint/metadata.xml
+++ b/sys-auth/libfprint/metadata.xml
@@ -2,10 +2,14 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="person">
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
+	<email>xmw@gentoo.org</email>
+	<name>Michael Weber</name>
+</maintainer>
+<maintainer type="person">
+	<email>zlogene@gentoo.org</email>
+	<name>Mikle Kolyada</name>
 </maintainer>
 <upstream>
-        <bugs-to>https://bugs.freedesktop.org/enter_bug.cgi?product=libfprint</bugs-to>
+	<bugs-to>https://bugs.freedesktop.org/enter_bug.cgi?product=libfprint</bugs-to>
 </upstream>
 </pkgmetadata>
diff --git a/sys-auth/nss-mdns/Manifest b/sys-auth/nss-mdns/Manifest
index 47e8c5119f34..760843868a75 100644
--- a/sys-auth/nss-mdns/Manifest
+++ b/sys-auth/nss-mdns/Manifest
@@ -1,11 +1,5 @@
 AUX mdns.allow 29 BLAKE2B 9227054a8809f3fdb2f08cf317bc72d8ba44e860cacdf7818737994c28edb8819e1e77d3eb467450c0c1306710d7b0447353b7bb0771b31829ac8999a3d0efbb SHA512 a89d2f8288acd653192ac463f784cdd8a8e8e014094e997d99c4ad5c6522cd3cf1f161714d15b28d9db2cfba60b55302f20a0e810bcf5c9ba633a5ee42dc3f50
-AUX nss-mdns-0.10-avahi-socket.patch 394 BLAKE2B df775332dc37a4f333985688f910b7b2f7ed6669635c2b6629ef4e01e1877a8d51d4b090a4f21147cd08dfa0dd19a33969ea4be7d24d3497b67c9ded0550e3f2 SHA512 79bfccaab009a3affc44ea5d02b572adbe3637aca27064e6cc5d347a74d36c0244b31f7d95b68f9771af02dc1baa788d041ecbaf5d3632dd3507b52f1559f661
-AUX nss-mdns-0.10-ipv6.patch 15651 BLAKE2B 4fe76fdf2f39295bf6a6084662c396520fedd7fc00e67f5703b69605f5d22b3e74edf56cb8b752665145d5acfd44134b5e17d09533bdb191272e3e0771c68b9a SHA512 8021b5dbb7e484fc29041e54d88a01346ee1dac7840b1bc13caacb4460e7b6baa99d079f34e0b28e9d665e821ccddccc83580f315454c63bf7ba1b2f6ab4c230
-DIST nss-mdns-0.10.tar.gz 353130 BLAKE2B 88cc7cbc908f397bbf52f590946b3bc8bc4c71585c9a0a52648ae3dd23b3f5ca9fbd24f0fc7c34dff08d7a4c8d72fec94a51a65650bed41b07aec6c81220d517 SHA512 7c9f4150648dfab34bc6f8551e5b58b0b7065e4c1472efb8ce1b00b2bd75627e5928b2c199d9dae742abe839968a8774e39c7646f8ce855d342b4d90252efc0e
-DIST nss-mdns-0.11.tar.gz 382059 BLAKE2B 5523c76d6f7364efde54b9bf303dfdf34c11b96c9348bfd4a62d095215e7d6f32e0d44e22d21677d51700d458a10f9c36f7ccecb7b4add04fcba629ee19abc21 SHA512 9dceb0f244c4cd27b04ca2014637873a0d137464c26780dfdb228502b06b310991494b115e42e1057c45478361d0e441ec73099fbf56a13a5933618b72390af4
 DIST nss-mdns-0.13.tar.gz 380261 BLAKE2B 555b7b9df8ff15da423712fac04ccbc303395d38a07121906cf31871a8684c71e43809b80674a489d87397902a33f4d19b0ae49a4c384290bad227a24880476f SHA512 f1b379111fb758323179ea3e447d754e934308940b11a8402dfb6033264940d831266d15ae1ee0badfecd5cdc7f589b42e4363dfc058f5e62026017d97eb0a3b
-EBUILD nss-mdns-0.10-r3.ebuild 1689 BLAKE2B 4050f59ac44f5a510f9a7beb3be44e609d8a40bb0e54fe43c2c48ec2f128fe5d1467a23343d7029953eff93a230175c20339005e879160b1147f8044bd41d413 SHA512 f10e8583fd7624dcddcd17c17bdd5c375f22903a21e4c595bb5f7a447a5e92abbafda9f549b3f3acb8c387451b10765f4f826340484003000f04762e3732eb5b
-EBUILD nss-mdns-0.11.ebuild 1667 BLAKE2B 35aea7515b9117cacc47f8680886d5d60e63752515712ba654655e127f40e4fdf40fc8ac6967e85d01e8b32e6894b84358d344faf95b5eb199c9fb7dcd9b6fa7 SHA512 4b4f9c48ea0bb498061b98f3add9b06b148e524140b798f3ac0b3a60e830a084506231118cbf3cfd3f7d3795b7c43e9e3dfe036713a03f45b4d8dd694549eace
 EBUILD nss-mdns-0.13.ebuild 1644 BLAKE2B 4cdfeca5e34f7aae869defc2fe01098698626ffb487f78eb1eccc5275c7e63e42503914085b7dec3a899f42234bd80762dcc5fb601d350e3d69bce9d61e4389e SHA512 48c221b7575195fbfac29f05015717170e8820a4e0d17ebdbf69b2203b1356b775d65b86694a95c0333b4bacd272616ccb7ec1864886f835c8e832c3eee5985a
 EBUILD nss-mdns-9999.ebuild 1681 BLAKE2B 1ae2e683def7ecd909d010611439201c6eb3827fcc7ead3c7b6229165413f725611061deec56e31cf19682a572afe2510c58591f4a6120043a4893ca4d50abd8 SHA512 edcc52347c4d4c1abd751be2b2f8965d7153ee087ca280acc2baa875e6f50f58460dd2c419e04f35d47bfca33cd8bfdc57be741193c5b2ce2125389a4246356a
-MISC metadata.xml 795 BLAKE2B 9237e6e6cc772633d1e45db608880c8bf112a361a2914ccc8f413020d31905d10e5822c922659bd500072f47580c63c94a68f54171a259ae3dc28b0b17499387 SHA512 912e8a154a0672a58bd89ee1f52efd8d43cfbeff1f1c40def47d6bd7600fb9b74e1b11dd633ea1ad6f75ef9ae9979ac5b741cfd5df97ea6b0055b060df33c977
+MISC metadata.xml 653 BLAKE2B ee847092dada1a3128f43edc75704cbac11fd6a632498297144fec1e0df2ec307a23e7622ffda42dc714327aecc383c3051c94b82858cb90c0183b3af7d8284c SHA512 c4e1942b097d664464ec9c3c0020f87a9f3968fa00fb794650f05619683632a35650c367b851dc8220dfaf9785fb0d246ebc2a7a28ce9214dcc3cb47ed31c4c5
diff --git a/sys-auth/nss-mdns/files/nss-mdns-0.10-avahi-socket.patch b/sys-auth/nss-mdns/files/nss-mdns-0.10-avahi-socket.patch
deleted file mode 100644
index 9ada93d2b8fb..000000000000
--- a/sys-auth/nss-mdns/files/nss-mdns-0.10-avahi-socket.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://bugs.gentoo.org/159341
-
-fix the full path to the socket run dir
-
---- src/Makefile.am
-+++ src/Makefile.am
-@@ -20,7 +20,7 @@
- AM_CFLAGS = \
- 	-DMDNS_ALLOW_FILE=\"$(sysconfdir)/mdns.allow\" \
- 	-DRESOLV_CONF_FILE=\"$(sysconfdir)/resolv.conf\" \
--	-DAVAHI_SOCKET=\"$(localstatedir)/run/avahi-daemon/socket\"
-+	-DAVAHI_SOCKET=\"/var/run/avahi-daemon/socket\"
- 
- #AM_CFLAGS += -DNDEBUG=1 -Os
diff --git a/sys-auth/nss-mdns/files/nss-mdns-0.10-ipv6.patch b/sys-auth/nss-mdns/files/nss-mdns-0.10-ipv6.patch
deleted file mode 100644
index 6d6dbc9eab58..000000000000
--- a/sys-auth/nss-mdns/files/nss-mdns-0.10-ipv6.patch
+++ /dev/null
@@ -1,528 +0,0 @@
-diff -u src/avahi.c src/avahi.c
---- src/avahi.c	2006-04-29 05:14:09.000000000 +0800
-+++ src/avahi.c	2013-01-04 10:00:05.025558790 +0800
-@@ -26,6 +26,7 @@
- #include <sys/socket.h>
- #include <string.h>
- #include <stdio.h>
-+#include <stdlib.h>
- #include <sys/types.h>
- #include <arpa/inet.h>
- #include <sys/un.h>
-@@ -34,6 +35,7 @@
- 
- #include "avahi.h"
- #include "util.h"
-+#include "query.h"
- 
- #define WHITESPACE " \t"
- 
-@@ -93,7 +95,8 @@
-     p = ln+1;
-     p += strspn(p, WHITESPACE);
- 
--    /* Skip interface */
-+    /* Parse interface */
-+    if (af == AF_INET6) ((ipv6_address_t*)data)->if_idx = strtoul(p, 0, 10);
-     p += strcspn(p, WHITESPACE);
-     p += strspn(p, WHITESPACE);
- 
-diff -u src/avahi-test.c src/avahi-test.c
---- src/avahi-test.c	2007-02-09 00:42:23.000000000 +0800
-+++ src/avahi-test.c	2013-01-04 09:59:06.174017729 +0800
-@@ -24,6 +24,7 @@
- #include <stdio.h>
- 
- #include "avahi.h"
-+#include "query.h"
- 
- int main(int argc, char *argv[]) {
-     uint8_t data[64];
-@@ -35,15 +36,20 @@
-     else
-         printf("AF_INET: failed (%i).\n", r);
- 
--/*     if ((r = avahi_resolve_name(AF_INET6, argc >= 2 ? argv[1] : "cocaine.local", data)) == 0) */
--/*         printf("AF_INET6: %s\n", inet_ntop(AF_INET6, data, t, sizeof(t))); */
--/*     else */
--/*         printf("AF_INET6: failed (%i).\n", r); */
--
-     if ((r = avahi_resolve_address(AF_INET, data, t, sizeof(t))) == 0)
-         printf("REVERSE: %s\n", t);
-     else
-         printf("REVERSE: failed (%i).\n", r);
-+
-+     if ((r = avahi_resolve_name(AF_INET6, argc >= 2 ? argv[1] : "cocaine.local", data)) == 0)
-+         printf("AF_INET6: %s, %u\n", inet_ntop(AF_INET6, data, t, sizeof(t)), ((ipv6_address_t*)data)->if_idx);
-+     else
-+         printf("AF_INET6: failed (%i).\n", r);
-+
-+    if ((r = avahi_resolve_address(AF_INET6, data, t, sizeof(t))) == 0)
-+        printf("REVERSE: %s\n", t);
-+    else
-+        printf("REVERSE: failed (%i).\n", r);
- 
-     return 0;
- }
-diff -u src/bsdnss.c src/bsdnss.c
---- src/bsdnss.c	2007-02-09 00:42:23.000000000 +0800
-+++ src/bsdnss.c	2013-01-04 09:49:45.566389491 +0800
-@@ -258,6 +258,8 @@
- 			ai->ai_addrlen = sizeof(struct sockaddr_in6);
- 			memcpy(&((struct sockaddr_in6 *)psa)->sin6_addr, hap,
- 			    ai->ai_addrlen);
-+			if (((struct sockaddr_in6 *)psa)->sin6_addr[0] == 0xfe && ((struct sockaddr_in6 *)psa)->sin6_addr[0] == 0x80)
-+			    ((struct sockaddr_in6 *)psa)->sin6_scope_id = ((struct ipv6_address_t*) hap)->if_idx;
- 			break;
- 		default:
- 			ai->ai_addrlen = sizeof(struct sockaddr_storage);
-diff -u src/map-file src/map-file
---- src/map-file	2007-01-02 02:36:21.000000000 +0800
-+++ src/map-file	2013-01-07 08:56:56.406478774 +0800
-@@ -18,6 +18,12 @@
- _nss_mdns_minimal_gethostbyname2_r;         
- _nss_mdns4_minimal_gethostbyname2_r;
- _nss_mdns6_minimal_gethostbyname2_r;
-+_nss_mdns_gethostbyname4_r;         
-+_nss_mdns4_gethostbyname4_r;
-+_nss_mdns6_gethostbyname4_r;
-+_nss_mdns_minimal_gethostbyname4_r;         
-+_nss_mdns4_minimal_gethostbyname4_r;
-+_nss_mdns6_minimal_gethostbyname4_r;
- local: 
- *;
- };
-diff -u src/nss.c src/nss.c
---- src/nss.c	2013-01-07 15:14:23.000000000 +0800
-+++ src/nss.c	2013-01-07 16:52:38.399842517 +0800
-@@ -41,22 +41,27 @@
- 
- #if defined(NSS_IPV4_ONLY) && ! defined(MDNS_MINIMAL)
- #define _nss_mdns_gethostbyname2_r _nss_mdns4_gethostbyname2_r
-+#define _nss_mdns_gethostbyname4_r _nss_mdns4_gethostbyname4_r
- #define _nss_mdns_gethostbyname_r  _nss_mdns4_gethostbyname_r
- #define _nss_mdns_gethostbyaddr_r  _nss_mdns4_gethostbyaddr_r
- #elif defined(NSS_IPV4_ONLY) && defined(MDNS_MINIMAL)
- #define _nss_mdns_gethostbyname2_r _nss_mdns4_minimal_gethostbyname2_r
-+#define _nss_mdns_gethostbyname4_r _nss_mdns4_minimal_gethostbyname4_r
- #define _nss_mdns_gethostbyname_r  _nss_mdns4_minimal_gethostbyname_r
- #define _nss_mdns_gethostbyaddr_r  _nss_mdns4_minimal_gethostbyaddr_r
- #elif defined(NSS_IPV6_ONLY) && ! defined(MDNS_MINIMAL)
- #define _nss_mdns_gethostbyname2_r _nss_mdns6_gethostbyname2_r
-+#define _nss_mdns_gethostbyname4_r _nss_mdns6_gethostbyname4_r
- #define _nss_mdns_gethostbyname_r  _nss_mdns6_gethostbyname_r
- #define _nss_mdns_gethostbyaddr_r  _nss_mdns6_gethostbyaddr_r
- #elif defined(NSS_IPV6_ONLY) && defined(MDNS_MINIMAL)
- #define _nss_mdns_gethostbyname2_r _nss_mdns6_minimal_gethostbyname2_r
-+#define _nss_mdns_gethostbyname4_r _nss_mdns6_minimal_gethostbyname4_r
- #define _nss_mdns_gethostbyname_r  _nss_mdns6_minimal_gethostbyname_r
- #define _nss_mdns_gethostbyaddr_r  _nss_mdns6_minimal_gethostbyaddr_r
- #elif defined(MDNS_MINIMAL)
- #define _nss_mdns_gethostbyname2_r _nss_mdns_minimal_gethostbyname2_r
-+#define _nss_mdns_gethostbyname4_r _nss_mdns_minimal_gethostbyname4_r
- #define _nss_mdns_gethostbyname_r  _nss_mdns_minimal_gethostbyname_r
- #define _nss_mdns_gethostbyaddr_r  _nss_mdns_minimal_gethostbyaddr_r
- #endif
-@@ -81,6 +86,12 @@
-         char *name[MAX_ENTRIES];
-     } data;
- };
-+struct user_gai_buf {
-+    struct gaih_addrtuple *list_base;
-+    int list_size;
-+    int list_idx;
-+    int wrote_name;
-+};
- 
- #ifndef NSS_IPV6_ONLY
- static void ipv4_callback(const ipv4_address_t *ipv4, void *userdata) {
-@@ -93,6 +104,21 @@
-     u->data.ipv4[u->count++] = *ipv4;
-     u->data_len += sizeof(ipv4_address_t);
- }
-+static void ipv4_gai_callback(const ipv4_address_t *ipv4, void *userdata) {
-+    struct user_gai_buf *u = userdata;
-+    assert(ipv4 && userdata);
-+
-+    if (u->list_idx+1 >= u->list_size)
-+        return;
-+
-+    u->list_base[u->list_idx].name = 0;
-+    u->list_base[u->list_idx].family = AF_INET;
-+    u->list_base[u->list_idx].addr[0] = ipv4->address;
-+    u->list_base[u->list_idx].scopeid = 0;
-+    if (u->list_idx > 0) u->list_base[u->list_idx-1].next = &u->list_base[u->list_idx];
-+    u->list_base[u->list_idx].next = 0;
-+    u->list_idx += 1;
-+}
- #endif
- 
- #ifndef NSS_IPV4_ONLY
-@@ -106,6 +132,21 @@
-     u->data.ipv6[u->count++] = *ipv6;
-     u->data_len += sizeof(ipv6_address_t);
- }
-+static void ipv6_gai_callback(const ipv6_address_t *ipv6, void *userdata) {
-+    struct user_gai_buf *u = userdata;
-+    assert(ipv6 && userdata);
-+
-+    if (u->list_idx+1 >= u->list_size)
-+        return;
-+
-+    u->list_base[u->list_idx].name = 0;
-+    u->list_base[u->list_idx].family = AF_INET6;
-+    memcpy(u->list_base[u->list_idx].addr, ipv6->address, sizeof(u->list_base[u->list_idx].addr));
-+    u->list_base[u->list_idx].scopeid = ipv6->if_idx;
-+    if (u->list_idx > 0) u->list_base[u->list_idx-1].next = &u->list_base[u->list_idx];
-+    u->list_base[u->list_idx].next = 0;
-+    u->list_idx += 1;
-+}
- #endif
- 
- static void name_callback(const char*name, void *userdata) {
-@@ -538,6 +579,265 @@
- 
-     status = NSS_STATUS_SUCCESS;
-     
-+finish:
-+#ifdef ENABLE_LEGACY
-+    if (fd >= 0)
-+        close(fd);
-+#endif
-+
-+    return status;
-+}
-+
-+enum nss_status _nss_mdns_gethostbyname4_r(
-+    const char *name,
-+    struct gaih_addrtuple **pat,
-+    char *buffer,
-+    size_t buflen,
-+    int *errnop,
-+    int *h_errnop,
-+    int32_t *ttlp) {
-+
-+    struct user_gai_buf u;
-+    enum nss_status status = NSS_STATUS_UNAVAIL;
-+    int i;
-+    size_t l, idx;
-+    void (*ipv4_func)(const ipv4_address_t *ipv4, void *userdata);
-+    void (*ipv6_func)(const ipv6_address_t *ipv6, void *userdata);
-+    int name_allowed;
-+    int af = AF_UNSPEC;
-+
-+#ifdef ENABLE_AVAHI
-+    int avahi_works = 1;
-+    void * data[32];
-+#endif
-+
-+#ifdef ENABLE_LEGACY
-+    int fd = -1;
-+#endif
-+
-+    if (pat) {
-+	af = (*pat)->family;
-+    }
-+
-+/*     DEBUG_TRAP; */
-+
-+#ifdef NSS_IPV6_ONLY
-+    if (af == AF_UNSPEC)
-+        af = AF_INET6;
-+#endif
-+
-+#ifdef NSS_IPV4_ONLY
-+    if (af == AF_UNSPEC)
-+        af = AF_INET;
-+#endif
-+
-+#ifdef NSS_IPV4_ONLY
-+    if (af != AF_INET) 
-+#elif NSS_IPV6_ONLY
-+    if (af != AF_INET6)
-+#else        
-+    if (af != AF_INET && af != AF_INET6 && af != AF_UNSPEC)
-+#endif        
-+    {    
-+        *errnop = EINVAL;
-+        *h_errnop = NO_RECOVERY;
-+
-+        goto finish;
-+    }
-+
-+    if (buflen <
-+        sizeof(struct gaih_addrtuple))  {
-+        
-+        *errnop = ERANGE;
-+        *h_errnop = NO_RECOVERY;
-+        status = NSS_STATUS_TRYAGAIN;
-+        
-+        goto finish;
-+    }
-+    
-+    u.list_base = (struct user_gai_buf*) buffer;
-+    u.list_size = buflen / sizeof( struct user_gai_buf );
-+    u.list_idx = 0;
-+    u.wrote_name = 0;
-+
-+#ifdef NSS_IPV6_ONLY
-+    ipv4_func = NULL;
-+#else
-+    ipv4_func = (af == AF_INET || af == AF_UNSPEC) ? ipv4_gai_callback : NULL;
-+#endif    
-+
-+#ifdef NSS_IPV4_ONLY
-+    ipv6_func = NULL;
-+#else
-+    ipv6_func = (af == AF_INET6 || af == AF_UNSPEC) ? ipv6_gai_callback : NULL;
-+#endif
-+
-+    name_allowed = verify_name_allowed(name);
-+    
-+#ifdef ENABLE_AVAHI
-+
-+    if (avahi_works && name_allowed) {
-+        int r;
-+
-+	if (af == AF_INET || af == AF_UNSPEC) {
-+	    if ((r = avahi_resolve_name(AF_INET, name, data)) < 0)
-+		avahi_works = 0;
-+	    else if (r == 0) {
-+		if (ipv4_func) {
-+		    ipv4_func((ipv4_address_t*) data, &u);
-+		}
-+	    }
-+	    else
-+		status = NSS_STATUS_NOTFOUND;
-+	}
-+	if (af == AF_INET6 || af == AF_UNSPEC) {
-+	    if ((r = avahi_resolve_name(AF_INET6, name, data)) < 0)
-+		avahi_works = 0;
-+	    else if (r == 0) {
-+		if (ipv6_func)
-+		    ipv6_func((ipv6_address_t*)data, &u);
-+	    }
-+	    else
-+		status = NSS_STATUS_NOTFOUND;
-+	}
-+    }
-+
-+#ifdef HONOUR_SEARCH_DOMAINS
-+    if (u.list_idx == 0 && avahi_works && !ends_with(name, ".")) {
-+        char **domains;
-+
-+        if ((domains = get_search_domains())) {
-+            char **p;
-+            
-+            /* Try to concatenate host names */
-+	    for (p = domains; *p; p++) {
-+                int fullnamesize;
-+                char *fullname;
-+                
-+	        fullnamesize = strlen(name) + strlen(*p) + 2;
-+
-+                if (!(fullname = malloc(fullnamesize)))
-+                    break;
-+                
-+		snprintf(fullname, fullnamesize, "%s.%s", name, *p);
-+
-+                if (verify_name_allowed(fullname)) {
-+                    int r;
-+
-+		    if (af == AF_INET || af == AF_UNSPEC) {
-+			r = avahi_resolve_name(AF_INET, fullname, data);
-+                    
-+			if (r < 0) {
-+			    /* Lookup failed */
-+			    avahi_works = 0;
-+			    free(fullname);
-+			    break;
-+			} else if (r == 0) {
-+			    /* Lookup succeeded */
-+			    if (ipv4_func)
-+				ipv4_func((ipv4_address_t*) data, &u);
-+			}
-+		    }
-+		    if (af == AF_INET6 || af == AF_UNSPEC) {
-+			r = avahi_resolve_name(AF_INET6, fullname, data);
-+                    
-+			if (r < 0) {
-+			    /* Lookup failed */
-+			    avahi_works = 0;
-+			    free(fullname);
-+			    break;
-+			} else if (r == 0) {
-+			    /* Lookup succeeded */
-+			    if (ipv6_func)
-+				ipv6_func((ipv6_address_t*)data, &u);
-+			}
-+		    }
-+		    free(fullname);
-+		    if (u.list_idx > 0) break;
-+                    
-+		} else
-+                    free(fullname);
-+	    }
-+            
-+	    free_domains(domains);
-+	}
-+    }
-+#endif /* HONOUR_SEARCH_DOMAINS */
-+#endif /* ENABLE_AVAHI */
-+
-+#if defined(ENABLE_LEGACY) && defined(ENABLE_AVAHI)
-+    if (u.list_idx == 0 && !avahi_works) 
-+#endif
-+
-+#if defined(ENABLE_LEGACY)
-+    {
-+        if ((fd = mdns_open_socket()) < 0) {
-+            *errnop = errno;
-+            *h_errnop = NO_RECOVERY;
-+            goto finish;
-+        }
-+
-+        if (name_allowed) {
-+            /* Ignore return value */
-+            mdns_query_name(fd, name, ipv4_func, ipv6_func, &u);
-+
-+            if (!u.list_idx)
-+                status = NSS_STATUS_NOTFOUND;
-+        }
-+
-+#ifdef HONOUR_SEARCH_DOMAINS
-+        if (u.list_idx == 0 && !ends_with(name, ".")) {
-+            char **domains;
-+            
-+            /* Try the search domains if the user did not use a traling '.' */
-+            
-+            if ((domains = get_search_domains())) {
-+                char **p;
-+                
-+                for (p = domains; *p; p++) {
-+                    int fullnamesize = 0;
-+                    char *fullname = NULL;
-+                    
-+                    fullnamesize = strlen(name) + strlen(*p) + 2;
-+                    if (!(fullname = malloc(fullnamesize)))
-+                        break;
-+                    
-+                    snprintf(fullname, fullnamesize, "%s.%s", name, *p);
-+                    
-+                    if (verify_name_allowed(fullname)) {
-+                        
-+                        /* Ignore return value */
-+                        mdns_query_name(fd, fullname, ipv4_func, ipv6_func, &u);
-+                        
-+                        if (u.list_idx > 0) {
-+                            /* We found something, so let's quit */
-+                            free(fullname);
-+                            break;
-+                        } else
-+                            status = NSS_STATUS_NOTFOUND;
-+
-+                    }
-+                    
-+                    free(fullname);
-+                }
-+                
-+                free_domains(domains);
-+	    }
-+        }
-+#endif /* HONOUR_SEARCH_DOMAINS */
-+    }
-+#endif /* ENABLE_LEGACY */
-+
-+    if (u.list_idx == 0) {
-+        *errnop = ETIMEDOUT;
-+        *h_errnop = HOST_NOT_FOUND;
-+        goto finish;
-+    }
-+    
-+    *pat = (struct gaih_addrtuple*) buffer;
-+
-+    status = NSS_STATUS_SUCCESS;
-+    
- finish:
- #ifdef ENABLE_LEGACY
-     if (fd >= 0)
-diff -u src/query.c src/query.c
---- src/query.c	2007-02-09 00:42:23.000000000 +0800
-+++ src/query.c	2013-01-04 09:57:03.778972196 +0800
-@@ -263,7 +263,7 @@
-     return n_sent;
- }
- 
--static int recv_dns_packet(int fd, struct dns_packet **ret_packet, uint8_t *ret_ttl, struct timeval *end) {
-+static int recv_dns_packet(int fd, struct dns_packet **ret_packet, uint8_t *ret_ttl, uint32_t *if_idx, struct timeval *end) {
-     struct dns_packet *p= NULL;
-     struct msghdr msg;
-     struct iovec io;
-@@ -286,6 +286,10 @@
-     msg.msg_controllen = sizeof(aux);
-     msg.msg_flags = 0;
-     
-+#ifndef IP_PKTINFO
-+    *if_idx = 0;
-+#endif
-+
-     for (;;) {
-         ssize_t l;
-         int r;
-@@ -304,6 +308,14 @@
-                     *ret_ttl = (uint8_t) (*(uint32_t*) CMSG_DATA(cmsg));
-                     break;
-                 }
-+#ifdef IP_PKTINFO
-+                if (cmsg->cmsg_level == IPPROTO_IP && cmsg->cmsg_type == IP_PKTINFO)
-+		{
-+                    *if_idx = ((struct in_pktinfo*) CMSG_DATA(cmsg))->ipi_ifindex;
-+                    break;
-+                }
-+#endif
-+
-             }
-                      
-             if (!cmsg)
-@@ -427,9 +439,10 @@
- 
-     while (!done) {
-         uint8_t ttl;
-+        uint32_t if_idx;
-         int r;
- 
--        if ((r = recv_dns_packet(fd, &p, &ttl, &end)) < 0)
-+        if ((r = recv_dns_packet(fd, &p, &ttl, &if_idx, &end)) < 0)
-             return -1;
-         else if (r > 0) /* timeout */
-             return 1;
-@@ -488,6 +501,7 @@
-                         rdlength == sizeof(ipv6_address_t)) {
-                         
-                         ipv6_address_t ipv6;
-+                        ipv6.if_idx = if_idx;
-                         
-                         if (dns_packet_consume_bytes(p, &ipv6, sizeof(ipv6_address_t)) < 0)
-                             break;
-@@ -584,9 +598,10 @@
- 
-     while (!done) {
-         uint8_t ttl;
-+        uint32_t if_idx;
-         int r;
- 
--        if ((r = recv_dns_packet(fd, &p, &ttl, &end)) < 0)
-+        if ((r = recv_dns_packet(fd, &p, &ttl, &if_idx, &end)) < 0)
-             return -1;
-         else if (r > 0) /* timeout */
-             return 1;
-diff -u src/query.h src/query.h
---- src/query.h	2005-06-21 22:43:23.000000000 +0800
-+++ src/query.h	2013-01-03 14:09:22.138018327 +0800
-@@ -30,6 +30,7 @@
- 
- typedef struct {
-     uint8_t address[16];
-+    uint32_t if_idx;
- } ipv6_address_t;
- 
diff --git a/sys-auth/nss-mdns/metadata.xml b/sys-auth/nss-mdns/metadata.xml
index a409ede683e9..0c9ca91ffcf5 100644
--- a/sys-auth/nss-mdns/metadata.xml
+++ b/sys-auth/nss-mdns/metadata.xml
@@ -8,10 +8,6 @@
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
 	</maintainer>
-	<use>
-		<flag name="search-domains">Honour search domains from
-		/etc/resolv.conf (see bug #201948 for possible side effects)</flag>
-	</use>
 	<longdescription lang="en">
 		Name service switch module for multicast dns.
 	</longdescription>
diff --git a/sys-auth/nss-mdns/nss-mdns-0.10-r3.ebuild b/sys-auth/nss-mdns/nss-mdns-0.10-r3.ebuild
deleted file mode 100644
index 4f91439d3705..000000000000
--- a/sys-auth/nss-mdns/nss-mdns-0.10-r3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit autotools eutils multilib-minimal
-
-DESCRIPTION="Name Service Switch module for Multicast DNS"
-HOMEPAGE="http://0pointer.de/lennart/projects/nss-mdns/"
-SRC_URI="http://0pointer.de/lennart/projects/nss-mdns/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~mips ppc x86"
-IUSE="search-domains"
-
-RDEPEND=">=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.10-avahi-socket.patch \
-		"${FILESDIR}"/${PN}-0.10-ipv6.patch
-	epatch_user
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_enable search-domains) \
-		--enable-avahi
-}
-
-multilib_src_install_all() {
-	dodoc README
-
-	insinto /etc
-	doins "${FILESDIR}"/mdns.allow
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "You must modify your name service switch look up file to enable"
-	ewarn "multicast DNS lookups.  If you wish to resolve only IPv6 addresses"
-	ewarn "use mdns6.  For IPv4 addresses only, use mdns4.  To resolve both"
-	ewarn "use mdns.  Keep in mind that mdns will be slower if there are no"
-	ewarn "IPv6 addresses published via mDNS on the network.  There are also"
-	ewarn "minimal (mdns?_minimal) libraries which only lookup .local hosts"
-	ewarn "and 169.254.x.x addresses."
-	ewarn
-	ewarn "Add the appropriate mdns into the hosts line in /etc/nsswitch.conf"
-	ewarn "An example line looks like:"
-	ewarn "hosts:	files mdns4_minimal [NOTFOUND=return] dns mdns4"
-	ewarn
-	ewarn "If you want to perform mDNS lookups for domains other than the ones"
-	ewarn "ending in .local, add them to /etc/mdns.allow"
-	ewarn
-}
diff --git a/sys-auth/nss-mdns/nss-mdns-0.11.ebuild b/sys-auth/nss-mdns/nss-mdns-0.11.ebuild
deleted file mode 100644
index d93a77b414f8..000000000000
--- a/sys-auth/nss-mdns/nss-mdns-0.11.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib-minimal
-
-DESCRIPTION="Name Service Switch module for Multicast DNS"
-HOMEPAGE="https://github.com/lathiat/nss-mdns"
-SRC_URI="https://github.com/lathiat/nss-mdns/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-multilib_src_configure() {
-	local myconf=(
-		# $(localstatedir)/run/... is used to locate avahi-daemon socket
-		--localstatedir=/var
-	)
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-}
-
-# the check target only compiles manual-use test programs
-src_test() { :; }
-
-multilib_src_install_all() {
-	dodoc *.md
-
-	insinto /etc
-	doins "${FILESDIR}"/mdns.allow
-}
-
-pkg_postinst() {
-	ewarn "You have to modify your name service switch look up file to enable"
-	ewarn "multicast DNS lookups.  If you wish to resolve only IPv6 addresses"
-	ewarn "use mdns6.  For IPv4 addresses only, use mdns4.  To resolve both"
-	ewarn "use mdns.  Keep in mind that mdns will be slower if there are no"
-	ewarn "IPv6 addresses published via mDNS on the network.  There are also"
-	ewarn "minimal (mdns?_minimal) libraries which only lookup .local hosts"
-	ewarn "and 169.254.x.x addresses."
-	ewarn
-	ewarn "Add the appropriate mdns into the hosts line in /etc/nsswitch.conf."
-	ewarn "An example line looks like:"
-	ewarn "hosts:	files mdns4_minimal [NOTFOUND=return] dns mdns4"
-	ewarn
-	ewarn "If you want to perform mDNS lookups for domains other than the ones"
-	ewarn "ending in .local, add them to /etc/mdns.allow."
-}
diff --git a/sys-auth/nss-pam-ldapd/Manifest b/sys-auth/nss-pam-ldapd/Manifest
index d40ed1ba12f4..39bc4eb6975e 100644
--- a/sys-auth/nss-pam-ldapd/Manifest
+++ b/sys-auth/nss-pam-ldapd/Manifest
@@ -7,9 +7,11 @@ AUX nss-pam-ldapd-0.9.4-disable-py3-only-linters.patch 403 BLAKE2B 2e17a92b3650c
 AUX nss-pam-ldapd-0.9.8-pynslcd-module-paths.patch 589 BLAKE2B de9801045f452da7d026afec44e15127b73f07a70f06d2f38ab2bc75562c4e825a789a9aae27d3c2e4e635143b50ed92e2841b3dcb55812aed5410eabb5eccfb SHA512 1bec5eb2376a85b0885b47e9ae560e9fcacb67b2d7a7170777f9e74c4cc8f9e1d57267cc122312f7df8cad05568f6dfcccd1cc6a62478c4d5c90459846e07706
 AUX pynslcd.initd 522 BLAKE2B 180d1ffa695a1cb6fccddfdc8719745e0d21ab082caeffbd0a071ce7afbbec6debddbabf9828c056b4aa88cb0f5cd6e84d4207cadf30e3cd8ac2e1946b9e7588 SHA512 2b737990a54b55c04de76fb295c466afbd029e44252372b0ca7a03407d059dfb200c63bfcbf55b1183d8c4f9f90a4f1130d8f5332f4fbde783d92c9ac0ce29b0
 DIST nss-pam-ldapd-0.8.14.tar.gz 508949 BLAKE2B ad8532bf86ef93c62394b91b7c3c035dc1090a70b60ab190ed8af012d533e61fe067b4383388af0d3a53142dbc96da3468d2aa09c2a30f92b9cf56434160c6d6 SHA512 70abb1836b5b3304e583fd3b71f11fee7586e181b26f4630779ec1d90b856da6e4fcc76327c51b20a158aa36708dd12ceb5f543a33c826881f2ad3e092f542c9
+DIST nss-pam-ldapd-0.9.10.tar.gz 749302 BLAKE2B 38cdc0e2a5b971d18412d7a583a265cdc87249342139dd4af9cddc61d17bc3d4d19b43c6705fdabc9dccc5ad4f7dad5ea473f75cde2915e485252fdf9116a1c6 SHA512 be559bc0d60bcf25af94919d456922bee4abb2c0417a8d2daf954d9aa9af2d41cb06a20cef04d9afd61c1316a744331753ee1cb25ef4a9c5411c508193231218
 DIST nss-pam-ldapd-0.9.8.tar.gz 771247 BLAKE2B bef3e5ede2b4747277ee400dfa8be620281e4e2a596acff236008e1f0bf6b79d6e309a4ca4bad852f6b0a8f79888cffcfffe09ddea8fde8e53b8450a894598eb SHA512 f0d24afd4cb5cea8155aa719b598448d3d81a896f7bc431f7d73e0617a7b2aa7e0ceb6de0b50163848c5554d96a3c415226e32a92e64ed91772fec4c64ad135b
 DIST nss-pam-ldapd-0.9.9.tar.gz 772059 BLAKE2B 0c1da79d58f19f0c310c0589ca9f286a73ada025028d1a00df938d40dd1211f4dd5ba694de94a37a3596b64b5f8a511127c359a86a60271eb091082dec69e6bb SHA512 8148467523003da397d03b70bb01e52dbc63b0528540aea1d85f6af2ee8af69300e107617b69608397b210e825a2351cfd61b88c4fa146d2e8e9fb9c5cd358e3
 EBUILD nss-pam-ldapd-0.8.14-r2.ebuild 1999 BLAKE2B 87751b3ceb0c761dca60bba6423b7f1e7fd65f04a788b5041f4c45f602343c543453fb05b2590337317b248e1c55d337fd45e7945428be70587fa1e869aa78eb SHA512 1fcdd8cf9be65a62d6703a947246dce9c78996fa6b5460c987fc1671e87e1713abfcc9c2bcd206f720db76dce20f06f0f5e91f27034f706191242c0caafad747
+EBUILD nss-pam-ldapd-0.9.10.ebuild 4179 BLAKE2B ff0b54041b76153708f1c81e254e98f4b87a4db78602f1a1b5fe5920ac2c7c665657b0df0a6bb9fc26b582949e58dfac294872496c141b6427f7a94db2b49eb6 SHA512 4b3e0a796cad11b52230320befe753949a8b4802ad303c5be857edc5818db4f9fad4eecccea3078c7b33aa8a7f53d66ca70937e93e4ad58e0644772d654f65d7
 EBUILD nss-pam-ldapd-0.9.8.ebuild 3337 BLAKE2B 640ffe29bc87802be8b87da38e86e59ed4f3d0d48fa07d5057ed9af456b7e68fd1448a6e145e8c754329286efa814e1c667641d1c90180c114932f2a7b309fb3 SHA512 13e2e210d0014611d8ccd715c93960bb935c335ea8a064e16de347a965d1ad38e48380530b56d59e02d3132f786728560a87137cf260613d598122ef3485385e
 EBUILD nss-pam-ldapd-0.9.9.ebuild 4177 BLAKE2B a06abfdfe830f26c06aac0b21672634ab91ca89788751c62a2e4a252b02aa41ff944570dd215d49a288030b01055ab3e8b4888cdc7544700f97f1527dbe6fe4a SHA512 9b6654460a1bfa665388c2c2cd2ed2ab14be09bbaa8f480c68c25b1d0720356a2887b73df7761015ff8efff08e1fa26c72f5ebff7738ca4b5cfe12fe95682ae0
 MISC metadata.xml 1169 BLAKE2B 22b5c9adcafb123a6af088ddfcaa1962eaf250ed153020e65afe36a0e6473b1f8c624f770634a91c3a983c74ded1d43535bb4930f13c6470fad681f5a77fcd51 SHA512 ab658f7d791db370920a4eb57da8ead2713b1cabda6f2dccd24478855043802e7c70a07c3aeaa33829b19dc94a4317d8b5ebec07d1caebe07b4fb3bc59b27b4c
diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.10.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.10.ebuild
new file mode 100644
index 000000000000..397ac40543d5
--- /dev/null
+++ b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.10.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=(python2_7)
+inherit eutils prefix user python-r1 multilib multilib-minimal systemd s6
+
+DESCRIPTION="NSS module for name lookups using LDAP"
+HOMEPAGE="https://arthurdejong.org/nss-pam-ldapd/"
+SRC_URI="https://arthurdejong.org/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug kerberos +pam pynslcd sasl test +utils"
+
+COMMON_DEP="
+	net-nds/openldap[${MULTILIB_USEDEP}]
+	sasl? ( dev-libs/cyrus-sasl[${MULTILIB_USEDEP}] )
+	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	virtual/pam[${MULTILIB_USEDEP}]
+	utils? ( ${PYTHON_DEPS} )
+	pynslcd? (
+		dev-python/python-ldap[${PYTHON_USEDEP}]
+		dev-python/python-daemon[${PYTHON_USEDEP}]
+	)
+	!sys-auth/nss_ldap
+	!sys-auth/pam_ldap"
+RDEPEND="${COMMON_DEP}"
+DEPEND="${COMMON_DEP}
+	test? (
+		${PYTHON_DEPS}
+		dev-python/pylint[${PYTHON_USEDEP}]
+	)
+	sys-devel/automake"
+
+REQUIRED_USE="
+	utils? ( ${PYTHON_REQUIRED_USE} )
+	test? ( ${PYTHON_REQUIRED_USE} pynslcd )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.4-disable-py3-only-linters.patch
+	"${FILESDIR}"/${PN}-0.9.8-pynslcd-module-paths.patch
+)
+
+pkg_setup() {
+	enewgroup nslcd
+	enewuser nslcd -1 -1 -1 nslcd
+}
+
+src_prepare() {
+	cp pynslcd/pynslcd.py "${S}" || die "Copying pynslcd failed"
+
+	default
+	use utils && python_setup
+	touch pynslcd/__init__.py || die "Could not create __init__.py for pynslcd"
+}
+
+multilib_src_configure() {
+	local -a myconf
+
+	myconf=(
+		--disable-utils
+		--enable-warnings
+		--with-ldap-lib=openldap
+		--with-ldap-conf-file=/etc/nslcd.conf
+		--with-nslcd-pidfile=/run/nslcd/nslcd.pid
+		--with-nslcd-socket=/run/nslcd/socket
+		$(usex x86-fbsd '--with-nss-flavour=' '--with-nss-flavour=' 'freebsd' 'glibc')
+		$(use_enable pynslcd)
+		$(use_enable debug)
+		$(use_enable kerberos)
+		$(use_enable pam)
+		$(use_enable sasl)
+	)
+
+	# nss libraries always go in /lib on Gentoo
+	if multilib_is_native_abi ; then
+		myconf+=("--with-pam-seclib-dir=${EPREFIX}/$(get_libdir)/security")
+		myconf+=("--libdir=${EPREFIX}/$(get_libdir)")
+	else
+		myconf+=("--with-pam-seclib-dir=/$(get_libdir)/security")
+		myconf+=("--libdir=/$(get_libdir)")
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_install_all() {
+	local script
+
+	newinitd "${FILESDIR}"/nslcd-init-r1 nslcd
+	newinitd "${FILESDIR}"/nslcd-init-r2 nslcd
+	s6_install_service nslcd "${FILESDIR}"/nslcd-run-s6
+
+	insinto /usr/share/nss-pam-ldapd
+	doins "${WORKDIR}/${P}/nslcd.conf"
+
+	fperms o-r /etc/nslcd.conf
+
+	if use utils; then
+		python_moduleinto nslcd
+		python_foreach_impl python_domodule utils/*.py
+
+		for script in chsh getent; do
+			python_foreach_impl python_newscript utils/${script}.py ${script}.ldap
+		done
+	fi
+	if use pynslcd; then
+		rm -rf "${D}"/usr/share/pynslcd
+		python_moduleinto pynslcd
+		python_foreach_impl python_domodule pynslcd/*.py
+		python_scriptinto /usr/sbin
+		python_newscript pynslcd.py pynslcd
+		newinitd "${FILESDIR}"/pynslcd.initd pynslcd
+	fi
+
+	systemd_newtmpfilesd "${FILESDIR}"/nslcd-tmpfiles.conf nslcd.conf
+	systemd_dounit "${FILESDIR}"/nslcd.service
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	if use pynslcd; then
+		python_moduleinto pynslcd
+		python_foreach_impl python_domodule pynslcd/*.py
+	fi
+}
+
+python_test() {
+	PYTHONPATH="${S}" emake check
+}
+
+multilib_src_test() {
+	pushd "${BUILD_DIR}"
+	ln -s ../pynslcd/constants.py utils/constants.py
+	python_foreach_impl python_test
+	popd
+}
+
+pkg_postinst() {
+	echo
+	elog "For this to work you must configure /etc/nslcd.conf"
+	elog "This configuration is similar to pam_ldap's /etc/ldap.conf"
+	echo
+	elog "In order to use nss-pam-ldapd, nslcd needs to be running. You can"
+	elog "start it like this:"
+	elog "  # /etc/init.d/nslcd start"
+	echo
+	elog "You can add it to the default runlevel like so:"
+	elog " # rc-update add nslcd default"
+	elog
+	elog "If you have >=sys-apps/openrc-0.16.3, you can also use s6"
+	elog "to supervise this service."
+	elog "To do this, emerge sys-apps/s6 then add nslcd-s6"
+	elog "default runlevel instead of nslcd."
+	elog
+	elog "If you are upgrading, keep in mind that /etc/nss-ldapd.conf"
+	elog " is now named /etc/nslcd.conf"
+	echo
+}
diff --git a/sys-auth/pam_p11/Manifest b/sys-auth/pam_p11/Manifest
index 399c1c998d12..a2ce0b5b09ac 100644
--- a/sys-auth/pam_p11/Manifest
+++ b/sys-auth/pam_p11/Manifest
@@ -2,5 +2,5 @@ AUX pam_p11-0.2.0-build.patch 812 BLAKE2B efd9b8f46bff6bfd04d0be9a82998ddb3ef4b5
 DIST pam_p11-0.1.6.tar.gz 351244 BLAKE2B a07f747a7abccc49e3c7bb7ceea5d4fce5c0491c2dcadfa0c5f5ce2215af724d187f00f6f1f7e43525e76f88afcf18ad74c3d38a793329e6c3175bfe696bbf3a SHA512 92ea894dfe605400dd3684b67bfb3fa4a4b6b67f0818791b492dd002063ebcf85eeb93c07d2f60ece98e579f298061c2e0c225554b6dc618bb1e335ac69f36b0
 DIST pam_p11-0.2.0.tar.gz 417550 BLAKE2B e3c5bb32d6c7c84776341796ebdb9850a9561778aee820acb2a6c61112a2a5df5ee7c539cb5974439e565046e944f4710b87c3b51dea61fdb2cd9171daac3a0c SHA512 2cadf6fe880c953554757099741f3cfe992067f251b7e7e977a6dda5f65cbe1f55b1de6d180638997eada0d3b760887091014b99f8ae4b6d31b25af8e555343c
 EBUILD pam_p11-0.1.6.ebuild 611 BLAKE2B 0e9f20e7b37a485d605eff45e82b4c36668b1fc965d260e6927ba391f216c55cd0f99f36ff8a99b3a2b7c6eedc3b152b6ef5b4319c885113557a44192a645560 SHA512 d500cae47e3bea469f7597e818a630ff95a07d1722ef0841fe6062916caa62216f730380efadd7e474652d36deec6fa5ca9812497041bcb361a1aaada1b2133b
-EBUILD pam_p11-0.2.0.ebuild 689 BLAKE2B 538769464d300e72daa8e7cc674d5377e7fe3209d8e3d70a1c85ea1d14576386b085cd0335bf11c2a786f2f632902e6601ed2726a7498e0a68286389062dc4b6 SHA512 b4f9b8a48a5f5d7d5caf2c618ac1ba860cb8e7e08080d4225467a656d17bdad6a8020ac3d2ad3b1fd2917b46afda362a9ffd06b05ffe2c1fb3c307f202180250
+EBUILD pam_p11-0.2.0.ebuild 688 BLAKE2B e0214addcc97001d5730b3dda2a55c2d4a06d6a351fbf543366be551e0aaf337dfe2c2baf05b2d8a486840bb2f989e02bd3754fe069c3496966e127bfbf0362c SHA512 5fda546992598fe2426fc99218b2d21bb6559791aea991a9c81b07864c0c322b7d812da15eab260358577f51d46ce1a279dc15da2b00a15948e429d72d875c2f
 MISC metadata.xml 528 BLAKE2B c2ab3c41473490f8c7c3926491d06ddf35554b92cd41ac7abe05f830a2b7c78c97a4ad9d4bcf39e6d1250cb2544ef9bd280e11a96f579ee1552b4748f012f1b8 SHA512 7d3ab0a89f1be52b1937fe300710c23ca4c24c548448b5c7edd5b6817c45a0a184fef8e07d60c0c4f6f9e1ee2fdb843dc6ceb95e5731ce9e9d76f98ae5b7e652
diff --git a/sys-auth/pam_p11/pam_p11-0.2.0.ebuild b/sys-auth/pam_p11/pam_p11-0.2.0.ebuild
index b1872dfaa3eb..4ac3eb2f38cd 100644
--- a/sys-auth/pam_p11/pam_p11-0.2.0.ebuild
+++ b/sys-auth/pam_p11/pam_p11-0.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~hppa ia64 ~ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="virtual/pam