devel/pydbus-common: Merge into devel/py-dbus

6 files changed, 1 insertions, 121 deletions

diff --git a/MOVED b/MOVED
index 24d1e2e7e610..d9d5bd150544 100644
--- a/MOVED
+++ b/MOVED
@@ -5071,3 +5071,4 @@ multimedia/mlt7-glaxnimate@qt5||2026-01-08|Qt5 support has been dropped by upstr
 multimedia/mlt7-glaxnimate@qt6|multimedia/mlt7-glaxnimate|2026-01-08|Unflavorize; only Qt6 is supported
 multimedia/mlt7-qt@qt5||2026-01-08|Qt5 support has been dropped by upstream
 multimedia/mlt7-qt@qt6|multimedia/mlt7-qt|2026-01-08|Unflavorize; only Qt6 is supported
+devel/pydbus-common|devel/py-dbus|2026-01-09|Merged into devel/py-dbus
diff --git a/devel/Makefile b/devel/Makefile
index ee657885b945..2b37e60a275b 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -6342,7 +6342,6 @@
     SUBDIR += pycharm
     SUBDIR += pycos
     SUBDIR += pycount
-    SUBDIR += pydbus-common
     SUBDIR += pydeps
     SUBDIR += pyderasn
     SUBDIR += pyenv
diff --git a/devel/pydbus-common/Makefile b/devel/pydbus-common/Makefile
deleted file mode 100644
index dd6f9f68554c..000000000000
--- a/devel/pydbus-common/Makefile
+++ /dev/null
@@ -1,77 +0,0 @@
-PORTNAME=	dbus
-DISTVERSION=	1.3.2
-PORTREVISION?=	0
-CATEGORIES=	devel gnome python
-MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus-python/
-PKGNAMEPREFIX?=	py
-PKGNAMESUFFIX?=	-common
-DISTNAME=	dbus-python-${PORTVERSION}
-
-MAINTAINER=	desktop@FreeBSD.org
-COMMENT?=	Common files for the Python bindings for the D-BUS messaging system
-WWW=		https://dbus.freedesktop.org/doc/dbus-python/
-
-BUILD_DEPENDS=	dbus-glib>=0:devel/dbus-glib
-
-SLAVE_PORT?=	no
-
-USES=		gettext gmake libtool pathfix pkgconfig
-GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${PYTHON_INCLUDEDIR}
-CONFIGURE_ARGS=	--docdir=${DOCSDIR} \
-		--disable-api-docs
-INSTALL_TARGET=	install-strip
-
-.if ${SLAVE_PORT} == no
-USES+=		python:build
-
-NO_ARCH=	yes
-
-DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
-EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}
-
-OPTIONS_SUB=	yes
-OPTIONS_DEFINE=	HTMLDOCS DOCS EXAMPLES
-HTMLDOCS_DESC=	build html documentation
-HTMLDOCS_IMPLIES=	DOCS
-HTMLDOCS_CONFIGURE_ENABLE=	documentation
-HTMLDOCS_BUILD_DEPENDS=		sphinx-build:textproc/py-sphinx \
-				${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR}
-
-post-patch-DOCS-on:
-	@${REINPLACE_CMD} -e 's|HEADERS install-dist_docDATA|HEADERS|g ; \
-		s|PYTHON install-nodist_docDATA|PYTHON|g' \
-			${WRKSRC}/Makefile.in
-
-do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/include/dbus-1.0/dbus/
-	${INSTALL_DATA} ${WRKSRC}/include/dbus/dbus-python.h \
-		${STAGEDIR}${PREFIX}/include/dbus-1.0/dbus/dbus-python.h
-	${INSTALL_DATA} ${WRKSRC}/dbus-python.pc \
-		${STAGEDIR}${PREFIX}/libdata/pkgconfig/dbus-python.pc
-
-	${MKDIR} ${STAGEDIR}${EXAMPLESDIR} && \
-		${INSTALL_DATA} ${WRKSRC}/examples/*.py ${STAGEDIR}${EXAMPLESDIR}
-
-	${MKDIR} ${STAGEDIR}${DOCSDIR} && \
-		${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${STAGEDIR}${DOCSDIR} && \
-		${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} && \
-		${INSTALL_DATA} ${WRKSRC}/NEWS ${STAGEDIR}${DOCSDIR}
-
-do-install-HTMLDOCS-on:
-	${INSTALL_DATA} ${WRKSRC}/doc/html/*.html ${STAGEDIR}${DOCSDIR}
-
-.else # slave is defined
-LIB_DEPENDS+=	libdbus-glib-1.so:devel/dbus-glib
-RUN_DEPENDS+=	pydbus-common>=0:devel/pydbus-common
-USE_LDCONFIG=	yes
-USES+=		python
-USE_PYTHON=	flavors
-
-post-install:
-	@${RM} -r ${STAGEDIR}${PREFIX}/include/dbus-1.0 \
-		${STAGEDIR}${PREFIX}/libdata/pkgconfig/dbus-python.pc
-	@${RM} -r ${STAGEDIR}/${DOCSDIR}
-.endif # end of slaving block
-
-.include <bsd.port.mk>
diff --git a/devel/pydbus-common/distinfo b/devel/pydbus-common/distinfo
deleted file mode 100644
index b29b332ce1cb..000000000000
--- a/devel/pydbus-common/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1662527783
-SHA256 (dbus-python-1.3.2.tar.gz) = ad67819308618b5069537be237f8e68ca1c7fcc95ee4a121fe6845b1418248f8
-SIZE (dbus-python-1.3.2.tar.gz) = 605495
diff --git a/devel/pydbus-common/pkg-descr b/devel/pydbus-common/pkg-descr
deleted file mode 100644
index 1e4b8c1b0f12..000000000000
--- a/devel/pydbus-common/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-Python bindings for the D-BUS interprocess messaging system.
diff --git a/devel/pydbus-common/pkg-plist b/devel/pydbus-common/pkg-plist
deleted file mode 100644
index ceec5fc31887..000000000000
--- a/devel/pydbus-common/pkg-plist
+++ /dev/null
@@ -1,39 +0,0 @@
-include/dbus-1.0/dbus/dbus-python.h
-libdata/pkgconfig/dbus-python.pc
-%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/API_CHANGES.html
-%%PORTDOCS%%%%DOCSDIR%%/API_CHANGES.txt
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/PY3PORT.html
-%%PORTDOCS%%%%DOCSDIR%%/PY3PORT.txt
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/dbus.bus.html
-%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/dbus.connection.html
-%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/dbus.decorators.html
-%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/dbus.exceptions.html
-%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/dbus.gi_service.html
-%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/dbus.glib.html
-%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/dbus.gobject_service.html
-%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/dbus.html
-%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/dbus.lowlevel.html
-%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/dbus.mainloop.html
-%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/dbus.proxies.html
-%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/dbus.server.html
-%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/dbus.service.html
-%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/dbus.types.html
-%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/genindex.html
-%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/news.html
-%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/py-modindex.html
-%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/search.html
-%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/tutorial.html
-%%PORTDOCS%%%%DOCSDIR%%/tutorial.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-async-client.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-client.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-service.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-signal-emitter.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-signal-recipient.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gconf-proxy-client.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gconf-proxy-service2.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/list-system-services.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/unix-fd-client.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/unix-fd-service.py