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

Conflicts:
	kde-unstable/soprano/PKGBUILD
	testing/imagemagick/PKGBUILD

8 files changed, 96 insertions, 29 deletions

diff --git a/community/clucene/PKGBUILD b/community/clucene/PKGBUILD
new file mode 100644
index 000000000..d99078c74
--- /dev/null
+++ b/community/clucene/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 49740 2011-06-20 20:01:57Z andrea $
+# Maintainer:
+# Contributor: Alois Nespor <alois.nespor@gmail.com>
+# Contributor: Tobias Powalowski <tpowa@archlinux.org>
+
+pkgname=clucene
+pkgver=2.3.3.4
+pkgrel=1
+pkgdesc="A C++ port of Lucene: the high-performance, full-featured text search engine"
+arch=('i686' 'x86_64')
+url="http://clucene.sourceforge.net"
+license=('APACHE' 'LGPL')
+depends=('gcc-libs' 'zlib' 'boost-libs')
+makedepends=('cmake' 'boost')
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-core-$pkgver.tar.gz")
+md5sums=('48d647fbd8ef8889e5a7f422c1bfda94')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../$pkgname-core-$pkgver \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/community/conkeror-git/PKGBUILD b/community/conkeror-git/PKGBUILD
index 30a3cf5c2..fb4345c7b 100644
--- a/community/conkeror-git/PKGBUILD
+++ b/community/conkeror-git/PKGBUILD
@@ -1,19 +1,20 @@
 # Contributor: Heeru Kiyura <M8R-p9i5nh@mailinator.com>
 # Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
 
-_commit=34882281d19ff7ac8786f927b414e1af5afc9266
+_commit=0d883dfd5e61e7d0b8a96a079d69b46af064fdca
 pkgname=conkeror-git
 pkgver=0.9.3
-pkgrel=4
+pkgrel=5
 pkgdesc="A highly programmable web browser based on Mozilla XULRunner."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://conkeror.mozdev.org/"
 license=('MPL' 'GPL' 'LGPL')
-depends=('bash' 'xulrunner')
+depends=('xulrunner' 'desktop-file-utils')
 makedepends=('git' 'imagemagick')
 provides=(conkeror)
 source=(conkeror_gimpfile.xpm)
 md5sums=('b592582a5b923db1707615564a95737f')
+install=conkeror-git.install
 
 __gitroot="git://repo.or.cz/conkeror.git"
 __gitname="conkeror"
@@ -24,7 +25,7 @@ build() {
  ## Git checkout
   if [ -d $srcdir/${__gitname} ] ; then
     msg "Git checkout:  Updating existing tree"
-    cd ${__gitname} && git checkout "$_commit"
+    cd ${__gitname} && git checkout ${_commit}
     msg "Git checkout:  Tree has been updated"
   else
     msg "Git checkout:  Retrieving sources"
@@ -54,7 +55,7 @@ package() {
   ln -s /usr/share/conkeror/contrib/run-conkeror \
     $pkgdir/usr/bin/conkeror 
   rm $pkgdir/usr/share/conkeror/conkeror-spawn-helper
-#  rm -r $pkgdir/usr/share/conkeror/debian
+  rm -r $pkgdir/usr/share/conkeror/debian
   install -d $pkgdir/usr/share/pixmaps
   install $srcdir/conkeror_gimpfile.xpm $pkgdir/usr/share/pixmaps
 } 
diff --git a/community/conkeror-git/conkeror-git.install b/community/conkeror-git/conkeror-git.install
new file mode 100644
index 000000000..5e5cfef4d
--- /dev/null
+++ b/community/conkeror-git/conkeror-git.install
@@ -0,0 +1,11 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  update-desktop-database -q
+}
diff --git a/community/docky/PKGBUILD b/community/docky/PKGBUILD
index 830375ad3..29807f42f 100644
--- a/community/docky/PKGBUILD
+++ b/community/docky/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 46732 2011-05-11 08:50:44Z heftig $
+# $Id: PKGBUILD 49764 2011-06-21 00:08:54Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: dieghen89 <dieghen89@gmail.com>
 # Contributor: Alessio 'Bl@ster' Biancalana <dottorblaster@gmail.com>
 
 pkgname=docky
