Version bump, remove old.

(Portage version: 2.2.0_alpha116/cvs/Linux i686)

4 files changed, 14 insertions, 129 deletions

diff --git a/kde-misc/plasma-applet-daisy/ChangeLog b/kde-misc/plasma-applet-daisy/ChangeLog
index 8cc178c6aa2e..4322d657ba03 100644
--- a/kde-misc/plasma-applet-daisy/ChangeLog
+++ b/kde-misc/plasma-applet-daisy/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-misc/plasma-applet-daisy
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/plasma-applet-daisy/ChangeLog,v 1.7 2012/03/08 12:18:53 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/plasma-applet-daisy/ChangeLog,v 1.8 2012/07/16 09:18:13 johu Exp $
+
+*plasma-applet-daisy-0.0.4.26 (16 Jul 2012)
+
+  16 Jul 2012; Johannes Huber <johu@gentoo.org>
+  +plasma-applet-daisy-0.0.4.26.ebuild,
+  -files/plasma-applet-daisy-0.0.4.25-kde48.patch,
+  -plasma-applet-daisy-0.0.4.25-r1.ebuild, -plasma-applet-daisy-0.0.4.25.ebuild:
+  Version bump, remove old.
 
 *plasma-applet-daisy-0.0.4.25-r1 (08 Mar 2012)
 
@@ -42,4 +50,3 @@
   18 Mar 2010; Dror Levin <spatz@gentoo.org>
   +plasma-applet-daisy-0.0.4.22.ebuild, +metadata.xml:
   Initial import from kde overlay. First version by hwoarang.
