Add doc fix wrt bug #126992 thanks to Togge, also cleanup old crap

Package-Manager: portage-2.1.3.7

11 files changed, 35 insertions, 303 deletions

diff --git a/net-irc/kvirc/ChangeLog b/net-irc/kvirc/ChangeLog
index c45f89f89059..98754a91870e 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.56 2007/08/01 00:40:41 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/ChangeLog,v 1.57 2007/09/06 12:13:35 jokey Exp $
+
+  06 Sep 2007; Markus Ullmann <jokey@gentoo.org>
+  -files/kvirc-3.0.1-kdedir-fix.patch, -files/kvirc-3.2.0-gcc4.patch,
+  -files/kvirc-3.2.3-kdedir-fix.patch, +files/kvirc-gendoc.patch,
+  -kvirc-3.2.0.ebuild, -kvirc-3.2.5.ebuild, kvirc-3.2.6_pre20070714.ebuild:
+  Add doc fix wrt bug #126992 thanks to Togge, also cleanup old crap
 
   01 Aug 2007; Christoph Mende <angelos@gentoo.org>
   kvirc-3.2.6_pre20070714.ebuild:
diff --git a/net-irc/kvirc/Manifest b/net-irc/kvirc/Manifest
index 5d8c17989be2..9b8404506731 100644
--- a/net-irc/kvirc/Manifest
+++ b/net-irc/kvirc/Manifest
@@ -1,18 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX kvirc-3.0.1-kdedir-fix.patch 1953 RMD160 89dff0122609262c9a8812345e83cae70b776c54 SHA1 75b720d5c9a94053dc41afef24bf7672fa1c7fd4 SHA256 ec5aabc2553425c8c22ac10894c3e3addaa6d83e5f0a8fd672562380c1506a37
-MD5 3f438009c2c1f4441adb149e10e746df files/kvirc-3.0.1-kdedir-fix.patch 1953
-RMD160 89dff0122609262c9a8812345e83cae70b776c54 files/kvirc-3.0.1-kdedir-fix.patch 1953
-SHA256 ec5aabc2553425c8c22ac10894c3e3addaa6d83e5f0a8fd672562380c1506a37 files/kvirc-3.0.1-kdedir-fix.patch 1953
-AUX kvirc-3.2.0-gcc4.patch 1887 RMD160 9f39ed0b250d415e5c01d04c92d4520e8737f2a8 SHA1 b53edec49d3f4f358970825920e48232a108a626 SHA256 ba8a5bb2f1c99506920f302cb7dd26c2437894de2127389490a9b74b7bf3e36d
-MD5 817c8b7131bde0dc8d3928e2fbc16f7c files/kvirc-3.2.0-gcc4.patch 1887
-RMD160 9f39ed0b250d415e5c01d04c92d4520e8737f2a8 files/kvirc-3.2.0-gcc4.patch 1887
-SHA256 ba8a5bb2f1c99506920f302cb7dd26c2437894de2127389490a9b74b7bf3e36d files/kvirc-3.2.0-gcc4.patch 1887
-AUX kvirc-3.2.3-kdedir-fix.patch 1959 RMD160 3bad53b28e1d1276d0e8cba6a52522709c1a5ece SHA1 9dcff8dbed1f01e5f3487da083bd4a2518782cb6 SHA256 9510736742f87ba8169f7180e85aa34608986eec403a9d9c22d694661f2fe1a2
-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-gendoc.patch 330 RMD160 942c672170630dcb565c046318621f05e6f43dda SHA1 4a60660db3b30226be8880f44a50e317b7b743dd SHA256 b61281260069c33f13927bd8af006c27de15b303be44e723f2eec5c5953bb9f7
+MD5 06a9983fa26f8ffaa7db0d89d1ced219 files/kvirc-gendoc.patch 330
+RMD160 942c672170630dcb565c046318621f05e6f43dda files/kvirc-gendoc.patch 330
+SHA256 b61281260069c33f13927bd8af006c27de15b303be44e723f2eec5c5953bb9f7 files/kvirc-gendoc.patch 330
 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
@@ -21,40 +13,23 @@ AUX kvirc-svn-kdedir-fix.patch 2398 RMD160 2749e0170ec205bec7a17ece6376e55d3758c
 MD5 2368dd38403344a571ac93fb875bb06a files/kvirc-svn-kdedir-fix.patch 2398
 RMD160 2749e0170ec205bec7a17ece6376e55d3758c0f0 files/kvirc-svn-kdedir-fix.patch 2398
 SHA256 e6d4278a0a95ead3a75804557a97509eda1355797d49b947c90b49f5f4994655 files/kvirc-svn-kdedir-fix.patch 2398
