summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Grozin <grozin@gentoo.org>2014-05-14 11:26:26 +0000
committerAndrey Grozin <grozin@gentoo.org>2014-05-14 11:26:26 +0000
commitface2371ef73f359edfc26199397ed5b68e36b01 (patch)
tree63b605f07fcf6d58eef35825a3eadb0f20b64a77 /dev-python
parentbump; drop py2.6 (diff)
downloadhistorical-face2371ef73f359edfc26199397ed5b68e36b01.tar.gz
historical-face2371ef73f359edfc26199397ed5b68e36b01.tar.bz2
historical-face2371ef73f359edfc26199397ed5b68e36b01.zip
An upstream bugfix; cleaning old
Package-Manager: portage-2.2.10/cvs/Linux i686 Manifest-Sign-Key: 0x3AFFCE974D34BD8C!
Diffstat (limited to 'dev-python')
-rw-r--r--dev-python/pyfeyn/ChangeLog9
-rw-r--r--dev-python/pyfeyn/Manifest36
-rw-r--r--dev-python/pyfeyn/files/pyfeyn-0.3.3.patch32
-rw-r--r--dev-python/pyfeyn/files/pyfeyn-0.3.4.patch16
-rw-r--r--dev-python/pyfeyn/pyfeyn-0.3.3.ebuild23
-rw-r--r--dev-python/pyfeyn/pyfeyn-0.3.4-r1.ebuild (renamed from dev-python/pyfeyn/pyfeyn-0.3.4.ebuild)4
6 files changed, 44 insertions, 76 deletions
diff --git a/dev-python/pyfeyn/ChangeLog b/dev-python/pyfeyn/ChangeLog
index 1ea1fd10bb7c..91177d015c6d 100644
--- a/dev-python/pyfeyn/ChangeLog
+++ b/dev-python/pyfeyn/ChangeLog
@@ -1,6 +1,13 @@
# 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.3 2014/03/09 14:19:58 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfeyn/ChangeLog,v 1.4 2014/05/14 11:25:57 grozin Exp $
+
+*pyfeyn-0.3.4-r1 (14 May 2014)
+
+ 14 May 2014; Andrey Grozin <grozin@gentoo.org> -pyfeyn-0.3.3.ebuild,
+ -pyfeyn-0.3.4.ebuild, +pyfeyn-0.3.4-r1.ebuild, -files/pyfeyn-0.3.3.patch,
+ +files/pyfeyn-0.3.4.patch:
+ An upstream bugfix; cleaning old
*pyfeyn-0.3.4 (09 Mar 2014)
diff --git a/dev-python/pyfeyn/Manifest b/dev-python/pyfeyn/Manifest
index 94ac78a33651..60a6c9bb6332 100644
--- a/dev-python/pyfeyn/Manifest
+++ b/dev-python/pyfeyn/Manifest
@@ -1,29 +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
+AUX pyfeyn-0.3.4.patch 662 SHA256 c5c54ab437c551aa7dd9895d459ae587be708218e8c137ad6188e72e02ab4104 SHA512 57031c6c3bd30d05e0d708d05359c9eaecf9b940b93af35c707d98c320478ad74c2a261f85e6d639202ddc671287522b26e9e0570eaea02ace58d3b9535cd413 WHIRLPOOL 2091a9e7f6518714d4b68b26087403ba6214d5101f5fdfbe3b18760a2e403ef45b60c078bc5cc46e638f83ec7133856e7603118b053f252992d882d2136f3dc5
DIST pyfeyn-0.3.4.tar.gz 27074 SHA256 6b1d86606b9b61cfc6285aec4a15202f60a819368b3e74fc13a586835f22da6e SHA512 b0ce1939d893df3af060cc64d11c2bb09f22c99b074aefe0e79d820ee4c6b5c64f4e8de8f4c31020b33735627b2dead9a70ea9d3504773417a058ac7a1915db8 WHIRLPOOL 6d303b0c941f7d698d4f8ca4d0286be74291392700eec6d63dbec9d9d0db22f77d790022d49176b0dbbb25bc6b44e4360dcf1a4821cb9806de0baf24dfcbebbf
-EBUILD pyfeyn-0.3.3.ebuild 658 SHA256 d676f75df2cf59061e397037fc93648d3b335efeacf7f2b9bd17aee95715f1ed SHA512 a0bd1010a16fdfe31d9870b5520a50544e3c4d6b07ea183b9dcab80a31eeb5a81d57e00cdb325d5f55415e95ee5f71dd71458c51676911e825b2c5eee14c5607 WHIRLPOOL c1566b8ad21e873d2a175dc909c9a625f7fcbb81d9f813dcc0db7bf0c04ba0e34b5c9117d705fb08b2ffd3ede3d3561baf1110fc9576991c37597246575bb88c
-EBUILD pyfeyn-0.3.4.ebuild 627 SHA256 86d7cafe8f1d71ecfe3357ff11815db5176506c18e46c481c92dd98e070d1a99 SHA512 e9de8e709a74ff2956fc47b38972bac924eec2bb0d879c2522bbc01abd97d1a60466a75de0e13cef956f59879e0a3001994223a22f3443d011646ddaa9a9fa85 WHIRLPOOL f074b6152e8126c3e6379688a71b03b5b27c309fd123df6765f15055b3a2c24a4172a9c72f6d155b8bffa6a98ce3b8769e731c3c9141c8afcfc96063524a3718
-MISC ChangeLog 622 SHA256 128d2451859869acc3b75c2ddf9ff2009713708c97fffe18c5e42a94f8fe39c9 SHA512 3e0805bde08e7c99cadbb37d0ed8118f7ed165f4b4badb7490e5df8d2083fbe018a414c4c53305c28f00e6642096984d696746cb5803dd8e0e171c2fb75ba10c WHIRLPOOL d16fdfe09d196798c1b9fb3324e906e143c480f060d3a2a87be079c12eb6110e2c61862438f2a44fd1866cf20a45a54e79cfb0b3db39bc61f038b3b70185569c
+EBUILD pyfeyn-0.3.4-r1.ebuild 668 SHA256 040d59dcf508cdc435b568b016e99c6f38fafd78678666128e0be478fdaf2aa6 SHA512 c13b4a48b8dd817ae9be41c575fe9af94f18533aa4782ec1224094c596d2b8450af6aba5fa396af62ef396cce9b646916a38c7126b6f23a9a5b1d9bd21f82c20 WHIRLPOOL 14a544e51424401816b2facd0ab8ca961fa0168c44bad017c754c550fbe44f3c6f76e38101cefa66ad693d11329c5827468961c24e9ce29ac28126bbf46f8ecf
+MISC ChangeLog 866 SHA256 32cef6c44370c9043fd40ed0d5472edd99c0f5828844e088bcc18f3c54637b25 SHA512 5a9c002ea87b35ae53f622fe5acba2a5b787c11a094c1c017b7a5ad84a85311770f7a529ca60b5ffd7308dac0edaaa2555489e2215315a3da4ae27a99723a313 WHIRLPOOL 8784f84492c173659a5ac51ac001351a5f8d7fcf9bed88cb03d6915775e5e2a796141eaa56c2052e2840d3b144be08f670dc77b555dc772eed88bf21776f9b5a
MISC metadata.xml 404 SHA256 7285ddbe4de41869d722f84c36086da95fcfe1393eb98f88346807b358002888 SHA512 dd1a871d0d8e426354b0c3f34031d493afb17cd40f86b632512a755b5591877e4aae822cdea6c33a350793247400feec339ca80690689e1122cda5392d2bef4e WHIRLPOOL 533ad53704165409b676a60ea1cfadfafff5d5f3e880ff2e24083b3966d50e29d24a92887f08cf1e29faa88197e0c80f74503d04cc7c72b3c9944290a29fedd3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iQJ8BAEBCABmBQJTHHasXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTc1DjXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwOEM0RURGNjY5QzVBNjMwRkU3REVCOTQz
-QUZGQ0U5NzREMzRCRDhDAAoJEDr/zpdNNL2MXa8P/178iQHabfZppq1QsRmcmwa0
-hIh7JM/DhxFSt5WmILbokdDdALHsXqjBzC5qyL3hvi5Rc3nXsL5xvCrqy1+T8k4e
-yc33+RBpZcDnBBEe64aKGOM5YhiSWedlxtNg29nmgbQ0tbkEmFYJvb3J2QBdslYu
-uxtrB0ppaw4QM5mIwaTZ0nRGb17bDYbQJwJKkN44D/JzxoFpKflJFGXH/mIvi02T
-USZJeQvLO7X9qH7PBtmttK+UjkQ/HE86zzZmhOHsvzD7J3xHImC/VPEiu7t3Wps2
-rcBjywjnMxd4HtdTmUXPesv7us2bgvqXSnqXwEzN7utnNkMWJTilgKHZVOOZP97h
-hFxAWgsf7Fpso8ZNXHOVGTLfoMeJlmWeTrgwGgR+gsDjDaRi0zJLWubuKpSAcTUt
-hmliS32LLZgXf99E34PbU2R6d2kCOx8Sw7PJEy8tNnbNuvolbXQXBTvWJ3siWxny
-wCRYkxAoXNrsxTdNTU3fxUMj1tSY6rKEyxMEeUQNrNOsFRQDN1frc7Qluk2XZME6
-hx+NMS16j2mEvYq6a16UYRZ3k46koBtFO90vgw88+X5lLz8Xn15mHjMy8ayknoXc
-d/SZV/TAthPGaWmKx4YuKeNGLCz7B8rmv7WTwqDA+oY1YfZfQeRD/jeMhsD6Qotn
-+rsbamU/hJ1dJUi6Y3CF
-=s4O8
+QUZGQ0U5NzREMzRCRDhDAAoJEDr/zpdNNL2M/owP/2bZnbMHcRPCTzWJUZ8cjlQ6
+VfyfrsPq8vCNoG2h4kY8xdB2Lnv3Z5n+XA1gA/91631IJ0AFi0Km7rLtUICHPtYt
+n6Ic7rBPJ+JvUOeM9mSVz5Hgg4utX/2w5c/UMu1UscLROo5Bfe4R49n77tXh3Yw1
+qdsk3RVJ8mgOKc8BGIz3Sf3kR3iGEARG85EBFtnom1JPUtQLIb4xSMGIXBx4klYK
+DxoL16uINOTErSv/Cxx19TPxIH5N+i96D7KVPss6eBYg9Sq9xjC+NupXxgl46iEf
+f9DMQXDYu4B/shz6WkmNgvKgi1CQsiIVYYBbAaYA7NBePa/yOAz/NWwkcddjQgHh
+X/MeaV3Sk9TSLbq6aQKrHw9HyjbNSemzaE5swNL5iJHvRG0N4Py67W36SUcTRhr7
+YzfDi4NaNp9J2cB90QvqT7uwtWoZuu/LX5H4FaWIAL4RBoVJ70Egq0QeGIWOv2iY
+HUJo8C7yviHtW4YLG8A/EYqxtL0TlbwhcypkScMbyG7FriAfB12fcUHlXc1sou2W
+OcBO818OjOaozahCl4gPrswJdFKlEJ3zSpc7f8EwZZUMBCdrPV31bu5uSnsCQpC3
+iEuTuHWTLOq84bQnGHpDQmCR+EKYURJuHTh2e2+UDEReTXuEhKRk5oJ2voHc0AYp
++bB/eFlKBaAgWCahYgEi
+=Njdz
-----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
deleted file mode 100644
index 9cb111be71a9..000000000000
--- a/dev-python/pyfeyn/files/pyfeyn-0.3.3.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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/files/pyfeyn-0.3.4.patch b/dev-python/pyfeyn/files/pyfeyn-0.3.4.patch
new file mode 100644
index 000000000000..0017bdd81661
--- /dev/null
+++ b/dev-python/pyfeyn/files/pyfeyn-0.3.4.patch
@@ -0,0 +1,16 @@
+diff -r -U2 pyfeyn-0.3.4.orig/pyfeyn/lines.py pyfeyn-0.3.4/pyfeyn/lines.py
+--- pyfeyn-0.3.4.orig/pyfeyn/lines.py 2014-03-06 23:12:24.000000000 +0700
++++ pyfeyn-0.3.4/pyfeyn/lines.py 2014-05-14 21:45:49.356935407 +0700
+@@ -117,8 +117,12 @@
+ """Make this line a straight line between start and end."""
+ self.arcthrupoint = None
++ return self
+
+
+ def bend(self, amount):
+ """Bend the line to the right by a given distance."""
++ if amount==0:
++ self.arcthrupoint = None
++ return self
+ middle = self.p1.midpoint(self.p2)
+ nx = (middle.y() - self.p1.y()) / abs(self.p1.distance(middle))
diff --git a/dev-python/pyfeyn/pyfeyn-0.3.3.ebuild b/dev-python/pyfeyn/pyfeyn-0.3.3.ebuild
deleted file mode 100644
index 261f84ae2712..000000000000
--- a/dev-python/pyfeyn/pyfeyn-0.3.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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.2 2014/02/24 09:40:06 grozin Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python package for drawing Feynman diagrams"
-HOMEPAGE="http://pyfeyn.hepforge.org/ https://pypi.python.org/pypi/pyfeyn/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/pyx[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
- dev-texlive/texlive-science"
-
-PATCHES=( "${FILESDIR}"/${P}.patch )
diff --git a/dev-python/pyfeyn/pyfeyn-0.3.4.ebuild b/dev-python/pyfeyn/pyfeyn-0.3.4-r1.ebuild
index 9a2956ae9121..ab5c1844cb3b 100644
--- a/dev-python/pyfeyn/pyfeyn-0.3.4.ebuild
+++ b/dev-python/pyfeyn/pyfeyn-0.3.4-r1.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.4.ebuild,v 1.1 2014/03/09 14:19:58 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfeyn/pyfeyn-0.3.4-r1.ebuild,v 1.1 2014/05/14 11:25:57 grozin Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7} )
@@ -19,3 +19,5 @@ IUSE="latex"
DEPEND=""
RDEPEND="dev-python/pyx[${PYTHON_USEDEP}]
latex? ( dev-texlive/texlive-science )"
+
+PATCHES=( "${FILESDIR}"/${P}.patch )