94 files changed, 195 insertions, 150 deletions

diff --git a/libre/gummiboot/PKGBUILD b/libre/gummiboot-parabola/PKGBUILD
index 95e25a164..9abb522b2 100644
--- a/libre/gummiboot/PKGBUILD
+++ b/libre/gummiboot-parabola/PKGBUILD
@@ -5,7 +5,8 @@
 # Contributor (Arch):  Mantas Mikulėnas <grawity@gmail.com>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-pkgname=gummiboot
+_pkgname=gummiboot
+pkgname=gummiboot-parabola
 pkgver=45
 pkgrel=1
 pkgdesc="Simple UEFI Boot Manager (Parabola rebranded)"
@@ -14,11 +15,11 @@ arch=('x86_64' 'i686' 'mips64el')
 license=('LGPL2.1')
 makedepends=('gnu-efi-libs' 'docbook-xsl' 'git')
 depends=('util-linux')
-conflicts=('gummiboot-efi')
-provides=('gummiboot-efi')
-replaces=('gummiboot-efi')
+replaces=('gummiboot-efi' "${_pkgname}")
+conflicts=('gummiboot-efi' "${_pkgname}")
+provides=('gummiboot-efi' "${_pkgname}=${pkgver}")
 options=('!strip' '!makeflags')
