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

20 files changed, 41 insertions, 51 deletions

diff --git a/libre/faenza-icon-theme-libre/PKGBUILD b/libre/faenza-icon-theme/PKGBUILD
index dd65e4a20..a9a55bfba 100644
--- a/libre/faenza-icon-theme-libre/PKGBUILD
+++ b/libre/faenza-icon-theme/PKGBUILD
@@ -9,20 +9,18 @@
 # Contributor: Jorge Araya Navarro <elcorreo@deshackra.com>
 # Contributor: Márcio Silva <coadde@parabola.nu>
 
-_pkgname=faenza-icon-theme
-pkgname=faenza-icon-theme-libre
+pkgname=faenza-icon-theme
 pkgver=1.3.1
-pkgrel=3
+pkgrel=3.parabola1
 pkgdesc='Icon theme designed for Equinox GTK theme, without nonfree distros and application icons (Parabola rebranded)'
 url='http://gnome-look.org/content/show.php/Faenza?content=128143'
 license=('GPL3')
 arch=('any')
-replaces=($_pkgname)
-conflicts=($_pkgname)
-provides=($_pkgname=$pkgver)
+replaces=(${pkgname}-libre)
+conflicts=(${pkgname}-libre)
 makedepends=('librsvg')
 options=(!strip)
