summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-06-09 08:41:59 +0000
committerMike Frysinger <vapier@gentoo.org>2008-06-09 08:41:59 +0000
commit6cc8e6fa29c4bbb1422fdf040b523c52e2bb143e (patch)
tree63085031dfc6ba3a2db647be466e56cee1f0ac25 /net-analyzer
parentAdd gcc-4.3 patch, bug 225439, Marek Miller <mlm@shells.pl> (diff)
downloadhistorical-6cc8e6fa29c4bbb1422fdf040b523c52e2bb143e.tar.gz
historical-6cc8e6fa29c4bbb1422fdf040b523c52e2bb143e.tar.bz2
historical-6cc8e6fa29c4bbb1422fdf040b523c52e2bb143e.zip
Remove stale libtool macros from local m4 files #220819 by Paul Hartman.
Package-Manager: portage-2.2_pre7-r1/cvs/Linux 2.6.25 AMD Athlon(tm) 64 X2 Dual Core Processor 4200+
Diffstat (limited to 'net-analyzer')
-rw-r--r--net-analyzer/ntop/ChangeLog7
-rw-r--r--net-analyzer/ntop/Manifest14
-rw-r--r--net-analyzer/ntop/ntop-3.3.ebuild6
3 files changed, 21 insertions, 6 deletions
diff --git a/net-analyzer/ntop/ChangeLog b/net-analyzer/ntop/ChangeLog
index 74d01ecf228f..77db96bba131 100644
--- a/net-analyzer/ntop/ChangeLog
+++ b/net-analyzer/ntop/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-analyzer/ntop
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ChangeLog,v 1.62 2007/11/13 02:29:58 mr_bones_ Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ChangeLog,v 1.63 2008/06/09 08:41:59 vapier Exp $
+
+ 09 Jun 2008; Mike Frysinger <vapier@gentoo.org> ntop-3.3.ebuild:
+ Remove stale libtool macros from local m4 files #220819 by Paul Hartman.
13 Nov 2007; Michael Sterrett <mr_bones_@gentoo.org> ntop-3.3.ebuild:
take snmp out of deps since it's disabled for now
diff --git a/net-analyzer/ntop/Manifest b/net-analyzer/ntop/Manifest
index de8d3692838c..bb200461991d 100644
--- a/net-analyzer/ntop/Manifest
+++ b/net-analyzer/ntop/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX globals-core.c.diff 536 RMD160 33d049b6c5143f42294bce9a7bf366e69e98d329 SHA1 7e59696252d26bef817210b016b16aa3b3f19754 SHA256 47077ead74ec2f10d9b65ee26ff3ea6f2c2d30908a151e1417e797a9c780d828
AUX ntop-3.2-build.patch 9369 RMD160 396ab052d11c21f5f33ea246c57aae8f1e4b2e35 SHA1 1dea08b5ad9652af5d6b9369bab9407a9a23ee39 SHA256 9df47e5c250f26c408ca8f35faa0e35166a3e1d2fe3924387bd9acb1907cd23d
AUX ntop-3.2-snmp.patch 776 RMD160 22b4e288b88beaff7a855f18b9b9a1bec09d92da SHA1 a197e0887ea05bc223951d65c349382592bc3b4a SHA256 c2cb51b8adb0909f29580846ee58d07c105998b5675cebf97f1cfda36e20abef
@@ -7,6 +10,13 @@ AUX ntop-initd 574 RMD160 a8b929fa2a93a1e33e43547fc5c7bdad170411c4 SHA1 c3e872ed
DIST ntop-3.2.tgz 3910593 RMD160 18ea4b535826e6d7bdf56c071c271869653cba8d SHA1 ab17e871890bc490746fe03f171523073b54e1e8 SHA256 5b639dbcb3c8bf77824cf8aaed168864f69730b2ef41dc68d2db22b205c586d8
DIST ntop-3.3.tar.gz 3709605 RMD160 453842866189e7e8f63c68e70ea57800e41684b9 SHA1 4b56f15eb502ea853308433589820161ce82c8d8 SHA256 e849dabe0ac1ff006e487aef7b78fe06864b8d74a7b789fe6c7b8e258b7f361c
EBUILD ntop-3.2-r3.ebuild 2986 RMD160 490719bf45be85ed262a450cd649a1f1b4893105 SHA1 94a3caab264c1b76ae4710579eb1e62fff3b82f7 SHA256 e3800f1df6bd68903a67c297bfdb6b6a2f0124b3b0d95e26951be07e838cd1bf
-EBUILD ntop-3.3.ebuild 3137 RMD160 cb14d642916696035421931ef4af1426705bf33c SHA1 8d49d1a330e8d3464e1943dd0a69beb4a9d4c1d4 SHA256 f9f5add415e261244fbcb2a7b364183fe71c1e7c13dd20dcc7ceca60a71527f2
-MISC ChangeLog 8212 RMD160 f202ffe264c2a2f16a94362179640d3c379caebf SHA1 e4b4afae8c308fd853a39bce07d6794bc21d915f SHA256 74e35bfb311aabc529b96d95623058e2f7f6478f5f5be001280c610bb298498c
+EBUILD ntop-3.3.ebuild 3249 RMD160 7a689f23c16f1fa0cab736563c66537965a645fb SHA1 401a31e5284b06269f39fa60bb6194f2ff00e6d3 SHA256 b00f75bd5c57f13726ace0b8a8b07be5e5612fd9a66b04127d761f3241ab03f9
+MISC ChangeLog 8352 RMD160 d16886ee16b903ff6d221374f6bb6db30c422cea SHA1 ef1e6afe25dfed4ee44c9dcaf1ebc125056c7478 SHA256 15913409dbbd305f3e937d045b3a7defe1ffe7c99553f2364fc02bebe10f9f59
MISC metadata.xml 233 RMD160 a40e5be287eb28adcd2008eb2de7a786bfd688c6 SHA1 4e1973fdf61e686516552955669fd6a845a66a27 SHA256 1cd97d0616d391c2639822aa603b9ae39e60796da9e21f498a8e856d317e0a0b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFITOzdj9hvisErhMIRAmj3AJ0S+u7V6ySUHl5tbxOtbhIN98tkTgCdFEem
+panpxUg3osYxKp2GOYqLMWE=
+=Z25r
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/ntop/ntop-3.3.ebuild b/net-analyzer/ntop/ntop-3.3.ebuild
index 5acc92d69efa..aa481af4e409 100644
--- a/net-analyzer/ntop/ntop-3.3.ebuild
+++ b/net-analyzer/ntop/ntop-3.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ntop-3.3.ebuild,v 1.5 2007/11/13 02:29:58 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ntop-3.3.ebuild,v 1.6 2008/06/09 08:41:59 vapier Exp $
inherit eutils autotools
@@ -64,6 +64,8 @@ src_unpack() {
cd "${S}"
epatch "${FILESDIR}"/globals-core.c.diff
epatch "${FILESDIR}"/${P}-build.patch
+ # remove local libtool garbage injected by upstream #220819
+ cat acinclude.m4.in acinclude.m4.ntop > acinclude.m4
eautoreconf
sed -i \