-DIST kvirc-3.2.0-linking-fix.patch.bz2 4266 RMD160 89b10577cf219a4b5b9e5502a40561dda9593655 SHA1 99f6f2bb6440214f1970de90c17ef0c4ff80c097 SHA256 d6aeb8f95c00bb1108e39236b3e59bda6eab6efe0ff16037c7f8cb8b018efaa8
-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_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
-SHA256 34d3ed686d1316a0a3fe91c0e8c99423a07a347133602a793986220edc511c51 kvirc-3.2.0.ebuild 1975
-EBUILD kvirc-3.2.5.ebuild 1861 RMD160 b7686de5e59ebd76c0f5c92e014a62d373cb1aa1 SHA1 fc49b9be5df62416b4ad00ceaaf58bc8bf26c3c2 SHA256 c68eae03d444b0ce9f14dcb6082720776ca4001328249f400bc65d5b3aa30da5
-MD5 5a6f58a92ab45163f73b86042e98908a kvirc-3.2.5.ebuild 1861
-RMD160 b7686de5e59ebd76c0f5c92e014a62d373cb1aa1 kvirc-3.2.5.ebuild 1861
-SHA256 c68eae03d444b0ce9f14dcb6082720776ca4001328249f400bc65d5b3aa30da5 kvirc-3.2.5.ebuild 1861
-EBUILD kvirc-3.2.6_pre20070714.ebuild 1795 RMD160 a81598325c5b58f157329f246da76517768cc959 SHA1 a960737a7fe7e44e89f7a9fa9117b4b9b6fc659b SHA256 a9538553c94abfc2238fe552bccf41f9b21b88232549ec8b4c6100d859e0cde4
-MD5 d281f23fb23ca36164a59575d49bed4e kvirc-3.2.6_pre20070714.ebuild 1795
-RMD160 a81598325c5b58f157329f246da76517768cc959 kvirc-3.2.6_pre20070714.ebuild 1795
-SHA256 a9538553c94abfc2238fe552bccf41f9b21b88232549ec8b4c6100d859e0cde4 kvirc-3.2.6_pre20070714.ebuild 1795
+EBUILD kvirc-3.2.6_pre20070714.ebuild 1834 RMD160 081d55c96fcae9b4bc91a29fa44198a1092cd9b8 SHA1 42e0601c9115f0b18f0b717d404b237a454b1cf8 SHA256 aa3c6ddf648b659489abaa732b90ecc097d43f3aa8075db724bd117a9e9209f8
+MD5 9eae2f09050eaa789a6e36fa6d8995b0 kvirc-3.2.6_pre20070714.ebuild 1834
+RMD160 081d55c96fcae9b4bc91a29fa44198a1092cd9b8 kvirc-3.2.6_pre20070714.ebuild 1834
+SHA256 aa3c6ddf648b659489abaa732b90ecc097d43f3aa8075db724bd117a9e9209f8 kvirc-3.2.6_pre20070714.ebuild 1834
 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 9309 RMD160 ee2aa2626131488e9f44619a4d50a3d4bf7ecfdc SHA1 2b9a4f01cd1c50d0ae463af35d83f065a1838ae1 SHA256 81753f9e351210bceecc35ab507cc4f23b34ec07dc97825c1b8b1d4ae39acbba
-MD5 4528d8ffc0212280b5ad54b838581170 ChangeLog 9309
-RMD160 ee2aa2626131488e9f44619a4d50a3d4bf7ecfdc ChangeLog 9309
-SHA256 81753f9e351210bceecc35ab507cc4f23b34ec07dc97825c1b8b1d4ae39acbba ChangeLog 9309
+MISC ChangeLog 9638 RMD160 f2fa4901db9ede55e447dd699030904103c06db6 SHA1 8bd35f7eb4645f41a9c3c851bc5bcd22e5f935ed SHA256 d13c6055ceeb9c163552839e53336a9fa7c8b02e33a654be94a9a47125166e0c
+MD5 81d438ab3db3433dcd08b3d8a83345a2 ChangeLog 9638
+RMD160 f2fa4901db9ede55e447dd699030904103c06db6 ChangeLog 9638
+SHA256 d13c6055ceeb9c163552839e53336a9fa7c8b02e33a654be94a9a47125166e0c ChangeLog 9638
 MISC metadata.xml 160 RMD160 279429d1df694561fc2b163cb81c09387b9d940c SHA1 97da1b72eecc5585c65717da08eaccc9bc1cf7cd SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
 RMD160 279429d1df694561fc2b163cb81c09387b9d940c metadata.xml 160
 SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2 metadata.xml 160
