rm old files

(Portage version: 2.2.0_alpha80/cvs/Linux x86_64)

3 files changed, 6 insertions, 147 deletions

diff --git a/kde-base/kdeplasma-addons/ChangeLog b/kde-base/kdeplasma-addons/ChangeLog
index 99151c2899e3..702c819696bf 100644
--- a/kde-base/kdeplasma-addons/ChangeLog
+++ b/kde-base/kdeplasma-addons/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdeplasma-addons
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog,v 1.112 2011/12/11 18:52:16 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog,v 1.113 2011/12/12 01:12:35 abcd Exp $
+
+  12 Dec 2011; Jonathan Callen <abcd@gentoo.org>
+  -files/kdeplasma-addons-4.4.3-cmake.patch,
+  -files/kdeplasma-addons-4.7.0-grid.patch:
+  rm old files
 
 *kdeplasma-addons-4.7.4 (11 Dec 2011)
 
diff --git a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.4.3-cmake.patch b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.4.3-cmake.patch
deleted file mode 100644
index 589954b9613a..000000000000
--- a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.4.3-cmake.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-Index: applets/CMakeLists.txt
-===================================================================
---- applets/CMakeLists.txt	(revision 1122757)
-+++ applets/CMakeLists.txt	(working copy)
-@@ -15,6 +15,7 @@
- add_subdirectory(calculator)
- add_subdirectory(charselect)
- add_subdirectory(comic)
-+add_subdirectory(dict)
- add_subdirectory(fifteenPuzzle)
- add_subdirectory(fileWatcher)
- add_subdirectory(frame)
-@@ -29,14 +30,21 @@
- add_subdirectory(microblog)
- add_subdirectory(notes)
- add_subdirectory(nowplaying)
-+
- if(LIBATTICA_FOUND)
-   add_subdirectory(opendesktop)
-   add_subdirectory(opendesktop-activities)
- endif(LIBATTICA_FOUND)
-+
- add_subdirectory(pastebin)
- add_subdirectory(previewer)
- add_subdirectory(rememberthemilk)
--add_subdirectory(rssnow)
-+
-+if(KDEPIMLIBS_FOUND)
-+  add_subdirectory(news)
-+  add_subdirectory(rssnow)
-+endif(KDEPIMLIBS_FOUND)
-+
- add_subdirectory(spellcheck)
- add_subdirectory(showdashboard)
- add_subdirectory(timer)
-@@ -47,11 +55,6 @@
- add_subdirectory(weatherstation)
- add_subdirectory(weather)
- 
--if(QT_QTWEBKIT_FOUND)
--  add_subdirectory(dict)
--  add_subdirectory(news)
--endif(QT_QTWEBKIT_FOUND)
--
- if(PHONON_FOUND)
-   add_subdirectory(mediaplayer)
- endif(PHONON_FOUND)
-Index: runners/CMakeLists.txt
-===================================================================
---- runners/CMakeLists.txt	(revision 1122757)
-+++ runners/CMakeLists.txt	(working copy)
-@@ -8,10 +8,9 @@
- add_subdirectory(spellchecker)
- 
- if(KDEPIMLIBS_FOUND)
--add_subdirectory(contacts)
-+   add_subdirectory(contacts)
- endif(KDEPIMLIBS_FOUND)
- 
- if(NOT WIN32)
-- add_subdirectory(konsolesessions)
-+   add_subdirectory(konsolesessions)
- endif(NOT WIN32)
--
-Index: runners/contacts/CMakeLists.txt
-===================================================================
---- runners/contacts/CMakeLists.txt	(revision 1122757)
-+++ runners/contacts/CMakeLists.txt	(working copy)
-@@ -5,7 +5,7 @@
- 
- kde4_add_plugin(krunner_contacts ${krunner_contacts_SRCS})
- target_link_libraries(krunner_contacts ${KDE4_KIO_LIBS} ${KDE4_PLASMA_LIBS}
--${KDE4_KABC_LIBS})
-+${KDEPIMLIBS_KABC_LIBS})
- 
- install(TARGETS krunner_contacts DESTINATION ${PLUGIN_INSTALL_DIR} )
- 
diff --git a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.0-grid.patch b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.0-grid.patch
deleted file mode 100644
index 587295afc895..000000000000
--- a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.0-grid.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-commit 67b5c56e564f5052238bab38342a85e5f4af570b
-Author: Christoph Feck <christoph@maxiom.de>
-Date:   Sat Jul 30 19:15:28 2011 +0200
-
-    Fix assignment operator and add copy constructor
-    
-    This fixes the crash in Grid Desktop and Grouping Desktop.
-    Thanks to Aaron Seigo for investigation and patch review.
-    
-    BUG: 278222
-    FIXED-IN: 4.7.1
-
-diff --git a/containments/groupingdesktop/lib/groupinfo.cpp b/containments/groupingdesktop/lib/groupinfo.cpp
-index 2106cca..c945551 100644
---- a/containments/groupingdesktop/lib/groupinfo.cpp
-+++ b/containments/groupingdesktop/lib/groupinfo.cpp
-@@ -43,6 +43,12 @@ GroupInfo::GroupInfo(const QString &name, const QString &prettyName)
-     d->prettyName = prettyName;
- }
- 
-+GroupInfo::GroupInfo(const GroupInfo &other)
-+          : d(new GroupInfoPrivate())
-+{
-+    *d = *other.d;
-+}
-+
- GroupInfo::~GroupInfo()
- {
-     delete d;
-@@ -78,13 +84,12 @@ QString GroupInfo::icon() const
-     return d->icon;
- }
- 
--GroupInfo GroupInfo::operator=(const GroupInfo &gi)
-+GroupInfo &GroupInfo::operator=(const GroupInfo &gi)
- {
--    GroupInfo g(gi.name(), gi.prettyName());
--    g.setFormFactors(gi.formFactors());
--    g.setIcon(gi.icon());
--
--    return g;
-+    if (this != &gi) {
-+        *d = *gi.d;
-+    }
-+    return *this;
- }
- 
- bool GroupInfo::operator==(const GroupInfo &gi) const
-diff --git a/containments/groupingdesktop/lib/groupinfo.h b/containments/groupingdesktop/lib/groupinfo.h
-index f8cc66f..320c800 100644
---- a/containments/groupingdesktop/lib/groupinfo.h
-+++ b/containments/groupingdesktop/lib/groupinfo.h
-@@ -31,6 +31,7 @@ class GroupInfo
- {
-     public:
-         explicit GroupInfo(const QString &name, const QString &prettyName = QString());
-+        GroupInfo(const GroupInfo &other);
-         ~GroupInfo();
-         void setFormFactors(QSet<Plasma::FormFactor> formFactors);
-         void setIcon(const QString &icon);
-@@ -40,7 +41,7 @@ class GroupInfo
-         QSet<Plasma::FormFactor> formFactors() const;
-         QString icon() const;
- 
--        GroupInfo operator=(const GroupInfo &gi);
-+        GroupInfo &operator=(const GroupInfo &gi);
-         bool operator==(const GroupInfo &gi) const;
-         bool operator<(const GroupInfo &gi) const;
-