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

1 files changed, 0 insertions, 109 deletions

diff --git a/community/calibre/desktop_integration.patch b/community/calibre/desktop_integration.patch
deleted file mode 100644
index 4c756f5d4..000000000
--- a/community/calibre/desktop_integration.patch
+++ /dev/null
@@ -1,109 +0,0 @@
---- a/src/calibre/linux.py	2012-09-21 06:56:20.000000000 +0200
-+++ b/src/calibre/linux.py	2012-09-22 18:51:12.000000000 +0200
-@@ -179,19 +179,6 @@
-             self.setup_completion()
-         if islinux or isbsd:
-             self.setup_desktop_integration()
--        self.create_uninstaller()
--
--        from calibre.utils.config import config_dir
--        if os.path.exists(config_dir):
--            os.chdir(config_dir)
--            if islinux or isbsd:
--                for f in os.listdir('.'):
--                    if os.stat(f).st_uid == 0:
--                        import shutil
--                        shutil.rmtree(f) if os.path.isdir(f) else os.unlink(f)
--                if os.stat(config_dir).st_uid == 0:
--                    os.rmdir(config_dir)
--
-         if warn is None and self.warnings:
-             self.info('There were %d warnings'%len(self.warnings))
-             for args, kwargs in self.warnings:
-@@ -237,7 +224,7 @@
-                 if isnetbsd:
-                     f = os.path.join(self.opts.staging_root, 'share/bash_completion.d/calibre')
-                 else:
--                    f = os.path.join(self.opts.staging_etc, 'bash_completion.d/calibre')
-+                    f = os.path.join(self.opts.staging_root, 'usr/share/bash-completion/completions/calibre')
-             if not os.path.exists(os.path.dirname(f)):
-                 os.makedirs(os.path.dirname(f))
-             self.manifest.append(f)
-@@ -357,63 +344,39 @@
- 
-             with TemporaryDirectory() as tdir, CurrentDir(tdir), \
-                                 PreserveMIMEDefaults():
--                render_img('mimetypes/lrf.png', 'calibre-lrf.png')
--                cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png application-lrf', shell=True)
--                self.icon_resources.append(('mimetypes', 'application-lrf', '128'))
--                cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png text-lrs', shell=True)
--                self.icon_resources.append(('mimetypes', 'application-lrs',
--                '128'))
--                render_img('mimetypes/mobi.png', 'calibre-mobi.png')
--                cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-mobi.png application-x-mobipocket-ebook', shell=True)
--                self.icon_resources.append(('mimetypes', 'application-x-mobipocket-ebook', '128'))
--                render_img('mimetypes/tpz.png', 'calibre-tpz.png')
--                cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-tpz.png application-x-topaz-ebook', shell=True)
--                self.icon_resources.append(('mimetypes', 'application-x-topaz-ebook', '128'))
--                render_img('mimetypes/azw2.png', 'calibre-azw2.png')
--                cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-azw2.png application-x-kindle-application', shell=True)
--                self.icon_resources.append(('mimetypes', 'application-x-kindle-application', '128'))
--                render_img('mimetypes/azw3.png', 'calibre-azw3.png')
--                cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-azw3.png application-x-mobi8-ebook', shell=True)
--                self.icon_resources.append(('mimetypes', 'application-x-mobi8-ebook', '128'))
--                render_img('lt.png', 'calibre-gui.png', width=256, height=256)
--                cc('xdg-icon-resource install --noupdate --size 256 calibre-gui.png calibre-gui', shell=True)
--                self.icon_resources.append(('apps', 'calibre-gui', '128'))
--                render_img('viewer.png', 'calibre-viewer.png')
--                cc('xdg-icon-resource install --size 128 calibre-viewer.png calibre-viewer', shell=True)
--                self.icon_resources.append(('apps', 'calibre-viewer', '128'))
-+                dir = os.path.join(self.opts.staging_sharedir,'../pixmaps')
-+                os.mkdir(dir)
-+                render_img('mimetypes/lrf.png', os.path.join(dir,'calibre-lrf.png'))
-+                render_img('lt.png', os.path.join(dir, 'calibre-gui.png'))
-+                render_img('viewer.png', os.path.join(dir, 'calibre-viewer.png'))
- 
-                 mimetypes = set([])
-                 for x in all_input_formats():
-                     mt = guess_type('dummy.'+x)[0]
--                    if mt and 'chemical' not in mt and 'ctc-posml' not in mt:
-+                    if mt and 'chemical' not in mt and 'text' not in mt and 'pdf' not in mt and 'xhtml' not in mt:
-                         mimetypes.add(mt)
- 
-                 def write_mimetypes(f):
-                     f.write('MimeType=%s;\n'%';'.join(mimetypes))
- 
--                f = open('calibre-lrfviewer.desktop', 'wb')
-+                dir = os.path.join(self.opts.staging_sharedir,'../applications')
-+                os.mkdir(dir)
-+                f = open(os.path.join(dir, 'calibre-lrfviewer.desktop'), 'wb')
-                 f.write(VIEWER)
-                 f.close()
--                f = open('calibre-ebook-viewer.desktop', 'wb')
-+                f = open(os.path.join(dir, 'calibre-ebook-viewer.desktop'), 'wb')
-                 f.write(EVIEWER)
-                 write_mimetypes(f)
-                 f.close()
--                f = open('calibre-gui.desktop', 'wb')
-+                f = open(os.path.join(dir, 'calibre-gui.desktop'), 'wb')
-                 f.write(GUI)
-                 write_mimetypes(f)
-                 f.close()
--                des = ('calibre-gui.desktop', 'calibre-lrfviewer.desktop',
--                        'calibre-ebook-viewer.desktop')
--                for x in des:
--                    cmd = ['xdg-desktop-menu', 'install', '--noupdate', './'+x]
--                    cc(' '.join(cmd), shell=True)
--                    self.menu_resources.append(x)
--                cc(['xdg-desktop-menu', 'forceupdate'])
--                f = open('calibre-mimetypes.xml', 'wb')
-+                dir = os.path.join(self.opts.staging_sharedir,'../mime/packages/')
-+                os.makedirs(dir)
-+                f = open(os.path.join(dir, 'calibre.xml'), 'wb')
-                 f.write(MIME)
-                 f.close()
--                self.mime_resources.append('calibre-mimetypes.xml')
--                cc('xdg-mime install ./calibre-mimetypes.xml', shell=True)
-         except Exception:
-             if self.opts.fatal_errors:
-                 raise