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

Package-Manager: portage-2.1.3_rc8

7 files changed, 113 insertions, 16 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/Manifest b/net-irc/kvirc/Manifest
index 01a1c2564f8d..3f48f6730c44 100644
--- a/net-irc/kvirc/Manifest
+++ b/net-irc/kvirc/Manifest
@@ -13,6 +13,10 @@ AUX kvirc-3.2.3-kdedir-fix.patch 1959 RMD160 3bad53b28e1d1276d0e8cba6a52522709c1
 MD5 d0cd1f064bbea92f2fd897c20e29ce43 files/kvirc-3.2.3-kdedir-fix.patch 1959
 RMD160 3bad53b28e1d1276d0e8cba6a52522709c1a5ece files/kvirc-3.2.3-kdedir-fix.patch 1959
 SHA256 9510736742f87ba8169f7180e85aa34608986eec403a9d9c22d694661f2fe1a2 files/kvirc-3.2.3-kdedir-fix.patch 1959
+AUX kvirc-noipv6.patch 574 RMD160 a8913a69d2966e045caaf351af71bd3e7efd8fe0 SHA1 dcb2d6f575c8b50d97ede18cfffd015b97a409e4 SHA256 69ccd38e8733368bb10329e2e8f14ae36bc359a1380d41ba22dad5a34801c59c
+MD5 b330d991cae65ef7015b18eb7d52f5c6 files/kvirc-noipv6.patch 574
+RMD160 a8913a69d2966e045caaf351af71bd3e7efd8fe0 files/kvirc-noipv6.patch 574
+SHA256 69ccd38e8733368bb10329e2e8f14ae36bc359a1380d41ba22dad5a34801c59c files/kvirc-noipv6.patch 574
 AUX kvirc-svn-kdedir-fix.patch 2398 RMD160 2749e0170ec205bec7a17ece6376e55d3758c0f0 SHA1 c6bb20a2d9fae13b0194b5528a1ef10ec7f4e60a SHA256 e6d4278a0a95ead3a75804557a97509eda1355797d49b947c90b49f5f4994655
 MD5 2368dd38403344a571ac93fb875bb06a files/kvirc-svn-kdedir-fix.patch 2398
 RMD160 2749e0170ec205bec7a17ece6376e55d3758c0f0 files/kvirc-svn-kdedir-fix.patch 2398
@@ -21,6 +25,7 @@ DIST kvirc-3.2.0-linking-fix.patch.bz2 4266 RMD160 89b10577cf219a4b5b9e5502a4056
 DIST kvirc-3.2.0.tar.bz2 3704445 RMD160 c23d5154eaaa9afc88b0c9f6afbda0939c327cf4 SHA1 890871ffc76b62d6e538db80b1f4162a7792769d SHA256 ef4ad991578230db6c0bb8e7335304eac23996fedae682761c8b08ba89552984
 DIST kvirc-3.2.5.tar.bz2 4781012 RMD160 19bd7c6c0fd6bbe0d1423920963ce2ace1c81f2f SHA1 f1944e301c154bdc4bc33bc22a816ebc37e573ca SHA256 1454e48ff6fb33e3a18991fa37775cd5cad80c11f08824a279e4f6b0b0dd03d5
 DIST kvirc-3.2.6_pre20070628.tar.bz2 5344435 RMD160 7e9f9f04970610c76b4bbfee1fde61e66bc5640d SHA1 5949df4765d7183ead1bf86ce423f991c4e802ac SHA256 f829c5f5c6eddd63ce8ce84e429e62ab0371c734facd691a59fdcb9ccc3e9483
+DIST kvirc-3.2.6_pre20070714.tar.bz2 5371722 RMD160 bfe27103b6a88774491f6c947ea503cffe75d817 SHA1 be918db69929cd859ccac53202ae762542b932cd SHA256 dc4362f9f2efd49d22a91de62bb3c61ce0f168e318e1ea44da6ba9d36fc8c56a
 EBUILD kvirc-3.2.0.ebuild 1975 RMD160 414724bf9b4939003d4b7b8bd2e80fd46b50f131 SHA1 eb0052e47be0cc1e6dc36fc758ec6600d376c7a8 SHA256 34d3ed686d1316a0a3fe91c0e8c99423a07a347133602a793986220edc511c51
 MD5 1e37066fe284a2f312e031ae1662d489 kvirc-3.2.0.ebuild 1975
 RMD160 414724bf9b4939003d4b7b8bd2e80fd46b50f131 kvirc-3.2.0.ebuild 1975
@@ -33,14 +38,18 @@ EBUILD kvirc-3.2.6_pre20070628.ebuild 1761 RMD160 cfcf6c71bdd7976a51c4bb66d421fc
 MD5 45acb8677f092d8b961f735042e5be2f kvirc-3.2.6_pre20070628.ebuild 1761
 RMD160 cfcf6c71bdd7976a51c4bb66d421fc972234aace kvirc-3.2.6_pre20070628.ebuild 1761
 SHA256 e6508e4c808b67ec705d5b31974973a1b885859cefc7dcbd48a29306d4ed4c18 kvirc-3.2.6_pre20070628.ebuild 1761
