Make sure every build uses the same filesystem layout when installed #539092 by Oleg Silishhev.

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

3 files changed, 23 insertions, 7 deletions

diff --git a/net-misc/ntp/ChangeLog b/net-misc/ntp/ChangeLog
index 46c282a1aacf..95b0adf2c916 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.231 2015/02/26 18:30:06 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.232 2015/04/04 07:07:20 vapier Exp $
+
+  04 Apr 2015; Mike Frysinger <vapier@gentoo.org> ntp-4.2.8-r2.ebuild:
+  Make sure every build uses the same filesystem layout when installed #539092
+  by Oleg Silishhev.
 
   26 Feb 2015; Mike Gilbert <floppym@gentoo.org> ntp-4.2.8-r2.ebuild:
   Add threads use flag, bug 533548.
diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index b3528fc8363c..fcc320819c4f 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -30,13 +30,23 @@ DIST ntp-4.2.8.tar.gz 6750364 SHA256 2e920df8b6a5a410567a73767fa458c00c7f0acec32
 EBUILD ntp-4.2.6_p5-r10.ebuild 4385 SHA256 8c30f3b8f7fcdf7ede4f534fe2c9e67f3f62cefea076fd8080d1c57a9ae305fc SHA512 18137975fa6703d877a8357da1c24279f1ab001b767257c827b10692994a8636b4fe849b5951f9a1dfbaef47c89c7356299936f82a9474aa8901d7cb3a9b1587 WHIRLPOOL ecb4b932b3ce6c86ce57c86818f803568642d654ca9925f4283a790096ae42f9ace6d6862907b171111daf8a5f0cdc68bc6fbef34a063ccc72be5fb613476bcf
 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 4365 SHA256 bb13bfd0b97d1ea4ac1b19fca5725d0f2b1ca43807b159a2143056e2b144ce41 SHA512 5e6de4d1fb5d6f3fc395b1c1c38ab70c434d45c66e12c6b166e4dc231707da5304e54c009f024561eb136c749ed643595779d71c433ad120cae43fe0f6386734 WHIRLPOOL f5fccc1bfb778ede79c763e5eee4729f66233fb0899ee202a91606940c778e0ac46d007d96b0a6cb01422e5ae94476d80900fe4bcbc233a8fd1a0ee7ad1f62b4
