diff options
Diffstat (limited to 'sci-libs')
44 files changed, 66 insertions, 964 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz Binary files differindex 110bb3a5bd8d..64a47b4c0f0d 100644 --- a/sci-libs/Manifest.gz +++ b/sci-libs/Manifest.gz diff --git a/sci-libs/Shapely/Manifest b/sci-libs/Shapely/Manifest index cc73ed6c90c6..e99b2b545f81 100644 --- a/sci-libs/Shapely/Manifest +++ b/sci-libs/Shapely/Manifest @@ -1,6 +1,6 @@ AUX Shapely-1.6.4_p2-test_operations.patch 722 BLAKE2B 661659bc1d2f8c8a5d6b77f0ca746024aa9724f2c25047d8203d591a4f793982d4cf9bebaa6abcaf48c0cf1b266ef941b986897d26bece39519f8fcaf5dcaf96 SHA512 c1e9eda0cf8dbfbcee2d6994f470559507c754fa2bf03973ac692ca6bd2fcf62ce05e15116515877e8900a89c55c6b2bf6e70b74e2cfced8d3852608901b34db DIST Shapely-1.5.17.tar.gz 180663 BLAKE2B 1a41de8c264989abeac27fe9b63abd81ad6f03f0eecd313131d04190b8bbebc6c6bd6b45b1782fbfd163025cda4977b7e93a24a711c76fddfaedb0fe880cea53 SHA512 eea241942ffbf377001445fab4017c9a2746d6bc0baa6c801a08ca95e608bbdaea7ad9568f00cbecdb559e634402bc6d213ebccb4074e59325e1cc4b3771626d DIST Shapely-1.6.4.post2.tar.gz 225745 BLAKE2B 96e995db6dd1464bac7c2562efdc7f298a5f23c388e44f334db685b1cfa1025ff403db870e11328977a267483726504e03b6d7c47fe4234a3a5966a13b2b7311 SHA512 027c816ef2104f654569ca658b52b87c60e5ba6a45927fcc51c23dd1922f3f9f7fdcea3601160b0a999e39611617142833ccac790777093be8b96a0d9083f78f -EBUILD Shapely-1.5.17-r1.ebuild 1075 BLAKE2B d27f0eda9125b453c17f411e18e4961f10e7507e56f10561c4ffd963a3fda58befb1dc2bc5f8fdbc1d702446dfae48e3d056bd47d642ba4493f796988a1ed648 SHA512 90cc083f8102273faa78aff7b0ad4027fdb8368dd8c3a2b7be4d4c9532ef47dd13c7c2842f2e24434ca15248faf2a940f8760baf6ad715b57ac8e043b34c799d +EBUILD Shapely-1.5.17-r1.ebuild 1065 BLAKE2B 23d868a3e15b0572ba4423ebaa84c4ac8633cbe325772b9a90d22cf9fa65f610eda28274616b945fcf139e7d4c103260f84218d20374307d52ed5ad1028df5cb SHA512 9740ff9620ba8cac0c56da082adbe497a8dfb1863b7f089ac1725982a12e7debf118471a54895d90c72111d8c5055d0926cb9394b82309cd6de722abb6bb0dfc EBUILD Shapely-1.6.4_p2-r1.ebuild 1231 BLAKE2B bcaa4b3dee9e05d924cd7f6f9fdfb17f410d16e7e7210e446e7a126da16a1e91f3998da71305cf5fe0888071fcd05cc9b131c3a8ee5acfb847017df76bb7a8bc SHA512 57cfa44501741647624ad7e0f3b97c327058a40d1dd351454105644559232835ede3ea855c544158fb8998c5a58b7a36218abb09f45f1154cf724ba8c89c1d31 MISC metadata.xml 242 BLAKE2B 5314a9f3c3a7dd475d215dc1be8c4fba1947504699ae6658044a1f8d05fa860798ebb24aed8b881a16a89f8eb84d554e2f9a738a2193668807173888bc187f56 SHA512 0d12ba53a623b64840750891b600f6fc2b4f857f8766557c54cf7a0ef473320b0bc09bab1d50d6ce2c8284fcf7a10b3aa1df8d43d9b10274101e82e1a7b1db94 diff --git a/sci-libs/Shapely/Shapely-1.5.17-r1.ebuild b/sci-libs/Shapely/Shapely-1.5.17-r1.ebuild index 9c0df2cbe226..692e04da131a 100644 --- a/sci-libs/Shapely/Shapely-1.5.17-r1.ebuild +++ b/sci-libs/Shapely/Shapely-1.5.17-r1.ebuild @@ -3,7 +3,7 @@ EAPI=6 -PYTHON_COMPAT=( python2_7 python3_6 ) +PYTHON_COMPAT=( python3_6 ) inherit distutils-r1 diff --git a/sci-libs/getdata/Manifest b/sci-libs/getdata/Manifest index 73d3e2355733..da01af919db2 100644 --- a/sci-libs/getdata/Manifest +++ b/sci-libs/getdata/Manifest @@ -1,4 +1,4 @@ AUX getdata-0.9.0-remove-python-test.patch 257 BLAKE2B bc60176d361d2cb891742c0ee8b443d0cb5c1350478bec1047e56d6a38b50021096ad8bab6ed4b1205744785f002227b22a80a4ab888c4bd52d517de8503e12b SHA512 7a8b5e8e1f2164fca9caba81c7b24f705c6caac036f8f2a3c6dd436961311e4dc34aa6a669eb0bd9e50fb50c09a8b22d32fe04961085c983a29da00e438cbc7c DIST getdata-0.9.0.tar.xz 920652 BLAKE2B d5f0659474dfab9f4e589a28a7788b5a51de3c0064b58de37bdb11dad27b56daa05d8e705da743c5da271bd8c4e1343ac6ac41adfdfabfcaef0006e46c45d2bf SHA512 28d720141e34cc56a5166594d0a6ac293144d123706988ed170e40dd9d7aaf13b920305e8bd8343ecd7cbe43eee5d83720e3e5f5d2da0cdccdc1444725cc6844 -EBUILD getdata-0.9.0-r1.ebuild 1506 BLAKE2B 938e0d6d91fa5ca0458fbf545d5485adc6f20addea8b33bab1d120fa3b63c36814d870c73aa5b0e8d1df6d479517472a81049880bca74c2b66da2229e7857cc7 SHA512 02b932f496218b8c70e0d4b83d667b2af5c1f2ce4c8258d988565c2bc27bce6526ec64005d01f573c74179649b4ee71c536e5cb4fb26a6f039ed45a82acb0e00 +EBUILD getdata-0.9.0-r1.ebuild 1566 BLAKE2B ef80ee67141b2fd5be341ac23426d4568bb2bece6b1f66b962bad6655afa0d82644b28a89be6a40c8823938fd0364d62df11e486846ec823b51fb94dae32d156 SHA512 06a261916043012214ff5fb3abb9a3eac9e320505bc46f66310269c5915992853f77655ab8764c1bfff9050e0467038c4b9f4078bda9eb5562e60dd2141bd610 MISC metadata.xml 660 BLAKE2B 74c050abc2e0978cc5c7d16625a6858f9a0a22d9c4ce4fbf0c303cb3361ef460d5d50d09845e5c8b9be82a73b22e9d159a554fec12f5dd7058602c99b7b5073d SHA512 d821e374438aad1beb22199383ebbc8a48247867b08370f08c370e02d7abaf7273a62e750a9ed3befc5e9674489a2a8e56453a6dad09a363a514986a79eb7460 diff --git a/sci-libs/getdata/getdata-0.9.0-r1.ebuild b/sci-libs/getdata/getdata-0.9.0-r1.ebuild index 1e6aa25c7ab1..65085d535e5b 100644 --- a/sci-libs/getdata/getdata-0.9.0-r1.ebuild +++ b/sci-libs/getdata/getdata-0.9.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -23,7 +23,13 @@ DEPEND=" bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl ) - python? ( dev-python/numpy[${PYTHON_USEDEP}] ${PYTHON_DEPS} )" + python? ( + || ( + dev-python/numpy-python2[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + ) + ${PYTHON_DEPS} + )" RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}/${P}-remove-python-test.patch" ) diff --git a/sci-libs/keras-applications/Manifest b/sci-libs/keras-applications/Manifest index 60bc616e5406..9b0d7880da11 100644 --- a/sci-libs/keras-applications/Manifest +++ b/sci-libs/keras-applications/Manifest @@ -1,5 +1,5 @@ DIST keras-applications-1.0.7.tar.gz 289570 BLAKE2B 5f6fe2419b2de41f718e6beae56c8c4910efe0e6c282ad32b792f50a8b9ebc88c866eed84fb8c7dcbbd1680de605036a0012458af6d14250b1f8624ead5013b7 SHA512 5f2c5fb7b7f644a881f8cc9040633a69d3a72562206dd0601c8b31bf4fd3bb2aeee07a0d7040311f0fd42f16330bc249d306cdfa01c7b60717b05726040a0b78 DIST keras-applications-1.0.8.tar.gz 288909 BLAKE2B 41d70552f5dfdd0c1385a7ca0b527ce0e0c3441c1ee3f72c90569f3e43e6a82485d0d4affee83afc645f3b99a519facb41d11a3fc1384c98f44182dddbea02bb SHA512 58af0d8e0289d97b416559bf235deeb9a5405d50f2a2c93612cdbde36e4d6d006db5c570acb814c209414a4b61c2310a99257aa0e2feaf24e5260d549b8b94f6 -EBUILD keras-applications-1.0.7.ebuild 555 BLAKE2B 4122997649b17c067326b78d4a177e76864ca19166f1f1660c6d3b84cb0f028d31d5f33ca89251a33e59cb81a008da8d6f5db3865a73aa58dde612fdd883f20d SHA512 7b15f028ad57cdf50e4ca6b23099ef01b945ae011619ed7bf4e82d7e7d31f081b33b73981119d03a773ba9cd74b3e906d4d4056947bbf012a39fa5eef46ef9f1 -EBUILD keras-applications-1.0.8.ebuild 557 BLAKE2B 9c3421de5e73b9fb604a0baff979d129e694ec6824d190b8fd1a67d4face6542918c26106ffef28c7c0dad8336537f012f28dd6859173ac4bf94ce76428b1db6 SHA512 d188868b3da62f5d24999c8d77dce51508639acf50854590d7aaec2a6101dfec065d5a6045e4a1b3e7f5a4300deeb3c754a45f79ddfb4a097420e3a6cb1efbaf +EBUILD keras-applications-1.0.7.ebuild 545 BLAKE2B 3c15aa73da882251f52cf1003966d6d7c696fcbe90573512340ddd81cfc3f5f5f7e983f9b5f79980dcdad10e57886d8695230ac6b4e1163e152480ae2a61c127 SHA512 3eb8da437ec1b8dfe8db19a6498c35315e7a10de07cc8fd7add6901ab50f37663b77c1863dfceb8364395505e9470a5b6f0280bcb6813045a4798110adbb739e +EBUILD keras-applications-1.0.8.ebuild 547 BLAKE2B 5957654f1f931e882e3789753c926b34be21d84b9d4cc30618b1cd3ac001276b7a23ffdd8a68322653c479c0ad405eb082e4dc43ee64858e7ca160da687eb543 SHA512 9b9a87bc2e835a93063de781d8f2e6249f0cb19921957f5fe06d057956047c1095820cf800a66f171e03d82674c138de237caf3ae6a6f4be88dd00b6d8b7b56e MISC metadata.xml 621 BLAKE2B 4f375ddfcfed6172df186350f7bd3dbfbcacea34f555b14719af43f58b140d73e378cd0a5efd8438ed2a0006f3552febc684b4fce85aeb88fb2c9bf819c06c4b SHA512 9dbb366d483843279cc7532b56a877313a7c39de25c93c313a2957092f9766ce5715a83dd87ef116d1733a7cc399319025ce1eb0e7ad174e2b7441360a9f5560 diff --git a/sci-libs/keras-applications/keras-applications-1.0.7.ebuild b/sci-libs/keras-applications/keras-applications-1.0.7.ebuild index d83037357a94..97ad5b054868 100644 --- a/sci-libs/keras-applications/keras-applications-1.0.7.ebuild +++ b/sci-libs/keras-applications/keras-applications-1.0.7.ebuild @@ -3,7 +3,7 @@ EAPI=6 -PYTHON_COMPAT=( python2_7 python{3_6,3_7} ) +PYTHON_COMPAT=( python{3_6,3_7} ) inherit distutils-r1 DESCRIPTION="Keras deep learning library reference implementations of deep learning models" diff --git a/sci-libs/keras-applications/keras-applications-1.0.8.ebuild b/sci-libs/keras-applications/keras-applications-1.0.8.ebuild index 8468b5755fad..1d5f4c3b2f3c 100644 --- a/sci-libs/keras-applications/keras-applications-1.0.8.ebuild +++ b/sci-libs/keras-applications/keras-applications-1.0.8.ebuild @@ -3,7 +3,7 @@ EAPI=6 -PYTHON_COMPAT=( python2_7 python{3_6,3_7} ) +PYTHON_COMPAT=( python{3_6,3_7} ) inherit distutils-r1 DESCRIPTION="Keras deep learning library reference implementations of deep learning models" diff --git a/sci-libs/keras-preprocessing/Manifest b/sci-libs/keras-preprocessing/Manifest index 2f7bba86e497..0913d8221df0 100644 --- a/sci-libs/keras-preprocessing/Manifest +++ b/sci-libs/keras-preprocessing/Manifest @@ -1,5 +1,5 @@ DIST keras-preprocessing-1.0.9.tar.gz 46476 BLAKE2B af80a6647bb56f8c4dba93120bc2b70db36d2c6a0e36c3be9a4843e5c36c9ffe50db1cd9396eecd47f6c0595c110825d70d2e6b28a29a0a199b5cfcc499e4440 SHA512 93ef9b294638bfeaea82170b323f08b261a2519f5ee8b9aac7d88e5b32c6486646d91075cea71bfbc27780c8af55125319873361f0431d48b451e574d1e7a400 DIST keras-preprocessing-1.1.0.tar.gz 50631 BLAKE2B 235a1a7d296684e5405c6472026a53b1930923e74065529ba6921e91bf8849d35c02378f8eeabc4f532a4e25937e8fd8f712a59067c5b358afe10b88e1531fcb SHA512 68c71e82ea2139d3db4142c86a2c404e4d65a9a881f72b07b4ccf28733b93a9e4837f91534a20c3ca5128600d8b885cc8723181d96c9045d5280ad7f84091cbb -EBUILD keras-preprocessing-1.0.9.ebuild 603 BLAKE2B 480ec1be11e9553483e39e9c35fceeaf619f837f6dc65235b2a55522deffc4a005722b4ca66417a6e7ee7c586a5742c1a152e663c33c192fcc21ae961ff5313e SHA512 b861496c45a5819ec9042ee6b909e0a6d56901f501ff90375b83116aef32c356f35fc76a571c9f289a38a97e822c859d2825cc4845d38b025b2308417478d315 -EBUILD keras-preprocessing-1.1.0.ebuild 605 BLAKE2B ff9c2a5cec242aba2b99569d4d73e76617b65f3cd32aa87f4ca381c706b3ee49ed9207f9e767c2bb774cfb4ce467e9f0412cdf029b183fc1e0ee28f413ec1f21 SHA512 17495366f3eb556e4f94aa8eac92c2d7b62ac2edf0db0b3e3ed7a40afcf052db7893656db8c854b820e954dc9370f957f714c85aeb55991309a3cf90f1b220b1 +EBUILD keras-preprocessing-1.0.9.ebuild 593 BLAKE2B cda6b2634c7c417f0a990fff0f2e82c41c143295222f41344fee956a6d77c4c1835a583e4ae7f2cab72918670511cc578e7e56cb26a202a328bb39d484f3229f SHA512 4b2ac3246b7c5bd3276cb33a224f39328610788897163cedb91934c7516e60e353b497228f622fc15f2f4199c4777a693045300a9e19483e48ded6cff45bf371 +EBUILD keras-preprocessing-1.1.0.ebuild 595 BLAKE2B ee4d8f99d8f8251a37c2e9f7041b77a75661346821cc13b78a5d2cf1889e79b133f4e49a8b6e4a2ece94d5789d22c4fa959f42c115cae670f30bf5dabc7dcb39 SHA512 c0cf40dd0ddf21122242db672545b30f2b9f6c470244823defcc223de97d6a4236d6635994e1e70f46c4aad3cece6358b0a5788e5882212b8aa34cb7ab0a68ef MISC metadata.xml 585 BLAKE2B a2f92ac4e2b9af055313a13de9bcbaee7ab7ca2efa4790c82027aece4b629bfa7a73c5ed0286b0f24f1853330057527009afe6ab1722f19d9c504a9d0737e827 SHA512 371cc3f5897bd28c62642a8857a22e775e24aa917bc0e58bb4de4e0a2a6580174ba35cfda2e8dd83599e2180fdfb3f11a953e7076c6d87073e1465b145b115e9 diff --git a/sci-libs/keras-preprocessing/keras-preprocessing-1.0.9.ebuild b/sci-libs/keras-preprocessing/keras-preprocessing-1.0.9.ebuild index f75f64631d3f..58c165ae5018 100644 --- a/sci-libs/keras-preprocessing/keras-preprocessing-1.0.9.ebuild +++ b/sci-libs/keras-preprocessing/keras-preprocessing-1.0.9.ebuild @@ -3,7 +3,7 @@ EAPI=6 -PYTHON_COMPAT=( python2_7 python{3_6,3_7} ) +PYTHON_COMPAT=( python{3_6,3_7} ) inherit distutils-r1 DESCRIPTION="Easy data preprocessing and data augmentation for deep learning models" diff --git a/sci-libs/keras-preprocessing/keras-preprocessing-1.1.0.ebuild b/sci-libs/keras-preprocessing/keras-preprocessing-1.1.0.ebuild index 90f33c01b7db..e40aaa9f033b 100644 --- a/sci-libs/keras-preprocessing/keras-preprocessing-1.1.0.ebuild +++ b/sci-libs/keras-preprocessing/keras-preprocessing-1.1.0.ebuild @@ -3,7 +3,7 @@ EAPI=6 -PYTHON_COMPAT=( python2_7 python{3_6,3_7} ) +PYTHON_COMPAT=( python{3_6,3_7} ) inherit distutils-r1 DESCRIPTION="Easy data preprocessing and data augmentation for deep learning models" diff --git a/sci-libs/libsigrok/Manifest b/sci-libs/libsigrok/Manifest index 517a3570f4ae..5a5d31b8c12c 100644 --- a/sci-libs/libsigrok/Manifest +++ b/sci-libs/libsigrok/Manifest @@ -5,8 +5,8 @@ DIST libsigrok-0.4.0.tar.gz 1387329 BLAKE2B 8d1578c1f84c84af54f0e6c97bcdcec6d183 DIST libsigrok-0.5.1.tar.gz 1664813 BLAKE2B b5765e1057ee4411ef2f83fa73473429bc8f84653f1c7761af3c1280decc2fcb1d3c68d8f92f7e77b85f1fcda74cf6066e5bf56c0da2de4b28148b920b94e0da SHA512 48337fc4625dc0abc162ae54e04ce091047835aa1e49ba1ab84542805008d1ff5646b143fde57e317f3b34514c0e6d4dcb7b1c5944f3f16bdef1a7169edc3517 DIST libsigrok-0.5.2.tar.gz 1779465 BLAKE2B fc6fdde1054e9ac50bc42249c34b3dbfff1e89d77f0db5a8762e52fcf2ea5ea69b2defcf1cde4ed7b1edd1e21770002ed661a470c8d666904daa48a84a2bbfc5 SHA512 cf673dad6280302d69050c29490621f66c6d6a73932d019a53ec3501316d3f2e23e7667a04f866dbe6ed73f86a63de73d2173e2b6cea563631d705e06f887092 EBUILD libsigrok-0.3.0.ebuild 1724 BLAKE2B 1c426bf94a8f83078ea74d094c8c43ce044ac6fe6c94548f47a15c203cc06295de43b6e72d97cffcb4a7a0ec11fecda611217e5d04541ec108f0a4d647773838 SHA512 e6ff926a3e3b0b4e753969c734603d934844c3099a3ba6eb6b81b5e938fa3e113014d46b1ce2cff977940a2099920d30e41f9a3bad5eea4ba41454196f801829 -EBUILD libsigrok-0.4.0.ebuild 2133 BLAKE2B 5385b1cf0a9accbb5172b95cb0e91efe6439d204c0cb734f4d9e01fae933e3a2c647e3fc2011e25955a92ab05714ad7de796e58023cee7afac9a8749b8089c4d SHA512 e299140f57d33d72c5f1cbf0723704f56b837106d71f91ca3c62dd691e982ffac0c9fcc561673821f00bbe0e3f265c148853e444bb2298ebcd8b0fb444fba194 -EBUILD libsigrok-0.5.1.ebuild 2363 BLAKE2B f4ead74620b10b97b32a94400f56e56bd54f8c4a80cddbbf837ac5edb185d65eb110ae83621f86412e1335a2a05ba480482fab1faeac332d091f1d5675b0181d SHA512 114eeb66a774f8a3739215a3029a7e65e94204497eadcd097f3a6e3f56ffa1a79d754ccfb22910520fd1c69389fef7286c40061ce42a285959cef5c7c5910c0c -EBUILD libsigrok-0.5.2.ebuild 3641 BLAKE2B 3c7b23e7e1fca072d969bac0adb61c44344c30f856f2b54b87fbf2a43b25a1d4edb0a7726256f30f4c741c8c446b93e0c73b1b3a4bb5d8772eeb94d0ed6b236b SHA512 3a821aa28e6349b69312e863051a52a2f3030b412ce608ffb936f811640a9d54e07718af2766be5923921318c999f703e3faadea4bd2be0c8ad7fd443c560767 -EBUILD libsigrok-9999.ebuild 3644 BLAKE2B cc90f93d924687e2e213a24d844276ab2424fd55505743ca93777c616cb4d1a442e40fa9f0edc93d3b99296d35836fa730c79e21db12805deca5ea31ec712c91 SHA512 88a23335faf959585fe92d4dd94c49c1d9634b747884e8c9bfa9ef16b822f145444f3866abc681c534b3b12097e76172ff4471d1e3d2ffdd3c5e186ec63c19c8 +EBUILD libsigrok-0.4.0.ebuild 2127 BLAKE2B d28aace671a55a8d7768000a60b44138cb544040326f13ddecca73a202c4762121d84edea1e4fca6fedb4da3c173f2cb9bcb0754bd390e977d473b11ac110984 SHA512 6cc9462fb911834725191f5e50d91ed2fe960a76cff80d273e675bad47709eb47b033d97c3622bf379156a76e9ee93f9d932cc1b61dc847c129524cfcf682e66 +EBUILD libsigrok-0.5.1.ebuild 2357 BLAKE2B a27237212510729f4860e4d33ba5cfa8a6b6c2fc802adaec0e0875bdb617d1aaf08b3769f9959ab8fedd2848b7d3d84256d24f0d0c4d55725e9674f370c505ae SHA512 bbbcbb78bcd1d7d0e822babdeba4ee772f0cb228104d5cf1c931b88bbdf29c89119dca064e4d0fedc24238e4f52904bac1a1e19719748a6ba662b093e3d69fda +EBUILD libsigrok-0.5.2.ebuild 3635 BLAKE2B 5637df8ea689134f99932323b0d5fd263bf8396d953bf66854861376b43092fbbf9c1f7c007170085526080fb5db2e5c6faa4b41db7f705ecf33ed162a360806 SHA512 da7090c8e11ff3b3a93d783e2606523e9af44861f4a046bc3fa59049626a3452d906a7adb898608d290f5e1647b13cc7d2515baeae31295b134b8f001166e4ba +EBUILD libsigrok-9999.ebuild 3638 BLAKE2B 4e8e61244cc1f9c0544a31e3e765c72b98cca2c03be5eac3da627ffb936a852777f4ac613683d460e6df8b7d4655380d0213c89604a9c3e8096905159406070b SHA512 8948066e791b410135950044f564a4f37593e67358e45efc67d28dc98024fd6a938ad7e4de242c0124a2318fdb3445c0407f327bba29d218152af432358f3400 MISC metadata.xml 701 BLAKE2B 8ae40f35611af8244dd9a0849077c4e823c126ee5d5d20087c6e7b0170b06718da3d4152940b51508586f47493c7c0435a678da278e8570a2e7f0d77ad803fa1 SHA512 66db0a2f5de48ec701c30e5c95562ec8508703fecb30a781d05ab74fc5db1e7ea6ff828b43eb68dda16f56833744a55f3f7c7911d889866b098bdcafe5a62f1b diff --git a/sci-libs/libsigrok/libsigrok-0.4.0.ebuild b/sci-libs/libsigrok/libsigrok-0.4.0.ebuild index a360d4392473..4b21e16866f8 100644 --- a/sci-libs/libsigrok/libsigrok-0.4.0.ebuild +++ b/sci-libs/libsigrok/libsigrok-0.4.0.ebuild @@ -3,7 +3,7 @@ EAPI="6" -PYTHON_COMPAT=( python{2_7,3_6} ) +PYTHON_COMPAT=( python3_6 ) inherit eutils python-single-r1 java-pkg-opt-2 diff --git a/sci-libs/libsigrok/libsigrok-0.5.1.ebuild b/sci-libs/libsigrok/libsigrok-0.5.1.ebuild index a55893a01993..af1e257b9010 100644 --- a/sci-libs/libsigrok/libsigrok-0.5.1.ebuild +++ b/sci-libs/libsigrok/libsigrok-0.5.1.ebuild @@ -3,7 +3,7 @@ EAPI="6" -PYTHON_COMPAT=( python{2_7,3_{6,7}} ) +PYTHON_COMPAT=( python3_{6,7} ) inherit eutils gnome2-utils python-single-r1 java-pkg-opt-2 udev xdg-utils diff --git a/sci-libs/libsigrok/libsigrok-0.5.2.ebuild b/sci-libs/libsigrok/libsigrok-0.5.2.ebuild index b34f77155e08..ef3ba1331db8 100644 --- a/sci-libs/libsigrok/libsigrok-0.5.2.ebuild +++ b/sci-libs/libsigrok/libsigrok-0.5.2.ebuild @@ -3,7 +3,7 @@ EAPI="6" -PYTHON_COMPAT=( python{2_7,3_{6,7}} ) +PYTHON_COMPAT=( python3_{6,7} ) USE_RUBY="ruby26 ruby25 ruby24" RUBY_OPTIONAL="yes" diff --git a/sci-libs/libsigrok/libsigrok-9999.ebuild b/sci-libs/libsigrok/libsigrok-9999.ebuild index 5c3c959d1d21..5f5f5dc0de7c 100644 --- a/sci-libs/libsigrok/libsigrok-9999.ebuild +++ b/sci-libs/libsigrok/libsigrok-9999.ebuild @@ -3,7 +3,7 @@ EAPI="6" -PYTHON_COMPAT=( python{2_7,3_{6,7}} ) +PYTHON_COMPAT=( python3_{6,7} ) USE_RUBY="ruby26 ruby25 ruby24" RUBY_OPTIONAL="yes" diff --git a/sci-libs/mathgl/Manifest b/sci-libs/mathgl/Manifest index 2744805d19e4..74a4c40f26b6 100644 --- a/sci-libs/mathgl/Manifest +++ b/sci-libs/mathgl/Manifest @@ -1,5 +1,5 @@ AUX mathgl-2.4.1-mutex.patch 424 BLAKE2B 2077654d0b17d2a1ba63bfcc17bcc82dac7dcc274253357a70cd0b2d49f9c99b73b380c1d09ad70e302fd04449b9adb6392c12cbd03fcefae4a36a50491cf012 SHA512 d0a0101041c91ba4d295484b8b06825d66787600b98acc2ee6e3cb8ec54e86939deadc40924bce42b6eb782bf5c03c6a7687ac853d7bc393e75bcf9a809d7849 DIST STIX_font.tgz 2450541 BLAKE2B f725eb0264d9c3cb7c32a935e8857c4a21cb905a1dc6c9cc8a16408afdc7dd9b6fcd312a8c2f77aff5484605a39a9ee36e86ad0234adb5d6bcc5c8839101194c SHA512 c9124ec552074c98f15d6d3572a063598ca6bc598e3e78dcb5a5d57ae3928b5327a1374635f428ea1cefc9e51ee1d1aa9bd6ba9a306429fc6965140251d368b5 DIST mathgl-2.4.1.tar.gz 22665490 BLAKE2B a9c9e0ec7d145262994a754dfbcf1f789d2777f9334c8b4e73696265adba4d2fd7283621857318264c2162841e81427df21f7bc7b951d83876fbc066d3b9068f SHA512 10fd016662ca60b9507942691f85b4d9151104319627732f4add0175475f7e8dff16e3645bb858c283b747f34e58f410d0532e94dc64cf8cf472938d3966402d -EBUILD mathgl-2.4.1.ebuild 4369 BLAKE2B 11ef176152d57eb1dfd90add52d081c8341c7179e3502290b54d5b5f8a18bc34e523e0f0e429bf082efb3f04744c82111a7e35b96afea9d98631d78f95edd2a1 SHA512 9ba6cadab25ebced5babd95404870f3b626de1c471dbb3dde6d5f2e6e71a790f9a92fa67cc266b03c7117c0bd91139a8b7279f87b4ac5a2671518c98bbd326fa +EBUILD mathgl-2.4.1.ebuild 4429 BLAKE2B 805b251b076fea7884f091a76b3dd5c4e7f45849b2ab09754ec11e789e4df4905299bbf7f9c2d0f3501e7a102c2b9851db206b416e8db7cf61f07e5c70b4ec72 SHA512 ae68b5ad9b5c8d247d74ed83b125c72a060ff3db1a34aaa3b0015e1394de1a9c9a6c17138d9c1c5ecce92bc6d45822dcddc0aeee8f27c923812de2d3f6a70bfa MISC metadata.xml 800 BLAKE2B baa75251910016e5d059cebeebd85632d290ab0c3c50089de0485ffbcd08ee8ac59cbfe33824347a5a5c339c74ea7a56c516d4d38661e56f7498d628d748f64a SHA512 8b75db0a01ce59f22543701447630c56a82f9091b5901f85ae102de7deca281e09dbcb443b8ff2930cf18145d63504646a289fd5e77defccc4d38480596d1968 diff --git a/sci-libs/mathgl/mathgl-2.4.1.ebuild b/sci-libs/mathgl/mathgl-2.4.1.ebuild index 461956958f10..81c1241a2fa6 100644 --- a/sci-libs/mathgl/mathgl-2.4.1.ebuild +++ b/sci-libs/mathgl/mathgl-2.4.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -38,7 +38,13 @@ RDEPEND=" openmp? ( sys-cluster/openmpi ) pdf? ( media-libs/libharu ) png? ( media-libs/libpng:0 ) - python? ( dev-python/numpy[${PYTHON_USEDEP}] ${PYTHON_DEPS} ) + python? ( + || ( + dev-python/numpy-python2[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + ) + ${PYTHON_DEPS} + ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 diff --git a/sci-libs/nlopt/Manifest b/sci-libs/nlopt/Manifest index acad693add5e..af9896a7af36 100644 --- a/sci-libs/nlopt/Manifest +++ b/sci-libs/nlopt/Manifest @@ -3,5 +3,5 @@ AUX nlopt-2.3-pkgconfig.patch 318 BLAKE2B 3569931fb9e2fceebf46c542e10fcd2562c8ac AUX nlopt-2.4.2-fix-dynamic-underlinking.patch 2522 BLAKE2B 5cdb8ea93cb44c25b1814431962259727c5c4dc97b4cf78d239189187f953a4b9458849a9afe77979841768b78226c6218ecc531328cb5752d26b9df63468ee5 SHA512 bdb07b216ffb68b68cb3f03076336234c558db3953c48b02511883bf9fb12f5915c04950a2e3222577c7af4fb1e288a165af2e8adf211fc853e747c98a65cd19 AUX nlopt-2.4.2-octave-4-map.patch 1858 BLAKE2B 34b1696762a9690a5ef5f3abc265b37d5de2f92b29e514952aa062faf1553a77ed3dba6f2abf7c8f1f7cbcc1cc63c9546967f3a317a773aa5e7c5c1e9c13f7e3 SHA512 00c45fe04fdc1acf4ccbb77aaf39feab0cb2b811b45edf791db7e87aa9e965c23b6131400eebd68335be8dcb86f346c01892e718f739f07dc0853b3dd9ea5ad4 DIST nlopt-2.4.2.tar.gz 2361992 BLAKE2B c1c9f533c7e7b3bb61e81343ebd26b87e05434fdbea1f347fc5f6a6c10160289ce105a51c6540296f3f1d122d31b415452da49b84516cd13fabc73372e4cfd0e SHA512 136aacc00a69f77e8a7ce5dc26a5f3f027bc8c01b97aa1f43919462e0a412154eabfb01be258e082dffe61f9b554bb2bfbb550a7b82c7c77c7b22874a64a9703 -EBUILD nlopt-2.4.2-r1.ebuild 2659 BLAKE2B 9008205cbefc5440e649fb24fa87f21184a74d639272d128ecbd14f2db5035a056b2b70ca1f107012552befd1fe37d84ee88eafa5603a7afb42994de9813306e SHA512 d5b8c7ee8061376f84577416d725a6bd4b6fdf26e7de6f1066740fae79d3e858c5818e0d4928080e6eb022bfc03dad0e49839284fe7bb2cdabdb0f98a918b1dc +EBUILD nlopt-2.4.2-r1.ebuild 2714 BLAKE2B 3939763ab3da6e8708c10b3ca39f1c001f2d9913e883648cade9d58b83c3242804991373fdd36599474715840562533881c8ab0ffd98cda54ad71d3d4c12cbe4 SHA512 c2a7e3336ccb1887c2c6074aed5fffb254dd11e607d871bd3ed864794d04cdfb7a3aff711b8cb5f7f0a98629f34a196f4f5fa7221f5c07324b2439b48cc9e5c9 MISC metadata.xml 1095 BLAKE2B e5032d65fbb49b125b6cb5abe332c52a1e058271c71aec2d2522cc78874a079f8987e2e8356290295bcb886c32e1cf794df9b157ebc712a862605105b80abe31 SHA512 74a37bc3e6fa74d0f96c3390fadf16e76caf904f43cf9ac0496f70e3e3bc458727e58d9fc65c39a81302b081575e530c27be3812488df20fab42aff5494437f7 diff --git a/sci-libs/nlopt/nlopt-2.4.2-r1.ebuild b/sci-libs/nlopt/nlopt-2.4.2-r1.ebuild index ff0499805459..5a937cd80edd 100644 --- a/sci-libs/nlopt/nlopt-2.4.2-r1.ebuild +++ b/sci-libs/nlopt/nlopt-2.4.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -23,7 +23,10 @@ DEPEND=" octave? ( sci-mathematics/octave ) python? ( ${PYTHON_DEPS} - dev-python/numpy[${PYTHON_USEDEP}] + || ( + dev-python/numpy-python2[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + ) )" RDEPEND="${DEPEND}" diff --git a/sci-libs/numkit/Manifest b/sci-libs/numkit/Manifest index 510a7e6a6e3c..6b229fb44ac2 100644 --- a/sci-libs/numkit/Manifest +++ b/sci-libs/numkit/Manifest @@ -1,3 +1,3 @@ DIST numkit-1.1.2.tar.gz 243442 BLAKE2B e5d1e4d85b7646acf47a1e332cbb08f849272ada30bcd65fc5995cd000683f802eb882603e4e7043b159d30ca73395988b83c1fc16d6303ea32731bfdea12db5 SHA512 694a56f64282bbbffed975eabeb2716ac924fbf47f5fb62934ba3b57e6415e5f4b079345fd4eee670990fbf7abe1f945b98472aba034d8c7ff259676da58c034 -EBUILD numkit-1.1.2.ebuild 782 BLAKE2B de1e5858a48ee6cdc48a83b3a949252ae8d7dfb10a9bb577bd7d028efb6bde70ef0af693bef5b6a32d87471b83ca970b1d2f06172cb2ef39afa3eb1612db968a SHA512 d26481c4d89b931c0adbf1423da3bded2ad5a4d09d3f8c985af556dcc6a9278651b16b9dacfd96bc1f99c53290e18f03bfc28ab34c2300b3c6b023cfb71ae90d +EBUILD numkit-1.1.2.ebuild 772 BLAKE2B f8f409b7793630688a6cc88ed42b8b6d555f102fd46a57ffef523a8a7bccdccabf6693210af6a8ab7315b8309be9b3e5793702a8bf4d3425b6b4bb734b1c3197 SHA512 0f9fb67e691d2f70c168b61706541b714bfaae65a7969ed404f82a142bef2781e1db33d99e378a3a2096f6d08b2b1fca1c519c52067bca4f4aa2f34fa36d3f09 MISC metadata.xml 474 BLAKE2B 7467f534225c3c84437c0306f716e64c9740607a9c18afae941af472c867fb29e3bf8e7371caaabd200a0a583c6502f5c6dc2dc6efa8508b91e15a372c90048f SHA512 7df51b689b986305f1a266361661871f2f0da60e1bda3c77d98f1f45d9ba4e2614930f283e2ef73fe861e519931fbc8b1724f2692c4759ddfa78e9cc89b1efeb diff --git a/sci-libs/numkit/numkit-1.1.2.ebuild b/sci-libs/numkit/numkit-1.1.2.ebuild index 19fc0f3c8168..8fb64e296e68 100644 --- a/sci-libs/numkit/numkit-1.1.2.ebuild +++ b/sci-libs/numkit/numkit-1.1.2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python2_7 python3_{6,7} ) +PYTHON_COMPAT=( python3_{6,7} ) if [[ $PV = *9999* ]]; then scm_eclass=git-r3 diff --git a/sci-libs/plplot/Manifest b/sci-libs/plplot/Manifest index 6a789d0ffade..f3e4f23c98e6 100644 --- a/sci-libs/plplot/Manifest +++ b/sci-libs/plplot/Manifest @@ -1,16 +1,9 @@ -AUX plplot-5.11.0-octave.patch 669 BLAKE2B 43361aa8c31f6b743b1a6d20b27701655ab4db475d330d5cde62e9f9774555d94ba8f26f2f5621e3625a7f86dce55d369ec387c8dcf5946ced4208ffe7463d9a SHA512 7ddd8105aa8ba684e423cac3657f2d1bc753b86eb2054edd2ff9497ec235354134da4ecfff5d26e26f01efced2f630f0e2488d114ce7dc887e7761f5ee060814 -AUX plplot-5.12.0-java-install-path.patch 393 BLAKE2B bd6860e694b5132a349699e25b79951308001b04b49d4ac1f070cd2ce51dc1e6ea76a7721e925c123669beb981ba756c3ae4e29bc0dee6f85f4e44fb61ac5f91 SHA512 0e87a67fd6821be07a56b68d8f9c23e4c25efea4fc9b56a2cec06d804202946917abd58271c71674d6b3b3ecda688be44920649095da3b125fe3a119fd22f1dd -AUX plplot-5.12.0-multiarch.patch 1309 BLAKE2B 8bce8e12a82b361989e5b8a7c11c25a642fc2d62af37b74764db675ed6d91bc4b011318633b42a942abd0b59db70658f1cb28bf4873722095a998d5e63a00d51 SHA512 4fe0992ccc8f7f9dcab956c1ec06a647e4a7bab67c0f2a78c4e004491a5d8685240dadfd2c248e4fd6a58747a5da67ab8c8dc35c1a0de5a85431da431a00607f -AUX plplot-5.12.0-ocaml-remove-rpath.patch 2012 BLAKE2B 47bbcc2c7e49b50f045c786ae3d5a799b45ab734e24e815168d9a6364fe09fc63869b57dd0a12b5c70ef5b69444ad6dba31bcc123faada6df9ac0af8cb0984d5 SHA512 6c40de6ab578ab8c347f12335b8a91976e5e4d8eee039512048039507c5e2b4a75b5bbfdde5ae347d2ccb167679b6574460d3f737ad37ee8902c7bcdc96af05d AUX plplot-5.12.0-safe-string.patch 791 BLAKE2B 8a3b37dd236d3086fe0780dd0e10d670884f706b4e6164980d8197de1a3f49fc0ef2ee15cd9f499c50b14a454bf62a6d6aee1512522ab5a3fe16c8fb93fc042f SHA512 c531a57ef2203c01f5d44f0bd1edc5101c740986987e454019fe42f4905dbd9b5f13ad93e91e3c73c95c320e9128ac4696021e258dc523fc9f5559348eda9129 AUX plplot-5.15.0-ieee.patch 1243 BLAKE2B 291274ae674f3471fdf081619c2b8e14caec490b391413e52bc8b424f596757297b48b9af09647196adc3069f81750652d05d8da5582092ad13e92d56af05c01 SHA512 e242ff53ac490f17b898cf8184446a342bd9ca36f6245f4142cefe275aa2f5865e13428cdbc8663e80a56d7f0c438492b3529dd7c3dd0400d380d99928c58318 AUX plplot-5.15.0-multiarch.patch 2544 BLAKE2B 288fc0f26f1f30cdbb786642ca5a59d8ba29958ffa690f87622748d4fa47ba098bce6671988e55f59526113dba08370ef15b0bc516552a9dee6918f430444dd5 SHA512 f98ea4f09cfaff7b1b2ad78940a10c5368ad29f402daca34a9a1ee2eeb3b275137576db884f1304ddc4c48ca83c032b9b2b10132a850839fba9c176bb27255a7 AUX plplot-5.15.0-ocaml-rpath.patch 9583 BLAKE2B b475580f9e4da0ab660dc2d0dfbdbbfbd277787a12421cf24c31453952257111c06e790a7f728f9b97ef16a8c4ea5a5e856e852f54cd81445a1f5b2aadb9df9d SHA512 5262e9922829ee3ec223b60b794de728e15104ba176f1a1e2fe4ba14929b08943cc5f00d166441c0e8ed5dfb09902044e3c62d944efdcf4bc3be604a56cb424a AUX plplot-5.15.0-ocaml.patch 3424 BLAKE2B ba1c9f758c319a76b0a457a287ee6934ee39300401e2d9a364c70446e12af679ce55c22eda0bf7aa7cb621fd4c76f56268afa649ba935a716495049f41706187 SHA512 1387625d1e784fb92ab3279a342c08d8f85fc055e0c69ce1af9656492102072c7a1d5a6498f8758dc3fd35e0543e80b65cd315641886f9baff60f7740583a0e3 AUX plplot-5.9.6-python.patch 379 BLAKE2B cf08250c851c3405517183e8f3425f42ede2f850cc8bcd89828e3e1b89035731a8a3face0988750e9f9e5dce2fa0404b23b2721c5b315ff61aeac552fd6e05f2 SHA512 cb2022bda3d5408ef0b2dc280981ad8bdb2f7ecb20d827f7e71ce063fba60963e68aeaa5efd8eef87da8e3dc270b609f7cb342c1da175cd757c9f135173842e4 -AUX replace-gdc-extensions.patch 15746 BLAKE2B 76d778d095c3c18ad990610b436ad9fad778187c572df260b9cc8278b3d17ef313c6462d07c2f23e1c7c7497e9028610a6bd2823a789df2c1dbb83dee723d8dc SHA512 9d4733bb79f654fdb0b6344be8dc366fc43251dc17dd5ce7dad4fe7883499dcfc58e53d278272c9263753ea45d5c1e9c406e906694366aeef2821bc8f0b2b3e2 -DIST plplot-5.12.0.tar.gz 16253895 BLAKE2B 5b89c0a6a478c6faf9bff2e2765eb6b13b6b1fc5644dbcdbc6aa88c510ad82a04253a7cb33d16816ff128eb866aad0f5cbccc365687ebb62022926f3c8545a0b SHA512 5566b9db0ddbb5ecaa677168f65f240197b2b8b23a02a812efc7e97fc79686b523591edad9c83de2e72935090d426b4cb9fe82496d9eb5a5a521c42161e9848b DIST plplot-5.15.0.tar.gz 15380293 BLAKE2B 41f359c4e86c7a26fe53a9d82a9f02aeb97b5b6f44abca590621640c56e50a62823e8a03165a939689f5456cee419b8292ea34faccd07641bd4a953b6f1d73fe SHA512 54533245569b724a7ef90392cc6e9ae65873e6cbab923df0f841c8b43def5e4307690894c7681802209bd3c8df97f54285310a706428f79b3340cce3207087c8 -EBUILD plplot-5.12.0-r1.ebuild 7243 BLAKE2B 76b1b6838834e291dcebd2ab2e25265bcea2c51b46c9715e19b38586b903513837ba01f643b45f8480d76c206b13b3736c717338458c46f91db99c8785562ae2 SHA512 014b44dbc72abfa66a054059ed8436ee9cbc52152eb6cdfb7e105103513e14ef4d236b0bd6824d24815a7ab7a42e314567572206dfc2f27248fa21b2f53e6450 EBUILD plplot-5.15.0.ebuild 7153 BLAKE2B 74fc0873428d0022eafb6c591439773c904c98423112593fd093d076b0dc9ad10599b6abad8e6f275a7549776fdd617b02aab22f1009aaee515b564ef9ac768e SHA512 7f689d63e44cbe0cb88ba24bea9e5f9fb0c86908d43680a653ee48125605d6556392472d133941edbbc490c7a8e150a1da14af210ab7f059238006b4eecbfaf3 -MISC metadata.xml 1487 BLAKE2B 33e45227a6094c8b7e8602081e267b5aad51cf90638269b544feb308f95e32757ae5784edc14cda97d8d0e4d5e209e9ba3528f8f763adada95ceb8c61d11fdc8 SHA512 ebace14f95cf9d6e3c71b8a4fa3ed411052183e2fa67197173f99045e22503b0e80dac6762ddb38fa97b7e36b67693b9c7352cba31d399d0b819d8da9cbf27ea +MISC metadata.xml 1420 BLAKE2B dc6f6e5f857b508989abed1b3769f42b7fb6de047d6b42f2614fa0c6cbabf9e7924185c94f1e5296cb34b3b51db1d580594add1592d26ed30239510b83ca1a42 SHA512 9af98d19c793ce18e7ee8c6f1a4346455008c907905c2fab8551d074429b8feab8b86161dca63943066bf0b238646e3b5d3d0161a57d313208ae1b155e6a212d diff --git a/sci-libs/plplot/files/plplot-5.11.0-octave.patch b/sci-libs/plplot/files/plplot-5.11.0-octave.patch deleted file mode 100644 index a2a41c96da7a..000000000000 --- a/sci-libs/plplot/files/plplot-5.11.0-octave.patch +++ /dev/null @@ -1,16 +0,0 @@ - plplot_test/test_octave.sh.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/plplot_test/test_octave.sh.in b/plplot_test/test_octave.sh.in -index 8a50d8b..8eb35fc 100755 ---- a/plplot_test/test_octave.sh.in -+++ b/plplot_test/test_octave.sh.in -@@ -35,7 +35,7 @@ echo "$TOPDIR" - export LD_LIBRARY_PATH="$TOPDIR"/src:"$TOPDIR"/lib/csa:"$TOPDIR"/lib/nn - - # Launch an Octave script that exercises all the demos --$octave -f -q <<EOF 2> test.error -+$octave -f -q $octaveopts -p "$octavedir" <<EOF 2> test.error - - # Disable warnings about shadowed functions - PLplot is _supposed_ to shadow the core functions - warning("off","Octave:shadowed-function"); diff --git a/sci-libs/plplot/files/plplot-5.12.0-java-install-path.patch b/sci-libs/plplot/files/plplot-5.12.0-java-install-path.patch deleted file mode 100644 index 2c053a2b1669..000000000000 --- a/sci-libs/plplot/files/plplot-5.12.0-java-install-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -Java libs are installed into an already prefixed path. - ---- a/bindings/java/CMakeLists.txt -+++ b/bindings/java/CMakeLists.txt -@@ -189,7 +189,7 @@ - ) - endif(APPLE) - -- install(TARGETS plplotjavac_wrap LIBRARY DESTINATION ${JAVAWRAPPER_HARDDIR}) -+ install(TARGETS plplotjavac_wrap LIBRARY DESTINATION ${JAVAWRAPPER_DIR}) - - set(JAVA_CLASSES) - foreach( srcfile ${JAVA_FILES_FULL} ) diff --git a/sci-libs/plplot/files/plplot-5.12.0-multiarch.patch b/sci-libs/plplot/files/plplot-5.12.0-multiarch.patch deleted file mode 100644 index 63e92f5aa5ab..000000000000 --- a/sci-libs/plplot/files/plplot-5.12.0-multiarch.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- a/examples/c/Makefile.examples.in -+++ b/examples/c/Makefile.examples.in -@@ -25,9 +25,6 @@ - CC = @CC@ - EXEEXT = @EXEEXT@ - --PKG_CONFIG_ENV = @PKG_CONFIG_ENV@ --RPATHCMD = @RPATHCMD@ -- - @extXdrawable_true@extXdrawable_EXECUTABLES_list = \ - @extXdrawable_true@ extXdrawable_demo$(EXEEXT) - ---- a/examples/c++/Makefile.examples.in -+++ b/examples/c++/Makefile.examples.in -@@ -25,10 +25,7 @@ - CXX = @CXX@ - EXEEXT = @EXEEXT@ - --PKG_CONFIG_ENV = @PKG_CONFIG_ENV@ --RPATHCMD = @RPATHCMD@ - @qt_gui_true@QT_MOC_EXECUTABLE = @QT_MOC_EXECUTABLE@ --@qt_gui_true@qt_RPATHCMD = @qt_RPATHCMD@ - - @wxwidgets_true@PLPLOTWXWIDGETS_EXECUTABLES_list = \ - @wxwidgets_true@ @wxdemo_name@$(EXEEXT) ---- a/examples/f95/Makefile.examples.in -+++ b/examples/f95/Makefile.examples.in -@@ -25,9 +25,6 @@ - F95 = @FC@ - EXEEXT = @EXEEXT@ - --PKG_CONFIG_ENV = @PKG_CONFIG_ENV@ --FORTRAN_RPATHCMD = @FORTRAN_RPATHCMD@ -- - EXECUTABLES_list = \ - x00f$(EXEEXT) \ - x01f$(EXEEXT) \ ---- a/examples/tk/Makefile.examples.in -+++ b/examples/tk/Makefile.examples.in -@@ -24,9 +24,6 @@ - CC = @CC@ - EXEEXT = @EXEEXT@ - --PKG_CONFIG_ENV = @PKG_CONFIG_ENV@ --plplottcltk_Main_RPATHCMD = @plplottcltk_Main_RPATHCMD@ -- - EXECUTABLES_list = xtk01$(EXEEXT) - # Second and fourth examples depend on itk. - @itk_true@itk_EXECUTABLES_list = xtk02$(EXEEXT) xtk04$(EXEEXT) diff --git a/sci-libs/plplot/files/plplot-5.12.0-ocaml-remove-rpath.patch b/sci-libs/plplot/files/plplot-5.12.0-ocaml-remove-rpath.patch deleted file mode 100644 index 2d18c79736fa..000000000000 --- a/sci-libs/plplot/files/plplot-5.12.0-ocaml-remove-rpath.patch +++ /dev/null @@ -1,34 +0,0 @@ -Fix OCaml's asinine RPATH inserting behaviour. - ---- a/bindings/ocaml/CMakeLists.txt -+++ b/bindings/ocaml/CMakeLists.txt -@@ -97,6 +97,20 @@ - - # ocamlc -c compiles *.c into *.o. - # ocamlmklib links *.o into *.so and *.a -+ -+ # ocamlmklib implicits inserts RPATHs if it is provided with an absolute path to -L, -+ # which is absolutely unacceptable and presents a massive security hazard. The -+ # following statements convert the absolute paths to relative ones to fix this. -+ # See also: -+ # https://caml.inria.fr/mantis/view.php?id=5943 -+ if(CMAKE_SKIP_RPATH) -+ file(RELATIVE_PATH CAMLIDL_LINK_LIB_DIR ${CMAKE_CURRENT_BINARY_DIR} ${CAMLIDL_LIB_DIR}) -+ file(RELATIVE_PATH CMAKE_LINK_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR}) -+ else(CMAKE_SKIP_RPATH) -+ set(CAMLIDL_LINK_LIB_DIR ${CAMLIDL_LIB_DIR}) -+ set(CMAKE_LINK_BINARY_DIR ${CMAKE_BINARY_DIR}) -+ endif(CMAKE_SKIP_RPATH) -+ - add_custom_command( - OUTPUT - ${CMAKE_CURRENT_BINARY_DIR}/plplot_core_stubs.o -@@ -105,7 +119,7 @@ - ${CMAKE_CURRENT_BINARY_DIR}/libplplot_stubs.a - COMMAND ${OCAMLC} -ccopt -I${CAMLIDL_LIB_DIR} -c ${CMAKE_CURRENT_BINARY_DIR}/plplot_core_stubs.c - COMMAND ${OCAMLC} -ccopt -I${CMAKE_SOURCE_DIR}/include -ccopt -I${CMAKE_BINARY_DIR}/include -ccopt -I${CMAKE_SOURCE_DIR}/lib/qsastime -ccopt -I${CMAKE_BINARY_DIR} -ccopt -I${CAMLIDL_LIB_DIR} -ccopt -DPLPLOT_HAVE_CONFIG_H -c ${CMAKE_CURRENT_SOURCE_DIR}/plplot_impl.c -- COMMAND ${OCAMLMKLIB} -o plplot_stubs -L${CAMLIDL_LIB_DIR} -lcamlidl -L${CMAKE_BINARY_DIR}/src -lplplot ${CMAKE_CURRENT_BINARY_DIR}/plplot_core_stubs.o ${CMAKE_CURRENT_BINARY_DIR}/plplot_impl.o ${ocaml_STATIC_FLAGS} -+ COMMAND ${OCAMLMKLIB} -o plplot_stubs -L${CAMLIDL_LINK_LIB_DIR} -lcamlidl -L${CMAKE_LINK_BINARY_DIR}/src -lplplot ${CMAKE_CURRENT_BINARY_DIR}/plplot_core_stubs.o ${CMAKE_CURRENT_BINARY_DIR}/plplot_impl.o ${ocaml_STATIC_FLAGS} - DEPENDS - ${CMAKE_CURRENT_BINARY_DIR}/plplot_core_stubs.c - ${CMAKE_CURRENT_SOURCE_DIR}/plplot_impl.c diff --git a/sci-libs/plplot/files/replace-gdc-extensions.patch b/sci-libs/plplot/files/replace-gdc-extensions.patch deleted file mode 100644 index 551926dc1540..000000000000 --- a/sci-libs/plplot/files/replace-gdc-extensions.patch +++ /dev/null @@ -1,434 +0,0 @@ -Description: Replace gdc extensions in D binding and examples source code with equivalent standard D source code - This patch is needed to avoid FTBFS with recent gdc versions. -Origin: upstream, https://sourceforge.net/p/plplot/plplot/ci/74799e02c5435e491b46dfc1fd053753105c3441/ -Reviewed-by: Sébastien Villemot <sebastien@debian.org> -Last-Update: 2019-10-08 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/bindings/d/plplot.d -+++ b/bindings/d/plplot.d -@@ -298,7 +298,7 @@ void plfill3( PLFLT[] x, PLFLT[] y, PLFL - // Get the current device (keyword) name - void plgdev( out string p_dev ) - { -- char cdev[1024]; -+ char[1024] cdev; - c_plgdev( cdev.ptr ); - p_dev = to!string( cdev.ptr ); - } -@@ -306,7 +306,7 @@ void plgdev( out string p_dev ) - // Get the (current) output file name. Must be preallocated to >80 bytes - void plgfnam( out string fnam ) - { -- char cfnam[1024]; -+ char[1024] cfnam; - c_plgfnam( cfnam.ptr ); - fnam = to!string( cfnam.ptr ); - } -@@ -337,7 +337,7 @@ void plgriddata( PLFLT[] x, PLFLT[] y, - // Get the current library version number - void plgver( out string p_ver ) - { -- char cver[1024]; -+ char[1024] cver; - c_plgver( cver.ptr ); - p_ver = to!string( cver.ptr ); - } ---- a/examples/d/x01d.d -+++ b/examples/d/x01d.d -@@ -224,7 +224,7 @@ class plot { - - if ( do_test && test_xor ) - { -- writefln( "The -xor command line option can only be exercised if your " -+ writefln( "The -xor command line option can only be exercised if your " ~ - "system\nhas usleep(), which does not seem to happen." ); - } - } -@@ -294,4 +294,4 @@ class plot { - plcol0( 4 ); - plline( x, y ); - } --} -\ No newline at end of file -+} ---- a/examples/d/x08d.d -+++ b/examples/d/x08d.d -@@ -24,7 +24,7 @@ - import plplot; - import std.string; - import std.math; --import std.c.stdlib; -+import core.stdc.stdlib; - - //-------------------------------------------------------------------------- - // cmap1_init1 -@@ -92,8 +92,8 @@ int main( char[][] args ) - PLFLT[] alt = [ 60.0, 40.0 ]; - PLFLT[] az = [ 30.0, -30.0 ]; - -- string title[] = [ "#frPLplot Example 8 - Alt=60, Az=30", -- "#frPLplot Example 8 - Alt=40, Az=-30" ]; -+ string[] title = [ "#frPLplot Example 8 - Alt=60, Az=30", -+ "#frPLplot Example 8 - Alt=40, Az=-30" ]; - - // Parse and process command line arguments - plparseopts( args, PL_PARSE_FULL ); ---- a/examples/d/x11d.d -+++ b/examples/d/x11d.d -@@ -48,16 +48,16 @@ void cmap1_init() - //-------------------------------------------------------------------------- - int main( char[][] args ) - { -- const nlevel = 10; -- const XPTS = 35; // Data points in x -- const YPTS = 46; // Data points in y -+ const nlevel = 10; -+ const XPTS = 35; // Data points in x -+ const YPTS = 46; // Data points in y - -- int[] opt = [ DRAW_LINEXY, DRAW_LINEXY ]; -+ int[] opt = [ DRAW_LINEXY, DRAW_LINEXY ]; - -- PLFLT[] alt = [ 33.0, 17.0 ]; -- PLFLT[] az = [ 24.0, 115.0 ]; -+ PLFLT[] alt = [ 33.0, 17.0 ]; -+ PLFLT[] az = [ 24.0, 115.0 ]; - -- string title[] = [ "#frPLplot Example 11 - Alt=33, Az=24, Opt=3", -+ string[] title = [ "#frPLplot Example 11 - Alt=33, Az=24, Opt=3", - "#frPLplot Example 11 - Alt=17, Az=115, Opt=3" ]; - - PLFLT xx, yy; ---- a/examples/d/x15d.d -+++ b/examples/d/x15d.d -@@ -145,10 +145,10 @@ class plot { - //-------------------------------------------------------------------------- - public void plot2( PLFLT[][] z ) - { -- static PLINT nlin[10] = [ 1, 1, 1, 1, 1, 2, 2, 2, 2, 2 ]; -- static PLINT inc[10][2] = [ [450, 0], [-450, 0], [0, 0], [900, 0], [300, 0], -+ static PLINT[10] nlin = [ 1, 1, 1, 1, 1, 2, 2, 2, 2, 2 ]; -+ static PLINT[2][10] inc = [ [450, 0], [-450, 0], [0, 0], [900, 0], [300, 0], - [450, -450], [0, 900], [0, 450], [450, -450], [0, 900] ]; -- static PLINT del[10][2] = [ [2000, 2000], [2000, 2000], [2000, 2000], -+ static PLINT[2][10] del = [ [2000, 2000], [2000, 2000], [2000, 2000], - [2000, 2000], [2000, 2000], [2000, 2000], - [2000, 2000], [2000, 2000], [4000, 4000], - [4000, 2000] ]; -@@ -191,11 +191,11 @@ class plot { - //-------------------------------------------------------------------------- - public void plot3() - { -- static PLFLT xx[2][5] = [ [-1.0, 1.0, 1.0, -1.0, -1.0], -+ static PLFLT[5][2] xx = [ [-1.0, 1.0, 1.0, -1.0, -1.0], - [-1.0, 1.0, 1.0, -1.0, -1.0] ]; -- static PLFLT yy[2][5] = [ [1.0, 1.0, 0.0, 0.0, 1.0], -+ static PLFLT[5][2] yy = [ [1.0, 1.0, 0.0, 0.0, 1.0], - [-1.0, -1.0, 0.0, 0.0, -1.0] ]; -- static PLFLT zz[2][5] = [ [0.0, 0.0, 1.0, 1.0, 0.0], -+ static PLFLT[5][2] zz = [ [0.0, 0.0, 1.0, 1.0, 0.0], - [0.0, 0.0, 1.0, 1.0, 0.0] ]; - - pladv( 0 ); ---- a/examples/d/x16d.d -+++ b/examples/d/x16d.d -@@ -195,7 +195,7 @@ int main( char[][] args ) - string[] axis_opts = [ - "bcvtm", - ]; -- PLFLT[] values[NUM_AXES]; -+ PLFLT[][NUM_AXES] values; - for ( size_t i = 0; i < NUM_AXES; i++ ) - { - values[i] = new PLFLT[ns]; -@@ -207,7 +207,7 @@ int main( char[][] args ) - 0, - ]; - const int NUM_LABELS = 1; -- PLINT label_opts[] = [ -+ PLINT[] label_opts = [ - PL_COLORBAR_LABEL_BOTTOM, - ]; - string[] labels = [ ---- a/examples/d/x17d.d -+++ b/examples/d/x17d.d -@@ -4,7 +4,7 @@ - import std.string; - import std.math; - import std.stdio; --import std.c.stdlib; -+import core.stdc.stdlib; - import plplot; - - ---- a/examples/d/x18d.d -+++ b/examples/d/x18d.d -@@ -6,9 +6,9 @@ import std.string; - - import plplot; - --int opt[] = [ 1, 0, 1, 0 ]; --PLFLT alt[] = [ 20.0, 35.0, 50.0, 65.0 ]; --PLFLT az[] = [ 30.0, 40.0, 50.0, 60.0 ]; -+int[] opt = [ 1, 0, 1, 0 ]; -+PLFLT[] alt = [ 20.0, 35.0, 50.0, 65.0 ]; -+PLFLT[] az = [ 30.0, 40.0, 50.0, 60.0 ]; - - //-------------------------------------------------------------------------- - // main -@@ -81,7 +81,7 @@ int main( char[][] args ) - - void test_poly( int k ) - { -- PLINT draw[][] = [ [ 1, 1, 1, 1 ], -+ PLINT[][] draw = [ [ 1, 1, 1, 1 ], - [ 1, 0, 1, 0 ], - [ 0, 1, 0, 1 ], - [ 1, 1, 0, 0 ] ]; ---- a/examples/d/x19d.d -+++ b/examples/d/x19d.d -@@ -4,7 +4,7 @@ - - import std.math; - import std.string; --import std.c.string; -+import core.stdc.string; - - import plplot; - -@@ -109,15 +109,15 @@ int main( char[][] args ) - PLFLT maxy = 80; - - //variables for the shapelib example -- const PLINT nbeachareas = 2; -- const PLINT beachareas[] = [ 23, 24 ]; -- const nwoodlandareas = 94; -- PLINT woodlandareas[94]; -- const PLINT nshingleareas = 22; -- const PLINT shingleareas[] = [ 0, 1, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 217, 2424, 2425, 2426, 2427, 2428, 2491, 2577 ]; -- const PLINT ncragareas = 2024; -- PLINT cragareas[2024]; -- const PLINT majorroads[] = [ 33, 48, 71, 83, 89, 90, 101, 102, 111 ]; -+ const PLINT nbeachareas = 2; -+ const PLINT[] beachareas = [ 23, 24 ]; -+ const nwoodlandareas = 94; -+ PLINT[94] woodlandareas; -+ const PLINT nshingleareas = 22; -+ const PLINT[] shingleareas = [ 0, 1, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 217, 2424, 2425, 2426, 2427, 2428, 2491, 2577 ]; -+ const PLINT ncragareas = 2024; -+ PLINT[2024] cragareas; -+ const PLINT[] majorroads = [ 33, 48, 71, 83, 89, 90, 101, 102, 111 ]; - - plinit(); - -@@ -173,8 +173,8 @@ int main( char[][] args ) - // Show Baltimore, MD on the map - plcol0( 2 ); - plssym( 0.0, 2.0 ); -- PLFLT x[1] = -76.6125; -- PLFLT y[1] = 39.2902778; -+ PLFLT[1] x = -76.6125; -+ PLFLT[1] y = 39.2902778; - plpoin( x, y, 18 ); - plssym( 0.0, 1.0 ); - plptex( -76.6125, 43.0, 0.0, 0.0, 0.0, "Baltimore, MD" ); ---- a/examples/d/x23d.d -+++ b/examples/d/x23d.d -@@ -336,14 +336,14 @@ int main( char[][] args ) - } - else if ( page == 14 ) - { -- text = format( "Page 15, %s, %s, %s: #<0x%1x0>#<0x%1x1>#<0x%1x2>" -+ text = format( "Page 15, %s, %s, %s: #<0x%1x0>#<0x%1x1>#<0x%1x2>" ~ - "The quick brown fox jumps over the lazy dog", - family[family_index], style[style_index], weight[weight_index], - family_index, style_index, weight_index ); - } - else if ( page == 15 ) - { -- text = format( "Page 16, %s, %s, %s: #<%s/>#<%s/>#<%s/>" -+ text = format( "Page 16, %s, %s, %s: #<%s/>#<%s/>#<%s/>" ~ - "The quick brown fox jumps over the lazy dog", - family[family_index], style[style_index], weight[weight_index], - family[family_index], style[style_index], weight[weight_index] ); ---- a/examples/d/x33d.d -+++ b/examples/d/x33d.d -@@ -30,7 +30,7 @@ import plplot; - import std.math; - import std.string; - --static PLINT position_options[16] = [ -+static PLINT[16] position_options = [ - PL_POSITION_LEFT | PL_POSITION_TOP | PL_POSITION_OUTSIDE, - PL_POSITION_TOP | PL_POSITION_OUTSIDE, - PL_POSITION_RIGHT | PL_POSITION_TOP | PL_POSITION_OUTSIDE, -@@ -50,7 +50,7 @@ static PLINT position_options[16] = [ - ]; - - // Pick 5 arbitrary UTF-8 symbols useful for plotting points (✠✚✱✪✽✺✰✴✦). --static string special_symbols[5] = [ -+static string[5] special_symbols = [ - "✰", - "✴", - "✱", -@@ -61,14 +61,14 @@ static string special_symbols[5] = [ - // plcolorbar options - - // Colorbar type options --const int COLORBAR_KINDS = 4; --static PLINT colorbar_option_kinds[COLORBAR_KINDS] = [ -+const int COLORBAR_KINDS = 4; -+static PLINT[COLORBAR_KINDS] colorbar_option_kinds = [ - PL_COLORBAR_SHADE, - PL_COLORBAR_SHADE | PL_COLORBAR_SHADE_LABEL, - PL_COLORBAR_IMAGE, - PL_COLORBAR_GRADIENT - ]; --static string colorbar_option_kind_labels[COLORBAR_KINDS] = [ -+static string[COLORBAR_KINDS] colorbar_option_kind_labels = [ - "Shade colorbars", - "Shade colorbars with custom labels", - "Image colorbars", -@@ -76,14 +76,14 @@ static string colorbar_option_kind_label - ]; - - // Which side of the page are we positioned relative to? --const int COLORBAR_POSITIONS = 4; --static PLINT colorbar_position_options[COLORBAR_POSITIONS] = [ -+const int COLORBAR_POSITIONS = 4; -+static PLINT[COLORBAR_POSITIONS] colorbar_position_options = [ - PL_POSITION_LEFT, - PL_POSITION_RIGHT, - PL_POSITION_TOP, - PL_POSITION_BOTTOM - ]; --static string colorbar_position_option_labels[COLORBAR_POSITIONS] = [ -+static string[COLORBAR_POSITIONS] colorbar_position_option_labels = [ - "Left", - "Right", - "Top", -@@ -91,14 +91,14 @@ static string colorbar_position_option_l - ]; - - // Colorbar label positioning options --const int COLORBAR_LABELS = 4; --static PLINT colorbar_label_options[COLORBAR_LABELS] = [ -+const int COLORBAR_LABELS = 4; -+static PLINT[COLORBAR_LABELS] colorbar_label_options = [ - PL_COLORBAR_LABEL_LEFT, - PL_COLORBAR_LABEL_RIGHT, - PL_COLORBAR_LABEL_TOP, - PL_COLORBAR_LABEL_BOTTOM - ]; --static string colorbar_label_option_labels[COLORBAR_LABELS] = [ -+static string[COLORBAR_LABELS] colorbar_label_option_labels = [ - "Label left", - "Label right", - "Label top", -@@ -106,14 +106,14 @@ static string colorbar_label_option_labe - ]; - - // Colorbar cap options --const int COLORBAR_CAPS = 4; --static PLINT colorbar_cap_options[COLORBAR_CAPS] = [ -+const int COLORBAR_CAPS = 4; -+static PLINT[COLORBAR_CAPS] colorbar_cap_options = [ - PL_COLORBAR_CAP_NONE, - PL_COLORBAR_CAP_LOW, - PL_COLORBAR_CAP_HIGH, - PL_COLORBAR_CAP_LOW | PL_COLORBAR_CAP_HIGH - ]; --static string colorbar_cap_option_labels[COLORBAR_CAPS] = [ -+static string[COLORBAR_CAPS] colorbar_cap_option_labels = [ - "No caps", - "Low cap", - "High cap", -@@ -126,20 +126,20 @@ void - plcolorbar_example_page( int kind_i, int label_i, int cap_i, PLINT cont_color, PLFLT cont_width, PLINT n_values, PLFLT [] values ) - { - // Parameters for the colorbars on this page -- PLINT position_i, position, opt; -- PLFLT x, y, x_length, y_length; -- PLFLT ticks[1] = [ 0.0 ]; -- PLINT sub_ticks[1] = [ 0 ]; -+ PLINT position_i, position, opt; -+ PLFLT x, y, x_length, y_length; -+ PLFLT[1] ticks = [ 0.0 ]; -+ PLINT[1] sub_ticks = [ 0 ]; - PLFLT low_cap_color, high_cap_color; - PLINT vertical, ifn; - PLINT n_axes = 1; - string[] axis_opts; -- PLINT n_labels = 1; -- PLINT label_opts[1] = [ 0 ]; -+ PLINT n_labels = 1; -+ PLINT[1] label_opts = [ 0 ]; - string[] label; - string title; - PLFLT colorbar_width, colorbar_height; -- PLINT n_values_array[1]; -+ PLINT[1] n_values_array; - PLFLT[][] values_array; - - axis_opts.length = 1; -@@ -279,26 +279,26 @@ const int MAX_NLEGEND = 7; - - int main( char[][] args ) - { -- int i, k; -- PLINT opt; -- PLINT nlegend, nturn; -- PLINT opt_array[MAX_NLEGEND]; -- PLINT text_colors[MAX_NLEGEND]; -- PLINT box_colors[MAX_NLEGEND]; -- PLINT box_patterns[MAX_NLEGEND]; -- PLFLT box_scales[MAX_NLEGEND]; -- PLFLT box_line_widths[MAX_NLEGEND]; -- PLINT line_colors[MAX_NLEGEND]; -- PLINT line_styles[MAX_NLEGEND]; -- PLFLT line_widths[MAX_NLEGEND]; -- PLINT symbol_numbers[MAX_NLEGEND]; -- PLINT symbol_colors[MAX_NLEGEND]; -- PLFLT symbol_scales[MAX_NLEGEND]; -- string text[MAX_NLEGEND]; -- string symbols[MAX_NLEGEND]; -- PLFLT legend_width, legend_height, x, y, xstart, ystart; -- PLFLT max_height, text_scale; -- PLINT position, opt_base, nrow, ncolumn; -+ int i, k; -+ PLINT opt; -+ PLINT nlegend, nturn; -+ PLINT[MAX_NLEGEND] opt_array; -+ PLINT[MAX_NLEGEND] text_colors; -+ PLINT[MAX_NLEGEND] box_colors; -+ PLINT[MAX_NLEGEND] box_patterns; -+ PLFLT[MAX_NLEGEND] box_scales; -+ PLFLT[MAX_NLEGEND] box_line_widths; -+ PLINT[MAX_NLEGEND] line_colors; -+ PLINT[MAX_NLEGEND] line_styles; -+ PLFLT[MAX_NLEGEND] line_widths; -+ PLINT[MAX_NLEGEND] symbol_numbers; -+ PLINT[MAX_NLEGEND] symbol_colors; -+ PLFLT[MAX_NLEGEND] symbol_scales; -+ string[MAX_NLEGEND] text; -+ string[MAX_NLEGEND] symbols; -+ PLFLT legend_width, legend_height, x, y, xstart, ystart; -+ PLFLT max_height, text_scale; -+ PLINT position, opt_base, nrow, ncolumn; - - // Parse and process command line arguments - plparseopts( args, PL_PARSE_FULL ); -@@ -822,9 +822,9 @@ int main( char[][] args ) - if ( colorbar ) - { - // Color bar examples -- PLFLT values_small[2] = [ -1.0e-20, 1.0e-20 ]; -- PLFLT values_uneven[9] = [ -1.0e-20, 2.0e-20, 2.6e-20, 3.4e-20, 6.0e-20, 7.0e-20, 8.0e-20, 9.0e-20, 10.0e-20 ]; -- PLFLT values_even[9] = [ -2.0e-20, -1.0e-20, 0.0e-20, 1.0e-20, 2.0e-20, 3.0e-20, 4.0e-20, 5.0e-20, 6.0e-20 ]; -+ PLFLT[2] values_small = [ -1.0e-20, 1.0e-20 ]; -+ PLFLT[9] values_uneven = [ -1.0e-20, 2.0e-20, 2.6e-20, 3.4e-20, 6.0e-20, 7.0e-20, 8.0e-20, 9.0e-20, 10.0e-20 ]; -+ PLFLT[9] values_even = [ -2.0e-20, -1.0e-20, 0.0e-20, 1.0e-20, 2.0e-20, 3.0e-20, 4.0e-20, 5.0e-20, 6.0e-20 ]; - - // Use unsaturated green background colour to contrast with black caps. - plscolbg( 70, 185, 70 ); diff --git a/sci-libs/plplot/metadata.xml b/sci-libs/plplot/metadata.xml index 7b64efe140a1..88a36164cbfa 100644 --- a/sci-libs/plplot/metadata.xml +++ b/sci-libs/plplot/metadata.xml @@ -9,7 +9,6 @@ <use> <flag name="dynamic">Build with dynamic drivers</flag> <flag name="octave">Add bindings for <pkg>sci-mathematics/octave</pkg></flag> - <flag name="pdl">Add bindings for <pkg>dev-perl/PDL</pkg></flag> <flag name="qhull">Add bindings for <pkg>media-libs/qhull</pkg></flag> <flag name="shapefile">Enable support for ESRI shapefiles</flag> </use> diff --git a/sci-libs/plplot/plplot-5.12.0-r1.ebuild b/sci-libs/plplot/plplot-5.12.0-r1.ebuild deleted file mode 100644 index cf5c4e336744..000000000000 --- a/sci-libs/plplot/plplot-5.12.0-r1.ebuild +++ /dev/null @@ -1,282 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -WX_GTK_VER=3.0-gtk3 -FORTRAN_NEEDED=fortran -FORTRAN_STANDARD=95 -PYTHON_COMPAT=( python2_7 ) - -inherit cmake-utils flag-o-matic fortran-2 java-pkg-opt-2 python-single-r1 toolchain-funcs virtualx wxwidgets - -DESCRIPTION="Multi-language scientific plotting library" -HOMEPAGE="http://plplot.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2" -SLOT="0/14" # SONAME of libplplot.so -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="cairo cxx doc +dynamic examples fortran gd java jpeg latex lua ocaml octave pdf - pdl png python qhull qt5 shapefile svg tcl test threads tk truetype wxwidgets X" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) qt5? ( dynamic ) test? ( latex ) tk? ( tcl )" -RESTRICT="!test? ( test ) octave? ( test )" - -RDEPEND=" - cairo? ( x11-libs/cairo:0=[svg?,X] ) - gd? ( media-libs/gd:2=[jpeg?,png?] ) - java? ( >=virtual/jre-1.5:* ) - latex? ( - app-text/ghostscript-gpl - virtual/latex-base - ) - lua? ( dev-lang/lua:0= ) - ocaml? ( - dev-lang/ocaml - dev-ml/camlidl - cairo? ( dev-ml/cairo-ocaml[gtk] ) - ) - octave? ( sci-mathematics/octave:0= ) - pdf? ( media-libs/libharu:0= ) - pdl? ( - dev-perl/PDL - dev-perl/XML-DOM - ) - python? ( - ${PYTHON_DEPS} - dev-python/numpy[${PYTHON_USEDEP}] - qt5? ( dev-python/PyQt5[${PYTHON_USEDEP}] ) - ) - qhull? ( media-libs/qhull:0= ) - qt5? ( - dev-qt/qtgui:5 - dev-qt/qtsvg:5 - dev-qt/qtprintsupport:5 - ) - shapefile? ( sci-libs/shapelib:0= ) - tcl? ( - dev-lang/tcl:0= - dev-tcltk/itcl:0= - tk? ( - dev-lang/tk:0= - dev-tcltk/itk - ) - ) - truetype? ( - media-fonts/freefont - media-libs/lasi:0= - gd? ( media-libs/gd:2=[truetype] ) - ) - wxwidgets? ( - x11-libs/wxGTK:${WX_GTK_VER}=[X] - x11-libs/agg:0=[truetype?] - ) - X? ( - x11-libs/libX11:0= - x11-libs/libXau:0= - x11-libs/libXdmcp:0= - )" - -DEPEND="${RDEPEND} - virtual/pkgconfig - java? ( - >=virtual/jdk-1.5 - dev-lang/swig - ) - ocaml? ( dev-ml/findlib ) - octave? ( >=dev-lang/swig-3.0.12 ) - python? ( dev-lang/swig ) - test? ( - media-fonts/font-misc-misc - media-fonts/font-cursor-misc - )" - -PATCHES=( - "${FILESDIR}"/${PN}-5.9.6-python.patch - "${FILESDIR}"/${PN}-5.11.0-octave.patch - "${FILESDIR}"/${PN}-5.12.0-multiarch.patch - "${FILESDIR}"/${PN}-5.12.0-java-install-path.patch - "${FILESDIR}"/${PN}-5.12.0-ocaml-remove-rpath.patch -) - -pkg_setup() { - use python && python-single-r1_pkg_setup - use java && java-pkg-opt-2_pkg_setup - use fortran && fortran-2_pkg_setup -} - -src_prepare() { - use wxwidgets && need-wxwidgets unicode - cmake-utils_src_prepare - - # avoid installing license - sed -i -e '/COPYING.LIB/d' CMakeLists.txt || die - - # prexify hard-coded /usr/include in cmake modules - sed -i \ - -e "s:/usr/include:${EPREFIX}/usr/include:g" \ - -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):g" \ - -e "s:/usr/share:${EPREFIX}/usr/share:g" \ - cmake/modules/*.cmake || die - - # change default install directories for doc and examples - local f - while IFS="" read -d $'\0' -r f; do - sed -i -e 's:${DATA_DIR}/examples:${DOC_DIR}/examples:g' "${f}" || die - done < <(find "${S}" -name CMakeLists.txt -print0) - - sed -i \ - -e 's:${VERSION}::g' \ - -e "s:doc/\${PACKAGE}:doc/${PF}:" \ - cmake/modules/instdirs.cmake || die - - java-utils-2_src_prepare -} - -src_configure() { - # - don't build doc, it pulls in a whole stack of horrible dependencies - # - Bindings: - # * Ada is a mess in Gentoo, don't use - # * D has been removed from Gentoo, don't use - # * Qt4 has been disabled, as it is deprecated and unsupported upstream - # - DPLD_* drivers need to use ON/OFF instead of the usex defaults yes/no, as - # the testsuite performs a string comparison to determine which tests to run - - # Octave bindings now require C++11 support, #609980 - append-cxxflags -std=c++11 - - local mycmakeargs=( - # The build system does not honour CMAKE_INSTALL_LIBDIR as a - # relative dir, which is against the spirit of GNUInstallDirs, #610066 - -DCMAKE_INSTALL_LIBDIR="${EPREFIX}"/usr/$(get_libdir) - - ## Features - -DBUILD_DOC=OFF - -DBUILD_DOX_DOC=OFF - -DCMAKE_SKIP_RPATH=ON - -DPREBUILT_DOC=$(usex doc) - -DHAVE_SHAPELIB=$(usex shapefile) - -DWITH_FREETYPE=$(usex truetype) - -DPL_HAVE_PTHREAD=$(usex threads) - -DPL_HAVE_QHULL=$(usex qhull) - -DPLPLOT_USE_QT5=$(usex qt5) - - ## Tests - -DTEST_DYNDRIVERS=OFF - -DBUILD_TEST=$(usex test) - - ## Bindings - -DENABLE_ada=OFF - -DENABLE_d=OFF - -DENABLE_ocaml=$(usex ocaml) - -DENABLE_pyqt4=OFF - -DENABLE_cxx=$(usex cxx) - -DENABLE_DYNDRIVERS=$(usex dynamic) - -DENABLE_f95=$(usex fortran) - -DENABLE_java=$(usex java) - -DENABLE_lua=$(usex lua) - -DTRY_OCTAVE4=$(usex octave) - -DENABLE_octave=$(usex octave) - -DENABLE_pdl=$(usex pdl) - -DENABLE_python=$(usex python) - -DENABLE_qt=$(usex qt5) - -DENABLE_tcl=$(usex tcl) - -DENABLE_itcl=$(usex tcl) - -DENABLE_tk=$(usex tk) - -DENABLE_itk=$(usex tk) - -DENABLE_wxwidgets=$(usex wxwidgets) - - ## Drivers - -DPLD_cgm=OFF - -DPLD_gif=OFF - -DPLD_jpeg=OFF - -DPLD_plmeta=OFF - -DPLD_png=OFF - -DPLD_pstex=OFF - -DPLD_wxpng=OFF - -DPLD_mem=ON - -DPLD_null=ON - -DPLD_wingcc=ON - # Cairo - $(usex cairo "" "-DDEFAULT_NO_CAIRO_DEVICES=ON") - -DPLD_epscairo=$(usex cairo ON OFF) - -DPLD_extcairo=$(usex cairo ON OFF) - -DPLD_memcairo=$(usex cairo ON OFF) - -DPLD_pdfcairo=$(usex cairo ON OFF) - -DPLD_pngcairo=$(usex cairo ON OFF) - -DPLD_pscairo=$(usex cairo ON OFF) - -DPLD_svgcairo=$(usex cairo ON OFF) - -DPLD_xcairo=$(usex cairo ON OFF) - # LaTeX - -DPLD_ps=$(usex latex ON OFF) - # PDF - -DPLD_pdf=$(usex pdf ON OFF) - # Qt - -DPLD_aqt=$(usex qt5 ON OFF) - -DPLD_bmpqt=$(usex qt5 ON OFF) - -DPLD_epsqt=$(usex qt5 ON OFF) - -DPLD_extqt=$(usex qt5 ON OFF) - -DPLD_jpgqt=$(usex qt5 ON OFF) - -DPLD_memqt=$(usex qt5 ON OFF) - -DPLD_pdfqt=$(usex qt5 ON OFF) - -DPLD_pngqt=$(usex qt5 ON OFF) - -DPLD_ppmqt=$(usex qt5 ON OFF) - -DPLD_qtwidget=$(usex qt5 ON OFF) - -DPLD_svgqt=$(usex qt5 ON OFF) - -DPLD_tiffqt=$(usex qt5 ON OFF) - # SVG - -DPLD_svg=$(usex svg ON OFF) - # Tk - -DPLD_ntk=$(usex tk ON OFF) - -DPLD_tk=$(usex tk ON OFF) - -DPLD_tkwin=$(usex tk ON OFF) - # Truetype - -DPLD_psttf=$(usex truetype ON OFF) - # Wx - -DPLD_wxwidgets=$(usex wxwidgets ON OFF) - # X - -DPLD_xfig=$(usex X ON OFF) - -DPLD_xwin=$(usex X ON OFF) - ) - - use truetype && mycmakeargs+=( - -DPL_FREETYPE_FONT_PATH="${EPREFIX}"/usr/share/fonts/freefont - ) - use shapefile && mycmakeargs+=( - -DSHAPELIB_INCLUDE_DIR="${EPREFIX}"/usr/include/libshp - ) - use ocaml && mycmakeargs+=( - -DOCAML_INSTALL_DIR="$(ocamlc -where)" - ) - use python && mycmakeargs+=( - -DENABLE_pyqt5=$(usex qt5) - ) - - cmake-utils_src_configure - - # clean up bloated pkg-config files (help linking properly on prefix) - sed -i \ - -e "/Cflags/s:-I\(${EPREFIX}\|\)/usr/include[[:space:]]::g" \ - -e "/Libs/s:-L\(${EPREFIX}\|\)/usr/lib\(64\|\)[[:space:]]::g" \ - -e "s:${LDFLAGS}::g" \ - "${BUILD_DIR}"/pkgcfg/*pc || die -} - -src_test() { - virtx cmake-utils_src_test -} - -src_install() { - cmake-utils_src_install - - if use examples; then - docompress -x /usr/share/doc/${PF}/examples - else - rm -r "${ED%/}"/usr/share/doc/${PF}/examples || die - fi - - if use java; then - java-pkg_dojar "${BUILD_DIR}"/examples/java/${PN}.jar - java-pkg_regso "${EPREFIX}"/usr/$(get_libdir)/jni/plplotjavac_wrap.so - fi -} diff --git a/sci-libs/pymmlib/Manifest b/sci-libs/pymmlib/Manifest index 0a597895d742..445557d14a2f 100644 --- a/sci-libs/pymmlib/Manifest +++ b/sci-libs/pymmlib/Manifest @@ -1,3 +1,3 @@ DIST pymmlib-1.2.1.tar.gz 37480403 BLAKE2B 9dc57144f5ac1a8055f1759b21c9b7c580bf33705e168ad92eec5bb9542650a006ba1dff4d45a05cce9fcb81e3633ee29eecc7a3aec46343467ec1940166353b SHA512 96328fcb8af70a271c0960be753c677f716d3b15c41519c320a1240fd9ad584fee173ab3a8e528c9ae198efea95d20863f64627e44d1a6726513f2916d93b464 -EBUILD pymmlib-1.2.1.ebuild 1038 BLAKE2B 110463f679a500ac201eae0750ffaacd63e707a19ce96efe28d327673b09650bffe57e9aceaebb98e76c7f47e94e72c3652fc09b9f93ef98d82f9d74e16f74d0 SHA512 8371bc249eb9d1256498076f2a4c2f58e6c853dea9b4a5f3ce7ad582f3935b46af2e0b00e30d1ff5c7bce1fe902e7ae93667bfd77a44fbbfe9918f69a149a8ac +EBUILD pymmlib-1.2.1.ebuild 1090 BLAKE2B 514f67f0561c203c18e303f660e94d82071ff35cdd345478d653a6bab3a36b879f509d6b1b10a06083498dd64fa90d7e253c72fc0d346b2a9b531bb2ada5c02a SHA512 5b3878abef4db8be7e3b86eae12e79e4d0e545420520a4399684e90681d506f04259da933b7f5769446e37883e85e52ec80ea7704257ed4e1101a89769b05a83 MISC metadata.xml 352 BLAKE2B 34a1fc3435528c5b6d9ebcdcc8c2fccb94c73905c18470cc1637ddd83030997173f8799f50c6f80e900949bbf7f1d1eed94d026e37a91fb0d708977fc607cbbc SHA512 0b30b2c2b407b9955227536ad72a0ad7583cd4ef5b2b691d44b0adc98e854b8051204666f6c5364a242cb81cefb17669e28744c1c062bbeb7bc207849f77384b diff --git a/sci-libs/pymmlib/pymmlib-1.2.1.ebuild b/sci-libs/pymmlib/pymmlib-1.2.1.ebuild index a372a683218f..e05c2a381dd1 100644 --- a/sci-libs/pymmlib/pymmlib-1.2.1.ebuild +++ b/sci-libs/pymmlib/pymmlib-1.2.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -17,7 +17,10 @@ KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" IUSE="doc" RDEPEND=" - dev-python/numpy[${PYTHON_USEDEP}] + || ( + dev-python/numpy-python2[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + ) dev-python/pygtkglext[${PYTHON_USEDEP}] media-libs/freeglut virtual/glu diff --git a/sci-libs/scikits_learn/Manifest b/sci-libs/scikits_learn/Manifest index 306a618ba3b4..56c194666de8 100644 --- a/sci-libs/scikits_learn/Manifest +++ b/sci-libs/scikits_learn/Manifest @@ -3,7 +3,7 @@ AUX scikits_learn-0.20.2-fix-cdfast.patch 3401 BLAKE2B cb75c941c2d7a81cde7fe07dc DIST scikit-learn-0.19.0.tar.gz 9341628 BLAKE2B c9e0c12558e81efb6f5cfddead028980b0019d2f6d0fdce5662c9138ec3a5b2a3d30b022a5713578bc7effd09894006e8f7f60a3e038ca66297502d9d4212686 SHA512 1b88bc043b08de9b5bb1f3814b8101c73ced010cf94bd725fb69e1ef95b4a9597a34de4a19f84fbbf63e54d47e95b3ff498d611234fcdfcaa5e4e3cf696289d2 DIST scikit-learn-0.20.2.tar.gz 10275187 BLAKE2B 6865fd101f99930e014f4a2a89616e1ee917df27a5a1b0a931d47503d7df509fe6490799e876a5d68b1cb76a35c6f85e4acbb31a28adfc528720fe9a69e108a7 SHA512 5e0bdea3c40e38880683c6a49cdf2f4c0d40c1f5436c1d8209d613440d5d9d13b9a608e73943a890ef3effaddd930b5c171c45d29700afb8629285ba4aad414f DIST scikit-learn-0.20.4.tar.gz 11684276 BLAKE2B 791fd5c7e3ebfdb9bf01524be46b19341b5750fdc5352de9e50cc395a34cf91551825352f18f235b658b55b38829981884fca9f0535a1c505adeb18ac5d87ceb SHA512 a94c254440641a987df1eaec63302639b8e6f56705ec426c350070658141dd574b502eb1e4b94ae9c766c1becfd911f08bb97d5c87d39b0546d8444ed281b06a -EBUILD scikits_learn-0.19.0-r1.ebuild 2846 BLAKE2B f5ec4d43a2af7fc0c76acec86edb717c7de4a424dc351482e2a579ae29eaca3291a4c302f9c31e87a67acf9a173d180163ef0375419c65a872de2463aaf6b6e4 SHA512 ff0bb216170b8ea1472e68ca8f8451039e7cc8d8589c6c9f88e9c480303c7b11226ca6a5027413f3495572d8146150b1354da196857a040fae5164a207253a91 -EBUILD scikits_learn-0.20.2.ebuild 2869 BLAKE2B 5d31c30890c02139b25724ba6d7ba61ebb331ef91f49536566ed13305901479afcf20d3f513a180c9ad35e9175727c15069305d0defd507ea5c3cba9c5076139 SHA512 afea761a062d61b3ecbef3a7f7c5b51c0faffe49f6157e5a42c3e45b1f83dd45d3ca612229cfde88baf8759004b0b8070358644790773d6aae3a01e1f429c210 -EBUILD scikits_learn-0.20.4.ebuild 2869 BLAKE2B 5d31c30890c02139b25724ba6d7ba61ebb331ef91f49536566ed13305901479afcf20d3f513a180c9ad35e9175727c15069305d0defd507ea5c3cba9c5076139 SHA512 afea761a062d61b3ecbef3a7f7c5b51c0faffe49f6157e5a42c3e45b1f83dd45d3ca612229cfde88baf8759004b0b8070358644790773d6aae3a01e1f429c210 +EBUILD scikits_learn-0.19.0-r1.ebuild 2836 BLAKE2B 06bc03dbe61c8afbf4c83f006d23bd4255979fa7a1091aceb9a78b051dee64f721215122196e66dc93b4a47fdac0337e2a75544693104825ea38879837fbbb30 SHA512 3c87b6a8cc2fd1af8614b809f5ff533d2db2f1d1240162a697aaa392b9143d6ac1e5680d423c104fd71051c70bc3fd4caa874b80a4c866341a6bd70bad575454 +EBUILD scikits_learn-0.20.2.ebuild 2860 BLAKE2B cf81ad4bcb8f98a498a8779cf8584be520a6626350dbee8b240709765611750cecdc8d4fb7801a597723c039a4e72bdecaaab8cab1c1d3aad287e0cfeea0578f SHA512 314c0e025cd30a62f8e47a4608a635c21a3ee0628f4cb288c78520099ce59814663e98aa102aba95ba84d7c27e9d7bf7a9cc00f7a9b780f0209ecce5bae66442 +EBUILD scikits_learn-0.20.4.ebuild 2860 BLAKE2B cf81ad4bcb8f98a498a8779cf8584be520a6626350dbee8b240709765611750cecdc8d4fb7801a597723c039a4e72bdecaaab8cab1c1d3aad287e0cfeea0578f SHA512 314c0e025cd30a62f8e47a4608a635c21a3ee0628f4cb288c78520099ce59814663e98aa102aba95ba84d7c27e9d7bf7a9cc00f7a9b780f0209ecce5bae66442 MISC metadata.xml 605 BLAKE2B 46a657647a79f0a23cc07b39877b1e57158cdf94d9478c3aa4e7af0dbdbf60acf996d1431076697db764d42bec0d5e0517c1247e91dc36e85823a45784d00e71 SHA512 e14b6835108fa80eca44bab635c9a229da65f048ffcee16cd4ad7736c3a0fb364c94ff0bd9630030653bd3cd78d8dced191c43c7e5aacb3a7f6e61ac45b5bb3d diff --git a/sci-libs/scikits_learn/scikits_learn-0.19.0-r1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.19.0-r1.ebuild index 991b1ca7d29e..467c21244943 100644 --- a/sci-libs/scikits_learn/scikits_learn-0.19.0-r1.ebuild +++ b/sci-libs/scikits_learn/scikits_learn-0.19.0-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python2_7 python3_{6,7} ) +PYTHON_COMPAT=( python3_{6,7} ) inherit distutils-r1 flag-o-matic diff --git a/sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild b/sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild index a7cda1c289c1..901e9afe5ff3 100644 --- a/sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild +++ b/sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild @@ -3,7 +3,7 @@ EAPI=6 -PYTHON_COMPAT=( python2_7 python3_6 ) +PYTHON_COMPAT=( python3_6 ) inherit distutils-r1 flag-o-matic @@ -11,7 +11,7 @@ MYPN="${PN/scikits_/scikit-}" MYP="${MYPN}-${PV}" DESCRIPTION="Python modules for machine learning and data mining" -HOMEPAGE="http://scikit-learn.org" +HOMEPAGE="https://scikit-learn.org" SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz" LICENSE="BSD" diff --git a/sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild b/sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild index a7cda1c289c1..901e9afe5ff3 100644 --- a/sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild +++ b/sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild @@ -3,7 +3,7 @@ EAPI=6 -PYTHON_COMPAT=( python2_7 python3_6 ) +PYTHON_COMPAT=( python3_6 ) inherit distutils-r1 flag-o-matic @@ -11,7 +11,7 @@ MYPN="${PN/scikits_/scikit-}" MYP="${MYPN}-${PV}" DESCRIPTION="Python modules for machine learning and data mining" -HOMEPAGE="http://scikit-learn.org" +HOMEPAGE="https://scikit-learn.org" SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz" LICENSE="BSD" diff --git a/sci-libs/scikits_optimization/Manifest b/sci-libs/scikits_optimization/Manifest index acbecf9e3a12..c5c31776b5f9 100644 --- a/sci-libs/scikits_optimization/Manifest +++ b/sci-libs/scikits_optimization/Manifest @@ -1,4 +1,3 @@ DIST scikits.optimization-0.3.tar.gz 25297 BLAKE2B 1001ee772fb115e620f98547332f26f3876b38c9718e9f3c9a47e17863f2efbd6d9f6551da2340fda1ce612b385f757123bd32786764dcd3e287689313cac4ec SHA512 e8f33f4770d9b0514854e36127c53554823a159363c69d1ca0445a05ca9ebc55bc7105b35b2c615bfbef0c63a2b658d628befccb0ab09bcf98d91f8cb4d8be72 -EBUILD scikits_optimization-0.3-r1.ebuild 668 BLAKE2B f62a9f76c1ce2daf74c1bbb9f680d1e5b2b67b0390e2a01d2d5f774a9d264df5572a11ae9ffae2ea831c8ab59247b636f84568286fc55bae9181b89a3bc437f2 SHA512 a9235a1f85a571fb35ed0146d77e8c8f1ee999aee80edd0552118c04a277ef16a318b8573bcf96975999a7e469c7c400221845d08c461fb46e082e09bf49adb8 -EBUILD scikits_optimization-0.3.ebuild 657 BLAKE2B 9fbf57298b6b2c4ada5656cdfb83af65df910b2222f31635d1bd208ff18e7993704cbb03ebd5c66379da43b6c35a59c61e55012fe7fdcfb1d965db16a3682cdf SHA512 cee7de81a15ecb2b9c6b08787ca5f8c04fe3732a6730263508c6af31d062c8fd7cd47745ed2b601254ee7a45e70de0c54f6f2e3834a9e8e3c6fac8107fc405e3 +EBUILD scikits_optimization-0.3-r1.ebuild 658 BLAKE2B de85ebb8be913e8347254fef5ecad1d77aa6ad006ef27dc7c835affa2f50eb24a14a81e780902f19c2c02f70b4dfa3678cd1911390269fd35a338c5aa394c62e SHA512 cb656e293835e86f0d1ca3809f65838f715c0f1d5be544e77a6cfeba10b60e91c03983b25d6a9434fde666517312eeadae77f90cd48bf43a01f9efb153366a31 MISC metadata.xml 441 BLAKE2B 503d22424542fd6a0f363f1a53c9f7fbd3945105ce8139e197266226b38464ce6b22b778d605ac502f9a990eb6e427a3333015c1c0e50b130e3299c17d867d9c SHA512 820c83082ab922e90874e753fee91b8d76d7bad211928dffc011d7ed44e11ca187d2d5fa75933defe673b7293770e6167148779fdfb28986c5784891d6843157 diff --git a/sci-libs/scikits_optimization/scikits_optimization-0.3-r1.ebuild b/sci-libs/scikits_optimization/scikits_optimization-0.3-r1.ebuild index 3dfd78dd6384..a86a8204ee92 100644 --- a/sci-libs/scikits_optimization/scikits_optimization-0.3-r1.ebuild +++ b/sci-libs/scikits_optimization/scikits_optimization-0.3-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python2_7 python3_{6,7} ) +PYTHON_COMPAT=( python3_{6,7} ) inherit distutils-r1 diff --git a/sci-libs/scikits_optimization/scikits_optimization-0.3.ebuild b/sci-libs/scikits_optimization/scikits_optimization-0.3.ebuild deleted file mode 100644 index aefab9cd031b..000000000000 --- a/sci-libs/scikits_optimization/scikits_optimization-0.3.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 - -MY_P="${P/scikits_/scikits.}" - -DESCRIPTION="Python module for numerical optimization" -HOMEPAGE="http://projects.scipy.org/scipy/scikits" -SRC_URI="mirror://pypi/${PN:0:1}/scikits.optimization/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND=" - dev-python/numpy[${PYTHON_USEDEP}] - sci-libs/scikits[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}]" - -S="${WORKDIR}/${MY_P}" - -python_test() { - esetup.py test -} diff --git a/sci-libs/scikits_timeseries/Manifest b/sci-libs/scikits_timeseries/Manifest index 43446f0e7e20..d40aa188f61e 100644 --- a/sci-libs/scikits_timeseries/Manifest +++ b/sci-libs/scikits_timeseries/Manifest @@ -1,5 +1,4 @@ DIST scikits.timeseries-0.91.3-html_docs.zip 907495 BLAKE2B e06c295bb4b093c2d7d5e767a8c03cb71e84ef3207790203c920ad9a9d57488f926c7a761ffb41fbc6829a9847327d40fa202776fa36fe473663066e41ecdee4 SHA512 9fb474e2a13dee865801fa5aa5f05bb74ea2387b7e14d716210898d9b338b63b7f1935f7a5514d72ffcd6f4a8552054094244fab199e18c819815d4b19cd3f23 DIST scikits.timeseries-0.91.3.tar.gz 323771 BLAKE2B 74c14a1ec903dd02f8b3134867d4e371bac00d1a7b22de38962c3ca27afb603296b415e3ab2f21114b9c34890c24ea10379e5465d557778c6c794470235a311e SHA512 ea7292bf4d9bcce416b6f0e2c99fc40afe97a3a0210c535bd68f43a4a553d8a30cb77ce00f96ffc26340d5ff837faf5d480ea775385769495eccb5a196a88617 -EBUILD scikits_timeseries-0.91.3-r1.ebuild 1120 BLAKE2B 786204c02e544a40181b379465a04e77e81d661d26f21920e8d13923051a7c1958bd17a1930982ebe24054928c23bbb6ab4e58208dbad18c99da15308ddee7e6 SHA512 cb788db3f4233d299b101038f56f92c636a475532e6a343dc0dce8125bffc23dbbb0b8427ee43a78f457756efc47cdd4886100c5b7de4762a4e23cefc08246c7 -EBUILD scikits_timeseries-0.91.3-r2.ebuild 1131 BLAKE2B 5347a14ac976d2bdaf904f5c620be3f39d3464032e932eb7759b5dd83244a5ec8723b45e831a089431c7cedc5cc9e5322387757dda2b46c8d7eee8205209f8cb SHA512 0c45cbe34c455479a5ad61f8320218a88244bb4dcc5f26423de40291e4dfa633a117c21b5be7cf4c1498c326119c270d925f283491c00a513b1544dbb8f3290c +EBUILD scikits_timeseries-0.91.3-r2.ebuild 1121 BLAKE2B 22697059322eb61c6707906f02be976810941232352a1c85c8a58870e2522d4d6a0abde6557e5e07875b96974bd1a7f89e2da5dccd374ea9b58d7338536aebd2 SHA512 09397a2f16c28a1270a4a4d064cc1420c87b4a4e8c4a8b139018903fedec460c9956d268fd17dc6e710a46952f951489ecdfdaf3524ef82b1c51f6dffaf70a8a MISC metadata.xml 673 BLAKE2B 432205d6049ba9bcc3355436a0017b30b66c0865afed8900e5f62846885050958ff193d2524fb9818141dca6cce2a912cf11cea4075a10abce4ed6bff3964f28 SHA512 1bd1de5dfc98873bf2df5d6fa42a02b5d4c0736d965b712909ccb991d8caff4fc71827bc292643a659566c64578e2a52a780ddec2eead4339d3481683b778d43 diff --git a/sci-libs/scikits_timeseries/scikits_timeseries-0.91.3-r1.ebuild b/sci-libs/scikits_timeseries/scikits_timeseries-0.91.3-r1.ebuild deleted file mode 100644 index 12d23e7fb048..000000000000 --- a/sci-libs/scikits_timeseries/scikits_timeseries-0.91.3-r1.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 - -MY_P="${P/scikits_/scikits.}" - -DESCRIPTION="SciPy module for manipulating, reporting, and plotting time series" -HOMEPAGE="http://pytseries.sourceforge.net/index.html" -SRC_URI=" - mirror://sourceforge/pytseries/${MY_P}.tar.gz - doc? ( mirror://sourceforge/pytseries/${MY_P}-html_docs.zip )" - -LICENSE="BSD eGenixPublic-1.1" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc" - -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )" -RDEPEND=" - sci-libs/scipy[${PYTHON_USEDEP}] - sci-libs/scikits[${PYTHON_USEDEP}] - dev-python/matplotlib[${PYTHON_USEDEP}] - dev-python/pytables[${PYTHON_USEDEP}]" - -S="${WORKDIR}/${MY_P}" - -python_test() { - esetup.py test -} - -python_install() { - distutils-r1_python_install - rm "${D}"$(python_get_sitedir)/scikits/__init__.py || die -} - -python_install_all() { - use doc && HTMLDOCS=( "${WORKDIR}/html" ) - distutils-r1_python_install_all -} diff --git a/sci-libs/scikits_timeseries/scikits_timeseries-0.91.3-r2.ebuild b/sci-libs/scikits_timeseries/scikits_timeseries-0.91.3-r2.ebuild index f67ebf2a2efc..b1dd82b36296 100644 --- a/sci-libs/scikits_timeseries/scikits_timeseries-0.91.3-r2.ebuild +++ b/sci-libs/scikits_timeseries/scikits_timeseries-0.91.3-r2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python2_7 python3_{6,7} ) +PYTHON_COMPAT=( python3_{6,7} ) inherit distutils-r1 diff --git a/sci-libs/shogun/Manifest b/sci-libs/shogun/Manifest index 7cee43439a10..d4cb18146d65 100644 --- a/sci-libs/shogun/Manifest +++ b/sci-libs/shogun/Manifest @@ -2,5 +2,5 @@ AUX shogun-4.1.0-remove-C-linkage.patch 825 BLAKE2B c95a7a322b669aa51a9a33470088 AUX shogun-5.0.0-fix-buildsystem.patch 2889 BLAKE2B 63593dcf5f077310c31983446d5060c15c23d45d3eb5e3780c0d7a53074ccef57da79fb115ce67b109ed94f2e58aa1e5804bdbd1d0d0a13c05de716de7ed1058 SHA512 3119a95e8fe76804eb113361e09260bbb951679faeb3360d378c0a9afcdbf322ac75f02da6e4c799102949abbd97006f2bbb7550b5f5b01fa8b4335ac530f377 DIST shogun-5.0.0.tar.bz2 2448509 BLAKE2B 85352d782740b4c671bb6081e0445bb7e801e27e36fdc0f82658b937fd6658c41016e4a91841ddb09ae9062b77d32f290f56b191318c1c34bf0812d1b9a8b364 SHA512 fa8d9dee4596acce12022540a6927cbdb62e08f8468c8be3790de07ebf3a53055032bcc532b28334ca83284c38f2b0153602634f12bafe4019acb9121b9ff236 DIST shogun-data-0.9.tar.bz2 287533841 BLAKE2B 796830262205961b88715f4eb60a47ff2ad108426b7af8e4e1a0733920962ad8154a1ab9892356e9793be24d415fcbc358960210f089a0173f55a0091ea3c0d1 SHA512 ab501640e2db650603899c857866b451fac5c7bbbc7b4ef98559581928869cea49aa326dfca1bb398eee7ebc8843dcc8ee3105c9f462718f1af672aac6b9340a -EBUILD shogun-5.0.0.ebuild 3882 BLAKE2B ebf718e3ef0dd9faedd09f38e2974cb163c6f772b9676362b35e9aed4af4301b10aaf63fafcab12732d30659aadb41944d0fb5ebca307935ec51701c57930e90 SHA512 c60bfb0cea35340e05c210b905cc5bb16ce887ac9b932fd0b8d5a8fc93456886ebbeafb4540110d1f53a849b40ad204ff79e40123f2b94c343b51e4f65be4524 +EBUILD shogun-5.0.0.ebuild 3873 BLAKE2B 72234d886953a021559cf62f1ab039034fdbd459fe993124af2815463c5f50f2388bcc63378388ef0d7e29ed7dd8fcd7c0e4b49836c351d33ec2e8c389a4109e SHA512 867f7b252ff41751beb437a2a4698395723cb53ba72b14b8e17b59349f270acc12c95d074362dac75264ba9dd7763401e13901085aea67512b05ccd14cf1389f MISC metadata.xml 1627 BLAKE2B 871fc71cd8ae67ef94fa060b50f249b233333ec934db4d8ad238f24408e491f071d1271903f57ad2548923b2091c0f2738a7ce3f269d5c24fd10300aaf179047 SHA512 babaf4f8a5d4a7d83e678d2ba1cb4f29a15a928740e7c2b312fe03ffd2c909f1f867a071573954269a03bd8f915f38f82c4c11782573ae08be6ec053cf3b54c6 diff --git a/sci-libs/shogun/shogun-5.0.0.ebuild b/sci-libs/shogun/shogun-5.0.0.ebuild index 82a612f37075..3bca4c41c568 100644 --- a/sci-libs/shogun/shogun-5.0.0.ebuild +++ b/sci-libs/shogun/shogun-5.0.0.ebuild @@ -3,7 +3,7 @@ EAPI=6 -PYTHON_COMPAT=( python2_7 python3_6 ) +PYTHON_COMPAT=( python3_6 ) inherit cmake-utils flag-o-matic python-single-r1 toolchain-funcs versionator @@ -11,7 +11,7 @@ MYPV=$(get_version_component_range 1-2) MYPD=${PN}-data-0.9 DESCRIPTION="Large Scale Machine Learning Toolbox" -HOMEPAGE="http://shogun-toolbox.org/" +HOMEPAGE="https://shogun-toolbox.org/" SRC_URI=" ftp://shogun-toolbox.org/shogun/releases/${MYPV}/sources/${P}.tar.bz2 test? ( ftp://shogun-toolbox.org/shogun/data/${MYPD}.tar.bz2 ) |