[arch-commits] Commit in eric/repos/community-any (9 files)

Evgeniy Alekseev arcanis at archlinux.org
Mon Dec 1 01:09:16 UTC 2014


    Date: Monday, December 1, 2014 @ 02:09:15
  Author: arcanis
Revision: 123305

archrelease: copy trunk to community-any

Added:
  eric/repos/community-any/.contrib
    (from rev 123304, eric/trunk/.contrib)
  eric/repos/community-any/ChangeLog
    (from rev 123304, eric/trunk/ChangeLog)
  eric/repos/community-any/PKGBUILD
    (from rev 123304, eric/trunk/PKGBUILD)
  eric/repos/community-any/eric.install
    (from rev 123304, eric/trunk/eric.install)
  eric/repos/community-any/install_py2.patch
    (from rev 123304, eric/trunk/install_py2.patch)
Deleted:
  eric/repos/community-any/.contrib
  eric/repos/community-any/ChangeLog
  eric/repos/community-any/PKGBUILD
  eric/repos/community-any/eric.install

-------------------+
 .contrib          |   14 ++--
 ChangeLog         |   15 ++--
 PKGBUILD          |  181 +++++++++++++++++++++++-----------------------------
 eric.install      |   18 ++---
 install_py2.patch |   12 +++
 5 files changed, 119 insertions(+), 121 deletions(-)

Deleted: .contrib
===================================================================
--- .contrib	2014-12-01 01:08:55 UTC (rev 123304)
+++ .contrib	2014-12-01 01:09:15 UTC (rev 123305)
@@ -1,7 +0,0 @@
-This is a list of (past) contributors not already credited in the PKGBUILD:
-
-Eric Belanger <eric at archlinux.org>
-riai <riai at bigfoot.com>
-Ben <ben at benmazer.net>
-Daniel J Griffiths <ghost1227 at archlinux.us>
-Felix Rohrbach <fxrh at gmx.de>

Copied: eric/repos/community-any/.contrib (from rev 123304, eric/trunk/.contrib)
===================================================================
--- .contrib	                        (rev 0)
+++ .contrib	2014-12-01 01:09:15 UTC (rev 123305)
@@ -0,0 +1,7 @@
+This is a list of (past) contributors not already credited in the PKGBUILD:
+
+Eric Belanger <eric at archlinux.org>
+riai <riai at bigfoot.com>
+Ben <ben at benmazer.net>
+Daniel J Griffiths <ghost1227 at archlinux.us>
+Felix Rohrbach <fxrh at gmx.de>

Deleted: ChangeLog
===================================================================
--- ChangeLog	2014-12-01 01:08:55 UTC (rev 123304)
+++ ChangeLog	2014-12-01 01:09:15 UTC (rev 123305)
@@ -1,6 +0,0 @@
-5.5.0-1:
-* upstream update
-* create python2-eric package
-
-5.4.7-1:
-upstream update. Create eric-common package

Copied: eric/repos/community-any/ChangeLog (from rev 123304, eric/trunk/ChangeLog)
===================================================================
--- ChangeLog	                        (rev 0)
+++ ChangeLog	2014-12-01 01:09:15 UTC (rev 123305)
@@ -0,0 +1,9 @@
+5.5.1-1:
+upstream update
+
+5.5.0-1:
+* upstream update
+* create python2-eric package
+
+5.4.7-1:
+upstream update. Create eric-common package

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2014-12-01 01:08:55 UTC (rev 123304)
+++ PKGBUILD	2014-12-01 01:09:15 UTC (rev 123305)
@@ -1,99 +0,0 @@
-# $Id$
-# Maintainer: Evgeniy Alekseev <arcanis at archlinux dot org>
-# Contributor: Ray Rashif <schiv at archlinux dot org>
-# Contributor: Brad Fanella <bradfanellaat archlinux dot us>
-# See .contrib for older/other contributors
-
-pkgbase=eric
-pkgname=('eric-common' 'eric' 'python2-eric')
-pkgver=5.5.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')
-install=${pkgbase}.install
-source=("http://downloads.sourceforge.net/eric-ide/eric5-${pkgver}.tar.gz")
-md5sums=('87a7b222269e688418e3f0d51c044508')
-changelog=ChangeLog
-
-prepare() {
-  cp -r "${srcdir}/eric5-${pkgver}"{,_py2}
-
-  cd "${srcdir}/eric5-${pkgver}_py2/eric"
-  find . -name '*.py' -exec \
-    sed -i -r "s:^#!/usr/bin/(env |)python(3|)$:#!/usr/bin/env python2:" {} \;
-  # fix py2 and py3 compatibility
-  sed -i "s/eric5.desktop/eric5_py2.desktop/g" "eric5.appdata.xml"
-  sed -i "s/Exec=eric5/Exec=eric5_py2/g" "eric5.desktop"
-  sed -i "s/Exec=eric5_webbrowser/Exec=eric5_webbrowser_py2/g" "eric5_webbrowser.desktop"
-}
-
-package_eric-common() {
-  depends=()
-
-  cd "${srcdir}/eric5-${pkgver}/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"
-  # pyqt APIs
-  install -Dm644 "APIs/Python3/PyQt4_Qt4.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"
-  # pixmaps
-  install -Dm644 "icons/default/eric.png" \
-                 "${pkgdir}/usr/share/pixmaps/eric.png"
-  install -Dm644 "icons/default/ericWeb.png" \
-                 "${pkgdir}/usr/share/pixmaps/ericWeb.png"
-}
-
-package_eric() {
-  depends=('eric-common' 'python-qscintilla')
-
-  cd "${srcdir}/eric5-${pkgver}"
-  python install.py -c -b /usr/bin -i "${pkgdir}"
-  # remove common components
-  rm -r "${pkgdir}/usr/share/pixmaps"
-  rm -r "${pkgdir}/usr/share/qt4"
-}
-
-package_python2-eric() {
-  depends=('eric-common' 'python2-qscintilla')
-
-  cd "${srcdir}/eric5-${pkgver}_py2"
-  python2 install.py -c -b /usr/bin -i "${pkgdir}" -y
-  # remove common components
-  rm -r "${pkgdir}/usr/share/qt4"
-  rm -r "${pkgdir}/usr/share/pixmaps"
-
-  # compatibility with eric
-  mv "${pkgdir}/usr/share/appdata/"{eric5.appdata.xml,eric5_py2.appdata.xml}
-  mv "${pkgdir}/usr/share/applications/"{eric5.desktop,eric5_py2.desktop}
-  mv "${pkgdir}/usr/share/applications/"{eric5_webbrowser.desktop,eric5_webbrowser_py2.desktop}
-}
-
-# vim:set ts=2 sw=2 et:

