| 1 |
commit: 4be2f6509bf1c198360af74212cd49e1751b340c |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 28 08:24:16 2017 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 28 11:26:49 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4be2f650 |
| 7 |
|
| 8 |
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. |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 11 |
|
| 12 |
...{catkin-0.7.6.ebuild => catkin-0.7.6-r1.ebuild} | 0 |
| 13 |
dev-util/catkin/files/package_xml.patch | 38 +++++++++++----------- |
| 14 |
2 files changed, 19 insertions(+), 19 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-util/catkin/catkin-0.7.6.ebuild b/dev-util/catkin/catkin-0.7.6-r1.ebuild |
| 17 |
similarity index 100% |
| 18 |
rename from dev-util/catkin/catkin-0.7.6.ebuild |
| 19 |
rename to dev-util/catkin/catkin-0.7.6-r1.ebuild |
| 20 |
|
| 21 |
diff --git a/dev-util/catkin/files/package_xml.patch b/dev-util/catkin/files/package_xml.patch |
| 22 |
index 6099f07960..52506ee680 100644 |
| 23 |
--- a/dev-util/catkin/files/package_xml.patch |
| 24 |
+++ b/dev-util/catkin/files/package_xml.patch |
| 25 |
@@ -1,19 +1,19 @@ |
| 26 |
-Index: catkin-0.7.1/cmake/catkin_package.cmake |
| 27 |
+Index: catkin-0.7.6/cmake/catkin_package.cmake |
| 28 |
=================================================================== |
| 29 |
---- catkin-0.7.1.orig/cmake/catkin_package.cmake |
| 30 |
-+++ catkin-0.7.1/cmake/catkin_package.cmake |
| 31 |
-@@ -518,6 +518,6 @@ function(_catkin_package) |
| 32 |
- |
| 33 |
- # install package.xml |
| 34 |
+--- catkin-0.7.6.orig/cmake/catkin_package.cmake |
| 35 |
++++ catkin-0.7.6/cmake/catkin_package.cmake |
| 36 |
+@@ -527,4 +527,7 @@ function(_catkin_package) |
| 37 |
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/package.xml |
| 38 |
-- DESTINATION share/${PROJECT_NAME} |
| 39 |
-+ DESTINATION share/ros_packages/${PROJECT_NAME} |
| 40 |
+ DESTINATION share/${PROJECT_NAME} |
| 41 |
) |
| 42 |
++ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/package.xml |
| 43 |
++ DESTINATION share/ros_packages/${PROJECT_NAME} |
| 44 |
++ ) |
| 45 |
endfunction() |
| 46 |
-Index: catkin-0.7.1/cmake/all.cmake |
| 47 |
+Index: catkin-0.7.6/cmake/all.cmake |
| 48 |
=================================================================== |
| 49 |
---- catkin-0.7.1.orig/cmake/all.cmake |
| 50 |
-+++ catkin-0.7.1/cmake/all.cmake |
| 51 |
+--- catkin-0.7.6.orig/cmake/all.cmake |
| 52 |
++++ catkin-0.7.6/cmake/all.cmake |
| 53 |
@@ -156,7 +156,7 @@ foreach(filename |
| 54 |
endforeach() |
| 55 |
|
| 56 |
@@ -23,15 +23,15 @@ Index: catkin-0.7.1/cmake/all.cmake |
| 57 |
message(STATUS "catkin ${catkin_VERSION}") |
| 58 |
# ensure that no current package name is set |
| 59 |
unset(_CATKIN_CURRENT_PACKAGE) |
| 60 |
-Index: catkin-0.7.1/cmake/catkin_metapackage.cmake |
| 61 |
+Index: catkin-0.7.6/cmake/catkin_metapackage.cmake |
| 62 |
=================================================================== |
| 63 |
---- catkin-0.7.1.orig/cmake/catkin_metapackage.cmake |
| 64 |
-+++ catkin-0.7.1/cmake/catkin_metapackage.cmake |
| 65 |
-@@ -40,6 +40,6 @@ function(catkin_metapackage) |
| 66 |
- |
| 67 |
- # install package.xml |
| 68 |
+--- catkin-0.7.6.orig/cmake/catkin_metapackage.cmake |
| 69 |
++++ catkin-0.7.6/cmake/catkin_metapackage.cmake |
| 70 |
+@@ -42,4 +42,7 @@ function(catkin_metapackage) |
| 71 |
install(FILES ${ARG_DIRECTORY}/package.xml |
| 72 |
-- DESTINATION share/${PROJECT_NAME} |
| 73 |
-+ DESTINATION share/ros_packages/${PROJECT_NAME} |
| 74 |
+ DESTINATION share/${PROJECT_NAME} |
| 75 |
) |
| 76 |
++ install(FILES ${ARG_DIRECTORY}/package.xml |
| 77 |
++ DESTINATION share/ros_packages/${PROJECT_NAME} |
| 78 |
++ ) |
| 79 |
endfunction() |
Archives