* [gentoo-commits] gentoo-x86 commit in app-i18n/uim: ChangeLog uim-1.7.1-r1.ebuild uim-1.7.0.ebuild
@ 2011-12-21 17:39 Matsuu Takuto (matsuu)
0 siblings, 0 replies; only message in thread
From: Matsuu Takuto (matsuu) @ 2011-12-21 17:39 UTC (permalink / raw
To: gentoo-commits
matsuu 11/12/21 17:39:41
Modified: ChangeLog
Added: uim-1.7.1-r1.ebuild
Removed: uim-1.7.0.ebuild
Log:
Added $(use_enable qt4 qt4-qt3support), bug #282922. Added REQUIRED_USE, bug #383389.
(Portage version: 2.1.10.41/cvs/Linux x86_64)
Revision Changes Path
1.237 app-i18n/uim/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/uim/ChangeLog?rev=1.237&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/uim/ChangeLog?rev=1.237&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/uim/ChangeLog?r1=1.236&r2=1.237
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -r1.236 -r1.237
--- ChangeLog 28 Sep 2011 10:59:35 -0000 1.236
+++ ChangeLog 21 Dec 2011 17:39:41 -0000 1.237
@@ -1,6 +1,13 @@
# ChangeLog for app-i18n/uim
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.236 2011/09/28 10:59:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.237 2011/12/21 17:39:41 matsuu Exp $
+
+*uim-1.7.1-r1 (21 Dec 2011)
+
+ 21 Dec 2011; MATSUU Takuto <matsuu@gentoo.org> -uim-1.7.0.ebuild,
+ +uim-1.7.1-r1.ebuild, +files/uim-1.7.1-qt4.patch:
+ Added $(use_enable qt4 qt4-qt3support), bug #282922. Added REQUIRED_USE, bug
+ #383389. Removed old version.
28 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> uim-1.6.1.ebuild,
uim-1.7.0.ebuild, uim-1.7.1.ebuild, metadata.xml:
1.1 app-i18n/uim/uim-1.7.1-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/uim/uim-1.7.1-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/uim/uim-1.7.1-r1.ebuild?rev=1.1&content-type=text/plain
Index: uim-1.7.1-r1.ebuild
===================================================================
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.7.1-r1.ebuild,v 1.1 2011/12/21 17:39:41 matsuu Exp $
EAPI="4"
inherit autotools eutils multilib elisp-common flag-o-matic
DESCRIPTION="Simple, secure and flexible input method library"
HOMEPAGE="http://code.google.com/p/uim/"
SRC_URI="http://uim.googlecode.com/files/${P}.tar.bz2"
LICENSE="BSD GPL-2 LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
IUSE="+anthy canna curl eb emacs libffi gnome gtk gtk3 kde libedit libnotify m17n-lib ncurses nls prime qt4 skk sqlite ssl static-libs test unicode X xft linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko"
RESTRICT="test"
REQUIRED_USE="gtk? ( X ) qt4? ( X )"
RDEPEND="X? (
x11-libs/libX11
x11-libs/libXft
x11-libs/libXt
x11-libs/libICE
x11-libs/libSM
x11-libs/libXext
x11-libs/libXrender
)
anthy? (
unicode? ( >=app-i18n/anthy-8622 )
!unicode? ( app-i18n/anthy )
)
canna? ( app-i18n/canna )
curl? ( >=net-misc/curl-7.16.4 )
eb? ( dev-libs/eb )
emacs? ( virtual/emacs )
libffi? ( virtual/libffi )
gnome? ( >=gnome-base/gnome-panel-2.14 )
gtk? ( >=x11-libs/gtk+-2.4:2 )
gtk3? ( x11-libs/gtk+:3 )
kde? ( >=kde-base/kdelibs-4 )
libedit? ( dev-libs/libedit )
libnotify? ( >=x11-libs/libnotify-0.4 )
m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 )
ncurses? ( sys-libs/ncurses )
nls? ( virtual/libintl )
prime? ( app-i18n/prime )
qt4? ( x11-libs/qt-gui:4[qt3support] )
skk? ( app-i18n/skk-jisyo )
sqlite? ( dev-db/sqlite:3 )
ssl? ( dev-libs/openssl )
!dev-scheme/sigscheme
!app-i18n/uim-svn
!<app-i18n/prime-0.9.4"
# >=dev-scheme/sigscheme-0.8.5
# mana? ( app-i18n/mana )
# scim? ( >=app-i18n/scim-1.3.0 ) # broken
# sj3? ( >=app-i18n/sj3-2.0.1.21 )
# wnn? ( app-i18n/wnn )
# gnome? (
# gtk? ( >=gnome-base/gnome-panel-2.14 )
# gtk3? ( >=gnome-base/gnome-panel-3 )
# )
DEPEND="${RDEPEND}
dev-util/pkgconfig
>=sys-devel/gettext-0.15
kde? ( dev-util/cmake )
X? (
x11-proto/xextproto
x11-proto/xproto
)"
RDEPEND="${RDEPEND}
X? (
media-fonts/font-sony-misc
linguas_zh_CN? (
|| ( media-fonts/font-isas-misc media-fonts/intlfonts )
)
linguas_zh_TW? (
media-fonts/intlfonts
)
linguas_ja? (
|| ( media-fonts/font-jis-misc media-fonts/intlfonts )
)
linguas_ko? (
|| ( media-fonts/font-daewoo-misc media-fonts/intlfonts )
)
)"
# test? ( dev-scheme/gauche )
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
}
src_prepare() {
epatch \
"${FILESDIR}"/${PN}-1.7.1-qt4.patch \
"${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
echo "QMAKE_LFLAGS = ${LDFLAGS}" >> qt4/common.pro.in || die
#./autogen.sh
AT_NO_RECURSIVE=1 eautoreconf
}
src_configure() {
local myconf
if (use gtk || use gtk3) && (use anthy || use canna) ; then
myconf="${myconf} --enable-dict"
else
myconf="${myconf} --disable-dict"
fi
if use gtk || use gtk3 || use qt4 ; then
myconf="${myconf} --enable-pref"
else
myconf="${myconf} --disable-pref"
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"
fi
if use libnotify ; then
myconf="${myconf} --enable-notify=libnotify"
fi
#if use gnome ; then
# myconf="${myconf} $(use_enable gtk gnome-applet)"
# myconf="${myconf} $(use_enable gtk3 gnome3-applet)"
#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 libffi ffi) \
$(use_enable gnome gnome-applet) \
$(use_with gtk gtk2) \
$(use_with gtk3) \
$(use_with libedit) \
--disable-kde-applet \
$(use_enable kde kde4-applet) \
$(use_with m17n-lib m17nlib) \
$(use_enable ncurses fep) \
$(use_enable nls) \
$(use_with prime) \
--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}
}
src_compile() {
emake || die "emake failed"
if use emacs; then
cd emacs
elisp-compile *.el || die "elisp-compile failed"
fi
}
src_install() {
# parallel make install b0rked, bug #222677
emake -j1 INSTALL_ROOT="${D}" DESTDIR="${D}" install || die "make install failed"
dodoc AUTHORS ChangeLog* NEWS README RELNOTE || die
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 {} +
sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-uim" > "${T}/uim.conf" || die
insinto /etc/X11/xinit/xinput.d
doins "${T}/uim.conf" || die
# collision with dev-scheme/sigscheme, bug #330975
# find "${ED}" -name '*gcroots*' -delete || die
}
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"
elog "% QT_IM_MODULE=uim ; export QT_IM_MODULE"
elog "% XMODIFIERS=@im=uim ; export XMODIFIERS"
elog
elog "If you would like to use uim-anthy as default input method, put"
elog "(define default-im-name 'anthy)"
elog "to your ~/.uim."
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 && update_gtk_immodules
use gtk3 && update_gtk3_immodules
if use emacs; then
elisp-site-regen
echo
elog "uim is autoloaded with Emacs with a minimal set of features:"
elog "There is no keybinding defined to call it directly, so please"
elog "create one yourself and choose an input method."
elog "Integration with LEIM is not done with this ebuild, please have"
elog "a look at the documentation how to achieve this."
fi
}
pkg_postrm() {
use gtk && update_gtk_immodules
use gtk3 && update_gtk3_immodules
use emacs && elisp-site-regen
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-12-21 17:39 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-21 17:39 [gentoo-commits] gentoo-x86 commit in app-i18n/uim: ChangeLog uim-1.7.1-r1.ebuild uim-1.7.0.ebuild Matsuu Takuto (matsuu)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox