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

Conflicts:
	community/esmtp/PKGBUILD
	community/geany-plugins/PKGBUILD
	community/giggle/PKGBUILD
	community/guichan/PKGBUILD
	community/mxml/PKGBUILD
	community/ruby-gtk2/PKGBUILD
	core/libtool/PKGBUILD
	core/mkinitcpio-busybox/PKGBUILD
	core/udev/PKGBUILD
	extra/audacious/PKGBUILD
	extra/conky/PKGBUILD
	extra/gnome-control-center/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/gtk3/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/kdeutils/PKGBUILD
	extra/kino/PKGBUILD
	extra/mkvtoolnix/PKGBUILD
	extra/poppler/PKGBUILD
	extra/postfix/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/qtcurve-gtk2/PKGBUILD
	extra/transmission/PKGBUILD
	extra/xfburn/PKGBUILD
	extra/xfce4-xkb-plugin/PKGBUILD
	extra/xorg-server/PKGBUILD
	extra/yelp/PKGBUILD
	kde-unstable/calligra/PKGBUILD
	multilib/lib32-gtk2/PKGBUILD
	multilib/lib32-libpulse/PKGBUILD
	multilib/libtool-multilib/PKGBUILD
	multilib/wine/PKGBUILD
	multilib/wine/wine.install

1 files changed, 42 insertions, 12 deletions

diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD
index a344cf176..1d1ff869f 100644
--- a/extra/mkvtoolnix/PKGBUILD
+++ b/extra/mkvtoolnix/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 140216 2011-10-09 20:54:01Z giovanni $
+# $Id: PKGBUILD 141066 2011-10-23 00:15:19Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 
-pkgname=mkvtoolnix
+pkgbase=mkvtoolnix
+pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk')
 pkgver=5.0.1
-pkgrel=1
-pkgdesc="Set of tools to create, edit and inspect Matroska files - CLI version"
+pkgrel=4
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.bunkus.org/videotools/mkvtoolnix/index.html"
-depends=('file' 'boost-libs' 'libmatroska' 'lzo2' 'expat' 'flac' 'libvorbis')
-makedepends=('boost' 'ruby')
-source=("http://www.bunkus.org/videotools/${pkgname}/sources/${pkgname}-${pkgver}.tar.bz2")
+makedepends=('libmatroska' 'flac' 'libvorbis' 'file' 'wxgtk'\
+             'boost-libs' 'lzo2' 'xdg-utils' 'boost' 'ruby')
+source=("http://www.bunkus.org/videotools/${pkgbase}/sources/${pkgbase}-${pkgver}.tar.bz2")
 md5sums=('93fbbe946de6013eca699c0c2a93a4e9')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgbase}-${pkgver}"
 
   # Disable automagic curl dep used for online update checking
   sed -i -e '/curl/d' configure.in
@@ -26,13 +26,43 @@ build() {
   autoreconf
 
   ./configure --prefix=/usr \
-              --with-boost-libdir=/usr/lib \
-              --disable-gui
+              --with-boost-libdir=/usr/lib
   rake
 }
 
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+package_mkvtoolnix-cli() {
+  pkgdesc="Set of tools to create, edit and inspect Matroska files - CLI version"
+  depends=('libmatroska' 'expat' 'flac' 'libvorbis' 'file' 'boost-libs' 'lzo2')
+  provides=('mkvtoolnix')
+  conflicts=('mkvtoolnix')
+  replaces=('mkvtoolnix')
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+
+  rake DESTDIR="${pkgdir}" install
+  rm -rf "${pkgdir}"/usr/bin/mmg
+  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/applications
+  rm -rf "${pkgdir}"/usr/share/icons
+  rm -rf "${pkgdir}"/usr/share/mime
+}
+
+package_mkvtoolnix-gtk() {
+  pkgdesc="Set of tools to create, edit and inspect Matroska files - wxGTK GUI"
+  depends=("mkvtoolnix-cli=${pkgver}" 'wxgtk' 'xdg-utils')
+  install=mkvtoolnix.install
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
 
   rake DESTDIR="${pkgdir}" install
+  rm -rf "${pkgdir}"/usr/bin/mkv*
+  rm -rf "${pkgdir}"/usr/share/doc
+  rm -rf "${pkgdir}"/usr/share/locale
+  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*
 }