Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	extra/libchewing/PKGBUILD
	extra/ntfs-3g_ntfsprogs/PKGBUILD
	extra/scim-chewing/PKGBUILD

10 files changed, 89 insertions, 41 deletions

diff --git a/extra/cairo/PKGBUILD b/extra/cairo/PKGBUILD
index f805e9727..657e7e20f 100644
--- a/extra/cairo/PKGBUILD
+++ b/extra/cairo/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 175889 2013-01-23 11:37:31Z jgc $
+# $Id: PKGBUILD 176849 2013-02-01 14:30:42Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Brice Carpentier <brice@daknet.org>
 
 pkgname=cairo
-pkgver=1.12.10
-pkgrel=2
+pkgver=1.12.12
+pkgrel=1
 pkgdesc="Cairo vector graphics library"
 arch=(i686 x86_64 'mips64el')
 license=('LGPL' 'MPL')
@@ -16,17 +16,11 @@ optdepends=('xcb-util: for XCB backend') # really needed?
 provides=('cairo-xcb')
 replaces=('cairo-xcb')
 options=('!libtool')
-source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz
-  	revert-xlib-map-to-image-requires-an-extents.patch
-  	revert-xlib-Simplify-source-creation-by-use-of-map-to-image.patch)
-sha1sums=('be06d5aaa272bbbd08380f71ca710d5612881493'
-          '8bc096dd16a885ad041cb2137a64757f32d1cc88'
-          'fd8ffd9aba3679c344e4f25494f199a51b0ae62c')
+source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz)
+sha1sums=('8e597874da5b861287893d87dd4ab32471e99c82')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -R -i ../revert-xlib-map-to-image-requires-an-extents.patch
-  patch -Np1 -R -i ../revert-xlib-Simplify-source-creation-by-use-of-map-to-image.patch
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
 	--localstatedir=/var \
diff --git a/extra/libchewing/PKGBUILD b/extra/libchewing/PKGBUILD
index 42d5fe830..9d850aa60 100644
--- a/extra/libchewing/PKGBUILD
+++ b/extra/libchewing/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 149033 2012-02-05 15:05:03Z bisson $
+# $Id: PKGBUILD 176851 2013-02-01 14:39:29Z bisson $
 # Contributor: damir <damir@archlinux.org>
 # Contributor: whisky <archlinux.cle(at)gmail.com>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=libchewing
-pkgver=0.3.3
-pkgrel=2.1
+pkgver=0.3.4
+pkgrel=1
 pkgdesc='Intelligent Zhuyin input method library for traditional Chinese'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://chewing.csie.net/'
 license=('GPL')
 options=('!libtool')
