Version bump; remove old.

(Portage version: 2.2.0_alpha96/cvs/Linux x86_64)

3 files changed, 26 insertions, 108 deletions

diff --git a/dev-util/eric/ChangeLog b/dev-util/eric/ChangeLog
index a395251a8a2c..a6f713cc466d 100644
--- a/dev-util/eric/ChangeLog
+++ b/dev-util/eric/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/eric
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/ChangeLog,v 1.168 2012/02/28 15:03:24 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/ChangeLog,v 1.169 2012/03/28 16:55:15 pesa Exp $
+
+*eric-4.5.1 (28 Mar 2012)
+
+  28 Mar 2012; Davide Pesavento <pesa@gentoo.org> +eric-4.5.1.ebuild,
+  -eric-4.4.19.ebuild, -eric-5.1.7.ebuild:
+  Version bump; remove old.
 
   28 Feb 2012; Davide Pesavento <pesa@gentoo.org> eric-4.4.14.ebuild,
   eric-4.4.19.ebuild, eric-5.1.2.ebuild, eric-5.1.7.ebuild:
diff --git a/dev-util/eric/eric-4.4.19.ebuild b/dev-util/eric/eric-4.5.1.ebuild
index a2616d3bf564..f4587f40a709 100644
--- a/dev-util/eric/eric-4.4.19.ebuild
+++ b/dev-util/eric/eric-4.5.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.4.19.ebuild,v 1.2 2012/02/28 15:03:24 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.5.1.ebuild,v 1.1 2012/03/28 16:55:15 pesa Exp $
 
-EAPI="3"
+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.
@@ -10,7 +10,8 @@ RESTRICT_PYTHON_ABIS="2.4 2.5 3.* *-jython 2.7-pypy-*"
 
 inherit eutils python
 
-MY_PN="${PN}${PV%%.*}"
+SLOT="4"
+MY_PN="${PN}${SLOT}"
 MY_PV="${PV/_pre/-snapshot-}"
 MY_P="${MY_PN}-${MY_PV}"
 
@@ -20,19 +21,23 @@ BASE_URI="mirror://sourceforge/eric-ide/${MY_PN}/stable/${PV}"
 SRC_URI="${BASE_URI}/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
-SLOT="4"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="kde spell"
 
-DEPEND=">=dev-python/sip-4.12.4
+DEPEND="
+	>=dev-python/sip-4.12.4
 	>=dev-python/PyQt4-4.6[assistant,svg,webkit,X]
-	>=dev-python/qscintilla-python-2.2
-	kde? ( kde-base/pykde4 )"
+	>=dev-python/qscintilla-python-2.3
+	kde? ( kde-base/pykde4 )
+"
 RDEPEND="${DEPEND}
 	>=dev-python/chardet-2.0.1
-	dev-python/coverage
-	>=dev-python/pygments-1.1"
-PDEPEND="spell? ( dev-python/pyenchant )"
+	>=dev-python/coverage-3.0.1
+	>=dev-python/pygments-1.3.1
+"
+PDEPEND="
+	spell? ( dev-python/pyenchant )
+"
 
 LANGS="cs de en es fr it ru tr zh_CN"
 for L in ${LANGS}; do
@@ -47,13 +52,15 @@ PYTHON_VERSIONED_EXECUTABLES=("/usr/bin/.*")
 
 src_prepare() {
 	epatch "${FILESDIR}/eric-4.4-no-interactive.patch"
-	epatch "${FILESDIR}/remove_coverage.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
 }
 
 src_install() {
@@ -68,7 +75,7 @@ src_install() {
 	python_execute_function installation
 	python_merge_intermediate_installation_images "${T}/images"
 
-	doicon eric/icons/default/eric.png || die "doicon failed"
+	doicon eric/icons/default/eric.png || die
 	make_desktop_entry "${MY_PN} --nosplash" ${MY_PN} eric "Development;IDE;Qt"
 }
 
diff --git a/dev-util/eric/eric-5.1.7.ebuild b/dev-util/eric/eric-5.1.7.ebuild
deleted file mode 100644
index c40dd688c6ab..000000000000
--- a/dev-util/eric/eric-5.1.7.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-5.1.7.ebuild,v 1.2 2012/02/28 15:03:24 pesa Exp $
-
-EAPI="3"
-PYTHON_DEPEND="3:3.1"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.* *-jython 2.7-pypy-*"
-
-inherit eutils python
-
-MY_PN="${PN}${PV%%.*}"
-MY_PV="${PV/_pre/-snapshot-}"
-MY_P="${MY_PN}-${MY_PV}"
-
-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}"
-SRC_URI="${BASE_URI}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="5"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="spell"
-
-DEPEND=">=dev-python/sip-4.12.4
-	>=dev-python/PyQt4-4.7[assistant,svg,webkit,X]
-	>=dev-python/qscintilla-python-2.4"
-RDEPEND="${DEPEND}
-	>=dev-python/chardet-2.0.1
-	>=dev-python/coverage-3.2
-	>=dev-python/pygments-1.4"
-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() {
-	epatch "${FILESDIR}/${PN}-5.0.2-remove_coverage.patch"
-
-	# Avoid file collisions between different slots of Eric.
-	sed -e "s/^Icon=eric$/&${SLOT}/" -i eric/${MY_PN}.desktop || die "sed failed"
-	sed -e "s/\([^[:alnum:]]\)eric\.png\([^[:alnum:]]\)/\1eric5.png\2/" -i $(grep -lr eric.png .) || die "sed failed"
-	mv eric/icons/default/eric{,5}.png || die "mv failed"
-	mv eric/pixmaps/eric{,5}.png || die "mv failed"
-	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.
-	rm -fr eric/ThirdParty
-	rm -fr eric/DebugClients/Python{,3}/coverage
-}
-
-src_install() {
-	installation() {
-		"$(PYTHON)" install.py \
-			-z \
-			-b "${EPREFIX}/usr/bin" \
-			-i "${T}/images/${PYTHON_ABI}" \
-			-d "${EPREFIX}$(python_get_sitedir)" \
-			-c
-	}
-	python_execute_function installation
-	python_merge_intermediate_installation_images "${T}/images"
-
-	doicon eric/icons/default/${MY_PN}.png || die "doicon failed"
-}
-
-pkg_postinst() {
-	python_mod_optimize -x "/eric5/(DebugClients/Python|UtilitiesPython2)/" ${MY_PN}{,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
-	elog "The following packages will give Eric extended functionality:"
-	elog "  dev-python/pylint"
-	elog "  dev-python/pysvn"
-	elog
-	elog "This version has a plugin interface with plugin-autofetch from"
-	elog "the application itself. You may want to check those as well."
-	elog
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${MY_PN}{,config.py,plugins}
-}