Dropped kde support from svn ebuild, bug 290867, thank Samuli Suominen for report. If you need kde-3.5 support use kde-sunset overlay.

(Portage version: 2.1.7.1/cvs/Linux x86_64)

2 files changed, 19 insertions, 41 deletions

diff --git a/net-im/sim/ChangeLog b/net-im/sim/ChangeLog
index fab0d6c8d0a4..55325b9b22a6 100644
--- a/net-im/sim/ChangeLog
+++ b/net-im/sim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/sim
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/sim/ChangeLog,v 1.99 2009/10/27 14:40:30 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/sim/ChangeLog,v 1.100 2009/10/28 13:18:15 pva Exp $
+
+  28 Oct 2009; Peter Volkov <pva@gentoo.org> sim-9999.ebuild:
+  Dropped kde support from svn ebuild, bug 290867, thank Samuli Suominen for
+  report. If you need kde-3.5 support use kde-sunset overlay.
 
   27 Oct 2009; Peter Volkov <pva@gentoo.org> sim-0.9.4.3-r3.ebuild:
   Added migration note, thank Anton Bolshakov for report in bug #275316.
diff --git a/net-im/sim/sim-9999.ebuild b/net-im/sim/sim-9999.ebuild
index a95350a57217..4414e1e724f3 100644
--- a/net-im/sim/sim-9999.ebuild
+++ b/net-im/sim/sim-9999.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/net-im/sim/sim-9999.ebuild,v 1.3 2008/05/11 13:24:42 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/sim/sim-9999.ebuild,v 1.4 2009/10/28 13:18:15 pva Exp $
 
 EAPI="1"
 
@@ -14,17 +14,15 @@ HOMEPAGE="http://sim-im.org/"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug gpg +jabber kde msn +oscar sms spell ssl weather yahoo livejournal"
+KEYWORDS=""
+IUSE="debug gpg +jabber msn +oscar sms spell ssl weather yahoo livejournal"
 
 # It's possible to disable/enable pluging defining SIMCMAKEOPTS. E.g. put
 # SIMCMAKEOPTS="-DENABLE_PLUGIN_TRANSPARENT:BOOL=Off"
 # inside /etc/portage/env/net-im/sim to disable transparent plugin.
 
-# kdebase-data provides the icon "licq.png"
-RDEPEND="kde? ( kde-base/kdelibs:3.5
-				|| ( kde-base/kdebase-data:3.5 kde-base/kdebase:3.5 ) )
-		!kde? ( spell? ( app-text/aspell ) )
+RDEPEND="
+		spell? ( app-text/aspell )
 		x11-libs/qt:3
 		ssl? ( dev-libs/openssl )
 		gpg? ( app-crypt/gnupg )
@@ -39,44 +37,12 @@ DEPEND="${RDEPEND}
 		app-arch/zip
 		x11-proto/scrnsaverproto"
 
-pkg_setup() {
-	if use kde; then
-		if use spell; then
-			if ! built_with_use "kde-base/kdelibs:3.5" spell; then
-				ewarn "kde-base/kdelibs were merged without spell in USE."
-				ewarn "Thus spelling will not work in sim. Please, either"
-				ewarn "reemerge kde-base/kdelibs with spell in USE or emerge"
-				ewarn 'sim with USE="-spell" to avoid this message.'
-				ebeep
-			fi
-		else
-			if built_with_use "kde-base/kdelibs:3.5" spell; then
-				ewarn 'kde-base/kdelibs were merged with spell in USE.'
-				ewarn 'Thus spelling will work in sim. Please, either'
-				ewarn 'reemerge kde-base/kdelibs without spell in USE or emerge'
-				ewarn 'sim with USE="spell" to avoid this message.'
-				ebeep
-			fi
-		fi
-	fi
-	if ! use jabber && ! use livejournal && ! use msn && ! use oscar && ! use yahoo; then
-		eerror "Sim requires at least one instant messaging protocol to be"
-		eerror "activated. The available protocols are:"
-		eerror "\"jabber livejournal msn oscar yahoo\"."
-		die "No instant messaging protocol activated."
-	fi
-}
-
 src_compile() {
-	if use kde; then
-		set-kdedir 3
-	fi
 	mycmakeargs="${mycmakeargs}
 				$(cmake-utils_use_enable debug PLUGIN_LOGGER)
 				$(cmake-utils_use_enable gpg PLUGIN_GPG)
 				$(cmake-utils_use_enable jabber PLUGIN_JABBER)
 				$(cmake-utils_use_enable livejournal PLUGIN_LIVEJOURNAL)
-				$(cmake-utils_use_enable kde KDE3)
 				$(cmake-utils_use_enable msn PLUGIN_MSN)
 				$(cmake-utils_use_enable oscar PLUGIN_ICQ)
 				$(cmake-utils_use_enable sms PLUGIN_SMS)
@@ -84,6 +50,7 @@ src_compile() {
 				$(cmake-utils_use_enable ssl OPENSSL)
 				$(cmake-utils_use_enable weather PLUGIN_WEATHER)
 				$(cmake-utils_use_enable yahoo PLUGIN_YAHOO)
+				-DENABLE_KDE3=OFF
 				-DENABLE_PLUGIN_UPDATE:BOOL=Off
 				${SIMCMAKEOPTS}"
 
@@ -94,3 +61,10 @@ src_install() {
 	cmake-utils_src_install
 	dodoc TODO TODO.CMake README AUTHORS.sim jisp-resources.txt ChangeLog
 }
+
+pkg_postinst() {
+	ewarn "Since kde-3.5 is deprecated sim doesn't have kde support any more (#275316)."
+	ewarn "If you have used sim built with kde USE flag enabled to migrate on qt only"
+	ewarn "version of sim, please, run the following command:"
+	ewarn " $ mv ~/.kde3.5/share/apps/sim ~/.sim"
+}