Pass --docdir and --htmldir to configure and drop dohtml, bug 533410.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

diff --git a/net-misc/ntp/ChangeLog b/net-misc/ntp/ChangeLog
index 1a205fb0744a19700d6af80de6514dbc9316d526..95dac702df177bec4a4e846580ff8e56cc7989d6 100644 (file)
--- a/net-misc/ntp/ChangeLog
+++ b/net-misc/ntp/ChangeLog
@@ -1,6 +1,11 @@
 # 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.228 2014/12/23 17:43:25 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.229 2014/12/23 21:11:13 floppym Exp $
+
+*ntp-4.2.8-r2 (23 Dec 2014)
+
+  23 Dec 2014; Mike Gilbert <floppym@gentoo.org> +ntp-4.2.8-r2.ebuild:
+  Pass --docdir and --htmldir to configure and drop dohtml, bug 533410.
 
   23 Dec 2014; Mike Gilbert <floppym@gentoo.org> files/ntpd.rc-r1:
   Remove note about /usr/share/ntp/ntp.conf.

diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index bb8ad49e82eff2a2caf6d3fe4d7fe8e5a7d68982..6ac71a2f015ea288a70dc3df9702293cac383a02 100644 (file)
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -30,12 +30,13 @@ DIST ntp-4.2.8.tar.gz 6750364 SHA256 2e920df8b6a5a410567a73767fa458c00c7f0acec32
 EBUILD ntp-4.2.6_p5-r10.ebuild 4385 SHA256 8c30f3b8f7fcdf7ede4f534fe2c9e67f3f62cefea076fd8080d1c57a9ae305fc SHA512 18137975fa6703d877a8357da1c24279f1ab001b767257c827b10692994a8636b4fe849b5951f9a1dfbaef47c89c7356299936f82a9474aa8901d7cb3a9b1587 WHIRLPOOL ecb4b932b3ce6c86ce57c86818f803568642d654ca9925f4283a790096ae42f9ace6d6862907b171111daf8a5f0cdc68bc6fbef34a063ccc72be5fb613476bcf
 EBUILD ntp-4.2.6_p5-r11.ebuild 4416 SHA256 d6808650a0477ccae3e0a30577c24a40d789209be87098291fd949e0954f49af SHA512 cf6b5afc4c78c318af4c9f9cd4c90a0942c02f88eb61f985e6fa31352f7a11e3fc971d9913ab6d6e6101e3b02fea529573b3a91f9cfdbdc9b8dbea4b67b29115 WHIRLPOOL 56b4ad2d444dd2d95b380eef283a1f92a4bbedf103875e0eb5bbce183f862c403d8d705b1e83130c4a4dc39bdcdbf3d84a40cccac39c135cdf59a11238485209
 EBUILD ntp-4.2.8-r1.ebuild 4211 SHA256 f3db047295f18ebccc87927f1867bb065356148a98b6f5f81458bb0af42c1ec9 SHA512 613ede716d9e3a32087c0a1fdae1178d8a1d714dc82c49ab506f0495940bcb411c039a8cc88f061a80fd0a97479209840ba63587b1cef9248469d25926f561e4 WHIRLPOOL f08d940effd2329adb54516df2eaace88d1b0b1447fcbaa8f3ab493d17f08acde85d1d3900e0a84df9823321d6a5b423c838ba1b0574f2f8252b485f7e66d672
