Remove kde-base/kdelibs:3.5 support.

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

4 files changed, 12 insertions, 38 deletions

diff --git a/app-misc/workrave/ChangeLog b/app-misc/workrave/ChangeLog
index b2cd514899ca..df4c6dd2b236 100644
--- a/app-misc/workrave/ChangeLog
+++ b/app-misc/workrave/ChangeLog
@@ -1,10 +1,10 @@
 # ChangeLog for app-misc/workrave
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/ChangeLog,v 1.59 2009/11/11 14:21:24 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/ChangeLog,v 1.60 2009/11/20 17:04:13 ssuominen Exp $
 
-  11 Nov 2009; Samuli Suominen <ssuominen@gentoo.org> workrave-1.8.5.ebuild,
+  20 Nov 2009; Samuli Suominen <ssuominen@gentoo.org> workrave-1.8.5.ebuild,
   workrave-1.9.0.ebuild:
-  Remove USE arts (deprecated).
+  Remove kde-base/arts:3.5 and kde-base/kdelibs:3.5 support.
 
   06 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> workrave-1.9.0.ebuild,
   +files/workrave-1.9.0-gcc44.patch:
diff --git a/app-misc/workrave/Manifest b/app-misc/workrave/Manifest
index 83182238d764..501841e0a0f4 100644
--- a/app-misc/workrave/Manifest
+++ b/app-misc/workrave/Manifest
@@ -11,7 +11,7 @@ AUX workrave-1.9.0-parallel-make.patch 1404 RMD160 a45d30bbfcf5b910a6f792a68e1a5
 AUX workrave-1.9.0-service.in 84 RMD160 70c6c250a58e48407f818e91e726f6e8f313a7b4 SHA1 ddd63c56530ae44947e849519868c0f494c870cb SHA256 0d6d93cedd6409404d4f4207b55cb744656f139de7361d4383435045a4892caa
 DIST workrave-1.8.5.tar.gz 1940651 RMD160 306364cbae2a1a4270cbd624864dc111b27ef388 SHA1 d40c3d536f1a37b849fcf8d1e7a6591e043cf19d SHA256 4a2f8f16f015fcec4446953421c8e12cdb41391a6da0e63d04d17b30534a0c56
 DIST workrave-1.9.0.tar.gz 6475352 RMD160 80da62dd8166428ce1236d8424da02fe941113d0 SHA1 5b8e697d33fa472cbe2e330ecf8ec70671ec61ed SHA256 ce110dd0b31c98e6fb34fc0cd63d69843a8e97933b9e75e54f173097c22f59ef
-EBUILD workrave-1.8.5.ebuild 2205 RMD160 090863156383df9cf3bcb0bd3bf629bb8bd222ba SHA1 5c9df2f8ef588212bd77d61423d7fc152ef7c912 SHA256 accedf3637424e2e17e981fa9b0574b4396c2a1ceded3f18b51adf1b1b9cb894
-EBUILD workrave-1.9.0.ebuild 2602 RMD160 c441d4a846e926cc8c2cf823e0f61599027f1a85 SHA1 87b22585d5d3976fd922ec9c16056130bef31015 SHA256 94a189b5dcb7cdfbef3cbdabb9149c7748d67fbc2d7e9e51f392779123998771
-MISC ChangeLog 9296 RMD160 d2aa8a1a0fa63ae2539b427275d63418e5179796 SHA1 a2929b7d11b62ec96f7988b61131a6b6fabd2329 SHA256 7187fd214d25c154f79eefffe0b8cca2ba7db36801b881a5ddc8936758df3591
+EBUILD workrave-1.8.5.ebuild 1975 RMD160 85cf144b9a2fc8819cccf71b34b5a0e42f7d1ce1 SHA1 a00880c0e5375bf48e9535c90c9aa673d502430a SHA256 50c59697ad81a3446d18783453deb2ca42859a168ec235e8b2309f3947b2af9c
+EBUILD workrave-1.9.0.ebuild 2372 RMD160 ae4e77a8ebd48e2ec1e8aaef4abd9b685873b1ff SHA1 de76443a5955c2707fbc8e69f7180dd10830bac1 SHA256 f3af21cd1e02ea97392d96b3337aa5969aec6831af3fc66b37e315a386e735ba
+MISC ChangeLog 9325 RMD160 33617bc792cebd27dc388e0204f413eb17773595 SHA1 e2c3b5d612ce966d30e52ed6fbf98a5b75f873e6 SHA256 232dca50385a90bc3eb2cb170749c9d54e636f987aee6afd0d7a5eee4143b819
 MISC metadata.xml 520 RMD160 36e3d789618562107f56faf8171d4c3adcd362ea SHA1 2a3ef0c57f60f739323f6422d9ebc443ed5514b6 SHA256 f614aee5f506fa3a49b3a4e9e8a20940c1b9795eca18c6d444b26048aa1c6fbc
