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, 99 deletions

diff --git a/extra/ntrack/libnl3.patch b/extra/ntrack/libnl3.patch
deleted file mode 100644
index 879b52c8c..000000000
--- a/extra/ntrack/libnl3.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
-Subject: Disable -pedantic, it makes ntrack fail to build against libnl3 3.2 and glib.
-
-Index: ntrack/glib/Makefile.am
-===================================================================
---- ntrack.orig/glib/Makefile.am	2011-12-22 19:25:13.137470000 -0500
-+++ ntrack/glib/Makefile.am	2011-12-22 20:07:10.243344976 -0500
-@@ -26,7 +26,6 @@
- AM_CFLAGS = \
- 	-Wall \
- 	-Werror \
--	-pedantic \
- 	-I$(srcdir)/../common/
- 
- AM_LDFLAGS =
-Index: ntrack/glib/Makefile.in
-===================================================================
---- ntrack.orig/glib/Makefile.in	2011-12-22 20:05:46.243208000 -0500
-+++ ntrack/glib/Makefile.in	2011-12-22 20:07:14.871344769 -0500
-@@ -325,7 +325,6 @@
- AM_CFLAGS = \
- 	-Wall \
- 	-Werror \
--	-pedantic \
- 	-I$(srcdir)/../common/
- 
- AM_LDFLAGS = 
-Index: ntrack/glib/test/Makefile.am
-===================================================================
---- ntrack.orig/glib/test/Makefile.am	2011-12-22 19:25:13.137470000 -0500
-+++ ntrack/glib/test/Makefile.am	2011-12-22 20:07:19.451344565 -0500
-@@ -27,7 +27,6 @@
- 	../../common/libntrack.la
- 
- AM_CFLAGS = \
--	-pedantic \
- 	-Wall \
- 	-Werror \
- 	-I$(srcdir)/.. \
-Index: ntrack/glib/test/Makefile.in
-===================================================================
---- ntrack.orig/glib/test/Makefile.in	2011-12-22 20:05:46.243208000 -0500
-+++ ntrack/glib/test/Makefile.in	2011-12-22 20:07:23.903344367 -0500
-@@ -260,7 +260,6 @@
- 	../../common/libntrack.la
- 
- AM_CFLAGS = \
--	-pedantic \
- 	-Wall \
- 	-Werror \
- 	-I$(srcdir)/.. \
-Index: ntrack/gobject/Makefile.am
-===================================================================
---- ntrack.orig/gobject/Makefile.am	2011-12-22 20:05:46.243208000 -0500
-+++ ntrack/gobject/Makefile.am	2011-12-22 20:07:27.515344206 -0500
-@@ -26,7 +26,6 @@
- AM_CFLAGS = \
- 	-Wall \
- 	-Werror \
--	-pedantic \
- 	-I$(srcdir)/../common/ \
- 	-I$(srcdir)/../glib/
- 
-Index: ntrack/gobject/Makefile.in
-===================================================================
---- ntrack.orig/gobject/Makefile.in	2011-12-22 20:05:46.243208000 -0500
-+++ ntrack/gobject/Makefile.in	2011-12-22 20:07:31.519344028 -0500
-@@ -347,7 +347,6 @@
- AM_CFLAGS = \
- 	-Wall \
- 	-Werror \
--	-pedantic \
- 	-I$(srcdir)/../common/ \
- 	-I$(srcdir)/../glib/
- 
-Index: ntrack/modules/Makefile.am
-===================================================================
---- ntrack.orig/modules/Makefile.am	2011-12-22 20:05:46.243208000 -0500
-+++ ntrack/modules/Makefile.am	2011-12-22 20:07:35.519343851 -0500
-@@ -26,7 +26,6 @@
- 	-Wall \
- 	-Werror \
- 	-Wno-variadic-macros \
--	-pedantic \
- 	-I$(top_srcdir)/common/
- 
- AM_LDFLAGS =
-Index: ntrack/modules/Makefile.in
-===================================================================
---- ntrack.orig/modules/Makefile.in	2011-12-22 20:05:46.243208000 -0500
-+++ ntrack/modules/Makefile.in	2011-12-22 20:07:39.391343676 -0500
-@@ -352,7 +352,6 @@
- 	-Wall \
- 	-Werror \
- 	-Wno-variadic-macros \
--	-pedantic \
- 	-I$(top_srcdir)/common/
- 
- AM_LDFLAGS =