summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2013-09-07 08:10:13 +0000
committerPacho Ramos <pacho@gentoo.org>2013-09-07 08:10:13 +0000
commit5993094e1176e1458fd65ee25282786821e9c2df (patch)
tree57984c23bd65af3b2a0745194ac9a60ad2de2e0a /app-i18n/uim/uim-1.8.0-r1.ebuild
parentdon't expand path variables in configure.in, thanks to vapier for pointing it... (diff)
downloadhistorical-5993094e1176e1458fd65ee25282786821e9c2df.tar.gz
historical-5993094e1176e1458fd65ee25282786821e9c2df.tar.bz2
historical-5993094e1176e1458fd65ee25282786821e9c2df.zip
Use query-immodules from eclass to inherit fixes and changes from there
Package-Manager: portage-2.2.1/cvs/Linux x86_64 Manifest-Sign-Key: 0xA188FBD4
Diffstat (limited to 'app-i18n/uim/uim-1.8.0-r1.ebuild')
-rw-r--r--app-i18n/uim/uim-1.8.0-r1.ebuild31
1 files changed, 6 insertions, 25 deletions
diff --git a/app-i18n/uim/uim-1.8.0-r1.ebuild b/app-i18n/uim/uim-1.8.0-r1.ebuild
index 5d8f27c87734..22bea804756d 100644
--- a/app-i18n/uim/uim-1.8.0-r1.ebuild
+++ b/app-i18n/uim/uim-1.8.0-r1.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.8.0-r1.ebuild,v 1.1 2013/04/06 02:45:32 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.8.0-r1.ebuild,v 1.2 2013/09/07 08:10:08 pacho Exp $
EAPI="4"
-inherit autotools eutils multilib elisp-common flag-o-matic
+inherit autotools eutils multilib elisp-common flag-o-matic gnome2-utils
DESCRIPTION="Simple, secure and flexible input method library"
HOMEPAGE="http://code.google.com/p/uim/"
@@ -92,25 +92,6 @@ RDEPEND="${RDEPEND}
SITEFILE=50${PN}-gentoo.el
-update_gtk_immodules() {
- local GTK2_CONFDIR="/etc/gtk-2.0"
- # bug #366889
- if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then
- GTK2_CONFDIR="${GTK2_CONFDIR}/$(get_abi_CHOST)"
- fi
- mkdir -p "${EPREFIX}${GTK2_CONFDIR}"
-
- if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" ] ; then
- "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" > "${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
- fi
-}
-
-update_gtk3_immodules() {
- if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" ] ; then
- "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" --update-cache
- fi
-}
-
pkg_setup() {
strip-linguas fr ja ko
if [[ -z "${LINGUAS}" ]]; then
@@ -250,8 +231,8 @@ pkg_postinst() {
elog "If you upgrade from a version of uim older than 1.4.0,"
elog "you should run revdep-rebuild."
- use gtk && update_gtk_immodules
- use gtk3 && update_gtk3_immodules
+ use gtk && gnome2_query_immodules_gtk2
+ use gtk3 && gnome2_query_immodules_gtk3
if use emacs; then
elisp-site-regen
echo
@@ -264,7 +245,7 @@ pkg_postinst() {
}
pkg_postrm() {
- use gtk && update_gtk_immodules
- use gtk3 && update_gtk3_immodules
+ use gtk && gnome2_query_immodules_gtk2
+ use gtk3 && gnome2_query_immodules_gtk3
use emacs && elisp-site-regen
}