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)

5 files changed, 74 insertions, 157 deletions

diff --git a/net-im/sim/ChangeLog b/net-im/sim/ChangeLog
index 4f7add9a5f14..f0d0654db7a8 100644
--- a/net-im/sim/ChangeLog
+++ b/net-im/sim/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/sim
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/sim/ChangeLog,v 1.85 2008/01/14 19:00:05 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/sim/ChangeLog,v 1.86 2008/01/22 13:38:27 pva Exp $
+
+  22 Jan 2008; <pva@gentoo.org> -sim-0.9.4.3.ebuild, sim-0.9.4.3-r1.ebuild,
+  sim-9999.ebuild:
+  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. Removed
+  old ebuild.
 
   14 Jan 2008; Christoph Mende <angelos@gentoo.org> sim-0.9.4.3-r1.ebuild:
   Stable on amd64 wrt bug #202113
diff --git a/net-im/sim/files/digest-sim-0.9.4.3 b/net-im/sim/files/digest-sim-0.9.4.3
deleted file mode 100644
index ebef92464401..000000000000
--- a/net-im/sim/files/digest-sim-0.9.4.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4bc30577e619e05252d394d51dc20747 sim-0.9.4.3.tar.bz2 3251965
-RMD160 2a1ced43d1e25e7b4fc95a88b7356c9991252d3c sim-0.9.4.3.tar.bz2 3251965
-SHA256 305ee38897f11b2e68471d0f771f5487ac08e77f5ca2d47e2c350894ffc1a1b9 sim-0.9.4.3.tar.bz2 3251965
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"
 }
diff --git a/net-im/sim/sim-0.9.4.3.ebuild b/net-im/sim/sim-0.9.4.3.ebuild
deleted file mode 100644
index 288f4d5c1b41..000000000000
--- a/net-im/sim/sim-0.9.4.3.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2007 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.ebuild,v 1.7 2007/11/17 17:23:45 pva Exp $
-
-inherit kde-functions eutils flag-o-matic
-
-DESCRIPTION="Simple Instant Messenger (with KDE support). ICQ/AIM/Jabber/MSN/Yahoo."
-HOMEPAGE="http://sim-im.org/"
-SRC_URI="http://download.berlios.de/sim-im/${P}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-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 ) )
-		 !kde? ( $(qt_min_version 3)
-				 spell? ( app-text/aspell ) )
-		 ssl? ( dev-libs/openssl )
-		 dev-libs/libxml2
-		 dev-libs/libxslt
-		 sys-libs/zlib
-		 x11-libs/libXScrnSaver"
-
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	app-arch/zip
-	x11-proto/scrnsaverproto"
-
-pkg_nofetch() {
-	einfo "${CATEGORY}/${P} contains icons and sounds with unclear licensing and thus"
-	einfo "you have to download and it put into ${DISTDIR} by yourself."
-	einfo "Download location:"
-	echo
-	einfo "${SRC_URI}"
-	echo
-	einfo "See http://archives.gentoo.org/gentoo-dev/msg_144003.xml for further"
-	einfo "information."
-}
-
-pkg_setup() {
-	if use kde ; then
-		if use spell; then
-			if ! built_with_use kde-base/kdelibs 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 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 arts ; then
-			myconf="--without-arts"
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	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"
-
-	econf ${myconf} `use_enable kde` \
-		  `use_with ssl` \
-		  `use_enable debug` || die "econf failed"
-
-	emake -j1 || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed."
-	dodoc TODO README AUTHORS.sim jisp-resources.txt ChangeLog
-}
diff --git a/net-im/sim/sim-9999.ebuild b/net-im/sim/sim-9999.ebuild
index 235849192b7d..353cf862804b 100644
--- a/net-im/sim/sim-9999.ebuild
+++ b/net-im/sim/sim-9999.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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-9999.ebuild,v 1.1 2007/12/14 17:11:21 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/sim/sim-9999.ebuild,v 1.2 2008/01/22 13:38:27 pva Exp $
 
-inherit subversion kde-functions eutils flag-o-matic
+EAPI="1"
+
+inherit cmake-utils kde-functions eutils flag-o-matic subversion
 
 ESVN_REPO_URI="svn://svn.berlios.de/sim-im/trunk"
 ESVN_PROJECT="sim-im"
-ESVN_BOOTSTRAP="make -f ./admin/Makefile.common"
 
 DESCRIPTION="Simple Instant Messenger (with KDE support). ICQ/AIM/Jabber/MSN/Yahoo."
 HOMEPAGE="http://sim-im.org/"
@@ -14,28 +15,34 @@ LICENSE="GPL-2"
 
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug kde spell ssl"
+IUSE="debug gpg +jabber kde 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
-				|| ( kde-base/kdebase-data kde-base/kdebase ) )
-		 !kde? ( $(qt_min_version 3)
-				 spell? ( app-text/aspell ) )
-		 ssl? ( dev-libs/openssl )
-		 dev-libs/libxml2
-		 dev-libs/libxslt
-		 sys-libs/zlib
-		 x11-libs/libXScrnSaver"
+DEPEND="kde? ( kde-base/kdelibs:3.5 )
+		!kde? ( spell? ( app-text/aspell ) )
+		x11-libs/qt:3
+		ssl? ( dev-libs/openssl )
+		dev-libs/libxml2
+		dev-libs/libxslt
+		sys-libs/zlib
+		media-libs/fontconfig
+		x11-libs/libXScrnSaver"
 
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	app-arch/zip
-	x11-proto/scrnsaverproto"
+RDEPEND="${DEPEND}
+		kde? ( || ( kde-base/kdebase-data:3.5 kde-base/kdebase:3.5 ) )
+		gpg? ( app-crypt/gnupg )
+		sys-devel/flex
+		app-arch/zip
+		x11-proto/scrnsaverproto"
 
 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"
@@ -43,7 +50,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'
@@ -51,36 +58,39 @@ pkg_setup() {
 				ebeep
 			fi
 		fi
-		if ! built_with_use kde-base/kdelibs arts ; then
-			myconf="--without-arts"
-		fi
 	fi
-}
-
-src_unpack() {
-	subversion_src_unpack
-
-	if use kde ; then
-	set-kdedir 3
+	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() {
-	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"
-
-	econf ${myconf} `use_enable kde` \
-		  `use_with ssl` \
-		  `use_enable debug` || die "econf failed"
+	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)
+				$(cmake-utils_use_enable spell PLUGIN_SPELL)
+				$(cmake-utils_use_enable ssl OPENSSL)
+				$(cmake-utils_use_enable weather PLUGIN_WEATHER)
+				$(cmake-utils_use_enable yahoo PLUGIN_YAHOO)
+				-DENABLE_PLUGIN_UPDATE:BOOL=Off
+				${SIMCMAKEOPTS}"
 
-	emake || die "make failed"
+	cmake-utils_src_compile
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed."
-	dodoc TODO README AUTHORS.sim jisp-resources.txt ChangeLog
+	cmake-utils_src_install
+	dodoc TODO TODO.CMake README AUTHORS.sim jisp-resources.txt ChangeLog
 }