gentoo resync : 29.05.2018

7 files changed, 161 insertions, 16 deletions

diff --git a/app-i18n/uim/files/50uim-gentoo.el b/app-i18n/uim/files/50uim-gentoo.el
index 350f6216139f..101505c4bd59 100644
--- a/app-i18n/uim/files/50uim-gentoo.el
+++ b/app-i18n/uim/files/50uim-gentoo.el
@@ -1,4 +1,2 @@
-;;; app-i18n/uim site-lisp configuration
-
 (add-to-list 'load-path "@SITELISP@")
 (autoload 'uim-mode "uim" nil t)
diff --git a/app-i18n/uim/files/uim-1.6.0-gentoo.patch b/app-i18n/uim/files/uim-1.6.0-gentoo.patch
deleted file mode 100644
index 206a1cdfb1e0..000000000000
--- a/app-i18n/uim/files/uim-1.6.0-gentoo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur uim-1.6.0.orig/configure.ac uim-1.6.0/configure.ac
---- uim-1.6.0.orig/configure.ac	2010-08-02 09:30:14.000000000 +0900
-+++ uim-1.6.0/configure.ac	2010-08-14 08:30:34.000000000 +0900
-@@ -1696,6 +1696,7 @@
- 
-   QT_CONFIG_OPTS="release"
- fi
-+QT_CONFIG_OPTS="$QT_CONFIG_OPTS nostrip"
- 
- AC_ARG_ENABLE(warnings-into-error,
-     AC_HELP_STRING([--enable-warnings-into-error],
diff --git a/app-i18n/uim/files/uim-1.8.6-gentoo.patch b/app-i18n/uim/files/uim-1.8.6-gentoo.patch
new file mode 100644
index 000000000000..0feee5a70997
--- /dev/null
+++ b/app-i18n/uim/files/uim-1.8.6-gentoo.patch
@@ -0,0 +1,28 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -36,6 +36,7 @@
+ AC_PATH_PROGS(SHA1, sha1 sha1sum)
+ AC_PATH_PROGS(SED, sed gsed)
+ AX_PATH_QMAKE4
++PKG_PROG_PKG_CONFIG
+ 
+ AM_MAINTAINER_MODE
+ 
+@@ -1792,7 +1793,7 @@
+   fi
+   AX_LANG_WNOERROR  # end AC_LANG_WERROR
+ 
+-  QT_CONFIG_OPTS="debug"
++  QT_CONFIG_OPTS="debug nostrip"
+ else
+   CFLAGS="$CFLAGS -DNDEBUG"
+   CXXFLAGS="$CXXFLAGS -DNDEBUG"
+@@ -1810,7 +1811,7 @@
+   AX_CFLAGS_GCC_OPTION([-Wno-unused-variable],  [SCIM_CFLAGS])
+   AX_LANG_WNOERROR  # end AC_LANG_WERROR
+ 
+-  QT_CONFIG_OPTS="release"
++  QT_CONFIG_OPTS="release nostrip"
+ fi
+ 
+ AC_ARG_ENABLE(warnings-into-error,
diff --git a/app-i18n/uim/files/uim-1.8.6-tinfo.patch b/app-i18n/uim/files/uim-1.8.6-tinfo.patch
new file mode 100644
index 000000000000..51105c909f54
--- /dev/null
+++ b/app-i18n/uim/files/uim-1.8.6-tinfo.patch
@@ -0,0 +1,65 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1058,27 +1058,25 @@
+       ;;
+       yes|*)
+         use_uim_fep="yes"
+-	AC_CHECK_LIB(curses, setupterm, FEP_LIBADD="-lcurses $FEP_LIBADD",
+-	  [AC_CHECK_LIB(ncurses, setupterm, FEP_LIBADD="-lncurses $FEP_LIBADD",
+-	    AC_MSG_WARN([fep needs setupterm in libcurses or libncurses. disabled...]);use_uim_fep="no")])
+-	AC_CHECK_FUNCS(forkpty)
+-	if test $ac_cv_func_forkpty = no; then
+-	  AC_CHECK_LIB(util, forkpty, [AC_DEFINE(HAVE_FORKPTY) FEP_LIBADD="-lutil $FEP_LIBADD"])
+-	fi
+-	AC_SUBST(FEP_LIBADD)
+       ;;
+     esac
+   ],
+-  [ use_uim_fep="yes"
+-    AC_CHECK_LIB(curses, setupterm, FEP_LIBADD="-lcurses $FEP_LIBADD",
+-      [AC_CHECK_LIB(ncurses, setupterm, FEP_LIBADD="-lncurses $FEP_LIBADD",
+-        AC_MSG_WARN([fep needs setupterm in libcurses or libncurses. disabled...]);use_uim_fep="no")])
+-    AC_CHECK_FUNCS(forkpty)
+-    if test $ac_cv_func_forkpty = no; then
+-      AC_CHECK_LIB(util, forkpty, [AC_DEFINE(HAVE_FORKPTY) FEP_LIBADD="-lutil $FEP_LIBADD"])
+-    fi
+-    AC_SUBST(FEP_LIBADD)
+-  ])
++  [use_uim_fep="yes"])
++
++if test "x$use_uim_fep" != "xno"; then
++  PKG_CHECK_MODULES(CURSES, ncurses,
++    [FEP_LIBADD="$CURSES_LIBS $FEP_LIBADD"],
++    [
++      AC_CHECK_LIB(curses, setupterm, FEP_LIBADD="-lcurses $FEP_LIBADD",
++        [AC_CHECK_LIB(ncurses, setupterm, FEP_LIBADD="-lncurses $FEP_LIBADD",
++          AC_MSG_WARN([fep needs setupterm in libcurses or libncurses. disabled...]);use_uim_fep="no")])
++    ])
++  AC_CHECK_FUNCS(forkpty)
++  if test $ac_cv_func_forkpty = no; then
++    AC_CHECK_LIB(util, forkpty, [AC_DEFINE(HAVE_FORKPTY) FEP_LIBADD="-lutil $FEP_LIBADD"])
++  fi
++  AC_SUBST(FEP_LIBADD)
++fi
+ 
+ AC_ARG_ENABLE(emacs,
+   AC_HELP_STRING([--disable-emacs],
+@@ -1210,10 +1208,14 @@
+     saved_LDFLAGS=$LDFLAGS
+     CPPFLAGS="${CPPFLAGS} -I$libedit_path/include"
+     LDFLAGS="${LDFLAGS} -L$libedit_path/lib"
+-    AC_CHECK_LIB(curses, tgetent, LIBEDIT_LIBS="-lcurses",
+-        [AC_CHECK_LIB(ncurses, tgetent, LIBEDIT_LIBS="-lncurses",
+-            AC_MSG_WARN("libedit needs libcurses or libncurses. disabled...")
+-            use_libedit="no")])
++    PKG_CHECK_MODULES(CURSES, ncurses,
++        [LIBEDIT_LIBS="$CURSES_LIBS"],
++        [
++            AC_CHECK_LIB(curses, tgetent, LIBEDIT_LIBS="-lcurses",
++                [AC_CHECK_LIB(ncurses, tgetent, LIBEDIT_LIBS="-lncurses",
++                    AC_MSG_WARN("libedit needs libcurses or libncurses. disabled...")
++                    use_libedit="no")])
++        ])
+     if test "x$use_libedit" != "xno"; then
+         AC_CHECK_LIB(edit, el_init,
+             [LIBEDIT_LIBS="-ledit $LIBEDIT_LIBS -L$libedit_path/lib"
diff --git a/app-i18n/uim/files/uim-gentoo.patch b/app-i18n/uim/files/uim-gentoo.patch
new file mode 100644
index 000000000000..de498b754d86
--- /dev/null
+++ b/app-i18n/uim/files/uim-gentoo.patch
@@ -0,0 +1,28 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -38,6 +38,7 @@
+ AC_PATH_PROGS(SED, sed gsed)
+ AX_PATH_QMAKE4
+ AX_PATH_QMAKE5
++PKG_PROG_PKG_CONFIG
+ 
+ AM_MAINTAINER_MODE
+ 
+@@ -1618,7 +1619,7 @@
+   fi
+   AX_LANG_WNOERROR  # end AC_LANG_WERROR
+ 
+-  QT_CONFIG_OPTS="debug"
++  QT_CONFIG_OPTS="debug nostrip"
+ else
+   CFLAGS="$CFLAGS -DNDEBUG"
+   CXXFLAGS="$CXXFLAGS -DNDEBUG"
+@@ -1629,7 +1630,7 @@
+   AX_CFLAGS_GCC_OPTION([-Wno-unused-function], [UIM_SCM_CFLAGS])
+   AX_LANG_WNOERROR  # end AC_LANG_WERROR
+ 
+-  QT_CONFIG_OPTS="release"
++  QT_CONFIG_OPTS="release nostrip"
+ fi
+ 
+ AC_ARG_ENABLE(warnings-into-error,
diff --git a/app-i18n/uim/files/uim-tinfo.patch b/app-i18n/uim/files/uim-tinfo.patch
new file mode 100644
index 000000000000..e2fcfceb3158
--- /dev/null
+++ b/app-i18n/uim/files/uim-tinfo.patch
@@ -0,0 +1,38 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1180,9 +1180,13 @@
+ 
+ if test "x$enable_fep" != xno; then
+   enable_fep=yes
+-  AC_CHECK_LIB(curses, setupterm, FEP_LIBADD="-lcurses $FEP_LIBADD",
+-    [AC_CHECK_LIB(ncurses, setupterm, FEP_LIBADD="-lncurses $FEP_LIBADD",
+-      AC_MSG_WARN([fep needs setupterm in libcurses or libncurses. disabled...]);enable_fep=no)])
++  PKG_CHECK_MODULES(CURSES, ncurses,
++    [FEP_LIBADD="$CURSES_LIBS $FEP_LIBADD"],
++    [
++      AC_CHECK_LIB(curses, setupterm, FEP_LIBADD="-lcurses $FEP_LIBADD",
++        [AC_CHECK_LIB(ncurses, setupterm, FEP_LIBADD="-lncurses $FEP_LIBADD",
++          AC_MSG_WARN([fep needs setupterm in libcurses or libncurses. disabled...]);enable_fep=no)])
++    ])
+   AC_CHECK_FUNCS(forkpty)
+   if test "x$ac_cv_func_forkpty" = xno; then
+     AC_CHECK_LIB(util, forkpty,
+@@ -1319,10 +1323,14 @@
+   saved_LDFLAGS=$LDFLAGS
+   CPPFLAGS="${CPPFLAGS} -I$libedit_path/include"
+   LDFLAGS="${LDFLAGS} -L$libedit_path/lib"
+-  AC_CHECK_LIB(curses, tgetent, LIBEDIT_LIBS="-lcurses",
+-    [AC_CHECK_LIB(ncurses, tgetent, LIBEDIT_LIBS="-lncurses",
+-      AC_MSG_WARN("libedit needs libcurses or libncurses. disabled...")
+-        with_libedit=no)])
++  PKG_CHECK_MODULES(CURSES, ncurses,
++    [LIBEDIT_LIBS="$CURSES_LIBS"],
++    [
++      AC_CHECK_LIB(curses, tgetent, LIBEDIT_LIBS="-lcurses",
++        [AC_CHECK_LIB(ncurses, tgetent, LIBEDIT_LIBS="-lncurses",
++          AC_MSG_WARN("libedit needs libcurses or libncurses. disabled...")
++            with_libedit=no)])
++    ])
+ 
+   if test "x$with_libedit" != xno; then
+       AC_CHECK_LIB(edit, el_init,
diff --git a/app-i18n/uim/files/uim-1.5.4-zhTW.patch b/app-i18n/uim/files/uim-zh-TW.patch
index 3836a210caa8..f73850013178 100644
--- a/app-i18n/uim/files/uim-1.5.4-zhTW.patch
+++ b/app-i18n/uim/files/uim-zh-TW.patch
@@ -1,6 +1,5 @@
-diff -Naur uim-1.5.4.orig/xim/convdisp.cpp uim-1.5.4/xim/convdisp.cpp
---- uim-1.5.4.orig/xim/convdisp.cpp	2008-02-13 23:43:42.000000000 +0900
-+++ uim-1.5.4/xim/convdisp.cpp	2008-12-10 02:04:35.000000000 +0900
+--- a/xim/convdisp.cpp
++++ b/xim/convdisp.cpp
 @@ -69,7 +69,7 @@
  #endif