community/xe-guest-utilities: modernize, remove unused patch

also add udev to makedepends since a subpackage needs it. this is so
correct build order can be calculated.

2 files changed, 7 insertions, 62 deletions

diff --git a/community/xe-guest-utilities/APKBUILD b/community/xe-guest-utilities/APKBUILD
index e344814dbbe..a04672f37b3 100644
--- a/community/xe-guest-utilities/APKBUILD
+++ b/community/xe-guest-utilities/APKBUILD
@@ -2,41 +2,30 @@
 # Maintainer: Cedric Schieli <cschieli@gmail.com>
 pkgname=xe-guest-utilities
 pkgver=6.6.80
-pkgrel=0
+pkgrel=1
 pkgdesc="XenServer guest tools"
 url="https://github.com/xenserver/xe-guest-utilities"
 arch="x86 x86_64"
 license="BSD-2-Clause"
 depends=
-makedepends=go
+makedepends="go udev"
 install=
 subpackages="${pkgname}-udev:udev:noarch"
 options="!check"
 source="${pkgname}-${pkgver}.tar.gz::https://github.com/xenserver/${pkgname}/archive/v${pkgver}.tar.gz
 	$pkgname.initd
-	identify_alpine.patch
 	"
 
-_builddir="$srcdir"/$pkgname-$pkgver
-
-prepare() {
-	cd "$_builddir/mk"
-
-	for i in ../*.diff ../*.patch; do
-		[ -f $i ] || continue
-		msg "Applying $i..."
-		patch -s -p1 -N < $i || return 1
-	done
-}
+builddir="$srcdir"/$pkgname-$pkgver
 
 build() {
-	cd "$_builddir"
+	cd "$builddir"
 	make
 }
 
 package() {
 	mkdir -p "$pkgdir"
-	cp -ar "${_builddir}/build/stage/usr/" "$pkgdir/"
+	cp -ar "${builddir}/build/stage/usr/" "$pkgdir/"
 	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
 }
 
@@ -47,9 +36,8 @@ udev() {
 	udev_dir="etc/udev/rules.d"
 	mkdir -p "${subpkgdir}/${udev_dir}"
 	filename="z10_xen-vcpu-hotplug.rules"
-	install -m644 -D "${_builddir}/build/stage/${udev_dir}/${filename}" "${subpkgdir}/${udev_dir}/${filename}"
+	install -m644 -D "${builddir}/build/stage/${udev_dir}/${filename}" "${subpkgdir}/${udev_dir}/${filename}"
 }
 
 sha512sums="8b4519e5c23cb57b2ee86435cec8078912921d2c9c49f90eddba6f0f122d0dec0091690d5280bebb7af97c13095640b6cb77ea7e1a813d828dd31514096069aa  xe-guest-utilities-6.6.80.tar.gz
-3e898b473f6e71ecc5b820717df0a460b31756b68f4bb9bf454df39f430e64ca5e33582c03bfea044d93f49937883fe9b6807c31dee72307750de670bfca8bcd  xe-guest-utilities.initd
-94d0d3c6f082dc76e7a76b48d1ecfff7d38ba6da344d1fdfa94c7a8f6c23ca726bccc7b1c8934f41ab06bb9a6b8582aec7448a99d17598b19dc8f3a73f1cd08a  identify_alpine.patch"
+3e898b473f6e71ecc5b820717df0a460b31756b68f4bb9bf454df39f430e64ca5e33582c03bfea044d93f49937883fe9b6807c31dee72307750de670bfca8bcd  xe-guest-utilities.initd"
diff --git a/community/xe-guest-utilities/identify_alpine.patch b/community/xe-guest-utilities/identify_alpine.patch
deleted file mode 100644
index d645c139aba..00000000000
--- a/community/xe-guest-utilities/identify_alpine.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- xe-guest-utilities-5.5.0.orig/xe-linux-distribution
-+++ xe-guest-utilities-5.5.0/xe-linux-distribution
-@@ -248,6 +248,32 @@
-     write_to_output "${distro}" "${major}" "${minor}" "${description}"
- }
- 
-+identify_alpine()
-+{
-+    alpine_release="$1"
-+    local major
-+    local minor
-+
-+    if [ ! -f "${alpine_release}" ] ; then
-+        return 1
-+    fi
-+
-+    eval $(sed -n \
-+               -e 's/^.*-\([0-9]*\)\.\([0-9]*\)\.[0-9]* .*$/major=\1;minor=\2/gp;' \
-+               -e 's/^.*-\([0-9]*\) .*$/major=\1;minor=/gp;' \
-+                         "${alpine_release}")
-+    
-+    if [ -z "${major}" ] ; then
-+        return 1
-+    fi
-+
-+    if [ -z "${minor}" ] ; then
-+        minor=0
-+    fi
-+
-+    write_to_output "alpine" "${major}" "${minor}" "Alpinelinux $(head -n 1 $alpine_release)"
-+}
-+
- if [ $# -eq 1 ] ; then
-     exec 1>"$1"
- fi
-@@ -257,6 +283,7 @@
-     identify_sles   /etc/SuSE-release   && exit 0
-     identify_lsb    lsb_release         && exit 0
-     identify_debian /etc/debian_version && exit 0
-+    identify_alpine /etc/alpine-release && exit 0
- 
-     if [ $# -eq 1 ] ; then
- 	rm -f "$1"