gentoo resync : 15.12.2019

4 files changed, 20 insertions, 109 deletions

diff --git a/sys-auth/ykpers/Manifest b/sys-auth/ykpers/Manifest
index 4fcac268cd1c..aeb054828449 100644
--- a/sys-auth/ykpers/Manifest
+++ b/sys-auth/ykpers/Manifest
@@ -1,9 +1,5 @@
-DIST ykpers-1.18.0.tar.gz 124932 BLAKE2B 48e7045429081c1e577ca560b3a10a4cc380820add40526dbb2a8e0fe347eae79c1dff8335c5363148da55cb374e193230ecb6273b08566ef94959848ceb848e SHA512 d636fcabf94a3fb48841572b7b0f03a12a3b3243b11ed7377654d01c33c7282dc321ee13b13c1ee3f2a49fc5015e326a96ef5bc1594b8592d07c1e5aa0521d20
-DIST ykpers-1.18.1.tar.gz 125397 BLAKE2B 7393373414f9f2f9474408c86b8abba0f2034f5908ab8c14fd1dbf9acab40994b43b19031a58f5e889acaf289869b82bd429199237da173e3fa19154b4424374 SHA512 faf9c98fc41a64ae17e2002cd22e89fa2f51de9941aa6eb10c49aa78fd2e2867a5d47fc91fd91ab8e916117cba08629f3f1b076d91698ac2fee6e43366d948a8
-DIST ykpers-1.19.0.tar.gz 125960 BLAKE2B 8b0ce106ec0c6e390f13e960f26d64bf17e4f481f8bf4cdfb29f050bdbcc9f73750993caa00c46f6bc0c59a8cef0891d2d4fa97cea96084b0c9a762adfc3f81a SHA512 413f81325782f0d71501d3dbf5aaaf646bd5dc02d87308a7f650044dfe860dc13b7cef11afa8794df3049c729e10da33ffad86e3f148ac429ee64685bf0fe56e
 DIST ykpers-1.19.3.tar.gz 127789 BLAKE2B 8dfc2751be92e69fcf98f5dc75d87eb170a4f70ff13faa321a85d4a04e27818823acbf02284ba23cb78ea758111513457ced4cdaa6961621a91f68b059eff378 SHA512 436c9807e488f7b324b892da7bfc7ea93e2b746cc3ae075822e9e8bfe478ef8e61c194127e5d4f50f6c1d9512292640d033464cceb6b8a18069411ff7993cc52
-EBUILD ykpers-1.18.0.ebuild 937 BLAKE2B ea45c65f0927b0a6c810b90c5662505f68f85e78eeb6aa1f0be6a83ffe13c3237d46aef84614da11321cdf02224629a2344413f1f5d8880fd0cbeb9db660cb5a SHA512 8313c2c13adeacf11427cfa6dfd8455f141ac5d992a3bd418731867e3d599a946edb02e0b9cfc319ceef9506c4e6e60ee75b46ce78f8a5f3c0925cab9a9f348c
-EBUILD ykpers-1.18.1.ebuild 981 BLAKE2B af4f36e8d758a125997188c48e16083d3d45cc66334fdc3330dafa175ee552ebbf0a4a88a78c598e6f00b6d12097f7295d874381fcd653c3e0f60d209fe32beb SHA512 b118dd9c1897a434460ca12f3887868c7240eaa5c81035e3f6101300f4519267802aae1f6882e3a24b5a40e669031697635fb87ad8caa1ea35262b93665b0e3f
-EBUILD ykpers-1.19.0.ebuild 995 BLAKE2B b4c7a15d5d52056492d04bed8644dd8bffed31625e2d7df5e52bc93d7828d2a21d3f05cbe514778845666461749d77d78cddb8e21bacb1e1231f3be6ef42f9d2 SHA512 864b9228c1eb50c8f0e9e70f32b0ebd394b3f6adeaaf80e694947fd8d64e9058aa0d43fa1529d39b8dcb2cf2ac30f4d8c04e35699e9a00aabcca0b3c20023da8
+DIST ykpers-1.20.0.tar.gz 127975 BLAKE2B 8753332be4df3eeb6ef0489782037fca12883a263d5697cfaee901763e4698ca5415953da1c2f8b3512de041c1e78735c03a5e6ea2101c71ada36d4e6d5d3d2d SHA512 a38b26700793f0a801e5f5889bbbce4a3f728d22aaecf8d0890f1b5135e67bed16a78b7a36dbc323c5d296901f6dd420fa658a982492a0cd9f0bbf95a5fbc823
 EBUILD ykpers-1.19.3-r1.ebuild 1077 BLAKE2B c80749b2db997e79112cec9dee3b6ad3e838ed30febc099d79180f1e2a9057edd200b705a1421b2f6e378be8a514c0a3e04cb809f2f795e00a88a95447d9fdce SHA512 b114d2b8f472da3dfebb2f5b5de9ca69a73dbe32abe9b5f62fd694a5d5755f80493d30d741d2ddcaa06d9235263c6fcc5abff54c94b3fd407a5d9f71ca1fa78f
