summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrice Clement <monsieurp@gentoo.org>2017-08-03 23:09:56 +0200
committerPatrice Clement <monsieurp@gentoo.org>2017-08-03 23:10:10 +0200
commitc12f5e503c32f54f57e04eab0dd7547d2d2de6b1 (patch)
tree0d61aea9df681c702ea883548e2345cb24c4d4cc /app-text/recode/files
parentsys-devel/gcc: remove older stable version in 4.9 branch (diff)
downloadgentoo-c12f5e503c32f54f57e04eab0dd7547d2d2de6b1.tar.gz
gentoo-c12f5e503c32f54f57e04eab0dd7547d2d2de6b1.tar.bz2
gentoo-c12f5e503c32f54f57e04eab0dd7547d2d2de6b1.zip
app-text/recode: revert 41abe76b06e50552be388dd2b27582bceaea965c.
Package-Manager: Portage-2.3.6, Repoman-2.3.1 RepoMan-Options: --force
Diffstat (limited to 'app-text/recode/files')
-rw-r--r--app-text/recode/files/recode-3.6-as-if.patch19
-rw-r--r--app-text/recode/files/recode-3.6-gettextfix.diff23
2 files changed, 42 insertions, 0 deletions
diff --git a/app-text/recode/files/recode-3.6-as-if.patch b/app-text/recode/files/recode-3.6-as-if.patch
new file mode 100644
index 00000000000..c7bcc27c875
--- /dev/null
+++ b/app-text/recode/files/recode-3.6-as-if.patch
@@ -0,0 +1,19 @@
+http://bugs.gentoo.org/283029
+
+--- a/m4/flex.m4
++++ b/m4/flex.m4
+@@ -8,11 +8,11 @@ dnl ad_AC_PROG_FLEX
+ dnl Look for flex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT
+ AC_DEFUN(ad_AC_PROG_FLEX,
+ [AC_CHECK_PROGS(LEX, flex, missing)
+-if test "$LEX" = missing; then
++AS_IF([test "$LEX" = missing], [dnl
+ LEX="\$(top_srcdir)/$ac_aux_dir/missing flex"
+ LEX_OUTPUT_ROOT=lex.yy
+ AC_SUBST(LEX_OUTPUT_ROOT)dnl
+-else
++], [:
+ AC_PROG_LEX
+ AC_DECL_YYTEXT
+-fi])
++])])
diff --git a/app-text/recode/files/recode-3.6-gettextfix.diff b/app-text/recode/files/recode-3.6-gettextfix.diff
new file mode 100644
index 00000000000..3b7eb8ba20e
--- /dev/null
+++ b/app-text/recode/files/recode-3.6-gettextfix.diff
@@ -0,0 +1,23 @@
+http://bugs.gentoo.org/239372
+
+patch by Dmitry Karasik
+
+--- recode-3.6/m4/gettext.m4
++++ recode-3.6/m4/gettext.m4
+@@ -109,12 +109,12 @@
+ else
+ ac_items="$LINGUAS"
+ for ac_item in $ac_items; do
+- case "$ALL_LINGUAS" in
+- *$ac_item*)
++ for supported_item in $ALL_LINGUAS; do
++ if test "$ac_item" = "$supported_item"; then
+ ac_print="$ac_print $ac_item"
+ MOFILES="$MOFILES $ac_item.mo"
+- ;;
+- esac
++ fi
++ done
+ done
+ fi
+ AC_SUBST(MOFILES)