* [gentoo-commits] repo/gentoo:master commit in: dev-util/wstool/, dev-util/wstool/files/
@ 2016-05-10 14:49 Alexis Ballier
0 siblings, 0 replies; 2+ messages in thread
From: Alexis Ballier @ 2016-05-10 14:49 UTC (permalink / raw
To: gentoo-commits
commit: 0de5e788658811acc6496d7274faf643f2f3e61d
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue May 10 14:49:29 2016 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue May 10 14:49:38 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0de5e788
dev-util/wstool: bump to 0.1.13
Package-Manager: portage-2.2.28
dev-util/wstool/Manifest | 1 +
dev-util/wstool/files/prefix2.patch | 26 ++++++++++++++++++++++
.../{wstool-9999.ebuild => wstool-0.1.13.ebuild} | 2 +-
dev-util/wstool/wstool-9999.ebuild | 2 +-
4 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/dev-util/wstool/Manifest b/dev-util/wstool/Manifest
index 312d718..144d310 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 0000000..934443f
--- /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-9999.ebuild b/dev-util/wstool/wstool-0.1.13.ebuild
similarity index 97%
copy from dev-util/wstool/wstool-9999.ebuild
copy to dev-util/wstool/wstool-0.1.13.ebuild
index d8ec14a..551f7c7 100644
--- a/dev-util/wstool/wstool-9999.ebuild
+++ b/dev-util/wstool/wstool-0.1.13.ebuild
@@ -45,7 +45,7 @@ DEPEND="${RDEPEND}
)
"
-PATCHES=( "${FILESDIR}/prefix.patch" )
+PATCHES=( "${FILESDIR}/prefix2.patch" )
DISTUTILS_IN_SOURCE_BUILD="yes"
python_test() {
diff --git a/dev-util/wstool/wstool-9999.ebuild b/dev-util/wstool/wstool-9999.ebuild
index d8ec14a..551f7c7 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() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/wstool/, dev-util/wstool/files/
@ 2019-12-29 8:53 David Seifert
0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2019-12-29 8:53 UTC (permalink / raw
To: gentoo-commits
commit: 87188c995cf9cfc793445e2c28e95c0c0f7821a8
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 29 08:53:05 2019 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Dec 29 08:53:05 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87188c99
dev-util/wstool: Remove old
Package-Manager: Portage-2.3.83, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>
dev-util/wstool/Manifest | 2 --
dev-util/wstool/files/prefix2.patch | 26 ---------------
dev-util/wstool/wstool-0.1.13.ebuild | 62 ------------------------------------
dev-util/wstool/wstool-0.1.17.ebuild | 62 ------------------------------------
4 files changed, 152 deletions(-)
diff --git a/dev-util/wstool/Manifest b/dev-util/wstool/Manifest
index 235a4850546..e04952ad72f 100644
--- a/dev-util/wstool/Manifest
+++ b/dev-util/wstool/Manifest
@@ -1,3 +1 @@
-DIST wstool-0.1.13.tar.gz 75188 BLAKE2B 6a34aa04e4a076a75dacf24faf789d5295f6ad9afbbdddae480d8cdd11db63940faeca2c5936a2432aeccae5274e2e9e4e824f303460fe96f95c0d17abeeb9c1 SHA512 4d54f78ca044d31d927de1c3387536d0447ece77672c555845adf54e47f07adb67e6e9c866bc2719aae468aeeb26c900b3784e0ec7cf014c8118e841a92dca14
-DIST wstool-0.1.17.tar.gz 76168 BLAKE2B 4862df0ff16a5102e42d3ed683dbd9e8eb432aaf44f6e641fba6bb6f5d962645685b0fc9ca11f3c8adbe15dbef33086b93e3f9136073f7f181b5da37522e28fa SHA512 13533354a40723137baadc125425a2ec3d6a441da4870f04a9e17c53509ee4d3dc27df1a59edc2c3985a05fbd66a045539e9814f73509ee527fb763f8a804626
DIST wstool-0.1.18.tar.gz 80595 BLAKE2B ed90fc5c63ab5d775dfb49ddacc6da6e285aeb5078cf471c0d504659a9e322fde27797e4d05fd56dff4b9958558200cf05e46cf7ae71fd1231ab63048e668808 SHA512 fda9c679183c605048ed024a57b07fd2d9b644978a3e4ff89c3716b74d8e4ba0124779bcdf88a75fdbbf47c765b7ab63db7c84a55a6e1744fc6f955649590c48
diff --git a/dev-util/wstool/files/prefix2.patch b/dev-util/wstool/files/prefix2.patch
deleted file mode 100644
index 934443f9870..00000000000
--- a/dev-util/wstool/files/prefix2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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
deleted file mode 100644
index 30a7bd56fa0..00000000000
--- a/dev-util/wstool/wstool-0.1.13.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-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
- https://github.com/vcstools/wstool/archive/${PV}.tar.gz -> ${P}.tar.gz
- "
- KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( 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-0.1.17.ebuild b/dev-util/wstool/wstool-0.1.17.ebuild
deleted file mode 100644
index 44cd350a809..00000000000
--- a/dev-util/wstool/wstool-0.1.17.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-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
- https://github.com/vcstools/wstool/archive/${PV}.tar.gz -> ${P}.tar.gz
- "
- KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( 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
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-12-29 8:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-10 14:49 [gentoo-commits] repo/gentoo:master commit in: dev-util/wstool/, dev-util/wstool/files/ Alexis Ballier
-- strict thread matches above, loose matches on Subject: below --
2019-12-29 8:53 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox