gentoo resync : 22.04.2018

14 files changed, 102 insertions, 26 deletions

diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 929eb6dfabd1..554d52d28321 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/libnss-compat/Manifest b/sys-auth/libnss-compat/Manifest
new file mode 100644
index 000000000000..14ba2bd3c8b2
--- /dev/null
+++ b/sys-auth/libnss-compat/Manifest
@@ -0,0 +1,3 @@
+DIST libnss_compat-1.2.tar.gz 201392 BLAKE2B d78cbd6df1437f95423c90fd9b0c82a974bb79cdb8e09b3bd2a3273aa417b2a0b9950e2ac76bf0e6a8fe384328f180a3182caab2e6b3ce40704c6cf49ea9a55e SHA512 e488c72d5d13f9749293a91f2bc86c06fcc184c2edb7d9335569bc77c7aea1d2874de1d83b13f394f3d0881ec368b5749cf9a5c60f362f7c4c428026c2fc0e53
+EBUILD libnss-compat-1.2.ebuild 887 BLAKE2B d312c716bbf1b0a9d658644a3954385554912eb75bf36774b8b21b3b1b6862bdb1f2b00795d3069f7a36dc9e65bfa1d3ec834d650b663c591778f0ed099641c3 SHA512 a5eda7baf2798b692208a1e941133132352686fa3193ced197eb1ffd91de52e2ccdd96cf40bcfcaec1ac555bb773cedd27ddce5c5c73bd6c7926c22a33e14cb6
+MISC metadata.xml 221 BLAKE2B 79f6de476af31c1da59c7aeebab26fa0db49c902398f6f73beeca03d3077820240bc51a25d2945642d9a07470470f2ca9548c2d8f1c63a8592966f6df9955926 SHA512 edb14bd2dae6ad57f77c07fc601cf2782589165c7e48e1e123eff7e47044febfdb1e19d18cd0b240fd2ca494e3401b5aa1f1243480769e0faf5dbfa377d20a3b
diff --git a/sys-auth/libnss-compat/libnss-compat-1.2.ebuild b/sys-auth/libnss-compat/libnss-compat-1.2.ebuild
new file mode 100644
index 000000000000..9d01d095eb87
--- /dev/null
+++ b/sys-auth/libnss-compat/libnss-compat-1.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="NSS module to provide compat entry support"
+HOMEPAGE="https://github.com/thkukuk/libnss_compat"
+SRC_URI="https://github.com/thkukuk/libnss_compat/archive/libnss_compat-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1+ BSD ISC"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>net-libs/libnsl-0:0=[${MULTILIB_USEDEP}]
+	net-libs/libtirpc:0=[${MULTILIB_USEDEP}]
+	!<sys-libs/glibc-2.26
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
+
+S=${WORKDIR}/libnss_compat-libnss_compat-${PV}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--enable-shared
+		--disable-static
+	)
+	ECONF_SOURCE=${S} econf "${myconf[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sys-auth/libnss-compat/metadata.xml b/sys-auth/libnss-compat/metadata.xml
new file mode 100644
index 000000000000..fa331094dd33
--- /dev/null
+++ b/sys-auth/libnss-compat/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>toolchain@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/sys-auth/nss-mdns/Manifest b/sys-auth/nss-mdns/Manifest
index 4d5e001fda5c..5a3a4af98c7c 100644
--- a/sys-auth/nss-mdns/Manifest
+++ b/sys-auth/nss-mdns/Manifest
@@ -4,7 +4,7 @@ AUX nss-mdns-0.10-ipv6.patch 15651 BLAKE2B 4fe76fdf2f39295bf6a6084662c396520fedd
 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 1840 BLAKE2B dd41dd364d82e918747bf8876953e763d8fd9886cccf9706bd67aa4a4e637f369039fc0148f33bd2db893d3c66a2a92c2dddbc767ec668af62382fde61cdc93d SHA512 50265452786edd3ac7b554904a57fdf38b9a121641363bc14587633efada2017d7b36c7f131740ce69e2a5389fc4be2d4a6b5c52bb6193dd0320891748f3ce5a
