Added a patch for compatibility with dev-python/pix-0.12.1-r1

Package-Manager: portage-2.2.8-r1/cvs/Linux i686
Manifest-Sign-Key: 0x3AFFCE974D34BD8C!

4 files changed, 61 insertions, 21 deletions

diff --git a/dev-python/pyfeyn/ChangeLog b/dev-python/pyfeyn/ChangeLog
index f55141cd3d11..9bc3c1ca98a2 100644
--- a/dev-python/pyfeyn/ChangeLog
+++ b/dev-python/pyfeyn/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pyfeyn
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfeyn/ChangeLog,v 1.1 2014/02/24 04:16:55 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfeyn/ChangeLog,v 1.2 2014/02/24 09:40:06 grozin Exp $
+
+  24 Feb 2014; Andrey Grozin <grozin@gentoo.org> pyfeyn-0.3.3.ebuild,
+  +files/pyfeyn-0.3.3.patch:
+  Added a patch for compatibility with dev-python/pix-0.12.1-r1
 
 *pyfeyn-0.3.3 (24 Feb 2014)
 
diff --git a/dev-python/pyfeyn/Manifest b/dev-python/pyfeyn/Manifest
index 70f3e80f6e21..35a4185c654b 100644
--- a/dev-python/pyfeyn/Manifest
+++ b/dev-python/pyfeyn/Manifest
@@ -1,26 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX pyfeyn-0.3.3.patch 1453 SHA256 a55c6632b4fc36ab45a40f84df62c7025f4daf12980bed2696e5aacec5ad6d1b SHA512 e5fcef16c8b71bea9a20b9f95564e5cbf3f367ba202224666ee6a90944bc63edcdefd24653d9bc488bce98397981e8af500d1f07ada88083fb05f056454d64e4 WHIRLPOOL f9d7774c72f764483570f519d95d4010bd01ae61865576669fc70d27884f93fd893bb4319d640cbab482ab4fa42be99c05f954afb3c083c869ed96658bd980d0
 DIST pyfeyn-0.3.3.tar.gz 26821 SHA256 494e716f104365e7daa3cb41da2fbd944f0afe200c58556bcfb3e9dc5d1afb03 SHA512 29fa9e0cb0357d1ca6c3bc7a041da3ef555cffec22a7d389869ee528d778f92309f6f48c65192c916dd24715a7cd348b8491dcc37869b5e13839a7a67d750bfb WHIRLPOOL 7d069420e5ddc1ebb9365472734d3ed14716568c9a1fee0426c23a0155585807f94af86bb94e7a43f3dd7405c3e438b636882503f5fca6f18cc2d2395740bb4e
-EBUILD pyfeyn-0.3.3.ebuild 607 SHA256 48703c630cbd8cf4e7c24f76284f7552ae5b91229173674c90b6ff9adf3ac06e SHA512 ca99e7e4a95d0e9cb0d97256d1144fbddb72968404fbb27c0a01c29bf973af6a201b99d95810ea492a06dfea0e39d6ce41f7e31b9f75672bbbf261fbc238ae5b WHIRLPOOL 2ba604e0ef6e183632f30e7bee5c4103f29cc6a8460c9504be4e0ba3018524ef3627bf770310e8dee4cc2292c4b8f67c58391d903646b180c315145134263d90
-MISC ChangeLog 342 SHA256 55866e92fbc7ba01618c5c7d6a641854dfae8c4caf85d0657c466f9af32feaae SHA512 696dad891bb9f47c24b8c16cb44bb936ea1f6102deab4fc81ce0fdeb27f9958e637077376f39f0f85fb548285dbd8d8c9e0c9f1b85e9ff15a33332214ce5c848 WHIRLPOOL 2119971d846d4fb829d475955d745f6db7c57c3f39d85aa5acb4e9a7a87182468cd6831984b9b8c2684f93cec59ca2c1a57302ac5b6e85dae920574e8226be60
+EBUILD pyfeyn-0.3.3.ebuild 658 SHA256 d676f75df2cf59061e397037fc93648d3b335efeacf7f2b9bd17aee95715f1ed SHA512 a0bd1010a16fdfe31d9870b5520a50544e3c4d6b07ea183b9dcab80a31eeb5a81d57e00cdb325d5f55415e95ee5f71dd71458c51676911e825b2c5eee14c5607 WHIRLPOOL c1566b8ad21e873d2a175dc909c9a625f7fcbb81d9f813dcc0db7bf0c04ba0e34b5c9117d705fb08b2ffd3ede3d3561baf1110fc9576991c37597246575bb88c
+MISC ChangeLog 506 SHA256 dcb16915c3eaecfd30fffc1bb0859890ff4f34196df0a0f7437b92659d072f5e SHA512 cf709acc38beb8c880cd311577c74265547f7b6a3320fd388d037c6506405c6c163e89a70ba0a5b7577c35a2929b1807cda2427a569f6e5b9dd357ac3f0ff6a8 WHIRLPOOL 546310c136b084cdf4fa5721689d3164fa56421e4329a008fbaacee03ad8b63d1ad80164d5b1da021f230be220cfe4cc71946683b56bd6da9f80b1eb68c461cf
 MISC metadata.xml 404 SHA256 7285ddbe4de41869d722f84c36086da95fcfe1393eb98f88346807b358002888 SHA512 dd1a871d0d8e426354b0c3f34031d493afb17cd40f86b632512a755b5591877e4aae822cdea6c33a350793247400feec339ca80690689e1122cda5392d2bef4e WHIRLPOOL 533ad53704165409b676a60ea1cfadfafff5d5f3e880ff2e24083b3966d50e29d24a92887f08cf1e29faa88197e0c80f74503d04cc7c72b3c9944290a29fedd3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTCsXEXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTCxGEXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwOEM0RURGNjY5QzVBNjMwRkU3REVCOTQz
