gentoo resync : 02.09.2020

6 files changed, 38 insertions, 38 deletions

diff --git a/sys-auth/thinkfinger/Manifest b/sys-auth/thinkfinger/Manifest
index 496e2cdb3b08..4b19b5e5e919 100644
--- a/sys-auth/thinkfinger/Manifest
+++ b/sys-auth/thinkfinger/Manifest
@@ -1,9 +1,9 @@
-AUX 0.3-carriagereturn.patch 409 BLAKE2B d97a658f5f096774ccc5c37cb1275ed94720fddc91ee0250cff75b96a46efbbdd7921ef942cef6efe3e2960e81751a4ddcdc7390b3676acf5929657c425aa700 SHA512 f41093878aebdea7c68d55a2c1365fd0cc491715797cd56ddc5b5f77390350d6bd097767d2d21bdb2d24f95ffa31057da726aeb3248b88cb37244bf2d442e7af
-AUX 0.3-direct_set_config_usb_hello.patch 941 BLAKE2B f2d053fad2fd49431ed86f812c2c602caaa13702c0bdc41a79e200ccf0e21e9948b39e788c7431ba70e544e597223ebc2f56020ee53cb2b0e9e6ffd3580ccd46 SHA512 7770bc4eafb00e6ca4cef38cbaeab021ecb90bc7c3d8fdfb98c2c9b07a74d2e95227701a73c85a166e689387e44e37da67f765b7e427bb150e26c22eb3abd86e
-AUX 0.3-send-sync-event.patch 1031 BLAKE2B 2e67bde1ba2656d39fbcbd6d61876d08f08f62fb31381fe1f05624b66240db3f7b2f791dd296d4720a383d1d1b589cd963f6bcf9a05ec2c2c853f806445dad2b SHA512 d73ed855535f093d3fbbbee368b3bd6a6ea66bf6ba347321468ab2990dc94efdb4b7b1c655a6501872304b2e7e9b07a2a8f32ae9e354c41bbccf6973bb0d9953
+AUX 0.3-carriagereturn.patch 341 BLAKE2B 966abfa61f35ab262900b0efb3d9d1c8ee7fed1879466d073ea38aa658ef1141234bb9c1e2a7f97154d17491d48864a1110bc04a34cf3d462eac07a7ba0f1096 SHA512 946eebc335d9acff5610df6c69b30d06064cba72e2a65597c02eca8c5017c3f695c9aed61543db897f3c0c71f08a0508809a42bfa79d408344c00beabf612837
+AUX 0.3-direct_set_config_usb_hello.patch 808 BLAKE2B 62c1fad990f33b2a3aad1aa56175cc3cc74219940822bf083fc4698a41270ce72d33368cd4b73c46eeb183be100cfe6f869f89bc6fac4de42d176c099790b23e SHA512 5a9439a1bf03b0ad5184663f9530f65db8b282c2648455fff56f33b75567268af55fb7fc0d8e07087b5a47f9c1d26f5cedf21375b0edc15c982e41af2a6db855
+AUX 0.3-send-sync-event.patch 963 BLAKE2B e2f434d565d941ccdd2c26860597639786196e7d1a805093f81fc1ffd054d68582ece681b49c0f8e10a2c35acb35204fb513687f0908fad2a668f74ecab37ad2 SHA512 a1308cf9e6aede2dabb44363137a42d64d3b2ddc7fac180726a393a64099f1ca111020e050ba7dc7a4568d29eeff60669ab3dc4579002e8408a2c7f836cd3f05
 AUX 0.3-strip-strip.patch 1375 BLAKE2B 2eedb83b3257b5b597d4c6989f6bb6d17527bd34b85c175ffa15b71c485e70092e37dc95bb11a7c67690c717f2c29ef1a1fb84fd419a573abf597af8e61147bb SHA512 85572023761a8f6ad1a7355062f308267bea10ce529e1e01268f14f3d81023e1a1d94b92833741a2132f448ef074cbeb9bfc7a9a29786f2eaaa7c17989315214
