Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-testing/virtualbox-modules/PKGBUILD
	community-testing/virtualbox/PKGBUILD
	community-testing/virtualbox/vbox-service.rc
	community-testing/virtualbox/vboxdrv-reference.patch
	core/cryptsetup/PKGBUILD
	core/ed/PKGBUILD
	core/module-init-tools/PKGBUILD
	libre/audacious-plugins-libre/PKGBUILD

2 files changed, 97 insertions, 45 deletions

diff --git a/libre/audacious-plugins-libre/PKGBUILD b/libre/audacious-plugins-libre/PKGBUILD
index 0b6af2cd2..006c39cdf 100644
--- a/libre/audacious-plugins-libre/PKGBUILD
+++ b/libre/audacious-plugins-libre/PKGBUILD
@@ -1,31 +1,45 @@
 # $Id$
-# Contributor: Alexander Fehr <pizzapunk gmail com>
-# Contributor: William Rea <sillywilly@gmail.com>
+# Arch Contributor: Alexander Fehr <pizzapunk gmail com>
+# Arch Contributor: William Rea <sillywilly@gmail.com>
+# Arch maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Parabola maintainer: Brendan Tildesley
 
 pkgname=audacious-plugins-libre
-pkgver=2.5.1
-pkgrel=2
+pkgver=3.0.4
+pkgrel=1
 pkgdesc='Plugins for Audacious without unfree plugins'
-arch=('i686' 'x86_64' 'mips64el')
 url='http://audacious-media-player.org/'
-license=('GPL')
+arch=('i686' 'x86_64' 'mips64el')
+license=('GPL' 'LGPL' 'custom')
+
+# Licensing issues:
+# The plugins 'scrobbler', stereoplugin', 'wavepack' and 'plugin_echo' have no license notice
+# but I've been informed by an upstream dev, <nenolod>, that they are all GPL of some type.
+# 
+# The plugin 'psf' is currently BSD+noncommercial, but is apparently being changed to GPL.
+# However, 'psf' is apparently an emulator for running non-free code, so I'll leave it out.
+#
+# All the other custom licensed plugins I think are mostly modified BSD or ISC.
+ 
 provides=("audacious-plugins=$pkgver")
 replaces=("${pkgname%-libre}")
 conflicts=("${pkgname%-libre}")
 
 makedepends=("audacious>=${pkgver}"
-             'alsa-lib' 'pulseaudio' 'jack' 'lame' 'libvorbis' 'flac'
-             'faad2' 'ffmpeg' 'fluidsynth' 'libcdio' 'libsidplay' 'wavpack'
+             'oss' 'alsa-lib' 'pulseaudio' 'jack2' 'lame' 'libvorbis' 'flac'
+             'mpg123' 'faad2' 'ffmpeg' 'fluidsynth' 'libcdio' 'libsidplay' 'wavpack'
              'libnotify' 'lirc-utils' 'curl' 'libmtp'
              'neon' 'libmms' 'libcue')
 
