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

diff --git a/community/root/fix-mathcore-generation-r42566.diff b/community/root/fix-mathcore-generation-r42566.diff
deleted file mode 100644
index ae22c23c0..000000000
--- a/community/root/fix-mathcore-generation-r42566.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: cint/cint/src/typedef.cxx
-===================================================================
---- cint/cint/src/typedef.cxx	(revision 42564)
-+++ cint/cint/src/typedef.cxx	(revision 42566)
-@@ -297,18 +297,27 @@
-       }
-       c = G__fgetname_template(type1, 0, "{");
-    }
--   if (!strcmp(type1, "::")) {  // FIXME: This makes no sense, there cannot be typedef ::{...};
-+   if (!strcmp(type1, "::")) {
-       // skip a :: without a namespace in front of it (i.e. global namespace!)
-       c = G__fgetspace(); // skip the next ':'
-       c = G__fgetname_template(type1, 0, "{");
-    }
--   if (!strncmp(type1, "::", 2)) { // Strip a leading :: (global namespace operator)
--      // A leading '::' causes other typename matching functions to fail so
--      // we remove it. This is not the ideal solution (neither was the one
--      // above since it does not allow for distinction between global
--      // namespace and local namespace) ... but at least it is an improvement
--      // over the current behavior.
--      strcpy((char*)type1, type1 + 2);  // Okay since we reduce the size ...
-+   if (!strncmp(type1, "::", 2)) {
-+      // Strip a leading :: (global namespace operator).
-+      // A leading '::' causes other typename matching
-+      // functions to fail so we remove it. This is not
-+      // the ideal solution (neither is the one above)
-+      // since it does not allow for decriminating between
-+      // global namespace and local namespace, but at
-+      // least it is an improvement over the current
-+      // behavior.
-+      //
-+      // Note: We must use memmove because the source
-+      //       and destination strings overlap!
-+      //
-+      int t1len = strlen(type1);
-+      memmove(type1, type1 + 2, t1len - 2);
-+      type1.Set(t1len - 2, '\0');
-    }
-    while (isspace(c)) {
-       len = strlen(type1);