[gentoo-commits] repo/gentoo:master commit in: sys-auth/libfprint/

["Matt Turner" <mattst88@gentoo.org>]

commit:     c68cfe612f531390d1c0cc37006f32657be6847a
Author:     David Michael <fedora.dm0 <AT> gmail <DOT> com>
AuthorDate: Sat Dec 26 03:16:32 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Jan  5 22:00:42 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c68cfe61

sys-auth/libfprint: introduce slots, fix deps, add introspection

Versions 1.0 and below need to use a different slot from 1.90 and
above.  These packages do not overlap, and the earlier versions
install libfprint.pc while newer versions install libfprint-2.pc.
This means that installing newer versions will cause packages to
fail to build if they look for libfprint.pc, until all of their
dependencies are updated to specify the slot.

Also stop cross-compiling gtk-doc, and add a USE flag to support
toggling introspection.

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: David Michael <fedora.dm0 <AT> gmail.com>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 sys-auth/libfprint/libfprint-1.0.ebuild             |  8 ++++----
 ...int-1.90.1.ebuild => libfprint-1.90.1-r1.ebuild} | 21 ++++++++++++---------
 ...int-1.90.2.ebuild => libfprint-1.90.2-r1.ebuild} | 21 ++++++++++++---------
 ...int-1.90.3.ebuild => libfprint-1.90.3-r1.ebuild} | 21 ++++++++++++---------
 4 files changed, 40 insertions(+), 31 deletions(-)

diff --git a/sys-auth/libfprint/libfprint-1.0.ebuild b/sys-auth/libfprint/libfprint-1.0.ebuild
index b3d49b6892c..c51abbccdff 100644
--- a/sys-auth/libfprint/libfprint-1.0.ebuild
+++ b/sys-auth/libfprint/libfprint-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,10 +22,10 @@ RDEPEND="dev-libs/glib:2
 	 x11-libs/libX11
 	 x11-libs/libXv"
 
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc"
+DEPEND="${RDEPEND}"
 
-BDEPEND="virtual/pkgconfig"
+BDEPEND="dev-util/gtk-doc
+	virtual/pkgconfig"
 
 PATCHES=( ${FILESDIR}/${PN}-0.8.2-fix-implicit-declaration.patch )
 

diff --git a/sys-auth/libfprint/libfprint-1.90.1.ebuild b/sys-auth/libfprint/libfprint-1.90.1-r1.ebuild
similarity index 75%
rename from sys-auth/libfprint/libfprint-1.90.1.ebuild
rename to sys-auth/libfprint/libfprint-1.90.1-r1.ebuild
index 311455ba8c5..f58fbf922a7 100644
--- a/sys-auth/libfprint/libfprint-1.90.1.ebuild
+++ b/sys-auth/libfprint/libfprint-1.90.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,23 +10,25 @@ HOMEPAGE="https://cgit.freedesktop.org/libfprint/libfprint/ https://github.com/f
 SRC_URI="https://gitlab.freedesktop.org/libfprint/libfprint/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
-SLOT="0"
+SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="examples"
+IUSE="examples +introspection"
 
 RDEPEND="dev-libs/glib:2
-	dev-libs/nss
 	>=dev-libs/libgusb-0.3.1
+	dev-libs/nss
 	virtual/libusb:1=
 	x11-libs/gtk+:3
 	x11-libs/pixman
 	x11-libs/libX11
-	x11-libs/libXv"
+	x11-libs/libXv
+	!>=${CATEGORY}/${PN}-1.90:0"
 
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc"
+DEPEND="${RDEPEND}"
 
-BDEPEND="virtual/pkgconfig"
+BDEPEND="dev-util/gtk-doc
+	virtual/pkgconfig
+	introspection? ( dev-libs/gobject-introspection )"
 
 PATCHES=( ${FILESDIR}/${PN}-0.8.2-fix-implicit-declaration.patch )
 
