From e7135ebb9b7ff1eb30386794ae563b5cbc415bd5 Mon Sep 17 00:00:00 2001
From: Alexis Ballier <aballier@gentoo.org>
Date: Thu, 16 Feb 2017 05:12:59 +0100
Subject: dev-python/catkin_pkg: Remove argparse dep from setup.py

Package-Manager: Portage-2.3.3, Repoman-2.3.1
---
 dev-python/catkin_pkg/catkin_pkg-0.3.1-r1.ebuild | 51 ++++++++++++++++++++++++
 dev-python/catkin_pkg/catkin_pkg-0.3.1.ebuild    | 51 ------------------------
 dev-python/catkin_pkg/catkin_pkg-9999.ebuild     |  2 +-
 dev-python/catkin_pkg/files/argparse.patch       | 12 ++++++
 4 files changed, 64 insertions(+), 52 deletions(-)
 create mode 100644 dev-python/catkin_pkg/catkin_pkg-0.3.1-r1.ebuild
 delete mode 100644 dev-python/catkin_pkg/catkin_pkg-0.3.1.ebuild
 create mode 100644 dev-python/catkin_pkg/files/argparse.patch

(limited to 'dev-python/catkin_pkg')

diff --git a/dev-python/catkin_pkg/catkin_pkg-0.3.1-r1.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.3.1-r1.ebuild
new file mode 100644
index 000000000000..ce8fd6d9c5b6
--- /dev/null
+++ b/dev-python/catkin_pkg/catkin_pkg-0.3.1-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5} 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="
+		http://download.ros.org/downloads/${PN}/${P}.tar.gz
+		https://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" "${FILESDIR}/argparse.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-0.3.1.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.3.1.ebuild
deleted file mode 100644
index fbc5d3f2d01c..000000000000
--- a/dev-python/catkin_pkg/catkin_pkg-0.3.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5} 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="
-		http://download.ros.org/downloads/${PN}/${P}.tar.gz
-		https://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
index fbc5d3f2d01c..ce8fd6d9c5b6 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 000000000000..f39df4a40565
--- /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'
+     ],
-- 
cgit v1.2.3-65-gdbad