[gentoo-commits] repo/gentoo:master commit in: app-i18n/uim/files/

2023-10-24 Thread Sam James 
commit: d3c8c3c88a466243342bce3a60f2d7fdad377051
Author: Sam James  gentoo  org>
AuthorDate: Tue Oct 24 23:30:42 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Oct 25 01:31:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3c8c3c8

app-i18n/uim: link to upstream PR for Clang 16 patch

Signed-off-by: Sam James  gentoo.org>

 app-i18n/uim/files/uim-clang-16.patch | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app-i18n/uim/files/uim-clang-16.patch 
b/app-i18n/uim/files/uim-clang-16.patch
index 9a1a4726eb18..b8b32532881a 100644
--- a/app-i18n/uim/files/uim-clang-16.patch
+++ b/app-i18n/uim/files/uim-clang-16.patch
@@ -1,4 +1,6 @@
 Part of this went upstream as 
https://github.com/uim/uim/commit/99fd890fa601b81ff99e5e0f1977fe309f56b90e.
+
+The rest was done in https://github.com/uim/uim/pull/198.
 --- a/configure.ac
 +++ b/configure.ac
 @@ -601,6 +601,7 @@ if test "x$ac_cv_func_snprintf" = xyes; then

[gentoo-commits] repo/gentoo:master commit in: app-i18n/uim/files/, app-i18n/uim/

2023-10-23 Thread Akinori Hattori 
commit: 8784adb43b6709fbf881863d5377021799115399
Author: Akinori Hattori  gentoo  org>
AuthorDate: Mon Oct 23 13:24:01 2023 +
Commit: Akinori Hattori  gentoo  org>
CommitDate: Mon Oct 23 13:28:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8784adb4

app-i18n/uim: drop old

Signed-off-by: Akinori Hattori  gentoo.org>

 app-i18n/uim/Manifest|   2 -
 app-i18n/uim/files/uim-1.8.8-zh-TW.patch |  11 --
 app-i18n/uim/uim-1.8.9.ebuild| 240 --
 app-i18n/uim/uim-1.8.9_pre20210103-r1.ebuild | 249 ---
 4 files changed, 502 deletions(-)

diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index 372e31815111..19043db7b68a 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -1,3 +1 @@
-DIST sigscheme-0.9.1.tar.bz2 1140162 BLAKE2B 
a649ec1a5ff0899af14fa686ea7cf43140c226b1df68d4c9415c3b95c7f7ae32c539df820f0e9da7d7a809c88fa388e563549728c345017dfd62d418748be7e1
 SHA512 
b66b901e8a6bc6d9188112f78d3ba21a2a0776e1236aa9d2d83df27cf8111b8491f665062b493d14c2a9a1b4eb47ce2789b3ca7180225a085e94623329281e09
 DIST uim-1.8.9.tar.bz2 6233465 BLAKE2B 
5fc57ffd43557cc685ca766d13e871a7b3ad3829fe3b3fcaa3ab76cba15350e82747952bcc77eda0093df0681ad5d3580cb30c96e2a707f0f3e2687a5bf96e19
 SHA512 
342bda32f27b9875bf1458adbfb3d3cdd92d98daf8068647e3cb01f9757fda6befbb44a7b9ba2b25b03e14b1de68c7e2d6b57362e84d6aae8bcff3959aaa12df
-DIST uim-1.8.9_pre20210103.tar.gz 4054622 BLAKE2B 
b50bafe9b0edbac1ab7e56afd5b654bdef793b606df3550ba7b8be467076005925bf2c5d221bbf3b3dbcdc5079bbb0e014ed29bef9b6a55c23384cb281411104
 SHA512 
39e046a8ee3bbc06ff0bab685e0ded8f63e9c474661ffecf7ed12e25cad3151498b2fecc7f14ca6f0c78974e55265df47d656a55bf158b41fe21a69071d02fe8

diff --git a/app-i18n/uim/files/uim-1.8.8-zh-TW.patch 
b/app-i18n/uim/files/uim-1.8.8-zh-TW.patch
deleted file mode 100644
index f73850013178..
--- a/app-i18n/uim/files/uim-1.8.8-zh-TW.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 a/xim/convdisp.cpp
-+++ b/xim/convdisp.cpp
-@@ -69,7 +69,7 @@
- #endif
- 
- const char *fontset_zhCN = 
"-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1, -isas-fangsong 
ti-medium-r-normal--16-160-72-72-c-160-gb2312.1980-0";
--const char *fontset_zhTW = 
"-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1, 
-taipei-fixed-medium-r-normal--16-150-75-75-c-160-big5-0";
-+const char *fontset_zhTW = 
"-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1, 
-eten-fixed-medium-r-normal--16-150-75-75-c-160-big5.eten-0";
- const char *fontset_ja = 
"-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1, 
-jis-fixed-medium-r-normal--16-*-75-75-c-160-jisx0208.1983-0, 
-sony-fixed-medium-r-normal--16-*-*-*-c-80-jisx0201.1976-0";
- const char *fontset_ko = 
"-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1, 
-daewoo-gothic-medium-r-normal--16-120-100-100-c-160-ksc5601.1987-0";
- 