-source=("http://chewing.csie.net/download/libchewing/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('24ade7bbb0288f71588bb45831d7fc9d5137a4cb')
+source=("http://chewing.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('631a613df00409b51adebb8b2dc33c5e6a006834')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	./configure --prefix=/usr --enable-static=no
+	./configure --prefix=/usr --disable-static
 	make
 }
 
diff --git a/extra/ntfs-3g_ntfsprogs/PKGBUILD b/extra/ntfs-3g_ntfsprogs/PKGBUILD
index 1dc642329..f31eea6af 100644
--- a/extra/ntfs-3g_ntfsprogs/PKGBUILD
+++ b/extra/ntfs-3g_ntfsprogs/PKGBUILD
@@ -1,20 +1,19 @@
-# $Id: PKGBUILD 172190 2012-12-01 14:32:58Z dreisner $
+# $Id: PKGBUILD 176861 2013-02-01 21:35:19Z eric $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Thomas Bächler <thomas.archlinux.org>
 
 pkgbase=ntfs-3g_ntfsprogs
 pkgname=('ntfs-3g' 'ntfsprogs')
-pkgver=2012.1.15
-pkgrel=4
-url="http://www.tuxera.com"
+pkgver=2013.1.13
+pkgrel=1
+url="http://www.tuxera.com/community/ntfs-3g-download/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 depends=('glibc' 'fuse')
-makedepends=('pkgconfig')
 options=('!libtool')
 source=(http://tuxera.com/opensource/$pkgbase-$pkgver.tgz)
-sha1sums=('8d55cf49afde172fefa369a0a85289e09c4d7bbb')
+sha1sums=('8c12b7644d90ae9fb8d0aca0d7ebd5f8fac2c818')
 
 build() {
   cd "$srcdir/$pkgbase-$pkgver"
diff --git a/extra/phonon-gstreamer/PKGBUILD b/extra/phonon-gstreamer/PKGBUILD
index 05becae9e..ab60683cb 100644
--- a/extra/phonon-gstreamer/PKGBUILD
+++ b/extra/phonon-gstreamer/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 165217 2012-08-13 13:16:45Z andrea $
+# $Id: PKGBUILD 176838 2013-02-01 08:12:28Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=phonon-gstreamer
-pkgver=4.6.2
+pkgver=4.6.3
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://phonon.kde.org/'
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4' 'phonon' 'mesa')
 provides=('phonon-backend')
 install="${pkgname}.install"
 source=("http://download.kde.org/stable/phonon/phonon-backend-gstreamer/${pkgver}/src/phonon-backend-gstreamer-${pkgver}.tar.xz")
-md5sums=('8c08875d10952bc5685bcec8de3acb2d')
+md5sums=('d7b0b6245f380347c52c09033a814931')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/pkgfile/PKGBUILD b/extra/pkgfile/PKGBUILD
new file mode 100644
index 000000000..7f9907165
--- /dev/null
+++ b/extra/pkgfile/PKGBUILD
@@ -0,0 +1,37 @@
+# $Id: PKGBUILD 176818 2013-02-01 01:25:21Z dreisner $
+# Maintainer: Dave Reisner <dreisner@archlinux.org>
+
+pkgname=pkgfile
+pkgver=8
+pkgrel=1
+pkgdesc="a pacman .files metadata explorer"
+arch=('i686' 'x86_64')
+url="http://github.com/falconindy/pkgfile"
+license=('MIT')
+depends=('libarchive' 'curl' 'pcre' 'pacman')
+conflicts=('pkgtools<24-2')
+source=("http://code.falconindy.com/archive/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig})
+install=pkgfile.install
+md5sums=('772d02872ddf112c5e24d6ad40e5623d'
+         '712c546c0291975e646a1d2170034e10')
+
+options=(!strip)
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  ./configure
+  make
+
+  # generate a license file
+  sed '/\*\//q' src/pkgfile.c >LICENSE
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim: ft=sh syn=sh
diff --git a/extra/pkgfile/pkgfile.install b/extra/pkgfile/pkgfile.install
new file mode 100644
index 000000000..5545a3d39
--- /dev/null
+++ b/extra/pkgfile/pkgfile.install
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+post_install() {
+  printf "==> Run 'pkgfile --update' to initialize the database\n"
+}
+
+post_remove() {
+  # the cache dir might not be removed, notify the user
+  if [ -d var/cache/pkgfile ]; then
+    printf "==> /var/cache/pkgfile has not been removed\n"
+  fi
+}
+
+post_upgrade() {
+  if [ "$(vercmp 5 "$2")" -eq 1 ]; then
+    printf "==> DB format has changed. Please run pkgfile -uu\n"
+  fi
+}
diff --git a/extra/racket/PKGBUILD b/extra/racket/PKGBUILD
index 2c9ccd486..8d4a5f91d 100644
--- a/extra/racket/PKGBUILD
+++ b/extra/racket/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 170577 2012-11-09 03:34:54Z eric $
+# $Id: PKGBUILD 176859 2013-02-01 18:49:56Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=racket
-pkgver=5.3.1
+pkgver=5.3.2
 pkgrel=1
 pkgdesc="A programming language environment (formerly known as PLT Scheme) suitable for tasks ranging from scripting to application development"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://racket-lang.org/"
 license=('LGPL')
 depends=('gtk2' 'desktop-file-utils')
-makedepends=('gsfonts')
+makedepends=('gsfonts' 'sqlite')
 options=('!libtool' '!strip')
 install=racket.install
 source=(http://download.racket-lang.org/installers/${pkgver}/racket/${pkgname}-${pkgver}-src-unix.tgz \
         drracket.desktop)
-sha1sums=('5aa74a2eafd44a521c27c34f4b4264670f1bf571'
+sha1sums=('bd6b1a31d3a94bc8253709f7ca1c81bcb2e23495'
           'a20808f6b250225704856f82a544681a962a299d')
 
 build() {
diff --git a/extra/scim-chewing/PKGBUILD b/extra/scim-chewing/PKGBUILD
index be143ae81..c3cdb0257 100644
--- a/extra/scim-chewing/PKGBUILD
+++ b/extra/scim-chewing/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 149044 2012-02-05 15:19:54Z bisson $
+# $Id: PKGBUILD 176853 2013-02-01 14:44:22Z bisson $
 # Contributor: damir <damir@archlinux.org>
 # Contributor: whisky <archlinux.cle(at)gmail.com>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=scim-chewing
-pkgver=0.3.4
-pkgrel=3
+pkgver=0.3.5
+pkgrel=1
 pkgdesc='Traditional Chinese input method module for SCIM'
 url='http://chewing.csie.net/'
 license=('GPL')
@@ -13,8 +13,8 @@ options=('!libtool')
 arch=('i686' 'x86_64' 'mips64el')
 makedepends=('intltool')
 depends=('scim' 'libchewing')
-source=("https://github.com/downloads/chewing/scim-chewing/scim-chewing-${pkgver}.tar.bz2")
-sha1sums=('f6c8d16f19f17449ee169f1ca787350353e93b05')
+source=("http://chewing.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('f26ced990f0c9e5d43e271cd6e77583de81a008d')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/testdisk/PKGBUILD b/extra/testdisk/PKGBUILD
index ab41368ca..93d4df898 100644
--- a/extra/testdisk/PKGBUILD
+++ b/extra/testdisk/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 170219 2012-11-05 14:04:00Z tpowa $
+# $Id: PKGBUILD 176860 2013-02-01 21:35:19Z eric $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Michal Krenek <mikos@sg1.cz>
 
 pkgname=testdisk
 pkgver=6.13
-pkgrel=3
+pkgrel=4
 pkgdesc="Checks and undeletes partitions + PhotoRec, signature based recovery tool"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.cgsecurity.org/index.html?testdisk.html"
diff --git a/extra/xf86-input-synaptics/PKGBUILD b/extra/xf86-input-synaptics/PKGBUILD
index c9bd84516..499c669a5 100644
--- a/extra/xf86-input-synaptics/PKGBUILD
+++ b/extra/xf86-input-synaptics/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 174734 2013-01-05 13:53:36Z andyrtr $
+# $Id: PKGBUILD 176855 2013-02-01 15:31:40Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tobias Powalowski  <tpowa@archlinux.org>
 # Contributor: Thomas Bächler <thomas@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xf86-input-synaptics
-pkgver=1.6.2
-pkgrel=4
+pkgver=1.6.3
+pkgrel=1
 pkgdesc="Synaptics driver for notebook touchpads"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
@@ -22,7 +22,7 @@ options=(!libtool)
 backup=('etc/X11/xorg.conf.d/50-synaptics.conf')
 source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
         add_tapbuttons.diff)
-sha256sums=('c3f7d6a085d480c352f030aeb43db2e5560d1468ed34be24d44a0fc3fda25920'
+sha256sums=('b40c9dbd5f743ff1eb2ac81a23b9676df72e76ed3fa6408de3f8a3a260248604'
             '5298d3e871db3768b34cf8516d3f53f9291202e2ea5de3300256e1cd9119a1ec')
 
 build() {