Version bumped, bug #206843 and #206846.

Package-Manager: portage-2.1.3.19

5 files changed, 136 insertions, 5 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/Manifest b/app-i18n/scim-bridge/Manifest
index c79d5b9ef5f1..3ec413814b0a 100644
--- a/app-i18n/scim-bridge/Manifest
+++ b/app-i18n/scim-bridge/Manifest
@@ -1,17 +1,26 @@
+AUX scim-bridge-0.4.14-qt4.patch 1163 RMD160 82b4ee7269455843c46aa09d18b722c907addbe6 SHA1 d62b9e9f5f5c6b7490e0d49e8a50cc8812d36ffd SHA256 3bf397ff3a8330a920289335838cb240ae998575bc775f47eb703a8e8677fb05
+MD5 94d8eaf9bc5c48e73326cf97865cfdf1 files/scim-bridge-0.4.14-qt4.patch 1163
+RMD160 82b4ee7269455843c46aa09d18b722c907addbe6 files/scim-bridge-0.4.14-qt4.patch 1163
+SHA256 3bf397ff3a8330a920289335838cb240ae998575bc775f47eb703a8e8677fb05 files/scim-bridge-0.4.14-qt4.patch 1163
 DIST scim-bridge-0.4.13.tar.gz 525972 RMD160 d9736192c88ec6413a60e933866b607c8b6963d9 SHA1 6ec2fad73e790bf57446262661879d83d1414f21 SHA256 e18f711a84f3fd20b9465f7ac4aa7c0ae3fa84539b7e7161e9a0ae8bbc100bfe
+DIST scim-bridge-0.4.14.tar.gz 753369 RMD160 4e36d8df910fc0ed99718565bf312f61ce4e9385 SHA1 295132f6ddd3492d766441ec6cfe5211ffdfc6d1 SHA256 8e79c9f5eaf13a81191e641f18b89aab0122461bd755174369f3e2edb3f74fb9
 DIST scim-bridge-0.4.9.tar.gz 509254 RMD160 ad135d1de043be68d1bb3eb358687da13f7e43f7 SHA1 fb76c95d6cb45954a894de1e265aa7ababf3091e SHA256 4851ee787525700960f6d6d3644d5cb99a609c231407daaf0eb7e54657e08cea
 EBUILD scim-bridge-0.4.13-r1.ebuild 1898 RMD160 eeaed32b17cc3c07778a27bc54981fbb673b8bbe SHA1 62f1d65436fc57e115bd6b075e881a1ee52cbc3c SHA256 c4aef4b4de47f471d69a850b4203d00990420c900b56d831c5006d7ab9ae5756
 MD5 2463efb13addc6e0124b1e473f9dce14 scim-bridge-0.4.13-r1.ebuild 1898
 RMD160 eeaed32b17cc3c07778a27bc54981fbb673b8bbe scim-bridge-0.4.13-r1.ebuild 1898
 SHA256 c4aef4b4de47f471d69a850b4203d00990420c900b56d831c5006d7ab9ae5756 scim-bridge-0.4.13-r1.ebuild 1898
+EBUILD scim-bridge-0.4.14.ebuild 2040 RMD160 a3d35c5d64dad1b06d0f919fda9495a3974483a8 SHA1 54487bea9297d66c06e305113cd81759aeac3769 SHA256 31b1264979fe7d8090ecd0d449afa6ede0c0c3973ac5fcba8bd3cb733b289281
+MD5 5c5fdcaafbbfa8d7c2b59235f356d2e8 scim-bridge-0.4.14.ebuild 2040
+RMD160 a3d35c5d64dad1b06d0f919fda9495a3974483a8 scim-bridge-0.4.14.ebuild 2040
+SHA256 31b1264979fe7d8090ecd0d449afa6ede0c0c3973ac5fcba8bd3cb733b289281 scim-bridge-0.4.14.ebuild 2040
 EBUILD scim-bridge-0.4.9.ebuild 1750 RMD160 d738c38acd26fd4fde4cacfd1279bf25f99878e8 SHA1 650379e7ee90fd87a12524b69e6c318463712356 SHA256 129d56926612692e1ebd14a81a265a7cb61af9349046a1b3f3e33b977286f2ab
 MD5 5be152ac5e1544c2e76478d85aab4ad1 scim-bridge-0.4.9.ebuild 1750
 RMD160 d738c38acd26fd4fde4cacfd1279bf25f99878e8 scim-bridge-0.4.9.ebuild 1750
 SHA256 129d56926612692e1ebd14a81a265a7cb61af9349046a1b3f3e33b977286f2ab scim-bridge-0.4.9.ebuild 1750
