added gcc 3.4 fix, -fPIC fix, and ~amd64 keyword

3 files changed, 236 insertions, 4 deletions

diff --git a/net-ftp/kbear/ChangeLog b/net-ftp/kbear/ChangeLog
index 35f2c11d8232..9fb4f353548d 100644
--- a/net-ftp/kbear/ChangeLog
+++ b/net-ftp/kbear/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-ftp/kbear
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/kbear/ChangeLog,v 1.18 2004/06/24 22:46:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/kbear/ChangeLog,v 1.19 2004/07/14 14:43:59 lv Exp $
+
+  14 Jul 2004; Travis Tilley <lv@gentoo.org> +files/kbear-2.1.1-gcc-3.4.patch,
+  kbear-2.1.1.ebuild:
+  added gcc 3.4 fix, -fPIC fix, and ~amd64 keyword
 
   16 May 2004; Dominik Stadler <centic@gentoo.org> kbear-2.1.1.ebuild,
   kbear-2.1.ebuild:
diff --git a/net-ftp/kbear/files/kbear-2.1.1-gcc-3.4.patch b/net-ftp/kbear/files/kbear-2.1.1-gcc-3.4.patch
new file mode 100644
index 000000000000..37e737389723
--- /dev/null
+++ b/net-ftp/kbear/files/kbear-2.1.1-gcc-3.4.patch
@@ -0,0 +1,220 @@
+diff -ur kbear-2.1.orig/kbear/base/kbearcopyjob.cpp kbear-2.1/kbear/base/kbearcopyjob.cpp
+--- kbear-2.1.orig/kbear/base/kbearcopyjob.cpp	2004-05-27 16:27:22.093325264 -0400
++++ kbear-2.1/kbear/base/kbearcopyjob.cpp	2004-05-27 13:19:32.000000000 -0400
+@@ -266,7 +266,7 @@
+         default:
+             break;
+     }
+-};
++}
+ 
+ void KBearCopyJob::slotEntries(KIO::Job* job, const KIO::UDSEntryList& list)
+ {
+
+
+
+diff -ur kbear-2.1.orig/kbear/kbeartransferview.h kbear-2.1/kbear/kbeartransferview.h
+--- kbear-2.1.orig/kbear/kbeartransferview.h	2004-05-27 16:27:22.161314928 -0400
++++ kbear-2.1/kbear/kbeartransferview.h	2004-05-27 13:25:43.000000000 -0400
+@@ -30,7 +30,7 @@
+ 
+ class KBearMdiChildView;
+ class QextMdiChildView;
+-class Transfer;;
++class Transfer;
+ 
+ /**
+
+
+
+diff -ur kbear-2.1.orig/kbear/parts/dirsynchpart/kbeardirsynchpart.cpp kbear-2.1/kbear/parts/dirsynchpart/kbeardirsynchpart.cpp
+--- kbear-2.1.orig/kbear/parts/dirsynchpart/kbeardirsynchpart.cpp	2004-05-27 16:27:22.145317360 -0400
++++ kbear-2.1/kbear/parts/dirsynchpart/kbeardirsynchpart.cpp	2004-05-27 14:18:32.000000000 -0400
+@@ -58,7 +58,7 @@
+ 
+ //-----------------------------------------------
+ typedef KParts::GenericFactory<KBearDirSynchPart> KBearDirSynchPartFactory;
+-K_EXPORT_COMPONENT_FACTORY( libkbeardirsynchpart, KBearDirSynchPartFactory );
++K_EXPORT_COMPONENT_FACTORY( libkbeardirsynchpart, KBearDirSynchPartFactory )
+ //-----------------------------------------------
+ KBearDirSynchPart::KBearDirSynchPart( QWidget* parentWidget, const char* widgetName,
+ 						QObject* parent, const char* name, const QStringList& )
+
+
+
+diff -ur kbear-2.1.orig/kbear/parts/filesyspart/kbearfilesyspart.cpp kbear-2.1/kbear/parts/filesyspart/kbearfilesyspart.cpp
+--- kbear-2.1.orig/kbear/parts/filesyspart/kbearfilesyspart.cpp	2004-05-27 16:27:22.138318424 -0400
++++ kbear-2.1/kbear/parts/filesyspart/kbearfilesyspart.cpp	2004-05-27 14:08:34.000000000 -0400
+@@ -79,7 +79,7 @@
+ 
+ //-----------------------------------------------
+ typedef KParts::GenericFactory<KBearFileSysPart> KBearFileSysPartFactory;
+-K_EXPORT_COMPONENT_FACTORY( libkbearfilesyspart, KBearFileSysPartFactory );
++K_EXPORT_COMPONENT_FACTORY( libkbearfilesyspart, KBearFileSysPartFactory )
+ //-----------------------------------------------
+ KBearFileSysPart::KBearFileSysPart( QWidget* parentWidget, const char* widgetName,
+ 						QObject* parent, const char* name, const QStringList& )
+
+
+
+diff -ur kbear-2.1.orig/kbear/parts/filesyspart/kbearfilesyspart.h kbear-2.1/kbear/parts/filesyspart/kbearfilesyspart.h
+--- kbear-2.1.orig/kbear/parts/filesyspart/kbearfilesyspart.h	2004-05-27 16:27:22.132319336 -0400
++++ kbear-2.1/kbear/parts/filesyspart/kbearfilesyspart.h	2004-05-27 14:08:07.000000000 -0400
+@@ -331,6 +331,6 @@
+ 	bool m_isLoading;
+ 	QValueList<int> m_splitterSizes;
+ 	QTextCodec* m_codec;
+-	bool m_guiEnabled;;
++	bool m_guiEnabled;
+ };
+ #endif
+
+
+
+diff -ur kbear-2.1.orig/kbear/plugins/importfilters/gftpimportfilter/gftpimportfilterplugin.cpp kbear-2.1/kbear/plugins/importfilters/gftpimportfilter/gftpimportfilterplugin.cpp
+--- kbear-2.1.orig/kbear/plugins/importfilters/gftpimportfilter/gftpimportfilterplugin.cpp	2004-05-27 16:27:22.182311736 -0400
++++ kbear-2.1/kbear/plugins/importfilters/gftpimportfilter/gftpimportfilterplugin.cpp	2004-05-27 13:31:21.000000000 -0400
+@@ -34,7 +34,7 @@
+ #include "gftpimportfilterplugin.h"
+ 
+ typedef KGenericFactory<GFTPImportFilterPlugin> GFTPImportFilterPluginFactory;
+-K_EXPORT_COMPONENT_FACTORY( libkbeargftpimportfilter, GFTPImportFilterPluginFactory( "GFTPImportFilterPlugin" ) );
++K_EXPORT_COMPONENT_FACTORY( libkbeargftpimportfilter, GFTPImportFilterPluginFactory( "GFTPImportFilterPlugin" ) )
+ //-----------------------------------------------
+ GFTPImportFilterPlugin::GFTPImportFilterPlugin(QObject *parent, const char *name,const QStringList& )
+ 	:	SiteImportFilterPluginIface(parent,name),
+
+
+
+diff -ur kbear-2.1.orig/kbear/plugins/importfilters/kbearimportfilter/kbearimportfilterplugin.cpp kbear-2.1/kbear/plugins/importfilters/kbearimportfilter/kbearimportfilterplugin.cpp
+--- kbear-2.1.orig/kbear/plugins/importfilters/kbearimportfilter/kbearimportfilterplugin.cpp	2004-05-27 16:27:22.168313864 -0400
++++ kbear-2.1/kbear/plugins/importfilters/kbearimportfilter/kbearimportfilterplugin.cpp	2004-05-27 13:39:37.000000000 -0400
+@@ -108,7 +108,7 @@
+ }
+ ///////////////////////////////////////////////////////
+ typedef KGenericFactory<KBearImportFilterPlugin> KBearImportFilterPluginFactory;
+-K_EXPORT_COMPONENT_FACTORY( libkbearimportfilter, KBearImportFilterPluginFactory( "KBearImportFilterPlugin" ) );
++K_EXPORT_COMPONENT_FACTORY( libkbearimportfilter, KBearImportFilterPluginFactory( "KBearImportFilterPlugin" ) )
+ //-----------------------------------------------
+ KBearImportFilterPlugin::KBearImportFilterPlugin(QObject *parent, const char *name,const QStringList& )
+ 	:	SiteImportFilterPluginIface(parent,name),
+
+
+
+diff -ur kbear-2.1.orig/kbear/plugins/importfilters/krusaderimportfilter/krusaderimportfilterplugin.cpp kbear-2.1/kbear/plugins/importfilters/krusaderimportfilter/krusaderimportfilterplugin.cpp
+--- kbear-2.1.orig/kbear/plugins/importfilters/krusaderimportfilter/krusaderimportfilterplugin.cpp	2004-05-27 16:27:22.178312344 -0400
++++ kbear-2.1/kbear/plugins/importfilters/krusaderimportfilter/krusaderimportfilterplugin.cpp	2004-05-27 13:50:44.000000000 -0400
+@@ -34,7 +34,7 @@
+ #include "krusaderimportfilterplugin.h"
+ 
+ typedef KGenericFactory<KrusaderImportFilterPlugin> KrusaderImportFilterPluginFactory;
+-K_EXPORT_COMPONENT_FACTORY( libkbearkrusaderimportfilter, KrusaderImportFilterPluginFactory( "KrusaderImportFilterPlugin" ) );
++K_EXPORT_COMPONENT_FACTORY( libkbearkrusaderimportfilter, KrusaderImportFilterPluginFactory( "KrusaderImportFilterPlugin" ) )
+ //-----------------------------------------------
+ KrusaderImportFilterPlugin::KrusaderImportFilterPlugin(QObject *parent, const char *name,const QStringList& )
+ 	:	SiteImportFilterPluginIface(parent,name),
+
+
+
+diff -ur kbear-2.1.orig/kbear/plugins/importfilters/ncftpimportfilter/ncftpimportfilterplugin.cpp kbear-2.1/kbear/plugins/importfilters/ncftpimportfilter/ncftpimportfilterplugin.cpp
+--- kbear-2.1.orig/kbear/plugins/importfilters/ncftpimportfilter/ncftpimportfilterplugin.cpp	2004-05-27 16:27:22.173313104 -0400
++++ kbear-2.1/kbear/plugins/importfilters/ncftpimportfilter/ncftpimportfilterplugin.cpp	2004-05-27 13:35:15.000000000 -0400
+@@ -42,7 +42,7 @@
+ #include "ncftpimportfilterplugin.h"
+ 
+ typedef KGenericFactory<NcFTPImportFilterPlugin> NcFTPImportFilterPluginFactory;
+-K_EXPORT_COMPONENT_FACTORY( libkbearncftpimportfilter, NcFTPImportFilterPluginFactory( "NcFTPImportFilterPlugin" ) );
++K_EXPORT_COMPONENT_FACTORY( libkbearncftpimportfilter, NcFTPImportFilterPluginFactory( "NcFTPImportFilterPlugin" ) )
+ //-----------------------------------------------
+ NcFTPImportFilterPlugin::NcFTPImportFilterPlugin(QObject *parent, const char *name, const QStringList& )
+ 	:	SiteImportFilterPluginIface(parent,name),
+
+
+
+diff -ur kbear-2.1.orig/kbear/plugins/importfilters/wincommanderimportfilter/wincommanderimportfilterplugin.cpp kbear-2.1/kbear/plugins/importfilters/wincommanderimportfilter/wincommanderimportfilterplugin.cpp
+--- kbear-2.1.orig/kbear/plugins/importfilters/wincommanderimportfilter/wincommanderimportfilterplugin.cpp	2004-05-27 16:27:22.172313256 -0400
++++ kbear-2.1/kbear/plugins/importfilters/wincommanderimportfilter/wincommanderimportfilterplugin.cpp	2004-05-27 13:47:25.000000000 -0400
+@@ -34,7 +34,7 @@
+ #include "wincommanderimportfilterplugin.h"
+ 
+ typedef KGenericFactory<WinCommanderImportFilterPlugin> WinCommanderImportFilterPluginFactory;
+-K_EXPORT_COMPONENT_FACTORY( libkbearwincommanderimportfilter, WinCommanderImportFilterPluginFactory( "WinCommanderImportFilterPlugin" ) );
++K_EXPORT_COMPONENT_FACTORY( libkbearwincommanderimportfilter, WinCommanderImportFilterPluginFactory( "WinCommanderImportFilterPlugin" ) )
+ //-----------------------------------------------
+ WinCommanderImportFilterPlugin::WinCommanderImportFilterPlugin(QObject *parent, const char *name,const QStringList& )
+ 	:	SiteImportFilterPluginIface(parent,name),
+
+
+
+diff -ur kbear-2.1.orig/kbear/plugins/importfilters/ws_ftpimportfilter/ws_ftpimportfilterplugin.cpp kbear-2.1/kbear/plugins/importfilters/ws_ftpimportfilter/ws_ftpimportfilterplugin.cpp
+--- kbear-2.1.orig/kbear/plugins/importfilters/ws_ftpimportfilter/ws_ftpimportfilterplugin.cpp	2004-05-27 16:27:22.180312040 -0400
++++ kbear-2.1/kbear/plugins/importfilters/ws_ftpimportfilter/ws_ftpimportfilterplugin.cpp	2004-05-27 13:43:24.000000000 -0400
+@@ -34,7 +34,7 @@
+ #include "ws_ftpimportfilterplugin.h"
+ 
+ typedef KGenericFactory<WS_FTPImportFilterPlugin> WS_FTPImportFilterPluginFactory;
+-K_EXPORT_COMPONENT_FACTORY( libkbearwsftpimportfilter, WS_FTPImportFilterPluginFactory( "WS_FTPImportFilterPlugin" ) );
++K_EXPORT_COMPONENT_FACTORY( libkbearwsftpimportfilter, WS_FTPImportFilterPluginFactory( "WS_FTPImportFilterPlugin" ) )
+ //-----------------------------------------------
+ WS_FTPImportFilterPlugin::WS_FTPImportFilterPlugin(QObject *parent, const char *name,const QStringList& )
+ 	:	SiteImportFilterPluginIface(parent,name),
+
+
+
+diff -ur kbear-2.1.orig/kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp kbear-2.1/kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp
+--- kbear-2.1.orig/kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp	2004-05-27 16:27:22.193310064 -0400
++++ kbear-2.1/kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp	2004-05-27 13:56:36.000000000 -0400
+@@ -50,7 +50,7 @@
+ #include "../../base/group.h"
+ 
+ typedef KGenericFactory<KBearSiteManagerPlugin> KBearSiteManagerPluginFactory;
+-K_EXPORT_COMPONENT_FACTORY( libkbearsitemanager, KBearSiteManagerPluginFactory( "kbearsitemanager" ) );
++K_EXPORT_COMPONENT_FACTORY( libkbearsitemanager, KBearSiteManagerPluginFactory( "kbearsitemanager" ) )
+ //-----------------------------------------------
+ KBearSiteManagerPlugin::KBearSiteManagerPlugin(QObject* parent, const char* name, const QStringList& )
+ 	:	KParts::Plugin(parent,name),
+
+
+
+diff -ur kbear-2.1.orig/kbear/plugins/tools/kbeartoolsplugin.cpp kbear-2.1/kbear/plugins/tools/kbeartoolsplugin.cpp
+--- kbear-2.1.orig/kbear/plugins/tools/kbeartoolsplugin.cpp	2004-05-27 16:27:22.184311432 -0400
++++ kbear-2.1/kbear/plugins/tools/kbeartoolsplugin.cpp	2004-05-27 14:01:34.000000000 -0400
+@@ -40,7 +40,7 @@
+ #include "kbeartoolswidget.h"
+ 
+ typedef KGenericFactory<KBearToolsPlugin> KBearToolsPluginFactory;
+-K_EXPORT_COMPONENT_FACTORY( libkbeartoolsplugin, KBearToolsPluginFactory( "KBearToolsPlugin" ) );
++K_EXPORT_COMPONENT_FACTORY( libkbeartoolsplugin, KBearToolsPluginFactory( "KBearToolsPlugin" ) )
+ //-----------------------------------------------
+ KBearToolsPlugin::KBearToolsPlugin(QObject *parent, const char *name, const QStringList& )
+ 	:	KParts::Plugin(parent,name)
+
+
+
+diff -ur kbear-2.1.orig/kbear/qextmdi/qextmdidefines.h kbear-2.1/kbear/qextmdi/qextmdidefines.h
+--- kbear-2.1.orig/kbear/qextmdi/qextmdidefines.h	2004-05-27 16:27:22.215306720 -0400
++++ kbear-2.1/kbear/qextmdi/qextmdidefines.h	2004-05-27 13:15:32.000000000 -0400
+@@ -88,7 +88,7 @@
+       TabPageMode    = 2
+    };
+ 
+-}; //namespace
++} //namespace
+ 
+ 
+ //----------------------------------------------------------------------------
+
+
+
+diff -ur kbear-2.1.orig/kbear/qextmdi/qextmdimainfrm.cpp kbear-2.1/kbear/qextmdi/qextmdimainfrm.cpp
+--- kbear-2.1.orig/kbear/qextmdi/qextmdimainfrm.cpp	2004-05-27 16:27:22.212307176 -0400
++++ kbear-2.1/kbear/qextmdi/qextmdimainfrm.cpp	2004-05-27 13:15:07.000000000 -0400
+@@ -1863,7 +1863,7 @@
+    if (m_pTaskBar)
+       m_pTaskBar->close();
+    m_pTaskBar = 0L;
+-};
++}
+ 
+ #ifndef NO_INCLUDE_MOCFILES
+ #include "qextmdimainfrm.moc"
diff --git a/net-ftp/kbear/kbear-2.1.1.ebuild b/net-ftp/kbear/kbear-2.1.1.ebuild
index 426067f2f314..0089b0bf11c4 100644
--- a/net-ftp/kbear/kbear-2.1.1.ebuild
+++ b/net-ftp/kbear/kbear-2.1.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/kbear/kbear-2.1.1.ebuild,v 1.4 2004/06/24 22:46:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/kbear/kbear-2.1.1.ebuild,v 1.5 2004/07/14 14:43:59 lv Exp $
 
-inherit kde
+inherit kde flag-o-matic eutils
 
 DESCRIPTION="A KDE 3.x FTP Manager"
 SRC_URI="mirror://sourceforge/kbear/${P}-1.src.tar.bz2"
@@ -12,7 +12,15 @@ SLOT="0"
 IUSE=""
 
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc sparc"
+KEYWORDS="x86 ~ppc sparc ~amd64"
 S=${WORKDIR}/kbear-2.1
 
 need-kde 3
+
+src_unpack() {
+	use amd64 && append-flags -fPIC
+	kde_src_unpack
+	cd ${S}
+	epatch ${FILESDIR}/kbear-2.1.1-gcc-3.4.patch
+}
+