Copied: eric/repos/community-any/PKGBUILD (from rev 123304, eric/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2014-12-01 01:09:15 UTC (rev 123305)
@@ -0,0 +1,82 @@
+# $Id$
+# Maintainer: Evgeniy Alekseev <arcanis at archlinux dot org>
+# Contributor: Ray Rashif <schiv at archlinux dot org>
+# Contributor: Brad Fanella <bradfanellaat archlinux dot us>
+# See .contrib for older/other contributors
+
+pkgbase=eric
+pkgname=('eric-common' 'eric' 'python2-eric')
+pkgver=5.5.1
+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')
+install=${pkgbase}.install
+source=("http://downloads.sourceforge.net/eric-ide/eric5-${pkgver}.tar.gz"
+        "install_py2.patch")
+md5sums=('1ffb05964068c41702f445c113565805'
+         '6c870e9ec58b7d9a4cf0a5ed97415b81')
+changelog=ChangeLog
+
+prepare() {
+  cp -r "${srcdir}/eric5-${pkgver}"{,_py2}
+  patch -p0 -i install_py2.patch
+
+  cd "${srcdir}/eric5-${pkgver}_py2/eric"
+  find . -name '*.py' -exec \
+    sed -i -r "s:^#!/usr/bin/(env |)python(3|)$:#!/usr/bin/env python2:" {} \;
+}
+
+package_eric-common() {
+  depends=()
+
+  cd "${srcdir}/eric5-${pkgver}/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"
+  # pyqt APIs
+  install -Dm644 "APIs/Python3/PyQt4_Qt4.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() {
+  depends=('eric-common' 'python-qscintilla')
+
+  cd "${srcdir}/eric5-${pkgver}"
+  python install.py -c -b /usr/bin -i "${pkgdir}" --noapis
+}
+
+package_python2-eric() {
+  depends=('eric-common' 'python2-qscintilla')
+
+  cd "${srcdir}/eric5-${pkgver}_py2"
+  python2 install.py -c -b /usr/bin -i "${pkgdir}" -y --noapis
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: eric.install
===================================================================
--- eric.install	2014-12-01 01:08:55 UTC (rev 123304)
+++ eric.install	2014-12-01 01:09:15 UTC (rev 123305)
@@ -1,9 +0,0 @@
-post_install() {
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-# vim:set ts=2 sw=2 et:

Copied: eric/repos/community-any/eric.install (from rev 123304, eric/trunk/eric.install)
===================================================================
--- eric.install	                        (rev 0)
+++ eric.install	2014-12-01 01:09:15 UTC (rev 123305)
@@ -0,0 +1,9 @@
+post_install() {
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+# vim:set ts=2 sw=2 et:

Copied: eric/repos/community-any/install_py2.patch (from rev 123304, eric/trunk/install_py2.patch)
===================================================================
--- install_py2.patch	                        (rev 0)
+++ install_py2.patch	2014-12-01 01:09:15 UTC (rev 123305)
@@ -0,0 +1,12 @@
+diff -ruN eric5-5.5.1_py2.orig/install.py eric5-5.5.1_py2/install.py
+--- eric5-5.5.1_py2.orig/install.py	2014-12-01 03:56:19.000000000 +0300
++++ eric5-5.5.1_py2/install.py	2014-12-01 03:56:46.332570642 +0300
+@@ -237,7 +237,7 @@
+     text = text.replace("@MARKER@", marker)
+     
+     if sys.version_info[0] == 2:
+-        f = codecs.open(src, "w", "utf-8")
++        f = codecs.open(dst, "w", "utf-8")
+     else:
+         f = open(dst, "w")
+     f.write(text)



More information about the arch-commits mailing list