Drop old postinst messages #440438 by poletti.marco. Control readline dep via USE...

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

diff --git a/net-misc/ntp/ChangeLog b/net-misc/ntp/ChangeLog
index 43ab21a74453e385c536bd9c8aa4e9a50f6be7bc..43f1a4d72bd1b095fabd84a9cc6f1baf86cc8fa6 100644 (file)
--- a/net-misc/ntp/ChangeLog
+++ b/net-misc/ntp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/ntp
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.233 2015/04/04 07:54:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.234 2015/04/04 08:05:36 vapier Exp $
+
+*ntp-4.2.8-r3 (04 Apr 2015)
+
+  04 Apr 2015; Mike Frysinger <vapier@gentoo.org> +ntp-4.2.8-r3.ebuild:
+  Drop old postinst messages #440438 by poletti.marco.  Control readline dep via
+  USE flag #545120 by nzqr.
 
   04 Apr 2015; Mike Frysinger <vapier@gentoo.org> ntp-4.2.8-r2.ebuild:
   Fix up file timestamps to keep autotools from re-running #538270 by Jeroen

diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index 904954554de40eae8dfe50d977d6e54220273050..4c6c426b20f8ced7bfba89ea325d31a397b2274f 100644 (file)
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -31,22 +31,23 @@ EBUILD ntp-4.2.6_p5-r10.ebuild 4385 SHA256 8c30f3b8f7fcdf7ede4f534fe2c9e67f3f62c
 EBUILD ntp-4.2.6_p5-r11.ebuild 4416 SHA256 d6808650a0477ccae3e0a30577c24a40d789209be87098291fd949e0954f49af SHA512 cf6b5afc4c78c318af4c9f9cd4c90a0942c02f88eb61f985e6fa31352f7a11e3fc971d9913ab6d6e6101e3b02fea529573b3a91f9cfdbdc9b8dbea4b67b29115 WHIRLPOOL 56b4ad2d444dd2d95b380eef283a1f92a4bbedf103875e0eb5bbce183f862c403d8d705b1e83130c4a4dc39bdcdbf3d84a40cccac39c135cdf59a11238485209
 EBUILD ntp-4.2.8-r1.ebuild 4210 SHA256 446c49175af1b8c6eb9a871c491d1330b447cf523b3dcfe7853cdeb8b5a0eed5 SHA512 5bda7c90d38a78375664b073b3a217dbc116f46297eed8c14115f09dbe3aa4700eb6500cb9be04a3d1454a72fa624063548fa59abf6f2bd9e98df26a73c89759 WHIRLPOOL beff9484635e81e260e14eda43939e8d4674dbcbf2ecf48a4dd9b0aa8add121919fc9c1a3c22eb1abc2b2534cb1d76d5b69f4444a666c5aa07e98eaae1fd9a0f
 EBUILD ntp-4.2.8-r2.ebuild 4825 SHA256 9afefc5811cee4570de6904b0622d76db8a4f715ef611055dac3c8a2cfca9053 SHA512 0886d3c0d748c2d956b3117b92a4e8f56830b03137bceaff1a965032b6f678694f4bccb49a0a3e5e9ef562db9e310e3ff7b076f73e858a24e10ace1e1dc77ac7 WHIRLPOOL c6bcc2b107ccc6066327b3c2b63801c3f312e9ce39eb5380b74e93a246af7a5ffcc2a3149c3e149ade7350821d0714fa1e064a284094d91a1c3015a31390fb29
