Remove KDE3 support.

(Portage version: 2.2_rc46/cvs/Linux x86_64)

6 files changed, 25 insertions, 31 deletions

diff --git a/app-i18n/uim/ChangeLog b/app-i18n/uim/ChangeLog
index 9ea04154e45f..1321756df655 100644
--- a/app-i18n/uim/ChangeLog
+++ b/app-i18n/uim/ChangeLog
@@ -1,6 +1,11 @@
 # 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.206 2009/10/11 16:03:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.207 2009/10/25 00:36:00 ssuominen Exp $
+
+  25 Oct 2009; Samuli Suominen <ssuominen@gentoo.org> uim-1.4.1.ebuild,
+  uim-1.4.2.ebuild, uim-1.5.6-r1.ebuild, uim-1.5.6-r2.ebuild,
+  uim-1.5.6-r3.ebuild:
+  Remove KDE3 support.
 
   11 Oct 2009; Raúl Porcel <armin76@gentoo.org> uim-1.5.6-r1.ebuild:
   sparc stable wrt #268190
diff --git a/app-i18n/uim/uim-1.4.1.ebuild b/app-i18n/uim/uim-1.4.1.ebuild
index 91e2b2b0a057..90a2d8a92a5e 100644
--- a/app-i18n/uim/uim-1.4.1.ebuild
+++ b/app-i18n/uim/uim-1.4.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.4.1.ebuild,v 1.14 2008/07/27 19:40:16 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.4.1.ebuild,v 1.15 2009/10/25 00:36:00 ssuominen Exp $
 
 EAPI=1
 
@@ -13,7 +13,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 m17n-lib ncurses nls prime qt3 X linguas_zh_CN linguas_ja linguas_ko"
+IUSE="anthy canna eb emacs gnome gtk libedit m17n-lib ncurses nls prime qt3 X linguas_zh_CN linguas_ja linguas_ko"
 
 RDEPEND="X? ( x11-libs/libX11
 		x11-libs/libXft
@@ -28,7 +28,6 @@ RDEPEND="X? ( x11-libs/libX11
 	emacs? ( virtual/emacs )
 	gnome? ( >=gnome-base/gnome-panel-2.14 )
 	gtk? ( >=x11-libs/gtk+-2.4 )
-	kde? ( kde-base/kdelibs )
 	libedit? ( dev-libs/libedit )
 	m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 )
 	ncurses? ( sys-libs/ncurses )
@@ -90,7 +89,7 @@ src_compile() {
 		$(use_enable gnome gnome-applet) \
 		$(use_with gtk gtk2) \
 		$(use_with libedit) \
-		$(use_enable kde kde-applet) \
+		--disable-kde-applet \
 		$(use_with m17n-lib m17nlib) \
 		$(use_enable ncurses fep) \
 		$(use_enable nls) \
diff --git a/app-i18n/uim/uim-1.4.2.ebuild b/app-i18n/uim/uim-1.4.2.ebuild
index 7cac23bf1cb9..40bc2ea75bc6 100644
--- a/app-i18n/uim/uim-1.4.2.ebuild
+++ b/app-i18n/uim/uim-1.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.9 2009/06/24 05:19:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.4.2.ebuild,v 1.10 2009/10/25 00:36:00 ssuominen Exp $
 
 EAPI=1
 inherit eutils qt3 multilib elisp-common flag-o-matic
@@ -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 m17n-lib ncurses nls prime qt3 X linguas_zh_CN linguas_ja linguas_ko"
+IUSE="anthy canna eb emacs gnome gtk libedit m17n-lib ncurses nls prime qt3 X linguas_zh_CN linguas_ja linguas_ko"
 
 RDEPEND="X? ( x11-libs/libX11
 		x11-libs/libXft
@@ -27,7 +27,6 @@ RDEPEND="X? ( x11-libs/libX11
 	emacs? ( virtual/emacs )
 	gnome? ( >=gnome-base/gnome-panel-2.14 )
 	gtk? ( >=x11-libs/gtk+-2.4 )
-	kde? ( kde-base/kdelibs:3.5 )
 	libedit? ( dev-libs/libedit )
 	m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 )
 	ncurses? ( sys-libs/ncurses )
@@ -92,7 +91,7 @@ src_compile() {
 		$(use_enable gnome gnome-applet) \
 		$(use_with gtk gtk2) \
 		$(use_with libedit) \
-		$(use_enable kde kde-applet) \
+		--disable-kde-applet \
 		$(use_with m17n-lib m17nlib) \
 		$(use_enable ncurses fep) \
 		$(use_enable nls) \
diff --git a/app-i18n/uim/uim-1.5.6-r1.ebuild b/app-i18n/uim/uim-1.5.6-r1.ebuild
index 816d0477122e..470f577edafa 100644
--- a/app-i18n/uim/uim-1.5.6-r1.ebuild
+++ b/app-i18n/uim/uim-1.5.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.8 2009/10/11 16:03:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.5.6-r1.ebuild,v 1.9 2009/10/25 00:36:00 ssuominen Exp $
 
 EAPI="2"
 inherit autotools eutils qt3 multilib elisp-common flag-o-matic
@@ -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 libedit libnotify m17n-lib ncurses nls prime qt3 qt4 unicode X xft linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko"
 
 RDEPEND="X? (
 		x11-libs/libX11
@@ -32,7 +32,6 @@ RDEPEND="X? (
 	emacs? ( virtual/emacs )
 	gnome? ( >=gnome-base/gnome-panel-2.14 )
 	gtk? ( >=x11-libs/gtk+-2.4 )
-	kde? ( kde-base/kdelibs:3.5 )
 	libedit? ( dev-libs/libedit )
 	libnotify? ( >=x11-libs/libnotify-0.4 )
 	m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 )
