From 983cf5027a39aea180b8c6333f86b74096ccba6c Mon Sep 17 00:00:00 2001
From: Enno Boland <eb@s01.de>
Date: Thu, 12 Mar 2015 17:28:30 +0100
Subject: [PATCH] android-tools: fix adb service.

---
 srcpkgs/android-tools/files/adb/finish | 3 +++
 srcpkgs/android-tools/files/adb/run    | 4 +++-
 srcpkgs/android-tools/template         | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100755 srcpkgs/android-tools/files/adb/finish

diff --git a/srcpkgs/android-tools/files/adb/finish b/srcpkgs/android-tools/files/adb/finish
new file mode 100755
index 00000000000..6c123ce447d
--- /dev/null
+++ b/srcpkgs/android-tools/files/adb/finish
@@ -0,0 +1,3 @@
+#!/bin/sh
+set -e
+exec adb kill-server
diff --git a/srcpkgs/android-tools/files/adb/run b/srcpkgs/android-tools/files/adb/run
index 18f6ea7728c..9d81719e4c7 100755
--- a/srcpkgs/android-tools/files/adb/run
+++ b/srcpkgs/android-tools/files/adb/run
@@ -1,3 +1,5 @@
 #!/bin/sh
+set -e
 [ -r conf ] && . ./conf
-exec adb fork-server server ${OPTS:=-P 5037}
+adb ${OPTS:=start-server -P5037}
+exec chpst -b adb pause
diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 13f6a08bb45..1d1f23b133b 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'android-tools'
 pkgname=android-tools
 version=5.1.0_r1
-revision=2
+revision=3
 create_wrksrc=yes
 build_style=gnu-makefile
 hostmakedepends="git"