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

4 files changed, 0 insertions, 86 deletions

diff --git a/extra/vice/vice-2.3-no-fc-cache.patch b/extra/vice/vice-2.3-no-fc-cache.patch
deleted file mode 100644
index 7efdc87c7..000000000
--- a/extra/vice/vice-2.3-no-fc-cache.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/configure.in	2011-02-19 23:07:05.000000000 +0100
-+++ b/configure.in	2012-08-06 13:18:46.000000000 +0200
-@@ -1990,12 +1990,7 @@
- 
- fi
- 
--AC_PATH_PROGS(FCCACHE, fc-cache, false)
--if test x"$FCCACHE" = "xfalse"; then
-   AM_CONDITIONAL(HAVE_FC_CACHE, false)
--else
--  AM_CONDITIONAL(HAVE_FC_CACHE, true)
--fi
- 
- if test x"$is_amigaos4" = "xyes"; then
-   if test x"$enable_sdlui" != "xyes"; then
diff --git a/extra/vice/vice-2.3-notexi-notxt.patch b/extra/vice/vice-2.3-notexi-notxt.patch
deleted file mode 100644
index f26ac0beb..000000000
--- a/extra/vice/vice-2.3-notexi-notxt.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/doc/Makefile.am	2011-02-05 17:52:48.000000000 +0100
-+++ b/doc/Makefile.am	2012-08-06 14:33:37.000000000 +0200
-@@ -48,14 +48,7 @@
- $(srcdir)/vice.txt:	vice.texi
- 	$(MAKEINFO) -o $(srcdir)/vice.txt --no-headers $(srcdir)/vice.texi
- 
--if BUILD_PDF
--$(srcdir)/vice.pdf:	vice.texi
--	$(TEXI2DVI) -q --clean --pdf -o $(srcdir)/vice.pdf $(srcdir)/vice.texi
--
--PDF_DEPS=$(srcdir)/vice.pdf
--else
- PDF_DEPS=
--endif
- 
- if BUILD_AMIGAGUIDE
- $(srcdir)/vice.guide:	vice.texi
-@@ -99,4 +92,4 @@
- IPF_DEPS=
- endif
- 
--INFO_DEPS = $(srcdir)/vice.txt $(srcdir)/vice.info $(PDF_DEPS) $(GUIDE_DEPS) $(HLP_DEPS) $(CHM_DEPS) $(IPF_DEPS)
-+INFO_DEPS = $(srcdir)/vice.info $(PDF_DEPS) $(GUIDE_DEPS) $(HLP_DEPS) $(CHM_DEPS) $(IPF_DEPS)
diff --git a/extra/vice/vice-2.3-x11video.patch b/extra/vice/vice-2.3-x11video.patch
deleted file mode 100644
index d698638c6..000000000
--- a/extra/vice/vice-2.3-x11video.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/arch/unix/x11/xaw/x11video.c	2011-01-18 23:59:00.000000000 +0100
-+++ b/src/arch/unix/x11/xaw/x11video.c	2011-02-27 18:40:52.000000000 +0100
-@@ -60,6 +60,8 @@
- #include <X11/Xutil.h>
- #include <X11/Intrinsic.h>
- #include <X11/cursorfont.h>
-+#include <X11/Xmd.h>
-+#include <X11/extensions/shmproto.h>
- 
- #include <stdio.h>
- #include <stdlib.h>
diff --git a/extra/vice/vice-2.3-zlib-1.2.7.patch b/extra/vice/vice-2.3-zlib-1.2.7.patch
deleted file mode 100644
index 079a8d6bd..000000000
--- a/extra/vice/vice-2.3-zlib-1.2.7.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/src/zfile.c	2010-07-16 20:20:01.000000000 +0200
-+++ b/src/zfile.c	2012-08-06 15:29:10.000000000 +0200
-@@ -197,10 +197,10 @@
-     do {
-         char buf[256];
- 
--        len = gzread(fdsrc, (void *)buf, 256);
-+        len = gzread((gzFile)fdsrc, (void *)buf, 256);
-         if (len > 0) {
-             if (fwrite((void *)buf, 1, (size_t)len, fddest) < len) {
--                gzclose(fdsrc);
-+                gzclose((gzFile)fdsrc);
-                 fclose(fddest);
-                 ioutil_remove(tmp_name);
-                 lib_free(tmp_name);
-@@ -209,7 +209,7 @@
-         }
-     } while (len > 0);
- 
--    gzclose(fdsrc);
-+    gzclose((gzFile)fdsrc);
-     fclose(fddest);
- 
-     return tmp_name;
-@@ -792,10 +792,10 @@
-         char buf[256];
-         len = fread((void *)buf, 256, 1, fdsrc);
-         if (len > 0)
--            gzwrite(fddest, (void *)buf, (unsigned int)len);
-+            gzwrite((gzFile)fddest, (void *)buf, (unsigned int)len);
-     } while (len > 0);
- 
--    gzclose(fddest);
-+    gzclose((gzFile)fddest);
-     fclose(fdsrc);
- 
-     archdep_file_set_gzip(dest);