Version bumped.

Package-Manager: portage-2.1.6.7/cvs/Linux x86_64

5 files changed, 121 insertions, 77 deletions

diff --git a/app-i18n/ibus-chewing/ChangeLog b/app-i18n/ibus-chewing/ChangeLog
index 70e54b72f3a7..a2e3c22e85b6 100644
--- a/app-i18n/ibus-chewing/ChangeLog
+++ b/app-i18n/ibus-chewing/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-i18n/ibus-chewing
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-chewing/ChangeLog,v 1.7 2009/03/02 14:56:56 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-chewing/ChangeLog,v 1.8 2009/03/11 15:26:43 matsuu Exp $
+
+*ibus-chewing-1.0.3.20090311 (11 Mar 2009)
+
+  11 Mar 2009; MATSUU Takuto <matsuu@gentoo.org>
+  -ibus-chewing-0.1.1.20081023.ebuild, -ibus-chewing-1.0.0.20090220.ebuild,
+  +ibus-chewing-1.0.3.20090311.ebuild:
+  Version bumped. Removed old versions.
 
 *ibus-chewing-1.0.2.20090302 (02 Mar 2009)
 
diff --git a/app-i18n/ibus-chewing/ibus-chewing-0.1.1.20081023.ebuild b/app-i18n/ibus-chewing/ibus-chewing-0.1.1.20081023.ebuild
deleted file mode 100644
index 3d5813db627c..000000000000
--- a/app-i18n/ibus-chewing/ibus-chewing-0.1.1.20081023.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-chewing/ibus-chewing-0.1.1.20081023.ebuild,v 1.2 2009/02/05 16:15:13 matsuu Exp $
-
-inherit python
-
-DESCRIPTION="The Chewing IMEngine for IBus Framework"
-HOMEPAGE="http://code.google.com/p/ibus/"
-SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="=app-i18n/ibus-0.1*
-	>=dev-libs/libchewing-0.3.0.901
-	>=dev-lang/python-2.5
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	dev-lang/swig
-	dev-util/pkgconfig
-	nls? ( >=sys-devel/gettext-0.16.1 )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	mv py-compile py-compile.orig || die
-	ln -s "$(type -P true)" py-compile || die
-}
-
-src_compile() {
-	econf $(use_enable nls) || die
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS README
-}
-
-pkg_postinst() {
-	ewarn "This package is very experimental, please report your bugs to"
-	ewarn "http://ibus.googlecode.com/issues/list"
-	elog
-	elog "You should run ibus-setup and enable IM Engines you want to use!"
-	elog
-
-	python_mod_optimize /usr/share/${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/share/${PN}
-}
diff --git a/app-i18n/ibus-chewing/ibus-chewing-1.0.0.20090220.ebuild b/app-i18n/ibus-chewing/ibus-chewing-1.0.3.20090311.ebuild
index 346362a5dcc8..fa87ed2c521c 100644
--- a/app-i18n/ibus-chewing/ibus-chewing-1.0.0.20090220.ebuild
+++ b/app-i18n/ibus-chewing/ibus-chewing-1.0.3.20090311.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-chewing/ibus-chewing-1.0.0.20090220.ebuild,v 1.1 2009/02/25 17:09:52 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-chewing/ibus-chewing-1.0.3.20090311.ebuild,v 1.1 2009/03/11 15:26:43 matsuu Exp $
 
-inherit cmake-utils eutils
+EAPI="1"
+inherit cmake-utils
 
 MY_P="${P}-Source"
 DESCRIPTION="The Chewing IMEngine for IBus Framework"
@@ -14,31 +15,19 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
-RDEPEND=">=app-i18n/ibus-1
+RDEPEND="x11-libs/libX11
+	x11-libs/libXtst
+	>=app-i18n/ibus-1
 	>=dev-libs/libchewing-0.3.2
-	>=dev-util/gob-2"
+	x11-libs/gtk+:2
+	gnome-base/gconf:2
+	dev-util/gob:2"
 DEPEND="${RDEPEND}
 	dev-util/cmake
 	dev-util/pkgconfig"
 
 S="${WORKDIR}/${MY_P}"
 
-PRJ_VER_FULL="${PF}"
-
 CMAKE_IN_SOURCE_BUILD=1
 
 DOCS="AUTHORS ChangeLog NEWS README"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-}
