Cleanup ebuild and drop calls to deprecated python functions.

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

4 files changed, 29 insertions, 43 deletions

diff --git a/media-gfx/fontypython/ChangeLog b/media-gfx/fontypython/ChangeLog
index 90228574fb0c..f63b57ddc834 100644
--- a/media-gfx/fontypython/ChangeLog
+++ b/media-gfx/fontypython/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/fontypython
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontypython/ChangeLog,v 1.8 2009/10/26 05:25:32 dirtyepic Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontypython/ChangeLog,v 1.9 2010/03/05 20:54:20 dirtyepic Exp $
+
+  05 Mar 2010; Ryan Hill <dirtyepic@gentoo.org> fontypython-0.4.2.2.ebuild,
+  fontypython-0.4.2.3.ebuild:
+  Cleanup ebuild and drop calls to deprecated python functions.
 
 *fontypython-0.4.2.3 (26 Oct 2009)
 
diff --git a/media-gfx/fontypython/Manifest b/media-gfx/fontypython/Manifest
index 5f64a161b55a..901ab029ee9e 100644
--- a/media-gfx/fontypython/Manifest
+++ b/media-gfx/fontypython/Manifest
@@ -3,14 +3,14 @@ Hash: SHA1
 
 DIST fontypython-0.4.2.2.tar.gz 343938 RMD160 b4a0fe7f2a440ba72aa4dd290e5ddc0c7716908b SHA1 44eabde7471a1d23c06dbc0719ce0ad1d9cb1bbf SHA256 24460133c5ef3f43aa7d4023ff9657a6c75f0690d510bf72dd9bcd8e3e0d026b
 DIST fontypython-0.4.2.3.tar.gz 344039 RMD160 29112d141c86f450ddfa3466a1dd886c2ea2f949 SHA1 0218a19b26c746314ee0f6cafade440146aa34d6 SHA256 9e2da2fd79aa70fbc3cb2ebc93981ea450ebb48144cb489337537679b566edff
-EBUILD fontypython-0.4.2.2.ebuild 1026 RMD160 e4c34f8319343a293a5cffc1fb547d01ac558bf4 SHA1 ad22216cead5cceac1599b79e60305d72325d1b6 SHA256 4c43150bc7ef7286caad3ca7194552d3c2d4fb142d0b3a9defecde4ab1fe431b
-EBUILD fontypython-0.4.2.3.ebuild 1026 RMD160 a871330c8634b66453534b6374349b8b6f89a77a SHA1 2df82e6b332cfcae79be777badae2df09bef89cc SHA256 05a36c912e16bd10bb33c4d0a7c236fe33b02458fb32177dc084d00e36742126
-MISC ChangeLog 1467 RMD160 384e772b445760711d047b7e756a6f6de3ef90aa SHA1 dbb7de6b03f29de70840eda597533877790ab6b2 SHA256 ec3e9b812d7a4af7b2fbdd8fada3ceddaf971a03c33a6b29dd8281619f4f3080
+EBUILD fontypython-0.4.2.2.ebuild 780 RMD160 5a632d61eca7a448ee8d9f8c8c7c2f717a264ea8 SHA1 d559e9b74427327728e3d10f21c2acb340baff05 SHA256 51d8147ed2c0b7a00cacba61e4e9e84be2159b0e71fbd9ad466c90aa85e67d53
+EBUILD fontypython-0.4.2.3.ebuild 780 RMD160 23fb3880ebe58f962c9b7cc8ec3c087ef5ac8de8 SHA1 8b88c0b5eeed3a9947b9091948806e2a4915b9f2 SHA256 e4827ca22dde94bab3037563f9ad92468f461952051d1ea2dd473f36ecd78c33
+MISC ChangeLog 1638 RMD160 1e003c9182564fc55f5a09f1acb090c08d09d0fa SHA1 f26715f15621fb8398580a430f190a0c62662dd9 SHA256 abdb0cf1c7b27589ed3a84bb2debddae7439c94f840789521b3ca2b7dc0191a3
 MISC metadata.xml 184 RMD160 144a664717c6ce3e566eca4d4dce5415aaa5eeea SHA1 aa535ab778c48440c469d274aeff6a00078cb114 SHA256 5976ad843386b1f0898c86c4d2737d683c372bce0e445a3408fbc09e700a6946
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkrlMyAACgkQiqiDRvmkBmIGwgCeIXeMc+spmHdnQ43sC8KtNrO+
-BkMAnApBDLvyJZcSppqWqGLIQZoyUwtv
-=i0U6
+iEYEARECAAYFAkuRcBkACgkQiqiDRvmkBmJUJwCgiXyYlv6l0C2/7YyXdL6XtuGX
+JcUAoIEefKgLxznL50JL8hhTF0YQukvz
+=UHly
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/fontypython/fontypython-0.4.2.2.ebuild b/media-gfx/fontypython/fontypython-0.4.2.2.ebuild
index 464c490ac598..c0b3254a3f6d 100644
--- a/media-gfx/fontypython/fontypython-0.4.2.2.ebuild
+++ b/media-gfx/fontypython/fontypython-0.4.2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontypython/fontypython-0.4.2.2.ebuild,v 1.1 2009/10/03 07:22:56 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontypython/fontypython-0.4.2.2.ebuild,v 1.2 2010/03/05 20:54:20 dirtyepic Exp $
 
 EAPI=2
 
