Revbump to make use of rewritten init script

(Portage version: 2.2.0_alpha194/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

3 files changed, 36 insertions, 3 deletions

diff --git a/net-analyzer/ntop/ChangeLog b/net-analyzer/ntop/ChangeLog
index 1ab3a4a09573..3c03466fd704 100644
--- a/net-analyzer/ntop/ChangeLog
+++ b/net-analyzer/ntop/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/ntop
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ChangeLog,v 1.116 2013/07/04 12:47:51 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ChangeLog,v 1.117 2013/08/06 06:28:07 polynomial-c Exp $
+
+*ntop-5.0.1-r1 (06 Aug 2013)
+
+  06 Aug 2013; Lars Wendler <polynomial-c@gentoo.org> -ntop-5.0.1.ebuild,
+  +ntop-5.0.1-r1.ebuild, +files/ntop-initd-r1:
+  Non-maintainer commit: Revbump to make use of rewritten init script.
 
 *ntop-5.0.1 (04 Jul 2013)
 
diff --git a/net-analyzer/ntop/files/ntop-initd-r1 b/net-analyzer/ntop/files/ntop-initd-r1
new file mode 100644
index 000000000000..112ba9210282
--- /dev/null
+++ b/net-analyzer/ntop/files/ntop-initd-r1
@@ -0,0 +1,25 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/files/ntop-initd-r1,v 1.1 2013/08/06 06:28:07 polynomial-c Exp $
+
+description="ntop - a network traffic analyzer"
+pidfile="/run/ntop.pid"
+command="/usr/bin/ntop"
+command_args="-L ${NTOP_OPTS}"
+start_stop_daemon_args="-p ${pidfile} -m -b"
+
+depend() {
+	need net
+}
+
+start_pre() {
+	if [ ! -e /var/lib/ntop/ntop_pw.db ] ; then
+		eerror "You need to set a password first by running"
+		eerror "ntop --set-admin-password"
+		return 1
+	fi
+
+	export LC_ALL=C # apparently doesn't work with some locales (#191576 and #205382)
+	export GDFONTPATH=/usr/share/fonts/corefonts # apparently the only font that works (#231705)
+}
diff --git a/net-analyzer/ntop/ntop-5.0.1.ebuild b/net-analyzer/ntop/ntop-5.0.1-r1.ebuild
index d0f91976d288..b7e9d5ebea75 100644
--- a/net-analyzer/ntop/ntop-5.0.1.ebuild
+++ b/net-analyzer/ntop/ntop-5.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ntop-5.0.1.ebuild,v 1.1 2013/07/04 12:47:51 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ntop-5.0.1-r1.ebuild,v 1.1 2013/08/06 06:28:07 polynomial-c Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_{6,7} )
@@ -41,6 +41,8 @@ RDEPEND="${COMMON_DEPEND}
 	dev-libs/glib:2
 	dev-python/mako"
 
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
 pkg_setup() {
 	enewgroup ntop
 	enewuser ntop -1 -1 /var/lib/ntop ntop
@@ -103,7 +105,7 @@ src_install() {
 	dodoc AUTHORS CONTENTS ChangeLog MANIFESTO NEWS
 	dodoc PORTING README SUPPORT_NTOP.txt THANKS $(find docs -type f)
 
-	newinitd "${FILESDIR}"/ntop-initd ntop
+	newinitd "${FILESDIR}"/ntop-initd-r1 ntop
 	newconfd "${FILESDIR}"/ntop-confd ntop
 
 	exeinto /etc/cron.monthly