Use SUPPORT_PYTHON_ABIS. Remove old.

(Portage version: 2.2_rc65/cvs/Linux x86_64)

5 files changed, 14 insertions, 140 deletions

diff --git a/app-editors/editra/ChangeLog b/app-editors/editra/ChangeLog
index f195d4401757..079fcec3fad3 100644
--- a/app-editors/editra/ChangeLog
+++ b/app-editors/editra/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/editra
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/editra/ChangeLog,v 1.10 2010/02/19 00:21:13 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/editra/ChangeLog,v 1.11 2010/03/06 04:36:24 dirtyepic Exp $
+
+  06 Mar 2010; Ryan Hill <dirtyepic@gentoo.org> -editra-0.5.05.ebuild,
+  -editra-0.5.15.ebuild, -editra-0.5.25.ebuild, editra-0.5.32.ebuild:
+  Use SUPPORT_PYTHON_ABIS. Remove old.
 
   19 Feb 2010; Ryan Hill <dirtyepic@gentoo.org> editra-0.5.32.ebuild,
   +files/editra-0.5.32-sandbox.patch:
diff --git a/app-editors/editra/editra-0.5.05.ebuild b/app-editors/editra/editra-0.5.05.ebuild
deleted file mode 100644
index d79e126e4775..000000000000
--- a/app-editors/editra/editra-0.5.05.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/editra/editra-0.5.05.ebuild,v 1.1 2009/09/04 00:56:36 dirtyepic Exp $
-
-EAPI=2
-
-inherit distutils eutils fdo-mime
-
-MY_PN=${PN/e/E}
-
-DESCRIPTION="Multi-platform text editor supporting over 50 programming languages."
-HOMEPAGE="http://editra.org"
-SRC_URI="http://editra.org/uploads/src/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="wxWinLL-3.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/python-2.5
-		>=dev-python/wxpython-2.8.9.2:2.8
-		dev-python/setuptools"
-# setuptools is RDEPEND because it's used by the runtime for installing plugins
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_PN}-${PV}
-
-src_install() {
-	distutils_src_install
-	insinto /usr/share/pixmaps
-	doins "${S}"/pixmaps/editra.png
-	make_desktop_entry Editra Editra editra "Development;TextEditor"
-	dodoc FAQ THANKS
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	distutils_pkg_postrm
-	fdo-mime_desktop_database_update
-}
diff --git a/app-editors/editra/editra-0.5.15.ebuild b/app-editors/editra/editra-0.5.15.ebuild
deleted file mode 100644
index 519cc164995a..000000000000
--- a/app-editors/editra/editra-0.5.15.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/editra/editra-0.5.15.ebuild,v 1.1 2009/11/02 00:02:25 dirtyepic Exp $
-
-EAPI=2
-
-inherit distutils eutils fdo-mime
-
-MY_PN=${PN/e/E}
-
-DESCRIPTION="Multi-platform text editor supporting over 50 programming languages."
-HOMEPAGE="http://editra.org http://pypi.python.org/pypi/Editra"
-SRC_URI="http://editra.org/uploads/src/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="wxWinLL-3.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="spell"
-
-DEPEND=">=dev-lang/python-2.5
-		>=dev-python/wxpython-2.8.9.2:2.8
-		dev-python/setuptools"
-# setuptools is RDEPEND because it's used by the runtime for installing plugins
-RDEPEND="${DEPEND}
-	spell? ( dev-python/pyenchant )"
-
-S="${WORKDIR}"/${MY_PN}-${PV}
-
-src_install() {
-	distutils_src_install
-	insinto /usr/share/pixmaps
-	doins "${S}"/pixmaps/editra.png
-	make_desktop_entry Editra Editra editra "Development;TextEditor"
-	dodoc FAQ THANKS
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	distutils_pkg_postrm
-	fdo-mime_desktop_database_update
-}
diff --git a/app-editors/editra/editra-0.5.25.ebuild b/app-editors/editra/editra-0.5.25.ebuild
deleted file mode 100644
index 2a95ba1e3613..000000000000
--- a/app-editors/editra/editra-0.5.25.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/editra/editra-0.5.25.ebuild,v 1.1 2009/12/19 02:09:06 dirtyepic Exp $
-
-EAPI=2
-
-inherit distutils eutils fdo-mime
-
-MY_PN=${PN/e/E}
-
-DESCRIPTION="Multi-platform text editor supporting over 50 programming languages."
-HOMEPAGE="http://editra.org http://pypi.python.org/pypi/Editra"
-SRC_URI="http://editra.org/uploads/src/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="wxWinLL-3.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="spell"
-
-DEPEND=">=dev-lang/python-2.5
-		>=dev-python/wxpython-2.8.9.2:2.8
-		dev-python/setuptools"
-# setuptools is RDEPEND because it's used by the runtime for installing plugins
-RDEPEND="${DEPEND}
-	spell? ( dev-python/pyenchant )"
-
-S="${WORKDIR}"/${MY_PN}-${PV}
-
-src_install() {
-	distutils_src_install
-	insinto /usr/share/pixmaps
-	doins "${S}"/pixmaps/editra.png
-	make_desktop_entry Editra Editra editra "Development;TextEditor"
-	dodoc FAQ THANKS
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	distutils_pkg_postrm
-	fdo-mime_desktop_database_update
-}
diff --git a/app-editors/editra/editra-0.5.32.ebuild b/app-editors/editra/editra-0.5.32.ebuild
index 95f6da0a099a..6b510a72e760 100644
--- a/app-editors/editra/editra-0.5.32.ebuild
+++ b/app-editors/editra/editra-0.5.32.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/editra/editra-0.5.32.ebuild,v 1.2 2010/02/19 00:21:13 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/editra/editra-0.5.32.ebuild,v 1.3 2010/03/06 04:36:24 dirtyepic Exp $
 
 EAPI=2
+SUPPORT_PYTHON_ABIS=1
 
-inherit distutils eutils fdo-mime
+inherit distutils eutils fdo-mime python
 
 MY_PN=${PN/e/E}
 
@@ -17,19 +18,22 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="spell"
 
-DEPEND=">=dev-lang/python-2.5
-		>=dev-python/wxpython-2.8.9.2:2.8
-		dev-python/setuptools"
+DEPEND=">=dev-python/wxpython-2.8.9.2:2.8
+		>=dev-python/setuptools-0.6"
 # setuptools is RDEPEND because it's used by the runtime for installing plugins
 RDEPEND="${DEPEND}
 	spell? ( dev-python/pyenchant )"
 
+PYTHON_DEPEND="2:2.4"
+RESTRICT_PYTHON_ABIS="3.*"
+
 S="${WORKDIR}"/${MY_PN}-${PV}
 
 src_prepare() {
 	#http://code.google.com/p/editra/issues/detail?id=481
 	epatch "${FILESDIR}"/${P}-sandbox.patch
 	# next version, use setup.py install --no-clean
+	distutils_src_prepare
 }
 
 src_install() {