diff --git a/Makefile b/Makefile
index 76198b005872d641919c81aefa5d9c7aaca777b2..54d36fbc6eb9d02fba72c5fd9be9f4d00e97eacf 100644
--- a/Makefile
+++ b/Makefile
@@ -99,8 +99,7 @@ SUBDIR+= py-morse
SUBDIR+= py-mraa
SUBDIR+= py-parametric-curves
SUBDIR+= py-qpoases
-SUBDIR+= py-qt4-gepetto-pythonqt
-SUBDIR+= py-qt5-gepetto-pythonqt
+SUBDIR+= py-qt-gepetto-pythonqt
SUBDIR+= py-sot-application-v3
SUBDIR+= py-sot-core-v3
SUBDIR+= py-sot-dynamic-pinocchio-v3
diff --git a/py-qt4-gepetto-pythonqt/DESCR b/py-qt-gepetto-pythonqt/DESCR
similarity index 100%
rename from py-qt4-gepetto-pythonqt/DESCR
rename to py-qt-gepetto-pythonqt/DESCR
diff --git a/py-qt4-gepetto-pythonqt/Makefile b/py-qt-gepetto-pythonqt/Makefile
similarity index 87%
rename from py-qt4-gepetto-pythonqt/Makefile
rename to py-qt-gepetto-pythonqt/Makefile
index e0a32dde07e64cf994c053227672f2599d425dba..50d79e5bea555c744166390f1b4d56ea52c2406c 100644
--- a/py-qt4-gepetto-pythonqt/Makefile
+++ b/py-qt-gepetto-pythonqt/Makefile
@@ -14,7 +14,7 @@ WRKSRC= ${WRKDIR}/${NAME}-${VERSION}
HOMEPAGE= ${MASTER_SITE_GITHUB:=${ORG}/${NAME}}
MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=${NAME}/}
MASTER_REPOSITORY= git ${HOMEPAGE}.git
-CHECKOUT_VCS_OPTS+= --recursive
+CHECKOUT_VCS_OPTS+= -b${PKG_ALTERNATIVE.qt}
CATEGORIES= wip
COMMENT= PythonQT temporary fork
@@ -24,7 +24,8 @@ MAINTAINER= gsaurel@laas.fr
CMAKE_ARGS+= -DPythonQt_Wrap_QtAll=ON
CMAKE_ARGS+= -DPythonQt_Extensions=ON
-DEPEND_ABI.qt= qt>=4<5
+PLIST_SRC+= ${PKGDIR}/PLIST
+PLIST_SRC+= ${PKGDIR}/PLIST.${PKG_ALTERNATIVE.qt}
include ../../pkgtools/pkg-config/depend.mk
include ../../mk/sysdep/cmake.mk
diff --git a/py-qt4-gepetto-pythonqt/PLIST b/py-qt-gepetto-pythonqt/PLIST
similarity index 100%
rename from py-qt4-gepetto-pythonqt/PLIST
rename to py-qt-gepetto-pythonqt/PLIST
diff --git a/py-qt-gepetto-pythonqt/PLIST.qt4 b/py-qt-gepetto-pythonqt/PLIST.qt4
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/py-qt-gepetto-pythonqt/PLIST.qt5 b/py-qt-gepetto-pythonqt/PLIST.qt5
new file mode 100644
index 0000000000000000000000000000000000000000..d25e5424077e6d124ba468c5cf81b7e39690d114
--- /dev/null
+++ b/py-qt-gepetto-pythonqt/PLIST.qt5
@@ -0,0 +1,2 @@
+include/PythonQt/PythonQtProperty.h
+include/PythonQt/PythonQtSlotDecorator.h
diff --git a/py-qt4-gepetto-pythonqt/depend.mk b/py-qt-gepetto-pythonqt/depend.mk
similarity index 100%
rename from py-qt4-gepetto-pythonqt/depend.mk
rename to py-qt-gepetto-pythonqt/depend.mk
diff --git a/py-qt5-gepetto-pythonqt/distinfo b/py-qt-gepetto-pythonqt/distinfo
similarity index 50%
rename from py-qt5-gepetto-pythonqt/distinfo
rename to py-qt-gepetto-pythonqt/distinfo
index 0aef75496a39930c5e60195045aeb5aa1113ba39..2d37a88e66538c44a5a8a153b413b6314365ed52 100644
--- a/py-qt5-gepetto-pythonqt/distinfo
+++ b/py-qt-gepetto-pythonqt/distinfo
@@ -1,3 +1,6 @@
+SHA1 (PythonQt-qt4-0.0.1.tar.gz) = 228b335475185ebca7acc3260b1bf7cd55bd4a08
+RMD160 (PythonQt-qt4-0.0.1.tar.gz) = 8a61461632944ff3eb4e7aeff9ed275b07cdf122
+Size (PythonQt-qt4-0.0.1.tar.gz) = 4600330 bytes
SHA1 (PythonQt-qt5-0.0.1.tar.gz) = 60bae1b3d7c0822590ffd1db1deb8f48ca7ed3dd
RMD160 (PythonQt-qt5-0.0.1.tar.gz) = 794746f942f69470a6a8be2b5ce8dfd2c6cacaa2
Size (PythonQt-qt5-0.0.1.tar.gz) = 4212082 bytes
diff --git a/py-qt4-gepetto-pythonqt/distinfo b/py-qt4-gepetto-pythonqt/distinfo
deleted file mode 100644
index 11c9e16386fd9cc8f8a11214acb9b25fb990476d..0000000000000000000000000000000000000000
--- a/py-qt4-gepetto-pythonqt/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-SHA1 (PythonQt-qt4-0.0.1.tar.gz) = 228b335475185ebca7acc3260b1bf7cd55bd4a08
-RMD160 (PythonQt-qt4-0.0.1.tar.gz) = 8a61461632944ff3eb4e7aeff9ed275b07cdf122
-Size (PythonQt-qt4-0.0.1.tar.gz) = 4600330 bytes
diff --git a/py-qt5-gepetto-pythonqt/DESCR b/py-qt5-gepetto-pythonqt/DESCR
deleted file mode 100644
index 9cd73fc3940457e15b9606520a557dc910ad5d7c..0000000000000000000000000000000000000000
--- a/py-qt5-gepetto-pythonqt/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Temporary fork of http://pythonqt.sourceforge.net/
diff --git a/py-qt5-gepetto-pythonqt/Makefile b/py-qt5-gepetto-pythonqt/Makefile
deleted file mode 100644
index 7bd35bd8946eb9a97671bb59440400c59a46c075..0000000000000000000000000000000000000000
--- a/py-qt5-gepetto-pythonqt/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# robotpkg Makefile for: wip/py-qt-gepetto-pythonqt
-# Created: Guilhem Saurel on Mon, 28 Jan 2019
-#
-
-ORG= gepetto
-NAME= PythonQt
-VERSION= 0.0.1
-PKGREVISION= 2
-
-DISTNAME= ${NAME}-${PKG_ALTERNATIVE.qt}-${VERSION}
-PKGNAME= ${PKGTAG.python-}${PKGTAG.qt-}${ORG}-pythonqt-${VERSION}
-WRKSRC= ${WRKDIR}/${NAME}-${VERSION}
-
-HOMEPAGE= ${MASTER_SITE_GITHUB:=${ORG}/${NAME}}
-MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=${NAME}/}
-MASTER_REPOSITORY= git ${HOMEPAGE}.git
-CHECKOUT_VCS_OPTS+= --recursive
-
-CATEGORIES= wip
-COMMENT= PythonQT temporary fork
-LICENSE= gnu-lgpl-v2.1
-MAINTAINER= gsaurel@laas.fr
-
-CMAKE_ARGS+= -DPythonQt_Wrap_QtAll=ON
-CMAKE_ARGS+= -DPythonQt_Extensions=ON
-
-DEPEND_ABI.qt= qt>5
-
-include ../../pkgtools/pkg-config/depend.mk
-include ../../mk/sysdep/cmake.mk
-include ../../mk/sysdep/python.mk
-include ../../mk/sysdep/qt.mk
-include ../../mk/language/c.mk
-include ../../mk/language/c++.mk
-include ../../mk/robotpkg.mk
diff --git a/py-qt5-gepetto-pythonqt/PLIST b/py-qt5-gepetto-pythonqt/PLIST
deleted file mode 100644
index f1afaa70046731b65995006a9e89e00611fc491c..0000000000000000000000000000000000000000
--- a/py-qt5-gepetto-pythonqt/PLIST
+++ /dev/null
@@ -1,43 +0,0 @@
-@comment Mon Jan 28 16:21:10 CET 2019
-include/PythonQt/PythonQt.h
-include/PythonQt/PythonQtBoolResult.h
-include/PythonQt/PythonQtClassInfo.h
-include/PythonQt/PythonQtClassWrapper.h
-include/PythonQt/PythonQtConversion.h
-include/PythonQt/PythonQtCppWrapperFactory.h
-include/PythonQt/PythonQtDoc.h
-include/PythonQt/PythonQtImportFileInterface.h
-include/PythonQt/PythonQtImporter.h
-include/PythonQt/PythonQtInstanceWrapper.h
-include/PythonQt/PythonQtMethodInfo.h
-include/PythonQt/PythonQtMisc.h
-include/PythonQt/PythonQtObjectPtr.h
-include/PythonQt/PythonQtProperty.h
-include/PythonQt/PythonQtPythonInclude.h
-include/PythonQt/PythonQtQFileImporter.h
-include/PythonQt/PythonQtSignal.h
-include/PythonQt/PythonQtSignalReceiver.h
-include/PythonQt/PythonQtSlot.h
-include/PythonQt/PythonQtSlotDecorator.h
-include/PythonQt/PythonQtStdDecorators.h
-include/PythonQt/PythonQtStdIn.h
-include/PythonQt/PythonQtStdOut.h
-include/PythonQt/PythonQtSystem.h
-include/PythonQt/PythonQtUtils.h
-include/PythonQt/PythonQtVariants.h
-include/PythonQt/PythonQt_QtAll.h
-include/PythonQt/PythonQt_QtBindings.h
-include/PythonQt/gui/PythonQtScriptingConsole.h
-lib/libPythonQt.so
-lib/libPythonQt_QtAll.so
-${PYTHON_SITELIB}/pythonqt/__init__.py
-${PYTHON_SITELIB}/pythonqt/matplotlib/__init__.py
-${PYTHON_SITELIB}/pythonqt/matplotlib/backends/__init__.py
-${PYTHON_SITELIB}/pythonqt/matplotlib/backends/backend_qt.py
-${PYTHON_SITELIB}/pythonqt/matplotlib/backends/backend_qt4.py
-${PYTHON_SITELIB}/pythonqt/matplotlib/backends/backend_qt4agg.py
-${PYTHON_SITELIB}/pythonqt/matplotlib/backends/backend_qtagg.py
-${PYTHON_SITELIB}/pythonqt/matplotlib/backends/qt4_compat.py
-${PYTHON_SITELIB}/pythonqt/matplotlib/backends/qt4_editor/__init__.py
-${PYTHON_SITELIB}/pythonqt/matplotlib/backends/qt4_editor/figureoptions.py
-${PYTHON_SITELIB}/pythonqt/matplotlib/backends/qt4_editor/formlayout.py
diff --git a/py-qt5-gepetto-pythonqt/depend.mk b/py-qt5-gepetto-pythonqt/depend.mk
deleted file mode 100644
index 891822a34bfa3b24eeb61f7d7356d29bd7c5ae18..0000000000000000000000000000000000000000
--- a/py-qt5-gepetto-pythonqt/depend.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# robotpkg depend.mk for: wip/py-qt-gepetto-pythonqt
-# Created: Guilhem Saurel on Mon, 28 Jan 2019
-#
-
-DEPEND_DEPTH:= ${DEPEND_DEPTH}+
-PY_QT_GEPETTO_PYTHONQT_DEPEND_MK:= ${PY_QT_GEPETTO_PYTHONQT_DEPEND_MK}+
-
-ifeq (+,$(DEPEND_DEPTH))
-DEPEND_PKG+= py-qt-gepetto-pythonqt
-endif
-
-ifeq (+,$(PY_QT_GEPETTO_PYTHONQT_DEPEND_MK)) # ------------------------------------------
-
-PREFER.py-qt-gepetto-pythonqt?= robotpkg
-
-SYSTEM_SEARCH.py-qt-gepetto-pythonqt=\
- 'include/PythonQt/PythonQt.h' \
- '${PYTHON_SYSLIBSEARCH}/pythonqt/__init__.py'
-
-DEPEND_USE+= py-qt-gepetto-pythonqt
-
-DEPEND_ABI.py-qt-gepetto-pythonqt?= py-qt-gepetto-pythonqt>=0.0.1
-DEPEND_DIR.py-qt-gepetto-pythonqt?= ../../wip/py-qt-gepetto-pythonqt
-
-endif # PY_QT_GEPETTO_PYTHONQT_DEPEND_MK ------------------------------------------------
-
-DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}