Reducing output verbosity some more

Package-Manager: portage-2.2.0_alpha143/cvs/Linux x86_64

5 files changed, 101 insertions, 4 deletions

diff --git a/sci-mathematics/msieve/ChangeLog b/sci-mathematics/msieve/ChangeLog
index 488971f05727..e9475cab6873 100644
--- a/sci-mathematics/msieve/ChangeLog
+++ b/sci-mathematics/msieve/ChangeLog
@@ -1,6 +1,10 @@
 # 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.8 2012/11/30 08:52:07 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/msieve/ChangeLog,v 1.9 2012/11/30 09:23:26 patrick Exp $
+
+  30 Nov 2012; Patrick Lauer <patrick@gentoo.org> +files/reduce-printf2.patch,
+  +files/reduce-printf3.patch, msieve-1.50-r4.ebuild:
+  Reducing output verbosity some more
 
 *msieve-1.50-r4 (30 Nov 2012)
 
diff --git a/sci-mathematics/msieve/Manifest b/sci-mathematics/msieve/Manifest
index 9fe6d7208e96..885244827cc3 100644
--- a/sci-mathematics/msieve/Manifest
+++ b/sci-mathematics/msieve/Manifest
@@ -1,7 +1,9 @@
 AUX fix-version.patch 499 SHA256 1c748921c35d34af3267020704a26feb14d3043ce58a9ff7855dbf989e8d213b SHA512 9ea8b52377cf11e6dc34860d3231dee364a8018d860a25ca25901fc00e948adb11ba767106df67e5769e6328fcb703638a14178666f53f9518c0e07b15d36767 WHIRLPOOL 916b1a0b4cfde68a440cdb57a2d411049eb44f9903df5b130da018893903dfa707243a42f9895b6555975a943ce6d48f4228dd94275d727190a3f76751d4c798
 AUX fix-version2.patch 560 SHA256 a3806f9159a0a760ac49872883631bae85fb137a357ee1d3ec9022ca76c10eb1 SHA512 c745b63461a76a20d32c3d022c120ed1ee201a05ed372f01381d71f4cc9601d92089acfc07bfe6930180740c4f4711b88b129d126065558d2cf6d7dd81bf78d8 WHIRLPOOL 26b2205eaf577233fc0b3f0faa7e943cfaefdc2badecdc06a016bf69c533322b600ffbaf6efe2ac02d133028f3b9adfbffdc309cde5370e23b3806d5ac094327
 AUX reduce-printf.patch 2105 SHA256 b576d46577c411b1ad814ab48e4fce595927b225e93e311789e6f2135a68a01e SHA512 c0ee9ddbbb41a25a48ec4b6cc80cf6a8afee35a723aee74eb7d7bfa01b545eff1713eaf2077ace7d2a9aca97f00aa42bc36e6d23d7d229f339de1f152316af98 WHIRLPOOL 75a55e0ff6da1e99c96bb2395ce75fbfac1aad1c3bfaf4bb924c957bc821141afd4a805e79bbd4fb47ebeae101c488a2291ca900198fb25cc8f94badfc1eb139
+AUX reduce-printf2.patch 1351 SHA256 f126280f92979925c1fa6e8640f0a5985d6b75a67c61c893832651aa48f8ba20 SHA512 472693a0e1ccfe937eb5713712195de5326e87181b1b0631d845ccd260784595b69f12a72f3ea9201b71b216bef20cce7fc42e77a7d38091d7a6ccb11613b46e WHIRLPOOL b2aab0e50484694c1b4f670da6d97e99924456ed0b45d1d8821ef6af4cb2837d180ca30098a8b0c52b96776a62a53baafc6249c8c9d65ac7e166abb892f3de66
+AUX reduce-printf3.patch 1145 SHA256 144d5ee944cefc7169ce8a7735f9ea1e43a94fc383f0ccd0bd3906edd3a98b75 SHA512 5a7f8ac795b7a04b6d6df8f9985e98a0c34d4bcefd8405b289987e45cd93dd967aaf4b54b212a37e4992e38135bcba849f62eb27af50746325b37c26bcc03cc1 WHIRLPOOL c73cc23d3676391927e2a70b058021c7e6b37483c75b313a4649c675fbf11f864f5a1617eaed09e909b124deb0510e06f2a8c1b1c75d6dd2ae43332a2bba133e
 DIST msieve150src.tar.gz 547458 SHA256 42e58975fe03ba8d3ffae096962aa4d53d381aa0f9cfb5e6244da11eadcce676 SHA512 f6a722d2dd87c44f07ec713b35cf22efdeb1149e06b2e8c02abefc0681a0c2b9dc68cad97a39f8fa84f739ad67993699eaad84c105ad7a01ca56da540b24dd03 WHIRLPOOL 6886e643f93d1426b794b53ca95f1e5ae18b69d653f71c00a1a2c481035142afe302a37709b4f8825239a8e1d6bc65c5e6fdda7f47219ca0e7c40e8ad1475c36
