Drop qt3 support, bug 283429

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

6 files changed, 43 insertions, 67 deletions

diff --git a/app-i18n/uim/ChangeLog b/app-i18n/uim/ChangeLog
index bb1356da468b..5ae4fc6852c2 100644
--- a/app-i18n/uim/ChangeLog
+++ b/app-i18n/uim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/uim
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.214 2009/12/31 15:54:40 mr_bones_ Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.215 2010/01/04 03:58:18 yngwin Exp $
+
+  04 Jan 2010; Ben de Groot <yngwin@gentoo.org> uim-1.4.2.ebuild,
+  uim-1.5.6-r1.ebuild, uim-1.5.6-r4.ebuild, uim-1.5.7.ebuild:
+  Drop qt3 support, bug 283429
 
   31 Dec 2009; Michael Sterrett <mr_bones_@gentoo.org> +uim-1.4.2.ebuild:
   resurrect uim-1.4.2.ebuild which is still in use
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index 08c51676e73d..f5d59006f03f 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -7,9 +7,9 @@ AUX uim-disable-notify.diff 1738 RMD160 a19b315a0b5f1408c543535886665562e90dd666
 DIST uim-1.4.2.tar.bz2 2723523 RMD160 7f0c6a93fb31799643f6c1e594896fc817b2e7f9 SHA1 2ece459ac14e95b2bb2be6135c1a134354dcef09 SHA256 381a4981d942ad5aae01eb711318170706c1cd8ac91a45ab5c733906699d25c2
 DIST uim-1.5.6.tar.bz2 3343584 RMD160 01774ff38e64436945290a5c3b2e1dc1a14d6771 SHA1 24b33991db4813fe82af7862c5e0d0f6d6b284dd SHA256 ce6b7218c3b79e5d100d52fa745e51abc83a1fe7668b3b759584b9ec7a00c28f
 DIST uim-1.5.7.tar.bz2 3330555 RMD160 037677cd583c2b69293fbbc1c0393756d7c7adac SHA1 fbea2590286ddc857a7824d8544cb08842f4299f SHA256 f404b274c4b7e71b4b912912c758606585af476fcc5f3d602a08564187ad4e46
-EBUILD uim-1.4.2.ebuild 4550 RMD160 9cf57a53308a47c4626db1318405cca0d3fc6c02 SHA1 50dc324f72f062a6ae4a500a40a0bd527538edf7 SHA256 f7a88c237b92b766d4fb6c84828f10f2c2c1a455c469bad440c8377436416846
-EBUILD uim-1.5.6-r1.ebuild 5360 RMD160 bf53d4a47322129eb779eccdf2c1c6d28e896d21 SHA1 adf4a7ef1b693d9c305a8464a223f9ab915e6f50 SHA256 93a34af3b65672516dd9874d3f1c4007e5f3d571c5260bacb09ab3e0cd7b19cd
-EBUILD uim-1.5.6-r4.ebuild 5457 RMD160 51a84957034eb538de9f926ae5cd5e3b4bb46c7b SHA1 95151a9d5136dfc5de9edf63022f39b3411c431e SHA256 1f9ec37fafc7de17425c5ad145596ba682576f7ed62ec1c0a440dcefcae3cd73
-EBUILD uim-1.5.7.ebuild 5508 RMD160 3015a15b07aa14fcb802b7773e76057ad232181f SHA1 754ba5c2b717e7bc89bfdb2ba2ee4a107c436089 SHA256 11903ac52252f3215c4b02fe6f4d2f67980e954e0df4e90a0b9d8a65597feae1
-MISC ChangeLog 30046 RMD160 90362d7ebd724a58be710564c2954cae3d2846bb SHA1 58e158b8b1c9291ccb913e43906f8a5c83a5047a SHA256 96b4d6acd23d032b8c829ee527c6cb93cec6e416d9716e1a22b503120a138935
+EBUILD uim-1.4.2.ebuild 4000 RMD160 1883268b99ed412a7d1c7189ee4dbb3735b9a27c SHA1 00028f9ac7595d964f24521f6a7c723fd086cf5c SHA256 07153001018ba2d43cd64397e3e1ec8b6cb8b3eba5207bbf08df80d39aa9c82d
+EBUILD uim-1.5.6-r1.ebuild 5169 RMD160 e82f2e8c8f34bc4d791bb75d19e34c67a9982bd5 SHA1 701b76f6e22e3951d36b9f1c4e2da550c920b4dd SHA256 574c5354750de42007dd70e3fe8eecef4e4826ff665028e554d409b46e66891b
+EBUILD uim-1.5.6-r4.ebuild 5266 RMD160 3cef3cd7d431d22935bb172a95628a0ede220e73 SHA1 c3dd334ae92aca209ededf97ec522ca6edb706e6 SHA256 06adc9371af5449f669bc4f23e0bcb6d3e11b1b8288895a3dcbbeb54f78c4f13
+EBUILD uim-1.5.7.ebuild 5299 RMD160 ac0d2e07d25ef8081b4aa1fec249fcdfcb0e0116 SHA1 e61453d3d0a3a1b33cba4f4d6a83df7e29669d7b SHA256 a192929c0ee4fc6eb13b884f1b76b9a47a791e46d66b592f6556b550676babe9
+MISC ChangeLog 30203 RMD160 c92aeb431a824f5bc9b33f60a7eff4cba59dbaff SHA1 9e21405b1fd39dd513c127eab8c33ae2762bdb70 SHA256 9a2da9ac6b3f574f665e8d2990df0902de033ed30215cd4c86536a4a8a8bfe13
 MISC metadata.xml 815 RMD160 012fd0ff539fa5f7d943f2b2b955af2b1a51579f SHA1 1c035765a6908e1b767689d899a68876e44dc772 SHA256 a1f64b1559c0291cb60d8783c53482f9235f03802984816c827255f92d171d5e
