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

Conflicts:
	community/comix/PKGBUILD
	community/geany/PKGBUILD
	community/gnome-do-docklets/PKGBUILD
	community/gnome-do-plugins/PKGBUILD
	community/gnome-system-tools/PKGBUILD
	community/gnustep-make/PKGBUILD
	community/gtweakui/PKGBUILD
	community/hwinfo/PKGBUILD
	community/kungfu/PKGBUILD
	community/liboauth/PKGBUILD
	community/liboobs/PKGBUILD
	community/lua-lzlib/PKGBUILD
	community/mcdp/PKGBUILD
	community/mingw32-gcc-base/PKGBUILD
	community/mingw32-runtime/PKGBUILD
	community/mplayer2/PKGBUILD
	community/pdf2svg/PKGBUILD
	community/perl-data-dumper/PKGBUILD
	community/perl-digest-md5/PKGBUILD
	community/perl-perlio-eol/PKGBUILD
	community/perl-xml-libxslt/PKGBUILD
	community/python-cherrypy/PKGBUILD
	community/python-pexpect/PKGBUILD
	community/python-pyro/PKGBUILD
	community/python2-cherrypy/PKGBUILD
	community/rexima/PKGBUILD
	community/shp2svg/PKGBUILD
	community/system-tools-backends/PKGBUILD
	community/tracker/PKGBUILD
	community/virtualbox/PKGBUILD
	core/bridge-utils/PKGBUILD
	extra/avidemux/PKGBUILD
	extra/beagle/PKGBUILD
	extra/bug-buddy/PKGBUILD
	extra/dssi/PKGBUILD
	extra/evolution-sharp/PKGBUILD
	extra/evolution-webcal/PKGBUILD
	extra/feh/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/gnome-mag/PKGBUILD
	extra/gnome-python-desktop/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/gok/PKGBUILD
	extra/gpsd/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/hyphen/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/keytouch-editor/PKGBUILD
	extra/keytouch/PKGBUILD
	extra/koffice/PKGBUILD
	extra/krusader/PKGBUILD
	extra/libbeagle/PKGBUILD
	extra/libffi/PKGBUILD
	extra/libgnomeuimm/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/m17n-lib/PKGBUILD
	extra/mtr/PKGBUILD
	extra/openbabel/PKGBUILD
	extra/poppler/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/rox/PKGBUILD
	extra/transmission/PKGBUILD
	extra/xf86-input-synaptics/PKGBUILD
	extra/xorg-server/PKGBUILD
	extra/xorg-xinit/PKGBUILD
	kde-unstable/calligra/PKGBUILD
	libre/icecat/PKGBUILD
	libre/linux-libre/PKGBUILD
	multilib/lib32-ncurses/PKGBUILD
	multilib/lib32-openssl/PKGBUILD
	multilib/lib32-talloc/PKGBUILD
	multilib/wine/PKGBUILD

6 files changed, 19 insertions, 35 deletions

diff --git a/community/madman/PKGBUILD b/community/madman/PKGBUILD
index 766383199..2a6cc72c7 100644
--- a/community/madman/PKGBUILD
+++ b/community/madman/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 33413 2010-11-24 16:03:47Z spupykin $
+# $Id: PKGBUILD 56740 2011-10-11 17:41:27Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Eric Belanger <belanger@astro.umontreal.ca>
 # Contributor: Hugo Ideler <hugoideler@dse.nl>
@@ -6,19 +6,19 @@
 
 pkgname=madman
 pkgver=0.94beta1.20060611
-pkgrel=1
+pkgrel=3
 pkgdesc="I-tunes like music player"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://madman.sourceforge.net/"
 license=('GPL')
