commit: c5b8f5e415ced45eafe9a204b1eb930fb032cdbd
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Mon May 28 13:50:13 2018 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Mon May 28 14:55:56 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5b8f5e4
app-i18n/uim: update to EAPI 6
Package-Manager: Portage-2.3.24, Repoman-2.3.6
app-i18n/uim/files/50uim-gentoo.el | 2 -
app-i18n/uim/metadata.xml | 15 ++-
app-i18n/uim/uim-1.8.6-r1.ebuild | 229 ++++++++++++++++++------------------
app-i18n/uim/uim-1.8.6-r2.ebuild | 231 +++++++++++++++++++------------------
4 files changed, 238 insertions(+), 239 deletions(-)
diff --git a/app-i18n/uim/files/50uim-gentoo.el
b/app-i18n/uim/files/50uim-gentoo.el
index 350f6216139..101505c4bd5 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/metadata.xml b/app-i18n/uim/metadata.xml
index 0e2214531e4..a509c6471ec 100644
--- a/app-i18n/uim/metadata.xml
+++ b/app-i18n/uim/metadata.xml
@@ -6,15 +6,14 @@
<name>Cjk</name>
</maintainer>
<longdescription lang="en">
- uim is a simple, secure and flexible input method library. At the moment
- Anthy, SKK, Prime, T-code, TUT-code (these are Japanese input method),
- Pinyin (Chinese input method), Hangul (Korean input method), IPA
- (International Phonetic Alphabet) are implemented. You can extend the
- library with Scheme thus easily, or with C if it becomes rather complicated.
-</longdescription>
+ uim is a simple, secure and flexible input method library. At the moment
+ Anthy, SKK, Prime, T-code, TUT-code (these are Japanese input method),
+ Pinyin (Chinese input method), Hangul (Korean input method), IPA
+ (International Phonetic Alphabet) are implemented. You can extend the
+ library with Scheme thus easily, or with C if it becomes rather
complicated.
+ </longdescription>
<use>
- <flag name="anthy">Enable support for <pkg>app-i18n/anthy</pkg> input
method
- </flag>
+ <flag name="anthy">Enable support for <pkg>app-i18n/anthy</pkg></flag>
<flag name="eb">Enable support for <pkg>dev-libs/eb</pkg></flag>
<flag name="gtk3">Enable support for <pkg>x11-libs/gtk+</pkg>:3</flag>
<flag name="skk">Enable support for <pkg>app-i18n/skk-jisyo</pkg></flag>
diff --git a/app-i18n/uim/uim-1.8.6-r1.ebuild b/app-i18n/uim/uim-1.8.6-r1.ebuild
index f72b7d26bba..a976c85b750 100644
--- a/app-i18n/uim/uim-1.8.6-r1.ebuild
+++ b/app-i18n/uim/uim-1.8.6-r1.ebuild
@@ -1,150 +1,159 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
-inherit autotools eutils multilib elisp-common gnome2-utils
+EAPI="6"
-DESCRIPTION="Simple, secure and flexible input method library"
-HOMEPAGE="https://github.com/uim/uim/";
+inherit autotools elisp-common gnome2-utils
+
+DESCRIPTION="A multilingual input method framework"
+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 libedit libnotify
m17n-lib ncurses nls qt4 skk sqlite ssl static-libs test unicode X xft l10n_ja
l10n_ko l10n_zh-CN l10n_zh-TW"
-
+IUSE="X +anthy canna curl eb emacs expat libffi gtk gtk3 l10n_ja l10n_ko
l10n_zh-CN l10n_zh-TW libedit libnotify m17n-lib ncurses nls qt4 skk sqlite ssl
static-libs test unicode xft"
RESTRICT="test"
+REQUIRED_USE="gtk? ( X )
+ gtk3? ( X )
+ qt4? ( X )
+ xft? ( X )"
-REQUIRED_USE="gtk? ( X ) qt4? ( X )"
-
-RDEPEND="X? (
- x11-libs/libX11
- x11-libs/libXft
- x11-libs/libXt
+CDEPEND="!dev-scheme/sigscheme
+ X? (
x11-libs/libICE
x11-libs/libSM
+ x11-libs/libX11
x11-libs/libXext
+ x11-libs/libXft
x11-libs/libXrender
+ x11-libs/libXt
)
anthy? (
unicode? ( >=app-i18n/anthy-8622 )
!unicode? ( app-i18n/anthy )
)
canna? ( app-i18n/canna )
- curl? ( >=net-misc/curl-7.16.4 )
+ curl? ( net-misc/curl )
eb? ( dev-libs/eb )
emacs? ( virtual/emacs )
expat? ( dev-libs/expat )
libffi? ( virtual/libffi )
- gtk? ( >=x11-libs/gtk+-2.4:2 )
+ gtk? ( x11-libs/gtk+:2 )
gtk3? ( x11-libs/gtk+:3 )
libedit? ( dev-libs/libedit )
- libnotify? ( >=x11-libs/libnotify-0.4 )
- m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 )
+ libnotify? ( x11-libs/libnotify )
+ m17n-lib? ( dev-libs/m17n-lib )
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? ( dev-libs/openssl:0 )
- !dev-scheme/sigscheme"
-# scim? ( >=app-i18n/scim-1.3.0 ) # broken
-# wnn? ( app-i18n/wnn )
-
-DEPEND="${RDEPEND}
+ ssl? ( dev-libs/openssl:0 )"
+DEPEND="${CDEPEND}
dev-util/intltool
+ sys-devel/gettext
virtual/pkgconfig
- >=sys-devel/gettext-0.15
X? ( x11-base/xorg-proto )"
-
-RDEPEND="${RDEPEND}
+RDEPEND="${CDEPEND}
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_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? ( media-fonts/intlfonts )
)"
-# test? ( dev-scheme/gauche )
-SITEFILE=50${PN}-gentoo.el
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.6.0-gentoo.patch
+ "${FILESDIR}"/${PN}-1.5.4-zhTW.patch
+)
+DOCS=( AUTHORS NEWS README RELNOTE )
-pkg_setup() {
- strip-linguas fr ja ko
- if [[ -z "${LINGUAS}" ]]; then
- # no linguas set, using the default one
- LINGUAS=" "
- fi
-}
+AT_NO_RECURSIVE="yes"
+SITEFILE="50${PN}-gentoo.el"
src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-1.6.0-gentoo.patch \
- "${FILESDIR}"/${PN}-1.5.4-zhTW.patch
-
- # bug 275420
- sed -i -e "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac || die
"sed failed!"
+ default
+ sed -i "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac
- AT_NO_RECURSIVE=1 eautoreconf
+ eautoreconf
}
src_configure() {
- local myconf
+ local myconf=(
+ $(use_with X x)
+ $(use_with canna)
+ $(use_with curl)
+ $(use_with eb)
+ $(use_enable emacs)
+ $(use_with emacs lispdir "${SITELISP}")
+ $(use_with expat)
+ $(use_with libedit)
+ $(use_with libffi ffi)
+ $(use_with gtk gtk2)
+ $(use_with gtk3)
+ $(use_with m17n-lib m17nlib)
+ $(use_enable ncurses fep)
+ $(use_enable nls)
+ $(use_with qt4 qt4)
+ $(use_with qt4 qt4-immodule)
+ $(use_enable qt4 qt4-qt3support)
+ $(use_with skk)
+ $(use_with sqlite sqlite3)
+ $(use_enable ssl openssl)
+ $(use_enable static-libs static)
+ $(use_with xft)
+ --disable-gnome-applet
+ --disable-gnome3-applet
+ --disable-kde-applet
+ --disable-kde4-applet
+ --without-mana
+ --without-prime
+ )
- if (use gtk || use gtk3) && (use anthy || use canna) ; then
- myconf="${myconf} --enable-dict"
+ if use anthy; then
+ if use unicode; then
+ myconf+=( --with-anthy-utf8 )
+ else
+ myconf+=( --with-anthy )
+ fi
else
- myconf="${myconf} --disable-dict"
+ myconf+=( --without-anthy )
fi
- if use gtk || use gtk3 || use qt4 ; then
- myconf="${myconf} --enable-pref"
+ if (use gtk || use gtk3) && (use anthy || use canna); then
+ myconf+=( --enable-dict )
else
- myconf="${myconf} --disable-pref"
+ myconf+=( --disable-dict )
fi
- if use anthy ; then
- if use unicode ; then
- myconf="${myconf} --with-anthy-utf8"
- else
- myconf="${myconf} --with-anthy"
- fi
- else
- myconf="${myconf} --without-anthy"
+ if use libnotify; then
+ myconf+=( --enable-notify=libnotify )
fi
- if use libnotify ; then
- myconf="${myconf} --enable-notify=libnotify"
+ if use gtk || use gtk3 || use qt4; then
+ myconf+=( --enable-pref )
+ else
+ myconf+=( --disable-pref )
fi
- econf $(use_with X x) \
- $(use_with canna) \
- $(use_with curl) \
- $(use_with eb) \
- $(use_enable emacs) \
- $(use_with emacs lispdir "${SITELISP}") \
- $(use_with expat) \
- $(use_with libffi ffi) \
- --disable-gnome-applet \
- $(use_with gtk gtk2) \
- $(use_with gtk3) \
- $(use_with libedit) \
- --disable-kde-applet \
- --disable-kde4-applet \
- $(use_with m17n-lib m17nlib) \
- $(use_enable ncurses fep) \
- $(use_enable nls) \
- --without-qt \
- --without-qt-immodule \
- $(use_with qt4 qt4) \
- $(use_with qt4 qt4-immodule) \
- $(use_enable qt4 qt4-qt3support) \
- $(use_with skk) \
- $(use_with sqlite sqlite3) \
- $(use_enable ssl openssl) \
- $(use_enable static-libs static) \
- $(use_with xft) \
- ${myconf}
+ econf "${myconf[@]}"
}
src_compile() {
@@ -152,36 +161,31 @@ src_compile() {
if use emacs; then
cd emacs
- elisp-compile *.el || die "elisp-compile failed!"
+ elisp-compile *.el || die
fi
}
src_install() {
- # parallel make install b0rked, bug #222677
- emake -j1 INSTALL_ROOT="${D}" DESTDIR="${D}" install
+ # bug #222677
+ emake -j1 DESTDIR="${D}" install
+ einstalldocs
- dodoc AUTHORS ChangeLog* NEWS README RELNOTE
- if use emacs; then
- elisp-install uim-el emacs/*.elc || die "elisp-install failed!"
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" uim-el \
- || die "elisp-site-file-install failed!"
- fi
-
- find "${ED}/usr/$(get_libdir)/uim" -name '*.la' -exec rm {} +
- use static-libs || find "${ED}" -name '*.la' -exec rm {} +
+ find "${ED}"/usr/$(get_libdir)/${PN} -name '*.la' -delete || die
+ use static-libs || find "${ED}" -name '*.la' -delete || die
- sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-uim" >
"${T}/uim.conf" || die "sed failed!"
insinto /etc/X11/xinit/xinput.d
- doins "${T}/uim.conf"
+ sed \
+ -e "s:@EPREFIX@:${EPREFIX}:g" \
+ "${FILESDIR}"/xinput-${PN} > "${T}"/${PN}.conf
+ doins "${T}"/${PN}.conf
- # collision with dev-scheme/sigscheme, bug #330975
- # find "${ED}" -name '*gcroots*' -delete || die
-
- #rmdir "${ED}"/usr/share/doc/sigscheme || die
+ if use emacs; then
+ elisp-install ${PN}-el emacs/*.el{,c}
+ elisp-site-file-install "${FILESDIR}"/${SITEFILE} ${PN}-el
+ fi
}
pkg_postinst() {
- elog
elog "New input method switcher has been introduced. You need to set"
elog
elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE"
@@ -194,12 +198,7 @@ pkg_postinst() {
elog
elog "All input methods can be found by running uim-im-switcher-gtk, "
elog "uim-im-switcher-gtk3 or uim-im-switcher-qt4."
- elog
- elog "If you upgrade from a version of uim older than 1.4.0,"
- elog "you should run revdep-rebuild."
- use gtk && gnome2_query_immodules_gtk2
- use gtk3 && gnome2_query_immodules_gtk3
if use emacs; then
elisp-site-regen
echo
@@ -209,10 +208,12 @@ pkg_postinst() {
elog "Integration with LEIM is not done with this ebuild,
please have"
elog "a look at the documentation how to achieve this."
fi
+ use gtk && gnome2_query_immodules_gtk2
+ use gtk3 && gnome2_query_immodules_gtk3
}
pkg_postrm() {
+ use emacs && elisp-site-regen
use gtk && gnome2_query_immodules_gtk2
use gtk3 && gnome2_query_immodules_gtk3
- use emacs && elisp-site-regen
}
diff --git a/app-i18n/uim/uim-1.8.6-r2.ebuild b/app-i18n/uim/uim-1.8.6-r2.ebuild
index cac96b004b7..35e99a234b8 100644
--- a/app-i18n/uim/uim-1.8.6-r2.ebuild
+++ b/app-i18n/uim/uim-1.8.6-r2.ebuild
@@ -1,46 +1,49 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
-inherit autotools eutils multilib elisp-common gnome2-utils
+EAPI="6"
-DESCRIPTION="Simple, secure and flexible input method library"
-HOMEPAGE="https://github.com/uim/uim/";
+inherit autotools elisp-common gnome2-utils
+
+DESCRIPTION="A multilingual input method framework"
+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 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"
-
+IUSE="X +anthy canna curl eb emacs expat libffi gtk gtk3 l10n_ja l10n_ko
l10n_zh-CN l10n_zh-TW libedit libnotify libressl m17n-lib ncurses nls qt4 skk
sqlite ssl static-libs test unicode xft"
RESTRICT="test"
+REQUIRED_USE="gtk? ( X )
+ gtk3? ( X )
+ qt4? ( X )
+ xft? ( X )"
-REQUIRED_USE="gtk? ( X ) qt4? ( X )"
-
-RDEPEND="X? (
- x11-libs/libX11
- x11-libs/libXft
- x11-libs/libXt
+CDEPEND="!dev-scheme/sigscheme
+ X? (
x11-libs/libICE
x11-libs/libSM
+ x11-libs/libX11
x11-libs/libXext
+ x11-libs/libXft
x11-libs/libXrender
+ x11-libs/libXt
)
anthy? (
unicode? ( >=app-i18n/anthy-8622 )
!unicode? ( app-i18n/anthy )
)
canna? ( app-i18n/canna )
- curl? ( >=net-misc/curl-7.16.4 )
+ curl? ( net-misc/curl )
eb? ( dev-libs/eb )
emacs? ( virtual/emacs )
expat? ( dev-libs/expat )
libffi? ( virtual/libffi )
- gtk? ( >=x11-libs/gtk+-2.4:2 )
+ gtk? ( x11-libs/gtk+:2 )
gtk3? ( x11-libs/gtk+:3 )
libedit? ( dev-libs/libedit )
- libnotify? ( >=x11-libs/libnotify-0.4 )
- m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 )
+ libnotify? ( x11-libs/libnotify )
+ m17n-lib? ( dev-libs/m17n-lib )
ncurses? ( sys-libs/ncurses:0= )
nls? ( virtual/libintl )
qt4? ( dev-qt/qtgui:4[qt3support] )
@@ -49,106 +52,112 @@ RDEPEND="X? (
ssl? (
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
- )
- !dev-scheme/sigscheme"
-# scim? ( >=app-i18n/scim-1.3.0 ) # broken
-# wnn? ( app-i18n/wnn )
-
-DEPEND="${RDEPEND}
+ )"
+DEPEND="${CDEPEND}
dev-util/intltool
+ sys-devel/gettext
virtual/pkgconfig
- >=sys-devel/gettext-0.15
X? ( x11-base/xorg-proto )"
-
-RDEPEND="${RDEPEND}
+RDEPEND="${CDEPEND}
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_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? ( media-fonts/intlfonts )
)"
-# test? ( dev-scheme/gauche )
-SITEFILE=50${PN}-gentoo.el
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.6.0-gentoo.patch
+ "${FILESDIR}"/${PN}-1.5.4-zhTW.patch
+ "${FILESDIR}"/${P}-libressl.patch
+)
+DOCS=( AUTHORS NEWS README RELNOTE )
-pkg_setup() {
- strip-linguas fr ja ko
- if [[ -z "${LINGUAS}" ]]; then
- # no linguas set, using the default one
- LINGUAS=" "
- fi
-}
+AT_NO_RECURSIVE="yes"
+SITEFILE="50${PN}-gentoo.el"
src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-1.6.0-gentoo.patch \
- "${FILESDIR}"/${PN}-1.5.4-zhTW.patch \
- "${FILESDIR}"/${P}-libressl.patch
-
- # bug 275420
- sed -i -e "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac || die
"sed failed!"
+ default
+ sed -i "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac
- AT_NO_RECURSIVE=1 eautoreconf
+ eautoreconf
}
src_configure() {
- local myconf
+ local myconf=(
+ $(use_with X x)
+ $(use_with canna)
+ $(use_with curl)
+ $(use_with eb)
+ $(use_enable emacs)
+ $(use_with emacs lispdir "${SITELISP}")
+ $(use_with expat)
+ $(use_with libedit)
+ $(use_with libffi ffi)
+ $(use_with gtk gtk2)
+ $(use_with gtk3)
+ $(use_with m17n-lib m17nlib)
+ $(use_enable ncurses fep)
+ $(use_enable nls)
+ $(use_with qt4 qt4)
+ $(use_with qt4 qt4-immodule)
+ $(use_enable qt4 qt4-qt3support)
+ $(use_with skk)
+ $(use_with sqlite sqlite3)
+ $(use_enable ssl openssl)
+ $(use_enable static-libs static)
+ $(use_with xft)
+ --disable-gnome-applet
+ --disable-gnome3-applet
+ --disable-kde-applet
+ --disable-kde4-applet
+ --without-mana
+ --without-prime
+ )
- if (use gtk || use gtk3) && (use anthy || use canna) ; then
- myconf="${myconf} --enable-dict"
+ if use anthy; then
+ if use unicode; then
+ myconf+=( --with-anthy-utf8 )
+ else
+ myconf+=( --with-anthy )
+ fi
else
- myconf="${myconf} --disable-dict"
+ myconf+=( --without-anthy )
fi
- if use gtk || use gtk3 || use qt4 ; then
- myconf="${myconf} --enable-pref"
+ if (use gtk || use gtk3) && (use anthy || use canna); then
+ myconf+=( --enable-dict )
else
- myconf="${myconf} --disable-pref"
+ myconf+=( --disable-dict )
fi
- if use anthy ; then
- if use unicode ; then
- myconf="${myconf} --with-anthy-utf8"
- else
- myconf="${myconf} --with-anthy"
- fi
- else
- myconf="${myconf} --without-anthy"
+ if use libnotify; then
+ myconf+=( --enable-notify=libnotify )
fi
- if use libnotify ; then
- myconf="${myconf} --enable-notify=libnotify"
+ if use gtk || use gtk3 || use qt4; then
+ myconf+=( --enable-pref )
+ else
+ myconf+=( --disable-pref )
fi
- econf $(use_with X x) \
- $(use_with canna) \
- $(use_with curl) \
- $(use_with eb) \
- $(use_enable emacs) \
- $(use_with emacs lispdir "${SITELISP}") \
- $(use_with expat) \
- $(use_with libffi ffi) \
- --disable-gnome-applet \
- $(use_with gtk gtk2) \
- $(use_with gtk3) \
- $(use_with libedit) \
- --disable-kde-applet \
- --disable-kde4-applet \
- $(use_with m17n-lib m17nlib) \
- $(use_enable ncurses fep) \
- $(use_enable nls) \
- --without-qt \
- --without-qt-immodule \
- $(use_with qt4 qt4) \
- $(use_with qt4 qt4-immodule) \
- $(use_enable qt4 qt4-qt3support) \
- $(use_with skk) \
- $(use_with sqlite sqlite3) \
- $(use_enable ssl openssl) \
- $(use_enable static-libs static) \
- $(use_with xft) \
- ${myconf}
+ econf "${myconf[@]}"
}
src_compile() {
@@ -156,36 +165,31 @@ src_compile() {
if use emacs; then
cd emacs
- elisp-compile *.el || die "elisp-compile failed!"
+ elisp-compile *.el || die
fi
}
src_install() {
- # parallel make install b0rked, bug #222677
- emake -j1 INSTALL_ROOT="${D}" DESTDIR="${D}" install
+ # bug #222677
+ emake -j1 DESTDIR="${D}" install
+ einstalldocs
- dodoc AUTHORS ChangeLog* NEWS README RELNOTE
- if use emacs; then
- elisp-install uim-el emacs/*.elc || die "elisp-install failed!"
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" uim-el \
- || die "elisp-site-file-install failed!"
- fi
-
- find "${ED}/usr/$(get_libdir)/uim" -name '*.la' -exec rm {} +
- use static-libs || find "${ED}" -name '*.la' -exec rm {} +
+ find "${ED}"/usr/$(get_libdir)/${PN} -name '*.la' -delete || die
+ use static-libs || find "${ED}" -name '*.la' -delete || die
- sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-uim" >
"${T}/uim.conf" || die "sed failed!"
insinto /etc/X11/xinit/xinput.d
- doins "${T}/uim.conf"
+ sed \
+ -e "s:@EPREFIX@:${EPREFIX}:g" \
+ "${FILESDIR}"/xinput-${PN} > "${T}"/${PN}.conf
+ doins "${T}"/${PN}.conf
- # collision with dev-scheme/sigscheme, bug #330975
- # find "${ED}" -name '*gcroots*' -delete || die
-
- #rmdir "${ED}"/usr/share/doc/sigscheme || die
+ if use emacs; then
+ elisp-install ${PN}-el emacs/*.el{,c}
+ elisp-site-file-install "${FILESDIR}"/${SITEFILE} ${PN}-el
+ fi
}
pkg_postinst() {
- elog
elog "New input method switcher has been introduced. You need to set"
elog
elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE"
@@ -198,12 +202,7 @@ pkg_postinst() {
elog
elog "All input methods can be found by running uim-im-switcher-gtk, "
elog "uim-im-switcher-gtk3 or uim-im-switcher-qt4."
- elog
- elog "If you upgrade from a version of uim older than 1.4.0,"
- elog "you should run revdep-rebuild."
- use gtk && gnome2_query_immodules_gtk2
- use gtk3 && gnome2_query_immodules_gtk3
if use emacs; then
elisp-site-regen
echo
@@ -213,10 +212,12 @@ pkg_postinst() {
elog "Integration with LEIM is not done with this ebuild,
please have"
elog "a look at the documentation how to achieve this."
fi
+ use gtk && gnome2_query_immodules_gtk2
+ use gtk3 && gnome2_query_immodules_gtk3
}
pkg_postrm() {
+ use emacs && elisp-site-regen
use gtk && gnome2_query_immodules_gtk2
use gtk3 && gnome2_query_immodules_gtk3
- use emacs && elisp-site-regen
}
