Drop redundant copy of ntp.conf. Remove cleanup code rendered obsolete by previous change.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

3 files changed, 11 insertions, 19 deletions

diff --git a/net-misc/ntp/ChangeLog b/net-misc/ntp/ChangeLog
index 557da4216a22..c5307000d2b0 100644
--- a/net-misc/ntp/ChangeLog
+++ b/net-misc/ntp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/ntp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.223 2014/12/22 03:15:36 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.224 2014/12/22 03:26:28 floppym Exp $
+
+  22 Dec 2014; Mike Gilbert <floppym@gentoo.org> ntp-4.2.8-r1.ebuild:
+  Drop redundant copy of ntp.conf. Remove cleanup code rendered obsolete by
+  previous change.
 
 *ntp-4.2.8-r1 (22 Dec 2014)
 
diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index a8cd8ebfbb3c..0f45f9e82028 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -47,13 +47,13 @@ EBUILD ntp-4.2.6_p5-r2.ebuild 3869 SHA256 f32d367bc823f2b1b8c8244f8912cda1b8b59b
 EBUILD ntp-4.2.6_p5-r7.ebuild 4221 SHA256 d56e8d233c1d7fc876a6b5caf051fb69667358fb79e5ef2aa4fc78833b7a2e8e SHA512 3a3e08b2f2108fcc49f0d07aecd57236791e8d603c8145c93768a910e96359e03737eafe4a084a1f7f54071bf27cc0da1eb310b0bf5eaa38d6c1ee5d7f2e97be WHIRLPOOL b8cfee3f7c2f2479a3b26bec04acaf667a0e4ebdb6d187704a1dd85245e49ce32b47ffbf37ea5c7039fb5f9072bd284bd65fe4b7bd836d5a2ba2e30ae2293f3a
 EBUILD ntp-4.2.6_p5-r9.ebuild 4276 SHA256 9dab6186242285460d39f8fd11ccbd9d2dc24b6d2a348bf69ca21ce99912f632 SHA512 dcd3cd8b990baa26f828c574d3ffac17ce422f0ebb2f73cd8d7bb12167b7b9be5f72358440da812905cdcfefbbfd626691c5a9e759458c410c15aec2afc5f2d2 WHIRLPOOL a3e6ea5bb2eab429ef7fbb58866957ad6185f4d79019485ec8189449ca153b7aca5912a6b10c158c1fdd6bb2105c2d43b0bdbaf74fb3df653c463e28c9e38a24
 EBUILD ntp-4.2.6_p5.ebuild 3817 SHA256 6128211172e7a6a101e597b3c288f68dcb71c564ba5652d828f2d2aa1123d7ea SHA512 0ed3a2d82232cf08539bcd5612f0509f09d2c39a426ca229e4f8d30fec5b53d00b576998c13a8e3ebc866fc69b99f0a18fbd9ba72dbaacd60695805354178f9d WHIRLPOOL 559b0955be950c79209c034bcdd4a57e7f48d997b4a3c6c25aa39ad0ab8d11c04f5664e0ffbfa27a7246b21222dc9f3869a27c64d439e077c7ec827342b22e54
