community/py3-openzwave: upgrade to 0.4.19

2 files changed, 16 insertions, 27 deletions

diff --git a/community/py3-openzwave/APKBUILD b/community/py3-openzwave/APKBUILD
index ab867227f90..c0f1a9252d5 100644
--- a/community/py3-openzwave/APKBUILD
+++ b/community/py3-openzwave/APKBUILD
@@ -2,28 +2,31 @@
 # Maintainer: Carlo Landmeter <clandmeter@gmail.com>
 _name=python-openzwave
 pkgname=py3-openzwave
-pkgver=0.3.2
-pkgrel=1
+pkgver=0.4.19
+pkgrel=0
 pkgdesc="Python wrapper for openzwave"
 url="http://www.openzwave.com/"
 arch="all"
 license="GPL"
 depends=" $pkgname-lib $pkgname-api $pkgname-manager"
-makedepends="python3-dev linux-headers eudev-dev coreutils"
+_libdeps="py3-six"
+_apideps="py3-dispatcher"
+_managerdeps="py3-urwid"
+makedepends="python3-dev linux-headers eudev-dev coreutils py3-setuptools py3-cython
+	$_libdeps $_apideps $_managerdeps"
 install=""
 subpackages="$pkgname-lib $pkgname-api::noarch $pkgname-manager::noarch"
-source="https://github.com/OpenZWave/python-openzwave/raw/master/archives/${_name}-${pkgver}.tgz
-	disable-Werror.patch"
+source="$_name-$pkgver.tar.gz::https://github.com/OpenZWave/python-openzwave/archive/v$pkgver.tar.gz"
 builddir="$srcdir/python-openzwave-$pkgver"
 
 
 build() {
 	cd "$builddir"
 	unset CFLAGS CPPFLAGS
-	make build || return 1
-	python3 setup-lib.py build || return 1
-	python3 setup-api.py build || return 1
-	python3 setup-manager.py build || return 1
+	make build PYTHON_EXEC=python3
+	python3 setup-lib.py build
+	python3 setup-api.py build
+	python3 setup-manager.py build
 }
 
 package() {
@@ -32,18 +35,16 @@ package() {
 
 lib() {
 	pkgdesc="$pkgdesc (lib)"
-	depends="python3 py3-six"
+	depends="python3 $_libdeps"
 	cd "$builddir"
 	python3 setup-lib.py install \
 		--single-version-externally-managed --root ${subpkgdir}
-	mkdir -p "$subpkgdir"/usr/share/"$pkgname"
-	mv "$subpkgdir"/usr/config "$subpkgdir"/usr/share/"$pkgname"
 }
 
 
 api() {
 	pkgdesc="$pkgdesc (api)"
-	depends="python3 py3-dispatcher"
+	depends="python3 $_apideps"
 	cd "$builddir"
 	python3 setup-api.py install \
 		--single-version-externally-managed --root "$subpkgdir"
@@ -51,12 +52,11 @@ api() {
 
 manager() {
 	pkgdesc="$pkgdesc (manager)"
-	depends="python3 py3-urwid"
+	depends="python3 $_managerdeps"
 	cd "$builddir"
 	python3 setup-manager.py install \
 		--single-version-externally-managed --root "$subpkgdir"
 }
 
 
-sha512sums="f495c2e41a67f715dbf0e312ee13d59ab6c907403dacb12d48c2becbb433ab458a53f3d634e21373e1aa0141ab71e418ec15ebd29f9d4506261700bcfadcbc79  python-openzwave-0.3.2.tgz
-5ac0755abf43cff49583305abb2fcaa963a5f926b6e6109dbe75724d6c7dd301621e7fd2e6eb16b45e258ef9ea1686d774b3a32a96ec256c31d703314952bedf  disable-Werror.patch"
+sha512sums="153e7571ee445c3af1b5880097ba484657e4c1aa376ae7d3c46b58fc485087742ecd04dba4c1ffba97b2f3b64b4e055cabfed573a457857f9d75e3b6ad12194b  python-openzwave-0.4.19.tar.gz"
diff --git a/community/py3-openzwave/disable-Werror.patch b/community/py3-openzwave/disable-Werror.patch
deleted file mode 100644
index 77197315eb0..00000000000
--- a/community/py3-openzwave/disable-Werror.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/openzwave/cpp/build/Makefile
-+++ b/openzwave/cpp/build/Makefile
-@@ -15,7 +15,7 @@
- # what flags we will use for compiling in debug mode
- DEBUG_CFLAGS    := -Wall -Wno-unknown-pragmas -Wno-inline -Wno-format -Werror -Wno-error=sequence-point -Wno-sequence-point -ggdb -DDEBUG -fPIC  -DSYSCONFDIR="\"$(PREFIX)/etc/openzwave/\""
- # what flags we will use for compiling in release mode
--RELEASE_CFLAGS  := -Wall -Wno-unknown-pragmas -Werror -Wno-format -Wno-error=sequence-point -Wno-sequence-point -O3 -DNDEBUG -fPIC  -DSYSCONFDIR="\"$(PREFIX)/etc/openzwave/\""
-+RELEASE_CFLAGS  := -Wall -Wno-unknown-pragmas -Wno-format -Wno-error=sequence-point -Wno-sequence-point -O3 -DNDEBUG -fPIC  -DSYSCONFDIR="\"$(PREFIX)/etc/openzwave/\""
- #what flags we will use for linking in debug mode
- DEBUG_LDFLAGS	:= -g
-