V4.1.4-2

Remove package kde indicator

2 files changed, 16 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 729524f4c901..df3da35e57e2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,11 @@
 # Generated by mksrcinfo v8
-# Wed Aug 31 07:31:49 UTC 2016
+# Wed Aug 31 07:41:44 UTC 2016
 pkgbase = pamac-aur
 	pkgdesc = A Gtk3 frontend for libalpm
 	pkgver = 4.1.4
 	pkgrel = 2
 	url = https://github.com/manjaro/pamac
+	install = pamac.install
 	arch = any
 	license = GPL3
 	makedepends = gettext
@@ -21,24 +22,15 @@ pkgbase = pamac-aur
 	depends = desktop-file-utils
 	depends = pacman>=5.0
 	depends = gnutls>=3.4
-	options = !emptydirs
-	source = pamac-4.1.4-2.tar.gz::https://github.com/manjaro/pamac/archive/v4.1.4.tar.gz
-	sha256sums = edd0c0ee836be6c572f1bbaf5852324754ec9f574e003e6efe828ebeaaeaff65
-
-pkgname = pamac-aur
-	install = pamac.install
 	optdepends = polkit-gnome: needed for authentification in Cinnamon, Gnome
 	optdepends = lxsession: needed for authentification in Xfce, LXDE etc.
 	optdepends = yaourt: needed for AUR support
-	optdepends = pamac-dev-tray-appindicator: tray icon for KDE
 	provides = pamac
 	conflicts = pamac
+	options = !emptydirs
 	backup = etc/pamac.conf
+	source = pamac-4.1.4-2.tar.gz::https://github.com/manjaro/pamac/archive/v4.1.4.tar.gz
+	sha256sums = edd0c0ee836be6c572f1bbaf5852324754ec9f574e003e6efe828ebeaaeaff65
 
-pkgname = pamac-aur-tray-appindicator
-	pkgdesc = Tray icon using appindicator which feets better in KDE
-	depends = pamac-aur
-	depends = libappindicator-gtk3
-	provides = pamac-tray-appindicator
-	conflicts = pamac-tray-appindicator
+pkgname = pamac-aur
 
diff --git a/PKGBUILD b/PKGBUILD
index 27ba35dd17e1..59b28944c05b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,6 @@
 # Contributor: Zeph <zeph33@gmail.com>
 # Maintainer: Zeph <zeph33@gmail.com>
-pkgbase=pamac-aur
-pkgname=('pamac-aur' 'pamac-aur-tray-appindicator')
+pkgname=pamac-aur
 pkgver=4.1.4
 _pkgver=4.1.4
 pkgrel=2
@@ -11,8 +10,15 @@ url="https://github.com/manjaro/pamac"
 license=('GPL3')
 depends=('glib2>=2.42' 'json-glib' 'libsoup' 'dbus-glib' 'polkit' 'vte3>=0.38' 'gtk3>=3.18'
          'libnotify' 'desktop-file-utils' 'pacman>=5.0' 'gnutls>=3.4')
+optdepends=('polkit-gnome: needed for authentification in Cinnamon, Gnome'
+            'lxsession: needed for authentification in Xfce, LXDE etc.'
+            'yaourt: needed for AUR support')
 makedepends=('gettext' 'itstool' 'vala>=0.28')
+backup=('etc/pamac.conf')
+conflicts=('pamac')
+provides=('pamac')
 options=(!emptydirs)
+install=pamac.install
 
 source=("pamac-$pkgver-$pkgrel.tar.gz::https://github.com/manjaro/pamac/archive/v$_pkgver.tar.gz")
 sha256sums=('edd0c0ee836be6c572f1bbaf5852324754ec9f574e003e6efe828ebeaaeaff65')
@@ -26,32 +32,13 @@ prepare() {
 
 build() {
   cd "$srcdir/pamac-$_pkgver"
-
   # build
   make all
 }
 
-package_pamac-aur() {
-  optdepends=('polkit-gnome: needed for authentification in Cinnamon, Gnome'
-              'lxsession: needed for authentification in Xfce, LXDE etc.'
-              'yaourt: needed for AUR support'
-              'pamac-dev-tray-appindicator: tray icon for KDE')
-  backup=('etc/pamac.conf')
-  conflicts=('pamac')
-  provides=('pamac')
-  install=pamac.install
-  cd "$srcdir/pamac-$_pkgver"
-  make prefix="$pkgdir"/usr sysconfdir="$pkgdir"/etc install
-}
+package() {
 
-package_pamac-aur-tray-appindicator() {
-  pkgdesc="Tray icon using appindicator which feets better in KDE"
-  depends=('pamac-aur' 'libappindicator-gtk3')
-  provides=('pamac-tray-appindicator')
-  conflicts=('pamac-tray-appindicator')
   cd "$srcdir/pamac-$_pkgver"
-  make use_appindicator=true
-  install -Dm755 src/pamac-tray-appindicator "$pkgdir"/usr/bin/pamac-tray-appindicator
-  install -Dm644 data/applications/pamac-tray-appindicator.desktop "$pkgdir"/etc/xdg/autostart/pamac-tray-appindicator.desktop
+  make prefix="$pkgdir"/usr sysconfdir="$pkgdir"/etc install
 }
 # vim:set ts=2 sw=2 et: