Updating kvirc live ebuild so it actualy compiles now. Note: you will have to update it when we change eclass again or it stops working with new version of kde.

(Portage version: 2.2_rc12/cvs/Linux 2.6.27-gentoo x86_64)

3 files changed, 27 insertions, 21 deletions

diff --git a/net-irc/kvirc/ChangeLog b/net-irc/kvirc/ChangeLog
index 422021e42761..b96e232f0274 100644
--- a/net-irc/kvirc/ChangeLog
+++ b/net-irc/kvirc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/kvirc
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/ChangeLog,v 1.70 2008/09/14 19:48:27 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/ChangeLog,v 1.71 2008/10/26 19:16:43 scarabeus Exp $
+
+  26 Oct 2008; Tomas Chvatal (scarabeus) <scarabeus@gentoo.org>
+  kvirc-9999.ebuild:
+  Update kvirc live ebuild so it works with kde 4.1
 
   14 Sep 2008; Markus Ullmann <jokey@gentoo.org> metadata.xml,
   kvirc-9999.ebuild:
diff --git a/net-irc/kvirc/kvirc-9999.ebuild b/net-irc/kvirc/kvirc-9999.ebuild
index 3c6cfa50f958..95be824a9f72 100644
--- a/net-irc/kvirc/kvirc-9999.ebuild
+++ b/net-irc/kvirc/kvirc-9999.ebuild
@@ -1,33 +1,37 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-9999.ebuild,v 1.12 2008/09/14 19:48:27 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-9999.ebuild,v 1.13 2008/10/26 19:16:43 scarabeus Exp $
 
-EAPI="1"
+EAPI="2"
 
+NEED_KDE=":4.1"
 inherit cmake-utils multilib subversion
 
 DESCRIPTION="Advanced IRC Client"
 HOMEPAGE="http://www.kvirc.net/"
+SRC_URI=""
+ESVN_REPO_URI="https://svn.kvirc.de/svn/trunk/kvirc"
+ESVN_PROJECT="kvirc"
+
 
 LICENSE="kvirc"
-SLOT="4"
+SLOT="4.1"
 KEYWORDS=""
-IUSE="audiofile +crypt +dcc_voice debug doc +gsm +ipc ipv6 kde nls profile +qt-dbus qt-phonon qt-webkit ssl +transparency"
+IUSE="audiofile +crypt +dcc_voice debug doc +gsm +ipc ipv6 kde +nls profile +phonon +ssl +transparency"
 
 RDEPEND="
+	!net-irc/kvirc:0
+	!net-irc/kvirc:4
 	sys-libs/zlib
-	x11-libs/qt-core
-	x11-libs/qt-gui
-	x11-libs/qt-qt3support
+	x11-libs/qt-gui[qt3support,dbus]
+	x11-libs/qt-webkit
 	audiofile? ( media-libs/audiofile )
-	kde? ( kde-base/kdelibs:kde-4 )
-	qt-dbus? ( x11-libs/qt-dbus )
-	qt-phonon? ( x11-libs/qt-phonon )
-	qt-webkit? ( x11-libs/qt-webkit )
+	kde? ( kde-base/kdelibs:4.1 )
+	phonon? ( || ( media-sound/phonon x11-libs/qt-phonon ) )
 	ssl? ( dev-libs/openssl )"
 
 DEPEND="${RDEPEND}
-	sys-devel/gettext
+	nls? ( sys-devel/gettext )
 	doc? ( app-doc/doxygen )"
 
 DOCS="ChangeLog TODO"
@@ -43,12 +47,14 @@ src_unpack() {
 	sed -i -e "/#define KVI_DEFAULT_FRAME_CAPTION/s/KVI_VERSION/& \" r${VERSIO_PRAESENS}\"/" src/kvirc/ui/kvi_frame.cpp || die "Failed to set revision number"
 }
 
-src_compile() {
+src_configure() {
 	local mycmakeargs="
 		-DCMAKE_INSTALL_PREFIX=/usr
 		-DCOEXISTENCE=1
 		-DLIB_INSTALL_PREFIX="/usr/$(get_libdir)"
 		-DVERBOSE=1
+		-DWANT_QTDBUS=1
+		-DWANT_QTWEBKIT=1
 		$(cmake-utils_use_want audiofile AUDIOFILE)
 		$(cmake-utils_use_want crypt CRYPT)
 		$(cmake-utils_use_want dcc_voice DCC_VOICE)
@@ -59,12 +65,10 @@ src_compile() {
 		$(cmake-utils_use_want ipv6 IPV6)
 		$(cmake-utils_use_want kde KDE4)
 		$(cmake-utils_use_want nls GETTEXT)
+		$(cmake-utils_use_want phonon PHONON)
 		$(cmake-utils_use_want profile MEMORY_PROFILE)
-		$(cmake-utils_use_want qt-dbus QTDBUS)
-		$(cmake-utils_use_want qt-phonon PHONON)
-		$(cmake-utils_use_want qt-webkit QTWEBKIT)
 		$(cmake-utils_use_want ssl OPENSSL)
 		$(cmake-utils_use_want transparency TRANSPARENCY)"
 
-	cmake-utils_src_compile
+	cmake-utils_src_configure
 }
diff --git a/net-irc/kvirc/metadata.xml b/net-irc/kvirc/metadata.xml
index 445303830448..993165ba2470 100644
--- a/net-irc/kvirc/metadata.xml
+++ b/net-irc/kvirc/metadata.xml
@@ -10,9 +10,7 @@
     <flag name="dcc_voice">Support voice over DCC chats</flag>
     <flag name="gsm">enable support for media-sound/gsm</flag>
     <flag name="ipc">add support for IPC between kvirc processes</flag>
-    <flag name="qt-dbus">enable use of Qt's DBUS interface for IPC</flag>
-    <flag name="qt-phonon">use phonon instead of command-based sound</flag>
-    <flag name="qt-webkit">enable use of Qt's WebKit</flag>
+    <flag name="phonon">use phonon instead of command-based sound</flag>
     <flag name="transparency">compile in fake-transparency</flag>
   </use>
 </pkgmetadata>