-MISC ChangeLog 2508 RMD160 62dc5877012dd503e88a2f89b3afaa275127799d SHA1 377d6ad215f20a51541e71a68b5f6eb232a0eef4 SHA256 9c461df047d6fc6bc96ae1bf032c65862d6a33e22922e5db7bcd1c6915091ed1
-MD5 09893cc18bd7d413876ea60e048c565e ChangeLog 2508
-RMD160 62dc5877012dd503e88a2f89b3afaa275127799d ChangeLog 2508
-SHA256 9c461df047d6fc6bc96ae1bf032c65862d6a33e22922e5db7bcd1c6915091ed1 ChangeLog 2508
+MISC ChangeLog 2734 RMD160 e36e4c36ba3479914a01d34041338edb04a06c8a SHA1 be491ea902e95c5ffec3aec4d70d50cdb5d5b37c SHA256 36cf98824fe59e275da95ce2fa45aed5b37823934ce8c9e1cec4f8511aca48f9
+MD5 476f9ee8ed8ebb22e056c6800c0653c7 ChangeLog 2734
+RMD160 e36e4c36ba3479914a01d34041338edb04a06c8a ChangeLog 2734
+SHA256 36cf98824fe59e275da95ce2fa45aed5b37823934ce8c9e1cec4f8511aca48f9 ChangeLog 2734
 MISC metadata.xml 157 RMD160 97adcce791d5b0e94b3844a1e27e00be60378454 SHA1 e11f0d9b1f8c57c4f50e453a89d2e61cf737329a SHA256 92a8379a3f1d8c9e52e17dbaf224721ad5bd6ba9fba4302e909aa2b099b33f89
 MD5 5a9deb1f29e94497a4ec6ccca8ccdeb3 metadata.xml 157
 RMD160 97adcce791d5b0e94b3844a1e27e00be60378454 metadata.xml 157
@@ -19,6 +28,9 @@ SHA256 92a8379a3f1d8c9e52e17dbaf224721ad5bd6ba9fba4302e909aa2b099b33f89 metadata
 MD5 dafd0aa2f3dd75cc470a112a66c8cff1 files/digest-scim-bridge-0.4.13-r1 256
 RMD160 b8749390da70f3c9e000db65e0a0e02bcb70d366 files/digest-scim-bridge-0.4.13-r1 256
 SHA256 b7196eb050ac48e508062554f607d1e24a8eed1f674b5eb620cb66f6ac6a8325 files/digest-scim-bridge-0.4.13-r1 256
+MD5 038749aca6ef934e57d90dd7dc1befcf files/digest-scim-bridge-0.4.14 256
+RMD160 6f21e58b8fc3e551890b257e3232c9a369248e40 files/digest-scim-bridge-0.4.14 256
+SHA256 14a482c3d4913ce81a703ae67aa1d2ce08635085e35c425c31f98cd97dead326 files/digest-scim-bridge-0.4.14 256
 MD5 2c75b3d13565b007ee401dd0db91cdcb files/digest-scim-bridge-0.4.9 253
 RMD160 1c8a21f6e54edd2687a769527e7c5ef609e8dd1c files/digest-scim-bridge-0.4.9 253
 SHA256 75dfe935ec3c5601422e142c597378c52e05893b5766b88d3d233f20662f773f files/digest-scim-bridge-0.4.9 253
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"
+}