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.

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.27-gentoo x86_64

4 files changed, 30 insertions, 34 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/Manifest b/net-irc/kvirc/Manifest
index 3c5429fe9e6f..602c63961155 100644
--- a/net-irc/kvirc/Manifest
+++ b/net-irc/kvirc/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX kvirc-3.4.0-kdedir-fix.patch 1712 RMD160 cfb353ed4bc32a000818817c7cc13b6b9c905cc8 SHA1 968e9e3c269954b6c0b48b365497c54ff0ff6479 SHA256 4732ee6d0b3290e4d032959cae4fb8f0550cd9e60afaa405cef3c12eff188adc
 AUX kvirc-gendoc.patch 330 RMD160 942c672170630dcb565c046318621f05e6f43dda SHA1 4a60660db3b30226be8880f44a50e317b7b743dd SHA256 b61281260069c33f13927bd8af006c27de15b303be44e723f2eec5c5953bb9f7
 AUX kvirc-noipv6.patch 574 RMD160 a8913a69d2966e045caaf351af71bd3e7efd8fe0 SHA1 dcb2d6f575c8b50d97ede18cfffd015b97a409e4 SHA256 69ccd38e8733368bb10329e2e8f14ae36bc359a1380d41ba22dad5a34801c59c
@@ -11,13 +8,6 @@ DIST kvirc-3.4.0.tar.bz2 5287688 RMD160 d11125df71bcde4683882880acd6fcfe430b8a51
 EBUILD kvirc-3.2.6_pre20070714.ebuild 1839 RMD160 70988f402618cc17c0ee685734eb880f15cbf9f4 SHA1 c53d3dc503888247792ed0cc5a8245485bb5cb08 SHA256 60295e9cb4dd7353279bbe7ac307bcb2dbe9dcfb97544b191f52cf58b5f8d03d
 EBUILD kvirc-3.2.6_pre20080204.ebuild 1815 RMD160 f96cbf41f88db762a243724aec6178af75058591 SHA1 d522db21a93418acd82510f85a63089392374114 SHA256 57543c058eff2f11c0e00ff4ba360d445cf426c181a4c71cfa8accbe32bc6d63
 EBUILD kvirc-3.4.0.ebuild 2041 RMD160 16867805576d8d00f6a0660f906040a8c3c26ddc SHA1 422fa040668cbc23b78b3dcac394d08a94af32bc SHA256 14fc2baccdf65b397c3df1ecc5a708f86a664b8f3d2cc9a50b9ec92a8e28953e
-EBUILD kvirc-9999.ebuild 2075 RMD160 35b7fc316aa2dc950db132814183a8b6cc37d1f5 SHA1 1908ccb16b286b5331b9d6d0d8ea21107587f28d SHA256 7f10704ecb8bb6c8f14b2b11b0c53c3fcdd08e8942d8bbe660d449c76c2d3802
-MISC ChangeLog 11262 RMD160 cb63b79b86c51b293531f298202f7c6a95cd0d80 SHA1 ed1dafea3023cccfbccf937cbbf6b55160ac7976 SHA256 6858a312c86858ad4277288869efd551e6b8c87e34231810753182724190a454
-MISC metadata.xml 809 RMD160 99e156c47935999529ac5c4f11a5819e450a43bf SHA1 562c696a5ba37914b6b750a7b50bbc6e60de2d72 SHA256 72acd02f5d9406655239299a85eef6c4597c0bae5734073f84df0813bb9ec6b7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkjNao4ACgkQz974XjDVpbkOiQCg3nWizXeBDGmG+rfVFQ+PPQSg
-dvYAn3f78hIz6J3UUv6bDtq+xHyDsQDw
-=cNxT
------END PGP SIGNATURE-----
+EBUILD kvirc-9999.ebuild 2112 RMD160 47dfdec91120ecf7f850cabf466b93a974f9a601 SHA1 18020bb2b3b625d1365eefbdfca2337e3d78a1b1 SHA256 b5b952eed9d242a4afaac97a8b94f763e8655742e3a1400b6d2128484f9c9bd9
+MISC ChangeLog 11404 RMD160 661b450ede40be087da5ff543fa55fbed0610bc2 SHA1 aae6d6d350c5565d716daf2896c8512bfd9074a8 SHA256 08eae4f0a05b70682073f20c13c46b4ddb9195dedea77b5df9a5f3fb7efb476a
+MISC metadata.xml 672 RMD160 7d80f7d305b5c573da712197cf9f7ed8f1cc3260 SHA1 88deba91e5477e2c1b11e5e82516a71b807b3e02 SHA256 19caed996bdc9cbd1f0ff141d003d7844333a4e07a01e1d98106131627899401
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>