* [gentoo-commits] repo/gentoo:master commit in: dev-util/catkin/files/, dev-util/catkin/
@ 2015-11-19 9:58 Alexis Ballier
0 siblings, 0 replies; 8+ messages in thread
From: Alexis Ballier @ 2015-11-19 9:58 UTC (permalink / raw
To: gentoo-commits
commit: e36fcade64d0da8cd1c0d121f83c1bf9fbc98025
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 19 09:47:48 2015 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 09:58:39 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e36fcade
dev-util/catkin: Add env.d file; moved from roslaunch.
Package-Manager: portage-2.2.25
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
dev-util/catkin/catkin-0.6.16.ebuild | 3 +++
dev-util/catkin/catkin-9999.ebuild | 3 +++
dev-util/catkin/files/40catkin | 3 +++
3 files changed, 9 insertions(+)
diff --git a/dev-util/catkin/catkin-0.6.16.ebuild b/dev-util/catkin/catkin-0.6.16.ebuild
index 53f670a..b4904c8 100644
--- a/dev-util/catkin/catkin-0.6.16.ebuild
+++ b/dev-util/catkin/catkin-0.6.16.ebuild
@@ -90,6 +90,9 @@ catkin_src_install_internal() {
src_install() {
python_foreach_impl catkin_src_install_internal
+
+ doenvd "${FILESDIR}/40catkin"
+
# needed to be considered as a workspace
touch "${ED}/usr/.catkin"
}
diff --git a/dev-util/catkin/catkin-9999.ebuild b/dev-util/catkin/catkin-9999.ebuild
index 53f670a..b4904c8 100644
--- a/dev-util/catkin/catkin-9999.ebuild
+++ b/dev-util/catkin/catkin-9999.ebuild
@@ -90,6 +90,9 @@ catkin_src_install_internal() {
src_install() {
python_foreach_impl catkin_src_install_internal
+
+ doenvd "${FILESDIR}/40catkin"
+
# needed to be considered as a workspace
touch "${ED}/usr/.catkin"
}
diff --git a/dev-util/catkin/files/40catkin b/dev-util/catkin/files/40catkin
new file mode 100644
index 0000000..46a6edf
--- /dev/null
+++ b/dev-util/catkin/files/40catkin
@@ -0,0 +1,3 @@
+CATKIN_PREFIX_PATH=/usr
+ROS_ROOT=/usr/share/ros
+ROS_PACKAGE_PATH=/usr/share
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/catkin/files/, dev-util/catkin/
@ 2015-11-27 12:31 Alexis Ballier
0 siblings, 0 replies; 8+ messages in thread
From: Alexis Ballier @ 2015-11-27 12:31 UTC (permalink / raw
To: gentoo-commits
commit: 3bc8f1430d487b57c71bb0129853466b6514afba
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 27 12:30:48 2015 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 12:30:55 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bc8f143
dev-util/catkin: include GNUInstallDirs in all.cmake so that LIBDIR is always defined. Bug #566670.
Package-Manager: portage-2.2.26
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
.../{catkin-0.6.16-r1.ebuild => catkin-0.6.16-r2.ebuild} | 1 +
dev-util/catkin/catkin-9999.ebuild | 1 +
dev-util/catkin/files/gnuinstalldirs.patch | 15 +++++++++++++++
3 files changed, 17 insertions(+)
diff --git a/dev-util/catkin/catkin-0.6.16-r1.ebuild b/dev-util/catkin/catkin-0.6.16-r2.ebuild
similarity index 98%
rename from dev-util/catkin/catkin-0.6.16-r1.ebuild
rename to dev-util/catkin/catkin-0.6.16-r2.ebuild
index b4904c8..1e11494 100644
--- a/dev-util/catkin/catkin-0.6.16-r1.ebuild
+++ b/dev-util/catkin/catkin-0.6.16-r2.ebuild
@@ -39,6 +39,7 @@ PATCHES=(
"${FILESDIR}/tests.patch"
"${FILESDIR}/distutils.patch"
"${FILESDIR}/catkin_prefix_path.patch"
+ "${FILESDIR}/gnuinstalldirs.patch"
)
src_prepare() {
diff --git a/dev-util/catkin/catkin-9999.ebuild b/dev-util/catkin/catkin-9999.ebuild
index b4904c8..1e11494 100644
--- a/dev-util/catkin/catkin-9999.ebuild
+++ b/dev-util/catkin/catkin-9999.ebuild
@@ -39,6 +39,7 @@ PATCHES=(
"${FILESDIR}/tests.patch"
"${FILESDIR}/distutils.patch"
"${FILESDIR}/catkin_prefix_path.patch"
+ "${FILESDIR}/gnuinstalldirs.patch"
)
src_prepare() {
diff --git a/dev-util/catkin/files/gnuinstalldirs.patch b/dev-util/catkin/files/gnuinstalldirs.patch
new file mode 100644
index 0000000..795eafc
--- /dev/null
+++ b/dev-util/catkin/files/gnuinstalldirs.patch
@@ -0,0 +1,15 @@
+Index: catkin-0.6.16/cmake/all.cmake
+===================================================================
+--- catkin-0.6.16.orig/cmake/all.cmake
++++ catkin-0.6.16/cmake/all.cmake
+@@ -108,6 +108,10 @@ endif()
+ # include CMake functions
+ include(CMakeParseArguments)
+
++# include GNUInstallDirs for LIBDIR
++# https://bugs.gentoo.org/show_bug.cgi?id=566670
++include(GNUInstallDirs)
++
+ # functions/macros: list_append_unique, safe_execute_process
+ # python-integration: catkin_python_setup.cmake, interrogate_setup_dot_py.py, templates/__init__.py.in, templates/script.py.in, templates/python_distutils_install.bat.in, templates/python_distutils_install.sh.in, templates/safe_execute_install.cmake.in
+ foreach(filename
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/catkin/files/, dev-util/catkin/
@ 2016-10-07 15:55 Alexis Ballier
0 siblings, 0 replies; 8+ messages in thread
From: Alexis Ballier @ 2016-10-07 15:55 UTC (permalink / raw
To: gentoo-commits
commit: 37b4031d1f22c7b09d35a4c1951e721a0d647801
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 7 15:50:50 2016 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Oct 7 15:55:15 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37b4031d
dev-util/catkin: install package.xml in /usr/share/ros_packages/$PKG.
This fixes rospack warnings and more importantly rospack reading the whole /usr/share hierarchy.
Bug #595004
Package-Manager: portage-2.3.1
...tkin-0.7.1-r1.ebuild => catkin-0.7.1-r2.ebuild} | 10 ++++++
dev-util/catkin/catkin-9999.ebuild | 10 ++++++
dev-util/catkin/files/40catkin | 2 +-
.../catkin/files/catkin_prefix_path_util_py.patch | 24 ++++++++++++++
dev-util/catkin/files/package_xml.patch | 37 ++++++++++++++++++++++
5 files changed, 82 insertions(+), 1 deletion(-)
diff --git a/dev-util/catkin/catkin-0.7.1-r1.ebuild b/dev-util/catkin/catkin-0.7.1-r2.ebuild
similarity index 84%
rename from dev-util/catkin/catkin-0.7.1-r1.ebuild
rename to dev-util/catkin/catkin-0.7.1-r2.ebuild
index cf494b1..02c18e9 100644
--- a/dev-util/catkin/catkin-0.7.1-r1.ebuild
+++ b/dev-util/catkin/catkin-0.7.1-r2.ebuild
@@ -41,6 +41,7 @@ PATCHES=(
"${FILESDIR}/catkin_prefix_path.patch"
"${FILESDIR}/gnuinstalldirs.patch"
"${FILESDIR}/catkin_prefix_path_util_py.patch"
+ "${FILESDIR}/package_xml.patch"
)
src_prepare() {
@@ -98,3 +99,12 @@ src_install() {
# needed to be considered as a workspace
touch "${ED}/usr/.catkin"
}
+
+pkg_postinst() {
+ ewarn "Starting from version 0.7.1-r2, dev-util/catkin changed the"
+ ewarn "installation path for package.xml files on Gentoo."
+ ewarn "In order for ROS to work properly, you will need to reinstall ROS"
+ ewarn "packages that have it installed in the old location:"
+ ewarn " emerge -1O /usr/share/*/package.xml"
+ ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=595004 for more details."
+}
diff --git a/dev-util/catkin/catkin-9999.ebuild b/dev-util/catkin/catkin-9999.ebuild
index cf494b1..02c18e9 100644
--- a/dev-util/catkin/catkin-9999.ebuild
+++ b/dev-util/catkin/catkin-9999.ebuild
@@ -41,6 +41,7 @@ PATCHES=(
"${FILESDIR}/catkin_prefix_path.patch"
"${FILESDIR}/gnuinstalldirs.patch"
"${FILESDIR}/catkin_prefix_path_util_py.patch"
+ "${FILESDIR}/package_xml.patch"
)
src_prepare() {
@@ -98,3 +99,12 @@ src_install() {
# needed to be considered as a workspace
touch "${ED}/usr/.catkin"
}
+
+pkg_postinst() {
+ ewarn "Starting from version 0.7.1-r2, dev-util/catkin changed the"
+ ewarn "installation path for package.xml files on Gentoo."
+ ewarn "In order for ROS to work properly, you will need to reinstall ROS"
+ ewarn "packages that have it installed in the old location:"
+ ewarn " emerge -1O /usr/share/*/package.xml"
+ ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=595004 for more details."
+}
diff --git a/dev-util/catkin/files/40catkin b/dev-util/catkin/files/40catkin
index 46a6edf..469fa37 100644
--- a/dev-util/catkin/files/40catkin
+++ b/dev-util/catkin/files/40catkin
@@ -1,3 +1,3 @@
CATKIN_PREFIX_PATH=/usr
ROS_ROOT=/usr/share/ros
-ROS_PACKAGE_PATH=/usr/share
+ROS_PACKAGE_PATH=/usr/share/ros_packages
diff --git a/dev-util/catkin/files/catkin_prefix_path_util_py.patch b/dev-util/catkin/files/catkin_prefix_path_util_py.patch
index d978176..e667ea9 100644
--- a/dev-util/catkin/files/catkin_prefix_path_util_py.patch
+++ b/dev-util/catkin/files/catkin_prefix_path_util_py.patch
@@ -14,3 +14,27 @@ Index: catkin-0.6.16/cmake/templates/_setup_util.py.in
# prepend current workspace if not already part of CPP
base_path = os.path.dirname(__file__)
if base_path not in CMAKE_PREFIX_PATH:
+Index: catkin-0.7.1/python/catkin/builder.py
+===================================================================
+--- catkin-0.7.1.orig/python/catkin/builder.py
++++ catkin-0.7.1/python/catkin/builder.py
+@@ -1026,6 +1026,7 @@ def build_workspace_isolated(
+ 'CATKIN_LIB_ENVIRONMENT_PATHS': "'lib'",
+ 'CATKIN_PKGCONFIG_ENVIRONMENT_PATHS': "os.path.join('lib', 'pkgconfig')",
+ 'CMAKE_PREFIX_PATH_AS_IS': ';'.join(os.environ['CMAKE_PREFIX_PATH'].split(os.pathsep)),
++ 'CATKIN_PREFIX_PATH': ';'.join(os.environ['CATKIN_PREFIX_PATH'].split(os.pathsep)),
+ 'PYTHON_EXECUTABLE': sys.executable,
+ 'PYTHON_INSTALL_DIR': get_python_install_dir(),
+ }
+Index: catkin-0.7.1/test/unit_tests/test_setup_util.py
+===================================================================
+--- catkin-0.7.1.orig/test/unit_tests/test_setup_util.py
++++ catkin-0.7.1/test/unit_tests/test_setup_util.py
+@@ -14,6 +14,7 @@ data = configure_file(os.path.join(os.pa
+ 'PYTHON_EXECUTABLE': sys.executable,
+ 'PYTHON_INSTALL_DIR': 'pythonX.Y/packages',
+ 'CMAKE_PREFIX_PATH_AS_IS': '',
++ 'CATKIN_PREFIX_PATH':'',
+ })
+ with tempfile.NamedTemporaryFile('w+') as setup_util_file:
+ setup_util_file.write(data)
diff --git a/dev-util/catkin/files/package_xml.patch b/dev-util/catkin/files/package_xml.patch
new file mode 100644
index 00000000..6099f07
--- /dev/null
+++ b/dev-util/catkin/files/package_xml.patch
@@ -0,0 +1,37 @@
+Index: catkin-0.7.1/cmake/catkin_package.cmake
+===================================================================
+--- catkin-0.7.1.orig/cmake/catkin_package.cmake
++++ catkin-0.7.1/cmake/catkin_package.cmake
+@@ -518,6 +518,6 @@ function(_catkin_package)
+
+ # install package.xml
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/package.xml
+- DESTINATION share/${PROJECT_NAME}
++ DESTINATION share/ros_packages/${PROJECT_NAME}
+ )
+ endfunction()
+Index: catkin-0.7.1/cmake/all.cmake
+===================================================================
+--- catkin-0.7.1.orig/cmake/all.cmake
++++ catkin-0.7.1/cmake/all.cmake
+@@ -156,7 +156,7 @@ foreach(filename
+ endforeach()
+
+ # output catkin version for debugging
+-_catkin_package_xml(${CMAKE_BINARY_DIR}/catkin/catkin_generated/version DIRECTORY ${catkin_EXTRAS_DIR}/..)
++#_catkin_package_xml(${CMAKE_BINARY_DIR}/catkin/catkin_generated/version DIRECTORY ${catkin_EXTRAS_DIR}/../../ros_packages/catkin)
+ message(STATUS "catkin ${catkin_VERSION}")
+ # ensure that no current package name is set
+ unset(_CATKIN_CURRENT_PACKAGE)
+Index: catkin-0.7.1/cmake/catkin_metapackage.cmake
+===================================================================
+--- catkin-0.7.1.orig/cmake/catkin_metapackage.cmake
++++ catkin-0.7.1/cmake/catkin_metapackage.cmake
+@@ -40,6 +40,6 @@ function(catkin_metapackage)
+
+ # install package.xml
+ install(FILES ${ARG_DIRECTORY}/package.xml
+- DESTINATION share/${PROJECT_NAME}
++ DESTINATION share/ros_packages/${PROJECT_NAME}
+ )
+ endfunction()
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/catkin/files/, dev-util/catkin/
@ 2017-02-23 9:44 Alexis Ballier
0 siblings, 0 replies; 8+ messages in thread
From: Alexis Ballier @ 2017-02-23 9:44 UTC (permalink / raw
To: gentoo-commits
commit: 2eea25efd90d77eff2d6d56d6c9944097e78d615
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 23 09:31:52 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Feb 23 09:44:52 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2eea25ef
dev-util/catkin: Add pypy support.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
dev-util/catkin/catkin-0.7.6.ebuild | 3 ++-
dev-util/catkin/catkin-9999.ebuild | 3 ++-
dev-util/catkin/files/sitedir.patch | 15 +++++++++++++++
3 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/dev-util/catkin/catkin-0.7.6.ebuild b/dev-util/catkin/catkin-0.7.6.ebuild
index 206cc51814..2bce0e1b50 100644
--- a/dev-util/catkin/catkin-0.7.6.ebuild
+++ b/dev-util/catkin/catkin-0.7.6.ebuild
@@ -10,7 +10,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
EGIT_REPO_URI="https://github.com/ros/catkin"
fi
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
inherit ${SCM} cmake-utils python-r1 python-utils-r1
@@ -43,6 +43,7 @@ PATCHES=(
"${FILESDIR}/catkin_prefix_path_util_py.patch"
"${FILESDIR}/package_xml.patch"
"${FILESDIR}/etc.patch"
+ "${FILESDIR}/sitedir.patch"
)
src_prepare() {
diff --git a/dev-util/catkin/catkin-9999.ebuild b/dev-util/catkin/catkin-9999.ebuild
index 206cc51814..2bce0e1b50 100644
--- a/dev-util/catkin/catkin-9999.ebuild
+++ b/dev-util/catkin/catkin-9999.ebuild
@@ -10,7 +10,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
EGIT_REPO_URI="https://github.com/ros/catkin"
fi
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
inherit ${SCM} cmake-utils python-r1 python-utils-r1
@@ -43,6 +43,7 @@ PATCHES=(
"${FILESDIR}/catkin_prefix_path_util_py.patch"
"${FILESDIR}/package_xml.patch"
"${FILESDIR}/etc.patch"
+ "${FILESDIR}/sitedir.patch"
)
src_prepare() {
diff --git a/dev-util/catkin/files/sitedir.patch b/dev-util/catkin/files/sitedir.patch
new file mode 100644
index 0000000000..61fcad29d0
--- /dev/null
+++ b/dev-util/catkin/files/sitedir.patch
@@ -0,0 +1,15 @@
+Pass --install-lib to setup.py install.
+pypy installs in /usr/site-packages otherwise...
+
+Index: catkin-0.7.6/cmake/templates/python_distutils_install.sh.in
+===================================================================
+--- catkin-0.7.6.orig/cmake/templates/python_distutils_install.sh.in
++++ catkin-0.7.6/cmake/templates/python_distutils_install.sh.in
+@@ -30,4 +30,6 @@ echo_and_run /usr/bin/env \
+ build --build-base "@CMAKE_CURRENT_BINARY_DIR@" \
+ install \
+ $DESTDIR_ARG \
+- @SETUPTOOLS_ARG_EXTRA@ --prefix="@CMAKE_INSTALL_PREFIX@" --install-scripts="${PYTHON_SCRIPTDIR:-@CMAKE_INSTALL_PREFIX@/@CATKIN_GLOBAL_BIN_DESTINATION@}"
++ @SETUPTOOLS_ARG_EXTRA@ --prefix="@CMAKE_INSTALL_PREFIX@" \
++ --install-scripts="${PYTHON_SCRIPTDIR:-@CMAKE_INSTALL_PREFIX@/@CATKIN_GLOBAL_BIN_DESTINATION@}" \
++ --install-lib="@CMAKE_INSTALL_PREFIX@/@PYTHON_INSTALL_DIR@"
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/catkin/files/, dev-util/catkin/
@ 2017-02-28 11:27 Alexis Ballier
0 siblings, 0 replies; 8+ messages in thread
From: Alexis Ballier @ 2017-02-28 11:27 UTC (permalink / raw
To: gentoo-commits
commit: 4be2f6509bf1c198360af74212cd49e1751b340c
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 28 08:24:16 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Feb 28 11:26:49 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4be2f650
dev-util/catkin: Install package.xml twice, once in ros_packages for fast searching/crawling, once in its standard location for other tools to find it.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
...{catkin-0.7.6.ebuild => catkin-0.7.6-r1.ebuild} | 0
dev-util/catkin/files/package_xml.patch | 38 +++++++++++-----------
2 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/dev-util/catkin/catkin-0.7.6.ebuild b/dev-util/catkin/catkin-0.7.6-r1.ebuild
similarity index 100%
rename from dev-util/catkin/catkin-0.7.6.ebuild
rename to dev-util/catkin/catkin-0.7.6-r1.ebuild
diff --git a/dev-util/catkin/files/package_xml.patch b/dev-util/catkin/files/package_xml.patch
index 6099f07960..52506ee680 100644
--- a/dev-util/catkin/files/package_xml.patch
+++ b/dev-util/catkin/files/package_xml.patch
@@ -1,19 +1,19 @@
-Index: catkin-0.7.1/cmake/catkin_package.cmake
+Index: catkin-0.7.6/cmake/catkin_package.cmake
===================================================================
---- catkin-0.7.1.orig/cmake/catkin_package.cmake
-+++ catkin-0.7.1/cmake/catkin_package.cmake
-@@ -518,6 +518,6 @@ function(_catkin_package)
-
- # install package.xml
+--- catkin-0.7.6.orig/cmake/catkin_package.cmake
++++ catkin-0.7.6/cmake/catkin_package.cmake
+@@ -527,4 +527,7 @@ function(_catkin_package)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/package.xml
-- DESTINATION share/${PROJECT_NAME}
-+ DESTINATION share/ros_packages/${PROJECT_NAME}
+ DESTINATION share/${PROJECT_NAME}
)
++ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/package.xml
++ DESTINATION share/ros_packages/${PROJECT_NAME}
++ )
endfunction()
-Index: catkin-0.7.1/cmake/all.cmake
+Index: catkin-0.7.6/cmake/all.cmake
===================================================================
---- catkin-0.7.1.orig/cmake/all.cmake
-+++ catkin-0.7.1/cmake/all.cmake
+--- catkin-0.7.6.orig/cmake/all.cmake
++++ catkin-0.7.6/cmake/all.cmake
@@ -156,7 +156,7 @@ foreach(filename
endforeach()
@@ -23,15 +23,15 @@ Index: catkin-0.7.1/cmake/all.cmake
message(STATUS "catkin ${catkin_VERSION}")
# ensure that no current package name is set
unset(_CATKIN_CURRENT_PACKAGE)
-Index: catkin-0.7.1/cmake/catkin_metapackage.cmake
+Index: catkin-0.7.6/cmake/catkin_metapackage.cmake
===================================================================
---- catkin-0.7.1.orig/cmake/catkin_metapackage.cmake
-+++ catkin-0.7.1/cmake/catkin_metapackage.cmake
-@@ -40,6 +40,6 @@ function(catkin_metapackage)
-
- # install package.xml
+--- catkin-0.7.6.orig/cmake/catkin_metapackage.cmake
++++ catkin-0.7.6/cmake/catkin_metapackage.cmake
+@@ -42,4 +42,7 @@ function(catkin_metapackage)
install(FILES ${ARG_DIRECTORY}/package.xml
-- DESTINATION share/${PROJECT_NAME}
-+ DESTINATION share/ros_packages/${PROJECT_NAME}
+ DESTINATION share/${PROJECT_NAME}
)
++ install(FILES ${ARG_DIRECTORY}/package.xml
++ DESTINATION share/ros_packages/${PROJECT_NAME}
++ )
endfunction()
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/catkin/files/, dev-util/catkin/
@ 2019-05-24 16:23 Alexis Ballier
0 siblings, 0 replies; 8+ messages in thread
From: Alexis Ballier @ 2019-05-24 16:23 UTC (permalink / raw
To: gentoo-commits
commit: c10a60e2e37797bb070ddfd54f1e8802f9d2fa32
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri May 24 16:04:09 2019 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri May 24 16:23:29 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c10a60e2
dev-util/catkin: bump to 0.7.17
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
dev-util/catkin/Manifest | 1 +
.../{catkin-9999.ebuild => catkin-0.7.17.ebuild} | 2 +-
dev-util/catkin/catkin-9999.ebuild | 2 +-
.../files/catkin_prefix_path_util_py_v2.patch | 40 ++++++++++++++++++++++
4 files changed, 43 insertions(+), 2 deletions(-)
diff --git a/dev-util/catkin/Manifest b/dev-util/catkin/Manifest
index b4107c5a90c..078333b1a2e 100644
--- a/dev-util/catkin/Manifest
+++ b/dev-util/catkin/Manifest
@@ -1 +1,2 @@
DIST catkin-0.7.14.tar.gz 203422 BLAKE2B 22f27066054db9d35aaee216603c778a70a1941ab067ba6bfb42d25c6c90dc3fe3efb19167328dcbb008d21b9f7987cce4d3af44fe8368a1fda369432b383401 SHA512 4d17d2fd9c69d04d90a2aff4d48ac6cbdec052856af18cd4b3fb72cb7b3159651b606cd36ef653b9097ee7c23e036709afc019a95bb0ab34c29f51aad4d17d21
+DIST catkin-0.7.17.tar.gz 212023 BLAKE2B 901bc5a3e226eaab59917b4d548fe3aacfad602a75e46cbd720f252ffd490c4ff2b170cd158a0c09c047b837d6f097555ba55291dfeedb51951d98f2f0273c34 SHA512 0c6adfda27924a5c9c5360e5e84e082e5cc9a7638a1129fe86f604515d3731f4257f725f80e8e8781200a8a367472224aea537871e56e1859e9f66950a746d45
diff --git a/dev-util/catkin/catkin-9999.ebuild b/dev-util/catkin/catkin-0.7.17.ebuild
similarity index 98%
copy from dev-util/catkin/catkin-9999.ebuild
copy to dev-util/catkin/catkin-0.7.17.ebuild
index cef4fa0eb0e..84cbac41ee4 100644
--- a/dev-util/catkin/catkin-9999.ebuild
+++ b/dev-util/catkin/catkin-0.7.17.ebuild
@@ -42,7 +42,7 @@ PATCHES=(
"${FILESDIR}/distutils.patch"
"${FILESDIR}/catkin_prefix_path.patch"
"${FILESDIR}/gnuinstalldirs.patch"
- "${FILESDIR}/catkin_prefix_path_util_py.patch"
+ "${FILESDIR}/catkin_prefix_path_util_py_v2.patch"
"${FILESDIR}/package_xml.patch"
"${FILESDIR}/etc.patch"
"${FILESDIR}/sitedir.patch"
diff --git a/dev-util/catkin/catkin-9999.ebuild b/dev-util/catkin/catkin-9999.ebuild
index cef4fa0eb0e..84cbac41ee4 100644
--- a/dev-util/catkin/catkin-9999.ebuild
+++ b/dev-util/catkin/catkin-9999.ebuild
@@ -42,7 +42,7 @@ PATCHES=(
"${FILESDIR}/distutils.patch"
"${FILESDIR}/catkin_prefix_path.patch"
"${FILESDIR}/gnuinstalldirs.patch"
- "${FILESDIR}/catkin_prefix_path_util_py.patch"
+ "${FILESDIR}/catkin_prefix_path_util_py_v2.patch"
"${FILESDIR}/package_xml.patch"
"${FILESDIR}/etc.patch"
"${FILESDIR}/sitedir.patch"
diff --git a/dev-util/catkin/files/catkin_prefix_path_util_py_v2.patch b/dev-util/catkin/files/catkin_prefix_path_util_py_v2.patch
new file mode 100644
index 00000000000..ae468b21c01
--- /dev/null
+++ b/dev-util/catkin/files/catkin_prefix_path_util_py_v2.patch
@@ -0,0 +1,40 @@
+Author: Eric Timmons
+https://bugs.gentoo.org/show_bug.cgi?id=586104
+
+Index: catkin-0.7.17/cmake/templates/_setup_util.py.in
+===================================================================
+--- catkin-0.7.17.orig/cmake/templates/_setup_util.py.in
++++ catkin-0.7.17/cmake/templates/_setup_util.py.in
+@@ -264,7 +264,7 @@ if __name__ == '__main__':
+
+ if not args.local:
+ # environment at generation time
+- CMAKE_PREFIX_PATH = '@CMAKE_PREFIX_PATH_AS_IS@'.split(';')
++ CMAKE_PREFIX_PATH = '@CATKIN_PREFIX_PATH@;@CMAKE_PREFIX_PATH_AS_IS@'.split(';')
+ else:
+ # don't consider any other prefix path than this one
+ CMAKE_PREFIX_PATH = []
+Index: catkin-0.7.17/python/catkin/builder.py
+===================================================================
+--- catkin-0.7.17.orig/python/catkin/builder.py
++++ catkin-0.7.17/python/catkin/builder.py
+@@ -1143,6 +1143,7 @@ _CATKIN_SETUP_DIR= . "{0}/setup.sh"
+ 'CATKIN_LIB_ENVIRONMENT_PATHS': "'lib'",
+ 'CATKIN_PKGCONFIG_ENVIRONMENT_PATHS': "os.path.join('lib', 'pkgconfig')",
+ 'CMAKE_PREFIX_PATH_AS_IS': ';'.join(os.environ['CMAKE_PREFIX_PATH'].split(os.pathsep)),
++ 'CATKIN_PREFIX_PATH': ';'.join(os.environ['CATKIN_PREFIX_PATH'].split(os.pathsep)),
+ 'PYTHON_EXECUTABLE': sys.executable,
+ 'PYTHON_INSTALL_DIR': get_python_install_dir(),
+ }
+Index: catkin-0.7.17/test/unit_tests/test_setup_util.py
+===================================================================
+--- catkin-0.7.17.orig/test/unit_tests/test_setup_util.py
++++ catkin-0.7.17/test/unit_tests/test_setup_util.py
+@@ -14,6 +14,7 @@ data = configure_file(os.path.join(os.pa
+ 'PYTHON_EXECUTABLE': sys.executable,
+ 'PYTHON_INSTALL_DIR': 'pythonX.Y/packages',
+ 'CMAKE_PREFIX_PATH_AS_IS': '',
++ 'CATKIN_PREFIX_PATH':'',
+ })
+ with tempfile.NamedTemporaryFile('w+') as setup_util_file:
+ setup_util_file.write(data)
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/catkin/files/, dev-util/catkin/
@ 2020-07-30 15:03 Alexis Ballier
0 siblings, 0 replies; 8+ messages in thread
From: Alexis Ballier @ 2020-07-30 15:03 UTC (permalink / raw
To: gentoo-commits
commit: 849f81370b8dbc13601b1bef1230bce46abc0630
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 30 15:01:40 2020 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Jul 30 15:02:35 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=849f8137
dev-util/catkin: Remove old
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
dev-util/catkin/Manifest | 1 -
dev-util/catkin/catkin-0.7.14.ebuild | 120 ---------------------
.../catkin/files/catkin_prefix_path_util_py.patch | 40 -------
3 files changed, 161 deletions(-)
diff --git a/dev-util/catkin/Manifest b/dev-util/catkin/Manifest
index 5ff51930aca..a32421bb653 100644
--- a/dev-util/catkin/Manifest
+++ b/dev-util/catkin/Manifest
@@ -1,4 +1,3 @@
-DIST catkin-0.7.14.tar.gz 203422 BLAKE2B 22f27066054db9d35aaee216603c778a70a1941ab067ba6bfb42d25c6c90dc3fe3efb19167328dcbb008d21b9f7987cce4d3af44fe8368a1fda369432b383401 SHA512 4d17d2fd9c69d04d90a2aff4d48ac6cbdec052856af18cd4b3fb72cb7b3159651b606cd36ef653b9097ee7c23e036709afc019a95bb0ab34c29f51aad4d17d21
DIST catkin-0.7.17.tar.gz 212023 BLAKE2B 901bc5a3e226eaab59917b4d548fe3aacfad602a75e46cbd720f252ffd490c4ff2b170cd158a0c09c047b837d6f097555ba55291dfeedb51951d98f2f0273c34 SHA512 0c6adfda27924a5c9c5360e5e84e082e5cc9a7638a1129fe86f604515d3731f4257f725f80e8e8781200a8a367472224aea537871e56e1859e9f66950a746d45
DIST catkin-0.7.20.tar.gz 215244 BLAKE2B 06755e87f43d1e97138a6696af05dfd9b9434adcca9d4269c7b93b363b25ac9e8b198a980d7607b6b317f546b7637103dc251213087201ff56c1f12c86892edb SHA512 7258f0d548a92d846c9ad195d5e28a567d3c1b4cd1caabffd58c3fabee66cec8ce3612d3095e6437ac201b4d37fddf8f850775e809ebb7eaaeb99328afaedfc6
DIST catkin-0.8.3.tar.gz 215988 BLAKE2B 92d7bced93e2d33dafcfd902724f993aa15756139265b5594c15041c333568591193b86e1a4bee8c278f2739dd063f73b6ce675b8ab4fefd312b5daeea414c7a SHA512 14fd03627f3fb339a850ca73e7a49dfeb7312a85416473dff60995ea1d0f1050982929c297751502589a7320dd7eec5d922c86061166f9d475fc1108540db4ae
diff --git a/dev-util/catkin/catkin-0.7.14.ebuild b/dev-util/catkin/catkin-0.7.14.ebuild
deleted file mode 100644
index 4a444f773cf..00000000000
--- a/dev-util/catkin/catkin-0.7.14.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
- SCM="git-r3"
- EGIT_REPO_URI="https://github.com/ros/catkin"
-fi
-
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit ${SCM} cmake-utils python-r1
-
-DESCRIPTION="Cmake macros and associated python code used to build some parts of ROS"
-HOMEPAGE="http://wiki.ros.org/catkin"
-if [ "${PV#9999}" != "${PV}" ] ; then
- SRC_URI=""
- KEYWORDS=""
-else
- SRC_URI="https://github.com/ros/catkin/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
- ${PYTHON_DEPS}
- dev-python/catkin_pkg[${PYTHON_USEDEP}]
- dev-python/empy[${PYTHON_USEDEP}]
- dev-util/cmake
-"
-DEPEND="${RDEPEND}
- test? ( dev-python/nose[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] )"
-
-PATCHES=(
- "${FILESDIR}/tests.patch"
- "${FILESDIR}/distutils.patch"
- "${FILESDIR}/catkin_prefix_path.patch"
- "${FILESDIR}/gnuinstalldirs.patch"
- "${FILESDIR}/catkin_prefix_path_util_py.patch"
- "${FILESDIR}/package_xml.patch"
- "${FILESDIR}/etc.patch"
- "${FILESDIR}/sitedir.patch"
-)
-
-src_prepare() {
- # fix libdir
- sed -i \
- -e 's:LIBEXEC_DESTINATION lib:LIBEXEC_DESTINATION libexec:' \
- -e 's:}/lib:}/${CMAKE_INSTALL_LIBDIR}:' \
- -e 's:DESTINATION lib):DESTINATION ${CMAKE_INSTALL_LIBDIR}):' \
- -e 's:DESTINATION lib/:DESTINATION ${CMAKE_INSTALL_LIBDIR}/:' \
- -e 's:PYTHON_INSTALL_DIR lib:PYTHON_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}:' \
- cmake/*.cmake || die
- cmake-utils_src_prepare
-}
-
-catkin_src_configure_internal() {
- local sitedir="$(python_get_sitedir)"
- mycmakeargs+=(
- -DPYTHON_EXECUTABLE="${PYTHON}"
- -DPYTHON_INSTALL_DIR="${sitedir#${EPREFIX}/usr/}"
- )
- python_export PYTHON_SCRIPTDIR
- cmake-utils_src_configure
-}
-
-src_configure() {
- export PYTHONPATH="${S}/python"
- local mycmakeargs=(
- "$(cmake-utils_use test CATKIN_ENABLE_TESTING)"
- "-DCATKIN_BUILD_BINARY_PACKAGE=ON"
- )
- python_foreach_impl catkin_src_configure_internal
-}
-
-src_compile() {
- python_foreach_impl cmake-utils_src_compile
-}
-
-src_test() {
- unset PYTHON_SCRIPTDIR
- python_foreach_impl cmake-utils_src_test
-}
-
-catkin_src_install_internal() {
- python_export PYTHON_SCRIPTDIR
- cmake-utils_src_install
- if [ ! -f "${T}/.catkin_python_symlinks_generated" ]; then
- dodir /usr/bin
- for i in "${D}/${PYTHON_SCRIPTDIR}"/* ; do
- dosym ../lib/python-exec/python-exec2 "/usr/bin/${i##*/}"
- done
- touch "${T}/.catkin_python_symlinks_generated"
- fi
-}
-
-src_install() {
- python_foreach_impl catkin_src_install_internal
-
- doenvd "${FILESDIR}/40catkin"
-
- # needed to be considered as a workspace
- touch "${ED}/usr/.catkin"
-}
-
-pkg_postinst() {
- ewarn "Starting from version 0.7.1-r2, dev-util/catkin changed the"
- ewarn "installation path for package.xml files on Gentoo."
- ewarn "In order for ROS to work properly, you will need to reinstall ROS"
- ewarn "packages that have it installed in the old location:"
- ewarn " emerge -1O /usr/share/*/package.xml"
- ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=595004 for more details."
-}
diff --git a/dev-util/catkin/files/catkin_prefix_path_util_py.patch b/dev-util/catkin/files/catkin_prefix_path_util_py.patch
deleted file mode 100644
index e667ea9cf59..00000000000
--- a/dev-util/catkin/files/catkin_prefix_path_util_py.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Author: Eric Timmons
-https://bugs.gentoo.org/show_bug.cgi?id=586104
-
-Index: catkin-0.6.16/cmake/templates/_setup_util.py.in
-===================================================================
---- catkin-0.6.16.orig/cmake/templates/_setup_util.py.in
-+++ catkin-0.6.16/cmake/templates/_setup_util.py.in
-@@ -262,7 +262,7 @@
- sys.exit(1)
-
- # environment at generation time
-- CMAKE_PREFIX_PATH = '@CMAKE_PREFIX_PATH_AS_IS@'.split(';')
-+ CMAKE_PREFIX_PATH = '@CATKIN_PREFIX_PATH@;@CMAKE_PREFIX_PATH_AS_IS@'.split(';')
- # prepend current workspace if not already part of CPP
- base_path = os.path.dirname(__file__)
- if base_path not in CMAKE_PREFIX_PATH:
-Index: catkin-0.7.1/python/catkin/builder.py
-===================================================================
---- catkin-0.7.1.orig/python/catkin/builder.py
-+++ catkin-0.7.1/python/catkin/builder.py
-@@ -1026,6 +1026,7 @@ def build_workspace_isolated(
- 'CATKIN_LIB_ENVIRONMENT_PATHS': "'lib'",
- 'CATKIN_PKGCONFIG_ENVIRONMENT_PATHS': "os.path.join('lib', 'pkgconfig')",
- 'CMAKE_PREFIX_PATH_AS_IS': ';'.join(os.environ['CMAKE_PREFIX_PATH'].split(os.pathsep)),
-+ 'CATKIN_PREFIX_PATH': ';'.join(os.environ['CATKIN_PREFIX_PATH'].split(os.pathsep)),
- 'PYTHON_EXECUTABLE': sys.executable,
- 'PYTHON_INSTALL_DIR': get_python_install_dir(),
- }
-Index: catkin-0.7.1/test/unit_tests/test_setup_util.py
-===================================================================
---- catkin-0.7.1.orig/test/unit_tests/test_setup_util.py
-+++ catkin-0.7.1/test/unit_tests/test_setup_util.py
-@@ -14,6 +14,7 @@ data = configure_file(os.path.join(os.pa
- 'PYTHON_EXECUTABLE': sys.executable,
- 'PYTHON_INSTALL_DIR': 'pythonX.Y/packages',
- 'CMAKE_PREFIX_PATH_AS_IS': '',
-+ 'CATKIN_PREFIX_PATH':'',
- })
- with tempfile.NamedTemporaryFile('w+') as setup_util_file:
- setup_util_file.write(data)
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/catkin/files/, dev-util/catkin/
@ 2020-07-30 15:03 Alexis Ballier
0 siblings, 0 replies; 8+ messages in thread
From: Alexis Ballier @ 2020-07-30 15:03 UTC (permalink / raw
To: gentoo-commits
commit: c49c01a279f217f2c1ae974dc53266aa4f06d09b
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 30 15:02:24 2020 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Jul 30 15:02:35 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c49c01a2
dev-util/catkin: Remove old
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
dev-util/catkin/Manifest | 2 -
dev-util/catkin/catkin-0.7.17.ebuild | 120 ----------------------------------
dev-util/catkin/catkin-0.7.20.ebuild | 120 ----------------------------------
dev-util/catkin/files/distutils.patch | 13 ----
dev-util/catkin/files/sitedir.patch | 15 -----
5 files changed, 270 deletions(-)
diff --git a/dev-util/catkin/Manifest b/dev-util/catkin/Manifest
index a32421bb653..e2012a736da 100644
--- a/dev-util/catkin/Manifest
+++ b/dev-util/catkin/Manifest
@@ -1,4 +1,2 @@
-DIST catkin-0.7.17.tar.gz 212023 BLAKE2B 901bc5a3e226eaab59917b4d548fe3aacfad602a75e46cbd720f252ffd490c4ff2b170cd158a0c09c047b837d6f097555ba55291dfeedb51951d98f2f0273c34 SHA512 0c6adfda27924a5c9c5360e5e84e082e5cc9a7638a1129fe86f604515d3731f4257f725f80e8e8781200a8a367472224aea537871e56e1859e9f66950a746d45
-DIST catkin-0.7.20.tar.gz 215244 BLAKE2B 06755e87f43d1e97138a6696af05dfd9b9434adcca9d4269c7b93b363b25ac9e8b198a980d7607b6b317f546b7637103dc251213087201ff56c1f12c86892edb SHA512 7258f0d548a92d846c9ad195d5e28a567d3c1b4cd1caabffd58c3fabee66cec8ce3612d3095e6437ac201b4d37fddf8f850775e809ebb7eaaeb99328afaedfc6
DIST catkin-0.8.3.tar.gz 215988 BLAKE2B 92d7bced93e2d33dafcfd902724f993aa15756139265b5594c15041c333568591193b86e1a4bee8c278f2739dd063f73b6ce675b8ab4fefd312b5daeea414c7a SHA512 14fd03627f3fb339a850ca73e7a49dfeb7312a85416473dff60995ea1d0f1050982929c297751502589a7320dd7eec5d922c86061166f9d475fc1108540db4ae
DIST catkin-0.8.8.tar.gz 217566 BLAKE2B c17ed55e4f72f6645a778b5669e9b54090ea0425526d7540a6c8cf3af88ba10dfd91b927f53a83d9d2fac56e000c4c52e93216a36694475a91fabe00dd2d0168 SHA512 a90c552bebb46ade23171c85ca1cb23b295d156e731c29cd7602e544aef6231edb179d0fce52d06008d762bafd309456e0ef8976a3f67ed9ea861b905b1bb979
diff --git a/dev-util/catkin/catkin-0.7.17.ebuild b/dev-util/catkin/catkin-0.7.17.ebuild
deleted file mode 100644
index bd0fec4e9fa..00000000000
--- a/dev-util/catkin/catkin-0.7.17.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
- SCM="git-r3"
- EGIT_REPO_URI="https://github.com/ros/catkin"
-fi
-
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit ${SCM} cmake-utils python-r1
-
-DESCRIPTION="Cmake macros and associated python code used to build some parts of ROS"
-HOMEPAGE="http://wiki.ros.org/catkin"
-if [ "${PV#9999}" != "${PV}" ] ; then
- SRC_URI=""
- KEYWORDS=""
-else
- SRC_URI="https://github.com/ros/catkin/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
- ${PYTHON_DEPS}
- dev-python/catkin_pkg[${PYTHON_USEDEP}]
- dev-python/empy[${PYTHON_USEDEP}]
- dev-util/cmake
-"
-DEPEND="${RDEPEND}
- test? ( dev-python/nose[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] )"
-
-PATCHES=(
- "${FILESDIR}/tests.patch"
- "${FILESDIR}/distutils.patch"
- "${FILESDIR}/catkin_prefix_path.patch"
- "${FILESDIR}/gnuinstalldirs.patch"
- "${FILESDIR}/catkin_prefix_path_util_py_v2.patch"
- "${FILESDIR}/package_xml.patch"
- "${FILESDIR}/etc.patch"
- "${FILESDIR}/sitedir.patch"
-)
-
-src_prepare() {
- # fix libdir
- sed -i \
- -e 's:LIBEXEC_DESTINATION lib:LIBEXEC_DESTINATION libexec:' \
- -e 's:}/lib:}/${CMAKE_INSTALL_LIBDIR}:' \
- -e 's:DESTINATION lib):DESTINATION ${CMAKE_INSTALL_LIBDIR}):' \
- -e 's:DESTINATION lib/:DESTINATION ${CMAKE_INSTALL_LIBDIR}/:' \
- -e 's:PYTHON_INSTALL_DIR lib:PYTHON_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}:' \
- cmake/*.cmake || die
- cmake-utils_src_prepare
-}
-
-catkin_src_configure_internal() {
- local sitedir="$(python_get_sitedir)"
- mycmakeargs+=(
- -DPYTHON_EXECUTABLE="${PYTHON}"
- -DPYTHON_INSTALL_DIR="${sitedir#${EPREFIX}/usr/}"
- )
- python_export PYTHON_SCRIPTDIR
- cmake-utils_src_configure
-}
-
-src_configure() {
- export PYTHONPATH="${S}/python"
- local mycmakeargs=(
- "$(cmake-utils_use test CATKIN_ENABLE_TESTING)"
- "-DCATKIN_BUILD_BINARY_PACKAGE=ON"
- )
- python_foreach_impl catkin_src_configure_internal
-}
-
-src_compile() {
- python_foreach_impl cmake-utils_src_compile
-}
-
-src_test() {
- unset PYTHON_SCRIPTDIR
- python_foreach_impl cmake-utils_src_test
-}
-
-catkin_src_install_internal() {
- python_export PYTHON_SCRIPTDIR
- cmake-utils_src_install
- if [ ! -f "${T}/.catkin_python_symlinks_generated" ]; then
- dodir /usr/bin
- for i in "${D}/${PYTHON_SCRIPTDIR}"/* ; do
- dosym ../lib/python-exec/python-exec2 "/usr/bin/${i##*/}"
- done
- touch "${T}/.catkin_python_symlinks_generated"
- fi
-}
-
-src_install() {
- python_foreach_impl catkin_src_install_internal
-
- doenvd "${FILESDIR}/40catkin"
-
- # needed to be considered as a workspace
- touch "${ED}/usr/.catkin"
-}
-
-pkg_postinst() {
- ewarn "Starting from version 0.7.1-r2, dev-util/catkin changed the"
- ewarn "installation path for package.xml files on Gentoo."
- ewarn "In order for ROS to work properly, you will need to reinstall ROS"
- ewarn "packages that have it installed in the old location:"
- ewarn " emerge -1O /usr/share/*/package.xml"
- ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=595004 for more details."
-}
diff --git a/dev-util/catkin/catkin-0.7.20.ebuild b/dev-util/catkin/catkin-0.7.20.ebuild
deleted file mode 100644
index c4909886d81..00000000000
--- a/dev-util/catkin/catkin-0.7.20.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
- SCM="git-r3"
- EGIT_REPO_URI="https://github.com/ros/catkin"
-fi
-
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit ${SCM} cmake-utils python-r1
-
-DESCRIPTION="Cmake macros and associated python code used to build some parts of ROS"
-HOMEPAGE="http://wiki.ros.org/catkin"
-if [ "${PV#9999}" != "${PV}" ] ; then
- SRC_URI=""
- KEYWORDS=""
-else
- SRC_URI="https://github.com/ros/catkin/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
- ${PYTHON_DEPS}
- dev-python/catkin_pkg[${PYTHON_USEDEP}]
- dev-python/empy[${PYTHON_USEDEP}]
- dev-util/cmake
-"
-DEPEND="${RDEPEND}
- test? ( dev-python/nose[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] )"
-
-PATCHES=(
- "${FILESDIR}/tests.patch"
- "${FILESDIR}/distutils.patch"
- "${FILESDIR}/catkin_prefix_path.patch"
- "${FILESDIR}/gnuinstalldirs.patch"
- "${FILESDIR}/catkin_prefix_path_util_py_v2.patch"
- "${FILESDIR}/package_xml.patch"
- "${FILESDIR}/etc.patch"
- "${FILESDIR}/sitedir.patch"
-)
-
-src_prepare() {
- # fix libdir
- sed -i \
- -e 's:LIBEXEC_DESTINATION lib:LIBEXEC_DESTINATION libexec:' \
- -e 's:}/lib:}/${CMAKE_INSTALL_LIBDIR}:' \
- -e 's:DESTINATION lib):DESTINATION ${CMAKE_INSTALL_LIBDIR}):' \
- -e 's:DESTINATION lib/:DESTINATION ${CMAKE_INSTALL_LIBDIR}/:' \
- -e 's:PYTHON_INSTALL_DIR lib:PYTHON_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}:' \
- cmake/*.cmake || die
- cmake-utils_src_prepare
-}
-
-catkin_src_configure_internal() {
- local sitedir="$(python_get_sitedir)"
- mycmakeargs+=(
- -DPYTHON_EXECUTABLE="${PYTHON}"
- -DPYTHON_INSTALL_DIR="${sitedir#${EPREFIX}/usr/}"
- )
- python_export PYTHON_SCRIPTDIR
- cmake-utils_src_configure
-}
-
-src_configure() {
- export PYTHONPATH="${S}/python"
- local mycmakeargs=(
- "$(cmake-utils_use test CATKIN_ENABLE_TESTING)"
- "-DCATKIN_BUILD_BINARY_PACKAGE=ON"
- )
- python_foreach_impl catkin_src_configure_internal
-}
-
-src_compile() {
- python_foreach_impl cmake-utils_src_compile
-}
-
-src_test() {
- unset PYTHON_SCRIPTDIR
- python_foreach_impl cmake-utils_src_test
-}
-
-catkin_src_install_internal() {
- python_export PYTHON_SCRIPTDIR
- cmake-utils_src_install
- if [ ! -f "${T}/.catkin_python_symlinks_generated" ]; then
- dodir /usr/bin
- for i in "${D}/${PYTHON_SCRIPTDIR}"/* ; do
- dosym ../lib/python-exec/python-exec2 "/usr/bin/${i##*/}" || die
- done
- touch "${T}/.catkin_python_symlinks_generated"
- fi
-}
-
-src_install() {
- python_foreach_impl catkin_src_install_internal
-
- doenvd "${FILESDIR}/40catkin"
-
- # needed to be considered as a workspace
- touch "${ED}/usr/.catkin"
-}
-
-pkg_postinst() {
- ewarn "Starting from version 0.7.1-r2, dev-util/catkin changed the"
- ewarn "installation path for package.xml files on Gentoo."
- ewarn "In order for ROS to work properly, you will need to reinstall ROS"
- ewarn "packages that have it installed in the old location:"
- ewarn " emerge -1O /usr/share/*/package.xml"
- ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=595004 for more details."
-}
diff --git a/dev-util/catkin/files/distutils.patch b/dev-util/catkin/files/distutils.patch
deleted file mode 100644
index 292551181b6..00000000000
--- a/dev-util/catkin/files/distutils.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Allow to install scripts in PYTHON_SCRIPTDIR.
-Needed for Gentoo multi-python support.
-
-Index: catkin-0.6.11/cmake/templates/python_distutils_install.sh.in
-===================================================================
---- catkin-0.6.11.orig/cmake/templates/python_distutils_install.sh.in
-+++ catkin-0.6.11/cmake/templates/python_distutils_install.sh.in
-@@ -25,4 +25,4 @@ cd "@INSTALL_CMD_WORKING_DIRECTORY@"
- build --build-base "@CMAKE_CURRENT_BINARY_DIR@" \
- install \
- $DESTDIR_ARG \
-- @SETUPTOOLS_ARG_EXTRA@ --prefix="@CMAKE_INSTALL_PREFIX@" --install-scripts="@CMAKE_INSTALL_PREFIX@/@CATKIN_GLOBAL_BIN_DESTINATION@"
-+ @SETUPTOOLS_ARG_EXTRA@ --prefix="@CMAKE_INSTALL_PREFIX@" --install-scripts="${PYTHON_SCRIPTDIR:-@CMAKE_INSTALL_PREFIX@/@CATKIN_GLOBAL_BIN_DESTINATION@}"
diff --git a/dev-util/catkin/files/sitedir.patch b/dev-util/catkin/files/sitedir.patch
deleted file mode 100644
index 61fcad29d04..00000000000
--- a/dev-util/catkin/files/sitedir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Pass --install-lib to setup.py install.
-pypy installs in /usr/site-packages otherwise...
-
-Index: catkin-0.7.6/cmake/templates/python_distutils_install.sh.in
-===================================================================
---- catkin-0.7.6.orig/cmake/templates/python_distutils_install.sh.in
-+++ catkin-0.7.6/cmake/templates/python_distutils_install.sh.in
-@@ -30,4 +30,6 @@ echo_and_run /usr/bin/env \
- build --build-base "@CMAKE_CURRENT_BINARY_DIR@" \
- install \
- $DESTDIR_ARG \
-- @SETUPTOOLS_ARG_EXTRA@ --prefix="@CMAKE_INSTALL_PREFIX@" --install-scripts="${PYTHON_SCRIPTDIR:-@CMAKE_INSTALL_PREFIX@/@CATKIN_GLOBAL_BIN_DESTINATION@}"
-+ @SETUPTOOLS_ARG_EXTRA@ --prefix="@CMAKE_INSTALL_PREFIX@" \
-+ --install-scripts="${PYTHON_SCRIPTDIR:-@CMAKE_INSTALL_PREFIX@/@CATKIN_GLOBAL_BIN_DESTINATION@}" \
-+ --install-lib="@CMAKE_INSTALL_PREFIX@/@PYTHON_INSTALL_DIR@"
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2020-07-30 15:03 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-05-24 16:23 [gentoo-commits] repo/gentoo:master commit in: dev-util/catkin/files/, dev-util/catkin/ Alexis Ballier
-- strict thread matches above, loose matches on Subject: below --
2020-07-30 15:03 Alexis Ballier
2020-07-30 15:03 Alexis Ballier
2017-02-28 11:27 Alexis Ballier
2017-02-23 9:44 Alexis Ballier
2016-10-07 15:55 Alexis Ballier
2015-11-27 12:31 Alexis Ballier
2015-11-19 9:58 Alexis Ballier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox