1 |
commit: b3232fc614b18ae0c48ea542a122bc944ed44b65 |
2 |
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Oct 23 14:14:06 2021 +0000 |
4 |
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 23 14:31:48 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3232fc6 |
7 |
|
8 |
app-i18n/uim: tidy |
9 |
|
10 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
11 |
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org> |
12 |
|
13 |
app-i18n/uim/uim-1.8.8-r1.ebuild | 46 +++++++++++++++++----------------------- |
14 |
1 file changed, 19 insertions(+), 27 deletions(-) |
15 |
|
16 |
diff --git a/app-i18n/uim/uim-1.8.8-r1.ebuild b/app-i18n/uim/uim-1.8.8-r1.ebuild |
17 |
index 1c032e933dc..4b72e29cd38 100644 |
18 |
--- a/app-i18n/uim/uim-1.8.8-r1.ebuild |
19 |
+++ b/app-i18n/uim/uim-1.8.8-r1.ebuild |
20 |
@@ -1,7 +1,7 @@ |
21 |
# Copyright 1999-2021 Gentoo Authors |
22 |
# Distributed under the terms of the GNU General Public License v2 |
23 |
|
24 |
-EAPI=7 |
25 |
+EAPI="7" |
26 |
|
27 |
inherit autotools elisp-common flag-o-matic gnome2-utils qmake-utils |
28 |
|
29 |
@@ -19,7 +19,15 @@ REQUIRED_USE="gtk? ( X ) |
30 |
qt5? ( X ) |
31 |
xft? ( X )" |
32 |
|
33 |
-COMMON_DEPEND=" |
34 |
+CDEPEND="X? ( |
35 |
+ x11-libs/libICE |
36 |
+ x11-libs/libSM |
37 |
+ x11-libs/libX11 |
38 |
+ x11-libs/libXext |
39 |
+ x11-libs/libXft |
40 |
+ x11-libs/libXrender |
41 |
+ x11-libs/libXt |
42 |
+ ) |
43 |
anthy? ( app-i18n/anthy ) |
44 |
curl? ( net-misc/curl ) |
45 |
eb? ( dev-libs/eb ) |
46 |
@@ -36,23 +44,10 @@ COMMON_DEPEND=" |
47 |
qt5? ( dev-qt/qtx11extras:5 ) |
48 |
skk? ( app-i18n/skk-jisyo ) |
49 |
sqlite? ( dev-db/sqlite:3 ) |
50 |
- ssl? ( |
51 |
- dev-libs/openssl:0= |
52 |
- ) |
53 |
- X? ( |
54 |
- x11-libs/libICE |
55 |
- x11-libs/libSM |
56 |
- x11-libs/libX11 |
57 |
- x11-libs/libXext |
58 |
- x11-libs/libXft |
59 |
- x11-libs/libXrender |
60 |
- x11-libs/libXt |
61 |
- ) |
62 |
-" |
63 |
-DEPEND="${COMMON_DEPEND} |
64 |
- X? ( x11-base/xorg-proto ) |
65 |
-" |
66 |
-RDEPEND="${COMMON_DEPEND} |
67 |
+ ssl? ( dev-libs/openssl:0= )" |
68 |
+DEPEND="${CDEPEND} |
69 |
+ X? ( x11-base/xorg-proto )" |
70 |
+RDEPEND="${CDEPEND} |
71 |
!dev-scheme/sigscheme |
72 |
X? ( |
73 |
media-fonts/font-sony-misc |
74 |
@@ -75,13 +70,10 @@ RDEPEND="${COMMON_DEPEND} |
75 |
) |
76 |
) |
77 |
l10n_zh-TW? ( media-fonts/intlfonts ) |
78 |
- ) |
79 |
-" |
80 |
-BDEPEND=" |
81 |
- dev-util/intltool |
82 |
+ )" |
83 |
+BDEPEND="dev-util/intltool |
84 |
sys-devel/gettext |
85 |
- virtual/pkgconfig |
86 |
-" |
87 |
+ virtual/pkgconfig" |
88 |
|
89 |
PATCHES=( |
90 |
"${FILESDIR}"/${PN}-gentoo.patch |
91 |
@@ -90,7 +82,6 @@ PATCHES=( |
92 |
"${FILESDIR}"/${PN}-zh-TW.patch |
93 |
"${FILESDIR}"/${P}-fno-common.patch |
94 |
) |
95 |
- |
96 |
DOCS=( AUTHORS NEWS README RELNOTE doc ) |
97 |
|
98 |
AT_NO_RECURSIVE="yes" |
99 |
@@ -166,8 +157,9 @@ src_compile() { |
100 |
default |
101 |
|
102 |
if use emacs; then |
103 |
- cd emacs |
104 |
+ cd emacs || die |
105 |
elisp-compile *.el || die |
106 |
+ cd - >/dev/null || die |
107 |
fi |
108 |
} |