fixed Qt related issue, bug #280887.

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

4 files changed, 290 insertions, 2 deletions

diff --git a/app-i18n/scim-bridge/ChangeLog b/app-i18n/scim-bridge/ChangeLog
index 883568ec7206..2448f5fd5327 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-bridge/ChangeLog,v 1.31 2010/01/02 22:40:39 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-bridge/ChangeLog,v 1.32 2010/02/24 16:38:47 matsuu Exp $
+
+*scim-bridge-0.4.16-r2 (24 Feb 2010)
+
+  24 Feb 2010; MATSUU Takuto <matsuu@gentoo.org>
+  +scim-bridge-0.4.16-r2.ebuild,
+  +files/scim-bridge-0.4.16-configure.ac.patch:
+  fixed Qt related issue, bug #280887.
 
   02 Jan 2010; Ben de Groot <yngwin@gentoo.org> -scim-bridge-0.4.9.ebuild,
   -scim-bridge-0.4.16.ebuild, scim-bridge-0.4.16-r1.ebuild:
diff --git a/app-i18n/scim-bridge/Manifest b/app-i18n/scim-bridge/Manifest
index 1991f3c5656a..2e64c0167d76 100644
--- a/app-i18n/scim-bridge/Manifest
+++ b/app-i18n/scim-bridge/Manifest
@@ -1,9 +1,31 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX scim-bridge-0.4.14-qt4.patch 1163 RMD160 82b4ee7269455843c46aa09d18b722c907addbe6 SHA1 d62b9e9f5f5c6b7490e0d49e8a50cc8812d36ffd SHA256 3bf397ff3a8330a920289335838cb240ae998575bc775f47eb703a8e8677fb05
 AUX scim-bridge-0.4.15-qt4-focus.patch 1974 RMD160 99dff169717446c0a38aa19eed932a0b9954bf05 SHA1 193529b5f75097a5d43c6fb675574fdfdf88a8f0 SHA256 124fc258c1f7cadabea5b9c5a7b8b3ab9b26d50910b16760d5746f58ab6b8a50
 AUX scim-bridge-0.4.15.2-gcc43.patch 375 RMD160 e46eef9e25195786680e28817b3b70aa5cd14b6b SHA1 f2f6c1ce4a7a71073977824c3b76a739740391e1 SHA256 0595a929766a9f29a0ad888696512c35caff1b9e3d91ceca29d05e3222a62a18
 AUX scim-bridge-0.4.15.2-qt4.patch 2146 RMD160 5d040ef796df0ee98e7e70befed00ba047b9c369 SHA1 a9d704adebd02f3abddaedc40cbd54ab5e7f1a83 SHA256 778a7174a08444871e82388235ee8053d3d5c8f248d1dbbddff0067c34742424
 AUX scim-bridge-0.4.16+gcc-4.4.patch 382 RMD160 4310e77e9572779d470e20f81f494b8787e75d17 SHA1 b17d1cda0104f3a5ae3ec294bfe964fb82a5fbcc SHA256 f80ca88a66de77447601270f60f31b46e32bb18058da91e726375c7757ee7719
+AUX scim-bridge-0.4.16-configure.ac.patch 5689 RMD160 3594a1274cd1dd025a2cfee27178a513e0b9693c SHA1 c3c64012d5978cb1d5a4516865bce7473000a83c SHA256 f03a657169fb7e1be2cf55eb48d0b64275698c57cdf9b43fa5da79931e7c7b60
 DIST scim-bridge-0.4.16.tar.gz 508870 RMD160 37aed056fb880358b013f104f08b2e58c3de4188 SHA1 6a7a714592dbecc9a1f44794f37319bafe2bdfae SHA256 50d9da4a2842ab31cd3b27b1baacb14c458614bdb35855c6ecd09ab855ac702c
 EBUILD scim-bridge-0.4.16-r1.ebuild 2153 RMD160 14d8f24aa82560e4f1b9d056a446b36272fdbfd2 SHA1 49de4fcbb1c0dff058ea56896b7184d54b0e03da SHA256 eb7858206f794892aef8db79929b200f12ec5554a86c3cd7fdb732573b1f40db
