[gentoo-commits] repo/gentoo:master commit in: dev-python/catkin_pkg/files/, dev-python/catkin_pkg/

2022-11-13 Thread Michał Górny 
commit: b64a3da7ffebfd74e24d560bd14f4bf8a59f6192
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Nov 14 04:34:45 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Nov 14 04:34:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b64a3da7

dev-python/catkin_pkg: Remove old

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/catkin_pkg/Manifest |  1 -
 dev-python/catkin_pkg/catkin_pkg-0.4.24.ebuild | 46 --
 dev-python/catkin_pkg/files/infinite_loop4.patch   | 27 -
 .../catkin_pkg/files/summary_single_line.patch | 19 -
 4 files changed, 93 deletions(-)

diff --git a/dev-python/catkin_pkg/Manifest b/dev-python/catkin_pkg/Manifest
index ad5ec33456df..08e672a1d448 100644
--- a/dev-python/catkin_pkg/Manifest
+++ b/dev-python/catkin_pkg/Manifest
@@ -1,2 +1 @@
-DIST catkin_pkg-0.4.24-gh.tar.gz 65113 BLAKE2B 
554848e5e34a663b29246ec1109f228361cbb010d76d54e0b27107189382843e90babf24f8660dce4063324f78dff87286e31f5f1bb7db10aaa86e056c23de2d
 SHA512 
7c746917876d5a9d8be6f187fc3d75e322ab158ff9fd1b9c661e0802504b188c59d47ad42320613e3aff26b83a6f239bb3dec5d0ab16dadd2ff1e26f73288e61
 DIST catkin_pkg-0.5.2-gh.tar.gz 67596 BLAKE2B 
aec34c6f54926dee02034d542741affe9cb662b06b354062088bec1fec25381f036d59af5fa52153ba1ce1c91fdf8bb9d1484475df8a63268ca474a7acd5f285
 SHA512 
40e7e3839017ad430ee36dccf87a90727e5efd92e6c605cdba3e9f8850b71a6a80da79bd8760d94e356dadebdd842c8a3f8b530782fb75503d3e620add79be4a