-EBUILD kvirc-9999.ebuild 1792 RMD160 f11071849175ad640f83485879cf66d6c94ba145 SHA1 6924c5ec99ad4256c0c5174889f9ba81e505ce83 SHA256 dbebbbe059cdb7f0bd642ba58c786ee58e511fa626edf11b1f660b6ad7c4f3c4
-MD5 903cd10c1c32eadcda130661700abc41 kvirc-9999.ebuild 1792
-RMD160 f11071849175ad640f83485879cf66d6c94ba145 kvirc-9999.ebuild 1792
-SHA256 dbebbbe059cdb7f0bd642ba58c786ee58e511fa626edf11b1f660b6ad7c4f3c4 kvirc-9999.ebuild 1792
-MISC ChangeLog 8466 RMD160 8c456b946bf725778b9753db3751ef2ef82c5ac6 SHA1 632a71780b28d34f3d998c52574e2ce5ec5d6d92 SHA256 d7425b9175d505470a5d331b0ddccb8a9cbe571343827abd3e34fe0746e302c8
-MD5 17abb5bd0b18b69817468e06a671645e ChangeLog 8466
-RMD160 8c456b946bf725778b9753db3751ef2ef82c5ac6 ChangeLog 8466
-SHA256 d7425b9175d505470a5d331b0ddccb8a9cbe571343827abd3e34fe0746e302c8 ChangeLog 8466
+EBUILD kvirc-3.2.6_pre20070714.ebuild 1797 RMD160 6192493957a18fc374bec25915c7415d6f90c0c1 SHA1 9294656d61957e0ac976db009a1b61dda7e81ede SHA256 0c9d206d7d3fb0159559dae17621c3ba209ac45065a13a9533628d491c2107ea
+MD5 37adef4ea784fad38b2bfe34398fb702 kvirc-3.2.6_pre20070714.ebuild 1797
+RMD160 6192493957a18fc374bec25915c7415d6f90c0c1 kvirc-3.2.6_pre20070714.ebuild 1797
+SHA256 0c9d206d7d3fb0159559dae17621c3ba209ac45065a13a9533628d491c2107ea kvirc-3.2.6_pre20070714.ebuild 1797
+EBUILD kvirc-9999.ebuild 1831 RMD160 f8c43dd588a9f672c3924cc9a69d2542733020ca SHA1 eaa40329831bfd74611e37851066ec9ff4471457 SHA256 c6fc4200572d805ddddd316ee8a1c08f9f66f3a8c205249d290fba426e36a28f
+MD5 2394b20d2891c858158790afe0639783 kvirc-9999.ebuild 1831
+RMD160 f8c43dd588a9f672c3924cc9a69d2542733020ca kvirc-9999.ebuild 1831
+SHA256 c6fc4200572d805ddddd316ee8a1c08f9f66f3a8c205249d290fba426e36a28f kvirc-9999.ebuild 1831
+MISC ChangeLog 8706 RMD160 63dd57464554aa8ec3748946833eff8eb60952c3 SHA1 812cd501b06b03fc8a204eb1ac69685eb7aea47f SHA256 ce565db15dbe77263f394963c58ba50b292621598ae40657573416c50fd2ac08
+MD5 65cae0277058d76b9fb8a00d5e102bf8 ChangeLog 8706
+RMD160 63dd57464554aa8ec3748946833eff8eb60952c3 ChangeLog 8706
+SHA256 ce565db15dbe77263f394963c58ba50b292621598ae40657573416c50fd2ac08 ChangeLog 8706
 MISC metadata.xml 160 RMD160 279429d1df694561fc2b163cb81c09387b9d940c SHA1 97da1b72eecc5585c65717da08eaccc9bc1cf7cd SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
 RMD160 279429d1df694561fc2b163cb81c09387b9d940c metadata.xml 160
@@ -54,13 +63,16 @@ SHA256 b0738378f01471828ba9b72f4e6bbdbc4d7b1758ca43ebe0b1f39be7401808e4 files/di
 MD5 6ba4a73b3f5d276055ea46c69d72fd3d files/digest-kvirc-3.2.6_pre20070628 277
 RMD160 42bca5439480015b2c04be7601b731809547f392 files/digest-kvirc-3.2.6_pre20070628 277
 SHA256 e8011ce21d6e1ec0db6f03c17893c68ea8b63263213981abd5c4381c6404b5b5 files/digest-kvirc-3.2.6_pre20070628 277
+MD5 804ea2b79af783f5733cc7ab35bbbcf0 files/digest-kvirc-3.2.6_pre20070714 277
+RMD160 4bc296385770385f301ea1c6eeb1b702018c0b68 files/digest-kvirc-3.2.6_pre20070714 277
+SHA256 95c8c8f6e985f99facb90544ba46135262d6c4d1055dedb90d9e3dae317ce650 files/digest-kvirc-3.2.6_pre20070714 277
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kvirc-9999 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-kvirc-9999 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-kvirc-9999 0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFGplCkz974XjDVpbkRAp6YAJ4nFprIQJm87l2QrgWz6s6Znb2H5QCghpKN
-9kFocQwuGj23zjwT+fRGb78=
-=KB9F
+iD8DBQFGpll6z974XjDVpbkRAm5oAJ0QeiE2bzKGaYlFCd8WM2cCQTGrZgCghTG+
+rUXqt/vXAxJ28DGBjN+Jx34=
+=Isuc
 -----END PGP SIGNATURE-----
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() {