commit: e18dcba3744bdbd1ef1700183c71a6a6703fed40 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Mar 29 10:45:20 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Mar 29 10:45:54 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e18dcba3
sys-apps/sysvinit: drop translations again They're also provided by man-pages-l10n which is Good Enough for now, we can revisit if they diverge. Closes: https://bugs.gentoo.org/836362 Closes: https://bugs.gentoo.org/836353 Signed-off-by: Sam James <sam <AT> gentoo.org> ...init-3.02-r1.ebuild => sysvinit-3.02-r2.ebuild} | 37 +++------------------- 1 file changed, 5 insertions(+), 32 deletions(-) diff --git a/sys-apps/sysvinit/sysvinit-3.02-r1.ebuild b/sys-apps/sysvinit/sysvinit-3.02-r2.ebuild similarity index 82% rename from sys-apps/sysvinit/sysvinit-3.02-r1.ebuild rename to sys-apps/sysvinit/sysvinit-3.02-r2.ebuild index 689e5a124a48..c05001372e26 100644 --- a/sys-apps/sysvinit/sysvinit-3.02-r1.ebuild +++ b/sys-apps/sysvinit/sysvinit-3.02-r2.ebuild @@ -3,9 +3,8 @@ EAPI=7 -PLOCALES="de es fi fr hu id pl" VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/sysvinit.asc -inherit toolchain-funcs flag-o-matic plocale verify-sig +inherit toolchain-funcs flag-o-matic verify-sig DESCRIPTION="/sbin/init - parent of all processes" HOMEPAGE="https://savannah.nongnu.org/projects/sysvinit"; @@ -18,7 +17,7 @@ SLOT="0" if [[ ${PV} != *beta* ]] ; then KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi -IUSE="selinux ibm nls static" +IUSE="selinux ibm static" COMMON_DEPEND=" selinux? ( @@ -31,9 +30,9 @@ DEPEND="${COMMON_DEPEND} RDEPEND="${COMMON_DEPEND} !<sys-apps/openrc-0.13 selinux? ( sec-policy/selinux-shutdown )" -# po4a is for man page translations -BDEPEND="nls? ( app-text/po4a ) - verify-sig? ( sec-keys/openpgp-keys-sysvinit )" +# We did have po4a for translations for a bit but clashes with i18n package +# Leave it for now. bug #836362 +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-sysvinit )" PATCHES=( # bug #80220 @@ -93,17 +92,6 @@ src_prepare() { if [[ ${#insert[@]} -gt 0 ]] ; then printf '%s\n' '' '# Architecture specific features' "${insert[@]}" >> inittab fi - - delete_unused_locale() { - local locale=${1} - - einfo "Deleting non-requested man page translations for locale=${locale}" - rm "${S}"/man/po/${locale}.po || die - - sed -i -e "/^\[po4a_langs\]/ s:${locale}::" "${S}"/man/po/po4a.cfg || die - } - - plocale_for_each_disabled_locale delete_unused_locale } src_compile() { @@ -117,11 +105,6 @@ src_compile() { use static && append-ldflags -static emake -C src $(usex selinux 'WITH_SELINUX=yes' '') - - if use nls && [[ -n "$(plocale_get_locales)" ]] ; then - cd man/po || die - po4a po4a.cfg || die - fi } src_install() { @@ -139,16 +122,6 @@ src_install() { keepdir /etc/inittab.d - if use nls && [[ -n "$(plocale_get_locales)" ]] ; then - install_locale_man_pages() { - local locale=${1} - - doman -i18n=${locale} man/po/${locale}/* - } - - plocale_for_each_locale install_locale_man_pages - fi - # Dead symlink find "${ED}" -xtype l -delete || die
