Merge branch 'master' of git://projects.parabolagnulinux.org/abslibre

3 files changed, 61 insertions, 54 deletions

diff --git a/libre/abs/PKGBUILD b/libre/abs/PKGBUILD
index e9f313c9c..de26ac1ae 100644
--- a/libre/abs/PKGBUILD
+++ b/libre/abs/PKGBUILD
@@ -1,9 +1,13 @@
 # $Id: PKGBUILD 215815 2014-06-30 16:27:03Z fyan $
 # Maintainer (Arch): Allan McRae <allan@archlinux.org>
+# Maintainer: André Silva <emulatorman@parabola.nu>
+# Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
+# Contributor: Nicolás Reynolds <fauno@kiwwwi.com.ar>
+# Contributor: Aditya Som <icarious@hacari.org>
 
 pkgname=abs
 pkgver=2.4.4
-pkgrel=2.parabola1
+pkgrel=2.parabola2
 pkgdesc="Utilities to download and work with the Arch Build System (ABS), with Parabola repos support"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://projects.archlinux.org/abs.git/"
@@ -33,13 +37,13 @@ package() {
 
   # make adjustments to abs.conf
   sed -i -e 's|i686 or x86_64|i686, x86_64 or mips64el|' "${pkgdir}"/etc/abs.conf
-  sed -i -e 's|rsync.archlinux.org|parabolagnulinux.org|' "${pkgdir}"/etc/abs.conf
+  sed -i -e 's|rsync.archlinux.org|repo.parabola.nu|' "${pkgdir}"/etc/abs.conf
+  sed -i -e 's|repo.parabola.nu["]|repo.parabola.nu"\nSYNCARGS="$SYNCARGS --port=875"|' "${pkgdir}"/etc/abs.conf
   sed -i -e 's|(core|(libre !libre-testing core|' "${pkgdir}"/etc/abs.conf
-  sed -i -e 's|!staging !community-staging !gnome-unstable !kde-unstable|!pcr !nonprism !kernels !cross !java !java-ugly !~smv !~xihh !~brendan !~lukeshu !~emulatorman !~aurelien !~jorginho !~coadde !~drtan|' "${pkgdir}"/etc/abs.conf
+  sed -i -e 's|!staging !community-staging !gnome-unstable !kde-unstable|!pcr !nonprism !nonprism-testing !kernels !cross !java !java-ugly !~smv !~xihh !~brendan !~lukeshu !~emulatorman !~aurelien !~jorginho !~coadde !~drtan|' "${pkgdir}"/etc/abs.conf
   if [[ $CARCH != "x86_64" ]]; then
     sed -i -e 's| multilib||' -e 's| !multilib-testing||' "${pkgdir}"/etc/abs.conf
-  fi
-  if [[ $CARCH = "x86_64" ]]; then
+  else
     sed -i -e 's|community|community libre-multilib|' -e 's|!community-testing|!community-testing !libre-multilib-testing|' "${pkgdir}"/etc/abs.conf
   fi
   sed -i "s/ARCH=.*/ARCH=$CARCH/" "${pkgdir}"/etc/abs.conf
diff --git a/libre/calibre/PKGBUILD b/libre/calibre/PKGBUILD
index 83366a96c..1e2173062 100644
--- a/libre/calibre/PKGBUILD
+++ b/libre/calibre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 119667 2014-09-27 18:34:38Z jelle $
+# $Id: PKGBUILD 120110 2014-10-03 20:08:48Z jelle $
 # Maintainer (Arch): Jelle van der Waa <jelle@vdwaa.nl>
 # Maintainer (Arch): Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor (Arch): Giovanni Scafora <giovanni@archlinux.org>
@@ -9,8 +9,8 @@
 
 pkgname=calibre
 _pkgname=$pkgname-libre
-pkgver=2.4.0
-pkgrel=1.parabola2
+pkgver=2.5.0
+pkgrel=1.parabola1
 pkgdesc="Ebook management application, without nonfree decompression engine for RAR archives"
 arch=('i686' 'x86_64' 'mips64el') 
 url="http://$pkgname-ebook.com/"
@@ -32,9 +32,9 @@ install=$pkgname.install
 mksource=("http://download.$pkgname-ebook.com/${pkgver}/$pkgname-${pkgver}.tar.xz")
 source=("https://repo.parabolagnulinux.org/other/${_pkgname}/${_pkgname}-${pkgver}.tar.xz"
         'libre.patch')
-mkmd5sums=('fc8f9b03879b959aa7d18b460f285eeb')
-md5sums=('4e044ab495aa4e6689765c8f7c4811d2'
-         '343162b9d1c97c0463d4919a8b9ac500')
+mkmd5sums=('f368f3f313fd5b8bc2d119edd9414318')
+md5sums=('7007c04112d24c2e108c629c132d4355'
+         '2c83d9289f381054ff279358ccd31d61')
 
 mksource(){
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/libre/calibre/libre.patch b/libre/calibre/libre.patch
index 7f1bdb6ee..449864c17 100644
--- a/libre/calibre/libre.patch
+++ b/libre/calibre/libre.patch
@@ -1,18 +1,21 @@
-diff -Nur calibre-1.204.1.orig/resources/images.qrc calibre-1.204.1/resources/images.qrc
---- calibre-1.204.1.orig/resources/images.qrc	1989-12-31 22:00:00.000000000 -0200
-+++ calibre-1.204.1/resources/images.qrc	2014-08-03 19:38:32.047600280 -0300
-@@ -193,8 +193,6 @@
+diff -Nur calibre-2.5.0.orig/resources/images.qrc calibre-2.5.0/resources/images.qrc
+--- calibre-2.5.0.orig/resources/images.qrc	1989-12-31 22:00:00.000000000 -0200
++++ calibre-2.5.0/resources/images.qrc	2014-10-04 19:24:44.275781452 -0300
+@@ -179,11 +179,9 @@
+ <file>images/mimetypes/html.png</file>
+ <file>images/mimetypes/xps.png</file>
  <file>images/mimetypes/svg.png</file>
- <file>images/mimetypes/odt.png</file>
- <file>images/mimetypes/epub.png</file>
 -<file>images/mimetypes/cbr.png</file>
--<file>images/mimetypes/rar.png</file>
  <file>images/mimetypes/tpz.png</file>
- <file>images/mimetypes/djvu.png</file>
- <file>images/mimetypes/computer.png</file>
+ <file>images/mimetypes/snb.png</file>
+ <file>images/mimetypes/png.png</file>
+-<file>images/mimetypes/rar.png</file>
+ <file>images/mimetypes/mobi.png</file>
+ <file>images/mimetypes/gif.png</file>
+ <file>images/mimetypes/pdf.png</file>
 @@ -214,4 +212,4 @@
- <file>images/mimetypes/html.png</file>
- <file>images/mimetypes/lrx.png</file>
+ <file>images/plugins/plugin_updater_updates.png</file>
+ <file>images/plugins/plugin_upgrade_valid.png</file>
  </qresource>
 -</RCC>
 \ No newline at end of file
@@ -55,10 +58,10 @@ diff -Nur calibre-1.204.1.orig/session.vim calibre-1.204.1/session.vim
              \'src/qt-harfbuzz/src',
              \'/usr/include/ImageMagick',
              \]
-diff -Nur calibre-1.204.1.orig/setup/extensions.py calibre-1.204.1/setup/extensions.py
---- calibre-1.204.1.orig/setup/extensions.py	1989-12-31 22:00:00.000000000 -0200
-+++ calibre-1.204.1/setup/extensions.py	2014-08-03 19:37:20.290255565 -0300
-@@ -229,24 +229,6 @@
+diff -Nur calibre-2.5.0.orig/setup/extensions.py calibre-2.5.0/setup/extensions.py
+--- calibre-2.5.0.orig/setup/extensions.py	1989-12-31 22:00:00.000000000 -0200
++++ calibre-2.5.0/setup/extensions.py	2014-10-04 19:23:44.118602581 -0300
+@@ -230,24 +230,6 @@
                  sip_files=['calibre/ebooks/pdf/render/qt_hack.sip']
                  ),
  