-pkgver=2.1.2
+pkgver=2.1.3
 pkgrel=1
 pkgdesc="The finest dock no money can buy!"
 url="https://launchpad.net/docky"
@@ -12,12 +12,12 @@ arch=(i686 x86_64 'mips64el')
 license=(GPL)
 depends=(gnome-desktop-sharp gnome-keyring-sharp gtk2 mono-addins
          hicolor-icon-theme ndesk-dbus-glib notify-sharp-svn xdg-utils
-         desktop-file-utils dockmanager gio-sharp dbus-sharp-glib)
-makedepends=(intltool)
+         desktop-file-utils dockmanager gio-sharp dbus-sharp-glib gconf-sharp)
+makedepends=(intltool libgnome-sharp)
 options=('!libtool' '!emptydirs')
 install=docky.install
 source=("http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz")
-md5sums=('a3597810198714b14dfbc9cfd1222fd2')
+md5sums=('7a40c25dff6b71c346e7791533f05b5f')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/gnome-commander/PKGBUILD b/community/gnome-commander/PKGBUILD
index 203294179..696a079c6 100644
--- a/community/gnome-commander/PKGBUILD
+++ b/community/gnome-commander/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 46124 2011-05-03 20:51:46Z ibiru $
+# $Id: PKGBUILD 49734 2011-06-20 19:34:19Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 # Contributor: Johannes Sjolund <j.sjolund@gmail.com>
 
 pkgname=gnome-commander
-pkgver=1.2.8.11
+pkgver=1.2.8.12
 pkgrel=1
 pkgdesc="A graphical two-pane filemanager for Gnome"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,8 +14,8 @@ depends=('libgnomeui' 'gnome-vfs' 'gconf' 'python2' 'libsm')
 makedepends=('perlxml' 'gnome-doc-utils>=0.20.1' 'intltool')
 options=(!libtool)
 install=gnome-commander.install
