gentoo resync : 04.05.2021

4 files changed, 73 insertions, 2 deletions

diff --git a/sys-auth/thinkfinger/Manifest b/sys-auth/thinkfinger/Manifest
index 4b19b5e5e919..3f575b1c1fd7 100644
--- a/sys-auth/thinkfinger/Manifest
+++ b/sys-auth/thinkfinger/Manifest
@@ -1,9 +1,11 @@
+AUX 0.3-autoreconf.patch 584 BLAKE2B 438d2ced1ed8a32e13dfc77d11f23cbeb8839e865428f5997bee092d4b225332564afbd7f8031e9005b40b668d6a4586c43cfb2d361071a179c292621dc0e73b SHA512 05be8a13ac1f7d97b1d93484b2245d29233aaf48dfd7268db5115673dddc83c307b870299f6f3bfc52e775be626ceaaf805649a60649a4b54de0320b1b5e9cf4
 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-slibtool.patch 1599 BLAKE2B f62b4853222b2ac694868d937b4ad589d818d48811870402cdd63bc717ae5930c498c663da8d0300f0183cad563c68560a73da43a8a8572823bcf122c004126d SHA512 c7d596f3db5c71b744cd90d72371e53dc5171511dcfc3d5eb64e3e9f98a9ac9503d6f7301a55fa89ba9df52031c2f855999df9315cee154fa8a9f880894012a1
 AUX 0.3-strip-strip.patch 1375 BLAKE2B 2eedb83b3257b5b597d4c6989f6bb6d17527bd34b85c175ffa15b71c485e70092e37dc95bb11a7c67690c717f2c29ef1a1fb84fd419a573abf597af8e61147bb SHA512 85572023761a8f6ad1a7355062f308267bea10ce529e1e01268f14f3d81023e1a1d94b92833741a2132f448ef074cbeb9bfc7a9a29786f2eaaa7c17989315214
 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 1932 BLAKE2B 8ed60abe6a9a402573fc1dbc60b0ebe69afa8388bf5f874db6ad6159f26a2c6e98a728992b10d0c5311ce3b66f869a19c31dbad9cae7129a8946492193f84a5e SHA512 1dc170126e5d4e9d8209dde5e5ce67e913f47c3af3951b2dd22f5e50b7d3d07d49cfc2e612fc6b7bee012a28b39cbbb19e9b669d664aff9495900213e416bb6a
+EBUILD thinkfinger-0.3-r3.ebuild 2057 BLAKE2B f56496453ef05ac31cc96ba206998d40bcf4f1ee0c03ccbcc0cc0398bb6202d742932133c0bfeed66ea07dfbb86035acca2f50afb7cb81a9e2995817dbcb82db SHA512 292bb7f69c814a7fc56880c7fe0886b568a5a0ae1ec9b79ea93887a863cb385a128879ce948dfa8f82aa48dd26f295b3f92fac732afae0d36578a0ca12eb26c7
 MISC metadata.xml 244 BLAKE2B 84dc5c2a4e8db9009d03970365477f7ba4538b67acdbda91c72873c425000020a07758ce6387863f382a34a9aed498bf3da079ee7e497df0aaf0d3b0c127313b SHA512 40e3d2553751e8b3f4355bbc2ce028f287c12fbd91227c1e2e473918b6be04c2c8959e4b9e821ca6cb8c64e8382226da6f7001023317d81cf1d55e1be6b3af3c