diff --git a/app-misc/workrave/workrave-1.8.5.ebuild b/app-misc/workrave/workrave-1.8.5.ebuild
index ad1555918eba..c8881e5faa5f 100644
--- a/app-misc/workrave/workrave-1.8.5.ebuild
+++ b/app-misc/workrave/workrave-1.8.5.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-misc/workrave/workrave-1.8.5.ebuild,v 1.6 2009/11/11 14:21:24 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/workrave-1.8.5.ebuild,v 1.7 2009/11/20 17:04:13 ssuominen Exp $
 
 inherit eutils gnome2
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE="dbus distribution gnome kde nls xml"
+IUSE="dbus distribution gnome nls xml"
 
 RDEPEND=">=dev-libs/glib-2
 	>=gnome-base/gconf-2
@@ -30,9 +30,6 @@ RDEPEND=">=dev-libs/glib-2
 		>=sys-apps/dbus-0.92
 		dev-libs/dbus-glib )
 	xml? ( dev-libs/gdome2 )
-	kde? (
-		=x11-libs/qt-3*
-		=kde-base/kdelibs-3* )
 	x11-libs/libX11
 	x11-libs/libXtst
 	x11-libs/libXt
@@ -55,7 +52,7 @@ pkg_setup() {
 		$(use_enable distribution)
 		$(use_enable gnome)
 		$(use_enable gnome gnomemm)
-		$(use_enable kde)
+		--disable-kde
 		$(use_enable nls)
 		$(use_enable xml)
 		--without-arts"
@@ -77,13 +74,3 @@ src_unpack() {
 	echo "frontend/gtkmm/src/gnome_applet/Workrave-Applet.server.in" >>	po/POTFILES.in
 	echo "frontend/gtkmm/src/gnome_applet/WorkraveApplet.c" >> po/POTFILES.in
 }
-
-src_compile() {
-	if use kde; then
-		addwrite "/usr/qt/3/etc/settings"
-		export KDEDIR=$(kde-config --prefix)
-		einfo "KDEDIR set to ${KDEDIR}"
-	fi
-
-	gnome2_src_compile
-}
diff --git a/app-misc/workrave/workrave-1.9.0.ebuild b/app-misc/workrave/workrave-1.9.0.ebuild
index 345922dac751..de02b3240c38 100644
--- a/app-misc/workrave/workrave-1.9.0.ebuild
+++ b/app-misc/workrave/workrave-1.9.0.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-misc/workrave/workrave-1.9.0.ebuild,v 1.4 2009/11/11 14:21:24 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/workrave-1.9.0.ebuild,v 1.5 2009/11/20 17:04:13 ssuominen Exp $
 
 inherit autotools eutils gnome2
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="dbus distribution gnome kde nls xml"
+IUSE="dbus distribution gnome nls xml"
 
 RDEPEND=">=dev-libs/glib-2
 	>=gnome-base/gconf-2
@@ -30,9 +30,6 @@ RDEPEND=">=dev-libs/glib-2
 		>=sys-apps/dbus-1.0
 		dev-libs/dbus-glib )
 	xml? ( dev-libs/gdome2 )
-	kde? (
-		=x11-libs/qt-3*
-		=kde-base/kdelibs-3* )
 	x11-libs/libX11
 	x11-libs/libXtst
 	x11-libs/libXt
@@ -58,7 +55,7 @@ pkg_setup() {
 		$(use_enable distribution)
 		$(use_enable gnome)
 		$(use_enable gnome gnomemm)
-		$(use_enable kde)
+		--disable-kde
 		$(use_enable nls)
 		$(use_enable xml)
 		--without-arts"
@@ -91,13 +88,3 @@ src_unpack() {
 
 	eautoreconf
 }
-
-src_compile() {
-	if use kde; then
-		addwrite "/usr/qt/3/etc/settings"
-		export KDEDIR=$(kde-config --prefix)
-		einfo "KDEDIR set to ${KDEDIR}"
-	fi
-
-	gnome2_src_compile
-}