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

diff --git a/extra/bootchart/README.patch b/extra/bootchart/README.patch
deleted file mode 100644
index 195052d0a..000000000
--- a/extra/bootchart/README.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4d34b379411f781a494b4775260d550ff61e22e4 Mon Sep 17 00:00:00 2001
-From: Tom Gundersen <teg@jklm.no>
-Date: Fri, 16 Mar 2012 01:34:10 +0100
-Subject: [PATCH] README: point to the correct location of the binary
-
----
- README   |    2 +-
- 1 file changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/README b/README
-index fa1d730..1906abb 100644
---- a/README
-+++ b/README
-@@ -6,7 +6,7 @@ Bootchart - a 'startup' graphing tool
- Bootchart is a tool, usually run at system startup, that collects and graphs
- the CPU and disk load of the system as it works. The output of bootchart is
- an SVG graph. Normally, bootchart is invoked as `bootchartd` by the kernel
--by passing "init=/sbin/bootchartd" to the kernel. Bootchart will then fork
-+by passing "init=/usr/bin/bootchartd" to the kernel. Bootchart will then fork
- init off to resume normal system startup, while monitoring and logging
- startup information in the background.
- 
--- 
-1.7.9.5
-
diff --git a/extra/bootchart/build.patch b/extra/bootchart/build.patch
deleted file mode 100644
index 91ca34def..000000000
--- a/extra/bootchart/build.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 4d34b379411f781a494b4775260d550ff61e22e4 Mon Sep 17 00:00:00 2001
-From: Tom Gundersen <teg@jklm.no>
-Date: Fri, 16 Mar 2012 01:34:10 +0100
-Subject: [PATCH] Makefile: move binary and avoid empty dirs
-
-Install to /usr/bin by default, and don't install an empty /etc.
-
-v2: Adjust README to reflect the change.
----
- Makefile |   10 ++++------
- README   |    2 +-
- 2 files changed, 5 insertions(+), 7 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 2150ed3..ae432fa 100644
---- a/Makefile
-+++ b/Makefile
-@@ -6,12 +6,10 @@ CC := gcc
- all: bootchartd
- 
- install: bootchartd
--	mkdir -p $(DESTDIR)/sbin
--	mkdir -p $(DESTDIR)/etc
--	mkdir -p $(DESTDIR)/usr/share/doc/bootchart/
--	install -m0755 bootchartd $(DESTDIR)/sbin/
--	install -m0644 bootchartd.conf.example $(DESTDIR)/usr/share/doc/bootchart/
--	install -m0644 README COPYING $(DESTDIR)/usr/share/doc/bootchart/
-+	install -d $(DESTDIR)/usr/bin
-+	install -d $(DESTDIR)/usr/share/doc/bootchart
-+	install -m0755 bootchartd $(DESTDIR)/usr/bin/
-+	install -m0644 README COPYING bootchartd.conf.example $(DESTDIR)/usr/share/doc/bootchart/
- 
- OBJS := log.o svg.o bootchart.o
- 
-diff --git a/README b/README
-index fa1d730..1906abb 100644
---- a/README
-+++ b/README
-@@ -6,7 +6,7 @@ Bootchart - a 'startup' graphing tool
- Bootchart is a tool, usually run at system startup, that collects and graphs
- the CPU and disk load of the system as it works. The output of bootchart is
- an SVG graph. Normally, bootchart is invoked as `bootchartd` by the kernel
--by passing "init=/sbin/bootchartd" to the kernel. Bootchart will then fork
-+by passing "init=/usr/bin/bootchartd" to the kernel. Bootchart will then fork
- init off to resume normal system startup, while monitoring and logging
- startup information in the background.
- 
--- 
-1.7.9.5
-