-AUX 0.3-tftoolgroup.patch 1708 BLAKE2B c6cfddb352ca4202625c05dfcc0a44e0448f3ec225a4ed7d5c0dc26eabbdf5398ccf91e55e6a4009bbb290552eb6c6bcb402fa3dc86556f353b9fc7503c0504c SHA512 cf4d73bd3fa29b029074b4a529426f7822eeb356b4ee5d7ac503a55fb27e891c63ccd44a0e155b1ab0ec3b2c32ca23378648f9514653861761ed75ca797aeb9a
+AUX 0.3-tftoolgroup.patch 1640 BLAKE2B c34069ac17dcf81ee975ba60be9fa41e934d4d8c1a849ff11a7c68d648dff3e704e13ce499ff6ac9a0a26170a42e16c022d9c0061e946ee2759a4baf077e11b5 SHA512 4c3298c6c6368aeb36f1f3f6bcdb0c37f613be64916334d0abeb2efbc4a32f9ae04f3da5b8a14e9c259e8378605f9a5caad0405a39be071ec705a2a17e864e23
 AUX 60-thinkfinger.rules 251 BLAKE2B 1d9ed9c8186f3974e6953042ef7947bab0f688888eaef7526287af1ad198a465be1ddce56c9604e2c3177d404c396c1a4d213cfe34e1f6dee92af06f6185b3dc SHA512 076aa2c09498681952d92268f6b87137f6a7856447dfb00bdde36408fd54cdd1856566424595815068981df44c36592e26e2d61e2f220d8311373f1149b6ab4a
 DIST thinkfinger-0.3.tar.gz 372053 BLAKE2B f9fc18cfa268f89d9e6d12245c80fead3238210f568df9e26be73525efc721a422701c96cfc5c2898c29541f1f48d9fe8be2b97e183f61d0cbf64d6a04f6e38e SHA512 08bbefd906047dd128c9a3d5eef4b14332e51383d9c0667974ffe7f85ccab2561310f58adfa0cfe8a65154e621a607542f6e99df9be3f21ced394bc7993db4ff
-EBUILD thinkfinger-0.3-r3.ebuild 2009 BLAKE2B 8f8162c208119552d31e32af19e012248e045169e3468126ce90e6325e6535b7abf2f97fb4ad9268cfa8c2dd6289f812a7b1bf0607609ea28211e322616b2fdb SHA512 7449075346f0166f984689506bb309d5f87a24badebbddc4658343c19d6dcb1ac1091bd22327c1e7ae210504a636536fb0ef4961426fbee39d9492d676fe712f
+EBUILD thinkfinger-0.3-r3.ebuild 1932 BLAKE2B 8ed60abe6a9a402573fc1dbc60b0ebe69afa8388bf5f874db6ad6159f26a2c6e98a728992b10d0c5311ce3b66f869a19c31dbad9cae7129a8946492193f84a5e SHA512 1dc170126e5d4e9d8209dde5e5ce67e913f47c3af3951b2dd22f5e50b7d3d07d49cfc2e612fc6b7bee012a28b39cbbb19e9b669d664aff9495900213e416bb6a
 MISC metadata.xml 244 BLAKE2B 84dc5c2a4e8db9009d03970365477f7ba4538b67acdbda91c72873c425000020a07758ce6387863f382a34a9aed498bf3da079ee7e497df0aaf0d3b0c127313b SHA512 40e3d2553751e8b3f4355bbc2ce028f287c12fbd91227c1e2e473918b6be04c2c8959e4b9e821ca6cb8c64e8382226da6f7001023317d81cf1d55e1be6b3af3c
diff --git a/sys-auth/thinkfinger/files/0.3-carriagereturn.patch b/sys-auth/thinkfinger/files/0.3-carriagereturn.patch
index 731f1531947b..528731e27d9e 100644
--- a/sys-auth/thinkfinger/files/0.3-carriagereturn.patch
+++ b/sys-auth/thinkfinger/files/0.3-carriagereturn.patch
@@ -1,5 +1,5 @@
---- pam/pam_thinkfinger-uinput.c	2007-02-27 17:52:50.000000000 +0100
-+++ pam/pam_thinkfinger-uinput.c	2009-02-17 13:56:02.013033249 +0100
+--- a/pam/pam_thinkfinger-uinput.c
++++ b/pam/pam_thinkfinger-uinput.c
 @@ -95,6 +95,7 @@
  	/* our single key keyboard */
  	i  = ioctl (*fd, UI_SET_EVBIT, EV_KEY) < 0;
diff --git a/sys-auth/thinkfinger/files/0.3-direct_set_config_usb_hello.patch b/sys-auth/thinkfinger/files/0.3-direct_set_config_usb_hello.patch
index 06723ad1306c..2de27ab459ad 100644
--- a/sys-auth/thinkfinger/files/0.3-direct_set_config_usb_hello.patch
+++ b/sys-auth/thinkfinger/files/0.3-direct_set_config_usb_hello.patch
@@ -1,7 +1,5 @@
-Index: libthinkfinger/libthinkfinger.c
-===================================================================
---- libthinkfinger/libthinkfinger.c	(revision 118)
-+++ libthinkfinger/libthinkfinger.c	(working copy)
+--- a/libthinkfinger/libthinkfinger.c
++++ b/libthinkfinger/libthinkfinger.c
 @@ -265,18 +265,7 @@
  	int retval = -1;
  	char dummy[] = "\x10";