-QUZGQ0U5NzREMzRCRDhDAAoJEDr/zpdNNL2MHLIQAKfvAnEff470IlxEoLHnndGX
-NKCzs0qry2CZn7XWXQqlY/3MEwPKA7hNwgQaw29dQNDWya0jHlYwn96Osp6uPUo2
-YehnNKRDpE6uBX5+hCHoHMz+WR4gA3urwK3VhFfdqP1/MWCwBYePg6uiFwXFxcLw
-9UUoSvkTcFJfg64UW3pStXIDIjy6MC7h650h5DFoYpg4yPTAu6FHVFFmAAQrVHYP
-m+tnCMtQMe/YO1mY1d3yU7fwRO038uObg6vk45b2P7J3iG7eiRifWyOGz82HRrz5
-wpURtnMBkG1RjkJXsFHR+wbXgLzSBhEP2Ap/b0LaA2X5d7jNJU33sWvkddqVgvVb
-0nI5gPgBc3gZ3aHLaUV5N3iSId34wRqzP+joYl5OEwUQfdeqn+KEje0BpSOBjNmX
-rEm+/CQcxICdY6LzkPynxwP1VTfw5NIryO5Et7HagbZVYgBYPEwSX1QYIC7jH75t
-RQbu1TLwsDzLicyB6WVxYPGH9Djr+iAcWZtkFrmYoRq1CPQ0vfGwoPU7Gl7WSwwi
-GUNdDdWiOcVRBlBlarDotXpilcmD/98scJAL74wArLhq/XRxe01tfmKYwPS9LYyz
-kjTvr5QUzrkz4nG1mQxAkOhNu5ARoHRa9JT/KsOCgj3kda5kuAHK9p7niZDg+bTk
-zjdOtH8fc+aZ0QDJ2oqf
-=vohh
+QUZGQ0U5NzREMzRCRDhDAAoJEDr/zpdNNL2MdsMQAJNZMH2NsicpdHbNXbXp9CBS
+yA3tqDsL4fQvCCEqmD34bGAsF1q16gzJ2REi8Jrd1sy/Mf6cyEpuHZ6K67mshW1W
+Xi8wqxIjkjxVU9XIluDNT/6owPs4ZIOhofiebPUliLBd08Qo9s7MDJTIhCXaZBDf
++ig690DluQyMmav/zcAMZjfA+9PpJEd91KAxhzr7y190WfVxlBnLguNBZok8TlgY
+X1JW2y1ld97k6XIMaGxeYbCItGMXkZ972CDD8y9zftfvsCYXSCEhAywXUSAWlJ5A
+i4KbueIDcW+IrDAcATfIWctJEFv4nt8XCGfehgEayNihtqQJ6lMMoct/AnrBvi7g
+nbwCIMdOA1BoNv+VEkrbR0j1XwhSotgZ3dLH57EC/p0nVEp7REJarYCaZvPN/YZ5
+oc96N/bvR0giGcBA95D2h8cCMmUfbuzghku8C00boKUt9BSGnbVOuxNRF4jC9Wd7
+7DmNOagqE5H0/DIlRIsv7TU2eDDJmVd4f4BkJUhMHlqiZ/lKB42/OZMzqPIKbveM
+KHJsrLaUB7/Mi/H2/pHtavOJXXP1Gcid+uL6ylxwPK2W7rrIyGQUWbSGxzAJh7L7
+oHcCJRGAqEi649jkDZ3XtmRXD5nhvgepT8fP4B5oLCiDYjTCQBXkl7xXZTd67GPD
+at93e5AjuCdo/1QGkfsT
+=Fz2+
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pyfeyn/files/pyfeyn-0.3.3.patch b/dev-python/pyfeyn/files/pyfeyn-0.3.3.patch
new file mode 100644
index 000000000000..9cb111be71a9
--- /dev/null
+++ b/dev-python/pyfeyn/files/pyfeyn-0.3.3.patch
@@ -0,0 +1,32 @@
+diff -r -U1 pyfeyn-0.3.3.orig/pyfeyn/__init__.py pyfeyn-0.3.3/pyfeyn/__init__.py
+--- pyfeyn-0.3.3.orig/pyfeyn/__init__.py	2013-10-03 20:24:30.000000000 +0700
++++ pyfeyn-0.3.3/pyfeyn/__init__.py	2014-02-24 20:19:42.908082109 +0700
+@@ -15,8 +15,2 @@
+     import pyx
+-
+-    ## Check the version
+-    from distutils.version import StrictVersion as Version
+-    if Version(pyx.version.version) < Version("0.9.0"):
+-        print "Warning: PyFeyn may not work with PyX versions older than 0.9!"
+-
+     ## Units
+@@ -24,10 +18,5 @@
+     pyx.unit.set(defaultunit = "cm")
+-
+     ## TeX stuff
+     pyx.text.defaulttexrunner.set(mode="latex")
+-    if pyx.pykpathsea.find_file("hepnames.sty", pyx.pykpathsea.kpse_tex_format):
+-        pyx.text.defaulttexrunner.preamble(r"\usepackage{hepnames}")
+-    else:
+-        print "Warning: hepnames LaTeX package not found!"
+-
++    pyx.text.defaulttexrunner.preamble(r"\usepackage{hepnames}")
+ except:
+diff -r -U1 pyfeyn-0.3.3.orig/pyfeyn/deco.py pyfeyn-0.3.3/pyfeyn/deco.py
+--- pyfeyn-0.3.3.orig/pyfeyn/deco.py	2011-02-20 23:29:40.000000000 +0600
++++ pyfeyn-0.3.3/pyfeyn/deco.py	2014-02-24 20:21:53.935087856 +0700
+@@ -27,3 +27,3 @@
+         arrowpath = pyx.deco._arrowhead(arrowtopath, self.pos*dp.path.arclen(),
+-                                        1, self.size, 45, constrictionlen)
++                                        1, self.size, 45, self.constriction, constrictionlen)
+         dp.ornaments.fill(arrowpath)
diff --git a/dev-python/pyfeyn/pyfeyn-0.3.3.ebuild b/dev-python/pyfeyn/pyfeyn-0.3.3.ebuild
index ee7e82f92207..261f84ae2712 100644
--- a/dev-python/pyfeyn/pyfeyn-0.3.3.ebuild
+++ b/dev-python/pyfeyn/pyfeyn-0.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfeyn/pyfeyn-0.3.3.ebuild,v 1.1 2014/02/24 04:16:55 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfeyn/pyfeyn-0.3.3.ebuild,v 1.2 2014/02/24 09:40:06 grozin Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -14,7 +14,10 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="latex"
+IUSE=""
 
-DEPEND="dev-python/pyx"
-RDEPEND="latex? ( dev-texlive/texlive-science )"
+DEPEND="dev-python/pyx[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	dev-texlive/texlive-science"
+
+PATCHES=( "${FILESDIR}"/${P}.patch )