-MISC ChangeLog 5318 RMD160 a6a7bd8a2becc09ca6d762dc06bec618ef04a0b3 SHA1 514b1be060e62c390a5949b15d5838eb0eb2f202 SHA256 576015bb47bac7c55b7ddca60ecd1701a68f6278bb1ef85128e027807b2429f8
+EBUILD scim-bridge-0.4.16-r2.ebuild 2214 RMD160 49188daa77122c1e5a842b8d7e99e12c80704457 SHA1 2e4df62e7451dc57682505e283be7c25f7a07873 SHA256 d1a0ff97a8405610825f073c9a41749f43b73e5b8f3bca18fa88b3b35f84aa98
+MISC ChangeLog 5526 RMD160 b4c56a86e2ee100d957197cf07c7f6f33476cffa SHA1 66b3d09799aa3591bfd6a4af610dcf51fb924148 SHA256 a6f9a0b4cc19f23acb67f1a36eb46562938d467f4238c451a69b09a4a0ca4e71
 MISC metadata.xml 157 RMD160 97adcce791d5b0e94b3844a1e27e00be60378454 SHA1 e11f0d9b1f8c57c4f50e453a89d2e61cf737329a SHA256 92a8379a3f1d8c9e52e17dbaf224721ad5bd6ba9fba4302e909aa2b099b33f89
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iQIcBAEBAgAGBQJLhVYpAAoJECaGw+YFKA1pL/IP/RycyC8CynMrfSnAs6YuFB1m
+b3wJsnjzFTHgPNSi44XowTGv1I7p0eTQTfkAdIvJlo7/qbOjAR9i/31PO4D+YzUf
+tbEptBMHLHttw1vb2cSqkeTOvkRM3NVrggR8q94O70wqJlLOKADWe6n7i8CyZNF/
+WtP0+Sik6r2DT+j3ffGWEfg33HiRX8cGMQaTAFU7jPZTxxcR8d7ukZCzo3bym81O
+Ao6qPfE9kIEYoBB7cClimuJwXGV7tgQEjHpfXSuMSGHEjcuBbThxDIlx5HUY/LL1
+g3M+ydCcvXKZurqEoaDGfsYRzzGaCoP9bmgGcA3U1Hzb4ujhu/3HpA9jQ9fxsi8A
+QGz0Mn7hQrWSTr4yoPfWrbqmnPM4KkyGnP/UDOZqBjqcKBrB8z68BcFXEqNzNgfX
+hnMWR49FxF7B7u3Bj5Gf7OmO4ALTaXMFtqvnKqQSCzLOsyk8cv2AtX66acHLRlYP
+9blCy5igobf1wwOVCaj9tN7mF30Zb4cHZ3+PtwLtMyw0imwBIx2nuiGJFup81odK
+uGWT6s+icO0ABxzTDA4DEswsf3En3KMSISW39bmyrfIxwzSo+I+a34WxqaI3JxvH
+pNCL+Dr+7Yqw9FkF6cDxCeIav5h9diO/wCQ3QMrNE76icEyzVdybhGPzLrYSnPLG
+vnto407ndozFDAcMyw7X
+=tdY6
+-----END PGP SIGNATURE-----
diff --git a/app-i18n/scim-bridge/files/scim-bridge-0.4.16-configure.ac.patch b/app-i18n/scim-bridge/files/scim-bridge-0.4.16-configure.ac.patch
new file mode 100644
index 000000000000..ee6543c7dd6a
--- /dev/null
+++ b/app-i18n/scim-bridge/files/scim-bridge-0.4.16-configure.ac.patch
@@ -0,0 +1,164 @@
+--- configure.ac.orig	2009-11-27 21:07:46.000000000 +0800
++++ configure.ac	2009-11-27 21:33:17.000000000 +0800
+@@ -55,63 +55,6 @@
+ AM_CONDITIONAL(HAVE_DOCBOOK, test x$DOCBOOK_XSL != xno)
+ AM_CONDITIONAL(BUILD_MANUAL, test x$XSLTPROC != xno -a x$DOCBOOK_XSL != xno)
+ 
+-# Check if we should build scim-bridge-gtk-immodule
+-PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= 2.4.0 pango >= 1.1.0 gdk-pixbuf-2.0 >= 2.4.0],
+-			[SCIM_BRIDGE_HAS_GTK2=yes],
+-			[SCIM_BRIDGE_HAS_GTK2=no])
+-
+-SCIM_BRIDGE_HAS_GTK2_2=no
+-if test "$SCIM_BRIDGE_HAS_GTK2" = "yes"; then
+-  if $PKG_CONFIG --exists "gtk+-2.0 >= 2.2" ; then
+-    SCIM_BRIDGE_HAS_GTK2_2=yes
+-    GTK_VERSION=2.2.0
+-    AC_DEFINE(GDK_MULTIHEAD_SAFE,1,[Force use of GDK's multihead-safe APIs.])
+-  fi
+-  if $PKG_CONFIG --exists "gtk+-2.0 >= 2.3.5" ; then
+-    SCIM_BRIDGE_HAS_GTK2_4=yes
+-    GTK_VERSION=2.3.5
+-    AC_DEFINE(HAVE_GTK_DRAW_INSERTION_CURSOR,1,[Have gtk_draw_insertion_cursor ().])
+-  fi
+-  GTK_BINARY_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
+-  GTK_LIBDIR=`$PKG_CONFIG --variable=libdir gtk+-2.0`
+-  if test -z "$GTK_LIBDIR)"; then
+-    GTK_LIBDIR="$libdir"
+-  fi
+-  AC_SUBST(GTK_LIBDIR)
+-  AC_SUBST(GTK_VERSION)
+-  AC_SUBST(GTK_BINARY_VERSION)
+-  enable_gtk2_immodule="yes";
+-fi
+-
+-# Check if we should build scim-bridge-qt-immodule
+-PKG_CHECK_MODULES(QT3, [qt-mt >= 3.3],
+-			[SCIM_BRIDGE_HAS_QT3=yes],
+-			[SCIM_BRIDGE_HAS_QT3=no])
+-
+-if test "$SCIM_BRIDGE_HAS_QT3" = "yes"; then
+-  if test -z "$QT3_PREFIX"; then
+-    QT3_PREFIX=`$PKG_CONFIG --variable=prefix qt-mt`
+-  fi
+-  AC_SUBST(QT3_PREFIX)
+-  enable_qt3_immodule="yes";
+-fi
+-
+-PKG_CHECK_MODULES(QT4, [QtGui >= 4.0, QtCore >= 4.0],
+-			[SCIM_BRIDGE_HAS_QT4=yes],
+-			[SCIM_BRIDGE_HAS_QT4=no])
+-
+-if test "$SCIM_BRIDGE_HAS_QT4" = "yes"; then
+-  if test -z "$QT4_PREFIX"; then
+-    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)
+-  enable_qt4_immodule="yes";
+-fi
+-
+ ###########################################################
+ ##             Definiation of compile args.              ##
+ ###########################################################
+@@ -132,13 +75,16 @@
+        	      enable_agent=yes)
+ 
+ AC_ARG_ENABLE(gtk2-immodule,
+-	      [AS_HELP_STRING([--enable-gtk2-immodule], [build GTK2 IM module])], , )
++	      [AS_HELP_STRING([--enable-gtk2-immodule], [build GTK2 IM module [default=yes]])], ,
++	      enable_gtk2_immodule=yes)
+ 
+ AC_ARG_ENABLE(qt3-immodule,
+-	      [AS_HELP_STRING([--enable-qt3-immodule], [build Qt3 IM module])], , )
++	      [AS_HELP_STRING([--enable-qt3-immodule], [build Qt3 IM module [default=yes]])], ,
++	      enable_qt3_immodule=yes)
+ 
+ AC_ARG_ENABLE(qt4-immodule,
+-	      [AS_HELP_STRING([--enable-qt4-immodule], [build Qt4 IM module])], , )
++	      [AS_HELP_STRING([--enable-qt4-immodule], [build Qt4 IM module [default=yes]])], ,
++	      enable_qt4_immodule=yes)
+ 
+ if test "$enable_debug" = "yes"; then
+   AC_DEFINE(ENABLE_DEBUG,1,[Define this to enable the debug facility in libscim])
+@@ -175,7 +121,33 @@
+ if test "$enable_gtk2_immodule" = "yes"; then
+   SCIM_BRIDGE_BUILD_GTK2_IMMODULE=1
+   SCIM_BRIDGE_BUILD_IMMODULE=1
+-  if test "$SCIM_BRIDGE_HAS_GTK2" = "no" ; then
++
++  # Check if we should build scim-bridge-gtk-immodule
++  PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= 2.4.0 pango >= 1.1.0 gdk-pixbuf-2.0 >= 2.4.0],
++  			[SCIM_BRIDGE_HAS_GTK2=yes],
++  			[SCIM_BRIDGE_HAS_GTK2=no])
++  
++  SCIM_BRIDGE_HAS_GTK2_2=no
++  if test "$SCIM_BRIDGE_HAS_GTK2" = "yes"; then
++    if $PKG_CONFIG --exists "gtk+-2.0 >= 2.2" ; then
++      SCIM_BRIDGE_HAS_GTK2_2=yes
++      GTK_VERSION=2.2.0
++      AC_DEFINE(GDK_MULTIHEAD_SAFE,1,[Force use of GDK's multihead-safe APIs.])
++    fi
++    if $PKG_CONFIG --exists "gtk+-2.0 >= 2.3.5" ; then
++      SCIM_BRIDGE_HAS_GTK2_4=yes
++      GTK_VERSION=2.3.5
++      AC_DEFINE(HAVE_GTK_DRAW_INSERTION_CURSOR,1,[Have gtk_draw_insertion_cursor ().])
++    fi
++    GTK_BINARY_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
++    GTK_LIBDIR=`$PKG_CONFIG --variable=libdir gtk+-2.0`
++    if test -z "$GTK_LIBDIR)"; then
++      GTK_LIBDIR="$libdir"
++    fi
++    AC_SUBST(GTK_LIBDIR)
++    AC_SUBST(GTK_VERSION)
++    AC_SUBST(GTK_BINARY_VERSION)
++  else
+      AC_MSG_ERROR([Gtk >= 2.2 can not be found!])
+   fi
+   enable_immodule=yes
+@@ -187,7 +159,18 @@
+ if test "$enable_qt3_immodule" = "yes"; then
+   SCIM_BRIDGE_BUILD_QT3_IMMODULE=1
+   SCIM_BRIDGE_BUILD_IMMODULE=1
+-  if test "$SCIM_BRIDGE_HAS_QT3" = "no"; then
++
++  # Check if we should build scim-bridge-qt-immodule
++  PKG_CHECK_MODULES(QT3, [qt-mt >= 3.3],
++  			[SCIM_BRIDGE_HAS_QT3=yes],
++  			[SCIM_BRIDGE_HAS_QT3=no])
++  
++  if test "$SCIM_BRIDGE_HAS_QT3" = "yes"; then
++    if test -z "$QT3_PREFIX"; then
++      QT3_PREFIX=`$PKG_CONFIG --variable=prefix qt-mt`
++    fi
++    AC_SUBST(QT3_PREFIX)
++  else
+     AC_MSG_ERROR([qt >= 3.3 can not be found!])
+   fi
+   enable_immodule=yes
+@@ -199,7 +182,21 @@
+ if test "$enable_qt4_immodule" = "yes"; then
+   SCIM_BRIDGE_BUILD_QT4_IMMODULE=1
+   SCIM_BRIDGE_BUILD_IMMODULE=1
+-  if test "$SCIM_BRIDGE_HAS_QT4" = "no"; then
++
++  PKG_CHECK_MODULES(QT4, [QtGui >= 4.0, QtCore >= 4.0],
++  			[SCIM_BRIDGE_HAS_QT4=yes],
++  			[SCIM_BRIDGE_HAS_QT4=no])
++  
++  if test "$SCIM_BRIDGE_HAS_QT4" = "yes"; then
++    if test -z "$QT4_PREFIX"; then
++      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)
++  else
+     AC_MSG_ERROR([qt >= 4.0 can not be found!])
+   fi
+   enable_immodule=yes
diff --git a/app-i18n/scim-bridge/scim-bridge-0.4.16-r2.ebuild b/app-i18n/scim-bridge/scim-bridge-0.4.16-r2.ebuild
new file mode 100644
index 000000000000..71af8fe1b92f
--- /dev/null
+++ b/app-i18n/scim-bridge/scim-bridge-0.4.16-r2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2010 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.16-r2.ebuild,v 1.1 2010/02/24 16:38:47 matsuu Exp $
+
+EAPI="2"
+
+inherit autotools eutils multilib
+
+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 qt4"
+
+RESTRICT="test"
+
+RDEPEND=">=app-i18n/scim-1.4.6
+	gtk? (
+		>=x11-libs/gtk+-2.2
+		>=x11-libs/pango-1.1
+	)
+	qt4? (
+		x11-libs/qt-gui:4
+		x11-libs/qt-core:4
+		>=x11-libs/pango-1.1
+	)"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	dev-util/intltool
+	doc? ( app-doc/doxygen )"
+
+update_gtk_immodules() {
+	local GTK2_CONFDIR
+	has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
+	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/}
+	if [ -x /usr/bin/gtk-query-immodules-2.0 ] ; then
+		/usr/bin/gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules"
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-0.4.15.2-qt4.patch"
+	epatch "${FILESDIR}/${PN}-0.4.15.2-gcc43.patch"
+	epatch "${FILESDIR}/${P}+gcc-4.4.patch"
+	# bug #280887
+	epatch "${FILESDIR}/${P}-configure.ac.patch"
+
+	# bug #241954
+	intltoolize --force
+	eautoreconf
+}
+
+src_configure() {
+	local myconf="$(use_enable doc documents)"
+	# '--disable-*-immodule' are b0rked, bug #280887
+
+	if use gtk ; then
+		myconf="${myconf} --enable-gtk2-immodule=yes"
+	else
+		myconf="${myconf} --enable-gtk2-immodule=no"
+	fi
+
+	# Qt3 is no longer supported, bug 283429
+	myconf="${myconf} --enable-qt3-immodule=no"
+
+	if use qt4 ; then
+		myconf="${myconf} --enable-qt4-immodule=yes"
+	else
+		myconf="${myconf} --enable-qt4-immodule=no"
+	fi
+
+	econf ${myconf} || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	dodoc AUTHORS ChangeLog NEWS README || die
+}
+
+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
+	use gtk && update_gtk_immodules
+}
+
+pkg_postrm() {
+	use gtk && update_gtk_immodules
+}