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

[Antonio Rojas]

    Date: Wednesday, July 1, 2020 @ 20:06:10
  Author: arojas
Revision: 657412

Update to 20.6, merge eric-common since there is no more python2

Modified:
  eric/trunk/PKGBUILD

----------+
 PKGBUILD |   53 ++++++++---------------------------------------------
 1 file changed, 8 insertions(+), 45 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-01 19:05:53 UTC (rev 657411)
+++ PKGBUILD	2020-07-01 20:06:10 UTC (rev 657412)
@@ -3,10 +3,8 @@
 # Contributor: Brad Fanella <bradfanellaat archlinux dot us>
 # See .contrib for older/other contributors
 
-pkgbase=eric
-pkgname=('eric-common' 'eric')
-pkgver=20.04
-_pkgver=20.4
+pkgname=eric
+pkgver=20.6
 pkgrel=1
 pkgdesc="A full-featured Python and Ruby IDE in PyQt"
 arch=('any')
@@ -13,50 +11,15 @@
 url="https://eric-ide.python-projects.org/"
 license=('GPL3')
 depends=('python-qscintilla-qt5' 'python-pyqtwebengine' 'python-pyqtchart' 'qt5-svg')
-source=("https://downloads.sourceforge.net/eric-ide/eric6-${_pkgver}.tar.gz")
-sha512sums=('a43e9b6dc5dd1e3dee2f8a85245dbab54283c3a6be19973c135cdeb5e2efd1d6b336962eeafefc87bd6fc0ba48115ba286dacbea20905b38d6b18505ef6bb7d1')
+conflicts=(eric-common)
+replaces=(eric-common)
+source=("https://downloads.sourceforge.net/eric-ide/eric6-$pkgver.tar.gz")
+sha512sums=('dc8eceaf85db290dc01b2e98902e3276e90dd641b96ef82f1d9468669afb057221e7e230ae6e3c39e5ed74fd6b9b5711ce633c66f2e2585558c35684efeaacb4')
 changelog=ChangeLog
 
-package_eric-common() {
-  depends=()
-
-  cd "${srcdir}/eric6-${_pkgver}/eric"
-  # eric APIs
-  install -Dm644 "eric6/APIs/Python3/eric6.api" \
-                 "${pkgdir}/usr/share/qt/qsci/api/python/eric6.api"
-  install -Dm644 "eric6/APIs/Python3/eric6.bas" \
-                 "${pkgdir}/usr/share/qt/qsci/api/python/eric6.bas"
-  # pyqt APIs
-  install -Dm644 "eric6/APIs/Python3/PyQt5.bas" \
-                 "${pkgdir}/usr/share/qt/qsci/api/python/PyQt5.bas"
-  # qss APIs
-  install -Dm644 "eric6/APIs/QSS/qss.api" \
-                 "${pkgdir}/usr/share/qt/qsci/api/qss/qss.api"
-  # qscintilla APIs
-  install -Dm644 "eric6/APIs/Python3/QScintilla2.bas" \
-                 "${pkgdir}/usr/share/qt/qsci/api/python/QScintilla2.bas"
-  # zope APIs
-  install -Dm644 "eric6/APIs/Python/zope-2.10.7.api" \
-                 "${pkgdir}/usr/share/qt/qsci/api/python/zope-2.10.7.api"
-  install -Dm644 "eric6/APIs/Python/zope-2.11.2.api" \
-                 "${pkgdir}/usr/share/qt/qsci/api/python/zope-2.11.2.api"
-  install -Dm644 "eric6/APIs/Python/zope-3.3.1.api" \
-                 "${pkgdir}/usr/share/qt/qsci/api/python/zope-3.3.1.api"
-  # ruby APIs
-  install -Dm644 "eric6/APIs/Ruby/Ruby-1.8.7.api" \
-                 "${pkgdir}/usr/share/qt/qsci/api/ruby/Ruby-1.8.7.api"
-  install -Dm644 "eric6/APIs/Ruby/Ruby-1.8.7.bas" \
-                 "${pkgdir}/usr/share/qt/qsci/api/ruby/Ruby-1.8.7.bas"
-  install -Dm644 "eric6/APIs/Ruby/Ruby-1.9.1.api" \
-                 "${pkgdir}/usr/share/qt/qsci/api/ruby/Ruby-1.9.1.api"
-  install -Dm644 "eric6/APIs/Ruby/Ruby-1.9.1.bas" \
-                 "${pkgdir}/usr/share/qt/qsci/api/ruby/Ruby-1.9.1.bas"
-}
-
 package_eric() {
-  depends+=(eric-common)
-  cd "${srcdir}/eric6-${_pkgver}"
-  python install.py -c -b "/usr/bin" -i "${pkgdir}" --no-apis
+  cd eric6-$pkgver
+  python install.py -c -b "/usr/bin" -i "${pkgdir}"
 
   # fix paths in desktop files
   find "${pkgdir}" -name '*.desktop' -exec sed -i "s|${pkgdir}||g" {} \;