pcr/zeroinstall-injector: updated to 2.11 (currently unable to build)

2 files changed, 14 insertions, 41 deletions

diff --git a/pcr/zeroinstall-injector/PKGBUILD b/pcr/zeroinstall-injector/PKGBUILD
index ce9e072ee..9c25180a7 100644
--- a/pcr/zeroinstall-injector/PKGBUILD
+++ b/pcr/zeroinstall-injector/PKGBUILD
@@ -1,18 +1,23 @@
-# Maintainer:  Ben Darwin <bcdarwin at gmail>
-# Contributor: speps <speps at aur dot archlinux dot org>
-# Contributor: Anton Bazhenov <anton.bazhenov at gmail>
-# Contributor: Lone_Wolf <lonewolf@xs4all.nl>
+# Maintainer (AUR):  Tatsuyuki Ishi <ishitatsuyuki at gmail>
+# Contributor (AUR): Ben Darwin <bcdarwin at gmail>
+# Contributor (AUR): speps <speps at aur dot archlinux dot org>
+# Contributor (AUR): Anton Bazhenov <anton.bazhenov at gmail>
+# Contributor (AUR): Lone_Wolf <lonewolf@xs4all.nl>
+
+# parabola changes and rationale:
+#  - added missing makedepends: ocamlbuild ocaml-findlib
 
 pkgname=zeroinstall-injector
 _pkgname=0install
-pkgver=2.6.1
+pkgver=2.11
 pkgrel=1
 pkgdesc="A decentralised loosely-coupled secure installation system"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'armv7h')
 url="http://0install.net"
 license=('GPL2' 'LGPL')
 depends=('ocaml-curl' 'ocaml-extlib' 'ocaml-lwt'
          'ocaml-ounit' 'ocaml-xmlm' 'ocaml-yojson')
+makedepends=('ocamlbuild' 'ocaml-findlib')
 optdepends=('ocaml-lablgtk: provides GUI features'
             'ocaml-obus: for DBUS, packagekit, and NetworkManager integration'
             'xdg-utils: desktop integration'
@@ -20,12 +25,13 @@ optdepends=('ocaml-lablgtk: provides GUI features'
 install="$pkgname.install"
 source=("http://downloads.sourceforge.net/zero-install/$_pkgname/$pkgver/$_pkgname-$pkgver.tar.bz2"
         "http://downloads.sourceforge.net/zero-install/$_pkgname/$pkgver/$_pkgname-$pkgver.tar.bz2.sig")
-sha256sums=('7f691924616c1f7154ac53f4904b63e9a801f4ee3e470f9d641d39fc94e274a2'
+sha256sums=('194b675c48556a3b9aee6b4a2478a521fafa66c0d871ef64349dc3baede28006'
             'SKIP')
+validpgpkeys=('5DD58D70899C454A966D6A5175133C8F94F6E0CC')
 
 build() {
   cd $_pkgname-$pkgver
-  make || return 1
+  make
 }
 
 package() {
diff --git a/pcr/zeroinstall-injector/PKGBUILD1 b/pcr/zeroinstall-injector/PKGBUILD1
deleted file mode 100644
index c3584cbe7..000000000
--- a/pcr/zeroinstall-injector/PKGBUILD1
+++ /dev/null
@@ -1,33 +0,0 @@
-# Contributor (Arch)     : Ben Darwin <bcdarwin at gmail>
-# Contributor (Arch)     : speps <speps at aur dot archlinux dot org>
-# Contributor (Arch)     : Anton Bazhenov <anton.bazhenov at gmail>
-# Contributor (Arch)     : Lone_Wolf <lonewolf@xs4all.nl>
-# Maintainer  (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp>
-
-pkgname=zeroinstall-injector
-_pkgname=0install
-pkgver=2.7
-pkgrel=0
-pkgdesc="A decentralised loosely-coupled secure installation system"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://0install.net"
-license=('GPL2' 'LGPL')
-depends=('gringo' 'clasp' 'opam' 'aspcud' 'ocaml' 'ocaml-curl' 'ocaml-extlib' 'ocaml-lwt' 'ocaml-biniou'
-         'ocaml-ounit' 'ocaml-xmlm' 'ocaml-yojson' 'ocaml-findlib')
-optdepends=('ocaml-lablgtk: provides GUI features'
-            'ocaml-obus: for DBUS, packagekit, and NetworkManager integration'
-            'xdg-utils: desktop integration'
-            'packagekit: packagekit integration')
-install="$pkgname.install"
-source=("http://kent.dl.sourceforge.net/project/zero-install/$_pkgname/2.7/$_pkgname-2.7.tar.bz2"
-        "http://kent.dl.sourceforge.net/project/zero-install/$_pkgname/2.7/$_pkgname-2.7.tar.bz2.sig")
-
-build() {
-  cd $_pkgname-$pkgver
-  make || return 1
-}
-
-package() {
-  cd $_pkgname-$pkgver
-  make DESTDIR="$pkgdir/" install_home
-}