Version bump #69858 by Christian Gut.

diff --git a/net-misc/openntpd/ChangeLog b/net-misc/openntpd/ChangeLog
index b0bec3bda303ddae7eb89f825db9e9b67f6c716a..32faff86b54fed5b6413550e5e6d99e9730b440d 100644 (file)
--- a/net-misc/openntpd/ChangeLog
+++ b/net-misc/openntpd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/openntpd
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/ChangeLog,v 1.8 2004/10/01 10:54:54 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/ChangeLog,v 1.9 2004/11/04 03:12:18 vapier Exp $
+
+*openntpd-0.20040824p (03 Nov 2004)
+
+  03 Nov 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/3.6_p1-ntpd.8.patch, +openntpd-0.20040824p.ebuild,
+  -openntpd-20040824p.ebuild, +openntpd-3.6_p1.ebuild:
+  Version bump #69858 by Christian Gut.
 
   01 Oct 2004; Danny van Dyk <kugelfang@gentoo.org> openntpd-20040824p.ebuild:
   Marked ~amd64.

diff --git a/net-misc/openntpd/Manifest b/net-misc/openntpd/Manifest
index b1db9c20c7fb872f774337e7737043de79b80fbe..12b389e8b9e095b113ea46316a1f513879f8b4b9 100644 (file)
--- a/net-misc/openntpd/Manifest
+++ b/net-misc/openntpd/Manifest
@@ -1,15 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 98f1f6ca42326e9d7f83fe29af3aa91c ChangeLog 935
-MD5 4a3bd96627a793f90ff5a9002929086f openntpd-20040824p.ebuild 883
+MD5 db46343f17a32e13e418a54d79c9df4f ChangeLog 1175
+MD5 961b147b108e846c060982286f63a4f1 openntpd-3.6_p1.ebuild 971
+MD5 4fe558b4274942fc5cbf5c8d2a129fba openntpd-0.20040824p.ebuild 943
+MD5 b1e008f7e477784dded26817d225dd1c files/3.6_p1-ntpd.8.patch 507
 MD5 190d5fd10b61033efb925f9d1fa5dd60 files/openntpd.rc 902
 MD5 b93fd6f96d2cf25cb967393fc1502784 files/openntpd.conf.d 243
-MD5 6629cc381ff1007852deb4dfc2303b20 files/digest-openntpd-20040824p 70
+MD5 ccc41a09c3fd03e626921199700f9a7e files/digest-openntpd-3.6_p1 66
+MD5 6629cc381ff1007852deb4dfc2303b20 files/digest-openntpd-0.20040824p 70
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBiZQjHTu7gpaalycRAmlJAKCF7fzorruxfYTYszYSuf8o9k0xbgCffneT
-F/pMTuWx7G6NXB8TXTUQrCI=
-=ohSz
+iD8DBQFBiZ47HTu7gpaalycRAolTAKCZlbdHGrnw4UXE3jkpViqFfgpARgCgzAo6
+NyTKwWwNxkyQwC2gOJZeFhY=
+=psa2
 -----END PGP SIGNATURE-----

diff --git a/net-misc/openntpd/files/3.6_p1-ntpd.8.patch b/net-misc/openntpd/files/3.6_p1-ntpd.8.patch
new file mode 100644 (file)
index 0000000..a2cf31e
--- /dev/null
+++ b/net-misc/openntpd/files/3.6_p1-ntpd.8.patch
@@ -0,0 +1,23 @@
+--- ntpd.8~    2004-07-15 12:16:28.000000000 +0200
++++ ntpd.8     2004-11-02 20:15:54.350917496 +0100
+@@ -37,20 +37,6 @@
+ and the Network Time Protocol version 3,
+ as described in RFC 1305.
+ .Pp
+-.Nm
+-is usually started at boot time, and can be enabled by
+-setting the following in
+-.Pa /etc/rc.conf.local :
+-.Pp
+-.Dl ntpd_flags=\&"\&"
+-.Pp
+-See
+-.Xr rc 8
+-and
+-.Xr rc.conf 8
+-for more information on the boot process
+-and enabling daemons.
+-.Pp
+ When
+ .Nm
+ starts up, it reads settings from a configuration file,

