50 files changed, 167 insertions, 204 deletions

diff --git a/nonprism/amarok-nonprism/PKGBUILD b/nonprism/amarok/PKGBUILD
index 6bf592d5b..d9a4013a6 100644
--- a/nonprism/amarok-nonprism/PKGBUILD
+++ b/nonprism/amarok/PKGBUILD
@@ -4,17 +4,15 @@
 # Contributor (Arch): damir <damir@archlinux.org>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-_pkgname=amarok
-pkgname=amarok-nonprism
+pkgname=amarok
 pkgver=2.8.0
-pkgrel=3
+pkgrel=3.nonprism1
 pkgdesc="The powerful music player for KDE, without Amazon MP3 store support"
 arch=("i686" "x86_64")
 url="http://amarok.kde.org/"
 license=('GPL2' 'LGPL2.1' 'FDL')
-replaces=($_pkgname)
-conflicts=($_pkgname)
-provides=($_pkgname=$pkgver)
+replaces=(${pkgname}-nonprism)
+conflicts=(${pkgname}-nonprism)
 depends=('kdebase-runtime' 'mariadb' 'qtscriptgenerator' 'taglib-extras'
         'liblastfm' 'ffmpeg' 'libofa' 'qjson')
 makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth'
@@ -24,14 +22,14 @@ optdepends=("libgpod: support for Apple iPod audio devices"
         	"loudmouth: backend needed by mp3tunes for syncing"
             "ifuse: support for Apple iPod Touch and iPhone"
             "libmygpo-qt: gpodder.net Internet Service")
