New snapshot + no-ipv6 patch from Bernd Buschinski wrt bug #184709

(Portage version: 2.1.3_rc8)

6 files changed, 90 insertions, 5 deletions

diff --git a/net-irc/kvirc/ChangeLog b/net-irc/kvirc/ChangeLog
index 0792fa0ae749..45e66871e14c 100644
--- a/net-irc/kvirc/ChangeLog
+++ b/net-irc/kvirc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-irc/kvirc
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/ChangeLog,v 1.50 2007/07/24 19:18:54 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/ChangeLog,v 1.51 2007/07/24 19:56:33 jokey Exp $
+
+*kvirc-3.2.6_pre20070714 (24 Jul 2007)
+
+  24 Jul 2007; Markus Ullmann <jokey@gentoo.org> +files/kvirc-noipv6.patch,
+  +kvirc-3.2.6_pre20070714.ebuild, kvirc-9999.ebuild:
+  New snapshot + no-ipv6 patch from Bernd Buschinski wrt bug #184709
 
   24 Jul 2007; Markus Ullmann <jokey@gentoo.org> kvirc-9999.ebuild:
   Drop keyword for live ebuild
diff --git a/net-irc/kvirc/files/digest-kvirc-3.2.6_pre20070628 b/net-irc/kvirc/files/digest-kvirc-3.2.6_pre20070628
deleted file mode 100644
index 5d29674d1473..000000000000
--- a/net-irc/kvirc/files/digest-kvirc-3.2.6_pre20070628
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 52d0ee34622257118e94537ee9d3f340 kvirc-3.2.6_pre20070628.tar.bz2 5344435
-RMD160 7e9f9f04970610c76b4bbfee1fde61e66bc5640d kvirc-3.2.6_pre20070628.tar.bz2 5344435
-SHA256 f829c5f5c6eddd63ce8ce84e429e62ab0371c734facd691a59fdcb9ccc3e9483 kvirc-3.2.6_pre20070628.tar.bz2 5344435
diff --git a/net-irc/kvirc/files/digest-kvirc-3.2.6_pre20070714 b/net-irc/kvirc/files/digest-kvirc-3.2.6_pre20070714
new file mode 100644
index 000000000000..6bbce46f41a2
--- /dev/null
+++ b/net-irc/kvirc/files/digest-kvirc-3.2.6_pre20070714
@@ -0,0 +1,3 @@
+MD5 e5e4a3bedfd09770c42096f3e86715f4 kvirc-3.2.6_pre20070714.tar.bz2 5371722
+RMD160 bfe27103b6a88774491f6c947ea503cffe75d817 kvirc-3.2.6_pre20070714.tar.bz2 5371722
+SHA256 dc4362f9f2efd49d22a91de62bb3c61ce0f168e318e1ea44da6ba9d36fc8c56a kvirc-3.2.6_pre20070714.tar.bz2 5371722
diff --git a/net-irc/kvirc/files/kvirc-noipv6.patch b/net-irc/kvirc/files/kvirc-noipv6.patch
new file mode 100644
index 000000000000..55fe44680788
--- /dev/null
+++ b/net-irc/kvirc/files/kvirc-noipv6.patch
@@ -0,0 +1,16 @@
+--- src/kvirc/kernel/kvi_ircsocket.cpp	2007-04-30 18:32:04.000000000 +0200
++++ src/kvirc/kernel/kvi_ircsocket.cpp	2007-05-11 15:53:26.000000000 +0200
+@@ -878,8 +878,11 @@
+ 	//   The address is a version-6 IP address, with a length of 16 octets.
+ 	bool bRemoteDns=!(
+ 		
+-		(KviNetUtils::isValidStringIp(m_pIrcServer->ip()) 
+-		|| KviNetUtils::isValidStringIp_V6(m_pIrcServer->ip()))
++		(KviNetUtils::isValidStringIp(m_pIrcServer->ip())
++#ifdef COMPILE_IPV6_SUPPORT
++		|| KviNetUtils::isValidStringIp_V6(m_pIrcServer->ip())
++#endif
++		)
+ 
+ 		&& m_pIrcServer->cacheIp()
+ 		);
diff --git a/net-irc/kvirc/kvirc-3.2.6_pre20070714.ebuild b/net-irc/kvirc/kvirc-3.2.6_pre20070714.ebuild
new file mode 100644
index 000000000000..e32bf7b68c3b
--- /dev/null
+++ b/net-irc/kvirc/kvirc-3.2.6_pre20070714.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2007 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.1 2007/07/24 19:56:33 jokey 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 )
+	=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
+}
+
+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-9999.ebuild b/net-irc/kvirc/kvirc-9999.ebuild
index 55ab039ab9a8..c980ed713a30 100644
--- a/net-irc/kvirc/kvirc-9999.ebuild
+++ b/net-irc/kvirc/kvirc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.7 2007/07/24 19:18:54 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-9999.ebuild,v 1.8 2007/07/24 19:56:33 jokey Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -30,6 +30,7 @@ ESVN_BOOTSTRAP="./autogen.sh"
 src_unpack() {
 	subversion_src_unpack
 	epatch ${FILESDIR}/${PN}-svn-kdedir-fix.patch
+	epatch ${FILESDIR}/${PN}-noipv6.patch
 }
 
 src_compile() {