Bump

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

3 files changed, 28 insertions, 27 deletions

diff --git a/dev-util/eric/ChangeLog b/dev-util/eric/ChangeLog
index b6445cdf029e..5b9f0e64b82b 100644
--- a/dev-util/eric/ChangeLog
+++ b/dev-util/eric/ChangeLog
@@ -1,6 +1,13 @@
 # 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.193 2013/03/11 09:42:20 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/ChangeLog,v 1.194 2013/04/07 23:49:00 pesa Exp $
+
+*eric-5.3.2 (07 Apr 2013)
+*eric-4.5.10 (07 Apr 2013)
+
+  07 Apr 2013; Davide Pesavento <pesa@gentoo.org> +eric-4.5.10.ebuild,
+  +eric-5.3.2.ebuild, -eric-5.3.0.ebuild, -eric-5.3.1.ebuild:
+  Bump
 
 *eric-5.3.1 (11 Mar 2013)
 
diff --git a/dev-util/eric/eric-5.3.1.ebuild b/dev-util/eric/eric-4.5.10.ebuild
index a800d843c740..4d8e76ec0627 100644
--- a/dev-util/eric/eric-5.3.1.ebuild
+++ b/dev-util/eric/eric-4.5.10.ebuild
@@ -1,15 +1,16 @@
 # 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.1.ebuild,v 1.1 2013/03/11 09:42:20 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.5.10.ebuild,v 1.1 2013/04/07 23:49:00 pesa Exp $
 
 EAPI="4"
-PYTHON_DEPEND="3:3.1"
+PYTHON_DEPEND="2:2.6"
 SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.* *-jython 2.7-pypy-*"
+# 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
 
-SLOT="5"
+SLOT="4"
 MY_PN="${PN}${SLOT}"
 MY_PV="${PV/_pre/-snapshot-}"
 MY_P="${MY_PN}-${MY_PV}"
@@ -21,17 +22,18 @@ SRC_URI="${BASE_URI}/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="spell"
+IUSE="kde spell"
 
 DEPEND="
 	>=dev-python/sip-4.12.4
-	>=dev-python/PyQt4-4.9.6-r1[X,help,sql,svg,webkit]
-	>=dev-python/qscintilla-python-2.6
+	>=dev-python/PyQt4-4.9.6-r1[X,help,svg,webkit]
+	>=dev-python/qscintilla-python-2.3
+	kde? ( kde-base/pykde4 )
 "
 RDEPEND="${DEPEND}
 	>=dev-python/chardet-2.0.1
-	>=dev-python/coverage-3.2
-	>=dev-python/pygments-1.5
+	>=dev-python/coverage-3.0.1
+	>=dev-python/pygments-1.3.1
 "
 PDEPEND="
 	spell? ( dev-python/pyenchant )
@@ -49,25 +51,16 @@ 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
-	mv eric/icons/default/eric{,5}.png || die
-	mv eric/pixmaps/eric{,5}.png || die
-	rm -f eric/APIs/Python/zope-*.api
-	rm -f eric/APIs/Ruby/Ruby-*.api
-
-	# Delete internal copies of dev-python/chardet,
-	# dev-python/coverage and dev-python/pygments.
+	epatch "${FILESDIR}/eric-4.4-no-interactive.patch"
+	use kde || epatch "${FILESDIR}/eric-4.4-no-pykde.patch"
+
+	# Delete internal copies of dev-python/chardet, dev-python/coverage,
+	# 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 /' \
 		$(grep -lr 'from DebugClients\.Python3\?\.coverage' .) || die
-
-	# Fix desktop files (bug 458092).
-	sed -i -e '/^Categories=/s:Python:X-&:' eric/eric5{,_webbrowser}.desktop || die
 }
 
 src_install() {
@@ -82,11 +75,12 @@ 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/eric.png || die
+	make_desktop_entry "${MY_PN} --nosplash" ${MY_PN} eric "Development;IDE;Qt"
 }
 
 pkg_postinst() {
-	python_mod_optimize -x "/eric5/(DebugClients/Python|UtilitiesPython2)/" ${MY_PN}{,config.py,plugins}
+	python_mod_optimize ${MY_PN}{,config.py,plugins}
 
 	elog
 	elog "If you want to use Eric with mod_python, have a look at"
diff --git a/dev-util/eric/eric-5.3.0.ebuild b/dev-util/eric/eric-5.3.2.ebuild
index 21a03ecd24dd..c061d05cb193 100644
--- a/dev-util/eric/eric-5.3.0.ebuild
+++ b/dev-util/eric/eric-5.3.2.ebuild
@@ -1,6 +1,6 @@
 # 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.0.ebuild,v 1.2 2013/02/19 09:04:51 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-5.3.2.ebuild,v 1.1 2013/04/07 23:49:00 pesa Exp $
 
 EAPI="4"
 PYTHON_DEPEND="3:3.1"