diff --git a/app-i18n/uim/uim-1.8.9.ebuild b/app-i18n/uim/uim-1.8.9.ebuild
deleted file mode 100644
index 8d3071273f39..
--- a/app-i18n/uim/uim-1.8.9.ebuild
+++ /dev/null
@@ -1,240 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit autotools elisp-common flag-o-matic gnome2-utils qmake-utils
-
-EGIT_COMMIT="d1ac9d9315ff8c57c713b502544fef9b3a83b3e5"
-
-DESCRIPTION="A multilingual input method framework"
-HOMEPAGE="https://github.com/uim/uim";
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.bz2";
-
-LICENSE="BSD GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~x86"
-IUSE="X +anthy curl eb emacs expat libffi gtk gtk2 kde l10n_ja l10n_ko 
l10n_zh-CN l10n_zh-TW libedit libnotify m17n-lib ncurses nls qt5 skk sqlite ssl 
static-libs xft"
-RESTRICT="test"
-REQUIRED_USE="gtk? ( X )
-   gtk2? ( X )
-   qt5? ( X )
-   xft? ( X )"
-
-CDEPEND="X? (
-   x11-libs/libICE
-   x11-libs/libSM
-   x11-libs/libX11
-   x11-libs/libXext
-   x11-libs/libXft
-   x11-libs/libXrender
-   x11-libs/libXt
-   )
-   anthy? ( app-i18n/anthy )
-   curl? ( net-misc/curl )
-   eb? ( dev-libs/eb )
-   emacs? ( >=app-editors/emacs-23.1:* )
-   expat? ( dev-libs/expat )
-   gtk? ( x11-libs/gtk+:3 )
-   gtk2? ( x11-libs/gtk+:2 )
-   kde? ( kde-frameworks/plasma:5 )
-   libedit? ( dev-libs/libedit )
-   libffi? ( dev-libs/libffi:= )
-   libnotify? ( x11-libs/libnotify )
-   m17n-lib? ( dev-libs/m17n-lib )
-   ncurses? ( sys-libs/ncurses:0= )
-   nls? ( virtual/libintl )
-   qt5? (
-   dev-qt/qtx11extras:5
-   dev-qt/qtwidgets:5
-   )
-   skk? ( app-i18n/skk-jisyo )
-   sqlite? ( dev-db/sqlite:3 )
-   ssl? ( dev-libs/openssl:0= )"
-DEPEND="${CDEPEND}
-   X? ( x11-base/xorg-proto )"
-RDEPEND="${CDEPEND}
-   !dev-scheme/sigscheme
-   X? (
-

[gentoo-commits] repo/gentoo:master commit in: app-i18n/uim/files/

2022-12-02 Thread Sam James 
commit: 0435f69f59143b128c06f82700578edbb5ab1e51
Author: Sam James  gentoo  org>
AuthorDate: Sat Dec  3 05:03:15 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Dec  3 06:06:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0435f69f

app-i18n/uim: add partial upstream link for clang 16 patch

Signed-off-by: Sam James  gentoo.org>

 app-i18n/uim/files/uim-clang-16-configure.patch | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-i18n/uim/files/uim-clang-16-configure.patch 
b/app-i18n/uim/files/uim-clang-16-configure.patch
index 46e3bac01534..9a1a4726eb18 100644
--- a/app-i18n/uim/files/uim-clang-16-configure.patch
+++ b/app-i18n/uim/files/uim-clang-16-configure.patch
@@ -1,3 +1,4 @@
+Part of this went upstream as 
https://github.com/uim/uim/commit/99fd890fa601b81ff99e5e0f1977fe309f56b90e.
 --- a/configure.ac
 +++ b/configure.ac
 @@ -601,6 +601,7 @@ if test "x$ac_cv_func_snprintf" = xyes; then

[gentoo-commits] repo/gentoo:master commit in: app-i18n/uim/files/, app-i18n/uim/

2022-10-04 Thread Sam James 
commit: 30832ee74d20c1c4c18b4e31c9f712e970029f03
Author: Sam James  gentoo  org>
AuthorDate: Tue Oct  4 06:31:59 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct  4 07:09:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30832ee7

app-i18n/uim: fix build w/ Clang 16, >= openssl-1.1.1

This needs a lot more love, to be honest, but we already
have a huge stack of patches we apply, so I've resorted
to a -D hack in the ebuild for the OpenSSL 1.1.1 part
outside of configure.

Signed-off-by: Sam James  gentoo.org>

 app-i18n/uim/files/uim-clang-16-configure.patch |  41 
 app-i18n/uim/uim-1.8.9-r1.ebuild| 246 
 2 files changed, 287 insertions(+)

diff --git a/app-i18n/uim/files/uim-clang-16-configure.patch 
b/app-i18n/uim/files/uim-clang-16-configure.patch
new file mode 100644
index ..46e3bac01534
--- /dev/null
+++ b/app-i18n/uim/files/uim-clang-16-configure.patch
@@ -0,0 +1,41 @@
+--- a/configure.ac
 b/configure.ac
+@@ -601,6 +601,7 @@ if test "x$ac_cv_func_snprintf" = xyes; then
+   AC_RUN_IFELSE(
+   [AC_LANG_SOURCE([[
+ #include 
++#include 
+ int main(void){char b[5];snprintf(b,5,"123456789");exit(b[4]!='\0');}
+   ]])],
+   [AC_MSG_RESULT(yes)],
+--- a/m4/openssl.m4
 b/m4/openssl.m4
+@@ -76,6 +76,7 @@ AC_MSG_CHECKING([OpenSSL header version])
+ AC_RUN_IFELSE(
+   [AC_LANG_SOURCE([[
+ #include 
++#include 
+ #include 
+ #include 
+ #define DATA "conftest.sslincver"
+@@ -156,7 +157,9 @@ AC_ARG_WITH(openssl-header-check,
+ AC_MSG_CHECKING([whether OpenSSL's headers match the library])
+ AC_RUN_IFELSE(
+   [AC_LANG_SOURCE([[
++#include 
+ #include 
++#include 
+ #include 
+ int main(void) { exit(SSLeay() == OPENSSL_VERSION_NUMBER ? 0 : 1); }
+   ]])],
+@@ -220,8 +223,8 @@ int main(void) { DTLSv1_method(); }
+ AC_MSG_CHECKING([if programs using OpenSSL functions will link])
+ AC_LINK_IFELSE(
+   [AC_LANG_SOURCE([[
+-#include 
+-int main(void) { SSLeay_add_all_algorithms(); }
++#include 
++int main(void) { OpenSSL_version_num(); }
+   ]])],
+   [
+   AC_MSG_RESULT(yes)

diff --git a/app-i18n/uim/uim-1.8.9-r1.ebuild b/app-i18n/uim/uim-1.8.9-r1.ebuild
new file mode 100644
index ..5bc58c158713
--- /dev/null
+++ b/app-i18n/uim/uim-1.8.9-r1.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit autotools elisp-common flag-o-matic gnome2-utils qmake-utils
+
+EGIT_COMMIT="d1ac9d9315ff8c57c713b502544fef9b3a83b3e5"
+
+DESCRIPTION="A multilingual input method framework"
+HOMEPAGE="https://github.com/uim/uim";
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.bz2";
+
+LICENSE="BSD GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="X +anthy curl eb emacs expat libffi gtk gtk2 kde l10n_ja l10n_ko 
l10n_zh-CN l10n_zh-TW libedit libnotify m17n-lib ncurses nls qt5 skk sqlite ssl 
static-libs xft"
+RESTRICT="test"
+REQUIRED_USE="gtk? ( X )
+   gtk2? ( X )
+   qt5? ( X )
+   xft? ( X )"
+
+CDEPEND="X? (
+   x11-libs/libICE
+   x11-libs/libSM
+   x11-libs/libX11
+   x11-libs/libXext
+   x11-libs/libXft
+   x11-libs/libXrender
+   x11-libs/libXt
+   )
+   anthy? ( app-i18n/anthy )
+   curl? ( net-misc/curl )
+   eb? ( dev-libs/eb )
+   emacs? ( >=app-editors/emacs-23.1:* )
+   expat? ( dev-libs/expat )
+   gtk? ( x11-libs/gtk+:3 )
+   gtk2? ( x11-libs/gtk+:2 )
+   kde? ( kde-frameworks/plasma:5 )
+   libedit? ( dev-libs/libedit )
+   libffi? ( dev-libs/libffi:= )
+   libnotify? ( x11-libs/libnotify )
+   m17n-lib? ( dev-libs/m17n-lib )
+   ncurses? ( sys-libs/ncurses:0= )
+   nls? ( virtual/libintl )
+   qt5? (
+   dev-qt/qtx11extras:5
+   dev-qt/qtwidgets:5
+   )
+   skk? ( app-i18n/skk-jisyo )
+   sqlite? ( dev-db/sqlite:3 )
+   ssl? ( dev-libs/openssl:0= )"
+DEPEND="${CDEPEND}
+   X? ( x11-base/xorg-proto )"
+RDEPEND="${CDEPEND}
+   !dev-scheme/sigscheme
+   X? (
+   media-fonts/font-sony-misc
+   l10n_ja? (
+   || (
+   media-fonts/font-jis-misc
+   media-fonts/intlfonts
+   )
+   )
+   l10n_ko? (
+   || (
+   media-fonts/font-daewoo-misc
+   media-fonts/intlfonts
+   )
+   )
+   l10n_zh-CN? (
+   || (
+   media-fonts/font-isas-misc
+   media-fonts/intlfonts
+   )
+   )
+   l10n_zh-TW?

[gentoo-commits] repo/gentoo:master commit in: app-i18n/uim/files/

2022-09-24 Thread Akinori Hattori 
commit: 4b7d73f24f8fc0467b410bdb90463c500a9e2ac4
Author: Akinori Hattori  gentoo  org>
AuthorDate: Sat Sep 24 13:18:57 2022 +
Commit: Akinori Hattori  gentoo  org>
CommitDate: Sat Sep 24 13:31:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b7d73f2

app-i18n/uim: update patch

Signed-off-by: Akinori Hattori  gentoo.org>

 app-i18n/uim/files/uim-slibtool.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/uim/files/uim-slibtool.patch 
b/app-i18n/uim/files/uim-slibtool.patch
index 51560d439e25..2efec471c2cc 100644
--- a/app-i18n/uim/files/uim-slibtool.patch
+++ b/app-i18n/uim/files/uim-slibtool.patch
@@ -7,7 +7,7 @@
 -@abs_top_builddir@/replace/.libs @abs_top_builddir@/uim/.libs
 -LIBS += -lreplace -luim -luim-scm
 +@abs_top_builddir@/replace/.libs @abs_top_builddir@/uim/.libs 
\
-+  @abs_top_builddir@/sigscheme/libgcroots/.libs
++@abs_top_builddir@/sigscheme/libgcroots/.libs
 +LIBS += -lreplace -luim -luim-scm -lgcroots
  !win32:!embedded:!mac {
  LIBS += -luim-x-util

[gentoo-commits] repo/gentoo:master commit in: app-i18n/uim/files/, app-i18n/uim/

2022-09-24 Thread Akinori Hattori 
commit: 0d156a13d92f8de153628976fe02d8551ccf7c4e
Author: Akinori Hattori  gentoo  org>
AuthorDate: Sat Sep 24 13:17:20 2022 +
Commit: Akinori Hattori  gentoo  org>
CommitDate: Sat Sep 24 13:31:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d156a13

app-i18n/uim: fix build when dev-lang/ruby is installed

Closes: https://bugs.gentoo.org/848966
Signed-off-by: Akinori Hattori  gentoo.org>

 app-i18n/uim/files/uim-gentoo.patch  | 10 ++
 app-i18n/uim/uim-1.8.9.ebuild|  1 -
 app-i18n/uim/uim-1.8.9_pre20210103-r1.ebuild |  1 -
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app-i18n/uim/files/uim-gentoo.patch 
b/app-i18n/uim/files/uim-gentoo.patch
index de498b754d86..9b7fb17a 100644
--- a/app-i18n/uim/files/uim-gentoo.patch
+++ b/app-i18n/uim/files/uim-gentoo.patch
@@ -26,3 +26,13 @@
  fi
  
  AC_ARG_ENABLE(warnings-into-error,
+--- a/sigscheme/src/Makefile.am
 b/sigscheme/src/Makefile.am
+@@ -51,7 +51,6 @@
+ functable-srfi60.c
+ 
+ if MAINTAINER_MODE
+-$(FUNC_TABLES): $(top_builddir)/config.status
+ # Core
+ SSCM_CORE_SRCS = \
+   $(srcdir)/error.c \

diff --git a/app-i18n/uim/uim-1.8.9.ebuild b/app-i18n/uim/uim-1.8.9.ebuild
index 0fc2663179b2..8d3071273f39 100644
--- a/app-i18n/uim/uim-1.8.9.ebuild
+++ b/app-i18n/uim/uim-1.8.9.ebuild
@@ -94,7 +94,6 @@ PATCHES=(
 )
 DOCS=( AUTHORS NEWS README RELNOTE doc )
 
-AT_NO_RECURSIVE="yes"
 SITEFILE="50${PN}-gentoo.el"
 
 src_prepare() {

diff --git a/app-i18n/uim/uim-1.8.9_pre20210103-r1.ebuild 
b/app-i18n/uim/uim-1.8.9_pre20210103-r1.ebuild
index 0b0228923d41..df9c907e1f24 100644
--- a/app-i18n/uim/uim-1.8.9_pre20210103-r1.ebuild
+++ b/app-i18n/uim/uim-1.8.9_pre20210103-r1.ebuild
@@ -96,7 +96,6 @@ PATCHES=(
 )
 DOCS=( AUTHORS NEWS README RELNOTE doc )
 
-AT_NO_RECURSIVE="yes"
 SITEFILE="50${PN}-gentoo.el"
 
 src_unpack() {

[gentoo-commits] repo/gentoo:master commit in: app-i18n/uim/files/

2022-09-24 Thread Akinori Hattori 
commit: 6db62a1d137760edf49318690cb4b8aee32907ab
Author: Akinori Hattori  gentoo  org>
AuthorDate: Sat Sep 24 13:00:01 2022 +
Commit: Akinori Hattori  gentoo  org>
CommitDate: Sat Sep 24 13:31:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6db62a1d

app-i18n/uim: fix CMake warning

Closes: https://bugs.gentoo.org/870394
Signed-off-by: Akinori Hattori  gentoo.org>

 app-i18n/uim/files/uim-kde.patch | 12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/app-i18n/uim/files/uim-kde.patch b/app-i18n/uim/files/uim-kde.patch
index 8a291650ae3d..dfac6b556435 100644
--- a/app-i18n/uim/files/uim-kde.patch
+++ b/app-i18n/uim/files/uim-kde.patch
@@ -29,7 +29,15 @@
  AC_ARG_ENABLE(pref,
AC_HELP_STRING([--disable-pref],
  [do not build graphical utility to edit user settings]),
-@@ -1948,12 +1970,15 @@
+@@ -1883,7 +1905,6 @@
+   cmake_option="-DCMAKE_BUILD_TYPE=${cmake_build_type}"
+   cmake_option="${cmake_option} -DCMAKE_INSTALL_PREFIX=${prefix}"
+   cmake_option="${cmake_option} -DCMAKE_SKIP_RPATH=true"
+-  cmake_option="${cmake_option} -DKDE4_USE_ALWAYS_FULL_RPATH=false"
+ fi
+ 
+ if test "x$with_qt4" = xyes; then
+@@ -1948,12 +1969,15 @@
  qt5_immodule_option="DEFINES+=QT5_IMMODULE"
fi
set -e
@@ -51,7 +59,7 @@
${QMAKE5} -o ${ac_abs_top_builddir}/qt5/candwin/Makefile.qmake \
  ${ac_abs_top_builddir}/qt5/candwin/uim-candwin-qt5.pro
${QMAKE5} -o ${ac_abs_top_builddir}/qt5/chardict/Makefile.qmake \
-@@ -2007,6 +2032,7 @@
+@@ -2007,6 +2031,7 @@
 Qt5 immodule: ${with_qt5_immodule}
 KDE3 Applet : ${enable_kde_applet}
 KDE4 Applet : ${enable_kde4_applet}

[gentoo-commits] repo/gentoo:master commit in: app-i18n/uim/files/

2022-09-24 Thread Akinori Hattori 
commit: 472fd64b5f966e862c8b97add0330753b3668703
Author: Akinori Hattori  gentoo  org>
AuthorDate: Sat Sep 24 13:29:35 2022 +
Commit: Akinori Hattori  gentoo  org>
CommitDate: Sat Sep 24 13:31:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=472fd64b

app-i18n/uim: fix build with Clang 16+

Closes: https://bugs.gentoo.org/870520
Closes: https://bugs.gentoo.org/870637
Signed-off-by: Akinori Hattori  gentoo.org>

 app-i18n/uim/files/uim-gentoo.patch | 18 +++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/app-i18n/uim/files/uim-gentoo.patch 
b/app-i18n/uim/files/uim-gentoo.patch
index 9b7fb17a..649288932259 100644
--- a/app-i18n/uim/files/uim-gentoo.patch
+++ b/app-i18n/uim/files/uim-gentoo.patch
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -38,6 +38,7 @@
+@@ -56,6 +56,7 @@
  AC_PATH_PROGS(SED, sed gsed)
  AX_PATH_QMAKE4
  AX_PATH_QMAKE5
@@ -8,7 +8,19 @@
  
  AM_MAINTAINER_MODE
  
-@@ -1618,7 +1619,7 @@
+@@ -575,6 +576,11 @@
+ AC_CHECK_FUNCS([waitpid])
+ AC_CHECK_FUNCS([daemon])
+ 
++AC_CHECK_DECL([va_copy],
++  [AC_DEFINE(HAVE_VA_COPY, 1, [Define to 1 if you have the 
`va_copy' macro.])],
++  [AC_CHECK_DECL([__va_copy],
++ [AC_DEFINE(HAVE___VA_COPY, 1, [Define to 1 if 
you have the `__va_copy' macro.])])])
++
+ # IRIX has a const char return value for gai_strerror()
+ AC_CHECK_FUNCS(gai_strerror,[
+ AC_DEFINE(HAVE_GAI_STRERROR)
+@@ -1637,7 +1643,7 @@
fi
AX_LANG_WNOERROR  # end AC_LANG_WERROR
  
@@ -17,7 +29,7 @@
  else
CFLAGS="$CFLAGS -DNDEBUG"
CXXFLAGS="$CXXFLAGS -DNDEBUG"
-@@ -1629,7 +1630,7 @@
+@@ -1648,7 +1654,7 @@
AX_CFLAGS_GCC_OPTION([-Wno-unused-function], [UIM_SCM_CFLAGS])
AX_LANG_WNOERROR  # end AC_LANG_WERROR

[gentoo-commits] repo/gentoo:master commit in: app-i18n/uim/files/, app-i18n/uim/

2022-09-06 Thread Akinori Hattori 
commit: 196faa660660198f3bd0deb66b627601861d9a03
Author: Akinori Hattori  gentoo  org>
AuthorDate: Tue Sep  6 15:24:06 2022 +
Commit: Akinori Hattori  gentoo  org>
CommitDate: Tue Sep  6 15:24:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=196faa66

app-i18n/uim: rename patches

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Akinori Hattori  gentoo.org>

 app-i18n/uim/files/{uim-zh-TW.patch => uim-1.8.8-zh-TW.patch} | 0
 ...0210103-remove-Wconversion-replace.patch => uim-Wconversion.patch} | 0
 app-i18n/uim/uim-1.8.9_pre20210103-r1.ebuild  | 4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-i18n/uim/files/uim-zh-TW.patch 
b/app-i18n/uim/files/uim-1.8.8-zh-TW.patch
similarity index 100%
rename from app-i18n/uim/files/uim-zh-TW.patch
rename to app-i18n/uim/files/uim-1.8.8-zh-TW.patch

diff --git 
a/app-i18n/uim/files/uim-1.8.9_pre20210103-remove-Wconversion-replace.patch 
b/app-i18n/uim/files/uim-Wconversion.patch
similarity index 100%
rename from 
app-i18n/uim/files/uim-1.8.9_pre20210103-remove-Wconversion-replace.patch
rename to app-i18n/uim/files/uim-Wconversion.patch

diff --git a/app-i18n/uim/uim-1.8.9_pre20210103-r1.ebuild 
b/app-i18n/uim/uim-1.8.9_pre20210103-r1.ebuild
index 8bafde17b650..0b0228923d41 100644
--- a/app-i18n/uim/uim-1.8.9_pre20210103-r1.ebuild
+++ b/app-i18n/uim/uim-1.8.9_pre20210103-r1.ebuild
@@ -90,9 +90,9 @@ PATCHES=(
"${FILESDIR}"/${PN}-kde.patch
"${FILESDIR}"/${PN}-slibtool.patch
"${FILESDIR}"/${PN}-tinfo.patch
+   "${FILESDIR}"/${PN}-Wconversion.patch
"${FILESDIR}"/${PN}-xkb.patch
-   "${FILESDIR}"/${PN}-zh-TW.patch
-   "${FILESDIR}"/${P}-remove-Wconversion-replace.patch
+   "${FILESDIR}"/${PN}-1.8.8-zh-TW.patch
 )
 DOCS=( AUTHORS NEWS README RELNOTE doc )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/uim/files/, app-i18n/uim/

2021-10-23 Thread Akinori Hattori 
commit: 33bdfd975f239c6d6433bc1587991cf9e3d31a64
Author: Akinori Hattori  gentoo  org>
AuthorDate: Sat Oct 23 14:21:57 2021 +
Commit: Akinori Hattori  gentoo  org>
CommitDate: Sat Oct 23 14:31:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33bdfd97

app-i18n/uim: fix build with Clang

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Akinori Hattori  gentoo.org>

 app-i18n/uim/files/uim-1.8.8-c++11.patch | 23 +++
 app-i18n/uim/uim-1.8.8-r2.ebuild |  1 +
 2 files changed, 24 insertions(+)

diff --git a/app-i18n/uim/files/uim-1.8.8-c++11.patch 
b/app-i18n/uim/files/uim-1.8.8-c++11.patch
new file mode 100644
index 000..07e08284096
--- /dev/null
+++ b/app-i18n/uim/files/uim-1.8.8-c++11.patch
@@ -0,0 +1,23 @@
+From bb25aac568359efbfb68e52dd8d9ee85e65d754b Mon Sep 17 00:00:00 2001
+From: Haelwenn Monnier 
+Date: Thu, 25 Oct 2018 09:10:16 +0200
+Subject: [PATCH] xim/main.cpp: FIx build against clang
+
+main.cpp:68:55: error: invalid suffix on literal; C++11 requires a space 
between literal and identifier
+---
+ xim/main.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/xim/main.cpp b/xim/main.cpp
+index a0b0beceb..c5818ca4a 100644
+--- a/xim/main.cpp
 b/xim/main.cpp
+@@ -65,7 +65,7 @@ int g_option_mask;
+ int scr_width, scr_height;
+ int host_byte_order;
+ 
+-#define VERSION_NAME "uim-xim under the way! Version "PACKAGE_VERSION"\n"
++#define VERSION_NAME "uim-xim under the way! Version " PACKAGE_VERSION "\n"
+ const char *version_name=VERSION_NAME;
+ const char *usage=
+ "--help , --version :Show usage or version\n"

diff --git a/app-i18n/uim/uim-1.8.8-r2.ebuild b/app-i18n/uim/uim-1.8.8-r2.ebuild
index 99ed8908464..3e0f4c05b07 100644
--- a/app-i18n/uim/uim-1.8.8-r2.ebuild
+++ b/app-i18n/uim/uim-1.8.8-r2.ebuild
@@ -80,6 +80,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-tinfo.patch
"${FILESDIR}"/${PN}-xkb.patch
"${FILESDIR}"/${PN}-zh-TW.patch
+   "${FILESDIR}"/${P}-c++11.patch
"${FILESDIR}"/${P}-desktop.patch
"${FILESDIR}"/${P}-fno-common.patch
 )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/uim/files/, app-i18n/uim/

2020-11-28 Thread David Seifert 
commit: a45dfd34d2a5ccb5a07a968a475b656b743f992e
Author: Jakov Smolic  sartura  hr>
AuthorDate: Sat Nov 28 23:08:46 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Nov 28 23:08:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a45dfd34

app-i18n/uim: fix build with gcc-10

* Thanks to Jeroen Roovers for submitting the patch

Closes: https://bugs.gentoo.org/706968
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 app-i18n/uim/files/uim-1.8.8-fno-common.patch | 11 +++
 app-i18n/uim/uim-1.8.8.ebuild |  1 +
 2 files changed, 12 insertions(+)

diff --git a/app-i18n/uim/files/uim-1.8.8-fno-common.patch 
b/app-i18n/uim/files/uim-1.8.8-fno-common.patch
new file mode 100644
index 000..ff974bb5d5b
--- /dev/null
+++ b/app-i18n/uim/files/uim-1.8.8-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/sigscheme/libgcroots/include/private/gc_priv.h
 b/sigscheme/libgcroots/include/private/gc_priv.h
+@@ -1979,7 +1979,7 @@
+   /* the signal mask. */
+ # define SETJMP(env) sigsetjmp(env, 1)
+ # define LONGJMP(env, val) siglongjmp(env, val)
+-# define JMP_BUF sigjmp_buf
++# define JMP_BUF extern sigjmp_buf
+ #else
+ # ifdef ECOS
+ #   define SETJMP(env)  hal_setjmp(env)

diff --git a/app-i18n/uim/uim-1.8.8.ebuild b/app-i18n/uim/uim-1.8.8.ebuild
index 412b439ce31..3ed23be0370 100644
--- a/app-i18n/uim/uim-1.8.8.ebuild
+++ b/app-i18n/uim/uim-1.8.8.ebuild
@@ -84,6 +84,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-tinfo.patch
"${FILESDIR}"/${PN}-xkb.patch
"${FILESDIR}"/${PN}-zh-TW.patch
+   "${FILESDIR}"/${P}-fno-common.patch
 )
 DOCS=( AUTHORS NEWS README RELNOTE doc )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/uim/files/, app-i18n/uim/

2018-07-23 Thread Akinori Hattori 
commit: 3f4b1e5199fb62f1327f0cf2f437f0620eb1080f
Author: Akinori Hattori  gentoo  org>
AuthorDate: Mon Jul 23 13:27:56 2018 +
Commit: Akinori Hattori  gentoo  org>
CommitDate: Mon Jul 23 13:29:00 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f4b1e51

app-i18n/uim: fix build with USE=-X

Closes: https://bugs.gentoo.org/661806
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-i18n/uim/files/uim-xkb.patch | 18 ++
 app-i18n/uim/uim-1.8.8.ebuild|  1 +
 2 files changed, 19 insertions(+)

diff --git a/app-i18n/uim/files/uim-xkb.patch b/app-i18n/uim/files/uim-xkb.patch
new file mode 100644
index 000..538fd964bfb
--- /dev/null
+++ b/app-i18n/uim/files/uim-xkb.patch
@@ -0,0 +1,18 @@
+--- a/uim/Makefile.am
 b/uim/Makefile.am
+@@ -181,6 +181,7 @@
+ libuim_eb_la_CFLAGS = @EBCONF_PTHREAD_CFLAGS@ -Wall
+ endif
+ 
++if LIBUIM_X_UTIL
+ if XKB
+ uim_plugin_LTLIBRARIES += libuim-xkb.la
+ libuim_xkb_la_SOURCES = uim-xkb.c
+@@ -189,6 +190,7 @@
+ libuim_xkb_la_CFLAGS = @X11_CFLAGS@
+ libuim_xkb_la_CPPFLAGS = -I$(top_srcdir)
+ endif
++endif
+ 
+ if OSX_DCS
+ uim_plugin_LTLIBRARIES += libuim-osx-dcs.la

diff --git a/app-i18n/uim/uim-1.8.8.ebuild b/app-i18n/uim/uim-1.8.8.ebuild
index 96c19d017d7..0356ea9c9bb 100644
--- a/app-i18n/uim/uim-1.8.8.ebuild
+++ b/app-i18n/uim/uim-1.8.8.ebuild
@@ -82,6 +82,7 @@ RDEPEND="${CDEPEND}
 PATCHES=(
"${FILESDIR}"/${PN}-gentoo.patch
"${FILESDIR}"/${PN}-tinfo.patch
+   "${FILESDIR}"/${PN}-xkb.patch
"${FILESDIR}"/${PN}-zh-TW.patch
 )
 DOCS=( AUTHORS NEWS README RELNOTE doc )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/uim/files/, app-i18n/uim/

2018-06-02 Thread Akinori Hattori 
commit: 35b51bf25341d839d9e1018fd87bb4b591620505
Author: Akinori Hattori  gentoo  org>
AuthorDate: Sun Jun  3 02:17:47 2018 +
Commit: Akinori Hattori  gentoo  org>
CommitDate: Sun Jun  3 02:18:51 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35b51bf2

app-i18n/uim: fix build with USE=qt4

Closes: https://bugs.gentoo.org/657052
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-i18n/uim/files/uim-1.8.6-qt.patch | 16 
 app-i18n/uim/uim-1.8.6-r1.ebuild  |  4 +++-
 app-i18n/uim/uim-1.8.6-r2.ebuild  |  4 +++-
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/app-i18n/uim/files/uim-1.8.6-qt.patch 
b/app-i18n/uim/files/uim-1.8.6-qt.patch
new file mode 100644
index 000..6c0cb7eee66
--- /dev/null
+++ b/app-i18n/uim/files/uim-1.8.6-qt.patch
@@ -0,0 +1,16 @@
+--- a/m4/ax_path_qmake4.m4
 b/m4/ax_path_qmake4.m4
+@@ -23,10 +23,10 @@
+ #   the copyright notice and this notice are preserved.
+ 
+ AC_DEFUN([AX_PATH_QMAKE4], [
+-  
ax_guessed_qt4_dirs="/usr/lib/qt4/bin:/usr/local/lib/qt4/bin:/usr/qt4/bin:/usr/local/qt4/bin:${QT4DIR}/bin:${QTDIR}/bin"
++  ax_guessed_qt4_dirs="${QT4DIR}/bin:${QTDIR}/bin"
+   AC_PROG_EGREP
+-  AC_PATH_PROGS(_QMAKE4, [qmake-qt4 qmake4], [], 
["$PATH:$ax_guessed_qt4_dirs"])
+-  AC_PATH_PROGS(_QMAKE, [qmake], [], ["$PATH:$ax_guessed_qt4_dirs"])
++  AC_PATH_PROGS(_QMAKE4, [qmake-qt4 qmake4], [], 
["$ax_guessed_qt4_dirs:$PATH"])
++  AC_PATH_PROGS(_QMAKE, [qmake], [], ["$ax_guessed_qt4_dirs:$PATH"])
+ 
+   AC_CACHE_CHECK([for Qt4 version of qmake], ax_cv_path_QMAKE4, [
+ ax_cv_path_QMAKE4=no

diff --git a/app-i18n/uim/uim-1.8.6-r1.ebuild b/app-i18n/uim/uim-1.8.6-r1.ebuild
index 84c5fa527eb..af634f34baf 100644
--- a/app-i18n/uim/uim-1.8.6-r1.ebuild
+++ b/app-i18n/uim/uim-1.8.6-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit autotools elisp-common gnome2-utils
+inherit autotools elisp-common gnome2-utils qmake-utils
 
 DESCRIPTION="A multilingual input method framework"
 HOMEPAGE="https://github.com/uim/uim";
@@ -78,6 +78,7 @@ RDEPEND="${CDEPEND}
 
 PATCHES=(
"${FILESDIR}"/${P}-gentoo.patch
+   "${FILESDIR}"/${P}-qt.patch
"${FILESDIR}"/${P}-tinfo.patch
"${FILESDIR}"/${PN}-zh-TW.patch
 )
@@ -144,6 +145,7 @@ src_configure() {
myconf+=( --disable-pref )
fi
 
+   export QT4DIR="$(qt4_get_libdir)"
econf "${myconf[@]}"
 }
 

diff --git a/app-i18n/uim/uim-1.8.6-r2.ebuild b/app-i18n/uim/uim-1.8.6-r2.ebuild
index ccec49f2869..8ecd96c0215 100644
--- a/app-i18n/uim/uim-1.8.6-r2.ebuild
+++ b/app-i18n/uim/uim-1.8.6-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit autotools elisp-common gnome2-utils
+inherit autotools elisp-common gnome2-utils qmake-utils
 
 DESCRIPTION="A multilingual input method framework"
 HOMEPAGE="https://github.com/uim/uim";
@@ -82,6 +82,7 @@ RDEPEND="${CDEPEND}
 PATCHES=(
"${FILESDIR}"/${P}-gentoo.patch
"${FILESDIR}"/${P}-libressl.patch
+   "${FILESDIR}"/${P}-qt.patch
"${FILESDIR}"/${P}-tinfo.patch
"${FILESDIR}"/${PN}-zh-TW.patch
 )
@@ -148,6 +149,7 @@ src_configure() {
myconf+=( --disable-pref )
fi
 
+   export QT4DIR="$(qt4_get_libdir)"
econf "${myconf[@]}"
 }

[gentoo-commits] repo/gentoo:master commit in: app-i18n/uim/files/, app-i18n/uim/

2018-05-28 Thread Akinori Hattori 
commit: d61c9a27a391ffe31d95c7655eb34336b0bfa26f
Author: Akinori Hattori  gentoo  org>
AuthorDate: Mon May 28 15:12:24 2018 +
Commit: Akinori Hattori  gentoo  org>
CommitDate: Mon May 28 15:12:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d61c9a27

app-i18n/uim: new upstream release

Closes: https://bugs.gentoo.org/644898
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-i18n/uim/Manifest   |   1 +
 app-i18n/uim/files/uim-gentoo.patch |  28 +
 app-i18n/uim/files/uim-tinfo.patch  |  38 ++
 app-i18n/uim/uim-1.8.8.ebuild   | 226 
 4 files changed, 293 insertions(+)

diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index fb64efc7829..0e626d08dac 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -1 +1,2 @@
 DIST uim-1.8.6.tar.bz2 6500739 BLAKE2B 
78623c015cafafa1fbaf32542535de1f0207f8452a422d929a15f4421e4c9926192d0d3b761a7865a38affdf616dc5477e083c0fd8655261ff80ca817fd37029
 SHA512 
26a95d3b51ef7a99108234b9af30ee7b74141cb3af13d092d4cdbf0749f630934cfd67f74b09dacc3adcdce4a390104489d68a4e2419ec07418645a9b4e5715b
+DIST uim-1.8.8.tar.bz2 6228743 BLAKE2B 
8fc44b61239f766ba3d9ebf3201c11471b3a844e082237f5ec97dd0fa6fbb04a0a588df5c0479a0aa4bcb4d9c4edcc93c36ec68618701c8aa88fa30732fdce28
 SHA512 
2257ae48f4f2b79039a5f6be0fc740e218d5609e004dad9a5a1aa5d4066587ee59d0be06bc23c7d567a48901466227fedc4778b480f7184d84b0b3b4dddac9a3

diff --git a/app-i18n/uim/files/uim-gentoo.patch 
b/app-i18n/uim/files/uim-gentoo.patch
new file mode 100644
index 000..de498b754d8
--- /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 000..e2fcfceb315
--- /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/uim-1.8.8.ebuild b/app-i18n/uim/uim-1.8.8.ebuild
new file mode 100644
index 000..b77ac271174
--- /dev/null
+++ b/app-i18n/uim/uim-1.8.8.ebuild
@@ -0,0 +1,226 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools elisp-common gnome2-utils
+
+DESCRIPTION="A multilingual input method framework"
+HOMEPAGE="https://github.com/uim/uim";
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.bz2";
+
+LICENSE="BSD GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="X +anthy canna curl eb emacs expat libffi gtk gtk2 l10n_ja l10n_ko 
l10n_zh-CN l10n_zh-TW libedit libnotify libressl m17n-lib ncurses nls qt5 skk 
sqlite ssl static-libs xft"
+RESTRICT="test"
+REQUIRED_USE="gtk?

[gentoo-commits] repo/gentoo:master commit in: app-i18n/uim/files/, app-i18n/uim/

2018-05-28 Thread Akinori Hattori 
commit: d2d7c1b5b3e7207257f6e82b0c98210b9037fb3a
Author: Akinori Hattori  gentoo  org>
AuthorDate: Mon May 28 14:10:57 2018 +
Commit: Akinori Hattori  gentoo  org>
CommitDate: Mon May 28 14:55:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2d7c1b5

app-i18n/uim: update patches

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-i18n/uim/files/uim-1.6.0-gentoo.patch  | 11 -
 app-i18n/uim/files/uim-1.8.6-gentoo.patch  | 28 ++
 .../{uim-1.5.4-zhTW.patch => uim-zh-TW.patch}  |  5 ++--
 app-i18n/uim/uim-1.8.6-r1.ebuild   |  4 ++--
 app-i18n/uim/uim-1.8.6-r2.ebuild   |  4 ++--
 5 files changed, 34 insertions(+), 18 deletions(-)

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 206a1cdfb1e..000
--- 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.ac2010-08-02 09:30:14.0 +0900
-+++ uim-1.6.0/configure.ac 2010-08-14 08:30:34.0 +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 000..0feee5a7099
--- /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.5.4-zhTW.patch 
b/app-i18n/uim/files/uim-zh-TW.patch
similarity index 79%
rename from app-i18n/uim/files/uim-1.5.4-zhTW.patch
rename to app-i18n/uim/files/uim-zh-TW.patch
index 3836a210caa..f7385001317 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.cpp2008-02-13 23:43:42.0 +0900
-+++ uim-1.5.4/xim/convdisp.cpp 2008-12-10 02:04:35.0 +0900
+--- a/xim/convdisp.cpp
 b/xim/convdisp.cpp
 @@ -69,7 +69,7 @@
  #endif
  

diff --git a/app-i18n/uim/uim-1.8.6-r1.ebuild b/app-i18n/uim/uim-1.8.6-r1.ebuild
index a976c85b750..8ede2635d9f 100644
--- a/app-i18n/uim/uim-1.8.6-r1.ebuild
+++ b/app-i18n/uim/uim-1.8.6-r1.ebuild
@@ -80,8 +80,8 @@ RDEPEND="${CDEPEND}
)"
 
 PATCHES=(
-   "${FILESDIR}"/${PN}-1.6.0-gentoo.patch
-   "${FILESDIR}"/${PN}-1.5.4-zhTW.patch
+   "${FILESDIR}"/${P}-gentoo.patch
+   "${FILESDIR}"/${PN}-zh-TW.patch
 )
 DOCS=( AUTHORS NEWS README RELNOTE )
 

diff --git a/app-i18n/uim/uim-1.8.6-r2.ebuild b/app-i18n/uim/uim-1.8.6-r2.ebuild
index 35e99a234b8..f2b009491e2 100644
--- a/app-i18n/uim/uim-1.8.6-r2.ebuild
+++ b/app-i18n/uim/uim-1.8.6-r2.ebuild
@@ -83,9 +83,9 @@ RDEPEND="${CDEPEND}
)"
 
 PATCHES=(
-   "${FILESDIR}"/${PN}-1.6.0-gentoo.patch
-   "${FILESDIR}"/${PN}-1.5.4-zhTW.patch
+   "${FILESDIR}"/${P}-gentoo.patch
"${FILESDIR}"/${P}-libressl.patch
+   "${FILESDIR}"/${PN}-zh-TW.patch
 )
 DOCS=( AUTHORS NEWS README RELNOTE )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/uim/files/, app-i18n/uim/

2018-05-28 Thread Akinori Hattori 
commit: 323cb12463345fb51e34f2ac42fd167efd9d3789
Author: Akinori Hattori  gentoo  org>
AuthorDate: Mon May 28 14:54:09 2018 +
Commit: Akinori Hattori  gentoo  org>
CommitDate: Mon May 28 14:55:59 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=323cb124

app-i18n/uim: fix build with sys-libs/ncurses[tinfo]

Closes: https://bugs.gentoo.org/588172
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-i18n/uim/files/uim-1.8.6-tinfo.patch | 65 
 app-i18n/uim/uim-1.8.6-r1.ebuild |  1 +
 app-i18n/uim/uim-1.8.6-r2.ebuild |  1 +
 3 files changed, 67 insertions(+)

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 000..51105c909f5
--- /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/uim-1.8.6-r1.ebuild b/app-i18n/uim/uim-1.8.6-r1.ebuild
index 7b43e2abb80..84c5fa527eb 100644
--- a/app-i18n/uim/uim-1.8.6-r1.ebuild
+++ b/app-i18n/uim/uim-1.8.6-r1.ebuild
@@ -78,6 +78,7 @@ RDEPEND="${CDEPEND}
 
 PATCHES=(
"${FILESDIR}"/${P}-gentoo.patch
+   "${FILESDIR}"/${P}-tinfo.patch
"${FILESDIR}"/${PN}-zh-TW.patch
 )
 DOCS=( AUTHORS NEWS README RELNOTE )

diff --git a/app-i18n/uim/uim-1.8.6-r2.ebuild b/app-i18n/uim/uim-1.8.6-r2.ebuild
index b7fb23b5ab8..ccec49f2869 100644
--- a/app-i18n/uim/uim-1.8.6-r2.ebuild
+++ b/app-i18n/uim/uim-1.8.6-r2.ebuild
@@ -82,6 +82,7 @@ RDEPEND="${CDEPEND}
 PATCHES=(
"${FILESDIR}"/${P}-gentoo.patch
"${FILESDIR}"/${P}-libressl.patch
+   "${FILESDIR}"/${P}-tinfo.patch
"${FILESDIR}"/${PN}-zh-TW.patch
 )
 DOCS=( AUTHORS NEWS README RELNOTE )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/uim/files/, app-i18n/uim/

2016-07-28 Thread Anthony G. Basile 
commit: 9865150618d0f7cca111d930737e5e590cd65b24
Author: Felix Janda  posteo  de>
AuthorDate: Tue Jul 26 16:58:44 2016 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Thu Jul 28 17:09:59 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98651506

app-i18n/uim: add libressl support

Gentoo-Bug: https://bugs.gentoo.org/585672

 app-i18n/uim/files/uim-1.8.6-libressl.patch |  79 ++
 app-i18n/uim/uim-1.8.6-r2.ebuild| 228 
 2 files changed, 307 insertions(+)

diff --git a/app-i18n/uim/files/uim-1.8.6-libressl.patch 
b/app-i18n/uim/files/uim-1.8.6-libressl.patch
new file mode 100644
index 000..b14de58
--- /dev/null
+++ b/app-i18n/uim/files/uim-1.8.6-libressl.patch
@@ -0,0 +1,79 @@
+From 7a281b1131399f04627986e6f9a54499b08e239d Mon Sep 17 00:00:00 2001
+From: Felix Janda 
+Date: Thu, 21 Apr 2016 23:12:10 +0200
+Subject: [PATCH] Make openssl SSLv2 and SSLv3 support optional
+
+Fixes compilation with libressl
+---
+ uim/openssl.c | 30 ++
+ 1 file changed, 30 insertions(+)
+
+diff --git a/uim/openssl.c b/uim/openssl.c
+index ba1b238..35ca1ca 100644
+--- a/uim/openssl.c
 b/uim/openssl.c
+@@ -208,34 +208,64 @@ c_SSL_write(uim_lisp s_, uim_lisp buf_)
+ static uim_lisp
+ c_SSLv2_method(void)
+ {
++#ifndef OPENSSL_NO_SSL2
+   return MAKE_PTR(SSLv2_method());
++#else
++  uim_notify_fatal(N_("uim-openssl: SSLv2_method() is not supported on this 
system"));
++  return uim_scm_f();
++#endif
+ }
+ static uim_lisp
+ c_SSLv2_server_method(void)
+ {
++#ifndef OPENSSL_NO_SSL2
+   return MAKE_PTR(SSLv2_server_method());
++#else
++  uim_notify_fatal(N_("uim-openssl: SSLv2_server_method() is not supported on 
this system"));
++  return uim_scm_f();
++#endif
+ }
+ static uim_lisp
+ c_SSLv2_client_method(void)
+ {
++#ifndef OPENSSL_NO_SSL2
+   return MAKE_PTR(SSLv2_client_method());
++#else
++  uim_notify_fatal(N_("uim-openssl: SSLv2_client_method() is not supported on 
this system"));
++  return uim_scm_f();
++#endif
+ }
+ 
+ /* SSLv3 */
+ static uim_lisp
+ c_SSLv3_method(void)
+ {
++#ifndef OPENSSL_NO_SSL3
+   return MAKE_PTR(SSLv3_method());
++#else
++  uim_notify_fatal(N_("uim-openssl: SSLv3_method() is not supported on this 
system"));
++  return uim_scm_f();
++#endif
+ }
+ static uim_lisp
+ c_SSLv3_server_method(void)
+ {
++#ifndef OPENSSL_NO_SSL3
+   return MAKE_PTR(SSLv3_server_method());
++#else
++  uim_notify_fatal(N_("uim-openssl: SSLv3_server_method() is not supported on 
this system"));
++  return uim_scm_f();
++#endif
+ }
+ static uim_lisp
+ c_SSLv3_client_method(void)
+ {
++#ifndef OPENSSL_NO_SSL3
+   return MAKE_PTR(SSLv3_client_method());
++#else
++  uim_notify_fatal(N_("uim-openssl: SSLv3_client_method() is not supported on 
this system"));
++  return uim_scm_f();
++#endif
+ }
+ 
+ /* SSLv3 but can rollback to v2 */

diff --git a/app-i18n/uim/uim-1.8.6-r2.ebuild b/app-i18n/uim/uim-1.8.6-r2.ebuild
new file mode 100644
index 000..5b04cfd
--- /dev/null
+++ b/app-i18n/uim/uim-1.8.6-r2.ebuild
@@ -0,0 +1,228 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+inherit autotools eutils multilib elisp-common gnome2-utils
+
+DESCRIPTION="Simple, secure and flexible input method library"
+HOMEPAGE="https://github.com/uim/uim/";
+SRC_URI="https://uim.googlecode.com/files/${P}.tar.bz2";
+
+LICENSE="BSD GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="+anthy canna curl eb emacs expat libffi gtk gtk3 kde libedit libnotify 
libressl m17n-lib ncurses nls qt4 skk sqlite ssl static-libs test unicode X xft 
l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW"
+
+RESTRICT="test"
+
+REQUIRED_USE="gtk? ( X ) qt4? ( X )"
+
+RDEPEND="X? (
+   x11-libs/libX11
+   x11-libs/libXft
+   x11-libs/libXt
+   x11-libs/libICE
+   x11-libs/libSM
+   x11-libs/libXext
+   x11-libs/libXrender
+   )
+   anthy? (
+   unicode? ( >=app-i18n/anthy-8622 )
+   !unicode? ( app-i18n/anthy )
+   )
+   canna? ( app-i18n/canna )
+   curl? ( >=net-misc/curl-7.16.4 )
+   eb? ( dev-libs/eb )
+   emacs? ( virtual/emacs )
+   expat? ( dev-libs/expat )
+   libffi? ( virtual/libffi )
+   gtk? ( >=x11-libs/gtk+-2.4:2 )
+   gtk3? ( x11-libs/gtk+:3 )
+   kde? ( >=kde-base/kdelibs-4 )
+   libedit? ( dev-libs/libedit )
+   libnotify? ( >=x11-libs/libnotify-0.4 )
+   m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 )
+   ncurses? ( sys-libs/ncurses:0= )
+   nls? ( virtual/libintl )
+   qt4? ( dev-qt/qtgui:4[qt3support] )
+   skk? ( app-i18n/skk-jisyo )
+   sqlite? ( dev-db/sqlite:3 )
+   ssl? (
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   )
+   !dev-scheme/sigscheme"
+#  scim? ( >=app-i18n/scim-1.3.0 )