Fixed depends for kde-4, bug 206732, thank Ingmar Vanhassel for the fix. Updated sim live svn ebuild to use cmake based build, bug 200684, thank you Bernd Steinhauser <gentoo AT bernd-steinhauser.de> for work on this.

(Portage version: 2.1.3.19)

1 files changed, 12 insertions, 12 deletions

diff --git a/net-im/sim/sim-0.9.4.3-r1.ebuild b/net-im/sim/sim-0.9.4.3-r1.ebuild
index 2f0e2f0c79e8..5480b34a7c8f 100644
--- a/net-im/sim/sim-0.9.4.3-r1.ebuild
+++ b/net-im/sim/sim-0.9.4.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/sim/sim-0.9.4.3-r1.ebuild,v 1.6 2008/01/14 19:00:05 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/sim/sim-0.9.4.3-r1.ebuild,v 1.7 2008/01/22 13:38:27 pva Exp $
 
 inherit kde-functions eutils flag-o-matic
 
@@ -17,8 +17,8 @@ IUSE="debug kde spell ssl"
 RESTRICT="fetch"
 
 # kdebase-data provides the icon "licq.png"
-RDEPEND="kde? ( kde-base/kdelibs
-				|| ( kde-base/kdebase-data kde-base/kdebase ) )
+RDEPEND="kde? ( =kde-base/kdelibs-3.5*
+				|| ( =kde-base/kdebase-data-3.5* =kde-base/kdebase-3.5* ) )
 		 !kde? ( $(qt_min_version 3)
 				 spell? ( app-text/aspell ) )
 		 ssl? ( dev-libs/openssl )
@@ -44,9 +44,9 @@ pkg_nofetch() {
 }
 
 pkg_setup() {
-	if use kde ; then
+	if use kde; then
 		if use spell; then
-			if ! built_with_use kde-base/kdelibs 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"
@@ -54,7 +54,7 @@ pkg_setup() {
 				ebeep
 			fi
 		else
-			if built_with_use kde-base/kdelibs spell ; then
+			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'
@@ -62,7 +62,7 @@ pkg_setup() {
 				ebeep
 			fi
 		fi
-		if ! built_with_use kde-base/kdelibs arts ; then
+		if ! built_with_use "=kde-base/kdelibs-3.5*" arts; then
 			myconf="--without-arts"
 		fi
 	fi
@@ -74,8 +74,8 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/${P}-double-message-fix.patch
 	epatch ../${P}-r1919_1924.patch
-	if use kde ; then
-	set-kdedir 3
+	if use kde; then
+		set-kdedir 3
 	fi
 }
 
@@ -87,9 +87,9 @@ src_compile() {
 
 	use kde || use spell || export DO_NOT_COMPILE="$DO_NOT_COMPILE plugins/spell"
 
-	econf ${myconf} `use_enable kde` \
-		  `use_with ssl` \
-		  `use_enable debug` || die "econf failed"
+	econf ${myconf} $(use_enable kde) \
+		  $(use_with ssl) \
+		  $(use_enable debug) || die "econf failed"
 
 	emake -j1 || die "make failed"
 }