5 files changed, 19 insertions, 21 deletions
diff --git a/libre/epdfview-libre/PKGBUILD b/libre/epdfview/PKGBUILD
index b5ab969a6..adef21e0e 100644
--- a/libre/epdfview-libre/PKGBUILD
+++ b/libre/epdfview/PKGBUILD
@@ -7,53 +7,51 @@
 # Maintainer: Márcio Silva <coadde@parabola.nu>
 # Maintainer: Michał Masłowski <mtjm@mtjm.eu>
 
-pkgname=epdfview-libre
-_pkgname=epdfview
+pkgname=epdfview
 pkgver=0.1.8
-pkgrel=5
+pkgrel=5.parabola1
 pkgdesc='Lightweight PDF document viewer, without nonfree suggestions'
-url='http://freecode.com/projects/epdfview'
+url="http://freecode.com/projects/$pkgname"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('poppler-glib' 'desktop-file-utils' 'hicolor-icon-theme' 'gtk2' 'xdg-utils')
 makedepends=('pkgconfig')
-provides=("epdfview=$pkgver")
-conflicts=('epdfview')
-replaces=('epdfview')
-install='epdfview.install'
-source=(ftp://ftp.slackware.com/.1/blfs/conglomeration/epdfview/$_pkgname-$pkgver.tar.bz2
-        epdfview-0.1.8-swap-the-blue-and-red-channel.patch
-        epdfview-0.1.8-glib2-headers.patch
-        epdfview-0.1.8-modern-cups.patch)
+conflicts=("$pkgname-libre")
+replaces=("$pkgname-libre")
+install="$pkgname.install"
+source=(ftp://ftp.slackware.com/.1/blfs/conglomeration/$pkgname/$pkgname-$pkgver.tar.bz2
+        $pkgname-0.1.8-swap-the-blue-and-red-channel.patch
+        $pkgname-0.1.8-glib2-headers.patch
+        $pkgname-0.1.8-modern-cups.patch)
 md5sums=('e50285b01612169b2594fea375f53ae4'
          '7f9ea101a41f5b4e999fd024f423d41f'
          '2fffa9c7cd4c5f0744803591c2f162a3'
          '5c2cf5612d2a7dfe6cf005b94aeb5ada')
 
 prepare() {
-  cd $_pkgname-$pkgver
-  sed -i 's/icon_epdfview-48/epdfview/' data/epdfview.desktop
+  cd $pkgname-$pkgver
+  sed -i "s/icon_$pkgname-48/$pkgname/" data/$pkgname.desktop
 
   # Use xdg-open as default browser.
   sed -r '/DEFAULT_EXTERNAL_BROWSER_COMMAND_LINE/s/firefox[^ ]*/xdg-open/' -i src/Config.cxx
 
-  patch -p1 -i ../epdfview-0.1.8-swap-the-blue-and-red-channel.patch
-  patch -p1 -i ../epdfview-0.1.8-glib2-headers.patch # FS#30116
-  patch -p1 -i ../epdfview-0.1.8-modern-cups.patch # FS#32511
+  patch -p1 -i ../$pkgname-0.1.8-swap-the-blue-and-red-channel.patch
+  patch -p1 -i ../$pkgname-0.1.8-glib2-headers.patch # FS#30116
+  patch -p1 -i ../$pkgname-0.1.8-modern-cups.patch # FS#32511
 }
 
 build() {
-  cd $_pkgname-$pkgver
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
   make
 }
 
 package() {
-  cd $_pkgname-$pkgver
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 
   for size in 24 32 48; do
-    install -Dm644 data/icon_$_pkgname-$size.png \
-      "$pkgdir"/usr/share/icons/hicolor/${size}x${size}/apps/$_pkgname.png
+    install -Dm644 data/icon_$pkgname-$size.png \
+      "$pkgdir"/usr/share/icons/hicolor/${size}x${size}/apps/$pkgname.png
   done
 }
diff --git a/libre/epdfview-libre/epdfview-0.1.8-glib2-headers.patch b/libre/epdfview/epdfview-0.1.8-glib2-headers.patch
index e9f0983b5..e9f0983b5 100644
--- a/libre/epdfview-libre/epdfview-0.1.8-glib2-headers.patch
+++ b/libre/epdfview/epdfview-0.1.8-glib2-headers.patch
diff --git a/libre/epdfview-libre/epdfview-0.1.8-modern-cups.patch b/libre/epdfview/epdfview-0.1.8-modern-cups.patch
index 64988789f..64988789f 100644
--- a/libre/epdfview-libre/epdfview-0.1.8-modern-cups.patch
+++ b/libre/epdfview/epdfview-0.1.8-modern-cups.patch
diff --git a/libre/epdfview-libre/epdfview-0.1.8-swap-the-blue-and-red-channel.patch b/libre/epdfview/epdfview-0.1.8-swap-the-blue-and-red-channel.patch
index e077a15cf..e077a15cf 100644
--- a/libre/epdfview-libre/epdfview-0.1.8-swap-the-blue-and-red-channel.patch
+++ b/libre/epdfview/epdfview-0.1.8-swap-the-blue-and-red-channel.patch
diff --git a/libre/epdfview-libre/epdfview.install b/libre/epdfview/epdfview.install
index c317fbaca..c317fbaca 100644
--- a/libre/epdfview-libre/epdfview.install
+++ b/libre/epdfview/epdfview.install