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

Conflicts:
	community/clucene/PKGBUILD
	community/cuyo/PKGBUILD
	community/pinot/PKGBUILD
	extra/fontforge/PKGBUILD
	extra/gtkimageview/PKGBUILD
	extra/mkvtoolnix/PKGBUILD
	multilib-testing/lib32-glibc/PKGBUILD
	staging/qt/PKGBUILD
	testing/glibc/PKGBUILD

7 files changed, 58 insertions, 30 deletions

diff --git a/extra/acpid/PKGBUILD b/extra/acpid/PKGBUILD
index cee35d88c..8572d79b1 100644
--- a/extra/acpid/PKGBUILD
+++ b/extra/acpid/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 143248 2011-11-24 01:29:25Z eric $
+# $Id: PKGBUILD 145167 2011-12-18 19:59:26Z eric $
 # Maintainer:
 # Contributor: xduugu
 # Contributor: Manolis Tzanidakis
 # Contributor: Jonathan Schmidt <j.schmidt@archlinux.us
 
 pkgname=acpid
-pkgver=2.0.13
+pkgver=2.0.14
 pkgrel=1
 pkgdesc="A daemon for delivering ACPI power management events with netlink support"
 arch=('i686' 'x86_64' 'mips64el')
@@ -19,7 +19,7 @@ source=("http://www.tedfelix.com/linux/$pkgname-$pkgver.tar.gz"
         'anything'
         'handler.sh'
         'acpid.conf.d')
-md5sums=('5bbbb9a320192df1cdd8d0e9a0196379'
+md5sums=('14fc1eabc3489f3ded9347fcd55f158a'
          'd69203a032c4583f9abaafcf21a7ed84'
          '2d37b98d6e74bab815604b8b48c6cfd4'
          'd411b758e8531adee191b66bcbc2892d'
diff --git a/extra/fontforge/PKGBUILD b/extra/fontforge/PKGBUILD
index 55401aa90..8f6b8da88 100644
--- a/extra/fontforge/PKGBUILD
+++ b/extra/fontforge/PKGBUILD
@@ -1,24 +1,25 @@
-# $Id: PKGBUILD 124359 2011-05-20 08:42:23Z bisson $
+# $Id: PKGBUILD 145161 2011-12-18 12:09:19Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=fontforge
-pkgver=20110222
+pkgver=20111214
 pkgrel=2
 pkgdesc='Outline and bitmap font editor'
 arch=('i686' 'x86_64' 'mips64el')
-url='http://fontforge.sourceforge.net'
+url='http://fontforge.sourceforge.net/'
 license=('BSD')
-depends=('libxkbui' 'libxi' 'libxml2' 'pango' 'giflib' 'libtiff' 'python2')
+depends=('libxkbui' 'libxi' 'libxml2' 'pango' 'giflib' 'libtiff' 'python2' 'libspiro')
 options=('!libtool' '!makeflags')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}_full-${pkgver}.tar.bz2")
-sha1sums=('8fada07647f102351bb1d7d1c4da487356e7142f')
+source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('55c3f00c0b486492ba071fc479e1feb426562e2b')
+
+# git clone git://fontforge.git.sourceforge.net/gitroot/fontforge/fontforge; cd fontforge; git archive --prefix=${pkgname}-${pkgver}/ master | xz > ../${pkgname}-${pkgver}.tar.xz
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	sed -i 's/python /python2 /g' Makefile.dynamic.in
-	export CFLAGS="${CFLAGS// -O2 / -O1 }" # on i686, -O2 yields FS#20430
 	./configure \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
diff --git a/extra/gtkimageview/PKGBUILD b/extra/gtkimageview/PKGBUILD
index 587d7cddf..c1a8a58f6 100644
--- a/extra/gtkimageview/PKGBUILD
+++ b/extra/gtkimageview/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 143749 2011-11-28 20:31:19Z giovanni $
+# $Id: PKGBUILD 145169 2011-12-18 22:03:46Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Jan Blazek <appolito@gmail.com>
 # Contributor: Jose Valecillos <valecillosjg (at) gmail (dot) com>
 
 pkgname=gtkimageview
 pkgver=1.6.4
-pkgrel=2
-pkgdesc="Simple image viewer widget for GTK"
+pkgrel=3
+pkgdesc="Simple image viewer widget for GTK2"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://trac.bjourne.webfactional.com/"
 license=('LGPL2.1')
diff --git a/extra/libspiro/PKGBUILD b/extra/libspiro/PKGBUILD
new file mode 100644
index 000000000..d27e6b9c1
--- /dev/null
+++ b/extra/libspiro/PKGBUILD
@@ -0,0 +1,25 @@
+# $Id: PKGBUILD 145163 2011-12-18 12:09:22Z bisson $
+# Contributor: Rémy Oudompheng <oudomphe@clipper.ens.fr>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+
+pkgname=libspiro
+pkgver=20071029
+pkgrel=2
+pkgdesc='Simplifies the drawing of beautiful curves'
+url='http://libspiro.sourceforge.net/'
+license=('GPL')
+options=('!libtool')
+arch=('i686' 'x86_64')
+source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}_src-${pkgver}.tar.bz2")
+sha1sums=('d8b407b835b35289af2914877a4c6000b4fdd382')
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	./configure --prefix=/usr
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/lighttpd/PKGBUILD b/extra/lighttpd/PKGBUILD
index 0cb1b9276..131e85cfc 100644
--- a/extra/lighttpd/PKGBUILD
+++ b/extra/lighttpd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 143810 2011-11-29 13:33:30Z stephane $
+# $Id: PKGBUILD 145165 2011-12-18 18:44:31Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=lighttpd
-pkgver=1.4.29
-pkgrel=3
+pkgver=1.4.30
+pkgrel=1
 pkgdesc='a secure, fast, compliant and very flexible web-server'
 license=('custom')
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,14 +16,14 @@ optdepends=('libxml2: mod_webdav'
             'sqlite3: mod_webdav')
 backup=('etc/lighttpd/lighttpd.conf' 'etc/logrotate.d/lighttpd')
 options=('!libtool' 'emptydirs')
