rename to calibre

3 files changed, 13 insertions, 14 deletions

diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre/PKGBUILD
index c3fb79ade..31c49b5e4 100644
--- a/libre/calibre-libre/PKGBUILD
+++ b/libre/calibre/PKGBUILD
@@ -7,13 +7,13 @@
 # Contributor (Arch): Larry Hajali <larryhaja@gmail.com>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-_pkgname=calibre
-pkgname=calibre-libre
+pkgname=calibre
+_pkgname=$pkgname-libre
 pkgver=2.1.0
 pkgrel=1
 pkgdesc="Ebook management application, without nonfree decompression engine for RAR archives"
 arch=('i686' 'x86_64' 'mips64el') 
-url="http://calibre-ebook.com/"
+url="http://$pkgname-ebook.com/"
 license=('GPL3')
 depends=('python2-six' 'python2-dateutil' 'python2-cssutils' 'python2-cherrypy' 
          'python2-mechanize' 'podofo' 'libwmf'
@@ -23,20 +23,19 @@ depends=('python2-six' 'python2-dateutil' 'python2-cssutils' 'python2-cherrypy'
          'python2-netifaces' 'python2-cssselect' 'python2-apsw' 'qt5-webkit'
          'qt5-svg' 'python2-chardet' 'python2-html5lib')
 makedepends=('python2-pycountry' 'qt5-x11extras' )
-optdepends=('ipython2: to use calibre-debug')
+optdepends=("ipython2: to use $pkgname-debug")
 replaces=($_pkgname)
 conflicts=($_pkgname)
-provides=($_pkgname=$pkgver)
-install=calibre.install
-mksource=("http://download.calibre-ebook.com/${pkgver}/calibre-${pkgver}.tar.xz")
-source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz"
+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=('db212364419212846719a9d392878c16')
 md5sums=('9c7c1c246d558a08c9a1f064ba7681f5'
          '343162b9d1c97c0463d4919a8b9ac500')
 
 mksource(){
-  cd "${srcdir}/${_pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   # Remove nonfree unRAR utility files from the source
   rm -rv src/unrar
@@ -46,13 +45,13 @@ prepare(){
   cd "${srcdir}/${_pkgname}-${pkgver}"
   
   # Remove nonfree rar/cbr support and references
-  rm -v src/calibre/{ebooks/metadata/rar.py,utils/unrar.{cpp,py}}
+  rm -v src/$pkgname/{ebooks/metadata/rar.py,utils/unrar.{cpp,py}}
   rm -v resources/images/mimetypes/{cbr,rar}.png
   rm -v imgsrc/mimetypes/rar.svg
   patch -Np1 -i "${srcdir}/libre.patch"
 
   # Remove unneeded files and libs
-  rm -rf resources/${_pkgname}-portable.* \
+  rm -rf resources/${pkgname}-portable.* \
          src/six.py \
          src/cherrypy \
          src/html5lib \
@@ -78,7 +77,7 @@ prepare(){
 \                os.mkdir(dir)" \
       -e "s/'ctc-posml'/'text' not in mt and 'pdf' not in mt and 'xhtml'/" \
       -e "s/^Name=calibre/Name=Calibre/g" \
-      -i  src/calibre/linux.py
+      -i  src/$pkgname/linux.py
 }
 
 build() {
@@ -106,6 +105,6 @@ package() {
     --staging-sharedir="${pkgdir}/usr/share"
 
   # Compiling bytecode FS#33392
-  python2 -m compileall "${pkgdir}/usr/lib/calibre/"
-  python2 -O -m compileall "${pkgdir}/usr/lib/calibre/"
+  python2 -m compileall "${pkgdir}/usr/lib/$pkgname/"
+  python2 -O -m compileall "${pkgdir}/usr/lib/$pkgname/"
 }
diff --git a/libre/calibre-libre/calibre.install b/libre/calibre/calibre.install
index 6210bd0ab..6210bd0ab 100644
--- a/libre/calibre-libre/calibre.install
+++ b/libre/calibre/calibre.install
diff --git a/libre/calibre-libre/libre.patch b/libre/calibre/libre.patch
index 7f1bdb6ee..7f1bdb6ee 100644
--- a/libre/calibre-libre/libre.patch
+++ b/libre/calibre/libre.patch