* [gentoo-commits] repo/proj/prefix:master commit in: sys-devel/gettext/files/, sys-devel/gettext/
@ 2019-02-27 12:45 Michael Haubenwallner
0 siblings, 0 replies; 3+ messages in thread
From: Michael Haubenwallner @ 2019-02-27 12:45 UTC (permalink / raw
To: gentoo-commits
commit: 5787ea66fc8036852796a38227d3444ce125880d
Author: Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 27 12:26:35 2019 +0000
Commit: Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Wed Feb 27 12:45:19 2019 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=5787ea66
sys-devel/gettext: update cygwin patches
Package-Manager: Portage-2.3.55.1-prefix, Repoman-2.3.12
Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>
sys-devel/gettext/files/0.19.8.1-cygwin-ftm.patch | 11 +++
sys-devel/gettext/files/0.19.8.1-no-woe32dll.patch | 95 ++++++++++++++++++++++
.../gettext/files/0.19.8.1-tests-cygwin.patch | 89 ++++++++++++++++++++
sys-devel/gettext/gettext-0.19.8.1.ebuild | 9 +-
4 files changed, 203 insertions(+), 1 deletion(-)
diff --git a/sys-devel/gettext/files/0.19.8.1-cygwin-ftm.patch b/sys-devel/gettext/files/0.19.8.1-cygwin-ftm.patch
new file mode 100644
index 0000000000..23f88f0b56
--- /dev/null
+++ b/sys-devel/gettext/files/0.19.8.1-cygwin-ftm.patch
@@ -0,0 +1,11 @@
+--- origsrc/gettext-0.19.8.1/gettext-runtime/intl/libgnuintl.in.h 2016-06-09 17:56:00.000000000 -0500
++++ src/gettext-0.19.8.1/gettext-runtime/intl/libgnuintl.in.h 2016-10-20 11:03:43.187813700 -0500
+@@ -435,7 +435,7 @@ extern int vswprintf (wchar_t *, size_t,
+ extern char *setlocale (int, const char *);
+ #endif
+
+-#if @HAVE_NEWLOCALE@
++#if @HAVE_NEWLOCALE@ && __POSIX_VISIBLE >= 200809
+
+ #undef newlocale
+ #define newlocale libintl_newlocale
diff --git a/sys-devel/gettext/files/0.19.8.1-no-woe32dll.patch b/sys-devel/gettext/files/0.19.8.1-no-woe32dll.patch
new file mode 100644
index 0000000000..75bb0a1e1e
--- /dev/null
+++ b/sys-devel/gettext/files/0.19.8.1-no-woe32dll.patch
@@ -0,0 +1,95 @@
+Derived from Cygwin: gettext-0.19.8.1-2.src/0.19.8.1-no-woe32dll.patch
+
+--- origsrc/gettext-0.19.8.1/gettext-tools/configure.ac 2016-06-09 17:56:00.000000000 -0500
++++ src/gettext-0.19.8.1/gettext-tools/configure.ac 2016-10-10 02:10:37.323106300 -0500
+#@@ -100,7 +100,7 @@ LT_LANG([Windows Resource])
+ dnl On mingw and Cygwin, we can activate special Makefile rules which add
+ dnl version information to the shared libraries and executables.
+ case "$host_os" in
+- mingw* | cygwin*) special_makefile_rules=woe32 ;;
++ mingw*) special_makefile_rules=woe32 ;;
+ os2*) special_makefile_rules=os2 ;;
+ *) special_makefile_rules=none ;;
+ esac
+#@@ -212,7 +212,7 @@ dnl must arrange to define the auxili
+ dnl exported variables _also_ in the static library.
+ if test "$enable_shared" = yes; then
+ case "$host_os" in
+- mingw* | cygwin*) is_woe32dll=yes ;;
++ mingw*) is_woe32dll=yes ;;
+ *) is_woe32dll=no ;;
+ esac
+ else
+--- gettext-0.19.8.1/gettext-tools/configure
++++ gettext-0.19.8.1/gettext-tools/configure
+@@ -100,7 +100,7 @@
+
+
+ case "$host_os" in
+- mingw* | cygwin*) special_makefile_rules=woe32 ;;
++ mingw*) special_makefile_rules=woe32 ;;
+ os2*) special_makefile_rules=os2 ;;
+ *) special_makefile_rules=none ;;
+ esac
+@@ -100,7 +100,7 @@
+
+ if test "$enable_shared" = yes; then
+ case "$host_os" in
+- mingw* | cygwin*) is_woe32dll=yes ;;
++ mingw*) is_woe32dll=yes ;;
+ *) is_woe32dll=no ;;
+ esac
+ else
+@@ -100,7 +100,7 @@
+
+ if test "$enable_shared" = yes; then
+ case "$host_os" in
+- mingw* | cygwin*) is_woe32dll=yes ;;
++ mingw*) is_woe32dll=yes ;;
+ *) is_woe32dll=no ;;
+ esac
+ else
+--- origsrc/gettext-0.19.8.1/m4/woe32-dll.m4 2016-03-20 02:37:53.000000000 -0500
++++ src/gettext-0.19.8.1/m4/woe32-dll.m4 2016-10-10 02:11:04.906081600 -0500
+#@@ -30,7 +30,7 @@ AC_DEFUN([gl_WOE32_DLL],
+ [
+ AC_REQUIRE([AC_CANONICAL_HOST])
+ case "$host_os" in
+- mingw* | cygwin*)
++ mingw*)
+ AC_MSG_CHECKING([for auto-import of symbols])
+ AC_CACHE_VAL([gl_cv_ld_autoimport], [
+ gl_save_LDFLAGS="$LDFLAGS"
+--- gettext-0.19.8.1/gettext-runtime/configure
++++ gettext-0.19.8.1/gettext-runtime/configure
+@@ -100,7 +100,7 @@
+
+
+ case "$host_os" in
+- mingw* | cygwin*)
++ mingw*)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for auto-import of symbols" >&5
+ $as_echo_n "checking for auto-import of symbols... " >&6; }
+ if ${gl_cv_ld_autoimport+:} false; then :
+--- gettext-0.19.8.1/gettext-runtime/libasprintf/configure
++++ gettext-0.19.8.1/gettext-runtime/libasprintf/configure
+@@ -100,7 +100,7 @@
+
+
+ case "$host_os" in
+- mingw* | cygwin*)
++ mingw*)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for auto-import of symbols" >&5
+ $as_echo_n "checking for auto-import of symbols... " >&6; }
+ if ${gl_cv_ld_autoimport+:} false; then :
+--- gettext-0.19.8.1/gettext-tools/configure
++++ gettext-0.19.8.1/gettext-tools/configure
+@@ -100,7 +100,7 @@
+
+
+ case "$host_os" in
+- mingw* | cygwin*)
++ mingw*)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for auto-import of symbols" >&5
+ $as_echo_n "checking for auto-import of symbols... " >&6; }
+ if ${gl_cv_ld_autoimport+:} false; then :
diff --git a/sys-devel/gettext/files/0.19.8.1-tests-cygwin.patch b/sys-devel/gettext/files/0.19.8.1-tests-cygwin.patch
new file mode 100644
index 0000000000..38aefe9904
--- /dev/null
+++ b/sys-devel/gettext/files/0.19.8.1-tests-cygwin.patch
@@ -0,0 +1,89 @@
+--- origsrc/gettext-0.19.3/gettext-tools/tests/format-c-3-prg.c 2013-05-31 00:01:54.000000000 -0500
++++ src/gettext-0.19.3/gettext-tools/tests/format-c-3-prg.c 2014-11-17 23:26:21.975557100 -0600
+@@ -34,7 +34,7 @@
+ /* Disable the override of setlocale that libgnuintl.h activates on MacOS X
+ and Windows. This test relies on the fake setlocale function in
+ setlocale.c. */
+-#undef setlocale
++/* #undef setlocale */
+
+ #define _(string) gettext (string)
+
+--- origsrc/gettext-0.19.3/gettext-tools/tests/format-c-4-prg.c 2013-05-31 00:01:54.000000000 -0500
++++ src/gettext-0.19.3/gettext-tools/tests/format-c-4-prg.c 2014-11-17 23:26:21.979557600 -0600
+@@ -34,7 +34,7 @@
+ /* Disable the override of setlocale that libgnuintl.h activates on MacOS X
+ and Windows. This test relies on the fake setlocale function in
+ setlocale.c. */
+-#undef setlocale
++/* #undef setlocale */
+
+ #define _(string) gettext (string)
+
+--- origsrc/gettext-0.19.3/gettext-tools/tests/plural-1 2014-04-14 20:52:11.000000000 -0500
++++ src/gettext-0.19.3/gettext-tools/tests/plural-1 2014-11-17 23:26:21.983058100 -0600
+@@ -50,15 +50,15 @@ ${DIFF} plural-1-fr.po.strip plural-1-fr
+
+ : ${DIFF=diff}
+ echo 'un morceau de gateau' > plural-1-cake.ok
+-LANGUAGE= ../cake fr 1 > plural-1-cake.tmp || Exit 1
++LANGUAGE= ../cake fr_FR 1 > plural-1-cake.tmp || Exit 1
+ LC_ALL=C tr -d '\r' < plural-1-cake.tmp > cake.out || Exit 1
+ ${DIFF} plural-1-cake.ok cake.out || Exit 1
+ echo '2 morceaux de gateau' > plural-1-cake.ok
+-LANGUAGE= ../cake fr 2 > plural-1-cake.tmp || Exit 1
++LANGUAGE= ../cake fr_FR 2 > plural-1-cake.tmp || Exit 1
+ LC_ALL=C tr -d '\r' < plural-1-cake.tmp > cake.out || Exit 1
+ ${DIFF} plural-1-cake.ok cake.out || Exit 1
+ echo '10 morceaux de gateau' > plural-1-cake.ok
+-LANGUAGE= ../cake fr 10 > plural-1-cake.tmp || Exit 1
++LANGUAGE= ../cake fr_FR 10 > plural-1-cake.tmp || Exit 1
+ LC_ALL=C tr -d '\r' < plural-1-cake.tmp > cake.out || Exit 1
+ ${DIFF} plural-1-cake.ok cake.out || Exit 1
+
+--- origsrc/gettext-0.19.3/gettext-tools/tests/plural-1-prg.c 2013-05-31 00:01:54.000000000 -0500
++++ src/gettext-0.19.3/gettext-tools/tests/plural-1-prg.c 2014-11-17 23:26:21.989058800 -0600
+@@ -30,7 +30,7 @@
+ /* Disable the override of setlocale that libgnuintl.h activates on MacOS X
+ and Windows. This test relies on the fake setlocale function in
+ setlocale.c. */
+-#undef setlocale
++/* #undef setlocale */
+
+ int
+ main (int argc, char *argv[])
+--- origsrc/gettext-0.19.3/gettext-tools/tests/plural-2 2014-04-14 20:52:11.000000000 -0500
++++ src/gettext-0.19.3/gettext-tools/tests/plural-2 2014-11-17 23:25:50.637077600 -0600
+@@ -3,8 +3,8 @@
+
+ : ${MSGFMT=msgfmt}
+ test -d plural-2-dir || mkdir plural-2-dir
+-test -d plural-2-dir/ll || mkdir plural-2-dir/ll
+-test -d plural-2-dir/ll/LC_MESSAGES || mkdir plural-2-dir/ll/LC_MESSAGES
++test -d plural-2-dir/es || mkdir plural-2-dir/es
++test -d plural-2-dir/es/LC_MESSAGES || mkdir plural-2-dir/es/LC_MESSAGES
+
+ cat <<EOF > plural-2.data
+ ja
+@@ -44,7 +44,7 @@ EOF
+ while read lang; do
+ read formula
+ read dataok
+- cat > plural-2-ll.po <<EOF
++ cat > plural-2-es.po <<EOF
+ msgid ""
+ msgstr ""
+ "MIME-Version: 1.0\n"
+@@ -65,10 +65,10 @@ msgstr[7] "7"
+ msgstr[8] "8"
+ msgstr[9] "9"
+ EOF
+- ${MSGFMT} -o plural-2-dir/ll/LC_MESSAGES/plural.mo plural-2-ll.po || Exit 1
++ ${MSGFMT} -o plural-2-dir/es/LC_MESSAGES/plural.mo plural-2-es.po || Exit 1
+ (for i in '' 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19; do
+ LANGUAGE= TEXTDOMAIN=plural TEXTDOMAINDIR=plural-2-dir \
+- $NGETTEXT --env LC_ALL=ll X Y ${i}0 ${i}1 ${i}2 ${i}3 ${i}4 ${i}5 ${i}6 ${i}7 ${i}8 ${i}9
++ $NGETTEXT --env LC_ALL=es_ES X Y ${i}0 ${i}1 ${i}2 ${i}3 ${i}4 ${i}5 ${i}6 ${i}7 ${i}8 ${i}9
+ done) > dataout
+ test "$dataok" = `cat dataout` || {
+ echo "Formula evaluation error for language $lang" 1>&2
diff --git a/sys-devel/gettext/gettext-0.19.8.1.ebuild b/sys-devel/gettext/gettext-0.19.8.1.ebuild
index b83c0f8a1d..d73a427485 100644
--- a/sys-devel/gettext/gettext-0.19.8.1.ebuild
+++ b/sys-devel/gettext/gettext-0.19.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Note: Keep version bumps in sync with dev-libs/libintl.
@@ -54,6 +54,13 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-0.19.7-disable-libintl.patch #564168
epatch "${FILESDIR}"/${PN}-0.19.8.1-format-security.patch
+ if use elibc_Cygwin; then
+ epatch "${FILESDIR}"/0.19.8.1-no-woe32dll.patch
+ epatch "${FILESDIR}"/0.19.3-localename.patch
+ epatch "${FILESDIR}"/0.19.8.1-tests-cygwin.patch
+ epatch "${FILESDIR}"/0.19.8.1-cygwin-ftm.patch
+ fi
+
# this script uses syntax that Solaris /bin/sh doesn't grok
sed -i -e '1c\#!/usr/bin/env sh' \
gettext-tools/misc/convert-archive.in || die
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/prefix:master commit in: sys-devel/gettext/files/, sys-devel/gettext/
@ 2020-11-30 3:12 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2020-11-30 3:12 UTC (permalink / raw
To: gentoo-commits
commit: 24276d89d7c30abb460e786497fe7d50605bcdf7
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 30 02:57:02 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Nov 30 02:57:02 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=24276d89
sys-devel/gettext: fix Darwin build on 0.21
Package-Manager: Portage-3.0.9, Repoman-3.0.2
RepoMan-Options: --force
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../gettext/files/gettext-0.21-no-setlocale.patch | 190 +++++++++++++++++++++
sys-devel/gettext/gettext-0.21.ebuild | 1 +
2 files changed, 191 insertions(+)
diff --git a/sys-devel/gettext/files/gettext-0.21-no-setlocale.patch b/sys-devel/gettext/files/gettext-0.21-no-setlocale.patch
new file mode 100644
index 0000000000..552bb2ecb7
--- /dev/null
+++ b/sys-devel/gettext/files/gettext-0.21-no-setlocale.patch
@@ -0,0 +1,190 @@
+Fixes build on Darwin.
+Undefined symbols for architecture x86_64:
+ "_gl_get_setlocale_null_lock", referenced from:
+ _libgettextpo_setlocale_null_r in libgnu.a(setlocale_null.o)
+ _libgettextpo_setlocale_null in libgnu.a(setlocale_null.o)
+ld: symbol(s) not found for architecture x86_64
+collect2: error: ld returned 1 exit status
+----
+From 55bb1134ed4c1c3701a16dc5aeb974be341967d2 Mon Sep 17 00:00:00 2001
+From: Bruno Haible <bruno@clisp.org>
+Date: Sun, 4 Oct 2020 23:40:53 +0200
+Subject: [PATCH] build: Assume ANSI C declaration of 'setlocale'.
+
+* gettext-tools/tests/setlocale.c (setlocale): Assume SETLOCALE_CONST is
+'const'.
+* gettext-tools/tests/format-c-3-prg.c: Likewise.
+* gettext-tools/tests/format-c-4-prg.c: Likewise.
+* gettext-tools/tests/plural-1-prg.c: Likewise.
+* gettext-tools/tests/tstgettext.c: Likewise.
+* gettext-tools/tests/tstngettext.c: Likewise.
+* gettext-tools/configure.ac: Don't invoke gt_SETLOCALE.
+* gettext-tools/m4/setlocale.m4: Remove file.
+* gettext-tools/m4/Makefile.am (EXTRA_DIST): Remove it.
+---
+ gettext-tools/configure.ac | 1 -
+ gettext-tools/m4/Makefile.am | 3 +--
+ gettext-tools/m4/setlocale.m4 | 31 -------------------------------
+ gettext-tools/tests/format-c-3-prg.c | 2 +-
+ gettext-tools/tests/format-c-4-prg.c | 2 +-
+ gettext-tools/tests/plural-1-prg.c | 2 +-
+ gettext-tools/tests/setlocale.c | 4 ++--
+ gettext-tools/tests/tstgettext.c | 2 +-
+ gettext-tools/tests/tstngettext.c | 2 +-
+ 9 files changed, 8 insertions(+), 41 deletions(-)
+ delete mode 100644 gettext-tools/m4/setlocale.m4
+
+diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
+index c4c3eed..90cd608 100644
+--- a/gettext-tools/configure.ac
++++ b/gettext-tools/configure.ac
+@@ -220,7 +220,6 @@ dnl Checks for library functions.
+ AC_CHECK_FUNCS([select])
+ AC_FUNC_VFORK
+ gt_SIGINFO
+-gt_SETLOCALE
+
+ AC_C_BIGENDIAN([endianness=1], [endianness=0],
+ [echo "AC-C-BIGENDIAN fails to work on your system." | sed -e 's,-,_,g' 1>&2
+diff --git a/gettext-tools/m4/Makefile.am b/gettext-tools/m4/Makefile.am
+index 1eabe09..55683aa 100644
+--- a/gettext-tools/m4/Makefile.am
++++ b/gettext-tools/m4/Makefile.am
+@@ -1,5 +1,5 @@
+ ## Makefile for the gettext-tools/m4 directory of GNU gettext
+-## Copyright (C) 2003-2010, 2013, 2017-2019 Free Software Foundation, Inc.
++## Copyright (C) 2003-2010, 2013, 2017-2020 Free Software Foundation, Inc.
+ ##
+ ## This program is free software: you can redistribute it and/or modify
+ ## it under the terms of the GNU General Public License as published by
+@@ -44,5 +44,4 @@ EXTRA_DIST = README csharpexec-test.exe \
+ exported.m4 \
+ hostname.m4 \
+ locale-de.m4 \
+-setlocale.m4 \
+ siginfo.m4
+diff --git a/gettext-tools/m4/setlocale.m4 b/gettext-tools/m4/setlocale.m4
+deleted file mode 100644
+index 5b8fff0..0000000
+--- a/gettext-tools/m4/setlocale.m4
++++ /dev/null
+@@ -1,31 +0,0 @@
+-# setlocale.m4 serial 4 (gettext-0.18)
+-dnl Copyright (C) 2001-2002, 2006, 2009 Free Software Foundation, Inc.
+-dnl This file is free software; the Free Software Foundation
+-dnl gives unlimited permission to copy and/or distribute it,
+-dnl with or without modifications, as long as this notice is preserved.
+-
+-# Check for setlocale declaration.
+-
+-AC_DEFUN([gt_SETLOCALE],[
+-AC_MSG_CHECKING([for setlocale declaration])
+-AC_CACHE_VAL(gt_cv_proto_setlocale, [
+-AC_TRY_COMPILE([
+-#include <stdlib.h>
+-#include <locale.h>
+-extern
+-#ifdef __cplusplus
+-"C"
+-#endif
+-#if defined(__STDC__) || defined(__cplusplus)
+-char *setlocale (int category, char *locale);
+-#else
+-char *setlocale();
+-#endif
+-], [], gt_cv_proto_setlocale_arg1="", gt_cv_proto_setlocale_arg1="const")
+-gt_cv_proto_setlocale="extern char *setlocale (int category, $gt_cv_proto_setlocale_arg1 char *locale);"])
+-gt_cv_proto_setlocale=`echo "[$]gt_cv_proto_setlocale" | tr -s ' ' | sed -e 's/( /(/'`
+-AC_MSG_RESULT([
+- $gt_cv_proto_setlocale])
+-AC_DEFINE_UNQUOTED(SETLOCALE_CONST,$gt_cv_proto_setlocale_arg1,
+- [Define as const if the declaration of setlocale() needs const.])
+-])
+diff --git a/gettext-tools/tests/format-c-3-prg.c b/gettext-tools/tests/format-c-3-prg.c
+index e1ce8ef..804d468 100644
+--- a/gettext-tools/tests/format-c-3-prg.c
++++ b/gettext-tools/tests/format-c-3-prg.c
+@@ -42,7 +42,7 @@
+ #undef setlocale
+ #if defined _WIN32 && !defined __CYGWIN__
+ # define setlocale fake_setlocale
+-extern char *setlocale (int category, SETLOCALE_CONST char *locale);
++extern char *setlocale (int category, const char *locale);
+ #endif
+
+ #define _(string) gettext (string)
+diff --git a/gettext-tools/tests/format-c-4-prg.c b/gettext-tools/tests/format-c-4-prg.c
+index 8f796ff..4dac6af 100644
+--- a/gettext-tools/tests/format-c-4-prg.c
++++ b/gettext-tools/tests/format-c-4-prg.c
+@@ -42,7 +42,7 @@
+ #undef setlocale
+ #if defined _WIN32 && !defined __CYGWIN__
+ # define setlocale fake_setlocale
+-extern char *setlocale (int category, SETLOCALE_CONST char *locale);
++extern char *setlocale (int category, const char *locale);
+ #endif
+
+ #define _(string) gettext (string)
+diff --git a/gettext-tools/tests/plural-1-prg.c b/gettext-tools/tests/plural-1-prg.c
+index 0df74d2..982ea47 100644
+--- a/gettext-tools/tests/plural-1-prg.c
++++ b/gettext-tools/tests/plural-1-prg.c
+@@ -38,7 +38,7 @@
+ #undef setlocale
+ #if defined _WIN32 && !defined __CYGWIN__
+ # define setlocale fake_setlocale
+-extern char *setlocale (int category, SETLOCALE_CONST char *locale);
++extern char *setlocale (int category, const char *locale);
+ #endif
+
+ int
+diff --git a/gettext-tools/tests/setlocale.c b/gettext-tools/tests/setlocale.c
+index e69a694..e48b38c 100644
+--- a/gettext-tools/tests/setlocale.c
++++ b/gettext-tools/tests/setlocale.c
+@@ -1,5 +1,5 @@
+ /* Fake setlocale - platform independent, for testing purposes.
+- Copyright (C) 2001-2002, 2019 Free Software Foundation, Inc.
++ Copyright (C) 2001-2002, 2019-2020 Free Software Foundation, Inc.
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+@@ -94,7 +94,7 @@ category_to_name (int category)
+ actually change the behaviour of locale dependent functions.
+ Assumes setenv()/putenv() is not called. */
+ char *
+-setlocale (int category, SETLOCALE_CONST char *locale)
++setlocale (int category, const char *locale)
+ {
+ static char C_string[] = "C";
+ static char *current_locale = C_string;
+diff --git a/gettext-tools/tests/tstgettext.c b/gettext-tools/tests/tstgettext.c
+index 71651bb..a855783 100644
+--- a/gettext-tools/tests/tstgettext.c
++++ b/gettext-tools/tests/tstgettext.c
+@@ -46,7 +46,7 @@
+ #if defined _WIN32 && !defined __CYGWIN__
+ # undef setlocale
+ # define setlocale fake_setlocale
+-extern char *setlocale (int category, SETLOCALE_CONST char *locale);
++extern char *setlocale (int category, const char *locale);
+ #endif
+
+ #define _(str) gettext (str)
+diff --git a/gettext-tools/tests/tstngettext.c b/gettext-tools/tests/tstngettext.c
+index 8dfeed4..e9ce5c9 100644
+--- a/gettext-tools/tests/tstngettext.c
++++ b/gettext-tools/tests/tstngettext.c
+@@ -44,7 +44,7 @@
+ #if defined _WIN32 && !defined __CYGWIN__
+ # undef setlocale
+ # define setlocale fake_setlocale
+-extern char *setlocale (int category, SETLOCALE_CONST char *locale);
++extern char *setlocale (int category, const char *locale);
+ #endif
+
+ #define _(str) gettext (str)
+--
+1.9.1
+
diff --git a/sys-devel/gettext/gettext-0.21.ebuild b/sys-devel/gettext/gettext-0.21.ebuild
index 69790191b8..921871be1e 100644
--- a/sys-devel/gettext/gettext-0.21.ebuild
+++ b/sys-devel/gettext/gettext-0.21.ebuild
@@ -60,6 +60,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-0.19.7-disable-libintl.patch #564168
"${FILESDIR}"/${PN}-0.20-parallel_install.patch #685530
"${FILESDIR}"/${PN}-0.21_rc1-avoid_eautomake.patch
+ "${FILESDIR}"/${P}-no-setlocale.patch
)
QA_SONAME_NO_SYMLINK=".*/preloadable_libintl.so"
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/prefix:master commit in: sys-devel/gettext/files/, sys-devel/gettext/
@ 2020-12-08 7:26 Fabian Groffen
0 siblings, 0 replies; 3+ messages in thread
From: Fabian Groffen @ 2020-12-08 7:26 UTC (permalink / raw
To: gentoo-commits
commit: 3631fa5cabc06c37d62d0d7b1f893255d268fb2d
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 7 20:27:44 2020 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Dec 8 07:26:14 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=3631fa5c
sys-devel/gettext: migrated to gx86
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
sys-devel/gettext/Manifest | 3 -
sys-devel/gettext/files/0.18.1.1-no-woe32dll.patch | 84 --
sys-devel/gettext/files/0.19.3-localename.patch | 168 ---
sys-devel/gettext/files/0.19.3-tests-cygwin.patch | 89 --
.../gettext/files/0.19.7-gnulib-cygwin25.patch | 22 -
sys-devel/gettext/files/0.19.8.1-cygwin-ftm.patch | 11 -
sys-devel/gettext/files/0.19.8.1-no-woe32dll.patch | 95 --
.../gettext/files/0.19.8.1-tests-cygwin.patch | 89 --
.../files/gettext-0.14.1-lib-path-tests.patch | 17 -
.../gettext/files/gettext-0.14.2-fix-race.patch | 13 -
.../files/gettext-0.15-expat-no-dlopen.patch | 36 -
.../gettext/files/gettext-0.16.1-x64-solaris.patch | 173 ---
sys-devel/gettext/files/gettext-0.17-gnuinfo.patch | 16 -
.../gettext/files/gettext-0.17-open-args.patch | 25 -
.../gettext/files/gettext-0.17-winnt-pipe.patch | 36 -
.../gettext/files/gettext-0.17-winnt-vs9.patch | 26 -
sys-devel/gettext/files/gettext-0.17-winnt.patch | 1264 --------------------
.../gettext/files/gettext-0.17-x-python.patch | 28 -
.../gettext/files/gettext-0.18.1.1-no-gets.patch | 42 -
.../gettext-0.18.1.1-uclibc-sched_param-def.patch | 20 -
.../files/gettext-0.19.7-disable-libintl.patch | 42 -
.../files/gettext-0.19.8.1-format-security.patch | 87 --
.../files/gettext-0.20-parallel_install.patch | 37 -
.../gettext/files/gettext-0.21-no-setlocale.patch | 190 ---
.../files/gettext-0.21_rc1-avoid_eautomake.patch | 22 -
sys-devel/gettext/gettext-0.19.7.ebuild | 151 ---
sys-devel/gettext/gettext-0.19.8.1.ebuild | 150 ---
sys-devel/gettext/gettext-0.21.ebuild | 170 ---
sys-devel/gettext/metadata.xml | 18 -
29 files changed, 3124 deletions(-)
diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
deleted file mode 100644
index 993bbc9245..0000000000
--- a/sys-devel/gettext/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gettext-0.19.7.tar.gz 19235781 BLAKE2B 4c2cfcb0b21a66a9f8d2d57de7420e624a1235f97180ad5ac194a5eb629760a9cacc7f3966cdf893d7af86c1740d8bb2266c639ebe2664ea44f2c47a962a841a SHA512 7ba89074d3eddd0b4a5e2980e1ec74b53c49b7a04a1fa91c70c4bc11ce9c30415e4df9d79698148eaaed325fb4feb25a340a2e8e01fbe86b1a66b1376a4c9e3d
-DIST gettext-0.19.8.1.tar.gz 19704011 BLAKE2B 17dc7aad338a26d71b818fea51e46a47dccf14744ee575ce86b591becaea402e36d64dc018e1a84113c356122ffef367cf2fa424e51ebc9720350040b4960091 SHA512 073042fa2dc48804c58e76f036130a669e19612c25427b0ab14d0b366b549a63751bf3af03bfd0745d7c4f72497a4b2aab26a3cc6de83189ce111679073878e1
-DIST gettext-0.21.tar.gz 24181849 BLAKE2B 2eae99d0916b00b2af6fbc6bf7e309076519a10fea16cd49e7aa29fe8aec1ee7c784c6277281b764dc4abacf400cd3fe461129586303c8cd337db15c76cb4b87 SHA512 bbe590c5dd3580c75bf30ff768da99a88eb8d466ec1ac9eea20be4cab4357ecf72448e6b81b47425e39d50fa6320ba426632914d7898dfebb4f159abc39c31d1
diff --git a/sys-devel/gettext/files/0.18.1.1-no-woe32dll.patch b/sys-devel/gettext/files/0.18.1.1-no-woe32dll.patch
deleted file mode 100644
index 3f2e4c424e..0000000000
--- a/sys-devel/gettext/files/0.18.1.1-no-woe32dll.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-Derived from Cygwin: gettext-0.19.7-1.src/0.18.1.1-no-woe32dll
-
---- origsrc/gettext-0.18.1.1/gettext-tools/configure.ac 2010-06-06 15:04:04.000000000 -0500
-+++ src/gettext-0.18.1.1/gettext-tools/configure.ac 2013-03-07 22:13:24.525723500 -0600
-#@@ -108,7 +108,7 @@ AC_SUBST([LTNOUNDEF])
- dnl On mingw and Cygwin, we can activate special Makefile rules which add
- dnl version information to the shared libraries and executables.
- case "$host_os" in
-- mingw* | cygwin*) is_woe32=yes ;;
-+ mingw*) is_woe32=yes ;;
- *) is_woe32=no ;;
- esac
- AM_CONDITIONAL([WOE32], [test $is_woe32 = yes])
-#@@ -211,7 +211,7 @@ dnl must arrange to define the auxili
- dnl exported variables _also_ in the static library.
- if test "$enable_shared" = yes; then
- case "$host_os" in
-- mingw* | cygwin*) is_woe32dll=yes ;;
-+ mingw*) is_woe32dll=yes ;;
- *) is_woe32dll=no ;;
- esac
- else
---- origsrc/gettext-0.18.1.1/m4/woe32-dll.m4 2010-06-06 07:49:58.000000000 -0500
-+++ src/gettext-0.18.1.1/m4/woe32-dll.m4 2013-03-07 23:33:34.183820200 -0600
-#@@ -29,7 +29,7 @@ AC_DEFUN([gl_WOE32_DLL],
- [
- AC_REQUIRE([AC_CANONICAL_HOST])
- case "$host_os" in
-- mingw* | cygwin*)
-+ mingw*)
- AC_MSG_CHECKING([for auto-import of symbols])
- AC_CACHE_VAL([gl_cv_ld_autoimport], [
- gl_save_LDFLAGS="$LDFLAGS"
---- origsrc/gettext-0.19.7/gettext-runtime/configure
-+++ src/gettext-0.19.7/gettext-runtime/configure
-@@ -7286,7 +7275,7 @@
-
-
- case "$host_os" in
-- mingw* | cygwin*)
-+ mingw*)
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for auto-import of symbols" >&5
- $as_echo_n "checking for auto-import of symbols... " >&6; }
- if ${gl_cv_ld_autoimport+:} false; then :
---- origsrc/gettext-0.19.7/gettext-runtime/libasprintf/configure
-+++ src/gettext-0.19.7/gettext-runtime/libasprintf/configure
-@@ -5479,7 +5467,7 @@
-
-
- case "$host_os" in
-- mingw* | cygwin*)
-+ mingw*)
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for auto-import of symbols" >&5
- $as_echo_n "checking for auto-import of symbols... " >&6; }
- if ${gl_cv_ld_autoimport+:} false; then :
---- origsrc/gettext-0.19.7/gettext-tools/configure
-+++ src/gettext-0.19.7/gettext-tools/configure
-@@ -9622,7 +9611,7 @@
-
-
- case "$host_os" in
-- mingw* | cygwin*)
-+ mingw*)
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for auto-import of symbols" >&5
- $as_echo_n "checking for auto-import of symbols... " >&6; }
- if ${gl_cv_ld_autoimport+:} false; then :
-@@ -17726,7 +17715,7 @@
-
-
- case "$host_os" in
-- mingw* | cygwin*) is_woe32=yes ;;
-+ mingw*) is_woe32=yes ;;
- *) is_woe32=no ;;
- esac
- if test $is_woe32 = yes; then
-@@ -71977,7 +71966,7 @@
-
- if test "$enable_shared" = yes; then
- case "$host_os" in
-- mingw* | cygwin*) is_woe32dll=yes ;;
-+ mingw*) is_woe32dll=yes ;;
- *) is_woe32dll=no ;;
- esac
- else
diff --git a/sys-devel/gettext/files/0.19.3-localename.patch b/sys-devel/gettext/files/0.19.3-localename.patch
deleted file mode 100644
index 0630292340..0000000000
--- a/sys-devel/gettext/files/0.19.3-localename.patch
+++ /dev/null
@@ -1,168 +0,0 @@
---- origsrc/gettext-0.19.3/gettext-runtime/gnulib-lib/localename.c 2014-10-16 01:00:08.000000000 -0500
-+++ src/gettext-0.19.3/gettext-runtime/gnulib-lib/localename.c 2014-11-17 23:22:47.747353600 -0600
-@@ -60,7 +60,7 @@
- # endif
- #endif
-
--#if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
-+#if defined WINDOWS_NATIVE /* Native Windows */
- # define WIN32_LEAN_AND_MEAN
- # include <windows.h>
- # include <winnls.h>
-@@ -1412,7 +1412,7 @@ gl_locale_name_canonicalize (char *name)
- #endif
-
-
--#if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
-+#if defined WINDOWS_NATIVE /* Native Windows */
-
- /* Canonicalize a Windows native locale name to a Unix locale name.
- NAME is a sufficiently large buffer.
-@@ -2825,11 +2825,6 @@ gl_locale_name_environ (int category, co
- Ignore invalid LANG value set by the Terminal application. */
- if (strcmp (retval, "UTF-8") != 0)
- #endif
--#if defined __CYGWIN__
-- /* Cygwin.
-- Ignore dummy LANG value set by ~/.profile. */
-- if (strcmp (retval, "C.UTF-8") != 0)
--#endif
- return retval;
- }
-
-@@ -2867,7 +2862,7 @@ gl_locale_name_default (void)
- "C.UTF-8" locale, which operates in the same way as the "C" locale.
- */
-
--#if !(HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE || defined WINDOWS_NATIVE || defined __CYGWIN__)
-+#if !(HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE || defined WINDOWS_NATIVE)
-
- /* The system does not have a way of setting the locale, other than the
- POSIX specified environment variables. We use C as default locale. */
-@@ -2922,7 +2917,7 @@ gl_locale_name_default (void)
-
- # endif
-
--# if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
-+# if defined WINDOWS_NATIVE /* Native Windows */
- {
- LCID lcid;
-
---- origsrc/gettext-0.19.3/gettext-runtime/intl/localename.c 2014-09-30 21:35:20.000000000 -0500
-+++ src/gettext-0.19.3/gettext-runtime/intl/localename.c 2014-11-17 23:22:47.755854700 -0600
-@@ -60,7 +60,7 @@
- # endif
- #endif
-
--#if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
-+#if defined WINDOWS_NATIVE_ /* Native Windows */
- # define WIN32_LEAN_AND_MEAN
- # include <windows.h>
- # include <winnls.h>
-@@ -1412,7 +1412,7 @@ gl_locale_name_canonicalize (char *name)
- #endif
-
-
--#if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
-+#if defined WINDOWS_NATIVE /* Native Windows */
-
- /* Canonicalize a Windows native locale name to a Unix locale name.
- NAME is a sufficiently large buffer.
-@@ -2770,7 +2770,7 @@ gl_locale_name_thread (int category, con
- However it does not specify the exact format. Neither do SUSV2 and
- ISO C 99. So we can use this feature only on selected systems (e.g.
- those using GNU C Library). */
--#if defined _LIBC || ((defined __GLIBC__ && __GLIBC__ >= 2) && !defined __UCLIBC__)
-+#if defined _LIBC || ((defined __GLIBC__ && __GLIBC__ >= 2) && !defined __UCLIBC__) || defined(__CYGWIN__)
- # define HAVE_LOCALE_NULL
- #endif
-
-@@ -2825,11 +2825,6 @@ gl_locale_name_environ (int category, co
- Ignore invalid LANG value set by the Terminal application. */
- if (strcmp (retval, "UTF-8") != 0)
- #endif
--#if defined __CYGWIN__
-- /* Cygwin.
-- Ignore dummy LANG value set by ~/.profile. */
-- if (strcmp (retval, "C.UTF-8") != 0)
--#endif
- return retval;
- }
-
-@@ -2867,7 +2862,7 @@ gl_locale_name_default (void)
- "C.UTF-8" locale, which operates in the same way as the "C" locale.
- */
-
--#if !(HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE || defined WINDOWS_NATIVE || defined __CYGWIN__)
-+#if !(HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE || defined WINDOWS_NATIVE)
-
- /* The system does not have a way of setting the locale, other than the
- POSIX specified environment variables. We use C as default locale. */
-@@ -2922,7 +2917,7 @@ gl_locale_name_default (void)
-
- # endif
-
--# if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
-+# if defined WINDOWS_NATIVE /* Native Windows */
- {
- LCID lcid;
-
---- origsrc/gettext-0.19.3/gettext-tools/gnulib-lib/localename.c 2014-10-16 01:00:35.000000000 -0500
-+++ src/gettext-0.19.3/gettext-tools/gnulib-lib/localename.c 2014-11-17 23:22:47.763355600 -0600
-@@ -60,7 +60,7 @@
- # endif
- #endif
-
--#if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
-+#if defined WINDOWS_NATIVE_ /* Native Windows */
- # define WIN32_LEAN_AND_MEAN
- # include <windows.h>
- # include <winnls.h>
-@@ -1412,7 +1412,7 @@ gl_locale_name_canonicalize (char *name)
- #endif
-
-
--#if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
-+#if defined WINDOWS_NATIVE /* Native Windows */
-
- /* Canonicalize a Windows native locale name to a Unix locale name.
- NAME is a sufficiently large buffer.
-@@ -2770,7 +2770,7 @@ gl_locale_name_thread (int category, con
- However it does not specify the exact format. Neither do SUSV2 and
- ISO C 99. So we can use this feature only on selected systems (e.g.
- those using GNU C Library). */
--#if defined _LIBC || ((defined __GLIBC__ && __GLIBC__ >= 2) && !defined __UCLIBC__)
-+#if defined _LIBC || ((defined __GLIBC__ && __GLIBC__ >= 2) && !defined __UCLIBC__) || defined(__CYGWIN__)
- # define HAVE_LOCALE_NULL
- #endif
-
-@@ -2825,11 +2825,6 @@ gl_locale_name_environ (int category, co
- Ignore invalid LANG value set by the Terminal application. */
- if (strcmp (retval, "UTF-8") != 0)
- #endif
--#if defined __CYGWIN__
-- /* Cygwin.
-- Ignore dummy LANG value set by ~/.profile. */
-- if (strcmp (retval, "C.UTF-8") != 0)
--#endif
- return retval;
- }
-
-@@ -2867,7 +2862,7 @@ gl_locale_name_default (void)
- "C.UTF-8" locale, which operates in the same way as the "C" locale.
- */
-
--#if !(HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE || defined WINDOWS_NATIVE || defined __CYGWIN__)
-+#if !(HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE || defined WINDOWS_NATIVE)
-
- /* The system does not have a way of setting the locale, other than the
- POSIX specified environment variables. We use C as default locale. */
-@@ -2922,7 +2917,7 @@ gl_locale_name_default (void)
-
- # endif
-
--# if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
-+# if defined WINDOWS_NATIVE /* Native Windows */
- {
- LCID lcid;
-
diff --git a/sys-devel/gettext/files/0.19.3-tests-cygwin.patch b/sys-devel/gettext/files/0.19.3-tests-cygwin.patch
deleted file mode 100644
index 7d3eed2b27..0000000000
--- a/sys-devel/gettext/files/0.19.3-tests-cygwin.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- origsrc/gettext-0.19.3/gettext-tools/tests/format-c-3-prg.c 2013-05-31 00:01:54.000000000 -0500
-+++ src/gettext-0.19.3/gettext-tools/tests/format-c-3-prg.c 2014-11-17 23:26:21.975557100 -0600
-@@ -34,7 +34,7 @@
- /* Disable the override of setlocale that libgnuintl.h activates on MacOS X
- and Windows. This test relies on the fake setlocale function in
- setlocale.c. */
--#undef setlocale
-+/* #undef setlocale */
-
- #define _(string) gettext (string)
-
---- origsrc/gettext-0.19.3/gettext-tools/tests/format-c-4-prg.c 2013-05-31 00:01:54.000000000 -0500
-+++ src/gettext-0.19.3/gettext-tools/tests/format-c-4-prg.c 2014-11-17 23:26:21.979557600 -0600
-@@ -34,7 +34,7 @@
- /* Disable the override of setlocale that libgnuintl.h activates on MacOS X
- and Windows. This test relies on the fake setlocale function in
- setlocale.c. */
--#undef setlocale
-+/* #undef setlocale */
-
- #define _(string) gettext (string)
-
---- origsrc/gettext-0.19.3/gettext-tools/tests/plural-1 2014-04-14 20:52:11.000000000 -0500
-+++ src/gettext-0.19.3/gettext-tools/tests/plural-1 2014-11-17 23:26:21.983058100 -0600
-@@ -50,15 +50,15 @@ ${DIFF} plural-1-fr.po.strip plural-1-fr
-
- : ${DIFF=diff}
- echo 'un morceau de gateau' > plural-1-cake.ok
--LANGUAGE= ../cake fr 1 > plural-1-cake.tmp || exit 1
-+LANGUAGE= ../cake fr_FR 1 > plural-1-cake.tmp || exit 1
- LC_ALL=C tr -d '\r' < plural-1-cake.tmp > cake.out || exit 1
- ${DIFF} plural-1-cake.ok cake.out || exit 1
- echo '2 morceaux de gateau' > plural-1-cake.ok
--LANGUAGE= ../cake fr 2 > plural-1-cake.tmp || exit 1
-+LANGUAGE= ../cake fr_FR 2 > plural-1-cake.tmp || exit 1
- LC_ALL=C tr -d '\r' < plural-1-cake.tmp > cake.out || exit 1
- ${DIFF} plural-1-cake.ok cake.out || exit 1
- echo '10 morceaux de gateau' > plural-1-cake.ok
--LANGUAGE= ../cake fr 10 > plural-1-cake.tmp || exit 1
-+LANGUAGE= ../cake fr_FR 10 > plural-1-cake.tmp || exit 1
- LC_ALL=C tr -d '\r' < plural-1-cake.tmp > cake.out || exit 1
- ${DIFF} plural-1-cake.ok cake.out || exit 1
-
---- origsrc/gettext-0.19.3/gettext-tools/tests/plural-1-prg.c 2013-05-31 00:01:54.000000000 -0500
-+++ src/gettext-0.19.3/gettext-tools/tests/plural-1-prg.c 2014-11-17 23:26:21.989058800 -0600
-@@ -30,7 +30,7 @@
- /* Disable the override of setlocale that libgnuintl.h activates on MacOS X
- and Windows. This test relies on the fake setlocale function in
- setlocale.c. */
--#undef setlocale
-+/* #undef setlocale */
-
- int
- main (int argc, char *argv[])
---- origsrc/gettext-0.19.3/gettext-tools/tests/plural-2 2014-04-14 20:52:11.000000000 -0500
-+++ src/gettext-0.19.3/gettext-tools/tests/plural-2 2014-11-17 23:25:50.637077600 -0600
-@@ -3,8 +3,8 @@
-
- : ${MSGFMT=msgfmt}
- test -d plural-2-dir || mkdir plural-2-dir
--test -d plural-2-dir/ll || mkdir plural-2-dir/ll
--test -d plural-2-dir/ll/LC_MESSAGES || mkdir plural-2-dir/ll/LC_MESSAGES
-+test -d plural-2-dir/es || mkdir plural-2-dir/es
-+test -d plural-2-dir/es/LC_MESSAGES || mkdir plural-2-dir/es/LC_MESSAGES
-
- cat <<EOF > plural-2.data
- ja
-@@ -44,7 +44,7 @@ EOF
- while read lang; do
- read formula
- read dataok
-- cat > plural-2-ll.po <<EOF
-+ cat > plural-2-es.po <<EOF
- msgid ""
- msgstr ""
- "MIME-Version: 1.0\n"
-@@ -65,10 +65,10 @@ msgstr[7] "7"
- msgstr[8] "8"
- msgstr[9] "9"
- EOF
-- ${MSGFMT} -o plural-2-dir/ll/LC_MESSAGES/plural.mo plural-2-ll.po || exit 1
-+ ${MSGFMT} -o plural-2-dir/es/LC_MESSAGES/plural.mo plural-2-es.po || exit 1
- (for i in '' 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19; do
- LANGUAGE= TEXTDOMAIN=plural TEXTDOMAINDIR=plural-2-dir \
-- $NGETTEXT --env LC_ALL=ll X Y ${i}0 ${i}1 ${i}2 ${i}3 ${i}4 ${i}5 ${i}6 ${i}7 ${i}8 ${i}9
-+ $NGETTEXT --env LC_ALL=es_ES X Y ${i}0 ${i}1 ${i}2 ${i}3 ${i}4 ${i}5 ${i}6 ${i}7 ${i}8 ${i}9
- done) > dataout
- test "$dataok" = `cat dataout` || {
- echo "Formula evaluation error for language $lang" 1>&2
diff --git a/sys-devel/gettext/files/0.19.7-gnulib-cygwin25.patch b/sys-devel/gettext/files/0.19.7-gnulib-cygwin25.patch
deleted file mode 100644
index e2e69545be..0000000000
--- a/sys-devel/gettext/files/0.19.7-gnulib-cygwin25.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://lists.gnu.org/archive/html/bug-gnulib/2016-03/msg00057.html
-
---- origsrc/gettext-0.19.7/gettext-tools/gnulib-lib/sys_select.in.h 2015-12-27 17:08:31.000000000 -0600
-+++ src/gettext-0.19.7/gettext-tools/gnulib-lib/sys_select.in.h 2016-05-04 10:07:56.425638400 -0500
-@@ -82,7 +82,7 @@
- Also, Mac OS X, AIX, HP-UX, IRIX, Solaris, Interix declare select()
- in <sys/time.h>.
- But avoid namespace pollution on glibc systems. */
--# ifndef __GLIBC__
-+# if !(defined __GLIBC__ || defined __NEWLIB__)
- # include <sys/time.h>
- # endif
-
-@@ -103,7 +103,7 @@
- But avoid namespace pollution on glibc systems.
- Do this after the include_next (for the sake of OpenBSD 5.0) but before
- the split double-inclusion guard (for the sake of Solaris). */
--#if !(defined __GLIBC__ && !defined __UCLIBC__)
-+#if !((defined __GLIBC__ || defined __NEWLIB__) && !defined __UCLIBC__)
- # include <signal.h>
- #endif
-
diff --git a/sys-devel/gettext/files/0.19.8.1-cygwin-ftm.patch b/sys-devel/gettext/files/0.19.8.1-cygwin-ftm.patch
deleted file mode 100644
index 23f88f0b56..0000000000
--- a/sys-devel/gettext/files/0.19.8.1-cygwin-ftm.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- origsrc/gettext-0.19.8.1/gettext-runtime/intl/libgnuintl.in.h 2016-06-09 17:56:00.000000000 -0500
-+++ src/gettext-0.19.8.1/gettext-runtime/intl/libgnuintl.in.h 2016-10-20 11:03:43.187813700 -0500
-@@ -435,7 +435,7 @@ extern int vswprintf (wchar_t *, size_t,
- extern char *setlocale (int, const char *);
- #endif
-
--#if @HAVE_NEWLOCALE@
-+#if @HAVE_NEWLOCALE@ && __POSIX_VISIBLE >= 200809
-
- #undef newlocale
- #define newlocale libintl_newlocale
diff --git a/sys-devel/gettext/files/0.19.8.1-no-woe32dll.patch b/sys-devel/gettext/files/0.19.8.1-no-woe32dll.patch
deleted file mode 100644
index 75bb0a1e1e..0000000000
--- a/sys-devel/gettext/files/0.19.8.1-no-woe32dll.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-Derived from Cygwin: gettext-0.19.8.1-2.src/0.19.8.1-no-woe32dll.patch
-
---- origsrc/gettext-0.19.8.1/gettext-tools/configure.ac 2016-06-09 17:56:00.000000000 -0500
-+++ src/gettext-0.19.8.1/gettext-tools/configure.ac 2016-10-10 02:10:37.323106300 -0500
-#@@ -100,7 +100,7 @@ LT_LANG([Windows Resource])
- dnl On mingw and Cygwin, we can activate special Makefile rules which add
- dnl version information to the shared libraries and executables.
- case "$host_os" in
-- mingw* | cygwin*) special_makefile_rules=woe32 ;;
-+ mingw*) special_makefile_rules=woe32 ;;
- os2*) special_makefile_rules=os2 ;;
- *) special_makefile_rules=none ;;
- esac
-#@@ -212,7 +212,7 @@ dnl must arrange to define the auxili
- dnl exported variables _also_ in the static library.
- if test "$enable_shared" = yes; then
- case "$host_os" in
-- mingw* | cygwin*) is_woe32dll=yes ;;
-+ mingw*) is_woe32dll=yes ;;
- *) is_woe32dll=no ;;
- esac
- else
---- gettext-0.19.8.1/gettext-tools/configure
-+++ gettext-0.19.8.1/gettext-tools/configure
-@@ -100,7 +100,7 @@
-
-
- case "$host_os" in
-- mingw* | cygwin*) special_makefile_rules=woe32 ;;
-+ mingw*) special_makefile_rules=woe32 ;;
- os2*) special_makefile_rules=os2 ;;
- *) special_makefile_rules=none ;;
- esac
-@@ -100,7 +100,7 @@
-
- if test "$enable_shared" = yes; then
- case "$host_os" in
-- mingw* | cygwin*) is_woe32dll=yes ;;
-+ mingw*) is_woe32dll=yes ;;
- *) is_woe32dll=no ;;
- esac
- else
-@@ -100,7 +100,7 @@
-
- if test "$enable_shared" = yes; then
- case "$host_os" in
-- mingw* | cygwin*) is_woe32dll=yes ;;
-+ mingw*) is_woe32dll=yes ;;
- *) is_woe32dll=no ;;
- esac
- else
---- origsrc/gettext-0.19.8.1/m4/woe32-dll.m4 2016-03-20 02:37:53.000000000 -0500
-+++ src/gettext-0.19.8.1/m4/woe32-dll.m4 2016-10-10 02:11:04.906081600 -0500
-#@@ -30,7 +30,7 @@ AC_DEFUN([gl_WOE32_DLL],
- [
- AC_REQUIRE([AC_CANONICAL_HOST])
- case "$host_os" in
-- mingw* | cygwin*)
-+ mingw*)
- AC_MSG_CHECKING([for auto-import of symbols])
- AC_CACHE_VAL([gl_cv_ld_autoimport], [
- gl_save_LDFLAGS="$LDFLAGS"
---- gettext-0.19.8.1/gettext-runtime/configure
-+++ gettext-0.19.8.1/gettext-runtime/configure
-@@ -100,7 +100,7 @@
-
-
- case "$host_os" in
-- mingw* | cygwin*)
-+ mingw*)
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for auto-import of symbols" >&5
- $as_echo_n "checking for auto-import of symbols... " >&6; }
- if ${gl_cv_ld_autoimport+:} false; then :
---- gettext-0.19.8.1/gettext-runtime/libasprintf/configure
-+++ gettext-0.19.8.1/gettext-runtime/libasprintf/configure
-@@ -100,7 +100,7 @@
-
-
- case "$host_os" in
-- mingw* | cygwin*)
-+ mingw*)
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for auto-import of symbols" >&5
- $as_echo_n "checking for auto-import of symbols... " >&6; }
- if ${gl_cv_ld_autoimport+:} false; then :
---- gettext-0.19.8.1/gettext-tools/configure
-+++ gettext-0.19.8.1/gettext-tools/configure
-@@ -100,7 +100,7 @@
-
-
- case "$host_os" in
-- mingw* | cygwin*)
-+ mingw*)
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for auto-import of symbols" >&5
- $as_echo_n "checking for auto-import of symbols... " >&6; }
- if ${gl_cv_ld_autoimport+:} false; then :
diff --git a/sys-devel/gettext/files/0.19.8.1-tests-cygwin.patch b/sys-devel/gettext/files/0.19.8.1-tests-cygwin.patch
deleted file mode 100644
index 38aefe9904..0000000000
--- a/sys-devel/gettext/files/0.19.8.1-tests-cygwin.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- origsrc/gettext-0.19.3/gettext-tools/tests/format-c-3-prg.c 2013-05-31 00:01:54.000000000 -0500
-+++ src/gettext-0.19.3/gettext-tools/tests/format-c-3-prg.c 2014-11-17 23:26:21.975557100 -0600
-@@ -34,7 +34,7 @@
- /* Disable the override of setlocale that libgnuintl.h activates on MacOS X
- and Windows. This test relies on the fake setlocale function in
- setlocale.c. */
--#undef setlocale
-+/* #undef setlocale */
-
- #define _(string) gettext (string)
-
---- origsrc/gettext-0.19.3/gettext-tools/tests/format-c-4-prg.c 2013-05-31 00:01:54.000000000 -0500
-+++ src/gettext-0.19.3/gettext-tools/tests/format-c-4-prg.c 2014-11-17 23:26:21.979557600 -0600
-@@ -34,7 +34,7 @@
- /* Disable the override of setlocale that libgnuintl.h activates on MacOS X
- and Windows. This test relies on the fake setlocale function in
- setlocale.c. */
--#undef setlocale
-+/* #undef setlocale */
-
- #define _(string) gettext (string)
-
---- origsrc/gettext-0.19.3/gettext-tools/tests/plural-1 2014-04-14 20:52:11.000000000 -0500
-+++ src/gettext-0.19.3/gettext-tools/tests/plural-1 2014-11-17 23:26:21.983058100 -0600
-@@ -50,15 +50,15 @@ ${DIFF} plural-1-fr.po.strip plural-1-fr
-
- : ${DIFF=diff}
- echo 'un morceau de gateau' > plural-1-cake.ok
--LANGUAGE= ../cake fr 1 > plural-1-cake.tmp || Exit 1
-+LANGUAGE= ../cake fr_FR 1 > plural-1-cake.tmp || Exit 1
- LC_ALL=C tr -d '\r' < plural-1-cake.tmp > cake.out || Exit 1
- ${DIFF} plural-1-cake.ok cake.out || Exit 1
- echo '2 morceaux de gateau' > plural-1-cake.ok
--LANGUAGE= ../cake fr 2 > plural-1-cake.tmp || Exit 1
-+LANGUAGE= ../cake fr_FR 2 > plural-1-cake.tmp || Exit 1
- LC_ALL=C tr -d '\r' < plural-1-cake.tmp > cake.out || Exit 1
- ${DIFF} plural-1-cake.ok cake.out || Exit 1
- echo '10 morceaux de gateau' > plural-1-cake.ok
--LANGUAGE= ../cake fr 10 > plural-1-cake.tmp || Exit 1
-+LANGUAGE= ../cake fr_FR 10 > plural-1-cake.tmp || Exit 1
- LC_ALL=C tr -d '\r' < plural-1-cake.tmp > cake.out || Exit 1
- ${DIFF} plural-1-cake.ok cake.out || Exit 1
-
---- origsrc/gettext-0.19.3/gettext-tools/tests/plural-1-prg.c 2013-05-31 00:01:54.000000000 -0500
-+++ src/gettext-0.19.3/gettext-tools/tests/plural-1-prg.c 2014-11-17 23:26:21.989058800 -0600
-@@ -30,7 +30,7 @@
- /* Disable the override of setlocale that libgnuintl.h activates on MacOS X
- and Windows. This test relies on the fake setlocale function in
- setlocale.c. */
--#undef setlocale
-+/* #undef setlocale */
-
- int
- main (int argc, char *argv[])
---- origsrc/gettext-0.19.3/gettext-tools/tests/plural-2 2014-04-14 20:52:11.000000000 -0500
-+++ src/gettext-0.19.3/gettext-tools/tests/plural-2 2014-11-17 23:25:50.637077600 -0600
-@@ -3,8 +3,8 @@
-
- : ${MSGFMT=msgfmt}
- test -d plural-2-dir || mkdir plural-2-dir
--test -d plural-2-dir/ll || mkdir plural-2-dir/ll
--test -d plural-2-dir/ll/LC_MESSAGES || mkdir plural-2-dir/ll/LC_MESSAGES
-+test -d plural-2-dir/es || mkdir plural-2-dir/es
-+test -d plural-2-dir/es/LC_MESSAGES || mkdir plural-2-dir/es/LC_MESSAGES
-
- cat <<EOF > plural-2.data
- ja
-@@ -44,7 +44,7 @@ EOF
- while read lang; do
- read formula
- read dataok
-- cat > plural-2-ll.po <<EOF
-+ cat > plural-2-es.po <<EOF
- msgid ""
- msgstr ""
- "MIME-Version: 1.0\n"
-@@ -65,10 +65,10 @@ msgstr[7] "7"
- msgstr[8] "8"
- msgstr[9] "9"
- EOF
-- ${MSGFMT} -o plural-2-dir/ll/LC_MESSAGES/plural.mo plural-2-ll.po || Exit 1
-+ ${MSGFMT} -o plural-2-dir/es/LC_MESSAGES/plural.mo plural-2-es.po || Exit 1
- (for i in '' 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19; do
- LANGUAGE= TEXTDOMAIN=plural TEXTDOMAINDIR=plural-2-dir \
-- $NGETTEXT --env LC_ALL=ll X Y ${i}0 ${i}1 ${i}2 ${i}3 ${i}4 ${i}5 ${i}6 ${i}7 ${i}8 ${i}9
-+ $NGETTEXT --env LC_ALL=es_ES X Y ${i}0 ${i}1 ${i}2 ${i}3 ${i}4 ${i}5 ${i}6 ${i}7 ${i}8 ${i}9
- done) > dataout
- test "$dataok" = `cat dataout` || {
- echo "Formula evaluation error for language $lang" 1>&2
diff --git a/sys-devel/gettext/files/gettext-0.14.1-lib-path-tests.patch b/sys-devel/gettext/files/gettext-0.14.1-lib-path-tests.patch
deleted file mode 100644
index 8a6a695eb6..0000000000
--- a/sys-devel/gettext/files/gettext-0.14.1-lib-path-tests.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-The test env manipulates $PATH, executing binaries whose libraries
-have not yet been installed into the standard library search path.
-Thus we manipulate LD_LIBRARY_PATH so that the current binaries
-run with the current libraries.
-
-http://bugs.gentoo.org/show_bug.cgi?id=81628
-
---- gettext-tools/tests/Makefile.in
-+++ gettext-tools/tests/Makefile.in
-@@ -122,6 +122,7 @@
-
- TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir) \
- PATH=.:../src:../../gettext-runtime/src:$(top_srcdir)/../gettext-runtime/src:$$PATH \
-+ LD_LIBRARY_PATH=../lib/.libs:../src/.libs:$$LD_LIBRARY_PATH \
- GETTEXT="$(CHECKER) tstgettext" \
- NGETTEXT="$(CHECKER) tstngettext" \
- XGETTEXT="$(CHECKER) xgettext" \
diff --git a/sys-devel/gettext/files/gettext-0.14.2-fix-race.patch b/sys-devel/gettext/files/gettext-0.14.2-fix-race.patch
deleted file mode 100644
index 57d381d37c..0000000000
--- a/sys-devel/gettext/files/gettext-0.14.2-fix-race.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://bugs.gentoo.org/85054
-
---- gettext-0.14.2/gettext-tools/misc/Makefile.in
-+++ gettext-0.14.2/gettext-tools/misc/Makefile.in
-@@ -441,7 +441,7 @@
- shift; \
- EMACS="$(EMACS)" $(SHELL) $(elisp_comp) "$$@" || exit 1; \
- else : ; fi
-- @mv -f elc-temp $@
-+ @mv -f elc-temp $@ || touch $@
- $(am__ELCFILES): elc-stamp
- @if test ! -f $@; then \
- rm -f elc-stamp; \
diff --git a/sys-devel/gettext/files/gettext-0.15-expat-no-dlopen.patch b/sys-devel/gettext/files/gettext-0.15-expat-no-dlopen.patch
deleted file mode 100644
index 4630d1dd92..0000000000
--- a/sys-devel/gettext/files/gettext-0.15-expat-no-dlopen.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Add support for expat-2 to xgettext by linking it at build time rather than
-at runtime using dlopen
-
-http://bugs.gentoo.org/146211
-
---- gettext-0.15/gettext-tools/configure
-+++ gettext-0.15/gettext-tools/configure
-@@ -44267,19 +44266,6 @@
-
-
-
--case "$host_os" in
-- linux*)
--
--cat >>confdefs.h <<\_ACEOF
--#define DYNLOAD_LIBEXPAT 1
--_ACEOF
--
-- LIBEXPAT="-ldl"
-- LTLIBEXPAT="-ldl"
--
--
-- ;;
-- *)
-
-
-
-@@ -44786,8 +44772,6 @@
-
-
-
-- ;;
--esac
-
- # If set to t, that means we are running in a shell under Emacs.
- # If you have an Emacs named "t", then use the full path.
diff --git a/sys-devel/gettext/files/gettext-0.16.1-x64-solaris.patch b/sys-devel/gettext/files/gettext-0.16.1-x64-solaris.patch
deleted file mode 100644
index e991902037..0000000000
--- a/sys-devel/gettext/files/gettext-0.16.1-x64-solaris.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-* patch grabbed from 0.17 sources to deal with Solaris 10/x86_64
- compilation (and runtime crash) issues
-
---- gettext-tools/gnulib-lib/vasprintf.c
-+++ gettext-tools/gnulib-lib/vasprintf.c
-@@ -1,11 +1,11 @@
- /* Like vsprintf but provides a pointer to malloc'd storage, which must
- be freed by the caller.
-- Copyright (C) 1994, 1998, 1999, 2000-2003, 2006 Free Software Foundation, Inc.
-+ Copyright (C) 1994, 1998-1999, 2000-2003, 2006-2007 Free Software Foundation, Inc.
-
--This program is free software; you can redistribute it and/or modify
-+This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
--the Free Software Foundation; either version 2, or (at your option)
--any later version.
-+the Free Software Foundation; either version 3 of the License, or
-+(at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
-@@ -13,13 +13,12 @@
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
--along with this program; if not, write to the Free Software Foundation,
--Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-+along with this program. If not, see <http://www.gnu.org/licenses/>. */
-
- #include <config.h>
-
- /* Specification. */
--#include "vasprintf.h"
-+#include <stdio.h>
-
- #include <stdio.h>
- #include <string.h>
-@@ -32,14 +31,15 @@
- #endif
-
- static int
--int_vasprintf (char **result, const char *format, va_list *args)
-+int_vasprintf (char **result, const char *format, va_list args)
- {
- const char *p = format;
- /* Add one to make sure that it is never zero, which might cause malloc
- to return NULL. */
- size_t total_width = strlen (format) + 1;
-- va_list ap = *args;
-+ va_list ap;
-
-+ va_copy (ap, args);
- while (*p != '\0')
- {
- if (*p++ == '%')
-@@ -107,12 +107,14 @@
- p++;
- }
- }
-+ va_end (ap);
-+
- #ifdef TEST
- global_total_width = total_width;
- #endif
- *result = malloc (total_width);
- if (*result != NULL)
-- return vsprintf (*result, format, *args);
-+ return vsprintf (*result, format, args);
- else
- return -1;
- }
-@@ -120,7 +122,7 @@
- int
- vasprintf (char **result, const char *format, va_list args)
- {
-- return int_vasprintf (result, format, &args);
-+ return int_vasprintf (result, format, args);
- }
-
- int
-@@ -150,6 +152,7 @@
-
- va_start (args, format);
- vasprintf (&result, format, args);
-+ va_end (args);
- if (strlen (result) < global_total_width)
- printf ("PASS: ");
- else
---- gettext-tools/libgettextpo/vasprintf.c
-+++ gettext-tools/libgettextpo/vasprintf.c
-@@ -1,11 +1,11 @@
- /* Like vsprintf but provides a pointer to malloc'd storage, which must
- be freed by the caller.
-- Copyright (C) 1994, 1998, 1999, 2000-2003, 2006 Free Software Foundation, Inc.
-+ Copyright (C) 1994, 1998-1999, 2000-2003, 2006-2007 Free Software Foundation, Inc.
-
--This program is free software; you can redistribute it and/or modify
-+This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
--the Free Software Foundation; either version 2, or (at your option)
--any later version.
-+the Free Software Foundation; either version 3 of the License, or
-+(at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
-@@ -13,13 +13,12 @@
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
--along with this program; if not, write to the Free Software Foundation,
--Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-+along with this program. If not, see <http://www.gnu.org/licenses/>. */
-
- #include <config.h>
-
- /* Specification. */
--#include "vasprintf.h"
-+#include <stdio.h>
-
- #include <stdio.h>
- #include <string.h>
-@@ -32,14 +31,15 @@
- #endif
-
- static int
--int_vasprintf (char **result, const char *format, va_list *args)
-+int_vasprintf (char **result, const char *format, va_list args)
- {
- const char *p = format;
- /* Add one to make sure that it is never zero, which might cause malloc
- to return NULL. */
- size_t total_width = strlen (format) + 1;
-- va_list ap = *args;
-+ va_list ap;
-
-+ va_copy (ap, args);
- while (*p != '\0')
- {
- if (*p++ == '%')
-@@ -107,12 +107,14 @@
- p++;
- }
- }
-+ va_end (ap);
-+
- #ifdef TEST
- global_total_width = total_width;
- #endif
- *result = malloc (total_width);
- if (*result != NULL)
-- return vsprintf (*result, format, *args);
-+ return vsprintf (*result, format, args);
- else
- return -1;
- }
-@@ -120,7 +122,7 @@
- int
- vasprintf (char **result, const char *format, va_list args)
- {
-- return int_vasprintf (result, format, &args);
-+ return int_vasprintf (result, format, args);
- }
-
- int
-@@ -150,6 +152,7 @@
-
- va_start (args, format);
- vasprintf (&result, format, args);
-+ va_end (args);
- if (strlen (result) < global_total_width)
- printf ("PASS: ");
- else
diff --git a/sys-devel/gettext/files/gettext-0.17-gnuinfo.patch b/sys-devel/gettext/files/gettext-0.17-gnuinfo.patch
deleted file mode 100644
index 243916636f..0000000000
--- a/sys-devel/gettext/files/gettext-0.17-gnuinfo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix broken Info file produced by texinfo 4.11
-http://bugs.gentoo.org/249167
-
---- gettext-0.17/gettext-tools/doc/gettext.info
-+++ gettext-0.17/gettext-tools/doc/gettext.info
-@@ -1,7 +1,8 @@
-+This is gettext.info, produced by makeinfo version 4.13 from
-+gettext.texi.
-+
- INFO-DIR-SECTION GNU Gettext Utilities
- START-INFO-DIR-ENTRY
--This is gettext.info, produced by makeinfo version 4.11 from gettext.texi.
--
- * gettext: (gettext). GNU gettext utilities.
- * autopoint: (gettext)autopoint Invocation. Copy gettext infrastructure.
- * envsubst: (gettext)envsubst Invocation. Expand environment variables.
diff --git a/sys-devel/gettext/files/gettext-0.17-open-args.patch b/sys-devel/gettext/files/gettext-0.17-open-args.patch
deleted file mode 100644
index 330cbf6146..0000000000
--- a/sys-devel/gettext/files/gettext-0.17-open-args.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-2007-11-07 Jim Meyering <meyering@redhat.com>
- Bruno Haible <bruno@clisp.org>
-
- * write-catalog.c (msgdomain_list_print): Fix open() call.
-
---- gettext-tools/src/write-catalog.c 7 Oct 2007 19:35:31 -0000 1.4
-+++ gettext-tools/src/write-catalog.c 7 Nov 2007 11:43:15 -0000
-@@ -1,5 +1,5 @@
- /* GNU gettext - internationalization aids
-- Copyright (C) 1995-1998, 2000-2006 Free Software Foundation, Inc.
-+ Copyright (C) 1995-1998, 2000-2007 Free Software Foundation, Inc.
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
-@@ -220,7 +220,9 @@
- /* Open the output file. */
- if (!to_stdout)
- {
-- fd = open (filename, O_WRONLY | O_CREAT);
-+ fd = open (filename, O_WRONLY | O_CREAT | O_TRUNC,
-+ /* 0666 in portable POSIX notation: */
-+ S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
- if (fd < 0)
- {
- const char *errno_description = strerror (errno);
diff --git a/sys-devel/gettext/files/gettext-0.17-winnt-pipe.patch b/sys-devel/gettext/files/gettext-0.17-winnt-pipe.patch
deleted file mode 100644
index 00fcef8be5..0000000000
--- a/sys-devel/gettext/files/gettext-0.17-winnt-pipe.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ru gettext-0.17.orig/gettext-runtime/gnulib-m4/include_next.m4 gettext-0.17/gettext-runtime/gnulib-m4/include_next.m4
---- gettext-0.17.orig/gettext-runtime/gnulib-m4/include_next.m4 2009-09-14 11:59:18 +0200
-+++ gettext-0.17/gettext-runtime/gnulib-m4/include_next.m4 2009-09-14 11:36:06 +0200
-@@ -89,12 +89,12 @@
- dnl so use subshell.
- AS_VAR_SET([gl_next_header],
- ['"'`(eval "$ac_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD |
-- sed -n '\#[\\/]]m4_quote(m4_defn([gl_HEADER_NAME]))[#{
-+ ( sed -n '\#[\\/]]m4_quote(m4_defn([gl_HEADER_NAME]))[#{
- s#.*"\(.*[\\/]]m4_quote(m4_defn([gl_HEADER_NAME]))[\)".*#\1#
- s#^/[^/]#//&#
- p
- q
-- }'`'"'])
-+ }'; cat > /dev/null; );`'"'])
- else
- AS_VAR_SET([gl_next_header], ['<'gl_HEADER_NAME'>'])
- fi
-diff -ru gettext-0.17.orig/gettext-tools/gnulib-m4/include_next.m4 gettext-0.17/gettext-tools/gnulib-m4/include_next.m4
---- gettext-0.17.orig/gettext-tools/gnulib-m4/include_next.m4 2009-09-14 11:58:33 +0200
-+++ gettext-0.17/gettext-tools/gnulib-m4/include_next.m4 2009-09-14 11:59:53 +0200
-@@ -89,12 +89,12 @@
- dnl so use subshell.
- AS_VAR_SET([gl_next_header],
- ['"'`(eval "$ac_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD |
-- sed -n '\#[\\/]]m4_quote(m4_defn([gl_HEADER_NAME]))[#{
-+ ( sed -n '\#[\\/]]m4_quote(m4_defn([gl_HEADER_NAME]))[#{
- s#.*"\(.*[\\/]]m4_quote(m4_defn([gl_HEADER_NAME]))[\)".*#\1#
- s#^/[^/]#//&#
- p
- q
-- }'`'"'])
-+ }'; cat > /dev/null; );`'"'])
- else
- AS_VAR_SET([gl_next_header], ['<'gl_HEADER_NAME'>'])
- fi
diff --git a/sys-devel/gettext/files/gettext-0.17-winnt-vs9.patch b/sys-devel/gettext/files/gettext-0.17-winnt-vs9.patch
deleted file mode 100644
index e93004773e..0000000000
--- a/sys-devel/gettext/files/gettext-0.17-winnt-vs9.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ru -x '*.Po' -x '*.Plo' gettext-0.17.orig/gettext-runtime/intl/localename.c gettext-0.17/gettext-runtime/intl/localename.c
---- gettext-0.17.orig/gettext-runtime/intl/localename.c 2008-12-29 08:15:58 +0100
-+++ gettext-0.17/gettext-runtime/intl/localename.c 2008-12-29 09:12:24 +0100
-@@ -1387,7 +1387,9 @@
- switch (sub)
- {
- case SUBLANG_SINDHI_PAKISTAN: return "sd_PK";
-+#if SUBLANG_SINDHI_PAKISTAN != SUBLANG_SINDHI_AFGHANISTAN
- case SUBLANG_SINDHI_AFGHANISTAN: return "sd_AF";
-+#endif
- }
- return "sd";
- case LANG_SINHALESE: return "si_LK";
-diff -ru -x '*.Po' -x '*.Plo' gettext-0.17.orig/gettext-tools/gnulib-lib/localename.c gettext-0.17/gettext-tools/gnulib-lib/localename.c
---- gettext-0.17.orig/gettext-tools/gnulib-lib/localename.c 2008-12-29 08:17:45 +0100
-+++ gettext-0.17/gettext-tools/gnulib-lib/localename.c 2008-12-29 09:31:23 +0100
-@@ -1387,7 +1387,9 @@
- switch (sub)
- {
- case SUBLANG_SINDHI_PAKISTAN: return "sd_PK";
-+#if SUBLANG_SINDHI_PAKISTAN != SUBLANG_SINDHI_AFGHANISTAN
- case SUBLANG_SINDHI_AFGHANISTAN: return "sd_AF";
-+#endif
- }
- return "sd";
- case LANG_SINHALESE: return "si_LK";
diff --git a/sys-devel/gettext/files/gettext-0.17-winnt.patch b/sys-devel/gettext/files/gettext-0.17-winnt.patch
deleted file mode 100644
index ed8e509041..0000000000
--- a/sys-devel/gettext/files/gettext-0.17-winnt.patch
+++ /dev/null
@@ -1,1264 +0,0 @@
-diff -ru -x '*.Po' -x '*.Plo' gettext-0.17.orig/gettext-runtime/gnulib-m4/include_next.m4 gettext-0.17/gettext-runtime/gnulib-m4/include_next.m4
---- gettext-0.17.orig/gettext-runtime/gnulib-m4/include_next.m4 2008-11-27 10:59:25 +0100
-+++ gettext-0.17/gettext-runtime/gnulib-m4/include_next.m4 2008-11-27 10:04:35 +0100
-@@ -89,8 +89,8 @@
- dnl so use subshell.
- AS_VAR_SET([gl_next_header],
- ['"'`(eval "$ac_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD |
-- sed -n '\#/]m4_quote(m4_defn([gl_HEADER_NAME]))[#{
-- s#.*"\(.*/]m4_quote(m4_defn([gl_HEADER_NAME]))[\)".*#\1#
-+ sed -n '\#[\\/]]m4_quote(m4_defn([gl_HEADER_NAME]))[#{
-+ s#.*"\(.*[\\/]]m4_quote(m4_defn([gl_HEADER_NAME]))[\)".*#\1#
- s#^/[^/]#//&#
- p
- q
-diff -ru -x '*.Po' -x '*.Plo' gettext-0.17.orig/gettext-runtime/intl/printf-parse.c gettext-0.17/gettext-runtime/intl/printf-parse.c
---- gettext-0.17.orig/gettext-runtime/intl/printf-parse.c 2008-11-27 10:59:25 +0100
-+++ gettext-0.17/gettext-runtime/intl/printf-parse.c 2008-11-27 10:04:35 +0100
-@@ -46,6 +46,10 @@
- # define DIRECTIVES char_directives
- #endif
-
-+#if defined(__PARITY__)
-+# define intmax_t long long int
-+#endif
-+
- /* Get size_t, NULL. */
- #include <stddef.h>
-
-diff -ru -x '*.Po' -x '*.Plo' gettext-0.17.orig/gettext-runtime/intl/relocatable.h gettext-0.17/gettext-runtime/intl/relocatable.h
---- gettext-0.17.orig/gettext-runtime/intl/relocatable.h 2008-11-27 10:59:25 +0100
-+++ gettext-0.17/gettext-runtime/intl/relocatable.h 2008-11-27 10:04:35 +0100
-@@ -33,7 +33,7 @@
- in any case. */
- #if HAVE_VISIBILITY && BUILDING_DLL
- # define RELOCATABLE_DLL_EXPORTED __attribute__((__visibility__("default")))
--#elif defined _MSC_VER && BUILDING_DLL
-+#elif defined _MSC_VER && BUILDING_DLL && !defined(__PARITY__)
- # define RELOCATABLE_DLL_EXPORTED __declspec(dllexport)
- #else
- # define RELOCATABLE_DLL_EXPORTED
-diff -ru -x '*.Po' -x '*.Plo' gettext-0.17.orig/gettext-runtime/libasprintf/configure.ac gettext-0.17/gettext-runtime/libasprintf/configure.ac
---- gettext-0.17.orig/gettext-runtime/libasprintf/configure.ac 2008-11-27 10:59:25 +0100
-+++ gettext-0.17/gettext-runtime/libasprintf/configure.ac 2008-11-27 10:04:35 +0100
-@@ -54,7 +54,6 @@
- dnl Checks for typedefs, structures, and compiler characteristics.
- AC_C_INLINE
- AC_TYPE_SIZE_T
--gl_AC_TYPE_LONG_LONG
- gt_TYPE_LONGDOUBLE
- gt_TYPE_WCHAR_T
- gt_TYPE_WINT_T
-diff -ru -x '*.Po' -x '*.Plo' gettext-0.17.orig/gettext-runtime/libasprintf/printf-parse.c gettext-0.17/gettext-runtime/libasprintf/printf-parse.c
---- gettext-0.17.orig/gettext-runtime/libasprintf/printf-parse.c 2008-11-27 10:59:25 +0100
-+++ gettext-0.17/gettext-runtime/libasprintf/printf-parse.c 2008-11-27 10:04:35 +0100
-@@ -46,6 +46,10 @@
- # define DIRECTIVES char_directives
- #endif
-
-+#if defined(__PARITY__)
-+# define intmax_t long long int
-+#endif
-+
- /* Get size_t, NULL. */
- #include <stddef.h>
-
-diff -ru -x '*.Po' -x '*.Plo' gettext-0.17.orig/gettext-tools/gnulib-lib/html-styled-ostream.c gettext-0.17/gettext-tools/gnulib-lib/html-styled-ostream.c
---- gettext-0.17.orig/gettext-tools/gnulib-lib/html-styled-ostream.c 2008-11-27 10:59:25 +0100
-+++ gettext-0.17/gettext-tools/gnulib-lib/html-styled-ostream.c 2008-11-27 10:04:35 +0100
-@@ -51,9 +51,6 @@
-
- const typeinfo_t html_styled_ostream_typeinfo = { "html_styled_ostream" };
-
--static const typeinfo_t * const html_styled_ostream_superclasses[] =
-- { html_styled_ostream_SUPERCLASSES };
--
- #define super styled_ostream_vtable
-
- #line 51 "html-styled-ostream.oo.c"
-@@ -105,6 +102,21 @@
- html_styled_ostream_t stream =
- XMALLOC (struct html_styled_ostream_representation);
-
-+ const typeinfo_t * const html_styled_ostream_superclasses[] =
-+ { html_styled_ostream_SUPERCLASSES };
-+
-+ const struct html_styled_ostream_implementation html_styled_ostream_vtable =
-+ {
-+ html_styled_ostream_superclasses,
-+ sizeof (html_styled_ostream_superclasses) / sizeof (html_styled_ostream_superclasses[0]),
-+ sizeof (struct html_styled_ostream_representation),
-+ html_styled_ostream__write_mem,
-+ html_styled_ostream__flush,
-+ html_styled_ostream__free,
-+ html_styled_ostream__begin_use_class,
-+ html_styled_ostream__end_use_class,
-+ };
-+
- stream->base.base.vtable = &html_styled_ostream_vtable;
- stream->destination = destination;
- stream->html_destination = html_ostream_create (destination);
-@@ -168,18 +180,6 @@
-
- #line 170 "html-styled-ostream.c"
-
--const struct html_styled_ostream_implementation html_styled_ostream_vtable =
--{
-- html_styled_ostream_superclasses,
-- sizeof (html_styled_ostream_superclasses) / sizeof (html_styled_ostream_superclasses[0]),
-- sizeof (struct html_styled_ostream_representation),
-- html_styled_ostream__write_mem,
-- html_styled_ostream__flush,
-- html_styled_ostream__free,
-- html_styled_ostream__begin_use_class,
-- html_styled_ostream__end_use_class,
--};
--
- #if !HAVE_INLINE
-
- /* Define the functions that invoke the methods. */
-diff -ru -x '*.Po' -x '*.Plo' gettext-0.17.orig/gettext-tools/gnulib-lib/libxml/xmlIO.c gettext-0.17/gettext-tools/gnulib-lib/libxml/xmlIO.c
---- gettext-0.17.orig/gettext-tools/gnulib-lib/libxml/xmlIO.c 2008-11-27 10:59:25 +0100
-+++ gettext-0.17/gettext-tools/gnulib-lib/libxml/xmlIO.c 2008-11-27 10:04:35 +0100
-@@ -36,7 +36,7 @@
- #include <zlib.h>
- #endif
-
--#ifdef WIN32
-+#if defined(WIN32) || defined(_WIN32)
- #include <windows.h>
- #endif
-
-diff -ru -x '*.Po' -x '*.Plo' gettext-0.17.orig/gettext-tools/gnulib-lib/memset.c gettext-0.17/gettext-tools/gnulib-lib/memset.c
---- gettext-0.17.orig/gettext-tools/gnulib-lib/memset.c 2008-11-27 10:59:25 +0100
-+++ gettext-0.17/gettext-tools/gnulib-lib/memset.c 2008-11-27 10:04:35 +0100
-@@ -17,6 +17,8 @@
-
- #include <stddef.h>
-
-+#ifndef __PARITY__
-+
- void *
- memset (void *str, int c, size_t len)
- {
-@@ -26,3 +28,6 @@
- *st++ = c;
- return str;
- }
-+
-+#endif
-+
-diff -ru -x '*.Po' -x '*.Plo' gettext-0.17.orig/gettext-tools/gnulib-lib/sys_stat.in.h gettext-0.17/gettext-tools/gnulib-lib/sys_stat.in.h
---- gettext-0.17.orig/gettext-tools/gnulib-lib/sys_stat.in.h 2008-11-27 10:59:25 +0100
-+++ gettext-0.17/gettext-tools/gnulib-lib/sys_stat.in.h 2008-11-27 10:04:35 +0100
-@@ -261,6 +261,7 @@
- # define lstat stat
- #endif
-
-+#if !defined(__PARITY__)
- /* mingw's _mkdir() function has 1 argument, but we pass 2 arguments.
- Additionally, it declares _mkdir (and depending on compile flags, an
- alias mkdir), only in the nonstandard io.h. */
-@@ -275,6 +276,7 @@
-
- # define mkdir rpl_mkdir
- #endif
-+#endif /* PARITY */
-
- #endif /* _GL_SYS_STAT_H */
- #endif /* _GL_SYS_STAT_H */
-diff -ru -x '*.Po' -x '*.Plo' gettext-0.17.orig/gettext-tools/gnulib-lib/term-styled-ostream.c gettext-0.17/gettext-tools/gnulib-lib/term-styled-ostream.c
---- gettext-0.17.orig/gettext-tools/gnulib-lib/term-styled-ostream.c 2008-11-27 10:59:25 +0100
-+++ gettext-0.17/gettext-tools/gnulib-lib/term-styled-ostream.c 2008-11-27 10:04:35 +0100
-@@ -70,9 +70,6 @@
-
- const typeinfo_t term_styled_ostream_typeinfo = { "term_styled_ostream" };
-
--static const typeinfo_t * const term_styled_ostream_superclasses[] =
-- { term_styled_ostream_SUPERCLASSES };
--
- #define super styled_ostream_vtable
-
- #line 82 "term-styled-ostream.oo.c"
-@@ -602,6 +599,21 @@
- XMALLOC (struct term_styled_ostream_representation);
- CRStyleSheet *css_file_contents;
-
-+ const typeinfo_t * const term_styled_ostream_superclasses[] =
-+ { term_styled_ostream_SUPERCLASSES };
-+
-+ const struct term_styled_ostream_implementation term_styled_ostream_vtable =
-+ {
-+ term_styled_ostream_superclasses,
-+ sizeof (term_styled_ostream_superclasses) / sizeof (term_styled_ostream_superclasses[0]),
-+ sizeof (struct term_styled_ostream_representation),
-+ term_styled_ostream__write_mem,
-+ term_styled_ostream__flush,
-+ term_styled_ostream__free,
-+ term_styled_ostream__begin_use_class,
-+ term_styled_ostream__end_use_class,
-+ };
-+
- stream->base.base.vtable = &term_styled_ostream_vtable;
- stream->destination = term_ostream_create (fd, filename);
-
-@@ -629,18 +641,6 @@
-
- #line 631 "term-styled-ostream.c"
-
--const struct term_styled_ostream_implementation term_styled_ostream_vtable =
--{
-- term_styled_ostream_superclasses,
-- sizeof (term_styled_ostream_superclasses) / sizeof (term_styled_ostream_superclasses[0]),
-- sizeof (struct term_styled_ostream_representation),
-- term_styled_ostream__write_mem,
-- term_styled_ostream__flush,
-- term_styled_ostream__free,
-- term_styled_ostream__begin_use_class,
-- term_styled_ostream__end_use_class,
--};
--
- #if !HAVE_INLINE
-
- /* Define the functions that invoke the methods. */
-diff -ru -x '*.Po' -x '*.Plo' gettext-0.17.orig/gettext-tools/gnulib-m4/include_next.m4 gettext-0.17/gettext-tools/gnulib-m4/include_next.m4
---- gettext-0.17.orig/gettext-tools/gnulib-m4/include_next.m4 2008-11-27 10:59:25 +0100
-+++ gettext-0.17/gettext-tools/gnulib-m4/include_next.m4 2008-11-27 10:04:35 +0100
-@@ -89,8 +89,8 @@
- dnl so use subshell.
- AS_VAR_SET([gl_next_header],
- ['"'`(eval "$ac_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD |
-- sed -n '\#/]m4_quote(m4_defn([gl_HEADER_NAME]))[#{
-- s#.*"\(.*/]m4_quote(m4_defn([gl_HEADER_NAME]))[\)".*#\1#
-+ sed -n '\#[\\/]]m4_quote(m4_defn([gl_HEADER_NAME]))[#{
-+ s#.*"\(.*[\\/]]m4_quote(m4_defn([gl_HEADER_NAME]))[\)".*#\1#
- s#^/[^/]#//&#
- p
- q
-diff -ru -x '*.Po' -x '*.Plo' gettext-0.17.orig/gettext-tools/libgettextpo/Makefile.am gettext-0.17/gettext-tools/libgettextpo/Makefile.am
---- gettext-0.17.orig/gettext-tools/libgettextpo/Makefile.am 2008-11-27 10:25:51 +0100
-+++ gettext-0.17/gettext-tools/libgettextpo/Makefile.am 2008-11-27 10:50:00 +0100
-@@ -145,7 +145,7 @@
- sf=`echo "$$f" | sed -e 's,\\.[^.]*$$,,'`.c; \
- test -f $$sf || sf=$(srcdir)/$$sf; \
- of=`echo "$$f" | sed -e 's,^.*/,,' -e 's,\\.[^.]*$$,,'`.$(OBJEXT); \
-- $(COMPILE) -c $$sf || { rm -f config.h; exit 1; }; \
-+ $(COMPILE) -c $$sf > /dev/null || { rm -f config.h; exit 1; }; \
- sh ./exported.sh $$of 1>&5; \
- rm -f $$of `echo "$$of" | sed -e 's,\\.$(OBJEXT)$$,.lo,'`; \
- ;; \
-diff -ru -x '*.Po' -x '*.Plo' gettext-0.17.orig/gettext-tools/libgrep/dfa.c gettext-0.17/gettext-tools/libgrep/dfa.c
---- gettext-0.17.orig/gettext-tools/libgrep/dfa.c 2008-11-27 10:25:52 +0100
-+++ gettext-0.17/gettext-tools/libgrep/dfa.c 2008-11-27 10:34:29 +0100
-@@ -30,7 +30,7 @@
- #include <string.h>
- #include <locale.h>
-
--#if defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H && defined HAVE_MBRTOWC
-+#if defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H && defined HAVE_MBRTOWC && !defined(__PARITY__)
- /* We can handle multibyte string. */
- # define MBS_SUPPORT
- #endif
-diff -ru -x '*.Po' -x '*.Plo' gettext-0.17.orig/gettext-tools/libgrep/m-common.h gettext-0.17/gettext-tools/libgrep/m-common.h
---- gettext-0.17.orig/gettext-tools/libgrep/m-common.h 2008-11-27 10:25:52 +0100
-+++ gettext-0.17/gettext-tools/libgrep/m-common.h 2008-11-27 10:35:00 +0100
-@@ -19,7 +19,7 @@
- #include <limits.h>
- #include "kwset.h"
-
--#if defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H && defined HAVE_MBRTOWC
-+#if defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H && defined HAVE_MBRTOWC && !defined(__PARITY)
- /* We can handle multibyte string. */
- # define MBS_SUPPORT
- # include <wchar.h>
-diff -ru -x '*.Po' -x '*.Plo' gettext-0.17.orig/gettext-tools/libgrep/regex.c gettext-0.17/gettext-tools/libgrep/regex.c
---- gettext-0.17.orig/gettext-tools/libgrep/regex.c 2008-11-27 10:25:52 +0100
-+++ gettext-0.17/gettext-tools/libgrep/regex.c 2008-11-27 10:36:11 +0100
-@@ -37,6 +37,11 @@
-
- # define WIDE_CHAR_SUPPORT (HAVE_WCTYPE_H && HAVE_WCHAR_H && HAVE_BTOWC)
-
-+# ifdef __PARITY__
-+# undef WIDE_CHAR_SUPPORT
-+# define WIDE_CHAR_SUPPORT 0
-+# endif
-+
- /* For platform which support the ISO C amendement 1 functionality we
- support user defined character classes. */
- # if defined _LIBC || WIDE_CHAR_SUPPORT
-diff -ru -x '*.Po' -x '*.Plo' gettext-0.17.orig/gettext-tools/src/format.c gettext-0.17/gettext-tools/src/format.c
---- gettext-0.17.orig/gettext-tools/src/format.c 2008-11-27 10:59:25 +0100
-+++ gettext-0.17/gettext-tools/src/format.c 2008-11-27 10:04:35 +0100
-@@ -31,32 +31,37 @@
-
- #define _(str) gettext (str)
-
--/* Table of all format string parsers. */
--struct formatstring_parser *formatstring_parsers[NFORMATS] =
--{
-- /* format_c */ &formatstring_c,
-- /* format_objc */ &formatstring_objc,
-- /* format_sh */ &formatstring_sh,
-- /* format_python */ &formatstring_python,
-- /* format_lisp */ &formatstring_lisp,
-- /* format_elisp */ &formatstring_elisp,
-- /* format_librep */ &formatstring_librep,
-- /* format_scheme */ &formatstring_scheme,
-- /* format_smalltalk */ &formatstring_smalltalk,
-- /* format_java */ &formatstring_java,
-- /* format_csharp */ &formatstring_csharp,
-- /* format_awk */ &formatstring_awk,
-- /* format_pascal */ &formatstring_pascal,
-- /* format_ycp */ &formatstring_ycp,
-- /* format_tcl */ &formatstring_tcl,
-- /* format_perl */ &formatstring_perl,
-- /* format_perl_brace */ &formatstring_perl_brace,
-- /* format_php */ &formatstring_php,
-- /* format_gcc_internal */ &formatstring_gcc_internal,
-- /* format_qt */ &formatstring_qt,
-- /* format_kde */ &formatstring_kde,
-- /* format_boost */ &formatstring_boost
--};
-+struct formatstring_parser ** get_formatstring_parsers() {
-+ /* Table of all format string parsers. */
-+ static struct formatstring_parser * parsers[NFORMATS] = { NULL };
-+
-+ if(!parsers[0]) {
-+ parsers[0] = /* format_c */ &formatstring_c;
-+ parsers[1] = /* format_objc */ &formatstring_objc;
-+ parsers[2] = /* format_sh */ &formatstring_sh;
-+ parsers[3] = /* format_python */ &formatstring_python;
-+ parsers[4] = /* format_lisp */ &formatstring_lisp;
-+ parsers[5] = /* format_elisp */ &formatstring_elisp;
-+ parsers[6] = /* format_librep */ &formatstring_librep;
-+ parsers[7] = /* format_scheme */ &formatstring_scheme;
-+ parsers[8] = /* format_smalltalk */ &formatstring_smalltalk;
-+ parsers[9] = /* format_java */ &formatstring_java;
-+ parsers[10] = /* format_csharp */ &formatstring_csharp;
-+ parsers[11] = /* format_awk */ &formatstring_awk;
-+ parsers[12] = /* format_pascal */ &formatstring_pascal;
-+ parsers[13] = /* format_ycp */ &formatstring_ycp;
-+ parsers[14] = /* format_tcl */ &formatstring_tcl;
-+ parsers[15] = /* format_perl */ &formatstring_perl;
-+ parsers[16] = /* format_perl_brace */ &formatstring_perl_brace;
-+ parsers[17] = /* format_php */ &formatstring_php;
-+ parsers[18] = /* format_gcc_internal */ &formatstring_gcc_internal;
-+ parsers[19] = /* format_qt */ &formatstring_qt;
-+ parsers[20] = /* format_kde */ &formatstring_kde;
-+ parsers[21] = /* format_boost */ &formatstring_boost;
-+ }
-+
-+ return parsers;
-+}
-
- /* Check whether both formats strings contain compatible format
- specifications for format type i (0 <= i < NFORMATS).
-@@ -74,7 +79,6 @@
- formatstring_error_logger_t error_logger)
- {
- int seen_errors = 0;
--
- /* At runtime, we can assume the program passes arguments that fit well for
- msgid. We must signal an error if msgstr wants more arguments that msgid
- accepts.
-@@ -86,7 +90,7 @@
- 2) it is generally wrong if a translation wants to ignore arguments that
- are used by other translations. */
-
-- struct formatstring_parser *parser = formatstring_parsers[i];
-+ struct formatstring_parser *parser = get_formatstring_parsers()[i];
- char *invalid_reason = NULL;
- void *msgid_descr =
- parser->parse (msgid_plural != NULL ? msgid_plural : msgid, false, NULL,
-diff -ru -x '*.Po' -x '*.Plo' gettext-0.17.orig/gettext-tools/src/format.h gettext-0.17/gettext-tools/src/format.h
---- gettext-0.17.orig/gettext-tools/src/format.h 2008-11-27 10:59:25 +0100
-+++ gettext-0.17/gettext-tools/src/format.h 2008-11-27 10:04:35 +0100
-@@ -117,8 +117,8 @@
- extern DLL_VARIABLE struct formatstring_parser formatstring_kde;
- extern DLL_VARIABLE struct formatstring_parser formatstring_boost;
-
--/* Table of all format string parsers. */
--extern DLL_VARIABLE struct formatstring_parser *formatstring_parsers[NFORMATS];
-+extern struct formatstring_parser** get_formatstring_parsers();
-+#define formatstring_parsers get_formatstring_parsers()
-
- /* Returns an array of the ISO C 99 <inttypes.h> format directives and other
- format flags or directives with a system dependent expansion contained in
-diff -ru -x '*.Po' -x '*.Plo' gettext-0.17.orig/gettext-tools/src/hostname.c gettext-0.17/gettext-tools/src/hostname.c
---- gettext-0.17.orig/gettext-tools/src/hostname.c 2008-11-27 10:25:55 +0100
-+++ gettext-0.17/gettext-tools/src/hostname.c 2008-11-27 10:33:12 +0100
-@@ -45,8 +45,10 @@
- # endif
- #endif
-
-+#if HAVE_SYS_PARAM_H
- /* Get MAXHOSTNAMELEN. */
--#include <sys/param.h>
-+# include <sys/param.h>
-+#endif
- #ifndef MAXHOSTNAMELEN
- # define MAXHOSTNAMELEN 64
- #endif
-diff -ru -x '*.Po' -x '*.Plo' gettext-0.17.orig/gettext-tools/src/msgattrib.c gettext-0.17/gettext-tools/src/msgattrib.c
---- gettext-0.17.orig/gettext-tools/src/msgattrib.c 2008-11-27 10:59:25 +0100
-+++ gettext-0.17/gettext-tools/src/msgattrib.c 2008-11-27 10:04:35 +0100
-@@ -74,47 +74,6 @@
- };
- static int to_change;
-
--/* Long options. */
--static const struct option long_options[] =
--{
-- { "add-location", no_argument, &line_comment, 1 },
-- { "clear-fuzzy", no_argument, NULL, CHAR_MAX + 8 },
-- { "clear-obsolete", no_argument, NULL, CHAR_MAX + 10 },
-- { "clear-previous", no_argument, NULL, CHAR_MAX + 18 },
-- { "directory", required_argument, NULL, 'D' },
-- { "escape", no_argument, NULL, 'E' },
-- { "force-po", no_argument, &force_po, 1 },
-- { "fuzzy", no_argument, NULL, CHAR_MAX + 11 },
-- { "help", no_argument, NULL, 'h' },
-- { "ignore-file", required_argument, NULL, CHAR_MAX + 15 },
-- { "indent", no_argument, NULL, 'i' },
-- { "no-escape", no_argument, NULL, 'e' },
-- { "no-fuzzy", no_argument, NULL, CHAR_MAX + 3 },
-- { "no-location", no_argument, &line_comment, 0 },
-- { "no-obsolete", no_argument, NULL, CHAR_MAX + 5 },
-- { "no-wrap", no_argument, NULL, CHAR_MAX + 13 },
-- { "obsolete", no_argument, NULL, CHAR_MAX + 12 },
-- { "only-file", required_argument, NULL, CHAR_MAX + 14 },
-- { "only-fuzzy", no_argument, NULL, CHAR_MAX + 4 },
-- { "only-obsolete", no_argument, NULL, CHAR_MAX + 6 },
-- { "output-file", required_argument, NULL, 'o' },
-- { "properties-input", no_argument, NULL, 'P' },
-- { "properties-output", no_argument, NULL, 'p' },
-- { "set-fuzzy", no_argument, NULL, CHAR_MAX + 7 },
-- { "set-obsolete", no_argument, NULL, CHAR_MAX + 9 },
-- { "sort-by-file", no_argument, NULL, 'F' },
-- { "sort-output", no_argument, NULL, 's' },
-- { "stringtable-input", no_argument, NULL, CHAR_MAX + 16 },
-- { "stringtable-output", no_argument, NULL, CHAR_MAX + 17 },
-- { "strict", no_argument, NULL, 'S' },
-- { "translated", no_argument, NULL, CHAR_MAX + 1 },
-- { "untranslated", no_argument, NULL, CHAR_MAX + 2 },
-- { "version", no_argument, NULL, 'V' },
-- { "width", required_argument, NULL, 'w', },
-- { NULL, 0, NULL, 0 }
--};
--
--
- /* Forward declaration of local functions. */
- static void usage (int status)
- #if defined __GNUC__ && ((__GNUC__ == 2 && __GNUC_MINOR__ >= 5) || __GNUC__ > 2)
-@@ -144,6 +103,46 @@
- bool sort_by_msgid = false;
- bool sort_by_filepos = false;
-
-+ /* Long options. */
-+ const struct option long_options[] =
-+ {
-+ { "add-location", no_argument, &line_comment, 1 },
-+ { "clear-fuzzy", no_argument, NULL, CHAR_MAX + 8 },
-+ { "clear-obsolete", no_argument, NULL, CHAR_MAX + 10 },
-+ { "clear-previous", no_argument, NULL, CHAR_MAX + 18 },
-+ { "directory", required_argument, NULL, 'D' },
-+ { "escape", no_argument, NULL, 'E' },
-+ { "force-po", no_argument, &force_po, 1 },
-+ { "fuzzy", no_argument, NULL, CHAR_MAX + 11 },
-+ { "help", no_argument, NULL, 'h' },
-+ { "ignore-file", required_argument, NULL, CHAR_MAX + 15 },
-+ { "indent", no_argument, NULL, 'i' },
-+ { "no-escape", no_argument, NULL, 'e' },
-+ { "no-fuzzy", no_argument, NULL, CHAR_MAX + 3 },
-+ { "no-location", no_argument, &line_comment, 0 },
-+ { "no-obsolete", no_argument, NULL, CHAR_MAX + 5 },
-+ { "no-wrap", no_argument, NULL, CHAR_MAX + 13 },
-+ { "obsolete", no_argument, NULL, CHAR_MAX + 12 },
-+ { "only-file", required_argument, NULL, CHAR_MAX + 14 },
-+ { "only-fuzzy", no_argument, NULL, CHAR_MAX + 4 },
-+ { "only-obsolete", no_argument, NULL, CHAR_MAX + 6 },
-+ { "output-file", required_argument, NULL, 'o' },
-+ { "properties-input", no_argument, NULL, 'P' },
-+ { "properties-output", no_argument, NULL, 'p' },
-+ { "set-fuzzy", no_argument, NULL, CHAR_MAX + 7 },
-+ { "set-obsolete", no_argument, NULL, CHAR_MAX + 9 },
-+ { "sort-by-file", no_argument, NULL, 'F' },
-+ { "sort-output", no_argument, NULL, 's' },
-+ { "stringtable-input", no_argument, NULL, CHAR_MAX + 16 },
-+ { "stringtable-output", no_argument, NULL, CHAR_MAX + 17 },
-+ { "strict", no_argument, NULL, 'S' },
-+ { "translated", no_argument, NULL, CHAR_MAX + 1 },
-+ { "untranslated", no_argument, NULL, CHAR_MAX + 2 },
-+ { "version", no_argument, NULL, 'V' },
-+ { "width", required_argument, NULL, 'w', },
-+ { NULL, 0, NULL, 0 }
-+ };
-+
- /* Set program name for messages. */
- set_program_name (argv[0]);
- error_print_progname = maybe_print_progname;
-diff -ru -x '*.Po' -x '*.Plo' gettext-0.17.orig/gettext-tools/src/msgcat.c gettext-0.17/gettext-tools/src/msgcat.c
---- gettext-0.17.orig/gettext-tools/src/msgcat.c 2008-11-27 10:59:25 +0100
-+++ gettext-0.17/gettext-tools/src/msgcat.c 2008-11-27 10:04:35 +0100
-@@ -58,39 +58,6 @@
- /* Target encoding. */
- static const char *to_code;
-
--/* Long options. */
--static const struct option long_options[] =
--{
-- { "add-location", no_argument, &line_comment, 1 },
-- { "color", optional_argument, NULL, CHAR_MAX + 5 },
-- { "directory", required_argument, NULL, 'D' },
-- { "escape", no_argument, NULL, 'E' },
-- { "files-from", required_argument, NULL, 'f' },
-- { "force-po", no_argument, &force_po, 1 },
-- { "help", no_argument, NULL, 'h' },
-- { "indent", no_argument, NULL, 'i' },
-- { "no-escape", no_argument, NULL, 'e' },
-- { "no-location", no_argument, &line_comment, 0 },
-- { "no-wrap", no_argument, NULL, CHAR_MAX + 2 },
-- { "output-file", required_argument, NULL, 'o' },
-- { "properties-input", no_argument, NULL, 'P' },
-- { "properties-output", no_argument, NULL, 'p' },
-- { "sort-by-file", no_argument, NULL, 'F' },
-- { "sort-output", no_argument, NULL, 's' },
-- { "strict", no_argument, NULL, 'S' },
-- { "stringtable-input", no_argument, NULL, CHAR_MAX + 3 },
-- { "stringtable-output", no_argument, NULL, CHAR_MAX + 4 },
-- { "style", required_argument, NULL, CHAR_MAX + 6 },
-- { "to-code", required_argument, NULL, 't' },
-- { "unique", no_argument, NULL, 'u' },
-- { "use-first", no_argument, NULL, CHAR_MAX + 1 },
-- { "version", no_argument, NULL, 'V' },
-- { "width", required_argument, NULL, 'w', },
-- { "more-than", required_argument, NULL, '>', },
-- { "less-than", required_argument, NULL, '<', },
-- { NULL, 0, NULL, 0 }
--};
--
-
- /* Forward declaration of local functions. */
- static void usage (int status)
-@@ -116,6 +83,39 @@
- bool sort_by_msgid = false;
- bool sort_by_filepos = false;
-
-+ /* Long options. */
-+ const struct option long_options[] =
-+ {
-+ { "add-location", no_argument, &line_comment, 1 },
-+ { "color", optional_argument, NULL, CHAR_MAX + 5 },
-+ { "directory", required_argument, NULL, 'D' },
-+ { "escape", no_argument, NULL, 'E' },
-+ { "files-from", required_argument, NULL, 'f' },
-+ { "force-po", no_argument, &force_po, 1 },
-+ { "help", no_argument, NULL, 'h' },
-+ { "indent", no_argument, NULL, 'i' },
-+ { "no-escape", no_argument, NULL, 'e' },
-+ { "no-location", no_argument, &line_comment, 0 },
-+ { "no-wrap", no_argument, NULL, CHAR_MAX + 2 },
-+ { "output-file", required_argument, NULL, 'o' },
-+ { "properties-input", no_argument, NULL, 'P' },
-+ { "properties-output", no_argument, NULL, 'p' },
-+ { "sort-by-file", no_argument, NULL, 'F' },
-+ { "sort-output", no_argument, NULL, 's' },
-+ { "strict", no_argument, NULL, 'S' },
-+ { "stringtable-input", no_argument, NULL, CHAR_MAX + 3 },
-+ { "stringtable-output", no_argument, NULL, CHAR_MAX + 4 },
-+ { "style", required_argument, NULL, CHAR_MAX + 6 },
-+ { "to-code", required_argument, NULL, 't' },
-+ { "unique", no_argument, NULL, 'u' },
-+ { "use-first", no_argument, NULL, CHAR_MAX + 1 },
-+ { "version", no_argument, NULL, 'V' },
-+ { "width", required_argument, NULL, 'w', },
-+ { "more-than", required_argument, NULL, '>', },
-+ { "less-than", required_argument, NULL, '<', },
-+ { NULL, 0, NULL, 0 }
-+ };
-+
- /* Set program name for messages. */
- set_program_name (argv[0]);
- error_print_progname = maybe_print_progname;
-diff -ru -x '*.Po' -x '*.Plo' gettext-0.17.orig/gettext-tools/src/msgcomm.c gettext-0.17/gettext-tools/src/msgcomm.c
---- gettext-0.17.orig/gettext-tools/src/msgcomm.c 2008-11-27 10:59:25 +0100
-+++ gettext-0.17/gettext-tools/src/msgcomm.c 2008-11-27 10:04:35 +0100
-@@ -59,8 +59,34 @@
- /* Target encoding. */
- static const char *to_code;
-
-+
-+
-+/* Forward declaration of local functions. */
-+static void usage (int status)
-+#if defined __GNUC__ && ((__GNUC__ == 2 && __GNUC_MINOR__ > 4) || __GNUC__ > 2)
-+ __attribute__ ((noreturn))
-+#endif
-+;
-+
-+
-+int
-+main (int argc, char *argv[])
-+{
-+ int cnt;
-+ int optchar;
-+ bool do_help = false;
-+ bool do_version = false;
-+ msgdomain_list_ty *result;
-+ catalog_input_format_ty input_syntax = &input_format_po;
-+ catalog_output_format_ty output_syntax = &output_format_po;
-+ bool sort_by_msgid = false;
-+ bool sort_by_filepos = false;
-+ const char *files_from = NULL;
-+ string_list_ty *file_list;
-+ char *output_file = NULL;
-+
- /* Long options. */
--static const struct option long_options[] =
-+const struct option long_options[] =
- {
- { "add-location", no_argument, &line_comment, 1 },
- { "directory", required_argument, NULL, 'D' },
-@@ -91,31 +117,6 @@
- { NULL, 0, NULL, 0 }
- };
-
--
--/* Forward declaration of local functions. */
--static void usage (int status)
--#if defined __GNUC__ && ((__GNUC__ == 2 && __GNUC_MINOR__ > 4) || __GNUC__ > 2)
-- __attribute__ ((noreturn))
--#endif
--;
--
--
--int
--main (int argc, char *argv[])
--{
-- int cnt;
-- int optchar;
-- bool do_help = false;
-- bool do_version = false;
-- msgdomain_list_ty *result;
-- catalog_input_format_ty input_syntax = &input_format_po;
-- catalog_output_format_ty output_syntax = &output_format_po;
-- bool sort_by_msgid = false;
-- bool sort_by_filepos = false;
-- const char *files_from = NULL;
-- string_list_ty *file_list;
-- char *output_file = NULL;
--
- /* Set program name for messages. */
- set_program_name (argv[0]);
- error_print_progname = maybe_print_progname;
-diff -ru -x '*.Po' -x '*.Plo' gettext-0.17.orig/gettext-tools/src/msgconv.c gettext-0.17/gettext-tools/src/msgconv.c
---- gettext-0.17.orig/gettext-tools/src/msgconv.c 2008-11-27 10:59:25 +0100
-+++ gettext-0.17/gettext-tools/src/msgconv.c 2008-11-27 10:04:35 +0100
-@@ -56,8 +56,32 @@
- /* Target encoding. */
- static const char *to_code;
-
-+
-+
-+/* Forward declaration of local functions. */
-+static void usage (int status)
-+#if defined __GNUC__ && ((__GNUC__ == 2 && __GNUC_MINOR__ >= 5) || __GNUC__ > 2)
-+ __attribute__ ((noreturn))
-+#endif
-+;
-+
-+
-+int
-+main (int argc, char **argv)
-+{
-+ int opt;
-+ bool do_help;
-+ bool do_version;
-+ char *output_file;
-+ const char *input_file;
-+ msgdomain_list_ty *result;
-+ catalog_input_format_ty input_syntax = &input_format_po;
-+ catalog_output_format_ty output_syntax = &output_format_po;
-+ bool sort_by_filepos = false;
-+ bool sort_by_msgid = false;
-+
- /* Long options. */
--static const struct option long_options[] =
-+const struct option long_options[] =
- {
- { "add-location", no_argument, &line_comment, 1 },
- { "directory", required_argument, NULL, 'D' },
-@@ -82,29 +106,6 @@
- { NULL, 0, NULL, 0 }
- };
-
--
--/* Forward declaration of local functions. */
--static void usage (int status)
--#if defined __GNUC__ && ((__GNUC__ == 2 && __GNUC_MINOR__ >= 5) || __GNUC__ > 2)
-- __attribute__ ((noreturn))
--#endif
--;
--
--
--int
--main (int argc, char **argv)
--{
-- int opt;
-- bool do_help;
-- bool do_version;
-- char *output_file;
-- const char *input_file;
-- msgdomain_list_ty *result;
-- catalog_input_format_ty input_syntax = &input_format_po;
-- catalog_output_format_ty output_syntax = &output_format_po;
-- bool sort_by_filepos = false;
-- bool sort_by_msgid = false;
--
- /* Set program name for messages. */
- set_program_name (argv[0]);
- error_print_progname = maybe_print_progname;
-diff -ru -x '*.Po' -x '*.Plo' gettext-0.17.orig/gettext-tools/src/msgen.c gettext-0.17/gettext-tools/src/msgen.c
---- gettext-0.17.orig/gettext-tools/src/msgen.c 2008-11-27 10:59:25 +0100
-+++ gettext-0.17/gettext-tools/src/msgen.c 2008-11-27 10:04:35 +0100
-@@ -52,8 +52,31 @@
- /* Force output of PO file even if empty. */
- static int force_po;
-
-+
-+
-+/* Forward declaration of local functions. */
-+static void usage (int status)
-+#if defined __GNUC__ && ((__GNUC__ == 2 && __GNUC_MINOR__ >= 5) || __GNUC__ > 2)
-+ __attribute__ ((noreturn))
-+#endif
-+;
-+
-+
-+int
-+main (int argc, char **argv)
-+{
-+ int opt;
-+ bool do_help;
-+ bool do_version;
-+ char *output_file;
-+ msgdomain_list_ty *result;
-+ catalog_input_format_ty input_syntax = &input_format_po;
-+ catalog_output_format_ty output_syntax = &output_format_po;
-+ bool sort_by_filepos = false;
-+ bool sort_by_msgid = false;
-+
- /* Long options. */
--static const struct option long_options[] =
-+const struct option long_options[] =
- {
- { "add-location", no_argument, &line_comment, 1 },
- { "directory", required_argument, NULL, 'D' },
-@@ -77,28 +100,6 @@
- { NULL, 0, NULL, 0 }
- };
-
--
--/* Forward declaration of local functions. */
--static void usage (int status)
--#if defined __GNUC__ && ((__GNUC__ == 2 && __GNUC_MINOR__ >= 5) || __GNUC__ > 2)
-- __attribute__ ((noreturn))
--#endif
--;
--
--
--int
--main (int argc, char **argv)
--{
-- int opt;
-- bool do_help;
-- bool do_version;
-- char *output_file;
-- msgdomain_list_ty *result;
-- catalog_input_format_ty input_syntax = &input_format_po;
-- catalog_output_format_ty output_syntax = &output_format_po;
-- bool sort_by_filepos = false;
-- bool sort_by_msgid = false;
--
- /* Set program name for messages. */
- set_program_name (argv[0]);
- error_print_progname = maybe_print_progname;
-diff -ru -x '*.Po' -x '*.Plo' gettext-0.17.orig/gettext-tools/src/msgfilter.c gettext-0.17/gettext-tools/src/msgfilter.c
---- gettext-0.17.orig/gettext-tools/src/msgfilter.c 2008-11-27 10:59:25 +0100
-+++ gettext-0.17/gettext-tools/src/msgfilter.c 2008-11-27 10:04:35 +0100
-@@ -102,8 +102,34 @@
- /* Filter function. */
- static void (*filter) (const char *str, size_t len, char **resultp, size_t *lengthp);
-
-+
-+/* Forward declaration of local functions. */
-+static void usage (int status)
-+#if defined __GNUC__ && ((__GNUC__ == 2 && __GNUC_MINOR__ >= 5) || __GNUC__ > 2)
-+ __attribute__ ((noreturn))
-+#endif
-+;
-+static void generic_filter (const char *str, size_t len, char **resultp, size_t *lengthp);
-+static msgdomain_list_ty *process_msgdomain_list (msgdomain_list_ty *mdlp);
-+
-+
-+int
-+main (int argc, char **argv)
-+{
-+ int opt;
-+ bool do_help;
-+ bool do_version;
-+ char *output_file;
-+ const char *input_file;
-+ msgdomain_list_ty *result;
-+ catalog_input_format_ty input_syntax = &input_format_po;
-+ catalog_output_format_ty output_syntax = &output_format_po;
-+ bool sort_by_filepos = false;
-+ bool sort_by_msgid = false;
-+ int i;
-+
- /* Long options. */
--static const struct option long_options[] =
-+const struct option long_options[] =
- {
- { "add-location", no_argument, &line_comment, 1 },
- { "directory", required_argument, NULL, 'D' },
-@@ -130,31 +156,6 @@
- };
-
-
--/* Forward declaration of local functions. */
--static void usage (int status)
--#if defined __GNUC__ && ((__GNUC__ == 2 && __GNUC_MINOR__ >= 5) || __GNUC__ > 2)
-- __attribute__ ((noreturn))
--#endif
--;
--static void generic_filter (const char *str, size_t len, char **resultp, size_t *lengthp);
--static msgdomain_list_ty *process_msgdomain_list (msgdomain_list_ty *mdlp);
--
--
--int
--main (int argc, char **argv)
--{
-- int opt;
-- bool do_help;
-- bool do_version;
-- char *output_file;
-- const char *input_file;
-- msgdomain_list_ty *result;
-- catalog_input_format_ty input_syntax = &input_format_po;
-- catalog_output_format_ty output_syntax = &output_format_po;
-- bool sort_by_filepos = false;
-- bool sort_by_msgid = false;
-- int i;
--
- /* Set program name for messages. */
- set_program_name (argv[0]);
- error_print_progname = maybe_print_progname;
-diff -ru -x '*.Po' -x '*.Plo' gettext-0.17.orig/gettext-tools/src/msggrep.c gettext-0.17/gettext-tools/src/msggrep.c
---- gettext-0.17.orig/gettext-tools/src/msggrep.c 2008-11-27 10:59:25 +0100
-+++ gettext-0.17/gettext-tools/src/msggrep.c 2008-11-27 10:04:35 +0100
-@@ -87,8 +87,39 @@
- };
- static struct grep_task grep_task[5];
-
-+
-+/* Forward declaration of local functions. */
-+static void no_pass (int opt)
-+#if defined __GNUC__ && ((__GNUC__ == 2 && __GNUC_MINOR__ >= 5) || __GNUC__ > 2)
-+ __attribute__ ((noreturn))
-+#endif
-+;
-+static void usage (int status)
-+#if defined __GNUC__ && ((__GNUC__ == 2 && __GNUC_MINOR__ >= 5) || __GNUC__ > 2)
-+ __attribute__ ((noreturn))
-+#endif
-+;
-+static msgdomain_list_ty *process_msgdomain_list (msgdomain_list_ty *mdlp);
-+
-+
-+int
-+main (int argc, char **argv)
-+{
-+ int opt;
-+ bool do_help;
-+ bool do_version;
-+ char *output_file;
-+ const char *input_file;
-+ int grep_pass;
-+ msgdomain_list_ty *result;
-+ catalog_input_format_ty input_syntax = &input_format_po;
-+ catalog_output_format_ty output_syntax = &output_format_po;
-+ bool sort_by_filepos = false;
-+ bool sort_by_msgid = false;
-+ size_t i;
-+
- /* Long options. */
--static const struct option long_options[] =
-+const struct option long_options[] =
- {
- { "add-location", no_argument, &line_comment, 1 },
- { "comment", no_argument, NULL, 'C' },
-@@ -126,36 +157,6 @@
- };
-
-
--/* Forward declaration of local functions. */
--static void no_pass (int opt)
--#if defined __GNUC__ && ((__GNUC__ == 2 && __GNUC_MINOR__ >= 5) || __GNUC__ > 2)
-- __attribute__ ((noreturn))
--#endif
--;
--static void usage (int status)
--#if defined __GNUC__ && ((__GNUC__ == 2 && __GNUC_MINOR__ >= 5) || __GNUC__ > 2)
-- __attribute__ ((noreturn))
--#endif
--;
--static msgdomain_list_ty *process_msgdomain_list (msgdomain_list_ty *mdlp);
--
--
--int
--main (int argc, char **argv)
--{
-- int opt;
-- bool do_help;
-- bool do_version;
-- char *output_file;
-- const char *input_file;
-- int grep_pass;
-- msgdomain_list_ty *result;
-- catalog_input_format_ty input_syntax = &input_format_po;
-- catalog_output_format_ty output_syntax = &output_format_po;
-- bool sort_by_filepos = false;
-- bool sort_by_msgid = false;
-- size_t i;
--
- /* Set program name for messages. */
- set_program_name (argv[0]);
- error_print_progname = maybe_print_progname;
-diff -ru -x '*.Po' -x '*.Plo' gettext-0.17.orig/gettext-tools/src/msgmerge.c gettext-0.17/gettext-tools/src/msgmerge.c
---- gettext-0.17.orig/gettext-tools/src/msgmerge.c 2008-11-27 10:59:25 +0100
-+++ gettext-0.17/gettext-tools/src/msgmerge.c 2008-11-27 10:04:35 +0100
-@@ -99,42 +99,6 @@
- static const char *version_control_string;
- static const char *backup_suffix_string;
-
--/* Long options. */
--static const struct option long_options[] =
--{
-- { "add-location", no_argument, &line_comment, 1 },
-- { "backup", required_argument, NULL, CHAR_MAX + 1 },
-- { "compendium", required_argument, NULL, 'C', },
-- { "directory", required_argument, NULL, 'D' },
-- { "escape", no_argument, NULL, 'E' },
-- { "force-po", no_argument, &force_po, 1 },
-- { "help", no_argument, NULL, 'h' },
-- { "indent", no_argument, NULL, 'i' },
-- { "multi-domain", no_argument, NULL, 'm' },
-- { "no-escape", no_argument, NULL, 'e' },
-- { "no-fuzzy-matching", no_argument, NULL, 'N' },
-- { "no-location", no_argument, &line_comment, 0 },
-- { "no-wrap", no_argument, NULL, CHAR_MAX + 4 },
-- { "output-file", required_argument, NULL, 'o' },
-- { "previous", no_argument, NULL, CHAR_MAX + 7 },
-- { "properties-input", no_argument, NULL, 'P' },
-- { "properties-output", no_argument, NULL, 'p' },
-- { "quiet", no_argument, NULL, 'q' },
-- { "sort-by-file", no_argument, NULL, 'F' },
-- { "sort-output", no_argument, NULL, 's' },
-- { "silent", no_argument, NULL, 'q' },
-- { "strict", no_argument, NULL, CHAR_MAX + 2 },
-- { "stringtable-input", no_argument, NULL, CHAR_MAX + 5 },
-- { "stringtable-output", no_argument, NULL, CHAR_MAX + 6 },
-- { "suffix", required_argument, NULL, CHAR_MAX + 3 },
-- { "update", no_argument, NULL, 'U' },
-- { "verbose", no_argument, NULL, 'v' },
-- { "version", no_argument, NULL, 'V' },
-- { "width", required_argument, NULL, 'w', },
-- { NULL, 0, NULL, 0 }
--};
--
--
- struct statistics
- {
- size_t merged;
-@@ -170,6 +134,41 @@
- bool sort_by_filepos = false;
- bool sort_by_msgid = false;
-
-+ /* Long options. */
-+ const struct option long_options[] =
-+ {
-+ { "add-location", no_argument, &line_comment, 1 },
-+ { "backup", required_argument, NULL, CHAR_MAX + 1 },
-+ { "compendium", required_argument, NULL, 'C', },
-+ { "directory", required_argument, NULL, 'D' },
-+ { "escape", no_argument, NULL, 'E' },
-+ { "force-po", no_argument, &force_po, 1 },
-+ { "help", no_argument, NULL, 'h' },
-+ { "indent", no_argument, NULL, 'i' },
-+ { "multi-domain", no_argument, NULL, 'm' },
-+ { "no-escape", no_argument, NULL, 'e' },
-+ { "no-fuzzy-matching", no_argument, NULL, 'N' },
-+ { "no-location", no_argument, &line_comment, 0 },
-+ { "no-wrap", no_argument, NULL, CHAR_MAX + 4 },
-+ { "output-file", required_argument, NULL, 'o' },
-+ { "previous", no_argument, NULL, CHAR_MAX + 7 },
-+ { "properties-input", no_argument, NULL, 'P' },
-+ { "properties-output", no_argument, NULL, 'p' },
-+ { "quiet", no_argument, NULL, 'q' },
-+ { "sort-by-file", no_argument, NULL, 'F' },
-+ { "sort-output", no_argument, NULL, 's' },
-+ { "silent", no_argument, NULL, 'q' },
-+ { "strict", no_argument, NULL, CHAR_MAX + 2 },
-+ { "stringtable-input", no_argument, NULL, CHAR_MAX + 5 },
-+ { "stringtable-output", no_argument, NULL, CHAR_MAX + 6 },
-+ { "suffix", required_argument, NULL, CHAR_MAX + 3 },
-+ { "update", no_argument, NULL, 'U' },
-+ { "verbose", no_argument, NULL, 'v' },
-+ { "version", no_argument, NULL, 'V' },
-+ { "width", required_argument, NULL, 'w', },
-+ { NULL, 0, NULL, 0 }
-+ };
-+
- /* Set program name for messages. */
- set_program_name (argv[0]);
- error_print_progname = maybe_print_progname;
-diff -ru -x '*.Po' -x '*.Plo' gettext-0.17.orig/gettext-tools/src/msguniq.c gettext-0.17/gettext-tools/src/msguniq.c
---- gettext-0.17.orig/gettext-tools/src/msguniq.c 2008-11-27 10:25:56 +0100
-+++ gettext-0.17/gettext-tools/src/msguniq.c 2008-11-27 10:36:47 +0100
-@@ -56,8 +56,32 @@
- /* Target encoding. */
- static const char *to_code;
-
-+
-+/* Forward declaration of local functions. */
-+static void usage (int status)
-+#if defined __GNUC__ && ((__GNUC__ == 2 && __GNUC_MINOR__ >= 5) || __GNUC__ > 2)
-+ __attribute__ ((noreturn))
-+#endif
-+;
-+
-+
-+int
-+main (int argc, char **argv)
-+{
-+ int optchar;
-+ bool do_help;
-+ bool do_version;
-+ char *output_file;
-+ const char *input_file;
-+ string_list_ty *file_list;
-+ msgdomain_list_ty *result;
-+ catalog_input_format_ty input_syntax = &input_format_po;
-+ catalog_output_format_ty output_syntax = &output_format_po;
-+ bool sort_by_msgid = false;
-+ bool sort_by_filepos = false;
-+
- /* Long options. */
--static const struct option long_options[] =
-+const struct option long_options[] =
- {
- { "add-location", no_argument, &line_comment, 1 },
- { "directory", required_argument, NULL, 'D' },
-@@ -86,29 +110,6 @@
- };
-
-
--/* Forward declaration of local functions. */
--static void usage (int status)
--#if defined __GNUC__ && ((__GNUC__ == 2 && __GNUC_MINOR__ >= 5) || __GNUC__ > 2)
-- __attribute__ ((noreturn))
--#endif
--;
--
--
--int
--main (int argc, char **argv)
--{
-- int optchar;
-- bool do_help;
-- bool do_version;
-- char *output_file;
-- const char *input_file;
-- string_list_ty *file_list;
-- msgdomain_list_ty *result;
-- catalog_input_format_ty input_syntax = &input_format_po;
-- catalog_output_format_ty output_syntax = &output_format_po;
-- bool sort_by_msgid = false;
-- bool sort_by_filepos = false;
--
- /* Set program name for messages. */
- set_program_name (argv[0]);
- error_print_progname = maybe_print_progname;
-diff -ru -x '*.Po' -x '*.Plo' gettext-0.17.orig/gettext-tools/src/read-mo.c gettext-0.17/gettext-tools/src/read-mo.c
---- gettext-0.17.orig/gettext-tools/src/read-mo.c 2008-11-27 10:59:25 +0100
-+++ gettext-0.17/gettext-tools/src/read-mo.c 2008-11-27 10:04:35 +0100
-@@ -393,6 +393,7 @@
- that the .mo was likely produced by "msgfmt -c". */
- for (f = format_c; ; f = format_objc)
- {
-+ /* Table of all format string parsers. */
- bool valid = true;
- struct formatstring_parser *parser = formatstring_parsers[f];
- const char *str_end;
-diff -ru -x '*.Po' -x '*.Plo' gettext-0.17.orig/gettext-tools/src/xgettext.c gettext-0.17/gettext-tools/src/xgettext.c
---- gettext-0.17.orig/gettext-tools/src/xgettext.c 2008-11-27 10:59:25 +0100
-+++ gettext-0.17/gettext-tools/src/xgettext.c 2008-11-27 10:04:35 +0100
-@@ -132,8 +132,6 @@
- /* Directory in which output files are created. */
- static char *output_dir;
-
--/* The output syntax: .pot or .properties or .strings. */
--static catalog_output_format_ty output_syntax = &output_format_po;
-
- /* If nonzero omit header with information about this run. */
- int xgettext_omit_header;
-@@ -186,55 +184,6 @@
- iconv_t xgettext_current_source_iconv;
- #endif
-
--/* Long options. */
--static const struct option long_options[] =
--{
-- { "add-comments", optional_argument, NULL, 'c' },
-- { "add-location", no_argument, &line_comment, 1 },
-- { "boost", no_argument, NULL, CHAR_MAX + 11 },
-- { "c++", no_argument, NULL, 'C' },
-- { "copyright-holder", required_argument, NULL, CHAR_MAX + 1 },
-- { "debug", no_argument, &do_debug, 1 },
-- { "default-domain", required_argument, NULL, 'd' },
-- { "directory", required_argument, NULL, 'D' },
-- { "escape", no_argument, NULL, 'E' },
-- { "exclude-file", required_argument, NULL, 'x' },
-- { "extract-all", no_argument, NULL, 'a' },
-- { "files-from", required_argument, NULL, 'f' },
-- { "flag", required_argument, NULL, CHAR_MAX + 8 },
-- { "force-po", no_argument, &force_po, 1 },
-- { "foreign-user", no_argument, NULL, CHAR_MAX + 2 },
-- { "from-code", required_argument, NULL, CHAR_MAX + 3 },
-- { "help", no_argument, NULL, 'h' },
-- { "indent", no_argument, NULL, 'i' },
-- { "join-existing", no_argument, NULL, 'j' },
-- { "kde", no_argument, NULL, CHAR_MAX + 10 },
-- { "keyword", optional_argument, NULL, 'k' },
-- { "language", required_argument, NULL, 'L' },
-- { "msgid-bugs-address", required_argument, NULL, CHAR_MAX + 5 },
-- { "msgstr-prefix", optional_argument, NULL, 'm' },
-- { "msgstr-suffix", optional_argument, NULL, 'M' },
-- { "no-escape", no_argument, NULL, 'e' },
-- { "no-location", no_argument, &line_comment, 0 },
-- { "no-wrap", no_argument, NULL, CHAR_MAX + 4 },
-- { "omit-header", no_argument, &xgettext_omit_header, 1 },
-- { "output", required_argument, NULL, 'o' },
-- { "output-dir", required_argument, NULL, 'p' },
-- { "package-name", required_argument, NULL, CHAR_MAX + 12 },
-- { "package-version", required_argument, NULL, CHAR_MAX + 13 },
-- { "properties-output", no_argument, NULL, CHAR_MAX + 6 },
-- { "qt", no_argument, NULL, CHAR_MAX + 9 },
-- { "sort-by-file", no_argument, NULL, 'F' },
-- { "sort-output", no_argument, NULL, 's' },
-- { "strict", no_argument, NULL, 'S' },
-- { "string-limit", required_argument, NULL, 'l' },
-- { "stringtable-output", no_argument, NULL, CHAR_MAX + 7 },
-- { "trigraphs", no_argument, NULL, 'T' },
-- { "version", no_argument, NULL, 'V' },
-- { "width", required_argument, NULL, 'w', },
-- { NULL, 0, NULL, 0 }
--};
--
-
- /* The extractors must all be functions returning void and taking three
- arguments designating the input stream and one message domain list argument
-@@ -268,6 +217,8 @@
- static extractor_ty language_to_extractor (const char *name);
- static const char *extension_to_language (const char *extension);
-
-+/* The output syntax: .pot or .properties or .strings. */
-+static catalog_output_format_ty output_syntax;
-
- int
- main (int argc, char *argv[])
-@@ -289,6 +240,56 @@
- extractor_ty extractor = { NULL, NULL, NULL, NULL };
- int cnt;
- size_t i;
-+ /* Long options. */
-+ const struct option long_options[] =
-+ {
-+ { "add-comments", optional_argument, NULL, 'c' },
-+ { "add-location", no_argument, &line_comment, 1 },
-+ { "boost", no_argument, NULL, CHAR_MAX + 11 },
-+ { "c++", no_argument, NULL, 'C' },
-+ { "copyright-holder", required_argument, NULL, CHAR_MAX + 1 },
-+ { "debug", no_argument, &do_debug, 1 },
-+ { "default-domain", required_argument, NULL, 'd' },
-+ { "directory", required_argument, NULL, 'D' },
-+ { "escape", no_argument, NULL, 'E' },
-+ { "exclude-file", required_argument, NULL, 'x' },
-+ { "extract-all", no_argument, NULL, 'a' },
-+ { "files-from", required_argument, NULL, 'f' },
-+ { "flag", required_argument, NULL, CHAR_MAX + 8 },
-+ { "force-po", no_argument, &force_po, 1 },
-+ { "foreign-user", no_argument, NULL, CHAR_MAX + 2 },
-+ { "from-code", required_argument, NULL, CHAR_MAX + 3 },
-+ { "help", no_argument, NULL, 'h' },
-+ { "indent", no_argument, NULL, 'i' },
-+ { "join-existing", no_argument, NULL, 'j' },
-+ { "kde", no_argument, NULL, CHAR_MAX + 10 },
-+ { "keyword", optional_argument, NULL, 'k' },
-+ { "language", required_argument, NULL, 'L' },
-+ { "msgid-bugs-address", required_argument, NULL, CHAR_MAX + 5 },
-+ { "msgstr-prefix", optional_argument, NULL, 'm' },
-+ { "msgstr-suffix", optional_argument, NULL, 'M' },
-+ { "no-escape", no_argument, NULL, 'e' },
-+ { "no-location", no_argument, &line_comment, 0 },
-+ { "no-wrap", no_argument, NULL, CHAR_MAX + 4 },
-+ { "omit-header", no_argument, &xgettext_omit_header, 1 },
-+ { "output", required_argument, NULL, 'o' },
-+ { "output-dir", required_argument, NULL, 'p' },
-+ { "package-name", required_argument, NULL, CHAR_MAX + 12 },
-+ { "package-version", required_argument, NULL, CHAR_MAX + 13 },
-+ { "properties-output", no_argument, NULL, CHAR_MAX + 6 },
-+ { "qt", no_argument, NULL, CHAR_MAX + 9 },
-+ { "sort-by-file", no_argument, NULL, 'F' },
-+ { "sort-output", no_argument, NULL, 's' },
-+ { "strict", no_argument, NULL, 'S' },
-+ { "string-limit", required_argument, NULL, 'l' },
-+ { "stringtable-output", no_argument, NULL, CHAR_MAX + 7 },
-+ { "trigraphs", no_argument, NULL, 'T' },
-+ { "version", no_argument, NULL, 'V' },
-+ { "width", required_argument, NULL, 'w', },
-+ { NULL, 0, NULL, 0 }
-+ };
-+
-+ output_syntax = &output_format_po;
-
- /* Set program name for messages. */
- set_program_name (argv[0]);
-@@ -1929,7 +1930,7 @@
- lex_pos_ty *pos, const char *pretty_msgstr)
- {
- size_t i;
--
-+ /* Table of all format string parsers. */
- if (context.is_format1 != undecided || context.is_format2 != undecided)
- for (i = 0; i < NFORMATS; i++)
- {
-@@ -2970,7 +2971,7 @@
- };
- typedef struct table_ty table_ty;
-
-- static table_ty table[] =
-+ table_ty table[] =
- {
- SCANNERS_C
- SCANNERS_PO
-@@ -3051,7 +3052,7 @@
- };
- typedef struct table_ty table_ty;
-
-- static table_ty table[] =
-+ table_ty table[] =
- {
- EXTENSIONS_C
- EXTENSIONS_PO
diff --git a/sys-devel/gettext/files/gettext-0.17-x-python.patch b/sys-devel/gettext/files/gettext-0.17-x-python.patch
deleted file mode 100644
index 20d55f8a32..0000000000
--- a/sys-devel/gettext/files/gettext-0.17-x-python.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From a6fed64abcc079877b33804420c666b867b50987 Mon Sep 17 00:00:00 2001
-From: Bruno Haible <bruno@clisp.org>
-Date: Sun, 03 Aug 2008 20:00:25 +0000
-Subject: Handle lone high surrogates gracefully.
-
-2008-08-03 Bruno Haible <bruno@clisp.org>
-
- * x-python.c (mixed_string_buffer_append): Replace a lone high
- surrogate with U+FFFD.
- Reported by Yann <asterix@lagaule.org>
- via Santiago Vila <sanvila@unex.es>.
-
-diff --git a/gettext-tools/src/x-python.c b/gettext-tools/src/x-python.c
-index e6dcc31..e05aca4 100644
---- a/gettext-tools/src/x-python.c
-+++ b/gettext-tools/src/x-python.c
-@@ -930,6 +930,11 @@ mixed_string_buffer_append (struct mixed_string_buffer *bp, int c)
-
- if (c >= UNICODE (0xd800) && c < UNICODE (0xdc00))
- bp->utf16_surr = UNICODE_VALUE (c);
-+ else if (c >= UNICODE (0xdc00) && c < UNICODE (0xe000))
-+ {
-+ /* A half surrogate is invalid, therefore use U+FFFD instead. */
-+ mixed_string_buffer_append_unicode (bp, 0xfffd);
-+ }
- else
- mixed_string_buffer_append_unicode (bp, UNICODE_VALUE (c));
- }
diff --git a/sys-devel/gettext/files/gettext-0.18.1.1-no-gets.patch b/sys-devel/gettext/files/gettext-0.18.1.1-no-gets.patch
deleted file mode 100644
index 9daa48eae6..0000000000
--- a/sys-devel/gettext/files/gettext-0.18.1.1-no-gets.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-hack until gzip pulls a newer gnulib version
-
-From 66712c23388e93e5c518ebc8515140fa0c807348 Mon Sep 17 00:00:00 2001
-From: Eric Blake <eblake@redhat.com>
-Date: Thu, 29 Mar 2012 13:30:41 -0600
-Subject: [PATCH] stdio: don't assume gets any more
-
-Gnulib intentionally does not have a gets module, and now that C11
-and glibc have dropped it, we should be more proactive about warning
-any user on a platform that still has a declaration of this dangerous
-interface.
-
---- a/gettext-tools/libgettextpo/stdio.in.h
-+++ b/gettext-tools/libgettextpo/stdio.in.h
-@@ -125,7 +125,6 @@
- so any use of gets warrants an unconditional warning. Assume it is
- always declared, since it is required by C89. */
- #undef gets
--_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
---- a/gettext-tools/gnulib-lib/stdio.in.h
-+++ b/gettext-tools/gnulib-lib/stdio.in.h
-@@ -125,7 +125,6 @@
- so any use of gets warrants an unconditional warning. Assume it is
- always declared, since it is required by C89. */
- #undef gets
--_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
---- a/gettext-runtime/gnulib-lib/stdio.in.h
-+++ b/gettext-runtime/gnulib-lib/stdio.in.h
-@@ -125,7 +125,6 @@
- so any use of gets warrants an unconditional warning. Assume it is
- always declared, since it is required by C89. */
- #undef gets
--_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
diff --git a/sys-devel/gettext/files/gettext-0.18.1.1-uclibc-sched_param-def.patch b/sys-devel/gettext/files/gettext-0.18.1.1-uclibc-sched_param-def.patch
deleted file mode 100644
index 4e392780fc..0000000000
--- a/sys-devel/gettext/files/gettext-0.18.1.1-uclibc-sched_param-def.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-uclibc defines __GLIBC__ but it does not expose struct shed_param as much as glibc
-and is not needed too per standard. gnulib attempts to use it but we have to account
-for it because in this case uclibc does not behave like glibc.
-
--Khem
-
-http://bugs.gentoo.org/336484
-http://bugs.gentoo.org/323377
-
---- gettext/gettext-tools/gnulib-lib/spawn.in.h
-+++ gettext/gettext-tools/gnulib-lib/spawn.in.h
-@@ -31,7 +31,7 @@
-
- /* Get definitions of 'struct sched_param' and 'sigset_t'.
- But avoid namespace pollution on glibc systems. */
--#ifndef __GLIBC__
-+#if !defined __GLIBC__ || defined __UCLIBC__
- # include <sched.h>
- # include <signal.h>
- #endif
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
deleted file mode 100644
index aa1b5adb13..0000000000
--- a/sys-devel/gettext/files/gettext-0.19.7-disable-libintl.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-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/m4/gettext.m4
-+++ b/gettext-runtime/m4/gettext.m4
-@@ -251,8 +251,7 @@
- dnl libintl. (Cf. the install rule in intl/Makefile.in.)
- 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
- dnl Reset the values set by searching for libintl.
---- 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/files/gettext-0.19.8.1-format-security.patch b/sys-devel/gettext/files/gettext-0.19.8.1-format-security.patch
deleted file mode 100644
index 6af1604198..0000000000
--- a/sys-devel/gettext/files/gettext-0.19.8.1-format-security.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From e546de65a333789e83f5485757967cee29ee3681 Mon Sep 17 00:00:00 2001
-From: Robert Yang <liezhi.yang@windriver.com>
-Date: Sun, 19 Feb 2017 23:32:46 -0800
-Subject: [PATCH] cr-statement.c/timsort.h: fix formatting issues
-
-Fixed when compile with "-Wformat -Wformat-security -Werror=format-security":
-| gettext-tools/gnulib-lib/libcroco/cr-statement.c: In function 'cr_statement_dump_charset':
-| gettext-tools/gnulib-lib/libcroco/cr-statement.c:2661:17: error: format not a string literal and no format arguments [-Werror=format-security]
-| fprintf (a_fp, str) ;
-
-And:
-gettext-tools/gnulib-lib/libxml/timsort.h:326:80: warning: format '%lu' expects argument of type 'long unsigned int', but argument 3 has type 'unsigned int' [-Wformat=]
- fprintf(stderr, "Error allocating temporary storage for tim sort: need %lu bytes", sizeof(SORT_TYPE) * new_size);
-
-Upstream-Status: Pending
-
-Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
----
- gettext-tools/gnulib-lib/libcroco/cr-statement.c | 10 +++++-----
- gettext-tools/gnulib-lib/libxml/timsort.h | 2 +-
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/gettext-tools/gnulib-lib/libcroco/cr-statement.c b/gettext-tools/gnulib-lib/libcroco/cr-statement.c
-index 617520f..100104b 100644
---- a/gettext-tools/gnulib-lib/libcroco/cr-statement.c
-+++ b/gettext-tools/gnulib-lib/libcroco/cr-statement.c
-@@ -2607,7 +2607,7 @@ cr_statement_dump_ruleset (CRStatement * a_this, FILE * a_fp, glong a_indent)
- g_return_if_fail (a_fp && a_this);
- str = cr_statement_ruleset_to_string (a_this, a_indent);
- if (str) {
-- fprintf (a_fp, str);
-+ fprintf (a_fp, "%s", str);
- g_free (str);
- str = NULL;
- }
-@@ -2658,7 +2658,7 @@ cr_statement_dump_charset (CRStatement * a_this, FILE * a_fp, gulong a_indent)
- str = cr_statement_charset_to_string (a_this,
- a_indent) ;
- if (str) {
-- fprintf (a_fp, str) ;
-+ fprintf (a_fp, "%s", str) ;
- g_free (str) ;
- str = NULL ;
- }
-@@ -2685,7 +2685,7 @@ cr_statement_dump_page (CRStatement * a_this, FILE * a_fp, gulong a_indent)
-
- str = cr_statement_at_page_rule_to_string (a_this, a_indent) ;
- if (str) {
-- fprintf (a_fp, str);
-+ fprintf (a_fp, "%s", str);
- g_free (str) ;
- str = NULL ;
- }
-@@ -2711,7 +2711,7 @@ cr_statement_dump_media_rule (CRStatement * a_this,
-
- str = cr_statement_media_rule_to_string (a_this, a_indent) ;
- if (str) {
-- fprintf (a_fp, str) ;
-+ fprintf (a_fp, "%s", str) ;
- g_free (str) ;
- str = NULL ;
- }
-@@ -2737,7 +2737,7 @@ cr_statement_dump_import_rule (CRStatement * a_this, FILE * a_fp,
-
- str = cr_statement_import_rule_to_string (a_this, a_indent) ;
- if (str) {
-- fprintf (a_fp, str) ;
-+ fprintf (a_fp, "%s", str) ;
- g_free (str) ;
- str = NULL ;
- }
-diff --git a/gettext-tools/gnulib-lib/libxml/timsort.h b/gettext-tools/gnulib-lib/libxml/timsort.h
-index 795f272..443918a 100644
---- a/gettext-tools/gnulib-lib/libxml/timsort.h
-+++ b/gettext-tools/gnulib-lib/libxml/timsort.h
-@@ -323,7 +323,7 @@ static void TIM_SORT_RESIZE(TEMP_STORAGE_T *store, const size_t new_size)
- SORT_TYPE *tempstore = (SORT_TYPE *)realloc(store->storage, new_size * sizeof(SORT_TYPE));
- if (tempstore == NULL)
- {
-- fprintf(stderr, "Error allocating temporary storage for tim sort: need %lu bytes", sizeof(SORT_TYPE) * new_size);
-+ fprintf(stderr, "Error allocating temporary storage for tim sort: need %zu bytes", sizeof(SORT_TYPE) * new_size);
- exit(1);
- }
- store->storage = tempstore;
---
-2.10.2
-
diff --git a/sys-devel/gettext/files/gettext-0.20-parallel_install.patch b/sys-devel/gettext/files/gettext-0.20-parallel_install.patch
deleted file mode 100644
index e47beaf944..0000000000
--- a/sys-devel/gettext/files/gettext-0.20-parallel_install.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 829660df1583c6c3ee1d90291dd910f08e3b777e Mon Sep 17 00:00:00 2001
-From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
-Date: Fri, 10 May 2019 20:08:25 +0200
-Subject: [PATCH] Fix parallel install issue
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- gettext-tools/src/Makefile.am | 13 ++++++++++---
- 1 file changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am
-index 09a3c153d..1ee49cdca 100644
---- a/gettext-tools/src/Makefile.am
-+++ b/gettext-tools/src/Makefile.am
-@@ -252,9 +252,16 @@ cldr_plurals_LDADD = libgettextsrc.la $(LDADD)
-
- # How to get the include files of libtextstyle.
- textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h:
-- here=`pwd`; \
-- cd ../../libtextstyle/lib && \
-- $(MAKE) install-nobase_includeHEADERS install-nobase_nodist_includeHEADERS includedir="$$here"
-+ cd "$(abs_top_builddir)/../libtextstyle/lib" && $(MAKE) $@
-+ if test -f "$(abs_top_builddir)/../libtextstyle/lib/$@"; then \
-+ file="$(abs_top_builddir)/../libtextstyle/lib/$@"; \
-+ else \
-+ file="$(abs_top_srcdir)/../libtextstyle/lib/$@"; \
-+ fi; \
-+ target_dir="$(abs_builddir)/$@"; \
-+ target_dir="$${target_dir%/*}"; \
-+ $(MKDIR_P) "$${target_dir}"; \
-+ $(INSTALL_HEADER) "$$file" $@
- BUILT_SOURCES += textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h
- MOSTLYCLEANFILES += textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h
-
---
-2.21.0
-
diff --git a/sys-devel/gettext/files/gettext-0.21-no-setlocale.patch b/sys-devel/gettext/files/gettext-0.21-no-setlocale.patch
deleted file mode 100644
index 552bb2ecb7..0000000000
--- a/sys-devel/gettext/files/gettext-0.21-no-setlocale.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-Fixes build on Darwin.
-Undefined symbols for architecture x86_64:
- "_gl_get_setlocale_null_lock", referenced from:
- _libgettextpo_setlocale_null_r in libgnu.a(setlocale_null.o)
- _libgettextpo_setlocale_null in libgnu.a(setlocale_null.o)
-ld: symbol(s) not found for architecture x86_64
-collect2: error: ld returned 1 exit status
-----
-From 55bb1134ed4c1c3701a16dc5aeb974be341967d2 Mon Sep 17 00:00:00 2001
-From: Bruno Haible <bruno@clisp.org>
-Date: Sun, 4 Oct 2020 23:40:53 +0200
-Subject: [PATCH] build: Assume ANSI C declaration of 'setlocale'.
-
-* gettext-tools/tests/setlocale.c (setlocale): Assume SETLOCALE_CONST is
-'const'.
-* gettext-tools/tests/format-c-3-prg.c: Likewise.
-* gettext-tools/tests/format-c-4-prg.c: Likewise.
-* gettext-tools/tests/plural-1-prg.c: Likewise.
-* gettext-tools/tests/tstgettext.c: Likewise.
-* gettext-tools/tests/tstngettext.c: Likewise.
-* gettext-tools/configure.ac: Don't invoke gt_SETLOCALE.
-* gettext-tools/m4/setlocale.m4: Remove file.
-* gettext-tools/m4/Makefile.am (EXTRA_DIST): Remove it.
----
- gettext-tools/configure.ac | 1 -
- gettext-tools/m4/Makefile.am | 3 +--
- gettext-tools/m4/setlocale.m4 | 31 -------------------------------
- gettext-tools/tests/format-c-3-prg.c | 2 +-
- gettext-tools/tests/format-c-4-prg.c | 2 +-
- gettext-tools/tests/plural-1-prg.c | 2 +-
- gettext-tools/tests/setlocale.c | 4 ++--
- gettext-tools/tests/tstgettext.c | 2 +-
- gettext-tools/tests/tstngettext.c | 2 +-
- 9 files changed, 8 insertions(+), 41 deletions(-)
- delete mode 100644 gettext-tools/m4/setlocale.m4
-
-diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
-index c4c3eed..90cd608 100644
---- a/gettext-tools/configure.ac
-+++ b/gettext-tools/configure.ac
-@@ -220,7 +220,6 @@ dnl Checks for library functions.
- AC_CHECK_FUNCS([select])
- AC_FUNC_VFORK
- gt_SIGINFO
--gt_SETLOCALE
-
- AC_C_BIGENDIAN([endianness=1], [endianness=0],
- [echo "AC-C-BIGENDIAN fails to work on your system." | sed -e 's,-,_,g' 1>&2
-diff --git a/gettext-tools/m4/Makefile.am b/gettext-tools/m4/Makefile.am
-index 1eabe09..55683aa 100644
---- a/gettext-tools/m4/Makefile.am
-+++ b/gettext-tools/m4/Makefile.am
-@@ -1,5 +1,5 @@
- ## Makefile for the gettext-tools/m4 directory of GNU gettext
--## Copyright (C) 2003-2010, 2013, 2017-2019 Free Software Foundation, Inc.
-+## Copyright (C) 2003-2010, 2013, 2017-2020 Free Software Foundation, Inc.
- ##
- ## This program is free software: you can redistribute it and/or modify
- ## it under the terms of the GNU General Public License as published by
-@@ -44,5 +44,4 @@ EXTRA_DIST = README csharpexec-test.exe \
- exported.m4 \
- hostname.m4 \
- locale-de.m4 \
--setlocale.m4 \
- siginfo.m4
-diff --git a/gettext-tools/m4/setlocale.m4 b/gettext-tools/m4/setlocale.m4
-deleted file mode 100644
-index 5b8fff0..0000000
---- a/gettext-tools/m4/setlocale.m4
-+++ /dev/null
-@@ -1,31 +0,0 @@
--# setlocale.m4 serial 4 (gettext-0.18)
--dnl Copyright (C) 2001-2002, 2006, 2009 Free Software Foundation, Inc.
--dnl This file is free software; the Free Software Foundation
--dnl gives unlimited permission to copy and/or distribute it,
--dnl with or without modifications, as long as this notice is preserved.
--
--# Check for setlocale declaration.
--
--AC_DEFUN([gt_SETLOCALE],[
--AC_MSG_CHECKING([for setlocale declaration])
--AC_CACHE_VAL(gt_cv_proto_setlocale, [
--AC_TRY_COMPILE([
--#include <stdlib.h>
--#include <locale.h>
--extern
--#ifdef __cplusplus
--"C"
--#endif
--#if defined(__STDC__) || defined(__cplusplus)
--char *setlocale (int category, char *locale);
--#else
--char *setlocale();
--#endif
--], [], gt_cv_proto_setlocale_arg1="", gt_cv_proto_setlocale_arg1="const")
--gt_cv_proto_setlocale="extern char *setlocale (int category, $gt_cv_proto_setlocale_arg1 char *locale);"])
--gt_cv_proto_setlocale=`echo "[$]gt_cv_proto_setlocale" | tr -s ' ' | sed -e 's/( /(/'`
--AC_MSG_RESULT([
-- $gt_cv_proto_setlocale])
--AC_DEFINE_UNQUOTED(SETLOCALE_CONST,$gt_cv_proto_setlocale_arg1,
-- [Define as const if the declaration of setlocale() needs const.])
--])
-diff --git a/gettext-tools/tests/format-c-3-prg.c b/gettext-tools/tests/format-c-3-prg.c
-index e1ce8ef..804d468 100644
---- a/gettext-tools/tests/format-c-3-prg.c
-+++ b/gettext-tools/tests/format-c-3-prg.c
-@@ -42,7 +42,7 @@
- #undef setlocale
- #if defined _WIN32 && !defined __CYGWIN__
- # define setlocale fake_setlocale
--extern char *setlocale (int category, SETLOCALE_CONST char *locale);
-+extern char *setlocale (int category, const char *locale);
- #endif
-
- #define _(string) gettext (string)
-diff --git a/gettext-tools/tests/format-c-4-prg.c b/gettext-tools/tests/format-c-4-prg.c
-index 8f796ff..4dac6af 100644
---- a/gettext-tools/tests/format-c-4-prg.c
-+++ b/gettext-tools/tests/format-c-4-prg.c
-@@ -42,7 +42,7 @@
- #undef setlocale
- #if defined _WIN32 && !defined __CYGWIN__
- # define setlocale fake_setlocale
--extern char *setlocale (int category, SETLOCALE_CONST char *locale);
-+extern char *setlocale (int category, const char *locale);
- #endif
-
- #define _(string) gettext (string)
-diff --git a/gettext-tools/tests/plural-1-prg.c b/gettext-tools/tests/plural-1-prg.c
-index 0df74d2..982ea47 100644
---- a/gettext-tools/tests/plural-1-prg.c
-+++ b/gettext-tools/tests/plural-1-prg.c
-@@ -38,7 +38,7 @@
- #undef setlocale
- #if defined _WIN32 && !defined __CYGWIN__
- # define setlocale fake_setlocale
--extern char *setlocale (int category, SETLOCALE_CONST char *locale);
-+extern char *setlocale (int category, const char *locale);
- #endif
-
- int
-diff --git a/gettext-tools/tests/setlocale.c b/gettext-tools/tests/setlocale.c
-index e69a694..e48b38c 100644
---- a/gettext-tools/tests/setlocale.c
-+++ b/gettext-tools/tests/setlocale.c
-@@ -1,5 +1,5 @@
- /* Fake setlocale - platform independent, for testing purposes.
-- Copyright (C) 2001-2002, 2019 Free Software Foundation, Inc.
-+ Copyright (C) 2001-2002, 2019-2020 Free Software Foundation, Inc.
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
-@@ -94,7 +94,7 @@ category_to_name (int category)
- actually change the behaviour of locale dependent functions.
- Assumes setenv()/putenv() is not called. */
- char *
--setlocale (int category, SETLOCALE_CONST char *locale)
-+setlocale (int category, const char *locale)
- {
- static char C_string[] = "C";
- static char *current_locale = C_string;
-diff --git a/gettext-tools/tests/tstgettext.c b/gettext-tools/tests/tstgettext.c
-index 71651bb..a855783 100644
---- a/gettext-tools/tests/tstgettext.c
-+++ b/gettext-tools/tests/tstgettext.c
-@@ -46,7 +46,7 @@
- #if defined _WIN32 && !defined __CYGWIN__
- # undef setlocale
- # define setlocale fake_setlocale
--extern char *setlocale (int category, SETLOCALE_CONST char *locale);
-+extern char *setlocale (int category, const char *locale);
- #endif
-
- #define _(str) gettext (str)
-diff --git a/gettext-tools/tests/tstngettext.c b/gettext-tools/tests/tstngettext.c
-index 8dfeed4..e9ce5c9 100644
---- a/gettext-tools/tests/tstngettext.c
-+++ b/gettext-tools/tests/tstngettext.c
-@@ -44,7 +44,7 @@
- #if defined _WIN32 && !defined __CYGWIN__
- # undef setlocale
- # define setlocale fake_setlocale
--extern char *setlocale (int category, SETLOCALE_CONST char *locale);
-+extern char *setlocale (int category, const char *locale);
- #endif
-
- #define _(str) gettext (str)
---
-1.9.1
-
diff --git a/sys-devel/gettext/files/gettext-0.21_rc1-avoid_eautomake.patch b/sys-devel/gettext/files/gettext-0.21_rc1-avoid_eautomake.patch
deleted file mode 100644
index 8adae5d548..0000000000
--- a/sys-devel/gettext/files/gettext-0.21_rc1-avoid_eautomake.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- gettext-0.21-rc1/gettext-tools/src/Makefile.in
-+++ gettext-0.21-rc1/gettext-tools/src/Makefile.in
-@@ -4106,9 +4106,16 @@
-
- # How to get the include files of libtextstyle.
- @USE_INSTALLED_LIBTEXTSTYLE_FALSE@textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h:
--@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ here=`pwd`; \
--@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ cd ../../libtextstyle/lib && \
--@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ $(MAKE) install-nobase_includeHEADERS install-nobase_nodist_includeHEADERS includedir="$$here"
-+@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ cd "$(abs_top_builddir)/../libtextstyle/lib" && $(MAKE) $@
-+@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ if test -f "$(abs_top_builddir)/../libtextstyle/lib/$@"; then \
-+@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ file="$(abs_top_builddir)/../libtextstyle/lib/$@"; \
-+@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ else \
-+@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ file="$(abs_top_srcdir)/../libtextstyle/lib/$@"; \
-+@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ fi; \
-+@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ target_dir="$(abs_builddir)/$@"; \
-+@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ target_dir="$${target_dir%/*}"; \
-+@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ $(MKDIR_P) "$${target_dir}"; \
-+@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ $(INSTALL_HEADER) "$$file" $@
-
- # No need to install libgettextsrc.a, except on AIX.
- install-exec-hook: install-exec-clean
diff --git a/sys-devel/gettext/gettext-0.19.7.ebuild b/sys-devel/gettext/gettext-0.19.7.ebuild
deleted file mode 100644
index 58abd0117f..0000000000
--- a/sys-devel/gettext/gettext-0.19.7.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# Note: Keep version bumps in sync with dev-libs/libintl.
-
-EAPI="5"
-
-inherit eutils mono-env libtool java-pkg-opt-2 multilib-minimal
-
-DESCRIPTION="GNU locale utilities"
-HOMEPAGE="https://www.gnu.org/software/gettext/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-# Only libasprintf is under the LGPL (and libintl is in a sep package),
-# so put that license behind USE=cxx.
-LICENSE="GPL-3+ cxx? ( LGPL-2.1+ )"
-SLOT="0"
-KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs"
-
-# only runtime goes multilib
-# Note: expat lacks a subslot because it is dynamically loaded at runtime. We
-# would depend on older subslots if they were available (based on the ABIs that
-# are explicitly handled), but expat doesn't currently use subslots.
-DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
- >=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
- dev-libs/libxml2:=
- dev-libs/expat
- acl? ( virtual/acl )
- ncurses? ( sys-libs/ncurses:0= )
- java? ( >=virtual/jdk-1.4 )"
-RDEPEND="${DEPEND}
- !git? ( cvs? ( dev-vcs/cvs ) )
- git? ( dev-vcs/git )
- java? ( >=virtual/jre-1.4 )"
-PDEPEND="emacs? ( app-emacs/po-mode )"
-
-MULTILIB_WRAPPED_HEADERS=(
- # only installed for native ABI
- /usr/include/gettext-po.h
-)
-
-pkg_setup() {
- mono-env_pkg_setup
- java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- java-pkg-opt-2_src_prepare
-
- # Cygwin patches
- epatch "${FILESDIR}"/0.18.1.1-no-woe32dll.patch
- epatch "${FILESDIR}"/0.19.3-localename.patch
- epatch "${FILESDIR}"/0.19.3-tests-cygwin.patch
- epatch "${FILESDIR}"/0.19.7-gnulib-cygwin25.patch
-
- # this script uses syntax that Solaris /bin/sh doesn't grok
- sed -i -e '1c\#!/usr/bin/env sh' \
- gettext-tools/misc/convert-archive.in || die
-
- elibtoolize
-
- # Never build libintl since it's in dev-libs/libintl now.
- einfo "Deactivating included intl library ..."
- sed -i -e \
- '/gt_use_preinstalled_gnugettext=yes/s/^/:;fi;if :;then /' \
- gettext-{runtime,tools}/configure || die
- eend $?
-}
-
-multilib_src_configure() {
- local myconf=(
- # switches common to runtime and top-level
- --cache-file="${BUILD_DIR}"/config.cache
- --docdir="${EPREFIX}/usr/share/doc/${PF}"
-
- # Emacs support is now in a separate package
- --without-emacs
- --without-lispdir
- # glib depends on us so avoid circular deps
- --with-included-glib
- # libcroco depends on glib which ... ^^^
- --with-included-libcroco
- # this will _disable_ libunistring (since it is not bundled),
- # see bug #326477
- --with-included-libunistring
-
- $(use_enable acl)
- $(use_enable cxx c++)
- $(use_enable cxx libasprintf)
- $(use_with git)
- $(usex git --without-cvs $(use_with cvs))
- $(use_enable java)
- $(use_enable ncurses curses)
- $(use_enable nls)
- $(use_enable openmp)
- $(use_enable static-libs static)
- )
-
- local ECONF_SOURCE=${S}
- if ! multilib_is_native_abi ; then
- # for non-native ABIs, we build runtime only
- ECONF_SOURCE+=/gettext-runtime
- fi
-
- econf "${myconf[@]}"
-}
-
-multilib_src_install() {
- default
-
- if multilib_is_native_abi ; then
- dosym msgfmt /usr/bin/gmsgfmt #43435
- dobin gettext-tools/misc/gettextize
- fi
-}
-
-multilib_src_install_all() {
- use nls || rm -r "${ED}"/usr/share/locale
- use static-libs || prune_libtool_files --all
-
- rm -f "${ED}"/usr/share/locale/locale.alias "${ED}"/usr/lib/charset.alias
-
- if use java ; then
- java-pkg_dojar "${ED}"/usr/share/${PN}/*.jar
- rm -f "${ED}"/usr/share/${PN}/*.jar
- rm -f "${ED}"/usr/share/${PN}/*.class
- if use doc ; then
- java-pkg_dojavadoc "${ED}"/usr/share/doc/${PF}/javadoc2
- rm -rf "${ED}"/usr/share/doc/${PF}/javadoc2
- fi
- fi
-
- if use doc ; then
- dohtml "${ED}"/usr/share/doc/${PF}/*.html
- else
- rm -rf "${ED}"/usr/share/doc/${PF}/{csharpdoc,examples,javadoc2,javadoc1}
- fi
- rm -f "${ED}"/usr/share/doc/${PF}/*.html
-
- # remove libintl stuff that we can't seem to get disabled
- rm -f "${ED}"/usr/$(get_libdir)/libintl*
- rm -f "${ED}"/usr/include/libintl.h
-
- dodoc AUTHORS ChangeLog NEWS README THANKS
-}
-
-pkg_preinst() {
- java-pkg-opt-2_pkg_preinst
-}
diff --git a/sys-devel/gettext/gettext-0.19.8.1.ebuild b/sys-devel/gettext/gettext-0.19.8.1.ebuild
deleted file mode 100644
index db5d65ef60..0000000000
--- a/sys-devel/gettext/gettext-0.19.8.1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Note: Keep version bumps in sync with dev-libs/libintl.
-
-EAPI="5"
-
-inherit epatch ltprune mono-env libtool java-pkg-opt-2 multilib-minimal
-
-DESCRIPTION="GNU locale utilities"
-HOMEPAGE="https://www.gnu.org/software/gettext/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-# Only libasprintf is under the LGPL (and libintl is in a sep package),
-# so put that license behind USE=cxx.
-LICENSE="GPL-3+ cxx? ( LGPL-2.1+ )"
-SLOT="0"
-KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs"
-
-# only runtime goes multilib
-# Note: The version of libxml2 corresponds to the version bundled via gnulib.
-# If the build detects too old of a system version, it will end up falling back
-# to the bundled copy. #596918
-# Note: expat lacks a subslot because it is dynamically loaded at runtime. We
-# would depend on older subslots if they were available (based on the ABIs that
-# are explicitly handled), but expat doesn't currently use subslots.
-DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
- >=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
- >=dev-libs/libxml2-2.9.3:=
- dev-libs/expat
- acl? ( virtual/acl )
- ncurses? ( sys-libs/ncurses:0= )
- java? ( >=virtual/jdk-1.4:= )"
-RDEPEND="${DEPEND}
- !git? ( cvs? ( dev-vcs/cvs ) )
- git? ( dev-vcs/git )
- java? ( >=virtual/jre-1.4 )"
-PDEPEND="emacs? ( app-emacs/po-mode )"
-
-MULTILIB_WRAPPED_HEADERS=(
- # only installed for native ABI
- /usr/include/gettext-po.h
-)
-
-pkg_setup() {
- mono-env_pkg_setup
- java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- java-pkg-opt-2_src_prepare
-
- epatch "${FILESDIR}"/${PN}-0.19.7-disable-libintl.patch #564168
- epatch "${FILESDIR}"/${PN}-0.19.8.1-format-security.patch
-
- if use elibc_Cygwin; then
- epatch "${FILESDIR}"/0.19.8.1-no-woe32dll.patch
- epatch "${FILESDIR}"/0.19.3-localename.patch
- epatch "${FILESDIR}"/0.19.8.1-tests-cygwin.patch
- epatch "${FILESDIR}"/0.19.8.1-cygwin-ftm.patch
- fi
-
- # this script uses syntax that Solaris /bin/sh doesn't grok
- sed -i -e '1c\#!/usr/bin/env sh' \
- gettext-tools/misc/convert-archive.in || die
-
- elibtoolize
-}
-
-multilib_src_configure() {
- local myconf=(
- # switches common to runtime and top-level
- --cache-file="${BUILD_DIR}"/config.cache
- --docdir="\$(datarootdir)/doc/${PF}"
-
- # Emacs support is now in a separate package
- --without-emacs
- --without-lispdir
- # glib depends on us so avoid circular deps
- --with-included-glib
- # libcroco depends on glib which ... ^^^
- --with-included-libcroco
- # this will _disable_ libunistring (since it is not bundled),
- # see bug #326477
- --with-included-libunistring
- # Never build libintl since it's in dev-libs/libintl now.
- --without-included-gettext
- # Never build bundled copy of libxml2.
- --without-included-libxml
-
- $(use_enable acl)
- $(use_enable cxx c++)
- $(use_enable cxx libasprintf)
- $(use_with git)
- $(usex git --without-cvs $(use_with cvs))
- $(use_enable java)
- $(use_enable ncurses curses)
- $(use_enable nls)
- $(use_enable openmp)
- $(use_enable static-libs static)
- )
-
- local ECONF_SOURCE=${S}
- if ! multilib_is_native_abi ; then
- # for non-native ABIs, we build runtime only
- ECONF_SOURCE+=/gettext-runtime
- fi
-
- econf "${myconf[@]}"
-}
-
-multilib_src_install() {
- default
-
- if multilib_is_native_abi ; then
- dosym msgfmt /usr/bin/gmsgfmt #43435
- dobin gettext-tools/misc/gettextize
- fi
-}
-
-multilib_src_install_all() {
- use nls || rm -r "${ED}"/usr/share/locale
- use static-libs || prune_libtool_files --all
-
- rm -f "${ED}"/usr/share/locale/locale.alias "${ED}"/usr/lib/charset.alias
-
- if use java ; then
- java-pkg_dojar "${ED}"/usr/share/${PN}/*.jar
- rm -f "${ED}"/usr/share/${PN}/*.jar
- rm -f "${ED}"/usr/share/${PN}/*.class
- if use doc ; then
- java-pkg_dojavadoc "${ED}"/usr/share/doc/${PF}/javadoc2
- rm -rf "${ED}"/usr/share/doc/${PF}/javadoc2
- fi
- fi
-
- if use doc ; then
- dohtml "${ED}"/usr/share/doc/${PF}/*.html
- else
- rm -rf "${ED}"/usr/share/doc/${PF}/{csharpdoc,examples,javadoc2,javadoc1}
- fi
- rm -f "${ED}"/usr/share/doc/${PF}/*.html
-
- dodoc AUTHORS ChangeLog NEWS README THANKS
-}
-
-pkg_preinst() {
- java-pkg-opt-2_pkg_preinst
-}
diff --git a/sys-devel/gettext/gettext-0.21.ebuild b/sys-devel/gettext/gettext-0.21.ebuild
deleted file mode 100644
index 921871be1e..0000000000
--- a/sys-devel/gettext/gettext-0.21.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Note: Keep version bumps in sync with dev-libs/libintl.
-
-EAPI=7
-
-inherit mono-env libtool java-pkg-opt-2 multilib-minimal
-
-DESCRIPTION="GNU locale utilities"
-HOMEPAGE="https://www.gnu.org/software/gettext/"
-if [[ "${PV}" == *_rc* ]] ; then
- SRC_URI="mirror://gnu-alpha/${PN}/${P/_/-}.tar.bz2"
- S="${WORKDIR}/${P/_/-}"
-else
- SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
- KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-fi
-# Only libasprintf is under the LGPL (and libintl is in a sep package),
-# so put that license behind USE=cxx.
-LICENSE="GPL-3+ cxx? ( LGPL-2.1+ )"
-SLOT="0"
-IUSE="acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs"
-
-# only runtime goes multilib
-# Note: The version of libxml2 corresponds to the version bundled via gnulib.
-# If the build detects too old of a system version, it will end up falling back
-# to the bundled copy. #596918
-# Note: expat lacks a subslot because it is dynamically loaded at runtime. We
-# would depend on older subslots if they were available (based on the ABIs that
-# are explicitly handled), but expat doesn't currently use subslots.
-DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
- >=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
- >=dev-libs/libxml2-2.9.3:=
- dev-libs/expat
- acl? ( virtual/acl )
- ncurses? ( sys-libs/ncurses:0= )
- java? ( >=virtual/jdk-1.4:= )"
-RDEPEND="${DEPEND}
- !git? ( cvs? ( dev-vcs/cvs ) )
- git? ( dev-vcs/git )
- java? ( >=virtual/jre-1.4 )"
-BDEPEND="
- git? ( dev-vcs/git )
-"
-PDEPEND="emacs? ( app-emacs/po-mode )"
-
-MULTILIB_WRAPPED_HEADERS=(
- # only installed for native ABI
- /usr/include/gettext-po.h
-
- /usr/include/autosprintf.h
- /usr/include/textstyle.h
- /usr/include/textstyle/stdbool.h
- /usr/include/textstyle/version.h
- /usr/include/textstyle/woe32dll.h
-)
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.19.7-disable-libintl.patch #564168
- "${FILESDIR}"/${PN}-0.20-parallel_install.patch #685530
- "${FILESDIR}"/${PN}-0.21_rc1-avoid_eautomake.patch
- "${FILESDIR}"/${P}-no-setlocale.patch
-)
-
-QA_SONAME_NO_SYMLINK=".*/preloadable_libintl.so"
-
-pkg_setup() {
- mono-env_pkg_setup
- java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- java-pkg-opt-2_src_prepare
-
- if use elibc_Cygwin; then
- PATCHES+=(
- "${FILESDIR}"/0.19.8.1-no-woe32dll.patch
- "${FILESDIR}"/0.19.3-localename.patch
- "${FILESDIR}"/0.19.8.1-tests-cygwin.patch
- "${FILESDIR}"/0.19.8.1-cygwin-ftm.patch
- )
- fi
-
- default
-
- # this script uses syntax that Solaris /bin/sh doesn't grok
- sed -i -e '1c\#!/usr/bin/env sh' \
- gettext-tools/misc/convert-archive.in || die
-
- elibtoolize
-}
-
-multilib_src_configure() {
- local myconf=(
- # switches common to runtime and top-level
- --cache-file="${BUILD_DIR}"/config.cache
- #--docdir="\$(datarootdir)/doc/${PF}"
-
- # Emacs support is now in a separate package
- --without-emacs
- --without-lispdir
- # glib depends on us so avoid circular deps
- --with-included-glib
- # libcroco depends on glib which ... ^^^
- --with-included-libcroco
- # this will _disable_ libunistring (since it is not bundled),
- # see bug #326477
- --with-included-libunistring
- # Never build libintl since it's in dev-libs/libintl now.
- --without-included-gettext
- # Never build bundled copy of libxml2.
- --without-included-libxml
-
- $(use_enable acl)
- $(use_enable cxx c++)
- $(use_enable cxx libasprintf)
- $(use_with git)
- $(usex git --without-cvs $(use_with cvs))
- $(use_enable java)
- $(use_enable ncurses curses)
- $(use_enable nls)
- $(use_enable openmp)
- $(use_enable static-libs static)
- )
-
- local ECONF_SOURCE="${S}"
- if ! multilib_is_native_abi ; then
- # for non-native ABIs, we build runtime only
- ECONF_SOURCE+=/gettext-runtime
- fi
-
- econf "${myconf[@]}"
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install
-
- if multilib_is_native_abi ; then
- dosym msgfmt /usr/bin/gmsgfmt #43435
- dobin gettext-tools/misc/gettextize
- fi
-}
-
-multilib_src_install_all() {
- find "${ED}" -type f -name "*.la" -delete || die
-
- if use java ; then
- java-pkg_dojar "${ED}"/usr/share/${PN}/*.jar
- rm "${ED}"/usr/share/${PN}/*.jar || die
- rm "${ED}"/usr/share/${PN}/*.class || die
- if use doc ; then
- java-pkg_dojavadoc "${ED}"/usr/share/doc/${PF}/html/javadoc2
- fi
- fi
-
- dodoc AUTHORS ChangeLog NEWS README THANKS
-
- if use doc ; then
- docinto html
- dodoc "${ED}"/usr/share/doc/${PF}/*.html
- else
- rm -rf "${ED}"/usr/share/doc/${PF}/{csharpdoc,examples,javadoc2,javadoc1}
- fi
- rm "${ED}"/usr/share/doc/${PF}/*.html || die
-}
-
-pkg_preinst() {
- java-pkg-opt-2_pkg_preinst
-}
diff --git a/sys-devel/gettext/metadata.xml b/sys-devel/gettext/metadata.xml
deleted file mode 100644
index 7844da809a..0000000000
--- a/sys-devel/gettext/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>base-system@gentoo.org</email>
- <name>Gentoo Base System</name>
-</maintainer>
-<use>
- <flag name="cvs">
- When running `autopoint`, use cvs to store the internal development files;
- this requires cvs at runtime, but will be faster/smaller than raw archives
- </flag>
- <flag name="git">
- When running `autopoint`, use git to store the internal development files;
- this requires git at runtime, but will be faster/smaller than raw archives
- </flag>
-</use>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-12-08 7:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-08 7:26 [gentoo-commits] repo/proj/prefix:master commit in: sys-devel/gettext/files/, sys-devel/gettext/ Fabian Groffen
-- strict thread matches above, loose matches on Subject: below --
2020-11-30 3:12 Sam James
2019-02-27 12:45 Michael Haubenwallner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox