Disable kde support, should fix build issue with kde4 installed, bug #275316, thank Anton Bolshakov and DaggyStyle for report and investigation of the problem.

Package-Manager: portage-2.1.7.1/cvs/Linux x86_64

3 files changed, 19 insertions, 45 deletions

diff --git a/net-im/sim/ChangeLog b/net-im/sim/ChangeLog
index 663f23627a0d..62c09b522c0b 100644
--- a/net-im/sim/ChangeLog
+++ b/net-im/sim/ChangeLog
@@ -1,6 +1,11 @@
 # 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.96 2009/10/10 19:55:06 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/sim/ChangeLog,v 1.97 2009/10/23 12:49:13 pva Exp $
+
+  23 Oct 2009; Peter Volkov <pva@gentoo.org> sim-0.9.4.3-r3.ebuild:
+  Disable kde support, should fix build issue with kde4 installed, bug
+  #275316, thank Anton Bolshakov and DaggyStyle for report and investigation
+  of the problem.
 
   10 Oct 2009; Peter Volkov <pva@gentoo.org> -sim-0.9.4.3-r1.ebuild,
   -sim-0.9.4.3-r2.ebuild:
diff --git a/net-im/sim/Manifest b/net-im/sim/Manifest
index ee36fbca77f4..96cac64b0f5c 100644
--- a/net-im/sim/Manifest
+++ b/net-im/sim/Manifest
@@ -3,7 +3,7 @@ AUX sim-0.9.4.3-old-protocol.patch 1731 RMD160 b4d1edd03bb5e0bc4c09f086aeebfcb19
 AUX sim-0.9.4.3-sslv23.patch 336 RMD160 21dd720d0fb3594b452c931143fd9f206ed70a5a SHA1 1581ff9f660bd9ec5f56f97f7edeeec000a717a6 SHA256 c79e982824a1b8cd7da1dc06a180cfb8a51a4a5a863dcaa4deb749c1390848f3
 DIST sim-0.9.4.3-r1919_1924.patch.bz2 53044 RMD160 9982bc984fb8befe0680cae7115fdad575936458 SHA1 e8e7cc8da756f5e7686e416afe79a42cb76442d9 SHA256 80717eac7096c6a4b72edcf88c90926e0cd1e8760dd101f5a3986e6d3f16e17f
 DIST sim-0.9.4.3.tar.bz2 3251965 RMD160 2a1ced43d1e25e7b4fc95a88b7356c9991252d3c SHA1 6d181b4cb6b8470dd874a409578c02504f157b3e SHA256 305ee38897f11b2e68471d0f771f5487ac08e77f5ca2d47e2c350894ffc1a1b9
-EBUILD sim-0.9.4.3-r3.ebuild 2859 RMD160 a38a60d6004e5b915bed34876adddc7a91813b0b SHA1 2a761bc7e770501048565684d516f191cdcc5d6e SHA256 4a8c6c7b06f307ccb0c02fe55ced94b9d92f8f63234e5fa2e772c1cdedb93cf9
+EBUILD sim-0.9.4.3-r3.ebuild 1775 RMD160 92801bc9ff818866a11696771b09f9f785bde5ff SHA1 aefe2965ad7d94448a3e4ac09b30dc266a75898d SHA256 9c310c72a7ecd3fbe82cf4a36ff7c3b0b59f88e680fe99b840dd2cd6802be691
 EBUILD sim-9999.ebuild 3119 RMD160 b3d2f3eb4762c90f35d9ac023ec8d9ac00b26588 SHA1 01fc65e74a9abb12730cc9dbe017bb42bac97bcc SHA256 007eb4e96904f72bd8d8f022ff3ebea9d970494e9fa14ac4de9b1795127d37da