@@ -120,9 +119,7 @@ src_configure() {
 		myconf="${myconf} --without-anthy"
 	fi
 
-	if use qt3 && use kde ; then
-		myconf="${myconf} --enable-notify=knotify3"
-	elif use libnotify ; then
+	if use libnotify ; then
 		myconf="${myconf} --enable-notify=libnotify"
 	fi
 
@@ -134,7 +131,7 @@ src_configure() {
 		$(use_enable gnome gnome-applet) \
 		$(use_with gtk gtk2) \
 		$(use_with libedit) \
-		$(use_enable kde kde-applet) \
+		--disable-kde-applet \
 		$(use_with m17n-lib m17nlib) \
 		$(use_enable ncurses fep) \
 		$(use_enable nls) \
diff --git a/app-i18n/uim/uim-1.5.6-r2.ebuild b/app-i18n/uim/uim-1.5.6-r2.ebuild
index 02c2ebd691d5..dd8480542b3c 100644
--- a/app-i18n/uim/uim-1.5.6-r2.ebuild
+++ b/app-i18n/uim/uim-1.5.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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-r2.ebuild,v 1.1 2009/09/16 16:23:00 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.5.6-r2.ebuild,v 1.2 2009/10/25 00:36:00 ssuominen Exp $
 
 EAPI="2"
 inherit autotools eutils qt3 multilib elisp-common flag-o-matic
@@ -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 libedit libnotify m17n-lib ncurses nls prime qt3 qt4 unicode X xft linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko"
 
 RDEPEND="X? (
 		x11-libs/libX11
@@ -32,7 +32,6 @@ RDEPEND="X? (
 	emacs? ( virtual/emacs )
 	gnome? ( >=gnome-base/gnome-panel-2.14 )
 	gtk? ( >=x11-libs/gtk+-2.4 )
-	kde? ( kde-base/kdelibs:3.5 )
 	libedit? ( dev-libs/libedit )
 	libnotify? ( >=x11-libs/libnotify-0.4 )
 	m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 )
@@ -121,9 +120,7 @@ src_configure() {
 		myconf="${myconf} --without-anthy"
 	fi
 
-	if use qt3 && use kde ; then
-		myconf="${myconf} --enable-notify=knotify3"
-	elif use libnotify ; then
+	if use libnotify ; then
 		myconf="${myconf} --enable-notify=libnotify"
 	fi
 
@@ -135,7 +132,7 @@ src_configure() {
 		$(use_enable gnome gnome-applet) \
 		$(use_with gtk gtk2) \
 		$(use_with libedit) \
-		$(use_enable kde kde-applet) \
+		--disable-kde-applet \
 		$(use_with m17n-lib m17nlib) \
 		$(use_enable ncurses fep) \
 		$(use_enable nls) \
diff --git a/app-i18n/uim/uim-1.5.6-r3.ebuild b/app-i18n/uim/uim-1.5.6-r3.ebuild
index 725ccbb5a04e..292afc041a5b 100644
--- a/app-i18n/uim/uim-1.5.6-r3.ebuild
+++ b/app-i18n/uim/uim-1.5.6-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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-r3.ebuild,v 1.1 2009/09/17 16:57:45 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.5.6-r3.ebuild,v 1.2 2009/10/25 00:36:00 ssuominen Exp $
 
 EAPI="2"
 inherit autotools eutils qt3 multilib elisp-common flag-o-matic
@@ -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 libedit libnotify m17n-lib ncurses nls prime qt3 qt4 unicode X xft linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko"
 
 RDEPEND="X? (
 		x11-libs/libX11
@@ -32,7 +32,6 @@ RDEPEND="X? (
 	emacs? ( virtual/emacs )
 	gnome? ( >=gnome-base/gnome-panel-2.14 )
 	gtk? ( >=x11-libs/gtk+-2.4 )
-	kde? ( kde-base/kdelibs:3.5 )
 	libedit? ( dev-libs/libedit )
 	libnotify? ( >=x11-libs/libnotify-0.4 )
 	m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 )
@@ -121,9 +120,7 @@ src_configure() {
 		myconf="${myconf} --without-anthy"
 	fi
 
-	if use qt3 && use kde && ! use qt4 ; then
-		myconf="${myconf} --enable-notify=knotify3"
-	elif use libnotify ; then
+	if use libnotify ; then
 		myconf="${myconf} --enable-notify=libnotify"
 	fi
 
@@ -135,7 +132,7 @@ src_configure() {
 		$(use_enable gnome gnome-applet) \
 		$(use_with gtk gtk2) \
 		$(use_with libedit) \
-		$(use_enable kde kde-applet) \
+		--disable-kde-applet \
 		$(use_with m17n-lib m17nlib) \
 		$(use_enable ncurses fep) \
 		$(use_enable nls) \