-EBUILD msieve-1.50-r4.ebuild 1613 SHA256 915e12ce468b82f3a29f477dde3c717fd2ff026f636e8b313e5ad40af4737af3 SHA512 7d199924207b3fa304fa679ad5a228f50c9ac3ba38282dd310a0831ef3166130abc0824152e86a5df7b7bd7d2240311034d5fb925c10c4cfca365d4a4303e4b1 WHIRLPOOL 0a80f3d15a62b680dd6e1584e6159c75615e4e82be474bdb61d63457f076271da19d7653667a39f37fcf012ffba7f24b8060ee69df84c13c841204f9680c55aa
-MISC ChangeLog 1426 SHA256 3b31a13b7c7376accd7a907c3dba68dc5e9eefa897543caea9eb3ae507b119b2 SHA512 67cdec4b4f70ea4bb965bc009a328fc45a75f9eded5c57a9dcc0d1c4cc9b28d9d7a00af23c12b283e71047700bd76563945ffb8338530b90dcf974659905ef88 WHIRLPOOL ef85a7ce9caa68f2650d2aef142c1dc5c2cd64ea180e77f770327d60a0aff07340c6ccd75b94446312d34e7c969a596a15e7f6f1d7651a28d85223390973e5d5
+EBUILD msieve-1.50-r4.ebuild 1713 SHA256 572bdd452246a49b3de89ec3e00da5eaa09b0998f346d795c7cf442c26ead433 SHA512 fc37e4617ad2a9c24d7f29fa25acce3ebffcb22b2362a48c984ae4c503045d8f5d9a39888abd61f8f7b04a5aa3e1d54d9479b332f791f7ea2d7ce6fdb9cf9d4c WHIRLPOOL 9ec1b60388c6ac260aad38492ccddee61b1c74f21a1b9ef6650cf6c9d9700dc2d0d183f38152dc6cce3bb08f0e972b9029539ea368252a67a057b6f5fec18d16
+MISC ChangeLog 1598 SHA256 637e0cafd846c698289948c81e8946055f30b05693ba762adea94f3053b2b035 SHA512 b99f2cf5ca5f24941570e866c5d2bda37940bdcb5e385424c9af8d821820e0c787b4feb3409993caeddcfe7ec84b4a421404675bd095eb2671c52c3448cddd86 WHIRLPOOL 05bcdee8fea302d86bbdf36fcc3b68beef715dbf9739d9ae08c11d673a05063bd7b85120c4bdb68d67efefa7d76a240273d5208cf881225ba88a2a7fcb32b1bf
 MISC metadata.xml 313 SHA256 cd226e0c19b92e49618bd4fe78419349e9821735756d4b1e19dcf52e8a62c5cb SHA512 bc088c0f8d8cb0ecdd4fd65082d618d6a0acefe855ee426c34b36da5dcdd93e39052de80cbb94cd8ca0803caaa3e4664b01a127d869c326a446163011c74169f WHIRLPOOL 08ede2862edbced89cd8faaa42f76410d7a8214e303bbb2885761aa45b9f3dca0eb4eb19333e46c508645d5daadf3bef887ac9dd1a3a4221ae7859ec819c5481
