[arch-commits] Commit in kate/trunk (PKGBUILD)

[Antonio Rojas]

    Date: Sunday, July 9, 2017 @ 09:34:58
  Author: arojas
Revision: 299925

libgit2 0.26 rebuild

Modified:
  kate/trunk/PKGBUILD

----------+
 PKGBUILD |   34 ++++++++++++----------------------
 1 file changed, 12 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-07-09 09:22:04 UTC (rev 299924)
+++ PKGBUILD	2017-07-09 09:34:58 UTC (rev 299925)
@@ -4,19 +4,16 @@
 # Contributor: Andrea Scarpino <andrea at archlinux.org>
 
 pkgbase=kate
-pkgname=('kwrite'
-         'kate')
+pkgname=(kwrite kate)
 pkgver=17.04.2
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-makedepends=('extra-cmake-modules' 'kdoctools' 'python' 'plasma-framework' 'knewstuff' 'ktexteditor'
-             'threadweaver' 'kitemmodels' 'kactivities')
+pkgrel=2
+arch=(i686 x86_64)
+license=(GPL LGPL FDL)
+makedepends=(extra-cmake-modules kdoctools python plasma-framework knewstuff ktexteditor threadweaver kitemmodels kactivities)
 source=("https://download.kde.org/stable/applications/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"{,.sig})
 sha256sums=('1045c5bee48ade8c229096eeaa8696eba4dac118bccc2a535f9ac553602fcaaf'
             'SKIP')
 validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid <aacid at kde.org>
-options=(!emptydirs)
 
 prepare() {
   mkdir -p build
@@ -24,11 +21,10 @@
 
 build() {
   cd build
-  cmake ../${pkgbase}-${pkgver} \
+  cmake ../$pkgbase-$pkgver \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DKDE_INSTALL_LIBDIR=lib \
-    -DSYSCONF_INSTALL_DIR=/etc \
     -DBUILD_TESTING=OFF
   make
 }
@@ -35,15 +31,12 @@
 
 package_kwrite() {
   pkgdesc="Text Editor"
-  groups=('kde-applications' 'kdebase')
+  groups=(kde-applications kdebase)
   url="https://www.kde.org/applications/utilities/kwrite/"
-  depends=('ktexteditor' 'kactivities' 'hicolor-icon-theme')
-  replaces=('kdebase-kwrite')
-  conflicts=('kdebase-kwrite')
-  provides=('kdebase-kwrite')
+  depends=(ktexteditor kactivities hicolor-icon-theme)
 
   cd build
-  make DESTDIR="${pkgdir}" install
+  make DESTDIR="$pkgdir" install
 
   find "$pkgdir" -type f -name '*kate*' -exec rm {} \;
   rm -r "$pkgdir"/usr/lib/qt/plugins/ktexteditor \
@@ -55,16 +48,13 @@
 
 package_kate() {
   pkgdesc="Advanced Text Editor"
-  groups=('kde-applications' 'kdebase')
+  groups=(kde-applications kdebase)
   url="https://www.kde.org/applications/utilities/kate/"
-  depends=('knewstuff' 'ktexteditor' 'threadweaver' 'kitemmodels' 'kactivities' 'hicolor-icon-theme')
-  replaces=('kdesdk-kate')
-  conflicts=('kdesdk-kate')
-  provides=('kdesdk-kate')
+  depends=(knewstuff ktexteditor threadweaver kitemmodels kactivities hicolor-icon-theme)
   optdepends=('konsole: open a terminal in Kate')
 
   cd build
-  make DESTDIR="${pkgdir}" install
+  make DESTDIR="$pkgdir" install
 
   find "$pkgdir" -type f -name '*kwrite*' -exec rm {} \;
   rm -r "$pkgdir"/usr/share/doc/HTML/*/kwrite