diff --git a/py-sot-tools-v3/Makefile b/py-sot-tools-v3/Makefile
index 5f85c4ab0a977cc06c169f6d65fefcd93c41ff52..37746edb07ac9282b8e09f334681cf320f8553e1 100644
--- a/py-sot-tools-v3/Makefile
+++ b/py-sot-tools-v3/Makefile
@@ -4,15 +4,10 @@
ORG= stack-of-tasks
NAME= sot-tools
-VERSION= 2.1.1
+VERSION= 2.2.0
-DISTNAME= ${NAME}-${VERSION}
PKGNAME= ${PKGTAG.python-}${NAME}-v3-${VERSION}
-MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=${NAME}/}
-MASTER_REPOSITORY= ${MASTER_REPOSITORY_GITHUB}${ORG}/${NAME}
-CHECKOUT_VCS_OPTS+= --recursive
-
CATEGORIES= wip
COMMENT= tools for the sot-core package (python bindings)
LICENSE= 2-clause-bsd
@@ -20,11 +15,9 @@ MAINTAINER= gepetto-soft@laas.fr
CONFLICTS+= py[0-9][0-9]-${NAME}
-CMAKE_ARGS+= -DCMAKE_INSTALL_LIBDIR=lib
-CMAKE_ARGS+= -DINSTALL_DOCUMENTATION=OFF # doxygen segfaults on 14.04
-
-DYNAMIC_PLIST_DIRS+= share/doc/${NAME}
+USE_PYTHON_ONLY= true
+include ../../devel/jrl-cmakemodules/Makefile.common
include ../../${CATEGORIES}/${NAME}-v3/depend.mk
include ../../wip/sot-core-v3/depend.mk
include ../../wip/py-sot-core-v3/depend.mk
diff --git a/py-sot-tools-v3/distinfo b/py-sot-tools-v3/distinfo
index d980d73dd66d490784a6ed1ee35c53e2e95a80d2..ff106075f1302a53e62531bff047065a1a87cd73 100644
--- a/py-sot-tools-v3/distinfo
+++ b/py-sot-tools-v3/distinfo
@@ -1,6 +1,3 @@
-SHA1 (sot-tools-2.1.1.tar.gz) = d601b2195c522b299be6513fde50abd3255612b6
-RMD160 (sot-tools-2.1.1.tar.gz) = c563c697edc55cfcaab9b40acb2291bdcaeb3843
-Size (sot-tools-2.1.1.tar.gz) = 795231 bytes
-SHA1 (patch-aa) = 6fc15aa32b1440fead21a83459638f0436df85bf
-SHA1 (patch-ab) = 65531cbbc1ea697e9f4f63f864fd811a99e955ae
-SHA1 (patch-ad) = 9731f90f2c33abec026a1d34cfaa653316b84427
+SHA1 (sot-tools-2.2.0.tar.gz) = 24bba437f50e4e895f4681a3bb288d30489284cd
+RMD160 (sot-tools-2.2.0.tar.gz) = 8f3e58fd22b9f8a52c8b49e9b27e34c74d3395a5
+Size (sot-tools-2.2.0.tar.gz) = 796458 bytes
diff --git a/py-sot-tools-v3/patches/patch-aa b/py-sot-tools-v3/patches/patch-aa
deleted file mode 100644
index 918ff4f78cb751b4eb727bffc7fe2d194f409153..0000000000000000000000000000000000000000
--- a/py-sot-tools-v3/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-don't install library from the main package
-
---- src/CMakeLists.txt.orig 2019-03-05 16:26:08.000000000 +0100
-+++ src/CMakeLists.txt 2019-03-05 16:36:01.762324977 +0100
-@@ -26,7 +26,6 @@
- SOVERSION ${PROJECT_VERSION}
- INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
-
--INSTALL (TARGETS ${LIBRARY_NAME} DESTINATION lib)
-
- IF(BUILD_PYTHON_INTERFACE)
- DYNAMIC_GRAPH_PYTHON_MODULE ("sot/tools" ${LIBRARY_NAME} wrap)
diff --git a/py-sot-tools-v3/patches/patch-ab b/py-sot-tools-v3/patches/patch-ab
deleted file mode 100644
index 72ef67639f1b9e60ce3968c5a25c71c6c48a2607..0000000000000000000000000000000000000000
--- a/py-sot-tools-v3/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-Don't install main .pc
-
---- cmake/base.cmake~ 2017-10-26 15:25:19.000000000 +0200
-+++ cmake/base.cmake 2018-04-26 18:06:07.322011937 +0200
-@@ -226,9 +226,7 @@
- # finalize the project setup.
- #
- MACRO(SETUP_PROJECT_FINALIZE)
-- _SETUP_PROJECT_PKG_CONFIG_FINALIZE()
- _SETUP_PROJECT_DOCUMENTATION_FINALIZE()
-- _SETUP_PROJECT_HEADER_FINAlIZE()
- _SETUP_DEBIAN()
- # Install data if needed
- _INSTALL_PROJECT_DATA()
diff --git a/py-sot-tools-v3/patches/patch-ad b/py-sot-tools-v3/patches/patch-ad
deleted file mode 100644
index 83ef8fe0054c7c19212a59d6abe3cc57a3f10707..0000000000000000000000000000000000000000
--- a/py-sot-tools-v3/patches/patch-ad
+++ /dev/null
@@ -1,40 +0,0 @@
-Don't install main headers
-
---- cmake/header.cmake~ 2017-10-26 15:25:19.000000000 +0200
-+++ cmake/header.cmake 2018-04-26 18:37:42.582417765 +0200
-@@ -92,11 +92,6 @@
- ${CMAKE_CURRENT_BINARY_DIR}/include/${HEADER_DIR}/deprecated.${PROJECT_CUSTOM_HEADER_EXTENSION}
- @ONLY
- )
-- INSTALL(FILES
-- ${CMAKE_CURRENT_BINARY_DIR}/include/${HEADER_DIR}/deprecated.${PROJECT_CUSTOM_HEADER_EXTENSION}
-- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${HEADER_DIR}
-- PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE
-- )
- # Generate warning.hh header.
- CONFIGURE_FILE(
- ${PROJECT_SOURCE_DIR}/cmake/warning.hh.cmake
-@@ -104,11 +99,6 @@
- @ONLY
- )
-
-- INSTALL(FILES
-- ${CMAKE_CURRENT_BINARY_DIR}/include/${HEADER_DIR}/warning.${PROJECT_CUSTOM_HEADER_EXTENSION}
-- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${HEADER_DIR}
-- PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE
-- )
-
-
- # Generate config.h header.
-@@ -150,11 +140,6 @@
- @ONLY
- )
- # Install it.
-- INSTALL(FILES
-- ${CMAKE_CURRENT_BINARY_DIR}/include/${HEADER_DIR}/${FILENAME}
-- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${HEADER_DIR}
-- PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE
-- )
- ENDFUNCTION(GENERATE_CONFIGURATION_HEADER)
-
-
diff --git a/sot-tools-v3/Makefile b/sot-tools-v3/Makefile
index 2d0637a47b508a8cba3a586b6d45b431a828e50e..16f5175e2919ddcfc72b727e33dfb08befa4aedf 100644
--- a/sot-tools-v3/Makefile
+++ b/sot-tools-v3/Makefile
@@ -4,15 +4,10 @@
ORG= stack-of-tasks
NAME= sot-tools
-VERSION= 2.1.1
+VERSION= 2.2.0
-DISTNAME= ${NAME}-${VERSION}
PKGNAME= ${NAME}-v3-${VERSION}
-MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=${NAME}/}
-MASTER_REPOSITORY= ${MASTER_REPOSITORY_GITHUB}${ORG}/${NAME}.git
-CHECKOUT_VCS_OPTS+= --recursive
-
CATEGORIES= wip
COMMENT= tools for the sot-core package
LICENSE= 2-clause-bsd
@@ -21,11 +16,9 @@ MAINTAINER= gepetto-soft@laas.fr
CONFLICTS+= ${NAME}
CMAKE_ARGS+= -DBUILD_PYTHON_INTERFACE=OFF
-CMAKE_ARGS+= -DCMAKE_INSTALL_LIBDIR=lib
CMAKE_ARGS+= -DINSTALL_DOCUMENTATION=OFF # doxygen segfaults on 14.04
-DYNAMIC_PLIST_DIRS+= share/doc/${NAME}
-
+include ../../devel/jrl-cmakemodules/Makefile.common
include ../../wip/sot-core-v3/depend.mk
include ../../wip/dynamic-graph-v3/depend.mk
include ../../pkgtools/pkg-config/depend.mk
diff --git a/sot-tools-v3/distinfo b/sot-tools-v3/distinfo
index 396cc6ab692d94539c736c6b206875d2cc7354c3..ff106075f1302a53e62531bff047065a1a87cd73 100644
--- a/sot-tools-v3/distinfo
+++ b/sot-tools-v3/distinfo
@@ -1,3 +1,3 @@
-SHA1 (sot-tools-2.1.1.tar.gz) = d601b2195c522b299be6513fde50abd3255612b6
-RMD160 (sot-tools-2.1.1.tar.gz) = c563c697edc55cfcaab9b40acb2291bdcaeb3843
-Size (sot-tools-2.1.1.tar.gz) = 795231 bytes
+SHA1 (sot-tools-2.2.0.tar.gz) = 24bba437f50e4e895f4681a3bb288d30489284cd
+RMD160 (sot-tools-2.2.0.tar.gz) = 8f3e58fd22b9f8a52c8b49e9b27e34c74d3395a5
+Size (sot-tools-2.2.0.tar.gz) = 796458 bytes