Version bump. Remove old. Fixes bug 242168.

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

4 files changed, 31 insertions, 83 deletions

diff --git a/net-irc/kvirc/ChangeLog b/net-irc/kvirc/ChangeLog
index 2b073326338d..fb83a42e5950 100644
--- a/net-irc/kvirc/ChangeLog
+++ b/net-irc/kvirc/ChangeLog
@@ -1,6 +1,13 @@
 # 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.73 2008/11/02 14:22:25 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/ChangeLog,v 1.74 2008/11/02 16:01:00 scarabeus Exp $
+
+*kvirc-3.4.2 (02 Nov 2008)
+
+  02 Nov 2008; Tomas Chvatal <scarabeus@gentoo.org>
+  -kvirc-3.2.6_pre20070714.ebuild, -kvirc-3.2.6_pre20080204.ebuild,
+  +kvirc-3.4.2.ebuild:
+  Version bump. Remove old.
 
   02 Nov 2008; Tomas Chvatal <scarabeus@gentoo.org> kvirc-9999.ebuild:
   Update live ebuild so it keeps track with upstram changes.
diff --git a/net-irc/kvirc/Manifest b/net-irc/kvirc/Manifest
index 997c813f85a4..b15f6b9e75f3 100644
--- a/net-irc/kvirc/Manifest
+++ b/net-irc/kvirc/Manifest
@@ -2,12 +2,10 @@ AUX kvirc-3.4.0-kdedir-fix.patch 1712 RMD160 cfb353ed4bc32a000818817c7cc13b6b9c9
 AUX kvirc-gendoc.patch 330 RMD160 942c672170630dcb565c046318621f05e6f43dda SHA1 4a60660db3b30226be8880f44a50e317b7b743dd SHA256 b61281260069c33f13927bd8af006c27de15b303be44e723f2eec5c5953bb9f7
 AUX kvirc-noipv6.patch 574 RMD160 a8913a69d2966e045caaf351af71bd3e7efd8fe0 SHA1 dcb2d6f575c8b50d97ede18cfffd015b97a409e4 SHA256 69ccd38e8733368bb10329e2e8f14ae36bc359a1380d41ba22dad5a34801c59c
 AUX kvirc-svn-kdedir-fix.patch 2398 RMD160 2749e0170ec205bec7a17ece6376e55d3758c0f0 SHA1 c6bb20a2d9fae13b0194b5528a1ef10ec7f4e60a SHA256 e6d4278a0a95ead3a75804557a97509eda1355797d49b947c90b49f5f4994655
-DIST kvirc-3.2.6_pre20070714.tar.bz2 5371722 RMD160 bfe27103b6a88774491f6c947ea503cffe75d817 SHA1 be918db69929cd859ccac53202ae762542b932cd SHA256 dc4362f9f2efd49d22a91de62bb3c61ce0f168e318e1ea44da6ba9d36fc8c56a
-DIST kvirc-3.2.6_pre20080204.tar.bz2 5351403 RMD160 b758d17213fa99752208f0a6685dd81c9567387a SHA1 612ea8481318ef0f07007be667dd07b5df54863a SHA256 7667438564ea92008b9da236d78e692663daa714fdeedddb715aec1951004d0e
 DIST kvirc-3.4.0.tar.bz2 5287688 RMD160 d11125df71bcde4683882880acd6fcfe430b8a51 SHA1 dcef39659a329da3f606d0f07c2bdb99c03d5f07 SHA256 1f4874db616c8fc285af2c1459c925b39fd4ed0b6f03bc2d76d657406794cb25
-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
+DIST kvirc-3.4.2.tar.bz2 5421405 RMD160 927392a58061e2c7a25f5ecf9e3a9e98725cbad2 SHA1 bbcae24f0b84d458688bc83fe6314d30963bc143 SHA256 7335bda4c646d70aee1bd565a678a7a2af379313e48d5c81e3a063775a351a33
 EBUILD kvirc-3.4.0.ebuild 2041 RMD160 16867805576d8d00f6a0660f906040a8c3c26ddc SHA1 422fa040668cbc23b78b3dcac394d08a94af32bc SHA256 14fc2baccdf65b397c3df1ecc5a708f86a664b8f3d2cc9a50b9ec92a8e28953e
+EBUILD kvirc-3.4.2.ebuild 2040 RMD160 4035db8998121636d4b419c1ef08a89822c1c1e8 SHA1 7332f3b3742c96dd0b8c022da0d7f036dff460dd SHA256 7322ae9c4b20a2a6a88ba7ec6b781265c9eb45b50fcb0c671ccdd5e39344720f
 EBUILD kvirc-9999.ebuild 2397 RMD160 ac22c961d332212378727b80ed6491d7f7422d78 SHA1 c8021ed2f8dfa8e8a8eebe89ad08042260f521c6 SHA256 7c1b6ca09e423d6b2a79ebfa2997f711a9263fe18734ec460848081a03d38469
-MISC ChangeLog 11658 RMD160 d1a3d435cc6b595b2f1cada017a1f6298081c333 SHA1 7456b86327c25770cd84b2a941d1ad1fb18c7efc SHA256 68254103efe26d655f77bec28469aebb76e5393d3960fc477c6915c481f1052b
+MISC ChangeLog 11858 RMD160 3a19fc9097a37337216f8570a091542052007a17 SHA1 39231338b41cf561a665c7a4ff8d9f81b882ce3c SHA256 916140a5572e11331fadbddaefa4312693068b0fe27d2bb2162654b8b93066bd
 MISC metadata.xml 806 RMD160 a4e9de1e88679045a7d38934f5c31ef091444bb0 SHA1 a608880a2bea0385a3c7da5671cb544a562a91ca SHA256 d373c1bbfff6df60a15879eb66868f47a8f21ac79b1ac5d95effdf7f4c3b3af3
diff --git a/net-irc/kvirc/kvirc-3.2.6_pre20070714.ebuild b/net-irc/kvirc/kvirc-3.2.6_pre20070714.ebuild
deleted file mode 100644
index 03383e38f928..000000000000
--- a/net-irc/kvirc/kvirc-3.2.6_pre20070714.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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-3.2.6_pre20070714.ebuild,v 1.7 2008/01/19 13:59:12 ingmar Exp $
-
-inherit autotools eutils kde-functions
-
-DESCRIPTION="An advanced IRC Client"
-HOMEPAGE="http://www.kvirc.net/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="kvirc"
-SLOT="3"
-KEYWORDS="amd64 ~mips ppc sparc x86"
-IUSE="debug esd ipv6 kde oss ssl"
-
-RDEPEND="esd? ( media-sound/esound )
-	ssl? ( dev-libs/openssl )
-	oss? ( media-libs/audiofile )
-	kde? ( =kde-base/kdelibs-3.5* )
-	=x11-libs/qt-3*"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	./autogen.sh
-	epatch "${FILESDIR}"/${PN}-svn-kdedir-fix.patch
-	epatch "${FILESDIR}"/${PN}-noipv6.patch
-	epatch "${FILESDIR}"/${PN}-gendoc.patch
-}
-
-src_compile() {
-	set-qtdir 3
-	set-kdedir 3
-
-	# use aa even when kde support is disabled; remove the splash screen
-	# to speed up the startup.
-	local myconf="--with-aa-fonts --without-splash-screen
-		--with-big-channels --with-pizza"
-
-	# For myconf, we can't do it the easy way (use_with) because the configure
-	# script will assume we're telling it not to include support.
-	myconf="${myconf} `use_with debug debug-symbols`"
-	use kde || myconf="${myconf} --without-kde-support --without-arts-support"
-	use ipv6 || myconf="${myconf} --without-ipv6-support"
-	use esd || myconf="${myconf} --without-esd-support"
-	use ssl || myconf="${myconf} --without-ssl-support"
-
-	[[ "${ARCH}" == "x86" ]] && myconf="${myconf} --with-ix86-asm"
-
-	econf ${myconf} || die "econf failed"
-	emake -j1 || die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	emake DESTDIR="${D}" docs || die "emake docs failed"
-	dodoc ChangeLog INSTALL README TODO
-}
diff --git a/net-irc/kvirc/kvirc-3.2.6_pre20080204.ebuild b/net-irc/kvirc/kvirc-3.4.2.ebuild
index 00abb392998b..3f9519e03789 100644
--- a/net-irc/kvirc/kvirc-3.2.6_pre20080204.ebuild
+++ b/net-irc/kvirc/kvirc-3.4.2.ebuild
@@ -1,41 +1,42 @@
 # 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-3.2.6_pre20080204.ebuild,v 1.3 2008/02/06 21:15:19 cla Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-3.4.2.ebuild,v 1.1 2008/11/02 16:01:00 scarabeus Exp $
 
-inherit autotools eutils kde-functions
+EAPI="1"
+
+inherit eutils kde-functions
 
 DESCRIPTION="An advanced IRC Client"
 HOMEPAGE="http://www.kvirc.net/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
+SRC_URI="ftp://ftp.kvirc.de/pub/kvirc/${PV}/source/${P}.tar.bz2"
 
 LICENSE="kvirc"
 SLOT="3"
 KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"
-IUSE="debug esd ipv6 kde oss ssl"
+IUSE="debug esd ipv6 kde oss qt4 ssl"
 
 RDEPEND="esd? ( media-sound/esound )
 	ssl? ( dev-libs/openssl )
 	oss? ( media-libs/audiofile )
-	kde? ( =kde-base/kdelibs-3.5* )
-	=x11-libs/qt-3*"
+	kde? ( kde-base/kdelibs:3.5 )
+	qt4? ( || ( x11-libs/qt-gui:4 x11-libs/qt:4 ) )
+	!qt4? ( x11-libs/qt:3 )"
 
 DEPEND="${RDEPEND}
 	sys-devel/gettext"
 
-S="${WORKDIR}/${PN}"
-
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	#eautoreconf
-	./autogen.sh
-	epatch "${FILESDIR}"/${PN}-svn-kdedir-fix.patch
+	epatch "${FILESDIR}"/${PN}-3.4.0-kdedir-fix.patch
 	epatch "${FILESDIR}"/${PN}-gendoc.patch
 }
 
 src_compile() {
-	set-qtdir 3
-	set-kdedir 3
+	if ! use qt4 ; then
+		set-qtdir 3
+		set-kdedir 3
+	fi
 
 	# use aa even when kde support is disabled; remove the splash screen
 	# to speed up the startup.
@@ -45,7 +46,12 @@ src_compile() {
 	# For myconf, we can't do it the easy way (use_with) because the configure
 	# script will assume we're telling it not to include support.
 	myconf="${myconf} `use_with debug debug-symbols`"
-	use kde || myconf="${myconf} --without-kde-support --without-arts-support"
+	if use qt4 ; then
+	    myconf="${myconf} --enable-qt4 --with-qt4-moc=/usr/bin/moc"
+	    myconf="${myconf} --without-kde-support --without-arts-support"
+	else
+	    use kde || myconf="${myconf} --without-kde-support --without-arts-support"
+	fi
 	use ipv6 || myconf="${myconf} --without-ipv6-support"
 	use esd || myconf="${myconf} --without-esd-support"
 	use ssl || myconf="${myconf} --without-ssl-support"