summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2015-08-26 21:49:42 -0400
committerMike Frysinger <vapier@gentoo.org>2015-08-26 21:50:24 -0400
commit7a3bddfcb1384d3681c14c01160c9a22cc229c15 (patch)
treedbf7e184de4df7e03775d5c6fbeb71894d899a34 /sys-devel/gettext/files
parentwww-plugins/chrome-binary-plugins: automated update (diff)
downloadgentoo-7a3bddfcb1384d3681c14c01160c9a22cc229c15.tar.gz
gentoo-7a3bddfcb1384d3681c14c01160c9a22cc229c15.tar.bz2
gentoo-7a3bddfcb1384d3681c14c01160c9a22cc229c15.zip
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.
Diffstat (limited to 'sys-devel/gettext/files')
-rw-r--r--sys-devel/gettext/files/gettext-0.19.5.1-version-hack.patch18
1 files changed, 18 insertions, 0 deletions
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 00000000000..1a9eaea8413
--- /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
+