-MD5 d25f8f6198d3dddb88d07435771dddc4 files/digest-kvirc-3.2.0 515
-RMD160 c3c5029f448d2cb44b2dd65faef73c7674d95925 files/digest-kvirc-3.2.0 515
-SHA256 a906d4658d405c05901975009ef26f5470fa0abde92d005e51ca1f66c8e8afd7 files/digest-kvirc-3.2.0 515
-MD5 24a784d157fdbd1b7b30a30aa7dfce2e files/digest-kvirc-3.2.5 241
-RMD160 81833f8e96893ba349991bd4776e4c311da622dd files/digest-kvirc-3.2.5 241
-SHA256 b0738378f01471828ba9b72f4e6bbdbc4d7b1758ca43ebe0b1f39be7401808e4 files/digest-kvirc-3.2.5 241
 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
@@ -62,9 +37,9 @@ 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)
+Version: GnuPG v2.0.6 (GNU/Linux)
 
-iD8DBQFGr9aSKhnDs22gwa8RAs1BAKC64W/EFG6gBVQTkQEXrnledfUZXwCfaPQk
-529P17eXsP/fBnUu3dtRg/4=
-=neaz
+iD8DBQFG3+76z974XjDVpbkRAu2OAKDSBCcjCoPgW2giULwaVVDmM8pxVgCfXDd0
+/5fF/KRZdb90AbmpM9vZmsM=
+=HvpX
 -----END PGP SIGNATURE-----
