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

Conflicts:
	nonprism/claws-mail-libre-nonprism/PKGBUILD

13 files changed, 319 insertions, 21 deletions

diff --git a/nonprism/bitlbee-nonprism/PKGBUILD b/nonprism/bitlbee-nonprism/PKGBUILD
index f0cfcbf19..58a6b9d14 100644
--- a/nonprism/bitlbee-nonprism/PKGBUILD
+++ b/nonprism/bitlbee-nonprism/PKGBUILD
@@ -1,9 +1,9 @@
 
 _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)'
+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 +11,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 +59,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/claws-mail-libre-nonprism/PKGBUILD b/nonprism/claws-mail-libre-nonprism/PKGBUILD
index ae3d1ae99..035fa40bd 100644
--- a/nonprism/claws-mail-libre-nonprism/PKGBUILD
+++ b/nonprism/claws-mail-libre-nonprism/PKGBUILD
@@ -6,7 +6,7 @@ _pkgname=claws-mail
 pkgname=$_pkgname-libre-nonprism
 pkgver=3.9.2
 pkgrel=3
-pkgdesc='A GTK+ based e-mail client, without nonfree PalmOS handheld devices support'
+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"
@@ -14,7 +14,7 @@ depends=('gtk2' 'gnutls' 'startup-notification' 'enchant'
          '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'
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
new file mode 100644
index 000000000..86c23797a
--- /dev/null
+++ b/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD
@@ -0,0 +1,71 @@
+# $Id: PKGBUILD 192541 2013-08-13 18:47:05Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+_pkgname=kdenetwork-kopete
+pkgname=kdenetwork-kopete-libre-nonprism
+pkgver=4.11.0
+pkgrel=1
+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' 'libidn'
+         'qimageblitz' 'mediastreamer' 'jsoncpp')
+makedepends=('cmake' 'automoc4' 'boost')
+install=${_pkgname}.install
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
+source=("http://download.kde.org/stable/${pkgver}/src/kopete-${pkgver}.tar.xz"
+        'libotr3.patch'
+        'mediastreamer29.patch'
+        'libre-nonprism.patch')
+sha1sums=('a67716f14a07cdbacf3df40983db17f594eb768b'
+          '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384'
+          '317683a5c2acd0a0058c5ab42f6006e9db511ef3'
+          '3c46e5c80ef0cd3f6fe9fb6d5cb8c252c6792208')
+
+prepare() {
+  cd kopete-${pkgver}
+  patch -p2 -i "${srcdir}"/libotr3.patch
+  patch -p1 -i "${srcdir}"/mediastreamer29.patch
+  # Based on http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/make-kdenetwork, revision 34.
+  sed -i 's/Skype protocol" ON/Skype protocol" OFF/g' protocols/CMakeLists.txt
+  rm -rf protocols/skype
+  # remove unsafe/dangerous services
+  sed -i 's/Oscar (ICQ and AIM) protocol" ON/Oscar (ICQ and AIM) protocol" OFF/g' protocols/CMakeLists.txt
+  rm -rf protocols/oscar
+  sed -i 's/Yahoo protocol" ON/Yahoo protocol" OFF/g' protocols/CMakeLists.txt
+  rm -rf protocols/yahoo
+  sed -i 's/QQ protocol" ON/QQ protocol" OFF/g' protocols/CMakeLists.txt
+  rm -rf protocols/qq
+  sed -i 's/Novell GroupWise Messenger protocol" ON/Novell GroupWise Messenger protocol" OFF/g' protocols/CMakeLists.txt
+  rm -rf protocols/groupwise
+  sed -i 's/Gadu-Gadu protocol" ON/Gadu-Gadu protocol" OFF/g' protocols/CMakeLists.txt
+  rm -rf protocols/gadu
+  sed -i 's/Google Talk support" ON/Google Talk support" OFF/g' protocols/CMakeLists.txt
+  sed -i 's/Window Live Messenger support" ON/Window Live Messenger support" OFF/g' protocols/CMakeLists.txt
+  rm -rf protocols/wlm
+  sed -i 's/Windows Live Messenger voice clip support" ON/Windows Live Messenger voice clip support" OFF/g' protocols/CMakeLists.txt
+  sed -i 's/meanwhile protocol" ON/meanwhile protocol" OFF/g' protocols/CMakeLists.txt
+  rm -rf protocols/meanwhile
+  patch -p1 -i "${srcdir}"/libre-nonprism.patch
+}
+
+build() {
+  mkdir build
+  cd build
+  cmake ../kopete-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DKDE4_BUILD_TESTS=OFF \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_SKIP_RPATH=ON
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR=$pkgdir install
+}
diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/kdenetwork-kopete.install b/nonprism/kdenetwork-kopete-libre-nonprism/kdenetwork-kopete.install
new file mode 100644
index 000000000..5495fb1b5
--- /dev/null
+++ b/nonprism/kdenetwork-kopete-libre-nonprism/kdenetwork-kopete.install
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/kdenetwork.install b/nonprism/kdenetwork-kopete-libre-nonprism/kdenetwork.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/nonprism/kdenetwork-kopete-libre-nonprism/kdenetwork.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/kdenetwork-kopete-libre-nonprism/libotr3.patch b/nonprism/kdenetwork-kopete-libre-nonprism/libotr3.patch
new file mode 100644
index 000000000..1e96c98d6
--- /dev/null
+++ b/nonprism/kdenetwork-kopete-libre-nonprism/libotr3.patch
@@ -0,0 +1,71 @@
+diff -urN a/kopete/cmake/modules/FindLibOTR.cmake b/kopete/cmake/modules/FindLibOTR.cmake
+--- a/kopete/cmake/modules/FindLibOTR.cmake	2012-08-12 18:08:59.000000000 -0600
++++ b/kopete/cmake/modules/FindLibOTR.cmake	2012-11-09 12:14:24.251450904 -0700
+@@ -13,13 +13,13 @@
+     SET(LIBOTR_FIND_QUIETLY TRUE)
+ ENDIF (LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY)
+ 
+-FIND_PATH(LIBOTR_INCLUDE_DIR libotr/version.h)
++FIND_PATH(LIBOTR_INCLUDE_DIR libotr3/version.h)
+ 
+-FIND_LIBRARY(LIBOTR_LIBRARY NAMES otr libotr)
++FIND_LIBRARY(LIBOTR_LIBRARY NAMES otr3 libotr3)
+ 
+-# Determine version information from libotr/version.h
++# Determine version information from libotr3/version.h
+ IF( LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY )
+-  EXECUTE_PROCESS(COMMAND grep "OTRL_VERSION" "${LIBOTR_INCLUDE_DIR}/libotr/version.h" OUTPUT_VARIABLE output)
++  EXECUTE_PROCESS(COMMAND grep "OTRL_VERSION" "${LIBOTR_INCLUDE_DIR}/libotr3/version.h" OUTPUT_VARIABLE output)
+   STRING(REGEX MATCH "OTRL_VERSION \"[0-9]+\\.[0-9]+\\.[0-9]+" LIBOTR_VERSION "${output}")
+   STRING(REGEX REPLACE "^OTRL_VERSION \"" "" LIBOTR_VERSION "${LIBOTR_VERSION}")
+   # Check if version is at least 3.2.0
+diff -urN a/kopete/plugins/otr/authenticationwizard.h b/kopete/plugins/otr/authenticationwizard.h
+--- a/kopete/plugins/otr/authenticationwizard.h	2012-08-12 18:09:00.000000000 -0600
++++ b/kopete/plugins/otr/authenticationwizard.h	2012-11-09 12:15:11.181265336 -0700
+@@ -26,7 +26,7 @@
+   */
+ 
+ extern "C"{
+-#include "libotr/proto.h"
++#include "libotr3/proto.h"
+ }
+ 
+ #include "kopetechatsession.h"
+diff -urN a/kopete/plugins/otr/otrlchatinterface.h b/kopete/plugins/otr/otrlchatinterface.h
+--- a/kopete/plugins/otr/otrlchatinterface.h	2012-08-12 18:09:00.000000000 -0600
++++ b/kopete/plugins/otr/otrlchatinterface.h	2012-11-09 12:16:10.141032744 -0700
+@@ -36,10 +36,10 @@
+ #include "authenticationwizard.h"
+ 
+ extern "C" {
+-#include <libotr/privkey.h>
+-#include <libotr/proto.h>
+-#include <libotr/message.h>
+-#include <libotr/userstate.h>
++#include <libotr3/privkey.h>
++#include <libotr3/proto.h>
++#include <libotr3/message.h>
++#include <libotr3/userstate.h>
+ }
+ 
+ 
+diff -urN a/kopete/plugins/otr/otrlconfinterface.h b/kopete/plugins/otr/otrlconfinterface.h
+--- a/kopete/plugins/otr/otrlconfinterface.h	2012-08-12 18:09:00.000000000 -0600
++++ b/kopete/plugins/otr/otrlconfinterface.h	2012-11-09 12:15:56.961084991 -0700
+@@ -32,11 +32,11 @@
+ #include <kopetechatsession.h>
+ 
+ extern "C" {
+-#include <libotr/privkey.h>
+-#include <libotr/proto.h>
+-#include <libotr/message.h>
+-#include <libotr/userstate.h>
+-#include <libotr/context.h>
++#include <libotr3/privkey.h>
++#include <libotr3/proto.h>
++#include <libotr3/message.h>
++#include <libotr3/userstate.h>
++#include <libotr3/context.h>
+ }
+ 
+ class KOPETE_OTR_SHARED_EXPORT OtrlConfInterface : public QObject
diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/libre-nonprism.patch b/nonprism/kdenetwork-kopete-libre-nonprism/libre-nonprism.patch
new file mode 100644
index 000000000..b6915cbb5
--- /dev/null
+++ b/nonprism/kdenetwork-kopete-libre-nonprism/libre-nonprism.patch
@@ -0,0 +1,110 @@
+diff --git a/doc/index.docbook b/doc/index.docbook
+index 1576dc9..daf7170 100644
+--- a/doc/index.docbook
++++ b/doc/index.docbook
+@@ -20,7 +20,6 @@
+   <!ENTITY kopete-chatstyle SYSTEM "chatstyle.docbook">
+   <!ENTITY kopete-pipes SYSTEM "pipes.docbook">
+   <!ENTITY kopete-jabber SYSTEM "jabber.docbook">
+-  <!ENTITY kopete-icq SYSTEM "icq.docbook">
+ ]>
+ <!--
+ Intro (1st draft, Will)
+@@ -112,15 +111,7 @@ Appendix: Chat Window Style Guide (1st draft, Michaël)
+ <keyword>Messaging</keyword>
+ <keyword>Jabber</keyword>
+ <keyword>IRC</keyword>
+-<keyword>MSN</keyword>
+-<keyword>ICQ</keyword>
+-<keyword>AIM</keyword>
+-<keyword>Yahoo</keyword>
+-<keyword>Gadu-Gadu</keyword>
+-<keyword>GroupWise</keyword>
+-<keyword>Novell</keyword>
+ <keyword>WinPopup</keyword>
+-<keyword>SMS</keyword>
+ </keywordset>
+ 
+ </bookinfo>
+@@ -174,13 +165,13 @@ Appendix: Chat Window Style Guide (1st draft, Michaël)
+ <para>To use &kopete; you need to set up one or more accounts for the instant messaging services you wish to use.</para>
+ <para>You've probably already chosen a messaging service, either because you already use &im;, or you need to use the same service as your friends.  If you don't fit into either of these categories, please consider using a messaging service based on open standards, because these are designed for use by Free Software.  Other messaging services are prone to changing the underlying technology without making the details freely available, making them harder for Free Software developers to support.</para>
+ <para>The messaging services that &kopete; supports that are based on open standards are Jabber and IRC.</para>
+-<para>The following section assumes you are registered with an &im; service already.  If not, you can register with Gadu-Gadu, Jabber, and <trademark>MSN</trademark> from inside &kopete;; for other services, you'll have to register using their respective web site before creating an account in &kopete;.</para>
++<para>The following section assumes you are registered with an &im; service already.  If not, you can register with Jabber from inside &kopete;; for other services, you'll have to register using their respective web site before creating an account in &kopete;.</para>
+ <sect1 id="creating-accounts">
+ <title>Creating Accounts</title>
+ <para>To create an account, use <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure...</guimenuitem> </menuchoice> to display the Configure window.</para>
+ <para>The Configure window is the main way to set up and customize &kopete;.  On the left a column of icons control which aspect of &kopete; is being configured.  Click the <guiicon>Accounts</guiicon> icon.  The main pane will change to display the account management pane.  This is currently empty, but will soon list your &im; accounts.  Click <guibutton>New</guibutton> to display the <interface>Account Wizard</interface>.</para>
+ <para>The <interface>Account Wizard</interface> helps you create an &im; account.  After the <guilabel>Introduction</guilabel> page, you are asked to select the messaging service that you'd like to use.  Click one of the services shown and then click <guibutton>Next</guibutton>.  On the following page, you should enter your registration details for that instant messaging service.</para>
+-<para>Most services just require you to enter a username or unique identifying number (<acronym>UIN</acronym>) and password.  The special purpose services Winpopup and <acronym>SMS</acronym> work slightly differently, so please see their specific sections.  There are a couple of other options that apply to most services that you should look at:</para>
++<para>Most services just require you to enter a username or unique identifying number (<acronym>UIN</acronym>) and password.  The special purpose services Winpopup work slightly differently, so please see their specific sections.  There are a couple of other options that apply to most services that you should look at:</para>
+ <variablelist>
+ <varlistentry><term>Remember password</term><listitem><para>When this is checked, &kopete; will store the password for you, so you don't have to enter it every time you connect to the &im; service.  If you are security-conscious or want to limit access to the &im; account you can leave this unchecked.</para></listitem></varlistentry>
+ <varlistentry><term>Connect at startup</term><listitem><para>When this is checked, &kopete; will try to connect to the &im; service as when it starts.  If you use a <acronym>LAN</acronym>, <acronym>DSL</acronym> or other <quote>always-on</quote> connection, this is appropriate; dial-up modem users should turn this off and connect manually when you have dialed up.</para></listitem></varlistentry>
+@@ -256,7 +247,7 @@ Shortcuts...</guimenuitem></menuchoice>.</para></tip>
+ <listitem><para>Select Display Name and Group.  Here you can enter a Display Name (the name used for this person inside &kopete;), and choose the <link linkend="organise-contacts-grouping">groups</link> they are a member of.</para></listitem>
+ <listitem><para>Select &im; Accounts.  Here you can choose which accounts you want to use to chat to the new contact.  If you only have one &im; account, you won't see this screen.</para></listitem>
+ <listitem><para>Account-specific Add Contact Pages.  For each account, you'll get one page where you can enter the <acronym>UIN</acronym>, buddy name or Email address, depending on the &im; system in use.</para></listitem>
+-<listitem><para>Finish Screen.  All done.  Except if the &im; system requires authorization (such as <trademark>ICQ</trademark>) to add a contact to your list - in which case, you'll be prompted after the wizard exits.</para></listitem>
++<listitem><para>Finish Screen.  All done.  Except if the &im; system requires authorization to add a contact to your list - in which case, you'll be prompted after the wizard exits.</para></listitem>
+ </orderedlist>
+ 
+ <para>You can add contacts to an existing Metacontact using its context menu.</para>
+@@ -699,47 +690,17 @@ Shortcuts...</guimenuitem></menuchoice>.</para></tip>
+ 	<para>&kopete; calls different &im; systems 'Protocols'.  When you add an account, it is specific to a single protocol.  Although &kopete; tries to make instant messaging appear the same, no matter what protocol you use, there are some differences in the level of support for advanced features such as file transfer and multimedia.</para>
+ 	<sect1 id="protocols-list">
+ 		<title>Protocols</title>
+-		<sect2 id="protocols-aim">
+-			<title>AIM</title>
+-			<para>AIM supports chatrooms.  Use the <guilabel>Join Chat...</guilabel> command on the AIM account menu to join a chatroom. Contact pictures and custom emoticons are also supported.</para>
+-		</sect2>
+-		<sect2 id="protocols-icq">
+-			<title>ICQ</title>
+-			<para>ICQ has an Invisibility feature which allows you to hide from selected contacts.  You may also search the ICQ user folder when adding a contact.  A wide range of contact details can be set using the <guilabel>Properties</guilabel> option.</para>
+-		</sect2>
+-		<sect2 id="protocols-msn">
+-			<title>MSN</title> 
+-			<para>File transfer and multi user chats work.  To transfer a file,  drag the file from &konqueror; or the desktop into the chat window.  To invite someone else into a chat, drag them from the Contact List into the chat window.  The <menuchoice><guimenu>File</guimenu></menuchoice> menu also contains these commands.  In addition, MSN supports custom emoticons.</para>
+-			<para>To use file transfer, make sure port 6891 is forwarded to your computer.</para>
+-		</sect2>
+-		<sect2 id="protocols-yahoo">
+-			<title>Yahoo</title>
+-			<para>Yahoo can send and receive webcam video.  It also supports Yahoo mail and the Yahoo address book from the account menu.  Conferencing is also possible.</para>
+-		</sect2>
+ 		<sect2 id="protocols-jabber">
+ 			<title>Jabber</title>
+ 			<para>Jabber, also known as XMPP, supports file transfer, conferencing and any other services supplied by the Jabber server.  For example, many Jabber servers have a user directory, and some provide transports to other messaging systems.  To access services, use <menuchoice><guimenu>Services...</guimenu></menuchoice> on the account menu.  Jabber file transfer can work without port forwarding, but enjoys better performance where a direct connection is possible.  By default, port 8010 is used for port forwarding, but this is configurable in each account's settings.</para>
+ 		</sect2>
+-		<sect2 id="protocols-gtalk">
+-			<title>Google Talk</title>
+-			<para>Since Google Talk is based upon Jabber, it is well supported in &kopete; with the exception of voice chat, which is worked upon.</para>
+-			<para>To configure &kopete; for Google Talk: Use your complete Google Mail address as the user name.  Check <guilabel>Use protocol encryption (SSL)</guilabel>, <guilabel>Allow plain-text password authentication</guilabel> and <guilabel>Override default server information</guilabel>.  The server is <quote>talk.google.com</quote> or <quote>gmail.com</quote> and ports 443 or 5223 should be used.</para>
+-		</sect2>
+-		<sect2 id="protocols-groupwise">
+-			<title>Novell GroupWise</title>
+-			<para>GroupWise Messenger is an enterprise messenging system from Novell Inc.  The full range of features are supported, including privacy, group chat, rich text and user search.</para>
+-		</sect2>
+-		<sect2 id="protocols-gadu-gadu">
+-			<title>Gadu-Gadu</title>
+-			<para>Gadu-Gadu is a chat system originating from Poland.  At present, &kopete; supports basic chat functions.</para>
+-		</sect2>
+ 		<sect2 id="protocols-winpopup">
+ 			<title>WinPopup</title>
+ 			<para>WinPopup is a way to use &kopete; to send and receive messages with &Windows; computers on the local network.  The WinPopup protocol only supports single, plain-text messages.</para>
+ 		</sect2>
+ 		<sect2 id="protocols-others">
+ 			<title>Other protocols</title>
+-			<para>As well as the protocols named above, &kopete; has support for several other protocols.  In most cases, this is not enabled by default or an additional plugin must be installed.  Meanwhile, SMS, Skype and SILC are provided in this way.  See &kopetewww; for details, however, the &kopete; team are not responsible for these protocols.</para>
++			<para>As well as the protocols named above, &kopete; has support for several other protocols.  In most cases, this is not enabled by default or an additional plugin must be installed.  See &kopetewww; for details, however, the &kopete; team are not responsible for these protocols.</para>
+ 		</sect2>
+ 	</sect1>
+ </chapter>
+@@ -1120,7 +1081,6 @@ Documentation copyright 2003,2004,2005 &Will.Stephenson; (lists at stevello free
+ &kopete-chatstyle;
+ &kopete-pipes;
+ &kopete-jabber;
+-&kopete-icq;
+ 
+ &documentation.index;
+ </book>
diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/mediastreamer29.patch b/nonprism/kdenetwork-kopete-libre-nonprism/mediastreamer29.patch
new file mode 100644
index 000000000..eb0b2297e
--- /dev/null
+++ b/nonprism/kdenetwork-kopete-libre-nonprism/mediastreamer29.patch
@@ -0,0 +1,22 @@
+diff --git a/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc b/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc
+index 88fdbd1..57c6c05 100644
+--- a/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc
++++ b/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc
+@@ -200,7 +200,7 @@ bool LinphoneVoiceChannel::SetSendCodecs(const std::vector<AudioCodec>& codecs)
+       LOG(LS_INFO) << "Using " << i->name << "/" << i->clockrate;
+       pt_ = i->id;
+       audio_stream_ = audio_stream_start(&av_profile, -1, "localhost", port1, i->id, 250, 0); /* -1 means that function will choose some free port */
+-      port2 = rtp_session_get_local_port(audio_stream_->session);
++      port2 = rtp_session_get_local_port(audio_stream_->ms.session);
+       first = false;
+     }
+   }
+@@ -211,7 +211,7 @@ bool LinphoneVoiceChannel::SetSendCodecs(const std::vector<AudioCodec>& codecs)
+     // working with a buggy client; let's try PCMU.
+     LOG(LS_WARNING) << "Received empty list of codces; using PCMU/8000";
+     audio_stream_ = audio_stream_start(&av_profile, -1, "localhost", port1, 0, 250, 0); /* -1 means that function will choose some free port */
+-    port2 = rtp_session_get_local_port(audio_stream_->session);
++    port2 = rtp_session_get_local_port(audio_stream_->ms.session);
+   }
+ 
+   return true;
diff --git a/nonprism/kdepim-runtime-nonprism/PKGBUILD b/nonprism/kdepim-runtime-nonprism/PKGBUILD
index 8bc3de90e..204a69809 100644
--- a/nonprism/kdepim-runtime-nonprism/PKGBUILD
+++ b/nonprism/kdepim-runtime-nonprism/PKGBUILD
@@ -4,19 +4,19 @@
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=kdepim-runtime
-pkgname=kdepim-runtime-coherence
+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')
-depends=('kdebase-runtime' 'libkolab' 'libkfbapi')
+depends=('kdebase-runtime' 'libkolab')
 makedepends=('cmake' 'automoc4' 'boost')
 install="${_pkgname}.install"
