0.8.2.r2: update makedepends

3 files changed, 58 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 77864c81cd26..3b936a7ffd40 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,19 @@
 pkgbase = kwin-scripts-krohnkite-git
 	pkgdesc = A dynamic tiling extension for KWin
-	pkgver = r464.2a47753
-	pkgrel = 2
-	url = https://github.com/esjeon/krohnkite.git
+	pkgver = 0.8.2.r2.gbc6fe23
+	pkgrel = 1
+	url = https://github.com/esjeon/krohnkite
 	arch = any
 	license = MIT
 	makedepends = make
-	makedepends = plasma-framework
+	makedepends = plasma-framework5
 	makedepends = typescript
 	makedepends = p7zip
 	makedepends = git
 	depends = kwin
-	provides = krohnkite
-	conflicts = krohnkite
+	provides = kwin-scripts-krohnkite
+	conflicts = kwin-scripts-krohnkite
 	source = krohnkite::git+https://github.com/esjeon/krohnkite.git
-	md5sums = SKIP
+	sha256sums = SKIP
 
 pkgname = kwin-scripts-krohnkite-git
-
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..018a3de08144
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*
+!PKGBUILD
+!.SRCINFO
+!.gitignore
diff --git a/PKGBUILD b/PKGBUILD
index e20ca7035257..988e30cf59b6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,57 @@
-# Maintainer: Jan Buchar <Teyras@gmail.com>
+# Maintainer:
+# Contributor: Jan Buchar <Teyras@gmail.com>
 
-pkgname=kwin-scripts-krohnkite-git
-_gitname=krohnkite
-pkgver=r464.2a47753
-pkgrel=2
+_gitname="krohnkite"
+_pkgname="kwin-scripts-$_gitname"
+pkgname="$_pkgname-git"
+pkgver=0.8.2.r2.gbc6fe23
+pkgrel=1
 pkgdesc="A dynamic tiling extension for KWin"
-arch=('any')
-url="https://github.com/esjeon/krohnkite.git"
+url="https://github.com/esjeon/krohnkite"
 license=('MIT')
+arch=('any')
+
 depends=('kwin')
-makedepends=('make' 'plasma-framework' 'typescript' 'p7zip' 'git')
-provides=("$_gitname")
-conflicts=("$_gitname")
-source=("$_gitname::git+$url")
-md5sums=('SKIP')
-
-pkgver() {
-  cd "${srcdir}/${_gitname}"
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
+makedepends=(
+  'make'
+  'plasma-framework5'
+  'typescript'
+  'p7zip'
+)
+
+if [ x"$pkgname" == x"$_pkgname" ] ; then
+  # normal package
+  :
+else
+  # git package
+  makedepends+=('git')
+
+  provides=("$_pkgname")
+  conflicts=("$_pkgname")
+
+  _pkgsrc="$_gitname"
+  source=("$_pkgsrc"::"git+$url.git")
+  sha256sums=('SKIP')
+
+  pkgver() {
+    cd "$_pkgsrc"
+    git describe --long --tags | sed -E 's/^v//;s/([^-]*-g)/r\1/;s/-/./g'
+  }
+fi
 
 build() {
-  mkdir -p "${srcdir}/pkg"
-  cd "${srcdir}/${_gitname}"
-  HOME=${srcdir}/pkg XDG_DATA_HOME= make -e install
+  cd "$_pkgsrc"
+
+  mkdir -p "${srcdir:?}/pkg"
+  HOME="${srcdir:?}/pkg" XDG_DATA_HOME= make -e install
 }
 
 package() {
-  cd "${srcdir}/${_gitname}"
-  install -d "${pkgdir}/usr/share/kwin/scripts/${_gitname}"
-  cp -ra "${srcdir}/pkg/.local/share/kwin/scripts/${_gitname}/." "${pkgdir}/usr/share/kwin/scripts/${_gitname}/"
-  install -Dm644 "${srcdir}/pkg/.local/share/kwin/scripts/${_gitname}/metadata.desktop" "${pkgdir}/usr/share/kservices5/${_gitname}.desktop"
+  install -d "${pkgdir:?}/usr/share/kwin/scripts/$_gitname"
+
+  cp -ra "${srcdir:?}/pkg/.local/share/kwin/scripts/$_gitname/." "${pkgdir:?}/usr/share/kwin/scripts/$_gitname/"
+
+  install -Dm644 "${srcdir:?}/pkg/.local/share/kwin/scripts/$_gitname/metadata.desktop" "${pkgdir:?}/usr/share/kservices5/$_gitname.desktop"
+
+  install -Dm644 "${srcdir:?}/$_pkgsrc/LICENSE" -t "${pkgdir:?}/usr/share/licenses/$pkgname/"
 }