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

21 files changed, 28 insertions, 33 deletions

diff --git a/libre/abiword-libre/PKGBUILD b/libre/abiword/PKGBUILD
index 4d48bf983..70eccc2ca 100644
--- a/libre/abiword-libre/PKGBUILD
+++ b/libre/abiword/PKGBUILD
@@ -3,11 +3,10 @@
 # Contributor (Arch): Maël Lavault <moimael@neuf.fr>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-_pkgbase=abiword
-pkgbase=abiword-libre
-pkgname=('abiword-libre' 'abiword-libre-plugins')
+pkgbase=abiword
+pkgname=('abiword' 'abiword-plugins')
 pkgver=3.0.0
-pkgrel=3
+pkgrel=3.parabola1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url='http://www.abisource.com'
@@ -16,7 +15,7 @@ makedepends=('pkgconfig' 'asio' 'boost' 'fribidi' 'goffice' 'libwmf' 'wv'
              'libots' 'libwpg' 'librsvg' 'loudmouth' 'libsoup' 'psiconv'
              'redland' 'libical')
 options=('!makeflags')
-source=(http://abisource.com/downloads/$_pkgbase/$pkgver/source/$_pkgbase-$pkgver.tar.gz
+source=(http://abisource.com/downloads/$pkgbase/$pkgver/source/$pkgbase-$pkgver.tar.gz
         fix_crash_saving_pdf.patch
         abiword-3.0.0-librevenge.patch
         liberation-fonts.patch)
@@ -26,7 +25,7 @@ md5sums=('8d9c41cff3a8fbef8d0c835c65600e65'
          'e7ef4d436469ae4b24b0f784b09ab023')
 
 prepare() {
-  cd $_pkgbase-$pkgver
+  cd $pkgbase-$pkgver
 
   # fix FS#39652 - http://bugzilla.abisource.com/show_bug.cgi?id=13586#c2
   patch -Np2 -i ${srcdir}/fix_crash_saving_pdf.patch
@@ -47,7 +46,7 @@ prepare() {
 
 
 build() {
-  cd $_pkgbase-$pkgver
+  cd $pkgbase-$pkgver
 
 # Collab plugin is somehow broken:
 # part service
@@ -78,17 +77,16 @@ build() {
   make
 }
 
-package_abiword-libre() {
+package_abiword() {
   pkgdesc='Fully-featured word processor, without nonfree fonts support'
   depends=('fribidi' 'wv' 'goffice' 'librsvg' 'enchant' 'desktop-file-utils'
            'redland' 'libical' 'gtk-update-icon-cache')
-  install=$_pkgbase.install
-  optdepends=('abiword-libre-plugins')
-  conflicts=("abiword-libre-plugins<${pkgver}-${pkgrel}" 'abiword')
-  replaces=('abiword')
-  provides=("abiword=$pkgver")
+  install=$pkgbase.install
+  optdepends=('abiword-plugins')
+  conflicts=("abiword-plugins<${pkgver}-${pkgrel}" 'abiword-libre')
+  replaces=('abiword-libre')
 
-  cd $_pkgbase-$pkgver
+  cd $pkgbase-$pkgver
   make DESTDIR="$pkgdir" install
 
   # split out plugins, there's no Makefile target for a clean way
@@ -96,13 +94,12 @@ package_abiword-libre() {
   mv "$pkgdir"/usr/lib/abiword-${pkgver%.*}/plugins ${srcdir}/_pluginsdir
 }
 
-package_abiword-libre-plugins() {
+package_abiword-plugins() {
   pkgdesc='Additional plugins for Abiword, without nonfree fonts support'
-  depends=("abiword-libre=${pkgver}-${pkgrel}" 'loudmouth' 'libwpg' 'libwmf' 'link-grammar' 
+  depends=("abiword=${pkgver}-${pkgrel}" 'loudmouth' 'libwpg' 'libwmf' 'link-grammar' 
            'gtkmathview' 'aiksaurus' 'libxslt' 'libsoup' 'libots' 'libgsf' 'psiconv')
-  conflicts=('abiword-plugins')
-  replaces=('abiword-plugins')
-  provides=("abiword-plugins=$pkgver")
+  conflicts=('abiword-libre-plugins')
+  replaces=('abiword-libre-plugins')
 
   install -dm755 ${pkgdir}/usr/lib/abiword-${pkgver%.*}
   mv ${srcdir}/_pluginsdir/plugins ${pkgdir}/usr/lib/abiword-${pkgver%.*}/
diff --git a/libre/abiword-libre/abiword-2.8.6-glib-2.31.patch b/libre/abiword/abiword-2.8.6-glib-2.31.patch
index 8b938cc25..8b938cc25 100644
--- a/libre/abiword-libre/abiword-2.8.6-glib-2.31.patch
+++ b/libre/abiword/abiword-2.8.6-glib-2.31.patch
diff --git a/libre/abiword-libre/abiword-2.8.6-libpng15.patch b/libre/abiword/abiword-2.8.6-libpng15.patch
index 7eded4c83..7eded4c83 100644
--- a/libre/abiword-libre/abiword-2.8.6-libpng15.patch
+++ b/libre/abiword/abiword-2.8.6-libpng15.patch
diff --git a/libre/abiword-libre/abiword-2.8.6-no-undefined.patch b/libre/abiword/abiword-2.8.6-no-undefined.patch
index c07000edb..c07000edb 100644
--- a/libre/abiword-libre/abiword-2.8.6-no-undefined.patch
+++ b/libre/abiword/abiword-2.8.6-no-undefined.patch
diff --git a/libre/abiword-libre/abiword-3.0.0-librevenge.patch b/libre/abiword/abiword-3.0.0-librevenge.patch
index 9ff7aea24..9ff7aea24 100644
--- a/libre/abiword-libre/abiword-3.0.0-librevenge.patch
+++ b/libre/abiword/abiword-3.0.0-librevenge.patch
diff --git a/libre/abiword-libre/abiword.install b/libre/abiword/abiword.install
index cc4abc0b6..cc4abc0b6 100644
--- a/libre/abiword-libre/abiword.install
+++ b/libre/abiword/abiword.install
diff --git a/libre/abiword-libre/compat_libwpg_0_9.patch b/libre/abiword/compat_libwpg_0_9.patch
index cf36e188e..cf36e188e 100644
--- a/libre/abiword-libre/compat_libwpg_0_9.patch
+++ b/libre/abiword/compat_libwpg_0_9.patch
diff --git a/libre/abiword-libre/fix_crash_saving_pdf.patch b/libre/abiword/fix_crash_saving_pdf.patch
index 6dd78c7f9..6dd78c7f9 100644
--- a/libre/abiword-libre/fix_crash_saving_pdf.patch
+++ b/libre/abiword/fix_crash_saving_pdf.patch
diff --git a/libre/abiword-libre/liberation-fonts.patch b/libre/abiword/liberation-fonts.patch
index 1660c3ead..1660c3ead 100644
--- a/libre/abiword-libre/liberation-fonts.patch
+++ b/libre/abiword/liberation-fonts.patch
diff --git a/libre/mesa-demos-libre/LICENSE b/libre/mesa-demos/LICENSE
index ae33d2709..ae33d2709 100644
--- a/libre/mesa-demos-libre/LICENSE
+++ b/libre/mesa-demos/LICENSE
diff --git a/libre/mesa-demos-libre/PKGBUILD b/libre/mesa-demos/PKGBUILD
index 728432ce3..24521b827 100644
--- a/libre/mesa-demos-libre/PKGBUILD
+++ b/libre/mesa-demos/PKGBUILD
@@ -3,16 +3,15 @@
 # Maintainer (Arch): Andreas Radke <andyrtr@archlinux.org>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-pkgname='mesa-demos-libre'
+pkgname='mesa-demos'
 pkgver=8.2.0
-pkgrel=3
+pkgrel=3.parabola1
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="Mesa demos and tools, without nonfree demos"
 url="http://mesa3d.sourceforge.net"
 license=('custom')
-provides=("mesa-demos=$pkgver")
-replaces=('mesa-demos')
-conflicts=('mesa-demos')
+replaces=('mesa-demos-libre')
+conflicts=('mesa-demos-libre')
 depends=('libgl' 'glew' 'freeglut')
 mksource=("ftp://ftp.freedesktop.org/pub/mesa/demos/${pkgver}/mesa-demos-${pkgver}.tar.bz2")
 source=("https://repo.parabolagnulinux.org/other/mesa-demos-libre/mesa-demos-libre-${pkgver}.tar.bz2"
diff --git a/libre/mesa-demos-libre/libre.patch b/libre/mesa-demos/libre.patch
index 43e2d1e37..43e2d1e37 100644
--- a/libre/mesa-demos-libre/libre.patch
+++ b/libre/mesa-demos/libre.patch
diff --git a/libre/sdl-libre/PKGBUILD b/libre/sdl/PKGBUILD
index ab057d514..957598225 100644
--- a/libre/sdl-libre/PKGBUILD
+++ b/libre/sdl/PKGBUILD
@@ -6,16 +6,15 @@
 # Maintainer: Márcio Silva <coadde@parabola.nu>
 # Maintainer (Connochaetos): Henry Jensen <hjensen@connochaetos.org>
 
-pkgname=sdl-libre
+pkgname=sdl
 pkgver=1.2.15
-pkgrel=6
+pkgrel=6.parabola1
 pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard, without nonfree riva_mmio.h file"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.libsdl.org"
 license=('LGPL')
-provides=("sdl=${pkgver}")
-conflicts=('sdl')
-replaces=('sdl')
+conflicts=('sdl-libre')
+replaces=('sdl-libre')
 depends=('glibc' 'libxext' 'libxrender' 'libx11')
 makedepends=('alsa-lib' 'mesa' 'libpulse' 'glu')
 optdepends=('alsa-lib: ALSA audio driver'
@@ -23,7 +22,7 @@ optdepends=('alsa-lib: ALSA audio driver'
 options=('staticlibs')
 mksource=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz
           libre.patch)
-source=(https://repo.parabolagnulinux.org/other/$pkgname/SDL-libre-${pkgver}.tar.gz
+source=(https://repo.parabolagnulinux.org/other/${pkgname}-libre/SDL-libre-${pkgver}.tar.gz
         sdl-1.2.14-fix-mouse-clicking.patch
         sdl-1.2.14-disable-mmx.patch
         fix_joystick_misc_axes.diff
diff --git a/libre/sdl-libre/X11_KeyToUnicode.patch b/libre/sdl/X11_KeyToUnicode.patch
index 5f0f325b1..5f0f325b1 100644
--- a/libre/sdl-libre/X11_KeyToUnicode.patch
+++ b/libre/sdl/X11_KeyToUnicode.patch
diff --git a/libre/sdl-libre/fix_joystick_misc_axes.diff b/libre/sdl/fix_joystick_misc_axes.diff
index 75e3755c9..75e3755c9 100644
--- a/libre/sdl-libre/fix_joystick_misc_axes.diff
+++ b/libre/sdl/fix_joystick_misc_axes.diff
diff --git a/libre/sdl-libre/libre.patch b/libre/sdl/libre.patch
index 72f7da56a..72f7da56a 100644
--- a/libre/sdl-libre/libre.patch
+++ b/libre/sdl/libre.patch
diff --git a/libre/sdl-libre/libsdl-1.2.15-resizing.patch b/libre/sdl/libsdl-1.2.15-resizing.patch
index 0655a13e1..0655a13e1 100644
--- a/libre/sdl-libre/libsdl-1.2.15-resizing.patch
+++ b/libre/sdl/libsdl-1.2.15-resizing.patch
diff --git a/libre/sdl-libre/sdl-1.2.14-disable-mmx.patch b/libre/sdl/sdl-1.2.14-disable-mmx.patch
index 1bb6e0e47..1bb6e0e47 100644
--- a/libre/sdl-libre/sdl-1.2.14-disable-mmx.patch
+++ b/libre/sdl/sdl-1.2.14-disable-mmx.patch
diff --git a/libre/sdl-libre/sdl-1.2.14-fix-mouse-clicking.patch b/libre/sdl/sdl-1.2.14-fix-mouse-clicking.patch
index 7d3e5acfc..7d3e5acfc 100644
--- a/libre/sdl-libre/sdl-1.2.14-fix-mouse-clicking.patch
+++ b/libre/sdl/sdl-1.2.14-fix-mouse-clicking.patch
diff --git a/libre/sdl-libre/sdl_x11sym.patch b/libre/sdl/sdl_x11sym.patch
index 9aaa2353b..9aaa2353b 100644
--- a/libre/sdl-libre/sdl_x11sym.patch
+++ b/libre/sdl/sdl_x11sym.patch
diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD
index 44e5e314b..2edc47996 100644
--- a/libre/your-freedom/PKGBUILD
+++ b/libre/your-freedom/PKGBUILD
@@ -5,8 +5,8 @@ pkgdesc="This package conflicts with every nonfree package known to date to ensu
 license=('GPL3')
 #url="https://projects.parabolagnulinux.org/blacklist.git"
 url="https://lukeshu.com/git/mirror/parabola/blacklist.git"
-pkgver=20140827.1
-_gitver=5575cf1f075adc00652d6c9aad01369e1410d8fb
+pkgver=20140902
+_gitver=bfd30ccf75e7637ed277491339646faf85db304a
 pkgrel=1
 
 arch=('any')
@@ -16,7 +16,7 @@ install=${pkgname}.install
 makedepends=(librelib)
 #source=(blacklist-${_gitver}.txt::https://projects.parabolagnulinux.org/blacklist.git/plain/blacklist.txt?id=${_gitver})
 source=(blacklist-${_gitver}.txt::https://lukeshu.com/git/mirror/parabola/blacklist.git/plain/blacklist.txt?id=${_gitver})
-md5sums=('4ab2276e3fe204e2876e26714f22baf3')
+md5sums=('86a541c856434deecf0b067b9d70993a')
 
 package() {
 	cd "$srcdir"