libaccounts-glib 1.22, libaccounts-qt 1.14, signon-ui 0.17+15.10.20150810

kaccounts-integration/PKGBUILD

@@ -4,7 +4,7 @@ source ../kdeapps.conf
 
 pkgname=kaccounts-integration
 pkgver=${_kdever}
-pkgrel=1
+pkgrel=2
 pkgdesc="Small system to administer web accounts for the sites and services across the KDE desktop, including: Google, Facebook, Owncloud, IMAP, Jabber and others"
 arch=('x86_64')
 url="https://projects.kde.org/projects/kdereview/kaccounts-integration"

kaccounts-providers/PKGBUILD

@@ -4,7 +4,7 @@ source ../kdeapps.conf
 
 pkgname=kaccounts-providers
 pkgver=${_kdever}
-pkgrel=1
+pkgrel=2
 pkgdesc="Small system to administer web accounts for the sites and services across the KDE desktop, including: Google, Facebook, Owncloud, IMAP, Jabber and others"
 arch=('x86_64')
 url="https://projects.kde.org/projects/playground/base/kde-accounts/kaccounts-providers"

libaccounts-glib/PKGBUILD

@@ -1,7 +1,8 @@
 # Contributors from Arch: https://www.archlinux.org/packages/extra/x86_64/libaccounts-glib/
 
 pkgname=libaccounts-glib
-pkgver=1.21
+pkgver=1.22
+_commit=8565136
 pkgrel=1
 pkgdesc="Glib-based client library for accessing the online accounts database"
 arch=('x86_64')
@@ -9,8 +10,8 @@ url="http://code.google.com/p/accounts-sso/"
 license=('LGPL')
 depends=('dbus-glib' 'libxml2' 'sqlite3')
 makedepends=('python2-gobject' 'docbook-xsl' 'gtk-doc')
-source=("https://gitlab.com/accounts-sso/libaccounts-glib/repository/archive.tar.gz?ref=VERSION_$pkgver")
-md5sums=('88184b9d613e04ae17b164019661d35d')
+source=("https://gitlab.com/accounts-sso/libaccounts-glib/repository/archive.tar.bz2?ref=$_commit")
+md5sums=('895a6f7bb14ddf44d2c358773ed3baa3')
 
 build() {
   cd $pkgname-*

libaccounts-qt/PKGBUILD

@@ -1,49 +1,32 @@
 # Contributors from Arch: https://www.archlinux.org/packages/extra/x86_64/libaccounts-qt4/
 
-pkgbase=libaccounts-qt
-pkgname=('libaccounts-qt4' 'libaccounts-qt5')
+pkgname='libaccounts-qt'
 pkgver=1.14
+_commit=a34ca4b
 pkgrel=1
+pkgdesc="Qt5-based client library for accessing the online accounts database"
 arch=('x86_64')
 url="http://code.google.com/p/accounts-sso/"
 license=('LGPL')
-makedepends=('qt' 'libaccounts-glib' 'doxygen' 'qt5-base')
+depends=('qt5-base' 'libaccounts-glib')
+makedepends=('doxygen')
+replaces=('libaccounts-qt5')
 options=('!docs' '!emptydirs')
-source=("https://gitlab.com/accounts-sso/libaccounts-qt/repository/archive.tar.bz2?ref=VERSION_$pkgver")
-sha1sums=('daa27223ed7bc7d47f761cbaa681b7dad9c99d6f')
+source=("https://gitlab.com/accounts-sso/libaccounts-qt/repository/archive.tar.bz2?ref=$_commit")
+sha1sums=('4cc4dd77888bbc31cb22e97523bfd749a4d01b78')
 
 prepare() {
-  mv $pkgbase-VERSION_$pkgver-* $pkgbase-$pkgver
-  
-  cd $pkgbase-$pkgver
+  cd $pkgname-*
   sed -i 's|SUBDIRS  += Accounts tests|SUBDIRS += Accounts|' accounts-qt.pro
-  cd ..
-
-  cp -a $pkgbase-$pkgver $pkgbase-$pkgver-qt4
 }
 
 build() {
-  cd ${srcdir}/$pkgbase-$pkgver
+  cd ${srcdir}/$pkgname-*
   qmake-qt5 PREFIX=/usr LIBDIR=/usr/lib
   make
-
-  cd ${srcdir}/$pkgbase-$pkgver-qt4
-  qmake PREFIX=/usr LIBDIR=/usr/lib
-  make
 }
 
-package_libaccounts-qt4() {
-  pkgdesc="Qt4-based client library for accessing the online accounts database"
-  depends=('qt' 'libaccounts-glib')
-
-  cd $pkgbase-$pkgver-qt4
-  make INSTALL_ROOT="$pkgdir" install
-}
-
-package_libaccounts-qt5() {
-  pkgdesc="Qt5-based client library for accessing the online accounts database"
-  depends=('qt5-base' 'libaccounts-glib')
-
-  cd $pkgbase-$pkgver
+package() {
+  cd $pkgbase-*
   make INSTALL_ROOT="$pkgdir" install
 }

signon-ui/PKGBUILD

@@ -1,15 +1,15 @@
 # Contributions from Arch: https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=packages/signon-ui
 
 pkgname=signon-ui
-pkgver=0.17+14.10.20140916
+pkgver=0.17+15.10.20150810
 pkgrel=1
 pkgdesc='UI component responsible for handling the user interactions which can happen during the login process of an online account'
 arch=(x86_64)
 url="https://launchpad.net/online-accounts-signon-ui"
 license=(GPL)
-depends=('libaccounts-qt5' 'qt5-webkit' 'signon' 'libnotify')
+depends=('libaccounts-qt' 'qt5-webkit' 'signon' 'libnotify')
 source=("http://archive.ubuntu.com/ubuntu/pool/main/s/$pkgname/${pkgname}_$pkgver.orig.tar.gz")
-md5sums=('1d38d956ad324d374cf5ef621eaa50b5')
+md5sums=('560ea77014d0418c4899984486839da8')
 
 prepare() {
   cd $pkgname-$pkgver

telepathy-accounts-signon/PKGBUILD

@@ -3,7 +3,7 @@
 
 pkgname=telepathy-accounts-signon
 pkgver=1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A mission control plugin for Telepathy, integrating with libaccounts and libsignon to provide IM accounts and authentication"
 arch=(i686 x86_64)
 url='https://gitlab.com/accounts-sso/telepathy-accounts-signon'