Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/erlang-sdl/PKGBUILD
	community/nautilus-sound-converter/PKGBUILD
	community/shapelib/PKGBUILD
	core/libarchive/PKGBUILD
	extra/claws-mail-extra-plugins/PKGBUILD
	extra/evince/PKGBUILD
	extra/gtk3/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/libgxps/PKGBUILD
	extra/mkvtoolnix/PKGBUILD
	extra/qt5/PKGBUILD
	libre/gstreamer0.10-bad-libre/PKGBUILD
	libre/kernel26-libre-lts/PKGBUILD

2 files changed, 0 insertions, 53 deletions

diff --git a/community/nautilus-sound-converter/PKGBUILD b/community/nautilus-sound-converter/PKGBUILD
deleted file mode 100644
index 00157594d..000000000
--- a/community/nautilus-sound-converter/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 79481 2012-11-06 03:41:36Z bgyorgy $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=nautilus-sound-converter
-pkgver=3.0.2
-pkgrel=2
-pkgdesc="Nautilus extension to convert audio files formats"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://code.google.com/p/nautilus-sound-converter/"
-license=('GPL')
-depends=('nautilus' 'libgnome-media-profiles')
-makedepends=('intltool')
-optdepends=('gstreamer0.10-good-plugins: Extra media codecs'
-            'gstreamer0.10-ugly-plugins: Extra media codecs'
-            'gstreamer0.10-bad-plugins: Extra media codecs'
-            'gstreamer0.10-ffmpeg: Extra media codecs')
-conflicts=('totem>=3.6.0')
-options=('!libtool')
-install=$pkgname.install
-source=(http://nautilus-sound-converter.googlecode.com/files/$pkgname-$pkgver.tar.xz)
-sha1sums=('f0799af3c7f14e2cd4cf70499d9bde07ec4ab89d')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --disable-static --disable-schemas-install \
-              --with-gconf-schema-file-dir=/usr/share/gconf/schemas
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/community/nautilus-sound-converter/nautilus-sound-converter.install b/community/nautilus-sound-converter/nautilus-sound-converter.install
deleted file mode 100644
index d2da24898..000000000
--- a/community/nautilus-sound-converter/nautilus-sound-converter.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=nautilus-sound-converter
-
-post_install() {
-  gconfpkg --install $pkgname
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  gconfpkg --uninstall $pkgname
-}