-source=("http://ppa.launchpad.net/tiheum/equinox/ubuntu/pool/main/f/$_pkgname/${_pkgname}_${pkgver}.tar.gz"
+source=("http://ppa.launchpad.net/tiheum/equinox/ubuntu/pool/main/f/$pkgname/${pkgname}_${pkgver}.tar.gz"
         'distributor-logo-parabola.svg'
         'start-here-parabola-symbolic.svg')
 md5sums=('b5339b70cbb821b583499e725957b150'
@@ -30,7 +28,7 @@ md5sums=('b5339b70cbb821b583499e725957b150'
          'e2301755fc4c552cfee7de72b6ed775a')
 
 prepare() {
- cd "$srcdir/$_pkgname-1.3"
+ cd "$srcdir/$pkgname-1.3"
  rm -rv debian
 
  # remove nonfree distros and application logos
@@ -56,7 +54,7 @@ prepare() {
 }
 
 package() {
-  cd $_pkgname-1.3
+  cd $pkgname-1.3
   mkdir -p "$pkgdir/usr/share/icons" "$pkgdir/usr/lib" "$pkgdir/usr/share"
 
   cp -rf Faenza{,-Dark,-Darkest,-Darker,-Ambiance,-Radiance} "$pkgdir/usr/share/icons/"
diff --git a/libre/faenza-icon-theme-libre/distributor-logo-parabola.svg b/libre/faenza-icon-theme/distributor-logo-parabola.svg
index dec339e9c..dec339e9c 100644
--- a/libre/faenza-icon-theme-libre/distributor-logo-parabola.svg
+++ b/libre/faenza-icon-theme/distributor-logo-parabola.svg
diff --git a/libre/faenza-icon-theme-libre/start-here-parabola-symbolic.svg b/libre/faenza-icon-theme/start-here-parabola-symbolic.svg
index a70ad3b3c..a70ad3b3c 100644
--- a/libre/faenza-icon-theme-libre/start-here-parabola-symbolic.svg
+++ b/libre/faenza-icon-theme/start-here-parabola-symbolic.svg
diff --git a/libre/faience-icon-theme-libre/PKGBUILD b/libre/faience-icon-theme/PKGBUILD
index ea9d910a4..f56de653d 100644
--- a/libre/faience-icon-theme-libre/PKGBUILD
+++ b/libre/faience-icon-theme/PKGBUILD
@@ -6,25 +6,23 @@
 # Contributor: Jorge Araya Navarro <elcorreo@deshackra.com>
 # Contributor: Márcio Silva <coadde@parabola.nu>
 
-_pkgname=faience-icon-theme
-pkgname=faience-icon-theme-libre
+pkgname=faience-icon-theme
 pkgver=0.5.1
-pkgrel=3
+pkgrel=3.parabola1
 pkgdesc='An icon theme based on Faenza, without nonfree distros and application icons (Parabola rebranded)'
 url='http://tiheum.deviantart.com/art/Faience-icon-theme-255099649'
 license=('GPL3')
 arch=('any')
-replaces=($_pkgname)
-conflicts=($_pkgname)
-provides=($_pkgname=$pkgver)
+replaces=(${pkgname}-libre)
+conflicts=(${pkgname}-libre)
 depends=('faenza-icon-theme')
-source=("http://ppa.launchpad.net/tiheum/equinox/ubuntu/pool/main/f/${_pkgname}/${_pkgname}_${pkgver}.tar.gz"
+source=("http://ppa.launchpad.net/tiheum/equinox/ubuntu/pool/main/f/${pkgname}/${pkgname}_${pkgver}.tar.gz"
         'start-here-parabola-symbolic.svg')
 sha256sums=('da4e6e921c465caeb8904d4fc6a183b173c8000c08abce625b5b6739f5a0867a'
             'ad3a47c9545358046b8ef1695cbc6effc913d7affbf27017744419d33e66aea6')
 
 prepare() {
-  cd ${_pkgname}-${pkgver%.*}
+  cd ${pkgname}-${pkgver%.*}
   rm -rv debian
 
   # remove nonfree distros and application logos
@@ -41,7 +39,7 @@ prepare() {
 }
 
 package() {
-  cd ${_pkgname}-${pkgver%.*}
+  cd ${pkgname}-${pkgver%.*}
 
   install -dm 755 "${pkgdir}"/usr/share/icons
   cp -dr --no-preserve=ownership Faience* "${pkgdir}"/usr/share/icons/
diff --git a/libre/faience-icon-theme-libre/start-here-parabola-symbolic.svg b/libre/faience-icon-theme/start-here-parabola-symbolic.svg
index a70ad3b3c..a70ad3b3c 100644
--- a/libre/faience-icon-theme-libre/start-here-parabola-symbolic.svg
+++ b/libre/faience-icon-theme/start-here-parabola-symbolic.svg
diff --git a/libre/ghostscript-libre/PKGBUILD b/libre/ghostscript/PKGBUILD
index c73b86a58..e12f428a6 100644
--- a/libre/ghostscript-libre/PKGBUILD
+++ b/libre/ghostscript/PKGBUILD
@@ -4,10 +4,9 @@
 
 ### !!! rebuild groff from core that picks up hardcoding the GS versioned font path !!! ###
 
-_pkgname=ghostscript
-pkgname=ghostscript-libre
+pkgname=ghostscript
 pkgver=9.14
-pkgrel=1
+pkgrel=1.parabola1
 pkgdesc="An interpreter for the PostScript language, without nonfree JPEG XR support"
 arch=('i686' 'x86_64' 'mips64el')
 license=('AGPL' 'custom')
@@ -16,9 +15,8 @@ depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng>=1.5.7' 'libjpeg
 makedepends=('gtk3' 'gnutls')
 optdepends=('texlive-core:      needed for dvipdf'
             'gtk3:              needed for gsx')
-conflicts=('ghostscript')
-replaces=('ghostscript')
-provides=("ghostscript=$pkgver")
+conflicts=('ghostscript-libre')
+replaces=('ghostscript-libre')
 url="http://www.ghostscript.com/"
 mksource=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2)
 source=(https://repo.parabolagnulinux.org/other/ghostscript-libre/ghostscript-libre-${pkgver}.tar.bz2
@@ -89,7 +87,7 @@ package() {
   # install missing doc files # http://bugs.archlinux.org/task/18023
   install -m 644 "${srcdir}"/ghostscript-${pkgver}/doc/{Ps2ps2.htm,gs-vms.hlp,gsdoc.el,pscet_status.txt} "${pkgdir}"/usr/share/ghostscript/$pkgver/doc/
   
-  install -D -m644 LICENSE "${pkgdir}"/usr/share/licenses/${_pkgname}/LICENSE
+  install -D -m644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 
   # remove unwanted localized man-pages
   rm -rf "$pkgdir"/usr/share/man/[^man1]*
diff --git a/libre/ghostscript-libre/ghostscript-sys-zlib.patch b/libre/ghostscript/ghostscript-sys-zlib.patch
index d632fcbb2..d632fcbb2 100644
--- a/libre/ghostscript-libre/ghostscript-sys-zlib.patch
+++ b/libre/ghostscript/ghostscript-sys-zlib.patch
diff --git a/libre/ghostscript-libre/libre.patch b/libre/ghostscript/libre.patch
index 0fe1c3b2e..0fe1c3b2e 100644
--- a/libre/ghostscript-libre/libre.patch
+++ b/libre/ghostscript/libre.patch
diff --git a/libre/gloobus-preview-libre/PKGBUILD b/libre/gloobus-preview/PKGBUILD
index 8385ea8b1..7d02eb70e 100644
--- a/libre/gloobus-preview-libre/PKGBUILD
+++ b/libre/gloobus-preview/PKGBUILD
@@ -2,20 +2,18 @@
 # Maintainer (Arch): Balló György <ballogyor+arch at gmail dot com>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-_pkgname=gloobus-preview
-pkgname=gloobus-preview-libre
+pkgname=gloobus-preview
 pkgver=0.4.5.290
 _pkgver=0.4.5-ubuntu11~ppa290
-pkgrel=2.1
+pkgrel=2.parabola1
 pkgdesc="Gnome application designed to enable a full screen preview of any kind of file, with libarchive support"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gloobus.net/"
 license=('GPL')
 depends=('gstreamer0.10-base-plugins' 'gtksourceview3' 'poppler-glib' 'python2-dbus' 'python2-gobject' 'gconf' 'taglib' 'xdg-utils')
 makedepends=('boost' 'bzr' 'djvulibre' 'libspectre')
-replaces=($_pkgname)
-conflicts=($_pkgname)
-provides=($_pkgname=$pkgver)
+replaces=(${pkgname}-libre)
+conflicts=(${pkgname}-libre)
 optdepends=('djvulibre: Preview DjVu documents'
             'gstreamer0.10-bad-plugins: Extra media codecs'
             'gstreamer0.10-good-plugins: Extra media codecs'
@@ -26,8 +24,8 @@ optdepends=('djvulibre: Preview DjVu documents'
             'unoconv: Preview LibreOffice compatible documents'
             'libarchive: View content of RAR archives'
             'unzip: View content of .ZIP archives')
-install=$_pkgname.install
-source=(https://launchpad.net/~gloobus-dev/+archive/$_pkgname/+files/${_pkgname}_$_pkgver.orig.tar.xz
+install=$pkgname.install
+source=(https://launchpad.net/~gloobus-dev/+archive/$pkgname/+files/${pkgname}_$_pkgver.orig.tar.xz
         gloobus-sushi::bzr+http://bazaar.launchpad.net/~gloobus-dev/gloobus-sushi/gloobus-sushi
         fix-gtksource-include.patch
         fix-unoconv.patch
@@ -45,7 +43,7 @@ md5sums=('27b3db2043ecaf47fa928940bbb4f32a'
          '25cda63ad406f00d3a7ba61ee8816b5c')
 
 prepare() {
-  cd "$srcdir/$_pkgname-$_pkgver"
+  cd "$srcdir/$pkgname-$_pkgver"
 
   # Python2 fix
   sed -i 's@^#!.*python$@#!/usr/bin/python2@' src/gloobus-preview-configuration
@@ -78,7 +76,7 @@ prepare() {
 
 
 build() {
-  cd "$srcdir/$_pkgname-$_pkgver"
+  cd "$srcdir/$pkgname-$_pkgver"
 
   ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
                --disable-static
@@ -92,7 +90,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$_pkgname-$_pkgver"
+  cd "$srcdir/$pkgname-$_pkgver"
   make DESTDIR="$pkgdir" install
 
   ### Install gloobus-sushi
diff --git a/libre/gloobus-preview-libre/fix-gtksource-include.patch b/libre/gloobus-preview/fix-gtksource-include.patch
index 053169a43..053169a43 100644
--- a/libre/gloobus-preview-libre/fix-gtksource-include.patch
+++ b/libre/gloobus-preview/fix-gtksource-include.patch
diff --git a/libre/gloobus-preview-libre/fix-unoconv.patch b/libre/gloobus-preview/fix-unoconv.patch
index f918f3019..f918f3019 100644
--- a/libre/gloobus-preview-libre/fix-unoconv.patch
+++ b/libre/gloobus-preview/fix-unoconv.patch
diff --git a/libre/gloobus-preview-libre/gloobus-preview-configuration-pygobject3-port.patch b/libre/gloobus-preview/gloobus-preview-configuration-pygobject3-port.patch
index 2c2540753..2c2540753 100644
--- a/libre/gloobus-preview-libre/gloobus-preview-configuration-pygobject3-port.patch
+++ b/libre/gloobus-preview/gloobus-preview-configuration-pygobject3-port.patch
diff --git a/libre/gloobus-preview-libre/gloobus-preview-usr-bsdtar-for-rar.patch b/libre/gloobus-preview/gloobus-preview-usr-bsdtar-for-rar.patch
index 3db748114..3db748114 100644
--- a/libre/gloobus-preview-libre/gloobus-preview-usr-bsdtar-for-rar.patch
+++ b/libre/gloobus-preview/gloobus-preview-usr-bsdtar-for-rar.patch
diff --git a/libre/gloobus-preview-libre/gloobus-preview.install b/libre/gloobus-preview/gloobus-preview.install
index 16ad7278f..16ad7278f 100644
--- a/libre/gloobus-preview-libre/gloobus-preview.install
+++ b/libre/gloobus-preview/gloobus-preview.install
diff --git a/libre/gloobus-preview-libre/gloobus-sushi-pygobject3-port.patch b/libre/gloobus-preview/gloobus-sushi-pygobject3-port.patch
index f748da875..f748da875 100644
--- a/libre/gloobus-preview-libre/gloobus-sushi-pygobject3-port.patch
+++ b/libre/gloobus-preview/gloobus-sushi-pygobject3-port.patch
diff --git a/libre/gloobus-preview-libre/use-xdg-open.patch b/libre/gloobus-preview/use-xdg-open.patch
index 68e219e6a..68e219e6a 100644
--- a/libre/gloobus-preview-libre/use-xdg-open.patch
+++ b/libre/gloobus-preview/use-xdg-open.patch
diff --git a/libre/gnome-boxes-libre/PKGBUILD b/libre/gnome-boxes/PKGBUILD
index 1c2bff72c..b7c1579f9 100644
--- a/libre/gnome-boxes-libre/PKGBUILD
+++ b/libre/gnome-boxes/PKGBUILD
@@ -4,41 +4,39 @@
 # Maintainer: André Silva <emulatorman@parabola.nu>
 # Contributor: Daniel Milewski <niitotantei@gmail.com>
 
-_pkgname=gnome-boxes
-pkgname=gnome-boxes-libre
+pkgname=gnome-boxes
 pkgver=3.12.3
-pkgrel=1
+pkgrel=1.parabola1
 pkgdesc="Simple GNOME 3 application to access remote or virtual systems, without nonfree system logos"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://wiki.gnome.org/Apps/Boxes"
 license=('LGPL')
-provides=($_pkgname=$pkgver)
-conflicts=($_pkgname)
-replaces=($_pkgname)
+conflicts=(${pkgname}-libre)
+replaces=(${pkgname}-libre)
 depends=('clutter-gtk' 'gtk-vnc' 'libosinfo' 'libsoup' 'libvirt-glib' 'spice-gtk3'
          'libtracker-sparql' 'qemu' 'cdrkit' 'libcdio' 'mtools' 'dconf'
          'gnome-icon-theme' 'gnome-themes-standard')
 makedepends=('gobject-introspection' 'intltool' 'itstool' 'spice-protocol' 'vala')
-install=$_pkgname.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz
+install=$pkgname.install
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
         libre.patch)
 sha256sums=('bf57525106baaa635d08a4a4c6ed81e4b8c8708897f2fe7c2623810aec9b6408'
             '2a93935ba94b9f327645a92f11d1a3d23cbeab8e5c800e414c6762181f51d4c0')
 
 prepare() {
-  cd $_pkgname-$pkgver
+  cd $pkgname-$pkgver
 
   patch -Np1 -i "$srcdir/libre.patch"
 }
 
 build() {
-  cd $_pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$_pkgname \
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
               --disable-static --disable-schemas-compile --enable-smartcard
   make
 }
 
 package() {
-  cd $_pkgname-$pkgver
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 }
diff --git a/libre/gnome-boxes-libre/gnome-boxes.install b/libre/gnome-boxes/gnome-boxes.install
index c0ed9a0d7..c0ed9a0d7 100644
--- a/libre/gnome-boxes-libre/gnome-boxes.install
+++ b/libre/gnome-boxes/gnome-boxes.install
diff --git a/libre/gnome-boxes-libre/libre.patch b/libre/gnome-boxes/libre.patch
index 0caf82691..0caf82691 100644
--- a/libre/gnome-boxes-libre/libre.patch
+++ b/libre/gnome-boxes/libre.patch
diff --git a/libre/gst-plugins-bad/PKGBUILD b/libre/gst-plugins-bad/PKGBUILD
index 7eb3a4ae1..56b6a2406 100644
--- a/libre/gst-plugins-bad/PKGBUILD
+++ b/libre/gst-plugins-bad/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 217512 2014-07-20 23:05:04Z heftig $
+# $Id: PKGBUILD 220829 2014-08-31 16:23:02Z heftig $
 # Maintainer (Arch): Jan de Groot <jgc@archlinux.org>
 # Maintainer: Márcio Silva <coadde@parabola.nu>
 
 pkgname=gst-plugins-bad
-pkgver=1.4.0
+pkgver=1.4.1
 pkgrel=1.parabola1
 pkgdesc="GStreamer Multimedia Framework Bad Plugins, without nonfree faac support"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ replaces=("${pkgname}-libre" "${pkgname}-parabola")
 conflicts=("${pkgname}-libre" "${pkgname}-parabola")
 options=(!emptydirs)
 source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('ff2cb754f7725b205aec66002b1406e440f3a03194b6cad2d126ef5cd00902f9')
+sha256sums=('0268db2faaf0bb22e5b709a11633abbca4f3d289b1f513bb262d0bf3f53e19ae')
 
 build() {
   cd $pkgname-$pkgver