clean up previous commit

(Portage version: 2.2_rc55/cvs/Linux x86_64)

4 files changed, 48 insertions, 53 deletions

diff --git a/net-misc/ntp/ChangeLog b/net-misc/ntp/ChangeLog
index a15805e7c347..bcf6e50a89f9 100644
--- a/net-misc/ntp/ChangeLog
+++ b/net-misc/ntp/ChangeLog
@@ -1,10 +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.155 2009/12/14 18:39:13 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.156 2009/12/14 18:47:09 vapier Exp $
 
   14 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org>
-  +files/4.2.6-as-needed.patch, ntp-4.2.6.ebuild:
-  QA: Apply as-needed fix per bug #296832. Thanks to Martin von Gagern for
+  +files/ntp-4.2.6-as-needed.patch, ntp-4.2.6.ebuild:
+  Apply as-needed fix per bug #296832. Thanks to Martin von Gagern for
   patch.
 
 *ntp-4.2.6 (14 Dec 2009)
diff --git a/net-misc/ntp/files/4.2.6-as-needed.patch b/net-misc/ntp/files/4.2.6-as-needed.patch
deleted file mode 100644
index aa45dec827e6..000000000000
--- a/net-misc/ntp/files/4.2.6-as-needed.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Index: ntp-4.2.6/ntpd/Makefile.am
-===================================================================
---- ntp-4.2.6.orig/ntpd/Makefile.am
-+++ ntp-4.2.6/ntpd/Makefile.am
-@@ -83,8 +83,8 @@ man_MANS=	ntpd.1
- # floor                               refclock_wwv.o
- # which are (usually) provided by -lm.
- keyword_gen_LDADD = ../libntp/libntp.a
--ntpd_LDADD = $(LDADD) -lm @LCRYPTO@ @LSCF@ $(LIBOPTS_LDADD) ../libntp/libntp.a
--ntpdsim_LDADD = $(LDADD) -lm @LCRYPTO@ @LSCF@ $(LIBOPTS_LDADD) ../libntp/libntpsim.a
-+ntpd_LDADD = $(LDADD) $(LIBOPTS_LDADD) ../libntp/libntp.a -lm @LCRYPTO@ @LSCF@
-+ntpdsim_LDADD = $(LDADD) $(LIBOPTS_LDADD) ../libntp/libntpsim.a -lm @LCRYPTO@ @LSCF@
- ntpdsim_CFLAGS = $(CFLAGS) -DSIM
- check_y2k_LDADD = $(LDADD) ../libntp/libntp.a
- DISTCLEANFILES = keyword-gen .version version.c
-Index: ntp-4.2.6/ntpdc/Makefile.am
-===================================================================
---- ntp-4.2.6.orig/ntpdc/Makefile.am
-+++ ntp-4.2.6/ntpdc/Makefile.am
-@@ -10,8 +10,8 @@ AM_CPPFLAGS= -I$(top_srcdir)/include -I$
- 	-I$(top_srcdir)/lib/isc/nothreads/include \
- 	-I$(top_srcdir)/lib/isc/unix/include $(LIBOPTS_CFLAGS)
- # LDADD might need RESLIB and ADJLIB
--ntpdc_LDADD=	version.o @LCRYPTO@ @EDITLINE_LIBS@ $(LIBOPTS_LDADD) \
--		../libntp/libntp.a
-+ntpdc_LDADD=	version.o @EDITLINE_LIBS@ $(LIBOPTS_LDADD) \
-+		../libntp/libntp.a @LCRYPTO@
- # ntpdc-layout doesn't need any additional libraries at all
- ntpdc_layout_LDADD=
- DISTCLEANFILES=	.version version.c
-Index: ntp-4.2.6/ntpq/Makefile.am
-===================================================================
---- ntp-4.2.6.orig/ntpq/Makefile.am
-+++ ntp-4.2.6/ntpq/Makefile.am
-@@ -8,8 +8,8 @@ AM_CPPFLAGS= -I$(top_srcdir)/include -I$
- 	-I$(top_srcdir)/lib/isc/unix/include $(LIBOPTS_CFLAGS)
- 
- # LDADD might need RESLIB and ADJLIB
--ntpq_LDADD=	version.o @LCRYPTO@ @EDITLINE_LIBS@ $(LIBOPTS_LDADD) \
--		../libntp/libntp.a
-+ntpq_LDADD=	version.o @EDITLINE_LIBS@ $(LIBOPTS_LDADD) \
-+		../libntp/libntp.a @LCRYPTO@
- noinst_HEADERS=	ntpq.h
- noinst_LIBRARIES=	libntpq.a
- # HMS: I don't think we need libntpq_a_LIBADD...
diff --git a/net-misc/ntp/files/ntp-4.2.6-linking.patch b/net-misc/ntp/files/ntp-4.2.6-linking.patch
new file mode 100644
index 000000000000..681029a1763c
--- /dev/null
+++ b/net-misc/ntp/files/ntp-4.2.6-linking.patch
@@ -0,0 +1,42 @@
+http://bugs.gentoo.org/296832
+https://support.ntp.org/bugs/show_bug.cgi?id=1418
+
+--- ntp-4.2.6/ntpd/Makefile.in
++++ ntp-4.2.6/ntpd/Makefile.in
+@@ -358,8 +358,8 @@ man_MANS = ntpd.1
+ # floor                               refclock_wwv.o
+ # which are (usually) provided by -lm.
+ keyword_gen_LDADD = ../libntp/libntp.a
+-ntpd_LDADD = $(LDADD) -lm @LCRYPTO@ @LSCF@ $(LIBOPTS_LDADD) ../libntp/libntp.a
+-ntpdsim_LDADD = $(LDADD) -lm @LCRYPTO@ @LSCF@ $(LIBOPTS_LDADD) ../libntp/libntpsim.a
++ntpd_LDADD = $(LDADD) $(LIBOPTS_LDADD) ../libntp/libntp.a -lm @LCRYPTO@ @LSCF@
++ntpdsim_LDADD = $(LDADD) $(LIBOPTS_LDADD) ../libntp/libntpsim.a -lm @LCRYPTO@ @LSCF@
+ ntpdsim_CFLAGS = $(CFLAGS) -DSIM
+ check_y2k_LDADD = $(LDADD) ../libntp/libntp.a
+ DISTCLEANFILES = keyword-gen .version version.c
+--- ntp-4.2.6/ntpdc/Makefile.in
++++ ntp-4.2.6/ntpdc/Makefile.in
+@@ -264,8 +264,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I
+ 	-I$(top_srcdir)/lib/isc/unix/include $(LIBOPTS_CFLAGS)
+ 
+ # LDADD might need RESLIB and ADJLIB
+-ntpdc_LDADD = version.o @LCRYPTO@ @EDITLINE_LIBS@ $(LIBOPTS_LDADD) \
+-		../libntp/libntp.a
++ntpdc_LDADD = version.o @EDITLINE_LIBS@ $(LIBOPTS_LDADD) \
++		../libntp/libntp.a @LCRYPTO@
+ 
+ # ntpdc-layout doesn't need any additional libraries at all
+ ntpdc_layout_LDADD = 
+--- ntp-4.2.6/ntpq/Makefile.in
++++ ntp-4.2.6/ntpq/Makefile.in
+@@ -265,8 +265,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I
+ 
+ 
+ # LDADD might need RESLIB and ADJLIB
+-ntpq_LDADD = version.o @LCRYPTO@ @EDITLINE_LIBS@ $(LIBOPTS_LDADD) \
+-		../libntp/libntp.a
++ntpq_LDADD = version.o @EDITLINE_LIBS@ $(LIBOPTS_LDADD) \
++		../libntp/libntp.a @LCRYPTO@
+ 
+ noinst_HEADERS = ntpq.h
+ noinst_LIBRARIES = libntpq.a
diff --git a/net-misc/ntp/ntp-4.2.6.ebuild b/net-misc/ntp/ntp-4.2.6.ebuild
index dd624ba4915b..ea008a2ff5c3 100644
--- a/net-misc/ntp/ntp-4.2.6.ebuild
+++ b/net-misc/ntp/ntp-4.2.6.ebuild
@@ -1,10 +1,10 @@
 # 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.6.ebuild,v 1.2 2009/12/14 18:39:13 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.6.ebuild,v 1.3 2009/12/14 18:47:09 vapier Exp $
 
 EAPI="2"
 
-inherit eutils toolchain-funcs flag-o-matic autotools
+inherit eutils toolchain-funcs flag-o-matic
 
 MY_P=${P/_p/p}
 DESCRIPTION="Network Time Protocol suite/programs"
@@ -40,10 +40,8 @@ src_prepare() {
 	#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
-	epatch "${FILESDIR}"/${PV}-as-needed.patch #296832
+	epatch "${FILESDIR}"/${P}-linking.patch #296832
 	append-cppflags -D_GNU_SOURCE #264109
-
-	eautoreconf
 }
 
 src_configure() {