commit: 25e32ee384088923b56e78198e9dd216637fae59 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> AuthorDate: Tue Feb 28 08:22:52 2017 +0000 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> CommitDate: Tue Feb 28 11:26:48 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25e32ee3
dev-python/catkin_pkg: Allow having package.xml in ros_packages subdir without triggering duplicate. Package-Manager: Portage-2.3.3, Repoman-2.3.1 .../{catkin_pkg-9999.ebuild => catkin_pkg-0.3.1-r2.ebuild} | 9 +-------- dev-python/catkin_pkg/catkin_pkg-9999.ebuild | 9 +-------- dev-python/catkin_pkg/files/ros_packages.patch | 13 +++++++++++++ 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.3.1-r2.ebuild similarity index 86% copy from dev-python/catkin_pkg/catkin_pkg-9999.ebuild copy to dev-python/catkin_pkg/catkin_pkg-0.3.1-r2.ebuild index 57cbb8ced9..e258fe5491 100644 --- a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild +++ b/dev-python/catkin_pkg/catkin_pkg-0.3.1-r2.ebuild @@ -35,15 +35,8 @@ RDEPEND=" DEPEND="${RDEPEND} test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] ) " -PATCHES=( "${FILESDIR}/catkin_prefix.patch" "${FILESDIR}/argparse.patch" ) +PATCHES=( "${FILESDIR}/catkin_prefix.patch" "${FILESDIR}/argparse.patch" "${FILESDIR}/ros_packages.patch" ) python_test() { nosetests -s --tests test || die } - -python_install_all() { - distutils-r1_python_install_all - # Avoid recursing in the whole hierarchy - dodir /usr/ - touch "${ED}/usr/CATKIN_IGNORE" -} diff --git a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild b/dev-python/catkin_pkg/catkin_pkg-9999.ebuild index 57cbb8ced9..e258fe5491 100644 --- a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild +++ b/dev-python/catkin_pkg/catkin_pkg-9999.ebuild @@ -35,15 +35,8 @@ RDEPEND=" DEPEND="${RDEPEND} test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] ) " -PATCHES=( "${FILESDIR}/catkin_prefix.patch" "${FILESDIR}/argparse.patch" ) +PATCHES=( "${FILESDIR}/catkin_prefix.patch" "${FILESDIR}/argparse.patch" "${FILESDIR}/ros_packages.patch" ) python_test() { nosetests -s --tests test || die } - -python_install_all() { - distutils-r1_python_install_all - # Avoid recursing in the whole hierarchy - dodir /usr/ - touch "${ED}/usr/CATKIN_IGNORE" -} diff --git a/dev-python/catkin_pkg/files/ros_packages.patch b/dev-python/catkin_pkg/files/ros_packages.patch new file mode 100644 index 0000000000..6c9855d627 --- /dev/null +++ b/dev-python/catkin_pkg/files/ros_packages.patch @@ -0,0 +1,13 @@ +Index: catkin_pkg-0.3.1/src/catkin_pkg/packages.py +=================================================================== +--- catkin_pkg-0.3.1.orig/src/catkin_pkg/packages.py ++++ catkin_pkg-0.3.1/src/catkin_pkg/packages.py +@@ -59,7 +59,7 @@ def find_package_paths(basepath, exclude + del dirnames[:] + continue + elif PACKAGE_MANIFEST_FILENAME in filenames: +- paths.append(os.path.relpath(dirpath, basepath)) ++ paths.append(os.path.relpath(dirpath.replace('ros_packages/',''), basepath)) + del dirnames[:] + continue + for dirname in dirnames: