Version bumps; tweak sed expression wrt bug 487272.

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 17A85C72)

4 files changed, 53 insertions, 60 deletions

diff --git a/dev-util/eric/ChangeLog b/dev-util/eric/ChangeLog
index 40576ab5cd49..e2cc625a7712 100644
--- a/dev-util/eric/ChangeLog
+++ b/dev-util/eric/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/eric
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/ChangeLog,v 1.204 2013/10/14 18:05:35 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/ChangeLog,v 1.205 2013/11/24 22:54:02 pesa Exp $
+
+*eric-5.3.8 (24 Nov 2013)
+*eric-4.5.16 (24 Nov 2013)
+
+  24 Nov 2013; Davide Pesavento <pesa@gentoo.org> +eric-4.5.16.ebuild,
+  +eric-5.3.8.ebuild, -eric-4.5.15.ebuild, -eric-5.3.7.ebuild,
+  -files/eric-4.4-no-interactive.patch:
+  Version bumps; tweak sed expression wrt bug 487272.
 
   14 Oct 2013; Tony Vroon <chainsaw@gentoo.org> eric-4.5.14.ebuild,
   eric-5.3.6.ebuild:
diff --git a/dev-util/eric/eric-4.5.15.ebuild b/dev-util/eric/eric-4.5.16.ebuild
index 76ac3732195c..dbe5c6220954 100644
--- a/dev-util/eric/eric-4.5.15.ebuild
+++ b/dev-util/eric/eric-4.5.16.ebuild
@@ -1,24 +1,31 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.5.15.ebuild,v 1.1 2013/10/01 22:17:14 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.5.16.ebuild,v 1.1 2013/11/24 22:54:02 pesa Exp $
+
+EAPI=4
 
-EAPI="4"
 PYTHON_DEPEND="2:2.6"
 SUPPORT_PYTHON_ABIS="1"
 # 2.4 and 2.5 are restricted to avoid conditional dependency on dev-python/simplejson.
 RESTRICT_PYTHON_ABIS="2.4 2.5 3.* *-jython 2.7-pypy-*"
 
-inherit eutils python
+PLOCALES="cs de en es fr it ru tr zh_CN"
 
-SLOT="4"
-MY_PN="${PN}${SLOT}"
-MY_PV="${PV/_pre/-snapshot-}"
-MY_P="${MY_PN}-${MY_PV}"
+inherit eutils l10n python
 
 DESCRIPTION="A full featured Python IDE using PyQt4 and QScintilla"
 HOMEPAGE="http://eric-ide.python-projects.org/"
-BASE_URI="mirror://sourceforge/eric-ide/${MY_PN}/stable/${PV}"
+
+SLOT="4"
+MY_PV=${PV/_pre/-snapshot-}
+MY_P=${PN}${SLOT}-${MY_PV}
+
+BASE_URI="mirror://sourceforge/eric-ide/${PN}${SLOT}/stable/${PV}"
 SRC_URI="${BASE_URI}/${MY_P}.tar.gz"
+for L in ${PLOCALES}; do
+	SRC_URI+=" linguas_${L}? ( ${BASE_URI}/${PN}${SLOT}-i18n-${L/zh_CN/zh_CN.GB2312}-${MY_PV}.tar.gz )"
+done
+unset L
 
 LICENSE="GPL-3"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
@@ -39,13 +46,6 @@ PDEPEND="
 	spell? ( dev-python/pyenchant )
 "
 
-LANGS="cs de en es fr it ru tr zh_CN"
-for L in ${LANGS}; do
-	SRC_URI+=" linguas_${L}? ( ${BASE_URI}/${MY_PN}-i18n-${L/zh_CN/zh_CN.GB2312}-${MY_PV}.tar.gz )"
-	IUSE+=" linguas_${L}"
-done
-unset L
-
 S=${WORKDIR}/${MY_P}
 
 PYTHON_VERSIONED_EXECUTABLES=("/usr/bin/.*")
