dev-util/catkin: Install package.xml twice, once in ros_packages for fast searching...

Package-Manager: Portage-2.3.3, Repoman-2.3.1

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 6099f079601077b8e4324a149d0b5e8d8feb4614..52506ee680e7329f18c79772c43cef50c1c94036 100644 (file)
--- 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()