Re-add _p6 until bug 274863 is resolved, but add the MOD_NANO patch so it compiles.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
RepoMan-Options: --force

3 files changed, 152 insertions, 12 deletions

diff --git a/net-misc/ntp/ChangeLog b/net-misc/ntp/ChangeLog
index e026472dac10..6a50449a7f5e 100644
--- a/net-misc/ntp/ChangeLog
+++ b/net-misc/ntp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/ntp
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.147 2009/06/20 12:05:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.148 2009/06/20 23:12:04 robbat2 Exp $
+
+  20 Jun 2009; Robin H. Johnson <robbat2@gentoo.org> +ntp-4.2.4_p6.ebuild:
+  Re-add _p6 until bug 274863 is resolved, but add the MOD_NANO patch so it
+  compiles.
 
   20 Jun 2009; Mike Frysinger <vapier@gentoo.org> files/ntp.conf:
   Update dhcp comments in ntp.conf #270672 by Rabbe Fogelholm.
diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index 9d243c6196c9..49125b94863a 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX man-pages/genmans.sh 1608 RMD160 0232a5c8c68112f099befa6f6f8116500b5a4097 SHA1 85fd49155f0d1aa88a58d4f303dd22bbd56a47d0 SHA256 543d91dcc7b310819aa136b84b815a1112a80d9949d37b08366edc8f70db1cb6
 AUX man-pages/ntp.xsl 5831 RMD160 3822bda81ff8187ed56e1fdd9725713017e1a375 SHA1 85650d22144dbafa151dd70cb2bd170949075b60 SHA256 8a41227ded8953c90f49022f68bdaba60f9d82fe528d5a93157672c5bf8db03d
 AUX man-pages/ntpdc.html.patch 2558 RMD160 54ee42ad6f8b23efdf3005a17df6f1bc6475f5ee SHA1 c2c18f7a70a407a92ca7d272d9de37979664be12 SHA256 ebc0667c6e0225413217489d3356b260824d06de083bd90ad5506c0d233e36d6
@@ -11,15 +8,11 @@ AUX ntp-client.rc 833 RMD160 bc24de842f93866a9d7663df81323b8c4ef75afa SHA1 4a794
 AUX ntp.conf 1517 RMD160 749056c054071b300de2b0a04a4b2a9a7a135da7 SHA1 4d2924d2ea6269b53f12e7f2fa45c3a2be2f2c4b SHA256 907ebf0c12e5c75cd32ce7ad45e600d356caacfecbe0858ac24260ff4695d0c9
 AUX ntpd.confd 189 RMD160 f66902d8abf5180ac8cc24646d665597cec8ba43 SHA1 f5fc6088e5f859f59b8a7a085da2193154a2c222 SHA256 a3bc17ee0f7d41102d6c33e4281e22d312a42cc2ffd8848b08e9cd78d63f2d05
 AUX ntpd.rc 827 RMD160 b7155fb342453a108b7f6f3a89f0d01eda27fe57 SHA1 f2acf5591a991d5c448a2e714c90cd64ced9381c SHA256 3f1e27310bf09df5931cb4b3bac48b6b68b1a8b5a5db27db0953701fe97c66a5
+DIST ntp-4.2.4p6-manpages.tar.bz2 49716 RMD160 5caa9341e0cbf66fef371d3b1832f81d42c5c139 SHA1 993b849a2e5fa719f53f85c4e83ee52eecbea56d SHA256 960447080376ecb429e83eea11f1cc64ec69c8abcb0534293a1da43c78eb515d
+DIST ntp-4.2.4p6.tar.gz 3443787 RMD160 d3853bdd593b49c435ec19b95066097ef5e71acc SHA1 ad4b068cc03ce346a6276ed6b31c026b6ffc3d92 SHA256 647640067c7c6a4c568af54c139ce07bbf9f69b54bf9be2704b4c99c56651067
 DIST ntp-4.2.4p7-manpages.tar.bz2 49719 RMD160 deebf4f80e4c3684c48f743a03e0481030c7993a SHA1 4e6939aff7b41e7e3efc42332e0a7048f7075240 SHA256 cd21e29fcd9a13ee92d5f5ad492c9be49eeb2e877351865973805c12993cad3f
 DIST ntp-4.2.4p7.tar.gz 3382146 RMD160 11d69176c8cb4b95f7e9f468c37ab8fc53a28876 SHA1 8476f75daffe9851cc6f33d170902bce77637499 SHA256 5681883ce5cd0666d73c1b907e284653964a25ad4c02a308ab11b54aca8f01c3