-
-pkg_postinst() {
-	ewarn "This package is very experimental, please report your bugs to"
-	ewarn "http://ibus.googlecode.com/issues/list"
-	elog
-	elog "You should run ibus-setup and enable IM Engines you want to use!"
-	elog
-}
diff --git a/app-i18n/ibus/ChangeLog b/app-i18n/ibus/ChangeLog
index c5338eee6913..8e445b624753 100644
--- a/app-i18n/ibus/ChangeLog
+++ b/app-i18n/ibus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/ibus
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.22 2009/03/07 02:38:35 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.23 2009/03/11 15:31:15 matsuu Exp $
+
+*ibus-1.1.0.20090311 (11 Mar 2009)
+
+  11 Mar 2009; MATSUU Takuto <matsuu@gentoo.org>
+  +ibus-1.1.0.20090311.ebuild:
+  Version bumped.
 
 *ibus-1.1.0.20090306 (07 Mar 2009)
 
diff --git a/app-i18n/ibus/ibus-1.1.0.20090311.ebuild b/app-i18n/ibus/ibus-1.1.0.20090311.ebuild
new file mode 100644
index 000000000000..05bc8e58ef2c
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.1.0.20090311.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.1.0.20090311.ebuild,v 1.1 2009/03/11 15:31:15 matsuu Exp $
+
+EAPI="1"
+inherit autotools eutils multilib python
+
+DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
+HOMEPAGE="http://code.google.com/p/ibus/"
+SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc nls qt4"
+
+RDEPEND=">=dev-libs/glib-2.18
+	>=x11-libs/gtk+-2
+	>=gnome-base/gconf-2.12
+	>=gnome-base/librsvg-2
+	sys-apps/dbus
+	qt4? (
+		>=x11-libs/qt-core-4.4:4
+		>=x11-libs/qt-dbus-4.4:4
+	)
+	app-text/iso-codes
+	x11-libs/libX11
+	>=dev-lang/python-2.5
+	>=dev-python/pygobject-2.14
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? ( >=dev-util/gtk-doc-1.9 )
+	nls? ( >=sys-devel/gettext-0.16.1 )"
+RDEPEND="${RDEPEND}
+	dev-python/pygtk
+	>=dev-python/dbus-python-0.83
+	dev-python/pyxdg
+	x11-misc/notification-daemon"
+
+pkg_setup() {
+	# An arch specific config directory is used on multilib systems
+	has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
+	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/}
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	mv py-compile py-compile.orig || die
+	ln -s "$(type -P true)" py-compile || die
+	sed -i -e '/QMAKE/s/$/ "CONFIG+=nostrip"/' client/qt4/Makefile.am || die
+	eautoreconf
+}
+
+src_compile() {
+	econf \
+		$(use_enable doc gtk-doc) \
+		$(use_enable nls) \
+		$(use_enable qt4 qt4-immodule) || die
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	dodoc AUTHORS ChangeLog NEWS README
+}
+
+pkg_postinst() {
+	local qt_im_module="xim"
+	use qt4 && qt_im_module="ibus"
+
+	elog "To use ibus, you should:"
+	elog "1. Get input engines from sunrise overlay."
+	elog "   Run \"emerge -s ibus-\" in your favorite terminal"
+	elog "   for a list of packages we already have."
+	elog "2. Set the following in your"
+	elog "   user startup scripts such as .xinitrc or .bashrc"
+	elog
+	elog "   export XMODIFIERS=\"@im=ibus\""
+	elog "   export GTK_IM_MODULE=\"ibus\""
+	elog "   export QT_IM_MODULE=\"${qt_im_module}\""
+	elog "   ibus &"
+
+	[ "${ROOT}" = "/" -a -x /usr/bin/gtk-query-immodules-2.0 ] && \
+		gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules"
+
+	python_mod_optimize /usr/share/${PN}
+}
+
+pkg_postrm() {
+	[ "${ROOT}" = "/" -a -x /usr/bin/gtk-query-immodules-2.0 ] && \
+		gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules"
+
+	python_mod_cleanup /usr/share/${PN}
+}