@@ -95,10 +98,10 @@ diff -Nur calibre-1.204.1.orig/setup/installer/windows/freeze.py calibre-1.204.1
                          'progress_indicator.pyd', 'hunspell.pyd',
                          # As per this https://bugs.launchpad.net/bugs/1087816
                          # on some systems magick.pyd fails to load from memory
-diff -Nur calibre-1.204.1.orig/setup/resources.py calibre-1.204.1/setup/resources.py
---- calibre-1.204.1.orig/setup/resources.py	1989-12-31 22:00:00.000000000 -0200
-+++ calibre-1.204.1/setup/resources.py	2014-08-03 19:37:20.290255565 -0300
-@@ -280,7 +280,7 @@
+diff -Nur calibre-2.5.0.orig/setup/resources.py calibre-2.5.0/setup/resources.py
+--- calibre-2.5.0.orig/setup/resources.py	1989-12-31 22:00:00.000000000 -0200
++++ calibre-2.5.0/setup/resources.py	2014-10-04 19:23:44.118602581 -0300
+@@ -285,7 +285,7 @@
              log = Log()
              # log.outputs = []
              for inf in supported_input_formats():
@@ -233,10 +236,10 @@ diff -Nur calibre-1.204.1.orig/src/calibre/devices/mtp/filesystem_cache.py calib
  
  class FileOrFolder(object):
  