-EBUILD ntp-4.2.8-r1.ebuild 4431 SHA256 b06d7fc28cee33cf3a5c44fb5b4a5a3477922d0d5894d2ab69864a815758b1dc SHA512 05e13857d6345c7c178dd28a82e7e256cb6b80c7b562d30db3ff2c0a7267fbcd2e5b55dae700817b8ec181f6756304c40919a5bc4571bbf058586f2a7569bc2e WHIRLPOOL a9caf1952426d686536adfb498a7acc88c67c7ad79e2abe5707323c46a6018530cd648ba4e1ecb869d12db036aae1ed847e5718c40cef4f2a0da2d599ec1b0d3
-MISC ChangeLog 31604 SHA256 3ec86916614657462e7452a3e2ea74efd8cf2f60c89b386b2ac01b33b7bd7c77 SHA512 ee90b973615c2b0bf408238600dc53ccf04df2768f909f2a1cc6a8f09f6a15a9caa66321745a0f00a997c014c59d803edccac94e92b0fad042542b66a98cf849 WHIRLPOOL d3c30d72a4442d72a1973e41088eb2e0ef981469edcd8494432e1f73791835caa968f0d49b40b11390c47ce504ec17a1d00339a54484e42ceb5f658e5e0c3c69
+EBUILD ntp-4.2.8-r1.ebuild 4136 SHA256 b5215f1ff07a94bafb5d969bad189a5b8095f207d0f48eb324e8dd6a5b6e972f SHA512 fdf375e8f21daa523c896752f853e837741f8d8a7196a406dccd5f42160e3ea1ec045f26de0685fbb4bebb30fbb072cbdb111417703ebcbb7f5c7bbe564f7fc7 WHIRLPOOL c8fbbcdb4a26d76c8f40b9a1601713cbe2805eb527b4bf185e8cda959bd04fa095859f6beda49b961031007f8966bdc68fe5f1de6e069193b2ebb37d183bc7c9
+MISC ChangeLog 31770 SHA256 6366144c7da9827337044041ca13a85bf0755e609ce063dbbe78e83c2511530e SHA512 ae4f54fce07b5b6a9f2096eb2d5110dcbbc4b60f48bd4ff6f124fae9216de7496994f2164677b9987d819909973ba259d3985fd486734651b9400f6cb479d6c7 WHIRLPOOL 409a8ff6a184e76d701ec2f1568c37dd7f38d197fd7615c5cc1314162c2b7d8e2d53cab5765ed4310116877013a73f5514f475239704fabd2055cf2ae1c80cf6
 MISC metadata.xml 837 SHA256 57b162a2c709963d5760fdb3abe7d2a12e6e55a6abe816b16db30e9e2ae10a4e SHA512 d1403413373a0785712c40fd1a96c4649ef368b30efc5735667626ad760bb2336ba28fd335c75fc781ad6222e7dd9f53ad5dd2f558b3cbbf719104684fa0d9ed WHIRLPOOL 1513304c252dfb8f9a06a7cce1e13ab41ac80e0f0db7e231891430168df6e71a81e88984d47a694d6a5d0fd5a9c04dd1318c504baf21c7be6bd0d99b307db867
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlSXjNkACgkQC77qH+pIQ6St6wD+PgI2s00XlVtZcP0yZestEisT
-9cLVD37bAVhOEo1qRA8A/3yncAuZ+VwDBrSw5rd3zaFp/FaF9w/XUsrZUwcThwO2
-=vZyM
+iF4EAREIAAYFAlSXj2YACgkQC77qH+pIQ6SyJgD/Y8bo71KGWOP4Bx6XpXGUHKRk
+OxyXzPAa91oEjbXwODMBALABjUPqlTyC0cKTghUTe282pHZ7sajUWiuWCOxFLeIT
+=G5rv
 -----END PGP SIGNATURE-----
diff --git a/net-misc/ntp/ntp-4.2.8-r1.ebuild b/net-misc/ntp/ntp-4.2.8-r1.ebuild
index 9512587240b2..d5b8c7a8e409 100644
--- a/net-misc/ntp/ntp-4.2.8-r1.ebuild
+++ b/net-misc/ntp/ntp-4.2.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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-r1.ebuild,v 1.1 2014/12/22 03:15:36 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.8-r1.ebuild,v 1.2 2014/12/22 03:26:28 floppym Exp $
 
 EAPI="4"
 
@@ -75,17 +75,6 @@ src_install() {
 	doman "${WORKDIR}"/man/*.[58]
 	dohtml -r html/*
 
-	insinto /usr/share/ntp
-	doins "${FILESDIR}"/ntp.conf
-	use prefix || fperms -R go-w /usr/share/ntp
-	find "${ED}"/usr/share/ntp \
-		'(' \
-		-name '*.in' -o \
-		-name 'Makefile*' -o \
-		-name support \
-		')' \
-		-exec rm -r {} \;
-
 	insinto /etc
 	doins "${FILESDIR}"/ntp.conf
 	newinitd "${FILESDIR}"/ntpd.rc ntpd
@@ -121,7 +110,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	ewarn "You can find an example /etc/ntp.conf in /usr/share/ntp/"
 	ewarn "Review /etc/ntp.conf to setup server info."
 	ewarn "Review /etc/conf.d/ntpd to setup init.d info."
 	echo