Move to USE=zeroconf #177413 by Jakub Moc.

Package-Manager: portage-2.1.2.9

3 files changed, 29 insertions, 21 deletions

diff --git a/net-misc/ntp/ChangeLog b/net-misc/ntp/ChangeLog
index 143457d4d52e..9d7581492e6a 100644
--- a/net-misc/ntp/ChangeLog
+++ b/net-misc/ntp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/ntp
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.102 2007/05/05 07:42:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.103 2007/06/11 04:33:08 vapier Exp $
+
+  11 Jun 2007; Mike Frysinger <vapier@gentoo.org> ntp-4.2.4_p0.ebuild:
+  Move to USE=zeroconf #177413 by Jakub Moc.
 
   05 May 2007; Mike Frysinger <vapier@gentoo.org> ntp-4.2.4_p0.ebuild:
   Add support for USE=mdnsresponder #176333 by Carsten Lohrke.
diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index 6873193b9cba..27334b39d59d 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -29,14 +29,14 @@ EBUILD ntp-4.2.4-r1.ebuild 3777 RMD160 2736668f45bdf7a6d31bc75b2cb51ac9e2b5031b
 MD5 f01ef9839035c3ac5f78613f29110313 ntp-4.2.4-r1.ebuild 3777
 RMD160 2736668f45bdf7a6d31bc75b2cb51ac9e2b5031b ntp-4.2.4-r1.ebuild 3777
 SHA256 260824595fa2ff7f03a19657c7fd54815b369d19fdf5310ff05679e200af9e6c ntp-4.2.4-r1.ebuild 3777
-EBUILD ntp-4.2.4_p0.ebuild 4029 RMD160 85070446791e133a739c6bb4352d416662e27e2f SHA1 9a8a0ac5875aad699eca27d522d2ff1f41008384 SHA256 24966c65cd2f7fca1453b23dfe88566ab89e872c741529bd7b3cf20a5dea0677
-MD5 240aac837550337391d26f6b9da80e98 ntp-4.2.4_p0.ebuild 4029
-RMD160 85070446791e133a739c6bb4352d416662e27e2f ntp-4.2.4_p0.ebuild 4029
-SHA256 24966c65cd2f7fca1453b23dfe88566ab89e872c741529bd7b3cf20a5dea0677 ntp-4.2.4_p0.ebuild 4029
-MISC ChangeLog 14918 RMD160 e913e3f4f66add9fd6adbc213df3030889b6b730 SHA1 6fa250802caf2b3a2b1df29786ecad5cfb43faa5 SHA256 cd772b9534366d112dc33750b102691345bb43a074b06df931c8e8010089bd86
-MD5 c7b5ce0d6e0b5e1d27fd57f61e7975a8 ChangeLog 14918
-RMD160 e913e3f4f66add9fd6adbc213df3030889b6b730 ChangeLog 14918
-SHA256 cd772b9534366d112dc33750b102691345bb43a074b06df931c8e8010089bd86 ChangeLog 14918
+EBUILD ntp-4.2.4_p0.ebuild 4297 RMD160 41e4e0c8b96664785dfdde1397d1352dbc1e4b58 SHA1 06a9e8135484e800754c160b570df121deae59d7 SHA256 322d6c6c75f2f93ab9de5c23dbf63dc78f417918a40031a6ef329a6101bb2266
+MD5 4bea01ac0f24a911690bbbc3369622f8 ntp-4.2.4_p0.ebuild 4297
+RMD160 41e4e0c8b96664785dfdde1397d1352dbc1e4b58 ntp-4.2.4_p0.ebuild 4297
+SHA256 322d6c6c75f2f93ab9de5c23dbf63dc78f417918a40031a6ef329a6101bb2266 ntp-4.2.4_p0.ebuild 4297
+MISC ChangeLog 15035 RMD160 23ed14a459f3627b24400d7eb2fcf1c8326747e0 SHA1 e6966217c331742679c46f28ca0934803ae2149e SHA256 78a77aa17990d2a55387188a138897bcb2dd1c1e7bbb73eef143124fdcf4e487
+MD5 d1afa51f113ea93c4ed23b5058555256 ChangeLog 15035
+RMD160 23ed14a459f3627b24400d7eb2fcf1c8326747e0 ChangeLog 15035
+SHA256 78a77aa17990d2a55387188a138897bcb2dd1c1e7bbb73eef143124fdcf4e487 ChangeLog 15035
 MISC metadata.xml 607 RMD160 f005595b482e97659d0dc42cf0af1c56d88ec3a7 SHA1 67aab04a0a7021caf7a78d9094315f3595f47409 SHA256 14dc7da8f6d0ccaafa8408e289acd1a23f7adff23ef45c2fdd0d8b89d97d0222
 MD5 8d52071ded7c5d37f4823ac9a4fffb8e metadata.xml 607
 RMD160 f005595b482e97659d0dc42cf0af1c56d88ec3a7 metadata.xml 607
