From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 72F4F13989D for ; Thu, 27 Aug 2015 01:51:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4216D14235; Thu, 27 Aug 2015 01:51:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C76B814235 for ; Thu, 27 Aug 2015 01:51:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 726833409AA for ; Thu, 27 Aug 2015 01:50:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 24E6116B for ; Thu, 27 Aug 2015 01:50:58 +0000 (UTC) From: "Mike Frysinger" 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" Message-ID: <1440640224.7a3bddfcb1384d3681c14c01160c9a22cc229c15.vapier@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.19.5.1-version-hack.patch sys-devel/gettext/gettext-0.19.5.1-r1.ebuild sys-devel/gettext/gettext-0.19.5.1.ebuild X-VCS-Directories: sys-devel/gettext/ sys-devel/gettext/files/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 7a3bddfcb1384d3681c14c01160c9a22cc229c15 X-VCS-Branch: master Date: Thu, 27 Aug 2015 01:50: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-Archives-Salt: 6821f2ff-a4d2-40fa-8936-e948b42eed5c X-Archives-Hash: ecf0797fc8651b8be38a51cdbaac21ff commit: 7a3bddfcb1384d3681c14c01160c9a22cc229c15 Author: Mike Frysinger gentoo org> AuthorDate: Thu Aug 27 01:49:42 2015 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Thu Aug 27 01:50:24 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a3bddfc sys-devel/gettext: hack gettextize configure output #556024 Until upstream sorts out a fix for us, hack the output in a terrible way so packages stop failing. This seems to be less terrible than just masking the new version. .../gettext/files/gettext-0.19.5.1-version-hack.patch | 18 ++++++++++++++++++ ...text-0.19.5.1.ebuild => gettext-0.19.5.1-r1.ebuild} | 6 ++++++ 2 files changed, 24 insertions(+) diff --git a/sys-devel/gettext/files/gettext-0.19.5.1-version-hack.patch b/sys-devel/gettext/files/gettext-0.19.5.1-version-hack.patch new file mode 100644 index 0000000..1a9eaea --- /dev/null +++ b/sys-devel/gettext/files/gettext-0.19.5.1-version-hack.patch @@ -0,0 +1,18 @@ +the gettext tooling does not quite understand 4 version components. +hack it so the output in the configure script sticks to 3 parts. +this is a horrible hack that really needs an upstream fix. + +https://lists.gnu.org/archive/html/bug-gettext/2015-07/msg00027.html +https://bugs.gentoo.org/556024 + +--- a/gettext-tools/misc/gettextize.in ++++ b/gettext-tools/misc/gettextize.in +@@ -1235,7 +1235,7 @@ + func_modify_configure_in "(AC_OUTPUT): Remove command that created po/Makefile." + sed -e '/^\(dnl \|\)AC_LINK_FILES(\$nls_cv_header_libgt, \$nls_cv_header_intl)$/d' < "$srcdir/$configure_in" > "$srcdir/$configure_in.tmp" + func_modify_configure_in "(AC_LINK_FILES): Remove invocation." +-sed -e 's/^AM_GNU_GETTEXT_VERSION([^()]*)/AM_GNU_GETTEXT_VERSION(['"$version"'])/' < "$srcdir/$configure_in" > "$srcdir/$configure_in.tmp" ++sed -e 's/^AM_GNU_GETTEXT_VERSION([^()]*)/AM_GNU_GETTEXT_VERSION(['"${version%.?}"'])/' < "$srcdir/$configure_in" > "$srcdir/$configure_in.tmp" + func_modify_configure_in "(AM_GNU_GETTEXT_VERSION): Bump to $version." + $do_changelog && func_ChangeLog_finish + diff --git a/sys-devel/gettext/gettext-0.19.5.1.ebuild b/sys-devel/gettext/gettext-0.19.5.1-r1.ebuild similarity index 94% rename from sys-devel/gettext/gettext-0.19.5.1.ebuild rename to sys-devel/gettext/gettext-0.19.5.1-r1.ebuild index 9e7d153..dc2e22a 100644 --- a/sys-devel/gettext/gettext-0.19.5.1.ebuild +++ b/sys-devel/gettext/gettext-0.19.5.1-r1.ebuild @@ -39,6 +39,12 @@ MULTILIB_WRAPPED_HEADERS=( src_prepare() { java-pkg-opt-2_src_prepare + + # This patch should not be included in version bumps (at least to 0.19.2). + # Perhaps 0.19.5.2 will be broken in the same way. #556024 + [[ ${PV} != 0.19.5.1 ]] && die + epatch "${FILESDIR}"/${P}-version-hack.patch #556024 + epunt_cxx elibtoolize }