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

Conflicts:
	community/asciijump/PKGBUILD
	community/cairo-compmgr/PKGBUILD
	community/cwiid/PKGBUILD
	community/darcs/PKGBUILD
	community/gadmin-samba/PKGBUILD
	community/gstm/PKGBUILD
	community/haskell-dbus/PKGBUILD
	community/haskell-mmap/PKGBUILD
	community/lastfm-client/PKGBUILD
	community/libtar/PKGBUILD
	community/mget/PKGBUILD
	community/nexuiz/PKGBUILD
	community/pstreams/PKGBUILD
	community/pyglet/PKGBUILD
	community/python-html5lib/PKGBUILD
	community/python-pychm/PKGBUILD
	community/qoauth/PKGBUILD
	community/quilt/PKGBUILD
	community/stormbaancoureur/PKGBUILD
	community/winegame/PKGBUILD
	community/winestuff/PKGBUILD
	community/xdg-user-dirs/PKGBUILD
	core/libfetch/PKGBUILD
	extra/acpi/PKGBUILD
	extra/alex/PKGBUILD
	extra/allegro/PKGBUILD
	extra/capi4k-utils/PKGBUILD
	extra/erlang/PKGBUILD
	extra/ettercap/PKGBUILD
	extra/gftp/PKGBUILD
	extra/gimp-refocus/PKGBUILD
	extra/happy/PKGBUILD
	extra/haskell-cgi/PKGBUILD
	extra/haskell-deepseq/PKGBUILD
	extra/haskell-fgl/PKGBUILD
	extra/haskell-glut/PKGBUILD
	extra/haskell-haskell-src/PKGBUILD
	extra/haskell-html/PKGBUILD
	extra/haskell-hunit/PKGBUILD
	extra/haskell-opengl/PKGBUILD
	extra/haskell-parallel/PKGBUILD
	extra/haskell-platform/PKGBUILD
	extra/haskell-quickcheck/PKGBUILD
	extra/haskell-regex-base/PKGBUILD
	extra/haskell-regex-compat/PKGBUILD
	extra/haskell-regex-posix/PKGBUILD
	extra/haskell-stm/PKGBUILD
	extra/haskell-syb/PKGBUILD
	extra/haskell-xhtml/PKGBUILD
	extra/libnet/PKGBUILD
	extra/linux_logo/PKGBUILD
	extra/mailman/PKGBUILD
	extra/midori/PKGBUILD
	extra/ntrack/PKGBUILD
	extra/pwgen/PKGBUILD
	extra/qtcurve-gtk2/PKGBUILD
	extra/qtcurve-kde4/PKGBUILD
	extra/ristretto/PKGBUILD
	extra/rxvt-unicode/PKGBUILD
	extra/telepathy-sofiasip/PKGBUILD
	extra/tightvnc/PKGBUILD
	extra/vsftpd/PKGBUILD
	extra/windowmaker-crm-git/PKGBUILD
	libre/aufs2-libre/PKGBUILD
	libre/calibre-libre/PKGBUILD
	libre/calibre-libre/calibre-mount-helper
	libre/calibre-libre/calibre.install
	libre/calibre-libre/desktop_integration.patch
	libre/ffmpeg-libre/PKGBUILD
	mozilla-testing/iceweasel-libre/PKGBUILD
	mozilla-testing/iceweasel-libre/libre.patch
	mozilla-testing/iceweasel-libre/mozconfig
	~lukeshu/openni-unstable/PKGBUILD

1 files changed, 0 insertions, 32 deletions

diff --git a/extra/alsa-utils/alsaconf.patch b/extra/alsa-utils/alsaconf.patch
deleted file mode 100644
index 48037fd3e..000000000
--- a/extra/alsa-utils/alsaconf.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -Naur alsa-utils-1.0.9a-orig/alsaconf/alsaconf.in alsa-utils-1.0.9a/alsaconf/alsaconf.in
---- alsa-utils-1.0.9a-orig/alsaconf/alsaconf.in	2005-03-24 00:24:52.000000000 -0800
-+++ alsa-utils-1.0.9a/alsaconf/alsaconf.in	2005-07-18 09:25:02.000000000 -0700
-@@ -58,6 +58,8 @@
-   distribution="redhat"
- elif test -f /etc/fedora-release && grep -q "Fedora" /etc/fedora-release; then
-   distribution="fedora"
-+elif test -f /etc/arch-release; then
-+  distribution="arch"
- elif [ -f /etc/slackware-version -o -f /etc/slamd64-version ]; then
-   distribution="slackware"
- else
-@@ -382,6 +384,8 @@
-     rcalsasound=/etc/rc.d/init.d/alsasound
- elif [ -x /etc/init.d/alsa ]; then
-     rcalsasound=/etc/init.d/alsa
-+elif [ -x /etc/rc.d/alsa ]; then
-+    rcalsasound=/etc/rc.d/alsa
- else
-     rcalsasound=rcalsasound
- fi
---- alsa-utils-1.0.9a-orig/alsaconf/alsaconf.in	2010-01-03 19:44:08.000000000 +0100
-+++ alsa-utils-1.0.9a-orig/alsaconf/alsaconf.in	2010-01-03 19:44:08.000000000 +0100
-@@ -315,7 +315,7 @@
- 	3.[789]*)
- 	  ;;
- 	*)
--	  cfgout="/etc/modprobe.d/sound"
-+	  cfgout="/etc/modprobe.d/sound.conf"
- 	  cfgoldout=""
- 	  ;;
- 	esac