@@ -48,9 +48,9 @@ MD5 da22ab91c793f6d4f0be12b22e6c8718 files/digest-ntp-4.2.4_p0 500
 RMD160 4a633f60a523a4252f15f7bc0a88ecb2a58481c6 files/digest-ntp-4.2.4_p0 500
 SHA256 2b2e1804b5f33bfeed92591cb61be77611eb1ae942a0fdba7002a31d663dff5e files/digest-ntp-4.2.4_p0 500
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGPY3O8bi6rjpTunYRAoSyAJ9CmTjRoCh0QuzCUpk4hbNMQE4S4QCdE/KU
-mc4scLY7ZEZUL+vNn16xFEc=
-=Xgje
+iD8DBQFGbNCK8bi6rjpTunYRAlZzAJ9OnpH+7BaBJdBbuWBVAqb30u7i+wCcDMNk
+wPXjZjVzoTWL/nrwBgzoXi0=
+=+kOU
 -----END PGP SIGNATURE-----
diff --git a/net-misc/ntp/ntp-4.2.4_p0.ebuild b/net-misc/ntp/ntp-4.2.4_p0.ebuild
index 67d512aecd6f..c3a90bcdca49 100644
--- a/net-misc/ntp/ntp-4.2.4_p0.ebuild
+++ b/net-misc/ntp/ntp-4.2.4_p0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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_p0.ebuild,v 1.3 2007/05/06 08:11:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.4_p0.ebuild,v 1.4 2007/06/11 04:33:08 vapier Exp $
 
 inherit eutils toolchain-funcs
 
@@ -13,12 +13,12 @@ SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar
 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 mdnsresponder openntpd parse-clocks selinux ssl"
+IUSE="caps debug ipv6 openntpd parse-clocks selinux ssl zeroconf"
 
 DEPEND=">=sys-libs/ncurses-5.2
 	>=sys-libs/readline-4.1
 	kernel_linux? ( caps? ( sys-libs/libcap ) )
-	mdnsresponder? ( net-misc/mDNSResponder )
+	zeroconf? ( || ( net-dns/avahi net-misc/mDNSResponder ) )
 	!openntpd? ( !net-misc/openntpd )
 	ssl? ( dev-libs/openssl )
 	selinux? ( sec-policy/selinux-ntp )"
@@ -39,6 +39,11 @@ hax_bitkeeper() {
 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() {
@@ -58,7 +63,7 @@ src_unpack() {
 src_compile() {
 	hax_bitkeeper
 	# blah, no real configure options #176333
-	export ac_cv_header_dns_sd_h=$(use mdnsresponder && echo yes || echo no)
+	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) \
@@ -126,10 +131,10 @@ pkg_postinst() {
 	ewarn "Review /etc/ntp.conf to setup server info."
 	ewarn "Review /etc/conf.d/ntpd to setup init.d info."
 	echo
-	einfo "The way ntp sets and maintains your system time has changed."
-	einfo "Now you can use /etc/init.d/ntp-client to set your time at"
-	einfo "boot while you can use /etc/init.d/ntpd to maintain your time"
-	einfo "while your machine runs"
+	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 [[ -n $(egrep '^[^#].*notrust' "${ROOT}"/etc/ntp.conf) ]] ; then
 		echo
 		eerror "The notrust option was found in your /etc/ntp.conf!"