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

5 files changed, 79 insertions, 11 deletions

diff --git a/~lukeshu/maildirproc/PKGBUILD b/pcr/maildirproc/PKGBUILD
index bb98fa112..0e3becf75 100644
--- a/~lukeshu/maildirproc/PKGBUILD
+++ b/pcr/maildirproc/PKGBUILD
@@ -1,17 +1,21 @@
-# Maintainer: Mick Koch <kchmck@gmail.com>
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (AUR): Mick Koch <kchmck@gmail.com>
 
 pkgname="maildirproc"
 pkgver="0.5.0"
-pkgrel="2"
+pkgrel="3"
 pkgdesc="Sorts mail based on a Python configuration file"
 arch=("any")
 url="http://joel.rosdahl.net/maildirproc/"
-license=("GPL")
+license=("GPL") # GPLv2+
 depends=("python")
 source=("http://joel.rosdahl.net/maildirproc/releases/$pkgname-$pkgver.tar.bz2")
 md5sums=("eaa001f6cd1befee99528ca55da979ca")
 
-build() {
+package() {
   cd "$srcdir/$pkgname-$pkgver"
-  python setup.py install --prefix=/usr --root="$pkgdir" || return 1
+  python setup.py install --root="$pkgdir" --optimize=1
+
+  mkdir -p "$pkgdir"/usr/share/doc/$pkgname/
+  cp -r doc/* "$pkgdir"/usr/share/doc/$pkgname/
 }
diff --git a/pcr/owncloud-client/PKGBUILD b/pcr/owncloud-client/PKGBUILD
index 44c8fcaa9..ea808c1ef 100644
--- a/pcr/owncloud-client/PKGBUILD
+++ b/pcr/owncloud-client/PKGBUILD
@@ -22,7 +22,7 @@ pkgdesc="ownCloud client based on mirall"
 arch=('i686' 'x86_64')
 url="http://owncloud.org/"
 license=('GPL2')
-depends=('qt4' 'ocsync')
+depends=('qt4' 'ocsync' 'qtkeychain' 'qtwebkit')
 makedepends=('cmake')
 optdepends=('qtkeychain: safe password storage')
 provides=('mirall' 'owncloud-client')
@@ -30,7 +30,8 @@ conflicts=('mirall-git')
 install=owncloud-client.install
 backup=('etc/owncloud-client/sync-exclude.lst')
 source=("http://download.owncloud.com/download/${_name}-${pkgver}.tar.bz2")
-md5sums=('ee2e7bafc714399f2027fefed853f968')
+md5sums=('05a69082b4e940b4282c2b05344c143a')
+
 
 if [[ ! ${_buildtype} == "Release" ]] && [[ ! ${_buildtype} == "release" ]]; then
   options=(!strip)
@@ -58,4 +59,3 @@ package() {
   cd ${srcdir}/${_name}-${pkgver}-build
   make DESTDIR=${pkgdir} install
 }
-md5sums=('05a69082b4e940b4282c2b05344c143a')
diff --git a/pcr/qtkeychain/PKGBUILD b/pcr/qtkeychain/PKGBUILD
new file mode 100644
index 000000000..152971751
--- /dev/null
+++ b/pcr/qtkeychain/PKGBUILD
@@ -0,0 +1,48 @@
+# Maintainer: Kuba Serafinowski <zizzfizzix(at)gmail(dot)com>
+# Maintainer: Jorge Araya Navarro <shackra@riseup.net>
+# Contributor: Teo Mrnjavac <teo@kde.org>
+# https://github.com/zizzfizzix/pkgbuilds
+
+_buildtype="Release"
+
+pkgname=qtkeychain
+pkgver=0.1
+pkgrel=3
+pkgdesc="Provides support for secure credentials storage."
+arch=('i686' 'x86_64')
+url="https://github.com/frankosterfeld/qtkeychain"
+license=('BSD2')
+depends=('qt4')
+makedepends=('cmake')
+source=("${pkgname}-${pkgver}.zip::https://github.com/frankosterfeld/qtkeychain/archive/${pkgver}.zip" 'prefer-qt4.patch')
+md5sums=('a1d11a611b27759a531896b57be15947'
+         'a2c46e61af02100a6f67487ffeb8a3d0')
+
+if [[ ! ${_buildtype} == "Release" ]] && [[ ! ${_buildtype} == "release" ]]; then
+  options=(!strip)
+fi
+
+prepare() {
+    cd ${srcdir}/${pkgname}-${pkgver}
+    patch -Np1 -i ${srcdir}/prefer-qt4.patch
+
+    if [[ -e ${srcdir}/${pkgname}-${pkgver}-build ]]; then rm -rf ${srcdir}/${pkgname}-${pkgver}-build; fi
+    mkdir ${srcdir}/${pkgname}-${pkgver}-build
+}
+
+build() {
+    cd ${srcdir}/${pkgname}-${pkgver}-build
+    cmake -DBUILD_WITH_QT4=on \
+          -DCMAKE_INSTALL_PREFIX=/usr \
+          -DCMAKE_INSTALL_LIBDIR=lib \
+          -DCMAKE_INSTALL_LIBEXECDIR=lib/${pkgname} \
+          -DCMAKE_BUILD_TYPE=${_buildtype} \
+          ../${pkgname}-${pkgver}
+    make
+}
+
+package() {
+    cd ${srcdir}/${pkgname}-${pkgver}-build
+    make DESTDIR=${pkgdir} install
+    install -D -m644 ${srcdir}/${pkgname}-${pkgver}/COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}
diff --git a/pcr/qtkeychain/prefer-qt4.patch b/pcr/qtkeychain/prefer-qt4.patch
new file mode 100644
index 000000000..0e264aad1
--- /dev/null
+++ b/pcr/qtkeychain/prefer-qt4.patch
@@ -0,0 +1,17 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index aba9032..4de64c8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,8 +11,10 @@ set(QTKEYCHAIN_SOVERSION 0)
+ set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${PROJECT_SOURCE_DIR}/cmake/Modules")
+ include(GNUInstallDirs)
+ 
+-# try Qt5 first, and prefer that if found
+-find_package(Qt5Core QUIET)
++# try Qt5 first, and prefer that if found, unless BUILD_WITH_QT4 is set
++if (NOT BUILD_WITH_QT4)
++  find_package(Qt5Core QUIET)
++endif()
+ if (Qt5Core_FOUND)
+   if(UNIX AND NOT APPLE)
+     find_package(Qt5DBus REQUIRED)
diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD
index 4fa04466e..f30db0ed2 100644
--- a/pcr/youtube-dl-current/PKGBUILD
+++ b/pcr/youtube-dl-current/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=youtube-dl-current
 _pkgname=youtube-dl
 provides=(youtube-dl)
-pkgver=2013.09.06.1
+pkgver=2013.09.07
 pkgrel=1
 pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites"
 arch=('any')
@@ -28,6 +28,5 @@ package() {
   install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
 }
 
-
-md5sums=('3ec268b42605d985b1957fab1f13b8ee'
+md5sums=('0128368f02f404d8e15935c0b034f6a0'
          'SKIP')