diff options
author | Alexis Ballier <aballier@gentoo.org> | 2016-05-10 16:49:29 +0200 |
---|---|---|
committer | Alexis Ballier <aballier@gentoo.org> | 2016-05-10 16:49:38 +0200 |
commit | 0de5e788658811acc6496d7274faf643f2f3e61d (patch) | |
tree | 1c278ff92d255d7c1cb9fa9077bfb4e3bf007f5d | |
parent | dev-util/electron: Regenerate Manifest file. (diff) | |
download | gentoo-0de5e788658811acc6496d7274faf643f2f3e61d.tar.gz gentoo-0de5e788658811acc6496d7274faf643f2f3e61d.tar.bz2 gentoo-0de5e788658811acc6496d7274faf643f2f3e61d.zip |
dev-util/wstool: bump to 0.1.13
Package-Manager: portage-2.2.28
-rw-r--r-- | dev-util/wstool/Manifest | 1 | ||||
-rw-r--r-- | dev-util/wstool/files/prefix2.patch | 26 | ||||
-rw-r--r-- | dev-util/wstool/wstool-0.1.13.ebuild | 62 | ||||
-rw-r--r-- | dev-util/wstool/wstool-9999.ebuild | 2 |
4 files changed, 90 insertions, 1 deletions
diff --git a/dev-util/wstool/Manifest b/dev-util/wstool/Manifest index 312d718bd1de..144d3100ad7e 100644 --- a/dev-util/wstool/Manifest +++ b/dev-util/wstool/Manifest @@ -1,2 +1,3 @@ DIST wstool-0.1.10.tar.gz 73404 SHA256 2810f7f384b45bc653e006e0d473ed66a3ba88e237792a92955bc61fcef61b7c SHA512 8b5924844e8ff0ddcce3302b550493a9bbe525c7c7d7f5a23e49d4734649f50893ca0f2e5dbd05b20ee73d31666d61a4c3035e7d30e6053bfe8ff5c6aa9aafde WHIRLPOOL b9a6399e0dfb894685b7ed83210fe2920bdcfb2a426684829c65fec33b3963eb6cde3f7c35f9f16194306731bb366ba54ce48ba10805ff70c7eaf0a094d7f15c DIST wstool-0.1.12.tar.gz 74561 SHA256 4ca6c61d8f311f9167d4e5e3d9b4acafb0c3a7c7a76607779eed047d9f6c7145 SHA512 2d398d28eae33fac06faec3dc2aa6867b3715ae4d586efa8f8e47fdeec88335e144665cf3564272cdf5fedca6789075659db29b80ea94569d38a1bc9a7d1a3c0 WHIRLPOOL 99c2011a31cd601f3518b95f7b2a16fe878493e4d95dbf8a0ec2cc613c19ff931755705771402da2a2f4b1a44a444e95698958c988f280112629c02e0f7e0e11 +DIST wstool-0.1.13.tar.gz 75188 SHA256 97db71105728b3bed1828c85becfb1216b95f8b2776d94e280ad1875f2196160 SHA512 4d54f78ca044d31d927de1c3387536d0447ece77672c555845adf54e47f07adb67e6e9c866bc2719aae468aeeb26c900b3784e0ec7cf014c8118e841a92dca14 WHIRLPOOL 3ef703a5eafc2ac8f80b76fdb91de789921c89fa15b3f8457979e84dafc86a9d2d957d053e430dc75784d85912008617bd1c2418432e60873bb199af561e845b diff --git a/dev-util/wstool/files/prefix2.patch b/dev-util/wstool/files/prefix2.patch new file mode 100644 index 000000000000..934443f98707 --- /dev/null +++ b/dev-util/wstool/files/prefix2.patch @@ -0,0 +1,26 @@ +Index: wstool-0.1.13/setup.py +=================================================================== +--- wstool-0.1.13.orig/setup.py ++++ wstool-0.1.13/setup.py +@@ -26,18 +26,11 @@ def _resolve_prefix(prefix, type): + # issue: https://github.com/vcstools/wstool/issues/81 + osx_system_prefix = '/System/Library/Frameworks/Python.framework/Versions' + if type == 'man': +- if prefix == '/usr': +- return '/usr/share' +- if sys.prefix.startswith(osx_system_prefix): +- return '/usr/local/share' ++ return os.path.join(prefix, 'share') + elif type == 'bash_comp': +- if prefix == '/usr': +- return '/' +- if sys.prefix.startswith(osx_system_prefix): +- return '/usr/local' ++ return os.path.join(prefix, '../') + elif type == 'zsh_comp': +- if sys.prefix.startswith(osx_system_prefix): +- return '/usr/local' ++ return os.path.join(prefix, '../') + else: + raise ValueError('not supported type') + return prefix diff --git a/dev-util/wstool/wstool-0.1.13.ebuild b/dev-util/wstool/wstool-0.1.13.ebuild new file mode 100644 index 000000000000..551f7c7a7703 --- /dev/null +++ b/dev-util/wstool/wstool-0.1.13.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2014 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="https://github.com/vcstools/wstool" +fi + +inherit ${SCM} distutils-r1 + +DESCRIPTION="Commands to manage several local SCM repositories for ROS" +HOMEPAGE="http://wiki.ros.org/wstool" +if [ "${PV#9999}" != "${PV}" ] ; then + SRC_URI="" + KEYWORDS="" +else + SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz + http://github.com/vcstools/wstool/archive/${PV}.tar.gz -> ${P}.tar.gz + " + KEYWORDS="~amd64 ~arm" +fi + +LICENSE="BSD" +SLOT="0" +IUSE="test" + +RDEPEND=" + dev-python/pyyaml[${PYTHON_USEDEP}] + >=dev-python/vcstools-0.1.38[${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND} + dev-python/sphinx + test? ( + dev-python/nose[${PYTHON_USEDEP}] + dev-python/coverage[${PYTHON_USEDEP}] + dev-vcs/git + dev-vcs/bzr + dev-vcs/mercurial + dev-vcs/subversion + ) +" + +PATCHES=( "${FILESDIR}/prefix2.patch" ) +DISTUTILS_IN_SOURCE_BUILD="yes" + +python_test() { + # From travis.yml + # Set git config to silence some stuff in the tests + git config --global user.email "foo@example.com" + git config --global user.name "Foo Bar" + # Set the hg user + echo -e "[ui]\nusername = Your Name <your@mail.com>" >> ~/.hgrc + # Set the bzr user + bzr whoami "Your Name <name@example.com>" + # command to run tests + nosetests --with-coverage --cover-package=wstool || die +} diff --git a/dev-util/wstool/wstool-9999.ebuild b/dev-util/wstool/wstool-9999.ebuild index d8ec14af3a9d..551f7c7a7703 100644 --- a/dev-util/wstool/wstool-9999.ebuild +++ b/dev-util/wstool/wstool-9999.ebuild @@ -45,7 +45,7 @@ DEPEND="${RDEPEND} ) " -PATCHES=( "${FILESDIR}/prefix.patch" ) +PATCHES=( "${FILESDIR}/prefix2.patch" ) DISTUTILS_IN_SOURCE_BUILD="yes" python_test() { |