gentoo resync : 28.04.2018

9 files changed, 5 insertions, 143 deletions

diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 554d52d28321..43893713732c 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/fingerprint-gui/Manifest b/sys-auth/fingerprint-gui/Manifest
index 62b877fc5bf8..7d00562b9c9b 100644
--- a/sys-auth/fingerprint-gui/Manifest
+++ b/sys-auth/fingerprint-gui/Manifest
@@ -1,5 +1,3 @@
-DIST fingerprint-gui-1.07.tar.gz 7042051 BLAKE2B c9b371e6344fd2a838a4c99a2962362a8aece8c3bce995926ff935453cf2d0d6b6b5f189e359638eb717bdba167b67d4ac336d7035646c7e68b62d5140e15c1d SHA512 b63bc86cbff29587a7fe164dd9344178006079f2520265ecd3d96e57bf584694246e17db780051dcacfe39dc6bd4da437b16e33d2f7cb6b474ae61dfbced6a3b
 DIST fingerprint-gui-1.09.tar.gz 7037943 BLAKE2B b35b8a1c5f53752709da44903961527c01db20773298e4636d8c316946cd7d23022c9407081c55ba5f6ec55d9ed53b7f8ef858c44a623873834fa1cbd6aa941f SHA512 c4fb22368d82d72586f80009b5adb9db0a8e8777c3d1c1f23cf58a21f718a3e3d05bbc90fff295be969cf7f744f037fb886e975e626cf6d599f8f6b5f8323724
-EBUILD fingerprint-gui-1.07-r1.ebuild 2745 BLAKE2B bd8cb71565422b20c1f016c9a50291ea773aed36ceff562167fe32f5115b73604a60d08c1cd567627106c9e1540b6fb29d48c0d56ef054ae359fc799397ff48f SHA512 d453dc8840625ff1a94c0bc10431845f77149b9754b7f197c13c9019d00fee7b0f8e3854a044c1ff6104e57a2cdf3ebafa457654bd4eaf7cbf7473f0e27965e6
-EBUILD fingerprint-gui-1.09.ebuild 3184 BLAKE2B 4669bfee4fea1a002c4c2d42a27486db4cdbe073305cefc64d406c1180ac7a24a00605535f987cb2ca8cf480a25634bb5df2fb9b385fe122ca671abdb7121b17 SHA512 42d3d2d2fa5153a2b423be60078a45571a6afa082b69d7a67e2bd478fc9396b15c6f87d4cacbbe9e26fe97c57b969c299ea840e9a941f04e991387f3cdea3e37
+EBUILD fingerprint-gui-1.09-r1.ebuild 3166 BLAKE2B 41ae6a14ce449d1b4c128c947baceb97c6979b5ef7c138284670e3f5e3041d56f5f599f48190c76a61f0f01549d92f000838ff2275b86c218d2895b2e9572b91 SHA512 f1815867e75df587c718cedbf97d3857396bb8548073872a1f4849386b9c025459ff1f6e178da39209ad11868a406718d9fb7ea161dd630e00e71749a77890d9
 MISC metadata.xml 343 BLAKE2B 9ee8b04222d90af96a3fcaac64416f5d286659f09d0a0cd2b00b252b6e2accb19fe88f37ba1ba87b81a83604a6f6fee71b84879af1bbad5f65af63d3a8450d31 SHA512 bb58875fd47a66a6784b088e3e2dcb07a89f61d48ff94547c4456e46f275d6c037f017632552ff4e43712b34d3fa2f8d5075e88c106f7cb6a72d317753522b7a
diff --git a/sys-auth/fingerprint-gui/fingerprint-gui-1.07-r1.ebuild b/sys-auth/fingerprint-gui/fingerprint-gui-1.07-r1.ebuild
deleted file mode 100644
index f0a6530c0374..000000000000
--- a/sys-auth/fingerprint-gui/fingerprint-gui-1.07-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib qt4-r2 readme.gentoo udev user
-
-DESCRIPTION="Use Fingerprint Devices with Linux"
-HOMEPAGE="http://www.n-view.net/Appliance/fingerprint/"
-HOMEPAGE="http://www.ullrich-online.cc/fingerprint/"
-SRC_URI="http://www.ullrich-online.cc/${PN%-gui}/download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+upekbsapi"
-
-DEPEND="app-crypt/qca:2[qt4,ssl]
-	sys-auth/libfprint
-	sys-auth/polkit-qt[qt4]
-	sys-libs/pam
-	x11-libs/libfakekey
-	dev-qt/qtcore:4
-	!sys-auth/thinkfinger"
-RDEPEND="${DEPEND}"
-
-QA_SONAME="/usr/lib/libbsapi.so.* /usr/lib64/libbsapi.so.*"
-QA_PRESTRIPPED="/usr/lib/libbsapi.so.* /usr/lib64/libbsapi.so.*"
-QA_FLAGS_IGNORED="/usr/lib/libbsapi.so.* /usr/lib64/libbsapi.so.*"
-
-src_prepare() {
-	sed -e '/Icon=/s:=.*:=Fingerprint:' \
-		-i bin/${PN}/${PN}.desktop || die
-	sed -e "s:/etc/udev/rules.d:\"$(get_udevdir)\"/rules.d:g" \
-		-i bin/${PN%-gui}-helper/${PN%-gui}-helper.pro || die
-	sed -e 's:GROUP="plugdev":GROUP="fingerprint":' \
-		-i bin/fingerprint-helper/92-fingerprint-gui-uinput.rules \
-		-i upek/91-fingerprint-gui-upek.rules || die
-}
-
-src_configure() {
-	eqmake4 \
-		PREFIX="${EROOT}"usr \
-		LIB="$(get_libdir)" \
-		LIBEXEC=libexec \
-		LIBPOLKIT_QT=LIBPOLKIT_QT_1_1
-}
-
-src_install() {
-	export INSTALL_ROOT="${D}" #submakes need it as well, re-install fails otherwise.
-	emake -j1 install
-	rm -r "${ED}"/usr/share/doc/${PN} || die
-	if use upekbsapi ; then
-		use amd64 && dolib.so upek/lib64/libbsapi.so*
-		use x86 && dolib.so upek/lib/libbsapi.so*
-		udev_dorules upek/91-fingerprint-gui-upek.rules
-		insinto /etc
-		doins upek/upek.cfg
-		#dodir /var/upek_data
-		#fowners root:plugdev /var/upek_data
-		#fperms 0775 /var/upek_data
-	fi
-	doicon src/res/Fingerprint.png
-
-	dodoc CHANGELOG README
-	dohtml doc/*
-
-	readme.gentoo_src_install
-}
-
-pkg_preinst() {
-	enewgroup fingerprint
-}
-
-pkg_postinst() {
-	einfo "Fixing permisisons of fingerprints..."
-	find "${EROOT}"/var/lib/fingerprint-gui -exec chown root:root {} + || die "chown root:root failed"
-	find "${EROOR}"/var/lib/fingerprint-gui -type d -exec chmod 755 {} + || die "chmod 755 failed"
-	find "${EROOT}"/var/lib/fingerprint-gui -type f -exec chmod 600 {} + || die "chmod 600 failed"
-
-	readme.gentoo_pkg_postinst
-}
-
-FORCE_PRINT_ELOG=1
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="Please take a thorough look a the Install-step-by-step.html
-in /usr/share/doc/${PF} for integration with pam/polkit/...
-Hint: You may want
-   auth        sufficient  pam_fingerprint-gui.so
-in /etc/pam.d/system-auth
-
-There are udev rules to enforce group fingerprint on the reader device
-Please put yourself in that group and re-trigger the udev rules."
diff --git a/sys-auth/fingerprint-gui/fingerprint-gui-1.09.ebuild b/sys-auth/fingerprint-gui/fingerprint-gui-1.09-r1.ebuild
index 2d7b9377d7ca..3fcbbc51892b 100644
--- a/sys-auth/fingerprint-gui/fingerprint-gui-1.09.ebuild
+++ b/sys-auth/fingerprint-gui/fingerprint-gui-1.09-r1.ebuild
@@ -24,7 +24,6 @@ DEPEND="
 	sys-auth/polkit-qt[qt5(+)]
 	sys-libs/pam
 	x11-libs/libX11
-	x11-proto/xproto
 	x11-libs/libfakekey
 	dev-libs/libusb
 	!sys-auth/thinkfinger
diff --git a/sys-auth/pam_u2f/Manifest b/sys-auth/pam_u2f/Manifest
index 1478695053d8..d3db0dc68e0f 100644
--- a/sys-auth/pam_u2f/Manifest
+++ b/sys-auth/pam_u2f/Manifest
@@ -1,6 +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
 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.4-r1.ebuild 723 BLAKE2B 281e48b2a7dea48ccdcda12467859ac4d210f2d906034b0dfde7bb6bf35cf1602bbea3fe5b07de8c0b42586379b65e65d1272346aac7259d36e03e08ec6004ab SHA512 7e2e2f36f1983a9976e07b22b06f996f8ee476d00b120a7c958e833b1af55527a0f5490a4ab2836a9dae1cde4e63e1f37df4452d0ebdd8cdf585c74b8e720ec9
 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/pam_u2f-1.0.4-r1.ebuild b/sys-auth/pam_u2f/pam_u2f-1.0.4-r1.ebuild
index 81368fbeff10..3e39b8a394dc 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_yubico/Manifest b/sys-auth/pam_yubico/Manifest
index 6037d900ad5b..05189e2eb6eb 100644
--- a/sys-auth/pam_yubico/Manifest
+++ b/sys-auth/pam_yubico/Manifest
@@ -1,5 +1,3 @@
-DIST pam_yubico-2.24.tar.gz 418419 BLAKE2B 5ae988a3ba3244761d1fcadfc25f67a6c8cefd78d24535f4644ca469a5a1fb274832fb17e76d18376645960f532bf1107e6eb08112b4eacf1c797faf0349b5ca SHA512 3554b40d97ede9d02102a0661e732347a0ab2cb012fa4330cc8227289a03398a7b974ee9d170604dce53ebef1bedade5c7ab9d5657560b0ba8e4c65432c1112c
-DIST pam_yubico-2.25.tar.gz 422192 BLAKE2B 54f27f9a0ff64c529c74415cf4530cdd1c359325beeda4d8ce2b51af4f9b53c69284696de21a5c1e3b4eed5102571e320cf068693fbd43d144ad2c9f40c39b72 SHA512 c561bedd35d3a84cc2129f12e358b77ac425520acf13444c2918cb17c9c4158d29dc5049b2e03dd30a1f04e8568980d80af13a6a0cfd9cc8e70eee8738727d70
-EBUILD pam_yubico-2.24.ebuild 896 BLAKE2B 98ad2c0a43b196f7895f94ecc06ca39bc49f79d0396a33accd31f2cc59afbdb7d7a549961cd9c7a7e052979ecbc7995cd9e484b2afe0bb6d29920877844c82b4 SHA512 cfd9f0a2b8c22ca25366b86460cf58535e6dd2f48aa8d1c899efe323643167a66cfda1a1af2a0aded8731855dba45bfaa89f27c4092d70d75d1715a2894a78a6
-EBUILD pam_yubico-2.25.ebuild 888 BLAKE2B a4b0b2ffed407f1fc702994356cf33b151b683ca03ac886eada37dbfc80f4745617f50cffebf146e963f5f862c42841890a8ca7348bee1c2501159454bccab4d SHA512 52e73f35f1d7991988ceb6e4280ffc44c4834a8ff671495262443d39a870ca1d2246d9338be7530594d00714b30282376450db7aaba76187e7e60ad700d53665
+DIST pam_yubico-2.26.tar.gz 423451 BLAKE2B be65b9726d3b5d353577014c78163d9e092d3d98baf9c22c2a43bbbb5362589c18713712d218fd154cf493211cefd2924158b326db45c2b7dd0aee9aa9080de5 SHA512 4adba37f07e1fe1a2c4b534246ef0e862be76e3b1ce0ed6f11f15436f537cd5963f00abf48f6faa7e65b025ff6924dbaf918db1675b1e2cb89a802d2f2d6a4ec
+EBUILD pam_yubico-2.26.ebuild 888 BLAKE2B a4b0b2ffed407f1fc702994356cf33b151b683ca03ac886eada37dbfc80f4745617f50cffebf146e963f5f862c42841890a8ca7348bee1c2501159454bccab4d SHA512 52e73f35f1d7991988ceb6e4280ffc44c4834a8ff671495262443d39a870ca1d2246d9338be7530594d00714b30282376450db7aaba76187e7e60ad700d53665
 MISC metadata.xml 339 BLAKE2B 159735b5bd274a1eabce6926405095f5207d01590f7ad054cc96c0b08a508e2815ac442bb3818cea26b8ae11323eda324350719dae75fe274bb30fb63eb14d13 SHA512 f6d6b5fc3be0305b4481ec8b93401bfdbfb094304b89a8c1acefb4ff3b4b341579afd26844abe31dbb08903f72b52e673ae7a65d7c366ed1341381547759c6f8
diff --git a/sys-auth/pam_yubico/pam_yubico-2.24.ebuild b/sys-auth/pam_yubico/pam_yubico-2.24.ebuild
deleted file mode 100644
index 17602d4f705a..000000000000
--- a/sys-auth/pam_yubico/pam_yubico-2.24.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib
-
-DESCRIPTION="Library for authenticating against PAM with a Yubikey"
-HOMEPAGE="https://github.com/Yubico/yubico-pam"
-SRC_URI="http://opensource.yubico.com/yubico-pam/releases/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ldap test"
-
-RDEPEND="
-	virtual/pam
-	sys-auth/libyubikey
-	>=sys-auth/ykclient-2.15
-	>=sys-auth/ykpers-1.6
-	ldap? ( net-nds/openldap )"
-DEPEND="${RDEPEND}
-	app-text/asciidoc
-	test? ( dev-perl/Net-LDAP-Server )"
-
-src_configure() {
-	#challenge response could be optional but that seems horribly dangerous to me
-	econf \
-		--with-cr \
-		$(use_with ldap) \
-		--with-pam-dir=/$(get_libdir)/security
-}
-
-src_install() {
-	default
-	dodoc doc/*
-	#prune_libtool_files #why doesn't this work?
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sys-auth/pam_yubico/pam_yubico-2.25.ebuild b/sys-auth/pam_yubico/pam_yubico-2.26.ebuild
index 034bfdfc4539..034bfdfc4539 100644
--- a/sys-auth/pam_yubico/pam_yubico-2.25.ebuild
+++ b/sys-auth/pam_yubico/pam_yubico-2.26.ebuild