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

3 files changed, 0 insertions, 191 deletions

diff --git a/extra/digikam/boost148.patch b/extra/digikam/boost148.patch
deleted file mode 100644
index 6d3ff585b..000000000
--- a/extra/digikam/boost148.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -u libs/database/imagehistory/imagehistorygraph_boost.h ../../digikam-2.5.0/core/libs/database/imagehistory/imagehistorygraph_boost.h
---- libs/database/imagehistory/imagehistorygraph_boost.h	2012-01-05 08:32:19.837388059 -0500
-+++ ../../digikam-2.5.0/core/libs/database/imagehistory/imagehistorygraph_boost.h	2012-01-05 09:17:27.798341897 -0500
-@@ -1198,7 +1198,7 @@
-             {
-                 boost::dag_shortest_paths(graph, v,
-                                           // we provide a constant weight of 1
--                                          weight_map(boost::ref_property_map<edge_t,int>(weight)).
-+                                          weight_map(boost::ref_property_map<typename boost::graph_traits<GraphType>::edge_descriptor,int>(weight)).
-                                           // Store distance and predecessors in QMaps, wrapped to serve as property maps
-                                           distance_map(VertexIntMapAdaptor(distances)).
-                                           predecessor_map(VertexVertexMapAdaptor(predecessors))
-@@ -1218,7 +1218,7 @@
-             {
-                 boost::dag_shortest_paths(graph, v,
-                                           // we provide a constant weight of 1
--                                          weight_map(boost::ref_property_map<edge_t,int>(weight)).
-+                                          weight_map(boost::ref_property_map<typename boost::graph_traits<GraphType>::edge_descriptor,int>(weight)).
-                                           // Invert the default compare method: With greater, we get the longest path
-                                           distance_compare(std::greater<int>()).
-                                           // will be returned if a node is unreachable
-@@ -1384,14 +1384,15 @@
-         template <class GraphType, typename VertexLessThan>
-         class lessThanMapEdgeToTarget
-         {
-+            typedef typename boost::graph_traits<GraphType>::edge_descriptor edge_descriptor;
-         public:
-             lessThanMapEdgeToTarget(const GraphType& g, VertexLessThan vertexLessThan)
-                 : g(g), vertexLessThan(vertexLessThan) {}
-             const GraphType& g;
-             VertexLessThan vertexLessThan;
--            bool operator()(const Edge& a, const Edge& b)
-+            bool operator()(const edge_descriptor& a, const edge_descriptor& b)
-             {
--                return vertexLessThan(boost::target(a.toEdge(), g), boost::target(b.toEdge(), g));
-+                return vertexLessThan(boost::target(a, g), boost::target(b, g));
-             }
-         };
- 
-@@ -1402,20 +1403,21 @@
-         {
-             typedef std::pair<Vertex, QList<Edge> > VertexInfo;
- 
--            QList<Edge>             outEdges;
-+            typedef typename boost::graph_traits<IncidenceGraph>::edge_descriptor edge_descriptor;
-+            QList<edge_descriptor> outEdges;
-             std::vector<VertexInfo> stack;
- 
-             boost::put(color, u, boost::gray_color);
-             vis.discover_vertex(u, g);
- 
--            outEdges = toEdgeList(boost::out_edges(u, g));
-+            outEdges = toList<edge_descriptor>(boost::out_edges(u, g));
-             // Sort edges. The lessThan we have takes vertices, so we use a lessThan which
-             // maps the given edges to their targets, and calls our vertex lessThan.
-             qSort(outEdges.begin(), outEdges.end(), lessThanMapEdgeToTarget<IncidenceGraph, LessThan>(g, lessThan));
- 
--            foreach(const Edge& e, outEdges)
-+            foreach(const edge_descriptor& e, outEdges)
-             {
--                Vertex v = boost::target(e.toEdge(), g);
-+                Vertex v = boost::target(e, g);
-                 vis.examine_edge(e, g);
-                 boost::default_color_type v_color = boost::get(color, v);
-                 if (v_color == boost::white_color)
diff --git a/extra/digikam/digikam-2.5.0-gcc-4.7.0.patch b/extra/digikam/digikam-2.5.0-gcc-4.7.0.patch
deleted file mode 100644
index 535387b92..000000000
--- a/extra/digikam/digikam-2.5.0-gcc-4.7.0.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- digikam-2.5.0/core/digikam/album/albummanager.h	2012-01-03 02:32:41.000000000 +0200
-+++ digikam-2.5.0/core/digikam/album/albummanager.h	2012-01-05 03:18:16.291639995 +0200
-@@ -831,7 +831,7 @@
-     {
-         foreach(T* t, list)
-         {
--            append(AlbumPointer<T>(t));
-+            this->append(AlbumPointer<T>(t));
-         }
-         return *this;
-     }
---- digikam-2.5.0/core/libs/database/imagehistory/imagehistorygraph_boost.h	2012-01-03 02:32:26.000000000 +0200
-+++ digikam-2.5.0/core/libs/database/imagehistory/imagehistorygraph_boost.h	2012-01-05 03:01:56.965609602 +0200
-@@ -1362,7 +1362,7 @@
-             template <typename VertexType, typename GraphType>
-             void discover_vertex(VertexType u, const GraphType&) const
-             {
--                record(u);
-+                this->record(u);
-             }
-         };
- 
-@@ -1373,7 +1373,7 @@
-             template <typename VertexType, typename GraphType>
-             void discover_vertex(VertexType u, const GraphType&) const
-             {
--                record(u);
-+                this->record(u);
-             }
-         };
- 
---- digikam-2.5.0/core/utilities/cameragui/devices/gpcamera.cpp	2012-01-03 02:32:04.000000000 +0200
-+++ digikam-2.5.0/core/utilities/cameragui/devices/gpcamera.cpp	2012-01-05 01:22:34.009352997 +0200
-@@ -30,6 +30,7 @@
- extern "C"
- {
- #include <utime.h>
-+#include <unistd.h>
- }
- 
- // C++ includes
---- digikam-2.5.0/extra/kipi-plugins/htmlexport/wizard.cpp	2012-01-03 02:31:42.000000000 +0200
-+++ digikam-2.5.0/extra/kipi-plugins/htmlexport/wizard.cpp	2012-01-05 02:35:01.061054821 +0200
-@@ -78,7 +78,7 @@
- public:
-     WizardPage(KAssistantDialog* dialog, const QString& title)
-     : QWidget(dialog) {
--        setupUi(this);
-+        this->setupUi(this);
-         layout()->setMargin(0);
-         mPage = dialog->addPage(this, title);
-     }
---- digikam-2.5.0/extra/kipi-plugins/printimages/wizard/wizard.cpp	2012-01-03 02:31:34.000000000 +0200
-+++ digikam-2.5.0/extra/kipi-plugins/printimages/wizard/wizard.cpp	2012-01-05 02:17:15.249914790 +0200
-@@ -88,7 +88,7 @@
-     WizardPage ( KAssistantDialog* dialog, const QString& title )
-         : QWidget ( dialog )
-     {
--        setupUi ( this );
-+        this->setupUi ( this );
-         layout()->setMargin ( 0 );
-         mPage = dialog->addPage ( this, title );
-     }
diff --git a/extra/digikam/libkipi140.patch b/extra/digikam/libkipi140.patch
deleted file mode 100644
index a221b5847..000000000
--- a/extra/digikam/libkipi140.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --git a/utilities/setup/setupplugins.cpp b/utilities/setup/setupplugins.cpp
-index 0f4030a..b8efb35 100644
---- a/utilities/setup/setupplugins.cpp
-+++ b/utilities/setup/setupplugins.cpp
-@@ -6,8 +6,8 @@
-  * Date        : 2004-01-02
-  * Description : setup Kipi plugins tab.
-  *
-- * Copyright (C) 2004-2011 by Gilles Caulier <caulier dot gilles at gmail dot com>
-- * Copyright (C) 2011 by Andi Clemens <andi dot clemens at googlemail dot com>
-+ * Copyright (C) 2004-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
-+ * Copyright (C) 2011-2012 by Andi Clemens <andi dot clemens at googlemail dot com>
-  *
-  * This program is free software; you can redistribute it
-  * and/or modify it under the terms of the GNU General
-@@ -100,6 +100,11 @@ SetupPlugins::SetupPlugins(QWidget* parent)
- 
-     panel->setLayout(mainLayout);
- 
-+#if KIPI_VERSION < 0x010400
-+    d->checkAllBtn->setVisible(false);
-+    d->clearBtn->setVisible(false);
-+#endif
-+
-     initPlugins();
- 
-     // --------------------------------------------------------
-@@ -158,14 +163,18 @@ void SetupPlugins::applyPlugins()
- void SetupPlugins::slotCheckAll()
- {
-     QApplication::setOverrideCursor(Qt::WaitCursor);
-+#if KIPI_VERSION >= 0x010400
-     d->kipiConfig->slotCheckAll();
-+#endif
-     QApplication::restoreOverrideCursor();
- }
- 
- void SetupPlugins::slotClear()
- {
-     QApplication::setOverrideCursor(Qt::WaitCursor);
-+#if KIPI_VERSION >= 0x010400
-     d->kipiConfig->slotClear();
-+#endif
-     QApplication::restoreOverrideCursor();
- }
- 
-diff --git a/utilities/setup/setupplugins.h b/utilities/setup/setupplugins.h
-index 271a569..114e0fa 100644
---- a/utilities/setup/setupplugins.h
-+++ b/utilities/setup/setupplugins.h
-@@ -6,8 +6,8 @@
-  * Date        : 2004-01-02
-  * Description : setup Kipi plugins tab.
-  *
-- * Copyright (C) 2004-2011 by Gilles Caulier <caulier dot gilles at gmail dot com>
-- * Copyright (C) 2011 by Andi Clemens <andi dot clemens at googlemail dot com>
-+ * Copyright (C) 2004-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
-+ * Copyright (C) 2011-2012 by Andi Clemens <andi dot clemens at googlemail dot com>
-  *
-  * This program is free software; you can redistribute it
-  * and/or modify it under the terms of the GNU General
-
-