-optdepends=('alsa-lib: Advanced Linux Sound Arch. output'
+optdepends=('oss: Open Sound System v4 output'
+            'alsa-lib: Advanced Linux Sound Arch. output'
             'pulseaudio: PulseAudio output'
-            'jack: Jack Audio Connection Kit output'
+            'jack2: Jack Audio Connection Kit output'
             'lame: FileWriter MP3 output'
             'libvorbis: Vorbis input, FileWriter Vorbis output'
             'flac: FLAC input, FileWriter FLAC output'
 
+            'mpg123: MP3 input'
             'faad2: AAC input'
             'ffmpeg: ffaudio input'
             'fluidsynth: MIDI FluidSynth backend input'
@@ -42,44 +56,79 @@ optdepends=('alsa-lib: Advanced Linux Sound Arch. output'
             'libmms: libmms-based mms transport'
             'libcue: CUE playlist format')
 
-source=("http://repo.parabolagnulinux.org/other/$pkgname-$pkgver.tar.gz")
+# Temporary source location
+source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('eaf3fa55987ed60d1c99983453d2b89a30087b7e')
 
-# Source PKGBUILD and run this function from the shell
+# Retrieve upstream & remove plugins 'psf' & 'usf' due to unfree license. Repackage as -libre
 mksource(){
-    tmpdir=$(mktemp -d /tmp/audacious-XXXX)
-    pushd $tmpdir >/dev/null
-    wget "http://distfiles.atheme.org/${pkgname%-libre}-$pkgver.tgz" -O - -q | tar xzf -
-
-	rm -rvf ${pkgname%-libre}-$pkgver/src/{u,p}sf/
-
-    mv -v ${pkgname%-libre}-$pkgver ${pkgname}-$pkgver
+	[ -f ${pkgname%-libre}-$pkgver.tar.gz ] || wget http://distfiles.atheme.org/${pkgname%-libre}-$pkgver.tar.gz
+	tar xzf ${pkgname%-libre}-${pkgver}.tar.gz
 
-    tar czf ${pkgname}-${pkgver}.tar.gz ${pkgname}-${pkgver}/
+	rm -rvf ${pkgname%-libre}-$pkgver/src/{p,u}usf/
+	sed -i s/enable_psf=yes/enable_psf=no/ ${pkgname%-libre}-$pkgver/configure
 
-    echo "You can find the sources at $tmpdir"
+	mv -v ${pkgname%-libre}-$pkgver ${pkgname}-$pkgver
+	tar czf ${pkgname}-${pkgver}.tar.gz ${pkgname}-${pkgver}/
+	rm -rf ${pkgname}-${pkgver}
+	echo "${pkgname}-${pkgver}.tar.gz is your new -libre source package."
 
-    popd >/dev/null
 }
 
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
-
-	sed 's/libavcore >= 0.12.0//g' -i configure # FS#23549
-
-	[[ $CARCH == x86_64 ]] && extraopts='' || extraopts='--disable-sse2'
-	./configure \
-		--prefix=/usr \
-		--enable-chardet \
-		--enable-amidiplug \
-		--disable-adplug \
-		--disable-psf \
-		$extraopts \
-
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	# hack to enable global hotkeys with gtk3
+	sed -e 's/gdk-x11-2.0/gdk-x11-3.0/g' -i configure
+
+	# Get license notices out of custom-licensed packages
+	cd src
+	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 18 cairo-spectrum/cairo-spectrum.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.cairo-spectrum
+	head -n 17 compressor/compressor.c	   | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.compressor
+	head -n 17 crossfade/crossfade.c	   | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.crossfade
+	head -n 18 crystalizer/crystalizer.c	   | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.crystalizer
+	head -n 17 daemon/daemon.c		   | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.daemon
+	head -n 22 dockalbumart/dockalbumart.c	   | cut -c 4- | tail -n 21 > ${tmpdir}/LICENSE.dockalbumart
+	head -n 18 lyricwiki/lyricwiki.c	   | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.lyricwiki
+	head -n 17 mixdown/mixdown.c		   | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.mixdown
+	head -n 19 mpg123/mpg123.c		   | cut -c 4- | tail -n 18 > ${tmpdir}/LICENSE.mpg123
+	head -n 17 openal/openal.c		   | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.openal
+	head -n 17 resample/resample.c		   | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.resample
+	head -n 18 roaraudio-vio/roaraudio-vio.c   | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.roaraudio-vio
+	head -n 17 unix-io/unix-io.c		   | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.unix-io
+	head -n 18 voice_removal/voice_removal.c   | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.voice_removal
+	head -n 25 xsf/corlett.c		   | cut -c 2- | tail -n 23 > ${tmpdir}/LICENSE.xfs
+	l=${pkgdir}/usr/share/licenses/${pkgname}/	
+	install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+ 	cd ..
+	pushd $tmpdir
+	install -m644 LICENSE.albumart $l
+	install -m644 LICENSE.alsa $l
+	install -m644 LICENSE.cairo-spectrum $l
+	install -m644 LICENSE.compressor $l
+	install -m644 LICENSE.crossfade $l
+	install -m644 LICENSE.crystalizer $l
+	install -m644 LICENSE.daemon $l
+	install -m644 LICENSE.dockalbumart $l
+	install -m644 LICENSE.lyricwiki $l
+	install -m644 LICENSE.mixdown $l
+	install -m644 LICENSE.mpg123 $l
+	install -m644 LICENSE.openal $l
+	install -m644 LICENSE.resample $l
+	install -m644 LICENSE.roaraudio-vio $l
+	install -m644 LICENSE.unix-io $l
+	install -m644 LICENSE.voice_removal $l
+	install -m644 LICENSE.xfs $l
+	popd
+	[[ ${CARCH} == x86_64 ]] && _extraopts='' || _extraopts='--disable-sse2'
+	./configure --prefix=/usr ${_extraopts}
 	make
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make DESTDIR="$pkgdir" install
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
 }
-md5sums=('510b325eb3b13621b6f0e6745f6d0961')
diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD
index 48ec8778d..e6b7679cd 100644
--- a/libre/texlive-bin-libre/PKGBUILD
+++ b/libre/texlive-bin-libre/PKGBUILD
@@ -5,15 +5,15 @@
 pkgname=texlive-bin-libre
 pkgver=2011.1
 _luatex_ver=0.70.1
-pkgrel=2
+pkgrel=3
 pkgdesc="TeX Live binaries"
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('t1lib' 'gd' 'libgraphite' 'poppler' 'libsigsegv' 'zziplib')
-makedepends=('perl' 'clisp' 'ffcall')
+makedepends=('perl' 'clisp' 'ffcall' 'pkg-config')
 optdepends=('ed: for texconfig')
 provides=('lcdf-typetools' 'kpathsea' 'xindy' 'pdfjam' 'texlive-bin')
-conflicts=('pdfjam')
+conflicts=('pdfjam' 'texlive-bin')
 replaces=('texlive-bin')
 options=('!libtool')
 url='http://tug.org/texlive/'
@@ -24,7 +24,8 @@ source=('texmf.cnf'
         'archlinux-build.patch'
         'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-20110724.tar.xz'
         'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-texmf-20110724.tar.xz'
-        "http://foundry.supelec.fr/gf/download/frsrelease/392/1730/luatex-beta-${_luatex_ver}.tar.bz2"
+        # "http://foundry.supelec.fr/gf/download/frsrelease/392/1730/luatex-beta-${_luatex_ver}.tar.bz2"
+        'http://ftp.archlinux.org/other/texlive/luatex-svn4356.tar.xz'
 )
 backup=(etc/texmf/web2c/texmf.cnf \
   etc/texmf/chktex/chktexrc \
@@ -46,7 +47,7 @@ md5sums=('ff30d6813babd2e41c414365eea9c147'
          '94ef5571a54262790ab64d6d044dd10c'
          '58e8ab64188eaf15897b7acf472dca9f'
          '9f7ae1aa24afd9e34289ac10a8f9e87b'
-         'c9348d4381170204b1a1b0440d8b6918')
+         'e7f0197559ef865d8c01683dab3b8526')
 
 build() {
    cd $srcdir
@@ -55,7 +56,8 @@ build() {
    rm -rf source/{extra/{djgpp,xz},libs/{freetype2,gd,xpdf,libpng,zziplib,zlib,t1lib,poppler,graphite},utils/dialog}
    rm -rf luatex-beta-0.70.1/source/libs/{libpng,zziplib,zlib,poppler}
    # Building LuaTeX
-   cd luatex-beta-${_luatex_ver}
+   # cd luatex-beta-${_luatex_ver}
+   cd luatex
    patch -p0 -i ../fix-fontforge-encoding.patch
   (cd source && ./texk/web2c/luatexdir/getluatexsvnversion.sh)
    mkdir build
@@ -73,6 +75,7 @@ build() {
     --without-system-icu \
     --without-system-kpathsea \
     --with-system-freetype2 \
+    --with-system-xpdf \
     --with-system-poppler \
     --with-freetype2-libdir=/usr/lib \
     --with-freetype2-include=/usr/include/freetype2 \
@@ -234,7 +237,7 @@ package() {
    rm -rf ${pkgdir}/usr/{texmf,texmf-dist}
 
    ## install luatex binary
-   cd $srcdir/luatex-beta-${_luatex_ver}/build/texk/web2c
+   cd $srcdir/luatex/build/texk/web2c
    ./libtool --mode=install install -m755 luatex $pkgdir/usr/bin/
    cd $pkgdir/usr/bin
    /bin/ln -s luatex texlua