gentoo resync : 03.07.2021

14 files changed, 250 insertions, 98 deletions

diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 0ff832be79ad..23ea87223d6c 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/pam-pgsql/Manifest b/sys-auth/pam-pgsql/Manifest
index 27584cfaea9d..edf0aa84ffc3 100644
--- a/sys-auth/pam-pgsql/Manifest
+++ b/sys-auth/pam-pgsql/Manifest
@@ -1,3 +1,3 @@
 DIST pam-pgsql-0.7.3.2.tar.gz 712533 BLAKE2B 6841505963310f5192aff3dce4d7d0ed8dce18bac629bd9338390794bdb6a0a2dd96b96a55660b5fcb6a34ebeeb8ef4024ce1203321508e027284fc8e94df3c5 SHA512 d5766e56a13b0b4762fba10d624d12f130f2675f1f1772eaaf275b599f44adcf98287c2636462ba3faf46af139eb1bd157918c0c783040796562f37dec17a6d9
-EBUILD pam-pgsql-0.7.3.2.ebuild 1174 BLAKE2B 0f35f65f70a7d22d04733f762ce9108fbea253cd1325ef31ffe1720f2c23acb159fda7e2c54d65f18820c769afbb6f01fef325bd08394d41c2d086ab6789d076 SHA512 2608b01a8412bb83d0fa91c7d9747a26970d2e7462db12aaf33efe671ef91689d65a2aa7a148b720e32be8f71c930c757d053e4540b881e03aaf642efa625007
+EBUILD pam-pgsql-0.7.3.2-r1.ebuild 1193 BLAKE2B 24c68a5adbe2186b47705bf323b12a1927206c1d408c30ed7049ea65072d1b73e7ba3f22723c4fe4829a3c3aab4ec3847ab36ccc3055e4cd3133d871dfc534e7 SHA512 a199b468f7583e408c408c2b0ba89ca8c0c104738c0eda5d6d501b8a15cddc3008eb2f27fa57d418648ce8ea895e604020f693c99020890f171e2e5017e7fbfb
 MISC metadata.xml 246 BLAKE2B 850b5402f188737f73aa16633a584d3f88d79e37a372857a3ecd6b7afb081a1b6d11a4c8edc74163410833a45d49a45fdeb6a3662e964d04670d13ba5cd0fbbf SHA512 1ef684533eaaf13fb66f13b4e9f340b4d2984d50b82b021c91a08c14cb1542d09701fa3bfd07a81a32f6b6a5c347e025feb102d0a7092f3727ad72c2f75c245d
diff --git a/sys-auth/pam-pgsql/pam-pgsql-0.7.3.2.ebuild b/sys-auth/pam-pgsql/pam-pgsql-0.7.3.2-r1.ebuild
index 56bbf56885ef..656ce64960a5 100644
--- a/sys-auth/pam-pgsql/pam-pgsql-0.7.3.2.ebuild
+++ b/sys-auth/pam-pgsql/pam-pgsql-0.7.3.2-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit pam
 
-DESCRIPTION="pam module to authenticate users via PostgreSQL"
+DESCRIPTION="PAM module to authenticate users via PostgreSQL"
 HOMEPAGE="https://sourceforge.net/projects/pam-pgsql/"
 
 if [[ ${PV} == *_p* ]]; then
@@ -14,16 +14,16 @@ else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 fi
 
-RDEPEND="sys-libs/pam
-	>=dev-db/postgresql-8.0:=
-	>=dev-libs/libgcrypt-1.2.0:0="
-
-DEPEND="${RDEPEND}"
-
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
+RDEPEND=">=dev-db/postgresql-8.0:=
+	>=dev-libs/libgcrypt-1.2.0:0=
+	sys-libs/pam
+	virtual/libcrypt:="
+DEPEND="${RDEPEND}"
+
 src_configure() {
 	econf \
 		--sysconfdir=/etc/security \
diff --git a/sys-auth/pam_mysql/Manifest b/sys-auth/pam_mysql/Manifest
index 79e2e47d35d4..2a4ce42926c0 100644
--- a/sys-auth/pam_mysql/Manifest
+++ b/sys-auth/pam_mysql/Manifest
@@ -1,5 +1,5 @@
 DIST pam_mysql-0.8.1.tar.gz 49613 BLAKE2B 1e3f6b0c8a11c8d328300fc820ddbbcd1601735de611e9317aab8f26ab2fbcf0f704e7a2c26de347fe9c4088c8171f0c278cd92e1668671871e5cd79db981241 SHA512 68aecc83c026c7616211a46b80f96fe822c8bd069a5ab6e9b170607bddac0dabe20410f78a1ac61ca1c1b2724ed0f0d99694d34bf28763270da3771c9ef05faf
 DIST pam_mysql-0.8.2.tar.gz 55023 BLAKE2B 2b278dc8cff229dd9fe9da2316f51838e6b9d57714dc07c7dfe85142ac4bb2e6c3a3de7eed7ab34917c08a07197c187434211cb7841c85f4c8d2d088309bae3a SHA512 268dd721554bc15125b6ea95b3f7b7a5f4ebf772e0ad65b6cf53d7e23d6154f10d916da774ea338a6b75427b2a6ada2b4730a57a88a15abea62a0454e7c5ea1e
-EBUILD pam_mysql-0.8.1-r1.ebuild 882 BLAKE2B 9cd44118c3f08968b9f0a342525faf8ea54f87fe831a2e808239f126e7a942a2bedba28e8112ba91264da54b40ed437ae05527c9b525d75de9c84db73db8cfd6 SHA512 6371f6247be3c991bccd1b44f0185eda2201a308d3db64f276f9155d547fce18982aac0703b751642a34725bda29145b45fc03db73ff36c24af3407fad4268f7
-EBUILD pam_mysql-0.8.2.ebuild 885 BLAKE2B 970599e73396c5f5cf912cea0c6eed61f9a043fc3f662bc7ecd4f8357f3e004cae64df49ee38af325ee0ef5bc46cabb7141858f9922cea30ba98329d618d1fd3 SHA512 a49afbcd142e60c4dd3b398b3aea875db6cd86c7d59212c532a757eeff07c2356f1b2f3b3458a6a9e3d4a68f42682a6936e83484c3f8be3d767ea7c649f86c35
+EBUILD pam_mysql-0.8.1-r2.ebuild 903 BLAKE2B 22cd8df2e94242d0602235a55c14ed295e543eba0da8d8c9b31796c533ca40c03176f56f952e1bab3bcd52082e47b47812b433fbfea85e7d4e2fe043d010e14c SHA512 d92281d1afca87de23d5350e1b1c9448971b91b4efb3bd62a7e76e735f0f9e7cab726790f59e09f2b514df9452d923a30c81e09fe0bd6d0927bdcee7719530ba
+EBUILD pam_mysql-0.8.2-r1.ebuild 906 BLAKE2B 53d245a3c03134532f494ded97227fc70e0b80fd2729af94fda6313c0efcc7a9601468b352b98f17f92e9af1a3072fd4eb4703c855ffbb488ae94ede3761108b SHA512 8eaebbe6696406caf9cba2e16d391182968c2530cf2085d04968181c8130986574832e184b28ceaeaee3a86bb54d8244f7c97dafb789b9742a2e585a5578aab4
 MISC metadata.xml 404 BLAKE2B aa7d8e4f9b1d52a6b238bca975f697debb58355314621957db0afaea72490a1e7b386ef05f95d9707d68bee9178b6848affeeadcad6800b0746912916cf2d682 SHA512 d78e3f912015ea18a9385b21c0f7f4d29a2af8773c0a154fd41a1a16abc71af8a7d43b71fa66f835be1b44d3afc22f0333e741313dfccb6446d628962d25915b
diff --git a/sys-auth/pam_mysql/pam_mysql-0.8.1-r1.ebuild b/sys-auth/pam_mysql/pam_mysql-0.8.1-r2.ebuild
index 8467e5ea0d73..f4493e838aa4 100644
--- a/sys-auth/pam_mysql/pam_mysql-0.8.1-r1.ebuild
+++ b/sys-auth/pam_mysql/pam_mysql-0.8.1-r2.ebuild
@@ -7,19 +7,21 @@ inherit autotools pam
 
 DESCRIPTION="pam_mysql is a module for pam to authenticate users with mysql"
 HOMEPAGE="https://github.com/NigelCunningham/pam-MySQL"
-
 SRC_URI="https://github.com/NigelCunningham/pam-MySQL/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/pam-MySQL-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ppc ~sparc x86"
+IUSE="openssl"
+
 DEPEND="
 	>=sys-libs/pam-0.72:0=
 	dev-db/mysql-connector-c:0=
+	virtual/libcrypt:=
 	openssl? ( dev-libs/openssl:0= )
 "
 RDEPEND="${DEPEND}"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~sparc x86"
-IUSE="openssl"
-S="${WORKDIR}/pam-MySQL-${PV}"
 
 DOCS=( AUTHORS ChangeLog NEWS README )
 
diff --git a/sys-auth/pam_mysql/pam_mysql-0.8.2.ebuild b/sys-auth/pam_mysql/pam_mysql-0.8.2-r1.ebuild
index 60c10e4af31a..6390e33505a8 100644
--- a/sys-auth/pam_mysql/pam_mysql-0.8.2.ebuild
+++ b/sys-auth/pam_mysql/pam_mysql-0.8.2-r1.ebuild
@@ -7,19 +7,21 @@ inherit autotools pam
 
 DESCRIPTION="pam_mysql is a module for pam to authenticate users with mysql"
 HOMEPAGE="https://github.com/NigelCunningham/pam-MySQL"
-
 SRC_URI="https://github.com/NigelCunningham/pam-MySQL/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/pam-MySQL-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="openssl"
+
 DEPEND="
 	>=sys-libs/pam-0.72:0=
 	dev-db/mysql-connector-c:0=
+	virtual/libcrypt:=
 	openssl? ( dev-libs/openssl:0= )
 "
 RDEPEND="${DEPEND}"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE="openssl"
-S="${WORKDIR}/pam-MySQL-${PV}"
 
 DOCS=( AUTHORS ChangeLog NEWS README )
 
diff --git a/sys-auth/pam_smb/Manifest b/sys-auth/pam_smb/Manifest
index 2f2274009809..56cffcf6d9ff 100644
--- a/sys-auth/pam_smb/Manifest
+++ b/sys-auth/pam_smb/Manifest
@@ -1,5 +1,7 @@
-AUX 10-pam_smb-bash-3.1.patch 563 BLAKE2B 2173be16da19f07425fe08d1b4e80a2f6dca94d0625b72b19afc88db0a695851fb3b8224d6348eb49b89961cb7c35d626ecb89f92f4c0fa70d388633c6f46e00 SHA512 0616b5be037b1f7429285286c2d8ac2709aa788fb449bd3d28f0e8c5f2f17a0307a9621452525fa818d66e42ba57796efcdb2e83eefaaee2a2395ed8b57fb06a
+AUX 10-pam_smb-bash-3.1.patch 419 BLAKE2B 3711e9d2f3195c69fbe853eb259e6363a8a9c479d9cdd95431496a0b42f42c8e801269628481558dbe0922cace178ac7e9d8976c49b99003af5208953338bf98 SHA512 bafb0a458caa1d717079de41fdeacfa09be20dead60906736506ea52e263ed5a3d6a7178216a5ec9890676cfac5a26945703fa8915d517dfd5962748978e5f5e
+AUX add-various-missing-includes.patch 1516 BLAKE2B 24d1d027e1d39f5d0287fa8c9d23615eb255b95d34655df7f64892b9f818ad852f8be097f8f83a5a5bab71153376739a7113ba23ed221f15718c051895eb4544 SHA512 c5d34da76cd1ef34cd85ed80bbfe8258fa029f10b35628a54e7785ffe8491cbfe7f5544eed486e9fc9b74df091d3d291e96dc73f1821dee97ea98dad1abe70a8
 AUX pamsmbd-init 356 BLAKE2B 833510d8d8285cd066335314424b6c5de28ddaa58f71bccdb957782e99820fa19600e18cd58d0b71b2889ed27e9fe233c1c27914271dc9b5365dd8ee7db4e0dd SHA512 2bf495c9915e025a3c89a127131c2489cca9b76a1995fe3a6c9e473cac22a4b5dd22ef80c42d42c0ddf759ea63ac643096711cb1db9331b8033de7f26b4634f4
+AUX respect-FLAGS-CC-AR.patch 3921 BLAKE2B 878b67b33dbc19c5a4965d0d9e8fa22c2b84b08d3d8f652a0031123f9a57d29b5531aa88a561b866f7bfebf6a80dee6ea4f823914588f803028bd1cdabd63016 SHA512 c900377166a64cd7a7225f3849e4f6393da8827d3fc11eba048c734812bf261769da113239435cddd4d052b167890e846b196c6a509914084686fd95f5345f35
 DIST pam_smb-2.0.0-rc6.tar.gz 115069 BLAKE2B 095e2e7e356391ef5b6152ad6855df895afaae7ed78e5b287fa97879e5e2a531f6fbcf7e72bf030fa9b7d525636ffb21708d7e99f75d5206b6e6024a01c2f95e SHA512 c41519ae2b657dd7cbbbeb6d097ec82fd2d0d5c0f51f658eecea98e7aaf4eb87975fc1bc6592d19dbef0a650e428ec69829270a3c119fdab9443cddd6facbe6a
-EBUILD pam_smb-2.0.0_rc6-r2.ebuild 1100 BLAKE2B 129420b3ead9aeefb230fa15bcc63d0124fad5661cd22c3ce2b06e4e457e93a4e9082518dce315fb62836e1ddcd3e378785c78f337388ea41a1a7b2f57054df6 SHA512 b02b26f337115e52de556fea10db6797c83918f3f63312e237006b6375f3884354c0bc1998692f219074cc5bd6108245b6205a682a124e580e4783b03ba1c0e2
-MISC metadata.xml 239 BLAKE2B 3424eee302f16814cc391ac82a70ed8dcf57c19e443eb0bb4bb8ee9f4db236b7dc77b015e975c663cad4760157a9add0c84971ad7a0bfee13ca6a8d56ca87fc3 SHA512 2613369bbdfb5d60b16d10f4993395a634ce1175871fb084be372541de1d41cf03630379f2206f26f4cb7d80e183a7c8df740badb9ec10cc3a9dbd24bd198380
+EBUILD pam_smb-2.0.0_rc6-r3.ebuild 1180 BLAKE2B 3b9267bbdadb4dd4485d5824a0c786ea3a4a35abbc97aec334bcb3764a7de3bd8f898a3224d4b22b1b21a2c0fec45f4362bfe940ad8d77ed73361e7e03086893 SHA512 dc862dc0f2f218958d7a4f7b3e25ab2debb15f7fb5928ccb6eb953071ba4c1bb6f2872b0910bc7230784cce4f7ed84d446d792d75e730756608749c2178b2ac1
+MISC metadata.xml 243 BLAKE2B b446685c73231b8dc3f8c162bfac14239a4e518621dced89fe744b2005d7c675c845e3cb98fda3dfc499b8441baf1d30f2a88eeb690871a6669cea48905e3514 SHA512 20e8b69b885142fd50740682bc351be71dd51d7fd4f91e61048aa1fc52e622a30470ac6dfe13472e6cb53a0ea81f3bb36239b1745775a79340937d4db36edf8b
diff --git a/sys-auth/pam_smb/files/10-pam_smb-bash-3.1.patch b/sys-auth/pam_smb/files/10-pam_smb-bash-3.1.patch
index df8050442d6b..ddad580381b4 100644
--- a/sys-auth/pam_smb/files/10-pam_smb-bash-3.1.patch
+++ b/sys-auth/pam_smb/files/10-pam_smb-bash-3.1.patch
@@ -1,6 +1,5 @@
-diff -Nurp pam_smb-2.0.0_rc6.orig/configure pam_smb-2.0.0_rc6/configure
---- a/configure	2006-03-17 15:02:01.000000000 +0000
-+++ b/configure	2006-03-17 15:02:01.000000000 +0000
+--- a/configure
++++ b/configure
 @@ -1486,7 +1486,7 @@ else
          # results, and the version is kept in special file).
  
diff --git a/sys-auth/pam_smb/files/add-various-missing-includes.patch b/sys-auth/pam_smb/files/add-various-missing-includes.patch
new file mode 100644
index 000000000000..0aa1ea48d32c
--- /dev/null
+++ b/sys-auth/pam_smb/files/add-various-missing-includes.patch
@@ -0,0 +1,68 @@
+From: Sam James <sam@gentoo.org>
+Date: Wed, 30 Jun 2021 08:09:19 +0100
+Subject: [PATCH] Add various missing includes
+--- a/pamsmbd/md5.c
++++ b/pamsmbd/md5.c
+@@ -39,6 +39,7 @@
+  */
+ 
+ #include "md5.h"
++#include <string.h>
+ 
+ #ifdef TEST
+ /*
+@@ -46,7 +47,6 @@
+  * The test program should print out the same values as given in section
+  * A.5 of RFC 1321, reproduced below.
+  */
+-#include <string.h>
+ main()
+ {
+     static const char *const test[7] = {
+--- a/pamsmbd/md5driver.c
++++ b/pamsmbd/md5driver.c
+@@ -38,6 +38,7 @@ Bug reports and feature requests should be sent to bugs@zetetic.net.
+ */
+ 
+ #include <strings.h>
++#include <string.h>
+ #include "constants.h"
+ #include "md5.h"
+ #include "md5driver.h"
+--- a/smbval/session.c
++++ b/smbval/session.c
+@@ -22,11 +22,8 @@
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+-#if defined(__FreeBSD__) || defined(__APPLE__)
+ #include <stdlib.h>
+-#else
+ #include <malloc.h>
+-#endif
+ #include <string.h>
+ 
+ int RFCNB_errno = 0;
+--- a/smbval/smblib-util.c
++++ b/smbval/smblib-util.c
+@@ -23,6 +23,7 @@
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+ 
++#include <string.h>
+ #include "smblib-priv.h"
+ #if defined(__FreeBSD__) || defined(__APPLE__)
+ #include <stdlib.h>
+--- a/smbval/smblib.c
++++ b/smbval/smblib.c
+@@ -25,6 +25,7 @@
+ */
+ 
+ #include "config.h"
++#include <ctype.h>
+ #include <string.h>
+ #if defined(__FreeBSD__) || defined(__APPLE__)
+ #include <stdlib.h>
+-- 
+2.32.0
+
diff --git a/sys-auth/pam_smb/files/respect-FLAGS-CC-AR.patch b/sys-auth/pam_smb/files/respect-FLAGS-CC-AR.patch
new file mode 100644
index 000000000000..1ba762f866a4
--- /dev/null
+++ b/sys-auth/pam_smb/files/respect-FLAGS-CC-AR.patch
@@ -0,0 +1,132 @@
+https://bugs.gentoo.org/341087
+https://bugs.gentoo.org/728146
+https://bugs.gentoo.org/725736
+
+From: Sam James <sam@gentoo.org>
+Date: Wed, 30 Jun 2021 07:54:21 +0100
+Subject: [PATCH] Respect *FLAGS, CC, AR
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -12,7 +12,7 @@ EXTRALIBS = @MLIBS@
+ LDFLAGS = @LDFLAGS@
+ CC = @CC@
+ 
+-SHELL=/bin/sh
++SHELL?=/bin/sh
+ 
+ INSTALL= @INSTALL@
+ 
+@@ -49,7 +49,7 @@ LIBOBJS = $(addprefix static/,$(LIBOBJ))
+ export CFLAGS CC SHLIB_LD SHLIB_CFLAGS SHLIB_SUFFIX DOBJS MOBJS MSRCS INSTALL INSTALLDIR MLIBS DLIBS EXTRALIBS
+ 
+ %.o : %.c
+-	$(CC) $(CFLAGS) $(DYNAMIC) $(CPPFLAGS) -c $< -o $@
++	$(CC) $(CFLAGS) $(DYNAMIC) $(CPPFLAGS) $(LDFLAGS) -c $< -o $@
+ 
+ 
+ ########################### don't edit below #######################
+@@ -80,4 +80,4 @@ distclean: clean
+ 	rm -f *.a *.out *.o *.so *.bak config.log config.cache config.status config.h Makefile include/config.h
+ 
+ .c.o:	
+-	$(CC) -c $(CFLAGS) $<
++	$(CC) -c $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $<
+--- a/pamsmbd/Makefile
++++ b/pamsmbd/Makefile
+@@ -8,7 +8,7 @@ CFLAGS += ${INCLUDE}
+ TARGET = pamsmbd
+ 
+ ${TARGET}: ${OBJS} ../smbval/smbvalid.a ../tdb/tdb.o ../tdb/spinlock.o
+-	$(CC) -g -o ${TARGET} ${INCLUDE} ${OBJS} ../tdb/tdb.o ../tdb/spinlock.o ../smbval/smbvalid.a $(DLIBS)
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o ${TARGET} ${INCLUDE} ${OBJS} ../tdb/tdb.o ../tdb/spinlock.o ../smbval/smbvalid.a $(DLIBS)
+ 
+ clean:
+ 	rm -f ${TARGET} ${OBJS}
+--- a/pamsmbd/Makefile.crypt
++++ b/pamsmbd/Makefile.crypt
+@@ -8,7 +8,7 @@ CFLAGS += ${INCLUDE}  -Wall
+ TARGET = pamsmbd
+ 
+ ${TARGET}: ${OBJS} ../smbval/smbvalid.a ../tdb/tdb.o
+-	$(CC) -DCRYPT -g -o ${TARGET} ${INCLUDE} ${OBJS} ../tdb/tdb.o ../smbval/smbvalid.a $(DLIBS) -lcrypt
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -DCRYPT -o ${TARGET} ${INCLUDE} ${OBJS} ../tdb/tdb.o ../smbval/smbvalid.a $(DLIBS) -lcrypt
+ 
+ clean:
+ 	rm -f ${TARGET} ${OBJS}
+--- a/pamsmbd/Makefile.md5
++++ b/pamsmbd/Makefile.md5
+@@ -8,7 +8,7 @@ CFLAGS += ${INCLUDE}  -Wall
+ TARGET = pamsmbd
+ 
+ ${TARGET}: ${OBJS} ../smbval/smbvalid.a ../tdb/tdb.o
+-	$(CC) -g -o ${TARGET} ${INCLUDE} ${OBJS} ../tdb/tdb.o ../smbval/smbvalid.a $(DLIBS)
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o ${TARGET} ${INCLUDE} ${OBJS} ../tdb/tdb.o ../smbval/smbvalid.a $(DLIBS)
+ 
+ clean:
+ 	rm -f ${TARGET} ${OBJS}
+--- a/pamsmbm/Makefile
++++ b/pamsmbm/Makefile
+@@ -4,7 +4,7 @@
+ #
+ #
+ 
+-CFLAGS = -DHAVE_CONFIG_H -I../include -I..
++CFLAGS += -DHAVE_CONFIG_H -I../include -I..
+ 
+ LIBAUTHSH = pam_smb_auth$(SHLIB_SUFFIX)
+ 
+@@ -16,7 +16,7 @@ LIBSRC = $(LIBAUTHSRC)
+ LIBSHARED = $(LIBAUTHSH) 
+ 
+ %.o : %.c
+-	$(CC) $(CFLAGS) $(SHLIB_CFLAGS) $(DYNAMIC) $(CPPFLAGS) -c $< -o $@
++	$(CC) $(CFLAGS) $(SHLIB_CFLAGS) $(DYNAMIC) $(CPPFLAGS) $(LDFLAGS) -c $< -o $@
+ 
+ 
+ ########################### don't edit below #######################
+@@ -26,7 +26,7 @@ dummy: all
+ all: $(LIBSHARED) Makefile
+ 
+ smb_auth: smb_auth.o
+-	gcc -o smb_auth smb_auth.o queue_valid.o ../smbval/smbvalid.a
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o smb_auth smb_auth.o queue_valid.o ../smbval/smbvalid.a
+ 
+ $(LIBOBJD): $(LIBSRC)
+
+@@ -43,4 +43,4 @@ extraclean: clean
+ 	rm -f *.a *.out *.o *.so
+ 
+ .c.o:	
+-	$(CC) -c $(CFLAGS) $<
++	$(CC) -c $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $<
+--- a/smbval/Makefile
++++ b/smbval/Makefile
+@@ -3,7 +3,7 @@
+ # Copyright (c) Dave Airlie 2000 (airlied@samba.org)
+ #
+ 
+-AR = ar
++AR ?= ar
+ 
+ INCLUDES = smblib.h smblib-priv.h
+ 
+@@ -27,7 +27,7 @@ all: smbvalid.a
+ 
+ .c.o:	$(INCLUDES)
+ 	@echo Compiling $*.c
+-	$(CC) -I../include $(CFLAGS) -c $*.c
++	$(CC) -I../include $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -c $*.c
+ 
+ clean:
+ 	rm -f *.o smbvalid.a
+--- a/pamsmbm/Makefile
++++ b/pamsmbm/Makefile
+@@ -31,7 +31,7 @@ smb_auth: smb_auth.o
+ $(LIBOBJD): $(LIBSRC)
+ 
+ $(LIBAUTHSH):	$(LIBAUTHSRC) $(LIBOBJ) 
+-		$(SHLIB_LD) $(LD_FLAGS) -o $@ $(LIBAUTHOBJ) $(EXTRALIBS)
++		$(SHLIB_LD) $(LDFLAGS) $(LD_FLAGS) -o $@ $(LIBAUTHOBJ) $(EXTRALIBS)
+ 
+ clean:
+ 	rm -f $(LIBAUTHSH) $(LIBAUTHOBJ) a.out core *~
diff --git a/sys-auth/pam_smb/metadata.xml b/sys-auth/pam_smb/metadata.xml
index 9f95883df7c1..a63448454bf2 100644
--- a/sys-auth/pam_smb/metadata.xml
+++ b/sys-auth/pam_smb/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>samba@gentoo.org</email>
-	<name>Samba Team</name>
-</maintainer>
+	<maintainer type="project">
+		<email>samba@gentoo.org</email>
+		<name>Samba Team</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-auth/pam_smb/pam_smb-2.0.0_rc6-r2.ebuild b/sys-auth/pam_smb/pam_smb-2.0.0_rc6-r3.ebuild
index dc4dd6bbca1c..e62a1829a687 100644
--- a/sys-auth/pam_smb/pam_smb-2.0.0_rc6-r2.ebuild
+++ b/sys-auth/pam_smb/pam_smb-2.0.0_rc6-r3.ebuild
@@ -12,27 +12,26 @@ HOMEPAGE="http://www.csn.ul.ie/~airlied/pam_smb/"
 SRC_URI="
 	mirror://samba/pam_smb/v2/${MY_P}.tar.gz
 	http://www.csn.ul.ie/~airlied/pam_smb/v2/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc x86"
 
-DEPEND=">=sys-libs/pam-0.75"
+DEPEND="virtual/libcrypt:=
+	>=sys-libs/pam-0.75"
 RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}/10-pam_smb-bash-3.1.patch"
-}
+PATCHES=(
+	"${FILESDIR}"/10-pam_smb-bash-3.1.patch
+	"${FILESDIR}"/respect-FLAGS-CC-AR.patch
+	"${FILESDIR}"/add-various-missing-includes.patch
+)
 
 src_configure() {
-	econf --disable-root-only
-}
+	tc-export CC
 
-src_compile() {
-	emake CC="$(tc-getCC)"
+	LDFLAGS="${LDFLAGS}" econf --disable-root-only
 }
 
 src_install() {
@@ -47,8 +46,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	echo
-	elog "You must create /etc/pam_smb.conf yourself, containing"
-	elog "your domainname, PDC and BDC.  See example files in docdir."
-	echo
+	elog "You must create ${EROOT}/etc/pam_smb.conf yourself, containing"
+	elog "your domain name, PDC and BDC.  See example files in docdir."
 }
diff --git a/sys-auth/seatd/Manifest b/sys-auth/seatd/Manifest
index d82b4ec290dd..2a61856f1838 100644
--- a/sys-auth/seatd/Manifest
+++ b/sys-auth/seatd/Manifest
@@ -1,7 +1,5 @@
 AUX seatd.initd 87 BLAKE2B e88a8c353191ad9b69c0ee263aee7a050333d43e8dd26c8b3ee40cfbcb17f9b7a9391720ac34d19f375a880fae8178cd7dfc0b45cc9565b4b073bbe43cadf5ce SHA512 a19171b55e6650a9237f89258d92aba18508684412fe8a072387c505945b8e54557bd52261de76230553a572d627f40e00770087040111a7473fadfe3c33c931
-DIST seatd-0.4.0.tar.gz 34242 BLAKE2B 295ee18736b5f7e1b06013d00514321aad5fb09c285690cfbd78833a9efbfeb2cfaef69c075fb096fedaac42ff249ee1a43593dbd03132770c1be293ffe7ddc1 SHA512 498ab4040c19ff90842bf82f580ba24c2c98e0aded7ba636dcffc80f6bfd8869eec3e87e784455b66e2b69786b2fc6e7315b2867effa825440759d58e391378c
 DIST seatd-0.5.0.tar.gz 34762 BLAKE2B 054bd64800b734f6092f856540217e5ea4872c5a363960bac6c5aa7dac5355bdbd982232efd2f8078ad326ec0e6257f3ee7643384c88a3bbe15255d65f02540c SHA512 a6b1f11313411fe99e8bdd64aa493fc19bde7b0b927f21e2c3ec8a7fadc6cf2f04fcefa73fa033d971d1dc482665d3dc927ec168026289fe88b2593a45adbc0f
-EBUILD seatd-0.4.0-r1.ebuild 1037 BLAKE2B f687419f4f306e0876ce82de334821c59d3813c6e7548f01c1552faade6d5319ee04c39a979da189f691839ae099aa9fa64076f615aa0eb9cd27b42375b03ed8 SHA512 65d935d01a7ebf57cc66b485df74c26991377cbdd9791d2b58a06a64edca454e9508d91fcab94fc8da721a44b8b9e2667c8a46ee925e001e8acf7d15ad9c8c13
 EBUILD seatd-0.5.0.ebuild 1042 BLAKE2B a446d0fbfe79100e7496952993fc951c60cbd830f7b9080433a8fbb1fe15d101879ef4e5de1730ee6acd3642d00c7ce0655a5f7f04bac01a0b8e78a6b3b5bef4 SHA512 37030a1212041d703ca4af341ca6751c01cc3a9c6022cb8cc21a24c41eefad54fdede86ba59d43bdc6a32426a795dc05a8fda224e2d06d99fca7e497ded0eb88
 EBUILD seatd-9999.ebuild 1040 BLAKE2B 90669d39f22d7d125b293d23ad3187c9d019debb45d80ff79895243b91dafe0a8e994ab16b2932178a5bd6a6c1a582f1a7833c3c1425309f27c0b1b21134b50f SHA512 eaefd1ed17c983f46e462e3a3db3dc4991446dc48a799498767df562eea2199d62432e5b235c4406501791d4b87ddc1d407d2de9670026a3cd953cf851cdf859
 MISC metadata.xml 401 BLAKE2B 5d18c166454284e17627d57cef82c4be2baf41ce3de777a0388a83c5d93f23aebba8cbb4a309ee2d56bb40ce1081111e08c5a6573ba73778f1b8d7d93c890c9f SHA512 abcfb783a786d09ea6b52b6252cb4314273be58989c4e0938b2f99ad61b8d85914d86422964cefef574c68eda0698d725a811d73dea1c6ed18f7bec603df02d9
diff --git a/sys-auth/seatd/seatd-0.4.0-r1.ebuild b/sys-auth/seatd/seatd-0.4.0-r1.ebuild
deleted file mode 100644
index 88d98cef8d35..000000000000
--- a/sys-auth/seatd/seatd-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson systemd
-
-DESCRIPTION="Minimal seat management daemon and universal library"
-HOMEPAGE="https://sr.ht/~kennylevinsen/seatd"
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.sr.ht/~kennylevinsen/seatd"
-else
-	KEYWORDS="amd64 arm64 ~ppc64 x86"
-	SRC_URI="https://git.sr.ht/~kennylevinsen/seatd/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-LICENSE="MIT"
-SLOT="0/1"
-IUSE="elogind systemd"
-REQUIRED_USE="?? ( elogind systemd )"
-
-DEPEND="
-	elogind? ( sys-auth/elogind )
-	systemd? ( sys-apps/systemd )
-"
-RDEPEND="${DEPEND}"
-BDEPEND=">=app-text/scdoc-1.9.7"
-
-src_configure() {
-	local emesonargs=(
-		-Dman-pages=enabled
-		-Dwerror=false
-	)
-
-	if use elogind || use systemd; then
-		emesonargs+=( -Dlogind=enabled )
-	else
-		emesonargs+=( -Dlogind=disabled )
-	fi
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	newinitd "${FILESDIR}/seatd.initd" seatd
-	systemd_dounit contrib/systemd/seatd.service
-}