From 588fad3f4ac69a1234341ffd3c2b3cd2b1d020c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@parabola.nu>
Date: Wed, 3 Sep 2014 06:57:55 -0300
Subject: kde packages: remove libre and nonprism suffixes, add complex pkgrel

---
 nonprism/kde-meta-nonprism/PKGBUILD                | 115 -------------
 nonprism/kde-meta/PKGBUILD                         | 113 +++++++++++++
 nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD |  68 --------
 .../kdenetwork-kopete.install                      |  12 --
 .../kdenetwork.install                             |  11 --
 .../libre-nonprism.patch                           | 110 -------------
 nonprism/kdenetwork-kopete/PKGBUILD                |  66 ++++++++
 .../kdenetwork-kopete/kdenetwork-kopete.install    |  12 ++
 nonprism/kdenetwork-kopete/kdenetwork.install      |  11 ++
 nonprism/kdenetwork-kopete/libre-nonprism.patch    | 110 +++++++++++++
 nonprism/kdepim-nonprism/PKGBUILD                  | 183 ---------------------
 nonprism/kdepim-nonprism/kdepim-akregator.install  |  12 --
 .../kdepim-nonprism/kdepim-kaddressbook.install    |  12 --
 nonprism/kdepim-nonprism/kdepim-kmail.install      |  12 --
 nonprism/kdepim-nonprism/kdepim-knode.install      |  12 --
 nonprism/kdepim-nonprism/kdepim-korganizer.install |  12 --
 nonprism/kdepim-nonprism/kdepim.install            |  11 --
 nonprism/kdepim-runtime-nonprism/PKGBUILD          |  39 -----
 .../kdepim-runtime-nonprism/kdepim-runtime.install |  13 --
 nonprism/kdepim-runtime/PKGBUILD                   |  37 +++++
 nonprism/kdepim-runtime/kdepim-runtime.install     |  13 ++
 nonprism/kdepim/PKGBUILD                           | 175 ++++++++++++++++++++
 nonprism/kdepim/kdepim-akregator.install           |  12 ++
 nonprism/kdepim/kdepim-kaddressbook.install        |  12 ++
 nonprism/kdepim/kdepim-kmail.install               |  12 ++
 nonprism/kdepim/kdepim-knode.install               |  12 ++
 nonprism/kdepim/kdepim-korganizer.install          |  12 ++
 nonprism/kdepim/kdepim.install                     |  11 ++
 28 files changed, 608 insertions(+), 622 deletions(-)
 delete mode 100644 nonprism/kde-meta-nonprism/PKGBUILD
 create mode 100644 nonprism/kde-meta/PKGBUILD
 delete mode 100644 nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD
 delete mode 100644 nonprism/kdenetwork-kopete-libre-nonprism/kdenetwork-kopete.install
 delete mode 100644 nonprism/kdenetwork-kopete-libre-nonprism/kdenetwork.install
 delete mode 100644 nonprism/kdenetwork-kopete-libre-nonprism/libre-nonprism.patch
 create mode 100644 nonprism/kdenetwork-kopete/PKGBUILD
 create mode 100644 nonprism/kdenetwork-kopete/kdenetwork-kopete.install
 create mode 100644 nonprism/kdenetwork-kopete/kdenetwork.install
 create mode 100644 nonprism/kdenetwork-kopete/libre-nonprism.patch
 delete mode 100644 nonprism/kdepim-nonprism/PKGBUILD
 delete mode 100644 nonprism/kdepim-nonprism/kdepim-akregator.install
 delete mode 100644 nonprism/kdepim-nonprism/kdepim-kaddressbook.install
 delete mode 100644 nonprism/kdepim-nonprism/kdepim-kmail.install
 delete mode 100644 nonprism/kdepim-nonprism/kdepim-knode.install
 delete mode 100644 nonprism/kdepim-nonprism/kdepim-korganizer.install
 delete mode 100644 nonprism/kdepim-nonprism/kdepim.install
 delete mode 100644 nonprism/kdepim-runtime-nonprism/PKGBUILD
 delete mode 100644 nonprism/kdepim-runtime-nonprism/kdepim-runtime.install
 create mode 100644 nonprism/kdepim-runtime/PKGBUILD
 create mode 100644 nonprism/kdepim-runtime/kdepim-runtime.install
 create mode 100644 nonprism/kdepim/PKGBUILD
 create mode 100644 nonprism/kdepim/kdepim-akregator.install
 create mode 100644 nonprism/kdepim/kdepim-kaddressbook.install
 create mode 100644 nonprism/kdepim/kdepim-kmail.install
 create mode 100644 nonprism/kdepim/kdepim-knode.install
 create mode 100644 nonprism/kdepim/kdepim-korganizer.install
 create mode 100644 nonprism/kdepim/kdepim.install

(limited to 'nonprism')

