gentoo auto-resync : 17:08:2022 - 02:31:41

5 files changed, 8 insertions, 52 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index b9ba00fecae9..380acdeca887 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/libu2f-host/Manifest b/app-crypt/libu2f-host/Manifest
index 5dc90690a543..93903f1562e3 100644
--- a/app-crypt/libu2f-host/Manifest
+++ b/app-crypt/libu2f-host/Manifest
@@ -1,5 +1,4 @@
 AUX libu2f-host-1.1.10-json-boolean.patch 1101 BLAKE2B c603290ae3f34ac9c6eccbee080ac83d7fcea2dfad69f1088de39cc35165fe7333acafee0aac53c9d973fd0b266bb822a1a68f48e64a492dbb5440976c2ecaf3 SHA512 e8b516d797bbb136fe51c367248be6d1035de409156a35ce55c9e871b236178c610e36f5859121e7fddae28e17c44db9bfa21ce4584acb3c45c6f68fbaba46e2
 DIST libu2f-host-1.1.10.tar.xz 471676 BLAKE2B 5066eaaaeda3b8c015afa8946f0af3b1b90a34488d4c71811c0d8f57a3ed2e4c8cb3d82d2df147dcf13ac3c384522d22f25894ac3a2d994a75b288891a67640a SHA512 91c5bf3994f1d3c9bd144f54b14b0404d839c15bef3c318619decdf1bd37214bcff33927af78a9826ff7d0bc9907c912a0e31104ae68d3a727a8436f2a1dbf7a
 EBUILD libu2f-host-1.1.10-r1.ebuild 1044 BLAKE2B 99d82153ca9a479ea6b39fe7000c399b76dfe9644994ea5593e97918bae69902e1e0cf82772fb4c98d6308f8077baef6bd3560a412a8ebcc95b898735052eca5 SHA512 0c42be918cbd9929de3ad0a29b9eac3fcbf09d2f2989563eef7cbca131916d4aec07b150e477900d1032c4c2cb0238d73778a835d1cfc3fc1b5a1d0f965d3f25
-EBUILD libu2f-host-1.1.10.ebuild 1044 BLAKE2B a1db95597cf045d25dd886289c476a27b7bf696f62e7796df6225ee5aa875020fdb5c70c4aa3c2f56447167fac6a700a7b13d35f9a2528b97e27930aafbfa0cb SHA512 2aba85c68c6b90e8a4606d9d704a16b09cdf9bd57fdf9ceb161d439b9b9ca1414fd98d92df5446a56ebbacc2aa234cc8d75e2f2055f1c99136e08a6835432bc3
 MISC metadata.xml 532 BLAKE2B ee0715bb0c5c993605e314456f9e2cf6aad97cec45e38836dbbcd51d557ee65da536c7f49fd04029e24d1d72d0011ef496346017cb8854b436d9ddc38efd3262 SHA512 c3dc0519b09376c82fa5bb589765ae5b88b680025224b22da23da508216253112ef66b6e0e14c1aebf79a7f67d88a6500f2106386a8f4eead97a79ef55204112
diff --git a/app-crypt/libu2f-host/libu2f-host-1.1.10.ebuild b/app-crypt/libu2f-host/libu2f-host-1.1.10.ebuild
deleted file mode 100644
index ad06c2b80ef9..000000000000
--- a/app-crypt/libu2f-host/libu2f-host-1.1.10.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info udev
-
-DESCRIPTION="Yubico Universal 2nd Factor (U2F) Host C Library"
-HOMEPAGE="https://developers.yubico.com/libu2f-host/"
-SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.xz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-IUSE="systemd"
-
-DEPEND="dev-libs/hidapi
-	dev-libs/json-c:="
-# The U2F device node will be owned by group 'plugdev'
-# in non-systemd configurations
-RDEPEND="${DEPEND}
-	!systemd? ( acct-group/plugdev )
-	systemd? ( sys-apps/systemd[acl] )"
-BDEPEND="virtual/pkgconfig"
-
-CONFIG_CHECK="~HIDRAW"
-
-PATCHES=( "${FILESDIR}/${P}-json-boolean.patch" )
-
-src_configure() {
-	econf --disable-static
-}
-
-src_install() {
-	default
-	if use kernel_linux; then
-		udev_dorules 70-u2f.rules
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	if ! use systemd; then
-		elog "Users must be a member of the 'plugdev' group"
-		elog "to be able to access U2F devices"
-	fi
-}
diff --git a/app-crypt/yubikey-manager/Manifest b/app-crypt/yubikey-manager/Manifest
index cc812d286417..361ef801d0dc 100644
--- a/app-crypt/yubikey-manager/Manifest
+++ b/app-crypt/yubikey-manager/Manifest
@@ -1,5 +1,5 @@
 DIST yubikey-manager-4.0.8.tar.gz 147076 BLAKE2B efdefb15c3939bfb2171766aec195fb776668894d4439565840587d14387999e052aee6eb225b9332662f1ebdbf1db24fceb606393e23d591ff61b91c1ee96f5 SHA512 87352bbb133eead48d1588df2db5420687278a9f76ceb283a53af8eab3d29e30c86e01a588a6da2884e6dac6af192ad355a28745f2f8505ef6cd0e96dea3e9c7
