Another revision bump. Added support for the debug USE flag which was previously always enabled.

Package-Manager: portage-2.0.51.21-r1

5 files changed, 33 insertions, 9 deletions

diff --git a/net-misc/ntp/ChangeLog b/net-misc/ntp/ChangeLog
index 1b343e3c7c8f..44eae2f34111 100644
--- a/net-misc/ntp/ChangeLog
+++ b/net-misc/ntp/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/ntp
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.55 2005/05/06 16:57:58 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.56 2005/05/08 05:45:59 swegener Exp $
+
+*ntp-4.2.0.20040617-r2 (08 May 2005)
+
+  08 May 2005; Sven Wegener <swegener@gentoo.org>
+  +files/4.2.0.20040617-debug-fix.patch, -ntp-4.2.0.20040617-r1.ebuild,
+  +ntp-4.2.0.20040617-r2.ebuild:
+  Another revision bump. Added support for the debug USE flag which was
+  previously always enabled.
 
 *ntp-4.2.0.20040617-r1 (06 May 2005)
 
diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index fb80716697c2..597f5c8e6d0b 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -2,11 +2,11 @@
 Hash: SHA1
 
 MD5 fd508993ba497efbbe023f0b257528f5 ntp-4.2.0-r2.ebuild 3734
+MD5 dbfc76eb3a2153fa2a4baed98aeb2d76 ntp-4.2.0.20040617-r2.ebuild 4251
 MD5 9ceb922f98c6b88a28c7942e0eacfd75 ntp-4.2.0.20040617.ebuild 3989
 MD5 5ee4f3f57c18aad3ceece869d567c9c8 ntp-4.1.2.ebuild 3167
-MD5 648980148c9aecca80395b6065033df4 ChangeLog 8177
+MD5 03cb65a5d159014d2d77958ef4c7f9be ChangeLog 8472
 MD5 aa73d5edf312beeab44fa9d58a603ad4 metadata.xml 636
-MD5 912ba7835f9cdcf266a15ac2d51ecea8 ntp-4.2.0.20040617-r1.ebuild 4167
 MD5 b8fc232f85be1313aee4c5a6f0048ca7 files/ntp-client-4.1.2.rc 840
 MD5 5fc28af5c2a508eeb67a4d5d0ffab341 files/digest-ntp-4.2.0-r2 135
 MD5 83dde3b948b28c278d496252494c935f files/ntpd.confd 393
@@ -18,13 +18,14 @@ MD5 20c344cec35350fe17773665094b2e57 files/ntp-4.2.0-gcc4.patch 1607
 MD5 87951141777f50b2e4a2347a96f987b8 files/ntpd-4.1.2.rc 806
 MD5 047fe77e01bc9335b07bcc5d963d8683 files/4.1.2-droproot.patch 12672
 MD5 59c70b7499e588d6a24901a951c1bcd8 files/digest-ntp-4.2.0.20040617 166
+MD5 4404af9ccf7ecc7005c46dc43d9ae80a files/4.2.0.20040617-debug-fix.patch 430
 MD5 0ce27073d67a016693a77314b6bfd4f5 files/ntpd.rc 741
 MD5 2965cff99d89c28ae19c1a967f697777 files/ntp-client.rc 925
 MD5 5bd3924f5720b97837969ec4ec4d5e09 files/ntp.conf 1451
 MD5 abb390de7ada49ef21ae18598b5eddb2 files/4.2.0.20040617-errno-fix.patch 685
 MD5 d07dbc58315f577cc6d1dd8614f95cb1 files/4.2.0-ntpdate-quiet.patch 1117
 MD5 af48491e8d6820a3d8eba16a771e5c26 files/digest-ntp-4.1.2 129
-MD5 59c70b7499e588d6a24901a951c1bcd8 files/digest-ntp-4.2.0.20040617-r1 166
+MD5 59c70b7499e588d6a24901a951c1bcd8 files/digest-ntp-4.2.0.20040617-r2 166
 MD5 0c3a6df816f448a870e070797c22f72e files/4.2.0.20040617-hostname.patch 8476
 MD5 c51a9f2f2c85ab3bcdc54a1a9e3bedb6 files/4.2.0.20040617-ipv6-fixes.patch 2541
 MD5 4e13c1a5fa0fa54e3b65ec311dd7270a files/broadcastclient.patch 451
