Diff sysvinit-3.08 with a sysvinit-3.07

/usr/portage/sys-apps/sysvinit/sysvinit-3.07.ebuild 2023-10-09 14:52:35.412368499 +0300
21 21
LICENSE="GPL-2"
22 22
SLOT="0"
23 23
if [[ ${PV} != *beta* ]] ; then
24
	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
24
	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
25 25
fi
26 26
IUSE="selinux ibm nls static"
27 27

  
......
29 29
	acct-group/root
30 30
	selinux? (
31 31
		>=sys-libs/libselinux-1.28
32
	)
33
"
34
DEPEND="
35
	${COMMON_DEPEND}
36
	virtual/os-headers
37
"
32
	)"
33
DEPEND="${COMMON_DEPEND}
34
	virtual/os-headers"
38 35
# Old OpenRC blocker is for bug #587424
39 36
# Keep for longer than usual given it's cheap and avoid user inconvenience
40
RDEPEND="
41
	${COMMON_DEPEND}
37
RDEPEND="${COMMON_DEPEND}
42 38
	!<app-i18n/man-pages-l10n-4.18.1-r1
43 39
	!<sys-apps/openrc-0.13
44
	selinux? ( sec-policy/selinux-shutdown )
45
"
40
	selinux? ( sec-policy/selinux-shutdown )"
46 41
# po4a is for man page translations
47
BDEPEND="
48
	nls? ( app-text/po4a )
49
	verify-sig? ( >=sec-keys/openpgp-keys-sysvinit-20220413 )
50
"
42
BDEPEND="nls? ( app-text/po4a )
43
	verify-sig? ( >=sec-keys/openpgp-keys-sysvinit-20220413 )"
51 44

  
52 45
PATCHES=(
46
	# bug #80220
47
	"${FILESDIR}/${PN}-2.86-kexec.patch"
53 48
	# bug #158615
54
	"${FILESDIR}/${PN}-3.08-shutdown-single.patch"
49
	"${FILESDIR}/${PN}-2.94_beta-shutdown-single.patch"
55 50
)
56 51

  
57 52
src_prepare() {
......
114 109
		local locale=${1}
115 110

  
116 111
		einfo "Deleting non-requested man page translations for locale=${locale}"
117
		rm "${S}"/man/po/${locale}.po || die
112
		rm "${S}"/man/{po/,}${locale}.po || die
113
		rm -rf "${S}"/man/${locale} || die
118 114

  
119 115
		sed -i -e "/^\[po4a_langs\]/ s:${locale}::" "${S}"/man/po/po4a.cfg || die
120 116
	}
......
189 185
	if [[ ! -e "${EROOT}/var/log/boot" ]] ; then
190 186
		touch "${EROOT}/var/log/boot"
191 187
	fi
192

  
193
	local ver
194
	for ver in ${REPLACING_VERSIONS}; do
195
		ver_test ${ver} -ge 3.07-r2 && continue
196
		ewarn "Previously, the 'halt' command caused the system to power off"
197
		ewarn "even if option -p was not given. This long-standing bug has"
198
		ewarn "been fixed, and the command now behaves as documented."
199
		break
200
	done
201 188
}
Thank you!