Merge branch 'master' of vparabola:abslibre

2 files changed, 45 insertions, 7 deletions

diff --git a/pcr/python2-wstool/PKGBUILD b/pcr/python2-wstool/PKGBUILD
new file mode 100644
index 000000000..731f4ad61
--- /dev/null
+++ b/pcr/python2-wstool/PKGBUILD
@@ -0,0 +1,33 @@
+# Contributor (Arch)     : Georg Bremer <pkgbuild@dschoordsch.de>
+# Maintainer  (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp>
+
+pkgname='python2-wstool'
+pkgver=0.1.1
+pkgrel=1
+pkgdesc="wstool provides commands to manage several local SCM repositories (supports git, mercurial, subversion, bazaar) based on a single workspace definition file (.rosinstall)."
+arch=('any')
+url="http://ros.org/"
+license=('BSD')
+groups=()
+depends=('python2' 'python2-yaml' 'python2-vcstools')
+makedepends=('python2-setuptools')
+optdepends=()
+provides=('wstool')
+conflicts=('wstool')
+replaces=()
+backup=()
+options=()
+install=
+source=("http://download.ros.org/downloads/wstool/wstool-$pkgver.tar.gz")
+
+noextract=()
+
+build() {
+  echo ""
+}
+
+package() {
+    cd "$srcdir/wstool-$pkgver"
+    python2 setup.py install --root "$pkgdir"
+}
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/rosinstall/PKGBUILD b/pcr/rosinstall/PKGBUILD
index 0dcfeb95b..71077bc23 100644
--- a/pcr/rosinstall/PKGBUILD
+++ b/pcr/rosinstall/PKGBUILD
@@ -1,21 +1,26 @@
-# Contributor (Arch): Georg Bremer <pkgbuild@dschoordsch.de>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
+# Maintainer (Arch)     : Georg Bremer <pkgbuild@dschoordsch.de>
+# Maintainer (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp>
 
 pkgdesc='Tool to download/boostrap the ROS stack'
 url='http://www.ros.org/'
 
 pkgname='rosinstall'
-pkgver='0.6.20'
+pkgver='0.7.3'
 pkgrel='1'
 arch=('i686' 'x86_64')
 license=('BSD')
-depends=('python2' 'cmake' 'wget' 'vcstools'
-  'git' 'python2-distribute' 'python2-yaml')
-
-source=("http://pr.willowgarage.com/downloads/$pkgname/$pkgname-$pkgver.tar.gz")
+depends=('python2' 'cmake' 'wget' 'python2-vcstools'
+  'git' 'python2-distribute' 'python2-yaml' 'python2-wstool')
+optdepends=('python2-catkin_pkg: for roslocate'
+'python2-rosdistro: for roslocate')
+source=("http://download.ros.org/downloads/$pkgname/$pkgname-$pkgver.tar.gz")
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   sed -i 's/env python /env python2 /' src/rosinstall/setupfiles.py
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   python2 setup.py install --root=$pkgdir --optimize=1
 }