@@ -35,7 +37,8 @@ S="${WORKDIR}/${PN}-v${PV}"
 src_configure() {
 		local emesonargs=(
 			-Ddoc=false
-			-Dgtk-examples=$(usex examples true false)
+			$(meson_use examples gtk-examples)
+			$(meson_use introspection)
 			-Ddrivers=all
 			-Dudev_rules=true
 			-Dudev_rules_dir=$(get_udevdir)/rules.d

diff --git a/sys-auth/libfprint/libfprint-1.90.2.ebuild b/sys-auth/libfprint/libfprint-1.90.2-r1.ebuild
similarity index 75%
rename from sys-auth/libfprint/libfprint-1.90.2.ebuild
rename to sys-auth/libfprint/libfprint-1.90.2-r1.ebuild
index 311455ba8c5..f58fbf922a7 100644
--- a/sys-auth/libfprint/libfprint-1.90.2.ebuild
+++ b/sys-auth/libfprint/libfprint-1.90.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,23 +10,25 @@ HOMEPAGE="https://cgit.freedesktop.org/libfprint/libfprint/ https://github.com/f
 SRC_URI="https://gitlab.freedesktop.org/libfprint/libfprint/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
-SLOT="0"
+SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="examples"
+IUSE="examples +introspection"
 
 RDEPEND="dev-libs/glib:2
-	dev-libs/nss
 	>=dev-libs/libgusb-0.3.1
+	dev-libs/nss
 	virtual/libusb:1=
 	x11-libs/gtk+:3
 	x11-libs/pixman
 	x11-libs/libX11
-	x11-libs/libXv"
+	x11-libs/libXv
+	!>=${CATEGORY}/${PN}-1.90:0"
 
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc"
+DEPEND="${RDEPEND}"
 
-BDEPEND="virtual/pkgconfig"
+BDEPEND="dev-util/gtk-doc
+	virtual/pkgconfig
+	introspection? ( dev-libs/gobject-introspection )"
 
 PATCHES=( ${FILESDIR}/${PN}-0.8.2-fix-implicit-declaration.patch )
 
@@ -35,7 +37,8 @@ S="${WORKDIR}/${PN}-v${PV}"
 src_configure() {
 		local emesonargs=(
 			-Ddoc=false
-			-Dgtk-examples=$(usex examples true false)
+			$(meson_use examples gtk-examples)
+			$(meson_use introspection)
 			-Ddrivers=all
 			-Dudev_rules=true
 			-Dudev_rules_dir=$(get_udevdir)/rules.d

diff --git a/sys-auth/libfprint/libfprint-1.90.3.ebuild b/sys-auth/libfprint/libfprint-1.90.3-r1.ebuild
similarity index 75%
rename from sys-auth/libfprint/libfprint-1.90.3.ebuild
rename to sys-auth/libfprint/libfprint-1.90.3-r1.ebuild
index 311455ba8c5..f58fbf922a7 100644
--- a/sys-auth/libfprint/libfprint-1.90.3.ebuild
+++ b/sys-auth/libfprint/libfprint-1.90.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,23 +10,25 @@ HOMEPAGE="https://cgit.freedesktop.org/libfprint/libfprint/ https://github.com/f
 SRC_URI="https://gitlab.freedesktop.org/libfprint/libfprint/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
-SLOT="0"
+SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="examples"
+IUSE="examples +introspection"
 
 RDEPEND="dev-libs/glib:2
-	dev-libs/nss
 	>=dev-libs/libgusb-0.3.1
+	dev-libs/nss
 	virtual/libusb:1=
 	x11-libs/gtk+:3
 	x11-libs/pixman
 	x11-libs/libX11
-	x11-libs/libXv"
+	x11-libs/libXv
+	!>=${CATEGORY}/${PN}-1.90:0"
 
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc"
+DEPEND="${RDEPEND}"
 
-BDEPEND="virtual/pkgconfig"
+BDEPEND="dev-util/gtk-doc
+	virtual/pkgconfig
+	introspection? ( dev-libs/gobject-introspection )"
 
 PATCHES=( ${FILESDIR}/${PN}-0.8.2-fix-implicit-declaration.patch )
 
@@ -35,7 +37,8 @@ S="${WORKDIR}/${PN}-v${PV}"
 src_configure() {
 		local emesonargs=(
 			-Ddoc=false
-			-Dgtk-examples=$(usex examples true false)
+			$(meson_use examples gtk-examples)
+			$(meson_use introspection)
 			-Ddrivers=all
 			-Dudev_rules=true
 			-Dudev_rules_dir=$(get_udevdir)/rules.d