diff options
author | Patrick Lauer <patrick@gentoo.org> | 2012-11-27 13:35:30 +0000 |
---|---|---|
committer | Patrick Lauer <patrick@gentoo.org> | 2012-11-27 13:35:30 +0000 |
commit | 1266c6099f4ebd594fc4ab6038984413d19121bf (patch) | |
tree | cf9b607fb2f845870d1fa3818a4879ce71bac339 /sci-mathematics/msieve | |
parent | Fix HOMEPAGE and SRC_URI links (diff) | |
download | historical-1266c6099f4ebd594fc4ab6038984413d19121bf.tar.gz historical-1266c6099f4ebd594fc4ab6038984413d19121bf.tar.bz2 historical-1266c6099f4ebd594fc4ab6038984413d19121bf.zip |
More improvements, quiet output for nfs
Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Diffstat (limited to 'sci-mathematics/msieve')
-rw-r--r-- | sci-mathematics/msieve/ChangeLog | 8 | ||||
-rw-r--r-- | sci-mathematics/msieve/Manifest | 4 | ||||
-rw-r--r-- | sci-mathematics/msieve/files/reduce-printf.patch | 62 | ||||
-rw-r--r-- | sci-mathematics/msieve/msieve-1.50-r3.ebuild | 57 |
4 files changed, 129 insertions, 2 deletions
diff --git a/sci-mathematics/msieve/ChangeLog b/sci-mathematics/msieve/ChangeLog index a1a6b3c874a1..0af14317f195 100644 --- a/sci-mathematics/msieve/ChangeLog +++ b/sci-mathematics/msieve/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sci-mathematics/msieve # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/msieve/ChangeLog,v 1.5 2012/11/25 06:22:38 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/msieve/ChangeLog,v 1.6 2012/11/27 13:35:18 patrick Exp $ + +*msieve-1.50-r3 (27 Nov 2012) + + 27 Nov 2012; Patrick Lauer <patrick@gentoo.org> +files/reduce-printf.patch, + +msieve-1.50-r3.ebuild: + More improvements, quiet output for nfs *msieve-1.50-r2 (25 Nov 2012) diff --git a/sci-mathematics/msieve/Manifest b/sci-mathematics/msieve/Manifest index a79c873d9dac..3bf5246b749f 100644 --- a/sci-mathematics/msieve/Manifest +++ b/sci-mathematics/msieve/Manifest @@ -1,6 +1,8 @@ +AUX reduce-printf.patch 2105 SHA256 b576d46577c411b1ad814ab48e4fce595927b225e93e311789e6f2135a68a01e SHA512 c0ee9ddbbb41a25a48ec4b6cc80cf6a8afee35a723aee74eb7d7bfa01b545eff1713eaf2077ace7d2a9aca97f00aa42bc36e6d23d7d229f339de1f152316af98 WHIRLPOOL 75a55e0ff6da1e99c96bb2395ce75fbfac1aad1c3bfaf4bb924c957bc821141afd4a805e79bbd4fb47ebeae101c488a2291ca900198fb25cc8f94badfc1eb139 DIST msieve150src.tar.gz 547458 SHA256 42e58975fe03ba8d3ffae096962aa4d53d381aa0f9cfb5e6244da11eadcce676 SHA512 f6a722d2dd87c44f07ec713b35cf22efdeb1149e06b2e8c02abefc0681a0c2b9dc68cad97a39f8fa84f739ad67993699eaad84c105ad7a01ca56da540b24dd03 WHIRLPOOL 6886e643f93d1426b794b53ca95f1e5ae18b69d653f71c00a1a2c481035142afe302a37709b4f8825239a8e1d6bc65c5e6fdda7f47219ca0e7c40e8ad1475c36 EBUILD msieve-1.50-r1.ebuild 1271 SHA256 72511c405a69609abe99fb51c912a5122ed7cb3d506159e0b19873ed0e86b106 SHA512 42b8da23dbf156b54887ce7eb3c1159c3558523a2a0a600541076e76a3ddc9bc5ee2fb8ad48c49280097faec0ae794bcf4139a86797f62d9bf64170e8a3e2e44 WHIRLPOOL c713e7b927c143d6e7b22eb175a559aee90ec3b181d195ef780700fd3495b8d89dea4b7a79a29f7b468bf6bdde013b4ce4c5d2667cbb065f90ec62d451b94e91 EBUILD msieve-1.50-r2.ebuild 1428 SHA256 fb3c770c2d82f903e32361d0b9c3df38f81e04b8259b6ae7ed5536f80e247d5e SHA512 e745946fd5fc7a3f36b1ad4d9d2c1f7f0c97b0b82cd92207e3aded0b527d818c29e5472a36fb44d85cdce685e80698a6427a8509ae2e7fa3e7b2d61a4b6d0627 WHIRLPOOL a6c90dbc84c1144fd84572855fec764ebeb603aea37a85a2ddb230d84906925dd48cf5ecbe5f44dbf47a0a9cbcc69957ee26e9be44fd1acef33646a0bcb3a9dd +EBUILD msieve-1.50-r3.ebuild 1540 SHA256 cba855339a134dc134aff7eca0ea1344904d3fe5c74374ab8d9516867b5117d7 SHA512 641f175f9ca3f80670dfa86a99a36ad51705af6cfdf5c20ffc3b2430e21eaa951b1ff3303af27cf2de15637d04c7d7c833cfcdb1b0276d8f602d75fbfed33771 WHIRLPOOL 6de9b55cd1d02b1a6b71183384ef58ba788e73eccaecc2106193999e345890346e71f7d5d335a78c0d9b9130f95afe5d06de27511257037d6d1cbee3e6e4607e EBUILD msieve-1.50.ebuild 1256 SHA256 b75b91bfde9a4eb76e7d6d4b88a0540a2d1651ae7d25255f24fb029ddabf91c3 SHA512 5b211f37581b8f8a103c53e9dd41630bce5b64c3c64394d50f414bae3e3bf81c47dc5d221e896c2a8bca4f3c6cfec3590043bf971988eb76dc69a23abdc5720c WHIRLPOOL a775aebf33bcdca8840b3bdd178fa26fe7a5f6fd31ef38e4e41e6ad05bcabe2d6180f5a7deb67ed6ae5f182fad2b3ac374d7fe7752da44fb53097b264837da36 -MISC ChangeLog 866 SHA256 7997c028c4eee38daddce6d05377df58e6fdf80653c78bac689a2e7f0268f9e4 SHA512 a9487028b698cbc27b1e044f1d236837faf9c83513ca780f3d56818f958fe3e41830162b33e302c456b2a24f314602988a34d24f984cec247b8ab5a12e45eb8c WHIRLPOOL 3ffc0c37fe1f4f33b116b990f55d23ba781e782bcd2a938bc72c11d0b73b5f0e4fb848974178f1d58556f9ee133eb74e9f6af69a97febec4e2b73f95ff715c36 +MISC ChangeLog 1044 SHA256 9b13467e2712ed06ec443d7abaf8fda0147a417646622fab845ee001bb43f428 SHA512 d9492119f210c3db5658ae9cc7ebc285b8144caf2e8f01c4881a85d7a5a15ad1d46d9193963762993ffe768a3b6426d057b3a2a1ddb7e932f4d8a82e8fc5d053 WHIRLPOOL 9506a71e697b4b077ba012abdc94d12576c5735296933cd2749d1426d78532a51b22ac57ef222f11299c069aa1c44bafe6c660da65f6433f6ca04555db9f95c2 MISC metadata.xml 313 SHA256 cd226e0c19b92e49618bd4fe78419349e9821735756d4b1e19dcf52e8a62c5cb SHA512 bc088c0f8d8cb0ecdd4fd65082d618d6a0acefe855ee426c34b36da5dcdd93e39052de80cbb94cd8ca0803caaa3e4664b01a127d869c326a446163011c74169f WHIRLPOOL 08ede2862edbced89cd8faaa42f76410d7a8214e303bbb2885761aa45b9f3dca0eb4eb19333e46c508645d5daadf3bef887ac9dd1a3a4221ae7859ec819c5481 diff --git a/sci-mathematics/msieve/files/reduce-printf.patch b/sci-mathematics/msieve/files/reduce-printf.patch new file mode 100644 index 000000000000..dad1dc7db8f3 --- /dev/null +++ b/sci-mathematics/msieve/files/reduce-printf.patch @@ -0,0 +1,62 @@ +diff -Naur msieve-1.50/common/minimize.c msieve-copy/common/minimize.c +--- msieve-1.50/common/minimize.c 2011-07-04 23:32:33.000000000 +0800 ++++ msieve-copy/common/minimize.c 2012-11-26 23:09:22.889240528 +0800 +@@ -210,7 +210,7 @@ + } + } + +- printf("too many line iterations\n"); ++ //printf("too many line iterations\n"); + *min_out = x; + *status = 1; + return fx; +diff -Naur msieve-1.50/gnfs/poly/stage2/optimize.c msieve-copy/gnfs/poly/stage2/optimize.c +--- msieve-1.50/gnfs/poly/stage2/optimize.c 2011-10-15 23:03:39.000000000 +0800 ++++ msieve-copy/gnfs/poly/stage2/optimize.c 2012-11-26 23:14:36.243232414 +0800 +@@ -390,7 +390,7 @@ + score = minimize(best, num_vars, tol, 40, + objective, &opt_data); + +- printf("i %u score %le\n", i, score); ++ //printf("i %u score %le\n", i, score); + for (j = 0; j <= rotate_dim; j++) { + double cj = floor(best[ROTATE0 + j] + 0.5); + mpz_set_d(c->gmp_help1, cj); +@@ -422,7 +422,7 @@ + tol = 1e-5; + score = ifs_rectangular(apoly.coeff, apoly.degree, + best[SKEWNESS]); +- printf("transition score %le\n", score); ++ //printf("transition score %le\n", score); + } + } + +@@ -430,9 +430,9 @@ + #if 0 + printf("norm %.7e skew %lf\n", *pol_norm, best[SKEWNESS]); + for (i = 0; i < 2; i++) +- gmp_printf("%+Zd\n", c->gmp_lina[i]); ++ //gmp_printf("%+Zd\n", c->gmp_lina[i]); + for (i = 0; i <= deg; i++) +- gmp_printf("%+Zd\n", c->gmp_a[i]); ++ //gmp_printf("%+Zd\n", c->gmp_a[i]); + #endif + } + +diff -Naur msieve-1.50/gnfs/poly/stage2/stage2.c msieve-copy/gnfs/poly/stage2/stage2.c +--- msieve-1.50/gnfs/poly/stage2/stage2.c 2011-10-09 09:32:49.000000000 +0800 ++++ msieve-copy/gnfs/poly/stage2/stage2.c 2012-11-26 23:14:30.894232552 +0800 +@@ -122,10 +122,10 @@ + } + + #if 0 +- gmp_printf("%+Zd\n", c->gmp_lina[0]); +- gmp_printf("%+Zd\n", c->gmp_lina[1]); ++ //gmp_printf("%+Zd\n", c->gmp_lina[0]); ++ //gmp_printf("%+Zd\n", c->gmp_lina[1]); + for (i = 0; i <= degree; i++) +- gmp_printf("%+Zd\n", c->gmp_a[i]); ++ //gmp_printf("%+Zd\n", c->gmp_a[i]); + + printf("coeff ratio = %.5lf\n", + fabs(mpz_get_d(c->gmp_a[degree-2])) / coeff_bound); diff --git a/sci-mathematics/msieve/msieve-1.50-r3.ebuild b/sci-mathematics/msieve/msieve-1.50-r3.ebuild new file mode 100644 index 000000000000..0e688b91f8ab --- /dev/null +++ b/sci-mathematics/msieve/msieve-1.50-r3.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/msieve/msieve-1.50-r3.ebuild,v 1.1 2012/11/27 13:35:18 patrick Exp $ + +EAPI=4 +DESCRIPTION="A C library implementing a suite of algorithms to factor large integers" +HOMEPAGE="http://sourceforge.net/projects/msieve/" +SRC_URI="mirror://sourceforge/${PN}/${PN}/Msieve%20v${PV}/${PN}${PV/./}src.tar.gz" + +inherit eutils + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="zlib +ecm mpi" + +DEPEND="sci-mathematics/ggnfs + ecm? ( sci-mathematics/gmp-ecm ) + mpi? ( virtual/mpi ) + zlib? ( sys-libs/zlib )" +RDEPEND="${DEPEND}" + +src_prepare() { + # TODO: Integrate ggnfs properly + epatch "${FILESDIR}/reduce-printf.patch" || die + sed -i -e 's/-march=k8//' Makefile || die + sed -i -e 's/CC =/#CC =/' Makefile || die + sed -i -e 's/CFLAGS =/CFLAGS +=/' Makefile || die +} + +src_compile() { + if use ecm; then + export "ECM=1" + fi + if use mpi; then + export "MPI=1" + fi + if use zlib; then + export "ZLIB=1" + fi + if use amd64; then + emake x86_64 || die "Failed to build" + fi + if use x86; then + emake x86 || die "Failed to build" + fi +} + +src_install() { + mkdir -p "${D}/usr/include/msieve" + mkdir -p "${D}/usr/lib/" + mkdir -p "${D}/usr/share/doc/${P}/" + cp include/* "${D}/usr/include/msieve" || die "Failed to install" + cp libmsieve.a "${D}/usr/lib/" || die "Failed to install" + dobin msieve || die "Failed to install" + cp Readme* "${D}/usr/share/doc/${P}/" || die "Failed to install" +} |