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

(Portage version: 2.1.3.7)

10 files changed, 19 insertions, 262 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/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() {