From 648a26fdb6f6bd9fdfbec62ae20ad6537f828f27 Mon Sep 17 00:00:00 2001
From: Patrick McLean <patrick.mclean@sony.com>
Date: Tue, 18 Feb 2020 14:25:34 -0800
Subject: dev-libs/libfido2-1.3.0-r1: revbump, udev rules, config check (bug
 #710120)

Closes: https://bugs.gentoo.org/710120
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Patrick McLean <chutzpah@gentoo.org>
---
 dev-libs/libfido2/libfido2-1.3.0-r1.ebuild | 50 ++++++++++++++++++++++++++++++
 dev-libs/libfido2/libfido2-1.3.0.ebuild    | 38 -----------------------
 2 files changed, 50 insertions(+), 38 deletions(-)
 create mode 100644 dev-libs/libfido2/libfido2-1.3.0-r1.ebuild
 delete mode 100644 dev-libs/libfido2/libfido2-1.3.0.ebuild

diff --git a/dev-libs/libfido2/libfido2-1.3.0-r1.ebuild b/dev-libs/libfido2/libfido2-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..351d1eeaa541
--- /dev/null
+++ b/dev-libs/libfido2/libfido2-1.3.0-r1.ebuild
@@ -0,0 +1,50 @@
+# 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 ~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"
+
+	# from upstream git, no longer needed with openssh-8.2
+	"${FILESDIR}/libfido2-1.3.0-remove-openssh-middleware.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.3.0.ebuild b/dev-libs/libfido2/libfido2-1.3.0.ebuild
deleted file mode 100644
index 80fc8d24e085..000000000000
--- a/dev-libs/libfido2/libfido2-1.3.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-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 ~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"
-
-	# from upstream git, no longer needed with openssh-8.2
-	"${FILESDIR}/libfido2-1.3.0-remove-openssh-middleware.patch"
-)
-
-src_install() {
-	cmake-utils_src_install
-
-	if ! use static-libs; then
-		rm -f "${D}/$(get_libdir)"/*.a || die
-	fi
-}
-- 
cgit v1.2.3-65-gdbad