-source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.bz2"
-        "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.bz2.asc"
+source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz"
+        "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz.asc"
         'lighttpd.rc.d' 'lighttpd.logrotate.d' 'lighttpd.conf')
-md5sums=('e6e67b09986cb504db630b5a86b2dd76'
-         'de2afb4ed6a088fd7fa5f13c387a08f0'
-         '268386e71f5748dc1d887b9a0ab65589'
-         '913e2157fa78d990c32146f387d44c2b'
-         'acdaa94299e6299cb5085e6d88babeca')
+sha256sums=('c237692366935b19ef8a6a600b2f3c9b259a9c3107271594c081a45902bd9c9b'
+            '941ab747aeb97ca111fb670d21eefecdf745debc5e139bc5bd6881ee66b2742a'
+            'ceff3a88e876f6104c094379d507b89bc504777d0f98a0930406a70624fcf024'
+            '6c5892830e77731d27e3ebb64a0d87ab9139c68eb703aec6741c591814cef26f'
+            '44267e8b670faaf5712ad0bc9fd84b8c52281ddd22ef2c22d4b474dbb1cf5d2a')
 
 build() {
 	cd $srcdir/$pkgname-$pkgver
diff --git a/extra/midori/PKGBUILD b/extra/midori/PKGBUILD
index 7bc946085..e8fd07bd8 100644
--- a/extra/midori/PKGBUILD
+++ b/extra/midori/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 142825 2011-11-16 00:02:11Z eric $
+# $Id: PKGBUILD 145174 2011-12-19 00:22:14Z eric $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: rabyte <rabyte.at.gmail.dot.com>
 # Contributor: Johannes Krampf <wuischke.at.amule.dot.org>
 
 pkgname=midori
-pkgver=0.4.2
+pkgver=0.4.3
 pkgrel=1
 pkgdesc="A lightweight web browser based on Gtk WebKit"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ depends=('libwebkit>=1.3.13' 'libunique' 'hicolor-icon-theme' 'desktop-file-util
 makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2>=2.7.1' 'vala') # 'git'
 optdepends=('vala: for use in extensions')
 source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
-md5sums=('4ec9c3daa332ebe865cba6aa8256ef63')
+md5sums=('900037557b82818d79d2dd1c5a7d7fd2')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD
index c45eb034c..873ba0163 100644
--- a/extra/mkvtoolnix/PKGBUILD
+++ b/extra/mkvtoolnix/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 144061 2011-12-02 20:54:42Z ibiru $
+# $Id: PKGBUILD 145175 2011-12-19 00:22:15Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: xduugu <xduugu@gmx.com>
 
 pkgbase=mkvtoolnix
 pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk')
-pkgver=5.1.0
-pkgrel=1
+pkgver=5.2.0
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.bunkus.org/videotools/mkvtoolnix/index.html"
 makedepends=('libmatroska' 'flac' 'libvorbis' 'file' 'wxgtk'
              'boost-libs' 'lzo2' 'xdg-utils' 'boost' 'ruby')
 source=("http://www.bunkus.org/videotools/${pkgbase}/sources/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('fed878893a7f292969e8bd81c7ab9209')
+md5sums=('53445217c42736d5932082e5596c20d4')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
@@ -56,6 +56,7 @@ package_mkvtoolnix-cli() {
   rm -rf "${pkgdir}"/usr/share/man/man1/mmg.1
   rm -rf "${pkgdir}"/usr/share/man/nl/man1/mmg.1
   rm -rf "${pkgdir}"/usr/share/man/zh_CN/man1/mmg.1
+  rm -rf "${pkgdir}"/usr/share/man/uk/man1/mmg.1
   rm -rf "${pkgdir}"/usr/share/applications
   rm -rf "${pkgdir}"/usr/share/icons
   rm -rf "${pkgdir}"/usr/share/mime
@@ -79,4 +80,5 @@ package_mkvtoolnix-gtk() {
   rm -rf "${pkgdir}"/usr/share/man/man1/mkv*
   rm -rf "${pkgdir}"/usr/share/man/nl/man1/mkv*
   rm -rf "${pkgdir}"/usr/share/man/zh_CN/man1/mkv*
+  rm -rf "${pkgdir}"/usr/share/man/uk/man1/mkv*
 }