-
diff --git a/kde-misc/plasma-applet-daisy/files/plasma-applet-daisy-0.0.4.25-kde48.patch b/kde-misc/plasma-applet-daisy/files/plasma-applet-daisy-0.0.4.25-kde48.patch
deleted file mode 100644
index 186ec02adaae..000000000000
--- a/kde-misc/plasma-applet-daisy/files/plasma-applet-daisy-0.0.4.25-kde48.patch
+++ /dev/null
@@ -1,107 +0,0 @@
---- applet/src/daisy.h
-+++ applet/src/daisy.h
-@@ -102,8 +102,8 @@
- #include <taskmanager/taskitem.h>
- #include <taskmanager/groupmanager.h>
- #include <taskmanager/startup.h>
--using TaskManager::TaskPtr;
--using TaskManager::StartupPtr;
-+using TaskManager::Task;
-+using TaskManager::Startup;
- using TaskManager::GroupManager;
- 
- 
-@@ -337,7 +337,7 @@
-     bool checkLock();
-     
-     void checkAttention( KWindowInfo taskInfo, QString widclass_tmp );
--    void createTaskThumbnail( TaskPtr task_tmp, int j );
-+    void createTaskThumbnail( Task* task_tmp, int j );
-     void scrollTasks(int delta);
-     
-     
-@@ -418,7 +418,7 @@
-     QSizeF m_hoversz;
-     
-     
--    TaskPtr m_task;
-+    Task* m_task;
-     GroupManager *m_groupManager;
-     
-     
-@@ -512,8 +512,8 @@
-   private slots:
-     
-     
--    void startupAdded(StartupPtr startupItem);
--    void startupRemoved(StartupPtr startupItem);
-+    void startupAdded(Startup* startupItem);
-+    void startupRemoved(Startup* startupItem);
-     
-     
-     void windowAdded(WId id);
---- applet/src/daisyTasks.cpp
-+++ applet/src/daisyTasks.cpp
-@@ -159,7 +159,7 @@
- //-----------------------------------------------------------------------------
- // Startup added
- //FIXME
--void daisy::startupAdded(StartupPtr startupItem)
-+void daisy::startupAdded(Startup* startupItem)
- {
-   
-   m_startingwindow = -1;
-@@ -195,7 +195,7 @@
- //-----------------------------------------------------------------------------
- // Startup removed
- //FIXME
--void daisy::startupRemoved(StartupPtr startupItem)
-+void daisy::startupRemoved(Startup* startupItem)
- {
-   
-   Q_UNUSED(startupItem);
-@@ -218,7 +218,7 @@
-   
-   KWindowInfo taskInfo = KWindowSystem::windowInfo( id, NET::WMName | NET::WMVisibleName | NET::WMVisibleIconName | NET::WMState | NET::XAWMState | NET::WMDesktop, NET::WM2WindowClass );
-   
--  TaskPtr task_tmp = TaskManager::TaskManager::self()->findTask( id );
-+  Task* task_tmp = TaskManager::TaskManager::self()->findTask( id );
-   
-   
-   if (  m_alias.indexOf( taskInfo.windowClassName() ) != -1 || m_alias.indexOf( QString(taskInfo.windowClassClass().toLower()) ) != -1 )
-@@ -372,7 +372,7 @@
-     KWindowInfo taskInfo = KWindowSystem::windowInfo( *it, NET::WMName | NET::WMVisibleName | NET::WMVisibleIconName | NET::WMState | NET::XAWMState | NET::WMDesktop | NET::WMWindowType, NET::WM2WindowClass );
-     
-     
--    TaskPtr task_tmp = TaskManager::TaskManager::self()->findTask( *it );
-+    Task* task_tmp = TaskManager::TaskManager::self()->findTask( *it );
-     if ( task_tmp && *it == KWindowSystem::activeWindow() )
-     {m_focusedWindow = *it;}
-     
-@@ -478,7 +478,7 @@
- //-----------------------------------------------------------------------------
- // Create task thumbnail
- //FIXME
--void daisy::createTaskThumbnail( TaskPtr task_tmp, int j )
-+void daisy::createTaskThumbnail( Task* task_tmp, int j )
- {
-   QIcon thumbnail;
-   //thumbnail = QIcon( QPixmap::grabWindow ( task_tmp->win(), 0, 0, -1, -1 ) );//This would suck
-@@ -714,7 +714,7 @@
-   KWindowInfo taskInfo = KWindowSystem::windowInfo( m_focusedWindow, NET::WMState, NET::WM2WindowClass );
-   for (it = taskDict.begin(); it != taskDict.end(); ++it )
-   {
--    TaskPtr task_tmp = TaskManager::TaskManager::self()->findTask( *it );
-+    Task* task_tmp = TaskManager::TaskManager::self()->findTask( *it );
-     if ( task_tmp ){real_taskDict << *it;}
-   }
-   if (real_taskDict.size() > 0)
-@@ -768,7 +768,7 @@
- void daisy::delayTaskIcoChange(void)
- {
-   m_uti_tmr->stop();
--  TaskPtr task_tmp = TaskManager::TaskManager::self()->findTask( m_toupwid );
-+  Task* task_tmp = TaskManager::TaskManager::self()->findTask( m_toupwid );
-   if ( task_tmp )
-   {
- //     QIcon thumbnail;
diff --git a/kde-misc/plasma-applet-daisy/plasma-applet-daisy-0.0.4.25.ebuild b/kde-misc/plasma-applet-daisy/plasma-applet-daisy-0.0.4.25.ebuild
deleted file mode 100644
index a1c48f21d31a..000000000000
--- a/kde-misc/plasma-applet-daisy/plasma-applet-daisy-0.0.4.25.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/plasma-applet-daisy/plasma-applet-daisy-0.0.4.25.ebuild,v 1.4 2012/03/08 12:18:53 johu Exp $
-
-EAPI=4
-
-inherit kde4-base
-
-DESCRIPTION="Simple application launcher for KDE 4's plasma desktop"
-HOMEPAGE="http://cdlszm.org/"
-SRC_URI="http://cdlszm.org/downloads/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
diff --git a/kde-misc/plasma-applet-daisy/plasma-applet-daisy-0.0.4.25-r1.ebuild b/kde-misc/plasma-applet-daisy/plasma-applet-daisy-0.0.4.26.ebuild
index 24d7ec7a9aa9..12f8b66df59b 100644
--- a/kde-misc/plasma-applet-daisy/plasma-applet-daisy-0.0.4.25-r1.ebuild
+++ b/kde-misc/plasma-applet-daisy/plasma-applet-daisy-0.0.4.26.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/plasma-applet-daisy/plasma-applet-daisy-0.0.4.25-r1.ebuild,v 1.1 2012/03/08 12:18:53 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/plasma-applet-daisy/plasma-applet-daisy-0.0.4.26.ebuild,v 1.1 2012/07/16 09:18:13 johu Exp $
 
 EAPI=4
 
 KDE_MINIMAL="4.8"
+KDE_LINGUAS_DIR="applet/po"
+KDE_LINGUAS="bs de el fr hu it pl pt ru sr tr"
 inherit kde4-base
 
 DESCRIPTION="Simple application launcher for KDE 4's plasma desktop"
@@ -16,6 +18,5 @@ SLOT="4"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
-PATCHES=(
-	"${FILESDIR}/${P}-kde48.patch"
-)
+DEPEND="$(add_kdebase_dep libtaskmanager)"
+RDEPEND="${DEPEND}"