[gentoo-commits] gentoo-x86 commit in net-analyzer/ntop: ChangeLog ntop-3.3.ebuild metadata.xml ntop-3.2-r3.ebuild ntop-3.3.6.ebuild

[Alin Nastac (mrness)]

mrness      08/07/04 23:44:21

  Modified:             ChangeLog ntop-3.3.ebuild metadata.xml
                        ntop-3.2-r3.ebuild
  Added:                ntop-3.3.6.ebuild
  Log:
  Version bump.
  Fix init script (#191576).
  Fix broken ebuild when locales use other chars than ASCII (#205382).
  Fix libtool dependency (#221623).
  (Portage version: 2.1.4.4)

Revision  Changes    Path
1.64                 net-analyzer/ntop/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/ntop/ChangeLog?rev=1.64&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/ntop/ChangeLog?rev=1.64&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/ntop/ChangeLog?r1=1.63&r2=1.64

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ChangeLog,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- ChangeLog	9 Jun 2008 08:41:59 -0000	1.63
+++ ChangeLog	4 Jul 2008 23:44:20 -0000	1.64
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/ntop
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ChangeLog,v 1.64 2008/07/04 23:44:20 mrness Exp $
+
+*ntop-3.3.6 (04 Jul 2008)
+
+  04 Jul 2008; Alin Năstac <mrness@g.o>
+  +files/ntop-3.3.6-gentoo.patch, files/ntop-initd, metadata.xml,
+  ntop-3.2-r3.ebuild, ntop-3.3.ebuild, +ntop-3.3.6.ebuild:
+  Version bump. Fix init script (#191576). Fix broken ebuild when locales use
+  other chars than ASCII (#205382). Fix libtool dependency (#221623).
 
   09 Jun 2008; Mike Frysinger <vapier@g.o> ntop-3.3.ebuild:
   Remove stale libtool macros from local m4 files #220819 by Paul Hartman.



1.7                  net-analyzer/ntop/ntop-3.3.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/ntop/ntop-3.3.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/ntop/ntop-3.3.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/ntop/ntop-3.3.ebuild?r1=1.6&r2=1.7

Index: ntop-3.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ntop-3.3.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ntop-3.3.ebuild	9 Jun 2008 08:41:59 -0000	1.6
+++ ntop-3.3.ebuild	4 Jul 2008 23:44:20 -0000	1.7
@@ -1,6 +1,6 @@
 # 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.6 2008/06/09 08:41:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ntop-3.3.ebuild,v 1.7 2008/07/04 23:44:20 mrness Exp $
 
 inherit eutils autotools
 
@@ -15,8 +15,7 @@
 #IUSE="ipv6 nls snmp ssl tcpd zlib"
 
 #snmp? ( net-analyzer/net-snmp )
-DEPEND="sys-apps/gawk
-	>=sys-devel/libtool-1.4
+COMMON_DEPEND="sys-apps/gawk
 	>=sys-libs/gdbm-1.8.0
 	net-libs/libpcap
 	>=media-libs/gd-2.0.22
@@ -25,12 +24,14 @@
 	ssl? ( >=dev-libs/openssl-0.9.6 )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r4 )
 	zlib? ( sys-libs/zlib )"
+DEPEND="${COMMON_DEPEND}
+	>=sys-devel/libtool-1.4"
 
 # Needed by xmldumpPlugin - couldn't get it to work
 #	dev-libs/gdome2
 #	>=dev-libs/glib-2"
 
-RDEPEND="${DEPEND}
+RDEPEND="${COMMON_DEPEND}
 	media-gfx/graphviz"
 
 pkg_setup() {



1.3                  net-analyzer/ntop/metadata.xml

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/ntop/metadata.xml?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/ntop/metadata.xml?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/ntop/metadata.xml?r1=1.2&r2=1.3

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/ntop/metadata.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- metadata.xml	23 Aug 2004 15:45:12 -0000	1.2
+++ metadata.xml	4 Jul 2008 23:44:20 -0000	1.3
@@ -2,5 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>netmon</herd>
+<maintainer>
+  <email>mrness@g.o</email>
+  <name>Alin Nastac</name>
+</maintainer>
 <longdescription>tool that shows network usage like top</longdescription>
 </pkgmetadata>



1.12                 net-analyzer/ntop/ntop-3.2-r3.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/ntop/ntop-3.2-r3.ebuild?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/ntop/ntop-3.2-r3.ebuild?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/ntop/ntop-3.2-r3.ebuild?r1=1.11&r2=1.12

Index: ntop-3.2-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ntop-3.2-r3.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ntop-3.2-r3.ebuild	28 Jul 2007 09:46:13 -0000	1.11
+++ ntop-3.2-r3.ebuild	4 Jul 2008 23:44:20 -0000	1.12
@@ -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.2-r3.ebuild,v 1.11 2007/07/28 09:46:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ntop-3.2-r3.ebuild,v 1.12 2008/07/04 23:44:20 mrness Exp $
 
 inherit eutils autotools
 
@@ -13,8 +13,7 @@
 KEYWORDS="amd64 arm hppa ~ia64 ppc ~ppc64 sh sparc s390 x86"
 IUSE="ipv6 nls snmp ssl tcpd zlib"
 
-DEPEND="sys-apps/gawk
-	>=sys-devel/libtool-1.4
+COMMON_DEPEND="sys-apps/gawk
 	>=sys-libs/gdbm-1.8.0
 	net-libs/libpcap
 	>=media-libs/gd-2.0.22
@@ -23,12 +22,14 @@
 	ssl? ( >=dev-libs/openssl-0.9.6 )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r4 )
 	zlib? ( sys-libs/zlib )"
+DEPEND="${COMMON_DEPEND}
+	>=sys-devel/libtool-1.4"
 
 # Needed by xmldumpPlugin - couldn't get it to work
 #	dev-libs/gdome2
 #	>=dev-libs/glib-2"
 
-RDEPEND="${DEPEND}
+RDEPEND="${COMMON_DEPEND}
 	media-gfx/graphviz"
 
 pkg_setup() {



1.1                  net-analyzer/ntop/ntop-3.3.6.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/ntop/ntop-3.3.6.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/ntop/ntop-3.3.6.ebuild?rev=1.1&content-type=text/plain

Index: ntop-3.3.6.ebuild
===================================================================
# 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.6.ebuild,v 1.1 2008/07/04 23:44:20 mrness Exp $

inherit eutils autotools

DESCRIPTION="tool that shows network usage like top"
HOMEPAGE="http://www.ntop.org/ntop.html"
SRC_URI="mirror://sourceforge/ntop/${P}.tar.gz"

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
IUSE="ipv6 nls ssl tcpd zlib"
#IUSE="ipv6 nls snmp ssl tcpd zlib"

#snmp? ( net-analyzer/net-snmp )
COMMON_DEPEND="sys-apps/gawk
	>=sys-libs/gdbm-1.8.0
	net-libs/libpcap
	>=media-libs/gd-2.0.22
	>=media-libs/libpng-1.2.5
	net-analyzer/rrdtool
	ssl? ( >=dev-libs/openssl-0.9.6 )
	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r4 )
	zlib? ( sys-libs/zlib )"
DEPEND="${COMMON_DEPEND}
	>=sys-devel/libtool-1.4"

# Needed by xmldumpPlugin - couldn't get it to work
#	dev-libs/gdome2
#	>=dev-libs/glib-2"
RDEPEND="${COMMON_DEPEND}
	media-gfx/graphviz"

S="${WORKDIR}/${PN}"

pkg_setup() {
	# snmp doesn't compile in this release, disabled for now

	#if use snmp ; then
	#	ewarn "snmp plugin is under development and upstream does not recommend"
	#	ewarn "it for usage in production environment."
	#	if ! use ipv6 ; then
	#		echo
	#		eerror "snmp plugin has compilation problems without ipv6 support."
	#		eerror "For additional information see bug #121497."
	#		die "snmp without ipv6 is broken"
	#	else
	#		if ! built_with_use net-analyzer/net-snmp ipv6 ; then
	#			echo
	#			eerror "You have both ipv6 and snmp enabled."
	#			eerror "This require ipv6 support in net-analyzer/net-snmp."
	#			eerror "However, net-analyzer/net-snmp was compiled with ipv6 flag disabled."
	#			eerror "Please, re-emerge net-analyzer/net-snmp with USE=\"ipv6\"."
	#			die "net-analyzer/net-snmp was build without ipv6."
	#		fi
	#	fi
	#fi
	enewgroup ntop
	enewuser ntop -1 -1 /var/lib/ntop ntop
}

src_unpack() {
	unpack ${A}

	cd "${S}"
	epatch "${FILESDIR}"/${P}-gentoo.patch

	eautoreconf
	cp /usr/share/aclocal/libtool.m4 libtool.m4.in || die "failed to copy libtool.m4"
}

src_compile() {
	# force disable xmldumpPlugin
	export \
		ac_cv_header_glib_h=no \
		ac_cv_header_glibconfig_h=no \
		ac_cv_header_gdome_h=no \
		ac_cv_lib_glib_g_date_julian=no \
		ac_cv_lib_xml2_xmlCheckVersion=no \
		ac_cv_lib_gdome_gdome_di_saveDocToFile=no

	econf \
		$(use_enable ipv6) \
		$(use_enable nls i18n) \
		$(use_with ssl) $(use_enable ssl sslv3) $(use_enable ssl sslwatchdog) \
		$(use_with tcpd) \
		$(use_with zlib) \
		--with-rrd-home=/usr/lib \
		--disable-snmp \
		|| die "configure problem"
		# $(use_enable snmp)
	emake || die "compile problem"
}

src_install() {
	LC_ALL=C # apparently doesn't work with some locales (#191576 and #205382)
	emake DESTDIR="${D}" install || die "install problem"

	keepdir /var/lib/ntop

	dodoc AUTHORS CONTENTS ChangeLog MANIFESTO NEWS
	dodoc PORTING README SUPPORT_NTOP.txt THANKS $(find docs -type f)

	newinitd "${FILESDIR}"/ntop-initd ntop
	newconfd "${FILESDIR}"/ntop-confd ntop
}

pkg_postinst() {
	fowners ntop:ntop /var/lib/ntop
	fperms 750 /var/lib/ntop

	elog "You need to set a password first by running"
	elog "ntop --set-admin-password"
}



-- 
gentoo-commits@l.g.o mailing list