diff --git a/net-misc/openntpd/files/digest-openntpd-20040824p b/net-misc/openntpd/files/digest-openntpd-0.20040824p
similarity index 100%
rename from net-misc/openntpd/files/digest-openntpd-20040824p
rename to net-misc/openntpd/files/digest-openntpd-0.20040824p

diff --git a/net-misc/openntpd/files/digest-openntpd-3.6_p1 b/net-misc/openntpd/files/digest-openntpd-3.6_p1
new file mode 100644 (file)
index 0000000..f0c28fe
--- /dev/null
+++ b/net-misc/openntpd/files/digest-openntpd-3.6_p1
@@ -0,0 +1 @@
+MD5 ba69427e83a9a8080410261af116cdbe openntpd-3.6p1.tar.gz 114924

diff --git a/net-misc/openntpd/openntpd-20040824p.ebuild b/net-misc/openntpd/openntpd-0.20040824p.ebuild
similarity index 55%
rename from net-misc/openntpd/openntpd-20040824p.ebuild
rename to net-misc/openntpd/openntpd-0.20040824p.ebuild
index 9d29170fbb58efbf874082d4e03e3b38128c36db..98f9b0810a04798471ed3ff7cafad41fecbef100 100644 (file)
--- a/net-misc/openntpd/openntpd-20040824p.ebuild
+++ b/net-misc/openntpd/openntpd-0.20040824p.ebuild
@@ -1,19 +1,25 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/openntpd-20040824p.ebuild,v 1.5 2004/11/04 02:29:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/openntpd-0.20040824p.ebuild,v 1.1 2004/11/04 03:12:18 vapier Exp $
 
-inherit eutils flag-o-matic
+inherit eutils
 
+MY_P="${P}-${PV/0.}"
 DESCRIPTION="Lightweight NTP server ported from OpenBSD"
 HOMEPAGE="http://www.openntpd.org/"
-SRC_URI="http://www.openntpd.org/dist/portable/${P}.tar.gz"
+SRC_URI="http://www.openntpd.org/dist/portable/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 ppc sparc x86"
 IUSE=""
 
-DEPEND="virtual/libc"
+RDEPEND="virtual/libc
+       !net-misc/ntp"
+DEPEND="${RDEPEND}
+       >=sys-apps/portage-2.0.51"
+
+S=${WORKDIR}/${MY_P}
 
 src_unpack() {
        unpack ${A}
@@ -30,8 +36,6 @@ src_install() {
        make install DESTDIR=${D} || die
        dodoc ChangeLog CREDITS README
 
-       exeinto /etc/init.d
-       newexe ${FILESDIR}/openntpd.rc openntpd
-       insinto /etc/conf.d
-       newins ${FILESDIR}/openntpd.conf.d openntpd
+       newinitd ${FILESDIR}/openntpd.rc openntpd
+       newconfd ${FILESDIR}/openntpd.conf.d openntpd
 }

diff --git a/net-misc/openntpd/openntpd-3.6_p1.ebuild b/net-misc/openntpd/openntpd-3.6_p1.ebuild
new file mode 100644 (file)
index 0000000..77f5d3b
--- /dev/null
+++ b/net-misc/openntpd/openntpd-3.6_p1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/openntpd-3.6_p1.ebuild,v 1.1 2004/11/04 03:12:18 vapier Exp $
+
+inherit eutils
+
+MY_P=${P/_/}
+DESCRIPTION="Lightweight NTP server ported from OpenBSD"
+HOMEPAGE="http://www.openntpd.org/"
+SRC_URI="mirror://openbsd/OpenNTPD/portable/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="virtual/libc
+       !net-misc/ntp"
+DEPEND="${RDEPEND}
+       >=sys-apps/portage-2.0.51"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+       unpack ${A}
+       cd ${S}
+       sed -i '/NTPD_USER/s:_ntp:ntp:' ntpd.h || die
+       epatch ${FILESDIR}/${PV}-ntpd.8.patch
+}
+
+pkg_preinst() {
+       enewgroup ntp 123
+       enewuser ntp 123 /bin/false /var/empty ntp
+}
+
+src_install() {
+       make install DESTDIR=${D} || die
+       dodoc ChangeLog CREDITS README
+
+       newinitd ${FILESDIR}/openntpd.rc openntpd
+       newconfd ${FILESDIR}/openntpd.conf.d openntpd
+}