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

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

4 files changed, 52 insertions, 17 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/Manifest b/app-i18n/uim/Manifest
index 9b47eebe3b0b..58e34d07ec6c 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -9,27 +9,33 @@ AUX uim-1.6.0-gentoo.patch 381 RMD160 b1be11c6cda393fac0c9d7848d52c0421e7fee77 S
 AUX uim-1.6.0-linker.patch 5969 RMD160 a6e60d17606a1bede3bb159b0ed34bf2705877a3 SHA1 eded83ebc0dc5ac4bffad982b64f7cd7895ec695 SHA256 432d51518a51aeca563ec9ae0a8b84b3968032afe5b0313c403a2fe872a883d0
 AUX uim-1.6.1-canna.patch 193 RMD160 d2f360d3f6aabac52d6070f39b557f9e54c152bf SHA1 d80a37169c1cc788e10fa7c77fcc17c6ed12f4e7 SHA256 7df7a9e356cda2620d114e9888f72d7adc09aff6eee0bb315a6d85a94ae0eb69
 AUX uim-1.6.1-libnotify-0.7.patch 661 RMD160 18ded31a4895abd2491fb470e20d8dfc8fbe5f1b SHA1 3130c041f0f62248b1ff0ae5f1a78a6953872f50 SHA256 f96f6fb81208a4a11382f08687bb92e0738ab54bb39a06146a284d8232edd8bb
+AUX uim-1.7.1-qt4.patch 827 RMD160 ecb97fc0baf39737964daf7a7114b01823c501b0 SHA1 7225717717840f36f99c901ac11eb5602fa468cc SHA256 23ba03fa8a601fab133212a63b36696c8140cec82b00ff63bf72aae43375997e
 AUX xinput-uim 108 RMD160 f8a0998539cc569d5be54e378104561d6798186d SHA1 ed2669ba359cfd27254728b2a16565bc36b87596 SHA256 972c38f0c227cdf2ace54fa3cb0d0095864e88cf38c73759645151e3eae4b548
 DIST uim-1.4.2.tar.bz2 2723523 RMD160 7f0c6a93fb31799643f6c1e594896fc817b2e7f9 SHA1 2ece459ac14e95b2bb2be6135c1a134354dcef09 SHA256 381a4981d942ad5aae01eb711318170706c1cd8ac91a45ab5c733906699d25c2
 DIST uim-1.5.7.tar.bz2 3330555 RMD160 037677cd583c2b69293fbbc1c0393756d7c7adac SHA1 fbea2590286ddc857a7824d8544cb08842f4299f SHA256 f404b274c4b7e71b4b912912c758606585af476fcc5f3d602a08564187ad4e46
 DIST uim-1.6.1.tar.bz2 6192431 RMD160 26c4e30f59c8eb005189d6778333079c81f8489c SHA1 412bb2df6041185084e2f64fb73357389bf992b5 SHA256 ee23965e26e6e9c52bdc37d87e66da9de2a491221b5f1989942f3666e9a44914
-DIST uim-1.7.0.tar.bz2 6402469 RMD160 e866f4270e60d0590a0a37331f3ccf64d7e48fbf SHA1 b79ed80c2557e804e6d3d2771a213a29cd932a73 SHA256 aa5da7324622df1471f3fdd217e809423695f857cdcec2d750f08748ffde65e8
 DIST uim-1.7.1.tar.bz2 6354866 RMD160 af62d79be189e0cafda37fbb34bd94441ebeff77 SHA1 9001955f9efbd3cf23c9ad62c027f44060553fa8 SHA256 81964ed6786eaa8306b0a638193db8171b78b386b9443d2e6a78e7f2cdf9a773
 EBUILD uim-1.4.2.ebuild 3987 RMD160 d290986b0fbefcd7855237c56ac59ec7457de6d4 SHA1 01fd6a01801b0aa17335c7df5582ef460cb229f3 SHA256 02cf0e6dba0b37e028d5e5aedd0aed1b4091a7522e245d55c95ef455d0a81143
 EBUILD uim-1.5.7.ebuild 5340 RMD160 e1bea05e98821a63e91c5c687757878744aa2c9e SHA1 fbd35bd0e661dc6c55a05eb81c41f6387d90c8f8 SHA256 681eaeae231fdb61e242a736988b8bce08978a0bc15788101476ab24ad9f278e
 EBUILD uim-1.6.1.ebuild 6058 RMD160 542e051057e3fd2bb996f4150ba4a7bd025cb0ff SHA1 14b65642e9802073ad5c94cdf32ee52f6a5a270d SHA256 8cdeb77ddaf32162a2986504b2ec8c7babe7f1ab7d93c06ee37f65ef9ff595ed
