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

diff --git a/extra/boost/BOOST_FOREACH.patch b/extra/boost/BOOST_FOREACH.patch
deleted file mode 100644
index 12cf08800..000000000
--- a/extra/boost/BOOST_FOREACH.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Index: /trunk/boost/foreach_fwd.hpp

-===================================================================

---- /trunk/boost/foreach_fwd.hpp	(revision 62661)

-+++ /trunk/boost/foreach_fwd.hpp	(revision 75540)

-@@ -15,4 +15,6 @@

- #define BOOST_FOREACH_FWD_HPP

- 

-+#include <utility> // for std::pair

-+

- // This must be at global scope, hence the uglified name

- enum boost_foreach_argument_dependent_lookup_hack

-@@ -26,4 +28,7 @@

- namespace foreach

- {

-+    template<typename T>

-+    std::pair<T, T> in_range(T begin, T end);

-+

-     ///////////////////////////////////////////////////////////////////////////////

-     // boost::foreach::tag

-@@ -47,4 +52,22 @@

- } // namespace foreach

- 

-+// Workaround for unfortunate https://svn.boost.org/trac/boost/ticket/6131

-+namespace BOOST_FOREACH

-+{

-+    using foreach::in_range;

-+    using foreach::tag;

-+

-+    template<typename T>

-+    struct is_lightweight_proxy

-+      : foreach::is_lightweight_proxy<T>

-+    {};

-+

-+    template<typename T>

-+    struct is_noncopyable

-+      : foreach::is_noncopyable<T>

-+    {};

-+

-+} // namespace BOOST_FOREACH

-+

- } // namespace boost

- 

-Index: /trunk/boost/foreach.hpp

-===================================================================

---- /trunk/boost/foreach.hpp	(revision 75077)

-+++ /trunk/boost/foreach.hpp	(revision 75540)

-@@ -166,5 +166,5 @@

- //   at the global namespace for your type.

- template<typename T>

--inline boost::foreach::is_lightweight_proxy<T> *

-+inline boost::BOOST_FOREACH::is_lightweight_proxy<T> *

- boost_foreach_is_lightweight_proxy(T *&, BOOST_FOREACH_TAG_DEFAULT) { return 0; }

- 

-@@ -191,5 +191,5 @@

- //   at the global namespace for your type.

- template<typename T>

--inline boost::foreach::is_noncopyable<T> *

-+inline boost::BOOST_FOREACH::is_noncopyable<T> *

- boost_foreach_is_noncopyable(T *&, BOOST_FOREACH_TAG_DEFAULT) { return 0; }

-