Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-staging/mythtv/PKGBUILD
	community-staging/mythtv/mythbackend.rc
	community-staging/mythtv/mythtv.install
	community/sigil/PKGBUILD
	extra/pixman/PKGBUILD
	staging/vlc/PKGBUILD

11 files changed, 78 insertions, 44 deletions

diff --git a/community/calcurse/PKGBUILD b/community/calcurse/PKGBUILD
index 018868c1c..8f6eaa35d 100644
--- a/community/calcurse/PKGBUILD
+++ b/community/calcurse/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD 64641 2012-02-17 13:26:11Z lfleischer $
+# $Id: PKGBUILD 73083 2012-06-30 14:19:55Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 # Contributor: wain <wain.at.gmx.net>
 
 pkgname=calcurse
-pkgver=2.9.2
-pkgrel=2
+pkgver=3.0.0
+pkgrel=1
 pkgdesc='A text-based personal organizer.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://calcurse.org/'
 license=('BSD')
 depends=('ncurses')
+install='calcurse.install'
 source=("http://calcurse.org/files/${pkgname}-${pkgver}.tar.gz")
-md5sums=('5cb7d9c9edddc551fc62c9c5733591c5')
+md5sums=('3e25d04afeecd8f21e064e8b1db8f02b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/calcurse/calcurse.install b/community/calcurse/calcurse.install
new file mode 100644
index 000000000..7ed9cf00e
--- /dev/null
+++ b/community/calcurse/calcurse.install
@@ -0,0 +1,8 @@
+post_upgrade() {
+  if (( $(vercmp $2 3.0.0) < 0 )); then
+    cat <<"EOF"
+==> The configuration file format has changed in calcurse 3.0.0.
+==> Run `calcurse-upgrade` to upgrade your configuration files.
+EOF
+  fi
+}
diff --git a/community/mythplugins/PKGBUILD b/community/mythplugins/PKGBUILD
index 984be7fad..c894be499 100644
--- a/community/mythplugins/PKGBUILD
+++ b/community/mythplugins/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 70479 2012-05-09 10:48:34Z jconder $
+# $Id: PKGBUILD 73073 2012-06-30 11:15:54Z jconder $
 # Maintainer: Jonathan Conder <jonno.conder@gmail.com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
@@ -13,8 +13,8 @@ pkgname=('mythplugins-mytharchive'
          'mythplugins-mythweather'
          'mythplugins-mythweb'
          'mythplugins-mythzoneminder')
-pkgver=0.25
-pkgrel=3
+pkgver=0.25.1
+pkgrel=1
 epoch=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.mythtv.org"
@@ -27,7 +27,7 @@ makedepends=('cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'flac' 'libexif'
 source=("ftp://ftp.osuosl.org/pub/mythtv/$pkgbase-$pkgver.tar.bz2"
         'php54.patch'
         'mtd.rc')
-md5sums=('b3f2768372a38e92ca94841519daa05e'
+md5sums=('5957fd42181f78f18c8a1fd819c9699c'
          '7a114c1b5a84ab5ee190e63cc9514086'
          '476c12ba074794ad7f4ae092bdf949d6')
 
diff --git a/community/mythtv/PKGBUILD b/community/mythtv/PKGBUILD
index 824e33225..e52fc70cd 100644
--- a/community/mythtv/PKGBUILD
+++ b/community/mythtv/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 69571 2012-04-19 02:21:24Z jconder $
+# $Id: PKGBUILD 73064 2012-06-30 06:07:26Z jconder $
 # Maintainer: Jonathan Conder <jonno.conder@gmail.com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
@@ -6,8 +6,8 @@
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=mythtv
-pkgver=0.25
-pkgrel=3
+pkgver=0.25.1
+pkgrel=1
 epoch=1
 pkgdesc="A Homebrew PVR project"
 arch=('i686' 'x86_64')
@@ -29,19 +29,19 @@ replaces=('myththemes' 'mythplugins-mythvideo')
 backup=('etc/conf.d/mythbackend')
 install='mythtv.install'
 source=("ftp://ftp.osuosl.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2"
-        'mythtv_0.25_gcc_4.7.patch'
         'mythbackend.rc'
-        'mythbackend.conf')
-md5sums=('e49c81de40e279c83dcb1b2aa9a45748'
-         '6090f5f22a8584db80b76cf19869ee41'
-         '62fd98347c56b1d9b795792f83269d25'
-         'ab962d83614cbd0ac11ce3fcc929829d')
+        'mythbackend.conf'
+	'mythbackend.service')
+md5sums=('4d6375cc3a820abdb2ac5300734687ac'
+         'c8f935d42fb8617e9279bd539811ca5f'
+         'ab962d83614cbd0ac11ce3fcc929829d'
+	 '813008d14a44e9c6212f364723aeaa74')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   find 'bindings/python' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
 
-  patch -Np1 -i "$srcdir/mythtv_0.25_gcc_4.7.patch"
+  sed -re 's@Key, &@Key, @' -i 'bindings/php/MythBase.php'
 
   ARCH="${CARCH/_/-}"
   ./configure --prefix=/usr \
@@ -64,6 +64,7 @@ package() {
 
   install -D -m755 "$srcdir/mythbackend.rc" "$pkgdir/etc/rc.d/mythbackend"
   install -D -m644 "$srcdir/mythbackend.conf" "$pkgdir/etc/conf.d/mythbackend"
+  install -D -m644 "$srcdir/mythbackend.service" "$pkgdir/usr/lib/systemd/system/mythbackend.service"
   install -D -m644 'database/mc.sql' "$pkgdir/usr/share/mythtv/mc.sql"
 
   mkdir -p "$pkgdir/usr/share/mythtv"
diff --git a/community/mythtv/mythbackend.rc b/community/mythtv/mythbackend.rc
index 2b3c2d52e..488b4cb8e 100644
--- a/community/mythtv/mythbackend.rc
+++ b/community/mythtv/mythbackend.rc
@@ -8,7 +8,7 @@
 # Default values to use if none are supplied in the config file.
 #
 # User who should start the mythbackend process
-MBE_USER='root'
+MBE_USER='mythtv'
 
 # Startup options for mythbackend
 MBE_OPTS=''
diff --git a/community/mythtv/mythbackend.service b/community/mythtv/mythbackend.service
new file mode 100644
index 000000000..9d92bd644
--- /dev/null
+++ b/community/mythtv/mythbackend.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=MythTV Backend
+After=network.target mysqld.service
+
+[Service]
+Type=simple
+Environment=HOME=/var/lib/mythtv
+User=mythtv
+ExecStart=/usr/bin/mythbackend --daemon --logpath /var/log/mythtv
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/mythtv/mythtv.install b/community/mythtv/mythtv.install
index c29a53454..eed25b868 100644
--- a/community/mythtv/mythtv.install
+++ b/community/mythtv/mythtv.install
@@ -1,11 +1,20 @@
-post_install() {
-   echo "See \"MythTV\" on the Archlinux Wiki for installation information - Extensive!!"
+post_upgrade() {
+	if ! getent passwd mythtv &>/dev/null; then
+		getent group mythtv &>/dev/null || groupadd -r mythtv >/dev/null
+		useradd -rmd /var/lib/mythtv -g mythtv -G video,audio,optical -s /bin/bash mythtv >/dev/null
+	fi
 }
 
-post_upgrade() {
-	return
+post_install() {
+	echo -e "For installation information, visit:\nhttps://wiki.archlinux.org/index.php/MythTV"
+
+	post_upgrade
 }
 
 post_remove() {
-   echo -e "NOTE: mysql database was not removed. To remove run:\nmysql -u root -e 'drop database mythconverg;'"
+	echo -e "The MythTV database was not removed. To remove it, run:\n  mysql -u root -e 'drop database mythconverg;'"
+	[ -d var/lib/mythtv ] && echo "The MythTV home directory /var/lib/mythtv can also be removed."
+
+	getent passwd mythtv &>/dev/null && userdel mythtv >/dev/null
+	getent group mythtv &>/dev/null && groupdel mythtv >/dev/null
 }
diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD
index bfdd93dae..36f40c85d 100644
--- a/community/nodejs/PKGBUILD
+++ b/community/nodejs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 72985 2012-06-26 13:36:13Z bpiotrowski $
+# $Id: PKGBUILD 73072 2012-06-30 08:03:14Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: James Campos <james.r.campos@gmail.com>
@@ -8,7 +8,7 @@
 # Contributor: TIanyi Cui <tianyicui@gmail.com>
 
 pkgname=nodejs
-pkgver=0.8.0
+pkgver=0.8.1
 pkgrel=1
 pkgdesc='Evented I/O for V8 javascript'
 arch=('i686' 'x86_64' 'mips64el')
@@ -19,7 +19,7 @@ checkdepends=('curl') # curl used for check()
 optdepends=('openssl: TLS support')
 options=('!emptydirs')
 source=("http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz")
-md5sums=('7efde00ad3292d4c56ad607ab676d935')
+md5sums=('32a6f7b7cf196cb89bd973741ae58dd1')
 
 build() {
   cd node-v${pkgver}
diff --git a/community/pcsc-tools/PKGBUILD b/community/pcsc-tools/PKGBUILD
index 510ffeff2..1f6508a5d 100644
--- a/community/pcsc-tools/PKGBUILD
+++ b/community/pcsc-tools/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 61978 2012-01-12 11:22:03Z giovanni $
+# $Id: PKGBUILD 73087 2012-06-30 14:26:59Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Lorenzo Nizzi Grifi Gargiolli <lorenzo.nizzi.grifi@gmail.com>
 # Contributor: marc0s <marc0s@fsfe.org>
 
 pkgname=pcsc-tools
-pkgver=1.4.18
+pkgver=1.4.20
 pkgrel=1
 pkgdesc="PC/SC Architecture smartcard tools"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ license=('GPL')
 depends=('pcsclite' 'pcsc-perl' 'gtk2-perl' 'glib-perl')
 makedepends=('pkg-config')
 source=("http://ludovic.rousseau.free.fr/softwares/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('647ec2779cec69c910906fe5496f4e6c')
+md5sums=('c85f8b983e4b9a9dcd373725f024c6b8')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/pcsclite/PKGBUILD b/community/pcsclite/PKGBUILD
index 3f4e3b813..92b2d78c2 100644
--- a/community/pcsclite/PKGBUILD
+++ b/community/pcsclite/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 71730 2012-06-02 00:19:22Z giovanni $
+# $Id: PKGBUILD 73085 2012-06-30 14:21:47Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com>
 
 pkgname=pcsclite
-pkgver=1.8.3
-pkgrel=4
+pkgver=1.8.4
+pkgrel=1
 pkgdesc="PC/SC Architecture smartcard middleware library"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://alioth.debian.org/projects/pcsclite/"
@@ -12,9 +12,9 @@ license=('BSD')
 depends=('python2' 'systemd-tools')
 makedepends=('pkg-config')
 options=('!libtool' '!docs')
-source=("https://alioth.debian.org/frs/download.php/3706/pcsc-lite-${pkgver}.tar.bz2"
+source=("https://alioth.debian.org/frs/download.php/3734/pcsc-lite-${pkgver}.tar.bz2"
         'pcscd')
-md5sums=('7ad8c97c89f77aab7a00317eb7e811e9'
+md5sums=('3ef6b569128b15969adba25d80ced8d0'
          'c97b6bce695222efb0f003d8e8369010')
 
 build() {
diff --git a/community/sigil/PKGBUILD b/community/sigil/PKGBUILD
index 20903dd54..c912d1a35 100644
--- a/community/sigil/PKGBUILD
+++ b/community/sigil/PKGBUILD
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD 66696 2012-02-27 15:03:06Z giovanni $
+# $Id: PKGBUILD 73075 2012-06-30 11:58:09Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com>
 
 pkgname=sigil
-pkgver=0.5.3
+pkgver=0.5.902
 pkgrel=1
-pkgdesc="A WYSIWYG ebook editor"
+pkgdesc="WYSIWYG ebook editor"
 arch=('i686' 'x86_64' 'mips64el') 
 url="http://code.google.com/p/sigil/"
 license=('GPL3')
 depends=('qtwebkit')
-makedepends=('cmake')
+makedepends=('cmake' 'gendesk')
 install=sigil.install
-source=("http://sigil.googlecode.com/files/Sigil-${pkgver}-Code.zip"
-        "${pkgname}.desktop")
-md5sums=('83c1a5608a2ec59a83c86ccc1429b5cc'
-         'fef6aa492af487ccccd6b133635cee5a')
+source=("http://sigil.googlecode.com/files/Sigil-${pkgver}-Code.zip")
+md5sums=('7e44ce266fc2539888edd0e1ee66b05d')
 
 build() {
   cd "${srcdir}"
+  gendesk -n
+
   mkdir build
   cd build
   cmake -G "Unix Makefiles" \
@@ -36,10 +36,13 @@ package() {
   make install DESTDIR="${pkgdir}"
 
   install -d -m 0755 "${pkgdir}"/usr/share/applications
-  install -m 0644 "${srcdir}"/${pkgname}.desktop "${pkgdir}"/usr/share/applications
+  install -m 0644 "${srcdir}"/${pkgname}.desktop \
+    "${pkgdir}"/usr/share/applications
 
   for _pic in 16 32 48 128 256; do
     install -D -m 0644 ../src/Sigil/Resource_Files/icon/app_icon_${_pic}.png \
       "${pkgdir}"/usr/share/icons/hicolor/${_pic}x${_pic}/apps/${pkgname}.png
   done
+  install -Dm644 ../src/Sigil/Resource_Files/icon/app_icon_128.png \
+    "$pkgdir/usr/share/pixmaps/$pkgname.png"
 }