diff --git a/sci-mathematics/msieve/files/reduce-printf2.patch b/sci-mathematics/msieve/files/reduce-printf2.patch
new file mode 100644
index 000000000000..a59e1722758a
--- /dev/null
+++ b/sci-mathematics/msieve/files/reduce-printf2.patch
@@ -0,0 +1,58 @@
+--- gnfs/poly/stage2/root_sieve_deg45_x.c	2011-08-23 20:59:59.000000000 +0800
++++ gnfs/poly/stage2/root_sieve_deg45_x.c.new	2012-11-30 17:09:22.553116526 +0800
+@@ -515,7 +515,7 @@
+ 			if (obj->flags & MSIEVE_FLAG_STOP_SIEVING)
+ 				break;
+ 		}
+-		printf("\n");
++		printf(".");
+ 		return;
+ 	}
+ 
+@@ -585,7 +585,7 @@
+ 		if (obj->flags & MSIEVE_FLAG_STOP_SIEVING)
+ 			break;
+ 	}
+-	printf("\n");
++	printf(",");
+ }
+ 
+ /*-------------------------------------------------------------------------*/
+@@ -604,7 +604,7 @@
+ 	xline_heap_t xline_heap;
+ 	uint32 cutoff_score;
+ 
+-	printf("L %u\n", (uint32)lattice_size);
++	/* printf("L %u\n", (uint32)lattice_size); */
+ 
+ 	mpz_set_ui(xy->y_base, (unsigned long)0);
+ 	xy->y_blocks = 0;
+@@ -621,7 +621,7 @@
+ 		x->x_blocks = line_max - line_min;
+ 		x->curr_score = 0;
+ 		root_sieve_line(rs);
+-		printf("\n");
++		printf("_");
+ 		return;
+ 	}
+ 
+@@ -664,5 +664,5 @@
+ 			break;
+ 	}
+ 
+-	printf("\n");
++	printf("*");
+ }
+--- gnfs/poly/stage2/root_sieve_deg5_xy.c	2011-07-15 09:49:00.000000000 +0800
++++ gnfs/poly/stage2/root_sieve_deg5_xy.c.new	2012-11-30 17:09:51.462454813 +0800
+@@ -290,8 +290,8 @@
+ 	}
+ 	xy->y_blocks = y_blocks;
+ 
+-	printf("\n%.0lf %u %u\n", (double)lattice_size, 
+-			y_blocks, num_lattices);
++	/* printf("\n%.0lf %u %u\n", (double)lattice_size, 
++			y_blocks, num_lattices); */
+ 
+ 	sieve_x_run_deg5(rs);
+ }
diff --git a/sci-mathematics/msieve/files/reduce-printf3.patch b/sci-mathematics/msieve/files/reduce-printf3.patch
new file mode 100644
index 000000000000..dedadde51d42
--- /dev/null
+++ b/sci-mathematics/msieve/files/reduce-printf3.patch
@@ -0,0 +1,31 @@
+--- gnfs/poly/poly_skew.c	2011-12-23 03:48:49.000000000 +0800
++++ gnfs/poly/poly_skew.c.new	2012-11-30 17:14:29.802747785 +0800
+@@ -221,7 +221,7 @@
+ static void stage1_callback(mpz_t high_coeff, mpz_t p, mpz_t m, 
+ 				double coeff_bound, void *extra) {
+ 	
+-	gmp_printf("%Zd %Zd %Zd\n", high_coeff, p, m);
++	/* gmp_printf("%Zd %Zd %Zd\n", high_coeff, p, m); */
+ 	poly_stage2_run((poly_stage2_t *)extra, high_coeff, p, m, 
+ 			coeff_bound, NULL);
+ }
+@@ -231,7 +231,7 @@
+ 				double coeff_bound, void *extra) {
+ 	
+ 	FILE *mfile = (FILE *)extra;
+-	gmp_printf("%Zd %Zd %Zd\n", high_coeff, p, m);
++	/* gmp_printf("%Zd %Zd %Zd\n", high_coeff, p, m); */
+ 	gmp_fprintf(mfile, "%Zd %Zd %Zd\n",
+ 			high_coeff, p, m);
+ 	fflush(mfile);
+--- gnfs/poly/stage2/root_sieve_line.c	2011-11-25 00:25:28.000000000 +0800
++++ gnfs/poly/stage2/root_sieve_line.c.new	2012-11-30 17:18:19.887475567 +0800
+@@ -402,7 +402,7 @@
+ 	uint32 num_primes = rs->num_primes;
+ 	uint16 *block = rs->sieve_block;
+ 
+-	printf("%u ", num_blocks); fflush(stdout);
++	/* printf("%u ", num_blocks); fflush(stdout); */
+ 
+ 	if (mpz_cmp_ui(x->mp_lattice_size, 1) == 0)
+ 		prepare_sieve_line(rs);
diff --git a/sci-mathematics/msieve/msieve-1.50-r4.ebuild b/sci-mathematics/msieve/msieve-1.50-r4.ebuild
index d472871ba1fd..8fce9795eec3 100644
--- a/sci-mathematics/msieve/msieve-1.50-r4.ebuild
+++ b/sci-mathematics/msieve/msieve-1.50-r4.ebuild
@@ -1,6 +1,6 @@
 # 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-r4.ebuild,v 1.1 2012/11/30 08:52:07 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/msieve/msieve-1.50-r4.ebuild,v 1.2 2012/11/30 09:23:26 patrick Exp $
 
 EAPI=4
 DESCRIPTION="A C library implementing a suite of algorithms to factor large integers"
@@ -22,6 +22,8 @@ RDEPEND="${DEPEND}"
 src_prepare() {
 	# TODO: Integrate ggnfs properly
 	epatch "${FILESDIR}/reduce-printf.patch" 	|| die
+	epatch "${FILESDIR}/reduce-printf2.patch"	|| die
+	epatch "${FILESDIR}/reduce-printf3.patch"	|| die
 	epatch "${FILESDIR}/fix-version.patch"		|| die
 	epatch "${FILESDIR}/fix-version2.patch"		|| die
 	sed -i -e 's/-march=k8//' Makefile 		|| die