remove parabola suffix and add complex pkgrel on the packages

177 files changed, 356 insertions, 429 deletions

diff --git a/libre/abs-parabola/PKGBUILD b/libre/abs/PKGBUILD
index 5d6622b6f..e9f313c9c 100644
--- a/libre/abs-parabola/PKGBUILD
+++ b/libre/abs/PKGBUILD
@@ -1,31 +1,29 @@
 # $Id: PKGBUILD 215815 2014-06-30 16:27:03Z fyan $
 # Maintainer (Arch): Allan McRae <allan@archlinux.org>
 
-_pkgname=abs
-pkgname=abs-parabola
+pkgname=abs
 pkgver=2.4.4
-pkgrel=2
+pkgrel=2.parabola1
 pkgdesc="Utilities to download and work with the Arch Build System (ABS), with Parabola repos support"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://projects.archlinux.org/abs.git/"
 license=('GPL')
-replaces=('abs' 'abs-libre')
-conflicts=('abs' 'abs-libre')
-provides=("abs=$pkgver")
+replaces=('abs-libre' 'abs-parabola')
+conflicts=('abs-libre' 'abs-parabola')
 depends=('bash' 'rsync')
 backup=(etc/abs.conf)
-source=(ftp://ftp.archlinux.org/other/abs/${_pkgname}-${pkgver}.tar.gz{,.sig})
+source=(ftp://ftp.archlinux.org/other/abs/${pkgname}-${pkgver}.tar.gz{,.sig})
 md5sums=('7258c739a93e02a4f31f114e9fc3b0ba'
          'a628f7d5b1cd1e838366b88709690c24')
 
 build() {
-  cd "$_pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
   make
 }
 
 package() {
-  cd "$_pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
   make DESTDIR="${pkgdir}" install
 
diff --git a/libre/audex-parabola/PKGBUILD b/libre/audex/PKGBUILD
index 56ddcf3ec..0e2730eb6 100644
--- a/libre/audex-parabola/PKGBUILD
+++ b/libre/audex/PKGBUILD
@@ -5,28 +5,26 @@
 # Contributor (Arch): moostik <mooostik_at_gmail.com>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-_pkgname=audex
-pkgname=audex-parabola
+pkgname=audex
 pkgver=0.78
-pkgrel=1
+pkgrel=1.parabola1
 pkgdesc="A CDDA extraction tool with a ftp upload function for KDE, without nonfree faac recommendation"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://kde-apps.org/content/show.php?content=77125"
 license=('GPL')
-replaces=("${_pkgname}" "${_pkgname}-libre")
-conflicts=("${_pkgname}" "${_pkgname}-libre")
-provides=(${_pkgname}=${pkgver})
+replaces=("${pkgname}-libre" "${pkgname}-parabola")
+conflicts=("${pkgname}-libre" "${pkgname}-parabola")
 depends=('kdebase-runtime' 'libkcddb' 'libkcompactdisc' 'cdparanoia')
 makedepends=('cmake' 'automoc4')
 optdepends=('vorbis-tools: OGG encoder'
 	'flac: FLAC encoder'
 	'lame: MP3 encoder')
-install=${_pkgname}.install
-source=("http://kde.maniatek.com/${_pkgname}/files/${_pkgname}-${pkgver}.tar.xz")
+install=${pkgname}.install
+source=("http://kde.maniatek.com/${pkgname}/files/${pkgname}-${pkgver}.tar.xz")
 md5sums=('e424309ab085de40043f841f2fa230c6')
 
 build() {
-  cd ${_pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
 
   mkdir build
   cd build
@@ -38,7 +36,7 @@ build() {
 }
 
 package() {
-  cd ${_pkgname}-${pkgver}/build
+  cd ${pkgname}-${pkgver}/build
 
   make DESTDIR=${pkgdir} install
 }
diff --git a/libre/audex-parabola/audex.install b/libre/audex/audex.install
index 81ce5c4b0..81ce5c4b0 100644
--- a/libre/audex-parabola/audex.install
+++ b/libre/audex/audex.install
diff --git a/libre/audex-parabola/google_regex.patch b/libre/audex/google_regex.patch
index 86917e66f..86917e66f 100644
--- a/libre/audex-parabola/google_regex.patch
+++ b/libre/audex/google_regex.patch
diff --git a/libre/audio-convert-parabola/ChangeLog b/libre/audio-convert/ChangeLog
index 0d8720f38..0d8720f38 100644
--- a/libre/audio-convert-parabola/ChangeLog
+++ b/libre/audio-convert/ChangeLog
diff --git a/libre/audio-convert-parabola/PKGBUILD b/libre/audio-convert/PKGBUILD
index 62e218bc5..155151a4d 100644
--- a/libre/audio-convert-parabola/PKGBUILD
+++ b/libre/audio-convert/PKGBUILD
@@ -3,10 +3,9 @@
 # Contributor (Arch): Igor Galic <i.galic@gmail.com>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-_pkgname=audio-convert
-pkgname=audio-convert-parabola
+pkgname=audio-convert
 pkgver=0.3.1.1
-pkgrel=7
+pkgrel=7.parabola1
 pkgdesc="A script with an easy to use interface to convert audio files: wav, mp3, ogg, flac, aac, mpc, ape and wma, without nonfree faac recommendation"
 arch=('any')
 url="http://freshmeat.net/projects/audio-convert"
@@ -19,15 +18,14 @@ optdepends=('faad2: for aac support'
             'mplayer: for wma support'
             'musepack-tools: for mpc support'
             'vorbis-tools: for ogg support')
-replaces=("${_pkgname}" "${_pkgname}-libre")
-conflicts=("${_pkgname}" "${_pkgname}-libre")
-provides=(${_pkgname}=${pkgver})
-source=(http://savannah.nongnu.org/download/$_pkgname/$_pkgname-$pkgver.tar.bz2)
+replaces=("${pkgname}-libre" "${pkgname}-parabola")
+conflicts=("${pkgname}-libre" "${pkgname}-parabola")
+source=(http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.bz2)
 sha256sums=('7b37d5fc2a4dd62885910b6424f5ff6870c329ed4f4f51feeeb952152c7d9d2b')
 
 package() {
-  install -D -m755 "$srcdir/$_pkgname-$pkgver/$_pkgname" "$pkgdir/usr/bin/$_pkgname"
+  install -D -m755 "$srcdir/$pkgname-$pkgver/$pkgname" "$pkgdir/usr/bin/$pkgname"
 
 #FS#29260 fix
-  sed -i '46 s/^/#/' "$pkgdir/usr/bin/$_pkgname"
+  sed -i '46 s/^/#/' "$pkgdir/usr/bin/$pkgname"
 }
diff --git a/libre/avidemux-parabola/PKGBUILD b/libre/avidemux/PKGBUILD
index 0a1d76cf4..9b17d4043 100644
--- a/libre/avidemux-parabola/PKGBUILD
+++ b/libre/avidemux/PKGBUILD
@@ -3,9 +3,9 @@
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
 pkgbase=avidemux
-pkgname=('avidemux-cli-parabola' 'avidemux-gtk-parabola' 'avidemux-qt-parabola')
+pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt')
 pkgver=2.5.6
-pkgrel=9
+pkgrel=9.parabola1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://fixounet.free.fr/avidemux/"
@@ -39,7 +39,7 @@ build() {
   make
 }
 
-package_avidemux-cli-parabola() {
+package_avidemux-cli() {
   pkgdesc="A graphical tool to edit video (filter/re-encode/split), without nonfree faac support"
   depends=('libxml2' 'sdl' 'fontconfig' 'libvpx' 'libva')
   optdepends=('lame: for the corresponding audio encoder plugin'
@@ -50,9 +50,9 @@ package_avidemux-cli-parabola() {
               'sdl: for the corresponding audio device plugin'
               'x264: for the corresponding video encoder plugin'
               'xvidcore: for the corresponding video encoder plugin')
-  provides=('avidemux' "avidemux-cli=$pkgver")
-  conflicts=('avidemux' 'avidemux-cli' 'avidemux-libre-cli')
-  replaces=('avidemux' 'avidemux-cli' 'avidemux-libre-cli')
+  provides=('avidemux')
+  conflicts=('avidemux' 'avidemux-libre-cli' 'avidemux-cli-parabola')
+  replaces=('avidemux' 'avidemux-libre-cli' 'avidemux-cli-parabola')
 
   cd ${pkgbase}_${pkgver}/build
   make DESTDIR="${pkgdir}" install
@@ -74,12 +74,11 @@ package_avidemux-cli-parabola() {
   install -D -m644 ../../man/avidemux.1 "${pkgdir}/usr/share/man/man1/avidemux.1"
 }
 
-package_avidemux-gtk-parabola() {
+package_avidemux-gtk() {
   pkgdesc="A graphical tool to edit video (filter/re-encode/split) - GTK GUI, without nonfree faac support"
   depends=("avidemux-cli=${pkgver}" 'gtk2' 'libxv' 'desktop-file-utils')
-  replaces=('avidemux-gtk' 'avidemux-libre-gtk')
-  conflicts=('avidemux-gtk' 'avidemux-libre-gtk')
-  provides=("avidemux-gtk=$pkgver")
+  replaces=('avidemux-libre-gtk' 'avidemux-gtk-parabola')
+  conflicts=('avidemux-libre-gtk' 'avidemux-gtk-parabola')
   install=avidemux.install
 
   cd ${pkgbase}_${pkgver}
@@ -97,12 +96,11 @@ package_avidemux-gtk-parabola() {
   sed -i "s|\[\$e\]||" "${pkgdir}/usr/share/applications/avidemux-gtk.desktop"
 }
 
-package_avidemux-qt-parabola() {
+package_avidemux-qt() {
   pkgdesc="A graphical tool to edit video (filter/re-encode/split) - Qt GUI, without nonfree faac support"
   depends=("avidemux-cli=${pkgver}" 'qt4')
-  replaces=('avidemux-qt' 'avidemux-libre-qt')
-  conflicts=('avidemux-qt' 'avidemux-libre-qt')
-  provides=("avidemux-qt=$pkgver")
+  replaces=('avidemux-libre-qt' 'avidemux-qt-parabola')
+  conflicts=('avidemux-libre-qt' 'avidemux-qt-parabola')
   install=avidemux.install
 
   cd ${pkgbase}_${pkgver}
diff --git a/libre/avidemux-parabola/PKGBUILD.WIP b/libre/avidemux/PKGBUILD.WIP
index c79fb90e9..c79fb90e9 100644
--- a/libre/avidemux-parabola/PKGBUILD.WIP
+++ b/libre/avidemux/PKGBUILD.WIP
diff --git a/libre/avidemux-parabola/avidemux.install b/libre/avidemux/avidemux.install
index e111ef946..e111ef946 100644
--- a/libre/avidemux-parabola/avidemux.install
+++ b/libre/avidemux/avidemux.install
diff --git a/libre/bfgminer-parabola/PKGBUILD b/libre/bfgminer/PKGBUILD
index 51fbc80a4..1a1508af8 100644
--- a/libre/bfgminer-parabola/PKGBUILD
+++ b/libre/bfgminer/PKGBUILD
@@ -2,33 +2,31 @@
 # Maintainer (Arch): Timothy Redaelli <timothy.redaelli@gmail.com>
 # Contributor (Arch): Andy Weidenbaum <archbaum@gmail.com>
 
-_pkgname=bfgminer
-pkgname=bfgminer-parabola
+pkgname=bfgminer
 pkgver=4.7.0
-pkgrel=1
+pkgrel=1.parabola1
 pkgdesc="Bitcoin miner featuring overclocking, monitoring, fan speed control and remote management. For FPGA/GPU/CPU Bitcoin mining, without nonfree OpenCL recommendation"
 arch=('i686' 'x86_64' 'mips64el')
 depends=('curl' 'jansson' 'libevent' 'libmicrohttpd' 'libusb' 'lm_sensors')
 makedepends=('uthash' 'yasm')
-replaces=("${_pkgname}" "${_pkgname}-libre")
-conflicts=("${_pkgname}" "${_pkgname}-libre")
-provides=("${_pkgname}=$pkgver")
+replaces=("${pkgname}-libre" "${pkgname}-parabola")
+conflicts=("${pkgname}-libre" "${pkgname}-parabola")
 url='http://bfgminer.org/'
 license=('GPL3')
-source=(http://luke.dashjr.org/programs/bitcoin/files/$_pkgname/$pkgver/$_pkgname-$pkgver.txz
+source=(http://luke.dashjr.org/programs/bitcoin/files/$pkgname/$pkgver/$pkgname-$pkgver.txz
         remove-dangerous-rpath.patch)
 sha256sums=('044636103f2c399d8c0290e6642ef896cff43de3c025d99a1465e670337aeb0a'
             'd26d07ca23ae25798c4db37cfda1a6a76f22d06e73efab1ddf62b3e1a7eef04c')
 
 prepare() {
-  cd "$srcdir"/$_pkgname-$pkgver
+  cd "$srcdir"/$pkgname-$pkgver
 
   patch -p0 < "${srcdir}"/remove-dangerous-rpath.patch
   NOSUBMODULES=1 ./autogen.sh
 }
 
 build() {
-  cd "$srcdir"/$_pkgname-$pkgver
+  cd "$srcdir"/$pkgname-$pkgver
 
   ./configure --prefix=/usr \
     --sbindir=/usr/bin \
@@ -43,7 +41,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir"/$_pkgname-$pkgver
+  cd "$srcdir"/$pkgname-$pkgver
 
   make DESTDIR="$pkgdir" install
 }
diff --git a/libre/bfgminer-parabola/change-kernel-path.patch b/libre/bfgminer/change-kernel-path.patch
index 9dd124ab4..9dd124ab4 100644
--- a/libre/bfgminer-parabola/change-kernel-path.patch
+++ b/libre/bfgminer/change-kernel-path.patch
diff --git a/libre/bfgminer-parabola/remove-dangerous-rpath.patch b/libre/bfgminer/remove-dangerous-rpath.patch
index abd815141..abd815141 100644
--- a/libre/bfgminer-parabola/remove-dangerous-rpath.patch
+++ b/libre/bfgminer/remove-dangerous-rpath.patch
diff --git a/libre/bitlbee-parabola/PKGBUILD b/libre/bitlbee/PKGBUILD
index 3c434e7a8..cbe8ad850 100644
--- a/libre/bitlbee-parabola/PKGBUILD
+++ b/libre/bitlbee/PKGBUILD
@@ -8,10 +8,9 @@
 # Maintainer (Arch): Dave Reisner <dreisner@archlinux.org>
 # Maintainer: Márcio Silva <coadde@parabola.nu>
 
-_pkgname=bitlbee
-pkgname=bitlbee-parabola
+pkgname=bitlbee
 pkgver=3.2.2
-pkgrel=1
+pkgrel=1.parabola1
 pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC, without nonfree Skype support'
 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')
-replaces=("${_pkgname}" "${_pkgname}-libre")
-conflicts=("${_pkgname}" "${_pkgname}-libre")
-provides=(${_pkgname}=${pkgver})
-source=("http://get.bitlbee.org/src/$_pkgname-$pkgver.tar.gz"
+replaces=("${pkgname}-libre" "${pkgname}-parabola")
+conflicts=("${pkgname}-libre" "${pkgname}-parabola")
+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 \
@@ -49,7 +47,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/libre/bitlbee-parabola/bitlbee.install b/libre/bitlbee/bitlbee.install
index c8a8f93a1..c8a8f93a1 100644
--- a/libre/bitlbee-parabola/bitlbee.install
+++ b/libre/bitlbee/bitlbee.install
diff --git a/libre/bitlbee-parabola/bitlbee.tmpfiles b/libre/bitlbee/bitlbee.tmpfiles
index da72a0a79..da72a0a79 100644
--- a/libre/bitlbee-parabola/bitlbee.tmpfiles
+++ b/libre/bitlbee/bitlbee.tmpfiles
diff --git a/libre/cups-filters-parabola/PKGBUILD b/libre/cups-filters/PKGBUILD
index 834b6dcd7..8e4f9a518 100644
--- a/libre/cups-filters-parabola/PKGBUILD
+++ b/libre/cups-filters/PKGBUILD
@@ -1,10 +1,9 @@
 # $Id: PKGBUILD 220542 2014-08-22 14:56:28Z andyrtr $
 # Maintainer (Arch): Andreas Radke <andyrtr@archlinux.org>
 
-pkgname=cups-filters-parabola
-_pkgname=cups-filters
+pkgname=cups-filters
 pkgver=1.0.58
-pkgrel=1
+pkgrel=1.parabola1
 pkgdesc="OpenPrinting CUPS Filters, without foomatic-db-nonfree recommendation"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting"
@@ -16,14 +15,14 @@ optdepends=('ghostscript: for non-PostScript printers to print with CUPS to conv
 	    'foomatic-db-engine: drivers use Ghostscript to convert PostScript to a printable form directly')
 backup=(etc/fonts/conf.d/99pdftoopvp.conf
         etc/cups/cups-browsed.conf)
-source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz)
-provides=("${_pkgname}=${pkgver}" 'foomatic-filters')
-replaces=("${_pkgname}" 'foomatic-filters' "${_pkgname}-libre")
-conflicts=("${_pkgname}" 'foomatic-filters' "${_pkgname}-libre")
+source=(http://www.openprinting.org/download/cups-filters/$pkgname-$pkgver.tar.gz)
+provides=('foomatic-filters')
+replaces=('foomatic-filters' "${pkgname}-libre" "${pkgname}-parabola")
+conflicts=('foomatic-filters' "${pkgname}-libre" "${pkgname}-parabola")
 md5sums=('0143ef62cd229e99fd3b03e827b1c122')
 
 build() {
-  cd $_pkgname-$pkgver
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr  \
     --sysconfdir=/etc \
     --sbindir=/usr/bin \
@@ -36,12 +35,12 @@ build() {
 }
 
 check() {
-  cd $_pkgname-$pkgver
+  cd $pkgname-$pkgver
   make check
 }
 
 package() {
-  cd $_pkgname-$pkgver
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir/" install
   
   # add upstream systemd support file
diff --git a/libre/cups-filters-parabola/cups-browsed.service b/libre/cups-filters/cups-browsed.service
index 07b342d62..07b342d62 100644
--- a/libre/cups-filters-parabola/cups-browsed.service
+++ b/libre/cups-filters/cups-browsed.service
diff --git a/libre/cups-filters-parabola/poppler_buildfix.diff b/libre/cups-filters/poppler_buildfix.diff
index 18fc643f9..18fc643f9 100644
--- a/libre/cups-filters-parabola/poppler_buildfix.diff
+++ b/libre/cups-filters/poppler_buildfix.diff
diff --git a/libre/ecasound-parabola/PKGBUILD b/libre/ecasound/PKGBUILD
index 58f2f40f6..8e156c615 100644
--- a/libre/ecasound-parabola/PKGBUILD
+++ b/libre/ecasound/PKGBUILD
@@ -4,10 +4,9 @@
 # Contributor (Arch): Tom Newsom <Jeepster@gmx.co.uk>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-_pkgname=ecasound
-pkgname=ecasound-parabola
+pkgname=ecasound
 pkgver=2.9.1
-pkgrel=2
+pkgrel=2.parabola1
 pkgdesc="Command-line multitrack audio processor, without nonfree faac recommendation"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.eca.cx/ecasound/"
@@ -22,16 +21,15 @@ optdepends=('python2: ecamonitor, ECI API'
             'faad2: AAC decoding'
             'timidity++: MIDI file input'
             'libmikmod: tracker module')
-replaces=("${_pkgname}" "${_pkgname}-libre")
-conflicts=("${_pkgname}" "${_pkgname}-libre")
-provides=(${_pkgname}=${pkgver})
-source=("http://ecasound.seul.org/download/$_pkgname-$pkgver.tar.gz"
+replaces=("${pkgname}-libre" "${pkgname}-parabola")
+conflicts=("${pkgname}-libre" "${pkgname}-parabola")
+source=("http://ecasound.seul.org/download/$pkgname-$pkgver.tar.gz"
         'ruby2.patch')
 md5sums=('13c7be1e4eddc0bbf3792dc17777e465'
          '6909dbd4f67f76d3bd31ce7c7fe16212')
 
 build() {
-  cd "$srcdir/$_pkgname-$pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
 
   # fix ruby 2.0 incompatibility + use vendor_ruby for ruby files
   patch -Np1 -i "$srcdir/ruby2.patch"
@@ -45,7 +43,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$_pkgname-$pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
 
   make DESTDIR="$pkgdir/" install
 
diff --git a/libre/ecasound-parabola/ruby2.patch b/libre/ecasound/ruby2.patch
index d55f12140..d55f12140 100644
--- a/libre/ecasound-parabola/ruby2.patch
+++ b/libre/ecasound/ruby2.patch
diff --git a/libre/engrampa-parabola/PKGBUILD b/libre/engrampa/PKGBUILD
index c94f519aa..6952dc040 100644
--- a/libre/engrampa-parabola/PKGBUILD
+++ b/libre/engrampa/PKGBUILD
@@ -2,10 +2,9 @@
 # Maintainer (Arch): Martin Wimpress <code@flexion.org>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-_pkgname=engrampa
-pkgname=engrampa-parabola
+pkgname=engrampa
 pkgver=1.8.0
-pkgrel=1
+pkgrel=1.parabola1
 pkgdesc="Archive manipulator for MATE, with unar recommendation included and nonfree unace recommendation removed"
 url="http://mate-desktop.org"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,27 +15,27 @@ optdepends=('unar: for RAR uncompression'
             'zip: for ZIP archives' 'unzip: for ZIP archives'
             'p7zip: 7zip compression utility' 'arj: for ARJ archives'
             'yelp: for reading MATE help documents')
-replaces=('mate-file-archiver' "${_pkgname}" "${_pkgname}-libre")
-provides=('mate-file-archiver' "${_pkgname}=$pkgver")
-conflicts=('mate-file-archiver' "${_pkgname}" "${_pkgname}-libre")
+replaces=('mate-file-archiver' "${pkgname}-libre" "${pkgname}-parabola")
+provides=('mate-file-archiver')
+conflicts=('mate-file-archiver' "${pkgname}-libre" "${pkgname}-parabola")
 groups=('mate-extra')
-source=("http://pub.mate-desktop.org/releases/1.8/${_pkgname}-${pkgver}.tar.xz"
+source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz"
         fr-rpm-bsdtar.patch)
 sha1sums=('511019cee95568a4951e9da12d8a7282c3f6af65'
           '219b05a979bf6f249aaae27964f02345fd81168d')
-install=${_pkgname}.install
+install=${pkgname}.install
 
 prepare() {
-    cd "${srcdir}/${_pkgname}-${pkgver}"
+    cd "${srcdir}/${pkgname}-${pkgver}"
     # This patch 'depends' on libarchive
     patch -Np1 -i "${srcdir}/fr-rpm-bsdtar.patch"
 }
 
 build() {
-    cd "${srcdir}/${_pkgname}-${pkgver}"
+    cd "${srcdir}/${pkgname}-${pkgver}"
     ./configure \
         --prefix=/usr \
-        --libexecdir=/usr/lib/${_pkgname} \
+        --libexecdir=/usr/lib/${pkgname} \
         --with-gtk=2.0 \
         --disable-static \
         --disable-packagekit
@@ -44,6 +43,6 @@ build() {
 }
 
 package() {
-    cd "${srcdir}/${_pkgname}-${pkgver}"
+    cd "${srcdir}/${pkgname}-${pkgver}"
     make DESTDIR="${pkgdir}" install
 }
diff --git a/libre/engrampa-parabola/engrampa.install b/libre/engrampa/engrampa.install
index bf6781f93..bf6781f93 100644
--- a/libre/engrampa-parabola/engrampa.install
+++ b/libre/engrampa/engrampa.install
diff --git a/libre/engrampa-parabola/fr-rpm-bsdtar.patch b/libre/engrampa/fr-rpm-bsdtar.patch
index 93a783176..93a783176 100644
--- a/libre/engrampa-parabola/fr-rpm-bsdtar.patch
+++ b/libre/engrampa/fr-rpm-bsdtar.patch
diff --git a/libre/file-roller-parabola/PKGBUILD b/libre/file-roller/PKGBUILD
index 4cdc7cb17..937f02cba 100644
--- a/libre/file-roller-parabola/PKGBUILD
+++ b/libre/file-roller/PKGBUILD
@@ -2,10 +2,9 @@
 # Maintainer (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor (Arch): Jan de Groot <jgc@archlinux.org>
 
-_pkgname=file-roller
-pkgname=file-roller-parabola
+pkgname=file-roller
 pkgver=3.12.2
-pkgrel=1
+pkgrel=1.parabola1
 pkgdesc="Create and modify archives, with unar support included and nonfree unace recommendation removed"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -13,17 +12,16 @@ depends=('desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'dconf' 'libarchive' '
 makedepends=('intltool' 'gnome-doc-utils' 'pkg-config' 'libnautilus-extension' 'itstool' 'docbook-xsl')
 optdepends=('lrzip: lrzip archive support')
 groups=('gnome-extra')
-replaces=("${_pkgname}" "${_pkgname}-libre")
-conflicts=("${_pkgname}" "${_pkgname}-libre")
-provides=(${_pkgname}=${pkgver})
+replaces=("${pkgname}-libre" "${pkgname}-parabola")
+conflicts=("${pkgname}-libre" "${pkgname}-parabola")
 options=('!emptydirs')
 install=file-roller.install
 url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:4}/$_pkgname-$pkgver.tar.xz)
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
 sha256sums=('0677be6618dba609eae2d76420e8a5a8d9a414bcec654e7b71e65b941764eacf')
 
 build() {
-  cd $_pkgname-$pkgver
+  cd $pkgname-$pkgver
 
   ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/file-roller \
@@ -33,6 +31,6 @@ build() {
 }
 
 package() {
-  cd $_pkgname-$pkgver
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 }
diff --git a/libre/file-roller-parabola/bug708854.patch b/libre/file-roller/bug708854.patch
index 6a5591a59..6a5591a59 100644
--- a/libre/file-roller-parabola/bug708854.patch
+++ b/libre/file-roller/bug708854.patch
diff --git a/libre/file-roller-parabola/bug709035.patch b/libre/file-roller/bug709035.patch
index f82e33f30..f82e33f30 100644
--- a/libre/file-roller-parabola/bug709035.patch
+++ b/libre/file-roller/bug709035.patch
diff --git a/libre/file-roller-parabola/file-roller.install b/libre/file-roller/file-roller.install
index 8b17fa3d4..8b17fa3d4 100644
--- a/libre/file-roller-parabola/file-roller.install
+++ b/libre/file-roller/file-roller.install
diff --git a/libre/file-roller-parabola/rePKGBUILD b/libre/file-roller/rePKGBUILD
index a83d218f1..a83d218f1 100644
--- a/libre/file-roller-parabola/rePKGBUILD
+++ b/libre/file-roller/rePKGBUILD
diff --git a/libre/filesystem-parabola/PKGBUILD b/libre/filesystem/PKGBUILD
index 0bc0fac54..446d4e49d 100644
--- a/libre/filesystem-parabola/PKGBUILD
+++ b/libre/filesystem/PKGBUILD
@@ -3,10 +3,9 @@
 # Maintainer: Nicolás Reynolds <fauno@kiwwwi.com.ar>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-_pkgname=filesystem
-pkgname=filesystem-parabola
+pkgname=filesystem
 pkgver=2014.07
-pkgrel=1.1
+pkgrel=1.parabola1
 pkgdesc='Base filesystem (Parabola rebranded)'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -15,9 +14,8 @@ groups=('base')
 install='filesystem.install'
 makedepends=('asciidoc')
 depends=('iana-etc')
-replaces=($_pkgname)
-conflicts=($_pkgname)
-provides=($_pkgname=$pkgver)
+replaces=(${pkgname}-parabola)
+conflicts=(${pkgname}-parabola)
 backup=('etc/fstab' 'etc/crypttab' 'etc/group' 'etc/hosts' 'etc/ld.so.conf' 'etc/passwd'
         'etc/shadow' 'etc/gshadow' 'etc/resolv.conf' 'etc/motd' 'etc/nsswitch.conf'
         'etc/shells' 'etc/host.conf' 'etc/securetty' 'etc/profile' 'etc/issue')
diff --git a/libre/filesystem-parabola/crypttab b/libre/filesystem/crypttab
index 195945a74..195945a74 100644
--- a/libre/filesystem-parabola/crypttab
+++ b/libre/filesystem/crypttab
diff --git a/libre/filesystem-parabola/filesystem.install b/libre/filesystem/filesystem.install
index d70906f47..d70906f47 100644
--- a/libre/filesystem-parabola/filesystem.install
+++ b/libre/filesystem/filesystem.install
diff --git a/libre/filesystem-parabola/fstab b/libre/filesystem/fstab
index b6716c14a..b6716c14a 100644
--- a/libre/filesystem-parabola/fstab
+++ b/libre/filesystem/fstab
diff --git a/libre/filesystem-parabola/group b/libre/filesystem/group
index ebfb87169..ebfb87169 100644
--- a/libre/filesystem-parabola/group
+++ b/libre/filesystem/group
diff --git a/libre/filesystem-parabola/gshadow b/libre/filesystem/gshadow
index 1fcb075bc..1fcb075bc 100644
--- a/libre/filesystem-parabola/gshadow
+++ b/libre/filesystem/gshadow
diff --git a/libre/filesystem-parabola/host.conf b/libre/filesystem/host.conf
index cf52fe561..cf52fe561 100644
--- a/libre/filesystem-parabola/host.conf
+++ b/libre/filesystem/host.conf
diff --git a/libre/filesystem-parabola/hosts b/libre/filesystem/hosts
index 1747f9196..1747f9196 100644
--- a/libre/filesystem-parabola/hosts
+++ b/libre/filesystem/hosts
diff --git a/libre/filesystem-parabola/issue b/libre/filesystem/issue
index b001c55dd..b001c55dd 100644
--- a/libre/filesystem-parabola/issue
+++ b/libre/filesystem/issue
diff --git a/libre/filesystem-parabola/ld.so.conf b/libre/filesystem/ld.so.conf
index dfac45683..dfac45683 100644
--- a/libre/filesystem-parabola/ld.so.conf
+++ b/libre/filesystem/ld.so.conf
diff --git a/libre/filesystem-parabola/locale.sh b/libre/filesystem/locale.sh
index 3cfc89c1b..3cfc89c1b 100644
--- a/libre/filesystem-parabola/locale.sh
+++ b/libre/filesystem/locale.sh
diff --git a/libre/filesystem-parabola/modprobe.d.usb-load-ehci-first b/libre/filesystem/modprobe.d.usb-load-ehci-first
index 947379411..947379411 100644
--- a/libre/filesystem-parabola/modprobe.d.usb-load-ehci-first
+++ b/libre/filesystem/modprobe.d.usb-load-ehci-first
diff --git a/libre/filesystem-parabola/motd b/libre/filesystem/motd
index e69de29bb..e69de29bb 100644
--- a/libre/filesystem-parabola/motd
+++ b/libre/filesystem/motd
diff --git a/libre/filesystem-parabola/nsswitch.conf b/libre/filesystem/nsswitch.conf
index 4a4f5770d..4a4f5770d 100644
--- a/libre/filesystem-parabola/nsswitch.conf
+++ b/libre/filesystem/nsswitch.conf
diff --git a/libre/filesystem-parabola/os-release b/libre/filesystem/os-release
index fe5f20b4f..fe5f20b4f 100644
--- a/libre/filesystem-parabola/os-release
+++ b/libre/filesystem/os-release
diff --git a/libre/filesystem-parabola/parabola.7.txt b/libre/filesystem/parabola.7.txt
index 60e1121e0..60e1121e0 100644
--- a/libre/filesystem-parabola/parabola.7.txt
+++ b/libre/filesystem/parabola.7.txt
diff --git a/libre/filesystem-parabola/passwd b/libre/filesystem/passwd
index b3e79eb9d..b3e79eb9d 100644
--- a/libre/filesystem-parabola/passwd
+++ b/libre/filesystem/passwd
diff --git a/libre/filesystem-parabola/profile b/libre/filesystem/profile
index 59d0abc83..59d0abc83 100644
--- a/libre/filesystem-parabola/profile
+++ b/libre/filesystem/profile
diff --git a/libre/filesystem-parabola/resolv.conf b/libre/filesystem/resolv.conf
index cecafba03..cecafba03 100644
--- a/libre/filesystem-parabola/resolv.conf
+++ b/libre/filesystem/resolv.conf
diff --git a/libre/filesystem-parabola/securetty b/libre/filesystem/securetty
index 5a2235ce7..5a2235ce7 100644
--- a/libre/filesystem-parabola/securetty
+++ b/libre/filesystem/securetty
diff --git a/libre/filesystem-parabola/shadow b/libre/filesystem/shadow
index 4c6e3d18f..4c6e3d18f 100644
--- a/libre/filesystem-parabola/shadow
+++ b/libre/filesystem/shadow
diff --git a/libre/filesystem-parabola/shells b/libre/filesystem/shells
index 18c1aeffa..18c1aeffa 100644
--- a/libre/filesystem-parabola/shells
+++ b/libre/filesystem/shells
diff --git a/libre/gnormalize-parabola/PKGBUILD b/libre/gnormalize/PKGBUILD
index edcb448a5..28765dbdc 100644
--- a/libre/gnormalize-parabola/PKGBUILD
+++ b/libre/gnormalize/PKGBUILD
@@ -5,10 +5,9 @@
 # Contributor (Arch):JZsolt Varadi (karmaxxl) 
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-_pkgname=gnormalize
-pkgname=gnormalize-parabola
+pkgname=gnormalize
 pkgver=0.63
-pkgrel=5
+pkgrel=5.parabola1
 pkgdesc='Audio normalizer, converter, encoder/decoder, ripper, tagger and player, without nonfree faac and mac recommendation'
 arch=('any')
 url='http://gnormalize.sourceforge.net/'
@@ -26,37 +25,36 @@ optdepends=('flac: FLAC encoding, FLAC playing in conjunction with mplayer'
             'cdparanoia: CD ripping'
             'cdrkit: CD ripping - alternative to cdparanoia'
             'wavegain: sound normalization')
-replaces=("${_pkgname}" "${_pkgname}-libre")
-conflicts=("${_pkgname}" "${_pkgname}-libre")
-provides=(${_pkgname}=${pkgver})
+replaces=("${pkgname}-libre" "${pkgname}-parabola")
+conflicts=("${pkgname}-libre" "${pkgname}-parabola")
 install=gnormalize.install
-source=("http://downloads.sourceforge.net/sourceforge/gnormalize/${_pkgname}-${pkgver}.tar.gz")
+source=("http://downloads.sourceforge.net/sourceforge/gnormalize/${pkgname}-${pkgver}.tar.gz")
 sha256sums=('80fd9aa2da8d7fcc88bd180be2adce1aed863bedba7d715144029bd95b61ccb6')
 
 prepare() {
-  cd "$srcdir/$_pkgname-$pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
 
-  gendesk -n --pkgname "$_pkgname" --pkgdesc "$pkgdesc" --mimetypes \
+  gendesk -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" --mimetypes \
   'audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/x-wav;application/x-ogg'
   lzma -qd gnormalize.1.lzma
 } 
 
 package() {
-  cd "$srcdir/$_pkgname-$pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
 
-  install -Dm755 "$_pkgname" "$pkgdir/usr/bin/$_pkgname"
-  install -Dm644 "$_pkgname.1" "$pkgdir/usr/share/man/man1/$_pkgname.1"
-  install -d "$pkgdir/usr/share/$_pkgname/animations"
-  install -m644 animations/*.gif "$pkgdir/usr/share/$_pkgname/animations/"
-  install -Dm644 README "$pkgdir/usr/share/doc/$_pkgname/README"
-  install -Dm644 "icons/$_pkgname.png" \
-    "$pkgdir/usr/share/pixmaps/$_pkgname.png"
+  install -Dm755 "$pkgname" "$pkgdir/usr/bin/$pkgname"
+  install -Dm644 "$pkgname.1" "$pkgdir/usr/share/man/man1/$pkgname.1"
+  install -d "$pkgdir/usr/share/$pkgname/animations"
+  install -m644 animations/*.gif "$pkgdir/usr/share/$pkgname/animations/"
+  install -Dm644 README "$pkgdir/usr/share/doc/$pkgname/README"
+  install -Dm644 "icons/$pkgname.png" \
+    "$pkgdir/usr/share/pixmaps/$pkgname.png"
   for i in 16 32 48 ; do
     install -Dm644 "icons/gnormalize-$i.png" \
-      "$pkgdir/usr/share/icons/hicolor/${i}x$i/apps/$_pkgname.png"
+      "$pkgdir/usr/share/icons/hicolor/${i}x$i/apps/$pkgname.png"
   done
-  install -Dm644 "$_pkgname.desktop" \
-    "$pkgdir/usr/share/applications/$_pkgname.desktop"
+  install -Dm644 "$pkgname.desktop" \
+    "$pkgdir/usr/share/applications/$pkgname.desktop"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/libre/gnormalize-parabola/gnormalize.desktop b/libre/gnormalize/gnormalize.desktop
index 4d4061308..4d4061308 100644
--- a/libre/gnormalize-parabola/gnormalize.desktop
+++ b/libre/gnormalize/gnormalize.desktop
diff --git a/libre/gnormalize-parabola/gnormalize.install b/libre/gnormalize/gnormalize.install
index ef533df53..ef533df53 100644
--- a/libre/gnormalize-parabola/gnormalize.install
+++ b/libre/gnormalize/gnormalize.install
diff --git a/libre/grub-parabola/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch b/libre/grub/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch
index e043633af..e043633af 100644
--- a/libre/grub-parabola/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch
+++ b/libre/grub/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch
diff --git a/libre/grub-parabola/09_parabola b/libre/grub/09_parabola
index 90a9062a3..90a9062a3 100644
--- a/libre/grub-parabola/09_parabola
+++ b/libre/grub/09_parabola
diff --git a/libre/grub-parabola/60_memtest86+ b/libre/grub/60_memtest86+
index 086f0cc84..086f0cc84 100644
--- a/libre/grub-parabola/60_memtest86+
+++ b/libre/grub/60_memtest86+
diff --git a/libre/grub-parabola/PKGBUILD b/libre/grub/PKGBUILD
index a4c4bfb9f..d67df30a8 100644
--- a/libre/grub-parabola/PKGBUILD
+++ b/libre/grub/PKGBUILD
@@ -21,22 +21,21 @@ _UNIFONT_VER="6.3.20131217"
 [[ "${CARCH}" == "x86_64" ]] && _EMU_ARCH="x86_64"
 [[ "${CARCH}" == "i686" ]] && _EMU_ARCH="i386"
 
-_pkgname="grub"
-pkgname="grub-parabola"
+pkgname="grub"
 pkgdesc="GNU GRand Unified Bootloader (2), (Parabola rebranded)"
 pkgver=2.02.beta2
-pkgrel=4
+pkgrel=4.parabola1
 epoch="1"
 url="https://www.gnu.org/software/grub/"
 arch=('x86_64' 'i686')
 license=('GPL3')
 backup=('etc/default/grub' 'etc/grub.d/40_custom')
-install="${_pkgname}.install"
+install="${pkgname}.install"
 options=('!makeflags')
 
-conflicts=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}" 'grub-legacy' 'grub')
-replaces=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}" 'grub')
-provides=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}" "grub=$pkgver")
+conflicts=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}" 'grub-legacy' 'grub-parabola')
+replaces=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}" 'grub-parabola')
+provides=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}")
 
 makedepends=('git' 'rsync' 'xz' 'freetype2' 'ttf-dejavu' 'python' 'autogen'
              'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse')
diff --git a/libre/grub-parabola/grub-10_linux-detect-parabola-initramfs.patch b/libre/grub/grub-10_linux-detect-parabola-initramfs.patch
index 18d9d520c..18d9d520c 100644
--- a/libre/grub-parabola/grub-10_linux-detect-parabola-initramfs.patch
+++ b/libre/grub/grub-10_linux-detect-parabola-initramfs.patch
diff --git a/libre/grub-parabola/grub-10_linux-rebrand-free-distros.patch b/libre/grub/grub-10_linux-rebrand-free-distros.patch
index 7edb22a1f..7edb22a1f 100644
--- a/libre/grub-parabola/grub-10_linux-rebrand-free-distros.patch
+++ b/libre/grub/grub-10_linux-rebrand-free-distros.patch
diff --git a/libre/grub-parabola/grub-2.00-fix-docs.patch b/libre/grub/grub-2.00-fix-docs.patch
index 0aa481154..0aa481154 100644
--- a/libre/grub-parabola/grub-2.00-fix-docs.patch
+++ b/libre/grub/grub-2.00-fix-docs.patch
diff --git a/libre/grub-parabola/grub-2.00-mkinitcpio-0.15.patch b/libre/grub/grub-2.00-mkinitcpio-0.15.patch
index 1af848fa3..1af848fa3 100644
--- a/libre/grub-parabola/grub-2.00-mkinitcpio-0.15.patch
+++ b/libre/grub/grub-2.00-mkinitcpio-0.15.patch
diff --git a/libre/grub-parabola/grub-2.00.5086-fix-lvm-parsing.patch b/libre/grub/grub-2.00.5086-fix-lvm-parsing.patch
index 9a2eb3ff7..9a2eb3ff7 100644
--- a/libre/grub-parabola/grub-2.00.5086-fix-lvm-parsing.patch
+++ b/libre/grub/grub-2.00.5086-fix-lvm-parsing.patch
diff --git a/libre/grub-parabola/grub-add-GRUB_COLOR_variables.patch b/libre/grub/grub-add-GRUB_COLOR_variables.patch
index c113a81d5..c113a81d5 100644
--- a/libre/grub-parabola/grub-add-GRUB_COLOR_variables.patch
+++ b/libre/grub/grub-add-GRUB_COLOR_variables.patch
diff --git a/libre/grub-parabola/grub.default b/libre/grub/grub.default
index 56585a47d..56585a47d 100644
--- a/libre/grub-parabola/grub.default
+++ b/libre/grub/grub.default
diff --git a/libre/grub-parabola/grub.install b/libre/grub/grub.install
index 9188b357a..9188b357a 100644
--- a/libre/grub-parabola/grub.install
+++ b/libre/grub/grub.install
diff --git a/libre/grub-parabola/parabola_grub_mkconfig_fixes.patch b/libre/grub/parabola_grub_mkconfig_fixes.patch
index 6e3a524f0..6e3a524f0 100644
--- a/libre/grub-parabola/parabola_grub_mkconfig_fixes.patch
+++ b/libre/grub/parabola_grub_mkconfig_fixes.patch
diff --git a/libre/gst-plugins-bad-parabola/PKGBUILD b/libre/gst-plugins-bad/PKGBUILD
index 634b48ed7..7eb3a4ae1 100644
--- a/libre/gst-plugins-bad-parabola/PKGBUILD
+++ b/libre/gst-plugins-bad/PKGBUILD
@@ -2,10 +2,9 @@
 # Maintainer (Arch): Jan de Groot <jgc@archlinux.org>
 # Maintainer: Márcio Silva <coadde@parabola.nu>
 
-_pkgname=gst-plugins-bad
-pkgname=$_pkgname-parabola
+pkgname=gst-plugins-bad
 pkgver=1.4.0
-pkgrel=1
+pkgrel=1.parabola1
 pkgdesc="GStreamer Multimedia Framework Bad Plugins, without nonfree faac support"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
@@ -13,15 +12,14 @@ url="http://gstreamer.freedesktop.org/"
 depends=('mjpegtools' 'gst-plugins-base-libs' 'curl' 'chromaprint' 'libmms' 'faad2' 'mpg123' 'celt' 'libdca' 'soundtouch' 'spandsp' 'libdvdnav' 'libmodplug' 'libgme' 'opus' 'wayland' 'neon' 'libofa' 'fluidsynth' 'openjpeg' 'libwebp' 'libsrtp' 'gnutls' 'wildmidi' 'glu' 'sbc')
 makedepends=('schroedinger' 'libexif' 'libdvdread' 'libvdpau' 'libmpeg2' 'python' 'valgrind' 'wildmidi' 'librsvg'
              'gobject-introspection' 'gtk-doc' 'gtk3' 'clutter' 'opencv' 'libtiger' 'ladspa' 'openal' 'libusb')
-replaces=("${_pkgname}" "${_pkgname}-libre")
-conflicts=("${_pkgname}" "${_pkgname}-libre")
-provides=(${_pkgname}=${pkgver})
+replaces=("${pkgname}-libre" "${pkgname}-parabola")
+conflicts=("${pkgname}-libre" "${pkgname}-parabola")
 options=(!emptydirs)
-source=(${url}/src/$_pkgname/$_pkgname-$pkgver.tar.xz)
+source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
 sha256sums=('ff2cb754f7725b205aec66002b1406e440f3a03194b6cad2d126ef5cd00902f9')
 
 build() {
-  cd $_pkgname-$pkgver
+  cd $pkgname-$pkgver
 
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --disable-static --enable-experimental --enable-gtk-doc \
@@ -36,12 +34,12 @@ build() {
 }
 
 check() {
-  cd $_pkgname-$pkgver
+  cd $pkgname-$pkgver
   # don't have a camera for the camerabin test
   make -k check || :
 }
 
 package() {
-  cd $_pkgname-$pkgver
+  cd $pkgname-$pkgver
   make DESTDIR="${pkgdir}" install
 }
diff --git a/libre/gstreamer0.10-bad-parabola/PKGBUILD b/libre/gstreamer0.10-bad/PKGBUILD
index a9ec61af9..f122dd38d 100644
--- a/libre/gstreamer0.10-bad-parabola/PKGBUILD
+++ b/libre/gstreamer0.10-bad/PKGBUILD
@@ -4,9 +4,9 @@
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
 pkgbase=gstreamer0.10-bad
-pkgname=('gstreamer0.10-bad-parabola' 'gstreamer0.10-bad-plugins-parabola')
+pkgname=('gstreamer0.10-bad' 'gstreamer0.10-bad-plugins')
 pkgver=0.10.23
-pkgrel=8
+pkgrel=8.parabola1
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL' 'GPL')
 makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.36' 'xvidcore' 'libdca' 'bzip2' 'libdc1394' 'neon' 'musicbrainz' 'faad2' 'libmms' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 'soundtouch' 'libvdpau' 'schroedinger' 'libass' 'libvpx' 'gsm' 'libgme' 'rtmpdump' 'libsndfile' 'librsvg' 'wildmidi' 'opus' 'git' 'spandsp' 'celt')
@@ -45,25 +45,23 @@ check() {
   make check
 }
 
-package_gstreamer0.10-bad-parabola() {
+package_gstreamer0.10-bad() {
   pkgdesc="GStreamer Multimedia Framework Bad Plugin libraries (gst-plugins-bad), without nonfree faac support"
   depends=('gstreamer0.10-base>=0.10.34')
-  provides=("gstreamer0.10-bad=$pkgver")
-  conflicts=('gstreamer0.10-bad' 'gstreamer0.10-bad-libre')
-  replaces=('gstreamer0.10-bad' 'gstreamer0.10-bad-libre')
+  conflicts=('gstreamer0.10-bad-libre' 'gstreamer0.10-bad-parabola')
+  replaces=('gstreamer0.10-bad-libre' 'gstreamer0.10-bad-parabola')
 
   cd gst-plugins-bad
   make DESTDIR="${pkgdir}" install
 }
 
-package_gstreamer0.10-bad-plugins-parabola() {
+package_gstreamer0.10-bad-plugins() {
   pkgdesc="GStreamer Multimedia Framework Bad Plugins (gst-plugins-bad), without nonfree faac support"
   depends=("gstreamer0.10-bad=${pkgver}" 'xvidcore' 'libdca' 'bzip2' 'libdc1394' 'neon' 'musicbrainz' 'faad2' 'libmms' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 'libvdpau' 'soundtouch' 'libass' 'schroedinger' 'libvpx' 'gsm' 'rtmpdump' 'libgme' 'libsndfile' 'librsvg' 'wildmidi' 'opus' 'celt' 'spandsp')
   groups=('gstreamer0.10-plugins')
   install=gstreamer0.10-bad-plugins.install
-  provides=("gstreamer0.10-bad-plugins=$pkgver")
-  conflicts=('gstreamer0.10-bad-plugins' 'gstreamer0.10-bad-libre-plugins')
-  replaces=('gstreamer0.10-bad-plugins' 'gstreamer0.10-bad-libre-plugins')
+  conflicts=('gstreamer0.10-bad-libre-plugins' 'gstreamer0.10-bad-plugins-parabola')
+  replaces=('gstreamer0.10-bad-libre-plugins' 'gstreamer0.10-bad-plugins-parabola')
 
   cd gst-plugins-bad
   make -C gst-libs DESTDIR="${pkgdir}" install
diff --git a/libre/gstreamer0.10-bad-parabola/disable-assrender-test.patch b/libre/gstreamer0.10-bad/disable-assrender-test.patch
index 07ce4f1bb..07ce4f1bb 100644
--- a/libre/gstreamer0.10-bad-parabola/disable-assrender-test.patch
+++ b/libre/gstreamer0.10-bad/disable-assrender-test.patch
diff --git a/libre/gstreamer0.10-bad-parabola/disable-camerabin-test.patch b/libre/gstreamer0.10-bad/disable-camerabin-test.patch
index 964351ae6..964351ae6 100644
--- a/libre/gstreamer0.10-bad-parabola/disable-camerabin-test.patch
+++ b/libre/gstreamer0.10-bad/disable-camerabin-test.patch
diff --git a/libre/gstreamer0.10-bad-parabola/gstreamer0.10-bad-plugins.install b/libre/gstreamer0.10-bad/gstreamer0.10-bad-plugins.install
index 3a36b0ccb..3a36b0ccb 100644
--- a/libre/gstreamer0.10-bad-parabola/gstreamer0.10-bad-plugins.install
+++ b/libre/gstreamer0.10-bad/gstreamer0.10-bad-plugins.install
diff --git a/libre/gummiboot-parabola/PKGBUILD b/libre/gummiboot/PKGBUILD
index 9abb522b2..018326c57 100644
--- a/libre/gummiboot-parabola/PKGBUILD
+++ b/libre/gummiboot/PKGBUILD
@@ -5,21 +5,20 @@
 # Contributor (Arch):  Mantas Mikulėnas <grawity@gmail.com>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-_pkgname=gummiboot
-pkgname=gummiboot-parabola
+pkgname=gummiboot
 pkgver=45
-pkgrel=1
+pkgrel=1.parabola1
 pkgdesc="Simple UEFI Boot Manager (Parabola rebranded)"
 url="http://freedesktop.org/wiki/Software/gummiboot"
 arch=('x86_64' 'i686' 'mips64el')
 license=('LGPL2.1')
 makedepends=('gnu-efi-libs' 'docbook-xsl' 'git')
 depends=('util-linux')
-replaces=('gummiboot-efi' "${_pkgname}")
-conflicts=('gummiboot-efi' "${_pkgname}")
-provides=('gummiboot-efi' "${_pkgname}=${pkgver}")
+replaces=('gummiboot-efi' "${pkgname}-parabola")
+conflicts=('gummiboot-efi' "${pkgname}-parabola")
+provides=('gummiboot-efi')
 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')
@@ -30,7 +29,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
@@ -46,7 +45,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-parabola/gummiboot.install b/libre/gummiboot/gummiboot.install
index 20861d4c8..20861d4c8 100644
--- a/libre/gummiboot-parabola/gummiboot.install
+++ b/libre/gummiboot/gummiboot.install
diff --git a/libre/gummiboot-parabola/loader.conf b/libre/gummiboot/loader.conf
index b8bfb988e..b8bfb988e 100644
--- a/libre/gummiboot-parabola/loader.conf
+++ b/libre/gummiboot/loader.conf
diff --git a/libre/gummiboot-parabola/parabola.conf b/libre/gummiboot/parabola.conf
index 111072ea2..111072ea2 100644
--- a/libre/gummiboot-parabola/parabola.conf
+++ b/libre/gummiboot/parabola.conf
diff --git a/libre/gummiboot-parabola/splash-parabola.bmp b/libre/gummiboot/splash-parabola.bmp
index 11ceeff28..11ceeff28 100644
--- a/libre/gummiboot-parabola/splash-parabola.bmp
+++ b/libre/gummiboot/splash-parabola.bmp
diff --git a/libre/hardinfo-parabola/PKGBUILD b/libre/hardinfo/PKGBUILD
index 27bcc4075..27913f3f0 100644
--- a/libre/hardinfo-parabola/PKGBUILD
+++ b/libre/hardinfo/PKGBUILD
@@ -2,27 +2,25 @@
 # Maintainer (Arch): Eric Bélanger <eric@archlinux.org>
 # Contributor: Márcio Silva <coadde@parabola.nu>
 
-_pkgname=hardinfo
-pkgname=hardinfo-parabola
+pkgname=hardinfo
 pkgver=0.5.1
-pkgrel=6
+pkgrel=6.parabola1
 pkgdesc="A system information and benchmark tool (Parabola rebranded)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/hardinfo.berlios/"
 license=('GPL2')
 depends=('gtk2' 'libsoup')
 options=('!emptydirs')
-replaces=($_pkgname)
-conflicts=($_pkgname)
-provides=($_pkgname=$pkgver)
-source=(http://sourceforge.net/projects/hardinfo.berlios/files/${_pkgname}-${pkgver}.tar.bz2
+replaces=(${pkgname}-parabola)
+conflicts=(${pkgname}-parabola)
+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
@@ -30,13 +28,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-parabola/fixsensors.patch b/libre/hardinfo/fixsensors.patch
index 812c29458..812c29458 100644
--- a/libre/hardinfo-parabola/fixsensors.patch
+++ b/libre/hardinfo/fixsensors.patch
diff --git a/libre/hardinfo-parabola/hardinfo.distro b/libre/hardinfo/hardinfo.distro
index cf378523a..cf378523a 100644
--- a/libre/hardinfo-parabola/hardinfo.distro
+++ b/libre/hardinfo/hardinfo.distro
diff --git a/libre/libquicktime-parabola/PKGBUILD b/libre/libquicktime/PKGBUILD
index 7a489e8dc..1cdd7cdc8 100644
--- a/libre/libquicktime-parabola/PKGBUILD
+++ b/libre/libquicktime/PKGBUILD
@@ -3,31 +3,29 @@
 # Maintainer (Arch): Mateusz Herych   <heniekk@gmail.com>
 # Contributor: Jorge Lopez <jorginho@lavabit.com>
 
-pkgname=libquicktime-parabola
-_pkgname=libquicktime
+pkgname=libquicktime
 pkgver=1.2.4
-pkgrel=10
+pkgrel=10.parabola1
 pkgdesc="A library for reading and writing quicktime files, without nonfree faac support"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://libquicktime.sourceforge.net/"
 depends=('gtk2' 'ffmpeg' 'libxv' 'libxaw' 'faad2')
 makedepends=('mesa-libgl' 'x264')
-source=("http://downloads.sourceforge.net/sourceforge/$_pkgname/$_pkgname-$pkgver.tar.gz"
+source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz"
         ffmpeg2.0.patch)
 sha256sums=('1c53359c33b31347b4d7b00d3611463fe5e942cae3ec0fefe0d2fd413fd47368'
             'a1c8415e8e7bc04c81b946b9e3746f7d5ef24819135962280c3a7ddb3f2baa2b')
-replaces=("${_pkgname}" "${_pkgname}-libre")
-conflicts=("${_pkgname}" "${_pkgname}-libre")
-provides=(${_pkgname}=${pkgver})
+replaces=("${pkgname}-libre" "${pkgname}-parabola")
+conflicts=("${pkgname}-libre" "${pkgname}-parabola")
 
 prepare() {
-  cd $_pkgname-$pkgver
+  cd $pkgname-$pkgver
   patch -Np1 -i ../ffmpeg2.0.patch
 }
 
 build() {
-  cd "$srcdir/$_pkgname-$pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
   ./configure --prefix=/usr \
     --enable-gpl \
     --with-ffmpeg \
@@ -37,6 +35,6 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$_pkgname-$pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
 }
diff --git a/libre/libquicktime-parabola/ffmpeg2.0.patch b/libre/libquicktime/ffmpeg2.0.patch
index 6bec4d99a..6bec4d99a 100644
--- a/libre/libquicktime-parabola/ffmpeg2.0.patch
+++ b/libre/libquicktime/ffmpeg2.0.patch
diff --git a/libre/lsb-release-parabola/PKGBUILD b/libre/lsb-release/PKGBUILD
index d0b083df5..71fb184eb 100644
--- a/libre/lsb-release-parabola/PKGBUILD
+++ b/libre/lsb-release/PKGBUILD
@@ -5,26 +5,24 @@
 # Maintainer: Michał Masłowski <mtjm@mtjm.eu>
 # Contributor: André Silva emulatorman@parabola.nu>
 
-_pkgname=lsb-release
-pkgname=lsb-release-parabola
+pkgname=lsb-release
 pkgver=1.4
-pkgrel=14
+pkgrel=14.parabola1
 pkgdesc="LSB version query program (Parabola rebranded)"
 arch=('any')
 url="http://www.linuxbase.org/"
 license=('GPL2')
 depends=('bash')
-replaces=("${_pkgname}" "${_pkgname}-libre")
-conflicts=("${_pkgname}" "${_pkgname}-libre")
-provides=(${_pkgname}=${pkgver})
+replaces=("${pkgname}-libre" "${pkgname}-parabola")
+conflicts=("${pkgname}-libre" "${pkgname}-parabola")
 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"
 
@@ -32,7 +30,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-parabola/lsb-release.install b/libre/lsb-release/lsb-release.install
index 261df2a73..261df2a73 100644
--- a/libre/lsb-release-parabola/lsb-release.install
+++ b/libre/lsb-release/lsb-release.install
diff --git a/libre/lsb-release-parabola/lsb_release_description.patch b/libre/lsb-release/lsb_release_description.patch
index d46835b97..d46835b97 100644
--- a/libre/lsb-release-parabola/lsb_release_description.patch
+++ b/libre/lsb-release/lsb_release_description.patch
diff --git a/libre/luxrays-parabola/PKGBUILD b/libre/luxrays/PKGBUILD
index 8edc9ff17..913b1ba79 100644
--- a/libre/luxrays-parabola/PKGBUILD
+++ b/libre/luxrays/PKGBUILD
@@ -1,11 +1,10 @@
 # Maintainer (Arch): Lukas Jirkovsky <l.jirkovsky@gmail.com>
 # Maintainer: Márcio Silva <ecoadde@parabola.nu>
-_pkgname=('luxrays' 'luxmark')
-#pkgname=('luxrays-parabola' 'luxmark-parabola')
-pkgname=('luxrays-parabola')
+#pkgname=('luxrays' 'luxmark')
+pkgname=('luxrays')
 pkgver=1.3.1
 _pkgver=7459cd8a9583
-pkgrel=5
+pkgrel=5.parabola1
 pkgdesc="Accelerate the ray intersection process by using CPUs"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.luxrender.net/"
@@ -43,10 +42,9 @@ build() {
   make
 }
 
-package_luxrays-parabola() {
-  provides=("${_pkgname[0]}=${pkgver}")
-  conflicts=("${_pkgname[0]}")
-  replaces=("${_pkgname[0]}")
+package_luxrays() {
+  conflicts=("${pkgname[0]}-parabola")
+  replaces=("${pkgname[0]}-parabola")
   optdepends=('glew: demos (SmallLuxGPU etc.)' 'freeglut: demos (SmallLuxGPU etc.)'
               'boost-libs: demos (SmallLuxGPU etc.)')
 
@@ -61,12 +59,9 @@ package_luxrays-parabola() {
   #rm "$pkgdir"/usr/bin/luxmark
 }
 
-package_luxmark-parabola() {
+package_luxmark() {
   pkgdesc="OpenCL benchmark tool"
   depends+=("${depends[@]}" 'boost-libs' 'qt4')
-  provides=("${_pkgname[1]}=${pkgver}")
-  conflicts=("${_pkgname[1]}")
-  replaces=("${_pkgname[1]}")
 
   cd "$srcdir/luxrender-luxrays-$_pkgver"
   install -d -m755 "$pkgdir"/usr/{bin,share/luxmark}
diff --git a/libre/luxrays-parabola/QTBUG-22829.diff b/libre/luxrays/QTBUG-22829.diff
index 5625856bf..5625856bf 100644
--- a/libre/luxrays-parabola/QTBUG-22829.diff
+++ b/libre/luxrays/QTBUG-22829.diff
diff --git a/libre/luxrays-parabola/luxmark_scenes_path.diff b/libre/luxrays/luxmark_scenes_path.diff
index 80f909a05..80f909a05 100644
--- a/libre/luxrays-parabola/luxmark_scenes_path.diff
+++ b/libre/luxrays/luxmark_scenes_path.diff
diff --git a/libre/luxrender-parabola/PKGBUILD b/libre/luxrender/PKGBUILD
index e9f32284c..04264a00c 100644
--- a/libre/luxrender-parabola/PKGBUILD
+++ b/libre/luxrender/PKGBUILD
@@ -2,14 +2,13 @@
 # Contributor (Arch): flixie <69one@gmx.net>
 # Contributor (Arch): Imanol Celaya <ornitorrincos@archlinux-es.org>
 # Maintainer: Márcio Silva <coadde@parabola.nu>
-_pkgname=luxrender
-pkgname=$_pkgname-parabola
+pkgname=luxrender
 pkgver=1.3.1
 _pkgver=d0b0e20c47cc
-pkgrel=10
+pkgrel=10.parabola1
 pkgdesc='Rendering system for physically correct, unbiased image synthesis, without nonfree nvidia-utils, amdstream and intel-opencl-sdk recommendation'
 arch=('i686' 'x86_64' 'mips64el')
-url="http://www.$_pkgname.net/"
+url="http://www.$pkgname.net/"
 license=('GPL')
 #depends=('boost-libs' 'freeimage' 'openexr' 'libpng' 'libcl' 'libgl' 'fftw')
 depends=('boost-libs' 'freeimage' 'openexr' 'libpng' 'libgl' 'fftw')
@@ -18,16 +17,15 @@ optdepends=('blender-addon-luxrender: Blender exporter' 'qt4: Qt GUI'
 # luxrender is constantly broken to various GCC bugs, the latest one being FS#40596
 #makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=$pkgver" 'python' 'opencl-headers' 'clang')
 makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=$pkgver" 'python' 'clang')
-provides=("$_pkgname=$pkgver")
-conflicts=("$_pkgname" "$_pkgname-libre")
-replaces=("$_pkgname" "$_pkgname-libre")
-source=("https://bitbucket.org/$_pkgname/lux/get/$_pkgver.tar.bz2"
+conflicts=("${pkgname}-libre" "${pkgname}-parabola")
+replaces=("${pkgname}-libre" "${pkgname}-parabola")
+source=("https://bitbucket.org/$pkgname/lux/get/$_pkgver.tar.bz2"
         "force_python3.diff")
 md5sums=('cbe749f56a1e1976745f5458100efa8a'
          '42692e65eabc5828693e2682e94b7c64')
 
 prepare() {
-  cd $srcdir/$_pkgname-lux-$_pkgver
+  cd $srcdir/$pkgname-lux-$_pkgver
 
   # fix library path on 64bit
   sed -i '\|SET[(]LIB_SUFFIX 64[)]|d' CMakeLists.txt
@@ -38,7 +36,7 @@ prepare() {
 }
 
 build() {
-  cd $srcdir/$_pkgname-lux-$_pkgver
+  cd $srcdir/$pkgname-lux-$_pkgver
 
   export CC=clang
   export CXX=clang++
@@ -53,7 +51,7 @@ build() {
 }
 
 package() {
-  cd $srcdir/$_pkgname-lux-$_pkgver
+  cd $srcdir/$pkgname-lux-$_pkgver
   make DESTDIR=$pkgdir install
 
   #install pylux
diff --git a/libre/luxrender-parabola/force_python3.diff b/libre/luxrender/force_python3.diff
index 1ee61e872..1ee61e872 100644
--- a/libre/luxrender-parabola/force_python3.diff
+++ b/libre/luxrender/force_python3.diff
diff --git a/libre/mkisolinux-parabola/PKGBUILD b/libre/mkisolinux/PKGBUILD
index fbe710095..b10ff11fe 100644
--- a/libre/mkisolinux-parabola/PKGBUILD
+++ b/libre/mkisolinux/PKGBUILD
@@ -1,18 +1,16 @@
 # $Id: PKGBUILD 12670 2008-09-17 21:19:05Z tpowa $
 # Maintainer (Arch): Tobias Powalowski <tpowa@archlinux.org>
 
-_pkgname=mkisolinux
-pkgname=mkisolinux-parabola
+pkgname=mkisolinux
 pkgver=2013.05
-pkgrel=1
+pkgrel=1.parabola1
 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' "$_pkgname")
-conflicts=($_pkgname)
-provides=($_pkgname=$pkgver)
+replaces=('mkbootcd' "${pkgname}-parabola")
+conflicts=(${pkgname}-parabola)
 backup=(etc/mkisolinux.conf)
 source=('boot.msg' 'mkisolinux' 'mkisolinux.conf' 'options.msg')
 
diff --git a/libre/mkisolinux-parabola/boot.msg b/libre/mkisolinux/boot.msg
index 2725404e0..2725404e0 100644
--- a/libre/mkisolinux-parabola/boot.msg
+++ b/libre/mkisolinux/boot.msg
diff --git a/libre/mkisolinux-parabola/mkisolinux b/libre/mkisolinux/mkisolinux
index 048d925aa..048d925aa 100755
--- a/libre/mkisolinux-parabola/mkisolinux
+++ b/libre/mkisolinux/mkisolinux
diff --git a/libre/mkisolinux-parabola/mkisolinux.conf b/libre/mkisolinux/mkisolinux.conf
index e8b1e0df0..e8b1e0df0 100644
--- a/libre/mkisolinux-parabola/mkisolinux.conf
+++ b/libre/mkisolinux/mkisolinux.conf
diff --git a/libre/mkisolinux-parabola/options.msg b/libre/mkisolinux/options.msg
index 16c6b2eda..16c6b2eda 100644
--- a/libre/mkisolinux-parabola/options.msg
+++ b/libre/mkisolinux/options.msg
diff --git a/libre/mkpxelinux-parabola/PKGBUILD b/libre/mkpxelinux/PKGBUILD
index fa328967d..2105d70dd 100644
--- a/libre/mkpxelinux-parabola/PKGBUILD
+++ b/libre/mkpxelinux/PKGBUILD
@@ -1,18 +1,16 @@
 # $Id: PKGBUILD 197074 2013-10-21 15:42:46Z tpowa $
 # Maintainer (Arch): Tobias Powalowski <tpowa@archlinux.org>
 
-_pkgname=mkpxelinux
-pkgname=mkpxelinux-parabola
+pkgname=mkpxelinux
 pkgver=2013.10
-pkgrel=1
+pkgrel=1.parabola1
 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)
+replaces=(${pkgname}-parabola)
+conflicts=(${pkgname}-parabola)
 backup=(etc/mkpxelinux.conf)
 optdepends=('dhcp: for dhcp server usage')
 source=('boot.msg' 'mkpxelinux' 'mkpxelinux.conf' 'options.msg')
diff --git a/libre/mkpxelinux-parabola/boot.msg b/libre/mkpxelinux/boot.msg
index 6c1fcd476..6c1fcd476 100644
--- a/libre/mkpxelinux-parabola/boot.msg
+++ b/libre/mkpxelinux/boot.msg
diff --git a/libre/mkpxelinux-parabola/mkpxelinux b/libre/mkpxelinux/mkpxelinux
index 35e946f82..35e946f82 100755
--- a/libre/mkpxelinux-parabola/mkpxelinux
+++ b/libre/mkpxelinux/mkpxelinux
diff --git a/libre/mkpxelinux-parabola/mkpxelinux.conf b/libre/mkpxelinux/mkpxelinux.conf
index 55aba8247..55aba8247 100644
--- a/libre/mkpxelinux-parabola/mkpxelinux.conf
+++ b/libre/mkpxelinux/mkpxelinux.conf
diff --git a/libre/mkpxelinux-parabola/options.msg b/libre/mkpxelinux/options.msg
index 16c6b2eda..16c6b2eda 100644
--- a/libre/mkpxelinux-parabola/options.msg
+++ b/libre/mkpxelinux/options.msg
diff --git a/libre/mksyslinux-parabola/PKGBUILD b/libre/mksyslinux/PKGBUILD
index 0369ebbc2..51ac29d53 100644
--- a/libre/mksyslinux-parabola/PKGBUILD
+++ b/libre/mksyslinux/PKGBUILD
@@ -1,17 +1,15 @@
 # $Id: PKGBUILD 187120 2013-06-04 06:46:39Z tpowa $
 # Maintainer (Arch): Tobias Powalowski <tpowa@archlinux.org>
 
-_pkgname=mksyslinux
-pkgname=mksyslinux-parabola
+pkgname=mksyslinux
 pkgver=2013.06
-pkgrel=1
+pkgrel=1.parabola1
 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)
+replaces=(${pkgname}-parabola)
+conflicts=(${pkgname}-parabola)
 depends=('mkinitcpio' 'syslinux' 'pciutils')
 backup=(etc/mksyslinux.conf)
 source=('boot.msg' 'mksyslinux' 'mksyslinux.conf' 'options.msg')
diff --git a/libre/mksyslinux-parabola/boot.msg b/libre/mksyslinux/boot.msg
index 2cfe24d42..2cfe24d42 100644
--- a/libre/mksyslinux-parabola/boot.msg
+++ b/libre/mksyslinux/boot.msg
diff --git a/libre/mksyslinux-parabola/mksyslinux b/libre/mksyslinux/mksyslinux
index 96ad45133..96ad45133 100755
--- a/libre/mksyslinux-parabola/mksyslinux
+++ b/libre/mksyslinux/mksyslinux
diff --git a/libre/mksyslinux-parabola/mksyslinux.conf b/libre/mksyslinux/mksyslinux.conf
index a7d032295..a7d032295 100644
--- a/libre/mksyslinux-parabola/mksyslinux.conf
+++ b/libre/mksyslinux/mksyslinux.conf
diff --git a/libre/mksyslinux-parabola/options.msg b/libre/mksyslinux/options.msg
index 16c6b2eda..16c6b2eda 100644
--- a/libre/mksyslinux-parabola/options.msg
+++ b/libre/mksyslinux/options.msg
diff --git a/libre/mplayer-vaapi-parabola/PKGBUILD b/libre/mplayer-vaapi/PKGBUILD
index 550952b67..ef162c58c 100644
--- a/libre/mplayer-vaapi-parabola/PKGBUILD
+++ b/libre/mplayer-vaapi/PKGBUILD
@@ -6,30 +6,29 @@
 # Contributor: Nicolás Reynolds <fauno@kiwwwi.com.ar>
 # Contributor: Márcio Silva <coadde@parabola.nu>
 
-_pkgname=mplayer-vaapi
-pkgname=mplayer-vaapi-parabola
+pkgname=mplayer-vaapi
 pkgver=36265
-pkgrel=12
+pkgrel=12.parabola1
 pkgdesc="A movie player, compiled with vaapi support, without nonfree faac support"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gitorious.org/vaapi/mplayer"
 license=('GPL')
 depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libcdio-paranoia' 'libxinerama'
          'lame' 'fontconfig' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'glu'
-         'sdl' 'smbclient' 'aalib' 'jack' 'libcaca' 'speex' 'faad2'
+         'sdl' 'smbclient' 'aalib' 'jack' 'libcaca' 'libx264' 'speex' 'faad2'
          'lirc-utils' 'ttf-dejavu' 'libxvmc' 'enca' 'opencore-amr' 'libdca'
          'a52dec' 'schroedinger' 'mpg123' 'libvpx' 'libpulse' 'fribidi' 'opus'
          'libbluray' 'libva' 'libass' 'desktop-file-utils')
 makedepends=('unzip' 'live-media' 'yasm' 'ladspa' 'git' 'mesa' 'x264')
-provides=('mplayer' "mplayer-vaapi=$pkgver")
-conflicts=('mplayer' 'mplayer-vaapi' 'mplayer-vaapi-libre' 'mplayer-libre-vaapi')
-replaces=('mplayer-vaapi' 'mplayer-vaapi-libre' 'mplayer-libre-vaapi')
+provides=('mplayer')
+conflicts=('mplayer' 'mplayer-vaapi-libre' 'mplayer-libre-vaapi' 'mplayer-vaapi-parabola')
+replaces=('mplayer-vaapi-libre' 'mplayer-libre-vaapi' 'mplayer-vaapi-parabola')
 backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
-source=(http://pkgbuild.com/~foutrelis/sources/$_pkgname/$_pkgname-$pkgver.tar.xz{,.sig}
+source=(http://pkgbuild.com/~foutrelis/sources/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}
         cdio-includes.patch
         tweak-desktop-file.patch
         subreader-fix-srt-parsing.patch
-	include-samba-4.0.patch)
+        include-samba-4.0.patch)
 options=('!buildflags' '!emptydirs')
 install=mplayer-vaapi.install
 sha256sums=('5747c28c30c15d1000fb655a8abaa4b22483746d0e82775b27466948ae0c549a'
@@ -41,7 +40,7 @@ sha256sums=('5747c28c30c15d1000fb655a8abaa4b22483746d0e82775b27466948ae0c549a'
 
 
 prepare() {
-  cd "$srcdir/$_pkgname-$pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
 
   patch -Np0 -i "$srcdir/cdio-includes.patch"
   patch -d etc -Np0 -i "$srcdir/tweak-desktop-file.patch"
@@ -54,7 +53,7 @@ prepare() {
 }
 
 build() {
-  cd "$srcdir/$_pkgname-$pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
 
   ./configure \
     --prefix=/usr \
@@ -87,7 +86,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$_pkgname-$pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
 
   make DESTDIR="$pkgdir" install-mplayer install-mplayer-man
   install -Dm644 etc/{codecs.conf,input.conf,example.conf} "$pkgdir/etc/mplayer/"
diff --git a/libre/mplayer-vaapi-parabola/cdio-includes.patch b/libre/mplayer-vaapi/cdio-includes.patch
index 894650717..894650717 100644
--- a/libre/mplayer-vaapi-parabola/cdio-includes.patch
+++ b/libre/mplayer-vaapi/cdio-includes.patch
diff --git a/libre/mplayer-parabola/include-samba-4.0.patch b/libre/mplayer-vaapi/include-samba-4.0.patch
index 2ed272b6a..2ed272b6a 100644
--- a/libre/mplayer-parabola/include-samba-4.0.patch
+++ b/libre/mplayer-vaapi/include-samba-4.0.patch
diff --git a/libre/mplayer-vaapi-parabola/mplayer-vaapi.install b/libre/mplayer-vaapi/mplayer-vaapi.install
index a44f19aef..a44f19aef 100644
--- a/libre/mplayer-vaapi-parabola/mplayer-vaapi.install
+++ b/libre/mplayer-vaapi/mplayer-vaapi.install
diff --git a/libre/mplayer-vaapi-parabola/subreader-fix-srt-parsing.patch b/libre/mplayer-vaapi/subreader-fix-srt-parsing.patch
index f1c087377..f1c087377 100644
--- a/libre/mplayer-vaapi-parabola/subreader-fix-srt-parsing.patch
+++ b/libre/mplayer-vaapi/subreader-fix-srt-parsing.patch
diff --git a/libre/mplayer-vaapi-parabola/tweak-desktop-file.patch b/libre/mplayer-vaapi/tweak-desktop-file.patch
index 606e356b0..606e356b0 100644
--- a/libre/mplayer-vaapi-parabola/tweak-desktop-file.patch
+++ b/libre/mplayer-vaapi/tweak-desktop-file.patch
diff --git a/libre/mplayer-parabola/PKGBUILD b/libre/mplayer/PKGBUILD
index 6c165c852..2e9750542 100644
--- a/libre/mplayer-parabola/PKGBUILD
+++ b/libre/mplayer/PKGBUILD
@@ -6,9 +6,9 @@
 # Contributor: Márcio Silva <coadde@parabola.nu>
 
 pkgbase=mplayer
-pkgname=('mplayer-parabola' 'mencoder-parabola')
+pkgname=('mplayer' 'mencoder')
 pkgver=37224
-pkgrel=2
+pkgrel=2.parabola1
 arch=('i686' 'x86_64' 'mips64el')
 makedepends=(
   'libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora'
@@ -81,7 +81,7 @@ build() {
   make
 }
 
-package_mplayer-parabola() {
+package_mplayer() {
   pkgdesc='Media player for GNU/Linux, without nonfree faac support'
   install=mplayer.install
   backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
@@ -93,9 +93,8 @@ package_mplayer-parabola() {
     'fribidi' 'libjpeg' 'faad2' 'libxvmc' 'schroedinger' 'mpg123'
     'libass' 'libxxf86vm' 'libbluray' 'libcdio-paranoia' 'opus'
   )
-  provides=("mplayer=$pkgver")
-  replaces=('mplayer' 'mplayer-libre')
-  conflicts=('mplayer' 'mplayer-libre')
+  replaces=('mplayer-libre' 'mplayer-parabola')
+  conflicts=('mplayer-libre' 'mplayer-parabola')
 
   cd $pkgbase-$pkgver
   make DESTDIR="$pkgdir" install-mplayer install-mplayer-man
@@ -110,7 +109,7 @@ package_mplayer-parabola() {
     "$pkgdir"/usr/share/pixmaps/mplayer.png
 }
 
-package_mencoder-parabola() {
+package_mencoder() {
   pkgdesc='Free command line video decoding, encoding and filtering tool, without nonfree faac support'
   depends=(
     'enca' 'a52dec' 'libvpx' 'libx264' 'libmng' 'libdca' 'bzip2' 'lame'
@@ -119,9 +118,8 @@ package_mencoder-parabola() {
     'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio-paranoia'
     'libvorbis' 'opus'
   )
-  provides=("mencoder=$pkgver")
-  replaces=('mencoder' 'mencoder-libre')
-  conflicts=('mencoder' 'mencoder-libre')
+  replaces=('mencoder-libre' 'mencoder-parabola')
+  conflicts=('mencoder-libre' 'mencoder-parabola')
 
   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-parabola/cdio-includes.patch b/libre/mplayer/cdio-includes.patch
index f71472812..f71472812 100644
--- a/libre/mplayer-parabola/cdio-includes.patch
+++ b/libre/mplayer/cdio-includes.patch
diff --git a/libre/mplayer-parabola/giflib51.patch b/libre/mplayer/giflib51.patch
index e884b39f1..e884b39f1 100644
--- a/libre/mplayer-parabola/giflib51.patch
+++ b/libre/mplayer/giflib51.patch
diff --git a/libre/mplayer-vaapi-parabola/include-samba-4.0.patch b/libre/mplayer/include-samba-4.0.patch
index 2ed272b6a..2ed272b6a 100644
--- a/libre/mplayer-vaapi-parabola/include-samba-4.0.patch
+++ b/libre/mplayer/include-samba-4.0.patch
diff --git a/libre/mplayer-parabola/mplayer.desktop b/libre/mplayer/mplayer.desktop
index 946b8e345..946b8e345 100644
--- a/libre/mplayer-parabola/mplayer.desktop
+++ b/libre/mplayer/mplayer.desktop
diff --git a/libre/mplayer-parabola/mplayer.install b/libre/mplayer/mplayer.install
index 660593cf5..660593cf5 100644
--- a/libre/mplayer-parabola/mplayer.install
+++ b/libre/mplayer/mplayer.install
diff --git a/libre/mplayer-parabola/mplayer.png b/libre/mplayer/mplayer.png
index 799769335..799769335 100644
--- a/libre/mplayer-parabola/mplayer.png
+++ b/libre/mplayer/mplayer.png
diff --git a/libre/mplayer-parabola/revert-icl-fixes.patch b/libre/mplayer/revert-icl-fixes.patch
index e5f049ff5..e5f049ff5 100644
--- a/libre/mplayer-parabola/revert-icl-fixes.patch
+++ b/libre/mplayer/revert-icl-fixes.patch
diff --git a/libre/nss-parabola/PKGBUILD b/libre/nss/PKGBUILD
index d49cc07e7..c2f03056e 100644
--- a/libre/nss-parabola/PKGBUILD
+++ b/libre/nss/PKGBUILD
@@ -3,10 +3,9 @@
 # Maintainer: André Silva <emulatorman@parabola.nu>
 # Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
 
-_pkgname=nss
-pkgname=nss-parabola
+pkgname=nss
 pkgver=3.16.3
-pkgrel=1
+pkgrel=1.parabola1
 pkgdesc="Mozilla Network Security Services, with CAcert CA certificates support"
 arch=(i686 x86_64)
 url="http://www.mozilla.org/projects/security/pki/nss/"
@@ -14,11 +13,10 @@ license=('MPL' 'GPL')
 _nsprver=4.10.6
 depends=("nspr>=${_nsprver}" 'sqlite' 'zlib' 'sh')
 makedepends=('perl')
-replaces=($_pkgname)
-conflicts=($_pkgname)
-provides=($_pkgname=$pkgver)
+replaces=(${pkgname}-parabola)
+conflicts=(${pkgname}-parabola)
 options=('!strip' '!makeflags' 'staticlibs')
-source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${_pkgname}-${pkgver}.tar.gz
+source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgname}-${pkgver}.tar.gz
         nss.pc.in
         nss-config.in
         ssl-renegotiate-transitional.patch
@@ -30,7 +28,7 @@ sha1sums=('a1937de60e03a24526591d883bcfe31a3acc8ef4'
           '6c5bad81358b2fd3bce8cc322bc761d5fdc4a341')
 
 prepare() {
-  cd $_pkgname-$pkgver
+  cd $pkgname-$pkgver
 
   # Add CAcert CA certificates.
   # See http://wiki.cacert.org/NSSLib for how to generate
@@ -46,7 +44,7 @@ prepare() {
 
 
 build() {
-  cd $_pkgname-$pkgver/nss
+  cd $pkgname-$pkgver/nss
 
   export BUILD_OPT=1
   export NSS_USE_SYSTEM_SQLITE=1
@@ -63,7 +61,7 @@ build() {
 }
 
 package() {
-  cd $_pkgname-$pkgver
+  cd $pkgname-$pkgver
   install -d "$pkgdir"/usr/{bin,include/nss,lib/pkgconfig}
 
   NSS_VMAJOR=$(grep '#define.*NSS_VMAJOR' nss/lib/nss/nss.h | awk '{print $3}')
diff --git a/libre/nss-parabola/add_cacert_ca_certs.patch b/libre/nss/add_cacert_ca_certs.patch
index b48f3fff1..b48f3fff1 100644
--- a/libre/nss-parabola/add_cacert_ca_certs.patch
+++ b/libre/nss/add_cacert_ca_certs.patch
diff --git a/libre/nss-parabola/nss-config.in b/libre/nss/nss-config.in
index f8f893e71..f8f893e71 100644
--- a/libre/nss-parabola/nss-config.in
+++ b/libre/nss/nss-config.in
diff --git a/libre/nss-parabola/nss.pc.in b/libre/nss/nss.pc.in
index d47b9e146..d47b9e146 100644
--- a/libre/nss-parabola/nss.pc.in
+++ b/libre/nss/nss.pc.in
diff --git a/libre/nss-parabola/ssl-renegotiate-transitional.patch b/libre/nss/ssl-renegotiate-transitional.patch
index f457c5551..f457c5551 100644
--- a/libre/nss-parabola/ssl-renegotiate-transitional.patch
+++ b/libre/nss/ssl-renegotiate-transitional.patch
diff --git a/libre/ogmrip-parabola/PKGBUILD b/libre/ogmrip/PKGBUILD
index 96fb91948..7a066d4da 100644
--- a/libre/ogmrip-parabola/PKGBUILD
+++ b/libre/ogmrip/PKGBUILD
@@ -5,10 +5,9 @@
 # Contributor (Arch): Vrob (Markus Heuser) mheuser@mi.fu-berlin.de
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-_pkgname=ogmrip
-pkgname=ogmrip-parabola
+pkgname=ogmrip
 pkgver=1.0.1
-pkgrel=1
+pkgrel=1.parabola1
 pkgdesc="Libraries and GTK2 interface for DVD ripping using mencoder, without nonfree faac support"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://ogmrip.sourceforge.net/"
@@ -24,24 +23,23 @@ 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}" "${_pkgname}-libre")
-conflicts=("${_pkgname}" "${_pkgname}-libre")
-provides=(${_pkgname}=${pkgver})
+replaces=("${pkgname}-libre" "${pkgname}-parabola")
+conflicts=("${pkgname}-libre" "${pkgname}-parabola")
 options=('!makeflags')
-changelog=$_pkgname.changelog
-install=$_pkgname.install
-source=(http://downloads.sourceforge.net/sourceforge/${_pkgname}/${_pkgname}-${pkgver}.tar.gz)
+changelog=$pkgname.changelog
+install=$pkgname.install
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
 sha256sums=('1c7bb9a346f94a0b6ba783d71df7d21ce021b2f179f5c1a2ebf870366d53ed56')
 
 build() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   ./configure --prefix=/usr --sysconfdir=/usr/share
   make
 }
 
 package() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   make DESTDIR="${pkgdir}" install
 }
diff --git a/libre/ogmrip-parabola/ogmrip.changelog b/libre/ogmrip/ogmrip.changelog
index 48f6e98e8..48f6e98e8 100644
--- a/libre/ogmrip-parabola/ogmrip.changelog
+++ b/libre/ogmrip/ogmrip.changelog
diff --git a/libre/ogmrip-parabola/ogmrip.install b/libre/ogmrip/ogmrip.install
index 660593cf5..660593cf5 100644
--- a/libre/ogmrip-parabola/ogmrip.install
+++ b/libre/ogmrip/ogmrip.install
diff --git a/libre/openshot-parabola/PKGBUILD b/libre/openshot/PKGBUILD
index 2c1b02964..ca870f1c7 100644
--- a/libre/openshot-parabola/PKGBUILD
+++ b/libre/openshot/PKGBUILD
@@ -3,10 +3,9 @@
 # Contributor (Arch): Asa Marco <marcoasa90[at]gmail[.]com>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-_pkgname=openshot
-pkgname=openshot-parabola
+pkgname=openshot
 pkgver=1.4.3
-pkgrel=3
+pkgrel=3.parabola1
 pkgdesc="a free, non-linear video editor for GNU/Linux based on MLT framework, without nonfree faac recommendation"
 arch=('any')
 url="http://www.openshotvideo.com/"
@@ -15,14 +14,13 @@ 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")
-conflicts=("${_pkgname}" "${_pkgname}-libre")
-provides=(${_pkgname}=${pkgver})
+replaces=("${pkgname}-libre" "${pkgname}-parabola")
+conflicts=("${pkgname}-libre" "${pkgname}-parabola")
 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)
 md5sums=('5ec82a7e8b7700ee4a359458aedf19e9')
 
 package() {
-  cd $srcdir/$_pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver
   python2 setup.py install --root=$pkgdir/ --optimize=1
 }
diff --git a/libre/openshot-parabola/openshot.install b/libre/openshot/openshot.install
index 046df0051..046df0051 100644
--- a/libre/openshot-parabola/openshot.install
+++ b/libre/openshot/openshot.install
diff --git a/libre/pacman-mirrorlist-parabola/PKGBUILD b/libre/pacman-mirrorlist/PKGBUILD
index 6d2d9b2f9..f35adafcc 100644
--- a/libre/pacman-mirrorlist-parabola/PKGBUILD
+++ b/libre/pacman-mirrorlist/PKGBUILD
@@ -3,9 +3,9 @@
 # Maintainer: Esteban Carnevale <alfplayer@mailoo.org>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-pkgname=pacman-mirrorlist-parabola
+pkgname=pacman-mirrorlist
 pkgver=$(LC_ALL=C date -u +%Y%m%d)
-pkgrel=1
+pkgrel=1.parabola1
 pkgdesc="Parabola GNU/Linux-libre mirror list for use by pacman"
 arch=('any')
 url="https://repo.parabolagnulinux.org/mirrorlist.txt"
@@ -13,9 +13,8 @@ license=('GPL')
 groups=('base')
 backup=(etc/pacman.d/mirrorlist)
 source=(mirrorlist-${pkgver}.txt::${url})
-conflicts=(pacman-mirrorlist pacman-mirrorlist-libre)
-replaces=(pacman-mirrorlist pacman-mirrorlist-libre)
-provides=(pacman-mirrorlist)
+conflicts=(pacman-mirrorlist-libre pacman-mirrorlist-parabola)
+replaces=(pacman-mirrorlist-libre pacman-mirrorlist-parabola)
 
 package() {
   mkdir -p $pkgdir/etc/pacman.d
diff --git a/libre/psi-parabola/PKGBUILD b/libre/psi/PKGBUILD
index cf835f032..445562033 100644
--- a/libre/psi-parabola/PKGBUILD
+++ b/libre/psi/PKGBUILD
@@ -2,19 +2,17 @@
 # Maintainer (Arch): Pierre Schmitz <pierre@archlinux.de>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-_pkgname=psi
-pkgname=psi-parabola
+pkgname=psi
 pkgver=0.15
-pkgrel=2
+pkgrel=2.parabola1
 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)
+replaces=(${pkgname}-parabola)
+conflicts=(${pkgname}-parabola)
 install='psi.install'
 source=("http://downloads.sourceforge.net/psi/psi-${pkgver}.tar.bz2"
         'parabola.patch')
diff --git a/libre/psi-parabola/parabola.patch b/libre/psi/parabola.patch
index 9d41bffc4..9d41bffc4 100644
--- a/libre/psi-parabola/parabola.patch
+++ b/libre/psi/parabola.patch
diff --git a/libre/psi-parabola/psi.install b/libre/psi/psi.install
index 464d2e625..464d2e625 100644
--- a/libre/psi-parabola/psi.install
+++ b/libre/psi/psi.install
diff --git a/libre/reflector-parabola/PKGBUILD b/libre/reflector/PKGBUILD
index 6735b352a..a96522096 100644
--- a/libre/reflector-parabola/PKGBUILD
+++ b/libre/reflector/PKGBUILD
@@ -1,16 +1,14 @@
 #Maintainer (Arch): Xyne <ac xunilhcra enyx, backwards>
 #Maintainer: André Silva <emulatorman@parabola.nu>
-_pkgname=reflector
-pkgname=reflector-parabola
+pkgname=reflector
 pkgver=2014.8
-pkgrel=1
+pkgrel=1.parabola1
 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)
+replaces=(${pkgname}-parabola)
+conflicts=(${pkgname}-parabola)
 depends=(python3)
 optdepends=('rsync: rate rsync mirrors')
 source=(
@@ -31,16 +29,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-parabola/rebranding.patch b/libre/reflector/rebranding.patch
index b29653ffd..b29653ffd 100644
--- a/libre/reflector-parabola/rebranding.patch
+++ b/libre/reflector/rebranding.patch
diff --git a/libre/soundkonverter-parabola/PKGBUILD b/libre/soundkonverter/PKGBUILD
index 257e77709..f2896a338 100644
--- a/libre/soundkonverter-parabola/PKGBUILD
+++ b/libre/soundkonverter/PKGBUILD
@@ -5,17 +5,15 @@
 # Contributor (Arch): Darwin Bautista <djclue917@gmail.com>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-_pkgname=soundkonverter
-pkgname=soundkonverter-parabola
+pkgname=soundkonverter
 pkgver=2.1.1
-pkgrel=1
+pkgrel=1.parabola1
 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}" "${_pkgname}-libre")
-conflicts=("${_pkgname}" "${_pkgname}-libre" )
-provides=(${_pkgname}=${pkgver})
+replaces=("${pkgname}-libre" "${pkgname}-parabola")
+conflicts=("${pkgname}-libre" "${pkgname}-parabola")
 depends=('kdebase-runtime' 'libkcddb' 'cdparanoia' 'taglib')
 makedepends=('automoc4' 'cmake')
 optdepends=('cdrkit: cdda2wav backend'
@@ -34,12 +32,12 @@ optdepends=('cdrkit: cdda2wav backend'
             'vorbis-tools: vorbis tools backend'
             'wavpack: wavpack backend'
             'sox: sox plugin (change sample rate, various effects)')
-install=$_pkgname.install
-source=("http://kde-apps.org/CONTENT/content-files/29024-${_pkgname}-${pkgver}.tar.gz")
+install=$pkgname.install
+source=("http://kde-apps.org/CONTENT/content-files/29024-${pkgname}-${pkgver}.tar.gz")
 md5sums=('fa008d90b5c12bc3af569ec104c3b4cc')
 
 build() {
-  cd "$srcdir"/$_pkgname-$pkgver
+  cd "$srcdir"/$pkgname-$pkgver
   cmake . \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release
@@ -47,6 +45,6 @@ build() {
 }
 
 package() {
-  cd "$srcdir"/$_pkgname-$pkgver
+  cd "$srcdir"/$pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 }
diff --git a/libre/soundkonverter-parabola/soundkonverter.install b/libre/soundkonverter/soundkonverter.install
index 0e8feb79c..0e8feb79c 100644
--- a/libre/soundkonverter-parabola/soundkonverter.install
+++ b/libre/soundkonverter/soundkonverter.install
diff --git a/libre/spectrwm-parabola/LICENSE b/libre/spectrwm/LICENSE
index 24c04f3a0..24c04f3a0 100644
--- a/libre/spectrwm-parabola/LICENSE
+++ b/libre/spectrwm/LICENSE
diff --git a/libre/spectrwm-parabola/PKGBUILD b/libre/spectrwm/PKGBUILD
index 082f189c5..f825ceeb4 100644
--- a/libre/spectrwm-parabola/PKGBUILD
+++ b/libre/spectrwm/PKGBUILD
@@ -2,19 +2,17 @@
 # Maintainer (Arch): Kyle Keen <keenerd@gmail.com>
 # Contributor (Arch): Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
 
-_pkgname=spectrwm
-pkgname=spectrwm-parabola
+pkgname=spectrwm
 pkgver=2.6.0
-pkgrel=1
+pkgrel=1.parabola1
 pkgdesc="A minimalistic automatic tiling window manager that tries to stay out of the way, without nonfree profont support"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.spectrwm.org"
 _watch="https://opensource.conformal.com/snapshots/spectrwm/"
 license=('custom:ISC')
 depends=('dmenu' 'xcb-util' 'xcb-util-wm' 'xcb-util-keysyms' 'libxrandr' 'libxft' 'libxcursor')
-replaces=('spectrwm' 'scrotwm' 'spectrwm-libre')
-conflicts=('spectrwm' 'spectrwm-libre')
-provides=("spectrwm=$pkgver")
+replaces=('scrotwm' 'spectrwm-libre' 'spectrwm-parabola')
+conflicts=('spectrwm-libre' 'spectrwm-parabola')
 makedepends=('libxt')
 optdepends=('scrot: screenshots'
             'xlockmore: great screenlocker'
@@ -24,8 +22,8 @@ backup=(etc/spectrwm.conf)
 # the 2.6.0 linux makefile does not build
 # so download and use the 2.5.1 makefile until this is fixed
 
-source=(http://opensource.conformal.com/snapshots/$_pkgname/$_pkgname-$pkgver.tgz \
-	http://opensource.conformal.com/snapshots/$_pkgname/$_pkgname-2.5.1.tgz \
+source=(http://opensource.conformal.com/snapshots/$pkgname/$pkgname-$pkgver.tgz \
+	http://opensource.conformal.com/snapshots/$pkgname/$pkgname-2.5.1.tgz \
 	LICENSE \
         baraction.sh \
         spectrwm-no-preload)
@@ -36,7 +34,7 @@ md5sums=('278acafe23d2fa2b1d7a3705bcbe95de'
          '974d109ce0af39cc73936d5efd682480')
 
 build() {
-  cd "$srcdir/$_pkgname-$pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
   
   sed -i 's|\"/usr/local/lib/libswmhack.so\"|\"libswmhack.so\"|' spectrwm.c
   sed -i 's/verbose_layout = false;/verbose_layout = true;/' spectrwm.c
@@ -49,12 +47,12 @@ build() {
   sed -i 's/setconfspawn("lock".*/setconfspawn("lock", "xlock", SWM_SPAWN_OPTIONAL);/' spectrwm.c
 
   cd linux
-  cp "$srcdir/$_pkgname-2.5.1/linux/Makefile" ./
+  cp "$srcdir/$pkgname-2.5.1/linux/Makefile" ./
   make PREFIX="/usr"
 }
 
 package() {
-  cd "$srcdir/$_pkgname-$pkgver/linux"
+  cd "$srcdir/$pkgname-$pkgver/linux"
   make PREFIX="/usr" DESTDIR="$pkgdir" install
   install -Dm644 spectrwm.desktop "$pkgdir/usr/share/xsessions/spectrwm.desktop"
   cd ..
@@ -63,7 +61,7 @@ package() {
   mkdir -p "$pkgdir/etc/spectrwm"
   cp spectrwm_*.conf "$pkgdir/etc/spectrwm/"
   cd "$srcdir"
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$_pkgname/LICENSE"
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
   install -Dm755 baraction.sh "$pkgdir/usr/share/spectrwm/baraction.sh"
   install -Dm755 spectrwm-no-preload "$pkgdir/usr/bin/spectrwm-no-preload"
 
diff --git a/libre/spectrwm-parabola/baraction.sh b/libre/spectrwm/baraction.sh
index 96a8a7b1a..96a8a7b1a 100644
--- a/libre/spectrwm-parabola/baraction.sh
+++ b/libre/spectrwm/baraction.sh
diff --git a/libre/spectrwm-parabola/spectrwm-no-preload b/libre/spectrwm/spectrwm-no-preload
index 12385eddb..12385eddb 100644
--- a/libre/spectrwm-parabola/spectrwm-no-preload
+++ b/libre/spectrwm/spectrwm-no-preload
diff --git a/libre/syslinux-parabola/PKGBUILD b/libre/syslinux/PKGBUILD
index 575bbaf04..08a4f406f 100644
--- a/libre/syslinux-parabola/PKGBUILD
+++ b/libre/syslinux/PKGBUILD
@@ -9,18 +9,16 @@ _IA32_EFI_IN_ARCH_X64="1"
 _VER="6.03-pre19"
 _GIT_TAG="syslinux-${_VER}"
 
-_pkgname="syslinux"
-pkgname="syslinux-parabola"
+pkgname="syslinux"
 pkgver="${_VER/-/}"
-pkgrel="1"
+pkgrel="1.parabola1"
 arch=('x86_64' 'i686')
 pkgdesc="Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs filesystems, from CDs and via PXE (Parabola rebranded)"
 url="http://syslinux.zytor.com/"
 license=('GPL2')
 options=('!makeflags' '!emptydirs')
-replaces=($_pkgname)
-conflicts=($_pkgname)
-provides=($_pkgname=$pkgver)
+replaces=(${pkgname}-parabola)
+conflicts=(${pkgname}-parabola)
 backup=('boot/syslinux/syslinux.cfg'
         'boot/syslinux/splash.png')
 makedepends=('git' 'python2' 'nasm' 'ncurses')
@@ -35,8 +33,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'
@@ -48,29 +46,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/"
     
@@ -81,38 +79,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
@@ -125,9 +123,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
@@ -137,20 +135,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
@@ -163,9 +161,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
@@ -175,16 +173,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"
@@ -208,10 +206,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
@@ -229,7 +227,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"
@@ -245,31 +243,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-parabola/splash.png b/libre/syslinux/splash.png
index eac14536b..eac14536b 100644
--- a/libre/syslinux-parabola/splash.png
+++ b/libre/syslinux/splash.png
diff --git a/libre/syslinux-parabola/splash.xcf b/libre/syslinux/splash.xcf
index c27d04445..c27d04445 100644
--- a/libre/syslinux-parabola/splash.xcf
+++ b/libre/syslinux/splash.xcf
diff --git a/libre/syslinux-parabola/syslinux-6.02-fix-bios-isolinux.patch b/libre/syslinux/syslinux-6.02-fix-bios-isolinux.patch
index 48df46f12..48df46f12 100644
--- a/libre/syslinux-parabola/syslinux-6.02-fix-bios-isolinux.patch
+++ b/libre/syslinux/syslinux-6.02-fix-bios-isolinux.patch
diff --git a/libre/syslinux-parabola/syslinux-6.02-fix-chainloading.patch b/libre/syslinux/syslinux-6.02-fix-chainloading.patch
index 6fd7ef4a8..6fd7ef4a8 100644
--- a/libre/syslinux-parabola/syslinux-6.02-fix-chainloading.patch
+++ b/libre/syslinux/syslinux-6.02-fix-chainloading.patch
diff --git a/libre/syslinux-parabola/syslinux-6.02-fix-efi-ovmf.patch b/libre/syslinux/syslinux-6.02-fix-efi-ovmf.patch
index f33f4c1de..f33f4c1de 100644
--- a/libre/syslinux-parabola/syslinux-6.02-fix-efi-ovmf.patch
+++ b/libre/syslinux/syslinux-6.02-fix-efi-ovmf.patch
diff --git a/libre/syslinux-parabola/syslinux-install_update b/libre/syslinux/syslinux-install_update
index 3843b5fed..3843b5fed 100644
--- a/libre/syslinux-parabola/syslinux-install_update
+++ b/libre/syslinux/syslinux-install_update
diff --git a/libre/syslinux-parabola/syslinux.cfg b/libre/syslinux/syslinux.cfg
index 0c0c6339a..0c0c6339a 100644
--- a/libre/syslinux-parabola/syslinux.cfg
+++ b/libre/syslinux/syslinux.cfg
diff --git a/libre/syslinux-parabola/syslinux.install b/libre/syslinux/syslinux.install
index ed8387773..ed8387773 100644
--- a/libre/syslinux-parabola/syslinux.install
+++ b/libre/syslinux/syslinux.install
diff --git a/libre/texlive-bin-parabola/09-texlive-fonts.conf b/libre/texlive-bin/09-texlive-fonts.conf
index f870fbd7a..f870fbd7a 100644
--- a/libre/texlive-bin-parabola/09-texlive-fonts.conf
+++ b/libre/texlive-bin/09-texlive-fonts.conf
diff --git a/libre/texlive-bin-parabola/PKGBUILD b/libre/texlive-bin/PKGBUILD
index f3f9e0de8..3717a196b 100644
--- a/libre/texlive-bin-parabola/PKGBUILD
+++ b/libre/texlive-bin/PKGBUILD
@@ -4,9 +4,9 @@
 # Maintainer: Michał Masłowski <mtjm@mtjm.eu>
 # Contributor: André Silva <emulatorman@parabola.nu>
 
-pkgname=texlive-bin-parabola
+pkgname=texlive-bin
 pkgver=2014.34260
-pkgrel=1
+pkgrel=1.parabola1
 pkgdesc="TeX Live binaries, without biber binaries (Parabola rebranded)"
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
@@ -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=$pkgver" 'lcdf-typetools' 'kpathsea' 'xindy' 'pdfjam')
-conflicts=('texlive-bin' 'pdfjam' 'texlive-bin-libre')
-replaces=('texlive-bin' 'texlive-bin-libre')
+provides=('lcdf-typetools' 'kpathsea' 'xindy' 'pdfjam')
+conflicts=('pdfjam' 'texlive-bin-libre' 'texlive-bin-parabola')
+replaces=('texlive-bin-libre' 'texlive-bin-parabola')
 options=('!strip')
 url='http://tug.org/texlive/'
 install="texlive.install"
diff --git a/libre/texlive-bin-parabola/fix-fontforge-encoding.patch b/libre/texlive-bin/fix-fontforge-encoding.patch
index 8104b3289..8104b3289 100644
--- a/libre/texlive-bin-parabola/fix-fontforge-encoding.patch
+++ b/libre/texlive-bin/fix-fontforge-encoding.patch
diff --git a/libre/texlive-bin-parabola/luatex-poppler-0.20.patch b/libre/texlive-bin/luatex-poppler-0.20.patch
index 175824f3e..175824f3e 100644
--- a/libre/texlive-bin-parabola/luatex-poppler-0.20.patch
+++ b/libre/texlive-bin/luatex-poppler-0.20.patch
diff --git a/libre/texlive-bin-parabola/luatex-r4449-radical-rule-thickness.patch b/libre/texlive-bin/luatex-r4449-radical-rule-thickness.patch
index f925a1a93..f925a1a93 100644
--- a/libre/texlive-bin-parabola/luatex-r4449-radical-rule-thickness.patch
+++ b/libre/texlive-bin/luatex-r4449-radical-rule-thickness.patch
diff --git a/libre/texlive-bin-parabola/poppler-0.20.patch b/libre/texlive-bin/poppler-0.20.patch
index 3bd8183ab..3bd8183ab 100644
--- a/libre/texlive-bin-parabola/poppler-0.20.patch
+++ b/libre/texlive-bin/poppler-0.20.patch
diff --git a/libre/texlive-bin-parabola/poppler-0.26.patch b/libre/texlive-bin/poppler-0.26.patch
index fde123f62..fde123f62 100644
--- a/libre/texlive-bin-parabola/poppler-0.26.patch
+++ b/libre/texlive-bin/poppler-0.26.patch
diff --git a/libre/texlive-bin-parabola/texlive.install b/libre/texlive-bin/texlive.install
index a2b86eb1f..a2b86eb1f 100644
--- a/libre/texlive-bin-parabola/texlive.install
+++ b/libre/texlive-bin/texlive.install
diff --git a/libre/texlive-bin-parabola/texmf.cnf b/libre/texlive-bin/texmf.cnf
index 76975ee5c..76975ee5c 100644
--- a/libre/texlive-bin-parabola/texmf.cnf
+++ b/libre/texlive-bin/texmf.cnf
diff --git a/libre/usermin-parabola/PKGBUILD b/libre/usermin/PKGBUILD
index 3c2db7573..b9fda8d02 100644
--- a/libre/usermin-parabola/PKGBUILD
+++ b/libre/usermin/PKGBUILD
@@ -1,18 +1,16 @@
 # $Id: PKGBUILD 208134 2014-03-18 07:25:18Z tpowa $
 # Maintainer (Arch): Tobias Powalowski <tpowa@archlinux.org>
-_pkgname=usermin
-pkgname=usermin-parabola
+pkgname=usermin
 pkgver=1.590
-pkgrel=1
+pkgrel=1.parabola1
 pkgdesc="a web interface that can be used to easily perform tasks like reading mail, setting up SSH or configuring mail forwarding (Parabola rebranded)"
 arch=(i686 x86_64 mips64el)
 license=('custom:usermin')
 url="http://www.webmin.com/"
 depends=('perl' 'webmin')
 makedepends=('perl-net-ssleay')
-replaces=($_pkgname)
-conflicts=($_pkgname)
-provides=($_pkgname=$pkgver)
+replaces=(${pkgname}-parabola)
+conflicts=(${pkgname}-parabola)
 backup=('etc/usermin/miniserv.conf' 'etc/usermin/miniserv.users' 'etc/usermin/config' 'etc/usermin/usermin.cats' \
 'etc/usermin/at/config' \
 'etc/usermin/man/config' \
@@ -47,12 +45,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
 
@@ -82,7 +80,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
@@ -126,7 +124,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-parabola/usermin.install b/libre/usermin/usermin.install
index 3ace10ea2..3ace10ea2 100644
--- a/libre/usermin-parabola/usermin.install
+++ b/libre/usermin/usermin.install
diff --git a/libre/usermin-parabola/usermin.service b/libre/usermin/usermin.service
index e91164c63..e91164c63 100644
--- a/libre/usermin-parabola/usermin.service
+++ b/libre/usermin/usermin.service
diff --git a/libre/webmin-parabola/PKGBUILD b/libre/webmin/PKGBUILD
index 2a1c01db5..34e3a51bf 100644
--- a/libre/webmin-parabola/PKGBUILD
+++ b/libre/webmin/PKGBUILD
@@ -1,17 +1,15 @@
 # $Id: PKGBUILD 208132 2014-03-18 07:22:29Z tpowa $
 # Maintainer (Arch): Tobias Powalowski <tpowa@archlinux.org>
-_pkgname=webmin
-pkgname=webmin-parabola
+pkgname=webmin
 pkgver=1.680
-pkgrel=1
+pkgrel=1.parabola1
 pkgdesc="a web-based interface for system administration (Parabola rebranded)"
 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)
+replaces=(${pkgname}-parabola)
+conflicts=(${pkgname}-parabola)
 makedepends=('perl-net-ssleay')
 backup=('etc/webmin/miniserv.conf' 'etc/webmin/miniserv.users' 'etc/webmin/config' 'etc/webmin/webmin.cats' \
 'etc/webmin/pacman/config' \
@@ -87,7 +85,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)
@@ -95,7 +93,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
@@ -154,7 +152,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
@@ -165,7 +163,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
@@ -212,7 +210,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-parabola/webmin.install b/libre/webmin/webmin.install
index efdd9291d..efdd9291d 100644
--- a/libre/webmin-parabola/webmin.install
+++ b/libre/webmin/webmin.install
diff --git a/libre/webmin-parabola/webmin.service b/libre/webmin/webmin.service
index a8a384a8c..a8a384a8c 100644
--- a/libre/webmin-parabola/webmin.service
+++ b/libre/webmin/webmin.service
diff --git a/libre/xorg-server-parabola/PKGBUILD b/libre/xorg-server/PKGBUILD
index a77b16e62..62d43726b 100644
--- a/libre/xorg-server-parabola/PKGBUILD
+++ b/libre/xorg-server/PKGBUILD
@@ -4,9 +4,9 @@
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=xorg-server
-pkgname=('xorg-server-parabola')
+pkgname=('xorg-server')
 pkgver=1.16.0
-pkgrel=6 # build first with 0.1 and then rebuild it after xf86-input-evdev rebuild
+pkgrel=6.parabola1 # build first with 0.1 and then rebuild it after xf86-input-evdev rebuild
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://xorg.freedesktop.org"
@@ -113,15 +113,15 @@ build() {
       -i hw/Makefile
 }
 
-package_xorg-server-parabola() {
+package_xorg-server() {
   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")
+  provides=('X-ABI-VIDEODRV_VERSION=18' 'X-ABI-XINPUT_VERSION=21' 'X-ABI-EXTENSION_VERSION=8.0' 'x-server')
   groups=('xorg')
-  conflicts=('nvidia-utils' 'glamor-egl' "$pkgbase" "${pkgbase}-libre")
-  replaces=('nvidia-utils' 'glamor-egl' "$pkgbase" "${pkgbase}-libre")
+  conflicts=('nvidia-utils' 'glamor-egl' "${pkgbase}-libre" "${pkgbase}-parabola")
+  replaces=('nvidia-utils' 'glamor-egl' "${pkgbase}-libre" "${pkgbase}-parabola")
   install=xorg-server.install
 
   cd "${pkgbase}-${pkgver}"
diff --git a/libre/xorg-server-parabola/autoconfig-nvidia-libre.patch b/libre/xorg-server/autoconfig-nvidia-libre.patch
index 688b495e1..688b495e1 100644
--- a/libre/xorg-server-parabola/autoconfig-nvidia-libre.patch
+++ b/libre/xorg-server/autoconfig-nvidia-libre.patch
diff --git a/libre/xorg-server-parabola/autoconfig-sis.patch b/libre/xorg-server/autoconfig-sis.patch
index 0b50049db..0b50049db 100644
--- a/libre/xorg-server-parabola/autoconfig-sis.patch
+++ b/libre/xorg-server/autoconfig-sis.patch
diff --git a/libre/xorg-server-parabola/glamor-upstream-fix.patch b/libre/xorg-server/glamor-upstream-fix.patch
index 89dd4d017..89dd4d017 100644
--- a/libre/xorg-server-parabola/glamor-upstream-fix.patch
+++ b/libre/xorg-server/glamor-upstream-fix.patch
diff --git a/libre/xorg-server-parabola/xorg-server.install b/libre/xorg-server/xorg-server.install
index 46bf5a90a..46bf5a90a 100644
--- a/libre/xorg-server-parabola/xorg-server.install
+++ b/libre/xorg-server/xorg-server.install
diff --git a/libre/xorg-server-parabola/xvfb-run b/libre/xorg-server/xvfb-run
index 4c2f4e0d3..4c2f4e0d3 100644
--- a/libre/xorg-server-parabola/xvfb-run
+++ b/libre/xorg-server/xvfb-run
diff --git a/libre/xorg-server-parabola/xvfb-run.1 b/libre/xorg-server/xvfb-run.1
index 137d3a196..137d3a196 100644
--- a/libre/xorg-server-parabola/xvfb-run.1
+++ b/libre/xorg-server/xvfb-run.1
diff --git a/libre/xsp-parabola/PKGBUILD b/libre/xsp/PKGBUILD
index d497bec70..701de9e28 100644
--- a/libre/xsp-parabola/PKGBUILD
+++ b/libre/xsp/PKGBUILD
@@ -2,23 +2,21 @@
 # Maintainer (Arch): Daniel Isenmann <daniel@archlinux.org>
 # Contributor (Arch): Tobias Kieslich <tobias@justdreams.de>
 
-_pkgname=xsp
-pkgname=xsp-parabola
+pkgname=xsp
 pkgver=3.0.11
-pkgrel=1
+pkgrel=1.parabola1
 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)
-replaces=($_pkgname)
-conflicts=($_pkgname)
-provides=($_pkgname=$pkgver)
-install=${_pkgname}.install
+replaces=(${pkgname}-parabola)
+conflicts=(${pkgname}-parabola)
+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')
@@ -29,7 +27,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
@@ -44,19 +42,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-parabola/xsp.conf.d b/libre/xsp/xsp.conf.d
index b100baef1..b100baef1 100644
--- a/libre/xsp-parabola/xsp.conf.d
+++ b/libre/xsp/xsp.conf.d
diff --git a/libre/xsp-parabola/xsp.install b/libre/xsp/xsp.install
index d2cc5955a..d2cc5955a 100644
--- a/libre/xsp-parabola/xsp.install
+++ b/libre/xsp/xsp.install
diff --git a/libre/xsp-parabola/xsp.rc.d b/libre/xsp/xsp.rc.d
index b4fcda15c..b4fcda15c 100644
--- a/libre/xsp-parabola/xsp.rc.d
+++ b/libre/xsp/xsp.rc.d
diff --git a/libre/xsp-parabola/xsp.service b/libre/xsp/xsp.service
index 36b802e21..36b802e21 100644
--- a/libre/xsp-parabola/xsp.service
+++ b/libre/xsp/xsp.service
diff --git a/libre/xsp-parabola/xsp.webapp b/libre/xsp/xsp.webapp
index a685dd171..a685dd171 100644
--- a/libre/xsp-parabola/xsp.webapp
+++ b/libre/xsp/xsp.webapp