Diff shadow-4.6 with a shadow-4.7

/usr/portage/sys-apps/shadow/shadow-4.7.ebuild 2019-06-17 12:09:00.000000000 +0300
1 1
# Copyright 1999-2019 Gentoo Authors
2 2
# Distributed under the terms of the GNU General Public License v2
3 3

  
4
EAPI=6
4
EAPI=7
5 5

  
6 6
inherit libtool pam
7 7

  
......
11 11

  
12 12
LICENSE="BSD GPL-2"
13 13
SLOT="0"
14
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
14
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
15 15
IUSE="acl audit +cracklib nls pam selinux skey xattr"
16 16
# Taken from the man/Makefile.am file.
17 17
LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
18 18

  
19
RDEPEND="acl? ( sys-apps/acl:0= )
19
DEPEND="acl? ( sys-apps/acl:0= )
20 20
	audit? ( >=sys-process/audit-2.6:0= )
21 21
	cracklib? ( >=sys-libs/cracklib-2.7-r3:0= )
22 22
	pam? ( virtual/pam:0= )
......
27 27
	)
28 28
	nls? ( virtual/libintl )
29 29
	xattr? ( sys-apps/attr:0= )"
30
DEPEND="${RDEPEND}
30
BDEPEND="
31 31
	app-arch/xz-utils
32 32
	nls? ( sys-devel/gettext )"
33
RDEPEND="${RDEPEND}
33
RDEPEND="${DEPEND}
34 34
	pam? ( >=sys-auth/pambase-20150213 )"
35 35

  
36 36
PATCHES=(
......
78 78
		comment="#"
79 79
		sed -i \
80 80
			-e "/^${opt}\>/s:^:#:" \
81
			"${ED%/}"/etc/login.defs || die
81
			"${ED}"/etc/login.defs || die
82 82
	else
83 83
		sed -i -r \
84 84
			-e "/^#?${opt}\>/s:.*:${opt} ${val}:" \
85
			"${ED%/}"/etc/login.defs
85
			"${ED}"/etc/login.defs
86 86
	fi
87
	local res=$(grep "^${comment}${opt}\>" "${ED%/}"/etc/login.defs)
87
	local res=$(grep "^${comment}${opt}\>" "${ED}"/etc/login.defs)
88 88
	einfo "${res:-Unable to find ${opt} in /etc/login.defs}"
89 89
}
90 90

  
......
96 96
	#   Currently, libshadow.a is for internal use only, so if you see
97 97
	#   -lshadow in a Makefile of some other package, it is safe to
98 98
	#   remove it.
99
	rm -f "${ED%/}"/{,usr/}$(get_libdir)/lib{misc,shadow}.{a,la}
99
	rm -f "${ED}"/{,usr/}$(get_libdir)/lib{misc,shadow}.{a,la}
100 100

  
101 101
	insinto /etc
102 102
	if ! use pam ; then
......
111 111

  
112 112
	# move passwd to / to help recover broke systems #64441
113 113
	dodir /bin
114
	mv "${ED%/}"/usr/bin/passwd "${ED%/}"/bin/ || die
114
	mv "${ED}"/usr/bin/passwd "${ED}"/bin/ || die
115 115
	dosym ../../bin/passwd /usr/bin/passwd
116 116

  
117 117
	cd "${S}" || die
......
168 168
			-e 'b exit' \
169 169
			-e ': pamnote; i# NOTE: This setting should be configured via /etc/pam.d/ and not in this file.' \
170 170
			-e ': exit' \
171
			"${ED%/}"/etc/login.defs || die
171
			"${ED}"/etc/login.defs || die
172 172

  
173 173
		# remove manpages that pam will install for us
174 174
		# and/or don't apply when using pam
175
		find "${ED%/}"/usr/share/man \
175
		find "${ED}"/usr/share/man \
176 176
			'(' -name 'limits.5*' -o -name 'suauth.5*' ')' \
177 177
			-delete
178 178

  
179 179
		# Remove pam.d files provided by pambase.
180
		rm "${ED%/}"/etc/pam.d/{login,passwd,su} || die
180
		rm "${ED}"/etc/pam.d/{login,passwd,su} || die
181 181
	fi
182 182

  
183 183
	# Remove manpages that are handled by other packages
184
	find "${ED%/}"/usr/share/man \
184
	find "${ED}"/usr/share/man \
185 185
		'(' -name id.1 -o -name passwd.5 -o -name getspnam.3 ')' \
186 186
		-delete
187 187

  
Thank you!