gentoo christmass resync : 25.12.2020

7 files changed, 14 insertions, 152 deletions

diff --git a/dev-libs/libfido2/Manifest b/dev-libs/libfido2/Manifest
index fcb5f7d82e38..9cbf1edcec59 100644
--- a/dev-libs/libfido2/Manifest
+++ b/dev-libs/libfido2/Manifest
@@ -1,11 +1,6 @@
-AUX libfido2-1.3.0-cmakelists.patch 1210 BLAKE2B a7b90def3763bc5c07511103c05917009532219dbd5fc2c2ee90e0a8c68251c938d23977449998ea98afa35900813e38b16b230379e5add15fa4ad18851134b9 SHA512 4559b85525247b1e625a4aba404f85e15802a6f75ada0d1b1a3e1c817d434d6e119fb4549147b0aa9c9af9e176f93d176c3f8ae71e4c8fdf7c0cde66ae18445e
-AUX libfido2-1.3.1-no-werror.patch 736 BLAKE2B 5eecbff49108683d77ee284d67425ff846028067ec757916422aa9c833594fe5207fe398fbf61261d4b0554fce9442d368a83be7e52bbfbabb5ae0cff0906932 SHA512 5532e3ea9be09284582e3217c2567a35bdef8c0f8efa54b172cd21e91adb61770c42632f386b0adc70d75842bc570f6b55c041bd3ef7c538ddb88e51ff20891f
-AUX libfido2-1.4.0-cmakelists.patch 1247 BLAKE2B c290dfdb1f25b241b1a51725d568169210890c67d61ea314c84100f4c0810f84cad540361105ddd3c36e1b8130eaa4d1c8c72e11b9bdc1518349eb80356a5eaf SHA512 5272d57fd384b9454c8385362a833d99e78b2f09f5fa30521d8750191800514c6322d1b5edf5bc239ff59d136a4200dbe9450180e8a8738741db0c18457b6709
 AUX libfido2-1.5.0-cmakelists.patch 1037 BLAKE2B f6e34d02dbedfda8f152a2f8081370ea5d8c23468a355329d2c44831c0a9b82a95cc914bb55e7963bda71aa65e4ce4b9849e0e1c42c397c39c9b6b67d80598b4 SHA512 c4b761174994b8db917c5a44940e4119d208e2f9625a6669c15c692ebc485e24439d549c45b271712d69a3c026dcd41005d39381dddd44b606d033b7c44d64b8
-DIST libfido2-1.3.1.tar.gz 1512676 BLAKE2B f69a04fc69c46b688d83afe9d72b2fb1860ac00a09665d55e25293595520e95d45486ecc5355c479bc8bc06dbe6ed4fd469c511f5bf5f341a0ec86cb099fce28 SHA512 fc56f7bcddd7ae0f950b4e94f08ad726f7de68b975c0bdcbca98c7932c2c3d2e2a51b30eaf41e8dba08e82af3926cbed44264244ae721902af46e47df9fcbe1b
-DIST libfido2-1.4.0.tar.gz 391439 BLAKE2B d45ff3e1a5605c5ea4c5bddbe423bb69e6237e7a359fcc58469a86c503c934ce4491b98fdd673130d419cabe09acab7e201592f923ffe3908568b2b0888ae32a SHA512 5cf2f2d70bdba893fd33bf3ca91940c7eded5ed1728b517ff3fc46cbde58bf64f16da4104138b20dcea1d9a1cec730e532bc4938cdcba4ad86343e51a1c3c513
 DIST libfido2-1.5.0.tar.gz 407259 BLAKE2B 23a04f9230c45652aa1ac9fd8b3e809096ae31699c65ca0fda27b27b1b47263e375bb99e5b1ebc515b9edfb801bb2fba9c4f50d88e755efe3eaa23463ca01946 SHA512 240e2368e43846fddf5e98bbcc247468833565bcde4ec27976b88c814d787f1a477241a82b064818aa0eb0a98ff46a65d80b8243f4d0bbd763270e42492354e2
