Gentoo Archives: gentoo-commits

From: Alexis Ballier <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/catkin_pkg/, dev-python/catkin_pkg/files/
Date: Thu, 16 Feb 2017 04:32:26
Message-Id: 1487219502.e7135ebb9b7ff1eb30386794ae563b5cbc415bd5.aballier@gentoo
1 commit: e7135ebb9b7ff1eb30386794ae563b5cbc415bd5
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Thu Feb 16 04:12:59 2017 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Thu Feb 16 04:31:42 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7135ebb
7
8 dev-python/catkin_pkg: Remove argparse dep from setup.py
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 .../{catkin_pkg-0.3.1.ebuild => catkin_pkg-0.3.1-r1.ebuild} | 2 +-
13 dev-python/catkin_pkg/catkin_pkg-9999.ebuild | 2 +-
14 dev-python/catkin_pkg/files/argparse.patch | 12 ++++++++++++
15 3 files changed, 14 insertions(+), 2 deletions(-)
16
17 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
18 similarity index 93%
19 rename from dev-python/catkin_pkg/catkin_pkg-0.3.1.ebuild
20 rename to dev-python/catkin_pkg/catkin_pkg-0.3.1-r1.ebuild
21 index fbc5d3f2d0..ce8fd6d9c5 100644
22 --- a/dev-python/catkin_pkg/catkin_pkg-0.3.1.ebuild
23 +++ b/dev-python/catkin_pkg/catkin_pkg-0.3.1-r1.ebuild
24 @@ -37,7 +37,7 @@ RDEPEND="
25 DEPEND="${RDEPEND}
26 test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )
27 "
28 -PATCHES=( "${FILESDIR}/catkin_prefix.patch" )
29 +PATCHES=( "${FILESDIR}/catkin_prefix.patch" "${FILESDIR}/argparse.patch" )
30
31 python_test() {
32 nosetests -s --tests test || die
33
34 diff --git a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild b/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
35 index fbc5d3f2d0..ce8fd6d9c5 100644
36 --- a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
37 +++ b/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
38 @@ -37,7 +37,7 @@ RDEPEND="
39 DEPEND="${RDEPEND}
40 test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )
41 "
42 -PATCHES=( "${FILESDIR}/catkin_prefix.patch" )
43 +PATCHES=( "${FILESDIR}/catkin_prefix.patch" "${FILESDIR}/argparse.patch" )
44
45 python_test() {
46 nosetests -s --tests test || die
47
48 diff --git a/dev-python/catkin_pkg/files/argparse.patch b/dev-python/catkin_pkg/files/argparse.patch
49 new file mode 100644
50 index 0000000000..f39df4a405
51 --- /dev/null
52 +++ b/dev-python/catkin_pkg/files/argparse.patch
53 @@ -0,0 +1,12 @@
54 +Index: catkin_pkg-0.3.1/setup.py
55 +===================================================================
56 +--- catkin_pkg-0.3.1.orig/setup.py
57 ++++ catkin_pkg-0.3.1/setup.py
58 +@@ -31,7 +31,6 @@ kwargs = {
59 + 'long_description': 'Library for retrieving information about catkin packages.',
60 + 'license': 'BSD',
61 + 'install_requires': [
62 +- 'argparse',
63 + 'docutils',
64 + 'python-dateutil'
65 + ],