2 files changed, 32 insertions, 30 deletions
diff --git a/pcr/python-rospkg/PKGBUILD b/pcr/python-rospkg/PKGBUILD
new file mode 100644
index 000000000..b2dd7fb9d
--- /dev/null
+++ b/pcr/python-rospkg/PKGBUILD
@@ -0,0 +1,32 @@
+# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
+
+_pkgname=rospkg
+pkgname=(python{,2}-$_pkgname)
+pkgver=1.1.7
+pkgrel=1
+pkgdesc="ROS package library"
+arch=(any)
+url="http://wiki.ros.org/rospkg"
+license=('BSD3')
+
+makedepends=(python{,2}-setuptools)
+source=("https://files.pythonhosted.org/packages/source/r/rospkg/rospkg-${pkgver}.tar.gz")
+sha256sums=('c6e918e13a6a51b362fd07b9a298f64e4cb066ee1e6168ac95b690c0b609b2ab')
+
+prepare() {
+  cp -r "$srcdir"/$_pkgname-$pkgver "$srcdir"/$_pkgname-$pkgver-python2
+  mv    "$srcdir"/$_pkgname-$pkgver "$srcdir"/$_pkgname-$pkgver-python
+
+  cd "$srcdir"/$_pkgname-$pkgver-python2
+  find -type f -print0 | xargs -0 sed -i -e 's/#!\/usr\/bin\/env python/#!\/usr\/bin\/env python2/g'
+}
+
+_package() {
+  depends=($1)
+  cd "$srcdir"/$_pkgname-$pkgver-$1
+  $1 setup.py install --root="$pkgdir"
+}
+
+for _pkg in "${pkgname[@]}"; do
+  eval "package_$_pkg () { _package ${_pkg%%-*}; }"
+done
diff --git a/pcr/python2-rospkg/PKGBUILD b/pcr/python2-rospkg/PKGBUILD
deleted file mode 100644
index e2375003e..000000000
--- a/pcr/python2-rospkg/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Contributor (Arch): Lukas Linhart <bugs@almad.net>
-# Contributor (Arch): Changaco <changaco ατ changaco δοτ net>
-# Contributor (Arch): Nicolas Pouillard <nicolas.pouillard@gmail.com>
-# Contributor (Arch): Sean Greenslade <zootboysean@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=python2-rospkg
-pkgver=1.0.35
-pkgrel=2
-pkgdesc="ROS - provides basic utilities for querying information about ROS packages, stacks, and distributions."
-url="http://docs.ros.org/independent/api/rospkg/html/"
-arch=('any')
-license=('BSD3')
-depends=('python2')
-makedepends=('python2-distribute')
-conflicts=()
-replaces=()
-backup=()
-source=("https://pypi.python.org/packages/source/r/rospkg/rospkg-${pkgver}.tar.gz")
-md5sums=('de31059c920121b691f7bbdf6973e8dc')
-
-build() {
-  cd ${srcdir}/rospkg-${pkgver}
-  find -type f -print0 | xargs -0 sed -i -e 's/#!\/usr\/bin\/env python/#!\/usr\/bin\/env python2/g'
-  python2 setup.py build
-}
-package() {
-  cd ${srcdir}/rospkg-${pkgver}
-  python2 setup.py install --optimize=1 --skip-build --prefix="/usr" --root="${pkgdir}"
-}