diff --git a/dev-python/catkin_pkg/catkin_pkg-0.4.24.ebuild 
b/dev-python/catkin_pkg/catkin_pkg-0.4.24.ebuild
deleted file mode 100644
index bc0e7090297d..
--- a/dev-python/catkin_pkg/catkin_pkg-0.4.24.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-SCM=""
-if [ "${PV#}" != "${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="https://wiki.ros.org/catkin_pkg;
-if [ "${PV#}" != "${PV}" ] ; then
-   SRC_URI=""
-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"
-
-RDEPEND="
-   dev-python/docutils[${PYTHON_USEDEP}]
-   dev-python/python-dateutil[${PYTHON_USEDEP}]
-   dev-python/pyparsing[${PYTHON_USEDEP}]
-   !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.4.20/src/catkin_pkg/packages.py
-===
 catkin_pkg-0.4.20.orig/src/catkin_pkg/packages.py
-+++ catkin_pkg-0.4.20/src/catkin_pkg/packages.py
-@@ -57,7 +57,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 set(dirnames + filenames) & {'AMENT_IGNORE', 'CATKIN_IGNORE', 
'COLCON_IGNORE'} or \
- os.path.realpath(dirpath) in real_exclude_paths or \
- (exclude_subspaces and '.catkin' in filenames):
-@@ -68,7 +70,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
- 
- 

diff --git a/dev-python/catkin_pkg/files/summary_single_line.patch 
b/dev-python/catkin_pkg/files/summary_single_line.patch
deleted file mode 100644
index d24c284da9ea..
--- a/dev-python/catkin_pkg/files/summary_single_line.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-setuptools will disallow newlines in descriptions, so do not generate them
-see e.g. https://bugs.gentoo.org/765868
-
-Index: catkin_pkg-0.4.23/src/catkin_pkg/python_setup.py
-===
 catkin_pkg-0.4.23.orig/src/catkin_pkg/python_setup.py
-+++ catkin_pkg-0.4.23/src/catkin_pkg/python_setup.py
-@@ -99,9 +99,9 @@ def generate_distutils_setup(package_xml
- data['url'] = package.urls[0].url
- 
- if len(package.description) <= 200:
--data['description'] = package.description
-+data['description'] = package.description.replace('\n', ' ')
- else:
--data['description'] = package.description[:197] + '...'
-+data['description'] =

[gentoo-commits] repo/gentoo:master commit in: dev-python/catkin_pkg/files/, dev-python/catkin_pkg/

2022-07-06 Thread Alexis Ballier 
commit: 598819d1a34cb5d100405d7168413fd0ede90ae9
Author: Alexis Ballier  gentoo  org>
AuthorDate: Wed Jul  6 15:12:46 2022 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Wed Jul  6 15:14:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=598819d1

dev-python/catkin_pkg: bump to 0.5.2

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alexis Ballier  gentoo.org>

 dev-python/catkin_pkg/Manifest |  1 +
 ...kin_pkg-.ebuild => catkin_pkg-0.5.2.ebuild} |  5 ++--
 dev-python/catkin_pkg/catkin_pkg-.ebuild   |  5 ++--
 dev-python/catkin_pkg/files/infinite_loop5.patch   | 27 ++
 4 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/dev-python/catkin_pkg/Manifest b/dev-python/catkin_pkg/Manifest
index c7f66fef7438..ad5ec33456df 100644
--- a/dev-python/catkin_pkg/Manifest
+++ b/dev-python/catkin_pkg/Manifest
@@ -1 +1,2 @@
 DIST catkin_pkg-0.4.24-gh.tar.gz 65113 BLAKE2B 
554848e5e34a663b29246ec1109f228361cbb010d76d54e0b27107189382843e90babf24f8660dce4063324f78dff87286e31f5f1bb7db10aaa86e056c23de2d
 SHA512 
7c746917876d5a9d8be6f187fc3d75e322ab158ff9fd1b9c661e0802504b188c59d47ad42320613e3aff26b83a6f239bb3dec5d0ab16dadd2ff1e26f73288e61
+DIST catkin_pkg-0.5.2-gh.tar.gz 67596 BLAKE2B 
aec34c6f54926dee02034d542741affe9cb662b06b354062088bec1fec25381f036d59af5fa52153ba1ce1c91fdf8bb9d1484475df8a63268ca474a7acd5f285
 SHA512 
40e7e3839017ad430ee36dccf87a90727e5efd92e6c605cdba3e9f8850b71a6a80da79bd8760d94e356dadebdd842c8a3f8b530782fb75503d3e620add79be4a

diff --git a/dev-python/catkin_pkg/catkin_pkg-.ebuild 
b/dev-python/catkin_pkg/catkin_pkg-0.5.2.ebuild
similarity index 89%
copy from dev-python/catkin_pkg/catkin_pkg-.ebuild
copy to dev-python/catkin_pkg/catkin_pkg-0.5.2.ebuild
index 79e5eb6b91bf..ae7ac37cda94 100644
--- a/dev-python/catkin_pkg/catkin_pkg-.ebuild
+++ b/dev-python/catkin_pkg/catkin_pkg-0.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -39,8 +39,7 @@ BDEPEND="
 PATCHES=(
"${FILESDIR}/catkin_prefix2.patch"
"${FILESDIR}/ros_packages.patch"
-   "${FILESDIR}/infinite_loop4.patch"
-   "${FILESDIR}/summary_single_line.patch"
+   "${FILESDIR}/infinite_loop5.patch"
 )
 
 distutils_enable_tests nose

diff --git a/dev-python/catkin_pkg/catkin_pkg-.ebuild 
b/dev-python/catkin_pkg/catkin_pkg-.ebuild
index 79e5eb6b91bf..ae7ac37cda94 100644
--- a/dev-python/catkin_pkg/catkin_pkg-.ebuild
+++ b/dev-python/catkin_pkg/catkin_pkg-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -39,8 +39,7 @@ BDEPEND="
 PATCHES=(
"${FILESDIR}/catkin_prefix2.patch"
"${FILESDIR}/ros_packages.patch"
-   "${FILESDIR}/infinite_loop4.patch"
-   "${FILESDIR}/summary_single_line.patch"
+   "${FILESDIR}/infinite_loop5.patch"
 )
 
 distutils_enable_tests nose

diff --git a/dev-python/catkin_pkg/files/infinite_loop5.patch 
b/dev-python/catkin_pkg/files/infinite_loop5.patch
new file mode 100644
index ..7f88da41a27d
--- /dev/null
+++ b/dev-python/catkin_pkg/files/infinite_loop5.patch
@@ -0,0 +1,27 @@
+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.5.2/src/catkin_pkg/packages.py
+===
+--- catkin_pkg-0.5.2.orig/src/catkin_pkg/packages.py
 catkin_pkg-0.5.2/src/catkin_pkg/packages.py
+@@ -61,7 +61,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 set(dirnames + filenames) & ignore_markers or \
+ os.path.realpath(dirpath) in real_exclude_paths or \
+ (exclude_subspaces and '.catkin' in filenames):
+@@ -72,7 +74,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
+ 
+

[gentoo-commits] repo/gentoo:master commit in: dev-python/catkin_pkg/files/, dev-python/catkin_pkg/

2021-01-20 Thread Alexis Ballier 
commit: 71f6ac45fbebc5efaa00c25b543e34a67f011d82
Author: Alexis Ballier  gentoo  org>
AuthorDate: Wed Jan 20 20:02:33 2021 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Wed Jan 20 20:02:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71f6ac45

dev-python/catkin_pkg: generate setup.py without newline in description

Closes: https://bugs.gentoo.org/765868
Closes: https://bugs.gentoo.org/765877
Closes: https://bugs.gentoo.org/765772
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Alexis Ballier  gentoo.org>

 ..._pkg-0.4.23.ebuild => catkin_pkg-0.4.23-r1.ebuild} |  3 ++-
 dev-python/catkin_pkg/catkin_pkg-.ebuild  |  3 ++-
 dev-python/catkin_pkg/files/summary_single_line.patch | 19 +++
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/dev-python/catkin_pkg/catkin_pkg-0.4.23.ebuild 
b/dev-python/catkin_pkg/catkin_pkg-0.4.23-r1.ebuild
similarity index 94%
rename from dev-python/catkin_pkg/catkin_pkg-0.4.23.ebuild
rename to dev-python/catkin_pkg/catkin_pkg-0.4.23-r1.ebuild
index 677f0b8d989..22de5978719 100644
--- a/dev-python/catkin_pkg/catkin_pkg-0.4.23.ebuild
+++ b/dev-python/catkin_pkg/catkin_pkg-0.4.23-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -50,6 +50,7 @@ PATCHES=(
"${FILESDIR}/catkin_prefix2.patch"
"${FILESDIR}/ros_packages.patch"
"${FILESDIR}/infinite_loop4.patch"
+   "${FILESDIR}/summary_single_line.patch"
 )
 
 python_test() {

diff --git a/dev-python/catkin_pkg/catkin_pkg-.ebuild 
b/dev-python/catkin_pkg/catkin_pkg-.ebuild
index 677f0b8d989..22de5978719 100644
--- a/dev-python/catkin_pkg/catkin_pkg-.ebuild
+++ b/dev-python/catkin_pkg/catkin_pkg-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -50,6 +50,7 @@ PATCHES=(
"${FILESDIR}/catkin_prefix2.patch"
"${FILESDIR}/ros_packages.patch"
"${FILESDIR}/infinite_loop4.patch"
+   "${FILESDIR}/summary_single_line.patch"
 )
 
 python_test() {

diff --git a/dev-python/catkin_pkg/files/summary_single_line.patch 
b/dev-python/catkin_pkg/files/summary_single_line.patch
new file mode 100644
index 000..d24c284da9e
--- /dev/null
+++ b/dev-python/catkin_pkg/files/summary_single_line.patch
@@ -0,0 +1,19 @@
+setuptools will disallow newlines in descriptions, so do not generate them
+see e.g. https://bugs.gentoo.org/765868
+
+Index: catkin_pkg-0.4.23/src/catkin_pkg/python_setup.py
+===
+--- catkin_pkg-0.4.23.orig/src/catkin_pkg/python_setup.py
 catkin_pkg-0.4.23/src/catkin_pkg/python_setup.py
+@@ -99,9 +99,9 @@ def generate_distutils_setup(package_xml
+ data['url'] = package.urls[0].url
+ 
+ if len(package.description) <= 200:
+-data['description'] = package.description
++data['description'] = package.description.replace('\n', ' ')
+ else:
+-data['description'] = package.description[:197] + '...'
++data['description'] = package.description[:197].replace('\n', ' ') + 
'...'
+ data['long_description'] = package.description
+ 
+ data['license'] = ', '.join(package.licenses)

[gentoo-commits] repo/gentoo:master commit in: dev-python/catkin_pkg/files/, dev-python/catkin_pkg/

2020-09-21 Thread Alexis Ballier 
commit: 04db859ba4e4f6202a5a5326edc9b59d42894574
Author: Alexis Ballier  gentoo  org>
AuthorDate: Fri Sep 18 16:55:02 2020 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Mon Sep 21 13:47:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04db859b

dev-python/catkin_pkg: improve catkin prefix patch not to require cmake

Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: Alexis Ballier  gentoo.org>

 .../{catkin_pkg-0.4.22.ebuild => catkin_pkg-0.4.22-r1.ebuild} |  0
 dev-python/catkin_pkg/files/catkin_prefix2.patch  | 11 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/dev-python/catkin_pkg/catkin_pkg-0.4.22.ebuild 
b/dev-python/catkin_pkg/catkin_pkg-0.4.22-r1.ebuild
similarity index 100%
rename from dev-python/catkin_pkg/catkin_pkg-0.4.22.ebuild
rename to dev-python/catkin_pkg/catkin_pkg-0.4.22-r1.ebuild

diff --git a/dev-python/catkin_pkg/files/catkin_prefix2.patch 
b/dev-python/catkin_pkg/files/catkin_prefix2.patch
index 761894e83b1..064ad1ca65f 100644
--- a/dev-python/catkin_pkg/files/catkin_prefix2.patch
+++ b/dev-python/catkin_pkg/files/catkin_prefix2.patch
@@ -2,10 +2,10 @@ 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.4.6/src/catkin_pkg/workspaces.py
+Index: catkin_pkg-0.4.22/src/catkin_pkg/workspaces.py
 ===
 catkin_pkg-0.4.6.orig/src/catkin_pkg/workspaces.py
-+++ catkin_pkg-0.4.6/src/catkin_pkg/workspaces.py
+--- catkin_pkg-0.4.22.orig/src/catkin_pkg/workspaces.py
 catkin_pkg-0.4.22/src/catkin_pkg/workspaces.py
 @@ -41,16 +41,17 @@ CATKIN_WORKSPACE_MARKER_FILE = '.catkin_
  
  def get_spaces(paths=None):
@@ -20,10 +20,11 @@ Index: catkin_pkg-0.4.6/src/catkin_pkg/workspaces.py
  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.')
+-paths = os.environ['CMAKE_PREFIX_PATH'].split(os.pathsep) if 
os.environ['CMAKE_PREFIX_PATH'] else []
 +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 []
++paths = os.environ['CMAKE_PREFIX_PATH'].split(os.pathsep) if 
os.environ.get('CMAKE_PREFIX_PATH') else []
++paths += os.environ['CATKIN_PREFIX_PATH'].split(os.pathsep) if 
os.environ.get('CATKIN_PREFIX_PATH') else []
  
  spaces = []
  for path in paths:

[gentoo-commits] repo/gentoo:master commit in: dev-python/catkin_pkg/files/

2019-01-15 Thread Alexis Ballier 
commit: e70904d8adddb1c7abe7fcc806c9cd06ed07bfc2
Author: Alexis Ballier  gentoo  org>
AuthorDate: Tue Jan 15 10:37:05 2019 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Tue Jan 15 10:46:45 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e70904d8

dev-python/catkin_pkg: Remove old

Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Alexis Ballier  gentoo.org>

 dev-python/catkin_pkg/files/argparse.patch | 12 
 1 file changed, 12 deletions(-)

diff --git a/dev-python/catkin_pkg/files/argparse.patch 
b/dev-python/catkin_pkg/files/argparse.patch
deleted file mode 100644
index f39df4a4056..000
--- a/dev-python/catkin_pkg/files/argparse.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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'
- ],

[gentoo-commits] repo/gentoo:master commit in: dev-python/catkin_pkg/files/, dev-python/catkin_pkg/

2018-05-15 Thread Alexis Ballier 
commit: acd83790f473073286a1834a978129c6adc703e1
Author: Alexis Ballier  gentoo  org>
AuthorDate: Tue May 15 06:34:50 2018 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Tue May 15 06:34:50 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acd83790

dev-python/catkin_pkg: bump to 0.4.2 and fix tests

Package-Manager: Portage-2.3.36, Repoman-2.3.9

 dev-python/catkin_pkg/Manifest  |  1 +
 dev-python/catkin_pkg/catkin_pkg-0.4.2.ebuild   | 47 +
 dev-python/catkin_pkg/files/catkin_prefix.patch |  2 +-
 dev-python/catkin_pkg/files/ros_packages.patch  |  2 +-
 4 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/dev-python/catkin_pkg/Manifest b/dev-python/catkin_pkg/Manifest
index bdeeb5ed96a..413b7da1d4b 100644
--- a/dev-python/catkin_pkg/Manifest
+++ b/dev-python/catkin_pkg/Manifest
@@ -1,2 +1,3 @@
 DIST catkin_pkg-0.3.9-gh.tar.gz 48290 BLAKE2B 
fbba89008946433007f1016addeb73e44108b057609d52d693e80024460c5d77686bde241331845d36068b23e87a4ac33dcc0c6c29af95c4e86e8a30bbe52918
 SHA512 
39c7dbd7b3bb7d0fd7f37e6931e5de8c76c28ca329db5783d1cf0b01e9a7f58079c45434d937a8edcf29cbdebdcfb4b18480508d688dcefdf58c218838af65c8
 DIST catkin_pkg-0.4.1-gh.tar.gz 50886 BLAKE2B 
03a5205271fd3f12e4a3bcd093d8e1811d3a1e3197292004e9dd4e255fa10741fdb90a754df4a1fd6705f305e524413cdb7a8dc9f5174a162a20ffa95cfc3b2e
 SHA512 
d7802bbfd0187f1411d36fbecca2afa43dc55f54441a6e0ddc54c2153bf1c553cfa76e5a3d1d08a92fe765c530d1668a762eaaf45e1f68b61c2cf6d1ec49e4a7
+DIST catkin_pkg-0.4.2-gh.tar.gz 52930 BLAKE2B 
2b8589441d241197c661975c07c60856c614c4c328e441e6fbb1cb41ea2919f57864f67198b684eba7183004671df0980ddcf0070a53099074433166b5d7db20
 SHA512 
cb47771172d88792bc7039f072175a6f410aa046e2611ccc75e46bda388d620ac0059e0fa9e087fbb7f2833600a7233d714c1aeeab65e264606d8ae2e64d76bb

diff --git a/dev-python/catkin_pkg/catkin_pkg-0.4.2.ebuild 
b/dev-python/catkin_pkg/catkin_pkg-0.4.2.ebuild
new file mode 100644
index 000..f74d5f891e5
--- /dev/null
+++ b/dev-python/catkin_pkg/catkin_pkg-0.4.2.ebuild
@@ -0,0 +1,47 @@
+# 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#}" != "${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#}" != "${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/files/catkin_prefix.patch 
b/dev-python/catkin_pkg/files/catkin_prefix.patch
index c5f40db51cd..fe9cc347882 100644
--- a/dev-python/catkin_pkg/files/catkin_prefix.patch
+++ b/dev-python/catkin_pkg/files/catkin_prefix.patch
@@ -19,7 +19,7 @@ Index: catkin_pkg-0.2.8/src/catkin_pkg/workspaces.py
  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 :
++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 []

diff --git a/dev-python/catkin_pkg/files/ros_packages.patch 
b/dev-python/catkin_pkg/files/ros_packages.patch
index 6c9855d627c..06933d69a9f 100644
--- a/dev-python/catkin_pkg/files/ros_packages.patch
+++ b/dev-python/catkin_pkg/files/ros_packages.patch
@@ -7,7 +7,7 @@ Index: catkin_pkg-0.3.1/src/catkin_pkg/packages.py
  continue
  elif PACKAGE_MANIFEST_FILENAME in filenames:
 -paths.append(os.path.relpath(dirpath, basepath))
-+

[gentoo-commits] repo/gentoo:master commit in: dev-python/catkin_pkg/files/, dev-python/catkin_pkg/

2017-08-15 Thread Alexis Ballier 
commit: 22d803245bc35305dde45a1873ffc5d352ed5fac
Author: Alexis Ballier  gentoo  org>
AuthorDate: Tue Aug 15 06:02:35 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Tue Aug 15 06:25:26 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22d80324

dev-python/catkin_pkg: bump to 0.3.6 and update infinite loop patch

Package-Manager: Portage-2.3.7, Repoman-2.3.3

 dev-python/catkin_pkg/Manifest |  1 +
 ...kin_pkg-.ebuild => catkin_pkg-0.3.6.ebuild} |  2 +-
 dev-python/catkin_pkg/catkin_pkg-.ebuild   |  2 +-
 dev-python/catkin_pkg/files/infinite_loop2.patch   | 27 ++
 4 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/dev-python/catkin_pkg/Manifest b/dev-python/catkin_pkg/Manifest
index 6238f24ae9d..1e1b7e22a3b 100644
--- a/dev-python/catkin_pkg/Manifest
+++ b/dev-python/catkin_pkg/Manifest
@@ -1,2 +1,3 @@
 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-.ebuild 
b/dev-python/catkin_pkg/catkin_pkg-0.3.6.ebuild
similarity index 96%
copy from dev-python/catkin_pkg/catkin_pkg-.ebuild
copy to dev-python/catkin_pkg/catkin_pkg-0.3.6.ebuild
index 28e56139aea..0967bd6ff8e 100644
--- a/dev-python/catkin_pkg/catkin_pkg-.ebuild
+++ b/dev-python/catkin_pkg/catkin_pkg-0.3.6.ebuild
@@ -38,7 +38,7 @@ PATCHES=(
"${FILESDIR}/catkin_prefix.patch"
"${FILESDIR}/argparse.patch"
"${FILESDIR}/ros_packages.patch"
-   "${FILESDIR}/infinite_loop.patch"
+   "${FILESDIR}/infinite_loop2.patch"
 )
 
 python_test() {

diff --git a/dev-python/catkin_pkg/catkin_pkg-.ebuild 
b/dev-python/catkin_pkg/catkin_pkg-.ebuild
index 28e56139aea..0967bd6ff8e 100644
--- a/dev-python/catkin_pkg/catkin_pkg-.ebuild
+++ b/dev-python/catkin_pkg/catkin_pkg-.ebuild
@@ -38,7 +38,7 @@ PATCHES=(
"${FILESDIR}/catkin_prefix.patch"
"${FILESDIR}/argparse.patch"
"${FILESDIR}/ros_packages.patch"
-   "${FILESDIR}/infinite_loop.patch"
+   "${FILESDIR}/infinite_loop2.patch"
 )
 
 python_test() {

diff --git a/dev-python/catkin_pkg/files/infinite_loop2.patch 
b/dev-python/catkin_pkg/files/infinite_loop2.patch
new file mode 100644
index 000..7c5edba2b50
--- /dev/null
+++ b/dev-python/catkin_pkg/files/infinite_loop2.patch
@@ -0,0 +1,27 @@
+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
+ 
+

[gentoo-commits] repo/gentoo:master commit in: dev-python/catkin_pkg/files/, dev-python/catkin_pkg/

2017-04-25 Thread Alexis Ballier 
commit: 1e2412c2e4b566936653e98e62d244efd5523848
Author: Alexis Ballier  gentoo  org>
AuthorDate: Tue Apr 25 06:39:55 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Tue Apr 25 06:40:16 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e2412c2

dev-python/catkin_pkg: Add patch by Tim Rakowski in bug #612860 to avoid 
infinite loop in crawling directories

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 ...-0.3.1-r2.ebuild => catkin_pkg-0.3.1-r3.ebuild} |  7 +-
 dev-python/catkin_pkg/catkin_pkg-.ebuild   |  7 +-
 dev-python/catkin_pkg/files/infinite_loop.patch| 27 ++
 3 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/dev-python/catkin_pkg/catkin_pkg-0.3.1-r2.ebuild 
b/dev-python/catkin_pkg/catkin_pkg-0.3.1-r3.ebuild
similarity index 86%
rename from dev-python/catkin_pkg/catkin_pkg-0.3.1-r2.ebuild
rename to dev-python/catkin_pkg/catkin_pkg-0.3.1-r3.ebuild
index f86e76ef427..28e56139aea 100644
--- a/dev-python/catkin_pkg/catkin_pkg-0.3.1-r2.ebuild
+++ b/dev-python/catkin_pkg/catkin_pkg-0.3.1-r3.ebuild
@@ -34,7 +34,12 @@ RDEPEND="
 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" )
+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-.ebuild 
b/dev-python/catkin_pkg/catkin_pkg-.ebuild
index f86e76ef427..28e56139aea 100644
--- a/dev-python/catkin_pkg/catkin_pkg-.ebuild
+++ b/dev-python/catkin_pkg/catkin_pkg-.ebuild
@@ -34,7 +34,12 @@ RDEPEND="
 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" )
+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
new file mode 100644
index 000..7aa3084efa0
--- /dev/null
+++ b/dev-python/catkin_pkg/files/infinite_loop.patch
@@ -0,0 +1,27 @@
+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
+

[gentoo-commits] repo/gentoo:master commit in: dev-python/catkin_pkg/files/, dev-python/catkin_pkg/

2017-02-28 Thread Alexis Ballier 
commit: 25e32ee384088923b56e78198e9dd216637fae59
Author: Alexis Ballier  gentoo  org>
AuthorDate: Tue Feb 28 08:22:52 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Tue Feb 28 11:26:48 2017 +
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-.ebuild => catkin_pkg-0.3.1-r2.ebuild}  |  9 +
 dev-python/catkin_pkg/catkin_pkg-.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-.ebuild 
b/dev-python/catkin_pkg/catkin_pkg-0.3.1-r2.ebuild
similarity index 86%
copy from dev-python/catkin_pkg/catkin_pkg-.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-.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-.ebuild 
b/dev-python/catkin_pkg/catkin_pkg-.ebuild
index 57cbb8ced9..e258fe5491 100644
--- a/dev-python/catkin_pkg/catkin_pkg-.ebuild
+++ b/dev-python/catkin_pkg/catkin_pkg-.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 00..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: