[arch-commits] Commit in eric/trunk (ChangeLog PKGBUILD)

[Evgeniy Alekseev]

    Date: Friday, January 2, 2015 @ 07:54:22
  Author: arcanis
Revision: 125153

upgpkg: eric 6.0.0-1
* split to qt4 and qt5 packages

Modified:
  eric/trunk/ChangeLog
  eric/trunk/PKGBUILD

-----------+
 ChangeLog |    4 ++
 PKGBUILD  |  100 ++++++++++++++++++++++++++++++++++++++++++++++++------------
 2 files changed, 84 insertions(+), 20 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2015-01-02 06:36:58 UTC (rev 125152)
+++ ChangeLog	2015-01-02 06:54:22 UTC (rev 125153)
@@ -1,3 +1,7 @@
+6.0.0-1:
+* upstream update
+* split to qt5 and qt4 packages
+
 5.5.2-1:
 upstream update
 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-01-02 06:36:58 UTC (rev 125152)
+++ PKGBUILD	2015-01-02 06:54:22 UTC (rev 125153)
@@ -5,38 +5,44 @@
 # See .contrib for older/other contributors
 
 pkgbase=eric
-pkgname=('eric-common' 'eric' 'python2-eric')
-pkgver=5.5.2
+pkgname=('eric-common-qt4' 'eric-qt4' 'python2-eric-qt4'
+         'eric-common' 'eric' 'python2-eric')
+pkgver=6.0.0
 pkgrel=1
 pkgdesc="A full-featured Python and Ruby IDE in PyQt4"
 arch=('any')
 url="http://eric-ide.python-projects.org/"
 license=('GPL3')
-depends=('python-qscintilla' 'python2-qscintilla')
+depends=('python-qscintilla' 'python2-qscintilla'
+         'python-qscintilla-qt5' 'python2-qscintilla-qt5'
+         'qt5-svg' 'qt5-webkit')
 install=${pkgbase}.install
-source=("http://downloads.sourceforge.net/eric-ide/eric5-${pkgver}.tar.gz")
-md5sums=('02e19a78056b0bc32e851753ec767e34')
+source=("http://downloads.sourceforge.net/eric-ide/eric6-${pkgver}.tar.gz")
+md5sums=('86d16e78fbf6a17f91181876f2ee86d9')
 changelog=ChangeLog
 
 prepare() {
-  cp -r "${srcdir}/eric5-${pkgver}"{,_py2}
+  cp -r "${srcdir}/eric6-${pkgver}"{,_py2}
 
-  cd "${srcdir}/eric5-${pkgver}_py2/eric"
+  cd "${srcdir}/eric6-${pkgver}_py2/eric"
   find . -name '*.py' -exec \
     sed -i -r "s:^#!/usr/bin/(env |)python(3|)$:#!/usr/bin/env python2:" {} \;
+
+  cp -r "${srcdir}/eric6-${pkgver}"{,-qt4}
+  cp -r "${srcdir}/eric6-${pkgver}_py2"{,-qt4}
 }
 