-EBUILD libfido2-1.3.1.ebuild 926 BLAKE2B c5f312bba979b24d41a7c62efb6404974e1fffdce9f83dee419ced2afdc98c8039b477eba994c6205d4b25826eb7b048d2f6489bacae158d5261d20485eca663 SHA512 0d108575faaf6af6adb53812b72dc2479068f7be72bded5564dd2f54a6545e7ceed12bbe7fae70530e49c8fd7c5e4f346e6cc3eee1e2406cc580a49eff23e4c4
-EBUILD libfido2-1.4.0.ebuild 913 BLAKE2B 98fc338e47d6eec425b9a0dc28e66d811bf6502f831170a179a2a0d69067fde8af24b9906e4906c2421f72f5bee1429e6932573ff2c59febb84dd72ca323e256 SHA512 987c094d3bdaf4d88728f083c4485c47e2fb5e4162f27fa21503f44c224b72ca42b45ff6236130cca64e78c3161e64e81c16ad479be4142c7863046ec3fc664a
-EBUILD libfido2-1.5.0-r1.ebuild 932 BLAKE2B 7c2c11e808bcaffd9904714fa967412917d05f21f73e37137408b45a4c59562737360e52500ee18d03f43342de145f278e052f2c7cf77dece213d88e353e2460 SHA512 9f65e6f5f4a8e7ccc441cab13142151c992733329ce73badf612e31e9c261cb72aac038a0cb7e1578f485eaaf87a00569f90d8e657996e087dfab90039b77b69
+DIST libfido2-1.6.0.tar.gz 413904 BLAKE2B 59444cc9e32b5d9f2a0f9138fe4f3ad644865e1f7f24f50bbace262308aa7c10b58aa0e890a3493e8fd102468e26947f7fc0864b5d7a1e185e40ad730064db8e SHA512 c473732a2f7ef54156097d315e44457d89056446ab3112a7c7a6fd99d5c2c8ae0ca2451ff9cd45be6c32de1ab335d6dfdb2b0c56b40cae9eb41391d18d83be4a
+EBUILD libfido2-1.5.0-r1.ebuild 926 BLAKE2B 01119027dab909094c4de51c0fb379172cc8ba108fca3e5d5545ee4d3122d54b850b52fdfc782262ac51a24d9455ebd531de63d2f492b4bc8dcf8e1020659b6f SHA512 8ca20903bcb8b2f39865580bebc282b71d6fdc62db780102140576d99f6959e5121f88fc6bd1e874b8a0dfe83c2c6cbae3613c41a17cbf8debd20e07b143c97a
+EBUILD libfido2-1.6.0.ebuild 932 BLAKE2B 7c2c11e808bcaffd9904714fa967412917d05f21f73e37137408b45a4c59562737360e52500ee18d03f43342de145f278e052f2c7cf77dece213d88e353e2460 SHA512 9f65e6f5f4a8e7ccc441cab13142151c992733329ce73badf612e31e9c261cb72aac038a0cb7e1578f485eaaf87a00569f90d8e657996e087dfab90039b77b69
 MISC metadata.xml 257 BLAKE2B f8a00f23163e58c310fa0e4ab94b2e6b5638ec569a5e93ea2efec8c7bdd97c1629e9bc0e9bf04917f5ca4fea4085855b281c30ced2f09548e96b12e6bb1d5a40 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1
