Version bumped, bug #206843 and #206846.

(Portage version: 2.1.3.19)

4 files changed, 120 insertions, 1 deletions

diff --git a/app-i18n/scim-bridge/ChangeLog b/app-i18n/scim-bridge/ChangeLog
index 9af94c5fe95b..1e6b856e3b5f 100644
--- a/app-i18n/scim-bridge/ChangeLog
+++ b/app-i18n/scim-bridge/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-i18n/scim-bridge
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-bridge/ChangeLog,v 1.16 2008/01/10 16:53:42 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-bridge/ChangeLog,v 1.17 2008/01/27 16:35:05 matsuu Exp $
+
+*scim-bridge-0.4.14 (27 Jan 2008)
+
+  27 Jan 2008; MATSUU Takuto <matsuu@gentoo.org>
+  +files/scim-bridge-0.4.14-qt4.patch, +scim-bridge-0.4.14.ebuild:
+  Version bumped, bug #206843.
+  Fixed path for qt4 plugins, bug #206846.
 
   10 Jan 2008; MATSUU Takuto <matsuu@gentoo.org> -scim-bridge-0.4.10.ebuild,
   -scim-bridge-0.4.12.ebuild, -scim-bridge-0.4.13.ebuild,
diff --git a/app-i18n/scim-bridge/files/digest-scim-bridge-0.4.14 b/app-i18n/scim-bridge/files/digest-scim-bridge-0.4.14
new file mode 100644
index 000000000000..1c240801b18a
--- /dev/null
+++ b/app-i18n/scim-bridge/files/digest-scim-bridge-0.4.14
@@ -0,0 +1,3 @@
+MD5 e973802933bdcba1a30af3adbe688e76 scim-bridge-0.4.14.tar.gz 753369
+RMD160 4e36d8df910fc0ed99718565bf312f61ce4e9385 scim-bridge-0.4.14.tar.gz 753369
+SHA256 8e79c9f5eaf13a81191e641f18b89aab0122461bd755174369f3e2edb3f74fb9 scim-bridge-0.4.14.tar.gz 753369
diff --git a/app-i18n/scim-bridge/files/scim-bridge-0.4.14-qt4.patch b/app-i18n/scim-bridge/files/scim-bridge-0.4.14-qt4.patch
new file mode 100644
index 000000000000..872ef8f4714d
--- /dev/null
+++ b/app-i18n/scim-bridge/files/scim-bridge-0.4.14-qt4.patch
@@ -0,0 +1,26 @@
+diff -Naur scim-bridge-0.4.14.orig/client-qt/qt4/Makefile.am scim-bridge-0.4.14/client-qt/qt4/Makefile.am
+--- scim-bridge-0.4.14.orig/client-qt/qt4/Makefile.am	2007-11-07 18:57:46.000000000 +0900
++++ scim-bridge-0.4.14/client-qt/qt4/Makefile.am	2008-01-28 01:24:30.000000000 +0900
+@@ -24,7 +24,7 @@
+ 
+ noinst_HEADERS = scim-bridge-client-qt.h scim-bridge-client-imcontext-qt.h  scim-bridge-client-key-event-utility-qt.h scim-bridge-client-common-qt.h
+ 
+-moduledir = @QT4_PREFIX@/plugins/inputmethods
++moduledir = @QT4_LIBDIR@/plugins/inputmethods
+ module_LTLIBRARIES = im-scim-bridge.la
+ 
+ im_scim_bridge_la_SOURCES = im-scim-bridge-qt.cpp \
+diff -Naur scim-bridge-0.4.14.orig/configure.ac scim-bridge-0.4.14/configure.ac
+--- scim-bridge-0.4.14.orig/configure.ac	2007-12-06 00:50:13.000000000 +0900
++++ scim-bridge-0.4.14/configure.ac	2008-01-28 01:24:30.000000000 +0900
+@@ -115,6 +115,10 @@
+     QT4_PREFIX=`$PKG_CONFIG --variable=prefix QtCore`
+   fi
+   AC_SUBST(QT4_PREFIX)
++  if test -z "$QT4_LIBDIR"; then
++    QT4_LIBDIR=`$PKG_CONFIG --variable=libdir QtCore`
++  fi
++  AC_SUBST(QT4_LIBDIR)
+ fi
+ 
+ ###########################################################
diff --git a/app-i18n/scim-bridge/scim-bridge-0.4.14.ebuild b/app-i18n/scim-bridge/scim-bridge-0.4.14.ebuild
new file mode 100644
index 000000000000..6ab1fe457c25
--- /dev/null
+++ b/app-i18n/scim-bridge/scim-bridge-0.4.14.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-bridge/scim-bridge-0.4.14.ebuild,v 1.1 2008/01/27 16:35:05 matsuu Exp $
+
+WANT_AUTOMAKE=latest
+WANT_AUTOCONF=latest
+
+inherit autotools eutils qt3 qt4
+
+DESCRIPTION="Yet another IM-client of SCIM"
+HOMEPAGE="http://www.scim-im.org/projects/scim_bridge"
+SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc64 ~sparc ~x86"
+IUSE="doc gtk qt3 qt4"
+
+RDEPEND=">=app-i18n/scim-1.4.6
+	gtk? (
+		>=x11-libs/gtk+-2.2
+		>=x11-libs/pango-1.1
+	)
+	qt3? (
+		$(qt_min_version 3.3.4)
+		>=x11-libs/pango-1.1
+	)
+	qt4? (
+		$(qt4_min_version 4.0.0)
+		>=x11-libs/pango-1.1
+	)"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+get_gtk_confdir() {
+	if use amd64 || ( [ "${CONF_LIBDIR}" == "lib32" ] && use x86 ) ; then
+		echo "/etc/gtk-2.0/${CHOST}"
+	else
+		echo "/etc/gtk-2.0"
+	fi
+}
+
+pkg_setup() {
+	if use qt3 && ! built_with_use =x11-libs/qt-3* immqt-bc && ! built_with_use =x11-libs/qt-3* immqt; then
+		die "You need to rebuild >=x11-libs/qt-3.3.4 with immqt-bc(recommended) or immqt USE flag enabled."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-qt4.patch
+	eautoreconf
+}
+
+src_compile() {
+	econf \
+		$(use_enable gtk gtk2-immodule) \
+		$(use_enable qt3 qt3-immodule) \
+		$(use_enable qt4 qt4-immodule) \
+		$(use_enable doc documents) || die
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	dodoc AUTHORS ChangeLog NEWS README
+}
+
+pkg_postinst() {
+	elog
+	elog "If you would like to use ${PN} as default instead of scim, set"
+	elog " $ export GTK_IM_MODULE=scim-bridge"
+	elog " $ export QT_IM_MODULE=scim-bridge"
+	elog
+	[ -x /usr/bin/gtk-query-immodules-2.0 ] && gtk-query-immodules-2.0 > "${ROOT}$(get_gtk_confdir)/gtk.immodules"
+}
+
+pkg_postrm() {
+	[ -x /usr/bin/gtk-query-immodules-2.0 ] && gtk-query-immodules-2.0 > "${ROOT}$(get_gtk_confdir)/gtk.immodules"
+}