Diff pam-1.3.1_p20200128-r1 with a pam-1.4.0-r2

/usr/portage/sys-libs/pam/pam-1.4.0-r2.ebuild 2020-06-18 18:09:00.000000000 +0300
3 3

  
4 4
EAPI=7
5 5

  
6
inherit autotools db-use fcaps multilib-minimal toolchain-funcs usr-ldscript
6
inherit autotools db-use fcaps toolchain-funcs usr-ldscript multilib-minimal
7 7

  
8 8
DESCRIPTION="Linux-PAM (Pluggable Authentication Modules)"
9 9
HOMEPAGE="https://github.com/linux-pam/linux-pam"
10 10

  
11
COMMIT_HASH="4dd9b97b762cc73816cb867d49c9d0d0b91d642c"
12
SRC_URI="https://github.com/linux-pam/linux-pam/archive/${COMMIT_HASH}.tar.gz#/${PN}-${COMMIT_HASH}.tar.gz"
11
SRC_URI="https://github.com/linux-pam/linux-pam/archive/v${PV}.tar.gz -> ${P}.tar.gz
12
	https://dev.gentoo.org/~zlogene/distfiles/${CATEGORY}/${PN}/${P}-doc.tar.xz"
13 13

  
14 14
LICENSE="|| ( BSD GPL-2 )"
15 15
SLOT="0"
16
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
17
IUSE="audit berkdb +cracklib debug nis +pie selinux static-libs"
16
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
17
IUSE="audit berkdb debug nis +pie selinux static-libs"
18 18

  
19
BDEPEND="app-text/docbook-xml-dtd:4.1.2
20
	app-text/docbook-xml-dtd:4.3
21
	app-text/docbook-xml-dtd:4.4
22
	app-text/docbook-xml-dtd:4.5
19
BDEPEND="
23 20
	dev-libs/libxslt
24 21
	sys-devel/flex
25 22
	sys-devel/gettext
26
	virtual/pkgconfig"
23
	virtual/pkgconfig
24
"
27 25

  
28 26
DEPEND="
29 27
	virtual/libcrypt:=[${MULTILIB_USEDEP}]
30 28
	>=virtual/libintl-0-r1[${MULTILIB_USEDEP}]
31 29
	audit? ( >=sys-process/audit-2.2.2[${MULTILIB_USEDEP}] )
32 30
	berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] )
33
	cracklib? ( >=sys-libs/cracklib-2.9.1-r1[${MULTILIB_USEDEP}] )
34 31
	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
35 32
	nis? ( >=net-libs/libtirpc-0.2.4-r2[${MULTILIB_USEDEP}] )"
36 33

  
37 34
RDEPEND="${DEPEND}"
38 35

  
39
PDEPEND="sys-auth/pambase"
36
PDEPEND=">=sys-auth/pambase-20200616"
40 37

  
41
S="${WORKDIR}/linux-${PN}-${COMMIT_HASH}"
38
S="${WORKDIR}/linux-${P}"
42 39

  
43 40
src_prepare() {
44 41
	default
45
	eapply "${FILESDIR}/${PN}-remove-browsers.patch"
46 42
	touch ChangeLog || die
43
	eapply "${FILESDIR}"/fix-test-calls.patch
47 44
	eautoreconf
48 45
}
49 46

  
......
58 55
	export ac_cv_header_xcrypt_h=no
59 56

  
60 57
	local myconf=(
58
		CC_FOR_BUILD="$(tc-getBUILD_CC)"
61 59
		--with-db-uniquename=-$(db_findver sys-libs/db)
62 60
		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog
63 61
		--enable-securedir="${EPREFIX}"/$(get_libdir)/security
62
		--includedir="${EPREFIX}"/usr/include/security
64 63
		--libdir="${EPREFIX}"/usr/$(get_libdir)
65 64
		--exec-prefix="${EPREFIX}"
66 65
		--disable-prelude
67
		--enable-doc
66
		--disable-cracklib
67
		--disable-tally
68
		--disable-tally2
69
		--disable-doc
70
		--disable-regenerate-docu
71
		--disable-Werror
68 72
		$(use_enable audit)
69 73
		$(use_enable berkdb db)
70
		$(use_enable cracklib)
71 74
		$(use_enable debug)
72 75
		$(use_enable nis)
73 76
		$(use_enable pie)
......
75 78
		$(use_enable static-libs static)
76 79
		--enable-isadir='.' #464016
77 80
		)
78
	ECONF_SOURCE="${S}" econf ${myconf[@]}
81
	ECONF_SOURCE="${S}" econf "${myconf[@]}"
79 82
}
80 83

  
81 84
multilib_src_compile() {
......
92 95
multilib_src_install_all() {
93 96
	find "${ED}" -type f -name '*.la' -delete || die
94 97

  
95
	if use selinux; then
96
		dodir /usr/lib/tmpfiles.d
97
		cat - > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<EOF
98
d /run/sepermit 0755 root root
99
EOF
100
	fi
98
	# tmpfiles.eclass is impossible to use because
99
	# there is the pam -> tmpfiles -> systemd -> pam dependency loop
100

  
101
	dodir /usr/lib/tmpfiles.d
102

  
103
	cat ->>  "${D}"/usr/lib/tmpfiles.d/${CATEGORY}-${PN}.conf <<-_EOF_
104
		d /run/faillock 0755 root root
105
	_EOF_
106
	use selinux && cat ->>  "${D}"/usr/lib/tmpfiles.d/${CATEGORY}-${PN}-selinux.conf <<-_EOF_
107
		d /run/sepermit 0755 root root
108
	_EOF_
109

  
110
	for i in "${WORKDIR}"/${P}-doc/*; do
111
		doman ${i}
112
	done
101 113
}
102 114

  
103 115
pkg_postinst() {
Thank you!