Version bumps, #382183 by Michael Mair-Keimberger.

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

3 files changed, 111 insertions, 11 deletions

diff --git a/dev-util/eric/ChangeLog b/dev-util/eric/ChangeLog
index 3f00cb35ea74..eb6a17a8a2b5 100644
--- a/dev-util/eric/ChangeLog
+++ b/dev-util/eric/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/eric
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/ChangeLog,v 1.165 2011/07/06 19:38:47 djc Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/ChangeLog,v 1.166 2012/01/01 22:54:42 pesa Exp $
+
+*eric-4.4.19 (01 Jan 2012)
+*eric-5.1.7 (01 Jan 2012)
+
+  01 Jan 2012; Davide Pesavento <pesa@gentoo.org> +eric-4.4.19.ebuild,
+  +eric-5.1.7.ebuild, -eric-5.1.4.ebuild:
+  Version bumps, #382183 by Michael Mair-Keimberger.
 
 *eric-5.1.4 (06 Jul 2011)
 
diff --git a/dev-util/eric/eric-4.4.19.ebuild b/dev-util/eric/eric-4.4.19.ebuild
new file mode 100644
index 000000000000..10f7eb7033bb
--- /dev/null
+++ b/dev-util/eric/eric-4.4.19.ebuild
@@ -0,0 +1,93 @@
+# 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.1 2012/01/01 22:54:42 pesa Exp $
+
+EAPI="3"
+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"
+
+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="4"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="kde spell"
+
+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 )"
+RDEPEND="${DEPEND}
+	>=dev-python/chardet-2.0.1
+	dev-python/coverage
+	>=dev-python/pygments-1.1"
+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}/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
+}
+
+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/eric.png || die "doicon failed"
+	make_desktop_entry "${MY_PN} --nosplash" ${MY_PN} eric "Development;IDE;Qt"
+}
+
+pkg_postinst() {
+	python_mod_optimize ${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}
+}
diff --git a/dev-util/eric/eric-5.1.4.ebuild b/dev-util/eric/eric-5.1.7.ebuild
index b130931f176d..a44247369f1e 100644
--- a/dev-util/eric/eric-5.1.4.ebuild
+++ b/dev-util/eric/eric-5.1.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.4.ebuild,v 1.1 2011/07/06 19:38:47 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-5.1.7.ebuild,v 1.1 2012/01/01 22:54:42 pesa Exp $
 
 EAPI="3"
-PYTHON_DEPEND="3"
+PYTHON_DEPEND="3:3.1"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="2.* *-jython"
 
@@ -23,7 +23,8 @@ SLOT="5"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="spell"
 
-DEPEND=">=dev-python/PyQt4-4.7[assistant,svg,webkit,X]
+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
@@ -31,15 +32,14 @@ RDEPEND="${DEPEND}
 	>=dev-python/pygments-1.4"
 PDEPEND="spell? ( dev-python/pyenchant )"
 
-LANGS="cs de es fr it ru tr zh_CN"
+LANGS="cs de en es fr it ru tr zh_CN"
 for L in ${LANGS}; do
-	SRC_URI="${SRC_URI}
-		linguas_${L}? ( ${BASE_URI}/${MY_PN}-i18n-${L/zh_CN/zh_CN.GB2312}-${MY_PV}.tar.gz )"
-	IUSE="${IUSE} linguas_${L}"
+	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}"
+S=${WORKDIR}/${MY_P}
 
 PYTHON_VERSIONED_EXECUTABLES=("/usr/bin/.*")