Re: [PR PATCH] [Updated] i2c-tools: change upstream and add python subpkg

[0x5c <0x5c@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1605 bytes --]

There is an updated pull request by 0x5c against master on the void-packages repository

https://github.com/0x5c/void-packages i2c-python
https://github.com/void-linux/void-packages/pull/36304

i2c-tools: change upstream and add python subpkg
~~Things I am still unsure about:~~
- ~~The subpackage name and short_desc~~
- ~~How to ensure the subpackage's version is the version of the python module (it is versioned separately)~~

Closes #36156

#### Testing the changes
- I tested the changes in this PR: **briefly**
    - [x] Distfile location change had no impact (same exact file as debian's)
    - [x] Package builds fine and with the right files in the right place
    - [x] Crossbuilds fine
    - [ ] Tested the python bindings

@leahneukirchen 

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/36304.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-i2c-python-36304.patch --]
[-- Type: text/x-diff, Size: 5571 bytes --]

From 27d1d749111a50600b04ccff057a41df865751db Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Tue, 29 Mar 2022 07:10:25 -0400
Subject: [PATCH] i2c-tools: change upstream and add python subpkg

Closes #36156
---
 .../patches/py-smbus_fix-destdir.patch        | 35 +++++++++++++++++++
 .../patches/py-smbus_use-setuptools.patch     | 33 +++++++++++++++++
 srcpkgs/i2c-tools/template                    | 35 ++++++++++++++++---
 srcpkgs/python3-smbus                         |  1 +
 4 files changed, 100 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/i2c-tools/patches/py-smbus_fix-destdir.patch
 create mode 100644 srcpkgs/i2c-tools/patches/py-smbus_use-setuptools.patch
 create mode 120000 srcpkgs/python3-smbus

