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 96912158009 for ; Sat, 24 Jun 2023 18:34:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BA8EBE0819; Sat, 24 Jun 2023 18:34:46 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9C92DE0819 for ; Sat, 24 Jun 2023 18:34:46 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8E0F334017A for ; Sat, 24 Jun 2023 18:34:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 020D3A66 for ; Sat, 24 Jun 2023 18:34:44 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1687631633.b76f3a0c56fd50eaf4272ea78bb9283a533710c0.grobian@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/gettext/, sys-devel/gettext/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/gettext/files/gettext-0.22-disable-libintl.patch sys-devel/gettext/gettext-0.22-r1.ebuild sys-devel/gettext/gettext-0.22.ebuild X-VCS-Directories: sys-devel/gettext/files/ sys-devel/gettext/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: b76f3a0c56fd50eaf4272ea78bb9283a533710c0 X-VCS-Branch: master Date: Sat, 24 Jun 2023 18:34:44 +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: fc4214bb-1c76-4239-95c2-b24819ab7635 X-Archives-Hash: c82939843498e797944ba146430fcfda commit: b76f3a0c56fd50eaf4272ea78bb9283a533710c0 Author: Fabian Groffen gentoo org> AuthorDate: Sat Jun 24 18:33:08 2023 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Sat Jun 24 18:33:53 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b76f3a0c sys-devel/gettext-0.22-r1: fix non-Linux targets Closes: https://bugs.gentoo.org/909041 Signed-off-by: Fabian Groffen gentoo.org> .../files/gettext-0.22-disable-libintl.patch | 34 ++++++++++++++++++++++ ...{gettext-0.22.ebuild => gettext-0.22-r1.ebuild} | 1 + 2 files changed, 35 insertions(+) diff --git a/sys-devel/gettext/files/gettext-0.22-disable-libintl.patch b/sys-devel/gettext/files/gettext-0.22-disable-libintl.patch new file mode 100644 index 000000000000..b242ead4b435 --- /dev/null +++ b/sys-devel/gettext/files/gettext-0.22-disable-libintl.patch @@ -0,0 +1,34 @@ +https://bugs.gentoo.org/564168 +https://bugs.gentoo.org/909041 + +Never build libintl since it's in dev-libs/libintl now. + +We can drop this if/when upstream fixes the configure flag handling: +https://savannah.gnu.org/bugs/?48233 + +--- a/gettext-runtime/configure ++++ b/gettext-runtime/configure +@@ -22765,9 +22765,7 @@ + + if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \ + || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \ +- && test "$PACKAGE" != gettext-runtime \ +- && test "$PACKAGE" != gettext-tools \ +- && test "$PACKAGE" != libintl; }; then ++ }; then + gt_use_preinstalled_gnugettext=yes + else + LIBINTL= +--- a/gettext-tools/configure ++++ b/gettext-tools/configure +@@ -26129,9 +26129,7 @@ + + if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \ + || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \ +- && test "$PACKAGE" != gettext-runtime \ +- && test "$PACKAGE" != gettext-tools \ +- && test "$PACKAGE" != libintl; }; then ++ }; then + gt_use_preinstalled_gnugettext=yes + else + LIBINTL= diff --git a/sys-devel/gettext/gettext-0.22.ebuild b/sys-devel/gettext/gettext-0.22-r1.ebuild similarity index 99% rename from sys-devel/gettext/gettext-0.22.ebuild rename to sys-devel/gettext/gettext-0.22-r1.ebuild index 58592b47a9e6..15b71238987e 100644 --- a/sys-devel/gettext/gettext-0.22.ebuild +++ b/sys-devel/gettext/gettext-0.22-r1.ebuild @@ -67,6 +67,7 @@ MULTILIB_WRAPPED_HEADERS=( ) PATCHES=( + "${FILESDIR}"/${PN}-0.22-disable-libintl.patch "${FILESDIR}"/${PN}-0.21-CVE-2020-12825.patch )