From b9ef7cab6264f1838672efbbcb4ba3b3abd5323f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 9 Dec 2017 09:14:02 +0000 Subject: gentoo resync : 09.12.2017 --- dev-python/Manifest.gz | Bin 293570 -> 293537 bytes dev-python/bsddb3/Manifest | 2 +- dev-python/bsddb3/bsddb3-6.2.4.ebuild | 2 +- dev-python/construct/Manifest | 10 +- dev-python/construct/construct-2.5.2.ebuild | 19 - dev-python/construct/construct-2.8.12.ebuild | 33 - dev-python/construct/construct-2.8.16.ebuild | 33 + dev-python/construct/metadata.xml | 4 + dev-python/cryptography-vectors/Manifest | 2 + .../cryptography-vectors-2.1.4.ebuild | 25 + dev-python/cryptography/Manifest | 2 + dev-python/cryptography/cryptography-2.1.4.ebuild | 53 + dev-python/cvxopt/Manifest | 7 - dev-python/cvxopt/cvxopt-1.1.6-r2.ebuild | 99 -- dev-python/cvxopt/cvxopt-1.1.8.ebuild | 103 -- dev-python/cvxopt/files/cvxopt-1.1.6-glpk449.patch | 1082 -------------------- dev-python/cvxopt/files/cvxopt-1.1.6-setup.patch | 176 ---- dev-python/cvxopt/files/cvxopt-1.1.8-setup.patch | 136 --- dev-python/defusedxml/Manifest | 2 +- dev-python/defusedxml/defusedxml-0.5.0.ebuild | 2 +- dev-python/lazy-object-proxy/Manifest | 4 +- .../lazy-object-proxy-1.2.1.ebuild | 2 +- .../lazy-object-proxy-1.3.1.ebuild | 40 + dev-python/libvirt-python/Manifest | 4 +- .../libvirt-python/libvirt-python-3.10.0.ebuild | 46 + .../libvirt-python/libvirt-python-3.9.0.ebuild | 46 - dev-python/markdown/Manifest | 2 +- dev-python/markdown/markdown-2.6.8.ebuild | 2 +- dev-python/namespace-paste/Manifest | 2 +- .../namespace-paste/namespace-paste-1.ebuild | 2 +- dev-python/numpy/Manifest | 8 +- dev-python/numpy/numpy-1.10.4.ebuild | 2 +- dev-python/parse-type/Manifest | 1 - dev-python/parse-type/parse-type-0.3.4.ebuild | 38 - dev-python/pastedeploy/Manifest | 2 +- dev-python/pastedeploy/pastedeploy-1.5.2-r1.ebuild | 2 +- dev-python/piexif/Manifest | 4 +- dev-python/piexif/piexif-1.0.13.ebuild | 26 + dev-python/pocketlint/Manifest | 2 +- dev-python/pocketlint/pocketlint-0.15.ebuild | 2 +- dev-python/pyClamd/Manifest | 8 +- dev-python/pyClamd/pyClamd-0.3.10.ebuild | 25 - dev-python/pyClamd/pyClamd-0.3.17.ebuild | 4 +- dev-python/pyClamd/pyClamd-0.4.0.ebuild | 26 + dev-python/pygame/Manifest | 4 +- dev-python/pygame/pygame-1.9.3.ebuild | 2 +- dev-python/pyglet/Manifest | 2 +- dev-python/pyglet/pyglet-1.2.4.ebuild | 2 +- dev-python/rdflib/Manifest | 2 +- dev-python/rdflib/rdflib-4.2.2.ebuild | 2 +- dev-python/rospkg/Manifest | 8 +- dev-python/rospkg/rospkg-1.1.3.ebuild | 43 - dev-python/rospkg/rospkg-1.1.4.ebuild | 1 + dev-python/rospkg/rospkg-9999.ebuild | 1 + dev-python/sparql-wrapper/Manifest | 2 +- .../sparql-wrapper/sparql-wrapper-1.8.0.ebuild | 2 +- dev-python/tqdm/Manifest | 4 +- dev-python/tqdm/tqdm-4.19.4.ebuild | 25 + dev-python/waitress/Manifest | 2 +- dev-python/waitress/waitress-1.0.2.ebuild | 2 +- dev-python/zeroconf/Manifest | 4 +- dev-python/zeroconf/zeroconf-0.19.1.ebuild | 43 + 62 files changed, 383 insertions(+), 1860 deletions(-) delete mode 100644 dev-python/construct/construct-2.5.2.ebuild delete mode 100644 dev-python/construct/construct-2.8.12.ebuild create mode 100644 dev-python/construct/construct-2.8.16.ebuild create mode 100644 dev-python/cryptography-vectors/cryptography-vectors-2.1.4.ebuild create mode 100644 dev-python/cryptography/cryptography-2.1.4.ebuild delete mode 100644 dev-python/cvxopt/cvxopt-1.1.6-r2.ebuild delete mode 100644 dev-python/cvxopt/cvxopt-1.1.8.ebuild delete mode 100644 dev-python/cvxopt/files/cvxopt-1.1.6-glpk449.patch delete mode 100644 dev-python/cvxopt/files/cvxopt-1.1.6-setup.patch delete mode 100644 dev-python/cvxopt/files/cvxopt-1.1.8-setup.patch create mode 100644 dev-python/lazy-object-proxy/lazy-object-proxy-1.3.1.ebuild create mode 100644 dev-python/libvirt-python/libvirt-python-3.10.0.ebuild delete mode 100644 dev-python/libvirt-python/libvirt-python-3.9.0.ebuild delete mode 100644 dev-python/parse-type/parse-type-0.3.4.ebuild create mode 100644 dev-python/piexif/piexif-1.0.13.ebuild delete mode 100644 dev-python/pyClamd/pyClamd-0.3.10.ebuild create mode 100644 dev-python/pyClamd/pyClamd-0.4.0.ebuild delete mode 100644 dev-python/rospkg/rospkg-1.1.3.ebuild create mode 100644 dev-python/tqdm/tqdm-4.19.4.ebuild create mode 100644 dev-python/zeroconf/zeroconf-0.19.1.ebuild (limited to 'dev-python') diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz index 0af5dcf33709..e88adf2521d0 100644 Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ diff --git a/dev-python/bsddb3/Manifest b/dev-python/bsddb3/Manifest index 8acf2a3dc7f5..b383a54a7067 100644 --- a/dev-python/bsddb3/Manifest +++ b/dev-python/bsddb3/Manifest @@ -1,5 +1,5 @@ DIST bsddb3-6.1.1.tar.gz 450571 BLAKE2B fae21052d3422e6e837f21a0e5f65aac063cb4c03b4c833e8b74fdd7da929972f81c3eaf5e869ce0990c1d55454d9f5964c3d526a44c047124d12da2afd78361 SHA512 f5e95edf2d18f04f4a306450a67ad675902b102cde9fdebd870727c2649ba7dd759206708c9225af871e0811e17812ef46c90ea6854eb3209ba36c86900ffb01 DIST bsddb3-6.2.4.tar.gz 242397 BLAKE2B b6b9c6d4d3231bce400ae46a5df85abddd83bfd3e4e52d0192c2c91faab51af14946c9a8682f55ff8251fd0d1f7a00ba834d7a39c1574b4adcfe2ea396cf684d SHA512 15bb714242b05649a7c40ccd153979e596340ef039c89549b215fc5438a12fedb44150195063d2783c6c06ede3552506e31e8013b6b0431d27dd7e14975c08b0 EBUILD bsddb3-6.1.1.ebuild 1949 BLAKE2B 5b06cd8a78f99f8f78d45d1d27d9d0f23e860982257c3000983a1fc90973abcfb0f4a19edb773da660fe405912a6159c3353394572c1ab6aaf7c434ab3182b22 SHA512 4288d31c4c38a8f4d8e2319b6a8a81712fb6fe77f8b4baa87a3d65459abacad1fa8c28b437c9fde8035404c518949f65229e0a545a37f35f21d3ffac2c40febf -EBUILD bsddb3-6.2.4.ebuild 1936 BLAKE2B 7bbbce52e9ba8bc3d29977698140a0d0ef6edf5bd97873dc121c6b61ff1bd368c1c7cdef0cae0f44a7cd70dffc486dc92cb5c7bd6633f0f8aa8897f3e5d59f0d SHA512 aba5c8cf3999fe4546d939e83022db85f2babd95f0e3971bd8da4da85d42bfb4a926cb44984e4aa7267ee4a1f9f03be388186efcb3854518f541ef556d37de99 +EBUILD bsddb3-6.2.4.ebuild 1935 BLAKE2B 4b68c6522130c8b8c0a00b04e959da2611bb918854eef1cc15e0d2ae5fa9fa58661224529703099686648e5e97622681a1efd9a4fe6fbb765dcb4e2144ef42d9 SHA512 f7e969f18e9b52a1268818b9018fa405e83ec31ed7cc5a053359ac3f33b29fbb77af671368f75b4a5950a253945beaabe0374f4e22efa1770b8f1d2b0ec9ffec MISC metadata.xml 309 BLAKE2B 2a491c74fd8f64d284bbe32aea28da5790bb54ba0105fd61f477f725bb00fa729e976c20d35cfdead53483fef8d711ea0d9000cc2dd9663ec498b02e9e082083 SHA512 edf575ec4a06047d837caffa6c8c8a35d53c5236d806e6d2b4804943617000d8f745f1b94fecfe2af117be823821669e6b7e9aea2a427aa2d97b1eb6ec11eb20 diff --git a/dev-python/bsddb3/bsddb3-6.2.4.ebuild b/dev-python/bsddb3/bsddb3-6.2.4.ebuild index ae7de068272c..71205c0c5d00 100644 --- a/dev-python/bsddb3/bsddb3-6.2.4.ebuild +++ b/dev-python/bsddb3/bsddb3-6.2.4.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux" RDEPEND=" python@gentoo.org Python + + azamat.hackimov@gmail.com + Azamat H. Hackimov + construct/construct construct diff --git a/dev-python/cryptography-vectors/Manifest b/dev-python/cryptography-vectors/Manifest index fae896a47833..4ebb246a15a2 100644 --- a/dev-python/cryptography-vectors/Manifest +++ b/dev-python/cryptography-vectors/Manifest @@ -7,6 +7,7 @@ DIST cryptography_vectors-2.0.3.tar.gz 27011810 SHA256 beb831aa73663a224f4d75204 DIST cryptography_vectors-2.1.1.tar.gz 27255936 SHA256 92f1300dd2b0a5812ca5d28003b7a11eb9eadba8c1c8c2b5150a0132d4a1fd64 SHA512 fa32a52a3e187d62c3a8eb4262795d0a9762fe8bb5d8464bc9bca7b1a56c6e19a3a14bfd0b2f56f4a048a8cb4dd05e105a90925dd4ee0697a76de3577faf88a3 WHIRLPOOL a6fdc7e45f1f514b787ff60db3d9e399fa9bba7aa128370995a885b66362f5bbf7436f81937fe3a9edba3abc8294f3b155570fe7f5674458ddd1d128ece3e98c DIST cryptography_vectors-2.1.2.tar.gz 27255884 SHA256 1d3829bdb7b7822cee85a829fe2e0d2455d69e242186705ef1a9d4d1ab6337df SHA512 e12c52b501e3f9974237e6b02b79e602e1c44c97928304560c9d68beca68be07acf2bb3cfe111d1cb0357ad0b9e458fec241463e63ec65fb223b65e1dbbeedaa WHIRLPOOL af1e8de02227289dc963e1e3ab8e2b9a4969c914861d3fb1d40ec636b2ddf5bc829d56906068a06877d851e40d59b0965c7e89e9c290f02580aee03b74cb888e DIST cryptography_vectors-2.1.3.tar.gz 27255719 SHA256 2de4957fdfd567d69e179d6e9ecf54a085387c953e20abf97a35a5c313aa3053 SHA512 09b7040bc5ef0d0c888ac3dadc325e76c8156f3b6aedba1298a07156471ce08f093ff953be413a9dde66d7db9d2c8ae22d0f94e323d961a0eb99fdb022f166ee WHIRLPOOL 693cc33ad0189c50ebc769d5c5b0a586a0738f85dab5ed8e77c1850586d344bcf127315b25e22df04de52e6a80f59ec71cef54480f198fe5878be63a16a9bbdc +DIST cryptography_vectors-2.1.4.tar.gz 27255711 BLAKE2B 6c842b6366d794e9986110479e2175996b344aa191345c85a5cec8c0640b7a67b157f310eca31ac8e6487739357b11a2b86b9832fc680318e754c4751414c754 SHA512 74c2c1e3924f848488a3b5abdabda1a0089ae7d070b94e65f9fa2bf2da057ad27a37e46f90de4f2c3e9f1cc96c1c179cb5dbf0f50d5166a02846923e3bceb165 EBUILD cryptography-vectors-1.7.1.ebuild 632 BLAKE2B cf2ecbb63c20058a909c1de56572b17fb8a96fd36ee35e81ee8163422508dbdf6c31d21e317bff332bcaa00bf7b6ab42e465210019ea70a25feebd3ef2c5a030 SHA512 652b04cd22ce0aedac1904acbb292355622fbee31da765b4acc2ca7f2e8de577e196acb935eb1335459d11a9fc7367c8ed448eec76538a22ac6151f5b152b27b EBUILD cryptography-vectors-1.7.2.ebuild 642 BLAKE2B 47e99fbbeced4ad390da0539b70e52b4efe9b9ff92df72a2eff2d3eecc1f639eae9be3ef77635b6117765f41c31b6ae7ec290dbf9c32e86ce90b3c786db78c5c SHA512 53b66c690c62327685f0dcf6e59172f284130278d03a9398aae9abddb7bee913b60592ee2131f8521e8aca75b78b19ec0e4e9ecabd3d46866ac64659839c4f8a EBUILD cryptography-vectors-1.8.1.ebuild 642 BLAKE2B 47e99fbbeced4ad390da0539b70e52b4efe9b9ff92df72a2eff2d3eecc1f639eae9be3ef77635b6117765f41c31b6ae7ec290dbf9c32e86ce90b3c786db78c5c SHA512 53b66c690c62327685f0dcf6e59172f284130278d03a9398aae9abddb7bee913b60592ee2131f8521e8aca75b78b19ec0e4e9ecabd3d46866ac64659839c4f8a @@ -16,4 +17,5 @@ EBUILD cryptography-vectors-2.0.3.ebuild 642 BLAKE2B 47e99fbbeced4ad390da0539b70 EBUILD cryptography-vectors-2.1.1.ebuild 642 BLAKE2B 47e99fbbeced4ad390da0539b70e52b4efe9b9ff92df72a2eff2d3eecc1f639eae9be3ef77635b6117765f41c31b6ae7ec290dbf9c32e86ce90b3c786db78c5c SHA512 53b66c690c62327685f0dcf6e59172f284130278d03a9398aae9abddb7bee913b60592ee2131f8521e8aca75b78b19ec0e4e9ecabd3d46866ac64659839c4f8a EBUILD cryptography-vectors-2.1.2.ebuild 642 BLAKE2B 47e99fbbeced4ad390da0539b70e52b4efe9b9ff92df72a2eff2d3eecc1f639eae9be3ef77635b6117765f41c31b6ae7ec290dbf9c32e86ce90b3c786db78c5c SHA512 53b66c690c62327685f0dcf6e59172f284130278d03a9398aae9abddb7bee913b60592ee2131f8521e8aca75b78b19ec0e4e9ecabd3d46866ac64659839c4f8a EBUILD cryptography-vectors-2.1.3.ebuild 642 BLAKE2B 47e99fbbeced4ad390da0539b70e52b4efe9b9ff92df72a2eff2d3eecc1f639eae9be3ef77635b6117765f41c31b6ae7ec290dbf9c32e86ce90b3c786db78c5c SHA512 53b66c690c62327685f0dcf6e59172f284130278d03a9398aae9abddb7bee913b60592ee2131f8521e8aca75b78b19ec0e4e9ecabd3d46866ac64659839c4f8a +EBUILD cryptography-vectors-2.1.4.ebuild 642 BLAKE2B 47e99fbbeced4ad390da0539b70e52b4efe9b9ff92df72a2eff2d3eecc1f639eae9be3ef77635b6117765f41c31b6ae7ec290dbf9c32e86ce90b3c786db78c5c SHA512 53b66c690c62327685f0dcf6e59172f284130278d03a9398aae9abddb7bee913b60592ee2131f8521e8aca75b78b19ec0e4e9ecabd3d46866ac64659839c4f8a MISC metadata.xml 333 BLAKE2B 31fb9fd463281fce83ac94d33dc69e54eee748ab3a230fa26ef36f29026ce8bcaf821e69994d2d94ed3b69c24b30cc80fa0a67f100cd45327ff1bb36a91c6014 SHA512 d65176e5ea86d82a13687d70fb2f29ca046bd71526752fb3583be9b0507b124363f271d697cfe6724245d6863c5aac36e67b1e50808041c52066d66e1f8b586a diff --git a/dev-python/cryptography-vectors/cryptography-vectors-2.1.4.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-2.1.4.ebuild new file mode 100644 index 000000000000..711276fa7749 --- /dev/null +++ b/dev-python/cryptography-vectors/cryptography-vectors-2.1.4.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 ) + +inherit distutils-r1 + +MY_PN=${PN/-/_} +MY_P=${MY_PN}-${PV} + +DESCRIPTION="Test vectors for the cryptography package" +HOMEPAGE="https://pypi.python.org/pypi/cryptography-vectors/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" + +LICENSE="|| ( Apache-2.0 BSD )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="" + +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" +RDEPEND="" + +S=${WORKDIR}/${MY_P} diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest index cf0ea4a6dfc2..10fe59d77af2 100644 --- a/dev-python/cryptography/Manifest +++ b/dev-python/cryptography/Manifest @@ -8,6 +8,7 @@ DIST cryptography-2.0.3.tar.gz 427544 SHA256 d04bb2425086c3fe86f7bc48915290b13e7 DIST cryptography-2.1.1.tar.gz 441477 SHA256 2699ed21e1f73dd1bdb7b0b22a517295de07809d535b23e200dd22166037fe6f SHA512 d021f7af1cb4c6430049d2213405b7bea84bc0bde9e9f92c99c87dd835b2f28eb28024d65090756d2cc72b63510f25d71c55e473ce00e1d24736c15037998adb WHIRLPOOL 1095cc8698775904019744bb7c7410f405183fa4b497f2a1a66bb3922176e2dacab3c050eb9d081fa0bf07aed268782950e9953d10582e4d57e953d30d93618c DIST cryptography-2.1.2.tar.gz 441439 SHA256 d7f348e4f5df146a0e75998544bab6d42313cf19a81a6e49990ab7b27cc9c73b SHA512 a5a1bf7ea60f172ae72816965a471be00ee092151c02d9d792579a4457cceddd181d5d95fb832752981f9bdd3cfb88a5d531562845b0b70f37b39fb0fbcafe85 WHIRLPOOL 49c543b80c09f77daf2a49a784bb2132dfadf07dde5b1f7e5c9174b215dda7113ab8b90a5cac386010bcc5fe0c012f55b601b895087f4c0bcbb126b8435cf440 DIST cryptography-2.1.3.tar.gz 441502 SHA256 68a26c353627163d74ee769d4749f2ee243866e9dac43c93bb33ebd8fbed1199 SHA512 04b340550955ab177e3ca3b63ad39f903cee8ae12d3dee1039507e09b9257210ea4474265cb521b8f93a5ccda8dd829640ed04bc16bb7e3663651e64a5bbe8e3 WHIRLPOOL 16fdd77eb60bd46331add278e8cd15a8a8f2d45c482d671997c1dac1835db39aba4812c21df9a0203a62b2cebc6c130c57a6760e0167a7dbaa1518d427087045 +DIST cryptography-2.1.4.tar.gz 441557 BLAKE2B 66aa07930ee54469328977e27096e65b7a333b38b71828c71cb7891b489ef7af60f5e5590f67b43d5e63dc2279d9ca1ba036879f3145264f7639d65000958b50 SHA512 f749cb4384badc174a842514e5a4fee2ed01ab9c716799d8d9d5301f6d2d97b6c41deb9e425f48928b639fa34bef8c05529ed7e5b777ef5ca75c244f8fda8fd4 EBUILD cryptography-1.7.1.ebuild 1666 BLAKE2B b474878fa899bf532dc628455180463f8068d4ce90a3d0f91f6367aef1eaa5f9dc9027496bb2ccc1c9bd9451b00ae0e713c92a4e0fe156b68ae209fb5befb14a SHA512 d30f513b2b76fb1fa100b9c9a06adf3330e66f6fcc18ca62d01dc493fa70aa6e84e6cc902e0d2d537d456c8fe8b963b25142bedd5d1185d476c032d0c50b7950 EBUILD cryptography-1.7.2.ebuild 1748 BLAKE2B d5567061692b4b08c99b11f3eb1251074c58cd463b56c0f46ed6609bcee14f54d47c1591bc19c4d8e8a508770e958f39ed4caca47e2e0eb2c54966854501a0a5 SHA512 f6d6768259d982e8c2f933bd61fd103384110258bb7133184f54ec48a6c91593a6261cef15b4208330192a7678be45e53170ecb16ef3f64b761ae9d258ef7ae9 EBUILD cryptography-1.8.1.ebuild 1675 BLAKE2B 07dbff835901aa406b1ad41420381b67a8864bac69a6f672840268cf24192dd5e08e9c02d97d53f136ed430a8d0011e0027d81a8fc9c64bbcb9181a9f5001015 SHA512 dc74e12777b873ebad3a97d7f8b205e0d200fac1479bc0d8c7e5b13aa8714d3d8866f42380540b6c81e48d83640abbe87582694097f8145e4c88ad0da314ca4b @@ -19,4 +20,5 @@ EBUILD cryptography-2.1.1.ebuild 1646 BLAKE2B c702f3d9de77034c098e512ce4c3b6632f EBUILD cryptography-2.1.2-r1.ebuild 1748 BLAKE2B 442a1ac096c5120355a51039fc06f5b7328d1b457d2bb6506caf884a334e0405ef823a89f43f817a01b2518304d20c6a162026918d12c2162f995cd7710fca9f SHA512 4fadc4dfdbd084efc7d375adf8e11b2b4cb429e26bda0ea9227298d30b1879d8e3609208afc7395af0370b072f334ac00ba7e172fa095636bda249e0e62441a1 EBUILD cryptography-2.1.2.ebuild 1646 BLAKE2B c702f3d9de77034c098e512ce4c3b6632f3d309790be1c9444bff9bd482d39c7c2cce6a188df406a72f04dae71cd82a1dbcef93989eb4c1dc4ce2993bdcb1cc0 SHA512 7d11e6ddae039e21eb205d5b4f71e56bd0bbf57670166afb57bcea711adb360653e4337a83a826ea11d1a964153b767fe05c7a8b00f16798f581e9c2de7ae966 EBUILD cryptography-2.1.3.ebuild 1749 BLAKE2B 745980a56d43ab82ba6a1a65a0918acee64642d5c5ee95b343c5c09ca6f68cf724e3effaac2ad8dac4262e6aa98386dab00feec2dc327b6e7c497429fcdbcbcb SHA512 cb0e140e6159364a1eec79eda27563638dc9ef8cb13278f1fd99d12c3b969af4f8abf4a3090b8ae5379a3678c482af049ff3df77e95cc46810c5b761f9ab3eba +EBUILD cryptography-2.1.4.ebuild 1749 BLAKE2B 745980a56d43ab82ba6a1a65a0918acee64642d5c5ee95b343c5c09ca6f68cf724e3effaac2ad8dac4262e6aa98386dab00feec2dc327b6e7c497429fcdbcbcb SHA512 cb0e140e6159364a1eec79eda27563638dc9ef8cb13278f1fd99d12c3b969af4f8abf4a3090b8ae5379a3678c482af049ff3df77e95cc46810c5b761f9ab3eba MISC metadata.xml 384 BLAKE2B 6dbfdd39bb24b2df61454716e308605ae1d35c3babd01f16556bbbab240e425434315cb2b80a2c3e8e9b18b237899b5fb96566a7ffefde2af3af1dcc2e08362b SHA512 c2806f846608bdd0720b589494e13f57ab2d64026747f2b13f412c9a0e9d2bef6b16fc357e4d16b74ad7a2a2af8daa5e28d0b6bfe4d2141ce68881c724fd24c7 diff --git a/dev-python/cryptography/cryptography-2.1.4.ebuild b/dev-python/cryptography/cryptography-2.1.4.ebuild new file mode 100644 index 000000000000..ab61cfd83112 --- /dev/null +++ b/dev-python/cryptography/cryptography-2.1.4.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} ) +PYTHON_REQ_USE="threads(+)" + +inherit distutils-r1 flag-o-matic + +DESCRIPTION="Library providing cryptographic recipes and primitives" +HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="|| ( Apache-2.0 BSD )" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x64-solaris" +IUSE="libressl test" + +RDEPEND=" + !libressl? ( dev-libs/openssl:0= ( || ( dev-libs/openssl:0[-bindist(-)] + =dev-libs/openssl-1.0.2l-r1:0 + >=dev-libs/openssl-1.1.0g-r1:0 ) ) ) + libressl? ( dev-libs/libressl ) + $(python_gen_cond_dep '>=dev-python/cffi-1.7:=[${PYTHON_USEDEP}]' 'python*') + $(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 pypy{,3}) + >=dev-python/idna-2.1[${PYTHON_USEDEP}] + >=dev-python/asn1crypto-0.21.0[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + >=dev-python/six-1.4.1[${PYTHON_USEDEP}] + virtual/python-ipaddress[${PYTHON_USEDEP}] + " +DEPEND="${RDEPEND} + >=dev-python/setuptools-1.0[${PYTHON_USEDEP}] + test? ( + ~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}] + dev-python/hypothesis[${PYTHON_USEDEP}] + dev-python/iso8601[${PYTHON_USEDEP}] + dev-python/pretend[${PYTHON_USEDEP}] + dev-python/pyasn1-modules[${PYTHON_USEDEP}] + >=dev-python/pytest-2.9.0[${PYTHON_USEDEP}] + dev-python/pytz[${PYTHON_USEDEP}] + )" + +DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst ) + +python_configure_all() { + append-cflags $(test-flags-CC -pthread) +} + +python_test() { + py.test -v -v -x || die "Tests fail with ${EPYTHON}" +} diff --git a/dev-python/cvxopt/Manifest b/dev-python/cvxopt/Manifest index 03afefcb1de2..1dd3ffa21214 100644 --- a/dev-python/cvxopt/Manifest +++ b/dev-python/cvxopt/Manifest @@ -1,10 +1,3 @@ -AUX cvxopt-1.1.6-glpk449.patch 39362 BLAKE2B 2b945b43f520d0f047bd319f31d17ca4ad306d1c038e174f6bfdee437adaf192eef3fe222084eccdd384cfbc60bbd2976b8757c274b698374ac623fdc6db1353 SHA512 e494dbf0e6426f06fdbfc289caa541fdbc01451213e7700f9b51cc87f0d349eb869706112d8485149ba529f50f35e9b3cd0125ec2c0f27fd809b34b2f79d1dde -AUX cvxopt-1.1.6-setup.patch 6312 BLAKE2B 3de1c3262dab6915259980c1ca40508dd8c53063f2f37984b586db3a9d87bdad60c7488f314506bd68ec9640bb2849c1fd0a66108b5aa6580abbf44103d70cd0 SHA512 ac89c43dafa66e41ef5608d1a8bdba2d94919303222778d8ca5fb266bd405e80f3ed7ca3ed7278ea0dfb65461d11c8adf0ce78772494aa8c0524d6eaca6456d9 -AUX cvxopt-1.1.8-setup.patch 4586 BLAKE2B 198c14a6db6ba247f69e3384ae858f965129cc26874fec748d1bb76fb5386b4819e191ed2757a7530bb95f7b7dd8f40abe6b039db5b742d8689b20a47801b8b6 SHA512 b48179544527584fbed368b7140097bac81ca95327df3dc1a1d43d071c23c9c0745a4ccd0f4dd297c698f5b0cb44180b68f044a39dafbb8482ffba511b2c6d40 -DIST cvxopt-1.1.6.tar.gz 3352996 SHA256 7b4ccf3ed896dde6624623431c0b1f5e32d874384329ed716f51babcbf416227 SHA512 b9f5fd7870412423b60068d205efb99d3630012509cb659fb67a10d6175906768846d7c906cf2fcac4be29afd558619b71e2dca730041329195a2365dd1d722c WHIRLPOOL d43cf090ee0396a77851fb71e6e34c980152bccdd5fdb3ecc53d0a464a505ac87a1e7198d313ec669443970bcf8a2d616f03c2f861b7df2f620bd583a97ea140 -DIST cvxopt-1.1.8.tar.gz 5354013 SHA256 c96f8d01ae31a5bdec36a65b0587f50cfbf8139335adb70442350a8042da2025 SHA512 fdf047f203275e687c51b88575639ab0383207f8748969939ecf2939f9a2acc9f5d0e97c68377466fce81eb979b5eb058834f75134cc56df5dbb01805cb98c93 WHIRLPOOL 65c8a246e03a7136c2bce3c7ef831f9f82c4cc84b7a1e5db6a2643127ea9164c35782fb1013c0eaf7ac190d036887a131c705fa56b78bda179792eca9d016d8b DIST cvxopt-1.1.9.tar.gz 1872932 SHA256 09997fec809179c9bb9fe8cdd202ad6ecb675f890658219022f492e0797122ee SHA512 bb0982cd1489157df4c7cd0dd92bf83b1692dc3a27d6b9a7a465dda9f9daea4ea5ef69e48642a879d036679bd0b0fe0dfd782433ce4cc570e90e11823733e58b WHIRLPOOL c9ba8b674dbcf1799a99559f3794db2cf8f57f5584865294fea5ee6932d59a9d9980e10197e8e4cd291d591bad9d92b24737a909b5bac6f6617597afa057c171 -EBUILD cvxopt-1.1.6-r2.ebuild 2521 BLAKE2B 698db1d3748f6cdaf99372e187e1d82141f6d94652938104760e8e9db00f248e89fb031a22a3837527c3ab1c04791e9427a540b50b1097d3b0a3d4194660d07b SHA512 f3121534347fb0fa66fa74986c169cf09236b6f193f26b18127fd76bac877583fbe6c2fd3123471eaac5df58249aaa9bbb4a82245d5e7c9b5b646a84488b868b -EBUILD cvxopt-1.1.8.ebuild 2572 BLAKE2B d3ccb098b4b2a38a7de72b6c6adb196d305c28f08f3dceaed57a8216b0630f90644070061edd7aee351500364ac521ed8943bee05c7fd0b1782ba6b6f42820bc SHA512 464be47edb5993512da0cf9f94ed40a767d6806cb5b99427e202d1e89c893c89c45111f11643496ae606a4a73538a4f17a8a0562440b9f26d86d9874a568d453 EBUILD cvxopt-1.1.9.ebuild 2887 BLAKE2B a4e7b8b258f4dd7fc466a4791f0dfc762977a1ac3160c6c49aa30d0fb6f6f8ee2951d9c2cb90cf382b3dff365a16cc60d3212d822e424005f9430d7b265fab3a SHA512 647370781d4b3bcaadcd6b08b25c17340f73c428ccf1da6d659955e52d762694404028e61bf5cb0572778dc11b11185b57538c19078537e61c53cf47fd0a5a90 MISC metadata.xml 805 BLAKE2B cfeb4a97635e28a1fe93b26897950dfe13268aef349647c5ca7455597e679ab7e79d21daf1b54f4c8855624abb8286676aff2da381782dd3b42b0a587f9396b2 SHA512 52bdd0bdc12807d7a3d2d820af3167b0768225167377bdf42e5f7218d5154deab2bee8bbcfdd173301e4b1d87f268bfb4bf6c1f884113c2d1f3fbf7fa1dc2ab6 diff --git a/dev-python/cvxopt/cvxopt-1.1.6-r2.ebuild b/dev-python/cvxopt/cvxopt-1.1.6-r2.ebuild deleted file mode 100644 index c83a21f9e4b9..000000000000 --- a/dev-python/cvxopt/cvxopt-1.1.6-r2.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python{2_7,3_4} ) - -inherit distutils-r1 toolchain-funcs eutils - -DESCRIPTION="Python package for convex optimization" -HOMEPAGE="http://cvxopt.org/" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc +dsdp examples fftw +glpk gsl" - -RDEPEND=" - virtual/blas - virtual/cblas - virtual/lapack - sci-libs/cholmod:0= - sci-libs/umfpack:0= - dsdp? ( sci-libs/dsdp:0= ) - fftw? ( sci-libs/fftw:3.0= ) - glpk? ( sci-mathematics/glpk:0= ) - gsl? ( sci-libs/gsl:0= )" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( dev-python/sphinx )" - -python_prepare_all(){ - epatch "${FILESDIR}"/${PN}-1.1.6-setup.patch - - has_version ">=sci-mathematics/glpk-4.49" && \ - epatch "${FILESDIR}"/${PN}-1.1.6-glpk449.patch - - rm -r src/C/SuiteSparse*/ || die - - pkg_lib() { - local pkg=$(echo $1 | tr '[:lower:]' '[:upper:]') - local libs="$($(tc-getPKG_CONFIG) --libs-only-l $1 | \ - sed -e 's:[ ]-l*\(pthread\|m\)\([ ]\|$\)::g' -e 's:[ ]*$::' | \ - tr ' ' '\n' | sort -u | sed -e "s:^-l\(.*\):'\1':g" | \ - tr '\n' ',' | sed -e 's:,$::')" - local libdir="$($(tc-getPKG_CONFIG) --libs-only-L $1 | \ - sed -e 's:[ ]*$::' | \ - tr ' ' '\n' | sort -u | sed -e "s:^-L\(.*\):'\1':g" | \ - tr '\n' ',' | sed -e 's:,$::')" - local incdir="$($(tc-getPKG_CONFIG) --cflags-only-I $1 | \ - sed -e 's:[ ]*$::' | \ - tr ' ' '\n' | sort -u | sed -e "s:^-L\(.*\):'\1':g" | \ - tr '\n' ',' | sed -e 's:,$::')" - sed -i \ - -e "/${pkg}_LIB[ ]*=/s:\(.*[ ]*=[ ]*\[\).*${1}.*:\1${libs}\]:" \ - -e "s:\(${pkg}_INC_DIR[ ]*=\).*$:\1 ${incdir}:" \ - -e "s:\[ BLAS_LIB_DIR \]:\[ ${libdir} \]:g" \ - setup.py || die - } - - use_cvx() { - local flag=$1 - if use ${flag} ; then - # Switch to ^^ when we switch to EAPI=6. - #local uflag=${flag^^} - local uflag=$(tr '[:lower:]' '[:upper:]' <<<"${flag}") - sed -i \ - -e "s/\(BUILD_${uflag} =\) 0/\1 1/" \ - setup.py || die - fi - } - - pkg_lib blas - pkg_lib lapack - - use_cvx gsl - use_cvx fftw - use_cvx glpk - use_cvx dsdp - - distutils-r1_python_prepare_all -} - -python_compile_all() { - use doc && export VARTEXFONTS="${T}/fonts" && emake -C doc -B html -} - -python_test() { - cd examples/doc/chap8 - "${EPYTHON}" lp.py || die -} - -python_install_all() { - use doc && HTML_DOCS=( doc/build/html/. ) - insinto /usr/share/doc/${PF} - use examples && doins -r examples - distutils-r1_python_install_all -} diff --git a/dev-python/cvxopt/cvxopt-1.1.8.ebuild b/dev-python/cvxopt/cvxopt-1.1.8.ebuild deleted file mode 100644 index a4a23ecac408..000000000000 --- a/dev-python/cvxopt/cvxopt-1.1.8.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{4,5} ) - -inherit distutils-r1 eutils toolchain-funcs - -DESCRIPTION="Python package for convex optimization" -HOMEPAGE="http://cvxopt.org/" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc +dsdp examples fftw +glpk gsl" - -RDEPEND=" - virtual/blas - virtual/cblas - virtual/lapack - sci-libs/amd:0= - sci-libs/cholmod:0= - sci-libs/colamd:0= - sci-libs/suitesparseconfig:0= - sci-libs/umfpack:0= - dsdp? ( sci-libs/dsdp:0= ) - fftw? ( sci-libs/fftw:3.0= ) - glpk? ( >=sci-mathematics/glpk-4.49:0= ) - gsl? ( sci-libs/gsl:0= )" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( dev-python/sphinx )" - -python_prepare_all(){ - epatch "${FILESDIR}"/${P}-setup.patch - - rm -r src/C/SuiteSparse*/ || die - - pkg_lib() { - local pkg=$(echo $1 | tr '[:lower:]' '[:upper:]') - local libs="$($(tc-getPKG_CONFIG) --libs-only-l $1 | \ - sed -e 's:[ ]-l*\(pthread\|m\)\([ ]\|$\)::g' -e 's:[ ]*$::' | \ - tr ' ' '\n' | sort -u | sed -e "s:^-l\(.*\):'\1':g" | \ - tr '\n' ',' | sed -e 's:,$::')" - local libdir="$($(tc-getPKG_CONFIG) --libs-only-L $1 | \ - sed -e 's:[ ]*$::' | \ - tr ' ' '\n' | sort -u | sed -e "s:^-L\(.*\):'\1':g" | \ - tr '\n' ',' | sed -e 's:,$::')" - local incdir="$($(tc-getPKG_CONFIG) --cflags-only-I $1 | \ - sed -e 's:[ ]*$::' | \ - tr ' ' '\n' | sort -u | sed -e "s:^-L\(.*\):'\1':g" | \ - tr '\n' ',' | sed -e 's:,$::')" - sed -i \ - -e "/${pkg}_LIB[ ]*=/s:\(.*[ ]*=[ ]*\[\).*${1}.*:\1${libs}\]:" \ - -e "s:\(${pkg}_INC_DIR[ ]*=\).*$:\1 ${incdir}:" \ - -e "s:\[ BLAS_LIB_DIR \]:\[ ${libdir} \]:g" \ - setup.py || die - } - - use_cvx() { - local flag=$1 - if use ${flag} ; then - # Switch to ^^ when we switch to EAPI=6. - #local uflag=${flag^^} - local uflag=$(tr '[:lower:]' '[:upper:]' <<<"${flag}") - sed -i \ - -e "s/\(BUILD_${uflag} =\) 0/\1 1/" \ - setup.py || die - fi - } - - pkg_lib blas - pkg_lib lapack - - use_cvx gsl - use_cvx fftw - use_cvx glpk - use_cvx dsdp - - sed \ - -e '/SUITESPARSE_EXT_LIB/s:0:1:g' \ - -i setup.py || die - - distutils-r1_python_prepare_all -} - -python_compile_all() { - use doc && export VARTEXFONTS="${T}/fonts" && emake -C doc -B html -} - -python_test() { - cd examples/doc/chap8 - "${EPYTHON}" lp.py || die -} - -python_install_all() { - use doc && HTML_DOCS=( doc/build/html/. ) - insinto /usr/share/doc/${PF} - use examples && EXAMPLES=( examples/. ) - distutils-r1_python_install_all -} diff --git a/dev-python/cvxopt/files/cvxopt-1.1.6-glpk449.patch b/dev-python/cvxopt/files/cvxopt-1.1.6-glpk449.patch deleted file mode 100644 index 2a1cc6737be4..000000000000 --- a/dev-python/cvxopt/files/cvxopt-1.1.6-glpk449.patch +++ /dev/null @@ -1,1082 +0,0 @@ ---- src/C/glpk.c.orig 2014-03-24 09:39:39.510214726 -0700 -+++ src/C/glpk.c 2014-03-24 09:38:41.251897138 -0700 -@@ -23,75 +23,271 @@ - #include "misc.h" - #include "glpk.h" - -+ - PyDoc_STRVAR(glpk__doc__, - "Interface to the simplex and mixed integer LP algorithms in GLPK.\n\n" - "The GLPK control parameters have the default values listed in \n" -- "the GLPK documentation, except for 'LPX_K_PRESOL', which is set\n" -+ "the GLPK documentation, except for 'presolve', which is set\n" - "to 1 and cannot be modified. The other parameters can be\n" -- "modified by making an entry in the dictionary glpk.options.\n" -- "For example, the command glpk.options['LPX_K_MSGLEV'] = 0 turns\n" -- "off the printed output during execution of glpk.simplex().\n" -+ "modified by passing a smcp or iocp object to the appropriate function\n" -+ "For example, the commands param = glpk.smcp(msg_lev = 0), or \n" -+ "param=glpk.smcp(); param.msg_lev=1 turn off the printed output during" -+ " execution of glpk.simplex().\n" - "See the documentation at www.gnu.org/software/glpk/glpk.html for\n" - "the list of GLPK control parameters and their default values."); - - static PyObject *glpk_module; - --typedef struct { -- char name[20]; -- int idx; -- char type; --} param_tuple; -- --static const param_tuple GLPK_PARAM_LIST[] = { -- {"LPX_K_MSGLEV", LPX_K_MSGLEV, 'i'}, -- {"LPX_K_SCALE", LPX_K_SCALE, 'i'}, -- {"LPX_K_DUAL", LPX_K_DUAL, 'i'}, -- {"LPX_K_PRICE", LPX_K_PRICE, 'i'}, -- {"LPX_K_RELAX", LPX_K_RELAX, 'f'}, -- {"LPX_K_TOLBND", LPX_K_TOLBND, 'f'}, -- {"LPX_K_TOLDJ", LPX_K_TOLDJ, 'f'}, -- {"LPX_K_TOLPIV", LPX_K_TOLPIV, 'f'}, -- {"LPX_K_ROUND", LPX_K_ROUND, 'i'}, -- {"LPX_K_OBJLL", LPX_K_OBJLL, 'f'}, -- {"LPX_K_OBJUL", LPX_K_OBJUL, 'f'}, -- {"LPX_K_ITLIM", LPX_K_ITLIM, 'i'}, -- {"LPX_K_ITCNT", LPX_K_ITCNT, 'i'}, -- {"LPX_K_TMLIM", LPX_K_TMLIM, 'f'}, -- {"LPX_K_OUTFRQ", LPX_K_OUTFRQ, 'i'}, -- {"LPX_K_OUTDLY", LPX_K_OUTDLY, 'f'}, -- {"LPX_K_BRANCH", LPX_K_BRANCH, 'i'}, -- {"LPX_K_BTRACK", LPX_K_BTRACK, 'i'}, -- {"LPX_K_TOLINT", LPX_K_TOLINT, 'f'}, -- {"LPX_K_TOLOBJ", LPX_K_TOLOBJ, 'f'}, -- {"LPX_K_MPSINFO", LPX_K_MPSINFO, 'i'}, -- {"LPX_K_MPSOBJ", LPX_K_MPSOBJ, 'i'}, -- {"LPX_K_MPSORIG", LPX_K_MPSORIG, 'i'}, -- {"LPX_K_MPSWIDE", LPX_K_MPSWIDE, 'i'}, -- {"LPX_K_MPSFREE", LPX_K_MPSFREE, 'i'}, -- {"LPX_K_MPSSKIP", LPX_K_MPSSKIP, 'i'}, -- {"LPX_K_LPTORIG", LPX_K_LPTORIG, 'i'}, -- {"LPX_K_PRESOL", LPX_K_PRESOL, 'i'}, --}; /* 28 paramaters */ -+/* Wrappers around the option glpk structs */ -+typedef struct{ -+ PyObject_HEAD -+ glp_smcp obj; -+} pysmcp; - -+/* Deallocation of smcp object */ -+static void smcp_dealloc(pysmcp* self) -+{ -+ Py_TYPE(self)->tp_free((PyObject*)self); -+} - --#if PY_MAJOR_VERSION >= 3 --static int get_param_idx(const char *str, int *idx, char *type) --#else --static int get_param_idx(char *str, int *idx, char *type) --#endif -+/* New smcp method */ -+static PyObject * -+smcp_new(PyTypeObject *type, PyObject *args, PyObject *kwds) - { -- int i; -+ pysmcp *self; -+ self = (pysmcp *)type->tp_alloc(type, 0); -+ return (PyObject *)self; -+} -+ -+/* Initialisation of smcp object */ -+static int -+smcp_init(pysmcp *self, PyObject *args, PyObject *kwds) -+{ -+ /*static char *kwlist[] = {"number", NULL};*/ -+ static char *kwlist[] = { "msg_lev", "meth", "pricing", "r_test", "tol_bnd", "tol_dj", "tol_piv", "obj_ll", "obj_ul", "it_lim", "tm_lim", "out_frq", "out_dly", "presolve" }; -+ glp_init_smcp(&self->obj); -+ if (! PyArg_ParseTupleAndKeywords(args, kwds, "|iiiidddddiiiii", kwlist, -+ &self->obj.msg_lev, -+ &self->obj.meth, -+ &self->obj.pricing, -+ &self->obj.r_test, -+ &self->obj.tol_bnd, -+ &self->obj.tol_dj, -+ &self->obj.tol_piv, -+ &self->obj.obj_ll, -+ &self->obj.obj_ul, -+ &self->obj.it_lim, -+ &self->obj.tm_lim, -+ &self->obj.out_frq, -+ &self->obj.out_dly, -+ &self->obj.presolve)) -+ return -1; - -- for (i=0; i<28; i++) { -- if (!strcmp(GLPK_PARAM_LIST[i].name, str)) { -- *idx = GLPK_PARAM_LIST[i].idx; -- *type = GLPK_PARAM_LIST[i].type; -- return 1; -- } -- } - return 0; - } - -+/* smcp members declaration */ -+static PyMemberDef smcpMembers[] = { -+ {"msg_lev", T_INT, offsetof(pysmcp,obj)+offsetof(glp_smcp,msg_lev), 0, "message level: "}, -+ {"meth", T_INT, offsetof(pysmcp,obj)+offsetof(glp_smcp,meth), 0, "simplex method option: "}, -+ {"pricing", T_INT, offsetof(pysmcp,obj)+offsetof(glp_smcp,pricing), 0, "pricing technique: "}, -+ {"r_test", T_INT, offsetof(pysmcp,obj)+offsetof(glp_smcp,r_test), 0, "ratio test technique: "}, -+ {"tol_bnd", T_DOUBLE, offsetof(pysmcp,obj)+offsetof(glp_smcp,tol_bnd), 0, "spx.tol_bnd "}, -+ {"tol_dj", T_DOUBLE, offsetof(pysmcp,obj)+offsetof(glp_smcp,tol_dj), 0, "spx.tol_dj "}, -+ {"tol_piv", T_DOUBLE, offsetof(pysmcp,obj)+offsetof(glp_smcp,tol_piv), 0, "spx.tol_piv "}, -+ {"obj_ll", T_DOUBLE, offsetof(pysmcp,obj)+offsetof(glp_smcp,obj_ll), 0, "spx.obj_ll "}, -+ {"obj_ul", T_DOUBLE, offsetof(pysmcp,obj)+offsetof(glp_smcp,obj_ul), 0, "spx.obj_ul "}, -+ {"it_lim", T_INT, offsetof(pysmcp,obj)+offsetof(glp_smcp,it_lim), 0, "spx.it_lim "}, -+ {"tm_lim", T_INT, offsetof(pysmcp,obj)+offsetof(glp_smcp,tm_lim), 0, "spx.tm_lim (milliseconds) "}, -+ {"out_frq", T_INT, offsetof(pysmcp,obj)+offsetof(glp_smcp,out_frq), 0, "spx.out_frq "}, -+ {"out_dly", T_INT, offsetof(pysmcp,obj)+offsetof(glp_smcp,out_dly), 0, "spx.out_dly (milliseconds) "}, -+ {"presolve", T_INT, offsetof(pysmcp,obj)+offsetof(glp_smcp,presolve), 0, "enable/disable using LP presolver "}, -+}; -+ -+static PyTypeObject smcp_t = { -+ PyVarObject_HEAD_INIT(NULL, 0) -+ "glpk.smcp", /* tp_name */ -+ sizeof(pysmcp), /* tp_basicsize */ -+ 0, /* tp_itemsize */ -+ (destructor)smcp_dealloc, /* tp_dealloc */ -+ 0, /* tp_print */ -+ 0, /* tp_getattr */ -+ 0, /* tp_setattr */ -+ 0, /* tp_reserved */ -+ 0, /* tp_repr */ -+ 0, /* tp_as_number */ -+ 0, /* tp_as_sequence */ -+ 0, /* tp_as_mapping */ -+ 0, /* tp_hash */ -+ 0, /* tp_call */ -+ 0, /* tp_str */ -+ 0, /* tp_getattro */ -+ 0, /* tp_setattro */ -+ 0, /* tp_as_buffer */ -+ Py_TPFLAGS_DEFAULT | -+ Py_TPFLAGS_BASETYPE, /* tp_flags */ -+ "simplex method control parameters", /* tp_doc */ -+ 0, /* tp_traverse */ -+ 0, /* tp_clear */ -+ 0, /* tp_richcompare */ -+ 0, /* tp_weaklistoffset */ -+ 0, /* tp_iter */ -+ 0, /* tp_iternext */ -+ 0, /* tp_methods */ -+ smcpMembers, /* tp_members */ -+ 0, /* tp_getset */ -+ 0, /* tp_base */ -+ 0, /* tp_dict */ -+ 0, /* tp_descr_get */ -+ 0, /* tp_descr_set */ -+ 0, /* tp_dictoffset */ -+ (initproc)smcp_init, /* tp_init */ -+ 0, /* tp_alloc */ -+ smcp_new, /* tp_new */ -+}; -+ -+ -+/* Wrappers around the option glpk structs */ -+typedef struct{ -+ PyObject_HEAD -+ glp_iocp obj; -+} pyiocp; -+ -+/* Deallocation of iocp object */ -+static void iocp_dealloc(pysmcp* self) -+{ -+ Py_TYPE(self)->tp_free((PyObject*)self); -+} -+ -+/* New iocp method */ -+static PyObject * -+iocp_new(PyTypeObject *type, PyObject *args, PyObject *kwds) -+{ -+ pyiocp *self; -+ self = (pyiocp *)type->tp_alloc(type, 0); -+ return (PyObject *)self; -+} -+ -+/* Initialisation of iocp object */ -+static int -+iocp_init(pyiocp *self, PyObject *args, PyObject *kwds) -+{ -+ /*static char *kwlist[] = {"number", NULL};*/ -+ static char *kwlist[] = { "msg_lev", "br_tech", "bt_tech", "tol_int", "tol_obj", "tm_lim", "out_frq", "out_dly", "cb_size", "pp_tech", "mip_gap", "mir_cuts", "gmi_cuts", "cov_cuts", "clq_cuts", "presolve", "binarize", "fp_heur", "ps_heur", "ps_tm_lim", "use_sol", "save_sol", "alien",NULL}; -+ glp_init_iocp(&self->obj); -+ -+ if (! PyArg_ParseTupleAndKeywords(args, kwds, "|iiiddiiiiidiiiiiiiiiisi", kwlist, -+ &self->obj.msg_lev, -+ &self->obj.br_tech, -+ &self->obj.bt_tech, -+ &self->obj.tol_int, -+ &self->obj.tol_obj, -+ &self->obj.tm_lim, -+ &self->obj.out_frq, -+ &self->obj.out_dly, -+ &self->obj.cb_size, -+ &self->obj.pp_tech, -+ &self->obj.mip_gap, -+ &self->obj.mir_cuts, -+ &self->obj.gmi_cuts, -+ &self->obj.cov_cuts, -+ &self->obj.clq_cuts, -+ &self->obj.presolve, -+ &self->obj.binarize, -+ &self->obj.fp_heur, -+ &self->obj.ps_heur, -+ &self->obj.ps_tm_lim, -+ &self->obj.use_sol, -+ &self->obj.save_sol, -+ &self->obj.alien)) -+ return -1; -+ -+ return 0; -+} -+ -+/* iocp members declaration */ -+static PyMemberDef iocpMembers[] = { -+ {"msg_lev", T_INT, offsetof(pysmcp,obj)+offsetof(glp_iocp,msg_lev), 0, "message level (see glp_smcp) "}, -+ {"br_tech", T_INT, offsetof(pysmcp,obj)+offsetof(glp_iocp,br_tech), 0, "branching technique: "}, -+ {"bt_tech", T_INT, offsetof(pysmcp,obj)+offsetof(glp_iocp,bt_tech), 0, "backtracking technique: "}, -+ {"tol_int", T_DOUBLE, offsetof(pysmcp,obj)+offsetof(glp_iocp,tol_int), 0, "mip.tol_int "}, -+ {"tol_obj", T_DOUBLE, offsetof(pysmcp,obj)+offsetof(glp_iocp,tol_obj), 0, "mip.tol_obj "}, -+ {"tm_lim", T_INT, offsetof(pysmcp,obj)+offsetof(glp_iocp,tm_lim), 0, "mip.tm_lim (milliseconds) "}, -+ {"out_frq", T_INT, offsetof(pysmcp,obj)+offsetof(glp_iocp,out_frq), 0, "mip.out_frq (milliseconds) "}, -+ {"out_dly", T_INT, offsetof(pysmcp,obj)+offsetof(glp_iocp,out_dly), 0, "mip.out_dly (milliseconds) "}, -+ /*void (*cb_func)(glp_tree *T, void *info); [> mip.cb_func <]*/ -+ /*void *cb_info; [> mip.cb_info <]*/ -+ {"cb_size", T_INT, offsetof(pysmcp,obj)+offsetof(glp_iocp,cb_size), 0, "mip.cb_size "}, -+ {"pp_tech", T_INT, offsetof(pysmcp,obj)+offsetof(glp_iocp,pp_tech), 0, "preprocessing technique: "}, -+ {"mip_gap", T_DOUBLE, offsetof(pysmcp,obj)+offsetof(glp_iocp,mip_gap), 0, "relative MIP gap tolerance "}, -+ {"mir_cuts", T_INT, offsetof(pysmcp,obj)+offsetof(glp_iocp,mir_cuts), 0, "MIR cuts (GLP_ON/GLP_OFF) "}, -+ {"gmi_cuts", T_INT, offsetof(pysmcp,obj)+offsetof(glp_iocp,gmi_cuts), 0, "Gomory's cuts (GLP_ON/GLP_OFF) "}, -+ {"cov_cuts", T_INT, offsetof(pysmcp,obj)+offsetof(glp_iocp,cov_cuts), 0, "cover cuts (GLP_ON/GLP_OFF) "}, -+ {"clq_cuts", T_INT, offsetof(pysmcp,obj)+offsetof(glp_iocp,clq_cuts), 0, "clique cuts (GLP_ON/GLP_OFF) "}, -+ {"presolve", T_INT, offsetof(pysmcp,obj)+offsetof(glp_iocp,presolve), 0, "enable/disable using MIP presolver "}, -+ {"binarize", T_INT, offsetof(pysmcp,obj)+offsetof(glp_iocp,binarize), 0, "try to binarize integer variables "}, -+ {"fp_heur", T_INT, offsetof(pysmcp,obj)+offsetof(glp_iocp,fp_heur), 0, "feasibility pump heuristic "}, -+ {"ps_heur", T_INT, offsetof(pysmcp,obj)+offsetof(glp_iocp,ps_heur), 0, "proximity search heuristic "}, -+ {"ps_tm_lim", T_INT, offsetof(pysmcp,obj)+offsetof(glp_iocp,ps_tm_lim), 0, "proxy time limit, milliseconds "}, -+ {"use_sol", T_INT, offsetof(pysmcp,obj)+offsetof(glp_iocp,use_sol), 0, "use existing solution "}, -+ {"save_sol",T_STRING,offsetof(pysmcp,obj)+offsetof(glp_iocp,save_sol),0, "filename to save every new solution"}, -+ {"alien", T_INT, offsetof(pysmcp,obj)+offsetof(glp_iocp,alien), 0, "use alien solver "}, -+}; -+ -+static PyTypeObject iocp_t = { -+ PyVarObject_HEAD_INIT(NULL, 0) -+ "glpk.iocp", /* tp_name */ -+ sizeof(pyiocp), /* tp_basicsize */ -+ 0, /* tp_itemsize */ -+ (destructor)iocp_dealloc, /* tp_dealloc */ -+ 0, /* tp_print */ -+ 0, /* tp_getattr */ -+ 0, /* tp_setattr */ -+ 0, /* tp_reserved */ -+ 0, /* tp_repr */ -+ 0, /* tp_as_number */ -+ 0, /* tp_as_sequence */ -+ 0, /* tp_as_mapping */ -+ 0, /* tp_hash */ -+ 0, /* tp_call */ -+ 0, /* tp_str */ -+ 0, /* tp_getattro */ -+ 0, /* tp_setattro */ -+ 0, /* tp_as_buffer */ -+ Py_TPFLAGS_DEFAULT | -+ Py_TPFLAGS_BASETYPE, /* tp_flags */ -+ "integer optimizer control parameters", /* tp_doc */ -+ 0, /* tp_traverse */ -+ 0, /* tp_clear */ -+ 0, /* tp_richcompare */ -+ 0, /* tp_weaklistoffset */ -+ 0, /* tp_iter */ -+ 0, /* tp_iternext */ -+ 0, /* tp_methods */ -+ iocpMembers, /* tp_members */ -+ 0, /* tp_getset */ -+ 0, /* tp_base */ -+ 0, /* tp_dict */ -+ 0, /* tp_descr_get */ -+ 0, /* tp_descr_set */ -+ 0, /* tp_dictoffset */ -+ (initproc)iocp_init, /* tp_init */ -+ 0, /* tp_alloc */ -+ iocp_new, /* tp_new */ -+}; -+ -+ -+ -+/* Small helper function to generate the output string of the simplex function */ -+inline static void set_output_string(PyObject* t,const char s[]) { -+ PyTuple_SET_ITEM(t, 0, (PyObject *) -+#if PY_MAJOR_VERSION >= 3 -+ PyUnicode_FromString(s)); -+#else -+ PyString_FromString(s)); -+#endif -+ } -+ - - static char doc_simplex[] = - "Solves a linear program using GLPK.\n\n" -@@ -126,21 +322,16 @@ - PyObject *kwrds) - { - matrix *c, *h, *b=NULL, *x=NULL, *z=NULL, *y=NULL; -- PyObject *G, *A=NULL, *t=NULL, *param, *key, *value; -- LPX *lp; -- int m, n, p, i, j, k, nnz, nnzmax, *rn=NULL, *cn=NULL, param_id; -- int_t pos=0; -+ PyObject *G, *A=NULL, *t=NULL; -+ glp_prob *lp; -+ glp_smcp *options = NULL; -+ pysmcp *smcpParm = NULL; -+ int m, n, p, i, j, k, nnz, nnzmax, *rn=NULL, *cn=NULL; - double *a=NULL, val; -- char param_type, err_str[100]; --#if PY_MAJOR_VERSION >= 3 -- const char *keystr; --#else -- char *keystr; --#endif -- char *kwlist[] = {"c", "G", "h", "A", "b", NULL}; -+ char *kwlist[] = {"c", "G", "h", "A", "b","options", NULL}; - -- if (!PyArg_ParseTupleAndKeywords(args, kwrds, "OOO|OO", kwlist, &c, -- &G, &h, &A, &b)) return NULL; -+ if (!PyArg_ParseTupleAndKeywords(args, kwrds, "OOO|OOO!", kwlist, &c, -+ &G, &h, &A, &b,&smcp_t,&smcpParm)) return NULL; - - if ((Matrix_Check(G) && MAT_ID(G) != DOUBLE) || - (SpMatrix_Check(G) && SP_ID(G) != DOUBLE) || -@@ -182,19 +373,30 @@ - PyErr_SetString(PyExc_ValueError, "incompatible dimensions"); - return NULL; - } -+ if(!smcpParm) -+ { -+ smcpParm = (pysmcp*)malloc(sizeof(*smcpParm)); -+ glp_init_smcp(&(smcpParm->obj)); -+ } -+ if(smcpParm) -+ { -+ Py_INCREF(smcpParm); -+ options = &smcpParm->obj; -+ options->presolve = 1; -+ } - -- lp = lpx_create_prob(); -- lpx_add_rows(lp, m+p); -- lpx_add_cols(lp, n); -+ lp = glp_create_prob(); -+ glp_add_rows(lp, m+p); -+ glp_add_cols(lp, n); - - for (i=0; i= 3 -- if ((PyUnicode_Check(key)) && -- get_param_idx(_PyUnicode_AsString(key), ¶m_id, -- ¶m_type)){ -- keystr = _PyUnicode_AsString(key); --#else -- if ((keystr = PyString_AsString(key)) && get_param_idx(keystr, -- ¶m_id, ¶m_type)){ --#endif -- if (param_type == 'i'){ --#if PY_MAJOR_VERSION >= 3 -- if (!PyLong_Check(value)){ --#else -- if (!PyInt_Check(value)){ --#endif -- sprintf(err_str, "invalid value for integer " -- "GLPK parameter: %-.20s", keystr); -- PyErr_SetString(PyExc_ValueError, err_str); -- lpx_delete_prob(lp); -- Py_DECREF(param); -- return NULL; -- } -- if (!strcmp("LPX_K_PRESOL", keystr) && --#if PY_MAJOR_VERSION >= 3 -- PyLong_AS_LONG(value) != 1){ --#else -- PyInt_AS_LONG(value) != 1){ --#endif -- PyErr_Warn(PyExc_UserWarning, "ignoring value of " -- "GLPK parameter 'LPX_K_PRESOL'"); -- } -- else lpx_set_int_parm(lp, param_id, --#if PY_MAJOR_VERSION >= 3 -- PyLong_AS_LONG(value)); --#else -- PyInt_AS_LONG(value)); --#endif -- } -- else { --#if PY_MAJOR_VERSION >= 3 -- if (!PyLong_Check(value) && !PyFloat_Check(value)){ --#else -- if (!PyInt_Check(value) && !PyFloat_Check(value)){ --#endif -- sprintf(err_str, "invalid value for floating point " -- "GLPK parameter: %-.20s", keystr); -- PyErr_SetString(PyExc_ValueError, err_str); -- lpx_delete_prob(lp); -- Py_DECREF(param); -- return NULL; -- } -- lpx_set_real_parm(lp, param_id, -- PyFloat_AsDouble(value)); -- } -- } -- lpx_set_int_parm(lp, LPX_K_PRESOL, 1); -- Py_DECREF(param); - -- switch (lpx_simplex(lp)){ -+ switch (glp_simplex(lp,options)){ - -- case LPX_E_OK: -+ case 0: - - x = (matrix *) Matrix_New(n,1,DOUBLE); - z = (matrix *) Matrix_New(m,1,DOUBLE); -@@ -329,65 +465,70 @@ - Py_XDECREF(z); - Py_XDECREF(y); - Py_XDECREF(t); -- lpx_delete_prob(lp); -+ Py_XDECREF(smcpParm); -+ glp_delete_prob(lp); - return PyErr_NoMemory(); - } - -- PyTuple_SET_ITEM(t, 0, (PyObject *) --#if PY_MAJOR_VERSION >= 3 -- PyUnicode_FromString("optimal")); --#else -- PyString_FromString("optimal")); --#endif -+ set_output_string(t,"optimal"); - - for (i=0; i= 3 -- PyUnicode_FromString("primal infeasible")); --#else -- PyString_FromString("primal infeasible")); --#endif -+ case GLP_EBADB: -+ set_output_string(t,"incorrect initial basis"); - break; -- -- case LPX_E_NODFS: -- -- PyTuple_SET_ITEM(t, 0, (PyObject *) --#if PY_MAJOR_VERSION >= 3 -- PyUnicode_FromString("dual infeasible")); --#else -- PyString_FromString("dual infeasible")); --#endif -+ case GLP_ESING: -+ set_output_string(t,"singular initial basis matrix"); -+ break; -+ case GLP_ECOND: -+ set_output_string(t,"ill-conditioned initial basis matrix"); -+ break; -+ case GLP_EBOUND: -+ set_output_string(t,"incorrect bounds"); -+ break; -+ case GLP_EFAIL: -+ set_output_string(t,"solver failure"); -+ break; -+ case GLP_EOBJLL: -+ set_output_string(t,"objective function reached lower limit"); -+ break; -+ case GLP_EOBJUL: -+ set_output_string(t,"objective function reached upper limit"); -+ break; -+ case GLP_EITLIM: -+ set_output_string(t,"iteration limit exceeded"); -+ break; -+ case GLP_ETMLIM: -+ set_output_string(t,"time limit exceeded"); -+ break; -+ case GLP_ENOPFS: -+ set_output_string(t,"primal infeasible"); -+ break; -+ case GLP_ENODFS: -+ set_output_string(t,"dual infeasible"); - break; -- - default: -- -- PyTuple_SET_ITEM(t, 0, (PyObject *) --#if PY_MAJOR_VERSION >= 3 -- PyUnicode_FromString("unknown")); --#else -- PyString_FromString("unknown")); --#endif -+ set_output_string(t,"unknown"); -+ break; - } - -- lpx_delete_prob(lp); -+ Py_XDECREF(smcpParm); -+ glp_delete_prob(lp); - - PyTuple_SET_ITEM(t, 1, Py_BuildValue("")); - PyTuple_SET_ITEM(t, 2, Py_BuildValue("")); -@@ -427,21 +568,28 @@ - { - matrix *c, *h, *b=NULL, *x=NULL; - PyObject *G, *A=NULL, *IntSet=NULL, *BinSet = NULL; -- PyObject *t=NULL, *param, *key, *value; -- LPX *lp; -- int m, n, p, i, j, k, nnz, nnzmax, *rn=NULL, *cn=NULL, param_id; -- int_t pos=0; -+ PyObject *t=NULL; -+ pyiocp *iocpParm = NULL;; -+ glp_iocp *options = NULL; -+ glp_prob *lp; -+ int m, n, p, i, j, k, nnz, nnzmax, *rn=NULL, *cn=NULL; - double *a=NULL, val; -- char param_type, err_str[100]; --#if PY_MAJOR_VERSION >= 3 -- const char *keystr; --#else -- char *keystr; --#endif -- char *kwlist[] = {"c", "G", "h", "A", "b", "I", "B", NULL}; -+ char *kwlist[] = {"c", "G", "h", "A", "b", "I", "B","iocp", NULL}; -+ -+ if (!PyArg_ParseTupleAndKeywords(args, kwrds, "OOO|OOOOO!", kwlist, &c, -+ &G, &h, &A, &b, &IntSet, &BinSet,iocp_t,&iocpParm)) return NULL; - -- if (!PyArg_ParseTupleAndKeywords(args, kwrds, "OOO|OOOO", kwlist, &c, -- &G, &h, &A, &b, &IntSet, &BinSet)) return NULL; -+ if(!iocpParm) -+ { -+ iocpParm = (pyiocp*)malloc(sizeof(*iocpParm)); -+ glp_init_iocp(&(iocpParm->obj)); -+ } -+ if(iocpParm) -+ { -+ Py_INCREF(iocpParm); -+ options = &iocpParm->obj; -+ options->presolve = 1; -+ } - - if ((Matrix_Check(G) && MAT_ID(G) != DOUBLE) || - (SpMatrix_Check(G) && SP_ID(G) != DOUBLE) || -@@ -490,18 +638,18 @@ - if ((BinSet) && (!PyAnySet_Check(BinSet))) - PY_ERR_TYPE("invalid binary index set"); - -- lp = lpx_create_prob(); -- lpx_add_rows(lp, m+p); -- lpx_add_cols(lp, n); -+ lp = glp_create_prob(); -+ glp_add_rows(lp, m+p); -+ glp_add_cols(lp, n); - - for (i=0; i= 3 -- if ((PyUnicode_Check(key)) && (keystr = PyUnicode_AS_DATA(key)) -- && get_param_idx(keystr, ¶m_id, ¶m_type)){ --#else -- if ((keystr = PyString_AsString(key)) && get_param_idx(keystr, -- ¶m_id, ¶m_type)){ --#endif -- if (param_type == 'i'){ --#if PY_MAJOR_VERSION >= 3 -- if (!PyLong_Check(value)){ --#else -- if (!PyInt_Check(value)){ --#endif -- sprintf(err_str, "invalid value for integer " -- "GLPK parameter: %-.20s", keystr); -- PyErr_SetString(PyExc_ValueError, err_str); -- lpx_delete_prob(lp); -- Py_DECREF(param); -- return NULL; -- } -- if (!strcmp("LPX_K_PRESOL", keystr) && --#if PY_MAJOR_VERSION >= 3 -- PyLong_AS_LONG(value) != 1){ --#else -- PyInt_AS_LONG(value) != 1){ --#endif -- PyErr_Warn(PyExc_UserWarning, "ignoring value of " -- "GLPK parameter 'LPX_K_PRESOL'"); -- } -- else --#if PY_MAJOR_VERSION >= 3 -- lpx_set_int_parm(lp, param_id, PyLong_AS_LONG(value)); --#else -- lpx_set_int_parm(lp, param_id, PyInt_AS_LONG(value)); --#endif -- } -- else { --#if PY_MAJOR_VERSION >= 3 -- if (!PyLong_Check(value) && !PyFloat_Check(value)){ --#else -- if (!PyInt_Check(value) && !PyFloat_Check(value)){ --#endif -- sprintf(err_str, "invalid value for floating point " -- "GLPK parameter: %-.20s", keystr); -- PyErr_SetString(PyExc_ValueError, err_str); -- lpx_delete_prob(lp); -- Py_DECREF(param); -- return NULL; -- } -- lpx_set_real_parm(lp, param_id, -- PyFloat_AsDouble(value)); -- } -- } -- lpx_set_int_parm(lp, LPX_K_PRESOL, 1); -- Py_DECREF(param); -- - if (IntSet) { - PyObject *iter = PySequence_Fast(IntSet, "Critical error: not sequence"); - -@@ -633,7 +716,7 @@ - #else - if (!PyInt_Check(tmp)) { - #endif -- lpx_delete_prob(lp); -+ glp_delete_prob(lp); - Py_DECREF(iter); - PY_ERR_TYPE("non-integer element in I"); - } -@@ -643,7 +726,7 @@ - int k = PyInt_AS_LONG(tmp); - #endif - if ((k < 0) || (k >= n)) { -- lpx_delete_prob(lp); -+ glp_delete_prob(lp); - Py_DECREF(iter); - PY_ERR(PyExc_IndexError, "index element out of range in I"); - } -@@ -664,7 +747,7 @@ - #else - if (!PyInt_Check(tmp)) { - #endif -- lpx_delete_prob(lp); -+ glp_delete_prob(lp); - Py_DECREF(iter); - PY_ERR_TYPE("non-binary element in I"); - } -@@ -674,7 +757,7 @@ - int k = PyInt_AS_LONG(tmp); - #endif - if ((k < 0) || (k >= n)) { -- lpx_delete_prob(lp); -+ glp_delete_prob(lp); - Py_DECREF(iter); - PY_ERR(PyExc_IndexError, "index element out of range in B"); - } -@@ -686,114 +769,85 @@ - } - - -+ switch (glp_intopt(lp,options)){ - -- switch (lpx_intopt(lp)){ -+ case 0: - -- case LPX_E_OK: -+ x = (matrix *) Matrix_New(n,1,DOUBLE); -+ if (!x) { -+ Py_XDECREF(iocpParm); -+ Py_XDECREF(t); -+ glp_delete_prob(lp); -+ return PyErr_NoMemory(); -+ } -+ set_output_string(t,"optimal"); -+ set_output_string(t,"optimal"); - -- x = (matrix *) Matrix_New(n,1,DOUBLE); -- if (!x) { -- Py_XDECREF(t); -- lpx_delete_prob(lp); -- return PyErr_NoMemory(); -- } -- PyTuple_SET_ITEM(t, 0, (PyObject *) --#if PY_MAJOR_VERSION >= 3 -- PyUnicode_FromString("optimal")); --#else -- PyString_FromString("optimal")); --#endif -+ for (i=0; i= 3 -- PyUnicode_FromString("time limit exceeded")); --#else -- PyString_FromString("time limit exceeded")); --#endif -+ for (i=0; i= 3 -- PyUnicode_FromString("invalid MIP formulation")); --#else -- PyString_FromString("invalid MIP formulation")); --#endif -- break; -+ case GLP_EBOUND: -+ set_output_string(t,"incorrect bounds"); -+ break; -+ case GLP_EFAIL: -+ set_output_string(t,"invalid MIP formulation"); -+ break; - -- case LPX_E_NOPFS: -- PyTuple_SET_ITEM(t, 0, (PyObject *) --#if PY_MAJOR_VERSION >= 3 -- PyUnicode_FromString("primal infeasible")); --#else -- PyString_FromString("primal infeasible")); --#endif -- break; -+ case GLP_ENOPFS: -+ set_output_string(t,"primal infeasible"); -+ break; - -- case LPX_E_NODFS: -+ case GLP_ENODFS: -+ set_output_string(t,"dual infeasible"); -+ break; - -- PyTuple_SET_ITEM(t, 0, (PyObject *) --#if PY_MAJOR_VERSION >= 3 -- PyUnicode_FromString("dual infeasible")); --#else -- PyString_FromString("dual infeasible")); --#endif -- break; -+ case GLP_EMIPGAP: -+ set_output_string(t,"Relative mip gap tolerance reached"); -+ break; - -- case LPX_E_ITLIM: -+ /*case LPX_E_ITLIM: - -- PyTuple_SET_ITEM(t, 0, (PyObject *) --#if PY_MAJOR_VERSION >= 3 -- PyUnicode_FromString("maxiters exceeded")); --#else -- PyString_FromString("maxiters exceeded")); --#endif -- break; -+ set_output_string(t,"maxiters exceeded"); -+ break;*/ - -- case LPX_E_SING: -+ /*case LPX_E_SING: - -- PyTuple_SET_ITEM(t, 0, (PyObject *) --#if PY_MAJOR_VERSION >= 3 -- PyUnicode_FromString("singular or ill-conditioned basis")); --#else -- PyString_FromString("singular or ill-conditioned basis")); --#endif -- break; -+ set_output_string(t,"singular or ill-conditioned basis"); -+ break;*/ - - -- default: -+ default: - -- PyTuple_SET_ITEM(t, 0, (PyObject *) --#if PY_MAJOR_VERSION >= 3 -- PyUnicode_FromString("unknown")); --#else -- PyString_FromString("unknown")); --#endif -- } -+ set_output_string(t,"unknown"); -+ } - -- lpx_delete_prob(lp); -+ Py_XDECREF(iocpParm); -+ glp_delete_prob(lp); - - PyTuple_SET_ITEM(t, 1, Py_BuildValue("")); - return (PyObject *) t; -@@ -819,10 +873,94 @@ - NULL, NULL, NULL, NULL - }; - -+void addglpkConstants (void) -+{ -+ PyModule_AddIntMacro(glpk_module, GLP_ON); -+ PyModule_AddIntMacro(glpk_module,GLP_OFF); -+ -+ /* reason codes: */ -+ PyModule_AddIntMacro(glpk_module,GLP_IROWGEN); -+ PyModule_AddIntMacro(glpk_module,GLP_IBINGO); -+ PyModule_AddIntMacro(glpk_module,GLP_IHEUR); -+ PyModule_AddIntMacro(glpk_module,GLP_ICUTGEN); -+ PyModule_AddIntMacro(glpk_module,GLP_IBRANCH); -+ PyModule_AddIntMacro(glpk_module,GLP_ISELECT); -+ PyModule_AddIntMacro(glpk_module,GLP_IPREPRO); -+ -+ /* branch selection indicator: */ -+ PyModule_AddIntMacro(glpk_module,GLP_NO_BRNCH); -+ PyModule_AddIntMacro(glpk_module,GLP_DN_BRNCH); -+ PyModule_AddIntMacro(glpk_module,GLP_UP_BRNCH); -+ -+ /* return codes: */ -+ PyModule_AddIntMacro(glpk_module,GLP_EBADB); -+ PyModule_AddIntMacro(glpk_module,GLP_ESING); -+ PyModule_AddIntMacro(glpk_module,GLP_ECOND); -+ PyModule_AddIntMacro(glpk_module,GLP_EBOUND); -+ PyModule_AddIntMacro(glpk_module,GLP_EFAIL); -+ PyModule_AddIntMacro(glpk_module,GLP_EOBJLL); -+ PyModule_AddIntMacro(glpk_module,GLP_EOBJUL); -+ PyModule_AddIntMacro(glpk_module,GLP_EITLIM); -+ PyModule_AddIntMacro(glpk_module,GLP_ETMLIM); -+ PyModule_AddIntMacro(glpk_module,GLP_ENOPFS); -+ PyModule_AddIntMacro(glpk_module,GLP_ENODFS); -+ PyModule_AddIntMacro(glpk_module,GLP_EROOT); -+ PyModule_AddIntMacro(glpk_module,GLP_ESTOP); -+ PyModule_AddIntMacro(glpk_module,GLP_EMIPGAP); -+ PyModule_AddIntMacro(glpk_module,GLP_ENOFEAS); -+ PyModule_AddIntMacro(glpk_module,GLP_ENOCVG); -+ PyModule_AddIntMacro(glpk_module,GLP_EINSTAB); -+ PyModule_AddIntMacro(glpk_module,GLP_EDATA); -+ PyModule_AddIntMacro(glpk_module,GLP_ERANGE); -+ -+ /* condition indicator: */ -+ PyModule_AddIntMacro(glpk_module,GLP_KKT_PE); -+ PyModule_AddIntMacro(glpk_module,GLP_KKT_PB); -+ PyModule_AddIntMacro(glpk_module,GLP_KKT_DE); -+ PyModule_AddIntMacro(glpk_module,GLP_KKT_DB); -+ PyModule_AddIntMacro(glpk_module,GLP_KKT_CS); -+ -+ /* MPS file format: */ -+ PyModule_AddIntMacro(glpk_module,GLP_MPS_DECK); -+ PyModule_AddIntMacro(glpk_module,GLP_MPS_FILE); -+ -+ /* simplex method control parameters */ -+ /* message level: */ -+ PyModule_AddIntMacro(glpk_module,GLP_MSG_OFF); -+ PyModule_AddIntMacro(glpk_module,GLP_MSG_ERR); -+ PyModule_AddIntMacro(glpk_module,GLP_MSG_ON); -+ PyModule_AddIntMacro(glpk_module,GLP_MSG_ALL); -+ PyModule_AddIntMacro(glpk_module,GLP_MSG_DBG); -+ /* simplex method option: */ -+ PyModule_AddIntMacro(glpk_module,GLP_PRIMAL); -+ PyModule_AddIntMacro(glpk_module,GLP_DUALP); -+ PyModule_AddIntMacro(glpk_module,GLP_DUAL); -+ /* pricing technique: */ -+ PyModule_AddIntMacro(glpk_module,GLP_PT_STD); -+ PyModule_AddIntMacro(glpk_module,GLP_PT_PSE); -+ /* ratio test technique: */ -+ PyModule_AddIntMacro(glpk_module,GLP_RT_STD); -+ PyModule_AddIntMacro(glpk_module,GLP_RT_HAR); -+ -+ /* interior-point solver control parameters */ -+ /* ordering algorithm: */ -+ PyModule_AddIntMacro(glpk_module,GLP_ORD_NONE); -+ PyModule_AddIntMacro(glpk_module,GLP_ORD_QMD); -+ PyModule_AddIntMacro(glpk_module,GLP_ORD_AMD); -+ PyModule_AddIntMacro(glpk_module,GLP_ORD_SYMAMD); -+} -+ - PyMODINIT_FUNC PyInit_glpk(void) - { - if (!(glpk_module = PyModule_Create(&glpk_module_def))) return NULL; -- PyModule_AddObject(glpk_module, "options", PyDict_New()); -+ if (PyType_Ready(&iocp_t) < 0 || (PyType_Ready(&smcp_t) < 0)) return NULL; -+ /* Adding macros */ -+ addglpkConstants(); -+ /* Adding option lists as objects */ -+ Py_INCREF(&smcp_t); -+ PyModule_AddObject(glpk_module,"smcp",(PyObject*)&smcp_t); -+ Py_INCREF(&iocp_t); -+ PyModule_AddObject(glpk_module,"iocp",(PyObject*)&iocp_t); - if (import_cvxopt() < 0) return NULL; - return glpk_module; - } -@@ -832,8 +970,13 @@ - PyMODINIT_FUNC initglpk(void) - { - glpk_module = Py_InitModule3("cvxopt.glpk", glpk_functions, -- glpk__doc__); -- PyModule_AddObject(glpk_module, "options", PyDict_New()); -+ glpk__doc__); -+ if (PyType_Ready(&iocp_t) < 0 || (PyType_Ready(&smcp_t) < 0)) return NULL; -+ addglpkConstants(); -+ Py_INCREF(&smcp_t); -+ PyModule_AddObject(glpk_module,"smcp",(PyObject*)&smcp_t); -+ Py_INCREF(&iocp_t); -+ PyModule_AddObject(glpk_module,"iocp",(PyObject*)&iocp_t); - if (import_cvxopt() < 0) return; - } - diff --git a/dev-python/cvxopt/files/cvxopt-1.1.6-setup.patch b/dev-python/cvxopt/files/cvxopt-1.1.6-setup.patch deleted file mode 100644 index c95f31bf6048..000000000000 --- a/dev-python/cvxopt/files/cvxopt-1.1.6-setup.patch +++ /dev/null @@ -1,176 +0,0 @@ ---- setup.py.orig 2013-05-16 21:36:29.616510963 +1200 -+++ setup.py 2013-05-16 21:51:08.456347311 +1200 -@@ -2,7 +2,7 @@ - from glob import glob - - # Modifiy this if BLAS and LAPACK libraries are not in /usr/lib. --BLAS_LIB_DIR = '/usr/lib' -+BLAS_LIB_DIR = '' - - # Default names of BLAS and LAPACK libraries - BLAS_LIB = ['blas'] -@@ -18,37 +18,37 @@ - BUILD_GSL = 0 - - # Directory containing libgsl (used only when BUILD_GSL = 1). --GSL_LIB_DIR = '/usr/lib' -+GSL_LIB_DIR = '' - - # Directory containing the GSL header files (used only when BUILD_GSL = 1). --GSL_INC_DIR = '/usr/include/gsl' -+GSL_INC_DIR = '' - - # Set to 1 if you are installing the fftw module. - BUILD_FFTW = 0 - - # Directory containing libfftw3 (used only when BUILD_FFTW = 1). --FFTW_LIB_DIR = '/usr/lib' -+FFTW_LIB_DIR = '' - - # Directory containing fftw.h (used only when BUILD_FFTW = 1). --FFTW_INC_DIR = '/usr/include' -+FFTW_INC_DIR = '' - - # Set to 1 if you are installing the glpk module. - BUILD_GLPK = 0 - - # Directory containing libglpk (used only when BUILD_GLPK = 1). --GLPK_LIB_DIR = '/usr/lib' -+GLPK_LIB_DIR = '' - - # Directory containing glpk.h (used only when BUILD_GLPK = 1). --GLPK_INC_DIR = '/usr/include' -+GLPK_INC_DIR = '' - - # Set to 1 if you are installing the DSDP module. - BUILD_DSDP = 0 - - # Directory containing libdsdp (used only when BUILD_DSDP = 1). --DSDP_LIB_DIR = '/usr/lib' -+DSDP_LIB_DIR = '' - - # Directory containing dsdp5.h (used only when BUILD_DSDP = 1). --DSDP_INC_DIR = '/usr/include/dsdp' -+DSDP_INC_DIR = '' - - # No modifications should be needed below this line. - -@@ -61,39 +61,32 @@ - # optional modules - - if BUILD_GSL: -- gsl = Extension('gsl', libraries = ['m', 'gsl'] + BLAS_LIB, -- include_dirs = [ GSL_INC_DIR ], -- library_dirs = [ GSL_LIB_DIR, BLAS_LIB_DIR ], -- extra_link_args = BLAS_EXTRA_LINK_ARGS, -+ gsl = Extension('gsl', libraries = ['gsl'], -+ library_dirs = [ GSL_LIB_DIR ], - sources = ['src/C/gsl.c'] ) - extmods += [gsl]; - - if BUILD_FFTW: -- fftw = Extension('fftw', libraries = ['fftw3'] + BLAS_LIB, -- include_dirs = [ FFTW_INC_DIR ], -- library_dirs = [ FFTW_LIB_DIR, BLAS_LIB_DIR ], -- extra_link_args = BLAS_EXTRA_LINK_ARGS, -+ fftw = Extension('fftw', libraries = ['fftw3'], -+ library_dirs = [ FFTW_LIB_DIR ], - sources = ['src/C/fftw.c'] ) - extmods += [fftw]; - - if BUILD_GLPK: - glpk = Extension('glpk', libraries = ['glpk'], -- include_dirs = [ GLPK_INC_DIR ], - library_dirs = [ GLPK_LIB_DIR ], - sources = ['src/C/glpk.c'] ) - extmods += [glpk]; - - if BUILD_DSDP: -- dsdp = Extension('dsdp', libraries = ['dsdp'] + LAPACK_LIB + BLAS_LIB, -- include_dirs = [ DSDP_INC_DIR ], -- library_dirs = [ DSDP_LIB_DIR, BLAS_LIB_DIR ], -- extra_link_args = BLAS_EXTRA_LINK_ARGS, -+ dsdp = Extension('dsdp', libraries = ['dsdp'], -+ library_dirs = [ DSDP_LIB_DIR ], - sources = ['src/C/dsdp.c'] ) - extmods += [dsdp]; - - # Required modules - --base = Extension('base', libraries = ['m'] + LAPACK_LIB + BLAS_LIB, -+base = Extension('base', libraries = ['m'] + LAPACK_LIB, - library_dirs = [ BLAS_LIB_DIR ], - define_macros = MACROS, - extra_link_args = BLAS_EXTRA_LINK_ARGS, -@@ -105,61 +98,36 @@ - extra_link_args = BLAS_EXTRA_LINK_ARGS, - sources = ['src/C/blas.c'] ) - --lapack = Extension('lapack', libraries = LAPACK_LIB + BLAS_LIB, -+lapack = Extension('lapack', libraries = LAPACK_LIB, - library_dirs = [ BLAS_LIB_DIR ], - define_macros = MACROS, - extra_link_args = BLAS_EXTRA_LINK_ARGS, - sources = ['src/C/lapack.c'] ) - - umfpack = Extension('umfpack', -- include_dirs = [ 'src/C/SuiteSparse/UMFPACK/Include', -- 'src/C/SuiteSparse/AMD/Include', -- 'src/C/SuiteSparse/AMD/Source', -- 'src/C/SuiteSparse/SuiteSparse_config' ], - library_dirs = [ BLAS_LIB_DIR ], - define_macros = MACROS + [('NTIMER', '1'), ('NCHOLMOD', '1')], -- libraries = LAPACK_LIB + BLAS_LIB, -+ libraries = [ 'umfpack' ], - extra_compile_args = ['-Wno-unknown-pragmas'], -- extra_link_args = BLAS_EXTRA_LINK_ARGS, -- sources = [ 'src/C/umfpack.c', -- 'src/C/SuiteSparse/UMFPACK/Source/umfpack_global.c', -- 'src/C/SuiteSparse/UMFPACK/Source/umfpack_tictoc.c' ] + -- ['src/C/SuiteSparse/SuiteSparse_config/SuiteSparse_config.c'] + -- glob('src/C/SuiteSparse_cvxopt_extra/umfpack/*')) -+ sources = [ 'src/C/umfpack.c' ]) - - # Build for int or long? - import sys - if sys.maxsize > 2**31: MACROS += [('DLONG',None)] - - cholmod = Extension('cholmod', -- library_dirs = [ BLAS_LIB_DIR ], -- libraries = LAPACK_LIB + BLAS_LIB, -- include_dirs = [ 'src/C/SuiteSparse/CHOLMOD/Include', -- 'src/C/SuiteSparse/COLAMD', -- 'src/C/SuiteSparse/AMD/Include', -- 'src/C/SuiteSparse/COLAMD/Include', -- 'src/C/SuiteSparse/SuiteSparse_config' ], -- define_macros = MACROS + [('NPARTITION', '1'), ('NTIMER', '1')], -- extra_link_args = BLAS_EXTRA_LINK_ARGS, -- sources = [ 'src/C/cholmod.c' ] + -- ['src/C/SuiteSparse/AMD/Source/' + s for s in ['amd_global.c', -- 'amd_postorder.c', 'amd_post_tree.c', 'amd_2.c']] + -- ['src/C/SuiteSparse/COLAMD/Source/' + s for s in ['colamd.c', -- 'colamd_global.c']] + -- ['src/C/SuiteSparse/SuiteSparse_config/SuiteSparse_config.c'] + -- glob('src/C/SuiteSparse/CHOLMOD/Core/c*.c') + -- glob('src/C/SuiteSparse/CHOLMOD/Cholesky/c*.c') + -- ['src/C/SuiteSparse/CHOLMOD/Check/cholmod_check.c'] + -- glob('src/C/SuiteSparse/CHOLMOD/Supernodal/c*.c') ) -+ library_dirs = [ BLAS_LIB_DIR ], -+ libraries = ['cholmod'] + BLAS_LIB, -+ define_macros = MACROS + [('NPARTITION', '1'), ('NTIMER', '1')], -+ sources = [ 'src/C/cholmod.c' ]) - - amd = Extension('amd', -- include_dirs = [ 'src/C/SuiteSparse/AMD/Include', -- 'src/C/SuiteSparse/SuiteSparse_config' ], - define_macros = MACROS, -- sources = [ 'src/C/amd.c' ] + glob('src/C/SuiteSparse/AMD/Source/*.c') ) -+ libraries = ['amd'], -+ sources = [ 'src/C/amd.c' ]) - - misc_solvers = Extension('misc_solvers', -- libraries = LAPACK_LIB + BLAS_LIB, -+ libraries = LAPACK_LIB, - library_dirs = [ BLAS_LIB_DIR ], - define_macros = MACROS, - extra_link_args = BLAS_EXTRA_LINK_ARGS, diff --git a/dev-python/cvxopt/files/cvxopt-1.1.8-setup.patch b/dev-python/cvxopt/files/cvxopt-1.1.8-setup.patch deleted file mode 100644 index 1b53f7535117..000000000000 --- a/dev-python/cvxopt/files/cvxopt-1.1.8-setup.patch +++ /dev/null @@ -1,136 +0,0 @@ - setup.py | 45 +++++++++++++++++++-------------------------- - 1 file changed, 19 insertions(+), 26 deletions(-) - -diff --git a/setup.py b/setup.py -index 031ad53..e5c56af 100644 ---- a/setup.py -+++ b/setup.py -@@ -6,7 +6,7 @@ from glob import glob - import os - - # Modifiy this if BLAS and LAPACK libraries are not in /usr/lib. --BLAS_LIB_DIR = '/usr/lib' -+BLAS_LIB_DIR = '' - - # Default names of BLAS and LAPACK libraries - BLAS_LIB = ['blas'] -@@ -22,37 +22,37 @@ BLAS_NOUNDERSCORES = False - BUILD_GSL = 0 - - # Directory containing libgsl (used only when BUILD_GSL = 1). --GSL_LIB_DIR = '/usr/lib' -+GSL_LIB_DIR = '' - - # Directory containing the GSL header files (used only when BUILD_GSL = 1). --GSL_INC_DIR = '/usr/include/gsl' -+GSL_INC_DIR = '' - - # Set to 1 if you are installing the fftw module. - BUILD_FFTW = 0 - - # Directory containing libfftw3 (used only when BUILD_FFTW = 1). --FFTW_LIB_DIR = '/usr/lib' -+FFTW_LIB_DIR = '' - - # Directory containing fftw.h (used only when BUILD_FFTW = 1). --FFTW_INC_DIR = '/usr/include' -+FFTW_INC_DIR = '' - - # Set to 1 if you are installing the glpk module. - BUILD_GLPK = 0 - - # Directory containing libglpk (used only when BUILD_GLPK = 1). --GLPK_LIB_DIR = '/usr/lib' -+GLPK_LIB_DIR = '' - - # Directory containing glpk.h (used only when BUILD_GLPK = 1). --GLPK_INC_DIR = '/usr/include' -+GLPK_INC_DIR = '' - - # Set to 1 if you are installing the DSDP module. - BUILD_DSDP = 0 - - # Directory containing libdsdp (used only when BUILD_DSDP = 1). --DSDP_LIB_DIR = '/usr/lib' -+DSDP_LIB_DIR = '' - - # Directory containing dsdp5.h (used only when BUILD_DSDP = 1). --DSDP_INC_DIR = '/usr/include/dsdp' -+DSDP_INC_DIR = '' - - # Set to 1 to use external SuiteSparse library - SUITESPARSE_EXT_LIB = 0 -@@ -98,39 +98,32 @@ if BLAS_NOUNDERSCORES: MACROS.append(('BLAS_NO_UNDERSCORE','')) - # optional modules - - if BUILD_GSL: -- gsl = Extension('gsl', libraries = ['m', 'gsl'] + BLAS_LIB, -- include_dirs = [ GSL_INC_DIR ], -- library_dirs = [ GSL_LIB_DIR, BLAS_LIB_DIR ], -- extra_link_args = BLAS_EXTRA_LINK_ARGS, -+ gsl = Extension('gsl', libraries = ['gsl'], -+ library_dirs = [ GSL_LIB_DIR ], - sources = ['src/C/gsl.c'] ) - extmods += [gsl]; - - if BUILD_FFTW: -- fftw = Extension('fftw', libraries = ['fftw3'] + BLAS_LIB, -- include_dirs = [ FFTW_INC_DIR ], -- library_dirs = [ FFTW_LIB_DIR, BLAS_LIB_DIR ], -- extra_link_args = BLAS_EXTRA_LINK_ARGS, -+ fftw = Extension('fftw', libraries = ['fftw3'], -+ library_dirs = [ FFTW_LIB_DIR ], - sources = ['src/C/fftw.c'] ) - extmods += [fftw]; - - if BUILD_GLPK: - glpk = Extension('glpk', libraries = ['glpk'], -- include_dirs = [ GLPK_INC_DIR ], - library_dirs = [ GLPK_LIB_DIR ], - sources = ['src/C/glpk.c'] ) - extmods += [glpk]; - - if BUILD_DSDP: -- dsdp = Extension('dsdp', libraries = ['dsdp'] + LAPACK_LIB + BLAS_LIB, -- include_dirs = [ DSDP_INC_DIR ], -- library_dirs = [ DSDP_LIB_DIR, BLAS_LIB_DIR ], -- extra_link_args = BLAS_EXTRA_LINK_ARGS, -+ dsdp = Extension('dsdp', libraries = ['dsdp'] + LAPACK_LIB, -+ library_dirs = [ DSDP_LIB_DIR ], - sources = ['src/C/dsdp.c'] ) - extmods += [dsdp]; - - # Required modules - --base = Extension('base', libraries = ['m'] + LAPACK_LIB + BLAS_LIB, -+base = Extension('base', libraries = ['m'] + LAPACK_LIB, - library_dirs = [ BLAS_LIB_DIR ], - define_macros = MACROS, - extra_link_args = BLAS_EXTRA_LINK_ARGS, -@@ -142,7 +135,7 @@ blas = Extension('blas', libraries = BLAS_LIB, - extra_link_args = BLAS_EXTRA_LINK_ARGS, - sources = ['src/C/blas.c'] ) - --lapack = Extension('lapack', libraries = LAPACK_LIB + BLAS_LIB, -+lapack = Extension('lapack', libraries = LAPACK_LIB, - library_dirs = [ BLAS_LIB_DIR ], - define_macros = MACROS, - extra_link_args = BLAS_EXTRA_LINK_ARGS, -@@ -177,7 +170,7 @@ if sys.maxsize > 2**31: MACROS += [('DLONG',None)] - - if SUITESPARSE_EXT_LIB: - cholmod = Extension('cholmod', -- libraries = ['amd','colamd','suitesparseconfig','cholmod'], -+ libraries = ['amd','colamd','suitesparseconfig','cholmod'] + LAPACK_LIB, - include_dirs = [SUITESPARSE_INC_DIR], - library_dirs = [SUITESPARSE_LIB_DIR], - sources = [ 'src/C/cholmod.c' ]) -@@ -218,7 +211,7 @@ else: - glob('src/C/SuiteSparse/AMD/Source/*.c') ) - - misc_solvers = Extension('misc_solvers', -- libraries = LAPACK_LIB + BLAS_LIB, -+ libraries = ['m'] + LAPACK_LIB, - library_dirs = [ BLAS_LIB_DIR ], - define_macros = MACROS, - extra_link_args = BLAS_EXTRA_LINK_ARGS, diff --git a/dev-python/defusedxml/Manifest b/dev-python/defusedxml/Manifest index 5676a37112a4..8e058a013dfc 100644 --- a/dev-python/defusedxml/Manifest +++ b/dev-python/defusedxml/Manifest @@ -1,5 +1,5 @@ DIST defusedxml-0.4.1.tar.gz 48889 BLAKE2B 4b4225c126a4d8997e7a78a5257991da4a767b3ca8b0ffa7e1414a1342995c02a389271579329990b786f71919f17a81f093a2e4f14d10a50f88563ae4acb6e5 SHA512 78a7a1f3d1eed9d7cda00afaaccf8153c7f616303c53d3918341d75970d532932b04effcfc8b1b8ed88ba6d730cb56400e9e4ecee8aa7d2181c7577f1d535783 DIST defusedxml-0.5.0.tar.gz 60405 BLAKE2B bd57b3b705abff71ff99ce4e43fe4c1fd708463546cc5d614dceb56f36e98771ef5c952a1aae010d32e4b557ed687c194c61723a0b3334dc1b0d517591d7c3d3 SHA512 71e1a604df9be41ded454bcdfa63610e897eb405295d7365fcddfc5f50f7572c36f0bd91a4a1fdf47d1b097637bd9fdcf08f1cdb73e2fe64eea0320a7532e452 EBUILD defusedxml-0.4.1-r1.ebuild 634 BLAKE2B bfa607f44a3a403141d6c1edec56c4c0f8274bbed35f1f7d4b92eb900eb2769e2ea5d3b84beb9556feed9023ebf4d7f89dec1040e7d6f0fb92dba1adbd007796 SHA512 c9fe185beac58bccab22be9c73c8a3afc5dfb74572092e89b6947faa16eff6780e304ad83cf885eac9dd4c5f1c31b14112b55590b608d5e1c0a7caf789cbf892 -EBUILD defusedxml-0.5.0.ebuild 705 BLAKE2B da0d98d2f7ea0b2a84c7e0ee9920215585df0e42fdceb417caee9867573609bbce124f43b6d248ff4fc1cbb0335e5b6eb907743b08ff0beb729341e07ce8a3ef SHA512 0832146ac79021494e8f706390a4a6e679e0ee0434a5aa3c8477a479eccc14f6eef4fb979ac84c0002c3dfb45b6cc64f8020cfd908d29e750b6461359c38f823 +EBUILD defusedxml-0.5.0.ebuild 704 BLAKE2B 6da573ff37c9c79f847bc4db34ca574efbe3d455b56cb2645332a16fe60da4ea7d41c7adeabd98a72bec5d31600250ad739b7a303230e049a087af24418164e9 SHA512 33537a6a14afd0c544220bbfd81245912a0156b276f181d544b63ddc83317feef724a0e0dacbca71d4ed226b877eea1ace8703b0b0d07e9699504d54c6f76ee7 MISC metadata.xml 384 BLAKE2B 27ce5f8830ff4e0646f95d633cbaeb85576ec01fea3bb46d7b54d2be2acd6f154ccfe8455169d61014bce03e5434eb449c2876c53a77f64bf083559985531de7 SHA512 377bdeac0f80c45f6f6f3387182e75c47e8cd526f563a1ce5305119113b4a1c4a99dc3a76bc91d81a967498645c9a23dc2746b62023dd0dc26e8d55d15424b6c diff --git a/dev-python/defusedxml/defusedxml-0.5.0.ebuild b/dev-python/defusedxml/defusedxml-0.5.0.ebuild index f4669e0c9e7c..ef0a86519e59 100644 --- a/dev-python/defusedxml/defusedxml-0.5.0.ebuild +++ b/dev-python/defusedxml/defusedxml-0.5.0.ebuild @@ -11,7 +11,7 @@ inherit distutils-r1 DESCRIPTION="XML bomb protection for Python stdlib modules, an xml serialiser" HOMEPAGE="https://bitbucket.org/tiran/defusedxml" SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" -KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86" +KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86" IUSE="examples" LICENSE="PSF-2" diff --git a/dev-python/lazy-object-proxy/Manifest b/dev-python/lazy-object-proxy/Manifest index f0e3bc669239..0248d7f50964 100644 --- a/dev-python/lazy-object-proxy/Manifest +++ b/dev-python/lazy-object-proxy/Manifest @@ -1,3 +1,5 @@ DIST lazy-object-proxy-1.2.1.tar.gz 28860 SHA256 22ed751a2c63c6cf718674fd7461b1dfc45215bab4751ca32b6c9b8cb2734cb3 SHA512 60813fea51e14ccfa22974c547c7179593da25e4ba65380c39493d2b91558bfcdffa298fe0a043170414d897bd72fd22f0bc3bc3fbdc8202873fab6c2a8e45a8 WHIRLPOOL 3e6bad5e09407d2ff750ce2d1078aa65156d61224c8f04b90a535235cc4c12d2683844dc43eef1a18805b395eb8d47508cb11dfde4f9cec08907657cf73613c1 -EBUILD lazy-object-proxy-1.2.1.ebuild 974 BLAKE2B 1959fb919078a5f834ccb9d31c75a5b70169bfb60bf8033c12c1febd7e0e67a877596e6c01ddc2b5d2edcf81829f047a8cb58b3762a64ac2696049bf0d054ef0 SHA512 b45dda99003d2da063dc617dd9ece75a56e7dc4bf7e0be30bb71c3026ae777835387a3d427802dff5f9227814336974217a2200208f8f0ed8c34c5538baabeab +DIST lazy-object-proxy-1.3.1.tar.gz 32237 BLAKE2B 3052c6952d80365c6698f50c5f4508d7448a68b33ca899d251477e9a728fa740a0bd1d3a85f5ccab63905fbd062e5c37da59a827ca58e25268e7ced6fd9a961c SHA512 9ea4fa0185431859ff79fd6dc59106c2b64e372b5052d034b3638e362695f10b27b59f57c5aed73bb2350d3963f98190e3069f9129b9f3f4932212f9b5460962 +EBUILD lazy-object-proxy-1.2.1.ebuild 975 BLAKE2B 244526fcb91eb4b406fb88789ec4330e0e2cf03f7ca1fb991da284827e709e49cebedb0cfd1605df2a70bf5b47a66234a04edc55531da8329a0aab7670d70370 SHA512 ea371aa4ccee67ea2edd437e8f932ac538f55c4ef77bcba8d34bf362f16295465c853342943e5b281dadb9c62a38f4009bb913f6137f248e447289f56f5cbbe6 +EBUILD lazy-object-proxy-1.3.1.ebuild 983 BLAKE2B eef9a4350bf9fe1d9875921eebe5390cc226d98b670c69354ce6062108f28228030847af2c76783541c8f1c922d78ceb32181f0514254d0638e32c0d03ae5c25 SHA512 670e2a6bec451777c793c26b64db1fb5d7cad6861c44be941e9725fd48458ab67e5ed066281403acb8fba09985feb43d482da5b75a9eae34f846a71c0e419a90 MISC metadata.xml 539 BLAKE2B 7f76da60b882c2832b84e774d3db85b1349d7e7190ac629c9f1cd99abaf6aa94e55ebb5867f75fbc948b03cf32121c4312a32a9435c2f037866af855130076d8 SHA512 7e5fa1513ed6a00183c3722f53b25062e35a3128dce6fd4e0d40fc10dcce8157eb902654b2f7606184378f81972f9bafc6e1ba578581ecf6d8e1b3ec09e1f473 diff --git a/dev-python/lazy-object-proxy/lazy-object-proxy-1.2.1.ebuild b/dev-python/lazy-object-proxy/lazy-object-proxy-1.2.1.ebuild index 3b78058b30c5..7a1526883914 100644 --- a/dev-python/lazy-object-proxy/lazy-object-proxy-1.2.1.ebuild +++ b/dev-python/lazy-object-proxy/lazy-object-proxy-1.2.1.ebuild @@ -10,7 +10,7 @@ inherit distutils-r1 DESCRIPTION="A fast and thorough lazy object proxy" HOMEPAGE=" https://github.com/ionelmc/python-lazy-object-proxy - http://pypi.python.org/pypi/lazy-object-proxy + https://pypi.python.org/pypi/lazy-object-proxy https://python-lazy-object-proxy.readthedocs.org/" SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" diff --git a/dev-python/lazy-object-proxy/lazy-object-proxy-1.3.1.ebuild b/dev-python/lazy-object-proxy/lazy-object-proxy-1.3.1.ebuild new file mode 100644 index 000000000000..b96994cca333 --- /dev/null +++ b/dev-python/lazy-object-proxy/lazy-object-proxy-1.3.1.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy ) + +inherit distutils-r1 + +DESCRIPTION="A fast and thorough lazy object proxy" +HOMEPAGE=" + https://github.com/ionelmc/python-lazy-object-proxy + https://pypi.python.org/pypi/lazy-object-proxy + https://python-lazy-object-proxy.readthedocs.org/" +SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="test" + +RDEPEND="" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + dev-python/pytest[${PYTHON_USEDEP}] + )" + +python_prepare_all() { + # No need to benchmark + sed \ + -e '/benchmark/s:test_:_&:g' \ + -e '/pytest.mark.benchmark/d' \ + -i tests/test_lazy_object_proxy.py || die + distutils-r1_python_prepare_all +} + +python_test() { + py.test -v -v --ignore=src || die "Fails for ${EPYTHON}" +} diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest index 37243065dfbc..637e8a9368ac 100644 --- a/dev-python/libvirt-python/Manifest +++ b/dev-python/libvirt-python/Manifest @@ -1,6 +1,6 @@ +DIST libvirt-python-3.10.0.tar.gz 184402 BLAKE2B f3ae1626dc6fe2afc2eb7754f6872a6696389bc13a3e8f557c6487e83e3ef66104251910fb4841a2f8b1667cec0418b87ad5a7e9ababf76a39a0f4adaec23bc4 SHA512 bbab01d43b1d9e682c5590c1ea1454c8891f2c545b49f48220f4e79ec4b5b01ab1736242a96653256e26fdf644389c4021747117978a9ec4e1084001de9f23f9 DIST libvirt-python-3.8.0.tar.gz 184346 SHA256 5fcba9ca645b01a8d970da84f7f95d54b0e8e915739d06b5e6d86ae626ea570b SHA512 40fcc67bf793b298016171751f207d65d98c8fe3e04d72bf4a815aab3c2f91a624fde1e0f1a420a67f4cf330874d7dd91ae46c3118e75067030ee551957a8178 WHIRLPOOL 15d815b5f6086e0ffc0f2688aef517c8a62fb89dfb123b6ce3b63a6190b885ef918e16e42fb9dd4d4f2178cf16777be6fc8aeba8d0115d8b3cac3f3a32f8cab4 -DIST libvirt-python-3.9.0.tar.gz 184365 SHA256 d721c812e002eb784a4b66fbe698dc70e8f42c9b7cc3a96f5b01e83ee7951850 SHA512 fe30d308fb81e08600adbac4ec80e28c24d012ee578686506e5615f22b716067795a76b3c37c4a951ca53d9d6642d2b43636924b2d256480dc24eb660a0225a4 WHIRLPOOL 8ecaad10aa557ffecaf22b6ec1eae2698cec7c126765c20ce3033ba5cb8569ab2b737a48e5532f254d65e5fce1f055f02ff5662ae28718118edbddedda784210 +EBUILD libvirt-python-3.10.0.ebuild 964 BLAKE2B 71ac33288178ce6dce1440f94dd11dc67e8a98aa567af9b230a62bc2936f49525a6893ff007366fdae962d106f7b4403b9f555a7134708be2d4d4b7982121f5d SHA512 5067c0583c8f3042ed13b6afb53d9aacca76305650223d318b5d82013b22bf0320069ac26efee4713376d01a75b9e2b797588d2bb5696b3815a74218c651072b EBUILD libvirt-python-3.8.0.ebuild 971 BLAKE2B a39cfbaf5c4d4f07ca0c0ad31963119305c21bb03588672716ee6c382ee501c45593ea0942364d7980efade1e2ac4f12badef737e02988ba566637fdce0ffaac SHA512 be12b7ea11f13b9ca7554d4c577cb82aec98008781868a8ab0f4a7d6632d48f47bc89b4702c349dd7d968a00fb647b515eb4606af35c21a5d1be6f839d25f648 -EBUILD libvirt-python-3.9.0.ebuild 964 BLAKE2B 71ac33288178ce6dce1440f94dd11dc67e8a98aa567af9b230a62bc2936f49525a6893ff007366fdae962d106f7b4403b9f555a7134708be2d4d4b7982121f5d SHA512 5067c0583c8f3042ed13b6afb53d9aacca76305650223d318b5d82013b22bf0320069ac26efee4713376d01a75b9e2b797588d2bb5696b3815a74218c651072b EBUILD libvirt-python-9999.ebuild 965 BLAKE2B 4a1ddf017be6ce4999a1c15edbfe3361e2561ada9845cd5b82e3174a7c2ec3b16de29f6e0bd572fbb251bf06ede220e3b4e1e6496e3d2e49e7bac3d1b4c4c193 SHA512 031a6875c7685b942cc444faa1a175cf44ac2700de9611920eeef03ba771c87be449b4dbdb71fbad7348cf69ba3c475516d41bed874b7f672b14b7c7d56a0156 MISC metadata.xml 518 BLAKE2B ac9993d622790a5cec52f737de0494b7ac6a5a6e17e66ccad8e4862257ba8926d688fa4b6e68cd96ea5a4f2d35825204219fd79bc5917d05a6f39787f80bc1df SHA512 243b815c70c65046d672bc2b4a05d67f61c6e70dc6677ef7e8b76783979d801793f8d864a33ed9c64072c4fa30786d4455c82c82fa37933dac0b0efac2264083 diff --git a/dev-python/libvirt-python/libvirt-python-3.10.0.ebuild b/dev-python/libvirt-python/libvirt-python-3.10.0.ebuild new file mode 100644 index 000000000000..c16440985c37 --- /dev/null +++ b/dev-python/libvirt-python/libvirt-python-3.10.0.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python{2_7,3_4,3_5} ) + +MY_P="${P/_rc/-rc}" + +inherit distutils-r1 + +if [[ ${PV} = *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="git://libvirt.org/libvirt-python.git" + SRC_URI="" + KEYWORDS="" + RDEPEND="app-emulation/libvirt:=[-python(-)]" +else + SRC_URI="http://libvirt.org/sources/python/${MY_P}.tar.gz" + KEYWORDS="~amd64 ~arm64 ~x86" + RDEPEND="app-emulation/libvirt:0/${PV}" +fi +S="${WORKDIR}/${P%_rc*}" + +DESCRIPTION="libvirt Python bindings" +HOMEPAGE="https://www.libvirt.org" +LICENSE="LGPL-2" +SLOT="0" +IUSE="examples test" + +DEPEND="${RDEPEND} + virtual/pkgconfig + test? ( dev-python/lxml[${PYTHON_USEDEP}] + dev-python/nose[${PYTHON_USEDEP}] )" + +python_test() { + esetup.py test +} + +python_install_all() { + if use examples; then + dodoc -r examples + docompress -x /usr/share/doc/${PF}/examples + fi + distutils-r1_python_install_all +} diff --git a/dev-python/libvirt-python/libvirt-python-3.9.0.ebuild b/dev-python/libvirt-python/libvirt-python-3.9.0.ebuild deleted file mode 100644 index c16440985c37..000000000000 --- a/dev-python/libvirt-python/libvirt-python-3.9.0.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) - -MY_P="${P/_rc/-rc}" - -inherit distutils-r1 - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="git://libvirt.org/libvirt-python.git" - SRC_URI="" - KEYWORDS="" - RDEPEND="app-emulation/libvirt:=[-python(-)]" -else - SRC_URI="http://libvirt.org/sources/python/${MY_P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~x86" - RDEPEND="app-emulation/libvirt:0/${PV}" -fi -S="${WORKDIR}/${P%_rc*}" - -DESCRIPTION="libvirt Python bindings" -HOMEPAGE="https://www.libvirt.org" -LICENSE="LGPL-2" -SLOT="0" -IUSE="examples test" - -DEPEND="${RDEPEND} - virtual/pkgconfig - test? ( dev-python/lxml[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] )" - -python_test() { - esetup.py test -} - -python_install_all() { - if use examples; then - dodoc -r examples - docompress -x /usr/share/doc/${PF}/examples - fi - distutils-r1_python_install_all -} diff --git a/dev-python/markdown/Manifest b/dev-python/markdown/Manifest index 63830f60058c..4e15d54b436f 100644 --- a/dev-python/markdown/Manifest +++ b/dev-python/markdown/Manifest @@ -4,5 +4,5 @@ DIST Markdown-2.6.5.tar.gz 301781 BLAKE2B 527a84bc8c4a891e64749bce273bf10c439376 DIST Markdown-2.6.8.tar.gz 307330 BLAKE2B 6867f15425bd84bc030ab52000dc2f83bff0c9885854cec4a2a785f80b18129160bc57da30226fe17f42043b4938482e2e4eff9cdb3d4370b0146cc09f1ff576 SHA512 85c1a16ebb50af79f378eb2fa936342df6174a4f597a74fee6d0495ef2bc4c7c8337463799e427cb6788b3429e400309958b5c4784f536593047ab2e47ac7c23 EBUILD markdown-2.6.1.ebuild 1262 BLAKE2B 00d62a618cca711ddeb1979dd00c5d486382d16c46d213d23fd8e9f764e75294bc4a04667dd16ecfdf25aa7a7adccbada7adb8623e7a7ebf6b8aaeacacef4bbf SHA512 ddaac99dd6fc3f2dcf1f2cfd14d8401058fe729fea31bc82f949cfe168fca6d093634b98eef3868f80bdb7a5386e2b6b1e87eccab17f969c60dcf365398ac41a EBUILD markdown-2.6.5.ebuild 1413 BLAKE2B a58769e42e854c1904f23b3a6dc72465d330c453a3f40737df17e29e98c3d7478352c106d02a97d400ae95e8c70cf8be34b6591f79a9665d3ec36cc9a9172c31 SHA512 0447c35221a7aaa7ea6a2d9f82a6114811f6c468bd6d6d09e3faf788b696c69ae39253e1293b2a1b44d6a72a53b2e203d8280780706b37258980094c0570d3ca -EBUILD markdown-2.6.8.ebuild 1454 BLAKE2B b4661f0594179ebdaf3111853cf05b9677d6f7b5076c3e3f71f9102854b3e7c1a726e9f3aeffc813f7c27963ce61f2a98131f37cdd6a368149ace6899500b42e SHA512 f9da0aa4780f1ed3ff90855209c85baebe89a6f8726e6de5216fe40562dc19d411e3c144f2e319e0140c2c8ce2ff88ab988ad90bc3e8a413166bfba40f3f5409 +EBUILD markdown-2.6.8.ebuild 1453 BLAKE2B f462dbd5584fd0847506d6f1d05bc88ed83d85a1ad9ef70f6e161c885dc9458bd7510ee83a211c2f83e0ae48b619ebd6f5e00aac2bb2281c3f60c792e5603d30 SHA512 0942d87c8d3c263ff03a245cc0fbe8d83607fd2254f8269cc1359f715bbfbad481191fd1dd8a3b25d63fcee1f920d8c2f9f6708860b91443b7e44d795559f417 MISC metadata.xml 465 BLAKE2B 8eadaf9d2733b1b3d93a389b0009652eecc3a0c3b6347ada4f27d99bd69b0de1be199eb1da7854655b8814a946f40a711e8fc092b22b214c18dc696dd3c0222a SHA512 4c9a52b62e49040fde94cc2d3d9edf88c42d085639d893fb81d119b8c216100f912e2725a1bbb31b1136b505ef8102f560989289da5aadc6c8f433f0186da44c diff --git a/dev-python/markdown/markdown-2.6.8.ebuild b/dev-python/markdown/markdown-2.6.8.ebuild index 8730c07cfabc..f207fda4bd1d 100644 --- a/dev-python/markdown/markdown-2.6.8.ebuild +++ b/dev-python/markdown/markdown-2.6.8.ebuild @@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/M/${PN^}/${P^}.tar.gz" LICENSE="|| ( BSD GPL-2 )" SLOT="0" -KEYWORDS="alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="doc test pygments" DEPEND=" diff --git a/dev-python/namespace-paste/Manifest b/dev-python/namespace-paste/Manifest index 2daee07d3b7c..0a89398d2a54 100644 --- a/dev-python/namespace-paste/Manifest +++ b/dev-python/namespace-paste/Manifest @@ -1,2 +1,2 @@ -EBUILD namespace-paste-1.ebuild 812 BLAKE2B ebc0b7c3fb76789b916bfd672d9bd074fc6d99eff1444c1a033bbe7688993ab5a39dc1e250cf630c8712073b6f66614de6e9349f7e75a081212d8150db79ac14 SHA512 d786c0289090e0683de33f333630ce30fcca55d0ed4afc21eaed10a8d1ce01b704700dcbe8abc11afe799c14936e8aebdbfbbceac4bd805704a14b4b83b447e4 +EBUILD namespace-paste-1.ebuild 811 BLAKE2B 8001d057561e506802834b29c6620638203772cf79ca4382b5e88f94f5f4683e377e7b90fa3c1c468b12ac7eda906885ab242d47249c38dbe2e7209d78034047 SHA512 c4ca372354ff8015253d5a4ee2da332f66a3d59c38b1ce647c56f51f9f9e3dda44bc2aaf68c67fdedeee5e9020776eb1a0a2e8383e161890e5d861c25b26c2a0 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781 diff --git a/dev-python/namespace-paste/namespace-paste-1.ebuild b/dev-python/namespace-paste/namespace-paste-1.ebuild index a0103b102dc0..7fc9d2d1715a 100644 --- a/dev-python/namespace-paste/namespace-paste-1.ebuild +++ b/dev-python/namespace-paste/namespace-paste-1.ebuild @@ -12,7 +12,7 @@ SRC_URI="" LICENSE="public-domain" SLOT="0" -KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" IUSE="" RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}] diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest index 213671f66a93..44925f35669c 100644 --- a/dev-python/numpy/Manifest +++ b/dev-python/numpy/Manifest @@ -3,12 +3,12 @@ AUX numpy-1.11.2-blas_rec_inc_dir.patch 958 BLAKE2B ee47f60c4b10af7cc36be22e5d8f AUX numpy-1.12.1-no-hardcode-blas.patch 3473 BLAKE2B 442b505aa6a09aece4e3e48c43fffcbb35e129f99097233d7387ea41bf3926ed72be4666025d4c4bbac7a5e9e557e54cc0c439d748cbbbff6ca075e7a1969c56 SHA512 0066fdc822151b13a4f91cab522000ab43bea52539100070949d08e0baf6bd35e9c32e13e877e22c40041c3fa0e8d716d802087b3c9016d6c1e05edd0e48fd6a AUX numpy-1.8.0-no-hardcode-blas.patch 1153 BLAKE2B d812ddc3069d23f211026c14ca36aa907c254b5e5305e720bc87bb5fbd51dd032f93eecd245c222ae8fa81dbe1541a2ffb1524e685a05f238758b4487e3532b9 SHA512 baa29a0c981ede608d890e776026961fb71156eb7804f702623bce775e3b6ce3bb28ced252d9c6fe991429b690b3eef8468d703f79247820527648d6484d23f3 AUX numpy-1.9.2-no-hardcode-blas.patch 1821 BLAKE2B bba698b76576a29c24f69a5aaf92173065d11d2e01ae8e76a66650484f18761b62cb49d348e97a62350cf74d9c728f2d26e94b903b62c59c903e7022c31fefc5 SHA512 59d498f7b0a1e6f4bc37e0eb7121812e1fe974e06176c7b80e99e41c49067a618bc98d925bcb667607462f5e7823f0f55235c8ddd685e318dfb3385b7eb7dad6 -DIST numpy-1.10.4.tar.gz 4069996 SHA256 7356e98fbcc529e8d540666f5a919912752e569150e9a4f8d869c686f14c720b SHA512 57ace46e357d49be0efd904e5ceb9862c626c916987c8798a12de7ae1e06816ad8483439ac4619792a04889631b5998f2397dc601c78dea33a784b4831c19c79 WHIRLPOOL 76946c2543b1cade06d71f83fd507bd818c1090baa9c3ddda7d1f48d48ed23672c5d9de76db890df990c6d8b7b26b71d3ce733c448943ad4177374a957360d1c +DIST numpy-1.10.4.tar.gz 4069996 BLAKE2B 9f315d1fca4415b148d4b3bff6f223930bab3d0cb9e19fc5790d71218549c9f0031355e8a95eae9c866ceaf6391a3aa41206bf3f48477b6cabbbc52e0287c246 SHA512 57ace46e357d49be0efd904e5ceb9862c626c916987c8798a12de7ae1e06816ad8483439ac4619792a04889631b5998f2397dc601c78dea33a784b4831c19c79 DIST numpy-1.12.1.zip 4824784 SHA256 a65266a4ad6ec8936a1bc85ce51f8600634a31a258b722c9274a80ff189d9542 SHA512 156319821e4f0cf8d820e977da704aab274b7a4a4b792f6e40d7c0f2827700c990f55f1ca9650523c62c9e937f0e75f336d091d46ca47aaa9875c68fe32bac2a WHIRLPOOL 1ecd1df77d2a64bc6db1910446f60b477ebf5a1cf33ec2e1fced56dbbf1a7df5fef004c7f84f0dccb0ca20ea7ab73c384e4d247eb9700159a18c9a4a51e4db6d -DIST numpy-1.13.1.zip 5012881 SHA256 c9b0283776085cb2804efff73e9955ca279ba4edafd58d3ead70b61d209c4fbb SHA512 bfa97ca4f958b04c158a4bcaa366ec2645c972654bd65fb20c287806f40fb7a04b8cc1f1cefb350d477488a93029d75a9f06d01c300cfb1805dd10819a631c43 WHIRLPOOL 9553d157f297c2bf385f16290f7596913d59ba30077a82ff7fa2969f87ea9ba57f88d38cec42aa9a81c4a15096ac0aeb4c409f42fa4b714a9cb45ee904c1bdf0 +DIST numpy-1.13.1.zip 5012881 BLAKE2B 865f5423ff0c20dac531cdeb3adbbba760632aba4f0183f4b44ae93fd6bd12c8bf78abec3fb47969b45f86b72c928330142d8897e201adb7236b2c6f76ba0089 SHA512 bfa97ca4f958b04c158a4bcaa366ec2645c972654bd65fb20c287806f40fb7a04b8cc1f1cefb350d477488a93029d75a9f06d01c300cfb1805dd10819a631c43 DIST numpy-1.13.3.zip 5021189 SHA256 36ee86d5adbabc4fa2643a073f93d5504bdfed37a149a3a49f4dde259f35a750 SHA512 b77969372c8463879b452dc54830afabb719e6814a2bb1ee0062b463155ac709d1cd48839b28b74aacaee8aced7ee35870ba43d59293ff54f90bc0f717ca7737 WHIRLPOOL 8655c99a09ce73d8cd1621dd759c7658d04e2e20a41b79b0bc61ab75fdca1b77964f7dce12ebf065d92c4977845c32089f6e0761b843dd7eb28cb108776c4aa3 DIST numpy-1.8.2.tar.gz 3792998 SHA256 6d487fc724780d66746bde264ea71f5cd77d3a39e52ee2b073dcaed63bc669db SHA512 996e6b8e2d42f223e44660f56bf73eb8ab124f400d89218f8f5e4d7c9860ada44a4d7c54526137b0695c7a10f36e8834fbf0d42b7cb20bcdb5d5c245d673385c WHIRLPOOL 0d3a05b1e3c0a1ceb0a7b4818406dbb45506e5f25bc2727d4ff44cc0a0520e6556b3c68ae24dbca37ba9d67ae2defbb3ff9c906d4c2635b29ed44452d70e8311 -DIST numpy-1.9.2.tar.gz 3986067 SHA256 325e5f2b0b434ecb6e6882c7e1034cc6cdde3eeeea87dbc482575199a6aeef2a SHA512 70470ebb9afef5dfd0c83ceb7a9d5f1b7a072b1a9b54b04f04f5ed50fbaedd5b4906bd500472268d478f94df9e749a88698b1ff30f2d80258e7f3fec040617d9 WHIRLPOOL 59f5dc52cb95c7ce80fec3a7feac6cfda1d149596bf6d95c18bd8314e31a8df494b2b470c4cc3d8c296c9fc11c718d70d5b9b5344337175ca75496504c0fd201 +DIST numpy-1.9.2.tar.gz 3986067 BLAKE2B e5ae6717badac01186a5b0f36729c1c01dda1fb4238978858c778f08f17512c5d1f3902d551cb0c67a77c1246ce238e588556188e7e6466c27ebdde09879782d SHA512 70470ebb9afef5dfd0c83ceb7a9d5f1b7a072b1a9b54b04f04f5ed50fbaedd5b4906bd500472268d478f94df9e749a88698b1ff30f2d80258e7f3fec040617d9 DIST numpy-html-1.10.1.zip 9663942 SHA256 4af48eb5abf2551f01d85aea7e9a99a30096777f02937dc185b16bb72a110366 SHA512 9d1f3619b801c88604a0495290da4ae8cfb4800257d549214363c554c1dc09a736425d594ed88f492afee6ae7c68fe5c166b9b3a8f24637ea41d67fd23b9d9f9 WHIRLPOOL d6c93e31e31c832fb21f117d03719e0375ee3d27fb6f7975bfcd12469df4a2ed0a25a16bd09a0e2113407446efc220e5bff534f7cd76a715c3d7df26c02f07a1 DIST numpy-html-1.11.0.zip 9879611 SHA256 0244bff4b585ab417be963f492e69129e54bb83d630b463591f9e89c62807d85 SHA512 7bf416030c273c767a98d0f23adef0e5fd05f96f6bb911e32ec88821a5bc7c47a2799d33fb0706cb2d391ea6e47b3e0eef0d789eb1c0d81c982cfaa991a09822 WHIRLPOOL d7e81340aa1ec46c2b0d36b76e7a1e11ba7d1b39177a8168efe734936e1622808c8997a8cc22f773b9c3e17b51f5861e11eaf7fa89e9b0c61cae937ee7b5fdba DIST numpy-html-1.13.0.zip 10324817 SHA256 514f1eba1cfa04a34de79a20da6ca6883dc6e74ac19ecf237d2e4f957899542d SHA512 2dd769ec0d4967ba1797339170b0f9bf694a0a304cffb8482a037ba043a3bd3a9207e63a1ffed2d7ae96205d3a1a72fa1b15eeac4bd2e565544363dd9742f542 WHIRLPOOL 1151179991147698c5bb63d7a4fd9b6389d9251d915a67c54676edc0fbb14c1e9d7ffc69287527127e00c1ee2ca1af9a4a5c48d36608a951861222b49bc92e2a @@ -24,7 +24,7 @@ DIST numpy-user-1.11.0.pdf 555403 SHA256 7ea6d24169d9e19d20ff131378d2bb5cd8b4165 DIST numpy-user-1.13.0.pdf 580593 SHA256 9bba988452f0e58c257833df80658509ccb85af5d946c55b19ffb16367f1704f SHA512 d3891d449b72c2d97af28182e0bcb12559abc114f8dbf0e0c68362c1af50e6aeab565b31b4aa44ab079e8d47f550081a79a4066c37fc52a1c70c05be45eb5c11 WHIRLPOOL ee8ebcf94ee49f892bcfcb4caec2b5fb0fe34ac47fcab9b3944f61522588a4ecf98a38c235a522cb06699e6ae5185150ba65cb7be96838cae7f88543a4447ea1 DIST numpy-user-1.8.1.pdf 408305 SHA256 be827f2d92ef86c3af7f59c623017e7bc23ee95c64f88e8c9871f3ad1f99b262 SHA512 9e646e89e7e67834fa596e43082b43842d1c59287d22fd8d20c9f0a1d3d56a518a08cc2c036de4972ad0d6d9d3c2f56e2210f76e7244d3f7547b5204d84d3c7c WHIRLPOOL bf4105093b208b35b1914e842821b8d289b46eb28f1fda110643f5970bbfafe801e9d148c5f535b43eba9a23e09d333e3aecd9a55b33e64827883d253477d19a DIST numpy-user-1.9.1.pdf 418111 SHA256 e1f6baed0b73f3d4b106c88924c083f9a519e860c1beb718830bf1aee1892232 SHA512 724302468a8e93daf70d379bb1ee7369953e297c40ea260f080b7aca3c9c81e619a81705bdfb2ea214da5b5325ec2b48e953eceeaa1d60c07593b00c35989f45 WHIRLPOOL f93ed20c5da7b379e3afcafab97c7eb60231ed4f73cebf18184e00b9a8a5a531fa32992f7f28f16d2714b3056c61153c29267c8c6b93cb100e06f53bced1bd6a -EBUILD numpy-1.10.4.ebuild 4071 BLAKE2B 31a27c82ce08956f76f9560661e1606cf3ab58ccb04fb1ed4be413b6fafaac4e21b78c4360ddd6a5560af5fb23a6c7fa406f23ecd370268b72b5ae4ced5789ed SHA512 28e2eb0295bf441e968da89cba927fcebeebe8def30cbef8fba2e0f6c1b653249f26abdaf3d6796cb933e2604efc56fcf532164088a73a4e057f6ae072dedad8 +EBUILD numpy-1.10.4.ebuild 4070 BLAKE2B 67a91881682dfd8e6b80c5c18b1e53c25bf742907857a755c9f671506601b9d1ba8ce96f62b0582f465cd4f442a34258c25877922e1828e613fd9eb36872a7b9 SHA512 fa27a99853a99fe5568ed5a000c5ef2894792aa6b927b4df20698178603dc187633973a6a72d97d10e04128e5722f5665efbfa8be56aebceed8a438b9049485e EBUILD numpy-1.12.1.ebuild 4611 BLAKE2B 35048fdf92ff976be5809f9c6000f0513116e11449828d16767a50fed354e4e49ffe7b475b898fe97b93408a413c081169feab0c5c9bd232376f799c1a6b0c19 SHA512 13ce9b1985f951c8a658b5f43d1abb294b2e20182df5c9e60212a93b625d014aeef875de5d1101e46198cfee7bac4b987485b642f8c152f79989168b5fbe36ec EBUILD numpy-1.13.1.ebuild 4621 BLAKE2B 2889f3b8969c4dd2e72ce7bb51973a89cd17636f055c17f8adeababdecf132cafe788715a54bc117ca0140d48c04bea46fd2ed8394cfd6fc75c83071cc9ea5cb SHA512 2a14957f44d34569efe69ffbdb2c6ec688080fce67c2423da9e4670648f67b6f7b9f9f01f5639d5a82f0c39e8d13af8f83aba89ca31446c57758faabfde81c02 EBUILD numpy-1.13.3.ebuild 4621 BLAKE2B 2889f3b8969c4dd2e72ce7bb51973a89cd17636f055c17f8adeababdecf132cafe788715a54bc117ca0140d48c04bea46fd2ed8394cfd6fc75c83071cc9ea5cb SHA512 2a14957f44d34569efe69ffbdb2c6ec688080fce67c2423da9e4670648f67b6f7b9f9f01f5639d5a82f0c39e8d13af8f83aba89ca31446c57758faabfde81c02 diff --git a/dev-python/numpy/numpy-1.10.4.ebuild b/dev-python/numpy/numpy-1.10.4.ebuild index dac126b3caf9..a9b753959a5e 100644 --- a/dev-python/numpy/numpy-1.10.4.ebuild +++ b/dev-python/numpy/numpy-1.10.4.ebuild @@ -24,7 +24,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz # It appears the docs haven't been upgraded, still @ 1.8.1 LICENSE="BSD" SLOT="0" -KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="doc lapack test" RDEPEND=" diff --git a/dev-python/parse-type/Manifest b/dev-python/parse-type/Manifest index b35318e8aae9..da648105c91d 100644 --- a/dev-python/parse-type/Manifest +++ b/dev-python/parse-type/Manifest @@ -1,5 +1,4 @@ AUX parse-type-0.3.4-python-3.5-tests-compat.patch 1382 BLAKE2B 0e2f122df1f8db5647cfcb30940b12d8c93c2e75309121314954eb8e78f7ac63a2bec50b065310bbb655072cb08d3aeb6546fdb5426b83e9141389b4e6f39b7a SHA512 95f66bbd323f5ca621db2803dcc118c392503188dd4569bee3418be85b644dabc0b15a48a83a66f218466e0764eba409abbe8574b3c7340589428de90a6a0acf DIST parse_type-0.3.4.tar.gz 62199 SHA256 3dd0b323bafcb8c25e000ce5589042a1c99cba9c3bec77b9f591e46bc9606147 SHA512 5ef80ed820cc7e2f4fa8fd0fbf64160c81f77b4a1af38015e3ec7e3be3f613ecc2211d5dba15ef600cbe11c556a2c1fb6cdc8374c52c608914aa903fad84267f WHIRLPOOL 236c047e7cbbb22bdde0424bc446404141694492cf4b0c7bb63f99f6fc8c7fa2a02b4a97e4c6b3d957a2d2a2156b3a514e9614761011f20ca4414a363c551e56 EBUILD parse-type-0.3.4-r1.ebuild 942 BLAKE2B 3e7d1c64b0dc7e28fcc28a6fd265d6a1879b0532938e2b0564e8a9c0cd7ac50bb52202bf0235ecf752e8e7e0fa461201d1cad1a3a096ef096aa9a08a9706fe37 SHA512 3cd0459bc8ee64bdb028f63b987164fb6419cbc11c70316854187b99f9dcd9b562d441bc988014660aaae2a03563dd0fc71ab0d96d28dc2d6b0d5e047abe9d10 -EBUILD parse-type-0.3.4.ebuild 864 BLAKE2B e3fd0aff136e2c18e7385f33dc42aa5d20825b4d521e3251d9b310f6a00ddc168fe546255a90aa4baa9f9f72694069b8e13c8252e39f61195324e9685a1c20da SHA512 50699964cfa963049677baabd0bf8a5b65618eea5998192196e2ba8edf53f4d58235c8ff16bbabe1074d7f0572f3425e09c0a07bff18f4acadc24f9e3a199f9f MISC metadata.xml 377 BLAKE2B 887edb2530c1f60a88834becf74c612d37230cb0135caf35d2eaee5a4fc6ac84a048e72eaf3d650b6a750b167e95f4a70cabd6dfe06d0aefecbf3a2684fbf905 SHA512 81adc20b95f5f0772eb5abce5e56087926982a87c994d3d8306c1833828fa4d943c471a5e4a32203dab62dff59b170986e79686321e83c9ae3ab32a79c2f44a5 diff --git a/dev-python/parse-type/parse-type-0.3.4.ebuild b/dev-python/parse-type/parse-type-0.3.4.ebuild deleted file mode 100644 index aa50d715f039..000000000000 --- a/dev-python/parse-type/parse-type-0.3.4.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -PYTHON_COMPAT=( python2_7 python3_4 ) - -inherit distutils-r1 - -DESCRIPTION="Simplifies to build parse types based on the parse module" -HOMEPAGE="https://github.com/jenisys/parse_type" - -MY_PN="${PN/-/_}" -MY_P="${MY_PN}-${PV}" -SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz" - -S="${WORKDIR}/${MY_P}" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64" -IUSE="test" - -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/pytest-runner[${PYTHON_USEDEP}] - ) -" -RDEPEND=" - >=dev-python/parse-1.6[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2*' 'python3_3') -" - -python_test() { - py.test tests || "Tests failed under ${EPYTHON}" -} diff --git a/dev-python/pastedeploy/Manifest b/dev-python/pastedeploy/Manifest index f13a471f6f5b..a0643be2b906 100644 --- a/dev-python/pastedeploy/Manifest +++ b/dev-python/pastedeploy/Manifest @@ -1,6 +1,6 @@ AUX pastedeploy-1.5.2-py3-tests.patch 606 BLAKE2B 8f7d5a9f8c517e14a1ecdcbfa040977ab9d3c8e7a072eef3c31d50ac74c02b377ea25fa965d36a89f3c9e0fbfed63364447cfe5525468766df976445d9cebe9c SHA512 0301653864071de976bae24a945ba6d8499aaf21d41c5117ad922254055ee8a3b975cdadc6590677cd458a233ad115647a01a05d52feb0dd40d16bcf4de8f5cc DIST PasteDeploy-1.5.2.tar.gz 24006 SHA256 d5858f89a255e6294e63ed46b73613c56e3b9a2d82a42f1df4d06c8421a9e3cb SHA512 03147b2e735f4504b928066d35f46e7d19a49b85afc506b793fba69c8827a4d5b8185074bdd4a963ac392cc104f5a608d1db9a3538d7d3239da5febcbff4ccab WHIRLPOOL 0a48c72278c71376f8b4ddc708c1b6c3370b13f66fc3d438d1a485e69d413814ca37cf580d8e09e0d49a8a35f7e6e0104744440a3fe6b1dfeb5914d3a0557793 DIST pastedeploy-1.5.2-r1.tar.gz 29528 SHA256 041a5d524ceb45b5677e0d7e0d94d01c14dc8bca51d35266497532299d9fa7f0 SHA512 5d9f648d4bddb4fa0b018f5e1c100d0899ff9e6a429a0a54aede69800fa13b7bb0d606ff454c516b36c3b056320bbda4581de9d57a154e71493a8bd6208fb3ce WHIRLPOOL a5938beecf0845e31a97f292fdc4ee49bf6bfd23a349a857c19269355e6f2c1b79cfb5b31ebdc7e29494054b94170cfb511530c054e070eebbf373cfee954bf4 -EBUILD pastedeploy-1.5.2-r1.ebuild 1060 BLAKE2B d5eea46b4cf16bccc772ea77df8b72e257277254887d61c2998ca947c9e371ddcffb545915cf95006738f4ff5249c1f8af41c57cbd8bfcd25b708d65b9dfb2db SHA512 4134b510de0a5e4789173cff37fffb90dea3d0cf9b91bb50f54c77a714463865a50bbce673df67daa62d1e67bc61c915bc3db9e7bc0adbcaa03037cae992bbfe +EBUILD pastedeploy-1.5.2-r1.ebuild 1059 BLAKE2B b13690f6764fbdf1fa8283683f5a9be9e0b4bee7025100875d9152565839d7ca5db5e8d474a2fdd3691cf331270404ff25c73482778c4800e1ac6c42e626c178 SHA512 5a41b52d04f6f4f04007c9e14be7e51898579eeb0d8d5da040aeb970ceb031e1d94bfe279229a3cc4eb5ba1b09df1f65e2f622fc2a1d19fd0ee33fc55c3ff4b6 EBUILD pastedeploy-1.5.2.ebuild 756 BLAKE2B b3120edf4162540cad0940cc076b7edbfe426bbc383d6ca62510aa9b354fd1789c0280b94d56fbe4e81f90edf062daa98b513fdcead777e464fa8b8e9ffe5c38 SHA512 d8dfb64442a57535b875302f9e0d7d95a81353c7cc3909c92160842648c08a27e3cb4ddbb62ed4dc3454d30033f9d4c537e6884e0cc7f3fa2c25ade913d51032 MISC metadata.xml 806 BLAKE2B f945ec7a43dac81abc59fa63d078872fe4bbd9bf3945ca0f03b4d78bb2511bbe137ef8d01424c5c54a55b73f22778dbd9efa009ab64ef41a20d55bd71bb15e99 SHA512 da770a4fe1f5918391fa4861dab525dcee34d5aeb362a464307c6c8b32edb4731effd22339056f01d77eea8d3729d3ca57572d1d95ebab8b786cad9029250f7d diff --git a/dev-python/pastedeploy/pastedeploy-1.5.2-r1.ebuild b/dev-python/pastedeploy/pastedeploy-1.5.2-r1.ebuild index 35d062b44501..4bfe800fc67d 100644 --- a/dev-python/pastedeploy/pastedeploy-1.5.2-r1.ebuild +++ b/dev-python/pastedeploy/pastedeploy-1.5.2-r1.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://bitbucket.org/ianb/pastedeploy/get/${PV}.tar.gz -> ${P}-r1.tar. LICENSE="MIT" SLOT="0" -KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" IUSE="doc test" RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}] diff --git a/dev-python/piexif/Manifest b/dev-python/piexif/Manifest index d2afe1cc57c2..e1e2cb5f252c 100644 --- a/dev-python/piexif/Manifest +++ b/dev-python/piexif/Manifest @@ -1,3 +1,5 @@ -DIST piexif-1.0.12.zip 1005725 SHA256 312e01e2113d0885088cf43704d8c7337fdb0144789a59b05ebaf7b24e6ebb95 SHA512 71de13b30d041c2de2136e9299bea96a0446352815de5358863324743aac6a5e187800214edd209dd212108ce9a0b0b4602aee54dd54f8b058228b255b543c63 WHIRLPOOL 6adc52a4551e55b70338fbba6c350864353bdaa55a10f225d3fde086f5232c4a9725a94db04695fd87b46662a91dba253aa3ccfa342b700a2e2974c0792affcb +DIST piexif-1.0.12.zip 1005725 BLAKE2B ff370dfea7b2e3b0013c484c586a294ed3b1590f9248104927974b4f7d2b82435da8fb0d8345ac23bd724606e0cefc2594ba9fa49c58d0f4f00219c1a4ed6cce SHA512 71de13b30d041c2de2136e9299bea96a0446352815de5358863324743aac6a5e187800214edd209dd212108ce9a0b0b4602aee54dd54f8b058228b255b543c63 +DIST piexif-1.0.13.zip 1008345 BLAKE2B f2f1ba520d661bf3f50de41b81ceebdaff8db2d83f76d4202771438d78c30beabf118f5732a5e76a6484fbf2bd850b461a9d1a0b675f12995dd7f3c8bb32e6cf SHA512 4234783a639e777b58eb0b4591a272d7d5e8c116a7a242cf36287e64d15089478c88327a16b4fa75786fc3621a6bf647f6a075fab0708e2d0aed6395f95b92cb EBUILD piexif-1.0.12.ebuild 567 BLAKE2B 8b131b6cbafd054b3bc0f77cdac2ac03de3c2099e6745feeac6903513b071300da8ebce4ce63786bdba1eca3a4754c0cac42cce8041c599f87b1271dccf5ef55 SHA512 79c318b9d1233d26fd2c75622578ba04e21e654e522f4dbb2ba2200c9879aeb60f03f1e567a77754ef16bc0f2d7d22b3fec87315d7828e41753e7c5b3e529e27 +EBUILD piexif-1.0.13.ebuild 568 BLAKE2B b3e0de5de2fed2f7f04acd6501eb5baf28834c4e9d7f206208bea4441c26383e938bf508f2d9e84bafadf3ad1413dd29b5cf9c1c16c72ca63e0c33d162bb6cae SHA512 6ff435eae9e93bac82c0924df7112b441b4951f26b8f923624989afdff978ca11ca1e1d2fbe6fcc86444b9fac28455c25641606b89dcf10e94ac17a10bc85f2d MISC metadata.xml 216 BLAKE2B a7f17874d9514cafd0bbab739d143a00ac66ad8446bce8e05932d122c1631d29ad8077c2bcda021bc92b7e89b77c03d55e8997cf250f3bb55f8a1aca046bb2a7 SHA512 1de1c9f4b223876125a0321126f2d7b1b564a113d24ae86b380c4d67bdf58ed4f2ae1a1f5d686211ccf4851eea8e970c20109977abbc79d0cd855164b6474e23 diff --git a/dev-python/piexif/piexif-1.0.13.ebuild b/dev-python/piexif/piexif-1.0.13.ebuild new file mode 100644 index 000000000000..1f3c4871b820 --- /dev/null +++ b/dev-python/piexif/piexif-1.0.13.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6}} ) + +inherit distutils-r1 + +DESCRIPTION="Exif manipulation with pure Python" +HOMEPAGE="https://github.com/hMatoba/Piexif + https://pypi.python.org/pypi/piexif" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" + +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] + app-arch/unzip + test? ( dev-python/pillow )" + +python_test() { + "${PYTHON}" setup.py test +} diff --git a/dev-python/pocketlint/Manifest b/dev-python/pocketlint/Manifest index 41269d10d4c5..8742fef582ab 100644 --- a/dev-python/pocketlint/Manifest +++ b/dev-python/pocketlint/Manifest @@ -1,3 +1,3 @@ DIST pocketlint-0.15.tar.gz 22334 SHA256 f2e98e64316a38b56100d2427ca8f9c7ff168b1b08016dc6c10e8a35574ed10d SHA512 0d3e3061635c8d88f4e31aa11f3cbb85a1d9acd3064c17b7bd3c50eb90f824f17a903c55bace8033bdecd626d792ffee091b8b5719b2993f475a4321f033c66b WHIRLPOOL 3aa30bbf687c372adcdeef5c98a50232ab20e916fb7f9ea70d5f56fee840b30245a802c84145ce19549ad1ecbc133bfad31455d673ad7da2a15d990dec025e26 -EBUILD pocketlint-0.15.ebuild 439 BLAKE2B bfd5512b3e734298636ae84d88d66a2112b05e3701e2cfa54b3f268f67b2fb210141c28611b0502b4bacf260f14b440750d1fc706e9ccfd8479ca82516ceedbb SHA512 05dca28c415db46e527180963c1f6d8a6d85410c353dc748413dc3c565e5ecae272ecca63a544408cf9c533035be2a134e6f421e16c62e650fcacf5058f075f0 +EBUILD pocketlint-0.15.ebuild 438 BLAKE2B 6ada1b19ee90df9fdca4da5bdcd915bb3b09f4efe7f2c474527218fe4035eb1fade80e6d687a0a4356792b669249f890d6a647c708f51b159e3aeeff7d995b61 SHA512 9fd249d89af3ec929bb2156d01861bc887576053579e79302d90e3bccec621e78ba7d2df192a45b45571b13c1b46b4d91f3f0ce34d77fe10f13d99aecb0256e8 MISC metadata.xml 348 BLAKE2B 832ec69373391ee6c884d446b58ccfb07de61b7519b34be09e3e592ea061c0cf0a10203a5c69bd05e2400366891fc9c74a7b1d74f4a7f268839aeaeb5781602b SHA512 925fd532aab036f7bb18011abfdf98daae08e648aa8b64853d721396dedc431254f54ae2168e5572e2e1f101c6e5ffde2b08a26e423407d84e0e849bd7d4d38e diff --git a/dev-python/pocketlint/pocketlint-0.15.ebuild b/dev-python/pocketlint/pocketlint-0.15.ebuild index 703506549789..a0f7d74be8fa 100644 --- a/dev-python/pocketlint/pocketlint-0.15.ebuild +++ b/dev-python/pocketlint/pocketlint-0.15.ebuild @@ -13,5 +13,5 @@ SRC_URI="https://github.com/rhinstaller/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 x86" +KEYWORDS="amd64 x86" IUSE="" diff --git a/dev-python/pyClamd/Manifest b/dev-python/pyClamd/Manifest index ceae8ca5fea5..e7acd05d8cdd 100644 --- a/dev-python/pyClamd/Manifest +++ b/dev-python/pyClamd/Manifest @@ -1,5 +1,5 @@ -DIST pyClamd-0.3.10.tar.gz 8929 SHA256 ed77743c32298b151c881cc52a211e188bd24203ae402f2640def858c6a2bca7 SHA512 2c895fbc5897646ad5c23445062fb2e34a2db070471afd8356796f5f458d90b0da824af58b8ba762ce49572acaee6981881169eb33231085dac82ff0169fa2c8 WHIRLPOOL fa9ba64ab721169373572e552450fcee96db0499a9eeb336763ed2ea9e6f24328aece3b46a2c04ba2a6706f8d6a047ea0ef96f1fe53a6ae4663be0980d9e9c43 -DIST pyClamd-0.3.17.tar.gz 10737 SHA256 9921a582c45baa34dabb357c548c5ed331b9a39334881b3a784b593680b07ba0 SHA512 52eda3f5b6612d47b803e6df8a49890167805dc39a30004f979dcd828b2717ebf7fe753ad0305ab3aad00aaaf750e9e862d43a504ccdb8f7df6faceae18da4a8 WHIRLPOOL 4e3f729f30ea65e0f57131087063405efe57b4b54b081cdb84eb9ccdfd77457f2ddb02d47e2ee79a68179eea27cfabfa3d700dd398f0dd21b4aa4663cbe051c4 -EBUILD pyClamd-0.3.10.ebuild 554 BLAKE2B 6e85b701c72edddc1bbcc1551a88cecf923e9e06f45fea3ded2e09ea563a460f3dfbb203d02968f13e41f734fd4733d083614bdd324876561d53a9720fcf8347 SHA512 34b3fe735b507a2cd98715a1cbfe6460c7863edfa9ee23a2ffd86dc638fc5d1dd05cdd3fe251a5f1bdeafec53c58732a8f5d294f2dfaa45d5433c272200ef8d8 -EBUILD pyClamd-0.3.17.ebuild 554 BLAKE2B 6e85b701c72edddc1bbcc1551a88cecf923e9e06f45fea3ded2e09ea563a460f3dfbb203d02968f13e41f734fd4733d083614bdd324876561d53a9720fcf8347 SHA512 34b3fe735b507a2cd98715a1cbfe6460c7863edfa9ee23a2ffd86dc638fc5d1dd05cdd3fe251a5f1bdeafec53c58732a8f5d294f2dfaa45d5433c272200ef8d8 +DIST pyClamd-0.3.17.tar.gz 10737 BLAKE2B a190809b8f652fdff6c55c73a9431fa509219b9a8d8728ac63844ab1d88e9169df8eeef96892695a8c8a60c48c7fbf938d347603676a186746c4be202b37ef34 SHA512 52eda3f5b6612d47b803e6df8a49890167805dc39a30004f979dcd828b2717ebf7fe753ad0305ab3aad00aaaf750e9e862d43a504ccdb8f7df6faceae18da4a8 +DIST pyClamd-0.4.0.tar.gz 11177 BLAKE2B cb69c9e1fec936d416a18658a2c3e9df4dc4684cf56c19e8a02ad9929b4c86d9985395c38a8f88f7053f81fe08fa3574c6a206bcc519a9494c2a61caf6b995b1 SHA512 b96e26729e0fe2600572534c0fa22a01238761589f1771e72a054dde9c1b8f122493c83ca04cffda167f7a0e44fbf309bdf76b8fe1de499ec50d56c677923bd4 +EBUILD pyClamd-0.3.17.ebuild 558 BLAKE2B 3e4b59a25bd1932d3c163f353e93f3cfbbb37e3cdf4f44771cdaf0f97805781a500ceaecc74493aff1888eb14e7ef9d53517c3c24dd1d5fba74d97c2a0a243c5 SHA512 316427c660345aaf72eb2325fa964a09b9d632e6eeed255d78e47991bdca7896e80d6cd09268b59f022a32608bc712816085284399d5f5f66e110dfd9a0286b9 +EBUILD pyClamd-0.4.0.ebuild 566 BLAKE2B d5786d52d9b190f93459d4303fa0424fed181a44a94c9683821f56fb5373609b4288b3c4af8f83fdaeb17767ae9691203a31a397ed1d9c2d4117ae848199a1c2 SHA512 403cab6997cd13fb1f8ad18cbc52587601d0afb759eb4cc6c8fc0dda83c9e0e222257b37976005e08c0603d912079213aed715e307159cf0725099d858681cd5 MISC metadata.xml 323 BLAKE2B 58103aaf74f241ee493b79225d841b88792d770a484885fa5eba23b8d07d5039d92d1691b2c8914964ec11a055d7ea5150a9b6f2685b9008f6ed7a3f62e638d1 SHA512 d415502fcadfae02999e34a1eb5d526e1e344ee55182ea0790556432df8a63dea1f71a0ebbe47575eafa205dd287e1d2d032de58f87cca6d1fde56154762dc61 diff --git a/dev-python/pyClamd/pyClamd-0.3.10.ebuild b/dev-python/pyClamd/pyClamd-0.3.10.ebuild deleted file mode 100644 index dda9b5d02ea5..000000000000 --- a/dev-python/pyClamd/pyClamd-0.3.10.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) - -inherit distutils-r1 - -DESCRIPTION="python interface to Clamd (Clamav daemon)" -HOMEPAGE="http://xael.org/norman/python/pyclamd/" -SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -RDEPEND="${DEPEND}" - -src_prepare() { - sed -e 's:/etc/clamav/clamd.conf:/etc/clamd.conf:' \ - -i pyclamd/pyclamd.py || die -} diff --git a/dev-python/pyClamd/pyClamd-0.3.17.ebuild b/dev-python/pyClamd/pyClamd-0.3.17.ebuild index dda9b5d02ea5..52f551de1eb6 100644 --- a/dev-python/pyClamd/pyClamd-0.3.17.ebuild +++ b/dev-python/pyClamd/pyClamd-0.3.17.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) inherit distutils-r1 diff --git a/dev-python/pyClamd/pyClamd-0.4.0.ebuild b/dev-python/pyClamd/pyClamd-0.4.0.ebuild new file mode 100644 index 000000000000..9f78b67269f2 --- /dev/null +++ b/dev-python/pyClamd/pyClamd-0.4.0.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) + +inherit distutils-r1 + +DESCRIPTION="python interface to Clamd (Clamav daemon)" +HOMEPAGE="http://xael.org/pages/pyclamd-en.html" +SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz" + +LICENSE="LGPL-3" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" +RDEPEND="${DEPEND}" + +src_prepare() { + default + sed -e 's:/etc/clamav/clamd.conf:/etc/clamd.conf:' \ + -i pyclamd/pyclamd.py || die +} diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest index 637fbbaadd75..469c34719f4e 100644 --- a/dev-python/pygame/Manifest +++ b/dev-python/pygame/Manifest @@ -1,6 +1,6 @@ AUX pygame-1.9.2_pre20120101-import-bdist.patch 1609 BLAKE2B 976556f860aa1d9be39a1cc56b0a771850aa6afad4acbf45103ac50f69da3b63f365eb3a3d94402c33233a45fd9adf74bec87e7c40c5e5c58f0b982b9a7d62a5 SHA512 d40d0141ac44d8081e51ec94c72123b7f59b8328569d5d590b8c54c3b33b1088e8ecbf56f80c2ba11a01c735421e5836d3f06b390da564f03448a6482d2fd319 -DIST pygame-1.9.2_pre20120101.tar.xz 2263028 SHA256 86d386a84a29387e98f6650edbd7fffe5b800115b69e6b15b2588c13eae56335 SHA512 1e82cf720da28d4e4213f6b7a029ab4c9dd592c3155f3d11da8272a7d81d28c54f93402383fa5fa4a4e8863dfc039062838d0317cfedde30a4455e52ce680576 WHIRLPOOL 437555ba4816e42bb745ad5ce13b7f164d5a1ff467cd7193327856b98047eeb56c1d1043c2cc75c6a0ca71ea96240df75b1dc544122034c7e4628c544f8d9486 +DIST pygame-1.9.2_pre20120101.tar.xz 2263028 BLAKE2B 401b7cdc32cfc6b960e8a686236d0a310d840b4a41211b602f6fe137f80f3bb358daa5e25758c4e152ab41e50c3864c183a0b6f36176e3dec12db80449e126e1 SHA512 1e82cf720da28d4e4213f6b7a029ab4c9dd592c3155f3d11da8272a7d81d28c54f93402383fa5fa4a4e8863dfc039062838d0317cfedde30a4455e52ce680576 DIST pygame-1.9.3.tar.gz 2974541 SHA256 751021819bdc0cbe5cbd51904abb6ff9e9aee5b0e8955af02284d0e77d6c9ec2 SHA512 8920c598a97b4ff8602391517f070b67263bacb6330e13ea5d7d5432ee592a7c984fe986837b90a032da3d4e717f9df0cc99f0fb39f1cbde1b4f6a4c132feffe WHIRLPOOL 639de0f3fff185c09a145f0aab569358f92a8aca5e549e7f05005717ac081ab6f4d5c8ecd98d93030a2e0dc344913cec86093e9df9d3fe38043372c325c5bb96 EBUILD pygame-1.9.2_pre20120101-r2.ebuild 1922 BLAKE2B 600b82e63db88de273532e01263651cb11b5cae28b9f159504e8d85fb88e197ce41971cc706224eaedc0b231ff3842d8398439c3d556f0addfa86043e2fa0c5b SHA512 41d06f4e001be51355894948abc96a525920302dff2edd63a6371f9bb0631feb79beaa339c8a06c926f3f0da83dc725a3a2a47463aaf476a7ef9551154a170f3 -EBUILD pygame-1.9.3.ebuild 1774 BLAKE2B fdfb8982b99bde4466dd4b0117ade3275aa8f906e10f3d3e274c121b0ffa336073a5bf8b7639cb01cca640c7c5fd111bec13485e140f120028a036674024395d SHA512 66e7dbf0de62162af47364d4eb5af194d09db14e5b59699790606821d446d886c7a02f4835680ef33c9378c4df9d6c2786ac8977924467ab35ce2e36613d7e3c +EBUILD pygame-1.9.3.ebuild 1781 BLAKE2B b217eb3d2d39d9f82a6482344bc8e61655bff9124c5a0be229b50c432b02981856704e76eefe79c65b63dd5e2d47d9ba1493f0bd944dfa9d1d464bf989b73c51 SHA512 07bc3acb11e4d91a4581a3b9684769180bf3ceb5d1656a2401ef878d7807e062b86ff210e4b8bd3318e2da3672ac2c82607c4b6a9c2476a1a7ad00f60ea9a335 MISC metadata.xml 408 BLAKE2B ae371ef164069765d0964da714a83c9898ddc190ac295c5ad5bbb6a3c45db5aa415d84ff21dbaa510e5c9852397e6b6b389684c54b67d83d675afd9b3d9a697e SHA512 a6e06c0bed59d5157166577a2dafa53f28a310c56f251bec36af077a79342c6f954fa63a3fa8d3546ca03cc9358e75eeb1ef04c6e0371e43e0b7bff51ffe35dd diff --git a/dev-python/pygame/pygame-1.9.3.ebuild b/dev-python/pygame/pygame-1.9.3.ebuild index 2cc7b3c5055b..ceab1f93675a 100644 --- a/dev-python/pygame/pygame-1.9.3.ebuild +++ b/dev-python/pygame/pygame-1.9.3.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86" IUSE="doc examples midi X" DEPEND="dev-python/numpy[${PYTHON_USEDEP}] diff --git a/dev-python/pyglet/Manifest b/dev-python/pyglet/Manifest index 6199c3bf34cb..d2edab3b5a45 100644 --- a/dev-python/pyglet/Manifest +++ b/dev-python/pyglet/Manifest @@ -1,5 +1,5 @@ DIST pyglet-1.1.4.tar.gz 2946835 BLAKE2B e6dacb162b0fc16440edaec8340ea2d99f59db85e3cacb9fc52aa406eafa595a78c91ec0c1d30091928d9a6090163d799dc75aa5d570017aa010b8a48f2e1d91 SHA512 e1acd2e145bddbed2da1e8d66222b7057ecfcc97f93f4972741e87ec8584a944e2cc0c972aa985cb1f51e0dd2e4bbf1332201e8eb66f29945cfdac1b9ac63b64 DIST pyglet-1.2.4.tar.gz 2122017 BLAKE2B 6e5e24ec78e24b9a9c8e9627791ede93d740c1af7af0176c6f75409c76981fa16752bbe14c9b5ec871438f5468b3587e7ce12194241d94ab3731d46cbbe395f1 SHA512 70cd781936db8c8c156499e524ee73520bc90c19461074264abd62a4854307ef090af5faba521686f247fb4cbee552a428892f59a5b382429acfc000f4c2e22d EBUILD pyglet-1.1.4-r2.ebuild 760 BLAKE2B 281cd44370ee0b5d8808c32c94d679e660ed86962efdf2969ac5525a47dfc006de5ab73c4200c1559d40f85c53a2104f30dc0b712821fc06b02909b1fdacdef6 SHA512 3c2f9f55d6e0fed6b19fb804487cb2a4f0d33e3d9174333b2bab5405b2b9e145e1fee6fff59f350241f2ad3c7c9879d99da85c76d12cee21e7bca8228a7dcdfb -EBUILD pyglet-1.2.4.ebuild 985 BLAKE2B c6369cca35efe851bc175c1122340ef29535d5358c2224632c882567b0ebfe6aa1d059de7b9f47ea72b810ef96f0aedf4e05feec8a88c7c03f04e347902c8cd5 SHA512 b6c2267d1b9c83dca92aa7b20a631756ccbda51e9ac79dda8de98ba2f9e2db923d54ccf8e063e61222c0f90232f31c4b3583427a45b9b367fa7f41eee7b93341 +EBUILD pyglet-1.2.4.ebuild 984 BLAKE2B eda8e4014ab9920ac01d97cf527a5d57b34057682e0a4d0d69893ef5a40e07c8238365fdc0109a0fbd5a3b74185e2850997d28e9e95d309930494cdebd1f6c21 SHA512 3ba3040991f5df5b9d3f42cc1db582bd3f4352af556bde321697ad8248acc78ad159998e6c5267de3861a6404cb789e316e0aee8695576bf678a609ba4814401 MISC metadata.xml 893 BLAKE2B b2c9d0381d98ba205738e1fee69cb1a8952060c5d0095d134d84136af35fd38da8f81cca964a1ad748e615cb9c443b18f53a31f436a8356c83725423e16e8b64 SHA512 2bf1d8f350103309d98bda2834337acf488726e3ee141509f3423c46695c87d2a61557dec3d3c0e523815e09fd3d02eb3411779b4ce2fac05b83425401480269 diff --git a/dev-python/pyglet/pyglet-1.2.4.ebuild b/dev-python/pyglet/pyglet-1.2.4.ebuild index 28a91921aa95..8a8f04796f93 100644 --- a/dev-python/pyglet/pyglet-1.2.4.ebuild +++ b/dev-python/pyglet/pyglet-1.2.4.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux" IUSE="alsa examples gtk +openal" RDEPEND=" diff --git a/dev-python/rdflib/Manifest b/dev-python/rdflib/Manifest index 84645424807e..2ef6d43f79ad 100644 --- a/dev-python/rdflib/Manifest +++ b/dev-python/rdflib/Manifest @@ -1,5 +1,5 @@ DIST rdflib-4.2.1.tar.gz 889467 BLAKE2B cc5f675646ca7a55ff40d4d98eb138953d8763d8b44b5b495cdc9bb83df16d425214bb681f8f841e053a3cb4d52edd30988afcf2c301a96f699a70d9c129cca5 SHA512 49145f80a9e027847523faed059c16ec1de358bb9d8fc3ab4fd3bf95a88dd181986b1785deedf6e837cf0b064bd74ab8e27fbb5581e33310353da3546ae7b016 DIST rdflib-4.2.2.tar.gz 905094 BLAKE2B fe17b5752f67c745bfdf4a160c2f5d49da19f0d85b6eddc4a65fa0ddb660de8bcc19c3ccecf893fb67f725b973cb94481374d9ee0c82072416a93e44952dba9b SHA512 efc24d8ce1080e59950cecc9c779ae0d63673c8690f74db1772f6c2dbf24d6f4de5214d5870a074bffe549b42d8d5f5d131df29bbfd174b763ae1f843aec7d5c EBUILD rdflib-4.2.1.ebuild 2687 BLAKE2B 28a7f358ea1c1ce4785f9d374aff553021147376a05c62a99600263a10df6159b3a5814bcc9d8bdf0909e45d727244088da219974fd3c9e1f7844e620d19f393 SHA512 86091ab53bc5103f5a673678504e8b99520e314c0b290240595f34df13740a4fca2e580082f9cf8fa18c517a220d87eb87c87e8edca97e2d4373ac177a2147dd -EBUILD rdflib-4.2.2.ebuild 2716 BLAKE2B e679a9f150670801fae101e7a7f62b4d322423a619f2ba857a1def8b1966f863b614f96e52f24f1a4af8b12d92ec4c3621eb9bc7dbf7e99a455ccde01c82eb47 SHA512 db4a25adc3a060302264b2358854db45e87787681055cd611723abbea014da091f6d88c872be6c2398f0b8e88b4e07ad531c562767ff88e898a83f895afa48da +EBUILD rdflib-4.2.2.ebuild 2715 BLAKE2B 345fb47275044feb9634967741ad672098bd967099991566d15af62c248f21b7f77807bee3234559e2c311d13402350c2e1d578e37a8ace207a74d28606564d6 SHA512 0742af6e2eba2ab84d3ecf076c2fd5c89cca4dd07f8704b0064a409b58320d56a9cd21281de4231a2ccb917b84b24f938b425759f03a71f863f96c9efb62155e MISC metadata.xml 462 BLAKE2B a2b02fb03f0966423a2354b593cee26c55aca5d28df913d6bbe9ba0731b093c5499568829736b86d8440c173f40059041905fe49e0a7de3cc5df32ae186241ff SHA512 d9b717e12472862a9071d3d2ad3efffcc053f6890a9a307f882040f77e7304addf30fdceaf94b9a752de5daaf7eae21a68d39311f9997bc1e99c598b5093fd78 diff --git a/dev-python/rdflib/rdflib-4.2.2.ebuild b/dev-python/rdflib/rdflib-4.2.2.ebuild index 6c6f845513a8..8e7727a9eb31 100644 --- a/dev-python/rdflib/rdflib-4.2.2.ebuild +++ b/dev-python/rdflib/rdflib-4.2.2.ebuild @@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux" IUSE="doc berkdb examples mysql redland sqlite test" RDEPEND=" diff --git a/dev-python/rospkg/Manifest b/dev-python/rospkg/Manifest index b47e23234fb3..a3fce916c796 100644 --- a/dev-python/rospkg/Manifest +++ b/dev-python/rospkg/Manifest @@ -1,7 +1,5 @@ AUX gentoo.patch 662 BLAKE2B 06e1c4af66a5d1ca1e51f8d99a1cf4e62042da3d41f38b34143f7af2ec7ae4bd4516f2b57e863ec6b80d921e2ab6a920ba581dccc6615da480c237e410f4cea2 SHA512 7525f4e8809b6002000b22d6f5def37054a1bceb3d581fe01bcedd7e21dc757dd04d229e9550bfe1d2248c5804856cd9869149bea9a9ec5423e1a596c0f56153 -DIST rospkg-1.1.3.tar.gz 89534 SHA256 ba0948fbb3be14082f9e83763cbe3a12857127eb78e142748c9d16d41ab4479c SHA512 2bb0521fbb87492dbc83d2582a8de3034f2e5548c1a464cfc558915157f3ef9d34d6166a4378d5e5cb226f2c8f714df86879220f7041d37b58a9ad33be2ce3cd WHIRLPOOL 77082d0927626a5350300c556fd15eceb3527ee3a64239ade75aa2758288c1835e3f7797425ea6921674cab187593ec494406717a8daa88093dea874efad95d0 -DIST rospkg-1.1.4.tar.gz 89554 SHA256 9d93bbf646c3db7e5ffd9814a879fe76cf45d2aa0a0bb210f44e807ea41a4c70 SHA512 1758dcbe28c18c834a60bbda2e5e6be34629b3dd4f6519f24dfa1324ff9fc59fb7d0ae9d324c002eee06ff672309627e48f97119b36601390b24a24ae196d5c5 WHIRLPOOL ab3eedf4df5bac5cfb19c50e8452928c8a879fc506a13e1ff2f92cb37afdd610ade43efd367d5c5cf09fbbc331177e42d79f8825da23ed05fae2f9f3953b4ab2 -EBUILD rospkg-1.1.3.ebuild 1006 BLAKE2B 0282355098a4aa7d64fd54063c52a9a65d85f5d748cc780fc4baf682469209876c4145d97cd777de4ec718e433ce05c38c23c2bacd78196c5d8fb79d4cd6012a SHA512 d81c650b250b40c58a2eb8e8fb6de4822d392121409346dba318b7c2a3844833cdfa6f661c6a57139b8b86a33de0d1e9066bb40e973a43858fb2335a540b56f4 -EBUILD rospkg-1.1.4.ebuild 1006 BLAKE2B 0282355098a4aa7d64fd54063c52a9a65d85f5d748cc780fc4baf682469209876c4145d97cd777de4ec718e433ce05c38c23c2bacd78196c5d8fb79d4cd6012a SHA512 d81c650b250b40c58a2eb8e8fb6de4822d392121409346dba318b7c2a3844833cdfa6f661c6a57139b8b86a33de0d1e9066bb40e973a43858fb2335a540b56f4 -EBUILD rospkg-9999.ebuild 1006 BLAKE2B 0282355098a4aa7d64fd54063c52a9a65d85f5d748cc780fc4baf682469209876c4145d97cd777de4ec718e433ce05c38c23c2bacd78196c5d8fb79d4cd6012a SHA512 d81c650b250b40c58a2eb8e8fb6de4822d392121409346dba318b7c2a3844833cdfa6f661c6a57139b8b86a33de0d1e9066bb40e973a43858fb2335a540b56f4 +DIST rospkg-1.1.4.tar.gz 89554 BLAKE2B b307482cc3df0f2a178dd427a37160cfdc3c407b2135a28854f3df0ff964ed57c17a8ee358a1aa90b3d735e0913bc6c3c8ea1084efdef5fd01933166e21ebac8 SHA512 1758dcbe28c18c834a60bbda2e5e6be34629b3dd4f6519f24dfa1324ff9fc59fb7d0ae9d324c002eee06ff672309627e48f97119b36601390b24a24ae196d5c5 +EBUILD rospkg-1.1.4.ebuild 1047 BLAKE2B 5b922d621b25f784306647865bbf7eac12b03c4684c656a69a884efec91bc72f127d8faf23eb3f3c87b86aff5c61759a30a3766ad847f290a955d12cb2ddbca5 SHA512 d01620d22f53394000cffd74a8df24338b51c1c8356efc02dae3ac26e595e76a23614b2fd50f9b918e6730f1ba03072a421de47e15cb9c44c04f4c4dd5c5686e +EBUILD rospkg-9999.ebuild 1047 BLAKE2B 5b922d621b25f784306647865bbf7eac12b03c4684c656a69a884efec91bc72f127d8faf23eb3f3c87b86aff5c61759a30a3766ad847f290a955d12cb2ddbca5 SHA512 d01620d22f53394000cffd74a8df24338b51c1c8356efc02dae3ac26e595e76a23614b2fd50f9b918e6730f1ba03072a421de47e15cb9c44c04f4c4dd5c5686e MISC metadata.xml 339 BLAKE2B b73b43910983a77b06481850b398f006e6e535382c5fde12e8b86d43151b840e309bb2c6b0cd83899c3a9b8fcfd1c44fe6f1e5c53008e62b5653fda7cbfb12db SHA512 c9e10c6eecb919a284258e818a9830f6ba2afe095a9f4c565bf086855d5bbb26bf6973455c62a38ab4e20eb88da1f3d44b97597b197ca30227a7e7438a84d8a7 diff --git a/dev-python/rospkg/rospkg-1.1.3.ebuild b/dev-python/rospkg/rospkg-1.1.3.ebuild deleted file mode 100644 index dff594067afb..000000000000 --- a/dev-python/rospkg/rospkg-1.1.3.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} ) - -SCM="" -if [ "${PV#9999}" != "${PV}" ] ; then - SCM="git-r3" - EGIT_REPO_URI="https://github.com/ros-infrastructure/rospkg" -fi - -inherit ${SCM} distutils-r1 - -DESCRIPTION="Standalone Python library for the ROS package system" -HOMEPAGE="http://wiki.ros.org/rospkg" -if [ "${PV#9999}" != "${PV}" ] ; then - SRC_URI="" - KEYWORDS="" - # Needed for tests - S="${WORKDIR}/${PN}" - EGIT_CHECKOUT_DIR="${S}" -else - SRC_URI="https://github.com/ros-infrastructure/rospkg/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm" -fi - -LICENSE="BSD" -SLOT="0" -IUSE="test" - -RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - test? ( - dev-python/nose[${PYTHON_USEDEP}] - dev-python/coverage[${PYTHON_USEDEP}] - ) -" -PATCHES=( "${FILESDIR}/gentoo.patch" ) - -python_test() { - nosetests --with-coverage --cover-package=rospkg --with-xunit test || die -} diff --git a/dev-python/rospkg/rospkg-1.1.4.ebuild b/dev-python/rospkg/rospkg-1.1.4.ebuild index dff594067afb..a7dae07958a5 100644 --- a/dev-python/rospkg/rospkg-1.1.4.ebuild +++ b/dev-python/rospkg/rospkg-1.1.4.ebuild @@ -31,6 +31,7 @@ IUSE="test" RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] test? ( dev-python/nose[${PYTHON_USEDEP}] dev-python/coverage[${PYTHON_USEDEP}] diff --git a/dev-python/rospkg/rospkg-9999.ebuild b/dev-python/rospkg/rospkg-9999.ebuild index dff594067afb..a7dae07958a5 100644 --- a/dev-python/rospkg/rospkg-9999.ebuild +++ b/dev-python/rospkg/rospkg-9999.ebuild @@ -31,6 +31,7 @@ IUSE="test" RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] test? ( dev-python/nose[${PYTHON_USEDEP}] dev-python/coverage[${PYTHON_USEDEP}] diff --git a/dev-python/sparql-wrapper/Manifest b/dev-python/sparql-wrapper/Manifest index 0a100813050a..2f8a48b744f5 100644 --- a/dev-python/sparql-wrapper/Manifest +++ b/dev-python/sparql-wrapper/Manifest @@ -1,5 +1,5 @@ DIST SPARQLWrapper-1.7.6.tar.gz 26597 SHA256 dccabec900eb9c97cb47834bd4b66ceaeb4d9ea11bae24a24fe734e9f48522f8 SHA512 cbaafe8986f7da88efc383ee7e694559c9314244a03f616e5f2afd186205ad625fe0601a2316013add4c11621fc697aa6d4672f8bbabdc485c11e873ca6342cb WHIRLPOOL 818cd215224a1d362c1e03286190e5ec8b7f465cbc837b136963e70948272450fc99dbcf22b065101546664dd5a7c1088703a578a2b8e0fb378dbb74630ef254 DIST SPARQLWrapper-1.8.0.tar.gz 28775 BLAKE2B b8ef5d3e2d52f4e17c47a7a398d01037dac3f6b62722faf92b6b76f37f2ac7e242ebf3cdfa93788744f632e58caf95207d1c37c462639151e20db74a94f4d69f SHA512 bdfa3d5efc2deb8202a27e8a4770cb69ce57c1a71133788fe7acf8aa4cbc2d74024fd5f7fe5188a0fbebd399d31f62ca23d85f7ebae5562046b5b782311d8907 EBUILD sparql-wrapper-1.7.6.ebuild 607 BLAKE2B 8b2f8eea948b345e3246d41a30e50edf3c2576eb6983da169fe00cfccce538c17b7cc1982d23153211ad7f2ba2cbfbde8e7ccdb8bc303092cc25d0d2aa6c1e41 SHA512 cbe8508cfdc3eaac33ba07cee40fe8410aeac49d192e854854dc865af61cadc6a9b93bad42d12458b283638c2eea074ce3617db5bf4aac4de47a654d09711016 -EBUILD sparql-wrapper-1.8.0.ebuild 616 BLAKE2B 73f54417d991cd2b5d9685d5206e8e522582cdd25617ae8aed006dd6a91d4a905eadf5e4bd58116775c3ffe5f39c5f9aa88118694532a4bb60ca71a60752233f SHA512 95bad76443eb87e3652b9fdc3a1eb92c3e47faadd6f83ea6de21c313ac15ec001f388b3d7c2620348f31ca4fe46f6259f66364a511cd1525010a24fe25bc4ca8 +EBUILD sparql-wrapper-1.8.0.ebuild 615 BLAKE2B bd96f51c2763f1d012b86f8bbe6b0810212597cfea1ee935685076e59ef6003f590908b2f326e90ef8037edc462497ce1d6a3245f11708a31a8ebd1149f32468 SHA512 b7e022527fc740ddf06c9a1972c7e702e1bf5f5d5a868eb927fb343cdeabe741c4dde085d3eb3864cb1e3ce7c2b837884dc8cfdf53c38cb33b1e038f98fe3ba0 MISC metadata.xml 326 BLAKE2B 0c3bfdc601d5e93c90d7966cf8b7de667f7c71b2353ea1a7c28ac0c52028999484f4cee8601d346d78e963055df1bfb115a1acb79bf0a07e8de6df600b63c83d SHA512 9cc7b41b1ba7fbcde0ecce7638a3b2df50d6290d65d9854ae6611ed144220d9b292235ab8916330c828a4f9a1c5605de6d0d71d1a08fb0f6ddf37f7302c03e40 diff --git a/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild b/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild index e0a6b4c587b3..0743831619d0 100644 --- a/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild +++ b/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz" LICENSE="W3C" SLOT="0" -KEYWORDS="alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="alpha amd64 ~arm ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux" IUSE="" diff --git a/dev-python/tqdm/Manifest b/dev-python/tqdm/Manifest index 967d55a0876c..46a8a7eb9d77 100644 --- a/dev-python/tqdm/Manifest +++ b/dev-python/tqdm/Manifest @@ -1,6 +1,8 @@ -DIST tqdm-4.10.0.tar.gz 615329 SHA256 de907ec76d60f085dcb09f98d578ef17b30eafcc71198e8d74730eb53ee883c7 SHA512 5c7719e13f57cf7f42e81e2514ae4db5cf72b010ead25aa8bcd4ad0037e0a374bf353c15f43f4b64337142f3c2562b952b5e18aea70634c9b11d6b82af51546e WHIRLPOOL cbcf1af8964c7623fcdc2261349365decec0bfe47b863c2a56d0a396644db8b750b2d46d79c8e0aca7c0c649cd5fb3c587a6e9a3ec45c9aeccfd51fe50526210 +DIST tqdm-4.10.0.tar.gz 615329 BLAKE2B 59cc8db43281a22cabfb895f81c3b6f3cf4e62e67e725ae0a7137497337fea492787f7154e99fa3601f39c1b2e4ddafa5911b6a80ebac6e4e4e7f3c6575d09d5 SHA512 5c7719e13f57cf7f42e81e2514ae4db5cf72b010ead25aa8bcd4ad0037e0a374bf353c15f43f4b64337142f3c2562b952b5e18aea70634c9b11d6b82af51546e +DIST tqdm-4.19.4.tar.gz 72037 BLAKE2B 5f2ed14b6f72f16e141dd47d30559e694398420de97b7bea67e6cc10b75288a3829f206fe4b8e7965a95cb93a7bd2d70a073c35a310b0e94eca68600d0cf67b1 SHA512 56d1f2cd8f7a56964611f0399c6f8f6c64740428e38ebde6778397340b57787a3409de2755269c1a26db38cd85ddf3c90636a36d742eb2b51d8736e5ad6c5989 DIST tqdm-4.8.4.tar.gz 609527 SHA256 8be8712eb5c8476d50acda96cd799fd336261e59886ba31da8255e47533d3910 SHA512 21a43e1cdfae5ce9c1db386043391c0d32f0d0ce7b3337054296cfffbbc68a57deef77efd597a0be6805023052e84724649cb29116fd8614a21a2f28440a5889 WHIRLPOOL 734e5ef0a2174131a8298d2964346deac4011d7e37614540ee301c50335cd6a28425edbb25d563e60de593eb481774d3a7663b29860b1efa90778c5b282a4642 EBUILD tqdm-4.10.0.ebuild 473 BLAKE2B 3263d67ead8147dc81f1e5e9838eae6c91bf1ae472a9142e33d06003cc9c10b689adaf997030e98d7b5eaf1477a53bb03851501841db36182fa6d96ab3f46bb9 SHA512 dd28063384e54dabab2681afb79b5b2911c2cb4f5fa848b76c7593d9fa85127e519aeeb38cf6ab0828965a824c2b57dcaba71ca2f3b1517157e8609807776931 +EBUILD tqdm-4.19.4.ebuild 584 BLAKE2B 347c41515e56264a67e4df85476a97af29b3ee17d66a4bb9ec3372388da3b6df27d34a7f53fc6aaecd2000be0404d5115c88831447552d6ce51ce00a271e4538 SHA512 5ed60db4cebe447ce5628f18d4acf2a904a356549f8d40c5dcc7fa9f12c5fa7e4d1a005dc307a223c7ad76fba444726fe4bcce82ee77ab2a2d812db5fd3fc265 EBUILD tqdm-4.8.4.ebuild 471 BLAKE2B 9d8bb0e5691295114f8f23634bcef277ec3dc5a216337ba2554c403fd034051f8ad08a183012ebf7ea78a0156d8b014b9eca0557fb352b60ccab1726b06f7b79 SHA512 41af95e83c05d41cb0b67d07bc65215f38bbbda7008b817f807d27f3ecf66d21749810e9852ee6125af67d226a1a85cdaffc592b3f6b8b1ff6692d894115bec8 EBUILD tqdm-9999.ebuild 447 BLAKE2B ba7909ad62a57de2b1ea70801480f3babf48d0f03baefc208c50b44c78ff0703ba13ff964a16eeb2ab6a60364caac20b65546ec144a7fcc5eb3edd5dd71fc729 SHA512 18b0dd43b0ccd13c8fe824a63ab84acfb902867dca4c0a26754e29bf8a22d4d9582b4172398e41c1975e9154422696d07414159d5bf06adafe124d4bbd9503cf MISC metadata.xml 611 BLAKE2B 508436ed86075ea93acdfda799c34f6b05b38ed48c77e5673cbb11d1b424be1a0b98be584ecdf4544848ffd0061dcab39d24bb67d2d0ef631d295d8f91d02cd5 SHA512 62ef0673bcb397648689769eac6e735f5de8a3df69d41e63a04b2e9b79cef3fea64c2183ab9bc83827dd7d1e1f982b0decb17ebaee96bbf4928bd9a545fac29c diff --git a/dev-python/tqdm/tqdm-4.19.4.ebuild b/dev-python/tqdm/tqdm-4.19.4.ebuild new file mode 100644 index 000000000000..508bef40ecfc --- /dev/null +++ b/dev-python/tqdm/tqdm-4.19.4.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) + +inherit distutils-r1 + +DESCRIPTION="Add a progress meter to your loops in a second" +HOMEPAGE="https://github.com/tqdm/tqdm" +SRC_URI="https://github.com/tqdm/tqdm/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" +RDEPEND="${DEPEND}" + +src_prepare() { + sed -i -e "s#man/man1#share/man/man1#" setup.py || die + distutils-r1_src_prepare +} diff --git a/dev-python/waitress/Manifest b/dev-python/waitress/Manifest index a213a2817612..f5122af574d4 100644 --- a/dev-python/waitress/Manifest +++ b/dev-python/waitress/Manifest @@ -1,5 +1,5 @@ DIST waitress-1.0.1.tar.gz 123934 BLAKE2B 1e7d2a2d0850096b6b0d5654208ebe23d4e78360d8eedf3bce98276b8710eac0f544158f9efe5fa72abbab27d3ca5c4f3ed9afed43144d4d06f88f8068b2f19a SHA512 0205a0a5fc9e65e20370fc1e97ba456337313c93817e9b2b283610e5045eb32de80f45d19ee0cfb9469a93e4fc9267b785feacedd70b362474f4af5c05a3ab21 DIST waitress-1.0.2.tar.gz 124685 BLAKE2B 4c9edd2d7c37964616311ee6fe5a58ff1f6a7677226956e47f03f629d7765b3015c1f652f39ad7b0f81608f8638e63edeb35f120ee57347e89b029918e418c04 SHA512 b7000e1198ac306ce189f70c5dcfcf41318e5ec47c8d6183cdbc360c8759ca726405d5da70f1c7fe3cfeb39d528af94d693767c2a7a1a7fe460c6407857ec6f0 EBUILD waitress-1.0.1.ebuild 797 BLAKE2B 67eb57070f777a7bd54d72b92578970f88f28d0eda42e8790628328a9a82e4f9e9f6c3bde9bfc0359a0260a2fac5ec058fe22db12a2916c562ccfe6781276e67 SHA512 a9b6288942450bafe1f52f8e368d19492feb50db0f29df91853498e4836450b5feec1db4c390d5265752bb0b76bbac5f1f7388a0e7007ed2b267a722d7599060 -EBUILD waitress-1.0.2.ebuild 791 BLAKE2B 12a40648cd559936a4660452d5a201bd3693a4498569f49454cae74fd30dd65a9f2548e9283ea90fd3aa3e2053ad47ce3598df08c6a40ac31c4b7d7be1915dcc SHA512 0e98267a3dd45e493e2dbc90355a3990684d855f1d01208085ab16e9a3713306e633ea8ed96796f901c4068d48738cf7a5f6a2e9f63b7e6eea1c5e55c4c6305e +EBUILD waitress-1.0.2.ebuild 790 BLAKE2B 6a6854b5e9f2cd06b8740332ec970a3f1dc482783aa3321c6a46df6d81ccacd26c98dc231d427799080ddbc0acc6bc1c0b66f44496a90e4ff7d034da18b72ac0 SHA512 880a419f3c3bf38ade5b9b12b5a7b38442c5754001aff2cfc0c9792dd538b42541024096a2ec8bbf5ac5fb13a5040be71ff38c4e93db5ae40be3947c3e85c9b2 MISC metadata.xml 378 BLAKE2B ce0ade449ef1c9d58ced1c883c0adb2a27573bd74f5299bdda36ee60fe073a56e8c44f5a81a36bdd7fa2c595c1a2f55abd3eb876fd5d0909256bff4310fdaabc SHA512 02bd27d7e984ce3ca047d34dd5acfe9c0b23e9d8fcf59484262e19e9df1206939fe2837a58ac00fe58575c2db4abe28b89a5a1c8a8b887d346c30635ee2b10fe diff --git a/dev-python/waitress/waitress-1.0.2.ebuild b/dev-python/waitress/waitress-1.0.2.ebuild index 9cfb4701a294..7d301f061df4 100644 --- a/dev-python/waitress/waitress-1.0.2.ebuild +++ b/dev-python/waitress/waitress-1.0.2.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd" +KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd" IUSE="test" RDEPEND="" diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest index be9c89513b5e..724399b38a9e 100644 --- a/dev-python/zeroconf/Manifest +++ b/dev-python/zeroconf/Manifest @@ -1,3 +1,5 @@ -DIST zeroconf-0.17.5.tar.gz 18428 SHA256 51ea8affc3512259d5e702a46031139c2eaefe2a0891990e5866d0b5a436112e SHA512 834f8d66bb92232474f60a5137ed7de3788fe1b7109cd5dd2100c3845a89bbb224df060bcb482b0c48b0a5849604247b8f29a902f9c78c35a72497a77f5323b3 WHIRLPOOL b18548e0ac1f7f4e03c4326d227ebcd6a56e43cfeb4ee4168ba47eae73675c131dda5d2840b506f56abf816517328eb2143c10afa52a6b972ee851be30f04736 +DIST zeroconf-0.17.5.tar.gz 18428 BLAKE2B b77b0a3c561fd498e59043d8b613ee17f9b9a6ef4f98070d1f2125653017233e12d4a3e87071709981dc67150589d55591b5956fe9661a18d257331662294dfa SHA512 834f8d66bb92232474f60a5137ed7de3788fe1b7109cd5dd2100c3845a89bbb224df060bcb482b0c48b0a5849604247b8f29a902f9c78c35a72497a77f5323b3 +DIST zeroconf-0.19.1.tar.gz 22769 BLAKE2B a63332d70c5610da4fe44cc32d106893241284c3f70b5d6f55f68e3b3dd045a9c39b1009e9dce0b80c836d5ab0693b99974901ee664513c36f34c31907162d46 SHA512 1a7ac803caca1b230eba6c4bcfb714613f218850d9373ea0de609a3c9a509d13acfd14d64f9efbab78637b74aebdf385cf2deded1ff871fc6f3aea4477a07730 EBUILD zeroconf-0.17.5.ebuild 974 BLAKE2B eb72d60abe1726ae304c4dfa84658cf1a96d8b45cd2623df547d8b444e0cc33f3b31fb5ec5df1036f02e9cc7a910560bd2935ad0cdb4ea0b7e93067f72416a0c SHA512 78d1e3bb8457a2419b0610e8046f96e9ff5a67370a6bbaeb303c20ecde52aabf27745336a24f01d1717596e7779a6ca3c90a705ce525eb1a3e3c9d96e1aeb3ca +EBUILD zeroconf-0.19.1.ebuild 977 BLAKE2B dbc14d334e4ab0c65affda8082dd8845c4f594de6a9358d20d2b1f77728ec63098388883369ed4a844742ad35c6df03af5c4c8a1e6315d4837b0cc37643c8d05 SHA512 550ecfec4d9e389e9b0d4ff6a5be4a9cbba88d8d0a44d634700b414bccf1f1d9357e7fdc4f3b2fa3c47c1053629e2dc6eabc867dc9d0550893531d2fac0846be MISC metadata.xml 387 BLAKE2B 9dea981cf6247ad6fb6ddb3b060671ddb031ec703dc00e61e2efb4909478d01b5dfa309ed848dafe321d388156d16f44bc7b803dab79731205e374b5f046757c SHA512 ccee11a4aad084b1ac1dd901d966e1424b7ad3769b4bdf62c2dd44f9cbb6ec1a566443967ba45b37ef6241f43d2a06c17ebb5028254fbf40e0a480fcc3d76f89 diff --git a/dev-python/zeroconf/zeroconf-0.19.1.ebuild b/dev-python/zeroconf/zeroconf-0.19.1.ebuild new file mode 100644 index 000000000000..5b6b4b8a2700 --- /dev/null +++ b/dev-python/zeroconf/zeroconf-0.19.1.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy pypy3 ) + +inherit distutils-r1 + +DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)" +HOMEPAGE="https://github.com/jstasiak/python-zeroconf https://pypi.python.org/pypi/zeroconf" +SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="test" + +RDEPEND=" + dev-python/netifaces[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + virtual/python-enum34[${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + dev-python/nose[${PYTHON_USEDEP}] + )" + +# Not included +RESTRICT="test" + +python_prepare_all() { + # It's virtual/python-enum34 + sed \ + -e "s:'enum-compat',::g" \ + -i setup.py || die + distutils-r1_python_prepare_all +} + +python_test() { + nosetests --verbose || die +} -- cgit v1.2.3