Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/comix/PKGBUILD
	community/geany/PKGBUILD
	community/gnome-do-docklets/PKGBUILD
	community/gnome-do-plugins/PKGBUILD
	community/gnome-system-tools/PKGBUILD
	community/gnustep-make/PKGBUILD
	community/gtweakui/PKGBUILD
	community/hwinfo/PKGBUILD
	community/kungfu/PKGBUILD
	community/liboauth/PKGBUILD
	community/liboobs/PKGBUILD
	community/lua-lzlib/PKGBUILD
	community/mcdp/PKGBUILD
	community/mingw32-gcc-base/PKGBUILD
	community/mingw32-runtime/PKGBUILD
	community/mplayer2/PKGBUILD
	community/pdf2svg/PKGBUILD
	community/perl-data-dumper/PKGBUILD
	community/perl-digest-md5/PKGBUILD
	community/perl-perlio-eol/PKGBUILD
	community/perl-xml-libxslt/PKGBUILD
	community/python-cherrypy/PKGBUILD
	community/python-pexpect/PKGBUILD
	community/python-pyro/PKGBUILD
	community/python2-cherrypy/PKGBUILD
	community/rexima/PKGBUILD
	community/shp2svg/PKGBUILD
	community/system-tools-backends/PKGBUILD
	community/tracker/PKGBUILD
	community/virtualbox/PKGBUILD
	core/bridge-utils/PKGBUILD
	extra/avidemux/PKGBUILD
	extra/beagle/PKGBUILD
	extra/bug-buddy/PKGBUILD
	extra/dssi/PKGBUILD
	extra/evolution-sharp/PKGBUILD
	extra/evolution-webcal/PKGBUILD
	extra/feh/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/gnome-mag/PKGBUILD
	extra/gnome-python-desktop/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/gok/PKGBUILD
	extra/gpsd/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/hyphen/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/keytouch-editor/PKGBUILD
	extra/keytouch/PKGBUILD
	extra/koffice/PKGBUILD
	extra/krusader/PKGBUILD
	extra/libbeagle/PKGBUILD
	extra/libffi/PKGBUILD
	extra/libgnomeuimm/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/m17n-lib/PKGBUILD
	extra/mtr/PKGBUILD
	extra/openbabel/PKGBUILD
	extra/poppler/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/rox/PKGBUILD
	extra/transmission/PKGBUILD
	extra/xf86-input-synaptics/PKGBUILD
	extra/xorg-server/PKGBUILD
	extra/xorg-xinit/PKGBUILD
	kde-unstable/calligra/PKGBUILD
	libre/icecat/PKGBUILD
	libre/linux-libre/PKGBUILD
	multilib/lib32-ncurses/PKGBUILD
	multilib/lib32-openssl/PKGBUILD
	multilib/lib32-talloc/PKGBUILD
	multilib/wine/PKGBUILD

3 files changed, 4 insertions, 83 deletions

diff --git a/community/collectd/PKGBUILD b/community/collectd/PKGBUILD
index 8efe669b1..9d4d70ec6 100644
--- a/community/collectd/PKGBUILD
+++ b/community/collectd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 56117 2011-10-02 02:52:22Z ebelanger $
+# $Id: PKGBUILD 56935 2011-10-17 07:29:09Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Gerhard Brauer <gerhard.brauer@web.de>
 
 pkgname=collectd
-pkgver=5.0.0
-pkgrel=7
+pkgver=5.0.1
+pkgrel=1
 pkgdesc='Daemon which collects system performance statistics periodically'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://collectd.org/'
@@ -42,13 +42,9 @@ makedepends=('curl' 'libdbi' 'libesmtp' 'libgcrypt' 'iptables' 'libmemcached'
 depends=('libtool')
 
 source=("${url}files/${pkgname}-${pkgver}.tar.gz"
-        'libnotify-0.7.patch'
-        'yajl-2.x.patch'
         'libperl.patch'
         'rc.d')
-sha1sums=('026e5121348f0e525dedb3844fe61c7713994bb7'
-          'f6fed097c16f6c9c90b9a32a5b8e48d54b35b337'
-          'd3854c39c9596b4f6dcf67a9eb8decea4d17120d'
+sha1sums=('ec1bf97d21a27d9b53b20f7dc4fb61441b4e42e0'
           'b221352447b2d42cade4a65ced322bcff8a40366'
           '0f441718d5519cb043b1130e5a1d0379078adbcc')
 
@@ -60,10 +56,6 @@ build() {
 	patch -p1 -i ../libperl.patch
 	autoconf
 
-	sed -i 's/ipt_error_target/bozo_error_target/g' src/owniptc/libiptc.c
-	patch -p1 -i ../libnotify-0.7.patch
-	patch -p1 -i ../yajl-2.x.patch
-
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
@@ -71,8 +63,6 @@ build() {
 		--enable-static=no \
 		--with-python=/usr/bin/python2
 
-	sed -i 's/ -Werror//g' */Makefile* */*/Makefile*
-
 	make all
 }
 
diff --git a/community/collectd/libnotify-0.7.patch b/community/collectd/libnotify-0.7.patch
deleted file mode 100644
index 5ea67047a..000000000
--- a/community/collectd/libnotify-0.7.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aur old/src/notify_desktop.c new/src/notify_desktop.c
---- old/src/notify_desktop.c	2011-03-07 23:50:24.096691200 +0100
-+++ new/src/notify_desktop.c	2011-03-07 23:52:35.486691201 +0100
-@@ -95,7 +95,7 @@
- 				: (NOTIF_WARNING == n->severity) ? "WARNING"
- 				: (NOTIF_OKAY == n->severity) ? "OKAY" : "UNKNOWN");
- 
--	notification = notify_notification_new (summary, n->message, NULL, NULL);
-+	notification = notify_notification_new (summary, n->message, NULL);
- 	if (NULL == notification) {
- 		log_err ("Failed to create a new notification.");
- 		return -1;
diff --git a/community/collectd/yajl-2.x.patch b/community/collectd/yajl-2.x.patch
deleted file mode 100644
index b90543dfe..000000000
--- a/community/collectd/yajl-2.x.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- old/src/curl_json.c	2011-04-25 20:43:00.972938855 -0400
-+++ new/src/curl_json.c	2011-04-25 20:46:03.859938860 -0400
-@@ -98,8 +98,7 @@
-     return (0);
- 
-   status = yajl_parse(db->yajl, (unsigned char *)buf, len);
--  if ((status != yajl_status_ok)
--      && (status != yajl_status_insufficient_data))
-+  if ((status != yajl_status_ok))
-   {
-     unsigned char *msg =
-       yajl_get_error(db->yajl, /* verbose = */ 1,
-@@ -130,7 +129,7 @@
- /* "number" may not be null terminated, so copy it into a buffer before
-  * parsing. */
- static int cj_cb_number (void *ctx,
--    const char *number, unsigned int number_len)
-+    const char *number, size_t number_len)
- {
-   char buffer[number_len + 1];
- 
-@@ -159,7 +158,7 @@
- } /* int cj_cb_number */
- 
- static int cj_cb_map_key (void *ctx, const unsigned char *val,
--                            unsigned int len)
-+                            size_t len)
- {
-   cj_t *db = (cj_t *)ctx;
-   c_avl_tree_t *tree;
-@@ -187,7 +186,7 @@
- }
- 
- static int cj_cb_string (void *ctx, const unsigned char *val,
--                           unsigned int len)
-+                           size_t len)
- {
-   cj_t *db = (cj_t *)ctx;
-   char str[len + 1];
-@@ -697,7 +696,7 @@
-   char *url;
-   yajl_handle yprev = db->yajl;
- 
--  db->yajl = yajl_alloc (&ycallbacks, NULL, NULL, (void *)db);
-+  db->yajl = yajl_alloc (&ycallbacks, NULL, (void *)db);
-   if (db->yajl == NULL)
-   {
-     ERROR ("curl_json plugin: yajl_alloc failed.");
-@@ -730,7 +729,7 @@
-     return (-1);
-   }
- 
--  status = yajl_parse_complete (db->yajl);
-+  status = yajl_complete_parse (db->yajl);
-   if (status != yajl_status_ok)
-   {
-     unsigned char *errmsg;