diff --git a/dev-libs/libfido2/files/libfido2-1.3.0-cmakelists.patch b/dev-libs/libfido2/files/libfido2-1.3.0-cmakelists.patch
deleted file mode 100644
index a5a4b721ed0d..000000000000
--- a/dev-libs/libfido2/files/libfido2-1.3.0-cmakelists.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt
-index 71bc502..ac424d2 100644
---- a/man/CMakeLists.txt
-+++ b/man/CMakeLists.txt
-@@ -2,11 +2,12 @@
- # Use of this source code is governed by a BSD-style
- # license that can be found in the LICENSE file.
- 
-+include(GNUInstallDirs)
-+
- find_program(MANDOC_PATH mandoc)
- message(STATUS "MANDOC_PATH: ${MANDOC_PATH}")
- 
- if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
--	find_program(GZIP_PATH gzip)
- 	message(STATUS "GZIP_PATH: ${GZIP_PATH}")
- endif()
- 
-@@ -301,16 +302,16 @@ elseif(NOT MSVC)
- 	foreach(f ${MAN_SOURCES})
- 		if (${f} MATCHES ".1$")
- 			install(FILES ${CMAKE_BINARY_DIR}/man/${f}
--				DESTINATION "${CMAKE_INSTALL_PREFIX}/man/man1")
-+				DESTINATION "${CMAKE_INSTALL_MANDIR}/man1")
- 		elseif(${f} MATCHES ".3$")
- 			install(FILES ${CMAKE_BINARY_DIR}/man/${f}
--				DESTINATION "${CMAKE_INSTALL_PREFIX}/man/man3")
-+				DESTINATION "${CMAKE_INSTALL_MANDIR}/man3")
- 		endif()
- 	endforeach()
- 	foreach(i RANGE 0 ${MAN_ALIAS_MAX} 2)
- 		math(EXPR j "${i} + 1")
- 		list(GET MAN_ALIAS ${j} DST)
- 		install(FILES ${CMAKE_BINARY_DIR}/man/${DST}.3
--			DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man3)
-+			DESTINATION ${CMAKE_INSTALL_MANDIR}/man3)
- 	endforeach()
- endif()
diff --git a/dev-libs/libfido2/files/libfido2-1.3.1-no-werror.patch b/dev-libs/libfido2/files/libfido2-1.3.1-no-werror.patch
deleted file mode 100644
index d2ebc1a54a1b..000000000000
--- a/dev-libs/libfido2/files/libfido2-1.3.1-no-werror.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9481c46..b347fab 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -107,13 +107,11 @@ else()
- 
- 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
- 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wextra")
--	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
- 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wshadow")
- 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wwrite-strings")
- 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-prototypes")
- 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wbad-function-cast")
- 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic")
--	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic-errors")
- 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector-all")
- 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
- 
diff --git a/dev-libs/libfido2/files/libfido2-1.4.0-cmakelists.patch b/dev-libs/libfido2/files/libfido2-1.4.0-cmakelists.patch
deleted file mode 100644
index df34a85dacc2..000000000000
--- a/dev-libs/libfido2/files/libfido2-1.4.0-cmakelists.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0bb2e87..4d0ed00 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -128,13 +128,11 @@ else()
-
- 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
- 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wextra")
--	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
- 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wshadow")
- 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wwrite-strings")
- 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-prototypes")
- 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wbad-function-cast")
- 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic")
--	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic-errors")
- 	check_c_compiler_flag("-fstack-protector-all" HAVE_STACK_PROTECTOR_ALL)
- 	if(HAVE_STACK_PROTECTOR_ALL)
- 		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector-all")
-diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt
-index 44e4a96..d04dacc 100644
---- a/man/CMakeLists.txt
-+++ b/man/CMakeLists.txt
-@@ -5,11 +5,6 @@
- find_program(MANDOC_PATH mandoc)
- message(STATUS "MANDOC_PATH: ${MANDOC_PATH}")
-
--if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "Linux")
--	find_program(GZIP_PATH gzip)
--	message(STATUS "GZIP_PATH: ${GZIP_PATH}")
--endif()
--
- list(APPEND MAN_SOURCES
- 	eddsa_pk_new.3
- 	es256_pk_new.3
diff --git a/dev-libs/libfido2/libfido2-1.3.1.ebuild b/dev-libs/libfido2/libfido2-1.3.1.ebuild
deleted file mode 100644
index eb279f392c54..000000000000
--- a/dev-libs/libfido2/libfido2-1.3.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils udev linux-info
-
-DESCRIPTION="Provides library functionality for FIDO 2.0"
-HOMEPAGE="https://github.com/Yubico/libfido2"
-SRC_URI="https://github.com/Yubico/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="libressl +static-libs"
-
-DEPEND="
-	dev-libs/libcbor:=
-	virtual/libudev:=
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/libfido2-1.3.0-cmakelists.patch"
-	"${FILESDIR}/libfido2-1.3.1-no-werror.patch"
-)
-
-pkg_pretend() {
-	CONFIG_CHECK="
-		~USB_HID
-		~HIDRAW
-	"
-
-	check_extra_config
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if ! use static-libs; then
-		rm -f "${D}/$(get_libdir)"/*.a || die
-	fi
-
-	udev_newrules udev/70-u2f.rules 70-libfido2-u2f.rules
-}
diff --git a/dev-libs/libfido2/libfido2-1.5.0-r1.ebuild b/dev-libs/libfido2/libfido2-1.5.0-r1.ebuild
index 8fbe1628305b..a45c99bd27b1 100644
--- a/dev-libs/libfido2/libfido2-1.5.0-r1.ebuild
+++ b/dev-libs/libfido2/libfido2-1.5.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Yubico/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
 IUSE="libressl +static-libs"
 
 DEPEND="
diff --git a/dev-libs/libfido2/libfido2-1.4.0.ebuild b/dev-libs/libfido2/libfido2-1.6.0.ebuild
index 8fe49a3ff5f1..8fbe1628305b 100644
--- a/dev-libs/libfido2/libfido2-1.4.0.ebuild
+++ b/dev-libs/libfido2/libfido2-1.6.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils udev linux-info
+inherit cmake udev linux-info
 
 DESCRIPTION="Provides library functionality for FIDO 2.0"
 HOMEPAGE="https://github.com/Yubico/libfido2"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Yubico/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="libressl +static-libs"
 
 DEPEND="
@@ -20,10 +20,14 @@ DEPEND="
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )
 "
-RDEPEND="${DEPEND}"
+
+RDEPEND="
+	${DEPEND}
+	acct-group/plugdev
+"
 
 PATCHES=(
-	"${FILESDIR}/libfido2-1.4.0-cmakelists.patch"
+	"${FILESDIR}/libfido2-1.5.0-cmakelists.patch"
 )
 
 pkg_pretend() {
@@ -36,10 +40,10 @@ pkg_pretend() {
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	if ! use static-libs; then
-		rm -f "${D}/$(get_libdir)"/*.a || die
+		rm -f "${ED}/$(get_libdir)"/*.a || die
 	fi
 
 	udev_newrules udev/70-u2f.rules 70-libfido2-u2f.rules