| 1 |
commit: 25e32ee384088923b56e78198e9dd216637fae59 |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 28 08:22:52 2017 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 28 11:26:48 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25e32ee3 |
| 7 |
|
| 8 |
dev-python/catkin_pkg: Allow having package.xml in ros_packages subdir without triggering duplicate. |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 11 |
|
| 12 |
.../{catkin_pkg-9999.ebuild => catkin_pkg-0.3.1-r2.ebuild} | 9 +-------- |
| 13 |
dev-python/catkin_pkg/catkin_pkg-9999.ebuild | 9 +-------- |
| 14 |
dev-python/catkin_pkg/files/ros_packages.patch | 13 +++++++++++++ |
| 15 |
3 files changed, 15 insertions(+), 16 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.3.1-r2.ebuild |
| 18 |
similarity index 86% |
| 19 |
copy from dev-python/catkin_pkg/catkin_pkg-9999.ebuild |
| 20 |
copy to dev-python/catkin_pkg/catkin_pkg-0.3.1-r2.ebuild |
| 21 |
index 57cbb8ced9..e258fe5491 100644 |
| 22 |
--- a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild |
| 23 |
+++ b/dev-python/catkin_pkg/catkin_pkg-0.3.1-r2.ebuild |
| 24 |
@@ -35,15 +35,8 @@ RDEPEND=" |
| 25 |
DEPEND="${RDEPEND} |
| 26 |
test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] ) |
| 27 |
" |
| 28 |
-PATCHES=( "${FILESDIR}/catkin_prefix.patch" "${FILESDIR}/argparse.patch" ) |
| 29 |
+PATCHES=( "${FILESDIR}/catkin_prefix.patch" "${FILESDIR}/argparse.patch" "${FILESDIR}/ros_packages.patch" ) |
| 30 |
|
| 31 |
python_test() { |
| 32 |
nosetests -s --tests test || die |
| 33 |
} |
| 34 |
- |
| 35 |
-python_install_all() { |
| 36 |
- distutils-r1_python_install_all |
| 37 |
- # Avoid recursing in the whole hierarchy |
| 38 |
- dodir /usr/ |
| 39 |
- touch "${ED}/usr/CATKIN_IGNORE" |
| 40 |
-} |
| 41 |
|
| 42 |
diff --git a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild b/dev-python/catkin_pkg/catkin_pkg-9999.ebuild |
| 43 |
index 57cbb8ced9..e258fe5491 100644 |
| 44 |
--- a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild |
| 45 |
+++ b/dev-python/catkin_pkg/catkin_pkg-9999.ebuild |
| 46 |
@@ -35,15 +35,8 @@ RDEPEND=" |
| 47 |
DEPEND="${RDEPEND} |
| 48 |
test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] ) |
| 49 |
" |
| 50 |
-PATCHES=( "${FILESDIR}/catkin_prefix.patch" "${FILESDIR}/argparse.patch" ) |
| 51 |
+PATCHES=( "${FILESDIR}/catkin_prefix.patch" "${FILESDIR}/argparse.patch" "${FILESDIR}/ros_packages.patch" ) |
| 52 |
|
| 53 |
python_test() { |
| 54 |
nosetests -s --tests test || die |
| 55 |
} |
| 56 |
- |
| 57 |
-python_install_all() { |
| 58 |
- distutils-r1_python_install_all |
| 59 |
- # Avoid recursing in the whole hierarchy |
| 60 |
- dodir /usr/ |
| 61 |
- touch "${ED}/usr/CATKIN_IGNORE" |
| 62 |
-} |
| 63 |
|
| 64 |
diff --git a/dev-python/catkin_pkg/files/ros_packages.patch b/dev-python/catkin_pkg/files/ros_packages.patch |
| 65 |
new file mode 100644 |
| 66 |
index 0000000000..6c9855d627 |
| 67 |
--- /dev/null |
| 68 |
+++ b/dev-python/catkin_pkg/files/ros_packages.patch |
| 69 |
@@ -0,0 +1,13 @@ |
| 70 |
+Index: catkin_pkg-0.3.1/src/catkin_pkg/packages.py |
| 71 |
+=================================================================== |
| 72 |
+--- catkin_pkg-0.3.1.orig/src/catkin_pkg/packages.py |
| 73 |
++++ catkin_pkg-0.3.1/src/catkin_pkg/packages.py |
| 74 |
+@@ -59,7 +59,7 @@ def find_package_paths(basepath, exclude |
| 75 |
+ del dirnames[:] |
| 76 |
+ continue |
| 77 |
+ elif PACKAGE_MANIFEST_FILENAME in filenames: |
| 78 |
+- paths.append(os.path.relpath(dirpath, basepath)) |
| 79 |
++ paths.append(os.path.relpath(dirpath.replace('ros_packages/',''), basepath)) |
| 80 |
+ del dirnames[:] |
| 81 |
+ continue |
| 82 |
+ for dirname in dirnames: |
Archives