[wip/py-pal] rework

- don't use PKGBASE
- use PKGTAG
- add missing dependency
- cosmetic changes

py-pal/Makefile

@@ -2,21 +2,31 @@
 # Created:			Olivier Stasse on Tue, 8 May 2018
 #
 
-VERSION=	0.9.14os1
-PKGBASE=	pal-python
-DISTNAME=	${VERSION}
-PKGNAME=	${PKGBASE}-${VERSION}
-ROSNAME=	$(subst -,_,${PKGBASE})
-WRKSRC=		${WRKDIR}/${ROSNAME}-${VERSION}
-DIST_SUBDIR=	${PKGBASE}
-
-CATEGORIES=	wip
-HOMEPAGE=	${MASTER_SITE_GITHUB:=olivier-stasse/${ROSNAME}}
-MASTER_SITES=	${HOMEPAGE}/archive/
-COMMENT=	PAL python utils
-LICENSE=	2-clause-bsd
-
-PYDISTUTILSPKG=	yes
+ORG=			olivier-stasse
+NAME=			pal-python
+VERSION=		0.9.14os1
+
+ROSNAME=		$(subst -,_,${NAME})
+
+PKGNAME=		${PKGTAG.python-}${NAME}-${VERSION}
+WRKSRC=			${WRKDIR}/${ROSNAME}-${VERSION}
+DISTNAME=		${VERSION}
+DIST_SUBDIR=		${NAME}
+
+# old package name and other Python versions
+CONFLICTS+=		${NAME}-[0-9]*
+CONFLICTS+=		py[0-9][0-9]-${NAME}-[0-9]*
+
+CATEGORIES=		wip
+
+MASTER_REPOSITORY=	${MASTER_REPOSITORY_GITHUB}${ORG}/${NAME}.git
+HOMEPAGE=		${MASTER_SITE_GITHUB:=${ORG}/${ROSNAME}}
+MASTER_SITES=		${HOMEPAGE}/archive/
+
+COMMENT=		PAL python utils
+LICENSE=		2-clause-bsd
+
+PYDISTUTILSPKG=		yes
 
 # FIXME warning does not seems to prevent installing
 # libyaml is not found or a compiler error: forcing --without-libyaml
@@ -24,5 +34,6 @@ PYDISTUTILSPKG=	yes
 # specify the option --include-dirs or uncomment and
 # modify the parameter include_dirs in setup.cfg)
 
+include ../../sysutils/py-catkin-pkg/depend.mk
 include ../../mk/sysdep/python.mk
 include ../../mk/robotpkg.mk

py-pal/depend.mk

@@ -3,7 +3,7 @@
 #
 
 DEPEND_DEPTH:=			${DEPEND_DEPTH}+
-PY_PAL_DEPEND_MK:=	${PY_PAL_DEPEND_MK}+
+PY_PAL_DEPEND_MK:=		${PY_PAL_DEPEND_MK}+
 
 ifeq (+,$(DEPEND_DEPTH))
 DEPEND_PKG+=			py-pal
@@ -15,14 +15,14 @@ PREFER.py-pal?=	robotpkg
 
 DEPEND_USE+=			py-pal
 
-DEPEND_ABI.py-pal?=\
-	pal-python>=0.9.14os1
-DEPEND_DIR.py-pal?=\
-	../../wip/py-pal
+DEPEND_ABI.py-pal?=		${PKGTAG.python-}pal-python>=0.9.14os1
+DEPEND_DIR.py-pal?=		../../wip/py-pal
 
-SYSTEM_SEARCH.py-pal=\
-  '${PYTHON_SYSLIBSEARCH}/pal_python/pal_common.py' \
-  '${PYTHON_SYSLIBSEARCH}/pal_python/pal_launch.py' 
+SYSTEM_SEARCH.py-pal=					\
+  '${PYTHON_SYSLIBSEARCH}/pal_python/pal_common.py'	\
+  '${PYTHON_SYSLIBSEARCH}/pal_python/pal_launch.py'
+
+include ../../mk/sysdep/python.mk
 
 endif # PY_PAL_DEPEND_MK ---------------------------------------