summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregorio Guidi <greg_g@gentoo.org>2005-02-08 16:17:53 +0000
committerGregorio Guidi <greg_g@gentoo.org>2005-02-08 16:17:53 +0000
commitb917e5c47d095ccda47400240fa9e4ca81bf9214 (patch)
tree8a50575f81b50a22d6acb06e095ba475f4883e15 /kde-base/kdepim
parentRemove old ebuilds. (diff)
downloadgentoo-2-b917e5c47d095ccda47400240fa9e4ca81bf9214.tar.gz
gentoo-2-b917e5c47d095ccda47400240fa9e4ca81bf9214.tar.bz2
gentoo-2-b917e5c47d095ccda47400240fa9e4ca81bf9214.zip
Remove old ebuilds.
(Portage version: 2.0.51-r15)
Diffstat (limited to 'kde-base/kdepim')
-rw-r--r--kde-base/kdepim/files/KMail-inboxEater-BRANCH.diff33
-rw-r--r--kde-base/kdepim/files/digest-kdepim-3.2.0-r21
-rw-r--r--kde-base/kdepim/files/digest-kdepim-3.2.21
-rw-r--r--kde-base/kdepim/files/digest-kdepim-3.3.01
-rw-r--r--kde-base/kdepim/files/digest-kdepim-3.3.0-r11
-rw-r--r--kde-base/kdepim/files/kdepim-3.3.0-korganizer.patch11
-rw-r--r--kde-base/kdepim/files/kdepim-3.3.0-spam-assistant.patch791
-rw-r--r--kde-base/kdepim/files/kmfilter.cpp.patch49
-rw-r--r--kde-base/kdepim/files/kpilot-parallel-make-fix.patch17
-rw-r--r--kde-base/kdepim/kdepim-3.2.0-r2.ebuild28
-rw-r--r--kde-base/kdepim/kdepim-3.2.2.ebuild32
-rw-r--r--kde-base/kdepim/kdepim-3.3.0-r1.ebuild22
-rw-r--r--kde-base/kdepim/kdepim-3.3.0.ebuild23
13 files changed, 0 insertions, 1010 deletions
diff --git a/kde-base/kdepim/files/KMail-inboxEater-BRANCH.diff b/kde-base/kdepim/files/KMail-inboxEater-BRANCH.diff
deleted file mode 100644
index 893a2ff82acd..000000000000
--- a/kde-base/kdepim/files/KMail-inboxEater-BRANCH.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- kmail/kmfolderimap.cpp 14 Jan 2004 23:05:04 -0000 1.163
-+++ kmail/kmfolderimap.cpp 4 Feb 2004 08:53:56 -0000
-@@ -1207,7 +1207,16 @@ void KMFolderImap::deleteMessage(KMMessa
- {
- KURL url = mAccount->getUrl();
- KMFolderImap *msg_parent = static_cast<KMFolderImap*>(msg->parent());
-- url.setPath(msg_parent->imapPath() + ";UID=" + msg->headerField("X-UID"));
-+ QString uid = msg->headerField("X-UID");
-+ /* If the uid is empty the delete job below will nuke all mail in the
-+ folder, so we better safeguard against that. See ::expungeFolder, as
-+ to why. :( */
-+ if ( uid.isEmpty() ) {
-+ kdDebug( 5006 ) << "KMFolderImap::deleteMessage: Attempt to delete "
-+ "an empty UID. Aborting." << endl;
-+ return;
-+ }
-+ url.setPath(msg_parent->imapPath() + ";UID=" + uid );
- if ( mAccount->makeConnection() != ImapAccountBase::Connected )
- return;
- KIO::SimpleJob *job = KIO::file_delete(url, FALSE);
-@@ -1228,7 +1237,11 @@ void KMFolderImap::deleteMessage(QPtrLis
- KMFolderImap *msg_parent = static_cast<KMFolderImap*>(msgList.first()->parent());
- for ( QStringList::Iterator it = sets.begin(); it != sets.end(); ++it )
- {
-- url.setPath(msg_parent->imapPath() + ";UID=" + *it);
-+ QString uid = *it;
-+ // Don't delete with no uid, that nukes the folder. Should not happen, but
-+ // better safe than sorry.
-+ if ( uid.isEmpty() ) continue;
-+ url.setPath(msg_parent->imapPath() + ";UID=" + uid);
- if ( mAccount->makeConnection() != ImapAccountBase::Connected )
- return;
- KIO::SimpleJob *job = KIO::file_delete(url, FALSE);
diff --git a/kde-base/kdepim/files/digest-kdepim-3.2.0-r2 b/kde-base/kdepim/files/digest-kdepim-3.2.0-r2
deleted file mode 100644
index 7f0b3ccf1635..000000000000
--- a/kde-base/kdepim/files/digest-kdepim-3.2.0-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 657a61e0f3d90d2afec3820e77f81306 kdepim-3.2.0.tar.bz2 7707960
diff --git a/kde-base/kdepim/files/digest-kdepim-3.2.2 b/kde-base/kdepim/files/digest-kdepim-3.2.2
deleted file mode 100644
index 90b1cb4baaee..000000000000
--- a/kde-base/kdepim/files/digest-kdepim-3.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 10249b56cbc4c67dc4093b9f968604b9 kdepim-3.2.2.tar.bz2 7721918
diff --git a/kde-base/kdepim/files/digest-kdepim-3.3.0 b/kde-base/kdepim/files/digest-kdepim-3.3.0
deleted file mode 100644
index 55b963d55eeb..000000000000
--- a/kde-base/kdepim/files/digest-kdepim-3.3.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 94520aeae0db2fac5da7d1ece7b575a5 kdepim-3.3.0.tar.bz2 9951726
diff --git a/kde-base/kdepim/files/digest-kdepim-3.3.0-r1 b/kde-base/kdepim/files/digest-kdepim-3.3.0-r1
deleted file mode 100644
index 55b963d55eeb..000000000000
--- a/kde-base/kdepim/files/digest-kdepim-3.3.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 94520aeae0db2fac5da7d1ece7b575a5 kdepim-3.3.0.tar.bz2 9951726
diff --git a/kde-base/kdepim/files/kdepim-3.3.0-korganizer.patch b/kde-base/kdepim/files/kdepim-3.3.0-korganizer.patch
deleted file mode 100644
index fa7df50f8d84..000000000000
--- a/kde-base/kdepim/files/kdepim-3.3.0-korganizer.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- korganizer/plugins/holidays/holidays.cpp.orig 2004-09-09 14:13:05.321243736 -0500
-+++ korganizer/plugins/holidays/holidays.cpp 2004-09-09 14:13:31.521260728 -0500
-@@ -91,7 +91,7 @@
- //static int lastYear = 0;
- int lastYear = 0;
-
-- if (mHolidayFile.isEmpty()) return QString::null;
-+ if (mHolidayFile.isEmpty() || qd.isNull()) return QString::null;
-
- //if ((lastYear == 0) || (qd.year() != lastYear)) {
- if ((yearLast == 0) || (qd.year() != yearLast)) {
diff --git a/kde-base/kdepim/files/kdepim-3.3.0-spam-assistant.patch b/kde-base/kdepim/files/kdepim-3.3.0-spam-assistant.patch
deleted file mode 100644
index 790b8da1b2bd..000000000000
--- a/kde-base/kdepim/files/kdepim-3.3.0-spam-assistant.patch
+++ /dev/null
@@ -1,791 +0,0 @@
-diff -uNr /home/fiam/kdepim-3.3.0.orig/kmail/antispamwizard.cpp ./kmail/antispamwizard.cpp
---- /home/fiam/kdepim-3.3.0.orig/kmail/antispamwizard.cpp 2004-08-05 21:26:52.000000000 +0200
-+++ ./kmail/antispamwizard.cpp 2004-09-11 14:27:58.745702928 +0200
-@@ -141,6 +141,7 @@
- << mVirusRulesPage->selectedFolderName() << endl;
-
- KMFilterActionDict dict;
-+ QPtrList<KMFilter> filterList;
-
- // Let's start with virus detection and handling,
- // so we can avoid spam checks for viral messages
-@@ -168,7 +169,7 @@
- pipeFilter->setStopProcessingHere( FALSE );
- pipeFilter->setConfigureShortcut( FALSE );
-
-- KMKernel::self()->filterMgr()->appendFilter( pipeFilter );
-+ filterList.append( pipeFilter );
- }
- }
-
-@@ -213,7 +214,7 @@
- virusFilter->setStopProcessingHere( TRUE );
- virusFilter->setConfigureShortcut( FALSE );
-
-- KMKernel::self()->filterMgr()->appendFilter( virusFilter );
-+ filterList.append( virusFilter );
- }
- }
- else { // AntiSpam mode
-@@ -240,7 +241,7 @@
- pipeFilter->setStopProcessingHere( FALSE );
- pipeFilter->setConfigureShortcut( FALSE );
-
-- KMKernel::self()->filterMgr()->appendFilter( pipeFilter );
-+ filterList.append( pipeFilter );
- }
- }
-
-@@ -288,7 +289,7 @@
- spamFilter->setStopProcessingHere( TRUE );
- spamFilter->setConfigureShortcut( FALSE );
-
-- KMKernel::self()->filterMgr()->appendFilter( spamFilter );
-+ filterList.append( spamFilter );
- }
-
- if ( mSpamRulesPage->classifyRulesSelected() )
-@@ -323,7 +324,8 @@
- classSpamFilter->setApplyOnExplicit( FALSE );
- classSpamFilter->setStopProcessingHere( TRUE );
- classSpamFilter->setConfigureShortcut( TRUE );
-- KMKernel::self()->filterMgr()->appendFilter( classSpamFilter );
-+ classSpamFilter->setConfigureToolbar( TRUE );
-+ filterList.append( classSpamFilter );
-
- // Classify messages manually as not Spam / as Ham
- KMFilter* classHamFilter = new KMFilter();
-@@ -350,92 +352,15 @@
- classHamFilter->setApplyOnExplicit( FALSE );
- classHamFilter->setStopProcessingHere( TRUE );
- classHamFilter->setConfigureShortcut( TRUE );
-- KMKernel::self()->filterMgr()->appendFilter( classHamFilter );
-+ classHamFilter->setConfigureToolbar( TRUE );
-+ filterList.append( classHamFilter );
-
-- // add the classification filter actions to the toolbar
-- QString filterNameSpam =
-- QString( "Filter %1" ).arg( classSpamFilterPattern->name() );
-- filterNameSpam = filterNameSpam.replace( " ", "_" );
-- QString filterNameHam =
-- QString( "Filter %1" ).arg( classHamFilterPattern->name() );
-- filterNameHam = filterNameHam.replace( " ", "_" );
--
-- // FIXME post KDE 3.2
-- // The following code manipulates the kmmainwin.rc file directly. Usuallay
-- // one would expect to let the toolbar write back it's change from above
-- // i.e. the new structure including the two added actions.
-- // In KDE 3.2 there is no API for that so I only fund the way to read in
-- // the XML file myself, to change it and write it out then.
-- // As soon as an API is available, the following part can certainly get
-- // replaced by one or two statements.
-- // (a.gungl@gmx.de)
--
-- // make the toolbar changes persistent - let's be very conservative here
-- QString config =
-- KXMLGUIFactory::readConfigFile( "kmmainwin.rc", KMKernel::self()->xmlGuiInstance() );
--#ifndef NDEBUG
-- kdDebug(5006) << "Read kmmainwin.rc contents (last 1000 chars printed):" << endl;
-- kdDebug(5006) << config.right( 1000 ) << endl;
-- kdDebug(5006) << "#####################################################" << endl;
--#endif
-- QDomDocument domDoc;
-- domDoc.setContent( config );
-- QDomNodeList domNodeList = domDoc.elementsByTagName( "ToolBar" );
-- if ( domNodeList.count() > 0 )
-- kdDebug(5006) << "ToolBar section found." << endl;
-- else
-- kdDebug(5006) << "No ToolBar section found." << endl;
-- for ( unsigned int i = 0; i < domNodeList.count(); i++ )
-- {
-- QDomNode domNode = domNodeList.item( i );
-- QDomNamedNodeMap nodeMap = domNode.attributes();
-- kdDebug(5006) << "name=" << nodeMap.namedItem( "name" ).nodeValue() << endl;
-- if ( nodeMap.namedItem( "name" ).nodeValue() == "mainToolBar" )
-- {
-- kdDebug(5006) << "mainToolBar section found." << endl;
-- bool spamActionFound = false;
-- bool hamActionFound = false;
-- QDomNodeList domNodeChildList = domNode.childNodes();
-- for ( unsigned int j = 0; j < domNodeChildList.count(); j++ )
-- {
-- QDomNode innerDomNode = domNodeChildList.item( j );
-- QDomNamedNodeMap innerNodeMap = innerDomNode.attributes();
-- if ( innerNodeMap.namedItem( "name" ).nodeValue() == filterNameSpam )
-- spamActionFound = true;
-- if ( innerNodeMap.namedItem( "name" ).nodeValue() == filterNameHam )
-- hamActionFound = true;
-- }
--
-- // append the new actions if not yet existing
-- if ( !spamActionFound )
-- {
-- QDomElement domElemSpam = domDoc.createElement( "Action" );
-- domElemSpam.setAttribute( "name", filterNameSpam );
-- domNode.appendChild( domElemSpam );
-- kdDebug(5006) << "Spam action added to toolbar." << endl;
-- }
-- if ( !hamActionFound )
-- {
-- QDomElement domElemHam = domDoc.createElement( "Action" );
-- domElemHam.setAttribute( "name", filterNameHam );
-- domNode.appendChild( domElemHam );
-- kdDebug(5006) << "Ham action added to toolbar." << endl;
-- }
-- if ( !spamActionFound || !hamActionFound )
-- {
--#ifndef NDEBUG
-- kdDebug(5006) << "New kmmainwin.rc structur (last 1000 chars printed):" << endl;
-- kdDebug(5006) << domDoc.toString().right( 1000 ) << endl;
-- kdDebug(5006) << "####################################################" << endl;
--#endif
-- // write back the modified resource file
-- KXMLGUIFactory::saveConfigFile( domDoc, "kmmainwin.rc",
-- KMKernel::self()->xmlGuiInstance() );
-- }
-- }
-- else
-- kdDebug(5006) << "No mainToolBar section found." << endl;
-- }
-+ /* Now that all the filters have been added to the list, tell
-+ * the filter manager about it. That will emit filterListUpdate
-+ * which will result in the filter list in kmmainwidget being
-+ * initialized. This should happend only once. */
-+ KMKernel::self()->filterMgr()->appendFilters( filterList );
-+
- }
- }
-
-diff -uNr /home/fiam/kdepim-3.3.0.orig/kmail/kmail_part.cpp ./kmail/kmail_part.cpp
---- /home/fiam/kdepim-3.3.0.orig/kmail/kmail_part.cpp 2004-08-05 21:26:53.000000000 +0200
-+++ ./kmail/kmail_part.cpp 2004-09-11 14:27:58.746702776 +0200
-@@ -49,6 +49,7 @@
- #include <dcopclient.h>
- #include <kiconloader.h>
- #include <kdebug.h>
-+#include <libkdepim/part.h>
-
- #include <qlayout.h>
-
-@@ -58,7 +59,7 @@
-
- KMailPart::KMailPart(QWidget *parentWidget, const char *widgetName,
- QObject *parent, const char *name, const QStringList &) :
-- DCOPObject("KMailIface"), KParts::ReadOnlyPart(parent, name),
-+ DCOPObject("KMailIface"), KPIM::Part(parent, name),
- mParentWidget( parentWidget )
- {
- kdDebug(5006) << "KMailPart()" << endl;
-@@ -94,6 +95,8 @@
- kmsetSignalHandler(kmsignalHandler);
- kapp->dcopClient()->resume(); // Ok. We are ready for DCOP requests.
-
-+ connect( kmailKernel, SIGNAL( showMailCalled() ), SIGNAL( raise() ) );
-+
- // create a canvas to insert our widget
- QWidget *canvas = new QWidget(parentWidget, widgetName);
- canvas->setFocusPolicy(QWidget::ClickFocus);
-@@ -118,7 +121,8 @@
- setXMLFile( "kmmainwin.rc" );
- kmkernel->inboxFolder()->close();
- #else
-- mainWidget = new KMMainWidget( canvas, "mainWidget", actionCollection(), kapp->config());
-+ mainWidget = new KMMainWidget( canvas, "mainWidget", this, actionCollection(),
-+ kapp->config());
- QVBoxLayout *topLayout = new QVBoxLayout(canvas);
- topLayout->addWidget(mainWidget);
- mainWidget->setFocusPolicy(QWidget::ClickFocus);
-@@ -237,6 +241,7 @@
- return mParentWidget;
- }
-
-+
- KMailBrowserExtension::KMailBrowserExtension(KMailPart *parent) :
- KParts::BrowserExtension(parent, "KMailBrowserExtension")
- {
-diff -uNr /home/fiam/kdepim-3.3.0.orig/kmail/kmail_part.h ./kmail/kmail_part.h
---- /home/fiam/kdepim-3.3.0.orig/kmail/kmail_part.h 2004-06-25 10:57:47.000000000 +0200
-+++ ./kmail/kmail_part.h 2004-09-11 14:27:58.747702624 +0200
-@@ -33,6 +33,7 @@
- #include <kparts/factory.h>
- #include <kparts/event.h>
- #include <qwidget.h>
-+#include <libkdepim/part.h>
-
- class KInstance;
- class KAboutData;
-@@ -47,7 +48,7 @@
-
- class ActionManager;
-
--class KMailPart: public KParts::ReadOnlyPart, virtual public KMailPartIface
-+class KMailPart: public KPIM::Part, virtual public KMailPartIface
- {
- Q_OBJECT
- public:
-diff -uNr /home/fiam/kdepim-3.3.0.orig/kmail/kmfilter.cpp ./kmail/kmfilter.cpp
---- /home/fiam/kdepim-3.3.0.orig/kmail/kmfilter.cpp 2004-05-22 22:58:05.000000000 +0200
-+++ ./kmail/kmfilter.cpp 2004-09-11 14:27:58.748702472 +0200
-@@ -180,6 +180,8 @@
-
- bStopProcessingHere = config->readBoolEntry("StopProcessingHere", true);
- bConfigureShortcut = config->readBoolEntry("ConfigureShortcut", false);
-+ bConfigureToolbar = config->readBoolEntry("ConfigureToolbar", false);
-+ bConfigureToolbar = bConfigureToolbar && bConfigureShortcut;
- mIcon = config->readEntry( "Icon", "gear" );
-
- int i, numActions;
-@@ -251,6 +253,7 @@
-
- config->writeEntry( "StopProcessingHere", bStopProcessingHere );
- config->writeEntry( "ConfigureShortcut", bConfigureShortcut );
-+ config->writeEntry( "ConfigureToolbar", bConfigureToolbar );
- config->writeEntry( "Icon", mIcon );
-
- QString key;
-diff -uNr /home/fiam/kdepim-3.3.0.orig/kmail/kmfilter.h ./kmail/kmfilter.h
---- /home/fiam/kdepim-3.3.0.orig/kmail/kmfilter.h 2004-05-22 22:58:05.000000000 +0200
-+++ ./kmail/kmfilter.h 2004-09-11 14:27:58.749702320 +0200
-@@ -154,10 +154,42 @@
- void setStopProcessingHere( bool aStop ) { bStopProcessingHere = aStop; }
- bool stopProcessingHere() const { return bStopProcessingHere; }
-
-- void setConfigureShortcut( bool aShort ) { bConfigureShortcut = aShort; }
-+ /** Set whether this filter should be plugged into the filter menu.
-+ */
-+ void setConfigureShortcut( bool aShort ) {
-+ bConfigureShortcut = aShort;
-+ bConfigureToolbar = bConfigureToolbar && bConfigureShortcut;
-+ }
-+
-+ /** @return TRUE if this filter should be plugged into the filter menu,
-+ FALSE otherwise.
-+ @see setConfigureShortcut
-+ */
- bool configureShortcut() const { return bConfigureShortcut; }
-
-+ /** Set whether this filter should be plugged into the toolbar.
-+ This can be done only if a shortcut is defined.
-+ @see setConfigureShortcut
-+ */
-+ void setConfigureToolbar( bool aTool ) {
-+ bConfigureToolbar = aTool && bConfigureShortcut;
-+ }
-+
-+ /** @return TRUE if this filter should be plugged into the toolbar,
-+ FALSE otherwise.
-+ @see setConfigureToolbar
-+ */
-+ bool configureToolbar() const { return bConfigureToolbar; }
-+
-+ /** Set the icon to be used if plugged into the filter menu
-+ or toolbar. Default is the gear icon.
-+ @see setConfigureShortcut setConfigureToolbar
-+ */
- void setIcon( QString icon ) { mIcon = icon; }
-+
-+ /** @return The name of the icon to be used.
-+ @see setIcon
-+ */
- QString icon() const { return mIcon; }
-
- /**
-@@ -191,6 +223,7 @@
- bool bApplyOnExplicit : 1;
- bool bStopProcessingHere : 1;
- bool bConfigureShortcut : 1;
-+ bool bConfigureToolbar : 1;
- };
-
- #endif /*kmfilter_h*/
-diff -uNr /home/fiam/kdepim-3.3.0.orig/kmail/kmfiltermgr.cpp ./kmail/kmfiltermgr.cpp
---- /home/fiam/kdepim-3.3.0.orig/kmail/kmfiltermgr.cpp 2004-05-22 22:58:05.000000000 +0200
-+++ ./kmail/kmfiltermgr.cpp 2004-09-11 14:27:58.750702168 +0200
-@@ -321,6 +321,15 @@
- endUpdate();
- }
-
-+void KMFilterMgr::appendFilters( const QPtrList <KMFilter> filters )
-+{
-+ beginUpdate();
-+ QPtrListIterator<KMFilter> it(filters);
-+ for ( it.toFirst(); it.current() ; ++it )
-+ append( *it );
-+ writeConfig( TRUE );
-+ endUpdate();
-+}
-
- //-----------------------------------------------------------------------------
- bool KMFilterMgr::folderRemoved(KMFolder* aFolder, KMFolder* aNewFolder)
-diff -uNr /home/fiam/kdepim-3.3.0.orig/kmail/kmfiltermgr.h ./kmail/kmfiltermgr.h
---- /home/fiam/kdepim-3.3.0.orig/kmail/kmfiltermgr.h 2004-05-22 22:58:05.000000000 +0200
-+++ ./kmail/kmfiltermgr.h 2004-09-11 14:27:58.751702016 +0200
-@@ -48,6 +48,8 @@
- write everything back into the configuration.*/
- void appendFilter( KMFilter* filter );
-
-+ void appendFilters( const QPtrList <KMFilter> );
-+
- /** Process given message by applying the filter rules one by
- one. You can select which set of filters (incoming or outgoing)
- should be used.
-diff -uNr /home/fiam/kdepim-3.3.0.orig/kmail/kmmainwidget.cpp ./kmail/kmmainwidget.cpp
---- /home/fiam/kdepim-3.3.0.orig/kmail/kmmainwidget.cpp 2004-08-09 11:27:48.000000000 +0200
-+++ ./kmail/kmmainwidget.cpp 2004-09-11 14:27:58.754701560 +0200
-@@ -101,8 +101,9 @@
- static KStaticDeleter<QPtrList<KMMainWidget> > mwlsd;
-
- //-----------------------------------------------------------------------------
--KMMainWidget::KMMainWidget(QWidget *parent, const char *name,
-- KActionCollection *actionCollection, KConfig* config ) :
-+KMMainWidget::KMMainWidget(QWidget *parent, const char *name,
-+ KXMLGUIClient *aGUIClient,
-+ KActionCollection *actionCollection, KConfig* config ) :
- QWidget(parent, name),
- mQuickSearchLine( 0 )
- {
-@@ -120,10 +121,15 @@
- mDestructed = false;
- mActionCollection = actionCollection;
- mTopLayout = new QVBoxLayout(this);
-- mFilterActions.setAutoDelete(true);
-+ mFilterMenuActions.setAutoDelete(true);
-+ mFilterTBarActions.setAutoDelete(false);
- mFilterCommands.setAutoDelete(true);
- mJob = 0;
- mConfig = config;
-+ mGUIClient = aGUIClient;
-+ // FIXME This should become a line separator as soon as the API
-+ // is extended in kdelibs.
-+ mToolbarActionSeparator = new KActionSeparator( actionCollection );
-
- if( !s_mainWidgetList )
- mwlsd.setObject( s_mainWidgetList, new QPtrList<KMMainWidget>() );
-@@ -2086,12 +2092,11 @@
-
- menu->insertSeparator();
-
-- // these two only make sense if there is a reader window.
-- // I guess. Not sure about view source ;). Till
-+ // this one only make sense if there is a reader window.
- if (mMsgView) {
- toggleFixFontAction()->plug(menu);
-- viewSourceAction()->plug(menu);
- }
-+ viewSourceAction()->plug(menu);
-
- menu->insertSeparator();
- mPrintAction->plug( menu );
-@@ -2715,6 +2720,9 @@
- SLOT(slotCollapseAllThreads()),
- actionCollection(), "collapse_all_threads" );
-
-+ mViewSourceAction = new KAction( i18n("&View Source"), Key_V, this,
-+ SLOT(slotShowMsgSrc()), actionCollection(),
-+ "view_source" );
-
- //----- Go Menu
- new KAction( KGuiItem( i18n("&Next Message"), QString::null,
-@@ -2881,6 +2889,19 @@
- mHeaders->slotExpandOrCollapseAllThreads( false ); // collapse
- }
-
-+//-----------------------------------------------------------------------------
-+void KMMainWidget::slotShowMsgSrc()
-+{
-+ KMMessage *msg = mHeaders->currentMsg();
-+ if ( !msg )
-+ return;
-+ KMCommand *command = new KMShowMsgSrcCommand( this, msg,
-+ mMsgView
-+ ? mMsgView->isFixedFont()
-+ : false );
-+ command->start();
-+}
-+
-
- //-----------------------------------------------------------------------------
- void KMMainWidget::moveSelectedToFolder( int menuId )
-@@ -3007,9 +3028,7 @@
- replyListAction()->setEnabled( single_actions );
- redirectAction()->setEnabled( single_actions );
- printAction()->setEnabled( single_actions );
-- if (mMsgView) {
-- viewSourceAction()->setEnabled( single_actions );
-- }
-+ viewSourceAction()->setEnabled( single_actions );
-
- mSendAgainAction->setEnabled( single_actions &&
- ( mHeaders->currentMsg() && mHeaders->currentMsg()->isSent() )
-@@ -3137,6 +3156,9 @@
- connect( kmkernel->filterMgr(), SIGNAL( filterListUpdated() ),
- this, SLOT( initializeFilterActions() ));
-
-+ // plug shortcut filter actions now
-+ initializeFilterActions();
-+
- QString newFeaturesMD5 = KMReaderWin::newFeaturesMD5();
- if ( kmkernel->firstStart() ||
- GlobalSettings::previousNewFeaturesMD5() != newFeaturesMD5 ) {
-@@ -3153,7 +3175,7 @@
- if ( !startup )
- startup = kmkernel->inboxFolder();
-
-- if ( mFolderTree )
-+ if ( mFolderTree )
- {
- mFolderTree->reload();
- mFolderTree->showFolder( startup );
-@@ -3175,6 +3197,7 @@
- //-----------------------------------------------------------------------------
- void KMMainWidget::slotChangeCaption(QListViewItem * i)
- {
-+ if ( !i ) return;
- // set the caption to the current full path
- QStringList names;
- for ( QListViewItem * item = i ; item ; item = item->parent() )
-@@ -3256,12 +3279,22 @@
- {
- QString filterName, normalizedName;
- KMMetaFilterActionCommand *filterCommand;
-- KAction *filterAction;
-- mApplyFilterActionsMenu->popupMenu()->clear();
-- mFilterActions.clear();
-+ KAction *filterAction = 0;
-+
-+ if ( !mFilterTBarActions.isEmpty() ) {
-+ if ( mGUIClient->factory() )
-+ mGUIClient->unplugActionList( "toolbar_filter_actions" );
-+ mFilterTBarActions.clear();
-+ }
-+ if ( !mFilterMenuActions.isEmpty() ) {
-+ mApplyFilterActionsMenu->popupMenu()->clear();
-+ if ( mGUIClient->factory() )
-+ mGUIClient->unplugActionList( "menu_filter_actions" );
-+ mFilterMenuActions.clear();
-+ }
- mFilterCommands.clear();
- for ( QPtrListIterator<KMFilter> it(*kmkernel->filterMgr()) ;
-- it.current() ; ++it )
-+ it.current() ; ++it ) {
- if (!(*it)->isEmpty() && (*it)->configureShortcut()) {
- filterName = QString("Filter %1").arg((*it)->name());
- normalizedName = filterName.replace(" ", "_");
-@@ -3276,26 +3309,26 @@
- filterAction = new KAction(as, icon, 0, filterCommand,
- SLOT(start()), actionCollection(),
- normalizedName.local8Bit());
-- mFilterActions.append(filterAction);
-+ filterAction->plug( mApplyFilterActionsMenu->popupMenu() );
-+ mFilterMenuActions.append(filterAction);
-+ // FIXME
-+ // uncomment the next if statement after the filter dialog supports
-+ // separate activation of filters for the toolbar - currently
-+ // we better use the coupled way
-+ // if ( (*it)->configureToolbar() )
-+ mFilterTBarActions.append(filterAction);
- }
--
-- plugFilterActions(mApplyFilterActionsMenu->popupMenu());
-+ }
-+ if ( !mFilterMenuActions.isEmpty() && mGUIClient->factory() )
-+ mGUIClient->plugActionList( "menu_filter_actions", mFilterMenuActions );
-+ if ( !mFilterTBarActions.isEmpty() && mGUIClient->factory() ) {
-+ mFilterTBarActions.prepend( mToolbarActionSeparator );
-+ mGUIClient->plugActionList( "toolbar_filter_actions", mFilterTBarActions );
-+ }
- }
-
-
- //-----------------------------------------------------------------------------
--void KMMainWidget::plugFilterActions(QPopupMenu *menu)
--{
-- for (QPtrListIterator<KMFilter> it(*kmkernel->filterMgr()); it.current(); ++it)
-- if (!(*it)->isEmpty() && (*it)->configureShortcut()) {
-- QString filterName = QString("Filter %1").arg((*it)->name());
-- filterName = filterName.replace(" ","_");
-- KAction *filterAction = action(filterName.local8Bit());
-- if (filterAction && menu)
-- filterAction->plug(menu);
-- }
--}
--
- void KMMainWidget::slotSubscriptionDialog()
- {
- if (!mFolder) return;
-@@ -3355,7 +3388,6 @@
- AntiSpamWizard wiz( AntiSpamWizard::AntiSpam,
- this, folderTree(), actionCollection() );
- wiz.exec();
-- emit modifiedToolBarConfig();
- }
-
- //-----------------------------------------------------------------------------
-@@ -3364,7 +3396,6 @@
- AntiSpamWizard wiz( AntiSpamWizard::AntiVirus,
- this, folderTree(), actionCollection() );
- wiz.exec();
-- //emit modifiedToolBarConfig();
- }
-
- //-----------------------------------------------------------------------------
-diff -uNr /home/fiam/kdepim-3.3.0.orig/kmail/kmmainwidget.h ./kmail/kmmainwidget.h
---- /home/fiam/kdepim-3.3.0.orig/kmail/kmmainwidget.h 2004-08-05 21:26:53.000000000 +0200
-+++ ./kmail/kmmainwidget.h 2004-09-11 14:27:58.756701256 +0200
-@@ -9,6 +9,7 @@
- #define __KMMAINWIDGET
-
- #include <kurl.h>
-+#include <kxmlguiclient.h>
- #include <qlistview.h>
- #include <qvbox.h>
-
-@@ -67,7 +68,8 @@
-
- public:
- KMMainWidget(QWidget *parent, const char *name,
-- KActionCollection *actionCollection,
-+ KXMLGUIClient *aGUIClient,
-+ KActionCollection *actionCollection,
- KConfig*config = KMKernel::config() );
- virtual ~KMMainWidget();
- void destruct();
-@@ -116,6 +118,7 @@
- KAction *findInMessageAction() const { return mFindInMessageAction; }
- KAction *saveAttachmentsAction() const { return mSaveAttachmentsAction; }
- KAction *openAction() const { return mOpenAction; }
-+ KAction *viewSourceAction() { return mViewSourceAction; }
-
- KActionMenu *statusMenu() const{ return mStatusMenu; }
- KActionMenu *threadStatusMenu() const { return mThreadStatusMenu; }
-@@ -128,7 +131,6 @@
-
- // Forwarded to the reader window.
- KToggleAction *toggleFixFontAction() { return mMsgView->toggleFixFontAction(); }
-- KAction *viewSourceAction() { return mMsgView->viewSourceAction(); }
-
- KMHeaders *headers() const { return mHeaders; }
- void toggleSystemTray();
-@@ -186,7 +188,6 @@
- signals:
- void messagesTransfered( bool );
- void captionChangeRequest( const QString & caption );
-- void modifiedToolBarConfig( void );
-
- protected:
- void setupActions();
-@@ -257,6 +258,7 @@
- void slotExpandAllThreads();
- void slotCollapseThread();
- void slotCollapseAllThreads();
-+ void slotShowMsgSrc();
- void slotSetMsgStatusNew();
- void slotSetMsgStatusUnread();
- void slotSetMsgStatusRead();
-@@ -348,8 +350,6 @@
- void removeDuplicates();
- /** Create actions for marked filters */
- void initializeFilterActions();
-- /** Plug filter actions into a popup menu */
-- void plugFilterActions(QPopupMenu*);
-
- /** Slot to reply to a message */
- void slotReplyToMsg();
-@@ -373,7 +373,7 @@
- // Message actions
- KAction *mTrashAction, *mDeleteAction, *mSaveAsAction, *mEditAction,
- *mSendAgainAction, *mApplyFiltersAction, *mFindInMessageAction,
-- *mSaveAttachmentsAction, *mOpenAction;
-+ *mSaveAttachmentsAction, *mOpenAction, *mViewSourceAction;
- // Composition actions
- KAction *mPrintAction, *mReplyAction, *mReplyAllAction, *mReplyAuthorAction,
- *mReplyListAction,
-@@ -460,15 +460,18 @@
-
- QGuardedPtr<KMail::Vacation> mVacation;
- KActionCollection *mActionCollection;
-+ KActionSeparator *mToolbarActionSeparator;
- QVBoxLayout *mTopLayout;
- bool mDestructed, mForceJumpToUnread;
-- QPtrList<KAction> mFilterActions;
-+ QPtrList<KAction> mFilterMenuActions;
-+ QPtrList<KAction> mFilterTBarActions;
- QPtrList<KMMetaFilterActionCommand> mFilterCommands;
- QGuardedPtr <KMail::FolderJob> mJob;
-
- KMSystemTray *mSystemTray;
- KConfig *mConfig;
--
-+ KXMLGUIClient *mGUIClient;
-+
- static QPtrList<KMMainWidget>* s_mainWidgetList;
- };
-
-diff -uNr /home/fiam/kdepim-3.3.0.orig/kmail/kmmainwin.cpp ./kmail/kmmainwin.cpp
---- /home/fiam/kdepim-3.3.0.orig/kmail/kmmainwin.cpp 2004-08-05 21:26:53.000000000 +0200
-+++ ./kmail/kmmainwin.cpp 2004-09-11 14:27:58.757701104 +0200
-@@ -27,7 +27,7 @@
- mReallyClose( false )
- {
- kapp->ref();
-- mKMMainWidget = new KMMainWidget( this, "KMMainWidget", actionCollection() );
-+ mKMMainWidget = new KMMainWidget( this, "KMMainWidget", this, actionCollection() );
- mKMMainWidget->resize( 450, 600 );
- setCentralWidget(mKMMainWidget);
- setupStatusBar();
-@@ -44,8 +44,9 @@
-
- KStdAction::quit( this, SLOT(slotQuit()), actionCollection());
- createGUI( "kmmainwin.rc", false );
-+ // Don't use conserveMemory() because this renders dynamic plugging
-+ // of actions unusable!
-
-- conserveMemory();
- applyMainWindowSettings(KMKernel::config(), "Main Window");
-
- connect( KPIM::BroadcastStatus::instance(), SIGNAL( statusMsg( const QString& ) ),
-diff -uNr /home/fiam/kdepim-3.3.0.orig/kmail/kmmainwin.rc ./kmail/kmmainwin.rc
---- /home/fiam/kdepim-3.3.0.orig/kmail/kmmainwin.rc 2004-07-17 21:16:37.000000000 +0200
-+++ ./kmail/kmmainwin.rc 2004-09-11 14:27:58.758700952 +0200
-@@ -1,5 +1,5 @@
- <!DOCTYPE kpartgui>
--<kpartgui version="77" name="kmmainwin" >
-+<kpartgui version="78" name="kmmainwin" >
- <MenuBar>
- <Menu noMerge="1" name="file" >
- <text>&amp;File</text>
-@@ -110,7 +110,11 @@
- <Action name="thread_ignored" />
- <Separator/>
- <Action name="apply_filters" />
-- <Action name="apply_filter_actions" />
-+ <Separator/>
-+ <Menu name="apply_filter_actions" >
-+ <text>A&amp;pply Filter</text>
-+ <ActionList name="menu_filter_actions" />
-+ </Menu>
- </Menu>
- <Menu noMerge="1" name="tools">
- <text>&amp;Tools</text>
-@@ -163,5 +167,6 @@
- <Action name="move_to_trash" />
- <Separator/>
- <Action name="search_messages" />
-+ <ActionList name="toolbar_filter_actions" />
- </ToolBar>
- </kpartgui>
-diff -uNr /home/fiam/kdepim-3.3.0.orig/libkdepim/Makefile.am ./libkdepim/Makefile.am
---- /home/fiam/kdepim-3.3.0.orig/libkdepim/Makefile.am 2004-08-05 21:27:05.000000000 +0200
-+++ ./libkdepim/Makefile.am 2004-09-11 14:28:18.001775560 +0200
-@@ -24,7 +24,7 @@
- overlaywidget.cpp progressmanager.cpp progressdialog.cpp \
- statusbarprogresswidget.cpp ssllabel.cpp completionordereditor.cpp \
- resourceabc.cpp diffalgo.cpp addresseediffalgo.cpp calendardiffalgo.cpp \
-- htmldiffalgodisplay.cpp broadcaststatus.cpp
-+ htmldiffalgodisplay.cpp broadcaststatus.cpp part.cpp
-
- noinst_HEADERS = categoryselectdialog.h categoryeditdialog.h ktimeedit.h
- $(srcdir)/categoryselectdialog.h: categoryselectdialog_base.h
-@@ -36,7 +36,7 @@
- AddressBookServiceIface_DIR = $(srcdir)/interfaces
-
- libkdepim_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 1:0:0
--libkdepim_la_LIBADD = $(LIB_KIO) $(LIB_KABC) \
-+libkdepim_la_LIBADD = $(LIB_KIO) $(LIB_KABC) $(LIB_KPARTS) \
- $(top_builddir)/libkcal/libkcal.la $(LIB_KDEUI)
- # $top_builddir)/libkdepim/resources/libkpimresources.la
-
-diff -uNr /home/fiam/kdepim-3.3.0.orig/libkdepim/part.cpp ./libkdepim/part.cpp
---- /home/fiam/kdepim-3.3.0.orig/libkdepim/part.cpp 1970-01-01 01:00:00.000000000 +0100
-+++ ./libkdepim/part.cpp 2004-09-11 14:27:58.791695936 +0200
-@@ -0,0 +1,35 @@
-+/*
-+ This file is part of libkdepim.
-+
-+ Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
-+
-+ This library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Library General Public
-+ License as published by the Free Software Foundation; either
-+ version 2 of the License, or (at your option) any later version.
-+
-+ This library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Library General Public License for more details.
-+
-+ You should have received a copy of the GNU Library General Public License
-+ along with this library; see the file COPYING.LIB. If not, write to
-+ the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+ Boston, MA 02111-1307, USA.
-+*/
-+
-+#include "part.h"
-+
-+using namespace KPIM;
-+
-+Part::Part( QObject *parent, const char *name )
-+ : KParts::ReadOnlyPart( parent, name )
-+{
-+}
-+
-+Part::~Part()
-+{
-+}
-+
-+#include "part.moc"
-diff -uNr /home/fiam/kdepim-3.3.0.orig/libkdepim/part.h ./libkdepim/part.h
---- /home/fiam/kdepim-3.3.0.orig/libkdepim/part.h 1970-01-01 01:00:00.000000000 +0100
-+++ ./libkdepim/part.h 2004-09-11 14:27:58.798694872 +0200
-@@ -0,0 +1,51 @@
-+/*
-+ This file is part of libkdepim.
-+
-+ Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
-+
-+ This library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Library General Public
-+ License as published by the Free Software Foundation; either
-+ version 2 of the License, or (at your option) any later version.
-+
-+ This library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Library General Public License for more details.
-+
-+ You should have received a copy of the GNU Library General Public License
-+ along with this library; see the file COPYING.LIB. If not, write to
-+ the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+ Boston, MA 02111-1307, USA.
-+*/
-+
-+#ifndef KPIM_PART_H
-+#define KPIM_PART_H
-+
-+#include <kparts/part.h>
-+
-+namespace KPIM {
-+
-+/**
-+ This special part should be used as base class for all applications
-+ which shall be integrated in Kontact.
-+ */
-+class Part : public KParts::ReadOnlyPart
-+{
-+ Q_OBJECT
-+
-+ public:
-+ Part( QObject *parent, const char *name );
-+ virtual ~Part();
-+
-+ signals:
-+ /**
-+ Emit this signal whenever the plugin with this part shall be
-+ raised inside Kontact.
-+ */
-+ void raise();
-+};
-+
-+}
-+
-+#endif
diff --git a/kde-base/kdepim/files/kmfilter.cpp.patch b/kde-base/kdepim/files/kmfilter.cpp.patch
deleted file mode 100644
index 8206264ecd2a..000000000000
--- a/kde-base/kdepim/files/kmfilter.cpp.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Index: kmfilter.cpp
-===================================================================
-RCS file: /home/kde/kdepim/kmail/kmfilter.cpp,v
-retrieving revision 1.58
-diff -u -3 -p -r1.58 kmfilter.cpp
---- kmail/kmfilter.cpp 29 Nov 2003 15:46:43 -0000 1.58
-+++ kmail/kmfilter.cpp 4 Feb 2004 16:16:01 -0000
-@@ -147,9 +147,18 @@ void KMFilter::readConfig(KConfig* confi
- // that the pattern is purified.
- mPattern.readConfig(config);
-
-- if (bPopFilter)
-+ if (bPopFilter) {
- // get the action description...
-- mAction = (KMPopFilterAction) config->readNumEntry( "action" );
-+ QString action = config->readEntry( "action" );
-+ if ( action == "down" )
-+ mAction = Down;
-+ else if ( action == "later" )
-+ mAction = Later;
-+ else if ( action == "delete" )
-+ mAction = Delete;
-+ else
-+ mAction = NoAction;
-+ }
- else {
- QStringList sets = config->readListEntry("apply-on");
- if ( sets.isEmpty() && !config->hasKey("apply-on") ) {
-@@ -210,7 +219,19 @@ void KMFilter::writeConfig(KConfig* conf
- mPattern.writeConfig(config);
-
- if (bPopFilter) {
-- config->writeEntry( "action", mAction );
-+ switch ( mAction ) {
-+ case Down:
-+ config->writeEntry( "action", "down" );
-+ break;
-+ case Later:
-+ config->writeEntry( "action", "later" );
-+ break;
-+ case Delete:
-+ config->writeEntry( "action", "delete" );
-+ break;
-+ default:
-+ config->writeEntry( "action", "" );
-+ }
- } else {
- QStringList sets;
- if ( bApplyOnInbound )
diff --git a/kde-base/kdepim/files/kpilot-parallel-make-fix.patch b/kde-base/kdepim/files/kpilot-parallel-make-fix.patch
deleted file mode 100644
index c7a7c7bdf24d..000000000000
--- a/kde-base/kdepim/files/kpilot-parallel-make-fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- kpilot/conduits/vcalconduit/Makefile.am.orig 2004-03-09 17:14:39.000000000 -0500
-+++ kpilot/conduits/vcalconduit/Makefile.am 2004-03-09 17:16:32.000000000 -0500
-@@ -26,12 +26,14 @@
- conduit_vcal_la_LIBADD = ../../lib/libkpilot.la \
- ../../../libkcal/libkcal.la \
- libvcalconduit_shared.la
-+conduit_vcal_la_COMPILE_FIRST = korganizerConduit.h
-
- conduit_todo_la_SOURCES = todo-factory.cc todo-setup.cc todo-conduit.cc
- conduit_todo_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
- conduit_todo_la_LIBADD = ../../lib/libkpilot.la \
- ../../../libkcal/libkcal.la \
- libvcalconduit_shared.la
-+conduit_todo_la_COMPILE_FIRST = korganizerConduit.h
-
- libvcalconduit_shared_la_SOURCES = korganizerConduit.ui \
- vcal-factorybase.cc \
diff --git a/kde-base/kdepim/kdepim-3.2.0-r2.ebuild b/kde-base/kdepim/kdepim-3.2.0-r2.ebuild
deleted file mode 100644
index 89abca9b0375..000000000000
--- a/kde-base/kdepim/kdepim-3.2.0-r2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.2.0-r2.ebuild,v 1.13 2005/01/23 20:04:19 corsair Exp $
-
-inherit kde-dist
-
-DESCRIPTION="KDE PIM (Personal Information Management) apps: korganizer, kmail, knode..."
-
-KEYWORDS="x86 ppc sparc hppa amd64 alpha ia64"
-IUSE="pda crypt ldap"
-
-DEPEND="~kde-base/kdenetwork-${PV}
- pda? ( app-pda/pilot-link dev-libs/libmal )
- ldap? ( net-nds/openldap )
- crypt? ( app-crypt/cryptplug app-crypt/gnupg )"
-
-PATCHES="${FILESDIR}/KMail-inboxEater-BRANCH.diff ${FILESDIR}/kmfilter.cpp.patch"
-
-src_compile() {
- use pda && myconf="$myconf --with-extra-includes=/usr/include/libpisock"
- kde_src_compile
-}
-
-src_install() {
- kde_src_install
- docinto html
- dodoc *.html
-}
diff --git a/kde-base/kdepim/kdepim-3.2.2.ebuild b/kde-base/kdepim/kdepim-3.2.2.ebuild
deleted file mode 100644
index 5ea179274bfd..000000000000
--- a/kde-base/kdepim/kdepim-3.2.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.2.2.ebuild,v 1.10 2005/01/23 20:04:19 corsair Exp $
-
-inherit kde-dist eutils
-
-DESCRIPTION="KDE PIM (Personal Information Management) apps: korganizer, kmail, knode..."
-
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ~ia64"
-IUSE="pda crypt ldap cjk"
-
-DEPEND="~kde-base/kdenetwork-${PV}
- pda? ( app-pda/pilot-link dev-libs/libmal )
- ldap? ( net-nds/openldap )
- crypt? ( app-crypt/cryptplug app-crypt/gnupg )"
-
-src_unpack() {
- kde_src_unpack
- cd ${S}
- use cjk && epatch ${FILESDIR}/kdepim-3.2.3-cjk.diff
-}
-
-src_compile() {
- use pda && myconf="$myconf --with-extra-includes=/usr/include/libpisock"
- kde_src_compile
-}
-
-src_install() {
- kde_src_install
- docinto html
- dodoc *.html
-}
diff --git a/kde-base/kdepim/kdepim-3.3.0-r1.ebuild b/kde-base/kdepim/kdepim-3.3.0-r1.ebuild
deleted file mode 100644
index 7e2597b9f204..000000000000
--- a/kde-base/kdepim/kdepim-3.3.0-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.3.0-r1.ebuild,v 1.11 2005/01/23 20:04:19 corsair Exp $
-
-inherit kde-dist eutils
-
-DESCRIPTION="KDE PIM (Personal Information Management) apps: korganizer, kmail, knode..."
-
-KEYWORDS="x86 amd64 ppc64 sparc ppc hppa"
-IUSE="crypt gnokii pda cjk"
-
-DEPEND="pda? ( app-pda/pilot-link dev-libs/libmal )
- gnokii? ( x86? ( net-dialup/gnokii ) )
- crypt? ( >=app-crypt/gpgme-0.9.0-r1 )"
-
-src_unpack() {
- kde_src_unpack
- epatch ${FILESDIR}/kdepim-3.3.0-korganizer.patch
- epatch ${FILESDIR}/kdepim-3.3.0-spam-assistant.patch
- use cjk && epatch ${FILESDIR}/kdepim-3.2.3-cjk.diff
- make -f admin/Makefile.common
-}
diff --git a/kde-base/kdepim/kdepim-3.3.0.ebuild b/kde-base/kdepim/kdepim-3.3.0.ebuild
deleted file mode 100644
index 7bba6261dbc5..000000000000
--- a/kde-base/kdepim/kdepim-3.3.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.3.0.ebuild,v 1.13 2005/01/23 20:04:19 corsair Exp $
-
-inherit kde-dist eutils
-
-DESCRIPTION="KDE PIM (Personal Information Management) apps: korganizer, kmail, knode..."
-
-KEYWORDS="amd64"
-IUSE="pda crypt cjk"
-
-DEPEND="pda? ( app-pda/pilot-link dev-libs/libmal )
- crypt? ( >=app-crypt/gpgme-0.9.0-r1 )"
-
-src_unpack() {
- kde_src_unpack
- epatch ${FILESDIR}/kdepim-3.3.0-korganizer.patch
- use cjk && epatch ${FILESDIR}/kdepim-3.2.3-cjk.diff
-}
-
-src_compile() {
- kde_src_compile
-}