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

9 files changed, 49 insertions, 51 deletions

diff --git a/libre/doublecmd-libre/PKGBUILD b/libre/doublecmd/PKGBUILD
index 806913117..68192fdad 100644
--- a/libre/doublecmd-libre/PKGBUILD
+++ b/libre/doublecmd/PKGBUILD
@@ -3,35 +3,35 @@
 # Maintainer (Arch): BlackIkeEagle <ike DOT devolder AT gmail DOT com>
 # Contributor (Arch): (sirocco AT ngs.ru)
 
-_pkgbase=doublecmd
-pkgbase=doublecmd-libre
-pkgname=('doublecmd-libre-gtk2' 'doublecmd-libre-qt')
+pkgbase=doublecmd
+_pkgbase=$pkgname-libre
+pkgname=("$pkgbase-gtk2" "$pkgbase-qt")
 pkgver=0.5.10
 _helpver=0.5.5
-pkgrel=1
-url="http://doublecmd.sourceforge.net/"
+pkgrel=1.parabola1
+url="http://$pkgbase.sourceforge.net/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-install="$_pkgbase.install"
-provides=("$_pkgbase")
+install="$pkgbase.install"
+provides=("$pkgbase")
 makedepends=('lazarus' 'qt4pas' 'gtk2')
 optdepends=(
 	'lua51: scripting'
 	'p7zip: support for 7zip archives'
 )
 mksource=(
-	"http://downloads.sourceforge.net/project/$_pkgbase/Double%20Commander%20Source/$_pkgbase-$pkgver-src.tar.gz"
+	"http://downloads.sourceforge.net/project/$pkgbase/Double%20Commander%20Source/$pkgbase-$pkgver-src.tar.gz"
 )
 source=(
-	"https://repo.parabolagnulinux.org/other/$pkgbase/$pkgbase-$pkgver-src.tar.gz"
-	"http://downloads.sourceforge.net/project/$_pkgbase/Double%20Commander%20Source/$_pkgbase-help-$_helpver-src.tar.gz"
+	"https://repo.parabolagnulinux.org/other/$_pkgbase/$_pkgbase-$pkgver-src.tar.gz"
+	"http://downloads.sourceforge.net/project/$pkgbase/Double%20Commander%20Source/$pkgbase-help-$_helpver-src.tar.gz"
 	"http://www.herecura.be/files/lazarus-20140321-2.tar.gz"
 	'libre.patch'
 	'help-libre.patch'
 )
 
 mksource() {
-	cd "$srcdir/$_pkgbase-$pkgver"
+	cd "$srcdir/$pkgbase-$pkgver"
 
 	msg2 'remove nonfree unRAR utility files from the source'
 	rm -rv install/linux/deb/libunrar
@@ -46,18 +46,18 @@ prepare() {
 	rm -v install/darwin/make-unrar.sh
 	patch -Np1 -i ../libre.patch
 
-	cd "$srcdir/$_pkgbase-help-$_helpver"
+	cd "$srcdir/$pkgbase-help-$_helpver"
 
 	msg2 'remove nonfree libunrar, unace, unarj support and references on the help'
 	patch -Np1 -i ../help-libre.patch
 }
 
 build() {
-	cp -a $_pkgbase-$pkgver $_pkgbase-gtk
-	cp -a $_pkgbase-$pkgver $_pkgbase-qt
+	cp -a $_pkgbase-$pkgver $pkgbase-gtk
+	cp -a $_pkgbase-$pkgver $pkgbase-qt
 
 	msg2 'build gtk'
-	gtkdir="$srcdir/$_pkgbase-gtk"
+	gtkdir="$srcdir/$pkgbase-gtk"
 	cd "$gtkdir"
 	bsdtar -zxf "$srcdir/lazarus-20140321-2.tar.gz"
 	sed -e "s/\\(export\\ lazbuild=\\).*/\\1\"\$(which lazbuild) --primary-config-path=${gtkdir//\//\\\/}\/lazarus\/lazarus-$CARCH\"/" -i build.sh
@@ -65,7 +65,7 @@ build() {
 	./build.sh beta gtk2
 
 	msg2 'build qt'
-	qtdir="$srcdir/$_pkgbase-qt"
+	qtdir="$srcdir/$pkgbase-qt"
 	cd "$qtdir"
 	bsdtar -zxf "$srcdir/lazarus-20140321-2.tar.gz"
 	sed -e "s/\\(export\\ lazbuild=\\).*/\\1\"\$(which lazbuild) --primary-config-path=${qtdir//\//\\\/}\/lazarus\/lazarus-$CARCH\"/" -i build.sh
@@ -74,32 +74,32 @@ build() {
 
 }
 
-package_doublecmd-libre-gtk2() {
+package_doublecmd-gtk2() {
 	pkgdesc="twin-panel (commander-style) file manager (GTK), without nonfree libunrar, unace and unarj support"
 	depends=('gtk2')
-	conflicts=('doublecmd-libre-qt' 'doublecmd-gtk2' 'doublecmd-gtk2-libre')
-	replaces=('doublecmd-gtk2' 'doublecmd-gtk2-libre')
-	provides=("doublecmd-gtk2=${pkgver}" 'doublecmd-gtk2-libre')
-	cd "$srcdir/$_pkgbase-gtk"
+	conflicts=("$pkgbase-qt" "$_pkgbase-gtk2" "$pkgbase-gtk2-libre")
+	replaces=("$_pkgbase-gtk2" "$pkgbase-gtk2-libre")
+	provides=("$pkgbase-gtk2-libre")
+	cd "$srcdir/$pkgbase-gtk"
 	./install/linux/install.sh --install-prefix="$pkgdir"
 
 	# install doc
-	cd "$srcdir/$_pkgbase-help-$_helpver"
-	cp -a * "$pkgdir/usr/share/$_pkgbase/doc/"
+	cd "$srcdir/$pkgbase-help-$_helpver"
+	cp -a * "$pkgdir/usr/share/$pkgbase/doc/"
 }
 
-package_doublecmd-libre-qt() {
+package_doublecmd-qt() {
 	pkgdesc="twin-panel (commander-style) file manager (QT), without nonfree libunrar, unace and unarj support"
 	depends=('qt4pas')
-	conflicts=('doublecmd-libre-gtk2' 'doublecmd-qt' 'doublecmd-qt-libre')
-	replaces=('doublecmd-qt' 'doublecmd-qt-libre')
-	provides=("doublecmd-qt=${pkgver}" 'doublecmd-qt-libre')
-	cd "$srcdir/$_pkgbase-qt"
+	conflicts=("$pkgbase-gtk2" "$_pkgbase-qt" "$pkgbase-qt-libre")
+	replaces=("$_pkgbase-qt" "$pkgbase-qt-libre")
+	provides=("$pkgbase-qt-libre")
+	cd "$srcdir/$pkgbase-qt"
 	./install/linux/install.sh --install-prefix="$pkgdir"
 
 	# install doc
-	cd "$srcdir/$_pkgbase-help-$_helpver"
-	cp -a * "$pkgdir/usr/share/$_pkgbase/doc/"
+	cd "$srcdir/$pkgbase-help-$_helpver"
+	cp -a * "$pkgdir/usr/share/$pkgbase/doc/"
 }
 
 mksha256sums=('cc54a2d973836f46f6f99fff1b8dd631bc96d8aa8524c3cd9cfc60b0c7a3dc12')
diff --git a/libre/doublecmd-libre/doublecmd.install b/libre/doublecmd/doublecmd.install
index c27b5bb23..c27b5bb23 100644
--- a/libre/doublecmd-libre/doublecmd.install
+++ b/libre/doublecmd/doublecmd.install
diff --git a/libre/doublecmd-libre/help-libre.patch b/libre/doublecmd/help-libre.patch
index c1d859d8b..c1d859d8b 100644
--- a/libre/doublecmd-libre/help-libre.patch
+++ b/libre/doublecmd/help-libre.patch
diff --git a/libre/doublecmd-libre/libre.patch b/libre/doublecmd/libre.patch
index 83c017125..83c017125 100644
--- a/libre/doublecmd-libre/libre.patch
+++ b/libre/doublecmd/libre.patch
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