From c68cfe612f531390d1c0cc37006f32657be6847a Mon Sep 17 00:00:00 2001 From: David Michael Date: Fri, 25 Dec 2020 22:16:32 -0500 Subject: 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 Signed-off-by: Matt Turner --- sys-auth/libfprint/libfprint-1.0.ebuild | 8 ++--- sys-auth/libfprint/libfprint-1.90.1-r1.ebuild | 48 +++++++++++++++++++++++++++ sys-auth/libfprint/libfprint-1.90.1.ebuild | 45 ------------------------- sys-auth/libfprint/libfprint-1.90.2-r1.ebuild | 48 +++++++++++++++++++++++++++ sys-auth/libfprint/libfprint-1.90.2.ebuild | 45 ------------------------- sys-auth/libfprint/libfprint-1.90.3-r1.ebuild | 48 +++++++++++++++++++++++++++ sys-auth/libfprint/libfprint-1.90.3.ebuild | 45 ------------------------- 7 files changed, 148 insertions(+), 139 deletions(-) create mode 100644 sys-auth/libfprint/libfprint-1.90.1-r1.ebuild delete mode 100644 sys-auth/libfprint/libfprint-1.90.1.ebuild create mode 100644 sys-auth/libfprint/libfprint-1.90.2-r1.ebuild delete mode 100644 sys-auth/libfprint/libfprint-1.90.2.ebuild create mode 100644 sys-auth/libfprint/libfprint-1.90.3-r1.ebuild delete mode 100644 sys-auth/libfprint/libfprint-1.90.3.ebuild (limited to 'sys-auth') diff --git a/sys-auth/libfprint/libfprint-1.0.ebuild b/sys-auth/libfprint/libfprint-1.0.ebuild index b3d49b6892ca..c51abbccdffa 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-r1.ebuild b/sys-auth/libfprint/libfprint-1.90.1-r1.ebuild new file mode 100644 index 000000000000..f58fbf922a7d --- /dev/null +++ b/sys-auth/libfprint/libfprint-1.90.1-r1.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit meson udev + +DESCRIPTION="library to add support for consumer fingerprint readers" +HOMEPAGE="https://cgit.freedesktop.org/libfprint/libfprint/ https://github.com/freedesktop/libfprint https://gitlab.freedesktop.org/libfprint/libfprint" +SRC_URI="https://gitlab.freedesktop.org/libfprint/libfprint/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="examples +introspection" + +RDEPEND="dev-libs/glib:2 + >=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 + !>=${CATEGORY}/${PN}-1.90:0" + +DEPEND="${RDEPEND}" + +BDEPEND="dev-util/gtk-doc + virtual/pkgconfig + introspection? ( dev-libs/gobject-introspection )" + +PATCHES=( ${FILESDIR}/${PN}-0.8.2-fix-implicit-declaration.patch ) + +S="${WORKDIR}/${PN}-v${PV}" + +src_configure() { + local emesonargs=( + -Ddoc=false + $(meson_use examples gtk-examples) + $(meson_use introspection) + -Ddrivers=all + -Dudev_rules=true + -Dudev_rules_dir=$(get_udevdir)/rules.d + --libdir=/usr/$(get_libdir) + ) + meson_src_configure +} diff --git a/sys-auth/libfprint/libfprint-1.90.1.ebuild b/sys-auth/libfprint/libfprint-1.90.1.ebuild deleted file mode 100644 index 311455ba8c5a..000000000000 --- a/sys-auth/libfprint/libfprint-1.90.1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit meson udev - -DESCRIPTION="library to add support for consumer fingerprint readers" -HOMEPAGE="https://cgit.freedesktop.org/libfprint/libfprint/ https://github.com/freedesktop/libfprint https://gitlab.freedesktop.org/libfprint/libfprint" -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" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="examples" - -RDEPEND="dev-libs/glib:2 - dev-libs/nss - >=dev-libs/libgusb-0.3.1 - virtual/libusb:1= - x11-libs/gtk+:3 - x11-libs/pixman - x11-libs/libX11 - x11-libs/libXv" - -DEPEND="${RDEPEND} - dev-util/gtk-doc" - -BDEPEND="virtual/pkgconfig" - -PATCHES=( ${FILESDIR}/${PN}-0.8.2-fix-implicit-declaration.patch ) - -S="${WORKDIR}/${PN}-v${PV}" - -src_configure() { - local emesonargs=( - -Ddoc=false - -Dgtk-examples=$(usex examples true false) - -Ddrivers=all - -Dudev_rules=true - -Dudev_rules_dir=$(get_udevdir)/rules.d - --libdir=/usr/$(get_libdir) - ) - meson_src_configure -} diff --git a/sys-auth/libfprint/libfprint-1.90.2-r1.ebuild b/sys-auth/libfprint/libfprint-1.90.2-r1.ebuild new file mode 100644 index 000000000000..f58fbf922a7d --- /dev/null +++ b/sys-auth/libfprint/libfprint-1.90.2-r1.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit meson udev + +DESCRIPTION="library to add support for consumer fingerprint readers" +HOMEPAGE="https://cgit.freedesktop.org/libfprint/libfprint/ https://github.com/freedesktop/libfprint https://gitlab.freedesktop.org/libfprint/libfprint" +SRC_URI="https://gitlab.freedesktop.org/libfprint/libfprint/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="examples +introspection" + +RDEPEND="dev-libs/glib:2 + >=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 + !>=${CATEGORY}/${PN}-1.90:0" + +DEPEND="${RDEPEND}" + +BDEPEND="dev-util/gtk-doc + virtual/pkgconfig + introspection? ( dev-libs/gobject-introspection )" + +PATCHES=( ${FILESDIR}/${PN}-0.8.2-fix-implicit-declaration.patch ) + +S="${WORKDIR}/${PN}-v${PV}" + +src_configure() { + local emesonargs=( + -Ddoc=false + $(meson_use examples gtk-examples) + $(meson_use introspection) + -Ddrivers=all + -Dudev_rules=true + -Dudev_rules_dir=$(get_udevdir)/rules.d + --libdir=/usr/$(get_libdir) + ) + meson_src_configure +} diff --git a/sys-auth/libfprint/libfprint-1.90.2.ebuild b/sys-auth/libfprint/libfprint-1.90.2.ebuild deleted file mode 100644 index 311455ba8c5a..000000000000 --- a/sys-auth/libfprint/libfprint-1.90.2.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit meson udev - -DESCRIPTION="library to add support for consumer fingerprint readers" -HOMEPAGE="https://cgit.freedesktop.org/libfprint/libfprint/ https://github.com/freedesktop/libfprint https://gitlab.freedesktop.org/libfprint/libfprint" -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" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="examples" - -RDEPEND="dev-libs/glib:2 - dev-libs/nss - >=dev-libs/libgusb-0.3.1 - virtual/libusb:1= - x11-libs/gtk+:3 - x11-libs/pixman - x11-libs/libX11 - x11-libs/libXv" - -DEPEND="${RDEPEND} - dev-util/gtk-doc" - -BDEPEND="virtual/pkgconfig" - -PATCHES=( ${FILESDIR}/${PN}-0.8.2-fix-implicit-declaration.patch ) - -S="${WORKDIR}/${PN}-v${PV}" - -src_configure() { - local emesonargs=( - -Ddoc=false - -Dgtk-examples=$(usex examples true false) - -Ddrivers=all - -Dudev_rules=true - -Dudev_rules_dir=$(get_udevdir)/rules.d - --libdir=/usr/$(get_libdir) - ) - meson_src_configure -} diff --git a/sys-auth/libfprint/libfprint-1.90.3-r1.ebuild b/sys-auth/libfprint/libfprint-1.90.3-r1.ebuild new file mode 100644 index 000000000000..f58fbf922a7d --- /dev/null +++ b/sys-auth/libfprint/libfprint-1.90.3-r1.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit meson udev + +DESCRIPTION="library to add support for consumer fingerprint readers" +HOMEPAGE="https://cgit.freedesktop.org/libfprint/libfprint/ https://github.com/freedesktop/libfprint https://gitlab.freedesktop.org/libfprint/libfprint" +SRC_URI="https://gitlab.freedesktop.org/libfprint/libfprint/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="examples +introspection" + +RDEPEND="dev-libs/glib:2 + >=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 + !>=${CATEGORY}/${PN}-1.90:0" + +DEPEND="${RDEPEND}" + +BDEPEND="dev-util/gtk-doc + virtual/pkgconfig + introspection? ( dev-libs/gobject-introspection )" + +PATCHES=( ${FILESDIR}/${PN}-0.8.2-fix-implicit-declaration.patch ) + +S="${WORKDIR}/${PN}-v${PV}" + +src_configure() { + local emesonargs=( + -Ddoc=false + $(meson_use examples gtk-examples) + $(meson_use introspection) + -Ddrivers=all + -Dudev_rules=true + -Dudev_rules_dir=$(get_udevdir)/rules.d + --libdir=/usr/$(get_libdir) + ) + meson_src_configure +} diff --git a/sys-auth/libfprint/libfprint-1.90.3.ebuild b/sys-auth/libfprint/libfprint-1.90.3.ebuild deleted file mode 100644 index 311455ba8c5a..000000000000 --- a/sys-auth/libfprint/libfprint-1.90.3.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit meson udev - -DESCRIPTION="library to add support for consumer fingerprint readers" -HOMEPAGE="https://cgit.freedesktop.org/libfprint/libfprint/ https://github.com/freedesktop/libfprint https://gitlab.freedesktop.org/libfprint/libfprint" -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" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="examples" - -RDEPEND="dev-libs/glib:2 - dev-libs/nss - >=dev-libs/libgusb-0.3.1 - virtual/libusb:1= - x11-libs/gtk+:3 - x11-libs/pixman - x11-libs/libX11 - x11-libs/libXv" - -DEPEND="${RDEPEND} - dev-util/gtk-doc" - -BDEPEND="virtual/pkgconfig" - -PATCHES=( ${FILESDIR}/${PN}-0.8.2-fix-implicit-declaration.patch ) - -S="${WORKDIR}/${PN}-v${PV}" - -src_configure() { - local emesonargs=( - -Ddoc=false - -Dgtk-examples=$(usex examples true false) - -Ddrivers=all - -Dudev_rules=true - -Dudev_rules_dir=$(get_udevdir)/rules.d - --libdir=/usr/$(get_libdir) - ) - meson_src_configure -} -- cgit v1.2.3-65-gdbad