diff --git a/net-irc/kvirc/files/digest-kvirc-3.2.0 b/net-irc/kvirc/files/digest-kvirc-3.2.0
deleted file mode 100644
index 3fba4defaacb..000000000000
--- a/net-irc/kvirc/files/digest-kvirc-3.2.0
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 be1db10f4eb16910ff1df4c4fcec5278 kvirc-3.2.0-linking-fix.patch.bz2 4266
-RMD160 89b10577cf219a4b5b9e5502a40561dda9593655 kvirc-3.2.0-linking-fix.patch.bz2 4266
-SHA256 d6aeb8f95c00bb1108e39236b3e59bda6eab6efe0ff16037c7f8cb8b018efaa8 kvirc-3.2.0-linking-fix.patch.bz2 4266
-MD5 e783827fda3832fc3fb50e7a41ed627d kvirc-3.2.0.tar.bz2 3704445
-RMD160 c23d5154eaaa9afc88b0c9f6afbda0939c327cf4 kvirc-3.2.0.tar.bz2 3704445
-SHA256 ef4ad991578230db6c0bb8e7335304eac23996fedae682761c8b08ba89552984 kvirc-3.2.0.tar.bz2 3704445
diff --git a/net-irc/kvirc/files/digest-kvirc-3.2.5 b/net-irc/kvirc/files/digest-kvirc-3.2.5
deleted file mode 100644
index 683caa8b1222..000000000000
--- a/net-irc/kvirc/files/digest-kvirc-3.2.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9e3db425502e4e315909451cc9aafeaa kvirc-3.2.5.tar.bz2 4781012
-RMD160 19bd7c6c0fd6bbe0d1423920963ce2ace1c81f2f kvirc-3.2.5.tar.bz2 4781012
-SHA256 1454e48ff6fb33e3a18991fa37775cd5cad80c11f08824a279e4f6b0b0dd03d5 kvirc-3.2.5.tar.bz2 4781012
diff --git a/net-irc/kvirc/files/kvirc-3.0.1-kdedir-fix.patch b/net-irc/kvirc/files/kvirc-3.0.1-kdedir-fix.patch
deleted file mode 100644
index 04c1aebbb2f0..000000000000
--- a/net-irc/kvirc/files/kvirc-3.0.1-kdedir-fix.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- configure.orig	2005-01-29 23:02:56.803194656 +0100
-+++ configure	2005-01-29 23:04:49.034132960 +0100
-@@ -20372,23 +20372,23 @@
- 
- 
- 	if test -n "$SS_KDE_SERVICESDIR"; then
--		kdeservicesdir="$SS_KDE_SERVICESDIR"
-+		kdeservicesdir="\${exec_prefix}/share/services"
- 	else
- 		kdeservicesdir="\${exec_prefix}/share/kvirc/$VERSION/protocols"
- 	fi
- 
- 
- 	if test "$SS_KDE_REQUESTED" = "yes"; then
--		iconapps16datadir="$SS_KDE_GENERAL_DIR/share/icons/hicolor/16x16/apps"
--		iconapps32datadir="$SS_KDE_GENERAL_DIR/share/icons/hicolor/32x32/apps"
--		iconapps48datadir="$SS_KDE_GENERAL_DIR/share/icons/hicolor/48x48/apps"
--		iconapps64datadir="$SS_KDE_GENERAL_DIR/share/icons/hicolor/64x64/apps"
--		iconmime16datadir="$SS_KDE_GENERAL_DIR/share/icons/hicolor/16x16/mimetypes"
--		iconmime32datadir="$SS_KDE_GENERAL_DIR/share/icons/hicolor/32x32/mimetypes"
--		iconmime48datadir="$SS_KDE_GENERAL_DIR/share/icons/hicolor/48x48/mimetypes"
--		iconmime64datadir="$SS_KDE_GENERAL_DIR/share/icons/hicolor/64x64/mimetypes"
--		applnkdir="$SS_KDE_GENERAL_DIR/share/applnk/Internet"
--		mimelnkdir="$SS_KDE_GENERAL_DIR/share/mimelnk/text"
-+		iconapps16datadir="\${exec_prefix}/share/icons/hicolor/16x16/apps"
-+		iconapps32datadir="\${exec_prefix}/share/icons/hicolor/32x32/apps"
-+		iconapps48datadir="\${exec_prefix}/share/icons/hicolor/48x48/apps"
-+		iconapps64datadir="\${exec_prefix}/share/icons/hicolor/64x64/apps"
-+		iconmime16datadir="\${exec_prefix}/share/icons/hicolor/16x16/mimetypes"
-+		iconmime32datadir="\${exec_prefix}/share/icons/hicolor/32x32/mimetypes"
-+		iconmime48datadir="\${exec_prefix}/share/icons/hicolor/48x48/mimetypes"
-+		iconmime64datadir="\${exec_prefix}/share/icons/hicolor/64x64/mimetypes"
-+		applnkdir="\${exec_prefix}/share/applnk/Internet"
-+		mimelnkdir="\${exec_prefix}/share/mimelnk/text"
- 	else
- 		iconapps16datadir="\${exec_prefix}/share/kvirc/$VERSION/icons/16x16"
- 		iconapps32datadir="\${exec_prefix}/share/kvirc/$VERSION/icons/32x32"
diff --git a/net-irc/kvirc/files/kvirc-3.2.0-gcc4.patch b/net-irc/kvirc/files/kvirc-3.2.0-gcc4.patch
deleted file mode 100644
index e801b77b4811..000000000000
--- a/net-irc/kvirc/files/kvirc-3.2.0-gcc4.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- src/kvirc/ui/kvi_console.h	2005-02-25 17:57:45.000000000 +0000
-+++ src/kvirc/ui/kvi_console.h	2006-01-01 20:57:30.000000000 +0000
-@@ -77,7 +77,7 @@
- 	friend class KviIrcSocket;
- 	friend class KviChannel;
- 	friend class KviQuery;
--	friend class KviIrcSocketMonitor;
-+	//friend class KviIrcSocketMonitor;
- 	friend class KviIrcContext;
- 	Q_OBJECT
- protected:
-@@ -105,8 +105,8 @@
- 	void fillStatusString();
- 	//void socketError(int iError);
- 	//void socketStateChange();
--	void registerLinkMonitor(KviIrcSocketMonitor * m);
--	void unregisterLinkMonitor(KviIrcSocketMonitor * m);
-+	//void registerLinkMonitor(KviIrcSocketMonitor * m);
-+	//void unregisterLinkMonitor(KviIrcSocketMonitor * m);
- 	virtual void loadProperties(KviConfig * cfg);
- 	virtual void saveProperties(KviConfig * cfg);
- 	
---- src/kvirc/ui/kvi_console.cpp	2005-02-25 17:57:45.000000000 +0000
-+++ src/kvirc/ui/kvi_console.cpp	2006-01-01 21:11:53.000000000 +0000
-@@ -88,7 +88,7 @@
- #define __KVI_DEBUG__
- #include "kvi_debug.h"
- 
--
-+class KviIrcServerDataBase;
- extern KVIRC_API KviIrcServerDataBase           * g_pIrcServerDataBase;
- extern KVIRC_API KviProxyDataBase               * g_pProxyDataBase;
- extern KVIRC_API KviRegisteredUserDataBase      * g_pRegisteredUserDataBase;
---- src/kvirc/kernel/kvi_irccontext.h	2004-11-22 02:13:17.000000000 +0000
-+++ src/kvirc/kernel/kvi_irccontext.h	2006-01-01 21:06:40.000000000 +0000
-@@ -37,6 +37,7 @@
- class KviAsynchronousConnectionData;
- class KviIrcDataStreamMonitor;
- class KviWindow;
-+class KviConsole;
- class QTimer;
- 
- /*
---- src/kvirc/module/kvi_moduleextension.h	2004-09-09 21:51:07.000000000 +0000
-+++ src/kvirc/module/kvi_moduleextension.h	2006-01-01 21:03:38.000000000 +0000
-@@ -36,6 +36,7 @@
- class KviModule;
- class KviModuleExtension;
- class KviModuleExtensionDescriptor;
-+class KviModuleExtensionManager;
- 
- typedef struct _KviModuleExtensionAllocStructTag
- {
diff --git a/net-irc/kvirc/files/kvirc-3.2.3-kdedir-fix.patch b/net-irc/kvirc/files/kvirc-3.2.3-kdedir-fix.patch
deleted file mode 100644
index 32f688744d4f..000000000000
--- a/net-irc/kvirc/files/kvirc-3.2.3-kdedir-fix.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- configure.orig	2006-06-03 15:46:47.000000000 +0200
-+++ configure	2006-06-03 15:52:42.000000000 +0200
-@@ -30486,23 +30486,23 @@
- 
- 
- 	if test -n "$SS_KDE_SERVICESDIR"; then
--		kdeservicesdir="$SS_KDE_SERVICESDIR"
-+		kdeservicesdir="\${exec_prefix}/share/services"
- 	else
- 		kdeservicesdir="\${exec_prefix}/share/kvirc/$SS_DIRTAG/protocols"
- 	fi
- 
- 
- 	if test "$SS_KDE_REQUESTED" = "yes"; then
--		iconapps16datadir="$SS_KDE_GENERAL_DIR/share/icons/hicolor/16x16/apps"
--		iconapps32datadir="$SS_KDE_GENERAL_DIR/share/icons/hicolor/32x32/apps"
--		iconapps48datadir="$SS_KDE_GENERAL_DIR/share/icons/hicolor/48x48/apps"
--		iconapps64datadir="$SS_KDE_GENERAL_DIR/share/icons/hicolor/64x64/apps"
--		iconmime16datadir="$SS_KDE_GENERAL_DIR/share/icons/hicolor/16x16/mimetypes"
--		iconmime32datadir="$SS_KDE_GENERAL_DIR/share/icons/hicolor/32x32/mimetypes"
--		iconmime48datadir="$SS_KDE_GENERAL_DIR/share/icons/hicolor/48x48/mimetypes"
--		iconmime64datadir="$SS_KDE_GENERAL_DIR/share/icons/hicolor/64x64/mimetypes"
--		applnkdir="$SS_KDE_GENERAL_DIR/share/applnk/Internet"
--		mimelnkdir="$SS_KDE_GENERAL_DIR/share/mimelnk/text"
-+		iconapps16datadir="\${exec_prefix}/share/icons/hicolor/16x16/apps"
-+		iconapps32datadir="\${exec_prefix}/share/icons/hicolor/32x32/apps"
-+		iconapps48datadir="\${exec_prefix}/share/icons/hicolor/48x48/apps"
-+		iconapps64datadir="\${exec_prefix}/share/icons/hicolor/64x64/apps"
-+		iconmime16datadir="\${exec_prefix}/share/icons/hicolor/16x16/mimetypes"
-+		iconmime32datadir="\${exec_prefix}/share/icons/hicolor/32x32/mimetypes"
-+		iconmime48datadir="\${exec_prefix}/share/icons/hicolor/48x48/mimetypes"
-+		iconmime64datadir="\${exec_prefix}/share/icons/hicolor/64x64/mimetypes"
-+		applnkdir="\${exec_prefix}/share/applnk/Internet"
-+		mimelnkdir="\${exec_prefix}/share/mimelnk/text"
- 	else
- 		iconapps16datadir="\${exec_prefix}/share/kvirc/$SS_DIRTAG/icons/16x16"
- 		iconapps32datadir="\${exec_prefix}/share/kvirc/$SS_DIRTAG/icons/32x32"
diff --git a/net-irc/kvirc/files/kvirc-gendoc.patch b/net-irc/kvirc/files/kvirc-gendoc.patch
new file mode 100644
index 000000000000..584b43411047
--- /dev/null
+++ b/net-irc/kvirc/files/kvirc-gendoc.patch
@@ -0,0 +1,10 @@
+--- kvirc/admin/gendoc.pl.orig	2006-12-17 20:36:07.000000000 +0100
++++ kvirc/admin/gendoc.pl	2007-08-05 20:34:47.000000000 +0200
+@@ -659,6 +659,7 @@
+ 			$docfilename=~ s/[ 	]*//g;
+ 			$docfilename=~ s/\@doc://g;
+ 			$docfilename=~ s/\n//g;
++			$docfilename=~ s/\r//g;
+ 			$docfilename=~ s/([a-zA-Z_]*)/\L\1/g;
+ 
+ 			undef %parts;
diff --git a/net-irc/kvirc/kvirc-3.2.0.ebuild b/net-irc/kvirc/kvirc-3.2.0.ebuild
deleted file mode 100644
index 2e6b8ae6fdfa..000000000000
--- a/net-irc/kvirc/kvirc-3.2.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-3.2.0.ebuild,v 1.12 2006/12/23 22:13:00 jokey Exp $
-
-inherit eutils kde-functions
-
-DESCRIPTION="An advanced IRC Client"
-HOMEPAGE="http://www.kvirc.net/"
-SRC_URI="ftp://ftp.kvirc.net/pub/kvirc/${PV}/source/${P}.tar.bz2
-	ftp://ftp.kvirc.de/pub/kvirc/${PV}/source/${P}.tar.bz2
-	ftp://kvirc.firenze.linux.it/pub/kvirc/${PV}/source/${P}.tar.bz2
-	mirror://gentoo/${P}-linking-fix.patch.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"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/kvirc-3.0.1-kdedir-fix.patch
-	epatch "${WORKDIR}"/${P}-linking-fix.patch
-	epatch "${FILESDIR}"/${P}-gcc4.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 "emake 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.5.ebuild b/net-irc/kvirc/kvirc-3.2.5.ebuild
deleted file mode 100644
index 89477ad9aa05..000000000000
--- a/net-irc/kvirc/kvirc-3.2.5.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.5.ebuild,v 1.6 2007/01/13 13:04:32 nixnut Exp $
-
-inherit eutils kde-functions
-
-DESCRIPTION="An advanced IRC Client"
-HOMEPAGE="http://www.kvirc.net/"
-SRC_URI="ftp://ftp.kvirc.net/pub/kvirc/snapshots/source/${P}.tar.bz2
-	ftp://ftp.kvirc.de/pub/kvirc/snapshots/source/${P}.tar.bz2
-	ftp://kvirc.firenze.linux.it/pub/kvirc/snapshots/source/${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"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-3.2.3-kdedir-fix.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_pre20070714.ebuild b/net-irc/kvirc/kvirc-3.2.6_pre20070714.ebuild
index 8b4a54cf78c4..15fa0d305f23 100644
--- a/net-irc/kvirc/kvirc-3.2.6_pre20070714.ebuild
+++ b/net-irc/kvirc/kvirc-3.2.6_pre20070714.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-3.2.6_pre20070714.ebuild,v 1.5 2007/08/01 00:40:41 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-3.2.6_pre20070714.ebuild,v 1.6 2007/09/06 12:13:35 jokey Exp $
 
 inherit autotools eutils kde-functions
 
@@ -30,6 +30,7 @@ src_unpack() {
 	./autogen.sh
 	epatch "${FILESDIR}"/${PN}-svn-kdedir-fix.patch
 	epatch "${FILESDIR}"/${PN}-noipv6.patch
+	epatch "${FILESDIR}"/${PN}-gendoc.patch
 }
 
 src_compile() {