Date: Monday, February 6, 2017 @ 08:35:58 Author: arcanis Revision: 210346
upgpkg: eric 17.02.1-1 Modified: eric/trunk/ChangeLog eric/trunk/PKGBUILD -----------+ ChangeLog | 4 +++ PKGBUILD | 62 ++---------------------------------------------------------- 2 files changed, 7 insertions(+), 59 deletions(-) Modified: ChangeLog =================================================================== --- ChangeLog 2017-02-06 07:59:14 UTC (rev 210345) +++ ChangeLog 2017-02-06 08:35:58 UTC (rev 210346) @@ -1,3 +1,7 @@ +17.02-1: +* upstream update +* drop qt4 versions as soon as they depend on qtwebkit + 17.01-1: upstream update Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-02-06 07:59:14 UTC (rev 210345) +++ PKGBUILD 2017-02-06 08:35:58 UTC (rev 210346) @@ -5,9 +5,8 @@ # See .contrib for older/other contributors pkgbase=eric -pkgname=('eric-common' 'eric' 'python2-eric' - 'eric-common-qt4' 'eric-qt4' 'python2-eric-qt4') -pkgver=17.01 +pkgname=('eric-common' 'eric' 'python2-eric') +pkgver=17.02.1 pkgrel=1 pkgdesc="A full-featured Python and Ruby IDE in PyQt" arch=('any') @@ -17,7 +16,7 @@ 'python-qscintilla-qt5' 'python2-qscintilla-qt5' 'qt5-svg' 'qt5-webkit') source=("http://downloads.sourceforge.net/eric-ide/eric6-${pkgver}.tar.gz") -md5sums=('4db84070d35a7d16ecba29eab9324410') +md5sums=('07b35888949b584ccdf4dd0d61e18df5') changelog=ChangeLog prepare() { @@ -26,63 +25,8 @@ 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-qt4() { - 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/PyQt4.bas" \ - "${pkgdir}/usr/share/qt4/qsci/api/python/PyQt4.bas" - # qss APIs - install -Dm644 "APIs/QSS/qss.api" \ - "${pkgdir}/usr/share/qt4/qsci/api/qss/qss.api" - # qscintilla APIs - install -Dm644 "APIs/Python3/QScintilla2.bas" \ - "${pkgdir}/usr/share/qt4/qsci/api/python/QScintilla2.bas" - # zope APIs - install -Dm644 "APIs/Python/zope-2.10.7.api" \ - "${pkgdir}/usr/share/qt4/qsci/api/python/zope-2.10.7.api" - install -Dm644 "APIs/Python/zope-2.11.2.api" \ - "${pkgdir}/usr/share/qt4/qsci/api/python/zope-2.11.2.api" - install -Dm644 "APIs/Python/zope-3.3.1.api" \ - "${pkgdir}/usr/share/qt4/qsci/api/python/zope-3.3.1.api" - # ruby APIs - install -Dm644 "APIs/Ruby/Ruby-1.8.7.api" \ - "${pkgdir}/usr/share/qt4/qsci/api/ruby/Ruby-1.8.7.api" - install -Dm644 "APIs/Ruby/Ruby-1.8.7.bas" \ - "${pkgdir}/usr/share/qt4/qsci/api/ruby/Ruby-1.8.7.bas" - install -Dm644 "APIs/Ruby/Ruby-1.9.1.api" \ - "${pkgdir}/usr/share/qt4/qsci/api/ruby/Ruby-1.9.1.api" - install -Dm644 "APIs/Ruby/Ruby-1.9.1.bas" \ - "${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=()