-MISC ChangeLog 33409 SHA256 a7b954c25280c23c712519661411eac429b0f6fcfee64067b92ee85d87c3fa9a SHA512 84b6d055e96b1c8177791db4bd7f5875955765559583951741beb5dbd803aba6533a316a8edc8a4d0c6ff19eeb79d4ba9fd56416a2c3c5d9ec0b30a6e9c5637e WHIRLPOOL 44ee00bef10f5fae33ede9ddc30a1b88453343779a0475c98ed9af93277a3f56f6a3fa718b701776211960b88553e4e1b1bdf39e40bcb6ad92fb5ea7be888859
+EBUILD ntp-4.2.8-r3.ebuild 4486 SHA256 ba0e5b4767e0f1a3681ad94c189ef71151302a6fc9ab6bed04220c98d2c2792a SHA512 502809befccbb2bb5dc0ccd4890f2401f83e76d0d419b42592a728ffaa194ee3b79c093b45cd4d9293f037e05f4bc041a9fb35c0a7f1f1102a9e458e3b47cea8 WHIRLPOOL 63a36f3dc5eebad5518ebad40c9694661579e8e8699756c48b4770896034ebf53d6241076312a1c7f9c44444f2b3759e443624afb360b665c464c39fdf7c50f3
+MISC ChangeLog 33620 SHA256 60d2cf37ac633464ac63a5f0c525cecc6f44fb5318a14bb06126a0312148bf73 SHA512 86b8129ce51cc7b4deba3fb4cb9864a2d44c4c3ba9dd7711fbae2f1c08980f4b1b2a5f4927f83beea7fdbdbff5552f45d766159574ebac997b2dcfc0fb12b0e8 WHIRLPOOL 9875da622c71a976c07ab57a11337561a4539cb4a0eaca7c4847086139b29ceb24188ccd88391fcb515697e222bbb39d4a8ab2a852bcdd95e634dfc264e0929f
 MISC metadata.xml 837 SHA256 57b162a2c709963d5760fdb3abe7d2a12e6e55a6abe816b16db30e9e2ae10a4e SHA512 d1403413373a0785712c40fd1a96c4649ef368b30efc5735667626ad760bb2336ba28fd335c75fc781ad6222e7dd9f53ad5dd2f558b3cbbf719104684fa0d9ed WHIRLPOOL 1513304c252dfb8f9a06a7cce1e13ab41ac80e0f0db7e231891430168df6e71a81e88984d47a694d6a5d0fd5a9c04dd1318c504baf21c7be6bd0d99b307db867
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVH5jSAAoJEPGu1DbS6WIAjTcP/juYBa4HEv8QCcNnaUUhG1zq
-gAK+sPFsFELPo9wAuM+XRSBZf7hzEBAJmVF49kQViXQoLV4Vr+tuRQCjUtAt4FAi
-PLqlgV0PPiN/Fo58zsELLq+/U6IGFSDA4YxqJpoB070Xbhsz0hYnMVHDlYMgQv6k
-psyuqSMG3QxOWE+7XHVQD++rUsyMVIFm94cS/Ci8lIhYhwepjt6hTQm6m4Ew8Rh6
-ys2mStgRShMqds/PldY8RH3iOkOxqoij0dH529C7Oh27UmDiDl6l+ZcHYBvBC0tf
-RdcrJWJviCY0doVChMARAxiocTocVhogbHyLlQUCy58Ip4EARNvXy+JS26hFCSIo
-4ly9LvYUDZ+t6Jk9TS5HNWlh2NjL3LKpYy+J3Ri57+7aT+6DQv9HAAsRZXPjvoXI
-A98lEC7wmCxA2bo93oJjx5UL+hCxxkR/0QS4sgcRjA1gOa57ZBISqKrPyVEat2jg
-IyEG+eUsoDc0npJclEYTwkESKBK3Xwp5yLM1V8nmqgHYXkzhkrfY9nn9qkrLKTqs
-N1TIprc2F6H/SEcb/tWXiNv0vEVDzRPSsdbyNyictfiZ/c7NrFQcjOuSCslDQefV
-iYX5Bnokrql8oxcaNoB/l4f/yicju0SihyvIJcTs3ydWs/8xP0e1oZG65RZzUtrR
-g1LYRKDTSNuYVcyhXP00
-=sc3D
+iQIcBAEBCAAGBQJVH5tRAAoJEPGu1DbS6WIAnGsP/0BmXncbsY88845hv+nc/kyQ
+8q27bcXVCEIgrYXwKK6e8kYx3UMhRAD7Ekycuo6sOuSxG8DJ7kYhEhHbCkGQlD6q
+Ldad75QDSdVgCII33czFm6r5TcwnXi3Q/KdBGzpty729mARpl5mucBvuBTV5DpgX
+rry3xcZoAj13nLvHLtwGHVQATLAXqlSzUe6a6GBEZ8IA7a5f8XB+m8g1cxv0ewO7
+GJDA4Rl1+hB1tIQNJwBdXy+L+jz6GvuviAVcbn7oZpvEbbnCj26+sg6kbx/1S1dS
++GWZ3Q4s+cS+dP7MqXsmY9k5jj+2JvqSqMwLIkDdUwDp3sJy3K3cYpZJKC6WQ8lh
+4JPFDELagvG/r/DqWMiws+Ha+VCd3snUe4dbpzZjvNckptKdM5BA12KReQq7sP75
+0SxwfF5M4uoqNgMUQRWOe1ZAHlNHEmrP4ivs5Ai0QrbSDtukapBYkuO4Ujb3L34d
+10a2CkU/JoYaPjytJ72QcGl8bqpafJ9Pr8cQQ8KTBMJ2YkLSZ+0rN4vOAvLP+Gzr
+p3DyDmddMZT5WRJ6vnW9lbOrFsovXuaxkm8BhuvsSi4zjjry1TJjKxaGBsTaOoty
+8sUPPddjZAAWOtZ6Lnn2tv7nE+G5Pz+pF2KQJ9iCEVz5hsqNhf0hdsrqtGRQYSB0
+ox6tKRxAq4KC2+tSTYs7
+=7fPq
 -----END PGP SIGNATURE-----

