summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2014-12-22 03:26:28 +0000
committerMike Gilbert <floppym@gentoo.org>2014-12-22 03:26:28 +0000
commit2c2cbb72a725056665cebd2bf624d393b73054f7 (patch)
tree389314435594f3560365472e0afc3978395ab4f2 /net-misc
parentDo not blindly copy the contents of scripts/ to /usr/share/ntp, bug 533248. (diff)
downloadgentoo-2-2c2cbb72a725056665cebd2bf624d393b73054f7.tar.gz
gentoo-2-2c2cbb72a725056665cebd2bf624d393b73054f7.tar.bz2
gentoo-2-2c2cbb72a725056665cebd2bf624d393b73054f7.zip
Drop redundant copy of ntp.conf. Remove cleanup code rendered obsolete by previous change.
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/ntp/ChangeLog6
-rw-r--r--net-misc/ntp/ntp-4.2.8-r1.ebuild14
2 files changed, 6 insertions, 14 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/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