Merge branch 'master' of ssh://gparabola/srv/git/abslibre

27 files changed, 704 insertions, 36 deletions

diff --git a/libre/audex-libre/PKGBUILD b/libre/audex-libre/PKGBUILD
new file mode 100644
index 000000000..413c11461
--- /dev/null
+++ b/libre/audex-libre/PKGBUILD
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Laurent Carlier <lordheavym@gmail.com>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: mightyjaym <jmambrosino@gmail.com>
+# Contributor: moostik <mooostik_at_gmail.com>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+_pkgname=audex
+pkgname=audex-libre
+pkgver=0.77b1
+pkgrel=1
+pkgdesc="A CDDA extraction tool with a ftp upload function for KDE (without nonfree faac recommendation)"
+arch=('i686' 'x86_64')
+url="http://kde-apps.org/content/show.php?content=77125"
+license=('GPL')
+depends=('kdebase-runtime' 'libkcddb' 'libkcompactdisc' 'cdparanoia')
+makedepends=('cmake' 'automoc4')
+optdepends=('vorbis-tools: OGG encoder'
+	'flac: FLAC encoder'
+	'lame: MP3 encoder')
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
+install=${_pkgname}.install
+#source=("ftp://ftp.archlinux.org/other/community/${_pkgname}/${_pkgname}-${pkgver}.tar.xz"
+source=("http://kde.maniatek.com/${_pkgname}/files/${_pkgname}-${pkgver}.tar.xz"
+        'gcc47.patch')
+md5sums=('1f3df64b60b15315e958e3e3b151fe92'
+         '64107bcf90e22910e57804be774822dd')
+
+build() {
+  cd ${_pkgname}-${pkgver}
+
+  patch -p1 -i "${srcdir}"/gcc47.patch
+  cd ..
+
+  mkdir build
+  cd build
+
+  cmake ../${_pkgname}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/build
+  make DESTDIR=${pkgdir} install
+}
diff --git a/libre/audex-libre/audex.install b/libre/audex-libre/audex.install
new file mode 100644
index 000000000..81ce5c4b0
--- /dev/null
+++ b/libre/audex-libre/audex.install
@@ -0,0 +1,12 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/libre/audex-libre/gcc47.patch b/libre/audex-libre/gcc47.patch
new file mode 100644
index 000000000..3d0ccf024
--- /dev/null
+++ b/libre/audex-libre/gcc47.patch
@@ -0,0 +1,13 @@
+--- audex-0.74b1.orig/utils/hashlist.cpp
++++ audex-0.74b1/utils/hashlist.cpp
+@@ -15,7 +15,8 @@
+  * You should have received a copy of the GNU General Public License
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
+- 
++
++#include <unistd.h>
+ #include "hashlist.h"
+ 
+ Hashlist::Hashlist() {
+
diff --git a/libre/audex-libre/google_regex.patch b/libre/audex-libre/google_regex.patch
new file mode 100644
index 000000000..86917e66f
--- /dev/null
+++ b/libre/audex-libre/google_regex.patch
@@ -0,0 +1,14 @@
+--- audex-0.74b1/utils/coverfetcher.cpp	2011-01-15 12:06:25.000000000 +0100
++++ audex-0.74b1/utils/coverfetcher_new.cpp	2011-07-20 18:43:37.554588883 +0200
+@@ -162,7 +162,10 @@
+   cover_tbnids.clear();
+   cover_thumbnails.clear();
+ 
+-  QRegExp rx("<a\\shref=(\\/imgres\\?imgurl=[a-zA-Z0-9\\&\\_\\%\\/\\=\\.\\:\\-\\?]+)>[\\s\\n]*<img\\ssrc=([a-zA-Z0-9\\&\\_\\%\\/\\=\\.\\:\\-\\?]+).*>[\\s\\n]*</a>");
++  QRegExp rx("<a\\shref=\"(\\/imgres\\?imgurl=[^\"]+)\">[\\s\\n]*<img[^>]+src=\"([^>]+)\"></a>");
++  QString html = xml;
++  html.replace( QLatin1String("&amp;"), QLatin1String("&") );
++
+   rx.setMinimal(TRUE);
+   
+   int pos = 0; int i = 0;
diff --git a/libre/audio-convert-libre/ChangeLog b/libre/audio-convert-libre/ChangeLog
new file mode 100644
index 000000000..c309d74a0
--- /dev/null
+++ b/libre/audio-convert-libre/ChangeLog
@@ -0,0 +1,5 @@
+2013-03-13 André Silva <emulatorman@lavabit.com>
+	* Remove nonfree faac recommendation
+
+2009-10-17 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* PKGBUILD syntax corrections
diff --git a/libre/audio-convert-libre/PKGBUILD b/libre/audio-convert-libre/PKGBUILD
new file mode 100644
index 000000000..07dc6e87c
--- /dev/null
+++ b/libre/audio-convert-libre/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# Contributor: Igor Galic <i.galic@gmail.com>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+_pkgname=audio-convert
+pkgname=audio-convert-libre
+pkgver=0.3.1.1
+pkgrel=6
+pkgdesc="A script with an easy to use interface to convert audio files: wav, mp3, ogg, flac, aac, mpc, ape and wma (without nonfree faac recommendation)"
+arch=('any')
+url="http://freshmeat.net/projects/audio-convert"
+license=('GPL')
+depends=('bash' 'zenity')
+optdepends=('faad2: for aac support'
+            'flac: for flac support'
+            'id3lib: for mp3 support'
+            'lame: for mp3 support'
+            'mplayer: for wma support'
+            'musepack-tools: for mpc support'
+            'vorbis-tools: for ogg support')
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
+source=(http://savannah.nongnu.org/download/$_pkgname/$_pkgname-$pkgver.tar.bz2)
+md5sums=('0c6b61bc96be4c9879f85b000192f3fd')
+
+package() {
+  install -D -m755 "$srcdir/$_pkgname-$pkgver/$_pkgname" "$pkgdir/usr/bin/$_pkgname"
+}
diff --git a/libre/avidemux-libre/PKGBUILD b/libre/avidemux-libre/PKGBUILD
new file mode 100644
index 000000000..475a7a7ec
--- /dev/null
+++ b/libre/avidemux-libre/PKGBUILD
@@ -0,0 +1,123 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+_pkgbase=avidemux
+pkgbase=avidemux-libre
+pkgname=('avidemux-libre-cli' 'avidemux-libre-gtk' 'avidemux-libre-qt')
+pkgver=2.5.6
+pkgrel=6.1
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://fixounet.free.fr/avidemux/"
+makedepends=('cmake' 'libxslt' 'gtk2' 'qt4' 'jack' 'libvorbis' 'sdl' 'libxv' \
+             'alsa-lib' 'lame' 'xvidcore' 'faad2' 'x264' 'libsamplerate' \
+             'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse' 'libva')
+options=('!makeflags')
+source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz)
+sha1sums=('47205c236bf6a4435b9d4dd944493c7b7e2752f5')
+
+build() {
+  cd "${srcdir}/${_pkgbase}_${pkgver}"
+  mkdir build
+  cd build
+  cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON -D GTK=1 -D QT4=1 ..
+  make
+
+# plugin build expects libraries to be already installed; we fake a prefix
+# in build/ by symlinking all libraries to build/lib/
+  mkdir -p lib
+  cd lib
+  find ../avidemux -name '*.so*' | xargs ln -sft .
+  cd ../../plugins
+  mkdir build
+  cd build
+  cmake -D CMAKE_INSTALL_PREFIX=/usr -D AVIDEMUX_SOURCE_DIR="${srcdir}/avidemux_${pkgver}" \
+    -D AVIDEMUX_CORECONFIG_DIR="${srcdir}/avidemux_${pkgver}/build/config" \
+    -D AVIDEMUX_INSTALL_PREFIX="${srcdir}/avidemux_${pkgver}/build" \
+    -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON ..
+  make
+}
+
+package_avidemux-libre-cli() {
+  pkgdesc="A graphical tool to edit video (filter/re-encode/split), without nonfree faac support"
+  depends=('libxml2' 'sdl' 'fontconfig' 'libvpx' 'libva')
+  optdepends=('lame: for the corresponding audio encoder plugin'
+              'faad2: for the corresponding audio decoder plugin'
+              'opencore-amr: for the corresponding audio decoder plugin'
+              'jack: for the corresponding audio device plugin'
+              'libpulse: for the corresponding audio device plugin'
+              'sdl: for the corresponding audio device plugin'
+              'x264: for the corresponding video encoder plugin'
+              'xvidcore: for the corresponding video encoder plugin')
+  provides=('avidemux' 'avidemux-cli')
+  conflicts=('avidemux' 'avidemux-cli')
+  replaces=('avidemux' "avidemux-cli=$pkgver")
+
+  cd "${srcdir}/${_pkgbase}_${pkgver}/build"
+  make DESTDIR="${pkgdir}" install
+
+  cd "${srcdir}/${_pkgbase}_${pkgver}/plugins/build"
+  make DESTDIR="${pkgdir}" install
+  rm -r "${pkgdir}"/usr/share/avidemux
+  rm "${pkgdir}"/usr/bin/avidemux2_{gtk,qt4}
+  rm "${pkgdir}"/usr/lib/*{_gtk,_qt4,Gtk,QT4}.so
+  rm "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/x264/*{Gtk,Qt}.so
+  rm "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/xvid/*{Gtk,Qt}.so
+  rm "${pkgdir}"/usr/lib/ADM_plugins/videoFilter/*{_gtk,_qt4}.so
+
+  ln -s /usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_xvid.so "${pkgdir}/usr/lib/libADM_vidEnc_xvid.so"
+  ln -s /usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_x264.so "${pkgdir}/usr/lib/libADM_vidEnc_x264.so"
+
+  install -D -m644 ../../avidemux_icon.png "${pkgdir}/usr/share/pixmaps/avidemux.png"
+  install -D -m644 ../../man/avidemux.1 "${pkgdir}/usr/share/man/man1/avidemux.1"
+}
+
+package_avidemux-libre-gtk() {
+  pkgdesc="A graphical tool to edit video (filter/re-encode/split), without nonfree faac support - GTK GUI"
+  depends=("avidemux-libre-cli=${pkgver}" 'gtk2' 'libxv' 'desktop-file-utils')
+  replaces=('avidemux-gtk')
+  conflicts=('avidemux-gtk')
+  provides=("avidemux-gtk=$pkgver")
+  install=avidemux.install
+
+  cd "${srcdir}/${_pkgbase}_${pkgver}"
+  install -D -m755 build/avidemux/avidemux2_gtk "${pkgdir}/usr/bin/avidemux2_gtk"
+
+  install -d "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/{x264,xvid}
+  install -d "${pkgdir}"/usr/lib/ADM_plugins/videoFilter
+
+  install -D -m755 build/lib/*{_gtk,Gtk}.so "${pkgdir}/usr/lib"
+  install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_x264/gtk/*Gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/x264"
+  install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_xvid/gtk/*Gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/xvid"
+  install -D -m755 plugins/build/ADM_videoFilters/*/*_gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoFilter"
+
+  install -D -m644 avidemux2-gtk.desktop "${pkgdir}/usr/share/applications/avidemux-gtk.desktop"
+  sed -i "s|\[\$e\]||" "${pkgdir}/usr/share/applications/avidemux-gtk.desktop"
+}
+
+package_avidemux-libre-qt() {
+  pkgdesc="A graphical tool to edit video (filter/re-encode/split), without nonfree faac support - QT GUI"
+  depends=("avidemux-libre-cli=${pkgver}" 'qt4')
+  replaces=('avidemux-qt')
+  conflicts=('avidemux-qt')
+  provides=("avidemux-qt=$pkgver")
+  install=avidemux.install
+
+  cd "${srcdir}/${_pkgbase}_${pkgver}"
+  install -D -m755 build/avidemux/avidemux2_qt4 "${pkgdir}/usr/bin/avidemux2_qt4"
+  install -d "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/{x264,xvid}
+  install -d "${pkgdir}"/usr/lib/ADM_plugins/videoFilter
+
+  install -D -m755 build/lib/*{_qt4,QT4}.so "${pkgdir}/usr/lib"
+  install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_x264/qt4/*Qt.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/x264"
+  install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/*Qt.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/xvid"
+  install -D -m755 plugins/build/ADM_videoFilters/*/*_qt4.so "${pkgdir}/usr/lib/ADM_plugins/videoFilter"
+
+  install -d "${pkgdir}/usr/share/avidemux/i18n"
+  install -D -m644 build/po/*.qm "${pkgdir}/usr/share/avidemux/i18n"
+
+  install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-qt.desktop"
+  sed -i 's/Name=avidemux2/Name=avidemux (QT)/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop"
+  sed -i 's/avidemux2_gtk/avidemux2_qt4/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop"
+}
diff --git a/libre/avidemux-libre/PKGBUILD.WIP b/libre/avidemux-libre/PKGBUILD.WIP
new file mode 100644
index 000000000..c96084eb8
--- /dev/null
+++ b/libre/avidemux-libre/PKGBUILD.WIP
@@ -0,0 +1,83 @@
+# $Id: PKGBUILD 160693 2012-06-03 22:00:17Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+
+pkgbase=avidemux
+pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt')
+pkgver=2.6.1
+pkgrel=1
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://fixounet.free.fr/avidemux/"
+makedepends=('cmake' 'libxslt' 'gtk3' 'qt' 'jack' 'libvorbis' 'sdl' 'libxv' \
+             'alsa-lib' 'lame' 'xvidcore' 'faad2' 'faac' 'x264' 'libsamplerate' \
+             'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse' 'libva' \
+             'libvdpau' 'libdca' 'fribidi' 'glu')
+options=('!makeflags' '!emptydirs')
+source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz)
+sha1sums=('a34ffc6409d96c3df30394fbd221e6693ec081ec')
+#source=(http://www.avidemux.org/nightly/source/snapshot_8273.tgz)
+#sha1sums=('cf5256ce189a51898a2e1071ffd46cd993f453f2')
+
+build() {
+#mv snapshot_8273 ${pkgbase}_${pkgver}
+
+  cd "${srcdir}/${pkgbase}_${pkgver}"
+  sed -i 's|avidemux2|avidemux3|' avidemux2.desktop
+  bash bootStrap.bash --with-core --with-cli --with-gtk --with-qt4 --with-plugins
+}
+
+package_avidemux-cli() {
+  pkgdesc="A graphical tool to edit video (filter/re-encode/split)"
+  depends=('libxml2' 'sdl' 'fontconfig' 'libvpx' 'libva')
+  optdepends=('lame: for the corresponding audio encoder plugin'
+              'faac: for the corresponding audio encoder plugin'
+              'faad2: for the corresponding audio decoder plugin'
+              'opencore-amr: for the corresponding audio decoder plugin'
+              'jack: for the corresponding audio device plugin'
+              'libpulse: for the corresponding audio device plugin'
+              'sdl: for the corresponding audio device plugin'
+              'x264: for the corresponding video encoder plugin'
+              'xvidcore: for the corresponding video encoder plugin'
+              'qt: for the QtScript scripting support'
+              'libdca: for the corresponding audio decoder plugin'
+              'fribidi: for the corresponding video filter plugin')
+
+  cd "${srcdir}/${pkgbase}_${pkgver}"
+  (cd buildCli; make DESTDIR="${pkgdir}" install)
+  (cd buildCore; make DESTDIR="${pkgdir}" install)
+  (cd buildPluginsCLI; make DESTDIR="${pkgdir}" install)
+  (cd buildPluginsCommon; make DESTDIR="${pkgdir}" install)
+
+  install -D -m644 avidemux_icon.png "${pkgdir}/usr/share/pixmaps/avidemux.png"
+  install -D -m644 man/avidemux.1 "${pkgdir}/usr/share/man/man1/avidemux.1"
+}
+
+package_avidemux-gtk() {
+  pkgdesc="A graphical tool to edit video (filter/re-encode/split) - GTK GUI"
+  depends=("avidemux-cli=${pkgver}" 'gtk3' 'libxv' 'desktop-file-utils')
+  install=avidemux.install
+
+  cd "${srcdir}/${pkgbase}_${pkgver}"
+  (cd buildGtk; make DESTDIR="${pkgdir}" install)
+  (cd buildPluginsGtk; make DESTDIR="${pkgdir}" install)
+
+  install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-gtk.desktop"
+
+  rm "${pkgdir}"/usr/lib/ADM_plugins6/pluginSettings/x264/1/{PSP.json,iPhone.json}
+  rm "${pkgdir}/usr/lib/ADM_plugins6/videoEncoders/libADM_ve_x264_other.so"
+}
+
+package_avidemux-qt() {
+  pkgdesc="A graphical tool to edit video (filter/re-encode/split) - QT GUI"
+  depends=("avidemux-cli=${pkgver}" 'qt' 'x264' 'glu')
+  install=avidemux.install
+
+  cd "${srcdir}/${pkgbase}_${pkgver}"
+  (cd buildQt4; make DESTDIR="${pkgdir}" install)
+  (cd buildPluginsQt4; make DESTDIR="${pkgdir}" install)
+
+  install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-qt.desktop"
+  sed -i 's|gtk|qt4|' "${pkgdir}/usr/share/applications/avidemux-qt.desktop"
+
+  rm "${pkgdir}"/usr/lib/ADM_plugins6/pluginSettings/x264/1/{PSP.json,iPhone.json}
+}
diff --git a/libre/avidemux-libre/avidemux.install b/libre/avidemux-libre/avidemux.install
new file mode 100644
index 000000000..e111ef946
--- /dev/null
+++ b/libre/avidemux-libre/avidemux.install
@@ -0,0 +1,11 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/libre/ecasound-libre/PKGBUILD b/libre/ecasound-libre/PKGBUILD
new file mode 100644
index 000000000..773aa4dc7
--- /dev/null
+++ b/libre/ecasound-libre/PKGBUILD
@@ -0,0 +1,57 @@
+# $Id$
+# Maintainer: Ray Rashif <schiv@archlinux.org>
+# Contributor: Eric Belanger <eric@archlinux.org>
+# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+_pkgname=ecasound
+pkgname=ecasound-libre
+pkgver=2.9.0
+pkgrel=2
+pkgdesc="A software package designed for multitrack audio processing (without nonfree faac recommendation)"
+arch=('i686' 'x86_64')
+url="http://www.eca.cx/ecasound/"
+license=('GPL' 'LGPL')
+depends=('audiofile' 'liblo'
+         'liboil' 'lilv')
+makedepends=('python2' 'ruby')
+optdepends=('python2: ecamonitor, ECI API'
+            'ruby: ECI API'
+            'mpg123: MP3 decoding'
+            'lame: MP3 encoding'
+            'vorbis-tools: Ogg Vorbis decoding/encoding'
+            'faad2: AAC decoding'
+            'timidity++: MIDI file input'
+            'libmikmod: tracker module')
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
+options=('!libtool')
+source=(http://ecasound.seul.org/download/$_pkgname-$pkgver.tar.gz)
+md5sums=('05e7d4664cdf4c7a138c098e9506a551')
+
+build() {
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  # use vendor_ruby for ruby files
+  sed -e 's/CONFIG\["sitedir"\]/CONFIG\["vendordir"\]/' -i configure
+
+  PYTHONPATH=/usr/bin/python2 ./configure \
+    --prefix=/usr \
+    --with-python-includes=/usr/include/python2.7 \
+    --with-python-modules=/usr/lib/python2.7
+
+  make
+}
+
+package() {
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir/" install
+
+  # fix for python 2.7
+  sed -i 's:bin/env python:bin/env python2:' \
+    "$pkgdir/usr/bin/ecamonitor"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD
index eb684f5f7..eac7300d4 100644
--- a/libre/filesystem/PKGBUILD
+++ b/libre/filesystem/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 176062 2013-01-27 07:33:21Z allan $
+# $Id: PKGBUILD 180021 2013-03-14 19:23:11Z dreisner $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgname=filesystem
-pkgver=2013.01
-pkgrel=3
-pkgdesc='Base filesystem for Parabola'
+pkgver=2013.03
+pkgrel=2
+pkgdesc='Base filesystem (Parabola rebranded)'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url='https://parabolagnulinux.org'
@@ -20,7 +20,27 @@ backup=('etc/fstab' 'etc/crypttab' 'etc/group' 'etc/hosts' 'etc/ld.so.conf' 'etc
 source=('group' 'issue' 'nsswitch.conf' 'securetty' 'host.conf' 'ld.so.conf'
         'passwd' 'shadow' 'fstab' 'crypttab' 'hosts' 'motd' 'os-release' 'resolv.conf'
         'shells' 'gshadow' 'profile' 'modprobe.d.usb-load-ehci-first' 'parabola.7.txt'
-	'locale.sh')
+        'locale.sh')
+md5sums=('7b8e40f8f793e60f471511641bb1c9f2'
+         '6be47d893fd49b2e4a8c0e811b350861'
+         '9e4533df61f0c82d6b2e2371f7376282'
+         '4c4540eeb748bf1f71d631b8c1dcf0b3'
+         'f28150d4c0b22a017be51b9f7f9977ed'
+         '6e488ffecc8ba142c0cf7e2d7aeb832e'
+         '1cfd310dff0804a7d21958487c32a3b1'
+         '2ef2429c2c98d0883906aa6f5363be80'
+         '693c97f2c9a519bb97a17008e92c2b74'
+         '1745349eb24ed21b4cfaa6f423bddb76'
+         '7bc65f234dfb6abf24e7c3b03e86f4ff'
+         'd41d8cd98f00b204e9800998ecf8427e'
+         '0e145e18fea8fd190b30d45764f5707c'
+         '6f48288b6fcaf0065fcb7b0e525413e0'
+         '22518e922891f9359f971f4f5b4e793c'
+         'f45389e116ab0b9e9968287617d27c7d'
+         'f3b6ae7db8adffaaa4bffc6099dcbd50'
+         'a8a962370cd0128465d514e6a1f74130'
+         'd5732ffdb3488e1383d4ea199343e767'
+         '3807d07215d9116331fe1cf8feeaa0f8')
 
 build() {
 	cd ${srcdir}
@@ -104,23 +124,3 @@ package() {
 	done
 	ln -s ../man usr/local/share/man
 }
-md5sums=('c61f6ac4f6377108e59879f203f18633'
-         '6be47d893fd49b2e4a8c0e811b350861'
-         '9e4533df61f0c82d6b2e2371f7376282'
-         '4c4540eeb748bf1f71d631b8c1dcf0b3'
-         'f28150d4c0b22a017be51b9f7f9977ed'
-         '6e488ffecc8ba142c0cf7e2d7aeb832e'
-         '1cfd310dff0804a7d21958487c32a3b1'
-         '2ef2429c2c98d0883906aa6f5363be80'
-         '693c97f2c9a519bb97a17008e92c2b74'
-         '1745349eb24ed21b4cfaa6f423bddb76'
-         '7bc65f234dfb6abf24e7c3b03e86f4ff'
-         'd41d8cd98f00b204e9800998ecf8427e'
-         '0e145e18fea8fd190b30d45764f5707c'
-         '6f48288b6fcaf0065fcb7b0e525413e0'
-         '22518e922891f9359f971f4f5b4e793c'
-         'ffe983034b8004989b8c3df97ec91095'
-         'f3b6ae7db8adffaaa4bffc6099dcbd50'
-         'a8a962370cd0128465d514e6a1f74130'
-         'd5732ffdb3488e1383d4ea199343e767'
-         '3807d07215d9116331fe1cf8feeaa0f8')
diff --git a/libre/filesystem/filesystem.install b/libre/filesystem/filesystem.install
index 0684afd69..c04374422 100644
--- a/libre/filesystem/filesystem.install
+++ b/libre/filesystem/filesystem.install
@@ -33,6 +33,7 @@ post_upgrade() {
 	_adduser uuidd    -u 68 -d / -g uuidd -s /sbin/nologin
 	_addgroup dbus    -g 81
 	_adduser dbus     -u 81 -d / -g dbus -s /sbin/nologin
+	_addgroup systemd-journal -g 190
 
 	# sync gshadow to group (fixes FS#19869)
 	if ! grep -q '^lock:' etc/gshadow; then
diff --git a/libre/filesystem/group b/libre/filesystem/group
index 3e6645c83..6c91b292f 100644
--- a/libre/filesystem/group
+++ b/libre/filesystem/group
@@ -32,3 +32,4 @@ scanner:x:96:
 power:x:98:
 nobody:x:99:
 users:x:100:
+systemd-journal:x:190:
diff --git a/libre/filesystem/gshadow b/libre/filesystem/gshadow
index 253f35838..fb475bfd2 100644
--- a/libre/filesystem/gshadow
+++ b/libre/filesystem/gshadow
@@ -20,7 +20,7 @@ smmsp:::
 http:::
 games:::
 lock:::
-uuidd:!::
+uuidd:x::
 dbus:x::
 network:x::
 video:x::
@@ -32,3 +32,4 @@ scanner:x::
 power:x::
 nobody:::
 users:::
+systemd-journal:x::
diff --git a/libre/gnormalize-libre/PKGBUILD b/libre/gnormalize-libre/PKGBUILD
new file mode 100644
index 000000000..8df68e2b6
--- /dev/null
+++ b/libre/gnormalize-libre/PKGBUILD
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Chris Brannon <cmbrannon79@gmail.com>
+# Contributor: Corrado Primier <bardo@aur.archlinux.org>
+# Contributor:JZsolt Varadi (karmaxxl) 
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+_pkgname=gnormalize
+pkgname=gnormalize-libre
+pkgver=0.63
+pkgrel=4
+pkgdesc="An audio normalizer, converter, encoder/decoder, ripper, tagger and player (without nonfree faac and mac recommendation)"
+arch=(any)
+url="http://gnormalize.sourceforge.net/"
+license=('GPL')
+depends=(perl cddb_get desktop-file-utils gtk2-perl hicolor-icon-theme)
+makedepends=('xz')
+optdepends=('flac: FLAC encoding, FLAC playing in conjunction with mplayer'
+            'lame: MP3 encoding'
+            'mpg321: MP3 playing'
+            'mplayer: FLAC/WAV playing'
+            'musepack-tools: full Musepack support'
+            'perl-mp3-info: MP3 ID3 tags'
+            'vorbis-tools: full OGG Vorbis support'
+            'cdcd: CD playing'
+            'cdparanoia: CD ripping'
+            'cdrkit: CD ripping - alternative to cdparanoia'
+            'wavegain: sound normalization')
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
+install=gnormalize.install
+source=(http://downloads.sourceforge.net/sourceforge/gnormalize/${_pkgname}-${pkgver}.tar.gz
+        gnormalize.desktop)
+md5sums=('25ca7520731e61a8b7f4b7fa61928d54' '81c6dffab2139816919842e042705884')
+
+package() {
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+  install -Dm755 gnormalize "${pkgdir}/usr/bin/gnormalize"
+  lzma -qd gnormalize.1.lzma
+  install -Dm644 gnormalize.1 "${pkgdir}/usr/share/man/man1/gnormalize.1"
+  install -d "${pkgdir}/usr/share/gnormalize/animations"
+  install -m644 animations/*.gif "${pkgdir}/usr/share/gnormalize/animations/"
+  install -Dm644 README "${pkgdir}/usr/share/doc/gnormalize/README"
+  install -Dm644 icons/gnormalize.png  \
+    "${pkgdir}/usr/share/pixmaps/gnormalize.png"
+  for i in 16 32 48 ; do
+    install -Dm644 icons/gnormalize-${i}.png \
+      "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps/gnormalize.png"
+  done
+  install -Dm644 "${srcdir}/gnormalize.desktop" \
+    "${pkgdir}/usr/share/applications/gnormalize.desktop"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/gnormalize-libre/gnormalize.desktop b/libre/gnormalize-libre/gnormalize.desktop
new file mode 100644
index 000000000..4d4061308
--- /dev/null
+++ b/libre/gnormalize-libre/gnormalize.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=gnormalize
+Comment=Encoder/Decoder, normalize frontend, etc.
+Exec=gnormalize
+Icon=gnormalize
+MimeType=audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/x-wav;application/x-ogg;
+Categories=GTK;AudioVideo;Player;
+Terminal=false
+Type=Application
diff --git a/libre/gnormalize-libre/gnormalize.install b/libre/gnormalize-libre/gnormalize.install
new file mode 100644
index 000000000..ef533df53
--- /dev/null
+++ b/libre/gnormalize-libre/gnormalize.install
@@ -0,0 +1,14 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD
index 65a644c9c..30a1b6f05 100644
--- a/libre/hplip-libre/PKGBUILD
+++ b/libre/hplip-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 179659 2013-03-09 09:20:06Z andyrtr $
+# $Id: PKGBUILD 180013 2013-03-14 18:45:58Z andyrtr $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor : Rémy Oudompheng <remy@archlinux.org>
 # Contributor: Morgan LEFIEUX <comete@archlinuxfr.org>
@@ -7,7 +7,7 @@
 _pkgname=hplip
 pkgname=hplip-libre
 pkgver=3.13.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet (without hplip-plugin binary blobs recommendation)"
 arch=('i686' 'x86_64')
 url="http://hplipopensource.com"
@@ -24,9 +24,9 @@ optdepends=('cups: for printing support'
             'python2-pyqt: for running hp-toolbox'
             'python2-gobject2: for running hp-toolbox'
             'libusbx: for advanced usb support')
-replaces=("${_pkgname}")
-conflicts=("${_pkgname}")
-provides=("${_pkgname}=${pkgver}")
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
 options=('!libtool')
 install=hplip.install
 source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc}
@@ -94,4 +94,7 @@ package() {
  chmod 775 "$pkgdir"/var/log/hp{,/tmp}
  # remove rc script
  rm -rf "$pkgdir"/etc/init.d
+ 
+ # fix broken udev rule - FS#34282
+ sed -i "s:\$attrs:\$attr:g" $pkgdir/usr/lib/udev/rules.d/56-hpmud_support.rules
 }
diff --git a/libre/ogmrip-libre/PKGBUILD b/libre/ogmrip-libre/PKGBUILD
new file mode 100644
index 000000000..cd2e48f2b
--- /dev/null
+++ b/libre/ogmrip-libre/PKGBUILD
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# Contributor: Daenyth
+# Contributor: Allan McRae <allan@archlinux.org>
+# Contributor: Vrob (Markus Heuser) mheuser@mi.fu-berlin.de
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+_pkgname=ogmrip
+pkgname=ogmrip-libre
+pkgver=0.13.8
+pkgrel=1
+pkgdesc="Libraries and GTK2 interface for DVD ripping using mencoder (without nonfree faac support)"
+arch=('i686' 'x86_64')
+url="http://ogmrip.sourceforge.net/"
+license=('GPL')
+depends=('libdvdread>=4.1.3' 'mplayer' 'mencoder' 'enca' 'pkg-config' 'gconf' 'libglade' 'libnotify' 'enchant')
+makedepends=('patch' 'intltool' 'perl-xml-parser' 'lame' 'mkvtoolnix' 'libtheora' 'ogmtools' 'gpac' 'vorbis-tools' 'tesseract')
+optdepends=('lame: support for the MP3 audio codec'
+            'mkvtoolnix: create, alter, and inspect Matroska files'
+            'libtheora: decode and encode Ogg Theora files'
+            'ogmtools: support for the Ogg Media container'
+            'gpac: support for the MP4 container'
+            'vorbis-tools: support for the Ogg Vorbis audio codec'
+            'gocr: support for the SRT subtitle format'
+            'ocrad: support for the SRT subtitle format'
+            'tesseract: support for the SRT subtitle format')
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
+options=('!libtool' '!makeflags')
+changelog=$_pkgname.changelog
+install=$_pkgname.install
+source=(http://downloads.sourceforge.net/sourceforge/${_pkgname}/${_pkgname}-${pkgver}.tar.gz)
+sha256sums=('ea6a75e6cc4fe7df1ed65648af208c87748959a6b372847b1005c3b92cc5a423')
+
+build() {
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+
+  ./configure --prefix=/usr --sysconfdir=/usr/share
+  make
+}
+
+package() {
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/libre/ogmrip-libre/ogmrip.changelog b/libre/ogmrip-libre/ogmrip.changelog
new file mode 100644
index 000000000..76179a2d3
--- /dev/null
+++ b/libre/ogmrip-libre/ogmrip.changelog
@@ -0,0 +1,27 @@
+2013-03-13 André Silva <emulatorman@lavabit.com>
+	* Remove nonfree faac support
+
+2012-06-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* ogmrip O.13.8-1
+
+2012-01-26  Eric Belanger  <eric@archlinux.org>
+	* Rebuild against libpng 1.5 and libtiff 4.0
+	* Add .install file
+
+2011-10-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* ogmrip O.13.7-1
+
+2010-08-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* ogmrip O.13.6-1
+
+2010-06-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* Update to major release O.13.5
+
+2010-04-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* Update to major release O.13.4
+
+2010-01-03 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* FS#17517 fixed in minor release O.13.3-2
+
+2010-01-01 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* Update to major release O.13.3
diff --git a/libre/ogmrip-libre/ogmrip.install b/libre/ogmrip-libre/ogmrip.install
new file mode 100644
index 000000000..660593cf5
--- /dev/null
+++ b/libre/ogmrip-libre/ogmrip.install
@@ -0,0 +1,11 @@
+post_install() {
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/libre/openshot-libre/PKGBUILD b/libre/openshot-libre/PKGBUILD
new file mode 100644
index 000000000..31ea71824
--- /dev/null
+++ b/libre/openshot-libre/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Asa Marco <marcoasa90[at]gmail[.]com>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+_pkgname=openshot
+pkgname=openshot-libre
+pkgver=1.4.3
+pkgrel=1
+pkgdesc="a free, non-linear video editor for GNU/Linux based on MLT framework (without nonfree faac recommendation)"
+arch=('any')
+url="http://www.openshotvideo.com/"
+license=('GPL')
+depends=('mlt-python-bindings' 'pygoocanvas' 'sdl' 'librsvg' 'mplayer'
+	 'pyxdg' 'pygtk' 'python2-httplib2' 'python-imaging')
+optdepends=('dvgrab: for IEEE digital sources'
+	    'libquicktime' 'libavc1394' 'jack' 'jack-rack' 'ladspa')
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
+install=openshot.install
+source=(http://launchpad.net/openshot/${pkgver%.*}/$pkgver/+download/$_pkgname-$pkgver.tar.gz)
+md5sums=('5ec82a7e8b7700ee4a359458aedf19e9')
+
+package() {
+  cd $srcdir/$_pkgname-$pkgver
+  python2 setup.py install --root=$pkgdir/ --optimize=1
+}
diff --git a/libre/openshot-libre/openshot.install b/libre/openshot-libre/openshot.install
new file mode 100644
index 000000000..cc0de896d
--- /dev/null
+++ b/libre/openshot-libre/openshot.install
@@ -0,0 +1,11 @@
+post_install() {
+	[ -x `which update-mime-database` ] &&  update-mime-database usr/share/mime
+}
+
+post_upgrade() {
+	[ -x `which update-mime-database` ] &&  update-mime-database usr/share/mime
+}
+
+post_remove() {
+	[ -x `which update-mime-database` ] &&  update-mime-database usr/share/mime
+}
diff --git a/libre/soundkonverter-libre/PKGBUILD b/libre/soundkonverter-libre/PKGBUILD
new file mode 100644
index 000000000..8b3c74d7c
--- /dev/null
+++ b/libre/soundkonverter-libre/PKGBUILD
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
+# Contributor: Mateusz Herych <heniekk@gmail.com>
+# Contributor: Eric Belanger <eric@archlinux.org>
+# Contributor: Darwin Bautista <djclue917@gmail.com>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+_pkgname=soundkonverter
+pkgname=soundkonverter-libre
+pkgver=2.0.0
+pkgrel=1
+pkgdesc="Front-end to various audio converters (without nonfree faac and mac recommendation)"
+arch=('i686' 'x86_64')
+url="http://www.kde-apps.org/content/show.php?content=29024"
+license=('GPL')
+depends=('kdebase-runtime' 'libkcddb' 'cdparanoia' 'taglib')
+makedepends=('automoc4' 'cmake')
+optdepends=('cdrkit: cdda2wav backend'
+            'faad2: faad backend'
+            'ffmpeg: ffmpeg backend'
+            'flac: flac backend'
+            'fluidsynth: flouidsynth backend'
+            'lame: lame backend'
+            'mplayer: mplayer backend'
+            'mp3gain: mp3gain backend'
+            'opus-tools: opus backend'
+            'speex: speexenc, speexdec backends'
+            'timidity++: midi backend'
+            'twolame: twolame backend'
+            'vorbisgain: vorbisgain backend'
+            'vorbis-tools: vorbis tools backend'
+            'wavpack: wavpack backend'
+            'sox: sox plugin (change sample rate, various effects)')
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
+install=$_pkgname.install
+source=("http://kde-apps.org/CONTENT/content-files/29024-${_pkgname}-${pkgver}.tar.gz")
+md5sums=('f1df729916b2418c474b859ed6b9eda6')
+
+build() {
+  cd "$srcdir"/$_pkgname-$pkgver
+  cmake . \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release
+  make
+}
+
+package() {
+	cd "$srcdir"/$_pkgname-$pkgver
+	make DESTDIR="$pkgdir" install
+}
diff --git a/libre/soundkonverter-libre/soundkonverter.install b/libre/soundkonverter-libre/soundkonverter.install
new file mode 100644
index 000000000..0e8feb79c
--- /dev/null
+++ b/libre/soundkonverter-libre/soundkonverter.install
@@ -0,0 +1,12 @@
+post_install() {
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
+
diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD
index a57637221..547f0dc2f 100644
--- a/libre/your-freedom/PKGBUILD
+++ b/libre/your-freedom/PKGBUILD
@@ -2,7 +2,7 @@
 pkgname=your-freedom
 pkgver=$(LC_ALL=C date -u +%Y%m%d)
 pkgrel=1
-pkgdesc="This package conflicts with every unfree package known to date to ensure your system is free."
+pkgdesc="This package conflicts with every nonfree package known to date to ensure your system is free."
 arch=('any')
 url="https://parabolagnulinux.org"
 license=('GPL3')
diff --git a/libre/your-freedom/your-freedom.install b/libre/your-freedom/your-freedom.install
index efa16e756..e0477cab9 100644
--- a/libre/your-freedom/your-freedom.install
+++ b/libre/your-freedom/your-freedom.install
@@ -3,18 +3,18 @@ pre_install() {
   cat <<EOM
   == IMPORTANT NOTICE ==
 
-  This package will help you identify unfree packages that are installed
+  This package will help you identify nonfree packages that are installed
   on your system at the time of its installation, as well as protecting
   you from (accidentally) installing them.
 
-  Also, if any other unfree package is identified, later updates will ask
+  Also, if any other nonfree package is identified, later updates will ask
   you for its removal.
 
-  Have in mind that, if you want to retain certain unfree packages
+  Have in mind that, if you want to retain certain nonfree packages
   installed on your system, you'll have to remove your-freedom :)
 
   If you find out any of the following:
-  * Cascade package removal due to unfree dependencies,
+  * Cascade package removal due to nonfree dependencies,
   * Your-freedom conflicting with a *-libre package,
   * Etc.