From ca697cb37ed5d1251977367f81b9f592aa22e700 Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Thu, 26 Dec 2024 18:14:35 +0000
Subject: [PATCH] deluge-ltconfig is only there to provide a plugin for deluge,
 which wants an .egg file in its plugin dir and not a normal installed Python
 module, though it was including both in the package. Change this to stop
 using MODPY_SETUPTOOLS, BDEP on setuptools instead, and just produce the
 .egg.

---
 net/deluge-ltconfig/Makefile  | 16 +++++++-------
 net/deluge-ltconfig/pkg/PLIST | 40 -----------------------------------
 2 files changed, 8 insertions(+), 48 deletions(-)

diff --git a/net/deluge-ltconfig/Makefile b/net/deluge-ltconfig/Makefile
index cac7424b25a..162fc6fafc5 100644
--- a/net/deluge-ltconfig/Makefile
+++ b/net/deluge-ltconfig/Makefile
@@ -1,7 +1,7 @@
 COMMENT =	libtorrent settings modification plugin for deluge
 
 MODPY_DISTV =	2.0.0
-REVISION =	1
+REVISION =	2
 
 GH_ACCOUNT =	ratanakvlun
 GH_PROJECT =	deluge-ltconfig
@@ -12,15 +12,15 @@ CATEGORIES =	net
 # GPLv3+
 PERMIT_PACKAGE =	Yes
 
-MODULES =		lang/python
-MODPY_SETUPTOOLS =	Yes
-RUN_DEPENDS =		net/deluge
+MODULES =	lang/python
+BUILD_DEPENDS =	devel/py-setuptools
+RUN_DEPENDS =	net/deluge
 
-post-build:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MODPY_BIN} ./${MODPY_SETUP} \
-		bdist_egg
+do-build:
+	cd ${WRKSRC} && \
+		${SETENV} ${MAKE_ENV} ${MODPY_BIN} setup.py bdist_egg
 
-post-install:
+do-install:
 	${INSTALL_DATA_DIR} ${WRKINST}${MODPY_SITEPKG}/deluge/plugins
 	${INSTALL_DATA} ${WRKBUILD}/dist/*.egg \
 		${WRKINST}${MODPY_SITEPKG}/deluge/plugins
diff --git a/net/deluge-ltconfig/pkg/PLIST b/net/deluge-ltconfig/pkg/PLIST
index 93bce109a01..6e59e8d15eb 100644
--- a/net/deluge-ltconfig/pkg/PLIST
+++ b/net/deluge-ltconfig/pkg/PLIST
@@ -1,41 +1 @@
 lib/python${MODPY_VERSION}/site-packages/deluge/plugins/ltConfig-${MODPY_DISTV}-py${MODPY_VERSION}.egg
-lib/python${MODPY_VERSION}/site-packages/ltConfig-${MODPY_DISTV}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/ltConfig-${MODPY_DISTV}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/ltConfig-${MODPY_DISTV}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/ltConfig-${MODPY_DISTV}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/ltConfig-${MODPY_DISTV}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/ltConfig-${MODPY_DISTV}-py${MODPY_VERSION}.egg-info/top_level.txt
-lib/python${MODPY_VERSION}/site-packages/ltconfig/
-lib/python${MODPY_VERSION}/site-packages/ltconfig/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ltconfig/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/ltconfig/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/ltconfig/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/ltconfig/${MODPY_PYCACHE}gtkui.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/ltconfig/${MODPY_PYCACHE}webui.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/ltconfig/common/
-lib/python${MODPY_VERSION}/site-packages/ltconfig/common/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ltconfig/common/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/ltconfig/common/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/ltconfig/common/${MODPY_PYCACHE}plugin.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/ltconfig/common/${MODPY_PYCACHE}presets.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/ltconfig/common/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/ltconfig/common/config/
-lib/python${MODPY_VERSION}/site-packages/ltconfig/common/config/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ltconfig/common/config/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/ltconfig/common/config/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/ltconfig/common/config/${MODPY_PYCACHE}convert.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/ltconfig/common/config/${MODPY_PYCACHE}file.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/ltconfig/common/config/${MODPY_PYCACHE}plugin.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/ltconfig/common/config/convert.py
-lib/python${MODPY_VERSION}/site-packages/ltconfig/common/config/file.py
-lib/python${MODPY_VERSION}/site-packages/ltconfig/common/config/plugin.py
-lib/python${MODPY_VERSION}/site-packages/ltconfig/common/plugin.py
-lib/python${MODPY_VERSION}/site-packages/ltconfig/common/presets.py
-lib/python${MODPY_VERSION}/site-packages/ltconfig/common/util.py
-lib/python${MODPY_VERSION}/site-packages/ltconfig/core.py
-lib/python${MODPY_VERSION}/site-packages/ltconfig/data/
-lib/python${MODPY_VERSION}/site-packages/ltconfig/data/ltconfig.js
-lib/python${MODPY_VERSION}/site-packages/ltconfig/data/wnd_preferences.glade
-lib/python${MODPY_VERSION}/site-packages/ltconfig/data/wnd_preferences.ui
-lib/python${MODPY_VERSION}/site-packages/ltconfig/gtkui.py
-lib/python${MODPY_VERSION}/site-packages/ltconfig/webui.py