-source=("git://anongit.freedesktop.org/$pkgname#tag=$pkgver"
+source=("git://anongit.freedesktop.org/$_pkgname#tag=$pkgver"
         'loader.conf'
         'parabola.conf'
         'splash-parabola.bmp')
@@ -29,7 +30,7 @@ md5sums=('SKIP'
          'c146ea0e16fff867164e113c48c91fff')
 
 build() {
-	cd ${srcdir}/${pkgname}
+	cd ${srcdir}/${_pkgname}
 
 	./autogen.sh
 	./configure --sysconfdir=/etc  --with-efi-ldsdir=/usr/lib --libexecdir=/usr/lib --libdir=/usr/lib
@@ -45,7 +46,7 @@ package() {
 	## ship an Parabola GNU/Linux-libre boot splash (still has to be dropped in manually to take effect)
 	install -D -m0644 "${srcdir}/splash-parabola.bmp" "${pkgdir}/usr/lib/gummiboot/splash-parabola.bmp"
 
-	cd ${srcdir}/${pkgname}
+	cd ${srcdir}/${_pkgname}
 
 	make DESTDIR="${pkgdir}" install
 }
diff --git a/libre/gummiboot/gummiboot.install b/libre/gummiboot-parabola/gummiboot.install
index 20861d4c8..20861d4c8 100644
--- a/libre/gummiboot/gummiboot.install
+++ b/libre/gummiboot-parabola/gummiboot.install
diff --git a/libre/gummiboot/loader.conf b/libre/gummiboot-parabola/loader.conf
index b8bfb988e..b8bfb988e 100644
--- a/libre/gummiboot/loader.conf
+++ b/libre/gummiboot-parabola/loader.conf
diff --git a/libre/gummiboot/parabola.conf b/libre/gummiboot-parabola/parabola.conf
index 111072ea2..111072ea2 100644
--- a/libre/gummiboot/parabola.conf
+++ b/libre/gummiboot-parabola/parabola.conf
diff --git a/libre/gummiboot/splash-parabola.bmp b/libre/gummiboot-parabola/splash-parabola.bmp
index 11ceeff28..11ceeff28 100644
--- a/libre/gummiboot/splash-parabola.bmp
+++ b/libre/gummiboot-parabola/splash-parabola.bmp
diff --git a/libre/hardinfo/PKGBUILD b/libre/hardinfo-parabola/PKGBUILD
index 1c3e14740..27bcc4075 100644
--- a/libre/hardinfo/PKGBUILD
+++ b/libre/hardinfo-parabola/PKGBUILD
@@ -2,7 +2,8 @@
 # Maintainer (Arch): Eric Bélanger <eric@archlinux.org>
 # Contributor: Márcio Silva <coadde@parabola.nu>
 
-pkgname=hardinfo
+_pkgname=hardinfo
+pkgname=hardinfo-parabola
 pkgver=0.5.1
 pkgrel=6
 pkgdesc="A system information and benchmark tool (Parabola rebranded)"
@@ -11,14 +12,17 @@ url="http://sourceforge.net/projects/hardinfo.berlios/"
 license=('GPL2')
 depends=('gtk2' 'libsoup')
 options=('!emptydirs')
-source=(http://sourceforge.net/projects/hardinfo.berlios/files/${pkgname}-${pkgver}.tar.bz2
+replaces=($_pkgname)
+conflicts=($_pkgname)
+provides=($_pkgname=$pkgver)
+source=(http://sourceforge.net/projects/hardinfo.berlios/files/${_pkgname}-${pkgver}.tar.bz2
         fixsensors.patch hardinfo.distro)
 sha1sums=('983f0445aa60e02156bc5a5eaedeffb30b8e4d64'
           'd2151dce76dca238102937d0e15541f172bca530'
           '9425e09191cd3a365a3afce57ca1973a6439fa57')
 
 prepare() {
-  cd ${pkgname}-${pkgver}
+  cd ${_pkgname}-${pkgver}
   patch -p1 -i "${srcdir}/fixsensors.patch"
   sed -i 's|/usr/lib64|/usr/lib|' configure
   sed -i 's|lib64|lib|' binreloc.c
@@ -26,13 +30,13 @@ prepare() {
 }
 
 build() {
-  cd ${pkgname}-${pkgver}
+  cd ${_pkgname}-${pkgver}
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
+  cd ${_pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
   install -D -m644 "${srcdir}/hardinfo.distro" "${pkgdir}/etc/hardinfo.distro"
 }
diff --git a/libre/hardinfo/fixsensors.patch b/libre/hardinfo-parabola/fixsensors.patch
index 812c29458..812c29458 100644
--- a/libre/hardinfo/fixsensors.patch
+++ b/libre/hardinfo-parabola/fixsensors.patch
diff --git a/libre/hardinfo/hardinfo.distro b/libre/hardinfo-parabola/hardinfo.distro
index cf378523a..cf378523a 100644
--- a/libre/hardinfo/hardinfo.distro
+++ b/libre/hardinfo-parabola/hardinfo.distro
diff --git a/libre/libquicktime-libre/PKGBUILD b/libre/libquicktime-parabola/PKGBUILD
index 2fb92be3b..7a489e8dc 100644
--- a/libre/libquicktime-libre/PKGBUILD
+++ b/libre/libquicktime-parabola/PKGBUILD
@@ -3,7 +3,7 @@
 # Maintainer (Arch): Mateusz Herych   <heniekk@gmail.com>
 # Contributor: Jorge Lopez <jorginho@lavabit.com>
 
-pkgname=libquicktime-libre
+pkgname=libquicktime-parabola
 _pkgname=libquicktime
 pkgver=1.2.4
 pkgrel=10
@@ -17,9 +17,9 @@ source=("http://downloads.sourceforge.net/sourceforge/$_pkgname/$_pkgname-$pkgve
         ffmpeg2.0.patch)
 sha256sums=('1c53359c33b31347b4d7b00d3611463fe5e942cae3ec0fefe0d2fd413fd47368'
             'a1c8415e8e7bc04c81b946b9e3746f7d5ef24819135962280c3a7ddb3f2baa2b')
-provides=("$_pkgname=$pkgver")
-conflicts=($_pkgname)
-replaces=($_pkgname)
+replaces=("${_pkgname}" "${_pkgname}-libre")
+conflicts=("${_pkgname}" "${_pkgname}-libre")
+provides=(${_pkgname}=${pkgver})
 
 prepare() {
   cd $_pkgname-$pkgver
diff --git a/libre/libquicktime-libre/ffmpeg2.0.patch b/libre/libquicktime-parabola/ffmpeg2.0.patch
index 6bec4d99a..6bec4d99a 100644
--- a/libre/libquicktime-libre/ffmpeg2.0.patch
+++ b/libre/libquicktime-parabola/ffmpeg2.0.patch
diff --git a/libre/lsb-release/PKGBUILD b/libre/lsb-release-parabola/PKGBUILD
index d35195267..d0b083df5 100644
--- a/libre/lsb-release/PKGBUILD
+++ b/libre/lsb-release-parabola/PKGBUILD
@@ -5,25 +5,26 @@
 # Maintainer: Michał Masłowski <mtjm@mtjm.eu>
 # Contributor: André Silva emulatorman@parabola.nu>
 
-pkgname=lsb-release
+_pkgname=lsb-release
+pkgname=lsb-release-parabola
 pkgver=1.4
-pkgrel=14.2
+pkgrel=14
 pkgdesc="LSB version query program (Parabola rebranded)"
 arch=('any')
 url="http://www.linuxbase.org/"
 license=('GPL2')
 depends=('bash')
-provides=('lsb-release-libre')
-conflicts=('lsb-release-libre')
-replaces=('lsb-release-libre')
+replaces=("${_pkgname}" "${_pkgname}-libre")
+conflicts=("${_pkgname}" "${_pkgname}-libre")
+provides=(${_pkgname}=${pkgver})
 install=lsb-release.install
-source=(http://downloads.sourceforge.net/lsb/$pkgname-$pkgver.tar.gz
+source=(http://downloads.sourceforge.net/lsb/$_pkgname-$pkgver.tar.gz
         lsb_release_description.patch)
 md5sums=('30537ef5a01e0ca94b7b8eb6a36bb1e4'
          '72f562d8eaa8915ab85fba13e68c8d68')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/$_pkgname-$pkgver"
 
   patch -Np0 < "$srcdir/lsb_release_description.patch"
 
@@ -31,7 +32,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/$_pkgname-$pkgver"
 
   install -dm755 "$pkgdir/etc"
   echo "LSB_VERSION=$pkgver" >> "$pkgdir/etc/lsb-release"
diff --git a/libre/lsb-release/lsb-release.install b/libre/lsb-release-parabola/lsb-release.install
index 261df2a73..261df2a73 100644
--- a/libre/lsb-release/lsb-release.install
+++ b/libre/lsb-release-parabola/lsb-release.install
diff --git a/libre/lsb-release/lsb_release_description.patch b/libre/lsb-release-parabola/lsb_release_description.patch
index d46835b97..d46835b97 100644
--- a/libre/lsb-release/lsb_release_description.patch
+++ b/libre/lsb-release-parabola/lsb_release_description.patch
diff --git a/libre/mkisolinux/PKGBUILD b/libre/mkisolinux-parabola/PKGBUILD
index 77e2c31b6..fbe710095 100644
--- a/libre/mkisolinux/PKGBUILD
+++ b/libre/mkisolinux-parabola/PKGBUILD
@@ -1,15 +1,18 @@
 # $Id: PKGBUILD 12670 2008-09-17 21:19:05Z tpowa $
 # Maintainer (Arch): Tobias Powalowski <tpowa@archlinux.org>
 
-pkgname=mkisolinux
+_pkgname=mkisolinux
+pkgname=mkisolinux-parabola
 pkgver=2013.05
-pkgrel=1.1
+pkgrel=1
 pkgdesc="Advanced, modular isolinux bootcd image creation utility (Parabola rebranded)"
 arch=(any)
 license=('GPL')
 url="https://parabolagnulinux.org/"
 depends=('mkinitcpio' 'cdrkit' 'syslinux' 'pciutils')
-replaces=('mkbootcd')
+replaces=('mkbootcd' "$_pkgname")
+conflicts=($_pkgname)
+provides=($_pkgname=$pkgver)
 backup=(etc/mkisolinux.conf)
 source=('boot.msg' 'mkisolinux' 'mkisolinux.conf' 'options.msg')
 
@@ -22,7 +25,7 @@ package()
   install -D -m644 boot.msg "$pkgdir/usr/share/mkisolinux/boot.msg"
   install -D -m644 options.msg "$pkgdir/usr/share/mkisolinux/options.msg"
 }
-md5sums=('945d5f5d74f37718c8c9d518bfd5698d'
-         '384aac3786506ff96ec3d1147bcacfe5'
-         '3cc23d74d7e4378d1be431d68a71a173'
+md5sums=('0ddb91a127ba040ce1434776d387825e'
+         'd19183e162aff04f7f4c7b9e46be1315'
+         'a474f11ab00ecbc12dafb548bb9ac025'
          'ae0007d6679b5a575b2a9e5ac3664baf')
diff --git a/libre/mkisolinux/boot.msg b/libre/mkisolinux-parabola/boot.msg
index 2725404e0..2725404e0 100644
--- a/libre/mkisolinux/boot.msg
+++ b/libre/mkisolinux-parabola/boot.msg
diff --git a/libre/mkisolinux/mkisolinux b/libre/mkisolinux-parabola/mkisolinux
index 048d925aa..048d925aa 100755
--- a/libre/mkisolinux/mkisolinux
+++ b/libre/mkisolinux-parabola/mkisolinux
diff --git a/libre/mkisolinux/mkisolinux.conf b/libre/mkisolinux-parabola/mkisolinux.conf
index e8b1e0df0..e8b1e0df0 100644
--- a/libre/mkisolinux/mkisolinux.conf
+++ b/libre/mkisolinux-parabola/mkisolinux.conf
diff --git a/libre/mkisolinux/options.msg b/libre/mkisolinux-parabola/options.msg
index 16c6b2eda..16c6b2eda 100644
--- a/libre/mkisolinux/options.msg
+++ b/libre/mkisolinux-parabola/options.msg
diff --git a/libre/mkpxelinux/PKGBUILD b/libre/mkpxelinux-parabola/PKGBUILD
index c0c30f18c..fa328967d 100644
--- a/libre/mkpxelinux/PKGBUILD
+++ b/libre/mkpxelinux-parabola/PKGBUILD
@@ -1,14 +1,18 @@
 # $Id: PKGBUILD 197074 2013-10-21 15:42:46Z tpowa $
 # Maintainer (Arch): Tobias Powalowski <tpowa@archlinux.org>
 
-pkgname=mkpxelinux
+_pkgname=mkpxelinux
+pkgname=mkpxelinux-parabola
 pkgver=2013.10
-pkgrel=1.1
+pkgrel=1
 pkgdesc="Advanced, modular network pxe boot image creation utility (Parabola rebranded)"
 arch=(any)
 license=('GPL')
 url="https://parabolagnulinux.org/"
 depends=('mkinitcpio' 'tftp-hpa' 'syslinux')
+replaces=($_pkgname)
+conflicts=($_pkgname)
+provides=($_pkgname=$pkgver)
 backup=(etc/mkpxelinux.conf)
 optdepends=('dhcp: for dhcp server usage')
 source=('boot.msg' 'mkpxelinux' 'mkpxelinux.conf' 'options.msg')
diff --git a/libre/mkpxelinux/boot.msg b/libre/mkpxelinux-parabola/boot.msg
index 6c1fcd476..6c1fcd476 100644
--- a/libre/mkpxelinux/boot.msg
+++ b/libre/mkpxelinux-parabola/boot.msg
diff --git a/libre/mkpxelinux/mkpxelinux b/libre/mkpxelinux-parabola/mkpxelinux
index 35e946f82..35e946f82 100755
--- a/libre/mkpxelinux/mkpxelinux
+++ b/libre/mkpxelinux-parabola/mkpxelinux
diff --git a/libre/mkpxelinux/mkpxelinux.conf b/libre/mkpxelinux-parabola/mkpxelinux.conf
index 55aba8247..55aba8247 100644
--- a/libre/mkpxelinux/mkpxelinux.conf
+++ b/libre/mkpxelinux-parabola/mkpxelinux.conf
diff --git a/libre/mkpxelinux/options.msg b/libre/mkpxelinux-parabola/options.msg
index 16c6b2eda..16c6b2eda 100644
--- a/libre/mkpxelinux/options.msg
+++ b/libre/mkpxelinux-parabola/options.msg
diff --git a/libre/mksyslinux/PKGBUILD b/libre/mksyslinux-parabola/PKGBUILD
index 4628c66e6..0369ebbc2 100644
--- a/libre/mksyslinux/PKGBUILD
+++ b/libre/mksyslinux-parabola/PKGBUILD
@@ -1,13 +1,17 @@
 # $Id: PKGBUILD 187120 2013-06-04 06:46:39Z tpowa $
 # Maintainer (Arch): Tobias Powalowski <tpowa@archlinux.org>
 
-pkgname=mksyslinux
+_pkgname=mksyslinux
+pkgname=mksyslinux-parabola
 pkgver=2013.06
-pkgrel=1.1
+pkgrel=1
 pkgdesc="Advanced, modular syslinux boot image creation utility (Parabola rebranded)"
 arch=(any)
 license=('GPL')
 url="https://parabolagnulinux.org/"
+replaces=($_pkgname)
+conflicts=($_pkgname)
+provides=($_pkgname=$pkgver)
 depends=('mkinitcpio' 'syslinux' 'pciutils')
 backup=(etc/mksyslinux.conf)
 source=('boot.msg' 'mksyslinux' 'mksyslinux.conf' 'options.msg')
@@ -20,7 +24,7 @@ package()
   install -D -m644 boot.msg "$pkgdir/usr/share/mksyslinux/boot.msg"
   install -D -m644 options.msg  "$pkgdir/usr/share/mksyslinux/options.msg"
 }
-md5sums=('287aad9693ca8061495e248c41ba43a7'
+md5sums=('e9836ac2bbb436ca3a13bfbe9cc5c19a'
          '0a9fd93356b5d98ab386f28bc849b808'
-         '15742e47e40a46491694b4b7680d4e38'
+         'c702b0b41ae7f58e9b08b53f3b6b0961'
          'ae0007d6679b5a575b2a9e5ac3664baf')
diff --git a/libre/mksyslinux/boot.msg b/libre/mksyslinux-parabola/boot.msg
index 2cfe24d42..2cfe24d42 100644
--- a/libre/mksyslinux/boot.msg
+++ b/libre/mksyslinux-parabola/boot.msg
diff --git a/libre/mksyslinux/mksyslinux b/libre/mksyslinux-parabola/mksyslinux
index 96ad45133..96ad45133 100755
--- a/libre/mksyslinux/mksyslinux
+++ b/libre/mksyslinux-parabola/mksyslinux
diff --git a/libre/mksyslinux/mksyslinux.conf b/libre/mksyslinux-parabola/mksyslinux.conf
index a7d032295..a7d032295 100644
--- a/libre/mksyslinux/mksyslinux.conf
+++ b/libre/mksyslinux-parabola/mksyslinux.conf
diff --git a/libre/mksyslinux/options.msg b/libre/mksyslinux-parabola/options.msg
index 16c6b2eda..16c6b2eda 100644
--- a/libre/mksyslinux/options.msg
+++ b/libre/mksyslinux-parabola/options.msg
diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-parabola/PKGBUILD
index 9a940284a..1ca89bb20 100644
--- a/libre/mplayer-libre/PKGBUILD
+++ b/libre/mplayer-parabola/PKGBUILD
@@ -6,8 +6,8 @@
 # Contributor: Márcio Silva <coadde@parabola.nu>
 
 _pkgbase=mplayer
-pkgbase=mplayer-libre
-pkgname=('mplayer-libre' 'mencoder-libre')
+pkgbase=mplayer-parabola
+pkgname=('mplayer-parabola' 'mencoder-parabola')
 pkgver=37224
 pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
@@ -82,7 +82,7 @@ build() {
   make
 }
 
-package_mplayer-libre() {
+package_mplayer-parabola() {
   pkgdesc='Media player for GNU/Linux, without nonfree faac support'
   install=mplayer.install
   backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
@@ -95,8 +95,8 @@ package_mplayer-libre() {
     'libass' 'libxxf86vm' 'libbluray' 'libcdio-paranoia' 'opus'
   )
   provides=("mplayer=$pkgver")
-  replaces=('mplayer')
-  conflicts=('mplayer')
+  replaces=('mplayer' 'mplayer-libre')
+  conflicts=('mplayer' 'mplayer-libre')
 
   cd $_pkgbase-$pkgver
   make DESTDIR="$pkgdir" install-mplayer install-mplayer-man
@@ -111,7 +111,7 @@ package_mplayer-libre() {
     "$pkgdir"/usr/share/pixmaps/mplayer.png
 }
 
-package_mencoder-libre() {
+package_mencoder-parabola() {
   pkgdesc='Free command line video decoding, encoding and filtering tool, without nonfree faac support'
   depends=(
     'enca' 'a52dec' 'libvpx' 'libx264' 'libmng' 'libdca' 'bzip2' 'lame'
@@ -121,8 +121,8 @@ package_mencoder-libre() {
     'libvorbis' 'opus'
   )
   provides=("mencoder=$pkgver")
-  replaces=('mencoder')
-  conflicts=('mencoder')
+  replaces=('mencoder' 'mencoder-libre')
+  conflicts=('mencoder' 'mencoder-libre')
 
   make -C $_pkgbase-$pkgver DESTDIR="$pkgdir" install-mencoder install-mencoder-man
   find "$pkgdir"/usr/share/man -name mplayer.1 -exec rename mplayer.1 mencoder.1 {} +
diff --git a/libre/mplayer-libre/cdio-includes.patch b/libre/mplayer-parabola/cdio-includes.patch
index f71472812..f71472812 100644
--- a/libre/mplayer-libre/cdio-includes.patch
+++ b/libre/mplayer-parabola/cdio-includes.patch
diff --git a/libre/mplayer-libre/giflib51.patch b/libre/mplayer-parabola/giflib51.patch
index e884b39f1..e884b39f1 100644
--- a/libre/mplayer-libre/giflib51.patch
+++ b/libre/mplayer-parabola/giflib51.patch
diff --git a/libre/mplayer-libre-vaapi/include-samba-4.0.patch b/libre/mplayer-parabola/include-samba-4.0.patch
index 2ed272b6a..2ed272b6a 100644
--- a/libre/mplayer-libre-vaapi/include-samba-4.0.patch
+++ b/libre/mplayer-parabola/include-samba-4.0.patch
diff --git a/libre/mplayer-libre/mplayer.desktop b/libre/mplayer-parabola/mplayer.desktop
index 946b8e345..946b8e345 100644
--- a/libre/mplayer-libre/mplayer.desktop
+++ b/libre/mplayer-parabola/mplayer.desktop
diff --git a/libre/mplayer-libre/mplayer.install b/libre/mplayer-parabola/mplayer.install
index 660593cf5..660593cf5 100644
--- a/libre/mplayer-libre/mplayer.install
+++ b/libre/mplayer-parabola/mplayer.install
diff --git a/libre/mplayer-libre/mplayer.png b/libre/mplayer-parabola/mplayer.png
index 799769335..799769335 100644
--- a/libre/mplayer-libre/mplayer.png
+++ b/libre/mplayer-parabola/mplayer.png
diff --git a/libre/mplayer-libre/revert-icl-fixes.patch b/libre/mplayer-parabola/revert-icl-fixes.patch
index e5f049ff5..e5f049ff5 100644
--- a/libre/mplayer-libre/revert-icl-fixes.patch
+++ b/libre/mplayer-parabola/revert-icl-fixes.patch
diff --git a/libre/mplayer-libre-vaapi/PKGBUILD b/libre/mplayer-vaapi-parabola/PKGBUILD
index f2e092a8d..550952b67 100644
--- a/libre/mplayer-libre-vaapi/PKGBUILD
+++ b/libre/mplayer-vaapi-parabola/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 116440 2014-07-27 19:03:01Z foutrelis $
+# $Id: PKGBUILD 117508 2014-08-18 09:21:58Z foutrelis $
 # Maintainer (Arch): Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor (Arch): Ionut Biru <ibiru@archlinux.org>
 # Contributor (Arch): Hugo Doria <hugo@archlinux.org>
@@ -7,7 +7,7 @@
 # Contributor: Márcio Silva <coadde@parabola.nu>
 
 _pkgname=mplayer-vaapi
-pkgname=mplayer-libre-vaapi
+pkgname=mplayer-vaapi-parabola
 pkgver=36265
 pkgrel=12
 pkgdesc="A movie player, compiled with vaapi support, without nonfree faac support"
@@ -21,9 +21,9 @@ depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libcdio-paranoia' 'libxinerama'
          'a52dec' 'schroedinger' 'mpg123' 'libvpx' 'libpulse' 'fribidi' 'opus'
          'libbluray' 'libva' 'libass' 'desktop-file-utils')
 makedepends=('unzip' 'live-media' 'yasm' 'ladspa' 'git' 'mesa' 'x264')
-provides=("mplayer=$pkgver" "mplayer-vaapi=$pkgver" 'mplayer-vaapi-libre')
-conflicts=('mplayer' 'mplayer-vaapi' 'mplayer-vaapi-libre')
-replaces=('mplayer-vaapi' 'mplayer-vaapi-libre')
+provides=('mplayer' "mplayer-vaapi=$pkgver")
+conflicts=('mplayer' 'mplayer-vaapi' 'mplayer-vaapi-libre' 'mplayer-libre-vaapi')
+replaces=('mplayer-vaapi' 'mplayer-vaapi-libre' 'mplayer-libre-vaapi')
 backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
 source=(http://pkgbuild.com/~foutrelis/sources/$_pkgname/$_pkgname-$pkgver.tar.xz{,.sig}
         cdio-includes.patch
diff --git a/libre/mplayer-libre-vaapi/cdio-includes.patch b/libre/mplayer-vaapi-parabola/cdio-includes.patch
index 894650717..894650717 100644
--- a/libre/mplayer-libre-vaapi/cdio-includes.patch
+++ b/libre/mplayer-vaapi-parabola/cdio-includes.patch
diff --git a/libre/mplayer-libre/include-samba-4.0.patch b/libre/mplayer-vaapi-parabola/include-samba-4.0.patch
index 2ed272b6a..2ed272b6a 100644
--- a/libre/mplayer-libre/include-samba-4.0.patch
+++ b/libre/mplayer-vaapi-parabola/include-samba-4.0.patch
diff --git a/libre/mplayer-libre-vaapi/mplayer-vaapi.install b/libre/mplayer-vaapi-parabola/mplayer-vaapi.install
index a44f19aef..a44f19aef 100644
--- a/libre/mplayer-libre-vaapi/mplayer-vaapi.install
+++ b/libre/mplayer-vaapi-parabola/mplayer-vaapi.install
diff --git a/libre/mplayer-libre-vaapi/subreader-fix-srt-parsing.patch b/libre/mplayer-vaapi-parabola/subreader-fix-srt-parsing.patch
index f1c087377..f1c087377 100644
--- a/libre/mplayer-libre-vaapi/subreader-fix-srt-parsing.patch
+++ b/libre/mplayer-vaapi-parabola/subreader-fix-srt-parsing.patch
diff --git a/libre/mplayer-libre-vaapi/tweak-desktop-file.patch b/libre/mplayer-vaapi-parabola/tweak-desktop-file.patch
index 606e356b0..606e356b0 100644
--- a/libre/mplayer-libre-vaapi/tweak-desktop-file.patch
+++ b/libre/mplayer-vaapi-parabola/tweak-desktop-file.patch
diff --git a/libre/ogmrip-libre/PKGBUILD b/libre/ogmrip-parabola/PKGBUILD
index 546798246..96fb91948 100644
--- a/libre/ogmrip-libre/PKGBUILD
+++ b/libre/ogmrip-parabola/PKGBUILD
@@ -6,7 +6,7 @@
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
 _pkgname=ogmrip
-pkgname=ogmrip-libre
+pkgname=ogmrip-parabola
 pkgver=1.0.1
 pkgrel=1
 pkgdesc="Libraries and GTK2 interface for DVD ripping using mencoder, without nonfree faac support"
@@ -24,9 +24,9 @@ optdepends=('lame: support for the MP3 audio codec'
             'gocr: support for the SRT subtitle format'
             'ocrad: support for the SRT subtitle format'
             'tesseract: support for the SRT subtitle format')
-replaces=($_pkgname)
-conflicts=($_pkgname)
-provides=($_pkgname=$pkgver)
+replaces=("${_pkgname}" "${_pkgname}-libre")
+conflicts=("${_pkgname}" "${_pkgname}-libre")
+provides=(${_pkgname}=${pkgver})
 options=('!makeflags')
 changelog=$_pkgname.changelog
 install=$_pkgname.install
diff --git a/libre/ogmrip-libre/ogmrip.changelog b/libre/ogmrip-parabola/ogmrip.changelog
index 48f6e98e8..48f6e98e8 100644
--- a/libre/ogmrip-libre/ogmrip.changelog
+++ b/libre/ogmrip-parabola/ogmrip.changelog
diff --git a/libre/ogmrip-libre/ogmrip.install b/libre/ogmrip-parabola/ogmrip.install
index 660593cf5..660593cf5 100644
--- a/libre/ogmrip-libre/ogmrip.install
+++ b/libre/ogmrip-parabola/ogmrip.install
diff --git a/libre/openshot-libre/PKGBUILD b/libre/openshot-parabola/PKGBUILD
index 473592202..2c1b02964 100644
--- a/libre/openshot-libre/PKGBUILD
+++ b/libre/openshot-parabola/PKGBUILD
@@ -4,7 +4,7 @@
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
 _pkgname=openshot
-pkgname=openshot-libre
+pkgname=openshot-parabola
 pkgver=1.4.3
 pkgrel=3
 pkgdesc="a free, non-linear video editor for GNU/Linux based on MLT framework, without nonfree faac recommendation"
@@ -15,9 +15,9 @@ 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)
-conflicts=($_pkgname)
-provides=($_pkgname=$pkgver)
+replaces=("${_pkgname}" "${_pkgname}-libre")
+conflicts=("${_pkgname}" "${_pkgname}-libre")
+provides=(${_pkgname}=${pkgver})
 install=openshot.install
 source=(http://launchpad.net/openshot/${pkgver%.*}/$pkgver/+download/$_pkgname-$pkgver.tar.gz)
 md5sums=('5ec82a7e8b7700ee4a359458aedf19e9')
diff --git a/libre/openshot-libre/openshot.install b/libre/openshot-parabola/openshot.install
index 046df0051..046df0051 100644
--- a/libre/openshot-libre/openshot.install
+++ b/libre/openshot-parabola/openshot.install
diff --git a/libre/psi/PKGBUILD b/libre/psi-parabola/PKGBUILD
index e5903d9d5..cf835f032 100644
--- a/libre/psi/PKGBUILD
+++ b/libre/psi-parabola/PKGBUILD
@@ -2,15 +2,19 @@
 # Maintainer (Arch): Pierre Schmitz <pierre@archlinux.de>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-pkgname=psi
+_pkgname=psi
+pkgname=psi-parabola
 pkgver=0.15
-pkgrel=2.2
+pkgrel=2
 pkgdesc='Instant messaging application designed for the Jabber IM (Parabola rebranded)'
 url='http://psi-im.org/'
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('qca-ossl' 'qca-gnupg' 'enchant' 'libxss' 'xdg-utils')
 makedepends=('icu')
+replaces=($_pkgname)
+conflicts=($_pkgname)
+provides=($_pkgname=$pkgver)
 install='psi.install'
 source=("http://downloads.sourceforge.net/psi/psi-${pkgver}.tar.bz2"
         'parabola.patch')
diff --git a/libre/psi/parabola.patch b/libre/psi-parabola/parabola.patch
index 9d41bffc4..9d41bffc4 100644
--- a/libre/psi/parabola.patch
+++ b/libre/psi-parabola/parabola.patch
diff --git a/libre/psi/psi.install b/libre/psi-parabola/psi.install
index 464d2e625..464d2e625 100644
--- a/libre/psi/psi.install
+++ b/libre/psi-parabola/psi.install
diff --git a/libre/reflector/PKGBUILD b/libre/reflector-parabola/PKGBUILD
index 7cee826e8..6735b352a 100644
--- a/libre/reflector/PKGBUILD
+++ b/libre/reflector-parabola/PKGBUILD
@@ -1,12 +1,16 @@
 #Maintainer (Arch): Xyne <ac xunilhcra enyx, backwards>
 #Maintainer: André Silva <emulatorman@parabola.nu>
-pkgname=reflector
+_pkgname=reflector
+pkgname=reflector-parabola
 pkgver=2014.8
 pkgrel=1
 pkgdesc='A Python 3 module and script to retrieve and filter the latest Pacman mirror list (Parabola rebranded)'
 arch=(any)
 license=(GPL)
 url="http://xyne.archlinux.ca/projects/reflector"
+replaces=($_pkgname)
+conflicts=($_pkgname)
+provides=($_pkgname=$pkgver)
 depends=(python3)
 optdepends=('rsync: rate rsync mirrors')
 source=(
@@ -27,16 +31,16 @@ md5sums=(
 
 prepare ()
 {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/$_pkgname-$pkgver"
   # Rebranding for Parabola
   patch -Np1 -i "$srcdir/rebranding.patch"
 }
 
 package ()
 {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/$_pkgname-$pkgver"
   python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
-  install -Dm755 "$srcdir/$pkgname-$pkgver/$pkgname" "$pkgdir/usr/bin/$pkgname"
+  install -Dm755 "$srcdir/$_pkgname-$pkgver/$_pkgname" "$pkgdir/usr/bin/$_pkgname"
 }
 
 
diff --git a/libre/reflector/rebranding.patch b/libre/reflector-parabola/rebranding.patch
index b29653ffd..b29653ffd 100644
--- a/libre/reflector/rebranding.patch
+++ b/libre/reflector-parabola/rebranding.patch
diff --git a/libre/soundkonverter-libre/PKGBUILD b/libre/soundkonverter-parabola/PKGBUILD
index 748cc6cf3..257e77709 100644
--- a/libre/soundkonverter-libre/PKGBUILD
+++ b/libre/soundkonverter-parabola/PKGBUILD
@@ -6,16 +6,16 @@
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
 _pkgname=soundkonverter
-pkgname=soundkonverter-libre
+pkgname=soundkonverter-parabola
 pkgver=2.1.1
 pkgrel=1
 pkgdesc="Front-end to various audio converters, without nonfree faac and mac recommendation"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kde-apps.org/content/show.php?content=29024"
 license=('GPL')
-replaces=($_pkgname)
-conflicts=($_pkgname)
-provides=($_pkgname=$pkgver)
+replaces=("${_pkgname}" "${_pkgname}-libre")
+conflicts=("${_pkgname}" "${_pkgname}-libre" )
+provides=(${_pkgname}=${pkgver})
 depends=('kdebase-runtime' 'libkcddb' 'cdparanoia' 'taglib')
 makedepends=('automoc4' 'cmake')
 optdepends=('cdrkit: cdda2wav backend'
diff --git a/libre/soundkonverter-libre/soundkonverter.install b/libre/soundkonverter-parabola/soundkonverter.install
index 0e8feb79c..0e8feb79c 100644
--- a/libre/soundkonverter-libre/soundkonverter.install
+++ b/libre/soundkonverter-parabola/soundkonverter.install
diff --git a/libre/syslinux/PKGBUILD b/libre/syslinux-parabola/PKGBUILD
index 8b3676cca..575bbaf04 100644
--- a/libre/syslinux/PKGBUILD
+++ b/libre/syslinux-parabola/PKGBUILD
@@ -9,7 +9,8 @@ _IA32_EFI_IN_ARCH_X64="1"
 _VER="6.03-pre19"
 _GIT_TAG="syslinux-${_VER}"
 
-pkgname="syslinux"
+_pkgname="syslinux"
+pkgname="syslinux-parabola"
 pkgver="${_VER/-/}"
 pkgrel="1"
 arch=('x86_64' 'i686')
@@ -17,6 +18,9 @@ pkgdesc="Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs files
 url="http://syslinux.zytor.com/"
 license=('GPL2')
 options=('!makeflags' '!emptydirs')
+replaces=($_pkgname)
+conflicts=($_pkgname)
+provides=($_pkgname=$pkgver)
 backup=('boot/syslinux/syslinux.cfg'
         'boot/syslinux/splash.png')
 makedepends=('git' 'python2' 'nasm' 'ncurses')
@@ -31,8 +35,8 @@ optdepends=('perl-passwd-md5:  For md5pass'
             'util-linux:       For isohybrid'
             'efibootmgr:       For EFI support'
             'dosfstools:       For EFI support')
-install="${pkgname}.install"
-source=("${pkgname}::git+http://git.zytor.com/syslinux/syslinux.git#tag=${_GIT_TAG}"
+install="${_pkgname}.install"
+source=("${_pkgname}::git+http://git.zytor.com/syslinux/syslinux.git#tag=${_GIT_TAG}"
         "gnu-efi::git+http://git.code.sf.net/p/gnu-efi/code#commit=3c62e78556aea01e9798380cd46794c6ca09d4bd"
         'syslinux.cfg'
         'syslinux-install_update'
@@ -44,29 +48,29 @@ md5sums=('SKIP'
          'cb46ca47c6b6323127d908440057d98f')
 
 _pkgver() {
-    cd "${srcdir}/${pkgname}/"
+    cd "${srcdir}/${_pkgname}/"
     echo "$(git describe --tags)" | sed -e 's|syslinux-||g' -e 's|-pre|pre|g' -e 's|-|.|g'
 }
 
 prepare() {
     
-    mv "${srcdir}/${pkgname}" "${srcdir}/${pkgname}-${pkgver}/"
-    cd "${srcdir}/${pkgname}-${pkgver}/"
+    mv "${srcdir}/${_pkgname}" "${srcdir}/${_pkgname}-${pkgver}/"
+    cd "${srcdir}/${_pkgname}-${pkgver}/"
     
     msg "Run git clean"
     git clean -x -d -f
     
     msg "Do not try to build the Windows or DOS installers and DIAG files"
-    sed 's|diag libinstaller dos win32 win64 dosutil txt|libinstaller txt|g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true
-    sed 's|win32/syslinux.exe win64/syslinux64.exe||g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true
-    sed 's|dosutil/*.com dosutil/*.sys||g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true
-    sed 's|dos/syslinux.com||g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true
-    sed 's|INSTALLSUBDIRS = com32 utils dosutil|INSTALLSUBDIRS = com32 utils|g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true
-    sed 's|install -m 644 -c $(INSTALL_DIAG) $(INSTALLROOT)$(DIAGDIR)|# install -m 644 -c $(INSTALL_DIAG) $(INSTALLROOT)$(DIAGDIR)|g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true
-    sed 's|-include $(MAKEDIR)/devel.mk||g' -i "${srcdir}/${pkgname}-${pkgver}/mk/syslinux.mk" || true
+    sed 's|diag libinstaller dos win32 win64 dosutil txt|libinstaller txt|g' -i "${srcdir}/${_pkgname}-${pkgver}/Makefile" || true
+    sed 's|win32/syslinux.exe win64/syslinux64.exe||g' -i "${srcdir}/${_pkgname}-${pkgver}/Makefile" || true
+    sed 's|dosutil/*.com dosutil/*.sys||g' -i "${srcdir}/${_pkgname}-${pkgver}/Makefile" || true
+    sed 's|dos/syslinux.com||g' -i "${srcdir}/${_pkgname}-${pkgver}/Makefile" || true
+    sed 's|INSTALLSUBDIRS = com32 utils dosutil|INSTALLSUBDIRS = com32 utils|g' -i "${srcdir}/${_pkgname}-${pkgver}/Makefile" || true
+    sed 's|install -m 644 -c $(INSTALL_DIAG) $(INSTALLROOT)$(DIAGDIR)|# install -m 644 -c $(INSTALL_DIAG) $(INSTALLROOT)$(DIAGDIR)|g' -i "${srcdir}/${_pkgname}-${pkgver}/Makefile" || true
+    sed 's|-include $(MAKEDIR)/devel.mk||g' -i "${srcdir}/${_pkgname}-${pkgver}/mk/syslinux.mk" || true
     
     msg "Fix FHS manpage path"
-    sed 's|/usr/man|/usr/share/man|g' -i "${srcdir}/${pkgname}-${pkgver}/mk/syslinux.mk" || true
+    sed 's|/usr/man|/usr/share/man|g' -i "${srcdir}/${_pkgname}-${pkgver}/mk/syslinux.mk" || true
     
     cd "${srcdir}/gnu-efi/"
     
@@ -77,38 +81,38 @@ prepare() {
     git revert --no-commit 06744d69273de4945cf0ffcaa4a6abf7cec707b6
     
     msg "Prepare gnu-efi source"
-    cp -r "${srcdir}/gnu-efi/gnu-efi-3.0" "${srcdir}/${pkgname}-${pkgver}/gnu-efi/gnu-efi-3.0"
+    cp -r "${srcdir}/gnu-efi/gnu-efi-3.0" "${srcdir}/${_pkgname}-${pkgver}/gnu-efi/gnu-efi-3.0"
     
-    cd "${srcdir}/${pkgname}-${pkgver}/"
+    cd "${srcdir}/${_pkgname}-${pkgver}/"
     
 }
 
 _build_syslinux_bios() {
     
-    rm -rf "${srcdir}/${pkgname}-${pkgver}-bios/" || true
-    cp -r "${srcdir}/${pkgname}-${pkgver}" "${srcdir}/${pkgname}-${pkgver}-bios"
+    rm -rf "${srcdir}/${_pkgname}-${pkgver}-bios/" || true
+    cp -r "${srcdir}/${_pkgname}-${pkgver}" "${srcdir}/${_pkgname}-${pkgver}-bios"
     
-    mkdir -p "${srcdir}/${pkgname}-${pkgver}-bios/OBJDIR"
-    cd "${srcdir}/${pkgname}-${pkgver}-bios/"
+    mkdir -p "${srcdir}/${_pkgname}-${pkgver}-bios/OBJDIR"
+    cd "${srcdir}/${_pkgname}-${pkgver}-bios/"
     
     msg "Do not try to compile bios build with our default LDFLAGS, it will fail"
     unset LDFLAGS
     
     msg "Run make bios"
-    make PYTHON="python2" OBJDIR="${srcdir}/${pkgname}-${pkgver}-bios/OBJDIR" bios
+    make PYTHON="python2" OBJDIR="${srcdir}/${_pkgname}-${pkgver}-bios/OBJDIR" bios
     
     msg "Run make bios installer"
-    make PYTHON="python2" OBJDIR="${srcdir}/${pkgname}-${pkgver}-bios/OBJDIR" bios installer
+    make PYTHON="python2" OBJDIR="${srcdir}/${_pkgname}-${pkgver}-bios/OBJDIR" bios installer
     
 }
 
 _build_syslinux_efi64() {
     
-    rm -rf "${srcdir}/${pkgname}-${pkgver}-efi64/" || true
-    cp -r "${srcdir}/${pkgname}-${pkgver}" "${srcdir}/${pkgname}-${pkgver}-efi64"
+    rm -rf "${srcdir}/${_pkgname}-${pkgver}-efi64/" || true
+    cp -r "${srcdir}/${_pkgname}-${pkgver}" "${srcdir}/${_pkgname}-${pkgver}-efi64"
     
-    mkdir -p "${srcdir}/${pkgname}-${pkgver}-efi64/OBJDIR/efi64/"
-    cd "${srcdir}/${pkgname}-${pkgver}-efi64/gnu-efi/gnu-efi-3.0/"
+    mkdir -p "${srcdir}/${_pkgname}-${pkgver}-efi64/OBJDIR/efi64/"
+    cd "${srcdir}/${_pkgname}-${pkgver}-efi64/gnu-efi/gnu-efi-3.0/"
     
     msg "Unset all compiler FLAGS for gnu-efi efi64 build"
     unset CFLAGS
@@ -121,9 +125,9 @@ _build_syslinux_efi64() {
     make ARCH="x86_64" -j1
     
     msg "Run make install gnu-efi for syslinux efi64"
-    make ARCH="x86_64" PREFIX="${srcdir}/${pkgname}-${pkgver}-efi64/OBJDIR/efi64/" -j1 install
+    make ARCH="x86_64" PREFIX="${srcdir}/${_pkgname}-${pkgver}-efi64/OBJDIR/efi64/" -j1 install
     
-    cd "${srcdir}/${pkgname}-${pkgver}-efi64/"
+    cd "${srcdir}/${_pkgname}-${pkgver}-efi64/"
     
     msg "Unset all compiler FLAGS for efi64 build"
     unset CFLAGS
@@ -133,20 +137,20 @@ _build_syslinux_efi64() {
     unset MAKEFLAGS
     
     msg "Run make efi64"
-    make PYTHON="python2" OBJDIR="${srcdir}/${pkgname}-${pkgver}-efi64/OBJDIR" efi64
+    make PYTHON="python2" OBJDIR="${srcdir}/${_pkgname}-${pkgver}-efi64/OBJDIR" efi64
     
     msg "Run make efi64 installer"
-    make PYTHON="python2" OBJDIR="${srcdir}/${pkgname}-${pkgver}-efi64/OBJDIR" efi64 installer
+    make PYTHON="python2" OBJDIR="${srcdir}/${_pkgname}-${pkgver}-efi64/OBJDIR" efi64 installer
     
 }
 
 _build_syslinux_efi32() {
     
-    rm -rf "${srcdir}/${pkgname}-${pkgver}-efi32/" || true
-    cp -r "${srcdir}/${pkgname}-${pkgver}" "${srcdir}/${pkgname}-${pkgver}-efi32"
+    rm -rf "${srcdir}/${_pkgname}-${pkgver}-efi32/" || true
+    cp -r "${srcdir}/${_pkgname}-${pkgver}" "${srcdir}/${_pkgname}-${pkgver}-efi32"
     
-    mkdir -p "${srcdir}/${pkgname}-${pkgver}-efi32/OBJDIR/efi32/"
-    cd "${srcdir}/${pkgname}-${pkgver}-efi32/gnu-efi/gnu-efi-3.0/"
+    mkdir -p "${srcdir}/${_pkgname}-${pkgver}-efi32/OBJDIR/efi32/"
+    cd "${srcdir}/${_pkgname}-${pkgver}-efi32/gnu-efi/gnu-efi-3.0/"
     
     msg "Unset all compiler FLAGS for gnu-efi efi32 build"
     unset CFLAGS
@@ -159,9 +163,9 @@ _build_syslinux_efi32() {
     make ARCH="ia32" -j1
     
     msg "Run make install gnu-efi for syslinux efi32"
-    make ARCH="ia32" PREFIX="${srcdir}/${pkgname}-${pkgver}-efi32/OBJDIR/efi32/" install
+    make ARCH="ia32" PREFIX="${srcdir}/${_pkgname}-${pkgver}-efi32/OBJDIR/efi32/" install
     
-    cd "${srcdir}/${pkgname}-${pkgver}-efi32/"
+    cd "${srcdir}/${_pkgname}-${pkgver}-efi32/"
     
     msg "Unset all compiler FLAGS for efi32 build"
     unset CFLAGS
@@ -171,16 +175,16 @@ _build_syslinux_efi32() {
     unset MAKEFLAGS
     
     msg "Run make efi32"
-    make PYTHON="python2" OBJDIR="${srcdir}/${pkgname}-${pkgver}-efi32/OBJDIR" efi32
+    make PYTHON="python2" OBJDIR="${srcdir}/${_pkgname}-${pkgver}-efi32/OBJDIR" efi32
     
     msg "Run make efi32 installer"
-    make PYTHON="python2" OBJDIR="${srcdir}/${pkgname}-${pkgver}-efi32/OBJDIR" efi32 installer
+    make PYTHON="python2" OBJDIR="${srcdir}/${_pkgname}-${pkgver}-efi32/OBJDIR" efi32 installer
     
 }
 
 build() {
     
-    cd "${srcdir}/${pkgname}-${pkgver}/"
+    cd "${srcdir}/${_pkgname}-${pkgver}/"
     
     if [[ "${CARCH}" == "x86_64" ]]; then
         msg "Build syslinux efi64"
@@ -204,10 +208,10 @@ build() {
 
 _package_syslinux_bios() {
     
-    cd "${srcdir}/${pkgname}-${pkgver}-bios/"
+    cd "${srcdir}/${_pkgname}-${pkgver}-bios/"
     
     msg "Install Syslinux bios"
-    make INSTALLROOT="${pkgdir}/" AUXDIR="/usr/lib/syslinux/bios/" OBJDIR="${srcdir}/${pkgname}-${pkgver}-bios/OBJDIR" bios install
+    make INSTALLROOT="${pkgdir}/" AUXDIR="/usr/lib/syslinux/bios/" OBJDIR="${srcdir}/${_pkgname}-${pkgver}-bios/OBJDIR" bios install
     
     msg "Remove syslinux.exe,syslinux64.exe,syslinux.com and dosutil dir"
     rm "${pkgdir}/usr/lib/syslinux/bios"/syslinux.{com,exe} || true
@@ -225,7 +229,7 @@ _package_syslinux_bios() {
     
     msg "Install syslinux docs"
     install -d "${pkgdir}/usr/share/doc"
-    cp -ar "${srcdir}/${pkgname}-${pkgver}/doc" "${pkgdir}/usr/share/doc/syslinux"
+    cp -ar "${srcdir}/${_pkgname}-${pkgver}/doc" "${pkgdir}/usr/share/doc/syslinux"
     
     msg "Install syslinux.cfg"
     install -D -m0644 "${srcdir}/syslinux.cfg" "${pkgdir}/boot/syslinux/syslinux.cfg"
@@ -241,31 +245,31 @@ _package_syslinux_bios() {
 
 _package_syslinux_efi() {
     
-    cd "${srcdir}/${pkgname}-${pkgver}/"
+    cd "${srcdir}/${_pkgname}-${pkgver}/"
     
     if [[ "${CARCH}" == "x86_64" ]]; then
-        cd "${srcdir}/${pkgname}-${pkgver}-efi64/"
+        cd "${srcdir}/${_pkgname}-${pkgver}-efi64/"
         msg "Install Syslinux efi64"
-        make INSTALLROOT="${pkgdir}/" AUXDIR="/usr/lib/syslinux/" OBJDIR="${srcdir}/${pkgname}-${pkgver}-efi64/OBJDIR" efi64 install
+        make INSTALLROOT="${pkgdir}/" AUXDIR="/usr/lib/syslinux/" OBJDIR="${srcdir}/${_pkgname}-${pkgver}-efi64/OBJDIR" efi64 install
         
         if [[ "${_IA32_EFI_IN_ARCH_X64}" == "1" ]]; then
-            cd "${srcdir}/${pkgname}-${pkgver}-efi32/"
+            cd "${srcdir}/${_pkgname}-${pkgver}-efi32/"
             msg "Install Syslinux efi32"
-            make INSTALLROOT="${pkgdir}/" AUXDIR="/usr/lib/syslinux/" OBJDIR="${srcdir}/${pkgname}-${pkgver}-efi32/OBJDIR" efi32 install
+            make INSTALLROOT="${pkgdir}/" AUXDIR="/usr/lib/syslinux/" OBJDIR="${srcdir}/${_pkgname}-${pkgver}-efi32/OBJDIR" efi32 install
         fi
     fi
     
     if [[ "${CARCH}" == "i686" ]]; then
-        cd "${srcdir}/${pkgname}-${pkgver}-efi32/"
+        cd "${srcdir}/${_pkgname}-${pkgver}-efi32/"
         msg "Install Syslinux efi32"
-        make INSTALLROOT="${pkgdir}/" AUXDIR="/usr/lib/syslinux/" OBJDIR="${srcdir}/${pkgname}-${pkgver}-efi32/OBJDIR" efi32 install
+        make INSTALLROOT="${pkgdir}/" AUXDIR="/usr/lib/syslinux/" OBJDIR="${srcdir}/${_pkgname}-${pkgver}-efi32/OBJDIR" efi32 install
     fi
     
 }
 
 package() {
     
-    cd "${srcdir}/${pkgname}-${pkgver}/"
+    cd "${srcdir}/${_pkgname}-${pkgver}/"
     
     msg "Package Syslinux efi"
     _package_syslinux_efi
diff --git a/libre/syslinux/splash.png b/libre/syslinux-parabola/splash.png
index eac14536b..eac14536b 100644
--- a/libre/syslinux/splash.png
+++ b/libre/syslinux-parabola/splash.png
diff --git a/libre/syslinux/splash.xcf b/libre/syslinux-parabola/splash.xcf
index c27d04445..c27d04445 100644
--- a/libre/syslinux/splash.xcf
+++ b/libre/syslinux-parabola/splash.xcf
diff --git a/libre/syslinux/syslinux-6.02-fix-bios-isolinux.patch b/libre/syslinux-parabola/syslinux-6.02-fix-bios-isolinux.patch
index 48df46f12..48df46f12 100644
--- a/libre/syslinux/syslinux-6.02-fix-bios-isolinux.patch
+++ b/libre/syslinux-parabola/syslinux-6.02-fix-bios-isolinux.patch
diff --git a/libre/syslinux/syslinux-6.02-fix-chainloading.patch b/libre/syslinux-parabola/syslinux-6.02-fix-chainloading.patch
index 6fd7ef4a8..6fd7ef4a8 100644
--- a/libre/syslinux/syslinux-6.02-fix-chainloading.patch
+++ b/libre/syslinux-parabola/syslinux-6.02-fix-chainloading.patch
diff --git a/libre/syslinux/syslinux-6.02-fix-efi-ovmf.patch b/libre/syslinux-parabola/syslinux-6.02-fix-efi-ovmf.patch
index f33f4c1de..f33f4c1de 100644
--- a/libre/syslinux/syslinux-6.02-fix-efi-ovmf.patch
+++ b/libre/syslinux-parabola/syslinux-6.02-fix-efi-ovmf.patch
diff --git a/libre/syslinux/syslinux-install_update b/libre/syslinux-parabola/syslinux-install_update
index 3843b5fed..3843b5fed 100644
--- a/libre/syslinux/syslinux-install_update
+++ b/libre/syslinux-parabola/syslinux-install_update
diff --git a/libre/syslinux/syslinux.cfg b/libre/syslinux-parabola/syslinux.cfg
index 0c0c6339a..0c0c6339a 100644
--- a/libre/syslinux/syslinux.cfg
+++ b/libre/syslinux-parabola/syslinux.cfg
diff --git a/libre/syslinux/syslinux.install b/libre/syslinux-parabola/syslinux.install
index ed8387773..ed8387773 100644
--- a/libre/syslinux/syslinux.install
+++ b/libre/syslinux-parabola/syslinux.install
diff --git a/libre/texlive-bin-libre/09-texlive-fonts.conf b/libre/texlive-bin-parabola/09-texlive-fonts.conf
index f870fbd7a..f870fbd7a 100644
--- a/libre/texlive-bin-libre/09-texlive-fonts.conf
+++ b/libre/texlive-bin-parabola/09-texlive-fonts.conf
diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-parabola/PKGBUILD
index 03d829d53..52f8566ce 100644
--- a/libre/texlive-bin-libre/PKGBUILD
+++ b/libre/texlive-bin-parabola/PKGBUILD
@@ -4,7 +4,7 @@
 # Maintainer: Michał Masłowski <mtjm@mtjm.eu>
 # Contributor: André Silva <emulatorman@parabola.nu>
 
-pkgname=texlive-bin-libre
+pkgname=texlive-bin-parabola
 pkgver=2013.30973
 pkgrel=10
 pkgdesc="TeX Live binaries, without biber binaries (Parabola rebranded)"
@@ -15,9 +15,9 @@ depends=('cairo' 'pixman' 'graphite' 't1lib' 'gd' 'poppler'
          'icu' 'harfbuzz' 'harfbuzz-icu')
 makedepends=('perl' 'clisp' 'ffcall')
 optdepends=('ed: for texconfig')
-provides=('texlive-bin' 'lcdf-typetools' 'kpathsea' 'xindy' 'pdfjam')
-conflicts=('texlive-bin' 'pdfjam')
-replaces=('texlive-bin')
+provides=("texlive-bin=$pkgver" 'lcdf-typetools' 'kpathsea' 'xindy' 'pdfjam')
+conflicts=('texlive-bin' 'pdfjam' 'texlive-bin-libre')
+replaces=('texlive-bin' 'texlive-bin-libre')
 options=('!strip')
 url='http://tug.org/texlive/'
 install="texlive.install"
diff --git a/libre/texlive-bin-libre/fix-fontforge-encoding.patch b/libre/texlive-bin-parabola/fix-fontforge-encoding.patch
index 8104b3289..8104b3289 100644
--- a/libre/texlive-bin-libre/fix-fontforge-encoding.patch
+++ b/libre/texlive-bin-parabola/fix-fontforge-encoding.patch
diff --git a/libre/texlive-bin-libre/luatex-poppler-0.20.patch b/libre/texlive-bin-parabola/luatex-poppler-0.20.patch
index 175824f3e..175824f3e 100644
--- a/libre/texlive-bin-libre/luatex-poppler-0.20.patch
+++ b/libre/texlive-bin-parabola/luatex-poppler-0.20.patch
diff --git a/libre/texlive-bin-libre/luatex-r4449-radical-rule-thickness.patch b/libre/texlive-bin-parabola/luatex-r4449-radical-rule-thickness.patch
index f925a1a93..f925a1a93 100644
--- a/libre/texlive-bin-libre/luatex-r4449-radical-rule-thickness.patch
+++ b/libre/texlive-bin-parabola/luatex-r4449-radical-rule-thickness.patch
diff --git a/libre/texlive-bin-libre/poppler-0.20.patch b/libre/texlive-bin-parabola/poppler-0.20.patch
index 3bd8183ab..3bd8183ab 100644
--- a/libre/texlive-bin-libre/poppler-0.20.patch
+++ b/libre/texlive-bin-parabola/poppler-0.20.patch
diff --git a/libre/texlive-bin-libre/poppler-0.26.patch b/libre/texlive-bin-parabola/poppler-0.26.patch
index fde123f62..fde123f62 100644
--- a/libre/texlive-bin-libre/poppler-0.26.patch
+++ b/libre/texlive-bin-parabola/poppler-0.26.patch
diff --git a/libre/texlive-bin-libre/texlive.install b/libre/texlive-bin-parabola/texlive.install
index 4932650e6..4932650e6 100644
--- a/libre/texlive-bin-libre/texlive.install
+++ b/libre/texlive-bin-parabola/texlive.install
diff --git a/libre/texlive-bin-libre/texmf.cnf b/libre/texlive-bin-parabola/texmf.cnf
index 76975ee5c..76975ee5c 100644
--- a/libre/texlive-bin-libre/texmf.cnf
+++ b/libre/texlive-bin-parabola/texmf.cnf
diff --git a/libre/usermin/PKGBUILD b/libre/usermin-parabola/PKGBUILD
index 3eaee9fc1..3c2db7573 100644
--- a/libre/usermin/PKGBUILD
+++ b/libre/usermin-parabola/PKGBUILD
@@ -1,6 +1,7 @@
 # $Id: PKGBUILD 208134 2014-03-18 07:25:18Z tpowa $
 # Maintainer (Arch): Tobias Powalowski <tpowa@archlinux.org>
-pkgname=usermin
+_pkgname=usermin
+pkgname=usermin-parabola
 pkgver=1.590
 pkgrel=1
 pkgdesc="a web interface that can be used to easily perform tasks like reading mail, setting up SSH or configuring mail forwarding (Parabola rebranded)"
@@ -9,6 +10,9 @@ license=('custom:usermin')
 url="http://www.webmin.com/"
 depends=('perl' 'webmin')
 makedepends=('perl-net-ssleay')
+replaces=($_pkgname)
+conflicts=($_pkgname)
+provides=($_pkgname=$pkgver)
 backup=('etc/usermin/miniserv.conf' 'etc/usermin/miniserv.users' 'etc/usermin/config' 'etc/usermin/usermin.cats' \
 'etc/usermin/at/config' \
 'etc/usermin/man/config' \
@@ -43,12 +47,12 @@ backup=('etc/usermin/miniserv.conf' 'etc/usermin/miniserv.users' 'etc/usermin/co
 'etc/usermin/usermount/config' \
 )
 install=usermin.install
-source=(http://downloads.sourceforge.net/sourceforge/webadmin/$pkgname-$pkgver.tar.gz 
+source=(http://downloads.sourceforge.net/sourceforge/webadmin/$_pkgname-$pkgver.tar.gz 
 	usermin.service
 	ftp://ftp.archlinux.org/other/usermin/usermin-config.tar.bz2) 
 
 package() {
-  cd "$srcdir"/$pkgname-$pkgver
+  cd "$srcdir"/$_pkgname-$pkgver
     
   # remove modules we do not support
 
@@ -78,7 +82,7 @@ package() {
   echo 'Parabola GNU/Linux-libre			Any version	generic-linux	*	-d "/etc/pacman.d"' >> os_list.txt
   
   # copy stuff to right dirs
-  cd "$srcdir"/$pkgname-$pkgver
+  cd "$srcdir"/$_pkgname-$pkgver
   cp -rp * "$pkgdir"/opt/usermin
   cd "$srcdir"/usermin-config
   cp -rfp * "$pkgdir"/opt/usermin
@@ -122,7 +126,7 @@ package() {
   # delete temp dir
   rm -r "$pkgdir"/tmp
   #install license
-  install -m 644 -D "$srcdir"/$pkgname-$pkgver/LICENCE "$pkgdir"/usr/share/licenses/usermin/LICENCE
+  install -m 644 -D "$srcdir"/$_pkgname-$pkgver/LICENCE "$pkgdir"/usr/share/licenses/usermin/LICENCE
 }
 md5sums=('e2c8ab2d0269f860f85b562e02e69ca2'
          'a5bd5e5ee779f8a3cf3d776ca77ee36e'
diff --git a/libre/usermin/usermin.install b/libre/usermin-parabola/usermin.install
index 3ace10ea2..3ace10ea2 100644
--- a/libre/usermin/usermin.install
+++ b/libre/usermin-parabola/usermin.install
diff --git a/libre/usermin/usermin.service b/libre/usermin-parabola/usermin.service
index e91164c63..e91164c63 100644
--- a/libre/usermin/usermin.service
+++ b/libre/usermin-parabola/usermin.service
diff --git a/libre/vim-runtime/PKGBUILD b/libre/vim-runtime-parabola/PKGBUILD
index d7c055ff7..a3a410e6f 100644
--- a/libre/vim-runtime/PKGBUILD
+++ b/libre/vim-runtime-parabola/PKGBUILD
@@ -6,7 +6,8 @@
 # Contributor: Márcio Silva <coadde@parabola.nu>
 
 pkgbase=vim
-pkgname=vim-runtime
+_pkgname=vim-runtime
+pkgname=vim-runtime-parabola
 _topver=7.4
 _patchlevel=410
 __hgrev=7af530381fec
@@ -58,10 +59,13 @@ build() {
   make
 }
 
-package_vim-runtime() {
+package_vim-runtime-parabola() {
   pkgdesc='Runtime for vim and gvim (Parabola rebranded)'
   depends=('perl' 'gawk')
   backup=('etc/vimrc')
+  replaces=($_pkgname)
+  conflicts=($_pkgname)
+  provides=($_pkgname=$pkgver)
 
   cd "${srcdir}"/vim-build
 
diff --git a/libre/vim-runtime/parabola.vim b/libre/vim-runtime-parabola/parabola.vim
index 3db882946..3db882946 100644
--- a/libre/vim-runtime/parabola.vim
+++ b/libre/vim-runtime-parabola/parabola.vim
diff --git a/libre/vim-runtime/vimrc b/libre/vim-runtime-parabola/vimrc
index fc67e7eb0..fc67e7eb0 100644
--- a/libre/vim-runtime/vimrc
+++ b/libre/vim-runtime-parabola/vimrc
diff --git a/libre/webmin/PKGBUILD b/libre/webmin-parabola/PKGBUILD
index bc9307bcc..2a1c01db5 100644
--- a/libre/webmin/PKGBUILD
+++ b/libre/webmin-parabola/PKGBUILD
@@ -1,6 +1,7 @@
 # $Id: PKGBUILD 208132 2014-03-18 07:22:29Z tpowa $
 # Maintainer (Arch): Tobias Powalowski <tpowa@archlinux.org>
-pkgname=webmin
+_pkgname=webmin
+pkgname=webmin-parabola
 pkgver=1.680
 pkgrel=1
 pkgdesc="a web-based interface for system administration (Parabola rebranded)"
@@ -8,6 +9,9 @@ arch=(i686 x86_64 mips64el)
 license=('custom:webmin')
 url="http://www.webmin.com/"
 depends=('perl' 'perl-perl4-corelibs')
+replaces=($_pkgname)
+conflicts=($_pkgname)
+provides=($_pkgname=$pkgver)
 makedepends=('perl-net-ssleay')
 backup=('etc/webmin/miniserv.conf' 'etc/webmin/miniserv.users' 'etc/webmin/config' 'etc/webmin/webmin.cats' \
 'etc/webmin/pacman/config' \
@@ -83,7 +87,7 @@ backup=('etc/webmin/miniserv.conf' 'etc/webmin/miniserv.users' 'etc/webmin/confi
 'etc/webmin/pserver/config' \
 'etc/webmin/dnsadmin/config' )
 install=webmin.install
-source=(http://downloads.sourceforge.net/sourceforge/webadmin/$pkgname-$pkgver.tar.gz
+source=(http://downloads.sourceforge.net/sourceforge/webadmin/$_pkgname-$pkgver.tar.gz
         ftp://ftp.archlinux.org/other/webmin/webmin-config.tar.bz2
         ftp://ftp.archlinux.org/other/webmin/webmin-pacman.tar.bz2
         webmin.service)
@@ -91,7 +95,7 @@ options=(!strip)
 
 package() {
   # NOTE: USE --asroot build option to avoid fakeroot error!
-  cd "$srcdir"/$pkgname-$pkgver
+  cd "$srcdir"/$_pkgname-$pkgver
   # add patches from webmin.com
   #for i in ../*.wbm
   #do tar xvf $i
@@ -150,7 +154,7 @@ package() {
   sed -i -e 's:^noconfig=0:noconfig=1:g'  defaultacl
 
   # Add pacman menu
-  cd "$srcdir"/$pkgname-$pkgver
+  cd "$srcdir"/$_pkgname-$pkgver
   cp -rf custom/ pacman
   cp -rf mscstyle3/custom mscstyle3/pacman
   sed -i -e 's:^noconfig=0:noconfig=1:g' -e 's:^edit=1:edit=0:g' pacman/defaultacl
@@ -161,7 +165,7 @@ package() {
   sed -i -e 's:^index_title=.*:index_title=Pacman:g' pacman/lang/*
 
   # copy stuff to right dirs
-  cd "$srcdir"/$pkgname-$pkgver
+  cd "$srcdir"/$_pkgname-$pkgver
   cp -rp * "$pkgdir"/opt/webmin
   cd "$srcdir"/webmin-config
   cp -rfp * "$pkgdir"/opt/webmin
@@ -208,7 +212,7 @@ package() {
   # change sticky bit
   chmod 0644 $pkgdir/opt/webmin/man/config-generic-linux
   # install license
-  install -m 644 -D "$srcdir"/$pkgname-$pkgver/LICENCE "$pkgdir"/usr/share/licenses/webmin/LICENCE
+  install -m 644 -D "$srcdir"/$_pkgname-$pkgver/LICENCE "$pkgdir"/usr/share/licenses/webmin/LICENCE
 }
 md5sums=('52654bd0fe36e9cace00fa74e49d41d8'
          'b0b3e3fb231a12e60165b6b4d604dcfa'
diff --git a/libre/webmin/webmin.install b/libre/webmin-parabola/webmin.install
index efdd9291d..efdd9291d 100644
--- a/libre/webmin/webmin.install
+++ b/libre/webmin-parabola/webmin.install
diff --git a/libre/webmin/webmin.service b/libre/webmin-parabola/webmin.service
index a8a384a8c..a8a384a8c 100644
--- a/libre/webmin/webmin.service
+++ b/libre/webmin-parabola/webmin.service
diff --git a/libre/xorg-server-libre/PKGBUILD b/libre/xorg-server-parabola/PKGBUILD
index c928dec68..a77b16e62 100644
--- a/libre/xorg-server-libre/PKGBUILD
+++ b/libre/xorg-server-parabola/PKGBUILD
@@ -4,7 +4,7 @@
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=xorg-server
-pkgname=('xorg-server-libre')
+pkgname=('xorg-server-parabola')
 pkgver=1.16.0
 pkgrel=6 # build first with 0.1 and then rebuild it after xf86-input-evdev rebuild
 arch=('i686' 'x86_64' 'mips64el')
@@ -113,15 +113,15 @@ build() {
       -i hw/Makefile
 }
 
-package_xorg-server-libre() {
+package_xorg-server-parabola() {
   pkgdesc="Xorg X server, without nonfree nvidia driver support"
   depends=(libepoxy libxdmcp libxfont libpciaccess libdrm pixman libgcrypt libxau xorg-server-common xf86-input-evdev libxshmfence)
   # see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions - we provide major numbers that drivers can depend on
   # and /usr/lib/pkgconfig/xorg-server.pc in xorg-server-devel pkg
   provides=('X-ABI-VIDEODRV_VERSION=18' 'X-ABI-XINPUT_VERSION=21' 'X-ABI-EXTENSION_VERSION=8.0' 'x-server' "$pkgbase=$pkgver")
   groups=('xorg')
-  conflicts=('nvidia-utils' 'glamor-egl' "$pkgbase")
-  replaces=('nvidia-utils' 'glamor-egl' "$pkgbase")
+  conflicts=('nvidia-utils' 'glamor-egl' "$pkgbase" "${pkgbase}-libre")
+  replaces=('nvidia-utils' 'glamor-egl' "$pkgbase" "${pkgbase}-libre")
   install=xorg-server.install
 
   cd "${pkgbase}-${pkgver}"
diff --git a/libre/xorg-server-libre/autoconfig-nvidia-libre.patch b/libre/xorg-server-parabola/autoconfig-nvidia-libre.patch
index 688b495e1..688b495e1 100644
--- a/libre/xorg-server-libre/autoconfig-nvidia-libre.patch
+++ b/libre/xorg-server-parabola/autoconfig-nvidia-libre.patch
diff --git a/libre/xorg-server-libre/autoconfig-sis.patch b/libre/xorg-server-parabola/autoconfig-sis.patch
index 0b50049db..0b50049db 100644
--- a/libre/xorg-server-libre/autoconfig-sis.patch
+++ b/libre/xorg-server-parabola/autoconfig-sis.patch
diff --git a/libre/xorg-server-libre/glamor-upstream-fix.patch b/libre/xorg-server-parabola/glamor-upstream-fix.patch
index 89dd4d017..89dd4d017 100644
--- a/libre/xorg-server-libre/glamor-upstream-fix.patch
+++ b/libre/xorg-server-parabola/glamor-upstream-fix.patch
diff --git a/libre/xorg-server-libre/xorg-server.install b/libre/xorg-server-parabola/xorg-server.install
index 46bf5a90a..46bf5a90a 100644
--- a/libre/xorg-server-libre/xorg-server.install
+++ b/libre/xorg-server-parabola/xorg-server.install
diff --git a/libre/xorg-server-libre/xvfb-run b/libre/xorg-server-parabola/xvfb-run
index 4c2f4e0d3..4c2f4e0d3 100644
--- a/libre/xorg-server-libre/xvfb-run
+++ b/libre/xorg-server-parabola/xvfb-run
diff --git a/libre/xorg-server-libre/xvfb-run.1 b/libre/xorg-server-parabola/xvfb-run.1
index 137d3a196..137d3a196 100644
--- a/libre/xorg-server-libre/xvfb-run.1
+++ b/libre/xorg-server-parabola/xvfb-run.1
diff --git a/libre/xsp/PKGBUILD b/libre/xsp-parabola/PKGBUILD
index 93867938d..d497bec70 100644
--- a/libre/xsp/PKGBUILD
+++ b/libre/xsp-parabola/PKGBUILD
@@ -2,19 +2,23 @@
 # Maintainer (Arch): Daniel Isenmann <daniel@archlinux.org>
 # Contributor (Arch): Tobias Kieslich <tobias@justdreams.de>
 
-pkgname=xsp
+_pkgname=xsp
+pkgname=xsp-parabola
 pkgver=3.0.11
-pkgrel=1.1
+pkgrel=1
 pkgdesc="A simple webserver based on mono - provides ASP.NET support (Parabola rebranded)"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://www.go-mono.com"
 depends=('mono' 'sqlite')
 options=(!makeflags)
-install=${pkgname}.install
+replaces=($_pkgname)
+conflicts=($_pkgname)
+provides=($_pkgname=$pkgver)
+install=${_pkgname}.install
 source=(https://github.com/mono/xsp/archive/${pkgver}.tar.gz
-        ${pkgname}.webapp
-        ${pkgname}.service)
+        ${_pkgname}.webapp
+        ${_pkgname}.service)
 md5sums=('6a694d5e87ebe57e532ec80a16b6966d'
          'c917c07f68b945691506c29750db482f'
          '9d83bd36d209f8d36a11dfbc4fa50819')
@@ -25,7 +29,7 @@ build() {
   mkdir -p "${MONO_SHARED_DIR}"
  # import pathes
  # build
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${srcdir}/${_pkgname}-${pkgver}
   #sed -i 's|/bin/sh|\0\nexport MONO_PATH=${MONO_PATH}:/opt/mono/lib/mono/1.0|' scripts/script.in
   ./autogen.sh
   ./configure --prefix=/usr --sysconfdir=/etc
@@ -40,19 +44,19 @@ build() {
 }
 
 package(){
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${srcdir}/${_pkgname}-${pkgver}
   make DESTDIR=${pkgdir}/ install
  # move test files from share to arch' default html home
   mkdir -p ${pkgdir}/srv/http/html
   mv ${pkgdir}/usr/lib/xsp/test ${pkgdir}/srv/http/html/xsp
   rm -rf ${pkgdir}/usr/share
-  chown -R http:http ${pkgdir}/srv/http/html/${pkgname}
+  chown -R http:http ${pkgdir}/srv/http/html/${_pkgname}
 
  # install a xsp configuration home
-  install -D -m644 ${srcdir}/${pkgname}.webapp \
-    ${pkgdir}/etc/${pkgname}/${pkgname}.webapp
-  install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
+  install -D -m644 ${srcdir}/${_pkgname}.webapp \
+    ${pkgdir}/etc/${_pkgname}/${_pkgname}.webapp
+  install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${_pkgname}/COPYING
  # install systemd service file
-  install -D -m644 ${srcdir}/${pkgname}.service \
+  install -D -m644 ${srcdir}/${_pkgname}.service \
     ${pkgdir}/usr/lib/systemd/system/xsp.service
 }
diff --git a/libre/xsp/xsp.conf.d b/libre/xsp-parabola/xsp.conf.d
index b100baef1..b100baef1 100644
--- a/libre/xsp/xsp.conf.d
+++ b/libre/xsp-parabola/xsp.conf.d
diff --git a/libre/xsp/xsp.install b/libre/xsp-parabola/xsp.install
index d2cc5955a..d2cc5955a 100644
--- a/libre/xsp/xsp.install
+++ b/libre/xsp-parabola/xsp.install
diff --git a/libre/xsp/xsp.rc.d b/libre/xsp-parabola/xsp.rc.d
index b4fcda15c..b4fcda15c 100644
--- a/libre/xsp/xsp.rc.d
+++ b/libre/xsp-parabola/xsp.rc.d
diff --git a/libre/xsp/xsp.service b/libre/xsp-parabola/xsp.service
index 36b802e21..36b802e21 100644
--- a/libre/xsp/xsp.service
+++ b/libre/xsp-parabola/xsp.service
diff --git a/libre/xsp/xsp.webapp b/libre/xsp-parabola/xsp.webapp
index a685dd171..a685dd171 100644
--- a/libre/xsp/xsp.webapp
+++ b/libre/xsp-parabola/xsp.webapp