* [gentoo-commits] repo/gentoo:master commit in: dev-python/catkin_pkg/, dev-python/catkin_pkg/files/
@ 2015-09-16 21:15 Alexis Ballier
0 siblings, 0 replies; 4+ messages in thread
From: Alexis Ballier @ 2015-09-16 21:15 UTC (permalink / raw
To: gentoo-commits
commit: 82b4d6250eab5e0350069bc76cf893730bfe5c81
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 16 21:15:38 2015 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Sep 16 21:15:38 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82b4d625
dev-python/catkin_pkg: Initial import. Ebuild by me.
Package-Manager: portage-2.2.20.1
dev-python/catkin_pkg/Manifest | 1 +
dev-python/catkin_pkg/catkin_pkg-0.2.10.ebuild | 51 +++++++++++++++++++++++++
dev-python/catkin_pkg/catkin_pkg-9999.ebuild | 51 +++++++++++++++++++++++++
dev-python/catkin_pkg/files/catkin_prefix.patch | 28 ++++++++++++++
dev-python/catkin_pkg/metadata.xml | 5 +++
5 files changed, 136 insertions(+)
diff --git a/dev-python/catkin_pkg/Manifest b/dev-python/catkin_pkg/Manifest
new file mode 100644
index 0000000..733a220
--- /dev/null
+++ b/dev-python/catkin_pkg/Manifest
@@ -0,0 +1 @@
+DIST catkin_pkg-0.2.10.tar.gz 44290 SHA256 df4a5e81dbcb42530cb7ccb4007e352f00ee4059de801f868e79949151e96403 SHA512 fe3fb8297319d410c4aa3f86c52ede5eabae4f51e70181b7ee2c6c4db9a576466d9d39970d410c95dd24900c6d9287cf64185aa267891bdb884b37d397807f7e WHIRLPOOL eac3196a9b00938eedb64710683951a3ca7d1d61110aeea5f82b3a863055e25861a8c61b89617d26a68f42a2573630c63e91423bff0e11c86b4f07076090d418
diff --git a/dev-python/catkin_pkg/catkin_pkg-0.2.10.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.2.10.ebuild
new file mode 100644
index 0000000..b5bb86f
--- /dev/null
+++ b/dev-python/catkin_pkg/catkin_pkg-0.2.10.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+ SCM="git-r3"
+ EGIT_REPO_URI="http://github.com/ros-infrastructure/catkin_pkg"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Standalone Python library for the catkin package system"
+HOMEPAGE="http://wiki.ros.org/catkin_pkg"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ SRC_URI=""
+ KEYWORDS=""
+else
+ SRC_URI="
+ http://download.ros.org/downloads/${PN}/${P}.tar.gz
+ http://github.com/ros-infrastructure/catkin_pkg/archive/${PV}.tar.gz -> ${P}.tar.gz
+ "
+ KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+ dev-python/docutils[${PYTHON_USEDEP}]
+ dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )
+"
+PATCHES=( "${FILESDIR}/catkin_prefix.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
new file mode 100644
index 0000000..b5bb86f
--- /dev/null
+++ b/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+ SCM="git-r3"
+ EGIT_REPO_URI="http://github.com/ros-infrastructure/catkin_pkg"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Standalone Python library for the catkin package system"
+HOMEPAGE="http://wiki.ros.org/catkin_pkg"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ SRC_URI=""
+ KEYWORDS=""
+else
+ SRC_URI="
+ http://download.ros.org/downloads/${PN}/${P}.tar.gz
+ http://github.com/ros-infrastructure/catkin_pkg/archive/${PV}.tar.gz -> ${P}.tar.gz
+ "
+ KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+ dev-python/docutils[${PYTHON_USEDEP}]
+ dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )
+"
+PATCHES=( "${FILESDIR}/catkin_prefix.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/catkin_prefix.patch b/dev-python/catkin_pkg/files/catkin_prefix.patch
new file mode 100644
index 0000000..c5f40db
--- /dev/null
+++ b/dev-python/catkin_pkg/files/catkin_prefix.patch
@@ -0,0 +1,28 @@
+Allow CATKIN_PREFIX_PATH to work as CMAKE_PREFIX_PATH:
+When building with SYSROOT!=/, CMAKE_PREFIX_PATH is the same as with SYSROOT=/
+but we need to find packages in SYSROOT.
+
+Index: catkin_pkg-0.2.8/src/catkin_pkg/workspaces.py
+===================================================================
+--- catkin_pkg-0.2.8.orig/src/catkin_pkg/workspaces.py
++++ catkin_pkg-0.2.8/src/catkin_pkg/workspaces.py
+@@ -42,15 +42,16 @@ CATKIN_WORKSPACE_MARKER_FILE = '.catkin_
+
+ def get_spaces(paths=None):
+ """
+- Return a list of spaces based on the CMAKE_PREFIX_PATH or passed in list of workspaces.
++ Return a list of spaces based on the CMAKE_PREFIX_PATH/CATKIN_PREFIX_PATH or passed in list of workspaces.
+ It resolves the source space for each devel space and ignores non-catkin paths.
+ :param paths_to_order: list of paths
+ :param prefix_paths: list of prefixes, must not end with '/'
+ """
+ if paths is None:
+- if 'CMAKE_PREFIX_PATH' not in os.environ:
+- raise RuntimeError('Neither the environment variable CMAKE_PREFIX_PATH is set nor was a list of paths passed.')
++ if 'CMAKE_PREFIX_PATH' not in os.environ and 'CATKIN_PREFIX_PATH' not in os.environ :
++ raise RuntimeError('None of the environment variables CMAKE_PREFIX_PATH or CATKIN_PREFIX_PATH are set nor was a list of paths passed.')
+ paths = os.environ['CMAKE_PREFIX_PATH'].split(os.pathsep) if os.environ['CMAKE_PREFIX_PATH'] else []
++ paths += os.environ['CATKIN_PREFIX_PATH'].split(os.pathsep) if os.environ['CATKIN_PREFIX_PATH'] else []
+
+ spaces = []
+ for path in paths:
diff --git a/dev-python/catkin_pkg/metadata.xml b/dev-python/catkin_pkg/metadata.xml
new file mode 100644
index 0000000..c42ea5b
--- /dev/null
+++ b/dev-python/catkin_pkg/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/catkin_pkg/, dev-python/catkin_pkg/files/
@ 2017-02-16 4:32 Alexis Ballier
0 siblings, 0 replies; 4+ messages in thread
From: Alexis Ballier @ 2017-02-16 4:32 UTC (permalink / raw
To: gentoo-commits
commit: e7135ebb9b7ff1eb30386794ae563b5cbc415bd5
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 16 04:12:59 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Feb 16 04:31:42 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7135ebb
dev-python/catkin_pkg: Remove argparse dep from setup.py
Package-Manager: Portage-2.3.3, Repoman-2.3.1
.../{catkin_pkg-0.3.1.ebuild => catkin_pkg-0.3.1-r1.ebuild} | 2 +-
dev-python/catkin_pkg/catkin_pkg-9999.ebuild | 2 +-
dev-python/catkin_pkg/files/argparse.patch | 12 ++++++++++++
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/dev-python/catkin_pkg/catkin_pkg-0.3.1.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.3.1-r1.ebuild
similarity index 93%
rename from dev-python/catkin_pkg/catkin_pkg-0.3.1.ebuild
rename to dev-python/catkin_pkg/catkin_pkg-0.3.1-r1.ebuild
index fbc5d3f2d0..ce8fd6d9c5 100644
--- a/dev-python/catkin_pkg/catkin_pkg-0.3.1.ebuild
+++ b/dev-python/catkin_pkg/catkin_pkg-0.3.1-r1.ebuild
@@ -37,7 +37,7 @@ RDEPEND="
DEPEND="${RDEPEND}
test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )
"
-PATCHES=( "${FILESDIR}/catkin_prefix.patch" )
+PATCHES=( "${FILESDIR}/catkin_prefix.patch" "${FILESDIR}/argparse.patch" )
python_test() {
nosetests -s --tests test || die
diff --git a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild b/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
index fbc5d3f2d0..ce8fd6d9c5 100644
--- a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
+++ b/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
@@ -37,7 +37,7 @@ RDEPEND="
DEPEND="${RDEPEND}
test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )
"
-PATCHES=( "${FILESDIR}/catkin_prefix.patch" )
+PATCHES=( "${FILESDIR}/catkin_prefix.patch" "${FILESDIR}/argparse.patch" )
python_test() {
nosetests -s --tests test || die
diff --git a/dev-python/catkin_pkg/files/argparse.patch b/dev-python/catkin_pkg/files/argparse.patch
new file mode 100644
index 0000000000..f39df4a405
--- /dev/null
+++ b/dev-python/catkin_pkg/files/argparse.patch
@@ -0,0 +1,12 @@
+Index: catkin_pkg-0.3.1/setup.py
+===================================================================
+--- catkin_pkg-0.3.1.orig/setup.py
++++ catkin_pkg-0.3.1/setup.py
+@@ -31,7 +31,6 @@ kwargs = {
+ 'long_description': 'Library for retrieving information about catkin packages.',
+ 'license': 'BSD',
+ 'install_requires': [
+- 'argparse',
+ 'docutils',
+ 'python-dateutil'
+ ],
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/catkin_pkg/, dev-python/catkin_pkg/files/
@ 2017-08-15 6:25 Alexis Ballier
0 siblings, 0 replies; 4+ messages in thread
From: Alexis Ballier @ 2017-08-15 6:25 UTC (permalink / raw
To: gentoo-commits
commit: 6056b6c389d1e688c600172d00247145869bcbf2
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 15 06:02:55 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Aug 15 06:25:27 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6056b6c3
dev-python/catkin_pkg: Remove old
Package-Manager: Portage-2.3.7, Repoman-2.3.3
dev-python/catkin_pkg/Manifest | 2 --
dev-python/catkin_pkg/catkin_pkg-0.3.4.ebuild | 46 -------------------------
dev-python/catkin_pkg/catkin_pkg-0.3.5.ebuild | 46 -------------------------
dev-python/catkin_pkg/files/infinite_loop.patch | 27 ---------------
4 files changed, 121 deletions(-)
diff --git a/dev-python/catkin_pkg/Manifest b/dev-python/catkin_pkg/Manifest
index 1e1b7e22a3b..f30d0471ab9 100644
--- a/dev-python/catkin_pkg/Manifest
+++ b/dev-python/catkin_pkg/Manifest
@@ -1,3 +1 @@
-DIST catkin_pkg-0.3.4-gh.tar.gz 47286 SHA256 e57164c46c20a2de338112beab65095717fa459526e42c37390b392a1480d7ce SHA512 857ed23534a8fd4a3bcfeac5173041b71e57566606f206e588caf76dfbfbb49d9cdd938345979a63c79069a73a087bf8371154650c3694768ea0f53b6c80ba06 WHIRLPOOL 35c08a08f049ace703ea20b1c80a2e47278acc131968825aaee9cd21bb1237d24058fc69883106e318038d7c0c7922b47755276a4656d9667b114e989335881a
-DIST catkin_pkg-0.3.5-gh.tar.gz 47325 SHA256 bc9f45bdc36ec251d04049fff6501c13e16fbe2913b1abd211cecf9b6499477f SHA512 21c22efc23f80982fbda97e65cde9e7609733f4fabb53716c5693e44d7f01a09bfede7e5b628b4b399a2fb5f01113e5d259cef5d0df5eb702dc114d65b988683 WHIRLPOOL dfbf1e7a85ecd39285c95ee4d51b2dbe986e935e2d0e127c3ade1fd9bc274c4d6cde1eb72131f129e4592adb841cb765f91e29231ae458a843c4b9515d0b0459
DIST catkin_pkg-0.3.6-gh.tar.gz 47637 SHA256 b05797352a89986a6c637ef33685a8cd004a8e5138b553f42a82065bc02f808b SHA512 191ed93271c9e592040110c92a572570fa8dec328ae3203dfea9e1fb6a1cb906350c436d3a9416d6826e57a1d59ef42200797d6a5bdc390aa77d352f716e0cc8 WHIRLPOOL 83f73ddaad17b5cfef4945a4d0c900855586877c47962b903e68f821772f4281f7658d82c4adfdf8067889e82f1264d843f1c4f336876ac8afa1bdfe48edeb37
diff --git a/dev-python/catkin_pkg/catkin_pkg-0.3.4.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.3.4.ebuild
deleted file mode 100644
index 28e56139aea..00000000000
--- a/dev-python/catkin_pkg/catkin_pkg-0.3.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
- SCM="git-r3"
- EGIT_REPO_URI="https://github.com/ros-infrastructure/catkin_pkg"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Standalone Python library for the catkin package system"
-HOMEPAGE="http://wiki.ros.org/catkin_pkg"
-if [ "${PV#9999}" != "${PV}" ] ; then
- SRC_URI=""
- KEYWORDS=""
-else
- SRC_URI="https://github.com/ros-infrastructure/catkin_pkg/archive/${PV}.tar.gz -> ${P}-gh.tar.gz"
- KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )
-"
-PATCHES=(
- "${FILESDIR}/catkin_prefix.patch"
- "${FILESDIR}/argparse.patch"
- "${FILESDIR}/ros_packages.patch"
- "${FILESDIR}/infinite_loop.patch"
-)
-
-python_test() {
- nosetests -s --tests test || die
-}
diff --git a/dev-python/catkin_pkg/catkin_pkg-0.3.5.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.3.5.ebuild
deleted file mode 100644
index 28e56139aea..00000000000
--- a/dev-python/catkin_pkg/catkin_pkg-0.3.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
- SCM="git-r3"
- EGIT_REPO_URI="https://github.com/ros-infrastructure/catkin_pkg"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Standalone Python library for the catkin package system"
-HOMEPAGE="http://wiki.ros.org/catkin_pkg"
-if [ "${PV#9999}" != "${PV}" ] ; then
- SRC_URI=""
- KEYWORDS=""
-else
- SRC_URI="https://github.com/ros-infrastructure/catkin_pkg/archive/${PV}.tar.gz -> ${P}-gh.tar.gz"
- KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )
-"
-PATCHES=(
- "${FILESDIR}/catkin_prefix.patch"
- "${FILESDIR}/argparse.patch"
- "${FILESDIR}/ros_packages.patch"
- "${FILESDIR}/infinite_loop.patch"
-)
-
-python_test() {
- nosetests -s --tests test || die
-}
diff --git a/dev-python/catkin_pkg/files/infinite_loop.patch b/dev-python/catkin_pkg/files/infinite_loop.patch
deleted file mode 100644
index 7aa3084efa0..00000000000
--- a/dev-python/catkin_pkg/files/infinite_loop.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=612860
-By Tim Rakowski
-We os.walk /usr with followlinks=True, but at least nodejs contains a "recursive" link in /usr/include/node
-
-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
-@@ -52,7 +52,9 @@ def find_package_paths(basepath, exclude_paths=None, exclude_subspaces=False):
- """
- paths = []
- real_exclude_paths = [os.path.realpath(p) for p in exclude_paths] if exclude_paths is not None else []
-+ visited = set()
- for dirpath, dirnames, filenames in os.walk(basepath, followlinks=True):
-+ visited.add(dirpath)
- if 'CATKIN_IGNORE' in filenames or \
- os.path.realpath(dirpath) in real_exclude_paths or \
- (exclude_subspaces and '.catkin' in filenames):
-@@ -63,7 +65,7 @@ def find_package_paths(basepath, exclude_paths=None, exclude_subspaces=False):
- del dirnames[:]
- continue
- for dirname in dirnames:
-- if dirname.startswith('.'):
-+ if dirname.startswith('.') or os.path.realpath(os.path.join(dirpath, dirname)) in visited:
- dirnames.remove(dirname)
- return paths
-
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/catkin_pkg/, dev-python/catkin_pkg/files/
@ 2018-08-17 13:08 Alexis Ballier
0 siblings, 0 replies; 4+ messages in thread
From: Alexis Ballier @ 2018-08-17 13:08 UTC (permalink / raw
To: gentoo-commits
commit: 91c14cabfa6fa2e752c81bf35031b7a7433ec5e2
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 17 12:53:40 2018 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Aug 17 13:07:58 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91c14cab
dev-python/catkin_pkg: Remove old
Package-Manager: Portage-2.3.46, Repoman-2.3.10
dev-python/catkin_pkg/Manifest | 2 -
dev-python/catkin_pkg/catkin_pkg-0.4.2.ebuild | 47 -----------------------
dev-python/catkin_pkg/catkin_pkg-0.4.6.ebuild | 49 ------------------------
dev-python/catkin_pkg/files/catkin_prefix.patch | 28 --------------
dev-python/catkin_pkg/files/infinite_loop2.patch | 27 -------------
5 files changed, 153 deletions(-)
diff --git a/dev-python/catkin_pkg/Manifest b/dev-python/catkin_pkg/Manifest
index 8e7c054db21..bcf225a1d04 100644
--- a/dev-python/catkin_pkg/Manifest
+++ b/dev-python/catkin_pkg/Manifest
@@ -1,3 +1 @@
-DIST catkin_pkg-0.4.2-gh.tar.gz 52930 BLAKE2B 2b8589441d241197c661975c07c60856c614c4c328e441e6fbb1cb41ea2919f57864f67198b684eba7183004671df0980ddcf0070a53099074433166b5d7db20 SHA512 cb47771172d88792bc7039f072175a6f410aa046e2611ccc75e46bda388d620ac0059e0fa9e087fbb7f2833600a7233d714c1aeeab65e264606d8ae2e64d76bb
-DIST catkin_pkg-0.4.6-gh.tar.gz 60713 BLAKE2B 88442adafcedd90a53a37c5aa3632d06dd88c1c685427708e7801d2a6702b229dfc3f81ac3dfb0ac6ad7c932865b9a61b8c6da28165acef8fa45859cd3a8aaf6 SHA512 d95362a56680f3ca1eb33299e041d6a0a8bbe35bb4a20f411c3b846a2b6fe91f583ffa7a1ed1884604a420dcc1b5e88fe3336ebfebe9a51a7a9f2c8a80f79f8f
DIST catkin_pkg-0.4.7-gh.tar.gz 60765 BLAKE2B 905de7f4f013f8e7d6472b5159cb0e9ac82bb06dfca0308a7a5f8881402a721d987a016f7980f7a435a7122c4771311f82f56f460949370ecd93057ef8a8bb25 SHA512 1e947c09aa4789d414de74bed7b1aa3d5f5d16d22a8a4609f656b47e51b7318fdd21e003f8bf65355728abaf54a016ce2d78b79cc4ab8bd7c3e048b66c0c0f6e
diff --git a/dev-python/catkin_pkg/catkin_pkg-0.4.2.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.4.2.ebuild
deleted file mode 100644
index f74d5f891e5..00000000000
--- a/dev-python/catkin_pkg/catkin_pkg-0.4.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
- SCM="git-r3"
- EGIT_REPO_URI="https://github.com/ros-infrastructure/catkin_pkg"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Standalone Python library for the catkin package system"
-HOMEPAGE="http://wiki.ros.org/catkin_pkg"
-if [ "${PV#9999}" != "${PV}" ] ; then
- SRC_URI=""
- KEYWORDS=""
-else
- SRC_URI="https://github.com/ros-infrastructure/catkin_pkg/archive/${PV}.tar.gz -> ${P}-gh.tar.gz"
- KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
- dev-python/pyparsing[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )
-"
-PATCHES=(
- "${FILESDIR}/catkin_prefix.patch"
- "${FILESDIR}/argparse.patch"
- "${FILESDIR}/ros_packages.patch"
- "${FILESDIR}/infinite_loop2.patch"
-)
-
-python_test() {
- nosetests -s --tests test || die
-}
diff --git a/dev-python/catkin_pkg/catkin_pkg-0.4.6.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.4.6.ebuild
deleted file mode 100644
index 263dc13362e..00000000000
--- a/dev-python/catkin_pkg/catkin_pkg-0.4.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
- SCM="git-r3"
- EGIT_REPO_URI="https://github.com/ros-infrastructure/catkin_pkg"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Standalone Python library for the catkin package system"
-HOMEPAGE="http://wiki.ros.org/catkin_pkg"
-if [ "${PV#9999}" != "${PV}" ] ; then
- SRC_URI=""
- KEYWORDS=""
-else
- SRC_URI="https://github.com/ros-infrastructure/catkin_pkg/archive/${PV}.tar.gz -> ${P}-gh.tar.gz"
- KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
- dev-python/pyparsing[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )
-"
-RDEPEND="${RDEPEND}
- !<dev-util/catkin-0.7.14"
-PATCHES=(
- "${FILESDIR}/catkin_prefix2.patch"
- "${FILESDIR}/argparse.patch"
- "${FILESDIR}/ros_packages.patch"
- "${FILESDIR}/infinite_loop3.patch"
-)
-
-python_test() {
- nosetests -s --tests test || die
-}
diff --git a/dev-python/catkin_pkg/files/catkin_prefix.patch b/dev-python/catkin_pkg/files/catkin_prefix.patch
deleted file mode 100644
index fe9cc347882..00000000000
--- a/dev-python/catkin_pkg/files/catkin_prefix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Allow CATKIN_PREFIX_PATH to work as CMAKE_PREFIX_PATH:
-When building with SYSROOT!=/, CMAKE_PREFIX_PATH is the same as with SYSROOT=/
-but we need to find packages in SYSROOT.
-
-Index: catkin_pkg-0.2.8/src/catkin_pkg/workspaces.py
-===================================================================
---- catkin_pkg-0.2.8.orig/src/catkin_pkg/workspaces.py
-+++ catkin_pkg-0.2.8/src/catkin_pkg/workspaces.py
-@@ -42,15 +42,16 @@ CATKIN_WORKSPACE_MARKER_FILE = '.catkin_
-
- def get_spaces(paths=None):
- """
-- Return a list of spaces based on the CMAKE_PREFIX_PATH or passed in list of workspaces.
-+ Return a list of spaces based on the CMAKE_PREFIX_PATH/CATKIN_PREFIX_PATH or passed in list of workspaces.
- It resolves the source space for each devel space and ignores non-catkin paths.
- :param paths_to_order: list of paths
- :param prefix_paths: list of prefixes, must not end with '/'
- """
- if paths is None:
-- if 'CMAKE_PREFIX_PATH' not in os.environ:
-- raise RuntimeError('Neither the environment variable CMAKE_PREFIX_PATH is set nor was a list of paths passed.')
-+ if 'CMAKE_PREFIX_PATH' not in os.environ and 'CATKIN_PREFIX_PATH' not in os.environ:
-+ raise RuntimeError('None of the environment variables CMAKE_PREFIX_PATH or CATKIN_PREFIX_PATH are set nor was a list of paths passed.')
- paths = os.environ['CMAKE_PREFIX_PATH'].split(os.pathsep) if os.environ['CMAKE_PREFIX_PATH'] else []
-+ paths += os.environ['CATKIN_PREFIX_PATH'].split(os.pathsep) if os.environ['CATKIN_PREFIX_PATH'] else []
-
- spaces = []
- for path in paths:
diff --git a/dev-python/catkin_pkg/files/infinite_loop2.patch b/dev-python/catkin_pkg/files/infinite_loop2.patch
deleted file mode 100644
index 7c5edba2b50..00000000000
--- a/dev-python/catkin_pkg/files/infinite_loop2.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=612860
-By Tim Rakowski
-We os.walk /usr with followlinks=True, but at least nodejs contains a "recursive" link in /usr/include/node
-
-Index: catkin_pkg-0.3.6/src/catkin_pkg/packages.py
-===================================================================
---- catkin_pkg-0.3.6.orig/src/catkin_pkg/packages.py
-+++ catkin_pkg-0.3.6/src/catkin_pkg/packages.py
-@@ -56,7 +56,9 @@ def find_package_paths(basepath, exclude
- """
- paths = []
- real_exclude_paths = [os.path.realpath(p) for p in exclude_paths] if exclude_paths is not None else []
-+ visited = set()
- for dirpath, dirnames, filenames in os.walk(basepath, followlinks=True):
-+ visited.add(dirpath)
- if 'CATKIN_IGNORE' in filenames or \
- os.path.realpath(dirpath) in real_exclude_paths or \
- (exclude_subspaces and '.catkin' in filenames):
-@@ -67,7 +69,7 @@ def find_package_paths(basepath, exclude
- del dirnames[:]
- continue
- # filter out hidden directories in-place
-- dirnames[:] = [d for d in dirnames if not d.startswith('.')]
-+ dirnames[:] = [d for d in dirnames if not d.startswith('.') and not os.path.realpath(os.path.join(dirpath, d)) in visited]
- return paths
-
-
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-08-17 13:08 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-16 21:15 [gentoo-commits] repo/gentoo:master commit in: dev-python/catkin_pkg/, dev-python/catkin_pkg/files/ Alexis Ballier
-- strict thread matches above, loose matches on Subject: below --
2017-02-16 4:32 Alexis Ballier
2017-08-15 6:25 Alexis Ballier
2018-08-17 13:08 Alexis Ballier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox