psensor: dont pick up appindicator-gtk2

diff --git a/.gitignore b/.gitignore
index 05c6d4d..c7edcf6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
-*
-!.gitignore
-!.SRCINFO
-!PKGBUILD
+# makepkg folders
+src
+pkg
+
+# generated packages
+*.tar.*
diff --git a/PKGBUILD b/PKGBUILD
index 915f484..112d030 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@

 pkgname=psensor
 pkgver=1.1.5
-pkgrel=1
+pkgrel=2
 pkgdesc="A graphical hardware temperature monitor for Linux"
 arch=('i686' 'x86_64')
 url="http://wpitchoune.net/psensor"
@@ -18,14 +18,22 @@ optdepends=('asciidoc: required to produce the HTML version of the FAQ'
 	'json-c: required for remote monitoring'
 	'curl: required for remote monitoring'
 	'libgtop: required for CPU usage')
-conflicts=('libappindicator-gtk2' 'libappindicator-activate-gtk2' 'libappindicator-gtk2-ubuntu' 'lib32-libappindicator-gtk2')
-source=("http://wpitchoune.net/$pkgname/files/$pkgname-$pkgver.tar.gz")
-md5sums=('db6fa7496576b63979c1c6e5e707142e')
+source=("http://wpitchoune.net/$pkgname/files/$pkgname-$pkgver.tar.gz"
+	"remove appindicator-gtk2 checks.patch")
+md5sums=('db6fa7496576b63979c1c6e5e707142e'
+         'acfbe3bd06ced3af51831a84608366c6')
+
+prepare() {
+	cd "$srcdir/$pkgname-$pkgver"
+	patch -p1 -i "$srcdir/remove appindicator-gtk2 checks.patch"
+	autoreconf --force --install
+}

 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 	./configure --prefix=/usr
-	make
+	# running autoreconf apparently breaks the parallel build with appindicator, so serialize explicitly
+	make --jobs=1
 }

 package() {
diff --git a/remove appindicator-gtk2 checks.patch b/remove appindicator-gtk2 checks.patch
new file mode 100644
index 0000000..0cbc3aa
--- /dev/null
+++ b/remove appindicator-gtk2 checks.patch
@@ -0,0 +1,26 @@
+diff --git a/configure.ac b/configure.ac
+index 803214d..0be0f46 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -110,21 +110,6 @@ PKG_CHECK_MODULES(APPINDICATOR, appindicator3-0.1,
+      [AC_DEFINE([HAVE_APPINDICATOR],[1],[Use AppIndicator3-0.1])],
+      [AC_MSG_WARN(AppIndicator 3-0.1 not present")])
+
+-if test "$APPINDICATOR_LIBS" == ""; then
+-   PKG_CHECK_MODULES(APPINDICATOR,
+-     appindicator-0.1 <= 0.2.9 ,
+-     [AC_DEFINE([HAVE_APPINDICATOR],[1],[Use AppIndicator 0.2.9])
+-      AC_DEFINE([HAVE_APPINDICATOR_029],[1],[Use AppIndicator 0.2.9])
+-     ],
+-     [AC_MSG_WARN(AppIndicator 0.2.9 not present")])
+-fi
+-
+-if test "$APPINDICATOR_LIBS" == ""; then
+-   PKG_CHECK_MODULES(APPINDICATOR,
+-     appindicator-0.1 > 0.2.9,
+-     [AC_DEFINE([HAVE_APPINDICATOR],[1],[Use AppIndicator > 0.2.9])],
+-     [AC_MSG_WARN("AppIndicator > 0.2.9 not present")])
+-fi
+ AM_CONDITIONAL(APPINDICATOR, test -n "$APPINDICATOR_LIBS")
+ AC_SUBST(APPINDICATOR_CFLAGS)
+ AC_SUBST(APPINDICATOR_LIBS)