-replaces=$_pkgname
-conflicts=$_pkgname
-provides=$_pkgname=$pkgver
+replaces=('kdepim-runtime' 'kdepim-runtime-coherence')
+conflicts=kdepim-runtime
+provides=kdepim-runtime=$pkgver
 source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz")
 sha1sums=('ec2a45baf0c2c2ccea633b599a453db52b38dc75')
 
diff --git a/nonprism/your-privacy/PKGBUILD b/nonprism/your-privacy/PKGBUILD
index c5bfbe5d7..3dbc1c733 100644
--- a/nonprism/your-privacy/PKGBUILD
+++ b/nonprism/your-privacy/PKGBUILD
@@ -1,5 +1,5 @@
 # Maintainer: Parabola Project <dev@list.parabolagnulinux.org>
-pkgname=your-coherence
+pkgname=your-privacy
 pkgver=$(LC_ALL=C date -u +%Y%m%d)
 pkgrel=1
 pkgdesc="This package will remove support for unsafe/dangerous for privacy protocols/services."
@@ -7,6 +7,7 @@ arch=('any')
 url="https://parabolagnulinux.org"
 license=('GPL3')
 install=${pkgname}.install
+replaces=your-coherence
 source=(${pkgname}-blacklist-${pkgver}.txt::https://projects.parabolagnulinux.org/blacklist.git/plain/${pkgname}-blacklist.txt)
 
 package() {
diff --git a/nonprism/your-privacy/your-privacy.install b/nonprism/your-privacy/your-privacy.install
index d5ece49d4..965fdbf43 100644
--- a/nonprism/your-privacy/your-privacy.install
+++ b/nonprism/your-privacy/your-privacy.install
@@ -14,11 +14,11 @@ pre_install() {
 
   Have in mind that, if you want to retain certain packages that support
   unsafe/dangerous for privacy protocols/services installed on your system,
-  you'll have to remove your-coherence :)
+  you'll have to remove your-privacy :)
 
-  Please report any issue to the Coherence Team on the usual channels:
+  Please report any issue to the Nonprism Team on the usual channels:
   * https://labs.parabola.nu
-  * irc://freenode.net/#your-coherence
+  * irc://freenode.net/#nonprism
   * mailto:dev@lists.parabolagnulinux.org
 EOM
 }