git: bc270d279601 - main - devel/shiboken*: fix conflicts between 2 and 6

The branch main has been updated by lbartoletti:

URL: https://cgit.FreeBSD.org/ports/commit/?id=bc270d27960177a72fc03b1ec741f9c2819a2a56

commit bc270d27960177a72fc03b1ec741f9c2819a2a56
Author:     Loïc Bartoletti <lbartoletti@FreeBSD.org>
AuthorDate: 2023-06-15 18:25:34 +0000
Commit:     Loïc Bartoletti <lbartoletti@FreeBSD.org>
CommitDate: 2023-06-19 18:49:17 +0000

    devel/shiboken*: fix conflicts between 2 and 6
    
    shiboken_tool.py is an useless tool which doesn't works on 2 nor 6.
    rm'em all
---
 devel/shiboken2/Makefile  | 6 ++++--
 devel/shiboken2/pkg-plist | 1 -
 devel/shiboken6/Makefile  | 5 +++--
 devel/shiboken6/pkg-plist | 1 -
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/devel/shiboken2/Makefile b/devel/shiboken2/Makefile
index e9ec5893ae25..1f386c9a3c69 100644
--- a/devel/shiboken2/Makefile
+++ b/devel/shiboken2/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	shiboken2
 DISTVERSION=	5.15.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel
 MASTER_SITES=	QT/official_releases/QtForPython/shiboken2/PySide2-${DISTVERSION}-src
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -26,7 +26,7 @@ USE_PYTHON=	flavors
 USE_QT=		buildtools:build core gui network qmake:build testlib \
 		xml xmlpatterns
 
-SHEBANG_FILES=	shiboken_tool.py
+#SHEBANG_FILES=	shiboken_tool.py
 
 CMAKE_ARGS+=	"-DCMAKE_CXX_FLAGS=-lexecinfo" \
 		"-DCMAKE_STANDARD_LIBRARIES=-lexecinfo" \
@@ -46,6 +46,7 @@ PLIST_SUB+=	PYVERSTR=.cpython-${PYTHON_SUFFIX}${PYTHON_ABIVER}
 WRKSRC=		${WRKDIR}/pyside-setup-opensource-src-${DISTVERSION:C/^([0-9].[0-9]+.[0-9])(.[0-9])?/\1/}/sources/shiboken2
 
 post-install:
+	${RM} ${STAGEDIR}${PREFIX}/bin/shiboken_tool.py
 	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
 		-f -d ${PYTHONPREFIX_SITELIBDIR} \
 		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
@@ -53,4 +54,5 @@ post-install:
 		-f -d ${PYTHONPREFIX_SITELIBDIR} \
 		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
+
 .include <bsd.port.post.mk>
diff --git a/devel/shiboken2/pkg-plist b/devel/shiboken2/pkg-plist
index c9b2ddfc6e91..757275ef2f8b 100644
--- a/devel/shiboken2/pkg-plist
+++ b/devel/shiboken2/pkg-plist
@@ -1,5 +1,4 @@
 bin/shiboken2
-bin/shiboken_tool.py
 include/shiboken2/autodecref.h
 include/shiboken2/basewrapper.h
 include/shiboken2/bindingmanager.h
diff --git a/devel/shiboken6/Makefile b/devel/shiboken6/Makefile
index 1ac6f98010e1..7ff38e41972e 100644
--- a/devel/shiboken6/Makefile
+++ b/devel/shiboken6/Makefile
@@ -26,8 +26,7 @@ USE_LDCONFIG=	yes
 USE_PYTHON=	flavors
 USE_QT=		5compat base declarative doc imageformats quick3d quicktimeline networkauth shadertools svg tools translations wayland
 
-# TODO: avoid a conflict with shiboken2
-SHEBANG_FILES=	shiboken_tool.py
+#SHEBANG_FILES=	shiboken_tool.py
 
 CMAKE_ARGS+=	-DClang_DIR:PATH="${LOCALBASE}/llvm${LLVM_DEFAULT}/lib/cmake/clang" \
 		-DLLVM_DIR:PATH="${LOCALBASE}/llvm${LLVM_DEFAULT}/lib/cmake/llvm" \
@@ -43,4 +42,6 @@ PLIST_SUB+=	DISTVERSION=${DISTVERSION}
 PLIST_SUB+=	PYVERSTR=.cpython-${PYTHON_SUFFIX}${PYTHON_ABIVER}
 WRKSRC=		${WRKDIR}/pyside-setup-opensource-src-${DISTVERSION}/sources/shiboken6
 
+post-install:
+	${RM} ${STAGEDIR}${PREFIX}/bin/shiboken_tool.py
 .include <bsd.port.post.mk>
diff --git a/devel/shiboken6/pkg-plist b/devel/shiboken6/pkg-plist
index 25003ef03c6d..16459fef12d3 100644
--- a/devel/shiboken6/pkg-plist
+++ b/devel/shiboken6/pkg-plist
@@ -1,5 +1,4 @@
 bin/shiboken6
-bin/shiboken_tool.py
 include/shiboken6/autodecref.h
 include/shiboken6/basewrapper.h
 include/shiboken6/basewrapper_p.h