diff options
| author |   Thomas Kahle <tomka@gentoo.org> | 2015-04-05 11:19:46 +0000 |
|---|---|---|
| committer | Thomas Kahle <tomka@gentoo.org> | 2015-04-05 11:19:46 +0000 |
| commit | 75b579f62664a810c073d77c1cbd087680448b7a (patch) | |
| tree | cc4e8fe48a06aaff4353d28e5c8d51fd0f89a09c /sci-mathematics | |
| parent | x86 stable wrt bug #545510 (diff) | |
| download | historical-75b579f62664a810c073d77c1cbd087680448b7a.tar.gz historical-75b579f62664a810c073d77c1cbd087680448b7a.tar.bz2 historical-75b579f62664a810c073d77c1cbd087680448b7a.zip | |
Fix ntl compatibility (bug 545318)
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x565C32BC
Diffstat (limited to 'sci-mathematics')
| -rw-r--r-- | sci-mathematics/flint/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-mathematics/flint/Manifest | 11 | ||||
| -rw-r--r-- | sci-mathematics/flint/files/flint-2.4.5-ntl62.patch | 13 | ||||
| -rw-r--r-- | sci-mathematics/flint/flint-2.4.5.ebuild | 7 |
4 files changed, 28 insertions, 9 deletions
diff --git a/sci-mathematics/flint/ChangeLog b/sci-mathematics/flint/ChangeLog index 1541422fc069..d567eae7909a 100644 --- a/sci-mathematics/flint/ChangeLog +++ b/sci-mathematics/flint/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-mathematics/flint # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/flint/ChangeLog,v 1.13 2015/04/03 10:03:43 tomka Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/flint/ChangeLog,v 1.14 2015/04/05 11:19:35 tomka Exp $ + + 05 Apr 2015; Thomas Kahle <tomka@gentoo.org> +files/flint-2.4.5-ntl62.patch, + flint-2.4.5.ebuild: + Fix ntl compatibility (bug 545318) 03 Apr 2015; Thomas Kahle <tomka@gentoo.org> +files/flint-2.4.5-gmp6-compat.patch, flint-2.4.5.ebuild: diff --git a/sci-mathematics/flint/Manifest b/sci-mathematics/flint/Manifest index e24e2250fc68..f19defc04946 100644 --- a/sci-mathematics/flint/Manifest +++ b/sci-mathematics/flint/Manifest @@ -6,6 +6,7 @@ AUX flint-2.4.3-libdir.patch 1215 SHA256 def40bcf963341d11982f0ce2bd04567c0381ac AUX flint-2.4.3-whitespaces.patch 1929 SHA256 e11afffa161207f73f905040dbede8246b4d96e2698ec780c9e1e1890f23bf71 SHA512 4bfa3bf3d7393ab577988b4def04fb2fe4107679a8f3eb2db7fd2c900d6ba0b79e685f5357d5d99633ea6eb8e4c7c38530f69f35fcfa250d6751e3d1f41a025f WHIRLPOOL 27b87df0bac1e74555c9f83cde575d1eaaeeec2a18245bd3df92b57b1c019168b33140275b18b7d89f67a69d0f3a488812e4a655d43d461fb6f34c6823d1ef86 AUX flint-2.4.4-test.patch 709 SHA256 41ba827bffa88c62ecdb93a2a7b1ddd01a3ad395e36b34b93a05c7c26e76ee57 SHA512 46f66ef5104b535c0004b63cac30bd0dcd66ff554502387597d0ab5f8d7a8189431872510c0666ad99dd7c15ec7756a87b670ef162ad6b085150c6eee7a7a376 WHIRLPOOL 29d73e80b43b06e7111dae44722967b5910850f7416aa03e5fd054aee8009a256fdf05e49b61370b8d4f9dd91aef1a5fc9535822c870cc9217fe45f75a2ee618 AUX flint-2.4.5-gmp6-compat.patch 3495 SHA256 57e2ec6769844cada6a8cffda9da3ad9c323e945e10ab00b10d921152a0707b2 SHA512 e7caf37d900380eacb5bea67be1d2e78a1468b92dd21c052d8d5b5d362782425b52107cc97dc68ef73e0da494071f01e980e6b1fafed5bfc8a090f8b9e7e5c3b WHIRLPOOL 3d76de9620b213417cd97be2a937ddad96000c8f03ea0eb559d3659915c54d90b5282f504669f9b59acfb14ebe550cbc102890442f5bf36418a65b73c443f255 +AUX flint-2.4.5-ntl62.patch 454 SHA256 e4dc970d1aaea39621215843eb92643a5c5b27e66c8378d30229546f10588322 SHA512 c19092d0dd4060469e383aa0844cff40ab55d9f4dda77edf5f8dc7f1a8ad833541cdf92d196fc6b21ad43fadcba6d70d0ace4574e1c6828d2c25d9f74094fbb0 WHIRLPOOL ba14c88a1b661f35a2f23cad271bce7206d995831b85d10f106cefa9ab2afb8e9beafcdb4aa77aa3e530f92a0034b75da7e9fde0c3a90774229b3f6ba11ef72c DIST flint-2.3.tar.gz 830837 SHA256 6bb059048f822dc9291567949f1baed8c77f337ff2601e91a8e9d20936291a75 SHA512 8b5cb41ef9616c984554f7085dcd914d8d91b0f8b3964939c740336e79cfcc6e81fc9135084845615f56429952a4fc0eb3960c6df13d5f779c997c3b53763e56 WHIRLPOOL 12ee4c4e6efadbe2913783fcfe7583f084c6c10777e04293de6748cf177423f7652e5cd8bcdd0f412be73a40f4c5fc744a84c0de89f6c1ff527c20e55e102258 DIST flint-2.4.3.tar.gz 1636527 SHA256 93585cd321c5a2fad053c903ba7cd947f54de71d31cf1dd1af6814906c1ee763 SHA512 d7cecb7116c458f554e09524b9df25784ed32f889a4d83a3fc6fbf16f08ace68890b3a748a8b1b03e543c121994ed7e5efbdca9e7dbb694a4571c8d25e983aa9 WHIRLPOOL 4ec1ce3447218c9a45a9548284b7948714327bf264e9087d7c0687936a586cb96eb921079770d78c482af158ca78c65193ccbf489a789771ae527eed4d75d588 DIST flint-2.4.4.tar.gz 1639262 SHA256 c4799e9394ef06d7b8625f7fd74ba2d8ca115dbb2aa506dcc6e369b49d0e5bc7 SHA512 236997cf64bdc96741740889f450fdbaf7d7e9b58252645f864d28005c9e7bdf87f7187cd17526606c605f0489f026398a1361b8f209f71158ca3b31c42d86d2 WHIRLPOOL 299820bc656e955d54dd06be3a1ba68440e8d9c72785ac54e7d9559da073b31c07b73598c9b18c98889f836dfd25ed8cd96d62a901a12a529698ae00ba30f1d1 @@ -13,13 +14,13 @@ DIST flint-2.4.5.tar.gz 1640022 SHA256 e489354df00f0d84976ccdd0477028693977c87cc EBUILD flint-2.3.ebuild 816 SHA256 8bea0e8340b2d6c5197e1ac93fb71e64e84ec5d1cc50a3ac72e0e8ba84eca575 SHA512 844d698e5a10133960b662bffdeffccd7b9696cc3932462d744455e27321fb08bb56c3ac39d91b628282d3958c34d7c892808468453a18c36e207a64ec0a6233 WHIRLPOOL b4aa7a8bbfdc1620cefa04168afe94c21373e56c704e5bae66eb9dda23e2dab68bf69736a85238092f6df8c18385dc4a0aba057a5d99adf6be963deb205e7a45 EBUILD flint-2.4.3.ebuild 1413 SHA256 42f6f0b9e043953bc258d1418977b887544c4992c5c0b162e9318bdfa8924ef3 SHA512 2402f6a6f57d4882c74b459d8e38fc5c321c0643607335c87f3ddf6bcbb7b472d0c7fc22f6eeb5160af1ae9cfbbb2820ed33512c46afe0e596200b90dd022b7c WHIRLPOOL e6e6873575a3f71ddb8080204e5fb95881fa8e0c185dff5e808d080e08dcc4a8a05e8d2b3d5ccc03e83183c6cbbe6e5ed6ebd9ca3126d96d31f45eac8278eae1 EBUILD flint-2.4.4-r1.ebuild 1521 SHA256 bb5571f87cfc8cbd9f2249b83e13dfb9b4da9827655cadc185d4abb7e8ec2f68 SHA512 ec20608b8e5994fe5a3b9598a44265dbc4a235ce4cc2b0f5eb3a9581190594ead48b0ebb69d45d425a16d96ebeaa3836fd71c3d9925cb62e1a8111d9f8ddc3c3 WHIRLPOOL 6ae3f7c5811576dc67fc10e0bb8460a7c2b95f648151938c178262003f46452812d669ac6ffe338a5476da4434b074102f3f989be489e697de4abbc18cb07837 -EBUILD flint-2.4.5.ebuild 1566 SHA256 3dd5c36afae5aea26f12ab6bd9370d2b7745651b0ca074765c1f2e8f804c2a7b SHA512 c45478502ee6c05bfb638b681d1594e54fd66840e312ad77dd83b91987668cab40723419e468cc2b6dd7f65b6a5f0d8112767317d40c3ceb84d7b8b2564f4606 WHIRLPOOL 2b92e35afdf6e74c0b3f44ae91c14a00de76d4c0569e2d8e5f1c6cb32e5b1840981c09ef87cc96228a4381be3b91decbf473042c56267ff5376d65d181a76608 -MISC ChangeLog 1895 SHA256 098e19ee755754ab798f535ca25944a96e4ee5b9e4de02409dc85334aefb66dc SHA512 fb033a30706724220536f08dc53a8edabfbe891552df278f95269c109399ace8ddb8b82fc89c3fafbb232115c87b42404a4c57c6c084d0e1e05c0841d6ae2297 WHIRLPOOL 73dfa62adb1c64dd4f9ac881a4e78c73604f4c9c73895d9501b95af9556ada13f028e54e4ad53b825f1791cabd732ebdffb696c531994faa1cb302dc705929ab +EBUILD flint-2.4.5.ebuild 1605 SHA256 939de29b114078c12221df7bd645f08df4a18aacfbd720322f69fbfd042493f5 SHA512 b0ce508ea03039ac7e33c34cd87dc3fbd31e11d974a89ee5eeb19bee16e65f5f46ee34de67e53edb90e4da7ec02953a56533ff4e290607b26be6eee9f40609e4 WHIRLPOOL 86ace74e3e562db6807a0b8de3233a6d9016af1d5716668f0479187cea8a9ff8a9a5d9238efe34a196695b9e3128dbe2f6625e2ea6c0fd3e9c54f25c74e7e3ab +MISC ChangeLog 2034 SHA256 0cbf5344cf945ccd4e168451219af7c7ab3e168209abc92db0292116f4e2f10d SHA512 51e6a829ed7fbc519e5109306d89c9a339c0480de321929f5ac4481afb71b6e2fbe072bacc1675d5dc39690ba60d37f25593c70925c346796daef99e6a2db005 WHIRLPOOL c37d0d8a42ef5456fb50ad983b315d019a54c79eb5724fa08a0969a26cafded8215364bd29f53e7231e6137f7f175d7a2aaef7c6cf149ba393e3256f7f1a8b27 MISC metadata.xml 467 SHA256 6c05803599698bc9cbb50c53a5b538f9b46468c8a49097a20d6034f0d2d26bff SHA512 025dff9514c28ea67629a0bd164abce9e339c48296afa3158368e86c7bd253202bad1c34e066040abb5c16c88f33cd4bd01ae7efc4956a0d8fa286c7fa1a003d WHIRLPOOL 40aa042e1447988965c94e379251abc2a1bd2ab64e5b14d056aa90b4f7b8f32422b84d18868949eaf9ee3867ddb71358834ed4c77966dd4f411a6e0a227ed3f9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iF4EAREIAAYFAlUeZgMACgkQid6yGVZcMrw+HQEAuwU/pPiM1bFvkrqa1JgiuE74 -XU9gLjkG5x7SzQkzmGcA/3UOBN7u2Yu2tq9VCBjD8FHqKmRl5UG9dv/bvR5YDtRo -=RptJ +iF4EAREIAAYFAlUhGtMACgkQid6yGVZcMrxSGwD+L6hElNoXedjnDZKTIeNYN9At +heuD06y64Ett76B8XXABAKKNA6YxHZagYsmn+8/6HwQYCjCYRpuSey8zA3OBcmYO +=CO7j -----END PGP SIGNATURE----- diff --git a/sci-mathematics/flint/files/flint-2.4.5-ntl62.patch b/sci-mathematics/flint/files/flint-2.4.5-ntl62.patch new file mode 100644 index 000000000000..e08fa774e298 --- /dev/null +++ b/sci-mathematics/flint/files/flint-2.4.5-ntl62.patch @@ -0,0 +1,13 @@ +diff -druN flint-2.5.orig/interfaces/NTL-interface.cpp flint-2.5/interfaces/NTL-interface.cpp +--- flint-2.5.orig/interfaces/NTL-interface.cpp 2014-07-16 07:50:40.000000000 -0700 ++++ flint-2.5/interfaces/NTL-interface.cpp 2014-08-26 07:51:55.585884615 -0700 +@@ -32,9 +32,7 @@ + #include <NTL/ZZ.h> + #include <NTL/ZZX.h> + #include <NTL/mat_ZZ.h> +-#include <NTL/lip.h> + #include <NTL/ctools.h> +-#include <NTL/g_lip.h> + #include <gmp.h> + + #include "flint.h" diff --git a/sci-mathematics/flint/flint-2.4.5.ebuild b/sci-mathematics/flint/flint-2.4.5.ebuild index 76fe6e9fb607..77534bcd488e 100644 --- a/sci-mathematics/flint/flint-2.4.5.ebuild +++ b/sci-mathematics/flint/flint-2.4.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/flint/flint-2.4.5.ebuild,v 1.3 2015/04/03 10:03:43 tomka Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/flint/flint-2.4.5.ebuild,v 1.4 2015/04/05 11:19:35 tomka Exp $ EAPI="5" @@ -19,7 +19,7 @@ IUSE="doc gc ntl static-libs test" RDEPEND="dev-libs/gmp dev-libs/mpfr gc? ( dev-libs/boehm-gc ) - ntl? ( <dev-libs/ntl-8 )" + ntl? ( dev-libs/ntl )" DEPEND="${RDEPEND} doc? ( app-text/texlive-core @@ -32,7 +32,8 @@ src_prepare() { "${FILESDIR}"/${PN}-2.4.3-whitespaces.patch \ "${FILESDIR}"/${PN}-2.4.3-cflags-ldflags.patch \ "${FILESDIR}"/${PN}-2.4.4-test.patch \ - "${FILESDIR}"/${PN}-2.4.5-gmp6-compat.patch + "${FILESDIR}"/${PN}-2.4.5-gmp6-compat.patch \ + "${FILESDIR}"/${PN}-2.4.5-ntl62.patch } src_configure() { |