diff --git a/app-i18n/uim/uim-1.4.2.ebuild b/app-i18n/uim/uim-1.4.2.ebuild
index a59a794cce4d..0f1242576de2 100644
--- a/app-i18n/uim/uim-1.4.2.ebuild
+++ b/app-i18n/uim/uim-1.4.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.4.2.ebuild,v 1.12 2009/12/31 15:54:40 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.4.2.ebuild,v 1.13 2010/01/04 03:58:18 yngwin Exp $
 
 EAPI=1
-inherit eutils qt3 multilib elisp-common flag-o-matic
+inherit eutils multilib elisp-common flag-o-matic
 
 DESCRIPTION="Simple, secure and flexible input method library"
 HOMEPAGE="http://code.google.com/p/uim/"
@@ -32,7 +32,6 @@ RDEPEND="X? ( x11-libs/libX11
 	ncurses? ( sys-libs/ncurses )
 	nls? ( virtual/libintl )
 	prime? ( app-i18n/prime )
-	qt3? ( x11-libs/qt:3 )
 	!app-i18n/uim-svn
 	!<app-i18n/prime-0.9.4"
 
@@ -52,12 +51,6 @@ RDEPEND="${RDEPEND}
 SITEFILE=50${PN}-gentoo.el
 
 pkg_setup() {
-	if use qt3 && ! built_with_use =x11-libs/qt-3* immqt-bc && ! built_with_use =x11-libs/qt-3* immqt; then
-		eerror "To support qt3 in this package is required to have"
-		eerror "=x11-libs/qt-3* compiled with immqt-bc(recommended) or immqt USE flag."
-		die "Please reemerge =x11-libs/qt-3* with USE=\"immqt-bc\" or USE=\"immqt\"."
-
-	fi
 	# An arch specific config directory is used on multilib systems
 	has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
 	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/}