-diff -Nur calibre-1.204.1.orig/src/calibre/ebooks/__init__.py calibre-1.204.1/src/calibre/ebooks/__init__.py
---- calibre-1.204.1.orig/src/calibre/ebooks/__init__.py	1989-12-31 22:00:00.000000000 -0200
-+++ calibre-1.204.1/src/calibre/ebooks/__init__.py	2014-08-03 19:37:20.290255565 -0300
-@@ -26,9 +26,9 @@
+diff -Nur calibre-2.5.0.orig/src/calibre/ebooks/__init__.py calibre-2.5.0/src/calibre/ebooks/__init__.py
+--- calibre-2.5.0.orig/src/calibre/ebooks/__init__.py	1989-12-31 22:00:00.000000000 -0200
++++ calibre-2.5.0/src/calibre/ebooks/__init__.py	2014-10-04 19:23:44.121935941 -0300
+@@ -25,9 +25,9 @@
  class ParserError(ValueError):
      pass
  
@@ -419,10 +422,10 @@ diff -Nur calibre-1.204.1.orig/src/calibre/gui2/actions/add.py calibre-1.204.1/s
          if paths:
              self.do_add_recursive(paths[0], single)
  
-diff -Nur calibre-1.204.1.orig/src/calibre/gui2/add.py calibre-1.204.1/src/calibre/gui2/add.py
---- calibre-1.204.1.orig/src/calibre/gui2/add.py	1989-12-31 22:00:00.000000000 -0200
-+++ calibre-1.204.1/src/calibre/gui2/add.py	2014-08-03 19:37:20.293588940 -0300
-@@ -84,11 +84,8 @@
+diff -Nur calibre-2.5.0.orig/src/calibre/gui2/add.py calibre-2.5.0/src/calibre/gui2/add.py
+--- calibre-2.5.0.orig/src/calibre/gui2/add.py	1989-12-31 22:00:00.000000000 -0200
++++ calibre-2.5.0/src/calibre/gui2/add.py	2014-10-04 19:23:44.121935941 -0300
+@@ -85,11 +85,8 @@
                  prints('Corrupt ZIP file, trying to use local headers')
                  from calibre.utils.localunzip import extractall
                  extractall(self.path, self.tdir)
@@ -435,7 +438,7 @@ diff -Nur calibre-1.204.1.orig/src/calibre/gui2/add.py calibre-1.204.1/src/calib
  
      def run(self):
          if self.tdir is not None:
-@@ -292,7 +289,7 @@
+@@ -296,7 +293,7 @@
          self.pd.canceled_signal.connect(self.canceled)
  
      def add_recursive(self, root, single=True):
@@ -456,10 +459,10 @@ diff -Nur calibre-1.204.1.orig/src/calibre/library/server/opds.py calibre-1.204.
  
  def url_for(name, version, **kwargs):
      if not name.endswith('_'):
