Merge branch 'master' of ssh://lukeshu.com:1863/srv/git/mirror/parabola/abslibre

44 files changed, 131 insertions, 136 deletions

diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel/PKGBUILD
index e8024f700..122e6138e 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -19,8 +19,7 @@ _debrel=deb3
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
-_pkgname=iceweasel
-pkgname=iceweasel-libre
+pkgname=iceweasel
 epoch=1
 pkgver=$_debver.$_debrel
 pkgrel=1
@@ -39,10 +38,10 @@ fi
 optdepends=('networkmanager: Location detection via available WiFi networks'
             'gst-plugins-good: h.264 video'
             'gst-libav: h.264 video')
-url="http://packages.debian.org/sid/${_pkgname}"
+url="http://packages.debian.org/sid/${pkgname}"
 install=iceweasel.install
-replaces=('firefox')
-conflicts=('firefox')
+replaces=('firefox' "${pkgname}-libre")
+conflicts=('firefox' "${pkgname}-libre")
 provides=('firefox')
 source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
         "$_debrepo/`debfile $_debname`_$_debver-${_debrel#deb}.debian.tar.xz"
@@ -58,11 +57,11 @@ md5sums=('52fc839ddc92223023d98c600075cd9e'
          '11f646159f802ac0bdb4900d9953e9f6'
          '2f5cb3df42b09fbfeaee5e72e5433ab9'
          'df08eaa1ac3bc6c2356be4fbf8ec8932'
-         '96aec3a725ad9f438ae9d54c0f8b37d0'
+         '038ce8cedafb790041fb9842ad0f21f4'
          'b03a979a78484503ba8dddad4f2c96d1'
          '7b9e5996dd9fe0b186a43a297db1c6b5'
          '1c42509891cf6843660a5f3c69896e80'
-         '783a5927246f014855b96a3abb92566b'
+         'd6d1d8fa09082766ba8df2ca4b898cba'
          '6e335a517c68488941340ee1c23f97b0')
 
 prepare() {
@@ -175,7 +174,7 @@ build() {
   cd "$srcdir/$DEBIAN_BUILD"
 
   export PATH="$srcdir/path:$PATH"
-  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname"
+  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgname"
   export PYTHON="/usr/bin/python2"
 
   if $_pgo; then
@@ -193,34 +192,34 @@ package() {
   cd "$srcdir/$DEBIAN_BUILD"
   make -f client.mk DESTDIR="$pkgdir" INSTALL_SDK= install
 
-  install -Dm644 ../vendor.js "$pkgdir/usr/lib/$_pkgname/browser/defaults/preferences/vendor.js"
+  install -Dm644 ../vendor.js "$pkgdir/usr/lib/$pkgname/browser/defaults/preferences/vendor.js"
 
   # I don't even know why we're hitting the objdir, and ConnOS didn't
   _brandingdir=debian/branding
   brandingdir=moz-objdir/$_brandingdir
   icondir="$pkgdir/usr/share/icons/hicolor"
   for i in 16x16 32x32 48x48 64x64; do
-    install -Dm644 "$brandingdir/default${i/x*/}.png" "$icondir/$i/apps/$_pkgname.png"
+    install -Dm644 "$brandingdir/default${i/x*/}.png" "$icondir/$i/apps/$pkgname.png"
   done
   install -Dm644 "$brandingdir/mozicon128.png" \
-    "$icondir/128x128/apps/$_pkgname.png"
+    "$icondir/128x128/apps/$pkgname.png"
   install -Dm644 "$_brandingdir/iceweasel_icon.svg" \
-    "$icondir/scalable/apps/$_pkgname.svg"
+    "$icondir/scalable/apps/$pkgname.svg"
  
   install -d "$pkgdir/usr/share/applications"
   install -m644  "$srcdir/iceweasel.desktop" \
     "$pkgdir/usr/share/applications"
 
   # Use system-provided dictionaries
-  rm -rf "$pkgdir/usr/lib/$_pkgname/"{dictionaries,hyphenation}
-  ln -s /usr/share/hunspell "$pkgdir/usr/lib/$_pkgname/dictionaries"
-  ln -s /usr/share/hyphen "$pkgdir/usr/lib/$_pkgname/hyphenation"
+  rm -rf "$pkgdir/usr/lib/$pkgname/"{dictionaries,hyphenation}
+  ln -s /usr/share/hunspell "$pkgdir/usr/lib/$pkgname/dictionaries"
+  ln -s /usr/share/hyphen "$pkgdir/usr/lib/$pkgname/hyphenation"
 
-  rm -rf "$pkgdir/usr/lib/$_pkgname/browser/"{searchplugins,plugins}
-  ln -sf /usr/lib/mozilla/plugins       "$pkgdir/usr/lib/$_pkgname/browser/plugins"
-  ln -sf /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$_pkgname/browser/searchplugins"
+  rm -rf "$pkgdir/usr/lib/$pkgname/browser/"{searchplugins,plugins}
+  ln -sf /usr/lib/mozilla/plugins       "$pkgdir/usr/lib/$pkgname/browser/plugins"
+  ln -sf /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$pkgname/browser/searchplugins"
 
   # Workaround for now:
   #https://bugzilla.mozilla.org/show_bug.cgi?id=658850
-  ln -sf $_pkgname "$pkgdir/usr/lib/$_pkgname/$_pkgname-bin"
+  ln -sf $pkgname "$pkgdir/usr/lib/$pkgname/$pkgname-bin"
 }
diff --git a/libre/iceweasel-libre/gnu_headshadow.png b/libre/iceweasel/gnu_headshadow.png
index e0f73a3bf..e0f73a3bf 100644
--- a/libre/iceweasel-libre/gnu_headshadow.png
+++ b/libre/iceweasel/gnu_headshadow.png
diff --git a/libre/iceweasel-libre/iceweasel-20.0.1-fixed-loading-icon.png b/libre/iceweasel/iceweasel-20.0.1-fixed-loading-icon.png
index 55f25e591..55f25e591 100644
--- a/libre/iceweasel-libre/iceweasel-20.0.1-fixed-loading-icon.png
+++ b/libre/iceweasel/iceweasel-20.0.1-fixed-loading-icon.png
diff --git a/libre/iceweasel-libre/iceweasel-install-dir.patch b/libre/iceweasel/iceweasel-install-dir.patch
index af113fa85..af113fa85 100644
--- a/libre/iceweasel-libre/iceweasel-install-dir.patch
+++ b/libre/iceweasel/iceweasel-install-dir.patch
diff --git a/libre/iceweasel-libre/iceweasel.desktop b/libre/iceweasel/iceweasel.desktop
index c4a338cc6..c4a338cc6 100644
--- a/libre/iceweasel-libre/iceweasel.desktop
+++ b/libre/iceweasel/iceweasel.desktop
diff --git a/libre/iceweasel-libre/iceweasel.install b/libre/iceweasel/iceweasel.install
index 1a1f4b16b..1a1f4b16b 100644
--- a/libre/iceweasel-libre/iceweasel.install
+++ b/libre/iceweasel/iceweasel.install
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel/libre.patch
index 608dc5819..08704affd 100644
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel/libre.patch
@@ -884,3 +884,26 @@ diff -Nur mozilla-release.orig/browser/modules/AboutHome.jsm mozilla-release/bro
        if (target) {
          target.messageManager.sendAsyncMessage("AboutHome:Update", data);
        } else {
+diff -Nur mozilla-release.orig/modules/libpref/src/init/all.js mozilla-release/modules/libpref/src/init/all.js
+--- mozilla-release.orig/modules/libpref/src/init/all.js	2014-09-03 04:25:46.017695291 -0300
++++ mozilla-release/modules/libpref/src/init/all.js	2014-09-03 04:44:10.801521540 -0300
+@@ -4268,19 +4268,6 @@
+ // Number of stack frames to capture in createObjectURL for about:memory.
+ pref("memory.blob_report.stack_frames", 0);
+ 
+-// comma separated list of domain origins (e.g. https://domain.com) for
+-// providers that can install from their own website without user warnings.
+-// entries are
+-pref("social.whitelist", "https://mozsocial.cliqz.com,https://now.msn.com,https://mixi.jp");
+-// comma separated list of domain origins (e.g. https://domain.com) for
+-// directory websites (e.g. AMO) that can install providers for other sites
+-pref("social.directories", "https://activations.cdn.mozilla.net");
+-// remote-install allows any website to activate a provider, with extended UI
+-// notifying user of installation. we can later pref off remote install if
+-// necessary. This does not affect whitelisted and directory installs.
+-pref("social.remote-install.enabled", true);
+-pref("social.toast-notifications.enabled", true);
+-
+ // Disable idle observer fuzz, because only privileged content can access idle
+ // observers (bug 780507).
+ pref("dom.idle-observers-api.fuzz_time.disabled", true);
diff --git a/libre/iceweasel-libre/mozconfig b/libre/iceweasel/mozconfig
index 37ad56fda..37ad56fda 100644
--- a/libre/iceweasel-libre/mozconfig
+++ b/libre/iceweasel/mozconfig
diff --git a/libre/iceweasel-libre/mozconfig.pgo b/libre/iceweasel/mozconfig.pgo
index 71ba205a4..71ba205a4 100644
--- a/libre/iceweasel-libre/mozconfig.pgo
+++ b/libre/iceweasel/mozconfig.pgo
diff --git a/libre/iceweasel-libre/vendor.js b/libre/iceweasel/vendor.js
index da8118138..78b5eeb45 100644
--- a/libre/iceweasel-libre/vendor.js
+++ b/libre/iceweasel/vendor.js
@@ -8,9 +8,6 @@ pref("browser.shell.checkDefaultBrowser", false);
 pref("extensions.autoDisableScopes", 11);
 pref("extensions.shownSelectionUI", true);
 
-// Disable Social API
-pref("social.remote-install.enabled", false);
-
 // Make sure that safebrowsing is disabled
 pref("browser.safebrowsing.enabled", false);
 pref("browser.safebrowsing.malware.enabled", false);
diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror/PKGBUILD
index 3c360cf60..6f0a738b9 100644
--- a/libre/kdebase-konqueror-libre/PKGBUILD
+++ b/libre/kdebase-konqueror/PKGBUILD
@@ -4,17 +4,15 @@
 # Maintainer: Michał Masłowski <mtjm@mtjm.eu>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-_pkgname='kdebase-konqueror'
-pkgname='kdebase-konqueror-libre'
+pkgname='kdebase-konqueror'
 pkgver=4.14.0
-pkgrel=1
+pkgrel=1.parabola1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://kde.org/applications/internet/konqueror/"
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdebase')
-conflicts=('kdebase-nsplugins' 'kdebase-konqueror')
-replaces=('kdebase-nsplugins' 'kdebase-konqueror')
-provides=("kdebase-konqueror=$pkgver")
+conflicts=('kdebase-nsplugins' 'kdebase-konqueror-libre')
+replaces=('kdebase-nsplugins' 'kdebase-konqueror-libre')
 makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml' 'baloo-widgets')
 source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz"
         'konq-about-fsdg.diff')
diff --git a/libre/kdebase-konqueror-libre/kdebase-konqueror.install b/libre/kdebase-konqueror/kdebase-konqueror.install
index 5495fb1b5..5495fb1b5 100644
--- a/libre/kdebase-konqueror-libre/kdebase-konqueror.install
+++ b/libre/kdebase-konqueror/kdebase-konqueror.install
diff --git a/libre/kdebase-konqueror-libre/konq-about-fsdg.diff b/libre/kdebase-konqueror/konq-about-fsdg.diff
index 93ef4016a..93ef4016a 100644
--- a/libre/kdebase-konqueror-libre/konq-about-fsdg.diff
+++ b/libre/kdebase-konqueror/konq-about-fsdg.diff
diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime/PKGBUILD
index 3e13281fc..6782dc11f 100644
--- a/libre/kdebase-runtime-libre/PKGBUILD
+++ b/libre/kdebase-runtime/PKGBUILD
@@ -3,17 +3,15 @@
 # Contributor (Arch): Pierre Schmitz <pierre@archlinux.de>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-_pkgname=kdebase-runtime
-pkgname=kdebase-runtime-libre
+pkgname=kdebase-runtime
 pkgver=4.14.0
-pkgrel=1
+pkgrel=1.parabola1
 pkgdesc="Plugins and applications necessary for the running of KDE applications, without non-privacy search providers"
 arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/projects/kde/kde-runtime'
 license=('GPL' 'LGPL')
-replaces=("${_pkgname}")
-conflicts=("${_pkgname}")
-provides=("${_pkgname}=${pkgver}")
+replaces=("${pkgname}-libre")
+conflicts=("${pkgname}-libre")
 depends=("kdelibs>=${pkgver}" 'kactivities' 'libkactivities4' 'smbclient' 'libssh' 'libcanberra'
          'oxygen-icons' 'xorg-xauth' 'libwebp')
 makedepends=('pkg-config' 'cmake' 'automoc4' 'kdepimlibs' 'openslp' 'doxygen'
@@ -22,7 +20,7 @@ optdepends=('kdepimlibs: needed by DrKonqi to send crash reports to KDE.org'
             'gdb: needed by DrKonqi to generate backtrace'
             'htdig: to build the search index in the KHelpCenter'
             'rarian: needed by KHelpCenter')
-install="${_pkgname}.install"
+install="${pkgname}.install"
 source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz"
         'duckduckgo_html.desktop'
         'duckduckgo_lite.desktop')
diff --git a/libre/kdebase-runtime-libre/duckduckgo_html.desktop b/libre/kdebase-runtime/duckduckgo_html.desktop
index ba6a602ad..ba6a602ad 100644
--- a/libre/kdebase-runtime-libre/duckduckgo_html.desktop
+++ b/libre/kdebase-runtime/duckduckgo_html.desktop
diff --git a/libre/kdebase-runtime-libre/duckduckgo_lite.desktop b/libre/kdebase-runtime/duckduckgo_lite.desktop
index 0da670dbe..0da670dbe 100644
--- a/libre/kdebase-runtime-libre/duckduckgo_lite.desktop
+++ b/libre/kdebase-runtime/duckduckgo_lite.desktop
diff --git a/libre/kdebase-runtime-libre/kdebase-runtime.install b/libre/kdebase-runtime/kdebase-runtime.install
index c77e68041..c77e68041 100644
--- a/libre/kdebase-runtime-libre/kdebase-runtime.install
+++ b/libre/kdebase-runtime/kdebase-runtime.install
diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs/PKGBUILD
index 963749145..045450038 100644
--- a/libre/kdelibs-libre/PKGBUILD
+++ b/libre/kdelibs/PKGBUILD
@@ -3,24 +3,22 @@
 # Contributor (Arch): Pierre Schmitz <pierre@archlinux.de>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-_pkgname=kdelibs
-pkgname=kdelibs-libre
+pkgname=kdelibs
 pkgver=4.14.0
-pkgrel=1
+pkgrel=1.parabola1
 pkgdesc="KDE Core Libraries, without nonfree plugins recommendation support"
 arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/projects/kde/kdelibs'
 license=('GPL' 'LGPL' 'FDL')
-provides=("kdelibs=$pkgver")
-replaces=('kdelibs')
-conflicts=('kdelibs')
+replaces=('kdelibs-libre')
+conflicts=('kdelibs-libre')
 depends=('attica' 'libxss' 'krb5' 'grantlee' 'qca' 'libdbusmenu-qt' 'polkit-qt'
         'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'strigi'
         'docbook-xsl' 'upower' 'udisks2' 'libxcursor' 'phonon-qt4'
         'media-player-info' 'libxtst' 'libutempter' 'qtwebkit' 'icu')
 makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa')
-install=${_pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz"
         'kde-applications-menu.patch' 'khtml-fsdg.diff' 'qt4.patch')
 sha1sums=('d8c56abfa101b0bd39e05ae36b7f6063d8fe360c'
           '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
@@ -29,7 +27,7 @@ sha1sums=('d8c56abfa101b0bd39e05ae36b7f6063d8fe360c'
 
 prepare() {
        mkdir build
-       cd ${_pkgname}-${pkgver}
+       cd ${pkgname}-${pkgver}
        # avoid file conflict with gnome-menus
        patch -p1 -i "${srcdir}"/kde-applications-menu.patch
        # don't ask the user to download a plugin, it's probably nonfree.
@@ -40,7 +38,7 @@ prepare() {
 
 build() {
        cd build
-       cmake ../${_pkgname}-${pkgver} \
+       cmake ../${pkgname}-${pkgver} \
                -DCMAKE_BUILD_TYPE=Release \
                -DKDE4_BUILD_TESTS=OFF \
                -DCMAKE_SKIP_RPATH=ON \
diff --git a/libre/kdelibs-libre/kde-applications-menu.patch b/libre/kdelibs/kde-applications-menu.patch
index 4b513298a..4b513298a 100644
--- a/libre/kdelibs-libre/kde-applications-menu.patch
+++ b/libre/kdelibs/kde-applications-menu.patch
diff --git a/libre/kdelibs-libre/kdelibs-cve-2014-5033.patch b/libre/kdelibs/kdelibs-cve-2014-5033.patch
index c85eccd6b..c85eccd6b 100644
--- a/libre/kdelibs-libre/kdelibs-cve-2014-5033.patch
+++ b/libre/kdelibs/kdelibs-cve-2014-5033.patch
diff --git a/libre/kdelibs-libre/kdelibs.install b/libre/kdelibs/kdelibs.install
index c77e68041..c77e68041 100644
--- a/libre/kdelibs-libre/kdelibs.install
+++ b/libre/kdelibs/kdelibs.install
diff --git a/libre/kdelibs-libre/khtml-fsdg.diff b/libre/kdelibs/khtml-fsdg.diff
index 1a531b3c8..1a531b3c8 100644
--- a/libre/kdelibs-libre/khtml-fsdg.diff
+++ b/libre/kdelibs/khtml-fsdg.diff
diff --git a/libre/kdelibs-libre/pyqt.patch b/libre/kdelibs/pyqt.patch
index eadd2f2ac..eadd2f2ac 100644
--- a/libre/kdelibs-libre/pyqt.patch
+++ b/libre/kdelibs/pyqt.patch
diff --git a/libre/kdelibs-libre/qt4.patch b/libre/kdelibs/qt4.patch
index bb4312d40..bb4312d40 100644
--- a/libre/kdelibs-libre/qt4.patch
+++ b/libre/kdelibs/qt4.patch
diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete/PKGBUILD
index d003aa80e..eac942b9c 100644
--- a/libre/kdenetwork-kopete-libre/PKGBUILD
+++ b/libre/kdenetwork-kopete/PKGBUILD
@@ -2,22 +2,20 @@
 # Maintainer (Arch): Andrea Scarpino <andrea@archlinux.org>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-_pkgname=kdenetwork-kopete
-pkgname=kdenetwork-kopete-libre
+pkgname=kdenetwork-kopete
 pkgver=4.14.0
-pkgrel=1
+pkgrel=1.parabola1
 pkgdesc='Instant Messenger, without nonfree Skype support'
 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)
+replaces=(${pkgname}-libre)
+conflicts=(${pkgname}-libre)
 depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'libidn'
          'qimageblitz' 'libgadu' 'mediastreamer' 'jsoncpp')
 makedepends=('cmake' 'automoc4' 'boost' 'kdepim-libkdepim')
-install=${_pkgname}.install
+install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kopete-${pkgver}.tar.xz")
 sha1sums=('bd247af3b25650bedcdb983fc285469dcacea964')
 
diff --git a/libre/kdenetwork-kopete-libre/kdenetwork-kopete.install b/libre/kdenetwork-kopete/kdenetwork-kopete.install
index 5495fb1b5..5495fb1b5 100644
--- a/libre/kdenetwork-kopete-libre/kdenetwork-kopete.install
+++ b/libre/kdenetwork-kopete/kdenetwork-kopete.install
diff --git a/libre/kdenetwork-kopete-libre/kdenetwork.install b/libre/kdenetwork-kopete/kdenetwork.install
index e70c054ec..e70c054ec 100644
--- a/libre/kdenetwork-kopete-libre/kdenetwork.install
+++ b/libre/kdenetwork-kopete/kdenetwork.install
diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark/PKGBUILD
index 303b7b372..4810ac95c 100644
--- a/libre/kdeutils-ark-libre/PKGBUILD
+++ b/libre/kdeutils-ark/PKGBUILD
@@ -2,22 +2,20 @@
 # Maintainer (Arch): Andrea Scarpino <andrea@archlinux.org>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-_pkgname=kdeutils-ark
-pkgname=kdeutils-ark-libre
+pkgname=kdeutils-ark
 pkgver=4.14.0
-pkgrel=1
+pkgrel=1.parabola1
 pkgdesc='Archiving Tool, with unar support'
 url='http://kde.org/applications/utilities/ark/'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeutils')
-provides=("kdeutils-ark=$pkgver")
-replaces=('kdeutils-ark')
-conflicts=('kdeutils-ark')
+replaces=('kdeutils-ark-libre')
+conflicts=('kdeutils-ark-libre')
 depends=('kdebase-runtime' 'kdebase-lib' 'libarchive' 'qjson')
 makedepends=('cmake' 'automoc4')
 optdepends=('p7zip' 'zip' 'unzip' 'unar')
-install=${_pkgname}.install
+install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz"
         'ark-unar-06.patch')
 sha1sums=('fc5d388ccedddfa1e68254b4de00186e93930669'
diff --git a/libre/kdeutils-ark-libre/ark-unar-06.patch b/libre/kdeutils-ark/ark-unar-06.patch
index ab2ef274f..ab2ef274f 100644
--- a/libre/kdeutils-ark-libre/ark-unar-06.patch
+++ b/libre/kdeutils-ark/ark-unar-06.patch
diff --git a/libre/kdeutils-ark-libre/kdeutils-ark.install b/libre/kdeutils-ark/kdeutils-ark.install
index 8a26818d8..8a26818d8 100644
--- a/libre/kdeutils-ark-libre/kdeutils-ark.install
+++ b/libre/kdeutils-ark/kdeutils-ark.install
diff --git a/nonprism/kde-meta-nonprism/PKGBUILD b/nonprism/kde-meta/PKGBUILD
index 71ae7d6c6..96419a7cb 100644
--- a/nonprism/kde-meta-nonprism/PKGBUILD
+++ b/nonprism/kde-meta/PKGBUILD
@@ -4,38 +4,37 @@
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
 pkgbase=kde-meta
-pkgname=('kde-meta-kdepim-nonprism'
-         'kde-meta-kdeplasma-addons-nonprism')
+pkgname=('kde-meta-kdepim'
+         'kde-meta-kdeplasma-addons')
 pkgver=4.13
-pkgrel=3.1
+pkgrel=3.nonprism1
 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'
+package_kde-meta-kdepim() {
+	pkgdesc=('Meta package for kdepim, without kdepim-blogilo')
+	depends=('kdepim-akonadiconsole'
 	         'kdepim-akregator'
 	         'kdepim-console'
-	         'kdepim-kaddressbook-nonprism'
+	         'kdepim-kaddressbook'
 	         'kdepim-kalarm'
-	         'kdepim-kjots-nonprism'
+	         'kdepim-kjots'
 	         'kdepim-kleopatra'
-	         'kdepim-kmail-nonprism'
-	         'kdepim-knode-nonprism'
-	         'kdepim-knotes-nonprism'
+	         'kdepim-kmail'
+	         'kdepim-knode'
+	         'kdepim-knotes'
 	         'kdepim-kontact'
-	         'kdepim-korganizer-nonprism'
+	         'kdepim-korganizer'
 	         'kdepim-kresources'
 	         'kdepim-ktimetracker'
 	         'kdepim-ktnef')
-	replaces=('kdepim' 'kde-meta-kdepim')
-	conflicts=('kdepim' 'kde-meta-kdepim')
-	provides=(kde-meta-kdepim=$pkgver)
+	replaces=('kdepim' 'kde-meta-kdepim-nonprism')
+	conflicts=('kdepim' 'kde-meta-kdepim-nonprism')
 }
 
-package_kde-meta-kdeplasma-addons-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'
@@ -109,7 +108,6 @@ package_kde-meta-kdeplasma-addons-nonprism() {
 	         '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)
+	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/PKGBUILD
index 60af2de58..f9bee6208 100644
--- a/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD
+++ b/nonprism/kdenetwork-kopete/PKGBUILD
@@ -2,22 +2,20 @@
 # Maintainer (Arch): Andrea Scarpino <andrea@archlinux.org>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-_pkgname=kdenetwork-kopete
-pkgname=kdenetwork-kopete-libre-nonprism
+pkgname=kdenetwork-kopete
 pkgver=4.14.0
-pkgrel=1
+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)
-conflicts=($_pkgname)
-provides=($_pkgname=$pkgver)
+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
+install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kopete-${pkgver}.tar.xz"
         'libre-nonprism.patch')
 sha1sums=('bd247af3b25650bedcdb983fc285469dcacea964'
diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/kdenetwork-kopete.install b/nonprism/kdenetwork-kopete/kdenetwork-kopete.install
index 5495fb1b5..5495fb1b5 100644
--- a/nonprism/kdenetwork-kopete-libre-nonprism/kdenetwork-kopete.install
+++ b/nonprism/kdenetwork-kopete/kdenetwork-kopete.install
diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/kdenetwork.install b/nonprism/kdenetwork-kopete/kdenetwork.install
index e70c054ec..e70c054ec 100644
--- a/nonprism/kdenetwork-kopete-libre-nonprism/kdenetwork.install
+++ b/nonprism/kdenetwork-kopete/kdenetwork.install
diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/libre-nonprism.patch b/nonprism/kdenetwork-kopete/libre-nonprism.patch
index 6d73766cc..6d73766cc 100644
--- a/nonprism/kdenetwork-kopete-libre-nonprism/libre-nonprism.patch
+++ b/nonprism/kdenetwork-kopete/libre-nonprism.patch
diff --git a/nonprism/kdepim-runtime-nonprism/PKGBUILD b/nonprism/kdepim-runtime/PKGBUILD
index 8cb1bd8c3..fd33567cd 100644
--- a/nonprism/kdepim-runtime-nonprism/PKGBUILD
+++ b/nonprism/kdepim-runtime/PKGBUILD
@@ -3,21 +3,19 @@
 # Contributor (Arch): Pierre Schmitz <pierre@archlinux.de>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-_pkgname=kdepim-runtime
-pkgname=kdepim-runtime-nonprism
+pkgname=kdepim-runtime
 pkgver=4.14.0
-pkgrel=3
+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' 'kdepim-runtime-coherence')
-conflicts=(kdepim-runtime)
-provides=(kdepim-runtime=$pkgver)
-source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz")
+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() {
@@ -26,7 +24,7 @@ prepare() {
 
 build() {
 	cd build
-	cmake ../${_pkgname}-${pkgver} \
+	cmake ../${pkgname}-${pkgver} \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DKDE4_BUILD_TESTS=OFF \
 		-DCMAKE_INSTALL_PREFIX=/usr
diff --git a/nonprism/kdepim-runtime-nonprism/kdepim-runtime.install b/nonprism/kdepim-runtime/kdepim-runtime.install
index c77e68041..c77e68041 100644
--- a/nonprism/kdepim-runtime-nonprism/kdepim-runtime.install
+++ b/nonprism/kdepim-runtime/kdepim-runtime.install
diff --git a/nonprism/kdepim-nonprism/PKGBUILD b/nonprism/kdepim/PKGBUILD
index abcfe2387..7f7de7b1a 100644
--- a/nonprism/kdepim-nonprism/PKGBUILD
+++ b/nonprism/kdepim/PKGBUILD
@@ -4,21 +4,21 @@
 # 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')
+pkgname=('kdepim-akonadiconsole'
+         'kdepim-kaddressbook'
+         'kdepim-kjots'
+         'kdepim-kmail'
+         'kdepim-knode'
+         'kdepim-knotes'
+         'kdepim-korganizer'
+         'kdepim-libkdepim')
 pkgver=4.14.0
-pkgrel=1
+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-nonprism' 'libxss' 'pilot-link'
+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')
@@ -36,25 +36,23 @@ build() {
 	make
 }
 
-package_kdepim-akonadiconsole-nonprism() {
+package_kdepim-akonadiconsole() {
 	pkgdesc='Akonadi Management and Debugging Console, without Google Drive support'
 	depends=('kdepim-libkdepim')
-	conflicts=('kdepim-akonadiconsole')
-	replaces=('kdepim-akonadiconsole')
-	provides=("kdepim-akonadiconsole=${pkgver}")
+	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-nonprism() {
+package_kdepim-kaddressbook() {
 	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}")
+	conflicts=('kdepim-kaddressbook-nonprism')
+	replaces=('kdepim-kaddressbook-nonprism')
   install='kdepim-kaddressbook.install'
   for i in kaddressbook kontact/plugins/kaddressbook \
     plugins/kaddressbook; do
@@ -63,13 +61,12 @@ package_kdepim-kaddressbook-nonprism() {
   done
 }
 
-package_kdepim-kjots-nonprism() {
+package_kdepim-kjots() {
 	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}")
+	conflicts=('kdepim-kjots-nonprism')
+	replaces=('kdepim-kjots-nonprism')
 	install='kdepim.install'
 	cd "${srcdir}"/build/kjots
 	make DESTDIR="${pkgdir}" install
@@ -79,16 +76,15 @@ package_kdepim-kjots-nonprism() {
 	make DESTDIR="${pkgdir}" install
 }
 
-package_kdepim-kmail-nonprism() {
+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')
+	           'kdepim-mimelib' 'kdepim-plugins' 'kdepim-kmail-nonprism')
 	replaces=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve'
-	          'kdepim-mimelib' 'kdepim-plugins' 'kdepim-kmail')
-	provides=("kdepim-kmail=${pkgver}")
+	          '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
@@ -103,13 +99,12 @@ package_kdepim-kmail-nonprism() {
 	make DESTDIR="${pkgdir}" install
 }
 
-package_kdepim-knode-nonprism() {
+package_kdepim-knode() {
 	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}")
+	conflicts=('kdepim-knode-nonprism')
+	replaces=('kdepim-knode-nonprism')
 	install='kdepim-knode.install'
 	cd "${srcdir}"/build/knode
 	make DESTDIR="${pkgdir}" install
@@ -119,13 +114,12 @@ package_kdepim-knode-nonprism() {
 	make DESTDIR="${pkgdir}" install
 }
 
-package_kdepim-knotes-nonprism() {
+package_kdepim-knotes() {
 	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}")
+	conflicts=('kdepim-knotes-nonprism')
+	replaces=('kdepim-knotes-nonprism')
 	install='kdepim.install'
 	cd "${srcdir}"/build/knotes
 	make DESTDIR="${pkgdir}" install
@@ -137,13 +131,12 @@ package_kdepim-knotes-nonprism() {
 	make DESTDIR="${pkgdir}" install
 }
 
-package_kdepim-korganizer-nonprism() {
+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')
-	replaces=('kdepim-korganizer')
-	provides=("kdepim-korganizer=${pkgver}")
+	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}
@@ -153,16 +146,15 @@ package_kdepim-korganizer-nonprism() {
 	make DESTDIR="${pkgdir}" install
 }
 
-package_kdepim-libkdepim-nonprism() {
+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')
+	           'kdepim-akonadi' 'kdepim-libkdepim-nonprism')
 	replaces=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp'
-	          'kdepim-akonadi' 'kdepim-libkdepim')
-	provides=("kdepim-libkdepim=${pkgver}")
+	          'kdepim-akonadi' 'kdepim-libkdepim-nonprism')
 	install='kdepim.install'
 	for i in agents/sendlateragent akonadi_next calendarsupport \
   incidenceeditor-ng kaddressbookgrantlee kdgantt2 libkdepim \
diff --git a/nonprism/kdepim-nonprism/kdepim-akregator.install b/nonprism/kdepim/kdepim-akregator.install
index 5787df72f..5787df72f 100644
--- a/nonprism/kdepim-nonprism/kdepim-akregator.install
+++ b/nonprism/kdepim/kdepim-akregator.install
diff --git a/nonprism/kdepim-nonprism/kdepim-kaddressbook.install b/nonprism/kdepim/kdepim-kaddressbook.install
index 5c501dc49..5c501dc49 100644
--- a/nonprism/kdepim-nonprism/kdepim-kaddressbook.install
+++ b/nonprism/kdepim/kdepim-kaddressbook.install
diff --git a/nonprism/kdepim-nonprism/kdepim-kmail.install b/nonprism/kdepim/kdepim-kmail.install
index 5787df72f..5787df72f 100644
--- a/nonprism/kdepim-nonprism/kdepim-kmail.install
+++ b/nonprism/kdepim/kdepim-kmail.install
diff --git a/nonprism/kdepim-nonprism/kdepim-knode.install b/nonprism/kdepim/kdepim-knode.install
index 5787df72f..5787df72f 100644
--- a/nonprism/kdepim-nonprism/kdepim-knode.install
+++ b/nonprism/kdepim/kdepim-knode.install
diff --git a/nonprism/kdepim-nonprism/kdepim-korganizer.install b/nonprism/kdepim/kdepim-korganizer.install
index 5787df72f..5787df72f 100644
--- a/nonprism/kdepim-nonprism/kdepim-korganizer.install
+++ b/nonprism/kdepim/kdepim-korganizer.install
diff --git a/nonprism/kdepim-nonprism/kdepim.install b/nonprism/kdepim/kdepim.install
index e70c054ec..e70c054ec 100644
--- a/nonprism/kdepim-nonprism/kdepim.install
+++ b/nonprism/kdepim/kdepim.install