Added $(use_enable qt4 qt4-qt3support), bug #282922. Added REQUIRED_USE, bug #383389.

(Portage version: 2.1.10.41/cvs/Linux x86_64)

3 files changed, 36 insertions, 7 deletions

diff --git a/app-i18n/uim/ChangeLog b/app-i18n/uim/ChangeLog
index f8badfb816ff..d4496a9ac64e 100644
--- a/app-i18n/uim/ChangeLog
+++ b/app-i18n/uim/ChangeLog
@@ -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:
diff --git a/app-i18n/uim/files/uim-1.7.1-qt4.patch b/app-i18n/uim/files/uim-1.7.1-qt4.patch
new file mode 100644
index 000000000000..76b8cfc5f14c
--- /dev/null
+++ b/app-i18n/uim/files/uim-1.7.1-qt4.patch
@@ -0,0 +1,19 @@
+Description: fix build with ld --as-needed
+ uim-counted-init is a static library which needs symbols from libuim
+ which it must be placed behind it on the command line so it is not
+ dropped by ld --as-needed
+Author: Julian Taylor <jtaylor.debian@googlemail.com>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/uim/+bug/832939
+Index: uim-1.7.1/qt4/pref/uim-pref-qt4.pro.in
+===================================================================
+--- uim-1.7.1.orig/qt4/pref/uim-pref-qt4.pro.in	2011-08-25 23:31:03.080564183 +0200
++++ uim-1.7.1/qt4/pref/uim-pref-qt4.pro.in	2011-08-25 23:31:01.170564166 +0200
+@@ -4,7 +4,7 @@
+ 
+ # to include qtgettext.h
+ INCLUDEPATH += @srcdir@/..
+-LIBS += -luim-custom -luim-counted-init @LIBINTL@
++LIBS += -luim-custom -luim-counted-init -luim @LIBINTL@
+ 
+ QMAKE_UIC = $$QMAKE_UIC -tr UIC_
+ 
diff --git a/app-i18n/uim/uim-1.7.0.ebuild b/app-i18n/uim/uim-1.7.1-r1.ebuild
index b7869b8503d9..75368892af80 100644
--- a/app-i18n/uim/uim-1.7.0.ebuild
+++ b/app-i18n/uim/uim-1.7.1-r1.ebuild
@@ -1,9 +1,9 @@
 # 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.0.ebuild,v 1.4 2011/09/28 10:59:35 ssuominen Exp $
+# $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="3"
-inherit autotools eutils multilib elisp-common flag-o-matic toolchain-funcs
+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/"
@@ -16,6 +16,8 @@ IUSE="+anthy canna curl eb emacs libffi gnome gtk gtk3 kde libedit libnotify m17
 
 RESTRICT="test"
 
+REQUIRED_USE="gtk? ( X ) qt4? ( X )"
+
 RDEPEND="X? (
 		x11-libs/libX11
 		x11-libs/libXft
@@ -110,9 +112,9 @@ update_gtk3_immodules() {
 
 src_prepare() {
 	epatch \
+		"${FILESDIR}"/${PN}-1.7.1-qt4.patch \
 		"${FILESDIR}"/${PN}-1.6.0-gentoo.patch \
-		"${FILESDIR}"/${PN}-1.5.4-zhTW.patch \
-		"${FILESDIR}"/${PN}-1.6.1-canna.patch
+		"${FILESDIR}"/${PN}-1.5.4-zhTW.patch
 
 	# bug 275420
 	sed -i -e "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac || die
@@ -156,6 +158,7 @@ src_configure() {
 	#	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) \
@@ -177,13 +180,13 @@ src_configure() {
 		--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}
-		# $(use_enable qt4 qt4-qt3support) \
 }
 
 src_compile() {