Use SUPPORT_PYTHON_ABIS. Remove old.

Package-Manager: portage-2.2_rc65/cvs/Linux x86_64

diff --git a/app-editors/editra/ChangeLog b/app-editors/editra/ChangeLog
index f195d44017579c2938f01e01f3290898bd5470c4..079fcec3fad3340839456c7414f79afe819ea012 100644 (file)
--- 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/Manifest b/app-editors/editra/Manifest
index 807a02d31612d7dd61e0cbcd76169d9381974ec0..1e00dff5b590ba3cc7b57c15ebe0e20a55d40fce 100644 (file)
--- a/app-editors/editra/Manifest
+++ b/app-editors/editra/Manifest
@@ -2,20 +2,14 @@
 Hash: SHA1
 
 AUX editra-0.5.32-sandbox.patch 789 RMD160 4ec995d217a78b254a03b393707b50d8da4e0a5c SHA1 cfbec588e0b8bad5a3fc9f36ab537033adc6e4a5 SHA256 32c2533685d275a1ca2eac862f2dcff4e8063d6d5d71008582f17309322a7d85
-DIST Editra-0.5.05.tar.gz 3239110 RMD160 532145e3651cb6a752af004995c7a80d7c7c56e0 SHA1 a92aaaf8ee51076d9166f8be76f0acb621d47e99 SHA256 285bfc77737ea301865a290c6b4bcc6d2722fbb8490498b012558c7a05db06cd
-DIST Editra-0.5.15.tar.gz 3264600 RMD160 260b1ca46516f8ac9d3a0d6bbf8b78e79beeb464 SHA1 2604b486c2420be41859dc1f99dab39fb12a21ac SHA256 c9a35f3e13fc0a408d651a7b32612f046769584c209d1250e9664f95e876f4bb
-DIST Editra-0.5.25.tar.gz 3036677 RMD160 f62560ded6f36f1f946d113abd42b49d84d5b712 SHA1 75fe19337e8338f49791b7be3cabf43fd118cf95 SHA256 c511dd2a899de35c3391a603b31fe178aa808c172328904d05fe844cfc399685
 DIST Editra-0.5.32.tar.gz 3036861 RMD160 b44ecd98eb237e5c9e1e39c78f056538ebc5de06 SHA1 38480ea8932a3fcea5ef985f643d3326cacbf237 SHA256 e99c641cea9be12446e30478f75d75599a3b0410f6d543c55fd868bae83cfa57
-EBUILD editra-0.5.05.ebuild 1084 RMD160 541d76d34796b2aa92ca45f6e96d834be3bf59a3 SHA1 ae9aeeb7be3a22a84b6700c7bef63658d68e33ca SHA256 526ff7e14b2adc127f706f4747ffa244d2cec92354c5b72722d33e8e34280cc6
-EBUILD editra-0.5.15.ebuild 1157 RMD160 cb75d3a562414b12bcfbd09cabee6f70138f6ebd SHA1 1db7fea53abc00add087aab9edb80d5ddf3782d9 SHA256 27cc7ea90d1351f10c1dbc9815b1e651503d46f4563c1e5036e3482b303f974d
-EBUILD editra-0.5.25.ebuild 1157 RMD160 80ef8eae47f70cf846a4c04c2f6de3a78a620005 SHA1 0cebef6cf424e7cea435292bf52fe66975648eb6 SHA256 03617777dfda67ce2827742c9bf48a00f7ae578e9d49b5c475e8f36375d62359
-EBUILD editra-0.5.32.ebuild 1321 RMD160 a815044b0490269bb3b14d84428f9648f2043d72 SHA1 53dc57d8d39f5fda2d3684b0066844e144124736 SHA256 56b8d28cc0ef69aaa7be0dc074002f02b824fb2e7b4d85b6307974b2dd16fde1
-MISC ChangeLog 1904 RMD160 cd668afac68f0ed2df6fdf7b53638470e487d2bd SHA1 0d996855490b15cce302565c1852ed81003ab185 SHA256 afbc2711d730b0b6f2d4975d733490132ec7122da23a949e246023c6462279e5
+EBUILD editra-0.5.32.ebuild 1405 RMD160 17c7794b8586db2203fdee73ef285a6a8cd57ea1 SHA1 a4de8c114e056c310efc777271ca6bb1ee9e106c SHA256 1f38543d8c878b90207a5110dfc21b7a25010da0fc5ec3c1c60733b225952815
+MISC ChangeLog 2085 RMD160 1b8974d45dbcbf029e45ace204409485c8a13999 SHA1 2a8d3683e5464ffb2fe857ef6277d82f2e715a37 SHA256 d1a04ecc39997ff7746755e6f41212ec459979199d1b5f8b3ecbfba3e578f4f8
 MISC metadata.xml 163 RMD160 9a0dfd25dd8d78688f888da6873ba81236f6ed02 SHA1 a3f0779e6edd3b5eff0964b594051edd3de40978 SHA256 f80859bf7a6a4f9003e458590a617debc14e3e1766004a67b368b327f3afc535
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkt92hUACgkQiqiDRvmkBmKNpACZARjfoAsgtHpErEzzBqhezlXY
-D1YAoMcwYnQ8rVscYjm5TuFj+ngKiYlu
-=xY9n
+iEYEARECAAYFAkuR3GAACgkQiqiDRvmkBmKodQCgimKNsTIShLK+slkgSs7FkWvh
+WJAAnRjTXQQzeGxOLy8i0SoSzQvjSJHB
+=15b+
 -----END PGP SIGNATURE-----

diff --git a/app-editors/editra/editra-0.5.05.ebuild b/app-editors/editra/editra-0.5.05.ebuild
deleted file mode 100644 (file)
index d79e126..0000000
--- 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 (file)
index 519cc16..0000000
--- 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 (file)
index 2a95ba1..0000000
--- 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 95f6da0a099a2affda2d9caf418f4d62f7b579b4..6b510a72e76005495a0de045faf4d7f22f914865 100644 (file)
--- 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() {