add parabola suffix on some packages

29 files changed, 65 insertions, 64 deletions

diff --git a/libre/audex-libre/PKGBUILD b/libre/audex-parabola/PKGBUILD
index acd5dcf82..56ddcf3ec 100644
--- a/libre/audex-libre/PKGBUILD
+++ b/libre/audex-parabola/PKGBUILD
@@ -6,16 +6,16 @@
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
 _pkgname=audex
-pkgname=audex-libre
+pkgname=audex-parabola
 pkgver=0.78
 pkgrel=1
 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)
-conflicts=($_pkgname)
-provides=($_pkgname=$pkgver)
+replaces=("${_pkgname}" "${_pkgname}-libre")
+conflicts=("${_pkgname}" "${_pkgname}-libre")
+provides=(${_pkgname}=${pkgver})
 depends=('kdebase-runtime' 'libkcddb' 'libkcompactdisc' 'cdparanoia')
 makedepends=('cmake' 'automoc4')
 optdepends=('vorbis-tools: OGG encoder'
diff --git a/libre/audex-libre/audex.install b/libre/audex-parabola/audex.install
index 81ce5c4b0..81ce5c4b0 100644
--- a/libre/audex-libre/audex.install
+++ b/libre/audex-parabola/audex.install
diff --git a/libre/audex-libre/google_regex.patch b/libre/audex-parabola/google_regex.patch
index 86917e66f..86917e66f 100644
--- a/libre/audex-libre/google_regex.patch
+++ b/libre/audex-parabola/google_regex.patch
diff --git a/libre/audio-convert-libre/ChangeLog b/libre/audio-convert-parabola/ChangeLog
index 0d8720f38..0d8720f38 100644
--- a/libre/audio-convert-libre/ChangeLog
+++ b/libre/audio-convert-parabola/ChangeLog
diff --git a/libre/audio-convert-libre/PKGBUILD b/libre/audio-convert-parabola/PKGBUILD
index d6807b701..62e218bc5 100644
--- a/libre/audio-convert-libre/PKGBUILD
+++ b/libre/audio-convert-parabola/PKGBUILD
@@ -4,7 +4,7 @@
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
 _pkgname=audio-convert
-pkgname=audio-convert-libre
+pkgname=audio-convert-parabola
 pkgver=0.3.1.1
 pkgrel=7
 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"
@@ -19,9 +19,9 @@ optdepends=('faad2: for aac support'
             'mplayer: for wma support'
             'musepack-tools: for mpc support'
             'vorbis-tools: for ogg support')
-replaces=($_pkgname)
-conflicts=($_pkgname)
-provides=($_pkgname=$pkgver)
+replaces=("${_pkgname}" "${_pkgname}-libre")
+conflicts=("${_pkgname}" "${_pkgname}-libre")
+provides=(${_pkgname}=${pkgver})
 source=(http://savannah.nongnu.org/download/$_pkgname/$_pkgname-$pkgver.tar.bz2)
 sha256sums=('7b37d5fc2a4dd62885910b6424f5ff6870c329ed4f4f51feeeb952152c7d9d2b')
 
diff --git a/libre/avidemux-libre/PKGBUILD b/libre/avidemux-parabola/PKGBUILD
index 21f5dc09b..0a1d76cf4 100644
--- a/libre/avidemux-libre/PKGBUILD
+++ b/libre/avidemux-parabola/PKGBUILD
@@ -2,9 +2,8 @@
 # Maintainer (Arch): Eric Bélanger <eric@archlinux.org>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-_pkgbase=avidemux
-pkgbase=avidemux-libre
-pkgname=('avidemux-libre-cli' 'avidemux-libre-gtk' 'avidemux-libre-qt')
+pkgbase=avidemux
+pkgname=('avidemux-cli-parabola' 'avidemux-gtk-parabola' 'avidemux-qt-parabola')
 pkgver=2.5.6
 pkgrel=9
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,7 +17,7 @@ source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz)
 sha1sums=('47205c236bf6a4435b9d4dd944493c7b7e2752f5')
 
 build() {
-  cd ${_pkgbase}_${pkgver}
+  cd ${pkgbase}_${pkgver}
   mkdir build
   cd build
   cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release \
@@ -40,7 +39,7 @@ build() {
   make
 }
 
-package_avidemux-libre-cli() {
+package_avidemux-cli-parabola() {
   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'
@@ -51,14 +50,14 @@ package_avidemux-libre-cli() {
               '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')
-  conflicts=('avidemux' 'avidemux-cli')
-  replaces=('avidemux' "avidemux-cli=$pkgver")
+  provides=('avidemux' "avidemux-cli=$pkgver")
+  conflicts=('avidemux' 'avidemux-cli' 'avidemux-libre-cli')
+  replaces=('avidemux' 'avidemux-cli' 'avidemux-libre-cli')
 
-  cd ${_pkgbase}_${pkgver}/build
+  cd ${pkgbase}_${pkgver}/build
   make DESTDIR="${pkgdir}" install
 
-  cd "${srcdir}/${_pkgbase}_${pkgver}/plugins/build"
+  cd "${srcdir}/${pkgbase}_${pkgver}/plugins/build"
   make DESTDIR="${pkgdir}" install
   rm -r "${pkgdir}"/usr/share/avidemux
   rm "${pkgdir}"/usr/share/ADM_addons/avsfilter/{avsload.exe,pipe_source.dll}
@@ -75,15 +74,15 @@ package_avidemux-libre-cli() {
   install -D -m644 ../../man/avidemux.1 "${pkgdir}/usr/share/man/man1/avidemux.1"
 }
 
-package_avidemux-libre-gtk() {
+package_avidemux-gtk-parabola() {
   pkgdesc="A graphical tool to edit video (filter/re-encode/split) - GTK GUI, without nonfree faac support"
-  depends=("avidemux-libre-cli=${pkgver}" 'gtk2' 'libxv' 'desktop-file-utils')
-  replaces=('avidemux-gtk')
-  conflicts=('avidemux-gtk')
+  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")
   install=avidemux.install
 
-  cd ${_pkgbase}_${pkgver}
+  cd ${pkgbase}_${pkgver}
   install -D -m755 build/avidemux/avidemux2_gtk "${pkgdir}/usr/bin/avidemux2_gtk"
 
   install -d "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/{x264,xvid}
@@ -98,15 +97,15 @@ package_avidemux-libre-gtk() {
   sed -i "s|\[\$e\]||" "${pkgdir}/usr/share/applications/avidemux-gtk.desktop"
 }
 
-package_avidemux-libre-qt() {
+package_avidemux-qt-parabola() {
   pkgdesc="A graphical tool to edit video (filter/re-encode/split) - Qt GUI, without nonfree faac support"
-  depends=("avidemux-libre-cli=${pkgver}" 'qt4')
-  replaces=('avidemux-qt')
-  conflicts=('avidemux-qt')
+  depends=("avidemux-cli=${pkgver}" 'qt4')
+  replaces=('avidemux-qt' 'avidemux-libre-qt')
+  conflicts=('avidemux-qt' 'avidemux-libre-qt')
   provides=("avidemux-qt=$pkgver")
   install=avidemux.install
 
-  cd ${_pkgbase}_${pkgver}
+  cd ${pkgbase}_${pkgver}
   install -D -m755 build/avidemux/avidemux2_qt4 "${pkgdir}/usr/bin/avidemux2_qt4"
   install -d "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/{x264,xvid}
   install -d "${pkgdir}"/usr/lib/ADM_plugins/videoFilter
diff --git a/libre/avidemux-libre/PKGBUILD.WIP b/libre/avidemux-parabola/PKGBUILD.WIP
index c79fb90e9..c79fb90e9 100644
--- a/libre/avidemux-libre/PKGBUILD.WIP
+++ b/libre/avidemux-parabola/PKGBUILD.WIP
diff --git a/libre/avidemux-libre/avidemux.install b/libre/avidemux-parabola/avidemux.install
index e111ef946..e111ef946 100644
--- a/libre/avidemux-libre/avidemux.install
+++ b/libre/avidemux-parabola/avidemux.install
diff --git a/libre/bitlbee-libre/PKGBUILD b/libre/bitlbee-parabola/PKGBUILD
index 77793b795..3c434e7a8 100644
--- a/libre/bitlbee-libre/PKGBUILD
+++ b/libre/bitlbee-parabola/PKGBUILD
@@ -9,7 +9,7 @@
 # Maintainer: Márcio Silva <coadde@parabola.nu>
 
 _pkgname=bitlbee
-pkgname=bitlbee-libre
+pkgname=bitlbee-parabola
 pkgver=3.2.2
 pkgrel=1
 pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC, without nonfree Skype support'
@@ -19,9 +19,9 @@ arch=('i686' 'x86_64' 'mips64el')
 depends=('gnutls' 'glib2')
 makedepends=('asciidoc' 'libotr')
 optdepends=('libotr: for OTR encryption support')
-provides=($_pkgname=$pkgver)
-conflicts=($_pkgname)
-replaces=($_pkgname)
+replaces=("${_pkgname}" "${_pkgname}-libre")
+conflicts=("${_pkgname}" "${_pkgname}-libre")
+provides=(${_pkgname}=${pkgver})
 source=("http://get.bitlbee.org/src/$_pkgname-$pkgver.tar.gz"
         'bitlbee.tmpfiles')
 sha1sums=('7e3cfe2b6bf4e8e603c74e7587307a6f5d267e9c'
diff --git a/libre/bitlbee-libre/bitlbee.install b/libre/bitlbee-parabola/bitlbee.install
index c8a8f93a1..c8a8f93a1 100644
--- a/libre/bitlbee-libre/bitlbee.install
+++ b/libre/bitlbee-parabola/bitlbee.install
diff --git a/libre/bitlbee-libre/bitlbee.tmpfiles b/libre/bitlbee-parabola/bitlbee.tmpfiles
index da72a0a79..da72a0a79 100644
--- a/libre/bitlbee-libre/bitlbee.tmpfiles
+++ b/libre/bitlbee-parabola/bitlbee.tmpfiles
diff --git a/libre/ecasound-libre/PKGBUILD b/libre/ecasound-parabola/PKGBUILD
index 464ce2b64..58f2f40f6 100644
--- a/libre/ecasound-libre/PKGBUILD
+++ b/libre/ecasound-parabola/PKGBUILD
@@ -5,7 +5,7 @@
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
 _pkgname=ecasound
-pkgname=ecasound-libre
+pkgname=ecasound-parabola
 pkgver=2.9.1
 pkgrel=2
 pkgdesc="Command-line multitrack audio processor, without nonfree faac recommendation"
@@ -22,9 +22,9 @@ optdepends=('python2: ecamonitor, ECI API'
             'faad2: AAC decoding'
             'timidity++: MIDI file input'
             'libmikmod: tracker module')
-replaces=($_pkgname)
-conflicts=($_pkgname)
-provides=($_pkgname=$pkgver)
+replaces=("${_pkgname}" "${_pkgname}-libre")
+conflicts=("${_pkgname}" "${_pkgname}-libre")
+provides=(${_pkgname}=${pkgver})
 source=("http://ecasound.seul.org/download/$_pkgname-$pkgver.tar.gz"
         'ruby2.patch')
 md5sums=('13c7be1e4eddc0bbf3792dc17777e465'
diff --git a/libre/ecasound-libre/ruby2.patch b/libre/ecasound-parabola/ruby2.patch
index d55f12140..d55f12140 100644
--- a/libre/ecasound-libre/ruby2.patch
+++ b/libre/ecasound-parabola/ruby2.patch
diff --git a/libre/engrampa-libre/PKGBUILD b/libre/engrampa-parabola/PKGBUILD
index 3a5a35e21..c94f519aa 100644
--- a/libre/engrampa-libre/PKGBUILD
+++ b/libre/engrampa-parabola/PKGBUILD
@@ -3,22 +3,22 @@
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
 _pkgname=engrampa
-pkgname=engrampa-libre
+pkgname=engrampa-parabola
 pkgver=1.8.0
-pkgrel=1.1
+pkgrel=1
 pkgdesc="Archive manipulator for MATE, with unar recommendation included and nonfree unace recommendation removed"
 url="http://mate-desktop.org"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-depends=('bzip2' 'caja' 'desktop-file-utils' 'gtk2' 'gzip' 'libarchive' 'tar' 'json-glib')
-makedepends=('mate-common' 'perl-xml-parser' 'yelp-tools')
+depends=('bzip2' 'caja' 'desktop-file-utils' 'gtk2' 'gzip' 'libarchive' 'tar')
+makedepends=('mate-common' 'perl-xml-parser' 'yelp-tools' 'json-glib') # json-glib is necessary to enable unar support on the package
 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")
-provides=('mate-file-archiver' "$_pkgname=$pkgver")
-conflicts=('mate-file-archiver' "$_pkgname")
+replaces=('mate-file-archiver' "${_pkgname}" "${_pkgname}-libre")
+provides=('mate-file-archiver' "${_pkgname}=$pkgver")
+conflicts=('mate-file-archiver' "${_pkgname}" "${_pkgname}-libre")
 groups=('mate-extra')
 source=("http://pub.mate-desktop.org/releases/1.8/${_pkgname}-${pkgver}.tar.xz"
         fr-rpm-bsdtar.patch)
diff --git a/libre/engrampa-libre/engrampa.install b/libre/engrampa-parabola/engrampa.install
index bf6781f93..bf6781f93 100644
--- a/libre/engrampa-libre/engrampa.install
+++ b/libre/engrampa-parabola/engrampa.install
diff --git a/libre/engrampa-libre/fr-rpm-bsdtar.patch b/libre/engrampa-parabola/fr-rpm-bsdtar.patch
index 93a783176..93a783176 100644
--- a/libre/engrampa-libre/fr-rpm-bsdtar.patch
+++ b/libre/engrampa-parabola/fr-rpm-bsdtar.patch
diff --git a/libre/file-roller-libre/PKGBUILD b/libre/file-roller-parabola/PKGBUILD
index 42faa5054..4cdc7cb17 100644
--- a/libre/file-roller-libre/PKGBUILD
+++ b/libre/file-roller-parabola/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor (Arch): Jan de Groot <jgc@archlinux.org>
 
 _pkgname=file-roller
-pkgname=file-roller-libre
+pkgname=file-roller-parabola
 pkgver=3.12.2
 pkgrel=1
 pkgdesc="Create and modify archives, with unar support included and nonfree unace recommendation removed"
@@ -13,9 +13,9 @@ 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')
-provides=("$_pkgname=$pkgver")
-replaces=("$_pkgname")
-conflicts=("$_pkgname")
+replaces=("${_pkgname}" "${_pkgname}-libre")
+conflicts=("${_pkgname}" "${_pkgname}-libre")
+provides=(${_pkgname}=${pkgver})
 options=('!emptydirs')
 install=file-roller.install
 url="http://www.gnome.org"
diff --git a/libre/file-roller-libre/bug708854.patch b/libre/file-roller-parabola/bug708854.patch
index 6a5591a59..6a5591a59 100644
--- a/libre/file-roller-libre/bug708854.patch
+++ b/libre/file-roller-parabola/bug708854.patch
diff --git a/libre/file-roller-libre/bug709035.patch b/libre/file-roller-parabola/bug709035.patch
index f82e33f30..f82e33f30 100644
--- a/libre/file-roller-libre/bug709035.patch
+++ b/libre/file-roller-parabola/bug709035.patch
diff --git a/libre/file-roller-libre/file-roller.install b/libre/file-roller-parabola/file-roller.install
index 8b17fa3d4..8b17fa3d4 100644
--- a/libre/file-roller-libre/file-roller.install
+++ b/libre/file-roller-parabola/file-roller.install
diff --git a/libre/file-roller-libre/rePKGBUILD b/libre/file-roller-parabola/rePKGBUILD
index a83d218f1..a83d218f1 100644
--- a/libre/file-roller-libre/rePKGBUILD
+++ b/libre/file-roller-parabola/rePKGBUILD
diff --git a/libre/gnormalize-libre/PKGBUILD b/libre/gnormalize-parabola/PKGBUILD
index 36219be72..edcb448a5 100644
--- a/libre/gnormalize-libre/PKGBUILD
+++ b/libre/gnormalize-parabola/PKGBUILD
@@ -6,7 +6,7 @@
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
 _pkgname=gnormalize
-pkgname=gnormalize-libre
+pkgname=gnormalize-parabola
 pkgver=0.63
 pkgrel=5
 pkgdesc='Audio normalizer, converter, encoder/decoder, ripper, tagger and player, without nonfree faac and mac recommendation'
@@ -26,9 +26,9 @@ optdepends=('flac: FLAC encoding, FLAC playing in conjunction with mplayer'
             'cdparanoia: CD ripping'
             'cdrkit: CD ripping - alternative to cdparanoia'
             'wavegain: sound normalization')
-replaces=($_pkgname)
-conflicts=($_pkgname)
-provides=($_pkgname=$pkgver)
+replaces=("${_pkgname}" "${_pkgname}-libre")
+conflicts=("${_pkgname}" "${_pkgname}-libre")
+provides=(${_pkgname}=${pkgver})
 install=gnormalize.install
 source=("http://downloads.sourceforge.net/sourceforge/gnormalize/${_pkgname}-${pkgver}.tar.gz")
 sha256sums=('80fd9aa2da8d7fcc88bd180be2adce1aed863bedba7d715144029bd95b61ccb6')
diff --git a/libre/gnormalize-libre/gnormalize.desktop b/libre/gnormalize-parabola/gnormalize.desktop
index 4d4061308..4d4061308 100644
--- a/libre/gnormalize-libre/gnormalize.desktop
+++ b/libre/gnormalize-parabola/gnormalize.desktop
diff --git a/libre/gnormalize-libre/gnormalize.install b/libre/gnormalize-parabola/gnormalize.install
index ef533df53..ef533df53 100644
--- a/libre/gnormalize-libre/gnormalize.install
+++ b/libre/gnormalize-parabola/gnormalize.install
diff --git a/libre/gst-plugins-bad-libre/PKGBUILD b/libre/gst-plugins-bad-parabola/PKGBUILD
index 7e39211c9..634b48ed7 100644
--- a/libre/gst-plugins-bad-libre/PKGBUILD
+++ b/libre/gst-plugins-bad-parabola/PKGBUILD
@@ -3,7 +3,7 @@
 # Maintainer: Márcio Silva <coadde@parabola.nu>
 
 _pkgname=gst-plugins-bad
-pkgname=$_pkgname-libre
+pkgname=$_pkgname-parabola
 pkgver=1.4.0
 pkgrel=1
 pkgdesc="GStreamer Multimedia Framework Bad Plugins, without nonfree faac support"
@@ -13,9 +13,9 @@ 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')
-provides=($_pkgname=$pkgver)
-conflicts=($_pkgname)
-replaces=($_pkgname)
+replaces=("${_pkgname}" "${_pkgname}-libre")
+conflicts=("${_pkgname}" "${_pkgname}-libre")
+provides=(${_pkgname}=${pkgver})
 options=(!emptydirs)
 source=(${url}/src/$_pkgname/$_pkgname-$pkgver.tar.xz)
 sha256sums=('ff2cb754f7725b205aec66002b1406e440f3a03194b6cad2d126ef5cd00902f9')
diff --git a/libre/gstreamer0.10-bad-libre/PKGBUILD b/libre/gstreamer0.10-bad-parabola/PKGBUILD
index 3c8d52824..a9ec61af9 100644
--- a/libre/gstreamer0.10-bad-libre/PKGBUILD
+++ b/libre/gstreamer0.10-bad-parabola/PKGBUILD
@@ -3,8 +3,8 @@
 # Maintainer: fauno <fauno@kiwwwi.com.ar>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-pkgbase=gstreamer0.10-bad-libre
-pkgname=('gstreamer0.10-bad-libre' 'gstreamer0.10-bad-libre-plugins')
+pkgbase=gstreamer0.10-bad
+pkgname=('gstreamer0.10-bad-parabola' 'gstreamer0.10-bad-plugins-parabola')
 pkgver=0.10.23
 pkgrel=8
 arch=('i686' 'x86_64' 'mips64el')
@@ -24,6 +24,8 @@ prepare() {
   sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -i configure.ac
   patch -Np1 -i ../disable-assrender-test.patch
   patch -Np1 -i ../disable-camerabin-test.patch
+
+  sed -i 's|stdafx[.]h|libmodplug/stdafx.h|' ext/modplug/gstmodplug.cc
 }
 
 build() {
@@ -43,25 +45,25 @@ check() {
   make check
 }
 
-package_gstreamer0.10-bad-libre() {
+package_gstreamer0.10-bad-parabola() {
   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')
-  replaces=('gstreamer0.10-bad')
+  conflicts=('gstreamer0.10-bad' 'gstreamer0.10-bad-libre')
+  replaces=('gstreamer0.10-bad' 'gstreamer0.10-bad-libre')
 
   cd gst-plugins-bad
   make DESTDIR="${pkgdir}" install
 }
 
-package_gstreamer0.10-bad-libre-plugins() {
+package_gstreamer0.10-bad-plugins-parabola() {
   pkgdesc="GStreamer Multimedia Framework Bad Plugins (gst-plugins-bad), without nonfree faac support"
-  depends=("gstreamer0.10-bad-libre=${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')
+  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')
-  replaces=('gstreamer0.10-bad-plugins')
+  conflicts=('gstreamer0.10-bad-plugins' 'gstreamer0.10-bad-libre-plugins')
+  replaces=('gstreamer0.10-bad-plugins' 'gstreamer0.10-bad-libre-plugins')
 
   cd gst-plugins-bad
   make -C gst-libs DESTDIR="${pkgdir}" install
diff --git a/libre/gstreamer0.10-bad-libre/disable-assrender-test.patch b/libre/gstreamer0.10-bad-parabola/disable-assrender-test.patch
index 07ce4f1bb..07ce4f1bb 100644
--- a/libre/gstreamer0.10-bad-libre/disable-assrender-test.patch
+++ b/libre/gstreamer0.10-bad-parabola/disable-assrender-test.patch
diff --git a/libre/gstreamer0.10-bad-libre/disable-camerabin-test.patch b/libre/gstreamer0.10-bad-parabola/disable-camerabin-test.patch
index 964351ae6..964351ae6 100644
--- a/libre/gstreamer0.10-bad-libre/disable-camerabin-test.patch
+++ b/libre/gstreamer0.10-bad-parabola/disable-camerabin-test.patch
diff --git a/libre/gstreamer0.10-bad-libre/gstreamer0.10-bad-plugins.install b/libre/gstreamer0.10-bad-parabola/gstreamer0.10-bad-plugins.install
index 3a36b0ccb..3a36b0ccb 100644
--- a/libre/gstreamer0.10-bad-libre/gstreamer0.10-bad-plugins.install
+++ b/libre/gstreamer0.10-bad-parabola/gstreamer0.10-bad-plugins.install