| 1 |
commit: 7def0ba1bb0def667a74e7298fb877bd86ed7c23 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 7 22:10:40 2021 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 7 23:56:49 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7def0ba1 |
| 7 |
|
| 8 |
app-i18n/uim: EAPI-7, use qmake-utils, sort some deps |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/764329 |
| 11 |
Closes: https://bugs.gentoo.org/712098 |
| 12 |
Package-Manager: Portage-3.0.12, Repoman-3.0.2 |
| 13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 14 |
|
| 15 |
app-i18n/uim/uim-1.8.8.ebuild | 54 +++++++++++++++++++++++++------------------ |
| 16 |
1 file changed, 31 insertions(+), 23 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-i18n/uim/uim-1.8.8.ebuild b/app-i18n/uim/uim-1.8.8.ebuild |
| 19 |
index 3ed23be0370..2f6435d4dcf 100644 |
| 20 |
--- a/app-i18n/uim/uim-1.8.8.ebuild |
| 21 |
+++ b/app-i18n/uim/uim-1.8.8.ebuild |
| 22 |
@@ -1,9 +1,9 @@ |
| 23 |
-# Copyright 1999-2020 Gentoo Authors |
| 24 |
+# Copyright 1999-2021 Gentoo Authors |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
|
| 27 |
-EAPI="6" |
| 28 |
+EAPI=7 |
| 29 |
|
| 30 |
-inherit autotools elisp-common flag-o-matic gnome2-utils |
| 31 |
+inherit autotools elisp-common flag-o-matic gnome2-utils qmake-utils |
| 32 |
|
| 33 |
DESCRIPTION="A multilingual input method framework" |
| 34 |
HOMEPAGE="https://github.com/uim/uim" |
| 35 |
@@ -19,26 +19,17 @@ REQUIRED_USE="gtk? ( X ) |
| 36 |
qt5? ( X ) |
| 37 |
xft? ( X )" |
| 38 |
|
| 39 |
-CDEPEND="!dev-scheme/sigscheme |
| 40 |
- X? ( |
| 41 |
- x11-libs/libICE |
| 42 |
- x11-libs/libSM |
| 43 |
- x11-libs/libX11 |
| 44 |
- x11-libs/libXext |
| 45 |
- x11-libs/libXft |
| 46 |
- x11-libs/libXrender |
| 47 |
- x11-libs/libXt |
| 48 |
- ) |
| 49 |
+COMMON_DEPEND=" |
| 50 |
anthy? ( app-i18n/anthy ) |
| 51 |
canna? ( app-i18n/canna ) |
| 52 |
curl? ( net-misc/curl ) |
| 53 |
eb? ( dev-libs/eb ) |
| 54 |
emacs? ( >=app-editors/emacs-23.1:* ) |
| 55 |
expat? ( dev-libs/expat ) |
| 56 |
- libffi? ( dev-libs/libffi:= ) |
| 57 |
gtk? ( x11-libs/gtk+:3 ) |
| 58 |
gtk2? ( x11-libs/gtk+:2 ) |
| 59 |
libedit? ( dev-libs/libedit ) |
| 60 |
+ libffi? ( dev-libs/libffi:= ) |
| 61 |
libnotify? ( x11-libs/libnotify ) |
| 62 |
m17n-lib? ( dev-libs/m17n-lib ) |
| 63 |
ncurses? ( sys-libs/ncurses:0= ) |
| 64 |
@@ -49,13 +40,22 @@ CDEPEND="!dev-scheme/sigscheme |
| 65 |
ssl? ( |
| 66 |
!libressl? ( dev-libs/openssl:0= ) |
| 67 |
libressl? ( dev-libs/libressl:0= ) |
| 68 |
- )" |
| 69 |
-DEPEND="${CDEPEND} |
| 70 |
- dev-util/intltool |
| 71 |
- sys-devel/gettext |
| 72 |
- virtual/pkgconfig |
| 73 |
- X? ( x11-base/xorg-proto )" |
| 74 |
-RDEPEND="${CDEPEND} |
| 75 |
+ ) |
| 76 |
+ X? ( |
| 77 |
+ x11-libs/libICE |
| 78 |
+ x11-libs/libSM |
| 79 |
+ x11-libs/libX11 |
| 80 |
+ x11-libs/libXext |
| 81 |
+ x11-libs/libXft |
| 82 |
+ x11-libs/libXrender |
| 83 |
+ x11-libs/libXt |
| 84 |
+ ) |
| 85 |
+" |
| 86 |
+DEPEND="${COMMON_DEPEND} |
| 87 |
+ X? ( x11-base/xorg-proto ) |
| 88 |
+" |
| 89 |
+RDEPEND="${COMMON_DEPEND} |
| 90 |
+ !dev-scheme/sigscheme |
| 91 |
X? ( |
| 92 |
media-fonts/font-sony-misc |
| 93 |
l10n_ja? ( |
| 94 |
@@ -77,7 +77,13 @@ RDEPEND="${CDEPEND} |
| 95 |
) |
| 96 |
) |
| 97 |
l10n_zh-TW? ( media-fonts/intlfonts ) |
| 98 |
- )" |
| 99 |
+ ) |
| 100 |
+" |
| 101 |
+BDEPEND=" |
| 102 |
+ dev-util/intltool |
| 103 |
+ sys-devel/gettext |
| 104 |
+ virtual/pkgconfig |
| 105 |
+" |
| 106 |
|
| 107 |
PATCHES=( |
| 108 |
"${FILESDIR}"/${PN}-gentoo.patch |
| 109 |
@@ -86,6 +92,7 @@ PATCHES=( |
| 110 |
"${FILESDIR}"/${PN}-zh-TW.patch |
| 111 |
"${FILESDIR}"/${P}-fno-common.patch |
| 112 |
) |
| 113 |
+ |
| 114 |
DOCS=( AUTHORS NEWS README RELNOTE doc ) |
| 115 |
|
| 116 |
AT_NO_RECURSIVE="yes" |
| 117 |
@@ -121,6 +128,7 @@ src_configure() { |
| 118 |
$(use_enable nls) |
| 119 |
$(use_with qt5) |
| 120 |
$(use_with qt5 qt5-immodule) |
| 121 |
+ _QMAKE5=$(qt5_get_bindir)/qmake |
| 122 |
$(use_with skk) |
| 123 |
$(use_with sqlite sqlite3) |
| 124 |
$(use_enable ssl openssl) |
| 125 |
@@ -214,7 +222,7 @@ pkg_postinst() { |
| 126 |
|
| 127 |
if use emacs; then |
| 128 |
elisp-site-regen |
| 129 |
- echo |
| 130 |
+ elog |
| 131 |
elog "uim is autoloaded with Emacs with a minimal set of features:" |
| 132 |
elog "There is no keybinding defined to call it directly, so please" |
| 133 |
elog "create one yourself and choose an input method." |
Archives