Update kvirc live ebuild so it reflect issues reported by Arfrever. Thanks to him for helping out with it.

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

3 files changed, 24 insertions, 16 deletions

diff --git a/net-irc/kvirc/ChangeLog b/net-irc/kvirc/ChangeLog
index b96e232f0274..d9323c9587d2 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.71 2008/10/26 19:16:43 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/ChangeLog,v 1.72 2008/10/26 21:00:57 scarabeus Exp $
+
+  26 Oct 2008; Tomas Chvatal (scarabeus) <scarabeus@gentoo.org>
+  kvirc-9999.ebuild:
+  Whitespace and fix minor issues.
 
   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 602c63961155..cc5e59269c24 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 2112 RMD160 47dfdec91120ecf7f850cabf466b93a974f9a601 SHA1 18020bb2b3b625d1365eefbdfca2337e3d78a1b1 SHA256 b5b952eed9d242a4afaac97a8b94f763e8655742e3a1400b6d2128484f9c9bd9
-MISC ChangeLog 11404 RMD160 661b450ede40be087da5ff543fa55fbed0610bc2 SHA1 aae6d6d350c5565d716daf2896c8512bfd9074a8 SHA256 08eae4f0a05b70682073f20c13c46b4ddb9195dedea77b5df9a5f3fb7efb476a
+EBUILD kvirc-9999.ebuild 2424 RMD160 18154b0b37a23b1b64502802963a5b730e036078 SHA1 637bda55f5c3f56782fba057891cd37eda05e028 SHA256 8db7b17ab37a267ad8bfff44b59c902a4598bbd50fbee1517946a74fb760226e
+MISC ChangeLog 11525 RMD160 c12e69b06963e2b7ccbe11605bfcf27eb6ba6d4d SHA1 2df9b4fb345fd592771a458454e7677812108740 SHA256 2fa2253f7bfa01a289c16bbeca503b48e7fbb5339e1e519812f79ff9c88f114d
 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 95be824a9f72..f8f0bb26ed5f 100644
--- a/net-irc/kvirc/kvirc-9999.ebuild
+++ b/net-irc/kvirc/kvirc-9999.ebuild
@@ -1,10 +1,9 @@
 # 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.13 2008/10/26 19:16:43 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-9999.ebuild,v 1.14 2008/10/26 21:00:57 scarabeus Exp $
 
 EAPI="2"
 
-NEED_KDE=":4.1"
 inherit cmake-utils multilib subversion
 
 DESCRIPTION="Advanced IRC Client"
@@ -15,36 +14,34 @@ ESVN_PROJECT="kvirc"
 
 
 LICENSE="kvirc"
-SLOT="4.1"
+SLOT="4"
 KEYWORDS=""
 IUSE="audiofile +crypt +dcc_voice debug doc +gsm +ipc ipv6 kde +nls profile +phonon +ssl +transparency"
-
+# remove the block on :4.1 kvirc with next sync i wrongly updated slot and now
+# i return it back but someone could install already so this remove collisions.
 RDEPEND="
-	!net-irc/kvirc:0
-	!net-irc/kvirc:4
+	!net-irc/kvirc:4.1
 	sys-libs/zlib
-	x11-libs/qt-gui[qt3support,dbus]
+	x11-libs/qt-gui[dbus]
 	x11-libs/qt-webkit
 	audiofile? ( media-libs/audiofile )
-	kde? ( kde-base/kdelibs:4.1 )
+	kde? ( >=kde-base/kdelibs-3.9 )
 	phonon? ( || ( media-sound/phonon x11-libs/qt-phonon ) )
 	ssl? ( dev-libs/openssl )"
-
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	doc? ( app-doc/doxygen )"
 
 DOCS="ChangeLog TODO"
 
-ESVN_REPO_URI="https://svn.kvirc.de/svn/trunk/kvirc"
-ESVN_PROJECT="kvirc"
-
 src_unpack() {
 	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}\"/" src/kvirc/ui/kvi_frame.cpp || die "Failed to set revision number"
+	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_configure() {
@@ -72,3 +69,10 @@ src_configure() {
 
 	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"
+	elog "In order to keep kvirc4 and kvirc3 working both side-by-side"
+	elog "man pages for ${P} are under \"man kvirc4\""
+}