[gentoo-commits] repo/gentoo:master commit in: sys-libs/pam/

["Sam James" <sam@gentoo.org>]

commit:     aeb526aa3b0875745fa0af6c754ded21af68658b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  6 02:28:55 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov  6 02:29:48 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aeb526aa

sys-libs/pam: drop usrscript

This shouldn't be necessary anymore but let's do it in a new revision
in ~arch to be safe.

See: 2ff9dcc3275e4f37a44eaf707fce9f53c13c2e82
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-libs/pam/pam-1.5.1-r1.ebuild                       | 4 +++-
 sys-libs/pam/pam-1.5.1_p20210622-r1.ebuild             | 4 +++-
 sys-libs/pam/{pam-1.5.2.ebuild => pam-1.5.2-r1.ebuild} | 0
 sys-libs/pam/pam-1.5.2.ebuild                          | 4 +++-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/sys-libs/pam/pam-1.5.1-r1.ebuild b/sys-libs/pam/pam-1.5.1-r1.ebuild
index 9d9ffe7141e..61fbf74ec47 100644
--- a/sys-libs/pam/pam-1.5.1-r1.ebuild
+++ b/sys-libs/pam/pam-1.5.1-r1.ebuild
@@ -9,7 +9,7 @@ MY_P="Linux-${PN^^}-${PV}"
 # Can reconsider w/ EAPI 8 and IDEPEND, bug #810979
 TMPFILES_OPTIONAL=1
 
-inherit autotools db-use fcaps toolchain-funcs multilib-minimal
+inherit autotools db-use fcaps toolchain-funcs usr-ldscript multilib-minimal
 
 DESCRIPTION="Linux-PAM (Pluggable Authentication Modules)"
 HOMEPAGE="https://github.com/linux-pam/linux-pam"
@@ -92,6 +92,8 @@ multilib_src_compile() {
 multilib_src_install() {
 	emake DESTDIR="${D}" install \
 		sepermitlockdir="/run/sepermit"
+
+	gen_usr_ldscript -a pam pam_misc pamc
 }
 
 multilib_src_install_all() {

diff --git a/sys-libs/pam/pam-1.5.1_p20210622-r1.ebuild b/sys-libs/pam/pam-1.5.1_p20210622-r1.ebuild
index 4c18a7e8cff..bbc95832d99 100644
--- a/sys-libs/pam/pam-1.5.1_p20210622-r1.ebuild
+++ b/sys-libs/pam/pam-1.5.1_p20210622-r1.ebuild
@@ -7,7 +7,7 @@ EAPI=7
 # Can reconsider w/ EAPI 8 and IDEPEND, bug #810979
 TMPFILES_OPTIONAL=1
 
-inherit autotools db-use fcaps toolchain-funcs multilib-minimal
+inherit autotools db-use fcaps toolchain-funcs usr-ldscript multilib-minimal
 
 GIT_COMMIT="fe1307512fb8892b5ceb3d884c793af8dbd4c16a"
 DOC_SNAPSHOT="20210610"
@@ -87,6 +87,8 @@ multilib_src_compile() {
 multilib_src_install() {
 	emake DESTDIR="${D}" install \
 		sepermitlockdir="/run/sepermit"
+
+	gen_usr_ldscript -a pam pam_misc pamc
 }
 
 multilib_src_install_all() {

diff --git a/sys-libs/pam/pam-1.5.2.ebuild b/sys-libs/pam/pam-1.5.2-r1.ebuild
similarity index 100%
copy from sys-libs/pam/pam-1.5.2.ebuild
copy to sys-libs/pam/pam-1.5.2-r1.ebuild

diff --git a/sys-libs/pam/pam-1.5.2.ebuild b/sys-libs/pam/pam-1.5.2.ebuild
index 77719a8fded..12fb3126d89 100644
--- a/sys-libs/pam/pam-1.5.2.ebuild
+++ b/sys-libs/pam/pam-1.5.2.ebuild
@@ -9,7 +9,7 @@ MY_P="Linux-${PN^^}-${PV}"
 # Can reconsider w/ EAPI 8 and IDEPEND, bug #810979
 TMPFILES_OPTIONAL=1
 
-inherit autotools db-use fcaps toolchain-funcs multilib-minimal
+inherit autotools db-use fcaps toolchain-funcs usr-ldscript multilib-minimal
 
 DESCRIPTION="Linux-PAM (Pluggable Authentication Modules)"
 HOMEPAGE="https://github.com/linux-pam/linux-pam"
@@ -86,6 +86,8 @@ multilib_src_compile() {
 multilib_src_install() {
 	emake DESTDIR="${D}" install \
 		sepermitlockdir="/run/sepermit"
+
+	gen_usr_ldscript -a pam pam_misc pamc
 }
 
 multilib_src_install_all() {