[Lunar-commits] <moonbase-kde> Merge branch 'master' of github.com:lunar-linux/moonbase-kde

[Dennis Veatch]

commit 91fbef4064429e1a48e04b95f9964b7c71605563
Author: Dennis Veatch <dennisveatch at bellsouth.net>
Date: Sat, 27 Dec 2014 08:50:48 -0500
URL: https://github.com/lunar-linux/moonbase-kde/commit/91fbef4064429e1a48e04b95f9964b7c71605563

Merge branch 'master' of github.com:lunar-linux/moonbase-kde
---
  qt4-apps/calibre/BUILD   | +1/-8     
  qt4-apps/calibre/DEPENDS | +1/-1     
  qt4-apps/calibre/DETAILS | +3/-4     
  3 files changed, 5 insertions(+), 13 deletions(-)

--- a/qt4-apps/calibre/BUILD
+++ b/qt4-apps/calibre/BUILD
@@ -1,17 +1,10 @@
-(
-
-  . /etc/profile.d/qt4.rc &&
+  . /etc/profile.d/qt5.rc &&
 
   python setup.py build &&
 
-# Fix the depreciated warning about SYSFS and udev.
-  sedit "s:SYSFS:ATTR:g" src/calibre/linux.py &&
-  sedit "s:BUS:SUBSYSTEM:g" src/calibre/linux.py &&
-
   prepare_install  &&
 
   python setup.py install . &&
 
   sedit "s:Icon=calibre-gui:Icon=/usr/share/icons/hicolor/256x256/apps/calibre-gui.png:" /usr/share/applications/calibre-gui.desktop &&
   sedit "s:Icon=calibre-ebook-edit:Icon=/usr/share/icons/hicolor/256x256/apps/calibre-ebook-edit.png:" /usr/share/applications/calibre-ebook-edit.desktop
-) > $C_FIFO 2>&1
--- a/qt4-apps/calibre/DEPENDS
+++ b/qt4-apps/calibre/DEPENDS
@@ -1,6 +1,6 @@
 depends setuptools
 depends pil
-depends PyQt
+depends PyQt5
 depends mechanize
 depends ImageMagick
 depends xdg-utils
--- a/qt4-apps/calibre/DETAILS
+++ b/qt4-apps/calibre/DETAILS
@@ -1,13 +1,12 @@
           MODULE=calibre
-         VERSION=1.48.0
+         VERSION=2.12.0
           SOURCE=$MODULE-$VERSION.tar.xz
    SOURCE_URL[0]=http://download.calibre-ebook.com/$VERSION
    SOURCE_URL[1]=$SFORGE_URL/$MODULE
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
-      SOURCE_VFY=sha256:e704090f6611c5e374252c3f1b58e077ccd3170a3ea39893e5bf687287abf472
+      SOURCE_VFY=sha256:8e32f55086ce2f64855fae33df1799758b6b5cfbd9c8052af2ee59e30c56e3e2
         WEB_SITE=http://www.calibre-ebook.com
          ENTERED=20090108
-         UPDATED=20140905
+         UPDATED=20141218
            SHORT="eBook management"
 
 cat << EOF