kde packages: remove libre and nonprism suffixes, add complex pkgrel

20 files changed, 27 insertions, 37 deletions

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