diff --git a/sys-auth/thinkfinger/files/0.3-autoreconf.patch b/sys-auth/thinkfinger/files/0.3-autoreconf.patch
new file mode 100644
index 000000000000..f0b7a1c20232
--- /dev/null
+++ b/sys-auth/thinkfinger/files/0.3-autoreconf.patch
@@ -0,0 +1,25 @@
+From 922e00d123092da33f3237071236e28b0f120766 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Sun, 28 Mar 2021 11:04:26 -0700
+Subject: [PATCH 1/2] build: Fix autoreconf.
+
+---
+ configure.in | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 2bdd150..4b277b9 100644
+--- a/configure.in
++++ b/configure.in
+@@ -179,8 +179,6 @@ AM_CONDITIONAL(HAVE_OLD_PAM, test "x$HAVE_OLD_PAM" = "xyes")
+ 
+ # AC_CONFIG_FILES
+ AC_CONFIG_FILES([Makefile
+-		README
+-		INSTALL
+ 		docs/Makefile
+ 		docs/autodocs/Makefile
+ 		libthinkfinger/Makefile
+-- 
+2.26.3
+
diff --git a/sys-auth/thinkfinger/files/0.3-slibtool.patch b/sys-auth/thinkfinger/files/0.3-slibtool.patch
new file mode 100644
index 000000000000..2b56e9ce1c85
--- /dev/null
+++ b/sys-auth/thinkfinger/files/0.3-slibtool.patch
@@ -0,0 +1,37 @@
+From 477ef76901ae46d58202091060a763f9b4c4b57f Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Sun, 28 Mar 2021 11:08:43 -0700
+Subject: [PATCH 2/2] build: Fix creating the libpam_thinkfinger library.
+
+---
+ pam/Makefile.am | 13 ++++++-------
+ 1 file changed, 6 insertions(+), 7 deletions(-)
+
+diff --git a/pam/Makefile.am b/pam/Makefile.am
+index d3bfcab..38c3cab 100644
+--- a/pam/Makefile.am
++++ b/pam/Makefile.am
+@@ -1,14 +1,13 @@
+-pam_PROGRAMS = pam_thinkfinger.so
++pam_LTLIBRARIES = libpam_thinkfinger.la
+ pamdir = $(SECUREDIR)
+ 
+ INCLUDES = -I$(top_srcdir)/libthinkfinger
+ 
+ if HAVE_OLD_PAM
+-pam_thinkfinger_so_SOURCES = pam_thinkfinger-compat.c pam_thinkfinger-compat.h pam_thinkfinger-uinput.c pam_thinkfinger-uinput.h pam_thinkfinger.c
++libpam_thinkfinger_la_SOURCES = pam_thinkfinger-compat.c pam_thinkfinger-compat.h pam_thinkfinger-uinput.c pam_thinkfinger-uinput.h pam_thinkfinger.c
+ else
+-pam_thinkfinger_so_SOURCES = pam_thinkfinger-uinput.c pam_thinkfinger-uinput.h pam_thinkfinger.c
++libpam_thinkfinger_la_SOURCES = pam_thinkfinger-uinput.c pam_thinkfinger-uinput.h pam_thinkfinger.c
+ endif
+-pam_thinkfinger_so_LDFLAGS = -shared -Wl,-soname,pam_thinkfinger.so -Wl,--as-needed
+-pam_thinkfinger_so_CFLAGS = $(CFLAGS)
+-pam_thinkfinger_so_LDADD = $(top_builddir)/libthinkfinger/libthinkfinger.la $(PAM_LIBS) $(PTHREAD_LIBS)
+-
++libpam_thinkfinger_la_LDFLAGS = -shared -Wl,-soname,pam_thinkfinger.so -Wl,--as-needed
++libpam_thinkfinger_la_CFLAGS = $(CFLAGS)
++libpam_thinkfinger_la_LIBADD = $(top_builddir)/libthinkfinger/libthinkfinger.la $(PAM_LIBS) $(PTHREAD_LIBS)
+-- 
+2.26.3
+
diff --git a/sys-auth/thinkfinger/thinkfinger-0.3-r3.ebuild b/sys-auth/thinkfinger/thinkfinger-0.3-r3.ebuild
index 5148727daa45..d877ef488e97 100644
--- a/sys-auth/thinkfinger/thinkfinger-0.3-r3.ebuild
+++ b/sys-auth/thinkfinger/thinkfinger-0.3-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit linux-info pam
+inherit autotools linux-info pam
 
 DESCRIPTION="Support for the UPEK/SGS Thomson fingerprint reader, common in Thinkpads"
 HOMEPAGE="http://thinkfinger.sourceforge.net/"
@@ -28,6 +28,8 @@ PATCHES=(
 	"${FILESDIR}"/${PV}-send-sync-event.patch
 	"${FILESDIR}"/${PV}-tftoolgroup.patch
 	"${FILESDIR}"/${PV}-strip-strip.patch
+	"${FILESDIR}"/${PV}-autoreconf.patch
+	"${FILESDIR}"/${PV}-slibtool.patch
 )
 
 pkg_setup() {
@@ -38,6 +40,11 @@ pkg_setup() {
 	fi
 }
 
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
 	econf \
 		--disable-static \