From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-887474-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id B35561382BD
for <garchives@archives.gentoo.org>; Wed, 15 Jun 2016 20:16:07 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 2D207E0A6D;
Wed, 15 Jun 2016 20:16:05 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id AC743E0A6D
for <gentoo-commits@lists.gentoo.org>; Wed, 15 Jun 2016 20:16:04 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 37DB833F9D2
for <gentoo-commits@lists.gentoo.org>; Wed, 15 Jun 2016 20:16:03 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 94F711AE8
for <gentoo-commits@lists.gentoo.org>; Wed, 15 Jun 2016 20:16:00 +0000 (UTC)
From: "Mike Frysinger" <vapier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" <vapier@gentoo.org>
Message-ID: <1466021748.7006ca35680e9aa14f4e5f4bbf3b30f03d5b38d6.vapier@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/gettext/files/, sys-devel/gettext/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sys-devel/gettext/files/gettext-0.19.7-disable-libintl.patch sys-devel/gettext/gettext-0.19.7.ebuild sys-devel/gettext/gettext-0.19.8.1.ebuild
X-VCS-Directories: sys-devel/gettext/files/ sys-devel/gettext/
X-VCS-Committer: vapier
X-VCS-Committer-Name: Mike Frysinger
X-VCS-Revision: 7006ca35680e9aa14f4e5f4bbf3b30f03d5b38d6
X-VCS-Branch: master
Date: Wed, 15 Jun 2016 20:16:00 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: b1a26023-05a8-4bcd-8d77-f7189f1ce1eb
X-Archives-Hash: 565ec09f176b4d3f1b6e21e89451c05c
commit: 7006ca35680e9aa14f4e5f4bbf3b30f03d5b38d6
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 15 20:14:58 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Jun 15 20:15:48 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7006ca35
sys-devel/gettext: make sure libintl building is disabled #564168
.../files/gettext-0.19.7-disable-libintl.patch | 30 ++++++++++++++++++++++
sys-devel/gettext/gettext-0.19.7.ebuild | 2 ++
sys-devel/gettext/gettext-0.19.8.1.ebuild | 2 ++
3 files changed, 34 insertions(+)
diff --git a/sys-devel/gettext/files/gettext-0.19.7-disable-libintl.patch b/sys-devel/gettext/files/gettext-0.19.7-disable-libintl.patch
new file mode 100644
index 0000000..f51de34
--- /dev/null
+++ b/sys-devel/gettext/files/gettext-0.19.7-disable-libintl.patch
@@ -0,0 +1,30 @@
+https://bugs.gentoo.org/564168
+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
+@@ -20391,8 +20391,7 @@ $as_echo "$ac_res" >&6; }
+
+ 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; }; then
++ }; then
+ gt_use_preinstalled_gnugettext=yes
+ else
+ LIBINTL=
+--- a/gettext-tools/configure
++++ b/gettext-tools/configure
+@@ -22746,8 +22746,7 @@ $as_echo "$ac_res" >&6; }
+
+ 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; }; then
++ }; then
+ gt_use_preinstalled_gnugettext=yes
+ else
+ LIBINTL=
diff --git a/sys-devel/gettext/gettext-0.19.7.ebuild b/sys-devel/gettext/gettext-0.19.7.ebuild
index 962433a..7922b1d 100644
--- a/sys-devel/gettext/gettext-0.19.7.ebuild
+++ b/sys-devel/gettext/gettext-0.19.7.ebuild
@@ -49,6 +49,8 @@ pkg_setup() {
src_prepare() {
java-pkg-opt-2_src_prepare
+ epatch "${FILESDIR}"/${PN}-0.19.7-disable-libintl.patch #564168
+
epunt_cxx
elibtoolize
}
diff --git a/sys-devel/gettext/gettext-0.19.8.1.ebuild b/sys-devel/gettext/gettext-0.19.8.1.ebuild
index 165bf05..d49716f 100644
--- a/sys-devel/gettext/gettext-0.19.8.1.ebuild
+++ b/sys-devel/gettext/gettext-0.19.8.1.ebuild
@@ -49,6 +49,8 @@ pkg_setup() {
src_prepare() {
java-pkg-opt-2_src_prepare
+ epatch "${FILESDIR}"/${PN}-0.19.7-disable-libintl.patch #564168
+
epunt_cxx
elibtoolize
}