Merge branch 'master' of ssh://lukeshu.com:1863/srv/git/mirror/parabola/abslibre

50 files changed, 212 insertions, 223 deletions

diff --git a/libre/abuse-libre/PKGBUILD b/libre/abuse/PKGBUILD
index dfffa4947..c91b24f76 100644
--- a/libre/abuse-libre/PKGBUILD
+++ b/libre/abuse/PKGBUILD
@@ -4,26 +4,26 @@
 # Contributor (Arch): jlvsimoes <jlvsimoes@oninet.pt>
 # Contributor (Arch): kevin <kevin@archlinux.org>
 # Contributor: André Silva <emulatorman@parabola.nu>
+# Contributor: Márcio Silva <coadde@parabola.nu>
 
-_pkgname=abuse
-pkgname=abuse-libre
+pkgname=abuse
+_pkgname=$pkgname-libre
 pkgver=0.8
-pkgrel=4
+pkgrel=4.parabola1
 pkgdesc='Side-scroller action game that pits you against ruthless alien killers, without nonfree claudio support'
 arch=('x86_64' 'i686' 'mips64el')
-url='http://abuse.zoy.org/'
+url="http://$pkgname.zoy.org/"
 license=('GPL' 'custom')
-provides=($_pkgname=$pkgver)
 replaces=($_pkgname)
 conflicts=($_pkgname)
 depends=('gcc-libs' 'libgl' 'sdl_mixer' 'glu' 'desktop-file-utils')
 makedepends=('gendesk' 'mesa-libgl' 'glu')
