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

Conflicts:
	community/cdemu-client/PKGBUILD
	community/dcron/PKGBUILD
	community/freevo/PKGBUILD
	community/gmerlin-avdecoder/PKGBUILD
	community/hacburn/PKGBUILD
	community/htmldoc/PKGBUILD
	community/ibus-table/PKGBUILD
	community/iksemel/PKGBUILD
	community/isomaster/PKGBUILD
	community/libmatio/PKGBUILD
	community/libtlen/PKGBUILD
	community/luarocks/PKGBUILD
	community/lxde-common/PKGBUILD
	community/multipath-tools/PKGBUILD
	community/nvclock/PKGBUILD
	community/pam-krb5/PKGBUILD
	community/pidgin-musictracker/PKGBUILD
	community/pkgfile/PKGBUILD
	community/pkgtools/PKGBUILD
	community/print-manager/PKGBUILD
	community/python-pyro/PKGBUILD
	community/python-pyxmpp/PKGBUILD
	community/python2-simplejson/PKGBUILD
	community/rsnapshot/PKGBUILD
	community/setconf/PKGBUILD
	community/tagpy/PKGBUILD
	community/terminator/PKGBUILD
	community/udunits/PKGBUILD
	community/vlock/PKGBUILD
	community/winefish/PKGBUILD
	core/nss-myhostname/PKGBUILD
	extra/avfs/PKGBUILD
	extra/bmp-musepack/PKGBUILD
	extra/bmp-wma/PKGBUILD
	extra/bochs/PKGBUILD
	extra/botan/PKGBUILD
	extra/cdargs/PKGBUILD
	extra/cx_freeze/PKGBUILD
	extra/dcfldd/PKGBUILD
	extra/devilspie/PKGBUILD
	extra/emelfm2/PKGBUILD
	extra/evilwm/PKGBUILD
	extra/fssos-nsvs/PKGBUILD
	extra/gimp-dbp/PKGBUILD
	extra/gimp-gap/PKGBUILD
	extra/gimp-ufraw/PKGBUILD
	extra/gmpc/PKGBUILD
	extra/gtkpod/PKGBUILD
	extra/hercules/PKGBUILD
	extra/herqq/PKGBUILD
	extra/hydrogen/PKGBUILD
	extra/kdegames/PKGBUILD
	extra/kradio/PKGBUILD
	extra/kshutdown/PKGBUILD
	extra/libmusicbrainz4/PKGBUILD
	extra/mahjong/PKGBUILD
	extra/mcrypt/PKGBUILD
	extra/monica/PKGBUILD
	extra/mpck/PKGBUILD
	extra/mrtg/PKGBUILD
	extra/nicotine/PKGBUILD
	extra/normalize/PKGBUILD
	extra/oprofile/PKGBUILD
	extra/perl-event/PKGBUILD
	extra/perl-unicode-string/PKGBUILD
	extra/pidgin-encryption/PKGBUILD
	extra/proftpd/PKGBUILD
	extra/pymad/PKGBUILD
	extra/qiv/PKGBUILD
	extra/quodlibet/PKGBUILD
	extra/ratpoison/PKGBUILD
	extra/rox/PKGBUILD
	extra/scrot/PKGBUILD
	extra/stardict/PKGBUILD
	extra/terminal/PKGBUILD
	extra/usbview/PKGBUILD
	extra/xdelta/PKGBUILD
	extra/xdelta3/PKGBUILD
	extra/xorg-xlsfonts/PKGBUILD
	extra/zile/PKGBUILD
	mozilla-testing/iceweasel-libre/mozconfig
	mozilla-testing/iceweasel-libre/vendor.js
	social/tokyocabinet/PKGBUILD
	~fauno/notmuch/PKGBUILD
	~mtjm/thinkfan/PKGBUILD
	~mtjm/zbar/PKGBUILD

2 files changed, 0 insertions, 78 deletions