-MISC ChangeLog 33078 SHA256 5379930e7a0d5b0ec625d7c83e1f6d9c4edc42b94ee376b30eb63d2aaa6f4f6e SHA512 356525cca488725126d0d88d685b4c638670656fa4347480e55fa9008203f5c1d44ffef81010a3a58be969969b81baacda1c21098110060194c355700599c4b2 WHIRLPOOL 8126c01e0239084ccb9f96c68ad6a03cd8be70aae3488c19734f11f97d20d3c06064aefe6bcef75b1088016d6b885db1bb355d8341b1ac64d9192ec0d4d9a856
+EBUILD ntp-4.2.8-r2.ebuild 4483 SHA256 fc7c8da8cdf1ddf4852c10ea6f61ca26ee7c1bc798ce749f17ec51ecdb7b2195 SHA512 27e3fde364d404f6ec34fb2e3066cc1acdc5294788db7be6a63ffeb4714e40640d88f0a1cd3fa69d0cebbd828db1713ed6bfb6d29bd730d27df7fdb31e05360a WHIRLPOOL 8a3304ee71bc5cec6ddbe8817a6a8f6aef6aabab893fc7ce144f018544fd6b9fa43509e955184b9c7ba32b1ebac4009cfd796e09f5751038075ddd95e93852d8
+MISC ChangeLog 33249 SHA256 4389fe88faca3269d853126e630e58c58a92cb9b576a009cbe6e36fd09f2c330 SHA512 86f089b734dcc127f427ef4388d74aea4ea86b0ad5a77c5c0556ef3ffa10dd6ab30f7cbd4c9bc5a537e147308017806c41f6b321523632edbcb325b5fffbbaeb WHIRLPOOL f538d20015e0ae31bb05edb833c59f685e167fd7ff7cbccd258d6bb4b2b54880a254c5996762be8bc56ce3a36d86b162e53f05e619831ca8c6e3523ed77f350a
 MISC metadata.xml 837 SHA256 57b162a2c709963d5760fdb3abe7d2a12e6e55a6abe816b16db30e9e2ae10a4e SHA512 d1403413373a0785712c40fd1a96c4649ef368b30efc5735667626ad760bb2336ba28fd335c75fc781ad6222e7dd9f53ad5dd2f558b3cbbf719104684fa0d9ed WHIRLPOOL 1513304c252dfb8f9a06a7cce1e13ab41ac80e0f0db7e231891430168df6e71a81e88984d47a694d6a5d0fd5a9c04dd1318c504baf21c7be6bd0d99b307db867
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlTvZjEACgkQC77qH+pIQ6TrygEAw3GYjUC251Meu6U3OoMTFTBX
-zFM91MVBe3UaAuD1QtwA/0uA6SXESQCQjaADok/gnmQPCv3sNaszze7cS3bVAwCw
-=Qgqq
+iQIcBAEBCAAGBQJVH42pAAoJEPGu1DbS6WIA5LkQAInxjhbHL10t06cW+7pO3pZg
+L6vf/fynt2zd4vjfZLuLSx5QuenwX6f4JhhujB+swR9+25EJnIq08pknKBKG7+Hl
+tzn9aqmJW93VAu0F/kgClaSUwyIbqf/LqbePYIgb0VInrM61hdj0627JUDcmPQg3
+Xch1xzj0ODlyB6agOVALkuQ967O/vPOmdakylM0M9YYD0pcxjkuaQRemICEaHwYq
+9tcu4LSEZeLErRYUUm5RQn+6tWAF8k4hJJIU1QIssMd763Mu2YQbPMBz4IZ7WJ8i
+yy8ezRp3ex3a0BF+1NyKZYuuCtgyjVNWFMciYyRfGiyH1ofzOAevqP4CNdpTIff8
+/I/JBb9vhGzmhaS/0oj5c3oCbCVxSugeVjg+o1xdyTNwQ6CJgf7z0f6DotCN+4ZE
+aARlY1b9gUbGKRyD8JVfaYTnIi04XtQjEkSVPHXs34axXx5LuxQqCXCy2ow6JYYN
+pknWFrURu/DrtGCU6j6VVt+uqvlPjOrEXdnP3un9lxLVQsN1VcqVA75sRXLxVx4T
+dR/pKOBDi1C4AQWqdlb1fPOapQ4RnkkSi9XW+fBXJJCfNeuBqx8o/msZlpHeIqGM
+gSTuSFytVsfu+Az/lx/7F01b1joWtLYptYFIgpKfN0AKb/ZFpyH/OwjX4dRul6R6
+hpqbAsrhH5Mz7P1iUdj6
+=IFBi
 -----END PGP SIGNATURE-----
diff --git a/net-misc/ntp/ntp-4.2.8-r2.ebuild b/net-misc/ntp/ntp-4.2.8-r2.ebuild
index dc6fbe23d103..ac7c8c84034a 100644
--- a/net-misc/ntp/ntp-4.2.8-r2.ebuild
+++ b/net-misc/ntp/ntp-4.2.8-r2.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-r2.ebuild,v 1.2 2015/02/26 18:30:06 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.8-r2.ebuild,v 1.3 2015/04/04 07:07:20 vapier Exp $
 
 EAPI="4"
 
@@ -44,6 +44,8 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-4.2.4_p7-nano.patch #270483
 	epatch "${FILESDIR}"/${P}-ntp-keygen-no-openssl.patch #533238
 	append-cppflags -D_GNU_SOURCE #264109
+	# Make sure every build uses the same install layout. #539092
+	find sntp/loc/ -type f '!' -name legacy -delete || die
 	eautoreconf
 }