@@ -15,25 +15,16 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="dev-lang/python:2.6
-	dev-python/imaging
+# Crashes w/ debug build of wxGTK (#201315)
+DEPEND="dev-python/imaging
 	dev-python/wxpython:2.8
 	x11-libs/wxGTK:2.8[-debug]"
 RDEPEND="${DEPEND}"
 
+PYTHON_DEPEND="2:2.6"
+PYTHON_MODNAME="fontypythonmodules"
+
 src_install() {
-	python_version
-	distutils_src_install \
-		--install-data=/usr/$(get_libdir)/python${PYVER}/site-packages
+	distutils_src_install
 	doman "${S}"/fontypython.1
 }
-
-pkg_postinst() {
-	pydir=/usr/$(get_libdir)/python${PYVER}/site-packages/fontypythonmodules
-	python_mod_optimize ${pydir}
-}
-
-pkg_postrm() {
-	pydir=/usr/$(get_libdir)/python${PYVER}/site-packages/fontypythonmodules
-	python_mod_cleanup ${pydir}
-}
diff --git a/media-gfx/fontypython/fontypython-0.4.2.3.ebuild b/media-gfx/fontypython/fontypython-0.4.2.3.ebuild
index b0482af90596..7dac4c9f50b8 100644
--- a/media-gfx/fontypython/fontypython-0.4.2.3.ebuild
+++ b/media-gfx/fontypython/fontypython-0.4.2.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontypython/fontypython-0.4.2.3.ebuild,v 1.1 2009/10/26 05:25:32 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontypython/fontypython-0.4.2.3.ebuild,v 1.2 2010/03/05 20:54:20 dirtyepic Exp $
 
 EAPI=2
 
@@ -15,25 +15,16 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="dev-lang/python:2.6
-	dev-python/imaging
+# Crashes w/ debug build of wxGTK (#201315)
+DEPEND="dev-python/imaging
 	dev-python/wxpython:2.8
 	x11-libs/wxGTK:2.8[-debug]"
 RDEPEND="${DEPEND}"
 
+PYTHON_DEPEND="2:2.6"
+PYTHON_MODNAME="fontypythonmodules"
+
 src_install() {
-	python_version
-	distutils_src_install \
-		--install-data=/usr/$(get_libdir)/python${PYVER}/site-packages
+	distutils_src_install
 	doman "${S}"/fontypython.1
 }
-
-pkg_postinst() {
-	pydir=/usr/$(get_libdir)/python${PYVER}/site-packages/fontypythonmodules
-	python_mod_optimize ${pydir}
-}
-
-pkg_postrm() {
-	pydir=/usr/$(get_libdir)/python${PYVER}/site-packages/fontypythonmodules
-	python_mod_cleanup ${pydir}
-}