-source=(ftp://ftp.gnome.org/pub/GNOME/sources/gnome-commander/1.2/$pkgname-$pkgver.tar.bz2)
-sha256sums=('ef0c466b0858542cf8aa2c63eee701a257ce189655d6a5e5f5bc64690ac26cd9')
+source=(ftp://ftp.gnome.org/pub/GNOME/sources/gnome-commander/1.2/$pkgname-$pkgver.tar.xz)
+sha256sums=('3431f28c7ff1dd882e4b5d6e6b2351929138cc123be4027e20b767eb5725bfee')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -38,5 +38,5 @@ package() {
   mkdir -p "${pkgdir}"/usr/share/gconf/schemas
   gconf-merge-schema "${pkgdir}"/usr/share/gconf/schemas/${pkgname}.schemas \
     --domain ${pkgname} "${pkgdir}"/etc/gconf/schemas/*.schemas
-  rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas
+  rm -rf "${pkgdir}"/etc/gconf/schemas/
 }
diff --git a/community/mysql-workbench/PKGBUILD b/community/mysql-workbench/PKGBUILD
index 240bf0076..8310c6382 100644
--- a/community/mysql-workbench/PKGBUILD
+++ b/community/mysql-workbench/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 47963 2011-05-26 13:44:42Z ibiru $
+# $Id: PKGBUILD 49744 2011-06-20 20:11:17Z ibiru $
 # Maintainer:
 # Contributor : Ionut Biru <ibiru@archlinux.org>
 # Contributor: totoloco <totoloco at gmail _dot_com>
@@ -6,13 +6,13 @@
 pkgname=mysql-workbench
 epoch=1
 pkgver=5.2.34
-pkgrel=1
+pkgrel=2
 pkgdesc="A cross-platform, visual database design tool developed by MySQL"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://wb.mysql.com/"
 license=('GPL2')
 depends=('libzip' 'libmysqlclient' 'lua' 'gtkmm' 'libgl'
-         'libsigc++' 'python-paramiko' 'python-pexpect')
+         'libsigc++' 'python-paramiko' 'python-pexpect' 'libgnome-keyring')
 makedepends=('boost' 'curl' 'mesa')
 options=('!libtool')
 source=(ftp://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQLGUITools/${pkgname}-gpl-${pkgver}-src.tar.gz
diff --git a/community/sword/PKGBUILD b/community/sword/PKGBUILD
index d6148decb..151487e90 100644
--- a/community/sword/PKGBUILD
+++ b/community/sword/PKGBUILD
@@ -1,26 +1,48 @@
+# $Id: PKGBUILD 49750 2011-06-20 22:08:06Z andrea $
 # Maintainer:  Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor: TripleE <eric1548@yahoo.com>
 
 pkgname=sword
 pkgver=1.6.2
-pkgrel=3
+pkgrel=4
 pkgdesc="SWORD libraries for Bible programs"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.crosswire.org/sword/index.jsp"
 license=('GPL')
-depends=('curl' 'icu' 'clucene')
-source=(http://www.crosswire.org/ftpmirror/pub/${pkgname}/source/v1.6/${pkgname}-${pkgver}.tar.gz)
-md5sums=('a7dc4456e20e915fec46d774b690e305')
+depends=('curl' 'icu' 'clucene' 'swig')
+makedepends=('cmake')
 backup=('etc/sword.conf')
+source=("http://www.crosswire.org/ftpmirror/pub/${pkgname}/source/v1.6/${pkgname}-${pkgver}.tar.gz")
+md5sums=('a7dc4456e20e915fec46d774b690e305')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --with-icu 
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release
   make 
 }
+
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}"/build
   make DESTDIR="${pkgdir}" install
-  make DESTDIR="${pkgdir}" install_config
-}
 
+  # Ugly workarounds to fix a weird cmakelists.txt
+  install -d "${pkgdir}"/usr/lib/sword
+  mv "${pkgdir}"/usr/lib/1.6.2_icu_4.8 "${pkgdir}"/usr/lib/sword/
+
+  cd "${srcdir}"/${pkgname}-${pkgver}/locales.d/
+  for file in *.conf; do
+    install -Dm644 $file "${pkgdir}"/usr/share/sword/locales.d/$file
+  done
+
+  cd ../include
+  install -d "${pkgdir}"/usr/include/sword
+  install -Dm644 canon_{catholic{,2},synodalp}.h "${pkgdir}"/usr/include/sword
+
+  cd ../samples
+  install -Dm644 mods.d/globals.conf "${pkgdir}"/usr/share/sword/mods.d/globals.conf
+  install -Dm644 recommended/sword.conf "${pkgdir}"/etc/sword.conf
+}
diff --git a/community/xiphos/PKGBUILD b/community/xiphos/PKGBUILD
index 2931ffae0..aca720a45 100755
--- a/community/xiphos/PKGBUILD
+++ b/community/xiphos/PKGBUILD
@@ -1,9 +1,10 @@
+# $Id: PKGBUILD 49759 2011-06-20 22:11:59Z andrea $
 # Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor: TripleE <eric1548@yahoo.com>
 
 pkgname=xiphos
 pkgver=3.1.4
-pkgrel=7
+pkgrel=8
 pkgdesc="A Bible study tool for gtk"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xiphos.org"
@@ -14,7 +15,7 @@ conflicts=('gnomesword')
 provides=('gnomesword')
 replaces=('gnomesword')
 install=$pkgname.install
-source=("http://downloads.sourceforge.net/sourceforge/gnomesword/$pkgname-$pkgver.tar.gz")
+source=("http://downloads.sourceforge.net/gnomesword/$pkgname-$pkgver.tar.gz")
 md5sums=('4d6f7805c4c8185f5c4ac3bd95fc705a')
 
 build() {
@@ -23,6 +24,7 @@ build() {
   ./waf configure --prefix=/usr --enable-gtkhtml
   ./waf build --prefix=/usr 
 }
+
 package() {
   cd $srcdir/$pkgname-$pkgver
   GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 ./waf install --destdir=$pkgdir