diff --git a/sys-auth/thinkfinger/files/0.3-send-sync-event.patch b/sys-auth/thinkfinger/files/0.3-send-sync-event.patch
index 39e0edb27ba1..0fbba6e9c2ae 100644
--- a/sys-auth/thinkfinger/files/0.3-send-sync-event.patch
+++ b/sys-auth/thinkfinger/files/0.3-send-sync-event.patch
@@ -1,5 +1,5 @@
---- pam/pam_thinkfinger-uinput.c	2009-12-27 18:42:26.000000000 +0100
-+++ pam/pam_thinkfinger-uinput.c	2009-12-27 18:41:55.000000000 +0100
+--- a/pam/pam_thinkfinger-uinput.c
++++ b/pam/pam_thinkfinger-uinput.c
 @@ -34,27 +34,40 @@
  int uinput_cr (int *fd)
  {
diff --git a/sys-auth/thinkfinger/files/0.3-tftoolgroup.patch b/sys-auth/thinkfinger/files/0.3-tftoolgroup.patch
index 169b7cefe286..251c6357b177 100644
--- a/sys-auth/thinkfinger/files/0.3-tftoolgroup.patch
+++ b/sys-auth/thinkfinger/files/0.3-tftoolgroup.patch
@@ -1,5 +1,5 @@
---- tf-tool/tf-tool.c	2007-03-30 11:00:45.000000000 +0200
-+++ tf-tool/tf-tool.c	2009-02-18 14:57:24.316197097 +0100
+--- a/tf-tool/tf-tool.c
++++ b/tf-tool/tf-tool.c
 @@ -26,6 +26,9 @@
  #include <errno.h>
  #include <libgen.h>
diff --git a/sys-auth/thinkfinger/thinkfinger-0.3-r3.ebuild b/sys-auth/thinkfinger/thinkfinger-0.3-r3.ebuild
index 730d8745e2c1..5148727daa45 100644
--- a/sys-auth/thinkfinger/thinkfinger-0.3-r3.ebuild
+++ b/sys-auth/thinkfinger/thinkfinger-0.3-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit autotools-utils user linux-info pam
+inherit linux-info pam
 
 DESCRIPTION="Support for the UPEK/SGS Thomson fingerprint reader, common in Thinkpads"
 HOMEPAGE="http://thinkfinger.sourceforge.net/"
@@ -12,13 +12,15 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug pam static-libs"
+IUSE="debug pam"
 
-RDEPEND="virtual/libusb:0
+DEPEND="
+	virtual/libusb:0
 	pam? ( sys-libs/pam )"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-	virtual/pkgconfig"
+RDEPEND="
+	${DEPEND}
+	acct-group/fingerprint"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${PV}-direct_set_config_usb_hello.patch
@@ -29,7 +31,7 @@ PATCHES=(
 )
 
 pkg_setup() {
-	if use pam ; then
+	if use pam; then
 		CONFIG_CHECK="~INPUT_UINPUT"
 		ERROR_CFG="Your kernel needs uinput for the pam module to work"
 		check_extra_config
@@ -37,43 +39,43 @@ pkg_setup() {
 }
 
 src_configure() {
-	local myeconfargs=(
+	econf \
+		--disable-static \
 		$(use_enable pam) \
 		$(use_enable debug usb-debug) \
-		"--with-securedir=$(getpam_mod_dir)"
-	)
-	autotools-utils_src_configure
+		--with-securedir="$(getpam_mod_dir)"
+
+	rm README.in || die
 }
 
 src_install() {
-	DOCS=( AUTHORS ChangeLog NEWS README )
-	autotools-utils_src_install
+	default
 
 	keepdir /etc/pam_thinkfinger
 	insinto /lib/udev/rules.d
 	doins "${FILESDIR}"/60-thinkfinger.rules
-}
 
-pkg_preinst() {
-	enewgroup fingerprint
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
 	fowners root:fingerprint /etc/pam_thinkfinger
 	fperms 710 /etc/pam_thinkfinger
+
 	elog "Use tf-tool --acquire to take a finger print"
 	elog "tf-tool will write the finger print file to /tmp/test.bir"
-	elog ""
-	if use pam ; then
+	elog
+
+	if use pam; then
 		elog "To add a fingerprint to PAM, use tf-tool --add-user USERNAME"
-		elog ""
+		elog
 		elog "Add the following to /etc/pam.d/system-auth after pam_env.so"
 		elog "auth     sufficient     pam_thinkfinger.so"
-		elog ""
+		elog
 		elog "Your system-auth should look similar to:"
 		elog "auth     required     pam_env.so"
 		elog "auth     sufficient   pam_thinkfinger.so"
 		elog "auth     sufficient   pam_unix.so try_first_pass likeauth nullok"
-		elog ""
 	fi
 }