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

[Akinori Hattori]

commit:     b3232fc614b18ae0c48ea542a122bc944ed44b65
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 23 14:14:06 2021 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Oct 23 14:31:48 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3232fc6

app-i18n/uim: tidy

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

 app-i18n/uim/uim-1.8.8-r1.ebuild | 46 +++++++++++++++++-----------------------
 1 file changed, 19 insertions(+), 27 deletions(-)

diff --git a/app-i18n/uim/uim-1.8.8-r1.ebuild b/app-i18n/uim/uim-1.8.8-r1.ebuild
index 1c032e933dc..4b72e29cd38 100644
--- a/app-i18n/uim/uim-1.8.8-r1.ebuild
+++ b/app-i18n/uim/uim-1.8.8-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="7"
 
 inherit autotools elisp-common flag-o-matic gnome2-utils qmake-utils
 
@@ -19,7 +19,15 @@ REQUIRED_USE="gtk? ( X )
        qt5? ( X )
        xft? ( X )"
 
-COMMON_DEPEND="
+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 )
@@ -36,23 +44,10 @@ COMMON_DEPEND="
        qt5? ( dev-qt/qtx11extras:5 )
        skk? ( app-i18n/skk-jisyo )
        sqlite? ( dev-db/sqlite:3 )
-       ssl? (
-               dev-libs/openssl:0=
-       )
-       X? (
-               x11-libs/libICE
-               x11-libs/libSM
-               x11-libs/libX11
-               x11-libs/libXext
-               x11-libs/libXft
-               x11-libs/libXrender
-               x11-libs/libXt
-       )
-"
-DEPEND="${COMMON_DEPEND}
-       X? ( x11-base/xorg-proto )
-"
-RDEPEND="${COMMON_DEPEND}
+       ssl? ( dev-libs/openssl:0= )"
+DEPEND="${CDEPEND}
+       X? ( x11-base/xorg-proto )"
+RDEPEND="${CDEPEND}
        !dev-scheme/sigscheme
        X? (
                media-fonts/font-sony-misc
@@ -75,13 +70,10 @@ RDEPEND="${COMMON_DEPEND}
                        )
                )
                l10n_zh-TW? ( media-fonts/intlfonts )
-       )
-"
-BDEPEND="
-       dev-util/intltool
+       )"
+BDEPEND="dev-util/intltool
        sys-devel/gettext
-       virtual/pkgconfig
-"
+       virtual/pkgconfig"
 
 PATCHES=(
        "${FILESDIR}"/${PN}-gentoo.patch
@@ -90,7 +82,6 @@ PATCHES=(
        "${FILESDIR}"/${PN}-zh-TW.patch
        "${FILESDIR}"/${P}-fno-common.patch
 )
-
 DOCS=( AUTHORS NEWS README RELNOTE doc )
 
 AT_NO_RECURSIVE="yes"
@@ -166,8 +157,9 @@ src_compile() {
        default
 
        if use emacs; then
-               cd emacs
+               cd emacs || die
                elisp-compile *.el || die
+               cd - >/dev/null || die
        fi
 }