diff --git a/nonprism/kde-meta-nonprism/PKGBUILD b/nonprism/kde-meta-nonprism/PKGBUILD
deleted file mode 100644
index 71ae7d6c6..000000000
--- a/nonprism/kde-meta-nonprism/PKGBUILD
+++ /dev/null
@@ -1,115 +0,0 @@
-# $Id: PKGBUILD 208325 2014-03-21 13:57:48Z andrea $
-# Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
-# Contributor (Arch): Pierre Schmitz <pierre@archlinux.de>
-# Maintainer: André Silva <emulatorman@parabola.nu>
-
-pkgbase=kde-meta
-pkgname=('kde-meta-kdepim-nonprism'
-         'kde-meta-kdeplasma-addons-nonprism')
-pkgver=4.13
-pkgrel=3.1
-arch=('any')
-url='http://parabolagnulinux.org/'
-license=('GPL')
-groups=('kde-meta')
-
-package_kde-meta-kdepim-nonprism() {
-	pkgdesc=('Meta package for kdepim, with nonprism packages included and kdepim-blogilo removed')
-	depends=('kdepim-akonadiconsole-nonprism'
-	         'kdepim-akregator'
-	         'kdepim-console'
-	         'kdepim-kaddressbook-nonprism'
-	         'kdepim-kalarm'
-	         'kdepim-kjots-nonprism'
-	         'kdepim-kleopatra'
-	         'kdepim-kmail-nonprism'
-	         'kdepim-knode-nonprism'
-	         'kdepim-knotes-nonprism'
-	         'kdepim-kontact'
-	         'kdepim-korganizer-nonprism'
-	         'kdepim-kresources'
-	         'kdepim-ktimetracker'
-	         'kdepim-ktnef')
-	replaces=('kdepim' 'kde-meta-kdepim')
-	conflicts=('kdepim' 'kde-meta-kdepim')
-	provides=(kde-meta-kdepim=$pkgver)
-}
-
-package_kde-meta-kdeplasma-addons-nonprism() {
-	pkgdesc=('Meta package for kdeplasma-addons, without kdeplasma-addons-runners-translator')
-	depends=('kdeplasma-addons-applets-bball'
-	         'kdeplasma-addons-applets-binary-clock'
-	         'kdeplasma-addons-applets-blackboard'
-	         'kdeplasma-addons-applets-bookmarks'
-	         'kdeplasma-addons-applets-bubblemon'
-	         'kdeplasma-addons-applets-calculator'
-	         'kdeplasma-addons-applets-charselect'
-	         'kdeplasma-addons-applets-comic'
-	         'kdeplasma-addons-applets-community'
-	         'kdeplasma-addons-applets-dict'
-	         'kdeplasma-addons-applets-eyes'
-	         'kdeplasma-addons-applets-fifteenpuzzle'
-	         'kdeplasma-addons-applets-filewatcher'
-	         'kdeplasma-addons-applets-frame'
-	         'kdeplasma-addons-applets-fuzzy-clock'
-	         'kdeplasma-addons-applets-icontasks'
-	         'kdeplasma-addons-applets-incomingmsg'
-	         'kdeplasma-addons-applets-kimpanel'
-	         'kdeplasma-addons-applets-knowledgebase'
-	         'kdeplasma-addons-applets-kolourpicker'
-	         'kdeplasma-addons-applets-konqprofiles'
-	         'kdeplasma-addons-applets-konsoleprofiles'
-	         'kdeplasma-addons-applets-lancelot'
-	         'kdeplasma-addons-applets-leavenote'
-	         'kdeplasma-addons-applets-life'
-	         'kdeplasma-addons-applets-luna'
-	         'kdeplasma-addons-applets-magnifique'
-	         'kdeplasma-addons-applets-mediaplayer'
-	         'kdeplasma-addons-applets-microblog'
-	         'kdeplasma-addons-applets-news'
-	         'kdeplasma-addons-applets-notes'
-	         'kdeplasma-addons-applets-nowplaying'
-	         'kdeplasma-addons-applets-paste'
-	         'kdeplasma-addons-applets-pastebin'
-	         'kdeplasma-addons-applets-plasmaboard'
-	         'kdeplasma-addons-applets-previewer'
-	         'kdeplasma-addons-applets-qalculate'
-	         'kdeplasma-addons-applets-rememberthemilk'
-	         'kdeplasma-addons-applets-rssnow'
-	         'kdeplasma-addons-applets-showdashboard'
-	         'kdeplasma-addons-applets-showdesktop'
-	         'kdeplasma-addons-applets-social-news'
-	         'kdeplasma-addons-applets-spellcheck'
-	         'kdeplasma-addons-applets-systemloadviewer'
-	         'kdeplasma-addons-applets-timer'
-	         'kdeplasma-addons-applets-unitconverter'
-	         'kdeplasma-addons-applets-weather'
-	         'kdeplasma-addons-applets-weatherstation'
-	         'kdeplasma-addons-applets-webslice'
-	         'kdeplasma-addons-containments'
-	         'kdeplasma-addons-runners-audioplayercontrol'
-	         'kdeplasma-addons-runners-browserhistory'
-	         'kdeplasma-addons-runners-characters'
-	         'kdeplasma-addons-runners-contacts'
-	         'kdeplasma-addons-runners-converter'
-	         'kdeplasma-addons-runners-datetime'
-	         'kdeplasma-addons-runners-dictionary'
-	         'kdeplasma-addons-runners-events'
-	         'kdeplasma-addons-runners-katesessions'
-	         'kdeplasma-addons-runners-konquerorsessions'
-	         'kdeplasma-addons-runners-konsolesessions'
-	         'kdeplasma-addons-runners-kopete'
-	         'kdeplasma-addons-runners-mediawiki'
-	         'kdeplasma-addons-runners-spellchecker'
-	         'kdeplasma-addons-runners-youtube'
-	         'kdeplasma-addons-wallpapers-mandelbrot'
-	         'kdeplasma-addons-wallpapers-marble'
-	         'kdeplasma-addons-wallpapers-pattern'
-	         'kdeplasma-addons-wallpapers-potd'
-	         'kdeplasma-addons-wallpapers-qmlwallpapers'
-	         'kdeplasma-addons-wallpapers-virus'
-	         'kdeplasma-addons-wallpapers-weather')
-	replaces=('kdeplasma-addons' 'kde-meta-kdeplasma-addons')
-	conflicts=('kdeplasma-addons' 'kde-meta-kdeplasma-addons')
-	provides=(kde-meta-kdeplasma-addons=$pkgver)
-}
diff --git a/nonprism/kde-meta/PKGBUILD b/nonprism/kde-meta/PKGBUILD
new file mode 100644
index 000000000..96419a7cb
--- /dev/null
+++ b/nonprism/kde-meta/PKGBUILD
@@ -0,0 +1,113 @@
+# $Id: PKGBUILD 208325 2014-03-21 13:57:48Z andrea $
+# Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
+# Contributor (Arch): Pierre Schmitz <pierre@archlinux.de>
+# Maintainer: André Silva <emulatorman@parabola.nu>
+
+pkgbase=kde-meta
+pkgname=('kde-meta-kdepim'
+         'kde-meta-kdeplasma-addons')
+pkgver=4.13
+pkgrel=3.nonprism1
+arch=('any')
+url='http://parabolagnulinux.org/'
+license=('GPL')
+groups=('kde-meta')
+
+package_kde-meta-kdepim() {
+	pkgdesc=('Meta package for kdepim, without kdepim-blogilo')
+	depends=('kdepim-akonadiconsole'
+	         'kdepim-akregator'
+	         'kdepim-console'
+	         'kdepim-kaddressbook'
+	         'kdepim-kalarm'
+	         'kdepim-kjots'
+	         'kdepim-kleopatra'
+	         'kdepim-kmail'
+	         'kdepim-knode'
+	         'kdepim-knotes'
+	         'kdepim-kontact'
+	         'kdepim-korganizer'
+	         'kdepim-kresources'
+	         'kdepim-ktimetracker'
+	         'kdepim-ktnef')
+	replaces=('kdepim' 'kde-meta-kdepim-nonprism')
+	conflicts=('kdepim' 'kde-meta-kdepim-nonprism')
+}
+
+package_kde-meta-kdeplasma-addons() {
+	pkgdesc=('Meta package for kdeplasma-addons, without kdeplasma-addons-runners-translator')
+	depends=('kdeplasma-addons-applets-bball'
+	         'kdeplasma-addons-applets-binary-clock'
+	         'kdeplasma-addons-applets-blackboard'
+	         'kdeplasma-addons-applets-bookmarks'
+	         'kdeplasma-addons-applets-bubblemon'
+	         'kdeplasma-addons-applets-calculator'
+	         'kdeplasma-addons-applets-charselect'
+	         'kdeplasma-addons-applets-comic'
+	         'kdeplasma-addons-applets-community'
+	         'kdeplasma-addons-applets-dict'
+	         'kdeplasma-addons-applets-eyes'
+	         'kdeplasma-addons-applets-fifteenpuzzle'
+	         'kdeplasma-addons-applets-filewatcher'
+	         'kdeplasma-addons-applets-frame'
+	         'kdeplasma-addons-applets-fuzzy-clock'
+	         'kdeplasma-addons-applets-icontasks'
+	         'kdeplasma-addons-applets-incomingmsg'
+	         'kdeplasma-addons-applets-kimpanel'
+	         'kdeplasma-addons-applets-knowledgebase'
+	         'kdeplasma-addons-applets-kolourpicker'
+	         'kdeplasma-addons-applets-konqprofiles'
+	         'kdeplasma-addons-applets-konsoleprofiles'
+	         'kdeplasma-addons-applets-lancelot'
+	         'kdeplasma-addons-applets-leavenote'
+	         'kdeplasma-addons-applets-life'
+	         'kdeplasma-addons-applets-luna'
+	         'kdeplasma-addons-applets-magnifique'
+	         'kdeplasma-addons-applets-mediaplayer'
+	         'kdeplasma-addons-applets-microblog'
+	         'kdeplasma-addons-applets-news'
+	         'kdeplasma-addons-applets-notes'
+	         'kdeplasma-addons-applets-nowplaying'
+	         'kdeplasma-addons-applets-paste'
+	         'kdeplasma-addons-applets-pastebin'
+	         'kdeplasma-addons-applets-plasmaboard'
+	         'kdeplasma-addons-applets-previewer'
+	         'kdeplasma-addons-applets-qalculate'
+	         'kdeplasma-addons-applets-rememberthemilk'
+	         'kdeplasma-addons-applets-rssnow'
+	         'kdeplasma-addons-applets-showdashboard'
+	         'kdeplasma-addons-applets-showdesktop'
+	         'kdeplasma-addons-applets-social-news'
+	         'kdeplasma-addons-applets-spellcheck'
+	         'kdeplasma-addons-applets-systemloadviewer'
+	         'kdeplasma-addons-applets-timer'
+	         'kdeplasma-addons-applets-unitconverter'
+	         'kdeplasma-addons-applets-weather'
+	         'kdeplasma-addons-applets-weatherstation'
+	         'kdeplasma-addons-applets-webslice'
+	         'kdeplasma-addons-containments'
+	         'kdeplasma-addons-runners-audioplayercontrol'
+	         'kdeplasma-addons-runners-browserhistory'
+	         'kdeplasma-addons-runners-characters'
+	         'kdeplasma-addons-runners-contacts'
+	         'kdeplasma-addons-runners-converter'
+	         'kdeplasma-addons-runners-datetime'
+	         'kdeplasma-addons-runners-dictionary'
+	         'kdeplasma-addons-runners-events'
+	         'kdeplasma-addons-runners-katesessions'
+	         'kdeplasma-addons-runners-konquerorsessions'
+	         'kdeplasma-addons-runners-konsolesessions'
+	         'kdeplasma-addons-runners-kopete'
+	         'kdeplasma-addons-runners-mediawiki'
+	         'kdeplasma-addons-runners-spellchecker'
+	         'kdeplasma-addons-runners-youtube'
+	         'kdeplasma-addons-wallpapers-mandelbrot'
+	         'kdeplasma-addons-wallpapers-marble'
+	         'kdeplasma-addons-wallpapers-pattern'
+	         'kdeplasma-addons-wallpapers-potd'
+	         'kdeplasma-addons-wallpapers-qmlwallpapers'
+	         'kdeplasma-addons-wallpapers-virus'
+	         'kdeplasma-addons-wallpapers-weather')
+	replaces=('kdeplasma-addons' 'kde-meta-kdeplasma-addons-nonprism')
+	conflicts=('kdeplasma-addons' 'kde-meta-kdeplasma-addons-nonprism')
+}
diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD b/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD
deleted file mode 100644
index 60af2de58..000000000
--- a/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD
+++ /dev/null
@@ -1,68 +0,0 @@
-# $Id: PKGBUILD 217314 2014-07-18 11:45:55Z svenstaro $
-# Maintainer (Arch): Andrea Scarpino <andrea@archlinux.org>
-# Maintainer: André Silva <emulatorman@parabola.nu>
-
-_pkgname=kdenetwork-kopete
-pkgname=kdenetwork-kopete-libre-nonprism
-pkgver=4.14.0
-pkgrel=1
-pkgdesc='Instant Messenger, without nonfree Skype support and support for unsafe and dangerous for privacy protocols'
-url='http://kde.org/applications/internet/kopete/'
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdenetwork')
-replaces=($_pkgname)
-conflicts=($_pkgname)
-provides=($_pkgname=$pkgver)
-depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'libidn'
-         'qimageblitz' 'mediastreamer' 'jsoncpp')
-makedepends=('cmake' 'automoc4' 'boost' 'kdepim-libkdepim')
-install=${_pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kopete-${pkgver}.tar.xz"
-        'libre-nonprism.patch')
-sha1sums=('bd247af3b25650bedcdb983fc285469dcacea964'
-          'ddde6ed0b6f281512dc12cb80f712f33c6932c92')
-
-prepare() {
-  cd kopete-${pkgver}
-  # Based on http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/make-kdenetwork, revision 34.
-  rm -rv protocols/skype
-  # remove unsafe/dangerous services
-  rm -rv protocols/oscar
-  rm -rv protocols/yahoo
-  rm -rv protocols/qq
-  rm -rv protocols/groupwise
-  rm -rv protocols/gadu
-  rm -rv protocols/wlm
-  rm -rv protocols/meanwhile
-  patch -p1 -i "${srcdir}"/libre-nonprism.patch
-  cd ..
-  mkdir build
-}
-
-build() {
-  cd build
-  cmake ../kopete-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DKDE4_BUILD_TESTS=OFF \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_SKIP_RPATH=ON \
-    -DWITH_Libmsn=OFF \
-    -DWITH_Libgadu=OFF \
-    -DWITH_skype=OFF \
-    -DWITH_oscar=OFF \
-    -DWITH_yahoo=OFF \
-    -DWITH_qq=OFF \
-    -DWITH_groupwise=OFF \
-    -DWITH_gadu=OFF \
-    -DWITH_GOOGLETALK=OFF \
-    -DWITH_wlm=OFF \
-    -DWITH_WLM_MEDIASTREAMER=OFF \
-    -DWITH_meanwhile=OFF
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR=$pkgdir install
-}
diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/kdenetwork-kopete.install b/nonprism/kdenetwork-kopete-libre-nonprism/kdenetwork-kopete.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/nonprism/kdenetwork-kopete-libre-nonprism/kdenetwork-kopete.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/kdenetwork.install b/nonprism/kdenetwork-kopete-libre-nonprism/kdenetwork.install
deleted file mode 100644
index e70c054ec..000000000
--- a/nonprism/kdenetwork-kopete-libre-nonprism/kdenetwork.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/libre-nonprism.patch b/nonprism/kdenetwork-kopete-libre-nonprism/libre-nonprism.patch
deleted file mode 100644
index 6d73766cc..000000000
--- a/nonprism/kdenetwork-kopete-libre-nonprism/libre-nonprism.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-diff --git a/doc/index.docbook b/doc/index.docbook
-index b55fd88..416de49 100644
---- a/doc/index.docbook
-+++ b/doc/index.docbook
-@@ -24,7 +24,6 @@
-   <!ENTITY kopete-chatstyle SYSTEM "chatstyle.docbook">
-   <!ENTITY kopete-pipes SYSTEM "pipes.docbook">
-   <!ENTITY kopete-jabber SYSTEM "jabber.docbook">
--  <!ENTITY kopete-icq SYSTEM "icq.docbook">
- ]>
- <!--
- Intro (1st draft, Will)
-@@ -116,15 +115,7 @@ Appendix: Chat Window Style Guide (1st draft, Michaël)
- <keyword>Messaging</keyword>
- <keyword>Jabber</keyword>
- <keyword>IRC</keyword>
--<keyword>MSN</keyword>
--<keyword>ICQ</keyword>
--<keyword>AIM</keyword>
--<keyword>Yahoo</keyword>
--<keyword>Gadu-Gadu</keyword>
--<keyword>GroupWise</keyword>
--<keyword>Novell</keyword>
- <keyword>WinPopup</keyword>
--<keyword>SMS</keyword>
- </keywordset>
- 
- </bookinfo>
-@@ -178,13 +169,13 @@ Appendix: Chat Window Style Guide (1st draft, Michaël)
- <para>To use &kopete; you need to set up one or more accounts for the instant messaging services you wish to use.</para>
- <para>You've probably already chosen a messaging service, either because you already use &im;, or you need to use the same service as your friends.  If you don't fit into either of these categories, please consider using a messaging service based on open standards, because these are designed for use by Free Software.  Other messaging services are prone to changing the underlying technology without making the details freely available, making them harder for Free Software developers to support.</para>
- <para>The messaging services that &kopete; supports that are based on open standards are Jabber and IRC.</para>
--<para>The following section assumes you are registered with an &im; service already.  If not, you can register with Gadu-Gadu, Jabber, and <trademark>MSN</trademark> from inside &kopete;; for other services, you'll have to register using their respective web site before creating an account in &kopete;.</para>
-+<para>The following section assumes you are registered with an &im; service already.  If not, you can register with Jabber from inside &kopete;; for other services, you'll have to register using their respective web site before creating an account in &kopete;.</para>
- <sect1 id="creating-accounts">
- <title>Creating Accounts</title>
- <para>To create an account, use <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure...</guimenuitem> </menuchoice> to display the Configure window.</para>
- <para>The Configure window is the main way to set up and customize &kopete;.  On the left a column of icons control which aspect of &kopete; is being configured.  Click the <guiicon>Accounts</guiicon> icon.  The main pane will change to display the account management pane.  This is currently empty, but will soon list your &im; accounts.  Click <guibutton>Add Account</guibutton> to display the <interface>Account Wizard</interface>.</para>
- <para>The <interface>Account Wizard</interface> helps you create an &im; account.  On the first page, you are asked to select the messaging service that you'd like to use.  Click one of the services shown and then click <guibutton>Next</guibutton>.  On the following page, you should enter your registration details for that instant messaging service.</para>
--<para>Most services just require you to enter a username or unique identifying number (<acronym>UIN</acronym>) and password.  The special purpose services Winpopup and <acronym>SMS</acronym> work slightly differently, so please see their specific sections.  There are a couple of other options that apply to most services that you should look at:</para>
-+<para>Most services just require you to enter a username or unique identifying number (<acronym>UIN</acronym>) and password.  The special purpose services Winpopup work slightly differently, so please see their specific sections.  There are a couple of other options that apply to most services that you should look at:</para>
- <variablelist>
- <varlistentry><term>Remember password</term><listitem><para>When this is checked, &kopete; will store the password for you, so you don't have to enter it every time you connect to the &im; service.  If you are security-conscious or want to limit access to the &im; account you can leave this unchecked.</para></listitem></varlistentry>
- <varlistentry><term>Connect at startup</term><listitem><para>When this is checked, &kopete; will try to connect to the &im; service as when it starts.  If you use a <acronym>LAN</acronym>, <acronym>DSL</acronym> or other <quote>always-on</quote> connection, this is appropriate; dial-up modem users should turn this off and connect manually when you have dialed up.</para></listitem></varlistentry>
-@@ -260,7 +251,7 @@ Shortcuts...</guimenuitem></menuchoice>.</para></tip>
- <listitem><para>Select Display Name and Group.  Here you can enter a Display Name (the name used for this person inside &kopete;), and choose the <link linkend="organise-contacts-grouping">groups</link> they are a member of.</para></listitem>
- <listitem><para>Select &im; Accounts.  Here you can choose which accounts you want to use to chat to the new contact.  If you only have one &im; account, you won't see this screen.</para></listitem>
- <listitem><para>Account-specific Add Contact Pages.  For each account, you'll get one page where you can enter the <acronym>UIN</acronym>, buddy name or Email address, depending on the &im; system in use.</para></listitem>
--<listitem><para>Finish Screen.  All done.  Except if the &im; system requires authorization (such as <trademark>ICQ</trademark>) to add a contact to your list - in which case, you'll be prompted after the wizard exits.</para></listitem>
-+<listitem><para>Finish Screen.  All done.  Except if the &im; system requires authorization to add a contact to your list - in which case, you'll be prompted after the wizard exits.</para></listitem>
- </orderedlist>
- 
- <para>You can add contacts to an existing Metacontact using its context menu.</para>
-@@ -705,47 +696,17 @@ Shortcuts...</guimenuitem></menuchoice>.</para></tip>
- 	<para>&kopete; calls different &im; systems 'Protocols'.  When you add an account, it is specific to a single protocol.  Although &kopete; tries to make instant messaging appear the same, no matter what protocol you use, there are some differences in the level of support for advanced features such as file transfer and multimedia.</para>
- 	<sect1 id="protocols-list">
- 		<title>Protocols</title>
--		<sect2 id="protocols-aim">
--			<title>AIM</title>
--			<para>AIM supports chatrooms.  Use the <guilabel>Join Chat...</guilabel> command on the AIM account menu to join a chatroom. Contact pictures and custom emoticons are also supported.</para>
--		</sect2>
--		<sect2 id="protocols-icq">
--			<title>ICQ</title>
--			<para>ICQ has an Invisibility feature which allows you to hide from selected contacts.  You may also search the ICQ user folder when adding a contact.  A wide range of contact details can be set using the <guilabel>Properties</guilabel> option.</para>
--		</sect2>
--		<sect2 id="protocols-msn">
--			<title>MSN</title> 
--			<para>File transfer and multi user chats work.  To transfer a file,  drag the file from &konqueror; or the desktop into the chat window.  To invite someone else into a chat, drag them from the Contact List into the chat window.  The <menuchoice><guimenu>File</guimenu></menuchoice> menu also contains these commands.  In addition, MSN supports custom emoticons.</para>
--			<para>To use file transfer, make sure port 6891 is forwarded to your computer.</para>
--		</sect2>
--		<sect2 id="protocols-yahoo">
--			<title>Yahoo</title>
--			<para>Yahoo can send and receive webcam video.  It also supports Yahoo mail and the Yahoo address book from the account menu.  Conferencing is also possible.</para>
--		</sect2>
- 		<sect2 id="protocols-jabber">
- 			<title>Jabber</title>
- 			<para>Jabber, also known as XMPP, supports file transfer, conferencing and any other services supplied by the Jabber server.  For example, many Jabber servers have a user directory, and some provide transports to other messaging systems.  To access services, use <menuchoice><guimenu>Services...</guimenu></menuchoice> on the account menu.  Jabber file transfer can work without port forwarding, but enjoys better performance where a direct connection is possible.  By default, port 8010 is used for port forwarding, but this is configurable in each account's settings.</para>
- 		</sect2>
--		<sect2 id="protocols-gtalk">
--			<title>Google Talk</title>
--			<para>Since Google Talk is based upon Jabber, it is well supported in &kopete; with the exception of voice chat, which is worked upon.</para>
--			<para>To configure &kopete; for Google Talk: Use your complete Google Mail address as the user name.  Check <guilabel>Use protocol encryption (SSL)</guilabel>, <guilabel>Allow plain-text password authentication</guilabel> and <guilabel>Override default server information</guilabel>.  The server is <quote>talk.google.com</quote> or <quote>gmail.com</quote> and ports 443 or 5223 should be used.</para>
--		</sect2>
--		<sect2 id="protocols-groupwise">
--			<title>Novell GroupWise</title>
--			<para>GroupWise Messenger is an enterprise messenging system from Novell Inc.  The full range of features are supported, including privacy, group chat, rich text and user search.</para>
--		</sect2>
--		<sect2 id="protocols-gadu-gadu">
--			<title>Gadu-Gadu</title>
--			<para>Gadu-Gadu is a chat system originating from Poland.  At present, &kopete; supports basic chat functions.</para>
--		</sect2>
- 		<sect2 id="protocols-winpopup">
- 			<title>WinPopup</title>
- 			<para>WinPopup is a way to use &kopete; to send and receive messages with &Windows; computers on the local network.  The WinPopup protocol only supports single, plain-text messages.</para>
- 		</sect2>
- 		<sect2 id="protocols-others">
- 			<title>Other protocols</title>
--			<para>As well as the protocols named above, &kopete; has support for several other protocols.  In most cases, this is not enabled by default or an additional plugin must be installed.  Meanwhile, SMS, Skype and SILC are provided in this way.  See &kopetewww; for details, however, the &kopete; team are not responsible for these protocols.</para>
-+			<para>As well as the protocols named above, &kopete; has support for several other protocols.  In most cases, this is not enabled by default or an additional plugin must be installed.  See &kopetewww; for details, however, the &kopete; team are not responsible for these protocols.</para>
- 		</sect2>
- 	</sect1>
- </chapter>
-@@ -1180,7 +1141,6 @@ Documentation copyright 2003,2004,2005 &Will.Stephenson; (lists at stevello free
- &kopete-chatstyle;
- &kopete-pipes;
- &kopete-jabber;
--&kopete-icq;
- 
- &documentation.index;
- </book>
diff --git a/nonprism/kdenetwork-kopete/PKGBUILD b/nonprism/kdenetwork-kopete/PKGBUILD
new file mode 100644
index 000000000..f9bee6208
--- /dev/null
+++ b/nonprism/kdenetwork-kopete/PKGBUILD
@@ -0,0 +1,66 @@
+# $Id: PKGBUILD 217314 2014-07-18 11:45:55Z svenstaro $
+# Maintainer (Arch): Andrea Scarpino <andrea@archlinux.org>
+# Maintainer: André Silva <emulatorman@parabola.nu>
+
+pkgname=kdenetwork-kopete
+pkgver=4.14.0
+pkgrel=1.parabola1.nonprism1
+pkgdesc='Instant Messenger, without nonfree Skype support and support for unsafe and dangerous for privacy protocols'
+url='http://kde.org/applications/internet/kopete/'
+arch=('i686' 'x86_64' 'mips64el')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdenetwork')
+replaces=(${pkgname}-libre ${pkgname}-libre-nonprism)
+conflicts=(${pkgname}-libre ${pkgname}-libre-nonprism)
+depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'libidn'
+         'qimageblitz' 'mediastreamer' 'jsoncpp')
+makedepends=('cmake' 'automoc4' 'boost' 'kdepim-libkdepim')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/kopete-${pkgver}.tar.xz"
+        'libre-nonprism.patch')
+sha1sums=('bd247af3b25650bedcdb983fc285469dcacea964'
+          'ddde6ed0b6f281512dc12cb80f712f33c6932c92')
+
+prepare() {
+  cd kopete-${pkgver}
+  # Based on http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/make-kdenetwork, revision 34.
+  rm -rv protocols/skype
+  # remove unsafe/dangerous services
+  rm -rv protocols/oscar
+  rm -rv protocols/yahoo
+  rm -rv protocols/qq
+  rm -rv protocols/groupwise
+  rm -rv protocols/gadu
+  rm -rv protocols/wlm
+  rm -rv protocols/meanwhile
+  patch -p1 -i "${srcdir}"/libre-nonprism.patch
+  cd ..
+  mkdir build
+}
+
+build() {
+  cd build
+  cmake ../kopete-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DKDE4_BUILD_TESTS=OFF \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_SKIP_RPATH=ON \
+    -DWITH_Libmsn=OFF \
+    -DWITH_Libgadu=OFF \
+    -DWITH_skype=OFF \
+    -DWITH_oscar=OFF \
+    -DWITH_yahoo=OFF \
+    -DWITH_qq=OFF \
+    -DWITH_groupwise=OFF \
+    -DWITH_gadu=OFF \
+    -DWITH_GOOGLETALK=OFF \
+    -DWITH_wlm=OFF \
+    -DWITH_WLM_MEDIASTREAMER=OFF \
+    -DWITH_meanwhile=OFF
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR=$pkgdir install
+}
diff --git a/nonprism/kdenetwork-kopete/kdenetwork-kopete.install b/nonprism/kdenetwork-kopete/kdenetwork-kopete.install
new file mode 100644
index 000000000..5495fb1b5
--- /dev/null
+++ b/nonprism/kdenetwork-kopete/kdenetwork-kopete.install
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/nonprism/kdenetwork-kopete/kdenetwork.install b/nonprism/kdenetwork-kopete/kdenetwork.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/nonprism/kdenetwork-kopete/kdenetwork.install
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/nonprism/kdenetwork-kopete/libre-nonprism.patch b/nonprism/kdenetwork-kopete/libre-nonprism.patch
new file mode 100644
index 000000000..6d73766cc
--- /dev/null
+++ b/nonprism/kdenetwork-kopete/libre-nonprism.patch
@@ -0,0 +1,110 @@
+diff --git a/doc/index.docbook b/doc/index.docbook
+index b55fd88..416de49 100644
+--- a/doc/index.docbook
++++ b/doc/index.docbook
+@@ -24,7 +24,6 @@
+   <!ENTITY kopete-chatstyle SYSTEM "chatstyle.docbook">
+   <!ENTITY kopete-pipes SYSTEM "pipes.docbook">
+   <!ENTITY kopete-jabber SYSTEM "jabber.docbook">
+-  <!ENTITY kopete-icq SYSTEM "icq.docbook">
+ ]>
+ <!--
+ Intro (1st draft, Will)
+@@ -116,15 +115,7 @@ Appendix: Chat Window Style Guide (1st draft, Michaël)
+ <keyword>Messaging</keyword>
+ <keyword>Jabber</keyword>
+ <keyword>IRC</keyword>
+-<keyword>MSN</keyword>
+-<keyword>ICQ</keyword>
+-<keyword>AIM</keyword>
+-<keyword>Yahoo</keyword>
+-<keyword>Gadu-Gadu</keyword>
+-<keyword>GroupWise</keyword>
+-<keyword>Novell</keyword>
+ <keyword>WinPopup</keyword>
+-<keyword>SMS</keyword>
+ </keywordset>
+ 
+ </bookinfo>
+@@ -178,13 +169,13 @@ Appendix: Chat Window Style Guide (1st draft, Michaël)
+ <para>To use &kopete; you need to set up one or more accounts for the instant messaging services you wish to use.</para>
+ <para>You've probably already chosen a messaging service, either because you already use &im;, or you need to use the same service as your friends.  If you don't fit into either of these categories, please consider using a messaging service based on open standards, because these are designed for use by Free Software.  Other messaging services are prone to changing the underlying technology without making the details freely available, making them harder for Free Software developers to support.</para>
+ <para>The messaging services that &kopete; supports that are based on open standards are Jabber and IRC.</para>
+-<para>The following section assumes you are registered with an &im; service already.  If not, you can register with Gadu-Gadu, Jabber, and <trademark>MSN</trademark> from inside &kopete;; for other services, you'll have to register using their respective web site before creating an account in &kopete;.</para>
++<para>The following section assumes you are registered with an &im; service already.  If not, you can register with Jabber from inside &kopete;; for other services, you'll have to register using their respective web site before creating an account in &kopete;.</para>
+ <sect1 id="creating-accounts">
+ <title>Creating Accounts</title>
+ <para>To create an account, use <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure...</guimenuitem> </menuchoice> to display the Configure window.</para>
+ <para>The Configure window is the main way to set up and customize &kopete;.  On the left a column of icons control which aspect of &kopete; is being configured.  Click the <guiicon>Accounts</guiicon> icon.  The main pane will change to display the account management pane.  This is currently empty, but will soon list your &im; accounts.  Click <guibutton>Add Account</guibutton> to display the <interface>Account Wizard</interface>.</para>
+ <para>The <interface>Account Wizard</interface> helps you create an &im; account.  On the first page, you are asked to select the messaging service that you'd like to use.  Click one of the services shown and then click <guibutton>Next</guibutton>.  On the following page, you should enter your registration details for that instant messaging service.</para>
+-<para>Most services just require you to enter a username or unique identifying number (<acronym>UIN</acronym>) and password.  The special purpose services Winpopup and <acronym>SMS</acronym> work slightly differently, so please see their specific sections.  There are a couple of other options that apply to most services that you should look at:</para>
++<para>Most services just require you to enter a username or unique identifying number (<acronym>UIN</acronym>) and password.  The special purpose services Winpopup work slightly differently, so please see their specific sections.  There are a couple of other options that apply to most services that you should look at:</para>
+ <variablelist>
+ <varlistentry><term>Remember password</term><listitem><para>When this is checked, &kopete; will store the password for you, so you don't have to enter it every time you connect to the &im; service.  If you are security-conscious or want to limit access to the &im; account you can leave this unchecked.</para></listitem></varlistentry>
+ <varlistentry><term>Connect at startup</term><listitem><para>When this is checked, &kopete; will try to connect to the &im; service as when it starts.  If you use a <acronym>LAN</acronym>, <acronym>DSL</acronym> or other <quote>always-on</quote> connection, this is appropriate; dial-up modem users should turn this off and connect manually when you have dialed up.</para></listitem></varlistentry>
+@@ -260,7 +251,7 @@ Shortcuts...</guimenuitem></menuchoice>.</para></tip>
+ <listitem><para>Select Display Name and Group.  Here you can enter a Display Name (the name used for this person inside &kopete;), and choose the <link linkend="organise-contacts-grouping">groups</link> they are a member of.</para></listitem>
+ <listitem><para>Select &im; Accounts.  Here you can choose which accounts you want to use to chat to the new contact.  If you only have one &im; account, you won't see this screen.</para></listitem>
+ <listitem><para>Account-specific Add Contact Pages.  For each account, you'll get one page where you can enter the <acronym>UIN</acronym>, buddy name or Email address, depending on the &im; system in use.</para></listitem>
+-<listitem><para>Finish Screen.  All done.  Except if the &im; system requires authorization (such as <trademark>ICQ</trademark>) to add a contact to your list - in which case, you'll be prompted after the wizard exits.</para></listitem>
++<listitem><para>Finish Screen.  All done.  Except if the &im; system requires authorization to add a contact to your list - in which case, you'll be prompted after the wizard exits.</para></listitem>
+ </orderedlist>
+ 
+ <para>You can add contacts to an existing Metacontact using its context menu.</para>
+@@ -705,47 +696,17 @@ Shortcuts...</guimenuitem></menuchoice>.</para></tip>
+ 	<para>&kopete; calls different &im; systems 'Protocols'.  When you add an account, it is specific to a single protocol.  Although &kopete; tries to make instant messaging appear the same, no matter what protocol you use, there are some differences in the level of support for advanced features such as file transfer and multimedia.</para>
+ 	<sect1 id="protocols-list">
+ 		<title>Protocols</title>
+-		<sect2 id="protocols-aim">
+-			<title>AIM</title>
+-			<para>AIM supports chatrooms.  Use the <guilabel>Join Chat...</guilabel> command on the AIM account menu to join a chatroom. Contact pictures and custom emoticons are also supported.</para>
+-		</sect2>
+-		<sect2 id="protocols-icq">
+-			<title>ICQ</title>
+-			<para>ICQ has an Invisibility feature which allows you to hide from selected contacts.  You may also search the ICQ user folder when adding a contact.  A wide range of contact details can be set using the <guilabel>Properties</guilabel> option.</para>
+-		</sect2>
+-		<sect2 id="protocols-msn">
+-			<title>MSN</title> 
+-			<para>File transfer and multi user chats work.  To transfer a file,  drag the file from &konqueror; or the desktop into the chat window.  To invite someone else into a chat, drag them from the Contact List into the chat window.  The <menuchoice><guimenu>File</guimenu></menuchoice> menu also contains these commands.  In addition, MSN supports custom emoticons.</para>
+-			<para>To use file transfer, make sure port 6891 is forwarded to your computer.</para>
+-		</sect2>
+-		<sect2 id="protocols-yahoo">
+-			<title>Yahoo</title>
+-			<para>Yahoo can send and receive webcam video.  It also supports Yahoo mail and the Yahoo address book from the account menu.  Conferencing is also possible.</para>
+-		</sect2>
+ 		<sect2 id="protocols-jabber">
+ 			<title>Jabber</title>
+ 			<para>Jabber, also known as XMPP, supports file transfer, conferencing and any other services supplied by the Jabber server.  For example, many Jabber servers have a user directory, and some provide transports to other messaging systems.  To access services, use <menuchoice><guimenu>Services...</guimenu></menuchoice> on the account menu.  Jabber file transfer can work without port forwarding, but enjoys better performance where a direct connection is possible.  By default, port 8010 is used for port forwarding, but this is configurable in each account's settings.</para>
+ 		</sect2>
+-		<sect2 id="protocols-gtalk">
+-			<title>Google Talk</title>
+-			<para>Since Google Talk is based upon Jabber, it is well supported in &kopete; with the exception of voice chat, which is worked upon.</para>
+-			<para>To configure &kopete; for Google Talk: Use your complete Google Mail address as the user name.  Check <guilabel>Use protocol encryption (SSL)</guilabel>, <guilabel>Allow plain-text password authentication</guilabel> and <guilabel>Override default server information</guilabel>.  The server is <quote>talk.google.com</quote> or <quote>gmail.com</quote> and ports 443 or 5223 should be used.</para>
+-		</sect2>
+-		<sect2 id="protocols-groupwise">
+-			<title>Novell GroupWise</title>
+-			<para>GroupWise Messenger is an enterprise messenging system from Novell Inc.  The full range of features are supported, including privacy, group chat, rich text and user search.</para>
+-		</sect2>
+-		<sect2 id="protocols-gadu-gadu">
+-			<title>Gadu-Gadu</title>
+-			<para>Gadu-Gadu is a chat system originating from Poland.  At present, &kopete; supports basic chat functions.</para>
+-		</sect2>
+ 		<sect2 id="protocols-winpopup">
+ 			<title>WinPopup</title>
+ 			<para>WinPopup is a way to use &kopete; to send and receive messages with &Windows; computers on the local network.  The WinPopup protocol only supports single, plain-text messages.</para>
+ 		</sect2>
+ 		<sect2 id="protocols-others">
+ 			<title>Other protocols</title>
+-			<para>As well as the protocols named above, &kopete; has support for several other protocols.  In most cases, this is not enabled by default or an additional plugin must be installed.  Meanwhile, SMS, Skype and SILC are provided in this way.  See &kopetewww; for details, however, the &kopete; team are not responsible for these protocols.</para>
++			<para>As well as the protocols named above, &kopete; has support for several other protocols.  In most cases, this is not enabled by default or an additional plugin must be installed.  See &kopetewww; for details, however, the &kopete; team are not responsible for these protocols.</para>
+ 		</sect2>
+ 	</sect1>
+ </chapter>
+@@ -1180,7 +1141,6 @@ Documentation copyright 2003,2004,2005 &Will.Stephenson; (lists at stevello free
+ &kopete-chatstyle;
+ &kopete-pipes;
+ &kopete-jabber;
+-&kopete-icq;
+ 
+ &documentation.index;
+ </book>
diff --git a/nonprism/kdepim-nonprism/PKGBUILD b/nonprism/kdepim-nonprism/PKGBUILD
deleted file mode 100644
index abcfe2387..000000000
--- a/nonprism/kdepim-nonprism/PKGBUILD
+++ /dev/null
@@ -1,183 +0,0 @@
-# $Id: PKGBUILD 220274 2014-08-20 15:25:21Z svenstaro $
-# Maintainer (Arch): Andrea Scarpino <andrea@archlinux.org>
-# Contributor (Arch): Pierre Schmitz <pierre@archlinux.de>
-# Maintainer: André Silva <emulatorman@parabola.nu>
-
-pkgbase=kdepim
-pkgname=('kdepim-akonadiconsole-nonprism'
-         'kdepim-kaddressbook-nonprism'
-         'kdepim-kjots-nonprism'
-         'kdepim-kmail-nonprism'
-         'kdepim-knode-nonprism'
-         'kdepim-knotes-nonprism'
-         'kdepim-korganizer-nonprism'
-         'kdepim-libkdepim-nonprism')
-pkgver=4.14.0
-pkgrel=1
-arch=('i686' 'x86_64' 'mips64el')
-url='http://pim.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdepim')
-makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime-nonprism' 'libxss' 'pilot-link'
-             'baloo' 'link-grammar')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('e5f24a8892954004f4b4eada5bcd46b6c71e1bbd')
-
-build() {
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DKDE4_BUILD_TESTS=OFF \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DKDEPIM_BUILD_MOBILE=OFF \
-		-DKDEPIM_STORAGESERVICE_GDRIVE=OFF
-	make
-}
-
-package_kdepim-akonadiconsole-nonprism() {
-	pkgdesc='Akonadi Management and Debugging Console, without Google Drive support'
-	depends=('kdepim-libkdepim')
-	conflicts=('kdepim-akonadiconsole')
-	replaces=('kdepim-akonadiconsole')
-	provides=("kdepim-akonadiconsole=${pkgver}")
-	url='http://pim.kde.org'
-	install='kdepim.install'
-	cd "${srcdir}"/build/akonadiconsole
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kaddressbook-nonprism() {
-	pkgdesc='Contact Manager, without Google Drive support'
-	depends=('kdepim-libkdepim')
-	url="http://kde.org/applications/office/kaddressbook/"
-	conflicts=('kdepim-kaddressbook')
-	replaces=('kdepim-kaddressbook')
-	provides=("kdepim-kaddressbook=${pkgver}")
-  install='kdepim-kaddressbook.install'
-  for i in kaddressbook kontact/plugins/kaddressbook \
-    plugins/kaddressbook; do
-    cd "${srcdir}"/build/${i}
-    make DESTDIR="${pkgdir}" install
-  done
-}
-
-package_kdepim-kjots-nonprism() {
-	pkgdesc='Note Taker, without Google Drive support'
-	depends=('kdepim-libkdepim')
-	url="http://kde.org/applications/utilities/kjots/"
-	conflicts=('kdepim-kjots')
-	replaces=('kdepim-kjots')
-	provides=("kdepim-kjots={pkgver}")
-	install='kdepim.install'
-	cd "${srcdir}"/build/kjots
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/kontact/plugins/kjots
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/kjots
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kmail-nonprism() {
-	pkgdesc='Mail Client, without Google Drive support'
-	depends=('kdepim-libkdepim' 'kde-agent')
-	url="http://kde.org/applications/internet/kmail/"
-	install='kdepim-kmail.install'
-	conflicts=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve'
-	           'kdepim-mimelib' 'kdepim-plugins' 'kdepim-kmail')
-	replaces=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve'
-	          'kdepim-mimelib' 'kdepim-plugins' 'kdepim-kmail')
-	provides=("kdepim-kmail=${pkgver}")
-    for i in kmail kmailcvt agents/archivemailagent storageservicemanager\
-      agents/mailfilteragent importwizard ksendemail libksieve messagelist \
-      kontact/plugins/kmail mboximporter; do
-      cd "${srcdir}"/build/${i}
-      make DESTDIR="${pkgdir}" install
-    done
-	cd "${srcdir}"/build/doc/kmail
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/sieveeditor
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/importwizard
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-knode-nonprism() {
-	pkgdesc='News Reader, without Google Drive support'
-	depends=('kdepim-libkdepim')
-	url="http://kde.org/applications/internet/knode/"
-	conflicts=('kdepim-knode')
-	replaces=('kdepim-knode')
-	provides=("kdepim-knode=${pkgver}")
-	install='kdepim-knode.install'
-	cd "${srcdir}"/build/knode
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/kontact/plugins/knode
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/knode
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-knotes-nonprism() {
-	pkgdesc='Popup Notes, without Google Drive support'
-	depends=('kdepim-libkdepim')
-	url="http://kde.org/applications/utilities/knotes/"
-	conflicts=('kdepim-knotes')
-	replaces=('kdepim-knotes')
-	provides=("kdepim-knotes=${pkgver}")
-	install='kdepim.install'
-	cd "${srcdir}"/build/knotes
-	make DESTDIR="${pkgdir}" install
-    cd "${srcdir}"/build/agents/notesagent
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/kontact/plugins/knotes
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/knotes
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-korganizer-nonprism() {
-	pkgdesc='Calendar and Scheduling Program, without Google Drive support'
-	depends=('kdepim-libkdepim')
-	url="http://kde.org/applications/office/korganizer"
-	conflicts=('kdepim-korganizer')
-	replaces=('kdepim-korganizer')
-	provides=("kdepim-korganizer=${pkgver}")
-	install='kdepim-korganizer.install'
-	for i in korganizer korgac kontact/plugins/korganizer calendarviews; do
-		cd "${srcdir}"/build/${i}
-		make DESTDIR="${pkgdir}" install
-	done
-	cd "${srcdir}"/build/doc/korganizer
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-libkdepim-nonprism() {
-	pkgdesc='Library for KDE PIM, without Google Drive support'
-	groups=()
-	depends=('kdepim-runtime' 'link-grammar' 'baloo')
-	url='http://pim.kde.org'
-	conflicts=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp'
-	           'kdepim-akonadi' 'kdepim-libkdepim')
-	replaces=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp'
-	          'kdepim-akonadi' 'kdepim-libkdepim')
-	provides=("kdepim-libkdepim=${pkgver}")
-	install='kdepim.install'
-	for i in agents/sendlateragent akonadi_next calendarsupport \
-  incidenceeditor-ng kaddressbookgrantlee kdgantt2 libkdepim \
-  libkdepimdbusinterfaces libkleo libkpgp mailcommon mailimporter \
-  messagecomposer messagecore messageviewer noteshared icons templateparser \
-  plugins/messageviewer grantleetheme grantleeeditor/grantleethemeeditor \
-  grantleeeditor/contactthemeeditor grantleeeditor/headerthemeeditor \
-  plugins/ktexteditor pimcommon pimsettingexporter; do
-		cd "${srcdir}"/build/${i}
-		make DESTDIR="${pkgdir}" install
-	done
-	cd "${srcdir}"/build/doc/pimsettingexporter
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/headerthemeeditor
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/contactthemeeditor
-	make DESTDIR="${pkgdir}" install
-}
diff --git a/nonprism/kdepim-nonprism/kdepim-akregator.install b/nonprism/kdepim-nonprism/kdepim-akregator.install
deleted file mode 100644
index 5787df72f..000000000
--- a/nonprism/kdepim-nonprism/kdepim-akregator.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/nonprism/kdepim-nonprism/kdepim-kaddressbook.install b/nonprism/kdepim-nonprism/kdepim-kaddressbook.install
deleted file mode 100644
index 5c501dc49..000000000
--- a/nonprism/kdepim-nonprism/kdepim-kaddressbook.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/nonprism/kdepim-nonprism/kdepim-kmail.install b/nonprism/kdepim-nonprism/kdepim-kmail.install
deleted file mode 100644
index 5787df72f..000000000
--- a/nonprism/kdepim-nonprism/kdepim-kmail.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/nonprism/kdepim-nonprism/kdepim-knode.install b/nonprism/kdepim-nonprism/kdepim-knode.install
deleted file mode 100644
index 5787df72f..000000000
--- a/nonprism/kdepim-nonprism/kdepim-knode.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/nonprism/kdepim-nonprism/kdepim-korganizer.install b/nonprism/kdepim-nonprism/kdepim-korganizer.install
deleted file mode 100644
index 5787df72f..000000000
--- a/nonprism/kdepim-nonprism/kdepim-korganizer.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/nonprism/kdepim-nonprism/kdepim.install b/nonprism/kdepim-nonprism/kdepim.install
deleted file mode 100644
index e70c054ec..000000000
--- a/nonprism/kdepim-nonprism/kdepim.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/nonprism/kdepim-runtime-nonprism/PKGBUILD b/nonprism/kdepim-runtime-nonprism/PKGBUILD
deleted file mode 100644
index 8cb1bd8c3..000000000
--- a/nonprism/kdepim-runtime-nonprism/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 220565 2014-08-22 17:27:51Z andrea $
-# Maintainer (Arch): Andrea Scarpino <andrea@archlinux.org>
-# Contributor (Arch): Pierre Schmitz <pierre@archlinux.de>
-# Maintainer: André Silva <emulatorman@parabola.nu>
-
-_pkgname=kdepim-runtime
-pkgname=kdepim-runtime-nonprism
-pkgver=4.14.0
-pkgrel=3
-pkgdesc='Extends the functionality of kdepim, without libkgapi and libkfbapi support'
-arch=('i686' 'x86_64' 'mips64el')
-url='https://projects.kde.org/projects/kde/kdepim-runtime'
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-runtime' 'libkolab' 'libaccounts-qt' 'signon')
-makedepends=('cmake' 'automoc4' 'boost')
-install="${_pkgname}.install"
-replaces=('kdepim-runtime' 'kdepim-runtime-coherence')
-conflicts=(kdepim-runtime)
-provides=(kdepim-runtime=$pkgver)
-source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz")
-sha1sums=('6cb3b92d57343872ddfc6ba24b5ebdd005126fa2')
-
-prepare() {
-  mkdir build
-}
-
-build() {
-	cd build
-	cmake ../${_pkgname}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DKDE4_BUILD_TESTS=OFF \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package() {
-	cd build
-	make DESTDIR="${pkgdir}" install
-}
diff --git a/nonprism/kdepim-runtime-nonprism/kdepim-runtime.install b/nonprism/kdepim-runtime-nonprism/kdepim-runtime.install
deleted file mode 100644
index c77e68041..000000000
--- a/nonprism/kdepim-runtime-nonprism/kdepim-runtime.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-mime-database usr/share/mime &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/nonprism/kdepim-runtime/PKGBUILD b/nonprism/kdepim-runtime/PKGBUILD
new file mode 100644
index 000000000..fd33567cd
--- /dev/null
+++ b/nonprism/kdepim-runtime/PKGBUILD
@@ -0,0 +1,37 @@
+# $Id: PKGBUILD 220565 2014-08-22 17:27:51Z andrea $
+# Maintainer (Arch): Andrea Scarpino <andrea@archlinux.org>
+# Contributor (Arch): Pierre Schmitz <pierre@archlinux.de>
+# Maintainer: André Silva <emulatorman@parabola.nu>
+
+pkgname=kdepim-runtime
+pkgver=4.14.0
+pkgrel=3.nonprism1
+pkgdesc='Extends the functionality of kdepim, without libkgapi and libkfbapi support'
+arch=('i686' 'x86_64' 'mips64el')
+url='https://projects.kde.org/projects/kde/kdepim-runtime'
+license=('GPL' 'LGPL' 'FDL')
+depends=('kdebase-runtime' 'libkolab' 'libaccounts-qt' 'signon')
+makedepends=('cmake' 'automoc4' 'boost')
+install="${pkgname}.install"
+replaces=('kdepim-runtime-coherence' 'kdepim-runtime-nonprism')
+conflicts=(kdepim-runtime-nonprism)
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('6cb3b92d57343872ddfc6ba24b5ebdd005126fa2')
+
+prepare() {
+  mkdir build
+}
+
+build() {
+	cd build
+	cmake ../${pkgname}-${pkgver} \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DKDE4_BUILD_TESTS=OFF \
+		-DCMAKE_INSTALL_PREFIX=/usr
+	make
+}
+
+package() {
+	cd build
+	make DESTDIR="${pkgdir}" install
+}
diff --git a/nonprism/kdepim-runtime/kdepim-runtime.install b/nonprism/kdepim-runtime/kdepim-runtime.install
new file mode 100644
index 000000000..c77e68041
--- /dev/null
+++ b/nonprism/kdepim-runtime/kdepim-runtime.install
@@ -0,0 +1,13 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+	update-mime-database usr/share/mime &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/nonprism/kdepim/PKGBUILD b/nonprism/kdepim/PKGBUILD
new file mode 100644
index 000000000..7f7de7b1a
--- /dev/null
+++ b/nonprism/kdepim/PKGBUILD
@@ -0,0 +1,175 @@
+# $Id: PKGBUILD 220274 2014-08-20 15:25:21Z svenstaro $
+# Maintainer (Arch): Andrea Scarpino <andrea@archlinux.org>
+# Contributor (Arch): Pierre Schmitz <pierre@archlinux.de>
+# Maintainer: André Silva <emulatorman@parabola.nu>
+
+pkgbase=kdepim
+pkgname=('kdepim-akonadiconsole'
+         'kdepim-kaddressbook'
+         'kdepim-kjots'
+         'kdepim-kmail'
+         'kdepim-knode'
+         'kdepim-knotes'
+         'kdepim-korganizer'
+         'kdepim-libkdepim')
+pkgver=4.14.0
+pkgrel=1.nonprism1
+arch=('i686' 'x86_64' 'mips64el')
+url='http://pim.kde.org'
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdepim')
+makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link'
+             'baloo' 'link-grammar')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
+sha1sums=('e5f24a8892954004f4b4eada5bcd46b6c71e1bbd')
+
+build() {
+	mkdir build
+	cd build
+	cmake ../${pkgbase}-${pkgver} \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DKDE4_BUILD_TESTS=OFF \
+		-DCMAKE_SKIP_RPATH=ON \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DKDEPIM_BUILD_MOBILE=OFF \
+		-DKDEPIM_STORAGESERVICE_GDRIVE=OFF
+	make
+}
+
+package_kdepim-akonadiconsole() {
+	pkgdesc='Akonadi Management and Debugging Console, without Google Drive support'
+	depends=('kdepim-libkdepim')
+	conflicts=('kdepim-akonadiconsole-nonprism')
+	replaces=('kdepim-akonadiconsole-nonprism')
+	url='http://pim.kde.org'
+	install='kdepim.install'
+	cd "${srcdir}"/build/akonadiconsole
+	make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-kaddressbook() {
+	pkgdesc='Contact Manager, without Google Drive support'
+	depends=('kdepim-libkdepim')
+	url="http://kde.org/applications/office/kaddressbook/"
+	conflicts=('kdepim-kaddressbook-nonprism')
+	replaces=('kdepim-kaddressbook-nonprism')
+  install='kdepim-kaddressbook.install'
+  for i in kaddressbook kontact/plugins/kaddressbook \
+    plugins/kaddressbook; do
+    cd "${srcdir}"/build/${i}
+    make DESTDIR="${pkgdir}" install
+  done
+}
+
+package_kdepim-kjots() {
+	pkgdesc='Note Taker, without Google Drive support'
+	depends=('kdepim-libkdepim')
+	url="http://kde.org/applications/utilities/kjots/"
+	conflicts=('kdepim-kjots-nonprism')
+	replaces=('kdepim-kjots-nonprism')
+	install='kdepim.install'
+	cd "${srcdir}"/build/kjots
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/kontact/plugins/kjots
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/doc/kjots
+	make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-kmail() {
+	pkgdesc='Mail Client, without Google Drive support'
+	depends=('kdepim-libkdepim' 'kde-agent')
+	url="http://kde.org/applications/internet/kmail/"
+	install='kdepim-kmail.install'
+	conflicts=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve'
+	           'kdepim-mimelib' 'kdepim-plugins' 'kdepim-kmail-nonprism')
+	replaces=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve'
+	          'kdepim-mimelib' 'kdepim-plugins' 'kdepim-kmail-nonprism')
+    for i in kmail kmailcvt agents/archivemailagent storageservicemanager\
+      agents/mailfilteragent importwizard ksendemail libksieve messagelist \
+      kontact/plugins/kmail mboximporter; do
+      cd "${srcdir}"/build/${i}
+      make DESTDIR="${pkgdir}" install
+    done
+	cd "${srcdir}"/build/doc/kmail
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/doc/sieveeditor
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/doc/importwizard
+	make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-knode() {
+	pkgdesc='News Reader, without Google Drive support'
+	depends=('kdepim-libkdepim')
+	url="http://kde.org/applications/internet/knode/"
+	conflicts=('kdepim-knode-nonprism')
+	replaces=('kdepim-knode-nonprism')
+	install='kdepim-knode.install'
+	cd "${srcdir}"/build/knode
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/kontact/plugins/knode
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/doc/knode
+	make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-knotes() {
+	pkgdesc='Popup Notes, without Google Drive support'
+	depends=('kdepim-libkdepim')
+	url="http://kde.org/applications/utilities/knotes/"
+	conflicts=('kdepim-knotes-nonprism')
+	replaces=('kdepim-knotes-nonprism')
+	install='kdepim.install'
+	cd "${srcdir}"/build/knotes
+	make DESTDIR="${pkgdir}" install
+    cd "${srcdir}"/build/agents/notesagent
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/kontact/plugins/knotes
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/doc/knotes
+	make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-korganizer() {
+	pkgdesc='Calendar and Scheduling Program, without Google Drive support'
+	depends=('kdepim-libkdepim')
+	url="http://kde.org/applications/office/korganizer"
+	conflicts=('kdepim-korganizer-nonprism')
+	replaces=('kdepim-korganizer-nonprism')
+	install='kdepim-korganizer.install'
+	for i in korganizer korgac kontact/plugins/korganizer calendarviews; do
+		cd "${srcdir}"/build/${i}
+		make DESTDIR="${pkgdir}" install
+	done
+	cd "${srcdir}"/build/doc/korganizer
+	make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-libkdepim() {
+	pkgdesc='Library for KDE PIM, without Google Drive support'
+	groups=()
+	depends=('kdepim-runtime' 'link-grammar' 'baloo')
+	url='http://pim.kde.org'
+	conflicts=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp'
+	           'kdepim-akonadi' 'kdepim-libkdepim-nonprism')
+	replaces=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp'
+	          'kdepim-akonadi' 'kdepim-libkdepim-nonprism')
+	install='kdepim.install'
+	for i in agents/sendlateragent akonadi_next calendarsupport \
+  incidenceeditor-ng kaddressbookgrantlee kdgantt2 libkdepim \
+  libkdepimdbusinterfaces libkleo libkpgp mailcommon mailimporter \
+  messagecomposer messagecore messageviewer noteshared icons templateparser \
+  plugins/messageviewer grantleetheme grantleeeditor/grantleethemeeditor \
+  grantleeeditor/contactthemeeditor grantleeeditor/headerthemeeditor \
+  plugins/ktexteditor pimcommon pimsettingexporter; do
+		cd "${srcdir}"/build/${i}
+		make DESTDIR="${pkgdir}" install
+	done
+	cd "${srcdir}"/build/doc/pimsettingexporter
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/doc/headerthemeeditor
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/doc/contactthemeeditor
+	make DESTDIR="${pkgdir}" install
+}
diff --git a/nonprism/kdepim/kdepim-akregator.install b/nonprism/kdepim/kdepim-akregator.install
new file mode 100644
index 000000000..5787df72f
--- /dev/null
+++ b/nonprism/kdepim/kdepim-akregator.install
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/nonprism/kdepim/kdepim-kaddressbook.install b/nonprism/kdepim/kdepim-kaddressbook.install
new file mode 100644
index 000000000..5c501dc49
--- /dev/null
+++ b/nonprism/kdepim/kdepim-kaddressbook.install
@@ -0,0 +1,12 @@
+post_install() {
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/nonprism/kdepim/kdepim-kmail.install b/nonprism/kdepim/kdepim-kmail.install
new file mode 100644
index 000000000..5787df72f
--- /dev/null
+++ b/nonprism/kdepim/kdepim-kmail.install
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/nonprism/kdepim/kdepim-knode.install b/nonprism/kdepim/kdepim-knode.install
new file mode 100644
index 000000000..5787df72f
--- /dev/null
+++ b/nonprism/kdepim/kdepim-knode.install
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/nonprism/kdepim/kdepim-korganizer.install b/nonprism/kdepim/kdepim-korganizer.install
new file mode 100644
index 000000000..5787df72f
--- /dev/null
+++ b/nonprism/kdepim/kdepim-korganizer.install
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/nonprism/kdepim/kdepim.install b/nonprism/kdepim/kdepim.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/nonprism/kdepim/kdepim.install
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
-- 
cgit v1.2.3