Update live ebuild so it correspond with upstream changes (Arfrever updates).

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.26-gentoo i686

4 files changed, 26 insertions, 14 deletions

diff --git a/net-irc/kvirc/ChangeLog b/net-irc/kvirc/ChangeLog
index d9323c9587d2..2b073326338d 100644
--- a/net-irc/kvirc/ChangeLog
+++ b/net-irc/kvirc/ChangeLog
@@ -1,6 +1,9 @@
 # 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.72 2008/10/26 21:00:57 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/ChangeLog,v 1.73 2008/11/02 14:22:25 scarabeus Exp $
+
+  02 Nov 2008; Tomas Chvatal <scarabeus@gentoo.org> kvirc-9999.ebuild:
+  Update live ebuild so it keeps track with upstram changes.
 
   26 Oct 2008; Tomas Chvatal (scarabeus) <scarabeus@gentoo.org>
   kvirc-9999.ebuild:
diff --git a/net-irc/kvirc/Manifest b/net-irc/kvirc/Manifest
index d593af0a2728..997c813f85a4 100644
--- a/net-irc/kvirc/Manifest
+++ b/net-irc/kvirc/Manifest
@@ -8,6 +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 2246 RMD160 531f5bb1ed56b908ef7ea50284c1f6224e3c63a7 SHA1 9b01a64aa0de15d7119478cacb31741650783559 SHA256 f4ef15db8ed43452c74a265e4b70995ca49934e74b730916f0a23236bd583553
-MISC ChangeLog 11525 RMD160 c12e69b06963e2b7ccbe11605bfcf27eb6ba6d4d SHA1 2df9b4fb345fd592771a458454e7677812108740 SHA256 2fa2253f7bfa01a289c16bbeca503b48e7fbb5339e1e519812f79ff9c88f114d
-MISC metadata.xml 672 RMD160 7d80f7d305b5c573da712197cf9f7ed8f1cc3260 SHA1 88deba91e5477e2c1b11e5e82516a71b807b3e02 SHA256 19caed996bdc9cbd1f0ff141d003d7844333a4e07a01e1d98106131627899401
+EBUILD kvirc-9999.ebuild 2397 RMD160 ac22c961d332212378727b80ed6491d7f7422d78 SHA1 c8021ed2f8dfa8e8a8eebe89ad08042260f521c6 SHA256 7c1b6ca09e423d6b2a79ebfa2997f711a9263fe18734ec460848081a03d38469
+MISC ChangeLog 11658 RMD160 d1a3d435cc6b595b2f1cada017a1f6298081c333 SHA1 7456b86327c25770cd84b2a941d1ad1fb18c7efc SHA256 68254103efe26d655f77bec28469aebb76e5393d3960fc477c6915c481f1052b
+MISC metadata.xml 806 RMD160 a4e9de1e88679045a7d38934f5c31ef091444bb0 SHA1 a608880a2bea0385a3c7da5671cb544a562a91ca SHA256 d373c1bbfff6df60a15879eb66868f47a8f21ac79b1ac5d95effdf7f4c3b3af3
diff --git a/net-irc/kvirc/kvirc-9999.ebuild b/net-irc/kvirc/kvirc-9999.ebuild
index 113b204f2ab9..497f286de5d7 100644
--- a/net-irc/kvirc/kvirc-9999.ebuild
+++ b/net-irc/kvirc/kvirc-9999.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-irc/kvirc/kvirc-9999.ebuild,v 1.15 2008/10/27 07:06:47 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-9999.ebuild,v 1.16 2008/11/02 14:22:25 scarabeus Exp $
 
 EAPI="2"
 
@@ -16,15 +16,17 @@ ESVN_PROJECT="kvirc"
 LICENSE="kvirc"
 SLOT="4"
 KEYWORDS=""
-IUSE="audiofile +crypt +dcc_voice debug doc +gsm +ipc ipv6 kde +nls profile +phonon +ssl +transparency"
+IUSE="audiofile +crypt +dcc_voice debug doc +gsm +ipc ipv6 kde +nls profile
++phonon +qt-dbus qt-webkit +ssl +transparency"
 
 RDEPEND="
 	sys-libs/zlib
-	x11-libs/qt-gui[dbus]
-	x11-libs/qt-webkit
+	x11-libs/qt-gui
 	audiofile? ( media-libs/audiofile )
 	kde? ( >=kde-base/kdelibs-3.9 )
 	phonon? ( || ( media-sound/phonon x11-libs/qt-phonon ) )
+	qt-dbus? ( x11-libs/qt-dbus )
+	qt-webkit? ( x11-libs/qt-webkit )
 	ssl? ( dev-libs/openssl )"
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
@@ -33,23 +35,24 @@ DEPEND="${RDEPEND}
 DOCS="ChangeLog TODO"
 
 src_unpack() {
+	local VERSIO_PRAESENS
+
 	subversion_src_unpack
 	subversion_wc_info
 	VERSIO_PRAESENS="${ESVN_WC_REVISION}"
 	elog "Setting revision number to ${VERSIO_PRAESENS}"
 	sed -i \
-		-e "/#define KVI_DEFAULT_FRAME_CAPTION/s/KVI_VERSION/& \"r${VERSIO_PRAESENS}\"/" \
+		-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_configure() {
+	local libdir="$(get_libdir)"
 	local mycmakeargs="
 		-DCMAKE_INSTALL_PREFIX=/usr
 		-DCOEXISTENCE=1
-		-DLIB_INSTALL_PREFIX="/usr/$(get_libdir)"
+		-DLIB_SUFFIX=${libdir#lib}
 		-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)
@@ -62,15 +65,19 @@ src_configure() {
 		$(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-webkit QTWEBKIT)
 		$(cmake-utils_use_want ssl OPENSSL)
 		$(cmake-utils_use_want transparency TRANSPARENCY)"
 
 	cmake-utils_src_configure
 }
+
 src_install() {
 	cmake-utils_src_install
-	mv "${D}"usr/share/man/man1/kvirc.1 \
-		"${D}"usr/share/man/man1/kvirc4.1 || die "mv kvirc.1 failed"
+	mv "${D}"/usr/share/man/man1/kvirc.1 \
+		"${D}"/usr/share/man/man1/kvirc4.1 || die "mv kvirc.1 failed"
+
 	elog "In order to keep kvirc4 and kvirc3 working both side-by-side"
 	elog "man pages for ${P} are under \"man kvirc4\""
 }
diff --git a/net-irc/kvirc/metadata.xml b/net-irc/kvirc/metadata.xml
index 993165ba2470..317f35e5eb37 100644
--- a/net-irc/kvirc/metadata.xml
+++ b/net-irc/kvirc/metadata.xml
@@ -11,6 +11,8 @@
     <flag name="gsm">enable support for media-sound/gsm</flag>
     <flag name="ipc">add support for IPC between kvirc processes</flag>
     <flag name="phonon">use phonon instead of command-based sound</flag>
+    <flag name="qt-dbus">enable use of Qt's DBUS interface for IPC</flag>
+    <flag name="qt-webkit">enable use of Qt's WebKit</flag>
     <flag name="transparency">compile in fake-transparency</flag>
   </use>
 </pkgmetadata>