diff --git a/net-misc/ntp/ntp-4.2.8-r3.ebuild b/net-misc/ntp/ntp-4.2.8-r3.ebuild
new file mode 100644 (file)
index 0000000..bea66e2
--- /dev/null
+++ b/net-misc/ntp/ntp-4.2.8-r3.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2015 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-r3.ebuild,v 1.1 2015/04/04 08:05:36 vapier Exp $
+
+EAPI="4"
+
+inherit autotools eutils toolchain-funcs flag-o-matic user systemd
+
+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="HPND BSD ISC"
+SLOT="0"
+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 readline samba selinux snmp ssl +threads vim-syntax zeroconf"
+
+CDEPEND="readline? ( >=sys-libs/readline-4.1 )
+       >=dev-libs/libevent-2.0.9[threads?]
+       kernel_linux? ( caps? ( sys-libs/libcap ) )
+       zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+       !openntpd? ( !net-misc/openntpd )
+       snmp? ( net-analyzer/net-snmp )
+       ssl? ( dev-libs/openssl )
+       parse-clocks? ( net-misc/pps-tools )"
+DEPEND="${CDEPEND}
+       virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+       selinux? ( sec-policy/selinux-ntp )
+       vim-syntax? ( app-vim/ntp-syntax )"
+PDEPEND="openntpd? ( net-misc/openntpd )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+       enewgroup ntp 123
+       enewuser ntp 123 -1 /dev/null ntp
+}
+
+src_prepare() {
+       epatch "${FILESDIR}"/${PN}-4.2.4_p7-nano.patch #270483
+       epatch "${FILESDIR}"/${P}-ntp-keygen-no-openssl.patch #533238
+       append-cppflags -D_GNU_SOURCE #264109
+       # Make sure every build uses the same install layout. #539092
+       find sntp/loc/ -type f '!' -name legacy -delete || die
+       # Disable pointless checks.
+       touch .checkChangeLog .gcc-warning FRC.html html/.datecheck
+       eautoreconf
+
+       # The autoreconf call above recursively ran in all subdirs, and then
+       # ran in the top level.  But the libtool call there updated files in
+       # the subdir which broke timestamps causing autotools to re-run.  #538270
+       find -type f -exec touch -r . {} +
+}
+
+src_configure() {
+       # avoid libmd5/libelf
+       export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no
+       export ac_cv_lib_elf_nlist=no
+       # blah, no real configure options #176333
+       export ac_cv_header_dns_sd_h=$(usex zeroconf)
+       export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h}
+       econf \
+               --with-lineeditlibs=readline,edit,editline \
+               --with-yielding-select \
+               --disable-local-libevent \
+               --docdir='$(datarootdir)'/doc/${PF} \
+               --htmldir='$(docdir)/html' \
+               $(use_enable caps linuxcaps) \
+               $(use_enable parse-clocks) \
+               $(use_enable ipv6) \
+               $(use_enable debug debugging) \
+               $(use_with readline lineeditlibs readline) \
+               $(use_enable samba ntp-signd) \
+               $(use_with snmp ntpsnmpd) \
+               $(use_with ssl crypto) \
+               $(use_enable threads thread-support)
+}
+
+src_install() {
+       default
+       # move ntpd/ntpdate to sbin #66671
+       dodir /usr/sbin
+       mv "${ED}"/usr/bin/{ntpd,ntpdate} "${ED}"/usr/sbin/ || die "move to sbin"
+
+       dodoc INSTALL WHERE-TO-START
+       doman "${WORKDIR}"/man/*.[58]
+
+       insinto /etc
+       doins "${FILESDIR}"/ntp.conf
+       newinitd "${FILESDIR}"/ntpd.rc-r1 ntpd
+       newconfd "${FILESDIR}"/ntpd.confd ntpd
+       newinitd "${FILESDIR}"/ntp-client.rc ntp-client
+       newconfd "${FILESDIR}"/ntp-client.confd ntp-client
+       newinitd "${FILESDIR}"/sntp.rc sntp
+       newconfd "${FILESDIR}"/sntp.confd sntp
+       if ! use caps ; then
+               sed -i "s|-u ntp:ntp||" "${ED}"/etc/conf.d/ntpd || die
+       fi
+       sed -i "s:/usr/bin:/usr/sbin:" "${ED}"/etc/init.d/ntpd || die
+
+       keepdir /var/lib/ntp
+       use prefix || fowners ntp:ntp /var/lib/ntp
+
+       if use openntpd ; then
+               cd "${ED}"
+               rm usr/sbin/ntpd || die
+               rm -r var/lib
+               rm etc/{conf,init}.d/ntpd
+               rm usr/share/man/*/ntpd.8 || die
+       else
+               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_newunit "${FILESDIR}"/ntpdate.service-r1 ntpdate.service
+       systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf
+       systemd_newunit "${FILESDIR}"/sntp.service-r2 sntp.service
+       systemd_install_serviced "${FILESDIR}"/sntp.service.conf
+}
+
+pkg_postinst() {
+       if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then
+               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
+}