@@ -72,11 +65,7 @@ src_compile() {
 		myconf="${myconf} --disable-dict"
 	fi
 
-	if use qt3 ; then
-		append-flags -DQT_THREAD_SUPPORT
-	fi
-
-	if use gtk || use qt3 ; then
+	if use gtk; then
 		myconf="${myconf} --enable-pref"
 	else
 		myconf="${myconf} --disable-pref"
@@ -95,9 +84,9 @@ src_compile() {
 		$(use_with m17n-lib m17nlib) \
 		$(use_enable ncurses fep) \
 		$(use_enable nls) \
-		$(use_with qt3 qt) \
-		$(use_with qt3 qt-immodule) \
-		${myconf} || die "econf failed"
+		--without-qt \
+		--without-qt-immodule \
+		${myconf}
 	emake -j1 || die "emake failed"
 
 	if use emacs; then
@@ -126,7 +115,6 @@ pkg_postinst() {
 	elog "New input method switcher has been introduced. You need to set"
 	elog
 	elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE"
-	elog "% QT_IM_MODULE=uim ; export QT_IM_MODULE"
 	elog "% XMODIFIERS=@im=uim ; export XMODIFIERS"
 	elog
 	elog "If you would like to use uim-anthy as default input method, put"
@@ -134,7 +122,6 @@ pkg_postinst() {
 	elog "to your ~/.uim."
 	elog
 	elog "All input methods can be found by running uim-im-switcher-gtk"
-	elog "or uim-im-switcher-qt."
 	elog
 	elog "If you upgrade from a version of uim older than 1.4.0,"
 	elog "you should run revdep-rebuild."
diff --git a/app-i18n/uim/uim-1.5.6-r1.ebuild b/app-i18n/uim/uim-1.5.6-r1.ebuild
index ea440a7bc55b..ba889349534c 100644
--- a/app-i18n/uim/uim-1.5.6-r1.ebuild
+++ b/app-i18n/uim/uim-1.5.6-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.5.6-r1.ebuild,v 1.10 2009/11/27 16:15:55 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.5.6-r1.ebuild,v 1.11 2010/01/04 03:58:18 yngwin Exp $
 
 EAPI="2"
-inherit autotools eutils qt3 multilib elisp-common flag-o-matic
+inherit autotools eutils multilib elisp-common flag-o-matic
 
 DESCRIPTION="Simple, secure and flexible input method library"
 HOMEPAGE="http://code.google.com/p/uim/"
@@ -12,7 +12,7 @@ SRC_URI="http://uim.googlecode.com/files/${P}.tar.bz2"
 LICENSE="BSD GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE="+anthy canna eb emacs gnome gtk libedit libnotify m17n-lib ncurses nls prime qt3 qt4 unicode X xft linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko"
+IUSE="+anthy canna eb emacs gnome gtk libedit libnotify m17n-lib ncurses nls prime qt4 unicode X xft linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko"
 
 RDEPEND="X? (
 		x11-libs/libX11
@@ -38,7 +38,6 @@ RDEPEND="X? (
 	ncurses? ( sys-libs/ncurses )
 	nls? ( virtual/libintl )
 	prime? ( app-i18n/prime )
-	qt3? ( || ( >=x11-libs/qt-3.2.0:3[immqt-bc] >=x11-libs/qt-3.2.0:3[immqt] ) )
 	qt4? ( x11-libs/qt-gui:4[qt3support] )
 	!app-i18n/uim-svn
 	!<app-i18n/prime-0.9.4"
@@ -99,11 +98,7 @@ src_configure() {
 		myconf="${myconf} --disable-dict"
 	fi
 
-	if use qt3 ; then
-		append-flags -DQT_THREAD_SUPPORT
-	fi
-
-	if use gtk || use qt3 ; then
+	if use gtk; then
 		myconf="${myconf} --enable-pref"
 	else
 		myconf="${myconf} --disable-pref"
@@ -136,11 +131,11 @@ src_configure() {
 		$(use_enable ncurses fep) \
 		$(use_enable nls) \
 		$(use_with prime) \
-		$(use_with qt3 qt) \
-		$(use_with qt3 qt-immodule) \
+		--without-qt \
+		--without-qt-immodule \
 		$(use_with qt4 qt4-immodule) \
 		$(use_with xft) \
-		${myconf} || die "econf failed"
+		${myconf}
 }
 
 src_compile() {
diff --git a/app-i18n/uim/uim-1.5.6-r4.ebuild b/app-i18n/uim/uim-1.5.6-r4.ebuild
index 54ceb80a4cf6..cd10bbe56a47 100644
--- a/app-i18n/uim/uim-1.5.6-r4.ebuild
+++ b/app-i18n/uim/uim-1.5.6-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.5.6-r4.ebuild,v 1.2 2009/11/27 16:15:55 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.5.6-r4.ebuild,v 1.3 2010/01/04 03:58:18 yngwin Exp $
 
 EAPI="2"
-inherit autotools eutils qt3 multilib elisp-common flag-o-matic
+inherit autotools eutils multilib elisp-common flag-o-matic
 
 DESCRIPTION="Simple, secure and flexible input method library"
 HOMEPAGE="http://code.google.com/p/uim/"
@@ -12,7 +12,7 @@ SRC_URI="http://uim.googlecode.com/files/${P}.tar.bz2"
 LICENSE="BSD GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+anthy canna eb emacs gnome gtk libedit libnotify m17n-lib ncurses nls prime qt3 qt4 unicode X xft linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko"
+IUSE="+anthy canna eb emacs gnome gtk libedit libnotify m17n-lib ncurses nls prime qt4 unicode X xft linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko"
 
 RDEPEND="X? (
 		x11-libs/libX11
@@ -38,7 +38,6 @@ RDEPEND="X? (
 	ncurses? ( sys-libs/ncurses )
 	nls? ( virtual/libintl )
 	prime? ( app-i18n/prime )
-	qt3? ( || ( >=x11-libs/qt-3.2.0:3[immqt-bc] >=x11-libs/qt-3.2.0:3[immqt] ) )
 	qt4? ( x11-libs/qt-gui:4[qt3support] )
 	!app-i18n/uim-svn
 	!<app-i18n/prime-0.9.4"
@@ -102,11 +101,7 @@ src_configure() {
 		myconf="${myconf} --disable-dict"
 	fi
 
-	if use qt3 ; then
-		append-flags -DQT_THREAD_SUPPORT
-	fi
-
-	if use gtk || use qt3 ; then
+	if use gtk; then
 		myconf="${myconf} --enable-pref"
 	else
 		myconf="${myconf} --disable-pref"
@@ -139,11 +134,11 @@ src_configure() {
 		$(use_enable ncurses fep) \
 		$(use_enable nls) \
 		$(use_with prime) \
-		$(use_with qt3 qt) \
-		$(use_with qt3 qt-immodule) \
+		--without-qt \
+		--without-qt-immodule \
 		$(use_with qt4 qt4-immodule) \
 		$(use_with xft) \
-		${myconf} || die "econf failed"
+		${myconf}
 }
 
 src_compile() {
diff --git a/app-i18n/uim/uim-1.5.7.ebuild b/app-i18n/uim/uim-1.5.7.ebuild
index 8079b5561fd7..6c49a3089215 100644
--- a/app-i18n/uim/uim-1.5.7.ebuild
+++ b/app-i18n/uim/uim-1.5.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.5.7.ebuild,v 1.5 2009/12/31 14:07:15 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.5.7.ebuild,v 1.6 2010/01/04 03:58:18 yngwin Exp $
 
 EAPI="2"
-inherit autotools eutils qt3 multilib elisp-common flag-o-matic
+inherit autotools eutils multilib elisp-common flag-o-matic
 
 DESCRIPTION="Simple, secure and flexible input method library"
 HOMEPAGE="http://code.google.com/p/uim/"
@@ -12,7 +12,7 @@ SRC_URI="http://uim.googlecode.com/files/${P}.tar.bz2"
 LICENSE="BSD GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ppc ppc64 ~sparc ~x86"
-IUSE="+anthy canna eb emacs gnome gtk kde libedit libnotify m17n-lib ncurses nls prime qt3 qt4 unicode X xft linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko"
+IUSE="+anthy canna eb emacs gnome gtk kde libedit libnotify m17n-lib ncurses nls prime qt4 unicode X xft linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko"
 
 RDEPEND="X? (
 		x11-libs/libX11
@@ -39,7 +39,6 @@ RDEPEND="X? (
 	ncurses? ( sys-libs/ncurses )
 	nls? ( virtual/libintl )
 	prime? ( app-i18n/prime )
-	qt3? ( || ( >=x11-libs/qt-3.2.0:3[immqt-bc] >=x11-libs/qt-3.2.0:3[immqt] ) )
 	qt4? ( x11-libs/qt-gui:4[qt3support] )
 	!app-i18n/uim-svn
 	!<app-i18n/prime-0.9.4"
@@ -102,11 +101,7 @@ src_configure() {
 		myconf="${myconf} --disable-dict"
 	fi
 
-	if use qt3 ; then
-		append-flags -DQT_THREAD_SUPPORT
-	fi
-
-	if use gtk || use qt3 || use qt4 ; then
+	if use gtk || use qt4 ; then
 		myconf="${myconf} --enable-pref"
 	else
 		myconf="${myconf} --disable-pref"
@@ -140,12 +135,12 @@ src_configure() {
 		$(use_enable ncurses fep) \
 		$(use_enable nls) \
 		$(use_with prime) \
-		$(use_with qt3 qt) \
-		$(use_with qt3 qt-immodule) \
+		--without-qt \
+		--without-qt-immodule \
 		$(use_with qt4 qt4) \
 		$(use_with qt4 qt4-immodule) \
 		$(use_with xft) \
-		${myconf} || die "econf failed"
+		${myconf}
 }
 
 src_compile() {
@@ -184,7 +179,7 @@ pkg_postinst() {
 	elog "to your ~/.uim."
 	elog
 	elog "All input methods can be found by running uim-im-switcher-gtk, "
-	elog "uim-im-switcher-qt or uim-im-switcher-qt4."
+	elog "or uim-im-switcher-qt4."
 	elog
 	elog "If you upgrade from a version of uim older than 1.4.0,"
 	elog "you should run revdep-rebuild."