@@ -33,7 +34,7 @@ MD5 dded11ceec4b8f2c1b140341a357f507 files/linux-config-phone.patch 747
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCe6ItI1lqEGTUzyQRAp3bAKCqVgq/O7yNT2MJ3fOnpZ5nT/OJ9QCfcKuQ
-ts4rhitXilp4ZtPP2/vM7i4=
-=L1di
+iD8DBQFCfaemI1lqEGTUzyQRAjwSAKDTkajrimXfhrGT71QgURZAWRNgvQCguqBr
+fTh7NmsoHSACCmgBNFXG0BA=
+=oJ77
 -----END PGP SIGNATURE-----
diff --git a/net-misc/ntp/files/4.2.0.20040617-debug-fix.patch b/net-misc/ntp/files/4.2.0.20040617-debug-fix.patch
new file mode 100644
index 000000000000..5a97fde7a442
--- /dev/null
+++ b/net-misc/ntp/files/4.2.0.20040617-debug-fix.patch
@@ -0,0 +1,13 @@
+diff -Nur ntp-stable-4.2.0a-20040617/ntpd/ntp_proto.c ntp-stable-4.2.0a-20040617-debug-fix/ntpd/ntp_proto.c
+--- ntp-stable-4.2.0a-20040617/ntpd/ntp_proto.c	2004-05-25 11:02:24.000000000 +0000
++++ ntp-stable-4.2.0a-20040617-debug-fix/ntpd/ntp_proto.c	2005-05-07 22:32:30.973867197 +0000
+@@ -2293,8 +2293,8 @@
+ 			if (debug > 1)
+ 				printf("select: prefer offset %.6f\n",
+ 				    sys_offset);
+-		}
+ #endif
++		}
+ 	} else {
+ 
+ 		/*
diff --git a/net-misc/ntp/files/digest-ntp-4.2.0.20040617-r1 b/net-misc/ntp/files/digest-ntp-4.2.0.20040617-r2
index 1fec3109247e..1fec3109247e 100644
--- a/net-misc/ntp/files/digest-ntp-4.2.0.20040617-r1
+++ b/net-misc/ntp/files/digest-ntp-4.2.0.20040617-r2
diff --git a/net-misc/ntp/ntp-4.2.0.20040617-r1.ebuild b/net-misc/ntp/ntp-4.2.0.20040617-r2.ebuild
index 3fdea2c6a5fe..f55ff1c088e2 100644
--- a/net-misc/ntp/ntp-4.2.0.20040617-r1.ebuild
+++ b/net-misc/ntp/ntp-4.2.0.20040617-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.0.20040617-r1.ebuild,v 1.1 2005/05/06 16:57:58 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.0.20040617-r2.ebuild,v 1.1 2005/05/08 05:45:59 swegener Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/snapshots/ntp-stable/${PV
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~ia64"
-IUSE="parse-clocks nodroproot selinux ssl ipv6 openntpd"
+IUSE="parse-clocks nodroproot selinux ssl ipv6 openntpd debug"
 
 RDEPEND=">=sys-libs/ncurses-5.2
 	>=sys-libs/readline-4.1
@@ -51,6 +51,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PV}-hostname.patch
 	epatch "${FILESDIR}"/${PV}-errno-fix.patch
 	epatch "${FILESDIR}"/${PV}-ipv6-fixes.patch
+	epatch "${FILESDIR}"/${PV}-debug-fix.patch
 
 	#GCC 4 compile fixes
 	epatch "${FILESDIR}"/ntp-4.2.0-gcc4.patch
@@ -69,6 +70,7 @@ src_compile() {
 		$(use_enable !nodroproot linuxcaps) \
 		$(use_enable parse-clocks) \
 		$(use_enable ipv6) \
+		$(use_enable debug debugging) \
 		$(use_with ssl crypto) \
 		|| die
 	emake || die