From 49dc3ebf0163b739f2af3cdc50f07b529c43b21b Mon Sep 17 00:00:00 2001
From: Alessio Sergi <al3hex@gmail.com>
Date: Wed, 20 Jun 2018 22:22:56 +0200
Subject: [PATCH] python-dbus: update to 1.2.8

- dbus-glib is no longer required
- license is actually MIT
---
 srcpkgs/python-dbus/template | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/python-dbus/template b/srcpkgs/python-dbus/template
index 20a4467b7b9..10ec5ec37f9 100644
--- a/srcpkgs/python-dbus/template
+++ b/srcpkgs/python-dbus/template
@@ -1,20 +1,20 @@
 # Template file for 'python-dbus'
 pkgname=python-dbus
-version=1.2.4
-revision=2
+version=1.2.8
+revision=1
 lib32disabled=yes
 wrksrc="dbus-python-${version}"
 build_style=gnu-configure
 hostmakedepends="pkg-config python-devel python3-devel"
-makedepends="libglib-devel dbus-glib-devel ${hostmakedepends/pkg-config/}"
+makedepends="libglib-devel ${hostmakedepends/pkg-config/}"
 depends="python dbus"
 pycompile_module="dbus"
 short_desc="D-Bus Python2 bindings"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
-license="GPL-2, LGPL-2.1"
+license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/DBusBindings"
 distfiles="https://dbus.freedesktop.org/releases/dbus-python/dbus-python-${version}.tar.gz"
-checksum=e2f1d6871f74fba23652e51d10873e54f71adab0525833c19bad9e99b1b2f9cc
+checksum=abf12bbb765e300bf8e2a1b2f32f85949eab06998dbda127952c31cb63957b6f
 
 pre_configure() {
 	mkdir -p dbus-${py2_ver}
@@ -22,18 +22,19 @@ pre_configure() {
 	cp -a dbus-${py2_ver} dbus-${py3_ver}
 }
 do_configure() {
+	local py_abiver=
 	for pyver in $py2_ver $py3_ver; do
 		if [ "$pyver" != "$py2_ver" ]; then
-			pyinc="$py3_inc"
-			pyabi="m"
+			py_inc="$py3_inc"
+			py_abiver="$py3_abiver"
 		else
-			pyinc="$py2_inc"
+			py_inc="$py2_inc"
 		fi
 
 		cd ${wrksrc}/dbus-${pyver}
-		export PYTHON_INCLUDES="-I${XBPS_CROSS_BASE}/${pyinc}"
-		export PYTHON_LIBS="-L${XBPS_CROSS_BASE}/usr/lib -lpython${pyver}${pyabi}"
-		export PYTHON="python${pyver}"
+		export PYTHON_CPPFLAGS="-I${XBPS_CROSS_BASE}/${py_inc}"
+		export PYTHON_EXTRA_LIBS="-L${XBPS_CROSS_BASE}/usr/lib -lpython${pyver}${py_abiver}"
+		export PYTHON_VERSION="${pyver}"
 		./configure ${configure_args}
 	done
 }
@@ -47,6 +48,7 @@ do_install() {
 	for pyver in $py2_ver $py3_ver; do
 		cd ${wrksrc}/dbus-${pyver}
 		make DESTDIR=${DESTDIR} install
+		vlicense COPYING
 	done
 }
 
@@ -56,17 +58,15 @@ python3-dbus_package() {
 	depends="python3 dbus"
 	short_desc="${short_desc/Python2/Python3}"
 	pkg_install() {
-		vmove ${py3_sitelib}
+		vmove usr/lib/python3*
 	}
 }
 python-dbus-devel_package() {
-	lib32disabled=yes
 	depends="python-devel python3-devel
 	 python-dbus>=${version}_${revision} python3-dbus>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove usr/share/doc
 	}
 }