diff --git a/extra/llvm/clang-3.1-fix-lwg-2141.patch b/extra/llvm/clang-3.1-fix-lwg-2141.patch
deleted file mode 100644
index af10a5c33..000000000
--- a/extra/llvm/clang-3.1-fix-lwg-2141.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Index: test/SemaCXX/libstdcxx_common_type_hack.cpp
-===================================================================
---- test/SemaCXX/libstdcxx_common_type_hack.cpp	(revision 0)
-+++ test/SemaCXX/libstdcxx_common_type_hack.cpp	(revision 166455)
-@@ -0,0 +1,33 @@
-+// RUN: %clang_cc1 -fsyntax-only %s -std=c++11 -verify
-+
-+// This is a test for an egregious hack in Clang that works around
-+// an issue with GCC's <type_traits> implementation. std::common_type
-+// relies on pre-standard rules for decltype(), in which it doesn't
-+// produce reference types so frequently.
-+
-+#ifdef BE_THE_HEADER
-+
-+#pragma GCC system_header
-+namespace std {
-+  template<typename T> T &&declval();
-+
-+  template<typename...Ts> struct common_type {};
-+  template<typename A, typename B> struct common_type<A, B> {
-+    // Under the rules in the standard, this always produces a
-+    // reference type.
-+    typedef decltype(true ? declval<A>() : declval<B>()) type;
-+  };
-+}
-+
-+#else
-+
-+#define BE_THE_HEADER
-+#include "libstdcxx_common_type_hack.cpp"
-+
-+using T = int;
-+using T = std::common_type<int, int>::type;
-+
-+using U = int; // expected-note {{here}}
-+using U = decltype(true ? std::declval<int>() : std::declval<int>()); // expected-error {{different types}}
-+
-+#endif
-Index: lib/Sema/SemaTemplateInstantiateDecl.cpp
-===================================================================
---- lib/Sema/SemaTemplateInstantiateDecl.cpp	(revision 166454)
-+++ lib/Sema/SemaTemplateInstantiateDecl.cpp	(revision 166455)
-@@ -158,6 +158,22 @@
-     SemaRef.MarkDeclarationsReferencedInType(D->getLocation(), DI->getType());
-   }
- 
-+  // HACK: g++ has a bug where it gets the value kind of ?: wrong.
-+  // libstdc++ relies upon this bug in its implementation of common_type.
-+  // If we happen to be processing that implementation, fake up the g++ ?:
-+  // semantics. See LWG issue 2141 for more information on the bug.
-+  const DecltypeType *DT = DI->getType()->getAs<DecltypeType>();
-+  CXXRecordDecl *RD = dyn_cast<CXXRecordDecl>(D->getDeclContext());
-+  if (DT && RD && isa<ConditionalOperator>(DT->getUnderlyingExpr()) &&
-+      DT->isReferenceType() &&
-+      RD->getEnclosingNamespaceContext() == SemaRef.getStdNamespace() &&
-+      RD->getIdentifier() && RD->getIdentifier()->isStr("common_type") &&
-+      D->getIdentifier() && D->getIdentifier()->isStr("type") &&
-+      SemaRef.getSourceManager().isInSystemHeader(D->getLocStart()))
-+    // Fold it to the (non-reference) type which g++ would have produced.
-+    DI = SemaRef.Context.getTrivialTypeSourceInfo(
-+      DI->getType().getNonReferenceType());
-+
-   // Create the new typedef
-   TypedefNameDecl *Typedef;
-   if (IsTypeAlias)
diff --git a/extra/llvm/clang-pure64.patch b/extra/llvm/clang-pure64.patch
deleted file mode 100644
index 9bbbfaa8b..000000000
--- a/extra/llvm/clang-pure64.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: lib/Driver/Tools.cpp
-===================================================================
---- lib/Driver/Tools.cpp	(revision 123373)
-+++ lib/Driver/Tools.cpp	(working copy)
-@@ -3306,7 +3306,7 @@
-     else if (ToolChain.getArch() == llvm::Triple::ppc64)
-       CmdArgs.push_back("/lib64/ld64.so.1");
-     else
--      CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2");
-+      CmdArgs.push_back("/lib/ld-linux-x86-64.so.2");
-   }
- 
-   CmdArgs.push_back("-o");