-diff -Nur calibre-1.204.1.orig/src/calibre/linux.py calibre-1.204.1/src/calibre/linux.py
---- calibre-1.204.1.orig/src/calibre/linux.py	1989-12-31 22:00:00.000000000 -0200
-+++ calibre-1.204.1/src/calibre/linux.py	2014-08-03 19:37:20.293588940 -0300
-@@ -316,7 +316,7 @@
+diff -Nur calibre-2.5.0.orig/src/calibre/linux.py calibre-2.5.0/src/calibre/linux.py
+--- calibre-2.5.0.orig/src/calibre/linux.py	1989-12-31 22:00:00.000000000 -0200
++++ calibre-2.5.0/src/calibre/linux.py	2014-10-04 19:23:44.121935941 -0300
+@@ -312,7 +312,7 @@
          ):
              for fmt in fmts:
                  is_input = group_title == input_group
@@ -468,10 +471,10 @@ diff -Nur calibre-1.204.1.orig/src/calibre/linux.py calibre-1.204.1/src/calibre/
                      continue
                  p = (get_parser(input_fmt=fmt) if is_input
                       else get_parser(output_fmt=fmt))
-diff -Nur calibre-1.204.1.orig/src/calibre/test_build.py calibre-1.204.1/src/calibre/test_build.py
---- calibre-1.204.1.orig/src/calibre/test_build.py	1989-12-31 22:00:00.000000000 -0200
-+++ calibre-1.204.1/src/calibre/test_build.py	2014-08-03 19:37:20.293588940 -0300
-@@ -139,11 +139,6 @@
+diff -Nur calibre-2.5.0.orig/src/calibre/test_build.py calibre-2.5.0/src/calibre/test_build.py
+--- calibre-2.5.0.orig/src/calibre/test_build.py	1989-12-31 22:00:00.000000000 -0200
++++ calibre-2.5.0/src/calibre/test_build.py	2014-10-04 19:23:44.125269302 -0300
+@@ -143,11 +143,6 @@
          raise RuntimeError('PIL choked!')
      print ('PIL OK!')
  
@@ -483,7 +486,7 @@ diff -Nur calibre-1.204.1.orig/src/calibre/test_build.py calibre-1.204.1/src/cal
  def test_ssl():
      import ssl
      ssl
-@@ -217,7 +212,6 @@
+@@ -222,7 +217,6 @@
      test_sqlite()
      test_apsw()
      test_imaging()
@@ -705,10 +708,10 @@ diff -Nur calibre-1.204.1.orig/src/calibre/web/feeds/feedparser.py calibre-1.204
  
      def __init__(self, data, baseuri, encoding):
          self.document = BeautifulSoup.BeautifulSoup(data)
-diff -Nur calibre-1.204.1.orig/translations/calibre/main.pot calibre-1.204.1/translations/calibre/main.pot
---- calibre-1.204.1.orig/translations/calibre/main.pot	1989-12-31 22:00:00.000000000 -0200
-+++ calibre-1.204.1/translations/calibre/main.pot	2014-08-03 19:37:20.296922310 -0300
-@@ -3906,7 +3906,7 @@
+diff -Nur calibre-2.5.0.orig/translations/calibre/main.pot calibre-2.5.0/translations/calibre/main.pot
+--- calibre-2.5.0.orig/translations/calibre/main.pot	1989-12-31 22:00:00.000000000 -0200
++++ calibre-2.5.0/translations/calibre/main.pot	2014-10-04 19:23:44.131936026 -0300
+@@ -4028,7 +4028,7 @@
  msgstr ""
  
  #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:42
@@ -716,8 +719,8 @@ diff -Nur calibre-1.204.1.orig/translations/calibre/main.pot calibre-1.204.1/tra
 +msgid "Extract common e-book formats from archives (zip) files. Also try to autodetect if they are actually cbz files."
  msgstr ""
  
- #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:644
-@@ -11087,7 +11087,7 @@
+ #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:652
+@@ -11554,7 +11554,7 @@
  msgstr ""
  
  #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:33