Delete broken info_trimble.c that ships with the source #545546 by Conrad Kostecki.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

3 files changed, 25 insertions, 17 deletions

diff --git a/net-misc/ntp/ChangeLog b/net-misc/ntp/ChangeLog
index 43f1a4d72bd1..901914e81e34 100644
--- a/net-misc/ntp/ChangeLog
+++ b/net-misc/ntp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/ntp
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.234 2015/04/04 08:05:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.235 2015/04/08 04:54:45 vapier Exp $
+
+  08 Apr 2015; Mike Frysinger <vapier@gentoo.org> ntp-4.2.8-r3.ebuild:
+  Delete broken info_trimble.c that ships with the source #545546 by Conrad
+  Kostecki.
 
 *ntp-4.2.8-r3 (04 Apr 2015)
 
diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index 4c6c426b20f8..47b35022af8d 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -31,23 +31,23 @@ EBUILD ntp-4.2.6_p5-r10.ebuild 4385 SHA256 8c30f3b8f7fcdf7ede4f534fe2c9e67f3f62c
 EBUILD ntp-4.2.6_p5-r11.ebuild 4416 SHA256 d6808650a0477ccae3e0a30577c24a40d789209be87098291fd949e0954f49af SHA512 cf6b5afc4c78c318af4c9f9cd4c90a0942c02f88eb61f985e6fa31352f7a11e3fc971d9913ab6d6e6101e3b02fea529573b3a91f9cfdbdc9b8dbea4b67b29115 WHIRLPOOL 56b4ad2d444dd2d95b380eef283a1f92a4bbedf103875e0eb5bbce183f862c403d8d705b1e83130c4a4dc39bdcdbf3d84a40cccac39c135cdf59a11238485209
 EBUILD ntp-4.2.8-r1.ebuild 4210 SHA256 446c49175af1b8c6eb9a871c491d1330b447cf523b3dcfe7853cdeb8b5a0eed5 SHA512 5bda7c90d38a78375664b073b3a217dbc116f46297eed8c14115f09dbe3aa4700eb6500cb9be04a3d1454a72fa624063548fa59abf6f2bd9e98df26a73c89759 WHIRLPOOL beff9484635e81e260e14eda43939e8d4674dbcbf2ecf48a4dd9b0aa8add121919fc9c1a3c22eb1abc2b2534cb1d76d5b69f4444a666c5aa07e98eaae1fd9a0f
 EBUILD ntp-4.2.8-r2.ebuild 4825 SHA256 9afefc5811cee4570de6904b0622d76db8a4f715ef611055dac3c8a2cfca9053 SHA512 0886d3c0d748c2d956b3117b92a4e8f56830b03137bceaff1a965032b6f678694f4bccb49a0a3e5e9ef562db9e310e3ff7b076f73e858a24e10ace1e1dc77ac7 WHIRLPOOL c6bcc2b107ccc6066327b3c2b63801c3f312e9ce39eb5380b74e93a246af7a5ffcc2a3149c3e149ade7350821d0714fa1e064a284094d91a1c3015a31390fb29
