fontforge python 2.7 fix

Package-Manager: portage-2.1.9.25/cvs/Linux x86_64

4 files changed, 31 insertions, 4 deletions

diff --git a/media-gfx/fontforge/ChangeLog b/media-gfx/fontforge/ChangeLog
index 6cc9772b24d8..1b047a34139a 100644
--- a/media-gfx/fontforge/ChangeLog
+++ b/media-gfx/fontforge/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/fontforge
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/ChangeLog,v 1.133 2010/10/14 19:23:52 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/ChangeLog,v 1.134 2010/11/30 23:41:38 hanno Exp $
+
+  30 Nov 2010; Hanno Boeck <hanno@gentoo.org> +files/fontforge-py27.diff,
+  fontforge-20100501.ebuild:
+  Add upstream patch for python 2.7.
 
   14 Oct 2010; Brent Baude <ranger@gentoo.org> fontforge-20100501.ebuild:
   stable ppc, bug 338340
diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index c3a6d4c32d7e..69f5134ac99c 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -1,6 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX fontforge-20090923-configure.patch 1024 RMD160 e4e9748b8b09ff475d576a221ff5a69af65ea2ef SHA1 4f18b1f1925d91abd451d4813afa0c1fa6855b34 SHA256 491fe813756d0ed693777d707da20ca16a97cf09274e92acdb72f8e7577b424f
 AUX fontforge-20090923-libpng14.patch 3458 RMD160 29386acf679e0cf4160fd0fce4830bf941874d3f SHA1 3e3f8575621de7b745868dde672cef6a6a826996 SHA256 4cd01772061dcf10555cb0d67dad27a05d6ea004f0e5eb01cc2e76c9878ed797
 AUX fontforge-desktop.patch 662 RMD160 2242c71cbb88941e398fe0bb28798df941b05cd6 SHA1 c170824b25ad698d0ef8d3a59e16312c418c1fd8 SHA256 b2308b21b7db3c1ad0f8e2880678a0866f401e3ce57903e98ed68472f1e187e8
+AUX fontforge-py27.diff 387 RMD160 633fbf1f53495d0bb87975f657e00f452d7cae9b SHA1 406b97dbd894a97f1f1a66376a1ab41c7a6081f2 SHA256 18d71c28258a00459621113a0126b525b08cfd0a2dfb406fc90c6bed3d3790ed
 DIST cidmaps-20090121.tgz 314314 RMD160 d194355e61813d31fe4813bdf10a62d66a9f6d04 SHA1 efbc7c9d3e95159f5600dc71f9cccb370e46bb94 SHA256 1bf9c7eb8835e6ed94e62cb49f1141bc046c562849e52e6c3c7f1d7cfc95c7b3
 DIST fontforge_full-20090622.tar.bz2 5359385 RMD160 ba9983bf667091e0e9b88fcabf865c65ba2debbd SHA1 bc638eeeb4cf2d540773bacc52cc6bac1c6ca76f SHA256 bf0f1fd76f47646252853c1d86d119a9638a9a6be5c42d12e2f35b6b5c120d3f
 DIST fontforge_full-20090923.tar.bz2 5492119 RMD160 704a623f506500c839f378393f11ef14b5dec367 SHA1 cccf78ddf074ea5ddc3ce13a988dc17d383eabdd SHA256 43bbad49796a93dac3eac6f97e79d882b34fb0835ee3645c2408b402fdd01baa
@@ -10,6 +14,13 @@ DIST fontforge_htdocs-20090914.tar.bz2 2828545 RMD160 74322d2d38f8321465b6fb9d79
 DIST fontforge_htdocs-20100429.tar.bz2 3115782 RMD160 f1dedf39898d12398ffe463c06ebcb5d88fb575b SHA1 eeda060ad5e83392d1a27f6c9c1eac2a9c780c09 SHA256 842a5e675341578aacdd2614ec416719eba51826749d73b2044731335d1a1883
 EBUILD fontforge-20090622.ebuild 3436 RMD160 335b22027cac3b1581cbe4279d60b7645cf38d00 SHA1 09a32fe961f9d7a7f2e2c0e5aa394f242a7ffaf6 SHA256 7ae2cc82779af7e4e4b881425857eb4eefc8fd9683f570bea9f46460be323728
 EBUILD fontforge-20090923.ebuild 3610 RMD160 cbb2eed19d03ebd50e4b9871038ecd89daa36dc6 SHA1 f4215bcc7f9ad1a0eef6e913195e2b4ee06e9065 SHA256 8097b39a32773b0a32984e5c51907cbc0b254d8abffd29cd1b798423a065502c