+EBUILD ntp-4.2.4_p6.ebuild 4401 RMD160 71db36cb77effd4666d51a6e3f18283becd3a7c2 SHA1 03b786e70ba02bc3b6b980962cd5a4c11a15a92d SHA256 ff227d888b5ac67db22e94521cc4fdc460fb9d7b4db9a18ea193dac5afc46d61
 EBUILD ntp-4.2.4_p7.ebuild 4400 RMD160 f86e70d05559a5187d514e0017cc795c596a9d73 SHA1 e7f47a72eb31fc1f320b9f47c9529709693d97fd SHA256 551fe2287ff24ad8fd342f682fbd006da035c2804fff772fa6b791e1e9f94f10
-MISC ChangeLog 19767 RMD160 80c9151be575abeb2963480e00f2f5201687ddb7 SHA1 dc51ace4426e790ee64ebd6a7cedb70be25f98b7 SHA256 55950dcfa9f6de28a9cb63f7f14defebee4f223f929bad69b97887c7960923e7
+MISC ChangeLog 19932 RMD160 eacbda63c673968bb33068a3f5c03b673f57a4f2 SHA1 9bf2719294b19ac22b8012a0b4fa847ce1b8304d SHA256 1ca53feaf1890814c1b96c36766a0926423751a9de6624ecf49d5dc10adb9ef2
 MISC metadata.xml 715 RMD160 399981058fa1aae89de79c26de94873c2426ce22 SHA1 ebbfab9333a505a464b4fbcdd61345fb2358e74d SHA256 3f67258fd96d7520138375575b1763e018f22ef8fb87b71acd1f65fffe307de0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAko80KsACgkQlPl3HsVfCDpdcQCdGqaK0dAXDz8fyoBA0O99y+77
