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

[Evgeniy Alekseev]

    Date: Monday, August 27, 2018 @ 06:37:31
  Author: arcanis
Revision: 374687

upgpkg: eric 18.08-1

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

-----------+
 ChangeLog |    3 +++
 PKGBUILD  |   11 ++++-------
 2 files changed, 7 insertions(+), 7 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2018-08-27 06:29:29 UTC (rev 374686)
+++ ChangeLog	2018-08-27 06:37:31 UTC (rev 374687)
@@ -1,3 +1,6 @@
+18.08-1:
+upstream update
+
 18.06-1:
 upstream update
 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-08-27 06:29:29 UTC (rev 374686)
+++ PKGBUILD	2018-08-27 06:37:31 UTC (rev 374687)
@@ -6,17 +6,16 @@
 
 pkgbase=eric
 pkgname=('eric-common' 'eric' 'python2-eric')
-pkgver=18.06
-pkgrel=2
+pkgver=18.08
+pkgrel=1
 pkgdesc="A full-featured Python and Ruby IDE in PyQt"
 arch=('any')
 url="http://eric-ide.python-projects.org/"
 license=('GPL3')
-depends=('python-qscintilla' 'python2-qscintilla'
-         'python-qscintilla-qt5' 'python2-qscintilla-qt5'
+depends=('python-qscintilla-qt5' 'python2-qscintilla-qt5'
          'qt5-svg' 'qt5-webkit')
 source=("https://downloads.sourceforge.net/eric-ide/eric6-${pkgver}.tar.gz")
-sha512sums=('0d7ab76157abca5f9276c9e3d73349a82e49d890bd75f4141f75e3d787ec2752014606b37171876d348afd7810d23e439b834168eeec4ee58e48ec701d42e49a')
+sha512sums=('5c95ab51cf8b9ffb101702e21f44c37e4e51b0cef47e3d7743faaab070ea7618a9b6362a01935336c70000f1bcd18e5ad728f39a41c3a46820c8dea8ab5e4d1c')
 changelog=ChangeLog
 
 prepare() {
@@ -66,7 +65,6 @@
 package_eric() {
   depends=('eric-common' 'python-qscintilla-qt5' 'qt5-svg' 'qt5-webkit')
   optdepends=('qt5-webengine: alternative browser backend')
-  conflicts=('eric-qt4')
 
   cd "${srcdir}/eric6-${pkgver}"
   python install.py -c -b /usr/bin -i "${pkgdir}" --noapis
@@ -78,7 +76,6 @@
 package_python2-eric() {
   depends=('eric-common' 'python2-qscintilla-qt5' 'qt5-svg' 'qt5-webkit')
   optdepends=('qt5-webengine: alternative browser backend')
-  conflicts=('python2-eric-qt4')
 
   cd "${srcdir}/eric6-${pkgver}_py2"
   python2 install.py -c -b /usr/bin -i "${pkgdir}" -y --noapis