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

diff --git a/community/onboard/1012_1011.diff b/community/onboard/1012_1011.diff
deleted file mode 100644
index 233478ac9..000000000
--- a/community/onboard/1012_1011.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-=== modified file 'setup.py'
---- setup.py	2012-08-09 13:21:31 +0000
-+++ setup.py	2012-10-18 17:17:38 +0000
-@@ -11,12 +11,6 @@
- from distutils.core import Extension, Command
- from distutils      import version
- 
--# Work around encoding error in python3-distutils-extra
--# when building in pbuilder with LANG=C (LP# 1017468).
--if sys.version_info.major == 3:
--    import locale
--    locale.getpreferredencoding = lambda: 'UTF-8'
--
- try:
-     import DistUtilsExtra.auto
- except ImportError:
-
diff --git a/community/onboard/1013_1012.diff b/community/onboard/1013_1012.diff
deleted file mode 100644
index a00b4ecf9..000000000
--- a/community/onboard/1013_1012.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-=== modified file 'Onboard/Config.py'
---- Onboard/Config.py	2012-10-18 16:17:12 +0000
-+++ Onboard/Config.py	2012-10-18 17:19:00 +0000
-@@ -73,7 +73,7 @@
- DEFAULT_RESIZE_HANDLES     = list(Handle.RESIZERS)
- 
- SCHEMA_VERSION_0_97         = Version(1, 0)   # Onboard 0.97
--SCHEMA_VERSION_0_98       = Version(2, 0)   # Onboard 0.97.1
-+SCHEMA_VERSION_0_98         = Version(2, 0)   # Onboard 0.97.1
- SCHEMA_VERSION              = SCHEMA_VERSION_0_98
- 
- 
-@@ -145,7 +145,7 @@
-         Singleton magic.
-         """
-         if not hasattr(cls, "self"):
--            cls.self = object.__new__(cls, args, kwargs)
-+            cls.self = object.__new__(cls, *args, **kwargs)
-             cls.self.construct()
-         return cls.self
- 
-