-MISC ChangeLog 14134 RMD160 6911f056caef42737953d5972c338b7546049c2d SHA1 81dd31cfaebcf8b8049ace7c87e81ad03eb2cf0e SHA256 5fde4c7750d30e1c3b4eb4c37fcdff4e6178da72a677534a132ee8c3186aabd1
+MISC ChangeLog 14369 RMD160 83daafdffc1f318bf85e4221b937853308a7c647 SHA1 31d9b47cf6d8d7d477bfb8147cd9d44f2c235ef7 SHA256 e8529f748a90d2b8017a5be272acd580058432534e1920d6fa6855ae141ff7ae
 MISC metadata.xml 860 RMD160 61c64f5e067fdfe89d20d90e6205d94bf28e5b18 SHA1 0c9654f1aeba90149ac6b9309337bfb853b28291 SHA256 dbdef5eda6ba49825f4989a88514b357daef74069ceb836acae35b7bb1aeb647
diff --git a/net-im/sim/sim-0.9.4.3-r3.ebuild b/net-im/sim/sim-0.9.4.3-r3.ebuild
index dea77ad686fb..1e071278da69 100644
--- a/net-im/sim/sim-0.9.4.3-r3.ebuild
+++ b/net-im/sim/sim-0.9.4.3-r3.ebuild
@@ -1,10 +1,10 @@
 # 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-0.9.4.3-r3.ebuild,v 1.5 2009/07/07 23:20:37 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/sim/sim-0.9.4.3-r3.ebuild,v 1.6 2009/10/23 12:49:13 pva Exp $
 
 EAPI=1
 
-inherit kde-functions eutils flag-o-matic
+inherit eutils flag-o-matic
 
 DESCRIPTION="Simple Instant Messenger (with KDE support). ICQ/AIM/Jabber/MSN/Yahoo."
 HOMEPAGE="http://sim-im.org/"
@@ -14,15 +14,12 @@ LICENSE="GPL-2"
 
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE="debug kde spell ssl"
+IUSE="debug spell ssl"
 
 RESTRICT="fetch"
 
-# 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? ( x11-libs/qt:3
-				 spell? ( app-text/aspell ) )
+RDEPEND="x11-libs/qt:3
+		 spell? ( app-text/aspell )
 		 ssl? ( dev-libs/openssl )
 		 dev-libs/libxml2
 		 dev-libs/libxslt
@@ -36,7 +33,7 @@ DEPEND="${RDEPEND}
 
 pkg_nofetch() {
 	elog "${CATEGORY}/${P} contains icons and sounds with unclear licensing and thus"
-	elog "you have to download and it put into '${DISTDIR}' by yourself."
+	elog "you have to download it and put into '${DISTDIR}' by yourself."
 	elog "Download location:"
 	echo
 	elog "${SRC_URI}"
@@ -45,31 +42,6 @@ pkg_nofetch() {
 	elog "information."
 }
 
-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
-		if ! built_with_use "=kde-base/kdelibs-3.5*" arts; then
-			myconf="--without-arts"
-		fi
-	fi
-}
-
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
@@ -78,22 +50,19 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-sslv23.patch
 	epatch ../${P}-r1919_1924.patch
 	epatch "${FILESDIR}"/${P}-old-protocol.patch
-	if use kde; then
-		set-kdedir 3
-	fi
 }
 
 src_compile() {
-	filter-flags -fstack-protector -fstack-protector-all
-
 	# Workaround for bug #119906
 	append-flags -fno-stack-protector
 
-	use kde || use spell || export DO_NOT_COMPILE="$DO_NOT_COMPILE plugins/spell"
+	use spell || export DO_NOT_COMPILE="$DO_NOT_COMPILE plugins/spell"
 
-	econf ${myconf} $(use_enable kde) \
+	econf ${myconf} \
 		  $(use_with ssl) \
-		  $(use_enable debug) || die "econf failed"
+		  $(use_enable debug) \
+		  --without-arts \
+		  --disable-kde
 
 	emake -j1 || die "make failed"
 }