3 files changed, 50 insertions, 83 deletions
diff --git a/abs/extra/mkvtoolnix/PKGBUILD b/abs/extra/mkvtoolnix/PKGBUILD
index ef840a1..2a8ff55 100644
--- a/abs/extra/mkvtoolnix/PKGBUILD
+++ b/abs/extra/mkvtoolnix/PKGBUILD
@@ -1,93 +1,60 @@
 # $Id$
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
+# Maintainer: Maxime Gauduin <alucryd@archlinux.org>
 # Contributor: xduugu <xduugu@gmx.com>
 
 pkgbase=mkvtoolnix
-pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk')
-pkgver=7.4.0
-pkgrel=1
+pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gui')
+pkgver=9.1.0
+pkgrel=3
+pkgdesc='Set of tools to create, edit and inspect Matroska files'
 arch=('i686' 'x86_64')
+url='https://www.bunkus.org/videotools/mkvtoolnix/'
 license=('GPL')
-url="http://www.bunkus.org/videotools/mkvtoolnix/index.html"
-makedepends=('libmatroska' 'flac' 'libvorbis' 'file' 'wxgtk'
-             'boost-libs' 'lzo' 'xdg-utils' 'boost' 'ruby')
-source=("http://www.bunkus.org/videotools/${pkgbase}/sources/${pkgbase}-${pkgver}.tar.xz")
-md5sums=('d107166920ff0d966ac30626f7cda80d')
-
-prepare() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  # Disable automagic curl dep used for online update checking
-  sed -i -e '/curl/d' configure.in
-  export CURL_CFLAGS="" CURL_LIBS=""
-
-  export CFLAGS="${CFLAGS} -DBOOST_FILESYSTEM_VERSION=3"
-  export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=3"
-
-  # Sets number of threads for a parallel build
-  export DRAKETHREADS=4
-
-  autoreconf -vfi
-}
+makedepends=('boost' 'boost-libs' 'file' 'flac' 'libebml' 'libmatroska'
+             'libogg' 'libvorbis' 'qt5-base' 'ruby' 'zlib')
+source=("http://www.bunkus.org/videotools/mkvtoolnix/sources/mkvtoolnix-${pkgver}.tar.xz")
+md5sums=('7eafd6f5a9affd35f9cbf607d8ccf9b3')
 
 build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  ./configure --prefix=/usr \
-              --with-boost-libdir=/usr/lib \
-              --disable-gui
-  ./drake
+  cd mkvtoolnix-${pkgver}
 
+  ./configure --prefix='/usr' \
+              --without-curl \
+              --disable-qt
+  ./drake apps:mkvinfo $MAKEFLAGS
   mv src/mkvinfo{,-cli}
 
-  ./configure --prefix=/usr \
-              --with-boost-libdir=/usr/lib
-  ./drake
+  ./configure --prefix='/usr' \
+              --without-curl
+  ./drake $MAKEFLAGS
 }
 
 package_mkvtoolnix-cli() {
-  pkgdesc="Set of tools to create, edit and inspect Matroska files - CLI version"
-  depends=('libmatroska' 'expat' 'flac' 'libvorbis' 'file' 'boost-libs' 'lzo')
-  provides=('mkvtoolnix')
-  conflicts=('mkvtoolnix')
-  replaces=('mkvtoolnix')
+  depends=('boost-libs' 'file' 'flac' 'gcc-libs' 'glibc' 'libogg' 'zlib'
+           'libebml.so' 'libmatroska.so' 'libvorbis.so')
 
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd mkvtoolnix-${pkgver}
 
   ./drake DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/usr/bin/mkvinfo
-  install -Dm755 src/mkvinfo-cli "${pkgdir}"/usr/bin/mkvinfo
-
-  rm -rf "${pkgdir}"/usr/bin/mmg
-  rm -rf "${pkgdir}"/usr/share/man/de/man1/mmg.1
-  rm -rf "${pkgdir}"/usr/share/man/ja/man1/mmg.1
-  rm -rf "${pkgdir}"/usr/share/man/man1/mmg.1
-  rm -rf "${pkgdir}"/usr/share/man/nl/man1/mmg.1
-  rm -rf "${pkgdir}"/usr/share/man/zh_CN/man1/mmg.1
-  rm -rf "${pkgdir}"/usr/share/man/uk/man1/mmg.1
-  rm -rf "${pkgdir}"/usr/share/applications
-  rm -rf "${pkgdir}"/usr/share/icons
-  rm -rf "${pkgdir}"/usr/share/mime
+  install -m 755 src/mkvinfo-cli "${pkgdir}"/usr/bin/mkvinfo
+  rm -rf "${pkgdir}"/usr/share/{applications,icons,mime}
+  find "${pkgdir}" -name mkvtoolnix-gui* -delete
 }
 
-package_mkvtoolnix-gtk() {
-  pkgdesc="Set of tools to create, edit and inspect Matroska files - wxGTK GUI"
-  depends=("mkvtoolnix-cli=${pkgver}" 'wxgtk' 'xdg-utils' 'desktop-file-utils')
-  install=mkvtoolnix.install
+package_mkvtoolnix-gui() {
+  depends=('desktop-file-utils' 'hicolor-icon-theme' 'mkvtoolnix-cli'
+           'qt5-base' 'shared-mime-info' 'xdg-utils')
+  replaces=('mkvtoolnix-gtk')
+  install='mkvtoolnix-gui.install'
 
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd mkvtoolnix-${pkgver}
 
   ./drake DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/usr/bin/mkv*
-  install -Dm755 src/mkvinfo "${pkgdir}"/usr/bin/mkvinfo-gtk
-  sed -ri 's/^(Exec=mkvinfo)/\1-gtk/' "${pkgdir}"/usr/share/applications/mkvinfo.desktop
-
-  rm -rf "${pkgdir}"/usr/share/doc
   rm -rf "${pkgdir}"/usr/share/locale
-  rm -rf "${pkgdir}"/usr/share/man/de/man1/mkv*
-  rm -rf "${pkgdir}"/usr/share/man/ja/man1/mkv*
-  rm -rf "${pkgdir}"/usr/share/man/man1/mkv*
-  rm -rf "${pkgdir}"/usr/share/man/nl/man1/mkv*
-  rm -rf "${pkgdir}"/usr/share/man/zh_CN/man1/mkv*
-  rm -rf "${pkgdir}"/usr/share/man/uk/man1/mkv*
+  for t in mkv{extract,info,merge,propedit}; do
+    find "${pkgdir}" -name $t* -delete
+  done
 }
+
+# vim: ts=2 sw=2 et:
diff --git a/abs/extra/mkvtoolnix/mkvtoolnix-gui.install b/abs/extra/mkvtoolnix/mkvtoolnix-gui.install
new file mode 100644
index 0000000..ec2cf43
--- /dev/null
+++ b/abs/extra/mkvtoolnix/mkvtoolnix-gui.install
@@ -0,0 +1,15 @@
+post_install() {
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+  update-mime-database /usr/share/mime &> /dev/null
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  post_install
+}
+
+# vim: ts=2 sw=2 et:
diff --git a/abs/extra/mkvtoolnix/mkvtoolnix.install b/abs/extra/mkvtoolnix/mkvtoolnix.install
deleted file mode 100644
index 1481351..0000000
--- a/abs/extra/mkvtoolnix/mkvtoolnix.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-   xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-   if [ -f usr/bin/update-mime-database ]; then
-      update-mime-database usr/share/mime &> /dev/null
-   fi
-   update-desktop-database -q
-}
-
-post_upgrade() {
-   post_install
-}
-
-pre_remove() {
-   post_install
-}