4 files changed, 8 insertions, 54 deletions

diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index 25cdef56c969..0b646e285978 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	kde-runtime
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/x11/kde4-runtime/distinfo b/x11/kde4-runtime/distinfo
index 8881db821f7f..f185dffd10a6 100644
--- a/x11/kde4-runtime/distinfo
+++ b/x11/kde4-runtime/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kde-runtime-4.8.3.tar.xz) = 289670266a85676de201a3ec7cbf1c4fea995a39ce4aa1e2f6f8146329751971
-SIZE (KDE/kde-runtime-4.8.3.tar.xz) = 5942940
+SHA256 (KDE/kde-runtime-4.8.4.tar.xz) = ac3235ef85cc330fed4660d2d716f26310ac705d1088946fe8d491da5da7523c
+SIZE (KDE/kde-runtime-4.8.4.tar.xz) = 6060492
diff --git a/x11/kde4-runtime/files/patch-git_095a2aa b/x11/kde4-runtime/files/patch-git_095a2aa
deleted file mode 100644
index 59f4d75f5aae..000000000000
--- a/x11/kde4-runtime/files/patch-git_095a2aa
+++ /dev/null
@@ -1,51 +0,0 @@
-commit 095a2aa48fc6009d2a3ccc57e8543dc40d43e509
-Author: Shaun Reich <shaun.reich@kdemail.net>
-Date:   Fri May 4 16:54:36 2012 -0400
-
-    fix build errors with CLANG/LLVM
-    (cherry picked from commit ac48ea95c7f726b7208b6b6136d97beefe7b06d9)
-
-diff --git a/nepomuk/services/storage/datamanagementmodel.h b/nepomuk/services/storage/datamanagementmodel.h
-index 781fb2c..5d9cbf1 100644
---- nepomuk/services/storage/datamanagementmodel.h
-+++ nepomuk/services/storage/datamanagementmodel.h
-@@ -156,7 +156,7 @@ public Q_SLOTS:
-                         const QString& app,
-                         Nepomuk::StoreIdentificationMode identificationMode = Nepomuk::IdentifyNew,
-                         Nepomuk::StoreResourcesFlags flags = Nepomuk::NoStoreResourcesFlags,
--                        const QHash<QUrl, QVariant>& additionalMetadata = QHash<QUrl, QVariant>() );
-+                        const QHash<QUrl, QVariant>& additionalMetadata = (QHash<QUrl, QVariant>()));
- 
-     /**
-      * Merges two resources into one. Properties from \p resource1
-@@ -188,7 +188,7 @@ public Q_SLOTS:
-                          const QString& userSerialization = QString(),
-                          Nepomuk::StoreIdentificationMode identificationMode = Nepomuk::IdentifyNew,
-                          Nepomuk::StoreResourcesFlags flags = Nepomuk::NoStoreResourcesFlags,
--                         const QHash<QUrl, QVariant>& additionalMetadata = QHash<QUrl, QVariant>());
-+                         const QHash<QUrl, QVariant>& additionalMetadata = (QHash<QUrl, QVariant>()));
- 
-     /**
-      * Describe a set of resources, i.e. retrieve all their properties.
-@@ -204,7 +204,7 @@ public Q_SLOTS:
-     //@}
- 
- private:
--    QUrl createGraph(const QString& app = QString(), const QHash<QUrl, QVariant>& additionalMetadata = QHash<QUrl, QVariant>());
-+    QUrl createGraph(const QString& app = QString(), const QHash<QUrl, QVariant>& additionalMetadata = (QHash<QUrl, QVariant>()));
-     QUrl createGraph(const QString& app, const QMultiHash<QUrl, Soprano::Node>& additionalMetadata);
- 
-     /**
-diff --git a/nepomuk/services/storage/resourcemerger.cpp b/nepomuk/services/storage/resourcemerger.cpp
-index e6f352c..1d49e65 100644
---- nepomuk/services/storage/resourcemerger.cpp
-+++ nepomuk/services/storage/resourcemerger.cpp
-@@ -506,7 +506,7 @@ Soprano::Node Nepomuk::ResourceMerger::resolveUnmappedNode(const Soprano::Node&
-     m_mappings.insert( QUrl(node.toN3()), newUri );
- 
-     // FIXME: trueg: IMHO these statements should instead be added to the list of all statements so there is only one place where anything is actually added to the model
--    Soprano::Node dateTime( Soprano::LiteralValue( QDateTime::currentDateTime() ) );
-+    Soprano::Node dateTime = Soprano::LiteralValue(QDateTime::currentDateTime());
-     m_model->addStatement( newUri, NAO::created(), dateTime, m_graph );
-     m_model->addStatement( newUri, NAO::lastModified(), dateTime, m_graph );
- 
diff --git a/x11/kde4-runtime/pkg-plist b/x11/kde4-runtime/pkg-plist
index de0da900316e..4493f2bd8cca 100644
--- a/x11/kde4-runtime/pkg-plist
+++ b/x11/kde4-runtime/pkg-plist
@@ -577,6 +577,11 @@ share/doc/HTML/en/kcontrol/icons/install-theme.png
 share/doc/HTML/en/kcontrol/icons/main.png
 share/doc/HTML/en/kcontrol/icons/size.png
 share/doc/HTML/en/kcontrol/icons/use-of-icons.png
+share/doc/HTML/en/kcontrol/kcm_ssl/common
+share/doc/HTML/en/kcontrol/kcm_ssl/details.png
+share/doc/HTML/en/kcontrol/kcm_ssl/index.cache.bz2
+share/doc/HTML/en/kcontrol/kcm_ssl/index.docbook
+share/doc/HTML/en/kcontrol/kcm_ssl/module.png
 share/doc/HTML/en/kcontrol/kcmcgi/common
 share/doc/HTML/en/kcontrol/kcmcgi/index.cache.bz2
 share/doc/HTML/en/kcontrol/kcmcgi/index.docbook
@@ -2159,6 +2164,7 @@ share/sounds/KDE-Window-Shade-Up.ogg
 @dirrm share/doc/HTML/en/kcontrol/kcmlaunch
 @dirrm share/doc/HTML/en/kcontrol/kcmcss
 @dirrm share/doc/HTML/en/kcontrol/kcmcgi
+@dirrm share/doc/HTML/en/kcontrol/kcm_ssl
 @dirrm share/doc/HTML/en/kcontrol/icons
 @dirrm share/doc/HTML/en/kcontrol/history
 @dirrm share/doc/HTML/en/kcontrol/filetypes