From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A013B15808B for ; Tue, 29 Mar 2022 10:46:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A456DE0863; Tue, 29 Mar 2022 10:46:12 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F02F3E0863 for ; Tue, 29 Mar 2022 10:46:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 55E233410EB for ; Tue, 29 Mar 2022 10:46:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6E40CAF for ; Tue, 29 Mar 2022 10:46:08 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1648550754.e18dcba3744bdbd1ef1700183c71a6a6703fed40.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/sysvinit/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/sysvinit/sysvinit-3.02-r1.ebuild sys-apps/sysvinit/sysvinit-3.02-r2.ebuild X-VCS-Directories: sys-apps/sysvinit/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: e18dcba3744bdbd1ef1700183c71a6a6703fed40 X-VCS-Branch: master Date: Tue, 29 Mar 2022 10:46:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f9be76a5-83ae-4447-8c2b-f3a2fafd7d2a X-Archives-Hash: ff29bf623bc0de812f6ab190a7349551 commit: e18dcba3744bdbd1ef1700183c71a6a6703fed40 Author: Sam James gentoo org> AuthorDate: Tue Mar 29 10:45:20 2022 +0000 Commit: Sam James gentoo 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 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} !> 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