Version bump.

(Portage version: 14212-svn/cvs/Linux x86_64)

4 files changed, 35 insertions, 170 deletions

diff --git a/dev-util/eric/ChangeLog b/dev-util/eric/ChangeLog
index 1e8555a045e0..7b65e098119f 100644
--- a/dev-util/eric/ChangeLog
+++ b/dev-util/eric/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/eric
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/ChangeLog,v 1.88 2009/09/06 19:57:47 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/ChangeLog,v 1.89 2009/09/07 06:51:18 arfrever Exp $
+
+*eric-4.3.7.1 (07 Sep 2009)
+
+  07 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -eric-4.3.3.ebuild, -eric-4.3.4.ebuild, -eric-4.3.5.ebuild,
+  +eric-4.3.7.1.ebuild:
+  Version bump.
 
   06 Sep 2009; Christian Ruppert <idl0r@gentoo.org>
   -files/3.9.5-disable_compilation.patch, eric-4.3.1.ebuild,
diff --git a/dev-util/eric/eric-4.3.3.ebuild b/dev-util/eric/eric-4.3.3.ebuild
deleted file mode 100644
index 60624e4dc775..000000000000
--- a/dev-util/eric/eric-4.3.3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.3.3.ebuild,v 1.3 2009/07/12 10:08:16 hwoarang Exp $
-
-EAPI="2"
-
-NEED_PYTHON=2.4
-
-inherit python eutils
-
-MY_PN=${PN}4
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="A full featured Python IDE that is written in PyQt4 using the QScintilla editor widget"
-HOMEPAGE="http://eric-ide.python-projects.org/index.html"
-SRC_URI="mirror://sourceforge/eric-ide/${MY_P}.tar.gz
-	linguas_cs? ( mirror://sourceforge/eric-ide/${MY_PN}-i18n-cs-${PV}.tar.gz )
-	linguas_de? ( mirror://sourceforge/eric-ide/${MY_PN}-i18n-de-${PV}.tar.gz )
-	linguas_es? ( mirror://sourceforge/eric-ide/${MY_PN}-i18n-es-${PV}.tar.gz )
-	linguas_fr? ( mirror://sourceforge/eric-ide/${MY_PN}-i18n-fr-${PV}.tar.gz )
-	linguas_ru? ( mirror://sourceforge/eric-ide/${MY_PN}-i18n-ru-${PV}.tar.gz )
-	linguas_tr? ( mirror://sourceforge/eric-ide/${MY_PN}-i18n-tr-${PV}.tar.gz )
-	linguas_zh_CN? ( mirror://sourceforge/eric-ide/${MY_PN}-i18n-zh_CN.GB2312-${PV}.tar.gz )"
-
-SLOT="4"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="linguas_cs linguas_de linguas_es linguas_fr linguas_ru linguas_tr"
-
-DEPEND="dev-python/PyQt4[X,svg,webkit]
-	>=dev-python/qscintilla-python-2.2[qt4]"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-LANGS="cs de es fr ru tr"
-
-python_version
-
-src_prepare() {
-	#epatch "${FILESDIR}"/4.3.0-paths.patch
-	epatch "${FILESDIR}"/4.2.3-no-interactive.patch
-}
-
-src_install() {
-	# Change qt dir to be located in ${D}
-	dodir /usr/share/qt4/
-	${python} install.py \
-		-z \
-		-b "/usr/bin" \
-		-i "${D}" \
-		-d "/usr/$(get_libdir)/python${PYVER}/site-packages" \
-		-c || die "python install.py failed"
-
-	make_desktop_entry "eric4 --nosplash" \
-			eric4 \
-			"/usr/$(get_libdir)/python${PYVER}/site-packages/eric4/icons/default/eric.png" \
-			"Development;IDE;Qt"
-}
-
-pkg_postinst() {
-	python_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/eric4{,plugins}
-	elog "If you want to use eric4 with mod_python, have a look at"
-	elog "\"${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages/eric4/patch_modpython.py\"."
-	elog
-	elog "The following packages will give eric extended functionality."
-	elog
-	elog "dev-python/pylint"
-	elog "dev-python/pysvn            (in sunrise overlay atm)"
-	elog
-	elog "This version has a new plugin interface with plugin-autofetch from"
-	elog "the App itself. You may want to check those as well"
-}
-
-pkg_postrm() {
-	python_mod_cleanup
-}
diff --git a/dev-util/eric/eric-4.3.4.ebuild b/dev-util/eric/eric-4.3.4.ebuild
deleted file mode 100644
index 4b5a033e1f1a..000000000000
--- a/dev-util/eric/eric-4.3.4.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.3.4.ebuild,v 1.3 2009/07/12 10:08:16 hwoarang Exp $
-
-EAPI="2"
-NEED_PYTHON=2.4
-inherit python eutils
-
-MY_PN=${PN}4
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="A full featured Python IDE that is written in PyQt4 using the QScintilla editor widget"
-HOMEPAGE="http://eric-ide.python-projects.org/index.html"
-SRC_URI="mirror://sourceforge/eric-ide/${MY_P}.tar.gz
-	linguas_cs? ( mirror://sourceforge/eric-ide/${MY_PN}-i18n-cs-${PV}.tar.gz )
-	linguas_de? ( mirror://sourceforge/eric-ide/${MY_PN}-i18n-de-${PV}.tar.gz )
-	linguas_es? ( mirror://sourceforge/eric-ide/${MY_PN}-i18n-es-${PV}.tar.gz )
-	linguas_fr? ( mirror://sourceforge/eric-ide/${MY_PN}-i18n-fr-${PV}.tar.gz )
-	linguas_ru? ( mirror://sourceforge/eric-ide/${MY_PN}-i18n-ru-${PV}.tar.gz )
-	linguas_tr? ( mirror://sourceforge/eric-ide/${MY_PN}-i18n-tr-${PV}.tar.gz )
-	linguas_zh_CN? ( mirror://sourceforge/eric-ide/${MY_PN}-i18n-zh_CN.GB2312-${PV}.tar.gz )"
-
-SLOT="4"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="linguas_cs linguas_de linguas_es linguas_fr linguas_ru linguas_tr"
-
-DEPEND="dev-python/PyQt4[X,svg,webkit]
-	>=dev-python/qscintilla-python-2.2[qt4]"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-LANGS="cs de es fr ru tr"
-
-python_version
-
-src_prepare() {
-	#epatch "${FILESDIR}"/4.3.0-paths.patch
-	epatch "${FILESDIR}"/4.2.3-no-interactive.patch
-}
-
-src_install() {
-	# Change qt dir to be located in ${D}
-	dodir /usr/share/qt4/
-	${python} install.py \
-		-z \
-		-b "/usr/bin" \
-		-i "${D}" \
-		-d "/usr/$(get_libdir)/python${PYVER}/site-packages" \
-		-c || die "python install.py failed"
-
-	make_desktop_entry "eric4 --nosplash" \
-			eric4 \
-			"/usr/$(get_libdir)/python${PYVER}/site-packages/eric4/icons/default/eric.png" \
-			"Development;IDE;Qt"
-}
-
-pkg_postinst() {
-	python_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/eric4{,plugins}
-	elog "If you want to use eric4 with mod_python, have a look at"
-	elog "\"${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages/eric4/patch_modpython.py\"."
-	elog
-	elog "The following packages will give eric extended functionality."
-	elog
-	elog "dev-python/pylint"
-	elog "dev-python/pysvn            (in sunrise overlay atm)"
-	elog
-	elog "This version has a plugin interface with plugin-autofetch from"
-	elog "the App itself. You may want to check those as well."
-}
-
-pkg_postrm() {
-	python_mod_cleanup
-}
diff --git a/dev-util/eric/eric-4.3.5.ebuild b/dev-util/eric/eric-4.3.7.1.ebuild
index 021f3d46a95f..23f5e0846800 100644
--- a/dev-util/eric/eric-4.3.5.ebuild
+++ b/dev-util/eric/eric-4.3.7.1.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.3.5.ebuild,v 1.1 2009/07/12 10:08:16 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.3.7.1.ebuild,v 1.1 2009/09/07 06:51:18 arfrever Exp $
 
 EAPI="2"
-NEED_PYTHON=2.4
-inherit python eutils
+NEED_PYTHON="2.4"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit eutils python
 
 MY_PN=${PN}4
 MY_P=${MY_PN}-${PV}
@@ -28,6 +30,8 @@ DEPEND="dev-python/PyQt4[svg,webkit,X]
 	>=dev-python/qscintilla-python-2.2[qt4]"
 RDEPEND="${DEPEND}"
 
+RESTRICT_PYTHON_ABIS="3*"
+
 S=${WORKDIR}/${MY_P}
 
 LANGS="cs de es fr ru tr"
@@ -35,19 +39,24 @@ LANGS="cs de es fr ru tr"
 python_version
 
 src_prepare() {
-	epatch "${FILESDIR}"/4.2.3-no-interactive.patch
+	epatch "${FILESDIR}/4.2.3-no-interactive.patch"
 }
 
 src_install() {
 	# Change qt dir to be located in ${D}
-	dodir /usr/share/qt4/
-	${python} install.py \
-		-z \
-		-b "/usr/bin" \
-		-i "${D}" \
-		-d "/usr/$(get_libdir)/python${PYVER}/site-packages" \
-		-c || die "python install.py failed"
+	dodir /usr/share/qt4
+
+	installation() {
+		"$(PYTHON)" install.py \
+			-z \
+			-b "/usr/bin" \
+			-i "${D}" \
+			-d "$(python_get_sitedir)" \
+			-c
+	}
+	python_execute_function installation
 
+	python_version
 	make_desktop_entry "eric4 --nosplash" \
 			eric4 \
 			"/usr/$(get_libdir)/python${PYVER}/site-packages/eric4/icons/default/eric.png" \
@@ -55,18 +64,19 @@ src_install() {
 }
 
 pkg_postinst() {
-	python_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/eric4{,plugins}
+	python_mod_optimize eric4{,config.py,plugins}
+
+	elog
 	elog "If you want to use eric4 with mod_python, have a look at"
 	elog "\"${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages/eric4/patch_modpython.py\"."
 	elog
-	elog "The following packages will give eric extended functionality."
-	elog
-	elog "dev-python/pylint"
-	elog "dev-python/pysvn            (in sunrise overlay atm)"
+	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 App itself. You may want to check those as well."
+	elog
 }
 
 pkg_postrm() {