-EBUILD ntp-4.2.8-r3.ebuild 4486 SHA256 ba0e5b4767e0f1a3681ad94c189ef71151302a6fc9ab6bed04220c98d2c2792a SHA512 502809befccbb2bb5dc0ccd4890f2401f83e76d0d419b42592a728ffaa194ee3b79c093b45cd4d9293f037e05f4bc041a9fb35c0a7f1f1102a9e458e3b47cea8 WHIRLPOOL 63a36f3dc5eebad5518ebad40c9694661579e8e8699756c48b4770896034ebf53d6241076312a1c7f9c44444f2b3759e443624afb360b665c464c39fdf7c50f3
-MISC ChangeLog 33620 SHA256 60d2cf37ac633464ac63a5f0c525cecc6f44fb5318a14bb06126a0312148bf73 SHA512 86b8129ce51cc7b4deba3fb4cb9864a2d44c4c3ba9dd7711fbae2f1c08980f4b1b2a5f4927f83beea7fdbdbff5552f45d766159574ebac997b2dcfc0fb12b0e8 WHIRLPOOL 9875da622c71a976c07ab57a11337561a4539cb4a0eaca7c4847086139b29ceb24188ccd88391fcb515697e222bbb39d4a8ab2a852bcdd95e634dfc264e0929f
+EBUILD ntp-4.2.8-r3.ebuild 4621 SHA256 8ad41af34c59ce5912cbb7d26e516fa2da082d0bea86141f21af183d1e178074 SHA512 fb4c2ac146f36794be4eb9f8e6d757df207744676224ed264e12dcb1334ced213833e7129682090816e94a37ef3140e5a3fed8f34b987ea5ca7faaf9bd340a83 WHIRLPOOL 6e43a55142ac3d672c0ec10a4a0796ea274e19db8c3a5bb92ff6003dd427ea4a70410633c4c7f07e245dea7cfe49a1048e483aec9f951d1e3cf6f84005fdd3b1
+MISC ChangeLog 33780 SHA256 c46231ff602cbdcfac070a46598f56d1a3421c48d801b814d43a88e8b7a0e2ca SHA512 dd3b74928f2ecf9f778df3722d34200d7f2d81fa8ce88799b050b921d6ea247abbd7b3ea8381a8d566a475c0ddaae45284efb10022420d36238af309738c5879 WHIRLPOOL e9bee0cecd3c29dcd3082e56170ed424e212b393ab13db6e4f63cb9d9e40559b740adcaff81ff3e34f24cb2179c8e75d8cc39c209405daa615ab2b3161b29666
 MISC metadata.xml 837 SHA256 57b162a2c709963d5760fdb3abe7d2a12e6e55a6abe816b16db30e9e2ae10a4e SHA512 d1403413373a0785712c40fd1a96c4649ef368b30efc5735667626ad760bb2336ba28fd335c75fc781ad6222e7dd9f53ad5dd2f558b3cbbf719104684fa0d9ed WHIRLPOOL 1513304c252dfb8f9a06a7cce1e13ab41ac80e0f0db7e231891430168df6e71a81e88984d47a694d6a5d0fd5a9c04dd1318c504baf21c7be6bd0d99b307db867
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVH5tRAAoJEPGu1DbS6WIAnGsP/0BmXncbsY88845hv+nc/kyQ
-8q27bcXVCEIgrYXwKK6e8kYx3UMhRAD7Ekycuo6sOuSxG8DJ7kYhEhHbCkGQlD6q
-Ldad75QDSdVgCII33czFm6r5TcwnXi3Q/KdBGzpty729mARpl5mucBvuBTV5DpgX
-rry3xcZoAj13nLvHLtwGHVQATLAXqlSzUe6a6GBEZ8IA7a5f8XB+m8g1cxv0ewO7
-GJDA4Rl1+hB1tIQNJwBdXy+L+jz6GvuviAVcbn7oZpvEbbnCj26+sg6kbx/1S1dS
-+GWZ3Q4s+cS+dP7MqXsmY9k5jj+2JvqSqMwLIkDdUwDp3sJy3K3cYpZJKC6WQ8lh
-4JPFDELagvG/r/DqWMiws+Ha+VCd3snUe4dbpzZjvNckptKdM5BA12KReQq7sP75
-0SxwfF5M4uoqNgMUQRWOe1ZAHlNHEmrP4ivs5Ai0QrbSDtukapBYkuO4Ujb3L34d
-10a2CkU/JoYaPjytJ72QcGl8bqpafJ9Pr8cQQ8KTBMJ2YkLSZ+0rN4vOAvLP+Gzr
-p3DyDmddMZT5WRJ6vnW9lbOrFsovXuaxkm8BhuvsSi4zjjry1TJjKxaGBsTaOoty
-8sUPPddjZAAWOtZ6Lnn2tv7nE+G5Pz+pF2KQJ9iCEVz5hsqNhf0hdsrqtGRQYSB0
-ox6tKRxAq4KC2+tSTYs7
-=7fPq
+iQIcBAEBCAAGBQJVJLSWAAoJEPGu1DbS6WIA02sQAJrNRDFXx7jZy3fyDDjMitwM
+JNkwP9Aa1XftC+bsRdOhCYoXSHVEbrhojZrhSBmaQwcaRRLvCtd+TTbQXiMjuNfd
+rvxSS8ePI51TMnDY4uJMjIvs+fKpasFogfxb9rLx4m29NRA43IgbdqvugJOTgH/F
+TwpIRneREWs0bsUvGvW4VL2sYJlxSiG5qK5VWsxqEsDPmG+RIH5I/0BKZAIDbE8I
+CH150T0EKXuosyTIO/dRCJPmaXGG/HesQZzl5yItcDya+csPONk3MBGr0bSbY6xm
+Srui3rMe8r2N2Rshztenp4ooCbGTrnU1bqzM60fyMCgO1lQEqVxcexzlTwEGV+e/
+ohghxTKA/BHjw7gTZXTMgYmIPXysxwpmlBLIL9/eNWV4/QXrRY+TihL+cMeoSpUO
+FC7IXJsObs3hLbXcdqhF4tUl3cDJe9tOP/FTl4AP16RGSK3odosPkfxkjnZWVMoD
+xhvLequnR5ZB4fHRwhe3ofmgeCuoUAvUB///ETo4wIy2UnBSovRnpKhfZcMVMthQ
+OFroNn6XMYnUalckVVN7KyxTZlKQG4Ce25oAjSVsVSnmpOgKdWHtdwdrm8WtruS/
+SPaEirmRy4VKiJfpXNB2tOO3c7cwvdoSzQaCDag2NI2HPRdC8OrqqQvk3qSvexPe
+eWKAjVZFyegMXBCeuTSq
+=uNLp
 -----END PGP SIGNATURE-----
diff --git a/net-misc/ntp/ntp-4.2.8-r3.ebuild b/net-misc/ntp/ntp-4.2.8-r3.ebuild
index bea66e2052a7..952ad25f35b2 100644
--- a/net-misc/ntp/ntp-4.2.8-r3.ebuild
+++ b/net-misc/ntp/ntp-4.2.8-r3.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/net-misc/ntp/ntp-4.2.8-r3.ebuild,v 1.1 2015/04/04 08:05:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.8-r3.ebuild,v 1.2 2015/04/08 04:54:45 vapier Exp $
 
 EAPI="4"
 
@@ -53,6 +53,10 @@ src_prepare() {
 	# ran in the top level.  But the libtool call there updated files in
 	# the subdir which broke timestamps causing autotools to re-run.  #538270
 	find -type f -exec touch -r . {} +
+
+	# We want to force a rebuild of this source file though as the shipped one
+	# is broken.  #545546
+	rm libparse/info_trimble.c || die
 }
 
 src_configure() {