From 3bd59b87dcc8438a688a25a0b78f0ccec320a983 Mon Sep 17 00:00:00 2001
From: Carlo Landmeter <clandmeter@gmail.com>
Date: Sat, 26 Nov 2016 23:14:14 +0100
Subject: testing/home-assistant: upgrade to 0.33.4 and update deps

---
 testing/home-assistant/APKBUILD | 63 ++++++++++++++++++-----------------------
 1 file changed, 28 insertions(+), 35 deletions(-)

(limited to 'testing/home-assistant/APKBUILD')

diff --git a/testing/home-assistant/APKBUILD b/testing/home-assistant/APKBUILD
index a5c0a142fe..b7eaed6ee1 100644
--- a/testing/home-assistant/APKBUILD
+++ b/testing/home-assistant/APKBUILD
@@ -1,32 +1,34 @@
 # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
 pkgname=home-assistant
 _pkgname=homeassistant
-pkgver=0.33.3
-pkgrel=1
+pkgver=0.33.4
+pkgrel=0
 pkgdesc="A Home automation platform"
 url="https://home-assistant.io"
 arch="all"
 license="MIT"
-depends="py3-requests py3-yaml py3-tz py3-jinja2 py3-voluptuous
-	py3-async-timeout"
+depends="
+	py3-requests
+	py3-yaml
+	py3-tz
+	py3-jinja2
+	py3-voluptuous
+	py3-aiohttp
+	py-netdisco
+	"
 makedepends="python3-dev"
-subpackages="$pkgname-aiohttp"
+subpackages=""
 pkgusers="hass"
 pkggroups="hass"
 install="$pkgname.pre-install"
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz
+source="$pkgname-$pkgver.tar.gz::https://github.com/home-assistant/home-assistant/archive/$pkgver.tar.gz
+	95b439fbd5ad96966dfe1176697c6ee4731a6207.patch
 	update-deps.patch
+
 	$pkgname.initd
 	$pkgname.confd"
-builddir="$srcdir"/$_pkgname-$pkgver
 