@@ -58,8 +58,7 @@ src_prepare() {
 	# dev-python/pygments and dev-python/simplejson.
 	rm -fr eric/ThirdParty
 	rm -fr eric/DebugClients/Python{,3}/coverage
-	sed -i -e '\|/coverage/|d' eric/${MY_PN}.e4p || die
-	sed -i -e 's/from DebugClients\.Python3\?\.coverage /from coverage /' \
+	sed -i -e 's/from DebugClients\.Python3\?\.coverage/from coverage/' \
 		$(grep -lr 'from DebugClients\.Python3\?\.coverage' .) || die
 }
 
@@ -76,15 +75,15 @@ src_install() {
 	python_merge_intermediate_installation_images "${T}/images"
 
 	doicon eric/icons/default/eric.png || die
-	make_desktop_entry "${MY_PN} --nosplash" ${MY_PN} eric "Development;IDE;Qt"
+	make_desktop_entry "eric4 --nosplash" eric4 eric "Development;IDE;Qt"
 }
 
 pkg_postinst() {
-	python_mod_optimize ${MY_PN}{,config.py,plugins}
+	python_mod_optimize eric4{,config.py,plugins}
 
 	elog
 	elog "If you want to use Eric with mod_python, have a look at"
-	elog "\"${EROOT}$(python_get_sitedir -b -f)/${MY_PN}/patch_modpython.py\"."
+	elog "\"${EROOT}$(python_get_sitedir -b -f)/eric4/patch_modpython.py\"."
 	elog
 	elog "The following packages will give Eric extended functionality:"
 	elog "  dev-python/pylint"
@@ -96,5 +95,5 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	python_mod_cleanup ${MY_PN}{,config.py,plugins}
+	python_mod_cleanup eric4{,config.py,plugins}
 }
diff --git a/dev-util/eric/eric-5.3.7.ebuild b/dev-util/eric/eric-5.3.8.ebuild
index d6465a111f29..104ece73a8c6 100644
--- a/dev-util/eric/eric-5.3.7.ebuild
+++ b/dev-util/eric/eric-5.3.8.ebuild
@@ -1,23 +1,31 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-5.3.7.ebuild,v 1.1 2013/10/01 22:17:14 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-5.3.8.ebuild,v 1.1 2013/11/24 22:54:02 pesa Exp $
+
+EAPI=4
 
-EAPI="4"
 PYTHON_DEPEND="3:3.1"
+PYTHON_USE_WITH="sqlite"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="2.* *-jython 2.7-pypy-*"
 
-inherit eutils python
+PLOCALES="cs de en es fr it ru tr zh_CN"
 
-SLOT="5"
-MY_PN="${PN}${SLOT}"
-MY_PV="${PV/_pre/-snapshot-}"
-MY_P="${MY_PN}-${MY_PV}"
+inherit eutils l10n python
 
 DESCRIPTION="A full featured Python IDE using PyQt4 and QScintilla"
 HOMEPAGE="http://eric-ide.python-projects.org/"
-BASE_URI="mirror://sourceforge/eric-ide/${MY_PN}/stable/${PV}"
+
+SLOT="5"
+MY_PV=${PV/_pre/-snapshot-}
+MY_P=${PN}${SLOT}-${MY_PV}
+
+BASE_URI="mirror://sourceforge/eric-ide/${PN}${SLOT}/stable/${PV}"
 SRC_URI="${BASE_URI}/${MY_P}.tar.gz"
+for L in ${PLOCALES}; do
+	SRC_URI+=" linguas_${L}? ( ${BASE_URI}/${PN}${SLOT}-i18n-${L/zh_CN/zh_CN.GB2312}-${MY_PV}.tar.gz )"
+done
+unset L
 
 LICENSE="GPL-3"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
@@ -37,22 +45,15 @@ PDEPEND="
 	spell? ( dev-python/pyenchant )
 "
 
