9 files changed, 116 insertions, 20 deletions
diff --git a/nonprism/bitlbee-nonprism/PKGBUILD b/nonprism/bitlbee-nonprism/PKGBUILD
index f0cfcbf19..d181f3b9f 100644
--- a/nonprism/bitlbee-nonprism/PKGBUILD
+++ b/nonprism/bitlbee-nonprism/PKGBUILD
@@ -1,9 +1,17 @@
+# $Id: PKGBUILD 186656 2013-05-30 12:19:35Z dreisner $
+
+# Contributor: FUBAR <mrfubar@gmail.com>
+# Contributor: simo <simo@archlinux.org>
+# Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+# Contributor: Gaetan Bisson <bisson@archlinux.org>
+# Maintainer: Dave Reisner <dreisner@archlinux.org>
 
 _pkgname=bitlbee
-pkgname=bitlbee-coherence
+pkgname=bitlbee-nonprism
 pkgver=3.2
-pkgrel=1
-pkgdesc='Brings XMPP to IRC (removed support for nonfree, unsafe and dangerous for privacy protocols)'
+pkgrel=3
+pkgdesc='Brings XMPP to IRC, without support for unsafe and dangerous for privacy protocols'
 url='http://www.bitlbee.org/'
 license=('GPL')
 arch=('i686' 'x86_64')
@@ -11,7 +19,7 @@ depends=('gnutls' 'glib2')
 makedepends=('asciidoc' 'libotr3')
 optdepends=('libotr3: for OTR encryption support'
             'xinetd: to run bitlbee through xinetd')
-replaces=$_pkgname
+replaces=("$_pkgname" 'bitlbee-coherence')
 conflicts=$_pkgname
 provides=$_pkgname=$pkgver
 source=("http://get.bitlbee.org/src/${_pkgname}-${pkgver}.tar.gz"
@@ -59,4 +67,4 @@ package() {
   install -o65 -g65 -dm770 "$pkgdir/var/lib/bitlbee"
   install -Dm644 "$srcdir/xinetd" "$pkgdir/etc/xinetd.d/bitlbee"
   install -Dm644 "$srcdir/bitlbee.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/bitlbee.conf"
-}
-\ No newline at end of file
+}
diff --git a/nonprism/choqok-nonprism/PKGBUILD b/nonprism/choqok-nonprism/PKGBUILD
new file mode 100644
index 000000000..abbb4073a
--- /dev/null
+++ b/nonprism/choqok-nonprism/PKGBUILD
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Peter Richard Lewis <plewis@aur.archlinux.org>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Emanuele Rossi <newdna1510@yahoo.it>
+# Contributor: Bram Schoenmakers <me@bramschoenmakers.nl>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+
+_pkgname=choqok
+pkgname=choqok-nonprism
+pkgver=1.3
+pkgrel=4.2
+pkgdesc="A status.net client for KDE, without Twitter support"
+url='http://choqok.gnufolks.org/'
+license=('GPL')
+arch=('i686' 'x86_64' 'mips64el')
+depends=('kdebase-runtime' 'qjson' 'qoauth' 'qca-ossl')
+makedepends=('cmake' 'automoc4')
+optdepends=('kdebase-konqueror-libre: proxy support')
+provides=("$_pkgname=$pkgver")
+conflicts=$_pkgname
+replaces=$_pkgname
+install="${_pkgname}.install"
+source=("http://downloads.sourceforge.net/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2")
+md5sums=('87eea4f2c23467fb021e3e6b794eb37d')
+
+prepare() {
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+
+  # remove twitter service and keep only twitterapi (choqok software) for status.net and open collaboration services
+  sed -i '\|add_subdirectory(twitter)|d' microblogs/CMakeLists.txt
+  sed -i 's|twitter[.]com|status.net|' microblogs/laconica/laconicamicroblog.cpp
+  sed -i 's|twitter[.]com|status.net|' microblogs/laconica/laconicasearch.cpp
+
+  # remove uploaders plugin (with only nonprivacy services)
+  sed -i '\|add_subdirectory(uploaders)|d' plugins/CMakeLists.txt
+  sed -i 's|Comment||' plugins/searchaction/choqok_searchaction.desktop
+
+  # remove twitter on docbook
+  sed -i 's| and Twitter.com||
+          s| and another with the alias|.</para>|
+          s|while a post using Twitter is called a tweet||
+          \|Twitter|d;\|twitter|d' doc/index.docbook
+}
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../${_pkgname}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+
+  # This is already installed by kdepimlibs >= 4.9.80
+  rm "${pkgdir}"/usr/share/apps/cmake/modules/FindQtOAuth.cmake
+}
diff --git a/nonprism/choqok-nonprism/choqok.install b/nonprism/choqok-nonprism/choqok.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/nonprism/choqok-nonprism/choqok.install
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/nonprism/claws-mail-libre-nonprism/PKGBUILD b/nonprism/claws-mail-libre-nonprism/PKGBUILD
index 42b980a14..099b6e1a0 100644
--- a/nonprism/claws-mail-libre-nonprism/PKGBUILD
+++ b/nonprism/claws-mail-libre-nonprism/PKGBUILD
@@ -4,17 +4,17 @@
 
 _pkgname=claws-mail
 pkgname=$_pkgname-libre-nonprism
-pkgver=3.9.1
-pkgrel=3
-pkgdesc='A GTK+ based e-mail client, without nonfree PalmOS handheld devices support'
+pkgver=3.9.2
+pkgrel=3.1
+pkgdesc='A GTK+ based e-mail client, without nonfree PalmOS handheld devices and libgdata support'
 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')
+         'gpgme' 'libetpan>=1.1-4' 'libsm' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils')
 makedepends=('compface' 'spamassassin' 'bogofilter' 'valgrind' 
              # dependencies for plugins
-             'libsoup' 'libgdata' 'webkitgtk2' 'libnotify' 'libcanberra' 'poppler-glib' 'pygtk') 
+             'libsoup' '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'
@@ -37,7 +37,7 @@ provides=("$_pkgname=$pkgver" 'claws')
 options=(!libtool)
 install=$_pkgname.install
 source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/$_pkgname-$pkgver.tar.bz2{,.asc})
-md5sums=('8adc734912ff1b83545cb12850100473'
+md5sums=('90de2a265e65fbd9dffdbf428bb0ee28'
          'SKIP')
 
 build() {
diff --git a/nonprism/claws-mail-libre-nonprism/claws-mail.install b/nonprism/claws-mail-libre-nonprism/claws-mail.install
new file mode 100644
index 000000000..4d2f155d4
--- /dev/null
+++ b/nonprism/claws-mail-libre-nonprism/claws-mail.install
@@ -0,0 +1,16 @@
+post_install() {
+  echo "install \"html2ps\" from AUR to add support for printing html mails with fancy plugin"
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
+}
+
+post_remove() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
+}
+
diff --git a/nonprism/empathy-nonprism/PKGBUILD b/nonprism/empathy-nonprism/PKGBUILD
index de0eca1e9..602adb465 100644
--- a/nonprism/empathy-nonprism/PKGBUILD
+++ b/nonprism/empathy-nonprism/PKGBUILD
@@ -1,9 +1,9 @@
 
 _pkgname=empathy
-pkgname=empathy-coherence
+pkgname=empathy-nonprism
 pkgver=3.8.3
 pkgrel=1
-pkgdesc="A GNOME instant messaging client using the Telepathy framework without support for nonfree, unsafe and dangerous for privacy protocols"
+pkgdesc="A GNOME instant messaging client using the Telepathy framework, without support for unsafe and dangerous for privacy protocols"
 arch=(i686 x86_64)
 url="http://live.gnome.org/Empathy"
 license=(GPL2)
@@ -16,7 +16,7 @@ optdepends=('telepathy-gabble: XMPP/Jabber support'
 options=('!libtool' '!makeflags')
 groups=(gnome)
 install=empathy.install
-replaces=$_pkgname
+replaces=("$_pkgname" 'empathy-coherence')
 conflicts=$_pkgname
 provides=$_pkgname=$pkgver
 source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz)
diff --git a/nonprism/evolution-data-server-nonprism/PKGBUILD b/nonprism/evolution-data-server-nonprism/PKGBUILD
index 2ba93b16c..96caee984 100644
--- a/nonprism/evolution-data-server-nonprism/PKGBUILD
+++ b/nonprism/evolution-data-server-nonprism/PKGBUILD
@@ -1,6 +1,6 @@
 
 _pkgname=evolution-data-server
-pkgname=evolution-data-server-coherence
+pkgname=evolution-data-server-nonprism
 pkgver=3.8.5
 pkgrel=1
 pkgdesc="Centralized access to appointments and contacts without libgdata support"
@@ -11,7 +11,7 @@ options=('!libtool')
 install=$_pkgname.install
 url="http://www.gnome.org"
 license=(GPL)
-replaces=$_pkgname
+replaces=("$_pkgname" 'evolution-data-server-coherence')
 conflicts=$_pkgname
 provides=$_pkgname=$pkgver
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz)
diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD b/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD
index d41efa232..86c23797a 100644
--- a/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD
+++ b/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD
@@ -6,13 +6,13 @@ _pkgname=kdenetwork-kopete
 pkgname=kdenetwork-kopete-libre-nonprism
 pkgver=4.11.0
 pkgrel=1
-pkgdesc='Instant Messenger, without skype and unsafe/dangerous protocols support'
+pkgdesc='Instant Messenger, without skype and support for unsafe and dangerous for privacy protocols'
 url='http://kde.org/applications/internet/kopete/'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdenetwork')
-depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr3' 'libmsn' 'libidn'
-         'qimageblitz' 'libgadu' 'mediastreamer' 'jsoncpp')
+depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr3' 'libidn'
+         'qimageblitz' 'mediastreamer' 'jsoncpp')
 makedepends=('cmake' 'automoc4' 'boost')
 install=${_pkgname}.install
 replaces=$_pkgname
diff --git a/nonprism/kdepim-runtime-nonprism/PKGBUILD b/nonprism/kdepim-runtime-nonprism/PKGBUILD
index 38a0a1edc..204a69809 100644
--- a/nonprism/kdepim-runtime-nonprism/PKGBUILD
+++ b/nonprism/kdepim-runtime-nonprism/PKGBUILD
@@ -7,7 +7,7 @@ _pkgname=kdepim-runtime
 pkgname=kdepim-runtime-nonprism
 pkgver=4.11.0
 pkgrel=1
-pkgdesc='Extends the functionality of kdepim, without libkgapi support'
+pkgdesc='Extends the functionality of kdepim, without libkgapi and libkfbapi support'
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdepim-runtime'
 license=('GPL' 'LGPL' 'FDL')