diff --git a/srcpkgs/i2c-tools/patches/py-smbus_fix-destdir.patch b/srcpkgs/i2c-tools/patches/py-smbus_fix-destdir.patch
new file mode 100644
index 000000000000..f61e4122cd62
--- /dev/null
+++ b/srcpkgs/i2c-tools/patches/py-smbus_fix-destdir.patch
@@ -0,0 +1,35 @@
+I had to add '--root' to the patch for it to not poison the masterdir.
+  That part will still be needed as a patch when the next version gets released.
+  -- 0x5c
+original message below
+
+From a4609318b6fa594f970673d77397f1ca74b4120a Mon Sep 17 00:00:00 2001
+From: Morten Linderud <morten@linderud.pw>
+Date: Mon, 4 Oct 2021 20:01:53 +0200
+Subject: py-smbus/Module.mk: Install with PREFIX defined
+
+If we are building to a defined destdir py-smbus is going to ignore this
+and try install to the actual root. This breaks packaging setups as the
+install section would fail.
+
+Signed-off-by: Morten Linderud <morten@linderud.pw>
+Signed-off-by: Jean Delvare <jdelvare@suse.de>
+---
+ py-smbus/Module.mk | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/py-smbus/Module.mk b/py-smbus/Module.mk
+index 04ceb64..1e2ded1 100644
+--- a/py-smbus/Module.mk
++++ b/py-smbus/Module.mk
+@@ -22,7 +22,7 @@ clean-python:
+ 	rm -rf py-smbus/build
+ 
+ install-python:
+-	$(DISTUTILS) install
++	$(DISTUTILS) install --prefix="$(PREFIX)" --root="$(DESTDIR)"
+ 
+ all: all-python
+ 
+-- 
+cgit 1.2.3-1.el7
diff --git a/srcpkgs/i2c-tools/patches/py-smbus_use-setuptools.patch b/srcpkgs/i2c-tools/patches/py-smbus_use-setuptools.patch
new file mode 100644
index 000000000000..c31e8757b4f0
--- /dev/null
+++ b/srcpkgs/i2c-tools/patches/py-smbus_use-setuptools.patch
@@ -0,0 +1,33 @@
+From cf3541b8a7ed50782edd05836020d31230fb86c6 Mon Sep 17 00:00:00 2001
+From: Ross Burton <ross.burton@arm.com>
+Date: Wed, 19 Jan 2022 12:08:53 +0100
+Subject: py-smbus: Use setuptools instead of distutils
+
+As per [1], distutils is deprecated in Python 3.10 and will be removed
+entirely in Python 3.12.
+
+As setuptools is essentially an enhanced version of distutils, it's
+trivial to port to that.
+
+[1] https://docs.python.org/3/whatsnew/3.10.html#distutils-deprecated
+
+Signed-off-by: Ross Burton <ross.burton@arm.com>
+Signed-off-by: Jean Delvare <jdelvare@suse.de>
+---
+ py-smbus/setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/py-smbus/setup.py b/py-smbus/setup.py
+index 28a4500..26db33a 100644
+--- a/py-smbus/setup.py
++++ b/py-smbus/setup.py
+@@ -1,6 +1,6 @@
+ #!/usr/bin/env python
+ 
+-from distutils.core import setup, Extension
++from setuptools import setup, Extension
+ 
+ setup(	name="smbus",
+ 	version="1.1",
+-- 
+cgit 1.2.3-1.el7
diff --git a/srcpkgs/i2c-tools/template b/srcpkgs/i2c-tools/template
index a121effff538..ec522fd6f71b 100644
--- a/srcpkgs/i2c-tools/template
+++ b/srcpkgs/i2c-tools/template
@@ -1,18 +1,36 @@
 # Template file for 'i2c-tools'
 pkgname=i2c-tools
 version=4.3
-revision=1
+revision=2
 build_style=gnu-makefile
-make_install_args="sbindir=/usr/bin"
+make_build_args="EXTRA=py-smbus"
+make_install_args="sbindir=/usr/bin EXTRA=py-smbus"
+hostmakedepends="python3 python3-setuptools"
+makedepends="python3-devel"
 depends="perl"
 short_desc="Heterogeneous set of I2C tools"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
-homepage="https://packages.debian.org/sid/i2c-tools"
-distfiles="${DEBIAN_SITE}/main/i/${pkgname}/${pkgname}_${version}.orig.tar.xz"
+homepage="https://i2c.wiki.kernel.org/index.php/I2C_Tools"
+distfiles="https://mirrors.edge.kernel.org/pub/software/utils/i2c-tools/i2c-tools-${version}.tar.xz"
 checksum=1f899e43603184fac32f34d72498fc737952dbc9c97a8dd9467fadfdf4600cf9
 system_groups="i2c"
 
+
+if [ -n "$CROSS_BUILD" ]; then
+	export PYPREFIX="$XBPS_CROSS_BASE"
+	export CFLAGS+=" -I${XBPS_CROSS_BASE}/${py3_inc} -I${XBPS_CROSS_BASE}/usr/include"
+	export LDFLAGS+=" -L${XBPS_CROSS_BASE}/${py3_lib} -L${XBPS_CROSS_BASE}/usr/lib"
+	export CC="${XBPS_CROSS_TRIPLET}-gcc -pthread $CFLAGS $LDFLAGS"
+	export LDSHARED="${CC} -shared $LDFLAGS"
+	export PYTHONPATH="${XBPS_CROSS_BASE}/${py3_lib}"
+	for f in ${XBPS_CROSS_BASE}/${py3_lib}/_sysconfigdata_*; do
+			f=${f##*/}
+			_PYTHON_SYSCONFIGDATA_NAME=${f%.py}
+	done
+	export _PYTHON_SYSCONFIGDATA_NAME
+fi
+
 post_install() {
 	vinstall "${FILESDIR}/45-i2c-tools.rules" 644 usr/lib/udev/rules.d
 }
@@ -27,3 +45,12 @@ i2c-tools-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
+
+python3-smbus_package() {
+	short_desc+="Python 3 bindings for libi2c from i2c-tools"
+	depends="${sourcepkg}>=${version}_${revision}"
+	lib32disabled=yes
+	pkg_install() {
+		vmove "usr/lib/python3.*"
+	}
+}
diff --git a/srcpkgs/python3-smbus b/srcpkgs/python3-smbus
new file mode 120000
index 000000000000..a82cddc3349e
--- /dev/null
+++ b/srcpkgs/python3-smbus
@@ -0,0 +1 @@
+i2c-tools
\ No newline at end of file