-DIST yubikey-manager-4.0.9.tar.gz 145952 BLAKE2B e7a5488be1163e3f3f82c049b7c068c4be82debfccab1d6a60c1f9bdebcab4df94f257082e9c83d6bb0ea037bdab4b47b924d27890537d066205e2fbc28d2066 SHA512 bbffbdf9437d0f2de0b7713fe577a342c8da95e9d9512cb5118374b63637dbde6ee95e516dbb47bbea3af5b2e5edd495882c7e4adcbec1fd3eb750471a50add5
+DIST yubikey-manager-4.0.9.gh.tar.gz 145952 BLAKE2B e7a5488be1163e3f3f82c049b7c068c4be82debfccab1d6a60c1f9bdebcab4df94f257082e9c83d6bb0ea037bdab4b47b924d27890537d066205e2fbc28d2066 SHA512 bbffbdf9437d0f2de0b7713fe577a342c8da95e9d9512cb5118374b63637dbde6ee95e516dbb47bbea3af5b2e5edd495882c7e4adcbec1fd3eb750471a50add5
 EBUILD yubikey-manager-4.0.8.ebuild 1095 BLAKE2B 0779e3f2db841ecc0c2026bd4dadc71fc038d2460d69bd2174ac0c5122e45e9967d0f4b884a6a34eb48fba50569dac9e0ff305a6de22790aa11cb327481356f5 SHA512 2561181f6e3682be5b50c9339555f16e17925d2b6c3e138a31a6ffbb386e0a78b385faba5fc4cb02ae1f3d1e9058049f566d5e6dee6a45e2818a575162e25cd6
-EBUILD yubikey-manager-4.0.9.ebuild 1002 BLAKE2B ab19b9a6e366984b29668b4d01e712a3a33a817fd43f14b98e829bdeee436b29ba0bc1825a2a99860dd7f7c78a237e6b12168ddb5020af3c9c10771b7df60bf2 SHA512 a348c211d85b622853a1dc3011c1551f08db58f1ec43c45ebc9c005b845f29ee162450dff74e84e9dae433f36a063d04fc5de22467a350a88c6cda86eaa4bf0b
+EBUILD yubikey-manager-4.0.9.ebuild 1310 BLAKE2B 13e91d00bbddbec0af1e1054b33f83b54b6198c2575846e856050cdbf3a3e448bc8f2876680e02e11dcc6705b3acc24332ca496336558c92cf23d369c8bbd7b3 SHA512 e1bc92d50660945fb5f87f4a8fbcbff093ee10665e0d51f53afc2b86e2bf6458f48f49ce33d6a4deec360ceaced1f5e7343b28085cebc0cf0e9b3c6bfa3af93d
 MISC metadata.xml 534 BLAKE2B 1dc91b31fae812c9abf38e762d18db228cf07cb29dc41f5c7928ef417002826acaaabaa3b1374433f9fdfc251b5f5fbabbc43e66e3b94cc6df3174d3ae5aa059 SHA512 cf47e3400679f7f4feb73ef3b8282d3f4dae6b6d0e5034cbc22935fd0196be0784946bf9ac93dea7fb36a16347f867d092845c1ce3528a00c704de9657ad3821
diff --git a/app-crypt/yubikey-manager/yubikey-manager-4.0.9.ebuild b/app-crypt/yubikey-manager/yubikey-manager-4.0.9.ebuild
index 71a5219bfd87..8d1ff491bab0 100644
--- a/app-crypt/yubikey-manager/yubikey-manager-4.0.9.ebuild
+++ b/app-crypt/yubikey-manager/yubikey-manager-4.0.9.ebuild
@@ -10,7 +10,12 @@ inherit distutils-r1
 
 DESCRIPTION="Python library and command line tool for configuring a YubiKey"
 HOMEPAGE="https://developers.yubico.com/yubikey-manager/"
-SRC_URI="https://github.com/Yubico/yubikey-manager/releases/download/${PV}/${P}.tar.gz"
+# Per https://github.com/Yubico/yubikey-manager/issues/217, Yubico is
+# the official source for tarballs, not Github.
+# Unfortunately in spite of having been mentioned on the Release Notes
+# page since mid-July, as of mid-August 2022 there is still no trace
+# of an official 4.0.9 tarball.
+SRC_URI="https://github.com/Yubico/yubikey-manager/releases/download/${PV}/${P}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"