-# NOTE: https://github.com/home-assistant/home-assistant/issues/4288
-# hass needs aiohttp at older version then available in aports
-# this should be fixed upstream after which this can be moved to community
-_ver_aiohttp=1.0.5
-_builddir_aiohttp="$srcdir/aiohttp-$_ver_aiohttp"
-depends="$depends $pkgname-aiohttp"
-source="$source https://files.pythonhosted.org/packages/source/a/aiohttp/aiohttp-$_ver_aiohttp.tar.gz"
+builddir="$srcdir"/$pkgname-$pkgver
 
 build() {
 	cd "$builddir"
@@ -45,27 +47,18 @@ package() {
 		"$pkgdir"/etc/conf.d/hass || return 1
 }
 
-aiohttp() {
-	pkgdesc="$pkgdesc (aiohttp dependency)"
-	depends="python3 py3-async-timeout py3-chardet py3-multidict py3-yarl
-		!py3-aiohttp"
-	cd "$_builddir_aiohttp"
-	python3 setup.py install \
-		--root="$subpkgdir" --prefix=/usr --optimize=1 || return 1
-}
-
-md5sums="967d4c16becbdd99ef0fb34d718b7efc  homeassistant-0.33.3.tar.gz
-14cd39ae5fc2e0ecd744022963554a0c  update-deps.patch
+md5sums="6e48b65ed8cdfc330d7b41b9625a53dc  home-assistant-0.33.4.tar.gz
+0b10f28946288be517d237fff8bd6a4d  95b439fbd5ad96966dfe1176697c6ee4731a6207.patch
+e9594298e7aef8e682bf09bb6801081c  update-deps.patch
 f98b4840a76b5cee70b2f825cfb26103  home-assistant.initd
-6cc698d864cfe3970913202ccf4ccbab  home-assistant.confd
-488026a1c1e716741842403b7b9f030a  aiohttp-1.0.5.tar.gz"
-sha256sums="87e09608a98eebc532d079c9894fd6a123070b53b6f608542abab4e201486e86  homeassistant-0.33.3.tar.gz
-dc19ea6037f6a738d3614a122e55fe0b6c2a55686855372e659de9bb25e7d97e  update-deps.patch
+6cc698d864cfe3970913202ccf4ccbab  home-assistant.confd"
+sha256sums="4946fbba5c9951d4b587f4a5048a45b8636d3d5da9e9858899bb81aa30225bfc  home-assistant-0.33.4.tar.gz
+3e2d0e4c8aca753d8dd39fbe3422cccf141d2d261175dcaa136ff430a0201d57  95b439fbd5ad96966dfe1176697c6ee4731a6207.patch
+da580edf8ee2ad1d3855092c9c19421dee4348f78adb12ddb54f9c4ab042f48e  update-deps.patch
 3518ebc275eee3041ff2821a83b7bb6151990b37c4512b0497874a9eb6b28cc8  home-assistant.initd
-ed25ddb01fc0362bb5442ef8ca1ae9a1382334f0cadc54dec53a5d5b5c46c8c3  home-assistant.confd
-c3e1897726f97d40e067e8b658b2dbdfe216f32b801c5c589212e1b1f9aa8388  aiohttp-1.0.5.tar.gz"
-sha512sums="8191d38653897ef978f7bb262b555a468e51fd924781bd223420ea47eb7d3d21014f84f00d2ae9d071eead6bb0b1bf65433ae5e12b58af4241b5991e063b29bd  homeassistant-0.33.3.tar.gz
-0c3287e9861e67ff97a9ccea60d57c6a772707a43cfa016f056832688bf776cc3df92c34e2f0dfb017a0566792331c1e6f4318db4845e283435f7422b4df6cdc  update-deps.patch
+ed25ddb01fc0362bb5442ef8ca1ae9a1382334f0cadc54dec53a5d5b5c46c8c3  home-assistant.confd"
+sha512sums="9880294ec8e6cf86ce3f7d076dfd4a89857cbf9ac587a40a9550fe981fd5dacdcbb29dd9ebd4906dfd6948249903e359eb6d3fab83a7dd00c95c1cc96e06088d  home-assistant-0.33.4.tar.gz
+3f4c6f8f2b6ebfc8a57834bfda4e955d6ecefe959ce55599dca94fe78d69ec80f104414c367c9a280c587f8cb88f0ac0a72cb458d2268b094c1b61cdf47568c1  95b439fbd5ad96966dfe1176697c6ee4731a6207.patch
+86daecf24c5a595bf7c8ee39c4c2bc7abc829f7e9f4579651c0ab24dc57ea29f50a1c94cae765d7f1ed16c0138b3561587b8675a18d0dd1b117f3527b4cbd82f  update-deps.patch
 34b8387836490228d94f6836bd0222812285d0a1161225b47b03c1398526f235c2ef2180ebaf0a81fe59165230467b5ad75eb06b3349175ef655da9bd00acd8e  home-assistant.initd
-12c24a79245ec70f001e63f60737017974f61ac5b508d29f998cd60ad5c0e97dfd0c5efb4f3d8357be1d05b7585de9b8d945f8f73b47e94e3667c9b02138f822  home-assistant.confd
-db5661b77b90eaecf04d80cebc1023ec7930bd639aed075d24291f897784d040ccc3fc5f9db310a3886f1661a0d163aaf42a8c5549b566027e890df42bb1bc0d  aiohttp-1.0.5.tar.gz"
+12c24a79245ec70f001e63f60737017974f61ac5b508d29f998cd60ad5c0e97dfd0c5efb4f3d8357be1d05b7585de9b8d945f8f73b47e94e3667c9b02138f822  home-assistant.confd"
-- 
cgit v1.2.3