+EBUILD ykpers-1.20.0.ebuild 1079 BLAKE2B e33df34982e28e79e546150670c0e8e11c1b2cd5642064c828c40a5e8972cd303b4e9d3d3bd8957b5876e5bfbdcd7e03e652796fa688dad051056dd9bf4e2a45 SHA512 ab179c6e71cfc3c58984d42a947b4e371471b65b6e3bdc69af084a134ebc01bfa09381b7ffca47b3f18d1081c7976caffc0cc8931e90ef71427ebad461bd02e7
 MISC metadata.xml 632 BLAKE2B b03dff691e31f6d0ff188f1e10156140f0b9d5a91993be3be01f291e5edb75a0e8776a550ad3a66ac0244c402bbb40aa9e7948307d498d05d5c8d6b9b1997c4a SHA512 1cb1ba38e29077530438a94c0a2c4e6724abc4b8e3f946466d141497495b6f316094c5f6d2313e260b163c979f65a777570de03a7630c2908a085ce5da34580b
diff --git a/sys-auth/ykpers/ykpers-1.18.0.ebuild b/sys-auth/ykpers/ykpers-1.18.0.ebuild
deleted file mode 100644
index f752624fdd0d..000000000000
--- a/sys-auth/ykpers/ykpers-1.18.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools udev
-
-DESCRIPTION="Library and tool for personalization of Yubico's YubiKey"
-SRC_URI="https://github.com/Yubico/yubikey-personalization/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://github.com/Yubico/yubikey-personalization"
-
-KEYWORDS="amd64 x86"
-SLOT="0"
-LICENSE="BSD-2"
-IUSE="static-libs consolekit"
-
-RDEPEND="
-	>=sys-auth/libyubikey-1.6
-	virtual/libusb:1"
-DEPEND="${RDEPEND}
-	app-text/asciidoc
-	virtual/pkgconfig"
-RDEPEND="${RDEPEND}
-	consolekit? ( sys-auth/consolekit[acl] )"
-
-S="${WORKDIR}/yubikey-personalization-${PV}"
-
-DOCS=( doc/. AUTHORS NEWS README )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--libdir=/usr/$(get_libdir) \
-		--localstatedir=/var \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	use consolekit && udev_dorules *.rules
-}
diff --git a/sys-auth/ykpers/ykpers-1.18.1.ebuild b/sys-auth/ykpers/ykpers-1.18.1.ebuild
deleted file mode 100644
index 0ffb8502d96b..000000000000
--- a/sys-auth/ykpers/ykpers-1.18.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools udev
-
-DESCRIPTION="Library and tool for personalization of Yubico's YubiKey"
-SRC_URI="https://github.com/Yubico/yubikey-personalization/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://github.com/Yubico/yubikey-personalization"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="BSD-2"
-IUSE="static-libs consolekit"
-
-RDEPEND="
-	>=sys-auth/libyubikey-1.6
-	virtual/libusb:1"
-DEPEND="${RDEPEND}
-	app-text/asciidoc
-	virtual/pkgconfig"
-RDEPEND="${RDEPEND}
-	consolekit? ( sys-auth/consolekit[acl] )"
-
-S="${WORKDIR}/yubikey-personalization-${PV}"
-
-DOCS=( doc/. AUTHORS NEWS README )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--libdir=/usr/$(get_libdir) \
-		--localstatedir=/var \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	use consolekit && udev_dorules *.rules
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sys-auth/ykpers/ykpers-1.19.0.ebuild b/sys-auth/ykpers/ykpers-1.20.0.ebuild
index 264c412f26d1..4db6dbd05bb2 100644
--- a/sys-auth/ykpers/ykpers-1.19.0.ebuild
+++ b/sys-auth/ykpers/ykpers-1.20.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools udev
 
@@ -9,20 +9,21 @@ DESCRIPTION="Library and tool for personalization of Yubico's YubiKey"
 SRC_URI="https://github.com/Yubico/yubikey-personalization/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 HOMEPAGE="https://github.com/Yubico/yubikey-personalization"
 
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 SLOT="0"
 LICENSE="BSD-2"
-IUSE="static-libs consolekit"
+IUSE="consolekit static-libs"
 
-RDEPEND="
+DEPEND="
 	dev-libs/json-c:=
 	>=sys-auth/libyubikey-1.6
 	virtual/libusb:1"
-DEPEND="${RDEPEND}
+BDEPEND="
 	app-text/asciidoc
 	virtual/pkgconfig"
-RDEPEND="${RDEPEND}
-	consolekit? ( sys-auth/consolekit[acl] )"
+RDEPEND="${DEPEND}
+	consolekit? ( sys-auth/consolekit[acl] )
+"
 
 S="${WORKDIR}/yubikey-personalization-${PV}"
 
@@ -34,15 +35,21 @@ src_prepare() {
 }
 
 src_configure() {
-	econf \
-		--libdir=/usr/$(get_libdir) \
-		--localstatedir=/var \
+	local myeconfargs=(
+		--libdir=/usr/$(get_libdir)
+		--localstatedir=/var
 		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
 	default
-	use consolekit && udev_dorules *.rules
+
+	udev_dorules 69-yubikey.rules
+	if use consolekit ; then
+		udev_dorules 70-yubikey.rules
+	fi
 
 	find "${D}" -name '*.la' -delete || die
 }