From bc6cf4be1b5c9faa2aadd5ecaf0f4b6c077777d2 Mon Sep 17 00:00:00 2001 From: murph Date: Tue, 21 Feb 2012 09:51:09 -0600 Subject: [PATCH 1/4] Added a gentoo rosdep file --- rosdep/gentoo.yaml | 5 +++++ rosdep/sources.list.d/20-default.list | 1 + 2 files changed, 6 insertions(+) create mode 100644 rosdep/gentoo.yaml diff --git a/rosdep/gentoo.yaml b/rosdep/gentoo.yaml new file mode 100644 index 0000000000000..e622f3df1fa78 --- /dev/null +++ b/rosdep/gentoo.yaml @@ -0,0 +1,5 @@ +assimp: gentoo: assimp-dev +gtest: gentoo: dev-cpp/gtest +pcre: gentoo: dev-libs/libpcre +tinyxml: gentoo: dev-libs/tinyxml[stl] +yaml-cpp: gentoo: dev-cpp/yaml-cpp \ No newline at end of file diff --git a/rosdep/sources.list.d/20-default.list b/rosdep/sources.list.d/20-default.list index 46f9b2f0ba7bc..da8683c2905cd 100644 --- a/rosdep/sources.list.d/20-default.list +++ b/rosdep/sources.list.d/20-default.list @@ -4,4 +4,5 @@ yaml https://github.com/ros/rosdistro/raw/master/rosdep/osx-homebrew.yaml osx # generic yaml https://github.com/ros/rosdistro/raw/master/rosdep/base.yaml yaml https://github.com/ros/rosdistro/raw/master/rosdep/python.yaml +yaml https://github.com/ros/rosdistro/raw/master/rosdep/gentoo.yaml gbpdistro https://github.com/ros/rosdistro/raw/master/releases/fuerte.yaml fuerte From a2209f12f811b15aea90bc4badafcd21c7a35c33 Mon Sep 17 00:00:00 2001 From: murph Date: Tue, 21 Feb 2012 09:52:39 -0600 Subject: [PATCH 2/4] Update gentoo rosdeps --- rosdep/gentoo.yaml | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/rosdep/gentoo.yaml b/rosdep/gentoo.yaml index e622f3df1fa78..249f65976a603 100644 --- a/rosdep/gentoo.yaml +++ b/rosdep/gentoo.yaml @@ -1,5 +1,20 @@ -assimp: gentoo: assimp-dev -gtest: gentoo: dev-cpp/gtest -pcre: gentoo: dev-libs/libpcre -tinyxml: gentoo: dev-libs/tinyxml[stl] -yaml-cpp: gentoo: dev-cpp/yaml-cpp \ No newline at end of file +assimp: + gentoo: + portage: + packages: assimp-dev +gtest: + gentoo: + portage: + packages: dev-cpp/gtest +pcre: + gentoo: + portage: + packages: dev-libs/libpcre +tinyxml: + gentoo: + portage: + packages: dev-libs/tinyxml[stl] +yaml-cpp: + gentoo: + portage: + packages: dev-cpp/yaml-cpp \ No newline at end of file From d1b47836c9a07d350d1aadd1518386be30909195 Mon Sep 17 00:00:00 2001 From: murph Date: Tue, 21 Feb 2012 10:08:49 -0600 Subject: [PATCH 3/4] Use assimp from lorelei-overlay --- rosdep/gentoo.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rosdep/gentoo.yaml b/rosdep/gentoo.yaml index 249f65976a603..0289d7904a863 100644 --- a/rosdep/gentoo.yaml +++ b/rosdep/gentoo.yaml @@ -1,7 +1,7 @@ assimp: gentoo: portage: - packages: assimp-dev + packages: media-libs/assimp::lorelei-overlay gtest: gentoo: portage: From fe6684e015e1b8c0ed6ca53a768bf50b1e8d1dd9 Mon Sep 17 00:00:00 2001 From: murph Date: Tue, 21 Feb 2012 10:33:31 -0600 Subject: [PATCH 4/4] move gentoo listing to the os-specific section --- rosdep/sources.list.d/20-default.list | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rosdep/sources.list.d/20-default.list b/rosdep/sources.list.d/20-default.list index da8683c2905cd..a83ed84a32665 100644 --- a/rosdep/sources.list.d/20-default.list +++ b/rosdep/sources.list.d/20-default.list @@ -1,8 +1,8 @@ # os-specific listings first yaml https://github.com/ros/rosdistro/raw/master/rosdep/osx-homebrew.yaml osx +yaml https://github.com/ros/rosdistro/raw/master/rosdep/gentoo.yaml gentoo # generic yaml https://github.com/ros/rosdistro/raw/master/rosdep/base.yaml yaml https://github.com/ros/rosdistro/raw/master/rosdep/python.yaml -yaml https://github.com/ros/rosdistro/raw/master/rosdep/gentoo.yaml gbpdistro https://github.com/ros/rosdistro/raw/master/releases/fuerte.yaml fuerte