gentoo resync : 02.06.2019

4 files changed, 2 insertions, 88 deletions

diff --git a/sys-auth/libfprint/Manifest b/sys-auth/libfprint/Manifest
index 41eb450f76cb..1da2575df23f 100644
--- a/sys-auth/libfprint/Manifest
+++ b/sys-auth/libfprint/Manifest
@@ -1,8 +1,4 @@
-AUX libfprint-0.6.0-fix-udev-rules.patch 1436 BLAKE2B 0e1d31c33ba0a1462e4c5482545802a253fad032a2148debe1be9a99452257e15c3a84df7ff74c5834718aeaa404a154a23f0f8cce634bc568a6f60b6327f4b7 SHA512 b3b191814e0decccaa6e6b1edad70db23e756c319e512f0f236a62845de41ba1982b510f3b0edd699202ba8de9f56afa68a9fef000ac88a61c1ae9d8d5d8a55d
 AUX libfprint-0.8.2-fix-implicit-declaration.patch 4831 BLAKE2B ec61d1ee189549f4456634b5b0157f32c61b2255330681b96bc50c73d9a5d51c1058f4f82b979ca4695d9d1065b0623e86be943f98c1582725bcddda0630156b SHA512 afd4e7c5ee65a91b17aa8bec4c6a0ba5b972e9f2586a0cfa7adc823d2a1f8d2378ed28928c5108870d2347f3edb2f343a24b2eaef6c015b7650834b4d76ceb73
-DIST libfprint-0.6.0.tar.bz2 323590 BLAKE2B 8a592241ded8826337db075dd26960a9712e1a01855c6fd2c461b73ea6e2fac5248bce16165144b48271b368d0b2a82963eab00a64a88c27539e19aee54b9ba4 SHA512 2ab9ceec0c357779c94d3b8e94c11a733825bd735bec0e5c762d215d69bf295da0c5db7fd365e2a7efdcf25747777371f793b5e99d5c98e1bf9dcb1170e10ef9
-DIST libfprint-0.6.0_vfs0050.patch.gz 9944 BLAKE2B b53a74f64c9691cee7c4e7f2f54afcffe2b00b63914900ed107426a9e42721548caa1ec80e1e39251ee6a0daec6ecf7f80d6704d37bc984dd1ac76320d0b4256 SHA512 658f936c462cf50d4325d33da6c8298768dfbe4bf442933fc197c8f4bebd741ef6878bcfe123606790c3ddcc3e217fd5f97b3755d36b181c5837dc28e146d674
 DIST libfprint-0.99.0.tar.gz 473925 BLAKE2B 799e3600393e4b25f7b0685ff0456ca391e5fcaef36e5b4475371cd07c848e40820dbbdc5a241fe11c6ee08b818380967129f85e177b5d8714b9dbc4d7b68ea1 SHA512 eca1d45baa23b7db1fcc5d7a9a396fe504aadc6ec2e68da32b5415fb0fff1227566d579271e0b34895ce7f3baa55314a0ccd20bb8c4adba253063b7b61284748
-EBUILD libfprint-0.6.0-r2.ebuild 1273 BLAKE2B 4e5371e38e79e1dfe0c25e36cfa79d03c2b823c145110fd9c8e13a241534cce708e7a67090bdacd203aab33693c46f494780ec46b6dea6a486b88b4a9a01487b SHA512 4e6d1285e871c53be91dc4ae834cd040dd5932d61c38cccb628c86d8b7cad5652faf498943ab8941041a32b5138a033b934a9d6ebaa5662dbfff285f458ba759
-EBUILD libfprint-0.99.0.ebuild 1063 BLAKE2B 6b1e7e7c2f13da8f62986ebd72b8814d5144d3fd46a756403e53c86a15c1d426c646d13817f078516a2fdab1a3b53651490f6efbffca8784b2b8f773947ef027 SHA512 304974ee1234b1caffdf117f265925381b7b4b59463c25eaeccf573c734e2ed9e49f2f49ee5a49a5716b94fe9aecd2d3fe3133b6f99571b0c2a35154f212a5fd
+EBUILD libfprint-0.99.0.ebuild 1056 BLAKE2B 11cec1b29ed9a675bfaa13c2820101f0d7d6e96bff46a51e27d1f4d71768bc8512a8e3323cb652013d3e078a7a9db7655fa79fd36dba77d97db33a48b451e451 SHA512 9700ca3575ff4ea83d664cdab7d6c3c62c29e649a6ab0f91606b7b3b0e19f1bce75caaa8ae619ed05f15706dc5b63c1440299011505b9be8f19ef6d3226bb442
 MISC metadata.xml 347 BLAKE2B dd0d99ac1a5a8cc925618bc556216a23f14fab90dd2e1d66747e4af3fd64d410812aac366a0e11cc169af7345c8bbf304577da5a1faf75f557bb4ba18033fb0f SHA512 f3303670a2e7d4b30732d335b313edda6c97952f2f6290ff6b1d67a8a237e147ba7c7c4edcb58994679ff9cbf606fb82b79bec1ba840a22b46ee21cfd26aefc9
