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 1A3AA15ACFC for ; Sun, 7 May 2023 00:03:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5343BE084E; Sun, 7 May 2023 00:03:01 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 370E0E084E for ; Sun, 7 May 2023 00:03:01 +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 06194341324 for ; Sun, 7 May 2023 00:03:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 26861A45 for ; Sun, 7 May 2023 00:02:58 +0000 (UTC) From: "Andreas K. Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Hüttel" Message-ID: <1683417727.2cb5d0e2319f88c99f7a1a55b74fea0a3066a6d2.dilfridge@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/glibc/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/glibc/glibc-9999.ebuild X-VCS-Directories: sys-libs/glibc/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: 2cb5d0e2319f88c99f7a1a55b74fea0a3066a6d2 X-VCS-Branch: master Date: Sun, 7 May 2023 00:02:58 +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: 27f8b8b6-b236-4b99-ad11-b33232632614 X-Archives-Hash: 69648e561bc69948efc4f165bc644c66 commit: 2cb5d0e2319f88c99f7a1a55b74fea0a3066a6d2 Author: Andreas K. Hüttel gentoo org> AuthorDate: Sun May 7 00:01:43 2023 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Sun May 7 00:02:07 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cb5d0e2 sys-libs/glibc: switch to external locale-gen Bug: https://bugs.gentoo.org/903649 Signed-off-by: Andreas K. Hüttel gentoo.org> sys-libs/glibc/glibc-9999.ebuild | 33 +++------------------------------ 1 file changed, 3 insertions(+), 30 deletions(-) diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild index c818e4aee8aa..2375fd18f6a9 100644 --- a/sys-libs/glibc/glibc-9999.ebuild +++ b/sys-libs/glibc/glibc-9999.ebuild @@ -26,9 +26,6 @@ PATCH_DEV=dilfridge # gcc mulitilib bootstrap files version GCC_BOOTSTRAP_VER=20201208 -# locale-gen version -LOCALE_GEN_VER=2.23 - # systemd integration version GLIBC_SYSTEMD_VER=20210729 @@ -47,7 +44,6 @@ else SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz" fi -SRC_URI+=" https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-${LOCALE_GEN_VER}.tar.gz" SRC_URI+=" multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz )" SRC_URI+=" systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-${GLIBC_SYSTEMD_VER}.tar.gz )" @@ -105,21 +101,13 @@ fi # compile-locales useflag either in src_install or in pkg_postinst. IDEPEND=" - !compile-locales? ( - app-arch/gzip - sys-apps/grep - app-alternatives/awk - ) + !compile-locales? ( sys-apps/locale-gen ) " BDEPEND=" ${PYTHON_DEPS} >=app-misc/pax-utils-${MIN_PAX_UTILS_VER} sys-devel/bison - compile-locales? ( - app-arch/gzip - sys-apps/grep - app-alternatives/awk - ) + compile-locales? ( sys-apps/locale-gen ) doc? ( dev-lang/perl sys-apps/texinfo @@ -142,7 +130,7 @@ COMMON_DEPEND=" DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} - sys-apps/gentoo-functions + sys-apps/locale-gen ! "${ED}"/usr/share/i18n/SUPPORTED \ || die "generating /usr/share/i18n/SUPPORTED failed" - cd "${WORKDIR}"/extra/locale || die - dosbin locale-gen - doman *.[0-8] - insinto /etc - doins locale.gen - - keepdir /usr/lib/locale cd "${S}" || die @@ -1514,7 +1488,6 @@ glibc_do_src_install() { # Generate all locales if this is a native build as locale generation if use compile-locales && ! is_crosscompile ; then run_locale_gen --inplace-glibc "${ED}/" - sed -e 's:COMPILED_LOCALES="":COMPILED_LOCALES="1":' -i "${ED}"/usr/sbin/locale-gen || die fi }