diff options
| -rw-r--r-- | libre/kdebase-konqueror/PKGBUILD (renamed from libre/kdebase-konqueror-libre/PKGBUILD) | 10 | ||||
| -rw-r--r-- | libre/kdebase-konqueror/kdebase-konqueror.install (renamed from libre/kdebase-konqueror-libre/kdebase-konqueror.install) | 0 | ||||
| -rw-r--r-- | libre/kdebase-konqueror/konq-about-fsdg.diff (renamed from libre/kdebase-konqueror-libre/konq-about-fsdg.diff) | 0 | ||||
| -rw-r--r-- | libre/kdebase-runtime/PKGBUILD (renamed from libre/kdebase-runtime-libre/PKGBUILD) | 12 | ||||
| -rw-r--r-- | libre/kdebase-runtime/duckduckgo_html.desktop (renamed from libre/kdebase-runtime-libre/duckduckgo_html.desktop) | 0 | ||||
| -rw-r--r-- | libre/kdebase-runtime/duckduckgo_lite.desktop (renamed from libre/kdebase-runtime-libre/duckduckgo_lite.desktop) | 0 | ||||
| -rw-r--r-- | libre/kdebase-runtime/kdebase-runtime.install (renamed from libre/kdebase-runtime-libre/kdebase-runtime.install) | 0 | ||||
| -rw-r--r-- | libre/kdelibs/PKGBUILD (renamed from libre/kdelibs-libre/PKGBUILD) | 18 | ||||
| -rw-r--r-- | libre/kdelibs/kde-applications-menu.patch (renamed from libre/kdelibs-libre/kde-applications-menu.patch) | 0 | ||||
| -rw-r--r-- | libre/kdelibs/kdelibs-cve-2014-5033.patch (renamed from libre/kdelibs-libre/kdelibs-cve-2014-5033.patch) | 0 | ||||
| -rw-r--r-- | libre/kdelibs/kdelibs.install (renamed from libre/kdelibs-libre/kdelibs.install) | 0 | ||||
| -rw-r--r-- | libre/kdelibs/khtml-fsdg.diff (renamed from libre/kdelibs-libre/khtml-fsdg.diff) | 0 | ||||
| -rw-r--r-- | libre/kdelibs/pyqt.patch (renamed from libre/kdelibs-libre/pyqt.patch) | 0 | ||||
| -rw-r--r-- | libre/kdelibs/qt4.patch (renamed from libre/kdelibs-libre/qt4.patch) | 0 | ||||
| -rw-r--r-- | libre/kdenetwork-kopete/PKGBUILD (renamed from libre/kdenetwork-kopete-libre/PKGBUILD) | 12 | ||||
| -rw-r--r-- | libre/kdenetwork-kopete/kdenetwork-kopete.install (renamed from libre/kdenetwork-kopete-libre/kdenetwork-kopete.install) | 0 | ||||
| -rw-r--r-- | libre/kdenetwork-kopete/kdenetwork.install (renamed from libre/kdenetwork-kopete-libre/kdenetwork.install) | 0 | ||||
| -rw-r--r-- | libre/kdeutils-ark/PKGBUILD (renamed from libre/kdeutils-ark-libre/PKGBUILD) | 12 | ||||
| -rw-r--r-- | libre/kdeutils-ark/ark-unar-06.patch (renamed from libre/kdeutils-ark-libre/ark-unar-06.patch) | 0 | ||||
| -rw-r--r-- | libre/kdeutils-ark/kdeutils-ark.install (renamed from libre/kdeutils-ark-libre/kdeutils-ark.install) | 0 | ||||
| -rw-r--r-- | nonprism/kde-meta/PKGBUILD (renamed from nonprism/kde-meta-nonprism/PKGBUILD) | 36 | ||||
| -rw-r--r-- | nonprism/kdenetwork-kopete/PKGBUILD (renamed from nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD) | 12 | ||||
| -rw-r--r-- | nonprism/kdenetwork-kopete/kdenetwork-kopete.install (renamed from nonprism/kdenetwork-kopete-libre-nonprism/kdenetwork-kopete.install) | 0 | ||||
| -rw-r--r-- | nonprism/kdenetwork-kopete/kdenetwork.install (renamed from nonprism/kdenetwork-kopete-libre-nonprism/kdenetwork.install) | 0 | ||||
| -rw-r--r-- | nonprism/kdenetwork-kopete/libre-nonprism.patch (renamed from nonprism/kdenetwork-kopete-libre-nonprism/libre-nonprism.patch) | 0 | ||||
| -rw-r--r-- | nonprism/kdepim-runtime/PKGBUILD (renamed from nonprism/kdepim-runtime-nonprism/PKGBUILD) | 16 | ||||
| -rw-r--r-- | nonprism/kdepim-runtime/kdepim-runtime.install (renamed from nonprism/kdepim-runtime-nonprism/kdepim-runtime.install) | 0 | ||||
| -rw-r--r-- | nonprism/kdepim/PKGBUILD (renamed from nonprism/kdepim-nonprism/PKGBUILD) | 76 | ||||
| -rw-r--r-- | nonprism/kdepim/kdepim-akregator.install (renamed from nonprism/kdepim-nonprism/kdepim-akregator.install) | 0 | ||||
| -rw-r--r-- | nonprism/kdepim/kdepim-kaddressbook.install (renamed from nonprism/kdepim-nonprism/kdepim-kaddressbook.install) | 0 | ||||
| -rw-r--r-- | nonprism/kdepim/kdepim-kmail.install (renamed from nonprism/kdepim-nonprism/kdepim-kmail.install) | 0 | ||||
| -rw-r--r-- | nonprism/kdepim/kdepim-knode.install (renamed from nonprism/kdepim-nonprism/kdepim-knode.install) | 0 | ||||
| -rw-r--r-- | nonprism/kdepim/kdepim-korganizer.install (renamed from nonprism/kdepim-nonprism/kdepim-korganizer.install) | 0 | ||||
| -rw-r--r-- | nonprism/kdepim/kdepim.install (renamed from nonprism/kdepim-nonprism/kdepim.install) | 0 |
34 files changed, 90 insertions, 114 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 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 |