-EBUILD fontforge-20100501.ebuild 3504 RMD160 b29a47e57981c334b76ccdabc7dc01e2335b3c03 SHA1 8df2c737871c0e9445c0316fbd18225e9ff16156 SHA256 016bf1b344b711de3fdaf9ccf2c5e8123d1a8b648a33be5c8253e44cb082052d
-MISC ChangeLog 19335 RMD160 96f5e0282d69e3b9f361b3a3c375530c8d0ff96f SHA1 af0e762efeb1e36a40ef74b7ec50f75b96fa147a SHA256 48ebf2d7432a4cdab859359ae7090fb949b577a6926e6dbe57e4ac1b412875b4
+EBUILD fontforge-20100501.ebuild 3545 RMD160 5b3e4486cfa636cd6e2141991e7d8d9d6821a78b SHA1 7aa7f4fe2ecf0106d47a31d77da01900d76b58ee SHA256 4a4707d882f6d88f63452e47ef45898ac68869a582b9d32b0154b847790bd0a0
+MISC ChangeLog 19475 RMD160 8836412e8f93e1b5af32456dde7cf544133d510e SHA1 5eaa16a548101775bd095aa825cf3d64d2384c56 SHA256 c5856124e786ef050ea79ac5f6addaa2dfd6847fa6c2b16bee82a7cd6bc2349a
 MISC metadata.xml 1457 RMD160 1d4951de15b18f544ad32bed8b23c86d9c062f99 SHA1 8cdb030e20d35deb3a7491fa2c622b67a4d9e0e7 SHA256 964fda064eb8db8a937daf398f089df1779527e1fe45aee0edede3142ea62604
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkz1i7gACgkQr2QksT29OyA87ACfbkP1FBvZNibWaxMfQfO6fPoU
+ls4An3AgzCUN0or9JPwfZo3O5mCS//fe
+=ZhIR
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/fontforge/files/fontforge-py27.diff b/media-gfx/fontforge/files/fontforge-py27.diff
new file mode 100644
index 000000000000..24f98e13cb30
--- /dev/null
+++ b/media-gfx/fontforge/files/fontforge-py27.diff
@@ -0,0 +1,11 @@
+--- fontforge/ffpython.h	2010/02/04 17:42:36	1.8
++++ fontforge/ffpython.h	2010/09/12 08:30:00	1.9
+@@ -62,7 +62,7 @@
+ #define PyMODINIT_FUNC void
+ #endif
+ 
+-#if PY_MAJOR_VERSION < 2 || (PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION <= 5)
++#if PY_MAJOR_VERSION < 2 || (PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION <= 7)
+ #define PyBytesObject PyStringObject
+ #define PyBytes_Type PyString_Type
+ 
diff --git a/media-gfx/fontforge/fontforge-20100501.ebuild b/media-gfx/fontforge/fontforge-20100501.ebuild
index 00a6cebc64f7..059be8a65574 100644
--- a/media-gfx/fontforge/fontforge-20100501.ebuild
+++ b/media-gfx/fontforge/fontforge-20100501.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20100501.ebuild,v 1.7 2010/10/14 19:23:52 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20100501.ebuild,v 1.8 2010/11/30 23:41:38 hanno Exp $
 
 # Some notes for maintainers this package:
 # 1. README-unix: freetype headers are required to make use of truetype debugger
@@ -59,6 +59,7 @@ src_unpack() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/fontforge-desktop.patch
+	epatch "${FILESDIR}"/fontforge-py27.diff
 
 	if use doc; then
 		cd "${WORKDIR}"/html/