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

(Portage version: 2.2_rc12/cvs/Linux 2.6.26-gentoo i686)

3 files changed, 23 insertions, 11 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/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>