Version bump, bug #287447 by Arfrever. Fixes collision with

dev-lang/fpc-ide, bug #286649 by Donald Wallace Rouse II.
Package-Manager: portage-2.2_rc42/cvs/Linux x86_64

4 files changed, 29 insertions, 36 deletions

diff --git a/media-gfx/fontypython/ChangeLog b/media-gfx/fontypython/ChangeLog
index 6de678cddced..de382d7a6e54 100644
--- a/media-gfx/fontypython/ChangeLog
+++ b/media-gfx/fontypython/ChangeLog
@@ -1,6 +1,13 @@
 # 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.6 2009/09/27 00:59:48 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontypython/ChangeLog,v 1.7 2009/10/03 07:22:56 dirtyepic Exp $
+
+*fontypython-0.4.2.2 (03 Oct 2009)
+
+  03 Oct 2009; Ryan Hill <dirtyepic@gentoo.org> -fontypython-0.3.6.ebuild,
+  -fontypython-0.4.1.ebuild, +fontypython-0.4.2.2.ebuild:
+  Version bump, bug #287447 by Arfrever. Fixes collision with
+  dev-lang/fpc-ide, bug #286649 by Donald Wallace Rouse II.
 
 *fontypython-0.4.1 (27 Sep 2009)
 
diff --git a/media-gfx/fontypython/Manifest b/media-gfx/fontypython/Manifest
index bde1ed127b0f..6fbf89ad2d4a 100644
--- a/media-gfx/fontypython/Manifest
+++ b/media-gfx/fontypython/Manifest
@@ -1,16 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST fontypython-0.3.6.tar.gz 336457 RMD160 493b848c01e4ae5b60e7453565db3b51c0ce4688 SHA1 2b970e567f85c89cf1fba1fce6dce3625368264f SHA256 e951869a89f16cc51ab3b4f18c769c4103e2241d47c7d89066b944f9541276f4
-DIST fontypython-0.4.1.tar.gz 360577 RMD160 4eae752a3b6714ba076bbbf95551f3c6e42c4682 SHA1 965654874d9c5416f0d81d8d8363c2c8f1b37db0 SHA256 93f32f50d461309d7ca71ff393bbc8d3f0fdd44c2ba31df5cf0f31df17ef6d78
-EBUILD fontypython-0.3.6.ebuild 694 RMD160 049a5d3d8a6c96340f7a3bd4f9bd853358058148 SHA1 cee64f1aa9a8a72d2727e44bd9d0560fa0f0f0c5 SHA256 4778d973612cd1619ae11299dae75ee4353a206e9d3d1b8633d19d23dacc493b
-EBUILD fontypython-0.4.1.ebuild 731 RMD160 79371ef0d0ecd9d225f911e7a5b425c26386c84e SHA1 df588ac9a20ea91316dce8b32036643e68e8ee84 SHA256 73960306ffef6ee57c072871c9137d2538a0b8cdafae3330c491dac437079d0c
-MISC ChangeLog 1045 RMD160 111fff10a20ae93ec45cad34747aac8fd308cfb6 SHA1 2ba6a93c26fdd3f052106912bbcd113aaee51db3 SHA256 a01049bf5c2123d19687b14a0f850ac7dc7977d6f8ec8d6a00acf2406779ae3d
+DIST fontypython-0.4.2.2.tar.gz 343938 RMD160 b4a0fe7f2a440ba72aa4dd290e5ddc0c7716908b SHA1 44eabde7471a1d23c06dbc0719ce0ad1d9cb1bbf SHA256 24460133c5ef3f43aa7d4023ff9657a6c75f0690d510bf72dd9bcd8e3e0d026b
+EBUILD fontypython-0.4.2.2.ebuild 1026 RMD160 e4c34f8319343a293a5cffc1fb547d01ac558bf4 SHA1 ad22216cead5cceac1599b79e60305d72325d1b6 SHA256 4c43150bc7ef7286caad3ca7194552d3c2d4fb142d0b3a9defecde4ab1fe431b
+MISC ChangeLog 1337 RMD160 c536833bdc872d5e72cdedb0b656f56c6e625573 SHA1 d4a60f98e00f8a3ba91f6ac0f9fa5ace798afce3 SHA256 f45406738a10dfd83bdb6b144ed2563ad05d622e11cfe7077faef09f49ba5fc5
 MISC metadata.xml 184 RMD160 144a664717c6ce3e566eca4d4dce5415aaa5eeea SHA1 aa535ab778c48440c469d274aeff6a00078cb114 SHA256 5976ad843386b1f0898c86c4d2737d683c372bce0e445a3408fbc09e700a6946
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkq+uTsACgkQiqiDRvmkBmKkgQCgprEb2GVDIaH1wipleVmjf1dq
-BdgAoLq9gpR7MXFzrt555ZkVaX+6C1pw
-=+RGJ
+iEYEARECAAYFAkrG/A0ACgkQiqiDRvmkBmI52ACeK1NoAv5iauLwPT6cxyVGVYYj
+QDMAoNs1uxLEdVhMiz0DY35pbC6Xk0Nr
+=WUNq
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/fontypython/fontypython-0.3.6.ebuild b/media-gfx/fontypython/fontypython-0.3.6.ebuild
deleted file mode 100644
index 07a769c4d77c..000000000000
--- a/media-gfx/fontypython/fontypython-0.3.6.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontypython/fontypython-0.3.6.ebuild,v 1.2 2009/03/07 23:02:45 maekke Exp $
-
-inherit distutils multilib python
-
-DESCRIPTION="Font preview application"
-HOMEPAGE="http://savannah.nongnu.org/projects/fontypython"
-SRC_URI="http://download.savannah.nongnu.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/imaging
-	>=dev-python/wxpython-2.6"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	python_version
-	distutils_src_install \
-		--install-data=/usr/$(get_libdir)/python${PYVER}/site-packages
-}
diff --git a/media-gfx/fontypython/fontypython-0.4.1.ebuild b/media-gfx/fontypython/fontypython-0.4.2.2.ebuild
index 6af005fdcab6..464c490ac598 100644
--- a/media-gfx/fontypython/fontypython-0.4.1.ebuild
+++ b/media-gfx/fontypython/fontypython-0.4.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontypython/fontypython-0.4.1.ebuild,v 1.1 2009/09/27 00:59:48 dirtyepic Exp $
+# $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 $
 
 EAPI=2
 
@@ -15,13 +15,25 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="dev-python/imaging
+DEPEND="dev-lang/python:2.6
+	dev-python/imaging
 	dev-python/wxpython:2.8
 	x11-libs/wxGTK:2.8[-debug]"
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"
 
 src_install() {
 	python_version
 	distutils_src_install \
 		--install-data=/usr/$(get_libdir)/python${PYVER}/site-packages
+	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}
 }