-install="$_pkgname.install"
-mksource=("http://abuse.zoy.org/raw-attachment/wiki/download/$_pkgname-$pkgver.tar.gz"
+install="$pkgname.install"
+mksource=("http://$pkgname.zoy.org/raw-attachment/wiki/download/$pkgname-$pkgver.tar.gz"
           'non-claudio.patch')
-source=("https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"
-        'abuse.sh'
-        'default.abuserc'
+source=("https://repo.parabolagnulinux.org/other/$_pkgname/$_pkgname-$pkgver.tar.gz"
+        "$pkgname.sh"
+        "default.${pkgname}rc"
         'default.gamma.lsp')
 mksha256sums=('0104db5fd2695c9518583783f7aaa7e5c0355e27c5a803840a05aef97f9d3488'
               '017cb58acf5ba8cdb889f97a758318cb66ab4947b860a77ab16b932c3f21b98f')
@@ -33,7 +33,7 @@ sha256sums=('ff7018b3ddcc6d2e702bc14eb2884622677ac5141c36e1fc0cdd127df3017f7d'
             '13df83fea60918d29d5141cdfbd8d56147c053e88d3701209ae676f46447c2f6')
 
 mksource() {
-  cd "abuse-$pkgver"
+  cd "$pkgname-$pkgver"
 
   # Remove the nonfree claudio addon
   rm -rvf ./data/addon/claudio
@@ -41,39 +41,39 @@ mksource() {
 }
 
 prepare() {
-  cd "abuse-$pkgver"
+  cd "$_pkgname-$pkgver"
 
-  gendesk -n -f --pkgname "$_pkgname" --pkgdesc "$pkgdesc"
+  gendesk -n -f --pkgname "$pkgname" --pkgdesc "$pkgdesc"
 }
 
 build() {
-  cd "abuse-$pkgver"
+  cd "$_pkgname-$pkgver"
 
-  ./configure --prefix=/usr --with-assetdir="/usr/share/$_pkgname/orig" --with-x
+  ./configure --prefix=/usr --with-assetdir="/usr/share/$pkgname/orig" --with-x
   make
 }
 
 package() {
-  cd "abuse-$pkgver"
+  cd "$_pkgname-$pkgver"
 
   make DESTDIR="$pkgdir" install
 
   # Desktop shortcut and icon
-  install -Dm644 "$_pkgname.desktop" \
-    "$pkgdir/usr/share/applications/$_pkgname.desktop"
-  install -Dm644 "doc/$_pkgname.png" "$pkgdir/usr/share/pixmaps/$_pkgname.png"
+  install -Dm644 "$pkgname.desktop" \
+    "$pkgdir/usr/share/applications/$pkgname.desktop"
+  install -Dm644 "doc/$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"
 
   # Sane defaults
-  mv "$pkgdir/usr/bin/$_pkgname" "$pkgdir/usr/bin/$_pkgname.elf"
-  install -Dm755 "$srcdir/$_pkgname.sh" "$pkgdir/usr/bin/$_pkgname"
-  install -Dm644 "$srcdir/default.${_pkgname}rc" \
-    "$pkgdir/usr/share/$_pkgname/default.${_pkgname}rc"
+  mv "$pkgdir/usr/bin/$pkgname" "$pkgdir/usr/bin/$pkgname.elf"
+  install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/$pkgname"
+  install -Dm644 "$srcdir/default.${pkgname}rc" \
+    "$pkgdir/usr/share/$pkgname/default.${pkgname}rc"
   install -Dm644 "$srcdir/default.gamma.lsp" \
-    "$pkgdir/usr/share/$_pkgname/default.gamma.lsp"
+    "$pkgdir/usr/share/$pkgname/default.gamma.lsp"
 
   # License (for the original source code)
-  install -d "$pkgdir/usr/share/licenses/abuse"
-  sed -n '1,/^$/p' src/view.cpp > "$pkgdir/usr/share/licenses/abuse/original"
+  install -d "$pkgdir/usr/share/licenses/$pkgname"
+  sed -n '1,/^$/p' src/view.cpp > "$pkgdir/usr/share/licenses/$pkgname/original"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/libre/abuse-libre/abuse.install b/libre/abuse/abuse.install
index ad97d7bab..ad97d7bab 100644
--- a/libre/abuse-libre/abuse.install
+++ b/libre/abuse/abuse.install
diff --git a/libre/abuse-libre/abuse.sh b/libre/abuse/abuse.sh
index 228bb6f7b..228bb6f7b 100644
--- a/libre/abuse-libre/abuse.sh
+++ b/libre/abuse/abuse.sh
diff --git a/libre/abuse-libre/default.abuserc b/libre/abuse/default.abuserc
index ff116819f..ff116819f 100644
--- a/libre/abuse-libre/default.abuserc
+++ b/libre/abuse/default.abuserc
diff --git a/libre/abuse-libre/default.gamma.lsp b/libre/abuse/default.gamma.lsp
index 9a77afa27..9a77afa27 100644
--- a/libre/abuse-libre/default.gamma.lsp
+++ b/libre/abuse/default.gamma.lsp
diff --git a/libre/abuse-libre/non-claudio.patch b/libre/abuse/non-claudio.patch
index 2a29e53f0..2a29e53f0 100644
--- a/libre/abuse-libre/non-claudio.patch
+++ b/libre/abuse/non-claudio.patch
diff --git a/libre/angband-libre/PKGBUILD b/libre/angband/PKGBUILD
index e8a827150..85fcdb2db 100644
--- a/libre/angband-libre/PKGBUILD
+++ b/libre/angband/PKGBUILD
@@ -7,24 +7,24 @@
 # Contributor (Arch): Christian Schmidt <xmucknertx@googlemail.com>
 # Contributor (Arch): Sebastian Sareyko <public@nooms.de>
 # Maintainer: André Silva <emulatorman@parabola.nu>
+# Contributor: Márcio Silva <coadde@parabola.nu>
 
-_pkgname=angband
-pkgname=angband-libre
+pkgname=angband
+_pkgname=$pkgname-libre
 pkgver=3.5.0
-pkgrel=2
+pkgrel=2.parabola1
 pkgdesc="A roguelike dungeon exploration game based on the writings of JRR Tolkien, without nonfree artwork and sound effects"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://rephial.org/"
 license=('GPL2' 'custom')
 replaces=($_pkgname)
 conflicts=($_pkgname)
-provides=($_pkgname=$pkgver)
 depends=('sdl_image' 'sdl_ttf' 'sdl_mixer' 'ncurses')
-mksource=("http://rephial.org/downloads/${pkgver:0:3}/${_pkgname}-v${pkgver}.tar.gz" 'libre.patch')
-source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-v${pkgver}.tar.gz")
+mksource=("http://rephial.org/downloads/${pkgver:0:3}/${pkgname}-v${pkgver}.tar.gz" 'libre.patch')
+source=("https://repo.parabolagnulinux.org/other/${_pkgname}/${_pkgname}-v${pkgver}.tar.gz")
 
 mksource() {
-  cd "${srcdir}/${_pkgname}-v${pkgver}"
+  cd "${srcdir}/${pkgname}-v${pkgver}"
 
   # remove nonfree parts from source code
   patch -Np1 -i ../libre.patch  
@@ -38,9 +38,9 @@ build() {
   ./configure \
     --prefix=/usr \
     --bindir=/usr/bin \
-    --sysconfdir=/usr/share/angband \
-    --with-configpath=/usr/share/angband \
-    --with-libpath=/usr/share/angband \
+    --sysconfdir=/usr/share/$pkgname \
+    --with-configpath=/usr/share/$pkgname \
+    --with-libpath=/usr/share/$pkgname \
     --enable-gtk \
     --enable-sdl \
     --enable-sdl-mixer
@@ -53,8 +53,8 @@ package() {
 
   make DESTDIR="${pkgdir}" install
 
-  rm -f "${pkgdir}/usr/share/angband/*/delete.me"
-  install -Dm644 copying.txt "${pkgdir}/usr/share/licenses/${_pkgname}/COPYING"
+  rm -f "${pkgdir}/usr/share/$pkgname/*/delete.me"
+  install -Dm644 copying.txt "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 }
 
 mkmd5sums=('4f6ee37abdb411285deb1685ddecba6a'
diff --git a/libre/angband-libre/libre.patch b/libre/angband/libre.patch
index a044bc6fe..a044bc6fe 100644
--- a/libre/angband-libre/libre.patch
+++ b/libre/angband/libre.patch
diff --git a/libre/arora-libre/PKGBUILD b/libre/arora/PKGBUILD
index d10fb8ade..dae62bbf5 100644
--- a/libre/arora-libre/PKGBUILD
+++ b/libre/arora/PKGBUILD
@@ -4,17 +4,15 @@
 # Contributor (Arch): Daniel J Griffiths <ghost1227@archlinux.us>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-_pkgname=arora
-pkgname=arora-libre
+pkgname=arora
 pkgver=0.11.0
-pkgrel=4
+pkgrel=4.parabola1
 pkgdesc='Lightweight cross-platform Web browser, without nonfree flash recommendation and non-privacy search providers'
-url='http://code.google.com/p/arora/'
+url="http://code.google.com/p/$pkgname/"
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
-replaces=($_pkgname)
-conflicts=($_pkgname)
-provides=($_pkgname=$pkgver)
+replaces=($pkgname-libre)
+conflicts=($pkgname-libre)
 depends=('qtwebkit' 'desktop-file-utils')
 source=("http://${_pkgname}.googlecode.com/files/${_pkgname}-${pkgver}.tar.gz"
         'searchengines.qrc'
@@ -34,7 +32,7 @@ sha1sums=('480cfd7482cccbb7ece866fa10afe9acace29b31'
 install=install
 
 prepare() {
-        cd "${srcdir}/${_pkgname}-${pkgver}"
+        cd "${srcdir}/${pkgname}-${pkgver}"
         # remove non-privacy search providers
         rm -r src/data/searchengines/*
         install -m644 $srcdir/searchengines.qrc src/data/searchengines
@@ -45,12 +43,12 @@ prepare() {
 }
 
 build() {
-	cd "${srcdir}/${_pkgname}-${pkgver}"
+	cd "${srcdir}/${pkgname}-${pkgver}"
 	qmake-qt4 PREFIX='/usr' 'CONFIG-=debug' -r
 	make
 }
 
 package() {
-	cd "${srcdir}/${_pkgname}-${pkgver}"
+	cd "${srcdir}/${pkgname}-${pkgver}"
 	make INSTALL_ROOT="${pkgdir}" install
 }
diff --git a/libre/arora-libre/duckduckgo-html.xml b/libre/arora/duckduckgo-html.xml
index 9b979fa31..9b979fa31 100644
--- a/libre/arora-libre/duckduckgo-html.xml
+++ b/libre/arora/duckduckgo-html.xml
diff --git a/libre/arora-libre/install b/libre/arora/install
index b0409600c..b0409600c 100644
--- a/libre/arora-libre/install
+++ b/libre/arora/install
diff --git a/libre/arora-libre/libre.patch b/libre/arora/libre.patch
index 6bb6c6b43..6bb6c6b43 100644
--- a/libre/arora-libre/libre.patch
+++ b/libre/arora/libre.patch
diff --git a/libre/arora-libre/searchengines.qrc b/libre/arora/searchengines.qrc
index 93cd9b80d..93cd9b80d 100644
--- a/libre/arora-libre/searchengines.qrc
+++ b/libre/arora/searchengines.qrc
diff --git a/libre/arora-libre/seeks-search.xml b/libre/arora/seeks-search.xml
index f79d87047..f79d87047 100644
--- a/libre/arora-libre/seeks-search.xml
+++ b/libre/arora/seeks-search.xml
diff --git a/libre/arora-libre/wikipedia-en.xml b/libre/arora/wikipedia-en.xml
index ea590759f..ea590759f 100644
--- a/libre/arora-libre/wikipedia-en.xml
+++ b/libre/arora/wikipedia-en.xml
diff --git a/libre/arora-libre/yacy.xml b/libre/arora/yacy.xml
index 9c97f16cc..9c97f16cc 100644
--- a/libre/arora-libre/yacy.xml
+++ b/libre/arora/yacy.xml
diff --git a/libre/atool-libre/PKGBUILD b/libre/atool-libre/PKGBUILD
deleted file mode 100644
index 3cf76f09a..000000000
--- a/libre/atool-libre/PKGBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-# $Id: PKGBUILD 115146 2014-07-05 17:57:54Z jlichtblau $
-# Maintainer (Arch): Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor (Arch): leif_thande <leif.thande@gmail.com>
-# Contributor (Arch): tranquility <trankas@gmail.com>
-# Contributor (Arch): Daniel J Griffiths <ghost1227@archlinux.us>
-# Maintainer: Márcio Silva <coadde@parabola.nu>
-# Contributor: André Silva <emulatorman@parabola.nu>
-
-_pkgname=atool
-pkgname=atool-libre
-pkgver=0.39.0
-pkgrel=3
-pkgdesc="A script for managing file archives of various types, without nonfree unace and unrar support"
-arch=('any')
-url="http://www.nongnu.org/atool/"
-license=('GPL3')
-depends=('file' 'perl')
-provides=("$_pkgname=$pkgver")
-replaces=("$_pkgname")
-conflicts=("$_pkgname")
-optdepends=('bzip2: for using atool with bzip2 compressed archives'
-            'cpio: for using atool with cpio archives'
-            'gzip: for using atool with gzip compressed archives'
-            'lha: for using atool with lha, lharc and similar archives'
-            'xz: for using atool with lzma compressed archives'
-            'lzop: for using atool with lzop compressed archives'
-            'p7zip: for using atool with 7z archives'
-            'tar: for using atool with tar archives'
-            'zip: for using atool for creating zip archives'
-            'unzip: for using atool for unpacking archives')
-changelog=$_pkgname.changelog
-source=(http://savannah.nongnu.org/download/$_pkgname/$_pkgname-$pkgver.tar.gz
-        libre.patch)
-sha256sums=('aaf60095884abb872e25f8e919a8a63d0dabaeca46faeba87d12812d6efc703b'
-            'c9aa3c72e4c979d236dd659f16cc1eb6841f0860e6ef4d2c90f021d6e5aca578')
-
-prepare() {
-  cd ${srcdir}/${_pkgname}-${pkgver}
-
-  # remove nonfree unace and unrar support
-  patch -Np1 -i ../libre.patch
-}
-
-build() {
-  cd "${srcdir}"/${_pkgname}-${pkgver}
-
-  ./configure --prefix=/usr
-}
-
-package() {
-  cd "${srcdir}"/${_pkgname}-${pkgver}
-
-  make prefix="${pkgdir}"/usr install
-}
diff --git a/libre/atool/PKGBUILD b/libre/atool/PKGBUILD
new file mode 100644
index 000000000..dca366b88
--- /dev/null
+++ b/libre/atool/PKGBUILD
@@ -0,0 +1,52 @@
+# $Id: PKGBUILD 115146 2014-07-05 17:57:54Z jlichtblau $
+# Maintainer (Arch): Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# Contributor (Arch): leif_thande <leif.thande@gmail.com>
+# Contributor (Arch): tranquility <trankas@gmail.com>
+# Contributor (Arch): Daniel J Griffiths <ghost1227@archlinux.us>
+# Maintainer: Márcio Silva <coadde@parabola.nu>
+# Contributor: André Silva <emulatorman@parabola.nu>
+
+pkgname=atool
+pkgver=0.39.0
+pkgrel=3.parabola1
+pkgdesc="A script for managing file archives of various types, without nonfree unace and unrar support"
+arch=('any')
+url="http://www.nongnu.org/$pkgname/"
+license=('GPL3')
+depends=('file' 'perl')
+replaces=("$pkgname-libre")
+conflicts=("$pkgname-libre")
+optdepends=("bzip2: for using $pkgname with bzip2 compressed archives"
+            "cpio: for using $pkgname with cpio archives"
+            "gzip: for using $pkgname with gzip compressed archives"
+            "lha: for using $pkgname with lha, lharc and similar archives"
+            "xz: for using $pkgname with lzma compressed archives"
+            "lzop: for using $pkgname with lzop compressed archives"
+            "p7zip: for using $pkgname with 7z archives"
+            "tar: for using $pkgname with tar archives"
+            "zip: for using $pkgname for creating zip archives"
+            "unzip: for using $pkgname for unpacking archives")
+changelog=$pkgname.changelog
+source=(http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz
+        libre.patch)
+sha256sums=('aaf60095884abb872e25f8e919a8a63d0dabaeca46faeba87d12812d6efc703b'
+            'c9aa3c72e4c979d236dd659f16cc1eb6841f0860e6ef4d2c90f021d6e5aca578')
+
+prepare() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  # remove nonfree unace and unrar support
+  patch -Np1 -i ../libre.patch
+}
+
+build() {
+  cd "${srcdir}"/${pkgname}-${pkgver}
+
+  ./configure --prefix=/usr
+}
+
+package() {
+  cd "${srcdir}"/${pkgname}-${pkgver}
+
+  make prefix="${pkgdir}"/usr install
+}
diff --git a/libre/atool-libre/atool.changelog b/libre/atool/atool.changelog
index c61925fb0..c61925fb0 100644
--- a/libre/atool-libre/atool.changelog
+++ b/libre/atool/atool.changelog
diff --git a/libre/atool-libre/libre.patch b/libre/atool/libre.patch
index 11f3b3cb8..11f3b3cb8 100644
--- a/libre/atool-libre/libre.patch
+++ b/libre/atool/libre.patch
diff --git a/libre/atril-libre/PKGBUILD b/libre/atril/PKGBUILD
index a082a1bce..9cf1c2fed 100644
--- a/libre/atril-libre/PKGBUILD
+++ b/libre/atril/PKGBUILD
@@ -2,10 +2,9 @@
 # Maintainer (Arch): Martin Wimpress <code@flexion.org>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-_pkgname=atril
-pkgname=atril-libre
+pkgname=atril
 pkgver=1.8.0
-pkgrel=1.1
+pkgrel=1.parabola1
 pkgdesc="Simply a document viewer, with libarchive support"
 url="http://mate-desktop.org"
 arch=('i686' 'x86_64' 'mips64el')
@@ -21,28 +20,28 @@ optdepends=('caja: Document Properties extension'
             'texlive-bin: DVI support'
             'libarchive: cbr compressed comic books'
             'yelp: for reading MATE help documents')
-replaces=('mate-document-viewer' "$_pkgname")
-provides=('mate-document-viewer' "$_pkgname=$pkgver")
-conflicts=('mate-document-viewer' "$_pkgname")
+replaces=('mate-document-viewer' "$pkgname-libre")
+provides=('mate-document-viewer')
+conflicts=('mate-document-viewer' "$pkgname-libre")
 options=('!emptydirs')
 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"
         'libarchive.patch')
 sha1sums=('8327437ba12df61326b83342cea746d1764727d0'
           'e88168d61b18ce8e340ef3db9c6df6bb66c65d14')
-install=${_pkgname}.install
+install=${pkgname}.install
 
 prepare() {
-    cd "${srcdir}/${_pkgname}-${pkgver}"
+    cd "${srcdir}/${pkgname}-${pkgver}"
     NOCONFIGURE=1 ./autogen.sh
     patch -Np1 -i ../libarchive.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 \
         --enable-gtk-doc \
         --enable-djvu \
@@ -57,6 +56,6 @@ build() {
 }
 
 package() {
-    cd "${srcdir}/${_pkgname}-${pkgver}"
+    cd "${srcdir}/${pkgname}-${pkgver}"
     make DESTDIR="${pkgdir}" install
 }
diff --git a/libre/atril-libre/atril.install b/libre/atril/atril.install
index bf6781f93..bf6781f93 100644
--- a/libre/atril-libre/atril.install
+++ b/libre/atril/atril.install
diff --git a/libre/atril-libre/libarchive.patch b/libre/atril/libarchive.patch
index f86908267..f86908267 100644
--- a/libre/atril-libre/libarchive.patch
+++ b/libre/atril/libarchive.patch
diff --git a/libre/audacious-plugins-libre/PKGBUILD b/libre/audacious-plugins/PKGBUILD
index 323eee1c4..ac2bdacea 100644
--- a/libre/audacious-plugins-libre/PKGBUILD
+++ b/libre/audacious-plugins/PKGBUILD
@@ -6,10 +6,9 @@
 # Maintainer: Brendan Tildesley
 # Contributor: Jorge Lopez <jorginho@parabola.nu>
 
-_pkgname=audacious-plugins
-pkgname=audacious-plugins-libre
+pkgname=audacious-plugins
 pkgver=3.5.1
-pkgrel=1
+pkgrel=1.parabola1
 pkgdesc='Plugins for Audacious, without nonfree plugins'
 url='http://audacious-media-player.org/'
 license=('GPL' 'GPL3' 'LGPL' 'custom:BSD')
@@ -24,9 +23,8 @@ arch=('i686' 'x86_64' 'mips64el')
 #
 # All the other custom licensed plugins I think are mostly modified BSD or ISC.
 
-replaces=($_pkgname)
-conflicts=($_pkgname)
-provides=($_pkgname=$pkgver)
+replaces=($pkgname-libre)
+conflicts=($pkgname-libre)
 
 makedepends=("audacious>=${pkgver}"
              'glib2' 'python2' # for gdbus-codegen
@@ -61,11 +59,11 @@ optdepends=('alsa-lib: Advanced Linux Sound Arch. output'
             'libmms: libmms-based mms transport'
             'libcue: CUE playlist format')
 
-source=("http://distfiles.audacious-media-player.org/${_pkgname}-${pkgver}.tar.bz2")
+source=("http://distfiles.audacious-media-player.org/${pkgname}-${pkgver}.tar.bz2")
 sha1sums=('c066f79ca1f213c998b651250d02a84982556946')
 
 prepare() {
-	cd "${srcdir}/${_pkgname}-${pkgver}"
+	cd "${srcdir}/${pkgname}-${pkgver}"
 
         # Retrieve upstream & remove plugin 'psf' due to issues mentioned above.
         rm -rv src/psf
@@ -73,7 +71,7 @@ prepare() {
 
 	# Get license notices out of custom-licensed packages
 	cd src
-	tmpdir=$(mktemp -d /tmp/${_pkgname}-${pkgver}-XXXX)
+	tmpdir=$(mktemp -d /tmp/${pkgname}-${pkgver}-XXXX)
 	head -n 18 albumart/albumart.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.albumart
 	head -n 17 alsa/alsa.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.alsa
 	head -n 17 audpl/audpl.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.audpl
@@ -110,7 +108,7 @@ prepare() {
 }
 
 build() {
-	cd "${srcdir}/${_pkgname}-${pkgver}"
+	cd "${srcdir}/${pkgname}-${pkgver}"
 
 	./configure \
 		--prefix=/usr \
@@ -121,7 +119,7 @@ build() {
 }
 
 package() {
-	cd "${srcdir}/${_pkgname}-${pkgver}"
+	cd "${srcdir}/${pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}" install
 	install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/libre/blackbox-libre/PKGBUILD b/libre/blackbox/PKGBUILD
index 94f07ee2e..cca418a9f 100644
--- a/libre/blackbox-libre/PKGBUILD
+++ b/libre/blackbox/PKGBUILD
@@ -4,19 +4,17 @@
 # Contributor (Arch): Steve Ponsford <sp4d@lavabit.com>
 # Maintainer: Márcio Silva <coadde@parabola.nu>
 
-_pkgname=blackbox
-pkgname=${_pkgname}-libre
+pkgname=blackbox
 pkgver=0.70.1
-pkgrel=11
+pkgrel=11.parabola1
 pkgdesc="A window manager for X11, without nonfree programs on the menu"
-url="http://blackboxwm.sourceforge.net/"
+url="http://${pkgname}wm.sourceforge.net/"
 arch=('i686' 'x86_64' 'mips64el')
 depends=('gcc-libs' 'libxft' 'libxext' 'libx11' 'libxt')
-replaces=($_pkgname)
-conflicts=($_pkgname)
-provides=($_pkgname=$pkgver)
+replaces=($pkgname-libre)
+conflicts=($pkgname-libre)
 license=('MIT')
-source=(http://downloads.sourceforge.net/blackboxwm/$_pkgname-$pkgver.tar.gz
+source=(http://downloads.sourceforge.net/${pkgname}wm/$pkgname-$pkgver.tar.gz
 	gcc4.3.patch
 	bbdock.patch
 	bsetbg-feh.patch
@@ -30,7 +28,7 @@ md5sums=('2d173b95ca5e64ef478c6a5d2deee9df'
          'f4fefa5f25c65c5d9a601e9c14646757')
 
 build() {
-  cd $srcdir/$_pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver
 
   patch -Np1 -i ../gcc4.3.patch
   patch -Np0 -i ../bbdock.patch
@@ -42,8 +40,8 @@ build() {
 }
 
 package() {
-  cd $srcdir/$_pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
-  install -D -m644 LICENSE $pkgdir/usr/share/licenses/$_pkgname/LICENSE
-  install -D -m644 $srcdir/menu $pkgdir/usr/share/$_pkgname/menu
+  install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+  install -D -m644 $srcdir/menu $pkgdir/usr/share/$pkgname/menu
 }
diff --git a/libre/blackbox-libre/bbdock.patch b/libre/blackbox/bbdock.patch
index 709b6cfe1..709b6cfe1 100644
--- a/libre/blackbox-libre/bbdock.patch
+++ b/libre/blackbox/bbdock.patch
diff --git a/libre/blackbox-libre/bsetbg-feh.patch b/libre/blackbox/bsetbg-feh.patch
index 17a612ff0..17a612ff0 100644
--- a/libre/blackbox-libre/bsetbg-feh.patch
+++ b/libre/blackbox/bsetbg-feh.patch
diff --git a/libre/blackbox-libre/gcc4.3.patch b/libre/blackbox/gcc4.3.patch
index 40a9dcdef..40a9dcdef 100644
--- a/libre/blackbox-libre/gcc4.3.patch
+++ b/libre/blackbox/gcc4.3.patch
diff --git a/libre/blackbox-libre/menu b/libre/blackbox/menu
index 9cba27d16..9cba27d16 100644
--- a/libre/blackbox-libre/menu
+++ b/libre/blackbox/menu
diff --git a/libre/blackbox-libre/textpropertytostring-unconditional.patch b/libre/blackbox/textpropertytostring-unconditional.patch
index ed320388a..ed320388a 100644
--- a/libre/blackbox-libre/textpropertytostring-unconditional.patch
+++ b/libre/blackbox/textpropertytostring-unconditional.patch
diff --git a/libre/blender-addon-luxrender/PKGBUILD b/libre/blender-addon-luxrender/PKGBUILD
index bbd7fe9d6..0956d9645 100644
--- a/libre/blender-addon-luxrender/PKGBUILD
+++ b/libre/blender-addon-luxrender/PKGBUILD
@@ -4,21 +4,21 @@ _srcname=luxrender
 _pkgver=1.3.1
 _bldname=blender
 _bldver=2.71
-_bldep=12
+_bldep=14
 _pkgname=${_srcname::3}${_bldname::5}25
 _srcver=ad6536b0dda8
 
 pkgname=$_bldname-addon-$_srcname
 pkgver=$_pkgver.v$_bldver
-pkgrel=1
-pkgdesc="$_pkgname: A addon for the ${_bldname^} which allows render and export with LuxRender (built for the $_bldname-libre package)"
+pkgrel=2
+pkgdesc="$_pkgname: A addon for the ${_bldname^} which allows render and export with LuxRender (built for the $_bldname package)"
 arch=any
 url=http://www.$_srcname.net/
 license=GPL
 depends=(
   $_srcname=$_pkgver
-  "$_bldname-libre>=$_bldep:$_bldver"
-  "$_bldname-libre<$(($_bldep+1)):${_bldver::2}$((${_bldver:2:4}+1))"
+  "$_bldname>=$_bldep:$_bldver"
+  "$_bldname<$(($_bldep+1)):${_bldver::2}$((${_bldver:2:4}+1))"
 )
 provides=($_pkgname=$_pkgver)
 conflicts=($_pkgname)
diff --git a/libre/bogofilter-libre/PKGBUILD b/libre/bogofilter/PKGBUILD
index c9f0c0d6a..4ab5f7c66 100644
--- a/libre/bogofilter-libre/PKGBUILD
+++ b/libre/bogofilter/PKGBUILD
@@ -2,37 +2,37 @@
 # Maintainer (Arch): AndyRTR <andyrtr@archlinux.org>
 # Contributor (Arch): tobias <tobias@archlinux.org>
 # Contributor (Arch): Low Kian Seong <fastmail_low@speedymail.org>
+# Maintainer: Márcio Silva <marcio@parabola.nu>
 
-_pkgname=bogofilter
-pkgname=bogofilter-libre
+pkgname=bogofilter
+_pkgname=$pkgname-libre
 pkgver=1.2.4
-pkgrel=1
+pkgrel=1.parabola1
 pkgdesc="A fast Bayesian spam filtering tool, without noncommercial files"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
-url="http://bogofilter.sourceforge.net"
+url="http://$pkgname.sourceforge.net"
 depends=('db' 'perl' 'gsl')
-backup=('etc/bogofilter/bogofilter.cf')
-mksource=(http://sourceforge.net/projects/${_pkgname}/files/${_pkgname}-current/${_pkgname}-${pkgver}/${_pkgname}-${pkgver}.tar.bz2)
-source=(https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
+backup=("etc/$pkgname/$pkgname.cf")
+mksource=(http://sourceforge.net/projects/${pkgname}/files/${pkgname}-current/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2)
+source=(https://repo.parabolagnulinux.org/other/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2)
 mkmd5sums=('d0a5eebb3274b23ceabe766a6443a1c5')
 md5sums=('cce573e059d39a68cf78097dbfaa5b2d')
-provides=("${_pkgname}=${pkgver}")
 replaces=("${_pkgname}")
 conflicts=("${_pkgname}")
 
 mksource() {
-  cd ${_pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
 
   # Remove noncommercial files.
-  rm doc/bogofilter-SA-{2005-0{1,2},2010-01}
+  rm doc/$pkgname-SA-{2005-0{1,2},2010-01}
 }
 
 build() {
   cd ${_pkgname}-${pkgver}
 
   ./configure --prefix=/usr \
-              --sysconfdir=/etc/bogofilter  \
+              --sysconfdir=/etc/$pkgname  \
               --localstatedir=/var \
               --enable-transactions
   make
@@ -42,8 +42,8 @@ package() {
   cd ${_pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 
-  mv "${pkgdir}/etc/bogofilter/bogofilter.cf.example" "${pkgdir}/etc/bogofilter/bogofilter.cf"
+  mv "${pkgdir}/etc/$pkgname/$pkgname.cf.example" "${pkgdir}/etc/$pkgname/$pkgname.cf"
 
-  install -dm755 "${pkgdir}/usr/share/${_pkgname}/contrib"
-  install -m644 contrib/* "${pkgdir}/usr/share/${_pkgname}/contrib/"
+  install -dm755 "${pkgdir}/usr/share/${pkgname}/contrib"
+  install -m644 contrib/* "${pkgdir}/usr/share/${pkgname}/contrib/"
 }
diff --git a/libre/bumblebee-libre/PKGBUILD b/libre/bumblebee/PKGBUILD
index 82bfbca1d..964fcf020 100644
--- a/libre/bumblebee-libre/PKGBUILD
+++ b/libre/bumblebee/PKGBUILD
@@ -1,10 +1,9 @@
 # Maintainer (Arch): Sven-Hendrik Haase <sh@lutzhaase.com>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-_pkgname=bumblebee
-pkgname=bumblebee-libre
+pkgname=bumblebee
 pkgver=3.2.1
-pkgrel=3
+pkgrel=3.parabola1
 pkgdesc="NVIDIA Optimus support for GNU/Linux through VirtualGL, without nonfree nvidia driver support"
 arch=('i686' 'x86_64' 'mips64el')
 depends=('virtualgl' 'glib2' 'mesa-libgl')
@@ -17,32 +16,32 @@ if [ "$CARCH" = "x86_64" ]; then
      optdepends[${#optdepends[@]}]='lib32-virtualgl: run 32bit applications with optirun'
      optdepends[${#optdepends[@]}]='lib32-primus: faster back-end for optirun'
 fi
-replaces=('bumblebee' 'nvidia-libgl')
-conflicts=('bumblebee' 'nvidia-libgl')
-provides=("bumblebee=$pkgver" 'nvidia-libgl')
-url="http://www.bumblebee-project.org"
+replaces=("$pkgname-libre" 'nvidia-libgl')
+conflicts=("$pkgname-libre" 'nvidia-libgl')
+provides=('nvidia-libgl')
+url="http://www.$pkgname-project.org"
 license=("GPL3")
-install='bumblebee.install'
-backup=('etc/bumblebee/bumblebee.conf' 
-        'etc/bumblebee/xorg.conf.nouveau')
-source=("http://www.bumblebee-project.org/${_pkgname}-${pkgver}.tar.gz"
+install="$pkgname.install"
+backup=("etc/$pkgname/$pkgname.conf"
+        "etc/$pkgname/xorg.conf.nouveau")
+source=("http://www.$pkgname-project.org/${pkgname}-${pkgver}.tar.gz"
         'libre.patch')
 md5sums=('30974e677bb13e8a3825fd6f3e7d3b24'
          '1daed1e00f74538add6c435dfa0569d1')
 
 prepare() {
-    cd "${srcdir}/${_pkgname}-${pkgver}"
+    cd "${srcdir}/${pkgname}-${pkgver}"
 
     # Remove nonfree references to nonfree nvidia driver and unnecessaries files
     rm -rv "README.markdown"
-    rm -rv "conf/"{99-bumblebee-nvidia-dev.rules,xorg.conf.nvidia}
+    rm -rv "conf/"{99-$pkgname-nvidia-dev.rules,xorg.conf.nvidia}
     rm -rv "doc"
-    rm -rv "scripts/bumblebee-bugreport.in"
+    rm -rv "scripts/$pkgname-bugreport.in"
     patch -Np1 -i "${srcdir}/libre.patch"
 }
 
 build() {
-    cd "${srcdir}/${_pkgname}-${pkgver}"
+    cd "${srcdir}/${pkgname}-${pkgver}"
 
     ./configure \
         CONF_DRIVER=nouveau \
@@ -55,14 +54,14 @@ build() {
 }
 
 package() {
-    cd "${srcdir}/${_pkgname}-${pkgver}"
+    cd "${srcdir}/${pkgname}-${pkgver}"
 
     make install DESTDIR="$pkgdir"
 
     # Install systemd unit
-    install -D -m644 "scripts/systemd/bumblebeed.service" "${pkgdir}/usr/lib/systemd/system/bumblebeed.service"    
-    sed -i "s/sbin/bin/" "${pkgdir}/usr/lib/systemd/system/bumblebeed.service"
+    install -D -m644 "scripts/systemd/${pkgname}d.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}d.service"
+    sed -i "s/sbin/bin/" "${pkgdir}/usr/lib/systemd/system/${pkgname}d.service"
 
     # Make bash_completion work
-    mv -v "${pkgdir}/etc/bash_completion.d/bumblebee" "${pkgdir}/etc/bash_completion.d/optirun"
+    mv -v "${pkgdir}/etc/bash_completion.d/$pkgname" "${pkgdir}/etc/bash_completion.d/optirun"
 }
diff --git a/libre/bumblebee-libre/bumblebee.install b/libre/bumblebee/bumblebee.install
index 57aed6cc5..57aed6cc5 100644
--- a/libre/bumblebee-libre/bumblebee.install
+++ b/libre/bumblebee/bumblebee.install
diff --git a/libre/bumblebee-libre/libre.patch b/libre/bumblebee/libre.patch
index 81d49ca33..81d49ca33 100644
--- a/libre/bumblebee-libre/libre.patch
+++ b/libre/bumblebee/libre.patch
diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre/PKGBUILD
index c3fb79ade..038ddb174 100644
--- a/libre/calibre-libre/PKGBUILD
+++ b/libre/calibre/PKGBUILD
@@ -7,13 +7,13 @@
 # Contributor (Arch): Larry Hajali <larryhaja@gmail.com>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-_pkgname=calibre
-pkgname=calibre-libre
+pkgname=calibre
+_pkgname=$pkgname-libre
 pkgver=2.1.0
-pkgrel=1
+pkgrel=1.parabola1
 pkgdesc="Ebook management application, without nonfree decompression engine for RAR archives"
 arch=('i686' 'x86_64' 'mips64el') 
-url="http://calibre-ebook.com/"
+url="http://$pkgname-ebook.com/"
 license=('GPL3')
 depends=('python2-six' 'python2-dateutil' 'python2-cssutils' 'python2-cherrypy' 
          'python2-mechanize' 'podofo' 'libwmf'
@@ -23,20 +23,19 @@ depends=('python2-six' 'python2-dateutil' 'python2-cssutils' 'python2-cherrypy'
          'python2-netifaces' 'python2-cssselect' 'python2-apsw' 'qt5-webkit'
          'qt5-svg' 'python2-chardet' 'python2-html5lib')
 makedepends=('python2-pycountry' 'qt5-x11extras' )
-optdepends=('ipython2: to use calibre-debug')
+optdepends=("ipython2: to use $pkgname-debug")
 replaces=($_pkgname)
 conflicts=($_pkgname)
-provides=($_pkgname=$pkgver)
-install=calibre.install
-mksource=("http://download.calibre-ebook.com/${pkgver}/calibre-${pkgver}.tar.xz")
-source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz"
+install=$pkgname.install
+mksource=("http://download.$pkgname-ebook.com/${pkgver}/$pkgname-${pkgver}.tar.xz")
+source=("https://repo.parabolagnulinux.org/other/${_pkgname}/${_pkgname}-${pkgver}.tar.xz"
         'libre.patch')
 mkmd5sums=('db212364419212846719a9d392878c16')
 md5sums=('9c7c1c246d558a08c9a1f064ba7681f5'
          '343162b9d1c97c0463d4919a8b9ac500')
 
 mksource(){
-  cd "${srcdir}/${_pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   # Remove nonfree unRAR utility files from the source
   rm -rv src/unrar
@@ -46,13 +45,13 @@ prepare(){
   cd "${srcdir}/${_pkgname}-${pkgver}"
   
   # Remove nonfree rar/cbr support and references
-  rm -v src/calibre/{ebooks/metadata/rar.py,utils/unrar.{cpp,py}}
+  rm -v src/$pkgname/{ebooks/metadata/rar.py,utils/unrar.{cpp,py}}
   rm -v resources/images/mimetypes/{cbr,rar}.png
   rm -v imgsrc/mimetypes/rar.svg
   patch -Np1 -i "${srcdir}/libre.patch"
 
   # Remove unneeded files and libs
-  rm -rf resources/${_pkgname}-portable.* \
+  rm -rf resources/${pkgname}-portable.* \
          src/six.py \
          src/cherrypy \
          src/html5lib \
@@ -78,7 +77,7 @@ prepare(){
 \                os.mkdir(dir)" \
       -e "s/'ctc-posml'/'text' not in mt and 'pdf' not in mt and 'xhtml'/" \
       -e "s/^Name=calibre/Name=Calibre/g" \
-      -i  src/calibre/linux.py
+      -i  src/$pkgname/linux.py
 }
 
 build() {
@@ -106,6 +105,6 @@ package() {
     --staging-sharedir="${pkgdir}/usr/share"
 
   # Compiling bytecode FS#33392
-  python2 -m compileall "${pkgdir}/usr/lib/calibre/"
-  python2 -O -m compileall "${pkgdir}/usr/lib/calibre/"
+  python2 -m compileall "${pkgdir}/usr/lib/$pkgname/"
+  python2 -O -m compileall "${pkgdir}/usr/lib/$pkgname/"
 }
diff --git a/libre/calibre-libre/calibre.install b/libre/calibre/calibre.install
index 6210bd0ab..6210bd0ab 100644
--- a/libre/calibre-libre/calibre.install
+++ b/libre/calibre/calibre.install
diff --git a/libre/calibre-libre/libre.patch b/libre/calibre/libre.patch
index 7f1bdb6ee..7f1bdb6ee 100644
--- a/libre/calibre-libre/libre.patch
+++ b/libre/calibre/libre.patch
diff --git a/libre/cdrkit-libre/PKGBUILD b/libre/cdrkit/PKGBUILD
index d64f0018e..aaa47f6ce 100644
--- a/libre/cdrkit-libre/PKGBUILD
+++ b/libre/cdrkit/PKGBUILD
@@ -2,27 +2,27 @@
 # Maintainer (Arch): Andrea Scarpino <andrea@archlinux.org>
 # Contributor (Arch): Alexander Fehr <pizzapunk gmail com>
 
-_pkgname=cdrkit
-pkgname=cdrkit-libre
+pkgname=cdrkit
+_pkgname=$pkgname-libre
 pkgver=1.1.11
-pkgrel=3.2
+pkgrel=3.parabola1
 pkgdesc="Suite of programs for CD/DVD recording, ISO image creation, and audio CD extraction, without nonfree apple_driver utility"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://cdrkit.org/"
+url="http://$pkgname.org/"
 license=('GPL2')
-provides=("cdrkit=${pkgver}" 'cdrtools')
-conflicts=('cdrkit' 'cdrtools')
-replaces=('cdrkit' 'cdrtools')
+provides=('cdrtools')
+conflicts=("$_pkgname" 'cdrtools')
+replaces=("$_pkgname" 'cdrtools')
 depends=('file' 'bzip2')
 optdepends=('perl: for dirsplit')
 makedepends=('cmake')
-mksource=(http://cdrkit.org/releases/$_pkgname-$pkgver.tar.gz)
-source=(https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz)
+mksource=(http://$pkgname.org/releases/$pkgname-$pkgver.tar.gz)
+source=(https://repo.parabolagnulinux.org/other/$_pkgname/$_pkgname-$pkgver.tar.gz)
 mkmd5sums=('efe08e2f3ca478486037b053acd512e9')
 md5sums=('SKIP')
 
 mksource() {
-  cd "$srcdir/$_pkgname-$pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
 
   # Remove nonfree apple_driver utility
   rm -rvf {doc/genisoimage/README.hfs_boot,genisoimage/apple_driver.{8,c}}
diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine/PKGBUILD
index f34f648cb..cfa05ad10 100644
--- a/libre/clementine-libre/PKGBUILD
+++ b/libre/clementine/PKGBUILD
@@ -7,17 +7,16 @@
 # Contributor: Kete <kete@ninthfloor.org>
 # Contributor: Márcio Silva <coadde@parabola.nu>
 
-_pkgname=clementine
-pkgname=clementine-libre
+pkgname=clementine
+_pkgname=$pkgname-libre
 pkgver=1.2.3
-pkgrel=2
+pkgrel=2.parabola1
 pkgdesc='A modern music player and library organizer, without nonfree artwork and Spotify support'
-url='http://www.clementine-player.org/'
+url="http://www.$pkgname-player.org/"
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
-replaces=('clementine')
-conflicts=('clementine')
-provides=("clementine=$pkgver")
+replaces=("$_pkgname")
+conflicts=("$_pkgname")
 depends=('chromaprint' 'glew' 'gstreamer0.10-base' 'libcdio' 'libgpod' 'liblastfm' 'libmtp' 'libmygpo-qt' 'protobuf' 'qca-ossl' 'taglib')
 makedepends=('cmake' 'boost' 'mesa' 'sparsehash')
 optdepends=('gstreamer0.10-base-plugins: "Base" plugin libraries'
@@ -25,11 +24,11 @@ optdepends=('gstreamer0.10-base-plugins: "Base" plugin libraries'
             'gstreamer0.10-bad-plugins: "Bad" plugin libraries'
             'gstreamer0.10-ugly-plugins: "Ugly" plugin libraries'
             'gvfs: Various devices support')
-install="${_pkgname}.install"
-mksource=("${_pkgname}-${pkgver}.tar.gz::https://github.com/clementine-player/Clementine/archive/${pkgver}.tar.gz"
+install="${pkgname}.install"
+mksource=("${pkgname}-${pkgver}.tar.gz::https://github.com/$pkgname-player/${pkgname^}/archive/${pkgver}.tar.gz"
           'remove-nonfree-artwork-and-spotify.patch'
           'moognu.png')
-source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+source=("https://repo.parabolagnulinux.org/other/${_pkgname}/${_pkgname}-${pkgver}.tar.gz"
         'udisks-namespace.patch')
 mksha256sums=('7df5650445a005c09f5f0e1a1b0d077037c37ecbe4ee77baf9d45f121308a1bf'
               '48bfbf42c84ac1891021638627c10780194fcc59eda1c69e157be3aebe8ee10b'
@@ -38,13 +37,13 @@ sha256sums=('c68275373b839b5b256b813b5bed85d501f94e12bef3dd8ed69e90094af3f769'
             'a7c2764576cee303a57e4efe6a5dbd583a66de8a15aee738bd92d4bb21786008')
 
 mksource() {
-  cd Clementine-${pkgver}
+  cd ${pkgname^}-${pkgver}
 
   # remove nonfree nonfree artwork and spotify references on files
   patch -Np1 -i ../remove-nonfree-artwork-and-spotify.patch
 
   # remove nonfree spotifyblob folders
-  rm -rv ext/{clementine-spotifyblob,libclementine-spotifyblob}
+  rm -rv ext/{$pkgname-spotifyblob,lib${pkgname}-spotifyblob}
 
   # remove nonfree spotify files
   rm -v cmake/SpotifyVersion.cmake
@@ -60,17 +59,17 @@ mksource() {
   install -m644 -v ../moognu.png data
 
   # create a blank file due which is a dependency for clementine
-  touch data/schema/schema-30.sql  
+  touch data/schema/schema-30.sql
 }
 
 prepare() {
-  cd Clementine-${pkgver}
+  cd ${_pkgname}-${pkgver}
 
   patch -Np1 -i ../udisks-namespace.patch
 }
 
 build() {
-  cd Clementine-${pkgver}
+  cd ${_pkgname}-${pkgver}
 
   if [[ -d build ]]; then
     rm -rf build
@@ -82,7 +81,7 @@ build() {
 }
 
 package() {
-  cd Clementine-${pkgver}/build
+  cd ${_pkgname}-${pkgver}/build
 
   make DESTDIR="${pkgdir}" install
 }
diff --git a/libre/clementine-libre/clementine.install b/libre/clementine/clementine.install
index 927a10258..927a10258 100644
--- a/libre/clementine-libre/clementine.install
+++ b/libre/clementine/clementine.install
diff --git a/libre/clementine-libre/moognu.png b/libre/clementine/moognu.png
index 177041886..177041886 100644
--- a/libre/clementine-libre/moognu.png
+++ b/libre/clementine/moognu.png
diff --git a/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch b/libre/clementine/remove-nonfree-artwork-and-spotify.patch
index 8c1b9aafd..8c1b9aafd 100644
--- a/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch
+++ b/libre/clementine/remove-nonfree-artwork-and-spotify.patch
diff --git a/libre/clementine-libre/udisks-namespace.patch b/libre/clementine/udisks-namespace.patch
index e74889e78..e74889e78 100644
--- a/libre/clementine-libre/udisks-namespace.patch
+++ b/libre/clementine/udisks-namespace.patch
diff --git a/libre/openexr/InterpretingDeepPixels.docx b/libre/openexr/InterpretingDeepPixels.docx
new file mode 100644
index 000000000..03d6fcdb0
--- /dev/null
+++ b/libre/openexr/InterpretingDeepPixels.docx
diff --git a/libre/openexr/MultiViewOpenEXR.odt b/libre/openexr/MultiViewOpenEXR.odt
new file mode 100644
index 000000000..ace41168b
--- /dev/null
+++ b/libre/openexr/MultiViewOpenEXR.odt
diff --git a/libre/openexr/OpenEXRFileLayout.odt b/libre/openexr/OpenEXRFileLayout.odt
new file mode 100644
index 000000000..cc969b551
--- /dev/null
+++ b/libre/openexr/OpenEXRFileLayout.odt
diff --git a/libre/openexr/PKGBUILD b/libre/openexr/PKGBUILD
index a2a2ba472..2eb99b439 100644
--- a/libre/openexr/PKGBUILD
+++ b/libre/openexr/PKGBUILD
@@ -3,6 +3,7 @@
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
 pkgname=openexr
+_pkgname=$pkgname
 pkgver=2.1.0
 pkgrel=1.parabola1
 pkgdesc="An high dynamic-range image file format library, without embedded nonfree fonts in the documentation"
@@ -11,15 +12,15 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('BSD')
 depends=('zlib' 'ilmbase')
 makedepends=('jre7-openjdk-headless' 'libcups' 'libreoffice-writer' 'libxinerama')
-replaces=("$pkgname-libre")
-conflicts=("$pkgname-libre")
+replaces=("$_pkgname")
+conflicts=("$_pkgname")
 mksource=("http://download.savannah.nongnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"
           "https://github.com/${pkgname}/${pkgname}/raw/master/OpenEXR/doc/InterpretingDeepPixels.docx"
           "https://github.com/${pkgname}/${pkgname}/raw/master/OpenEXR/doc/MultiViewOpenEXR.odt"
           "https://github.com/${pkgname}/${pkgname}/raw/master/OpenEXR/doc/OpenEXRFileLayout.odt"
           "https://github.com/${pkgname}/${pkgname}/raw/master/OpenEXR/doc/ReadingAndWritingImageFiles.odt"
           "https://github.com/${pkgname}/${pkgname}/raw/master/OpenEXR/doc/TechnicalIntroduction.odt")
-source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+source=("https://repo.parabolagnulinux.org/other/${_pkgname}/${_pkgname}-${pkgver}.tar.gz")
 noextract=(InterpretingDeepPixels.docx MultiViewOpenEXR.odt OpenEXRFileLayout.odt ReadingAndWritingImageFiles.odt TechnicalIntroduction.odt)
 
 mksource() {
@@ -43,19 +44,19 @@ prepare() {
   # remove TheoryDeepPixels.pdf reference
   sed -i '\|TheoryDeepPixels[.]pdf|d
           \|InterpretingDeepPixels[.]pdf| s| [\]||
-         ' "${srcdir}/${pkgname}-${pkgver}/doc/Makefile."{am,in}
+         ' "${srcdir}/${_pkgname}-${pkgver}/doc/Makefile."{am,in}
 }
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${_pkgname}-${pkgver}"
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${_pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
   install -m644 "doc/"{InterpretingDeepPixels.docx,{MultiViewOpenEXR,OpenEXRFileLayout,ReadingAndWritingImageFiles,TechnicalIntroduction}.odt} "${pkgdir}/usr/share/doc/OpenEXR-${pkgver}"
 }
 mkmd5sums=('33735d37d2ee01c6d8fbd0df94fb8b43'
diff --git a/libre/openexr/ReadingAndWritingImageFiles.odt b/libre/openexr/ReadingAndWritingImageFiles.odt
new file mode 100644
index 000000000..d8c1fd44a
--- /dev/null
+++ b/libre/openexr/ReadingAndWritingImageFiles.odt
diff --git a/libre/openexr/TechnicalIntroduction.odt b/libre/openexr/TechnicalIntroduction.odt
new file mode 100644
index 000000000..d728128cc
--- /dev/null
+++ b/libre/openexr/TechnicalIntroduction.odt