[patch] ebuild diff from p2 to p3 for review

openntpd-5.7_p3.ebuild.diff (text/plain), 1.33 KB, created by Paul B. Henson on 2015-02-01 02:21:28 UTC

--- openntpd-5.7_p2.ebuild	2015-01-24 16:54:30.000000000 -0800
+++ openntpd-5.7_p3.ebuild	2015-01-31 17:57:56.602816159 -0800
@@ -1,6 +1,5 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/openntpd-5.7_p2.ebuild,v 1.1 2015/01/25 00:54:30 ottxor Exp $
 
 EAPI=5
 
@@ -43,13 +42,15 @@
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-5.7_p1-runpath.patch"
-	epatch "${FILESDIR}/${PN}-5.7_p1-driftpath.patch"
-	epatch "${FILESDIR}/${PN}-5.7_p1-gentoopool.patch"
-	epatch "${FILESDIR}/${P}-adjtimex.patch"
-	epatch "${FILESDIR}/${P}-proctitle.patch"
-	#Due to last patch
-	eautoreconf
+	# fix /run path
+	sed -i 's:/var/run/ntpd:/run/ntpd:g' ntpctl.8 ntpd.8 || die
+	sed -i 's:LOCALSTATEDIR "/run/ntpd:"/run/ntpd:' ntpd.h || die
+	# fix ntpd.drift path
+	sed -i 's:/var/db/ntpd.drift:/var/lib/openntpd/ntpd.drift:g' ntpd.8 || die
+	sed -i 's:"/db/ntpd.drift":"/openntpd/ntpd.drift":' ntpd.h || die
+	# fix default config to use gentoo pool
+	sed -i 's:servers pool.ntp.org:#servers pool.ntp.org:' ntpd.conf || die
+	printf "\n# Choose servers announced from Gentoo NTP Pool\nservers 0.gentoo.pool.ntp.org\nservers 1.gentoo.pool.ntp.org\nservers 2.gentoo.pool.ntp.org\nservers 3.gentoo.pool.ntp.org\n" >> ntpd.conf || die
 }
 
 src_configure() {