-depends=('qt3' 'xmms' 'libid3tag' 'gtk')
-makedepends=('python')
-source=(http://arch.pp.ru/~sergej/dl/madman_$pkgver.orig.tar.gz
-	http://arch.pp.ru/~sergej/dl/madman_$pkgver-2.diff.gz
-	madman.desktop
-	madman_logo.png
-	madman_logo_mini.png
-	madman_logo_large.png
+depends=('qt3' 'xmms' 'gtk' 'taglib')
+makedepends=('python2' 'scons')
+source=(ftp://ftp.archlinux.org/other/community/madman/madman_$pkgver.orig.tar.gz
+	ftp://ftp.archlinux.org/other/community/madman/madman_$pkgver-2.diff.gz
+	ftp://ftp.archlinux.org/other/community/madman/madman.desktop
+	ftp://ftp.archlinux.org/other/community/madman/madman_logo.png
+	ftp://ftp.archlinux.org/other/community/madman/madman_logo_mini.png
+	ftp://ftp.archlinux.org/other/community/madman/madman_logo_large.png
 	fake-g++.sh)
 md5sums=('36e7a4619ebe83ed939c7ae09c16d535'
          '26de942ae2465fb805748d3bea9a8a17'
@@ -26,7 +26,7 @@ md5sums=('36e7a4619ebe83ed939c7ae09c16d535'
          'd4546f77857a6ccdabb2036eb6a0da07'
          '2d54bb8eceed283edc88a3e4553d2483'
          '3c2da1b1800fb372e225ae38fa1398e8'
-         '6882bb5e67e6dea45e2f770d899514c5')
+         '685a6fb13c861b82950dd6a77fd02120')
 
 build() {
   . /etc/profile.d/qt3.sh
@@ -41,19 +41,15 @@ build() {
 	,build/release/designer/tsonglistview.h \
 	,build/release/designer/tsetlistview.h
   sed -i '26,1i#include <memory>' utility/base.h
+  sed -i 's|python|python2|' designer/make_imagedata httpd/make_webdata doc/update_format_tag
   cp $srcdir/fake-g++.sh ./g++
   export PATH=.:$PATH
 
-  scons || return 1
-  scons prefix=$pkgdir/usr install || return 1
+  scons
+  scons install_to=$pkgdir/usr prefix=/usr install
 
-  rm $pkgdir/usr/bin/.sconsign
-  rm $pkgdir/usr/lib/madman/plugins/.sconsign
-  mkdir -p $pkgdir/usr/share/{applications,icons}
-  mkdir -p $pkgdir/usr/share/icons/{mini,large}
-
-  cp $srcdir/madman_logo.png $pkgdir/usr/share/icons
-  cp $srcdir/madman_logo_mini.png $pkgdir/usr/share/icons/mini
-  cp $srcdir/madman_logo_large.png $pkgdir/usr/share/icons/large
-  cp $srcdir/madman.desktop $pkgdir/usr/share/applications
+  install -Dm644 $srcdir/madman_logo.png $pkgdir/usr/share/icons/madman_logo.png
+  install -Dm644 $srcdir/madman_logo_mini.png $pkgdir/usr/share/icons/mini/madman_logo_mini.png
+  install -Dm644 $srcdir/madman_logo_large.png $pkgdir/usr/share/icons/large/madman_logo_large.png
+  install -Dm644 $srcdir/madman.desktop $pkgdir/usr/share/applications/madman.desktop
 }
diff --git a/community/madman/fake-g++.sh b/community/madman/fake-g++.sh
index 17da66d5a..af424f5ca 100755
--- a/community/madman/fake-g++.sh
+++ b/community/madman/fake-g++.sh
@@ -1,7 +1,5 @@
 #!/bin/sh -x
 
 Q=`echo "$*" | sed 's|- p t h r e a d|-pthread|'`
-
 echo "$Q" | grep 'lmp4ff' && Q="$Q /usr/lib/libmp4ff.a"
-
-exec /bin/g++ $Q
+exec /usr/bin/g++ $Q
diff --git a/community/madman/madman.desktop b/community/madman/madman.desktop
deleted file mode 100644
index c415a6ee5..000000000
--- a/community/madman/madman.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Madman
-Comment=Music Manager
-Exec=madman
-Icon=/usr/share/icons/madman_logo.png
-Miniicon=/usr/share/icons/mini/madman_logo_mini.png
-GenericName=Music Manager
-Terminal=false
-Type=Application
-Categories=AudioVideo;Audio
diff --git a/community/madman/madman_logo.png b/community/madman/madman_logo.png
deleted file mode 100644
index 2128a45d2..000000000
--- a/community/madman/madman_logo.png
+++ /dev/null
diff --git a/community/madman/madman_logo_large.png b/community/madman/madman_logo_large.png
deleted file mode 100644
index 4661b4f4f..000000000
--- a/community/madman/madman_logo_large.png
+++ /dev/null
diff --git a/community/madman/madman_logo_mini.png b/community/madman/madman_logo_mini.png
deleted file mode 100644
index 5bf9f1083..000000000
--- a/community/madman/madman_logo_mini.png
+++ /dev/null