-package_eric-common() {
+package_eric-common-qt4() {
   depends=()
 
-  cd "${srcdir}/eric5-${pkgver}/eric"
+  cd "${srcdir}/eric6-${pkgver}-qt4/eric"
   # eric APIs
-  install -Dm644 "APIs/Python3/eric5.api" \
-                 "${pkgdir}/usr/share/qt4/qsci/api/python/eric5.api"
-  install -Dm644 "APIs/Python3/eric5.bas" \
-                 "${pkgdir}/usr/share/qt4/qsci/api/python/eric5.bas"
+  install -Dm644 "APIs/Python3/eric6.api" \
+                 "${pkgdir}/usr/share/qt4/qsci/api/python/eric6.api"
+  install -Dm644 "APIs/Python3/eric6.bas" \
+                 "${pkgdir}/usr/share/qt4/qsci/api/python/eric6.bas"
   # pyqt APIs
-  install -Dm644 "APIs/Python3/PyQt4_Qt4.bas" \
+  install -Dm644 "APIs/Python3/PyQt4.bas" \
                  "${pkgdir}/usr/share/qt4/qsci/api/python/PyQt4.bas"
   # qss APIs
   install -Dm644 "APIs/QSS/qss.api" \
@@ -62,18 +68,72 @@
                  "${pkgdir}/usr/share/qt4/qsci/api/ruby/Ruby-1.9.1.bas"
 }
 
+package_eric-qt4() {
+  depends=('eric-common-qt4' 'python-qscintilla')
+  conflicts=('eric')
+
+  cd "${srcdir}/eric6-${pkgver}-qt4"
+  python install.py -c -b /usr/bin -i "${pkgdir}" --noapis --pyqt=4
+}
+
+package_python2-eric-qt4() {
+  depends=('eric-common-qt4' 'python2-qscintilla')
+  conflicts=('python2-eric-qt4')
+
+  cd "${srcdir}/eric6-${pkgver}_py2-qt4"
+  python2 install.py -c -b /usr/bin -i "${pkgdir}" -y --noapis --pyqt=4
+}
+
+package_eric-common() {
+  depends=()
+
+  cd "${srcdir}/eric6-${pkgver}/eric"
+  # eric APIs
+  install -Dm644 "APIs/Python3/eric6.api" \
+                 "${pkgdir}/usr/share/qt4/qsci/api/python/eric6.api"
+  install -Dm644 "APIs/Python3/eric6.bas" \
+                 "${pkgdir}/usr/share/qt4/qsci/api/python/eric6.bas"
+  # pyqt APIs
+  install -Dm644 "APIs/Python3/PyQt5.bas" \
+                 "${pkgdir}/usr/share/qt/qsci/api/python/PyQt5.bas"
+  # qss APIs
+  install -Dm644 "APIs/QSS/qss.api" \
+                 "${pkgdir}/usr/share/qt/qsci/api/qss/qss.api"
+  # qscintilla APIs
+  install -Dm644 "APIs/Python3/QScintilla2.bas" \
+                 "${pkgdir}/usr/share/qt/qsci/api/python/QScintilla2.bas"
+  # zope APIs
+  install -Dm644 "APIs/Python/zope-2.10.7.api" \
+                 "${pkgdir}/usr/share/qt/qsci/api/python/zope-2.10.7.api"
+  install -Dm644 "APIs/Python/zope-2.11.2.api" \
+                 "${pkgdir}/usr/share/qt/qsci/api/python/zope-2.11.2.api"
+  install -Dm644 "APIs/Python/zope-3.3.1.api" \
+                 "${pkgdir}/usr/share/qt/qsci/api/python/zope-3.3.1.api"
+  # ruby APIs
+  install -Dm644 "APIs/Ruby/Ruby-1.8.7.api" \
+                 "${pkgdir}/usr/share/qt/qsci/api/ruby/Ruby-1.8.7.api"
+  install -Dm644 "APIs/Ruby/Ruby-1.8.7.bas" \
+                 "${pkgdir}/usr/share/qt/qsci/api/ruby/Ruby-1.8.7.bas"
+  install -Dm644 "APIs/Ruby/Ruby-1.9.1.api" \
+                 "${pkgdir}/usr/share/qt/qsci/api/ruby/Ruby-1.9.1.api"
+  install -Dm644 "APIs/Ruby/Ruby-1.9.1.bas" \
+                 "${pkgdir}/usr/share/qt/qsci/api/ruby/Ruby-1.9.1.bas"
+}
+
 package_eric() {
-  depends=('eric-common' 'python-qscintilla')
+  depends=('eric-common' 'python-qscintilla-qt5' 'qt5-svg' 'qt5-webkit')
+  conflicts=('eric-qt4')
 
-  cd "${srcdir}/eric5-${pkgver}"
-  python install.py -c -b /usr/bin -i "${pkgdir}" --noapis
+  cd "${srcdir}/eric6-${pkgver}"
+  python install.py -c -b /usr/bin -i "${pkgdir}" --noapis --pyqt=5
 }
 
 package_python2-eric() {
-  depends=('eric-common' 'python2-qscintilla')
+  depends=('eric-common' 'python2-qscintilla-qt5' 'qt5-svg' 'qt5-webkit')
+  conflicts=('python2-eric-qt4')
 
-  cd "${srcdir}/eric5-${pkgver}_py2"
-  python2 install.py -c -b /usr/bin -i "${pkgdir}" -y --noapis
+  cd "${srcdir}/eric6-${pkgver}_py2"
+  python2 install.py -c -b /usr/bin -i "${pkgdir}" -y --noapis --pyqt=5
 }
 
 # vim:set ts=2 sw=2 et: