Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

1 files changed, 56 insertions, 75 deletions

diff --git a/libre/claws-mail-libre/PKGBUILD b/libre/claws-mail-libre/PKGBUILD
index ee7019130..e37ffe283 100644
--- a/libre/claws-mail-libre/PKGBUILD
+++ b/libre/claws-mail-libre/PKGBUILD
@@ -2,95 +2,76 @@
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
-pkgbase=claws-mail
 pkgname=claws-mail-libre
-pkgflag=-libre
-pkgver=3.9.0
-pkgrel=2
+_pkgflag=libre
+_pkgname=${pkgname%-$_pkgflag}
+pkgver=3.9.1
+pkgrel=3
 pkgdesc='A GTK+ based e-mail client, without nonfree PalmOS handheld devices support'
-arch=(
-  i686
-  x86_64
-  mips64el
-)
-license=GPL3
-url="http://www.$pkgbase.org"
-depends=(
-  db
-  dbus-glib
-  desktop-file-utils
-  enchant
-  gnutls
-  gpgme
-  gtk2
-  hicolor-icon-theme
-  'libetpan>=1.1'
-  libsm
-  startup-notification
-)
-makedepends=(
-  bogofilter
-  compface
-  spamassassin
-)
-[ "$CARCH" != "mips64el" ] && makedepends+=(valgrind)
-optdepends=(
-  'python2:           needed for some tools'
-  'perl:              needed for some tools'
-  'spamassassin:      adds support for spamfiltering'
-  'bogofilter:        adds support for spamfiltering'
-)
-provides=(
-  claws
-  $pkgbase=$pkgver
-)
-conflicts=(
-  $pkgbase
-)
-replaces=(
-  $pkgbase
-  sylpheed-claws
-)
-options=(
-  '!libtool'
-)
-install=$pkgbase.install
-source=(
-  http://downloads.sourceforge.net/sourceforge/sylpheed-claws/$pkgbase-$pkgver.tar.bz2
-)
-md5sums=(
-  4c5ac7b21f0ed17d0f6404124c2229a4
-)
+arch=('i686' 'x86_64' 'mips64el')
+license=('GPL3')
+url="http://www.$_pkgname.org"
+depends=('gtk2' 'gnutls' 'startup-notification' 'enchant'
+         'gpgme' 'libetpan>=1.1' 'libsm' 'db' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils')
+makedepends=('compface' 'spamassassin' 'bogofilter' 'valgrind' 
+             # dependencies for plugins
+             'libsoup' 'libgdata' 'webkitgtk2' 'libnotify' 'libcanberra' 'poppler-glib' 'pygtk') 
+             #'libchamplain' needed for geolocation plugin, disabled for now - most time it's not compatible with current gnome releases
+optdepends=('python2:           needed for some tools and python plugin'
+            'perl:              needed for some tools and perl plugin'
+            'spamassassin:      adds support for spamfiltering'
+            'bogofilter:        adds support for spamfiltering'
+            'libnotify:         for notification plugin'
+            'libcanberra:       for notification plugin'
+            'dbus:              for notification plugin'
+            'libxml2:           for gtkhtml2_viewer and rssyl plugins'
+            'curl:              for gtkhtml2_viewer, vcalendar, rssyl and spamreport plugins'
+            'libarchive:        for archive plugin and various other plugins'
+            'libytnef:          for tnef_parse plugin'
+            'webkitgtk2:        for the fancy webkit html plugin'
+            'libsoup:           for the fancy webkit html plugin'
+	        'libgdata:          for gdata plugin'
+	        'poppler-glib:      for pdf viewer plugin'
+	        'ghostscript:       for pdf viewer plugin')
+replaces=("$_pkgname" "sylpheed-claws" "$_pkgname-extra-plugins")
+conflicts=("$_pkgname" "$_pkgname-extra-plugins")
+provides=("$_pkgname=$pkgver" 'claws')
+options=(!libtool)
+install=$_pkgname.install
+source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/$_pkgname-$pkgver.tar.bz2{,.asc})
+md5sums=('8adc734912ff1b83545cb12850100473'
+         'SKIP')
 
 build() {
-  cd $srcdir/$pkgbase-$pkgver
+  cd $srcdir/$_pkgname-$pkgver
 
+  # fixes for python2
+  export PYTHON="/usr/bin/python2"
   sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py
+  sed -i 's:python -c:python2 -c:g' configure
 
-  ./configure --prefix=/usr\
-    --disable-dillo-viewer-plugin\
-    --disable-static\
-    --enable-bogofilter-plugin\
-    --enable-crash-dialog\
-    --enable-enchant\
-    --enable-gnutls\
-    --enable-jpilot\
-    --enable-ldap\
-    --enable-pgpmime-plugin\
-    --enable-spamassassin-plugin
-
-  make
+  setarch $CARCH ./configure --prefix=/usr --disable-static \
+    --enable-enchant \
+    --enable-gnutls \
+    --enable-ldap \
+    --enable-crash-dialog \
+    --enable-pgpmime-plugin \
+    --enable-spamassassin-plugin \
+    --enable-bogofilter-plugin \
+    --enable-jpilot \
+    #--help
+  setarch $CARCH make
 }
 
 package() {
-  cd $srcdir/$pkgbase-$pkgver
-  make DESTDIR=$pkgdir install
+  cd $srcdir/$_pkgname-$pkgver
+  setarch $CARCH make DESTDIR=$pkgdir install
 
   # build and install extra tools
   cd tools
-  make
+  setarch $CARCH make
    # all executables and .conf files ; only top directory
   find -maxdepth 1 -type f -and -perm /111 -or -name '*.conf' | while read i ; do
-    install -D -m755 $i $pkgdir/usr/lib/$pkgbase/tools/$i
+    install -D -m755 $i $pkgdir/usr/lib/$_pkgname/tools/$i
   done
 }