diff --git a/sys-auth/libfprint/files/libfprint-0.6.0-fix-udev-rules.patch b/sys-auth/libfprint/files/libfprint-0.6.0-fix-udev-rules.patch
deleted file mode 100644
index 128ac8ce311b..000000000000
--- a/sys-auth/libfprint/files/libfprint-0.6.0-fix-udev-rules.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Remove spurious \n to fix udev rule generation
-
-Steven Newbury <steve@snewbury.org.uk>:
-libfprint generates 60-fprint-autosuspend.rules for all supported devices, 
-however there's a spurious \n before the ', MODE="0666"' which results in it 
-appearing on a new line after the match criteria.  At least on current 
-systemd/udev this results in MODE="0666" being applied unconditionally to all 
-device nodes.  This is an extremely serious security problem and effectively 
-gives root access to all users simply by having the ebuild emerged.
-
-https://bugs.gentoo.org/562218
-
---- a/libfprint/fprint-list-udev-rules.c
-+++ b/libfprint/fprint-list-udev-rules.c
-@@ -74,7 +74,7 @@
- 	if (num_printed == 0)
- 	    printf ("# %s\n", driver->full_name);
- 
--	printf ("SUBSYSTEM==\"usb\", ATTRS{idVendor}==\"%04x\", ATTRS{idProduct}==\"%04x\", ATTRS{dev}==\"*\", TEST==\"power/control\", ATTR{power/control}=\"auto\"\n, MODE=\"0666\"\n", driver->id_table[i].vendor, driver->id_table[i].product);
-+	printf ("SUBSYSTEM==\"usb\", ATTRS{idVendor}==\"%04x\", ATTRS{idProduct}==\"%04x\", ATTRS{dev}==\"*\", TEST==\"power/control\", ATTR{power/control}=\"auto\", MODE=\"0666\"\n", driver->id_table[i].vendor, driver->id_table[i].product);
- 	printf ("SUBSYSTEM==\"usb\", ATTRS{idVendor}==\"%04x\", ATTRS{idProduct}==\"%04x\", ENV{LIBFPRINT_DRIVER}=\"%s\"\n", driver->id_table[i].vendor, driver->id_table[i].product, driver->full_name);
- 	num_printed++;
-     }
diff --git a/sys-auth/libfprint/libfprint-0.6.0-r2.ebuild b/sys-auth/libfprint/libfprint-0.6.0-r2.ebuild
deleted file mode 100644
index 73bc12900ff3..000000000000
--- a/sys-auth/libfprint/libfprint-0.6.0-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils udev vcs-snapshot
-
-MY_PV="V_${PV//./_}"
-DESCRIPTION="library to add support for consumer fingerprint readers"
-HOMEPAGE="https://cgit.freedesktop.org/libfprint/libfprint/"
-SRC_URI="https://cgit.freedesktop.org/${PN}/${PN}/snapshot/${MY_PV}.tar.bz2 -> ${P}.tar.bz2
-	https://dev.gentoo.org/~xmw/${P}_vfs0050.patch.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
-IUSE="debug static-libs vanilla"
-
-RDEPEND="virtual/libusb:1
-	dev-libs/glib:2
-	dev-libs/nss
-	x11-libs/pixman"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-udev-rules.patch"
-)
-
-src_prepare() {
-	if ! use vanilla ; then
-		eapply "${WORKDIR}"/${P}_vfs0050.patch
-	fi
-
-	default
-
-	# upeke2 and fdu2000 were missing from all_drivers.
-	sed -e '/^all_drivers=/s:"$: upeke2 fdu2000":' \
-		-i configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-drivers=all \
-		$(use_enable debug debug-log) \
-		$(use_enable static-libs static) \
-		-enable-udev-rules \
-		--with-udev-rules-dir=$(get_udevdir)/rules.d
-}
-
-src_install() {
-	default
-
-	prune_libtool_files
-
-	dodoc AUTHORS HACKING NEWS README THANKS TODO
-}
diff --git a/sys-auth/libfprint/libfprint-0.99.0.ebuild b/sys-auth/libfprint/libfprint-0.99.0.ebuild
index f47dc6065968..f985a5c73d6b 100644
--- a/sys-auth/libfprint/libfprint-0.99.0.ebuild
+++ b/sys-auth/libfprint/libfprint-0.99.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/freedesktop/libfprint/archive/V_$(ver_rs 0-3 '_').ta
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sparc x86"
 IUSE="examples"
 
 RDEPEND="dev-libs/glib:2