-3wwAn1j4pxQgHsZrLSWPXM+o5i/R+k2q
-=AbYG
------END PGP SIGNATURE-----
diff --git a/net-misc/ntp/ntp-4.2.4_p6.ebuild b/net-misc/ntp/ntp-4.2.4_p6.ebuild
new file mode 100644
index 000000000000..c753b453c643
--- /dev/null
+++ b/net-misc/ntp/ntp-4.2.4_p6.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.4_p6.ebuild,v 1.9 2009/06/20 23:12:04 robbat2 Exp $
+
+inherit eutils toolchain-funcs flag-o-matic
+
+MY_P=${P/_p/p}
+DESCRIPTION="Network Time Protocol suite/programs"
+HOMEPAGE="http://www.ntp.org/"
+SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz
+	mirror://gentoo/${MY_P}-manpages.tar.bz2"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+IUSE="caps debug ipv6 openntpd parse-clocks selinux ssl vim-syntax zeroconf"
+
+DEPEND=">=sys-libs/ncurses-5.2
+	>=sys-libs/readline-4.1
+	kernel_linux? ( caps? ( sys-libs/libcap ) )
+	zeroconf? ( || ( net-dns/avahi net-misc/mDNSResponder ) )
+	!openntpd? ( !net-misc/openntpd )
+	ssl? ( dev-libs/openssl )
+	selinux? ( sec-policy/selinux-ntp )"
+RDEPEND="${DEPEND}
+	vim-syntax? ( app-vim/ntp-syntax )"
+PDEPEND="openntpd? ( net-misc/openntpd )"
+
+S=${WORKDIR}/${MY_P}
+
+hax_bitkeeper() {
+	# the makefiles have support for bk ...
+	# basically we have to do this or bk will try to write
+	# to files in /opt/bitkeeper causing sandbox violations ;(
+	mkdir -p "${T}"/fakebin
+	echo "#!/bin/sh"$'\n'"exit 1" > "${T}"/fakebin/bk
+	chmod a+x "${T}"/fakebin/bk
+	export PATH="${T}/fakebin:${PATH}"
+}
+
+pkg_setup() {
+	enewgroup ntp 123
+	enewuser ntp 123 -1 /dev/null ntp
+
+	if use zeroconf && has_version net-dns/avahi && ! built_with_use net-dns/avahi mdnsresponder-compat ; then
+		eerror "You need to recompile net-dns/avahi with mdnsresponder-compat USE flag"
+		die "net-dns/avahi is missing required mdnsresponder-compat support"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Needs to be ported ...
+	#epatch "${FILESDIR}"/4.2.0.20040617-hostname.patch
+	epatch "${FILESDIR}"/${PN}-4.2.4_p5-adjtimex.patch #254030
+	epatch "${FILESDIR}"/${PN}-4.2.4_p7-nano.patch #270483
+	append-cppflags -D_GNU_SOURCE #264109
+
+	sed -i \
+		-e 's:md5\.h:touch_not_my_md5:g' \
+		-e 's:-lelf:-la_doe_a_deer_a_female_deer:g' \
+		-e 's:-lmd5:-li_dont_want_no_stinkin_md5:g' \
+		configure || die "sed failed"
+}
+
+src_compile() {
+	hax_bitkeeper
+	# blah, no real configure options #176333
+	export ac_cv_header_dns_sd_h=$(use zeroconf && echo yes || echo no)
+	export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h}
+	econf \
+		$(use_enable caps linuxcaps) \
+		$(use_enable parse-clocks) \
+		$(use_enable ipv6) \
+		$(use_enable debug debugging) \
+		$(use_with ssl crypto) \
+		|| die
+	emake || die
+}
+
+src_install() {
+	hax_bitkeeper
+	emake install DESTDIR="${D}" || die "install failed"
+	# move ntpd/ntpdate to sbin #66671
+	dodir /usr/sbin
+	mv "${D}"/usr/bin/{ntpd,ntpdate} "${D}"/usr/sbin/ || die "move to sbin"
+
+	dodoc ChangeLog INSTALL NEWS README TODO WHERE-TO-START
+	doman "${WORKDIR}"/man/*.[58]
+	dohtml -r html/*
+
+	insinto /usr/share/ntp
+	doins "${FILESDIR}"/ntp.conf
+	cp -r scripts/* "${D}"/usr/share/ntp/ || die
+	fperms -R go-w /usr/share/ntp
+	find "${D}"/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
+	newconfd "${FILESDIR}"/ntpd.confd ntpd
+	newinitd "${FILESDIR}"/ntp-client.rc ntp-client
+	newconfd "${FILESDIR}"/ntp-client.confd ntp-client
+	use caps || dosed "s|-u ntp:ntp||" /etc/conf.d/ntpd
+	dosed "s:/usr/bin:/usr/sbin:" /etc/init.d/ntpd
+
+	keepdir /var/lib/ntp
+	fowners ntp:ntp /var/lib/ntp
+
+	if use openntpd ; then
+		cd "${D}"
+		rm usr/sbin/ntpd || die
+		rm -r var/lib
+		rm etc/{conf,init}.d/ntpd
+		rm usr/share/man/*/ntpd.8 || die
+	fi
+}
+
+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
+	elog "The way ntp sets and maintains your system time has changed."
+	elog "Now you can use /etc/init.d/ntp-client to set your time at"
+	elog "boot while you can use /etc/init.d/ntpd to maintain your time"
+	elog "while your machine runs"
+	if grep -qs '^[^#].*notrust' "${ROOT}"/etc/ntp.conf ; then
+		echo
+		eerror "The notrust option was found in your /etc/ntp.conf!"
+		ewarn "If your ntpd starts sending out weird responses,"
+		ewarn "then make sure you have keys properly setup and see"
+		ewarn "http://bugs.gentoo.org/41827"
+	fi
+}