-LANGS="cs de en es fr it ru tr zh_CN"
-for L in ${LANGS}; do
-	SRC_URI+=" linguas_${L}? ( ${BASE_URI}/${MY_PN}-i18n-${L/zh_CN/zh_CN.GB2312}-${MY_PV}.tar.gz )"
-	IUSE+=" linguas_${L}"
-done
-unset L
-
 S=${WORKDIR}/${MY_P}
 
 PYTHON_VERSIONED_EXECUTABLES=("/usr/bin/.*")
 
 src_prepare() {
 	# Avoid file collisions between different slots of Eric.
-	sed -e "s/^Icon=eric$/&${SLOT}/" -i eric/${MY_PN}.desktop || die
-	sed -e "s/\([^[:alnum:]]\)eric\.png\([^[:alnum:]]\)/\1eric5.png\2/" \
-		-i $(grep -lr "eric\.png" .) || die
+	sed -i -e 's/^Icon=eric$/&5/' eric/eric5.desktop || die
+	sed -i -e 's/\([^[:alnum:]]\)eric\.png\([^[:alnum:]]\)/\1eric5.png\2/' \
+		$(grep -lr 'eric\.png' .) || die
 	mv eric/icons/default/eric{,5}.png || die
 	mv eric/pixmaps/eric{,5}.png || die
 	rm -f eric/APIs/Python/zope-*.api
@@ -62,8 +63,7 @@ src_prepare() {
 	# dev-python/coverage and dev-python/pygments.
 	rm -fr eric/ThirdParty
 	rm -fr eric/DebugClients/Python{,3}/coverage
-	sed -i -e '\|/coverage/|d' eric/${MY_PN}.e4p || die
-	sed -i -e 's/from DebugClients\.Python3\?\.coverage /from coverage /' \
+	sed -i -e 's/from DebugClients\.Python3\?\.coverage/from coverage/' \
 		$(grep -lr 'from DebugClients\.Python3\?\.coverage' .) || die
 
 	# Fix desktop files (bug 458092).
@@ -82,15 +82,15 @@ src_install() {
 	python_execute_function installation
 	python_merge_intermediate_installation_images "${T}/images"
 
-	doicon eric/icons/default/${MY_PN}.png || die
+	doicon eric/icons/default/eric5.png || die
 }
 
 pkg_postinst() {
-	python_mod_optimize -x "/eric5/(DebugClients/Python|UtilitiesPython2)/" ${MY_PN}{,config.py,plugins}
+	python_mod_optimize -x "/eric5/(DebugClients/Python|UtilitiesPython2)/" eric5{,config.py,plugins}
 
 	elog
 	elog "If you want to use Eric with mod_python, have a look at"
-	elog "\"${EROOT}$(python_get_sitedir -b -f)/${MY_PN}/patch_modpython.py\"."
+	elog "\"${EROOT}$(python_get_sitedir -b -f)/eric5/patch_modpython.py\"."
 	elog
 	elog "The following packages will give Eric extended functionality:"
 	elog "  dev-python/pylint"
@@ -102,5 +102,5 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	python_mod_cleanup ${MY_PN}{,config.py,plugins}
+	python_mod_cleanup eric5{,config.py,plugins}
 }
diff --git a/dev-util/eric/files/eric-4.4-no-interactive.patch b/dev-util/eric/files/eric-4.4-no-interactive.patch
deleted file mode 100644
index 4c682bfb777e..000000000000
--- a/dev-util/eric/files/eric-4.4-no-interactive.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: eric4-4.4-snapshot-20091129/install.py
-===================================================================
---- eric4-4.4-snapshot-20091129.orig/install.py
-+++ eric4-4.4-snapshot-20091129/install.py
-@@ -761,9 +761,6 @@ def main(argv):
-                     (v[0], v[1], v[2])
-                 print "    with foreign characters. Please see 'README-PyXML.txt' for"
-                 print "    details."
--                res = raw_input("    Shall pyXML be patched now (y/n)? ")
--                if res in ["Y", "y"]:
--                    patchPyXML()
-     except ImportError:
-         pass
-