-MISC ChangeLog 32696 SHA256 f41ce4365c7e9a107eaaa5d27b5e67eacb03462fb3a7ad973ce4ae61164ff8c7 SHA512 8c5ede56d27879f59a48f6a6135105731bfdb65f7ba9d4dec017e7e7f98dab95c5ef251e5064c1c4e3732584452b310724df8a4fe3b03eb587a858a6433fb432 WHIRLPOOL 8f0f32689e1d991f3fb1b3f5d4c64f979ba04e83efa1e6d662e7d65e2fb15483211ecee1cf705344091240436e00383ebd770a561d9abaa9e6bdce52df011097
+EBUILD ntp-4.2.8-r2.ebuild 4305 SHA256 d2880c924a028f4e5fd4fb9618ed08dcc6d69891e97525a175ba6733cca29c93 SHA512 a553dd33333c50bb3fb76f492f75ae4e637e569d6f8ebc06fca6840c9f919056f31ba6525f0d1c27d8b2cfaca70ac3d3fe41e048580148571c70529a9d443a32 WHIRLPOOL ce37c90b795aa69eae587f8fa9852a2461d6a5d681c90ba3c4a2f8569338658c2a10d9cdf2b912b388ea0bf3cb7c7addccfc12df5d3832c3d3c726ec2c3bae10
+MISC ChangeLog 32869 SHA256 f748fcf557af740a011ecea32d3db5f8c9b3e93db35f7508d736768979445053 SHA512 a1108e1e549a03c9c59d9960a09609ebab258fda93eaa55213e75ae718cd742e7d92f3f258d37a8ec24b8159a0fc8fe6e1cf851c4b1ee66be4749ebf4def2ce6 WHIRLPOOL 67062d5e5e31ba72b0d7e1fdace57187617edb68c9710de62ccfb46963a4c0970b2036b447572647de6b1f7dfd086bcd3d8d340de0c932beacb4d0199461aa88
 MISC metadata.xml 837 SHA256 57b162a2c709963d5760fdb3abe7d2a12e6e55a6abe816b16db30e9e2ae10a4e SHA512 d1403413373a0785712c40fd1a96c4649ef368b30efc5735667626ad760bb2336ba28fd335c75fc781ad6222e7dd9f53ad5dd2f558b3cbbf719104684fa0d9ed WHIRLPOOL 1513304c252dfb8f9a06a7cce1e13ab41ac80e0f0db7e231891430168df6e71a81e88984d47a694d6a5d0fd5a9c04dd1318c504baf21c7be6bd0d99b307db867
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlSZqcEACgkQC77qH+pIQ6QrSQD+O7SevYDTVwFLnul9n9KvfoM+
-b4vLQP6DC03uT6RJVWYBAJgwhDRZDUGhjH6jFTMdBuPUONVGtWegnCNIFypzW0X1
-=x8Ii
+iF4EAREIAAYFAlSZ2nIACgkQC77qH+pIQ6R/ygD/bNNC2nDLu9Is+d+6d8l2ATE0
+hIXaCdJbXj3KpGk3RPYA/3rV5vnwyJTkXJedO74SkcSQ5I4CFBuGQmUsoC7j/7iL
+=vv7h
 -----END PGP SIGNATURE-----

diff --git a/net-misc/ntp/ntp-4.2.8-r2.ebuild b/net-misc/ntp/ntp-4.2.8-r2.ebuild
new file mode 100644 (file)
index 0000000..4175717
--- /dev/null
+++ b/net-misc/ntp/ntp-4.2.8-r2.ebuild
@@ -0,0 +1,130 @@
+# 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.8-r2.ebuild,v 1.1 2014/12/23 21:11:13 floppym 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 samba selinux snmp ssl vim-syntax zeroconf"
+
+CDEPEND=">=sys-libs/ncurses-5.2
+       >=sys-libs/readline-4.1
+       >=dev-libs/libevent-2.0.9
+       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
+       eautoreconf
+}
+
+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="${EPREFIX}/usr/share/doc/${PF}" \
+               --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+               $(use_enable caps linuxcaps) \
+               $(use_enable parse-clocks) \
+               $(use_enable ipv6) \
+               $(use_enable debug debugging) \
+               $(use_enable samba ntp-signd) \
+               $(use_with snmp ntpsnmpd) \
+               $(use_with ssl crypto)
+}
+
+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() {
+       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' "${EROOT}"/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
+}