-EBUILD uim-1.7.0.ebuild 6904 RMD160 bb23882d9d3aa6f84355ee00825fc9d6c2d3b24b SHA1 25ba5936f142e3659df420031bb386aeb2fe4946 SHA256 f66d0a8f7f418b3d52e6bc942a6ec881049464a59a96348ca4747998fbe9f5db
+EBUILD uim-1.7.1-r1.ebuild 6923 RMD160 5b1d3d8bb0bef7a2a83b78d2fba898b3000f3d66 SHA1 8eee6c2bf2a6ed822d731fb0d0f8e47c73e04bbc SHA256 44824dc41e1bcc074149976ddb38479263ad93e50b0650e0c7385dab0a1fb34e
 EBUILD uim-1.7.1.ebuild 6847 RMD160 b2eb29e193d5774dbaf5a3946b571648b1f70747 SHA1 f8555a41aa39c97f718e2f3342524fb274a07a3d SHA256 563f2bfff4e5c3c7233bda6ab8b5601b3c8e42b42ccfc2ed7aa3a9fb40511947
-MISC ChangeLog 33819 RMD160 9d129916f6a6f986a24a468b5747b3c0fba56c29 SHA1 c90b9439ece45adb6e5afbe6bd807290593c86c1 SHA256 a38837d70c67cb9da2aad64c1627b20deffb08052c177e58317af66cf6585029
+MISC ChangeLog 34077 RMD160 f1195e1357d58821cb983b01a80ebb15c4cb403b SHA1 5e7e57b8a03b86f423f7a10d356bbe463b549055 SHA256 f28fbfb0296d697c77f9bfa760d361c88861e644e3cc90a6e12d85c5d6c04deb
 MISC metadata.xml 963 RMD160 2275f335832b0cf6d3b9a22138ea9a8c89ed76c1 SHA1 69c61337a5cec1abc7311a7e6543cc460679597d SHA256 f9ec0fb753307e61a6e6cc5381e41344f34fe4d774ec12d61063077e803c2a8b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOgv45AAoJEEdUh39IaPFNTu8H/0qaBXDU3xpFOdcvZM2Pd+q0
-pO7xSFv/rPYEpImOaYFWm46wZ3nqhdRI48K8mvVEmdBSejgZw4XO6eowq1ZOVNck
-oljSxEgmZ0F1zXIeHQB02sR+jZpKVIYVV/QPwGf/1G6Qcy2YfzdctEoIh1HAdWYO
-bi0Xp9C89b0hc31+4nHxkMK1Y+oNvFz467cX0O2RxePb7A53kPWSC4W+AOChP5Tu
-way4TV3FZaWrAAY1O3ZntaCMahLheB0nji3EJmnTEKyVDKGrju4Tub49OeDhmTAj
-fMxx7iKPgcEOxHBDbD1qpGvuNWGfix6sbv+aEncfuIDp9utYpOJ4UTb3fp27BBc=
-=ZtUS
+iQIcBAEBAgAGBQJO8hnnAAoJECaGw+YFKA1pbLsP/RyaPNcTQjncOB6P2zDfCJRF
+D8PzaDtuHs12a3rOThVx4ZlkNmlXeSYCgOqrW9f9aWsAYW7p5N/6Ym8v5BxuJ1xy
+aiUOT9f6GWNPK/tKfPDxHhlWsFEWZUYqNvDuYqePdo+8n8pxZXQdnzE2Z6SyGuyk
+zdjOb6e9uM7Z6g1A2u1v9pJDod3utdqjuKZIkHVyMLRU6ThDgyeMhJISNJWqmI99
+oDlcjvfKTzmddQ3XHP5inpyR6lBrbVHFAJ1TNU5nTvjfniBxpAGvNjSlTsj/FJj0
+8THqimiPuqlZq6p76U/uf2y7fIe6cvojyJeD6hiTyqkjXJMJOQXUbX9fV4Ts7yu9
+yyozyYcYsro77Qh4438Uau4I5abG/C6Zc2TXiY1NeL6WncsMk7iX4pfcrLZN75i0
+sG72+hOXZl8LAuEYpT+mUF4LlZ9a5fAh/r7ZjPFsbVHkP5jj1gGmRs+nC3urDzc3
+vBeaPAdoS9QwkkyWjwDf43taWeVqWTglafVnuz8Cb/Le0aleZ4iDM+4F2OSsl6mP
+cpz4n4h7rLdJnHiIjVEdDJJTNo2KNBASHIqL89cbpXl9jm6NAFbHFiWMwHxMyXh1
+eUQoQl+j8qaorsm7zyxO0n7XKOjEj7HF71w3b5fvYkBrY3CWlr3ArmeOzQVJF2Ho
+SbIz1M0NtpOjWd3Zy0RV
+=2MgK
 -----END PGP SIGNATURE-----
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() {