From a3caff16c678d60376db4d42f54b8ad1b54bf76f Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Thu, 15 Jun 2023 20:10:09 +0100
Subject: [PATCH] python-dbus: split python3-dbus subpackage, update
 python3-dbus to 1.3.2.

---
 srcpkgs/python-dbus/template  | 82 ++++-------------------------------
 srcpkgs/python3-dbus          |  1 -
 srcpkgs/python3-dbus-devel    |  2 +-
 srcpkgs/python3-dbus/template | 34 +++++++++++++++
 4 files changed, 44 insertions(+), 75 deletions(-)
 delete mode 120000 srcpkgs/python3-dbus
 create mode 100644 srcpkgs/python3-dbus/template

diff --git a/srcpkgs/python-dbus/template b/srcpkgs/python-dbus/template
index 2dd33f5437b2..ab7cf4a9b775 100644
--- a/srcpkgs/python-dbus/template
+++ b/srcpkgs/python-dbus/template
@@ -3,9 +3,10 @@ pkgname=python-dbus
 version=1.2.18
 revision=3
 build_style=gnu-configure
-hostmakedepends="pkg-config python python3"
-makedepends="libglib-devel python3-devel python-devel"
+hostmakedepends="pkg-config python"
+makedepends="libglib-devel python-devel"
 depends="python dbus"
+checkdepends="${depends} python-gobject"
 short_desc="D-Bus Python2 bindings"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
@@ -14,77 +15,12 @@ distfiles="https://dbus.freedesktop.org/releases/dbus-python/dbus-python-${versi
 checksum=92bdd1e68b45596c833307a5ff4b217ee6929a1502f5341bae28fd120acf7260
 lib32disabled=yes
 
-pre_configure() {
-	mkdir -p dbus-${py2_ver}
-	mv * dbus-${py2_ver} || true
-	cp -a dbus-${py2_ver} dbus-${py3_ver}
-}
-
-do_configure() {
-	local py_abiver py_inc pyver
-	for pyver in $py2_ver $py3_ver; do
-		case "${pyver}" in
-			"${py2_ver}")
-				py_inc="$py2_inc"
-				;;
-			*)
-				py_inc="$py3_inc"
-				py_abiver="$py3_abiver"
-				;;
-		esac
-
-		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}"
-
-		( cd dbus-${pyver} && ./configure ${configure_args} )
-
-	done
-
-	unset PYTHON_CPPFLAGS PYTHON_EXTRA_LIBS PYTHON_VERSION
-}
+export PYTHON_CPPFLAGS="-I${XBPS_CROSS_BASE}/${py2_inc}"
+export PYTHON_EXTRA_LIBS="-L${XBPS_CROSS_BASE}/usr/lib -lpython${py2_ver}"
+export PYTHON_VERSION="${py2_ver}"
 
-do_build() {
-	local pyver
-	for pyver in $py2_ver $py3_ver; do
-		( cd dbus-${pyver} && make ${makejobs} )
-	done
-}
-
-do_install() {
-	local pyver pysite eggver
-	for pyver in $py2_ver $py3_ver; do
-		case "${pyver}" in
-			"${py2_ver}") pysite="${py2_sitelib}" ;;
-			*) pysite="${py3_sitelib}" ;;
-		esac
-
-		eggver="dbus_python-${version}-py${pyver}"
-		(
-			cd dbus-${pyver}
-			make DESTDIR=${DESTDIR} install
-			vcopy dbus_python.egg-info "${pysite}/${eggver}.egg-info"
-		)
-	done
-
-	vlicense dbus-${py2_ver}/COPYING
-}
-
-python3-dbus_package() {
-	lib32disabled=yes
-	depends="python3 dbus"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense dbus-${py3_ver}/COPYING
-	}
-}
+post_install() {
+	vcopy dbus_python.egg-info "${py2_sitelib}/dbus_python-${version}-py${py2_ver}.egg-info"
 
-python3-dbus-devel_package() {
-	depends="python3-devel python3-dbus>=${version}_${revision}"
-	short_desc="${short_desc/Python2/Python3} - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-	}
+	vlicense COPYING
 }
diff --git a/srcpkgs/python3-dbus b/srcpkgs/python3-dbus
deleted file mode 120000
index 082b5c2fc193..000000000000
--- a/srcpkgs/python3-dbus
+++ /dev/null
@@ -1 +0,0 @@
-python-dbus
\ No newline at end of file
diff --git a/srcpkgs/python3-dbus-devel b/srcpkgs/python3-dbus-devel
index 082b5c2fc193..5fe29e0f2f2e 120000
--- a/srcpkgs/python3-dbus-devel
+++ b/srcpkgs/python3-dbus-devel
@@ -1 +1 @@
-python-dbus
\ No newline at end of file
+python3-dbus
\ No newline at end of file
diff --git a/srcpkgs/python3-dbus/template b/srcpkgs/python3-dbus/template
new file mode 100644
index 000000000000..14da7e4e86e7
--- /dev/null
+++ b/srcpkgs/python3-dbus/template
@@ -0,0 +1,34 @@
+# Template file for 'python3-dbus'
+pkgname=python3-dbus
+version=1.3.2
+revision=1
+build_style=gnu-configure
+hostmakedepends="pkg-config python3"
+makedepends="libglib-devel python3-devel"
+depends="python3 dbus"
+checkdepends="${depends} python3-gobject"
+short_desc="D-Bus Python3 bindings"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://www.freedesktop.org/wiki/Software/DBusBindings"
+distfiles="https://dbus.freedesktop.org/releases/dbus-python/dbus-python-${version}.tar.gz"
+checksum=ad67819308618b5069537be237f8e68ca1c7fcc95ee4a121fe6845b1418248f8
+lib32disabled=yes
+
+export PYTHON_CPPFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}"
+export PYTHON_EXTRA_LIBS="-L${XBPS_CROSS_BASE}/usr/lib -lpython${py3_ver}${py3_abiver}"
+
+post_install() {
+	vcopy dbus_python.egg-info "${py3_sitelib}/dbus_python-${version}-py${py3_ver}.egg-info"
+
+	vlicense COPYING
+}
+
+python3-dbus-devel_package() {
+	depends="python3-devel python3-dbus>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}