Merge branch 'master' of ssh://projects.parabolagnulinux.org:1863/srv/git/abslibre

6 files changed, 65 insertions, 43 deletions

diff --git a/pcr/android-udev/PKGBUILD b/pcr/android-udev/PKGBUILD
deleted file mode 100644
index 000953e1f..000000000
--- a/pcr/android-udev/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Maintainer (AUR): M0Rf30 
-# Contributor (Arch): marlock
-
-pkgname=android-udev
-pkgver=20130911
-_gitver=8dfd1cd0002d7067d24a2ef89360212f164f3856
-url="https://github.com/M0Rf30/android-udev-rules"
-pkgdesc='Udev rules to for Android devices.'
-
-# The author is the maintainer of the AUR package, where it is listed as GPL;
-# this is the best hint to the license that we have.
-license=('GPL')
-
-pkgrel=1
-arch=('any')
-source=("51-android-$pkgver.rules::https://raw.github.com/M0Rf30/android-udev-rules/$_gitver/51-android.rules")
-depends=('systemd' 'libmtp')
-install='android-udev.install'
-
-package() {
-  cd "$srcdir"
-  install -Dm755 "$srcdir"/51-android-$pkgver.rules "$pkgdir"/usr/lib/udev/rules.d/51-android.rules
-}
-
-md5sums=('1b2033fcf52b1b0ffa807ba90b11fd14')
diff --git a/pcr/android-udev/android-udev.install b/pcr/android-udev/android-udev.install
deleted file mode 100644
index dcb1ebc20..000000000
--- a/pcr/android-udev/android-udev.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    post_upgrade
-    echo "NOTE: To use adb as a normal user you have to add yourself to the adbusers group"
-}
-
-post_upgrade() {
-    { getent group adbusers || /usr/sbin/groupadd adbusers; } &>/dev/null
-}
-
-post_remove() {
-    getent group adbusers &>/dev/null && /usr/sbin/groupdel adbusers
-}
diff --git a/pcr/conkeror/PKGBUILD b/pcr/conkeror/PKGBUILD
new file mode 100644
index 000000000..e914cd153
--- /dev/null
+++ b/pcr/conkeror/PKGBUILD
@@ -0,0 +1,46 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (AUR): Ivy Foster <joyfulgirl@archlinux.us>
+# Maintainer (AUR): Stefan Husmann <stefan-husmann@t-online.de>
+# Contributor (AUR): Heeru Kiyura <M8R-p9i5nh@mailinator.com>
+
+pkgname=conkeror
+pkgver=1.0pre.git140428.1.git25
+_gitver='commit=c5e640d874c65762c082430b42207bcafb58fda6'
+pkgrel=1
+pkgdesc="A highly programmable web browser based on Mozilla XULRunner."
+arch=('i686' 'x86_64')
+url="http://conkeror.org/"
+license=('MPL1.1' 'GPL2' 'LGPL2.1')
+depends=('xulrunner' 'desktop-file-utils')
+install=conkeror.install
+
+source=("https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"
+        'conkeror.sh')
+md5sums=('a59ddc563eb8de7e8be6465aa023102d'
+         '11c6c76a2639254754b34a542f1965a1')
+
+mkdepends=('git')
+mksource=("$pkgname-$pkgver::git://repo.or.cz/conkeror.git#${_gitver}")
+mkmd5sums=('SKIP')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  install -d "$pkgdir"/usr/{bin,share/{man/man1,applications}}
+
+  cp -a . "$pkgdir"/usr/share/$pkgname
+
+  ln -srT "$pkgdir"/usr/share/$pkgname/contrib/man/conkeror.1 \
+          "$pkgdir"/usr/share/man/man1/$pkgname.1
+  ln -srT "$pkgdir"/usr/share/$pkgname/debian/conkeror.desktop \
+          "$pkgdir"/usr/share/applications/$pkgname.desktop
+  ln -srT "$pkgdir"/usr/share/$pkgname/conkeror-spawn-helper \
+          "$pkgdir"/usr/bin/conkeror-spawn-helper
+
+  install -Dm755 "$srcdir"/conkeror.sh "$pkgdir"/usr/bin/$pkgname
+}
diff --git a/pcr/conkeror/conkeror.install b/pcr/conkeror/conkeror.install
new file mode 100644
index 000000000..5e5cfef4d
--- /dev/null
+++ b/pcr/conkeror/conkeror.install
@@ -0,0 +1,11 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  update-desktop-database -q
+}
diff --git a/pcr/conkeror/conkeror.sh b/pcr/conkeror/conkeror.sh
new file mode 100644
index 000000000..963720513
--- /dev/null
+++ b/pcr/conkeror/conkeror.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec xulrunner /usr/share/conkeror/application.ini "$@"
diff --git a/pcr/nginx-passenger/PKGBUILD b/pcr/nginx-passenger/PKGBUILD
index f3c8dabbc..b2c47b0df 100644
--- a/pcr/nginx-passenger/PKGBUILD
+++ b/pcr/nginx-passenger/PKGBUILD
@@ -1,13 +1,14 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
 # Maintainer (AUR): Tom Richards <tom@tomrichards.net>
 # Maintainer (Arch): Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Maintainer (Arch): Sébastien Luttringer
 # Contributor (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor (Arch): Miroslaw Szot <mss@czlug.icis.pcz.pl>
+# Contributor (Arch): Daniel Micay <danielmicay@gmail.com>
 
 pkgname=nginx-passenger
-_nginxver=1.4.7
-_passengerver=4.0.38
+_nginxver=1.6.0
+_passengerver=4.0.41
 pkgver=$_nginxver.passenger.$_passengerver
 pkgrel=1
 pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server'
@@ -35,8 +36,8 @@ source=($url/download/nginx-$_nginxver.tar.gz
         passenger-$_passengerver.tar.gz::https://github.com/phusion/passenger/archive/release-$_passengerver.tar.gz
         service
         logrotate)
-md5sums=('aee151d298dcbfeb88b3f7dd3e7a4d17'
-         'ec6cb96a8f3d444540a54a3007143e2e'
+md5sums=('8efa354f1c3c2ccf434a50d3fbe82340'
+         'ce2b669c498457cf385d250eea43b055'
          'ce9a06bcaf66ec4a3c4eb59b636e0dfd'
          '3441ce77cdd1aab6f0ab7e212698a8a7')