+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 1647 BLAKE2B fd7b8f690b7f27dd7ab3593573963f0fa71b178035ef1edf66e75a6d9f886eb6e2e5c354bc453f0b78a6a5c369c7fd1e2a3cc19b64440b7d4107f17db615ba17 SHA512 b49b53ab68690a2b3062ae180bdd0d45a60f41fe2b5721330df4b6a5e40a43e952ae54e754d05980874b8038daf302bd9810dd74821dbe17a25e19017df25827
 EBUILD nss-mdns-9999.ebuild 1681 BLAKE2B 1ae2e683def7ecd909d010611439201c6eb3827fcc7ead3c7b6229165413f725611061deec56e31cf19682a572afe2510c58591f4a6120043a4893ca4d50abd8 SHA512 edcc52347c4d4c1abd751be2b2f8965d7153ee087ca280acc2baa875e6f50f58460dd2c419e04f35d47bfca33cd8bfdc57be741193c5b2ce2125389a4246356a
diff --git a/sys-auth/nss-mdns/nss-mdns-0.10-r3.ebuild b/sys-auth/nss-mdns/nss-mdns-0.10-r3.ebuild
index 8183106781f9..4f91439d3705 100644
--- a/sys-auth/nss-mdns/nss-mdns-0.10-r3.ebuild
+++ b/sys-auth/nss-mdns/nss-mdns-0.10-r3.ebuild
@@ -15,11 +15,6 @@ IUSE="search-domains"
 
 RDEPEND=">=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508-r7
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.10-avahi-socket.patch \
diff --git a/sys-auth/nss_ldap/Manifest b/sys-auth/nss_ldap/Manifest
index 56368fb67c95..2dae90da21cc 100644
--- a/sys-auth/nss_ldap/Manifest
+++ b/sys-auth/nss_ldap/Manifest
@@ -10,5 +10,5 @@ AUX nss_ldap-265-pthread.patch 18698 BLAKE2B 1a158ddca1dbc99536b2d637a938c6ab121
 AUX nss_ldap-265-reconnect-timeouts.patch 2806 BLAKE2B b254a9959892a0a8ecb6e53778c4581f5ce8f9f0b90ceaf7fdb3e08cdc029b3914d9f95a7b65f3f9ceedf6669ae5727d8bc41c7229c567667896b4cb8868b227 SHA512 d9767cfaf32b9041d222c7b313c327a72ac2766d26fed7ce19cc1acff56cf2493d4e1e83b33852083505952f983ba64c00409e3cf09dcbf74676390968dd935b
 AUX nsswitch.ldap.diff 575 BLAKE2B 9578535ea6cff87ac21fa8f3a0a1b8d727c657a53318b378dd86b4dded15bac950e241af59b15b6898a1ed089d1c481f0615ca7de3ae4e07a231432920af7b52 SHA512 0d08d4dacea0213714cab864300e625158106245eeb34a7d4b983749dd4fa4156d3f36d6c2dd214efdf80cf926c37657eb00651bceb89907286a3310123399a0
 DIST nss_ldap-265.tar.gz 280976 BLAKE2B 31b233ef7680204abfb62408141609b9489e133327c787c59afedd9ac41194189bde26d1f3b0a885622f57ec769ddee2bdf7d274b9584d4d5002d1c016c86892 SHA512 c4584682968861dd5880992fe7d11c6005d94f0c17252ab1cda04380fd7a81b419ba7e87d0efa44c24c5ce5bf76b9fd8331034dddb4f1400f132eb2192472077
-EBUILD nss_ldap-265-r5.ebuild 4116 BLAKE2B 6035f1f73d7dddb7cf0f806c12f6ff24dc3450035d75d928ae769129976b985e41fb97365de29c6f4f28e95584911b348e5b38da92e6d4ec66afb8934bfe9431 SHA512 13e3539a1d6b1c022ee4ddd81a1b59ae4740311a567d26cd0fd67e71da5b111953367befe99302cad3001bbadb5f3a8081ab4181b05040b793118301133eb3a7
+EBUILD nss_ldap-265-r5.ebuild 3982 BLAKE2B d9f37e49df616467d905d06ed8e6bf4d195ac3808851415b7e306f3e980438b52371318a73e3303c788d0dad34185fdecb437df62672d018365f33f24d07b366 SHA512 89d5a0a980cf96667bd9f6a45b538c3abbd0abc7d6ded96829ac806e2c982d6f06240e068e4c31f8b5ba03c6e80e45cdb3479494ff00fbcc239a9177a11bfb5a
 MISC metadata.xml 472 BLAKE2B 807d6edadcbc8209f6cefdf43d271376eeb043a7b9cc315d708d20ad3a6765da6436128068b3394a48861343c8823a54efb3588fccbe71e00b257c9ed50f0d48 SHA512 33c52bba49fa13e698544de57b00dc813d87820ef29adf29b57198fadca85a1e45a1e99eff3d8806c77eab456d870ce8ddbfd02a688babb5600ba64cf2cf2419
diff --git a/sys-auth/nss_ldap/nss_ldap-265-r5.ebuild b/sys-auth/nss_ldap/nss_ldap-265-r5.ebuild
index 57382a2b44f0..d17aae5251a3 100644
--- a/sys-auth/nss_ldap/nss_ldap-265-r5.ebuild
+++ b/sys-auth/nss_ldap/nss_ldap-265-r5.ebuild
@@ -19,11 +19,7 @@ DEPEND=">=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}]
 		kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
 		ssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )"
 RDEPEND="${DEPEND}
-		!<net-fs/autofs-4.1.3
-		abi_x86_32? (
-			!<=app-emulation/emul-linux-x86-baselibs-20140508-r7
-			!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-		)"
+		!<net-fs/autofs-4.1.3"
 
 src_prepare() {
 	if use prefix; then
diff --git a/sys-auth/pam_ldap/Manifest b/sys-auth/pam_ldap/Manifest
index c1e7c18a4275..713fa2e01764 100644
--- a/sys-auth/pam_ldap/Manifest
+++ b/sys-auth/pam_ldap/Manifest
@@ -3,6 +3,6 @@ DIST pam_ldap-184.tar.gz 128053 BLAKE2B 4555878c47b712bd78f9124d3795e45cf37199f7
 DIST pam_ldap-186.tar.gz 163437 BLAKE2B 4e917985b78349283c891daca94935792f2316afc08cd694edb7256c89a7ed612a62ba4b53111fc2022f6e11f754103bf58ac0a53a4298b011a5379625c51cdc SHA512 aaa6fbc48150db53bf92dcf600bcb8f0526baa2e6124f46468f59958c8a91495eb003d16a45b659c8cbb2d3481c4732a0d1f5945a2c98c09549ef8a51ed18a3d
 EBUILD pam_ldap-183.ebuild 944 BLAKE2B 67f0f29641ea41de1896e729332ee5b3cc0d28030bea7c1f6e7c1e53081acf322940d40d48e88f9de99367a735127e529c1dbf04780a53bef669d759d1f59257 SHA512 4771e92976cfaea2ce836db5c06a2cbf281545ba69e316899a5d2e06452ebc4db33e32971563973bf043a8d6736dc1762237051132443c76be942f0e3f11705c
 EBUILD pam_ldap-184.ebuild 957 BLAKE2B 7fc95e1570da47c29f272b625a2f618391c46551ce90d3b7e9f742e6f3acb18e96699e9b78e15c0aa6599e0118b7fbdfb28063dfa0a98bf5a84a1821b9875800 SHA512 28edb52962178ed75be096be8549f153fc769fe15dbf3269baf520bb1b723db3bd7848069d4e69d6cdd550c34687b7665001dfe023a90b5e91239893b30115ea
-EBUILD pam_ldap-186-r1.ebuild 1291 BLAKE2B ab513763bf8080914dfc8b4d90a0c6035651f29632dc50b63610134bac4b1b020c80b77b35e81c903c1a86e7f8221c905d1b8a0a2120ce360b011165a8bbb70e SHA512 08e0c429883f894dc63b6d83601109135ac2202d1d7bfd65e5f75b275ce487a94856011fb9f0e0909c5a12e2e431be1eef9e7f6304b916d23b709bb8ad62020f
+EBUILD pam_ldap-186-r1.ebuild 1161 BLAKE2B 048bf9321e9125aad5c99a1b30ab18a43589b4d46b1376935d90cb609bb61fc58d2b96eaed68d9efdcde70a218fd6ad7f4a08facc881983ae09ce6eb99368215 SHA512 9ca8188e9082eea150d7f7127b5f69c4d61e5cea6c28913b37759115a13866bf2460e93739e5aa40f0c2e5f1bdaa93f170af0ffec65b7101bf3b03af3c40035a
 EBUILD pam_ldap-186.ebuild 896 BLAKE2B 1a6da873633e7317fc06f5ca3b297606bb6ed983d4e7b0e5e9d3ea10c36105d19a14ccc660c3c31fb69e06658948fb75ece3552e368377e61f9d146584928ed8 SHA512 29e7eddb69f22a4aee698095bf6384d0d11880021318a00f28390dba9aea5d065f3b29f811c4560a86dbcb1b6762fff61253ab431f979c1cbee12fd755a5e5f4
 MISC metadata.xml 216 BLAKE2B 97b30b803b06d4809dde0bbd686fe4be81edac39c42da6dd2998c8d73e0ad96b69721ee876320a0ae6935d51bfaa72dedc4c9cd98aacc335a60e5e228d9c8889 SHA512 206ec8bb38d85f19b567f88093ad55291639b5ae484be283f0fa05e2a5d69a108805c08ab3ff94278344ee20f252187309310d5a2d2d4151f2e972ed0e3fb7c5
diff --git a/sys-auth/pam_ldap/pam_ldap-186-r1.ebuild b/sys-auth/pam_ldap/pam_ldap-186-r1.ebuild
index a1817e2870d3..c84e807e6fce 100644
--- a/sys-auth/pam_ldap/pam_ldap-186-r1.ebuild
+++ b/sys-auth/pam_ldap/pam_ldap-186-r1.ebuild
@@ -17,11 +17,7 @@ DEPEND="|| ( >=sys-libs/glibc-2.1.3 >=sys-freebsd/freebsd-lib-9.1 )
 	>=virtual/pam-0-r1[${MULTILIB_USEDEP}]
 	>=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}]
 	sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r3[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508-r7
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
+RDEPEND="${DEPEND}"
 
 multilib_src_configure() {
 	local myconf=(
diff --git a/sys-auth/pam_u2f/Manifest b/sys-auth/pam_u2f/Manifest
index 07384648ed93..1478695053d8 100644
--- a/sys-auth/pam_u2f/Manifest
+++ b/sys-auth/pam_u2f/Manifest
@@ -1,4 +1,6 @@
 AUX pam_u2f-1.0.2-fix-Makefile.patch 324 BLAKE2B bc32459e011106e0f8516afe8e1afaa288e1bb53190b350467a12b9c6bbfaee9beb885bd78f1f1c3665b5f6907c1d7d99fb70d8d476b2dc3fe1fad2cba52f940 SHA512 eddf3c607e953b952ba91acb7d7bb1b8a43d6b70da86faece994011eb3eac43476c6ad9721be0a76805688dc9f9bab02ee5e13f58ce556bb68b8d574135ca44d
 DIST pam_u2f-1.0.4.tar.gz 349114 BLAKE2B 50811fe8b0076ff36af030e080593161a1f676f05d5eb970a50ea7092bac5bfe1832370d12b730be8422f7f42677ff950d5b3e932a6087a1698a4acba267c9d5 SHA512 324d1a1172eae567372f95971d9ee6bb237b47758b89c083f3cfb11275c4b0c22c4cf02a51380451f88d372dd6aaa415bdb671a43a7444062fbf8f50b658f087
-EBUILD pam_u2f-1.0.4-r1.ebuild 725 BLAKE2B 327461714876908d6c89f7007404510645092a3ec501c68bba967690a945fc895c0f30f99592ba94d744d948f307291438bab4d297935066180ffd216db238c1 SHA512 05ef485b7007c6c742043cb9a58b1c90fc87b3a3a0dcfcaebaf5fec6305e4e51a39b42bf85c287d560ff3116757ec34be883b32beb92363379f62720cf9a13c9
-MISC metadata.xml 702 BLAKE2B adc794b2a2e4aee0a606c75ded4f920b8b316bfd1ad3c6c0138aa6f574faf4158c527bfa5da6af781e4c993170e78b2b4381ccbaf6b1cc208d354c0fa7d98400 SHA512 b0ef72e1a2f8f34345492a6d9b4eda2e427fec504bb0e2b5ae2adc07d79d9e0fdfdf72dd8cdc2e222025e3beb8b2ff7596ccff4daaa18213584428e163244940
+DIST pam_u2f-1.0.6.tar.gz 375181 BLAKE2B eac1457cbfd7951fd617ea0cff4220d6e5fe6f3e33cbc960024a28a1ca09f376fced27afa8e5a23dc5bab1881c226497c41fea7041dd891a36e1be7ba18c09f3 SHA512 e169d3d251a132213c04570099164aee0cdcea4bca233432f13af47b2cc5e420e14b3fb6dcde20cb8f77f9ed677459bd641aa3f9c1da65c88cd7490e26ab25e3
+EBUILD pam_u2f-1.0.4-r1.ebuild 724 BLAKE2B ff1cfc6c266f389ff1bc57eff612b2bae6755cda90bb48d27fdb6cecaa7cc8aa7fdae8b4f44b30b71c1ca1b700fb0e5d02aab2c8b366e8b40146391ab63194ec SHA512 fb1a65a1bb607e0f87b58d7ad704bfa2dd995ac8c92a336a6020c87c3c67e7111bb484a73f11bd5bc18e6876a639b090fbbf46d4295a37605133e44d70cc59c4
+EBUILD pam_u2f-1.0.6.ebuild 725 BLAKE2B 327461714876908d6c89f7007404510645092a3ec501c68bba967690a945fc895c0f30f99592ba94d744d948f307291438bab4d297935066180ffd216db238c1 SHA512 05ef485b7007c6c742043cb9a58b1c90fc87b3a3a0dcfcaebaf5fec6305e4e51a39b42bf85c287d560ff3116757ec34be883b32beb92363379f62720cf9a13c9
+MISC metadata.xml 714 BLAKE2B 8694b13d8ec22eb56c2bf5637f0ef83c5adf369025aeec8f4512a79914cc00e43620d6db1d95361199c7861a41afd2f1c215758e84584af7d6fdeb7d00619101 SHA512 a59a8b6a51c50c63495eecf712d3a5c9f60b0a94d78a6d2a12d789eb334d77bc80b00de3c2368cbc3cc684c359085af71153f09d0ce5f9cf4f74be77fdc09277
diff --git a/sys-auth/pam_u2f/metadata.xml b/sys-auth/pam_u2f/metadata.xml
index 11ec7f2c19e3..29f1229e1201 100644
--- a/sys-auth/pam_u2f/metadata.xml
+++ b/sys-auth/pam_u2f/metadata.xml
@@ -2,18 +2,17 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>shirk+gentoo@bitspin.org</email>
-    <name>René Köcher</name>
-  </maintainer>
-  <maintainer type="person">
     <email>gokturk@gentoo.org</email>
     <name>Göktürk Yüksek</name>
   </maintainer>
   <use>
-    <flag name="debug">
+    <flag name="debug" restrict="&lt;sys-auth/pam_u2f-1.0.6">
       Enable debug messages using the pam logging macros.
       (Note: these will be visible on stdout for terminal logins).
     </flag>
+    <flag name="debug">
+      Enable debug messages using the pam logging macros.
+    </flag>
   </use>
   <upstream>
     <remote-id type="github">Yubico/pam-u2f</remote-id>
diff --git a/sys-auth/pam_u2f/pam_u2f-1.0.4-r1.ebuild b/sys-auth/pam_u2f/pam_u2f-1.0.4-r1.ebuild
index c90ab12d94dd..81368fbeff10 100644
--- a/sys-auth/pam_u2f/pam_u2f-1.0.4-r1.ebuild
+++ b/sys-auth/pam_u2f/pam_u2f-1.0.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://developers.yubico.com/${PN/_/-}/Releases/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/sys-auth/pam_u2f/pam_u2f-1.0.6.ebuild b/sys-auth/pam_u2f/pam_u2f-1.0.6.ebuild
new file mode 100644
index 000000000000..c90ab12d94dd
--- /dev/null
+++ b/sys-auth/pam_u2f/pam_u2f-1.0.6.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic pam
+
+DESCRIPTION="Library for authenticating against PAM with a Yubikey"
+HOMEPAGE="https://github.com/Yubico/pam-u2f"
+SRC_URI="https://developers.yubico.com/${PN/_/-}/Releases/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	app-crypt/libu2f-host
+	app-crypt/libu2f-server:=
+	virtual/pam"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${PN}-1.0.2-fix-Makefile.patch" )
+
+src_prepare() {
+	default
+	use debug || append-cppflags -UDEBUG_PAM -UPAM_DEBUG
+	eautoreconf
+}
+
+src_configure() {
+	econf --with-pam-dir=$(getpam_mod_dir)
+}