-install="${_pkgname}.install"
-source=("http://download.kde.org/stable/${_pkgname}/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2"
+install="${pkgname}.install"
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
         'remove-amazon-references-on-docs.patch')
 sha1sums=('e76ccd53c05d57f9457d74cd08c2c41383c00937'
           'eed2616fd1465cd16f86f2e3554e3b34b83557af')
 
 prepare() {
-  cd ${srcdir}/${_pkgname}-${pkgver}
+  cd ${srcdir}/${pkgname}-${pkgver}
   sed -i '\|amzdownloader|d' utilities/CMakeLists.txt
   sed -i '\|amazon|d' src/services/CMakeLists.txt
   patch -Np1 -i ${srcdir}/remove-amazon-references-on-docs.patch
@@ -41,7 +39,7 @@ prepare() {
 
 build() {
   cd build
-  cmake ../${_pkgname}-${pkgver} \
+  cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DKDE4_BUILD_TESTS=OFF \
     -DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/nonprism/amarok-nonprism/amarok.install b/nonprism/amarok/amarok.install
index 81ce5c4b0..81ce5c4b0 100644
--- a/nonprism/amarok-nonprism/amarok.install
+++ b/nonprism/amarok/amarok.install
diff --git a/nonprism/amarok-nonprism/remove-amazon-references-on-docs.patch b/nonprism/amarok/remove-amazon-references-on-docs.patch
index b2b824c4d..b2b824c4d 100644
--- a/nonprism/amarok-nonprism/remove-amazon-references-on-docs.patch
+++ b/nonprism/amarok/remove-amazon-references-on-docs.patch
diff --git a/nonprism/banshee-nonprism/Initial-port-to-GStreamer-1.0.patch b/nonprism/banshee/Initial-port-to-GStreamer-1.0.patch
index be6593715..be6593715 100644
--- a/nonprism/banshee-nonprism/Initial-port-to-GStreamer-1.0.patch
+++ b/nonprism/banshee/Initial-port-to-GStreamer-1.0.patch
diff --git a/nonprism/banshee-nonprism/PKGBUILD b/nonprism/banshee/PKGBUILD
index 6d1fc3db0..f8487407b 100644
--- a/nonprism/banshee-nonprism/PKGBUILD
+++ b/nonprism/banshee/PKGBUILD
@@ -3,10 +3,9 @@
 # Contributor (Arch): György Balló <ballogy@freestart.hu>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-_pkgname=banshee
-pkgname=banshee-nonprism
+pkgname=banshee
 pkgver=2.6.2
-pkgrel=4
+pkgrel=4.nonprism1
 pkgdesc="Music management and playback for GNOME, without gdata-sharp support"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://banshee.fm/"
@@ -16,11 +15,10 @@ makedepends=('intltool' 'gnome-doc-utils' 'gtk-sharp-beans' 'gnome-common')
 optdepends=('gst-plugins-ugly: Extra media codecs'
             'gst-libav: Extra media codecs'
             'brasero: CD burning')
-replaces=($_pkgname)
-conflicts=($_pkgname)
-provides=($_pkgname=$pkgver)
-install=$_pkgname.install
-source=(http://download.gnome.org/sources/$_pkgname/2.6/$_pkgname-$pkgver.tar.xz
+replaces=(${pkgname}-nonprism)
+conflicts=(${pkgname}-nonprism)
+install=$pkgname.install
+source=(http://download.gnome.org/sources/$pkgname/2.6/$pkgname-$pkgver.tar.xz
         Initial-port-to-GStreamer-1.0.patch
         Remove-build-time-enable-gapless-playback-option.patch)
 md5sums=('12dbb8a996783f7081d538062a8589b7'
@@ -28,7 +26,7 @@ md5sums=('12dbb8a996783f7081d538062a8589b7'
          '0bf7ee4241b12538779c9ecc401d142a')
 
 prepare() {
-  cd $_pkgname-$pkgver
+  cd $pkgname-$pkgver
   patch -p1 -i ../Initial-port-to-GStreamer-1.0.patch
   patch -p1 -i ../Remove-build-time-enable-gapless-playback-option.patch
 }
@@ -37,7 +35,7 @@ build() {
   export MONO_SHARED_DIR="$srcdir/.wabi"
   mkdir -p "$MONO_SHARED_DIR"
 
-  cd $_pkgname-$pkgver
+  cd $pkgname-$pkgver
 
   # Disable youtube extension because it needs gdata-sharp to works
   MCS=/usr/bin/dmcs ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
@@ -55,8 +53,8 @@ package() {
   export MONO_SHARED_DIR="$srcdir/.wabi"
   mkdir -p "$MONO_SHARED_DIR"
 
-  cd "$srcdir/$_pkgname-$pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
 
-  install -D -m644 COPYING "$pkgdir/usr/share/licenses/$_pkgname/COPYING"
+  install -D -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
diff --git a/nonprism/banshee-nonprism/Remove-build-time-enable-gapless-playback-option.patch b/nonprism/banshee/Remove-build-time-enable-gapless-playback-option.patch
index dec054b5a..dec054b5a 100644
--- a/nonprism/banshee-nonprism/Remove-build-time-enable-gapless-playback-option.patch
+++ b/nonprism/banshee/Remove-build-time-enable-gapless-playback-option.patch
diff --git a/nonprism/banshee-nonprism/banshee.install b/nonprism/banshee/banshee.install
index 079ac953d..079ac953d 100644
--- a/nonprism/banshee-nonprism/banshee.install
+++ b/nonprism/banshee/banshee.install
diff --git a/nonprism/bitlbee-nonprism/PKGBUILD b/nonprism/bitlbee/PKGBUILD
index 8ea7706a7..dc271e9cc 100644
--- a/nonprism/bitlbee-nonprism/PKGBUILD
+++ b/nonprism/bitlbee/PKGBUILD
@@ -8,10 +8,9 @@
 # Maintainer (Arch): Dave Reisner <dreisner@archlinux.org>
 # Maintainer: Márcio Silva <coadde@parabola.nu>
 
-_pkgname=bitlbee
-pkgname=bitlbee-nonprism
+pkgname=bitlbee
 pkgver=3.2.2
-pkgrel=1
+pkgrel=1.parabola1.nonprism1
 pkgdesc='Brings XMPP to IRC, without nonfree Skype support and support for unsafe and dangerous for privacy protocols'
 url='http://www.bitlbee.org/'
 license=('GPL')
@@ -19,10 +18,9 @@ arch=('i686' 'x86_64' 'mips64el')
 depends=('gnutls' 'glib2')
 makedepends=('asciidoc' 'libotr')
 optdepends=('libotr: for OTR encryption support')
-provides=(${_pkgname}=$pkgver)
-conflicts=("${_pkgname}" "${_pkgname}-libre" "${_pkgname}-coherence" "${_pkgname}-libre-nonprism" "${_pkgname}-parabola")
-replaces=("${_pkgname}" "${_pkgname}-libre" "${_pkgname}-coherence" "${_pkgname}-libre-nonprism" "${_pkgname}-parabola")
-source=("http://get.bitlbee.org/src/$_pkgname-$pkgver.tar.gz"
+replaces=("${pkgname}-libre" "${pkgname}-parabola" "${pkgname}-coherence" "${pkgname}-libre-nonprism" "${pkgname}-nonprism")
+conflicts=("${pkgname}-libre" "${pkgname}-parabola" "${pkgname}-coherence" "${pkgname}-libre-nonprism" "${pkgname}-nonprism")
+source=("http://get.bitlbee.org/src/$pkgname-$pkgver.tar.gz"
         'bitlbee.tmpfiles')
 sha1sums=('7e3cfe2b6bf4e8e603c74e7587307a6f5d267e9c'
           '3695ed2fe22436c4d0fc3ead829f7d1f89bc491c')
@@ -31,7 +29,7 @@ backup=('etc/bitlbee/bitlbee.conf'
 install=bitlbee.install
 
 build() {
-  cd "$_pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
   ./configure \
     --prefix=/usr \
@@ -54,7 +52,7 @@ build() {
 }
 
 package() {
-  make -C "$_pkgname-$pkgver" DESTDIR="$pkgdir" install{,-etc,-dev,-systemd}
+  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install{,-etc,-dev,-systemd}
 
   install -o65 -g65 -dm770 "$pkgdir/var/lib/bitlbee"
   install -Dm644 "$srcdir/bitlbee.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/bitlbee.conf"
diff --git a/nonprism/bitlbee-nonprism/bitlbee.install b/nonprism/bitlbee/bitlbee.install
index c8a8f93a1..c8a8f93a1 100644
--- a/nonprism/bitlbee-nonprism/bitlbee.install
+++ b/nonprism/bitlbee/bitlbee.install
diff --git a/nonprism/bitlbee-nonprism/bitlbee.tmpfiles b/nonprism/bitlbee/bitlbee.tmpfiles
index da72a0a79..da72a0a79 100644
--- a/nonprism/bitlbee-nonprism/bitlbee.tmpfiles
+++ b/nonprism/bitlbee/bitlbee.tmpfiles
diff --git a/nonprism/bti-nonprism/PKGBUILD b/nonprism/bti/PKGBUILD
index b7df4c6a2..24a45223b 100644
--- a/nonprism/bti-nonprism/PKGBUILD
+++ b/nonprism/bti/PKGBUILD
@@ -4,37 +4,35 @@
 # Contributor (Arch): uvok <uvok at online dot de>
 # Contributor (Arch): Urist <9362773 at gmail.com>
 
-_pkgname=bti
-pkgname=bti-nonprism
+pkgname=bti
 pkgver=034
-pkgrel=1
+pkgrel=1.nonprism1
 pkgdesc='Console client for status.net, without Twitter support'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://gregkh.github.com/bti/'
 license=('GPL')
 depends=('pcre' 'libxml2' 'curl' 'liboauth' 'json-c')
-provides=($_pkgname=$pkgver)
-conflicts=($_pkgname)
-replaces=($_pkgname)
-source=(http://www.kernel.org/pub/software/web/$_pkgname/$_pkgname-$pkgver.tar.xz
+conflicts=(${pkgname}-nonprism)
+replaces=(${pkgname}-nonprism)
+source=(http://www.kernel.org/pub/software/web/$pkgname/$pkgname-$pkgver.tar.xz
         nonprism.patch)
 sha256sums=('8b4a1a11f529f83956468acadaea9d11db4f03e82afe07fecb84b2d00e9eae83'
             '86eab6c949e3c19d3a4088fac78fba4709845e9d5871b12c17a944127347498c')
 
 prepare() {
-  cd "${srcdir}"/$_pkgname-$pkgver
+  cd "${srcdir}"/$pkgname-$pkgver
   patch -Np1 -i ${srcdir}/nonprism.patch
 }
 
 build() {
-  cd "${srcdir}"/$_pkgname-$pkgver
+  cd "${srcdir}"/$pkgname-$pkgver
   ./configure --prefix=/usr
 
   make
 }
 
 package() {
-  cd "${srcdir}"/$_pkgname-$pkgver
+  cd "${srcdir}"/$pkgname-$pkgver
   
   make DESTDIR="${pkgdir}" install
 }
diff --git a/nonprism/bti-nonprism/nonprism.patch b/nonprism/bti/nonprism.patch
index 9423d03a7..9423d03a7 100644
--- a/nonprism/bti-nonprism/nonprism.patch
+++ b/nonprism/bti/nonprism.patch
diff --git a/nonprism/centerim-nonprism/PKGBUILD b/nonprism/centerim/PKGBUILD
index 58f77e1aa..6813a7bdf 100644
--- a/nonprism/centerim-nonprism/PKGBUILD
+++ b/nonprism/centerim/PKGBUILD
@@ -3,31 +3,29 @@
 # Contributor (Arch): Aaron Griffin <aaron@archlinux.org>
 # Contributor (Arch): shild <sxp@bk.ru>
 
-_pkgname=centerim
-pkgname=centerim-nonprism
+pkgname=centerim
 pkgver=4.22.10
-pkgrel=3
+pkgrel=3.nonprism1
 pkgdesc="Fork of CenterICQ - A text mode menu- and window-driven IM interface, without support for unsafe and dangerous for privacy protocols"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.centerim.org"
 license=('GPL')
 depends=('python2' 'libjpeg' 'gpgme')
-replaces=("$_pkgname" 'centericq')
-conflicts=($_pkgname)
-provides=($_pkgname=$pkgver)
-source=("http://www.centerim.org/download/releases/$_pkgname-$pkgver.tar.gz"
+replaces=('centericq' "${pkgname}-nonprism")
+conflicts=(${pkgname}-nonprism)
+source=("http://www.centerim.org/download/releases/$pkgname-$pkgver.tar.gz"
         'nonprism.patch')
 md5sums=('7565c3c8cac98a4e2d8524076a44676f'
          '74887744683b68ea37d4d020c80fb675')
 
 prepare() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
   # add patch to remove more protocols
   patch -Np1 -i "${srcdir}/nonprism.patch"
 }
 
 build() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
   sed -i 's#python#python2#' misc/CenterIMLog2HTML.py
   sed -i '1,1i#include <stdio.h>' libicq2000/libicq2000/sigslot.h
   ./configure --prefix=/usr \
@@ -43,6 +41,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
diff --git a/nonprism/centerim-nonprism/nonprism.patch b/nonprism/centerim/nonprism.patch
index 43c732966..43c732966 100644
--- a/nonprism/centerim-nonprism/nonprism.patch
+++ b/nonprism/centerim/nonprism.patch
diff --git a/nonprism/choqok-nonprism/PKGBUILD b/nonprism/choqok/PKGBUILD
index 62d23478c..6a815e7c6 100644
--- a/nonprism/choqok-nonprism/PKGBUILD
+++ b/nonprism/choqok/PKGBUILD
@@ -5,27 +5,26 @@
 # Contributor (Arch): Bram Schoenmakers <me@bramschoenmakers.nl>
 # Maintainer: Márcio Silva <coadde@parabola.nu>
 
-_pkgname=choqok
-pkgname=choqok-nonprism
+pkgname=choqok
 pkgver=1.4
-pkgrel=1.1
+pkgrel=1.nonprism1
 pkgdesc="A status.net client for KDE, without Twitter support"
 url='http://choqok.gnufolks.org/'
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
-provides=("$_pkgname=$pkgver")
-conflicts=($_pkgname)
+conflicts=(${pkgname}-nonprism)
+replaces=(${pkgname}-nonprism)
 depends=('kdebase-runtime' 'qjson' 'qoauth' 'qca-ossl')
 makedepends=('cmake' 'automoc4')
 optdepends=('kdebase-konqueror: proxy support')
-install="${_pkgname}.install"
-source=("http://downloads.sourceforge.net/${_pkgname}/${_pkgname}-${pkgver}.tar.xz")
+install="${pkgname}.install"
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz")
 md5sums=('2efe34ed903b448a21d9233d8033dbdb')
 
 prepare() {
   mkdir build
 
-  cd "${srcdir}/${_pkgname}-${pkgver}"
+  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
@@ -45,7 +44,7 @@ prepare() {
 
 build() {
   cd build
-  cmake ../${_pkgname}-${pkgver} \
+  cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr
   make
diff --git a/nonprism/choqok-nonprism/choqok.install b/nonprism/choqok/choqok.install
index e70c054ec..e70c054ec 100644
--- a/nonprism/choqok-nonprism/choqok.install
+++ b/nonprism/choqok/choqok.install
diff --git a/nonprism/claws-mail-nonprism/PKGBUILD b/nonprism/claws-mail/PKGBUILD
index 7dcfb61d0..016c2a385 100644
--- a/nonprism/claws-mail-nonprism/PKGBUILD
+++ b/nonprism/claws-mail/PKGBUILD
@@ -2,14 +2,13 @@
 # Maintainer (Arch): Andreas Radke <andyrtr@archlinux.org>
 # Maintainer: Márcio Silva <coadde@parabola.nu>
 
-_pkgname=claws-mail
-pkgname=$_pkgname-nonprism
+pkgname=claws-mail
 pkgver=3.10.1
-pkgrel=1
+pkgrel=1.nonprism1
 pkgdesc="A GTK+ based e-mail client, without libgdata support"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
-url="http://www.$_pkgname.org"
+url="http://www.$pkgname.org"
 depends=('gtk2' 'gnutls' 'startup-notification' 'enchant' 'gpgme' 'libetpan' 'compface'
          'libsm' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils')
 makedepends=('spamassassin' 'bogofilter' 'valgrind' 
@@ -31,16 +30,16 @@ optdepends=('python2:           needed for some tools and python plugin'
             'libsoup:           for the fancy webkit html plugin'
 	        'poppler-glib:      for pdf viewer plugin'
 	        'ghostscript:       for pdf viewer plugin')
-replaces=("$_pkgname" "sylpheed-claws" "$_pkgname-extra-plugins" "$_pkgname-libre" "$_pkgname-libre-nonprism")
-conflicts=("$_pkgname" "$_pkgname-extra-plugins")
-provides=("$_pkgname=$pkgver" 'claws')
-install=$_pkgname.install
-source=(http://downloads.sourceforge.net/sourceforge/claws-mail/$_pkgname-$pkgver.tar.xz{,.asc})
+replaces=("sylpheed-claws" "$pkgname-extra-plugins" "$pkgname-libre" "$pkgname-libre-nonprism" "$pkgname-nonprism")
+conflicts=("$pkgname-extra-plugins" "$pkgname-libre" "$pkgname-libre-nonprism" "$pkgname-nonprism")
+provides=('claws')
+install=$pkgname.install
+source=(http://downloads.sourceforge.net/sourceforge/claws-mail/$pkgname-$pkgver.tar.xz{,.asc})
 sha1sums=('fff74eabee65b78dc842abf34819cc5dd9e7feca'
           'SKIP')
 
 build() {
-  cd $_pkgname-$pkgver
+  cd $pkgname-$pkgver
 
   # fixes for python2
   export PYTHON="/usr/bin/python2"
@@ -61,7 +60,7 @@ build() {
 }
 
 package() {
-  cd $_pkgname-$pkgver
+  cd $pkgname-$pkgver
   setarch $CARCH make DESTDIR=$pkgdir install
 
   # build and install extra tools
@@ -70,6 +69,6 @@ package() {
    # 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/$_pkgname/tools/$i
+        $pkgdir/usr/lib/$pkgname/tools/$i
   done
 }
diff --git a/nonprism/claws-mail-nonprism/claws-mail.install b/nonprism/claws-mail/claws-mail.install
index 4d2f155d4..4d2f155d4 100644
--- a/nonprism/claws-mail-nonprism/claws-mail.install
+++ b/nonprism/claws-mail/claws-mail.install
diff --git a/nonprism/darktable-nonprism/PKGBUILD b/nonprism/darktable/PKGBUILD
index 6ec07aba4..0c25441c7 100644
--- a/nonprism/darktable-nonprism/PKGBUILD
+++ b/nonprism/darktable/PKGBUILD
@@ -3,18 +3,16 @@
 # Maintainer (Arch):  Christian Himpel <chressie at gmail dot com>
 # Contributor (Arch): Johannes Hanika <hanatos at gmail dot com>
 
-_pkgname=darktable
-pkgname=darktable-nonprism
+pkgname=darktable
 pkgver=1.4.2
 _pkgver=1.4
-pkgrel=3
+pkgrel=3.nonprism1
 pkgdesc="Utility to organize and develop raw images, without flickcurl support"
 arch=('i686' 'x86_64' 'mips64el')
 url=http://darktable.sf.net/
 license=('GPL3')
-replaces=($_pkgname)
-conflicts=($_pkgname)
-provides=($_pkgname=$pkgver)
+replaces=(${pkgname}-nonprism)
+conflicts=(${pkgname}-nonprism)
 depends=('exiv2>=0.18' 'intltool>=0.40' 'lcms2' 'lensfun>=0.2.3' 'libglade' 'dbus-glib'
 	 'curl' 'libgnome-keyring' 'libgphoto2' 'openexr' 'sqlite' 'libxslt'
 	 'libsoup' 'gtk-engines' 'json-glib')
@@ -25,7 +23,7 @@ source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/
 md5sums=('f86554329c2c809ffb009244a6f1d643')
 
 build() {
-  cd "$srcdir/$_pkgname-$pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
   mkdir -p build
   cd build
   CXXFLAGS+=" -fpermissive"
@@ -41,7 +39,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$_pkgname-$pkgver/build"
+  cd "$srcdir/$pkgname-$pkgver/build"
   make DESTDIR="$pkgdir" install
-  mv "${pkgdir}/usr/share/doc/darktable" "${pkgdir}/usr/share/doc/${_pkgname}-${pkgver}"
+  mv "${pkgdir}/usr/share/doc/darktable" "${pkgdir}/usr/share/doc/${pkgname}-${pkgver}"
 }
diff --git a/nonprism/darktable-nonprism/darktable.install b/nonprism/darktable/darktable.install
index 24b15a4f5..24b15a4f5 100644
--- a/nonprism/darktable-nonprism/darktable.install
+++ b/nonprism/darktable/darktable.install
diff --git a/nonprism/duplicity-nonprism/PKGBUILD b/nonprism/duplicity/PKGBUILD
index a145c4165..f1fb1feef 100644
--- a/nonprism/duplicity-nonprism/PKGBUILD
+++ b/nonprism/duplicity/PKGBUILD
@@ -4,17 +4,15 @@
 # Contributor (Arch): Aaron Schaefer <aaron@elasticdog.com>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-_pkgname=duplicity
-pkgname=duplicity-nonprism
+pkgname=duplicity
 pkgver=0.6.24
-pkgrel=1
+pkgrel=1.nonprism1
 pkgdesc='A utility for encrypted, bandwidth-efficient backups using the rsync algorithm, without python2-gdata recommendation'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.nongnu.org/duplicity/'
 license=('GPL')
-replaces=($_pkgname)
-conflicts=($_pkgname)
-provides=($_pkgname=$pkgver)
+replaces=(${pkgname}-nonprism)
+conflicts=(${pkgname}-nonprism)
 depends=('gnupg' 'librsync' 'ncftp' 'python2-paramiko' 'python2-lockfile')
 makedepends=('python2-setuptools')
 optdepends=('lftp: FTPS backend'
@@ -24,12 +22,12 @@ optdepends=('lftp: FTPS backend'
             'python2-httplib2: Ubuntu One backend'
             'python2-oauthlib: Ubuntu One backend'
             'rsync: rsync backend')
-source=("https://launchpad.net/$_pkgname/0.6-series/$pkgver/+download/$_pkgname-$pkgver.tar.gz"{,.sig})
+source=("https://launchpad.net/$pkgname/0.6-series/$pkgver/+download/$pkgname-$pkgver.tar.gz"{,.sig})
 md5sums=('5d4e9329a6d793880909d18b0736ff06'
          'SKIP')
 
 build() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   # python2 fix
   for file in $(find . -name '*.py' -print); do
@@ -39,12 +37,12 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
   
   python2 setup.py install --root="$pkgdir" --optimize=1
 
   # fix broken documentation permissions until upstream does (FS#27301)
-  chmod 644 "$pkgdir/usr/share/man/man1/$_pkgname.1"
+  chmod 644 "$pkgdir/usr/share/man/man1/$pkgname.1"
   chmod 644 "$pkgdir/usr/share/man/man1/rdiffdir.1"
-  chmod 644 "$pkgdir/usr/share/doc/$_pkgname-$pkgver"/*
+  chmod 644 "$pkgdir/usr/share/doc/$pkgname-$pkgver"/*
 }
diff --git a/nonprism/duplicity-nonprism/gpg-encode.patch b/nonprism/duplicity/gpg-encode.patch
index f9159a3ca..f9159a3ca 100644
--- a/nonprism/duplicity-nonprism/gpg-encode.patch
+++ b/nonprism/duplicity/gpg-encode.patch
diff --git a/nonprism/eog-plugins-nonprism/PKGBUILD b/nonprism/eog-plugins/PKGBUILD
index 513284441..78ff2bd78 100644
--- a/nonprism/eog-plugins-nonprism/PKGBUILD
+++ b/nonprism/eog-plugins/PKGBUILD
@@ -2,25 +2,23 @@
 # Maintainer (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Maintainer: Márcio Silva <coadde@parabola.nu>
 
-_pkgname=eog-plugins
-pkgname=eog-plugins-nonprism
+pkgname=eog-plugins
 pkgver=3.12.1
-pkgrel=1
+pkgrel=1.nonprism1
 pkgdesc="Plugins for Eye of Gnome, without libgdata support"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://wiki.gnome.org/Apps/EyeOfGnome/Plugins"
 license=('GPL2')
 depends=('eog' 'libchamplain')
 makedepends=('intltool')
-provides=("$_pkgname=$pkgver")
-conflicts=($_pkgname)
-replaces=($_pkgname)
+conflicts=(${pkgname}-nonprism)
+replaces=(${pkgname}-nonprism)
 install=eog-plugins.install
-source=(http://download.gnome.org/sources/$_pkgname/${pkgver:0:4}/$_pkgname-$pkgver.tar.xz)
+source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
 sha256sums=('5b9a6854d5411e75aadb9d44694bbe02a35f5a79a23da5c1bb4feb6bacf56f1c')
 
 build() {
-  cd $_pkgname-$pkgver
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr \
     --sysconfdir=/etc --localstatedir=/var
 
@@ -31,7 +29,7 @@ build() {
 }
 
 package() {
-  cd $_pkgname-$pkgver
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 }
 
diff --git a/nonprism/eog-plugins-nonprism/eog-plugins.install b/nonprism/eog-plugins/eog-plugins.install
index 24072f316..24072f316 100644
--- a/nonprism/eog-plugins-nonprism/eog-plugins.install
+++ b/nonprism/eog-plugins/eog-plugins.install
diff --git a/nonprism/evolution-data-server-nonprism/PKGBUILD b/nonprism/evolution-data-server/PKGBUILD
index 346eba000..ba85ed48e 100644
--- a/nonprism/evolution-data-server-nonprism/PKGBUILD
+++ b/nonprism/evolution-data-server/PKGBUILD
@@ -1,25 +1,23 @@
 # $Id: PKGBUILD 220453 2014-08-20 20:13:44Z heftig $
 # Maintainer (Arch): Jan de Groot <jgc@archlinux.org>
 
-_pkgname=evolution-data-server
-pkgname=evolution-data-server-nonprism
+pkgname=evolution-data-server
 pkgver=3.12.5
-pkgrel=1
+pkgrel=1.nonprism1
 pkgdesc="Centralized access to appointments and contacts, without libgdata support"
 arch=(i686 x86_64)
 depends=(gnome-online-accounts nss krb5 libgweather libical db)
 makedepends=(intltool gperf gobject-introspection vala python2)
-install=$_pkgname.install
+install=$pkgname.install
 url="https://wiki.gnome.org/Apps/Evolution"
 license=(GPL)
-replaces=("$_pkgname" 'evolution-data-server-coherence')
-conflicts=($_pkgname)
-provides=($_pkgname=$pkgver)
-source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:4}/$_pkgname-$pkgver.tar.xz)
+replaces=("${pkgname}-coherence" "${pkgname}-nonprism")
+conflicts=("${pkgname}-coherence" "${pkgname}-nonprism")
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
 sha256sums=('d3a2f832f823cb2a41467926dcaec984a15b2cb51ef89cf41267e337ca750811')
 
 build() {
-  cd "$_pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --with-openldap=yes \
       --libexecdir=/usr/lib/evolution-data-server \
@@ -32,6 +30,6 @@ build() {
 }
 
 package() {
-  cd "$_pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
 }
diff --git a/nonprism/evolution-data-server-nonprism/evolution-data-server.install b/nonprism/evolution-data-server/evolution-data-server.install
index e75920e11..e75920e11 100644
--- a/nonprism/evolution-data-server-nonprism/evolution-data-server.install
+++ b/nonprism/evolution-data-server/evolution-data-server.install
diff --git a/nonprism/evolution-data-server-nonprism/git-fixes.patch b/nonprism/evolution-data-server/git-fixes.patch
index 88c0a1fb6..88c0a1fb6 100644
--- a/nonprism/evolution-data-server-nonprism/git-fixes.patch
+++ b/nonprism/evolution-data-server/git-fixes.patch
diff --git a/nonprism/gnome-online-accounts-nonprism/PKGBUILD b/nonprism/gnome-online-accounts/PKGBUILD
index 50d26f50e..2a0b56d78 100644
--- a/nonprism/gnome-online-accounts-nonprism/PKGBUILD
+++ b/nonprism/gnome-online-accounts/PKGBUILD
@@ -2,27 +2,25 @@
 # Maintainer (Arch): Ionut Biru <ibiru@archlinux.org>
 # Maintainer: Márcio Silva <coadde@parabola.nu>
 
-_pkgname=gnome-online-accounts
-pkgname=gnome-online-accounts-nonprism
+pkgname=gnome-online-accounts
 pkgver=3.12.3
-pkgrel=1
+pkgrel=1.nonprism1
 pkgdesc="GNOME service to access online accounts, without support for unsafe and dangerous for privacy protocols"
 arch=(i686 x86_64 mips64el)
 url="http://www.gnome.org"
 license=('GPL')
-provides=("$_pkgname=$pkgver")
-conflicts=($_pkgname)
-replaces=($_pkgname $pkgname-coherence)
+conflicts=("${pkgname}-coherence" "${pkgname}-nonprism" )
+replaces=("${pkgname}-coherence" "${pkgname}-nonprism")
 depends=('webkitgtk' 'json-glib' 'libnotify' 'rest' 'hicolor-icon-theme' 'libsecret'
          'telepathy-glib' 'krb5' 'gcr')
 makedepends=('intltool' 'libxslt' 'gobject-introspection' 'docbook-xsl')
-install=$_pkgname.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:4}/$_pkgname-$pkgver.tar.xz)
+install=$pkgname.install
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
 sha256sums=('afd7e2f0e6eccbde92f10183ea366c95b579767c540442ef82e4009d7759eda6')
 
 build() {
-  cd $_pkgname-$pkgver
-  ./configure --prefix=/usr --libexecdir=/usr/lib/$_pkgname --disable-static \
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --libexecdir=/usr/lib/$pkgname --disable-static \
     --disable-exchange --disable-facebook -disable-flickr \
     --disable-google --enable-imap-smtp --disable-kerberos \
     --enable-owncloud --enable-telepathy --disable-windows-live \
@@ -31,7 +29,7 @@ build() {
 }
 
 package() {
-  cd $_pkgname-$pkgver
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 }
 
diff --git a/nonprism/gnome-online-accounts-nonprism/gnome-online-accounts.install b/nonprism/gnome-online-accounts/gnome-online-accounts.install
index 525ecff63..525ecff63 100644
--- a/nonprism/gnome-online-accounts-nonprism/gnome-online-accounts.install
+++ b/nonprism/gnome-online-accounts/gnome-online-accounts.install
diff --git a/nonprism/grilo-plugins-nonprism/PKGBUILD b/nonprism/grilo-plugins/PKGBUILD
index f2b675538..64378c771 100644
--- a/nonprism/grilo-plugins-nonprism/PKGBUILD
+++ b/nonprism/grilo-plugins/PKGBUILD
@@ -2,17 +2,15 @@
 # Maintainer (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-_pkgname=grilo-plugins
-pkgname=grilo-plugins-nonprism
+pkgname=grilo-plugins
 pkgver=0.2.12
-pkgrel=2
+pkgrel=2.nonprism1
 pkgdesc="Plugins for Grilo, without libgdata support and gnome-online-accounts recommendation"
 url="http://www.gnome.org"
 arch=(i686 x86_64)
 license=(LGPL)
-replaces=($_pkgname)
-conflicts=($_pkgname)
-provides=($_pkgname=$pkgver)
+replaces=(${pkgname}-nonprism)
+conflicts=(${pkgname}-nonprism)
 depends=(grilo sqlite libgcrypt)
 makedepends=(gupnp-av gmime libtracker-sparql libdmapsharing
              json-glib intltool avahi itstool libmediaart lua)
@@ -26,17 +24,17 @@ optdepends=('gupnp-av: uPnP plugin'
             'lua: LUA factory plugin')
 options=('!emptydirs')
 groups=('gnome')
-source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgname}/${pkgver:0:3}/${_pkgname}-${pkgver}.tar.xz)
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz)
 sha256sums=('15bed8a633c81b251920ab677d455433e641388f605277ca88e549cc89012b48')
 
 build() {
-  cd $_pkgname-$pkgver
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc --disable-static \
     --enable-shoutcast --disable-pocket --enable-lua-factory
   make
 }
 
 package() {
-  cd $_pkgname-$pkgver
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 }
diff --git a/nonprism/gthumb-nonprism/PKGBUILD b/nonprism/gthumb/PKGBUILD
index 23f56062c..7e379542d 100644
--- a/nonprism/gthumb-nonprism/PKGBUILD
+++ b/nonprism/gthumb/PKGBUILD
@@ -5,17 +5,15 @@
 # Maintainer: André Silva <emulatorman@parabola.nu>
 # Contributor: Márcio Silva <coadde@parabola.nu>
 
-_pkgname=gthumb
-pkgname=gthumb-nonprism
+pkgname=gthumb
 pkgver=3.2.8
-pkgrel=1
+pkgrel=1.nonprism1
 pkgdesc="Image browser and viewer for the GNOME Desktop, without support for unsafe and dangerous for privacy protocols"
 arch=(i686 x86_64)
 license=(GPL)
 url="http://live.gnome.org/gthumb"
-replaces=($_pkgname)
-conflicts=($_pkgname)
-provides=($_pkgname=$pkgver)
+replaces=(${pkgname}-nonprism)
+conflicts=(${pkgname}-nonprism)
 depends=(desktop-file-utils hicolor-icon-theme dconf librsvg clutter-gtk
          gst-plugins-base-libs gsettings-desktop-schemas libwebp libsecret
          libsoup webkitgtk json-glib)
@@ -27,18 +25,18 @@ optdepends=('libopenraw: read RAW files'
             'liboauth: web albums')
 options=('!emptydirs')
 install=gthumb.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
         nonprism.patch)
 sha256sums=('d600aba747af551540f3bbae8e8afa1cc308c658d911318c98fd4bf52ecd61b8'
             '7706181514c9cfe0241329e9b14778dfa2797ddc1feb206b1cd9f07f9be31490')
 
 prepare() {
-  cd $_pkgname-$pkgver
+  cd $pkgname-$pkgver
   patch -Np1 -i $srcdir/nonprism.patch
 }
 
 build() {
-  cd $_pkgname-$pkgver
+  cd $pkgname-$pkgver
   
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
@@ -50,11 +48,11 @@ build() {
 }
 
 check() {
-  cd $_pkgname-$pkgver
+  cd $pkgname-$pkgver
   make check
 }
 
 package() {
-  cd $_pkgname-$pkgver
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 }
diff --git a/nonprism/gthumb-nonprism/gthumb.install b/nonprism/gthumb/gthumb.install
index 9d4e7822f..9d4e7822f 100644
--- a/nonprism/gthumb-nonprism/gthumb.install
+++ b/nonprism/gthumb/gthumb.install
diff --git a/nonprism/gthumb-nonprism/nonprism.patch b/nonprism/gthumb/nonprism.patch
index 0bdde908f..0bdde908f 100644
--- a/nonprism/gthumb-nonprism/nonprism.patch
+++ b/nonprism/gthumb/nonprism.patch
diff --git a/nonprism/jitsi-nonprism/PKGBUILD b/nonprism/jitsi/PKGBUILD
index d8eaa082d..d3bc07db2 100644
--- a/nonprism/jitsi-nonprism/PKGBUILD
+++ b/nonprism/jitsi/PKGBUILD
@@ -3,17 +3,15 @@
 # Maintainer: André Silva <emulatorman@parabola.nu>
 # Contributor: Márcio Silva <coadde@parabola.nu>
 
-_pkgname=jitsi
-pkgname=jitsi-nonprism
+pkgname=jitsi
 pkgver=2.4.4997
-pkgrel=1
+pkgrel=1.nonprism1
 pkgdesc="An audio/video SIP VoIP phone and instant messenger written in Java (formerly SIP-Communicator), without support for unsafe and dangerous for privacy protocols"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://jitsi.org"
 license=('LGPL')
-replaces=($_pkgname)
-conflicts=($_pkgname)
-provides=($_pkgname=$pkgver)
+replaces=(${pkgname}-nonprism)
+conflicts=(${pkgname}-nonprism)
 depends=('jre7-openjdk')
 makedepends=('apache-ant' 'jdk7-openjdk')
 options=(!strip !emptydirs zipman !libtool docs)
@@ -29,7 +27,7 @@ sha256sums=('f1c2688d7d6bf1916fed3b8b105a785662980c5b297dcab3c9e7d272647ef825'
             'b66440b35108713e2ada0d8d892c870f72363a238c6c9fa9dba24e02256d5017')
 
 prepare() {
-  cd $srcdir/$_pkgname
+  cd $srcdir/$pkgname
 
   # append the build revision to the jitsi version
   sed -i "s|0.build.by.SVN|build.$pkgver|" src/net/java/sip/communicator/impl/version/NightlyBuildID.java
@@ -75,20 +73,20 @@ prepare() {
 }
 
 build() {
-  cd $srcdir/$_pkgname
+  cd $srcdir/$pkgname
   . /etc/profile.d/apache-ant.sh
   ant rebuild
 }
 
 package() {
-  cd $srcdir/$_pkgname
-  find lib/ lib/bundle/ -maxdepth 1 -type f -exec install -Dm644 {} "${pkgdir}/usr/lib/${_pkgname}/"{} \;
-#  find lib/os-specific/linux/ -maxdepth 1 -type f -execdir install -Dm644 {} "${pkgdir}/usr/lib/${_pkgname}/lib/"{} \;
+  cd $srcdir/$pkgname
+  find lib/ lib/bundle/ -maxdepth 1 -type f -exec install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/"{} \;
+#  find lib/os-specific/linux/ -maxdepth 1 -type f -execdir install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/lib/"{} \;
   shopt -sq extglob
-  find lib/native/linux$(sed 's/_/-/g' <<<${CARCH/#*(i?86|x86)/})/ -maxdepth 1 -type f -execdir install -Dm644 {} "${pkgdir}/usr/lib/${_pkgname}/lib/native/"{} \;
-  find sc-bundles/{,os-specific/linux/} -maxdepth 1 -type f -execdir install -Dm644 {} "${pkgdir}/usr/lib/${_pkgname}/sc-bundles/"{} \;
-  install -Dm755 "${srcdir}/${_pkgname}.sh" "${pkgdir}/usr/bin/${_pkgname}"
-  install -Dm644 "${srcdir}/${_pkgname}.desktop" "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
+  find lib/native/linux$(sed 's/_/-/g' <<<${CARCH/#*(i?86|x86)/})/ -maxdepth 1 -type f -execdir install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/lib/native/"{} \;
+  find sc-bundles/{,os-specific/linux/} -maxdepth 1 -type f -execdir install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/sc-bundles/"{} \;
+  install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
+  install -Dm644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
 
   cd "resources/install/debian/"
   for _file in *.{svg,xpm}; do
diff --git a/nonprism/jitsi-nonprism/drop-open-term-on-index-jn-html.patch b/nonprism/jitsi/drop-open-term-on-index-jn-html.patch
index 8d4012a05..8d4012a05 100644
--- a/nonprism/jitsi-nonprism/drop-open-term-on-index-jn-html.patch
+++ b/nonprism/jitsi/drop-open-term-on-index-jn-html.patch
diff --git a/nonprism/jitsi-nonprism/jitsi.desktop b/nonprism/jitsi/jitsi.desktop
index dd4de82a6..dd4de82a6 100644
--- a/nonprism/jitsi-nonprism/jitsi.desktop
+++ b/nonprism/jitsi/jitsi.desktop
diff --git a/nonprism/jitsi-nonprism/jitsi.sh b/nonprism/jitsi/jitsi.sh
index 6e53cdbf5..6e53cdbf5 100644
--- a/nonprism/jitsi-nonprism/jitsi.sh
+++ b/nonprism/jitsi/jitsi.sh
diff --git a/nonprism/jitsi-nonprism/nonprism.patch b/nonprism/jitsi/nonprism.patch
index 5effbbd7d..5effbbd7d 100644
--- a/nonprism/jitsi-nonprism/nonprism.patch
+++ b/nonprism/jitsi/nonprism.patch
diff --git a/nonprism/openshot-nonprism/PKGBUILD b/nonprism/openshot/PKGBUILD
index 171cbc10d..8beac5ee7 100644
--- a/nonprism/openshot-nonprism/PKGBUILD
+++ b/nonprism/openshot/PKGBUILD
@@ -3,10 +3,9 @@
 # Contributor (Arch): Asa Marco <marcoasa90[at]gmail[.]com>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-_pkgname=openshot
-pkgname=openshot-nonprism
+pkgname=openshot
 pkgver=1.4.3
-pkgrel=3
+pkgrel=3.parabola1.nonprism1
 pkgdesc="a free, non-linear video editor for GNU/Linux based on MLT framework, without nonfree faac recommendation and Youtube uploader support"
 arch=('any')
 url="http://www.openshotvideo.com/"
@@ -15,20 +14,19 @@ depends=('mlt-python-bindings' 'pygoocanvas' 'sdl' 'librsvg' 'mplayer'
 	 'pyxdg' 'pygtk' 'python2-httplib2' 'python2-pillow')
 optdepends=('dvgrab: for IEEE digital sources'
 	    'libquicktime' 'libavc1394' 'jack' 'jack-rack' 'ladspa')
-replaces=("${_pkgname}" "${_pkgname}-libre" "${_pkgname}-parabola")
-conflicts=("${_pkgname}" "${_pkgname}-libre" "${_pkgname}-parabola")
-provides=(${_pkgname}=${pkgver})
+replaces=("${pkgname}-libre" "${pkgname}-parabola" "${pkgname}-libre-nonprism" "${pkgname}-nonprism")
+conflicts=("${pkgname}-libre" "${pkgname}-parabola" "${pkgname}-libre-nonprism" "${pkgname}-nonprism")
 install=openshot.install
-source=(http://launchpad.net/openshot/${pkgver%.*}/$pkgver/+download/$_pkgname-$pkgver.tar.gz
+source=(http://launchpad.net/openshot/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz
         nonprism.patch)
 md5sums=('5ec82a7e8b7700ee4a359458aedf19e9'
          '0b8ade6f6332d1ef9c6c153647953df7')
 prepare() {
-  cd $srcdir/$_pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver
   patch -Np1 -i $srcdir/nonprism.patch
 }
 
 package() {
-  cd $srcdir/$_pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver
   python2 setup.py install --root=$pkgdir/ --optimize=1
 }
diff --git a/nonprism/openshot-nonprism/nonprism.patch b/nonprism/openshot/nonprism.patch
index 0028f7013..0028f7013 100644
--- a/nonprism/openshot-nonprism/nonprism.patch
+++ b/nonprism/openshot/nonprism.patch
diff --git a/nonprism/openshot-nonprism/openshot.install b/nonprism/openshot/openshot.install
index 046df0051..046df0051 100644
--- a/nonprism/openshot-nonprism/openshot.install
+++ b/nonprism/openshot/openshot.install
diff --git a/nonprism/pidgin-nonprism/PKGBUILD b/nonprism/pidgin/PKGBUILD
index d6ae8811d..634906c63 100644
--- a/nonprism/pidgin-nonprism/PKGBUILD
+++ b/nonprism/pidgin/PKGBUILD
@@ -5,24 +5,24 @@
 # Contributor (Arch): Alexander Fehr <pizzapunk gmail com>
 # Contributor (Arch): Lucien Immink <l.immink@student.fnt.hvu.nl>
 
-_pkgname=pidgin
-pkgname=('pidgin-nonprism' 'libpurple-nonprism' 'finch-nonprism')
+pkgname=pidgin
+pkgname=('pidgin' 'libpurple' 'finch')
 pkgver=2.10.9
-pkgrel=2
+pkgrel=2.nonprism1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pidgin.im/"
 license=('GPL')
 makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm'
              'libidn' 'python2' 'hicolor-icon-theme' 'farstream-0.1' 'avahi'
              'tk' 'ca-certificates' 'intltool' 'networkmanager')
-source=(https://downloads.sourceforge.net/project/$_pkgname/Pidgin/$pkgver/$_pkgname-$pkgver.tar.bz2{,.asc}
+source=(https://downloads.sourceforge.net/project/$pkgname/Pidgin/$pkgver/$pkgname-$pkgver.tar.bz2{,.asc}
         nonprism.patch)
 sha256sums=('dc362ed8577f623eea4554a79e917073aa726825074fea402f2e515f0f51f319'
             'SKIP'
             'f7acfb852cdecfed16e8b116546b643cad1c44d28b56f28ff5485f92af68e9e2')
 
 prepare() {
-  cd "$srcdir/$_pkgname-$pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
 
   msg 'remove Google Talk and Facebook protocols'
   patch -Np1 -i "$srcdir/nonprism.patch"
@@ -36,7 +36,7 @@ prepare() {
 }
 
 build() {
-  cd "$srcdir/$_pkgname-$pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
 
   ./configure \
     --prefix=/usr \
@@ -53,14 +53,13 @@ build() {
     make
 }
 
-package_pidgin-nonprism(){
+package_pidgin(){
   pkgdesc="Multi-protocol instant messaging client, without support for unsafe and dangerous for privacy protocols"
   depends=('libpurple' 'startup-notification' 'gtkspell' 'libxss' 'libsm'
            'hicolor-icon-theme')
   optdepends=('aspell: for spelling correction')
-  provides=("$_pkgname=$pkgver")
-  conflicts=$_pkgname
-  replaces=$_pkgname
+  conflicts=(${pkgname}-nonprism)
+  replaces=(${pkgname}-nonprism)
   install=pidgin.install
 
   cd "$srcdir/pidgin-$pkgver"
@@ -91,16 +90,15 @@ package_pidgin-nonprism(){
          " "$pkgdir"/usr/share/applications/pidgin.desktop
 }
 
-package_libpurple-nonprism(){
+package_libpurple(){
   pkgdesc="IM library extracted from Pidgin, without support for unsafe and dangerous for privacy protocols"
   depends=('farstream-0.1' 'libsasl' 'libidn' 'dbus-glib' 'nss')
   optdepends=('avahi: Bonjour protocol support'
               'ca-certificates: SSL CA certificates'
               'python2-dbus: for purple-remote and purple-url-handler'
               'tk: Tcl/Tk scripting support')
-  provides=("${pkgname%-nonprism}=$pkgver")
-  conflicts=${pkgname%-nonprism}
-  replaces=${pkgname%-nonprism}
+  conflicts=(${pkgname}-nonprism)
+  replaces=(${pkgname}-nonprism)
 
   cd "$srcdir/pidgin-$pkgver"
 
@@ -113,12 +111,11 @@ package_libpurple-nonprism(){
   rmdir "$pkgdir"/etc{/gconf{/schemas,},}
 }
 
-package_finch-nonprism(){
+package_finch(){
   pkgdesc="A ncurses-based messaging client, without support for unsafe and dangerous for privacy protocols"
   depends=("libpurple=$pkgver-$pkgrel" 'libx11' 'python2')
-  provides=("${pkgname%-nonprism}=$pkgver")
-  conflicts=${pkgname%-nonprism}
-  replaces=${pkgname%-nonprism}
+  conflicts=(${pkgname}-nonprism)
+  replaces=(${pkgname}-nonprism)
 
   cd "$srcdir/pidgin-$pkgver"
 
diff --git a/nonprism/pidgin-nonprism/nonprism.patch b/nonprism/pidgin/nonprism.patch
index 88140268e..88140268e 100644
--- a/nonprism/pidgin-nonprism/nonprism.patch
+++ b/nonprism/pidgin/nonprism.patch
diff --git a/nonprism/pidgin-nonprism/pidgin.install b/nonprism/pidgin/pidgin.install
index 1a05f573e..1a05f573e 100644
--- a/nonprism/pidgin-nonprism/pidgin.install
+++ b/nonprism/pidgin/pidgin.install
diff --git a/nonprism/shotwell-nonprism/PKGBUILD b/nonprism/shotwell/PKGBUILD
index 0f7b84603..598973b01 100644
--- a/nonprism/shotwell-nonprism/PKGBUILD
+++ b/nonprism/shotwell/PKGBUILD
@@ -5,17 +5,15 @@
 # Maintainer: André Silva <emulatorman@parabola.nu>
 # Contributor: Márcio Silva <coadde@parabola.nu>
 
-_pkgname=shotwell
-pkgname=shotwell-nonprism
+pkgname=shotwell
 pkgver=0.18.1
-pkgrel=1
+pkgrel=1.nonprism1
 pkgdesc="A digital photo organizer designed for the GNOME desktop environment, without support for unsafe and dangerous for privacy protocols"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://yorba.org/shotwell/"
 license=('LGPL2.1')
-replaces=($_pkgname)
-conflicts=($_pkgname)
-provides=($_pkgname=$pkgver)
+replaces=(${pkgname}-nonprism)
+conflicts=(${pkgname}-nonprism)
 depends=('libgee' 'webkitgtk' 'libgexiv2' 'libraw' 'rest'
 	 'desktop-file-utils' 'dconf' 'hicolor-icon-theme' 'json-glib'
 	 'gst-plugins-base' 'libgphoto2')
@@ -27,7 +25,7 @@ md5sums=('361eeef67f5aaed36ec44b12cfd675b3'
          'b6c67e76af91be99852310e9c2be5ffa')
 
 prepare() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i ${srcdir}/nonprism.patch
 
   cd po
@@ -38,7 +36,7 @@ prepare() {
 }
 
 build() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --libexec=/usr/lib/shotwell \
 	--disable-schemas-compile \
 	--disable-desktop-update \
@@ -48,6 +46,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
diff --git a/nonprism/shotwell-nonprism/nonprism.patch b/nonprism/shotwell/nonprism.patch
index 8a83cbe3a..8a83cbe3a 100644
--- a/nonprism/shotwell-nonprism/nonprism.patch
+++ b/nonprism/shotwell/nonprism.patch
diff --git a/nonprism/shotwell-nonprism/shotwell.install b/nonprism/shotwell/shotwell.install
index bab8ecd29..bab8ecd29 100644
--- a/nonprism/shotwell-nonprism/shotwell.install
+++ b/nonprism/shotwell/shotwell.install
diff --git a/nonprism/sylpheed-nonprism/PKGBUILD b/nonprism/sylpheed/PKGBUILD
index fae1f4661..5f1b17321 100644
--- a/nonprism/sylpheed-nonprism/PKGBUILD
+++ b/nonprism/sylpheed/PKGBUILD
@@ -5,34 +5,32 @@
 # Maintainer: André Silva <emulatorman@parabola.nu>
 # Contributor: Aditya Som <icarious@hacari.org>"
 
-_pkgname=sylpheed
-pkgname=sylpheed-nonprism
+pkgname=sylpheed
 pkgver=3.4.2
-pkgrel=1
+pkgrel=1.nonprism1
 pkgdesc="Lightweight and user-friendly e-mail client, without Gmail support"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sylpheed.sraoss.jp/en/"
 license=('GPL')
-replaces=($_pkgname)
-conflicts=($_pkgname)
-provides=($_pkgname=$pkgver)
+replaces=(${pkgname}-nonprism)
+conflicts=(${pkgname}-nonprism)
 depends=('compface' 'gpgme' 'gtkspell' 'desktop-file-utils')
 makedepends=('openssl')
-install="$_pkgname.install"
-source=("http://sylpheed.sraoss.jp/$_pkgname/v${pkgver%.*}/$_pkgname-$pkgver.tar.bz2"
+install="$pkgname.install"
+source=("http://sylpheed.sraoss.jp/$pkgname/v${pkgver%.*}/$pkgname-$pkgver.tar.bz2"
         'nonprism.patch')
 md5sums=('d4e53489763ff2cb575ab02890d91dc9'
          'e1bddc14962e607cdb899ec082660639')
 
 prepare() {
-  cd $_pkgname-$pkgver
+  cd $pkgname-$pkgver
 
   # Remove Gmail support
   patch -Np1 -i "$srcdir/nonprism.patch"
 }
 
 build() {
-  cd $_pkgname-$pkgver
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr \
               --enable-ldap
   make
@@ -42,7 +40,7 @@ build() {
 }
 
 package() {
-  cd $_pkgname-$pkgver
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir/" install
 
   # Install Attachment-Tool Plug-in
diff --git a/nonprism/sylpheed-nonprism/nonprism.patch b/nonprism/sylpheed/nonprism.patch
index 50d000634..50d000634 100644
--- a/nonprism/sylpheed-nonprism/nonprism.patch
+++ b/nonprism/sylpheed/nonprism.patch
diff --git a/nonprism/sylpheed-nonprism/sylpheed.install b/nonprism/sylpheed/sylpheed.install
index e111ef946..e111ef946 100644
--- a/nonprism/sylpheed-nonprism/sylpheed.install
+++ b/nonprism/sylpheed/sylpheed.install