Conflicts=systemd-timesyncd.service will be needed for systemd-216 (#521804), drop old version committed by me long time ago.

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

5 files changed, 54 insertions, 6 deletions

diff --git a/net-misc/ntp/ChangeLog b/net-misc/ntp/ChangeLog
index 5276bf95d16d..65bef6c49506 100644
--- a/net-misc/ntp/ChangeLog
+++ b/net-misc/ntp/ChangeLog
@@ -1,6 +1,14 @@
 # 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.219 2014/07/01 16:54:26 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.220 2014/10/12 09:19:24 pacho Exp $
+
+*ntp-4.2.6_p5-r11 (12 Oct 2014)
+
+  12 Oct 2014; Pacho Ramos <pacho@gentoo.org> +files/ntpd.service-r2,
+  +files/ntpdate.service-r1, +files/sntp.service-r2, +ntp-4.2.6_p5-r11.ebuild,
+  -ntp-4.2.6_p5-r8.ebuild:
+  Conflicts=systemd-timesyncd.service will be needed for systemd-216 (#521804),
+  drop old version committed by me long time ago.
 
   01 Jul 2014; Pacho Ramos <pacho@gentoo.org> files/ntpdate.service,
   ntp-4.2.6_p5-r10.ebuild:
diff --git a/net-misc/ntp/files/ntpd.service-r2 b/net-misc/ntp/files/ntpd.service-r2
new file mode 100644
index 000000000000..5f11b27e9232
--- /dev/null
+++ b/net-misc/ntp/files/ntpd.service-r2
@@ -0,0 +1,11 @@
+[Unit]
+Description=Network Time Service
+After=ntpdate.service sntp.service
+Conflicts=systemd-timesyncd.service
+
+[Service]
+ExecStart=/usr/sbin/ntpd -g -n
+PrivateTmp=true
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/ntp/files/ntpdate.service-r1 b/net-misc/ntp/files/ntpdate.service-r1
new file mode 100644
index 000000000000..f9bc9ddefc90
--- /dev/null
+++ b/net-misc/ntp/files/ntpdate.service-r1
@@ -0,0 +1,14 @@
+[Unit]
+Description=Set time via NTP using ntpdate
+After=network-online.target nss-lookup.target
+Before=time-sync.target
+Wants=time-sync.target
+Conflicts=systemd-timesyncd.service             
+
+[Service]
+Type=oneshot
+ExecStart=/usr/sbin/ntpdate -b -u $SERVER
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/ntp/files/sntp.service-r2 b/net-misc/ntp/files/sntp.service-r2
new file mode 100644
index 000000000000..9bdd578ffbc7
--- /dev/null
+++ b/net-misc/ntp/files/sntp.service-r2
@@ -0,0 +1,14 @@
+[Unit]
+Description=Set time via SNTP
+After=network.target NetworkManager-wait-online.service nss-lookup.target
+Before=time-sync.target
+Wants=time-sync.target
+Conflicts=systemd-timesyncd.service             
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/sntp -s $SERVER
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/ntp/ntp-4.2.6_p5-r8.ebuild b/net-misc/ntp/ntp-4.2.6_p5-r11.ebuild
index 52f57963b381..152c44729ff6 100644
--- a/net-misc/ntp/ntp-4.2.6_p5-r8.ebuild
+++ b/net-misc/ntp/ntp-4.2.6_p5-r11.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.6_p5-r8.ebuild,v 1.2 2014/04/06 14:47:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.6_p5-r11.ebuild,v 1.1 2014/10/12 09:19:24 pacho Exp $
 
 EAPI="4"
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar
 
 LICENSE="HPND BSD ISC"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~m68k-mint"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~m68k-mint"
 IUSE="caps debug ipv6 openntpd parse-clocks samba selinux snmp ssl vim-syntax zeroconf"
 
 DEPEND=">=sys-libs/ncurses-5.2
@@ -106,13 +106,14 @@ src_install() {
 		rm etc/{conf,init}.d/ntpd
 		rm usr/share/man/*/ntpd.8 || die
 	else
-		systemd_newunit "${FILESDIR}"/ntpd.service-r1 ntpd.service
+		systemd_newunit "${FILESDIR}"/ntpd.service-r2 ntpd.service
+		use caps && sed -i '/ExecStart/ s|$| -u ntp:ntp|' "${ED}"/usr/lib/systemd/system/ntpd.service
 		systemd_enable_ntpunit 60-ntpd ntpd.service
 	fi
 
-	systemd_dounit "${FILESDIR}"/ntpdate.service
+	systemd_newunit "${FILESDIR}"/ntpdate.service-r1 ntpdate.service
 	systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf
-	systemd_dounit "${FILESDIR}"/sntp.service
+	systemd_newunit "${FILESDIR}"/sntp.service-r2 sntp.service
 	systemd_install_serviced "${FILESDIR}"/sntp.service.conf
 }