upgpkg: gnome-shell-extension-appindicator 17

3 files changed, 25 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1b862eba5eca..e056056ef216 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,15 @@
 pkgbase = gnome-shell-extension-appindicator-git
 	pkgdesc = Integrates AppIndicators into GNOME Shell.
-	pkgver = 16.r0.g86cd3a2
+	pkgver = 17.r4.g6a1a114
 	pkgrel = 1
 	url = https://github.com/rgcjonas/gnome-shell-extension-appindicator
-	install = gschemas.install
 	arch = any
 	license = GPL
 	makedepends = git
 	depends = gnome-shell
-	depends = libappindicator
-	depends = python2
-	options = !emptydirs
+	optdepends = libappindicator-gtk2: support GTK+2 applications
+	optdepends = libappindicator-gtk3: support GTK+3 applications
+	optdepends = libappindicator-sharp: support .net applications
 	source = gnome-shell-extension-appindicator-git::git+https://github.com/rgcjonas/gnome-shell-extension-appindicator.git
 	sha512sums = SKIP
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..9a009bcc0a42
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+gnome-shell-extension-appindicator-git/
+pkg/
+src/
+*.pkg.tar.*
diff --git a/PKGBUILD b/PKGBUILD
index 6a28f991d225..6ba95fdb2ea7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,48 +1,38 @@
 # Maintainer: Llewelyn Trahaearn <WoefulDerelict at GMail dot com>
 # Contributor: Dave Kleinschmidt <dave.f.kleinschmidt at gmail dot com>
 # Contributor: Frikilinux <frikilinux at gmail dot com>
+# Contributor: Surefire <surefire at cryptomile.net>
 
 pkgname=gnome-shell-extension-appindicator-git
-pkgver=16.r0.g86cd3a2
+pkgver=17.r4.g6a1a114
 pkgrel=1
 pkgdesc="Integrates AppIndicators into GNOME Shell."
 arch=('any')
 url="https://github.com/rgcjonas/gnome-shell-extension-appindicator"
 license=('GPL')
-depends=('gnome-shell' 'libappindicator' 'python2')
 makedepends=('git')
-options=('!emptydirs')
-install="gschemas.install"
+depends=('gnome-shell')
+optdepends=(
+  'libappindicator-gtk2: support GTK+2 applications'
+  'libappindicator-gtk3: support GTK+3 applications'
+  'libappindicator-sharp: support .net applications'
+)
 source=("${pkgname}::git+https://github.com/rgcjonas/gnome-shell-extension-appindicator.git")
 sha512sums=('SKIP')
-_branch=master
 
 pkgver() {
-  cd "${srcdir}/${pkgname}"
-  git checkout ${_branch} --quiet
-  ( set -o pipefail
-    git describe --long 2>/dev/null | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' ||
-    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-  )
-}
-
-prepare() {
-  cd "${srcdir}/${pkgname}"
-  git checkout ${_branch}
-}
-
-build() {
-  cd "${srcdir}/${pkgname}"
-  make
+  cd "${pkgname}"
+  git describe --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 package() {
+  cd "${pkgname}"
   # Locate the extension.
-  cd "$(dirname $(find -name 'metadata.json' -print -quit))"
-  _extname=$(grep -Po '(?<="uuid": ")[^"]*' metadata.json)
-  _destdir="${pkgdir}/usr/share/gnome-shell/extensions/${_extname}"
+  local _extname="$(grep -Po '(?<="uuid": ")[^"]*' metadata.json)"
+  local _destdir="${pkgdir}/usr/share/gnome-shell/extensions/${_extname}"
+
   # Copy extension files into place.
-  find -maxdepth 1 \( -iname '*.js*' -or -iname '*.css' -or -iname '*.ui' \) -exec install -Dm644 -t "${_destdir}" '{}' +
-  find -maxdepth 2 \( -wholename '*schemas/*.xml' \) -exec install -Dm644 -t "${pkgdir}/usr/share/glib-2.0/schemas/" '{}' +
-  cp -r --no-preserve=ownership,mode indicator-test-tool interfaces-xml "${_destdir}"
+  install -Dm644 -t "${_destdir}"                          ./*.js metadata.json
+  install -Dm644 -t "${_destdir}/interfaces-xml"           ./interfaces-xml/*.xml
+  install -Dm644 -t "${pkgdir}/usr/share/glib-2.0/schemas" ./interfaces-xml/*.xml
 }