Revbump to make use of rewritten init script

Package-Manager: portage-2.2.0_alpha194/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

4 files changed, 52 insertions, 18 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/Manifest b/net-analyzer/ntop/Manifest
index 6617a1fb69cf..0beca2e7a37d 100644
--- a/net-analyzer/ntop/Manifest
+++ b/net-analyzer/ntop/Manifest
@@ -6,29 +6,30 @@ AUX ntop-4.1.0-gentoo.patch 7369 SHA256 a7cef4604d239285403b7ec57346088db972c92d
 AUX ntop-5.0.1-gentoo.patch 6824 SHA256 3fab00d82529e1b24031db2760a5c29d6db9f1365c309403e55cbff835801af7 SHA512 64214fc1d74d16a027c9a9c87fed96182ece62bb327126cb42a0cf0b623297f7f5093c55838e0af2c27f76bbd81de6117ebbd5801173ab487d3b33811f79d188 WHIRLPOOL ae2868d060f071c4c260dd037bc3322737ee03b21001a4e270c79d6f7cd0719f393555ae6fb8deccce51b727faf8baa3d16f4fe5399b22d250269373a6796c4b
 AUX ntop-confd 341 SHA256 b582253490df4cde55dda97585d45d16b2968296da7e9bc996dde932cf42584d SHA512 8693050cab03eeb29b59e0a7b173c7791625e8cd6bc33eaa5d74a50ab3ecf435577d7918626cfe3963a0d23d4522a737737b2b9fd8335df29784858a6191813d WHIRLPOOL b467f3baf1065ca7a2434fce23561b270adf1507d36269f1adec04ac41d08866885b043673d2908c44dc6fecb4db1768bc1a01ce590d65e4a629bf5b75b21d67
 AUX ntop-initd 747 SHA256 f583d6625690ee60744d407d149845db178f618f1239d962bfac14f39076dc7d SHA512 294cf1c0c274f1fbb29804965306be1aee97d98e83a2fd25925ac92398ce9d1f8f617968888842fa6d6d19b0b28f2f29bb9f8fd861067a18cc53ea89c91b0c67 WHIRLPOOL 3f57ec8e287e99d9d4854974d0d3d2566995ebb3b2889a8baed66457c45ac2d645af1dfa3d2e991a740d64465d70a91a5f93ca953ed2971f33d008c61dd45b36
+AUX ntop-initd-r1 787 SHA256 ebb85fa4ecc3686bf3d207eaaa959b6d1942512ccf6e8333a96f95bba3a435d0 SHA512 158071d262cc35213b8ef1e6ff4f3ebff20b180fd427fb103cd80557204c22be52d2d197371ee627ad660645e0674f701346802cb68c97fa9d212a532e8e953e WHIRLPOOL 53cadc62b45339e2b6d0010957e69237893149fc2e9ed504779c63106c491c531a7bfe047e4c8cadbcdd39d3a930a3dab922ecc41af862c3c6478a5141250fd1
 AUX ntop-update-geoip-db 492 SHA256 3604d0a728b203211fab05eca829a7e93bc05c04f252937ffbf630813420eef6 SHA512 7b5ae8dbd7d5d084c7278af1deb64a903b106663c3195df70acead3e8d7e14fbd996e69d5132c0ddac9147b3e70892c91695d834ab7b22fec2569efcd52df5f6 WHIRLPOOL d96c2fa39287ed6e0ac8b76a5c09ff4485305328bfd61fd738ff82a09cde0a8f0be76474d0c5bc95f0a55aa212b092f2e7b7a3bf3d8e6ee2ec1e88f246653e78
 DIST ntop-4.0.3.tgz 39191671 SHA256 5b34b64fa4aebaeb365b2f255b2bbeb0a487686f49e85680789070d1c2404dc0 SHA512 48734b8c2fcb5c8efb9917836702b6407cca568cfd715c1cab98b8f4eaba2aa43491414132a94019d4619400b7e02a2232abd0a60cb2dbc413c6fbe6472f7f2f WHIRLPOOL c7bc59a010fd6792110eead7a6fe6cbeb401d7d38fd47a440d66091f3c317a7d80d2685bcb5e129db3267ef691908e4363c2ed3dfbff9c58578e272c420541a7
 DIST ntop-4.1.0.tar.gz 39118983 SHA256 c71e5563879ec1866296825e1705f30b5a67eb87c9abfbd7dc1c5baeed0384a4 SHA512 6759ef6396768b33db96db20ceb907f9d8a5e3421c920d277e043bec85eb1fb38e41b7c88e189e7dd316a02c627aa4c4ea9295beee8cd890ac09b5d8b161a579 WHIRLPOOL ae5616bf29a002d02273fcb436fd3b869ec6fcb7c3d10a61097f72aabe68240232f8aff9b533300baa76fc2096900902dfd900f95142c334c61f5cd425e543a7
 DIST ntop-5.0.1.tar.gz 40133867 SHA256 7e8e84cb14d2173beaca4d4cb991a14d84a4bef84ec37b2276bc363f45c52ef8 SHA512 f52c40e6c00c8d2f46b68078c5f9aef8ed78670f92a0a81f66f2f44c71d41bc4c001b4550f19b71c546f7c07cbbed15e0aa1ee13873ac63a11678bf2b8483f2a WHIRLPOOL aa20b6529f343f6f57fc1d880c8cf07cd11720c6fe8c968359ff1e16b77fe3f4c6df1ed83a184e580d6ef7f5eff6d245b2971c17a7dd674c12325f21029f64ee
 EBUILD ntop-4.0.3.ebuild 3495 SHA256 f5be31321d796e65fca8722d1af92d53cd1eb302802b6136e897328c82916b97 SHA512 f11aea1c238ba115bb1c04178b6ba3c90287eaf174b75ea6c8403c014d25b19f48cb7ab6ff83aff1aa61a38d4aaad852e53cfc0621251f0434213da375a28b46 WHIRLPOOL 40c39b78a26a6222db10445b7905f295c270ef5681bf5af8338b2c8d5f364fdc17036f520893666d6f8e3829cdd10d2fed110132e8e32640c1c6bb41e922dca4
 EBUILD ntop-4.1.0.ebuild 2624 SHA256 cd4f33565d249315448b7554b2ac932a7a67fa558d2eee5d6b78e55145319256 SHA512 cf5da917ac0d5bab4c518c754a1e4885803847f205d2b710e15b45e14cdd7dc440704031294c7a1297a0d17748b31dc2740977f0104c196a4eccd5d41e5183b4 WHIRLPOOL d24cfc92ef87fce8da4348fcd0febc0312dfc3b23223c38ec75a29d548ef7828572a9a1af87e0e34295c034426c6e3d7083d87b9ef4a9ec5f185fc94d77bbac8
-EBUILD ntop-5.0.1.ebuild 2774 SHA256 98981638385b414c754d9c59eeca22a6cdff28e5a915ec6aea2654625dc39ef9 SHA512 2a1ef28a2df8b72bc4ddb0a566c5fabf3045ef30ba8001ba8d5bf54b9e41bf9c8e39771a0496fcc2f774be39b008f4c6938f7c528c4baa5eeeb3b400c46fecbf WHIRLPOOL b3b17f8838d3e552754392a8b50544532b2acf6341b2d1432a9a5f11ad50573dbe868ed2dbc54a757e005f289b9632e322d704fe9fbf7c880e82e94014a83ba0
-MISC ChangeLog 16156 SHA256 301c947a2347ed04352e22b9952d8e1b81663e16be29e074eb42ebfa4a6604fd SHA512 2230d35aae16c488833f441b4d94fa24942b1a90fe1a8ec650dbfa2e4c0c427e7dfdbb2824ce30758779794dc220503eef7dd1d18f5a02f53e5e1d8c31833347 WHIRLPOOL 5234c46cdc9b07c29b7d48b657a379856a0d42af91c68e0356928da3ef263844dd401d3d004bb804332ebb7a695660856e3a6be1baf6374613aae0932b7d4a7d
+EBUILD ntop-5.0.1-r1.ebuild 2819 SHA256 5a0ada6420359cc13f1fb9f296563dba28b40ab6efa0d515fd8a688926952098 SHA512 8c94f736dc49569ffa4e210b4ee669fd3e7d2af9f47c4f5267e75068f708d10a61c1c9431a681542bfc2cbd9fbb2a73eda9cbdd0f7d51bfc21aa0c852c758250 WHIRLPOOL 125b981d44092008430e63ddd3ae5feb400974ee298b6ea549304d11652f375f0baa1cdfe60f7421e5a29437b3ae588d40282472fbb208f3d1bb289533310b41
+MISC ChangeLog 16379 SHA256 4883e70ebcd695f9075146ba96a9125fc3f28f6312fd95007f9ea49681ebe5c3 SHA512 dcdb43f45a22b970ae2191a17311537ea93f052dbe7a649e0bb33ba2113682352467d057e3b8476707ec14cef35907a9c7f1c930fbde3ada033b0ef72b440147 WHIRLPOOL cfa4a3473388a118779202e8a5bbcfcef4de3f51350481d4d9b06e98b90ba78b1a6fcb5c5c2a0bf7cbec53b1894c6a8fa2cde9940eb893b9b3a14e47161f838d
 MISC metadata.xml 726 SHA256 8a92db7bc1d416edb070e77e05b334bce2fad523700b1630a4386461fad1713a SHA512 7b0dfb1be74bff0af9763afc57db89f0f35cae422c5d71a8cfccf8d59999fa73e637486bebbe6a90ab0d613818e996e010a802f07a9f6ff09d2f4c84caf14a00 WHIRLPOOL d31605fc7a98a13efc6bee0509fa9afc067bb9a2be838c545f8e9da2a21f2abbab5febaee849ce903d55beb1cff7d1dbe8eb2d63c4e6d08def2d4282a6469eff
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJR1W74AAoJEPiazRVxLXTFDnoP/3uKZI+5WVs0T3WWMrB01Ggu
-SKZUFbTgjJgBovu0kWfP0EnvBE85SjkBnnnyf5xaou2j8vCANXRJAmE03AfQwxJU
-TUhAtg1f8S7jydGQzmGY38xgtwzNgCDQXiN2tIghRRFALaYknhULpHQsO0nqGm62
-/ottwo9bYfI2Hc4wmO0qpWpIFT3uThUQZpVqheq1utyT/h0AcgClvM5yM4yktj4v
-sSBAerBCGhlNQBbovbBy+e2P9qJTU6XY5IXymQ6GItW/FJmg478x4ZSRdNECLpze
-XlAhzQp0C+PbMhm6xFgQVQybu3lAM/ya/MgDvT3oT03sAMlDKWPN0W1TAFdOWjbF
-iR2AqSjQ4iR+1oAFZro+5aj9HwnrRwcBfCPY6AHXCzMn8vlUISaYzEZ+UY5VZUdb
-LW7D52trqwTuer5NuJEf866TuekhxJEUfLoGTbECSXRYq/omBYNGkpFbN5WbFeqE
-+S0ZD5N0wBxGob/UVPHpoQ4BkR6aOK5Rt9Z/jk4L82ltPrd3ozCwI6oF2aKUuTaj
-ICKktztMYh7xLcOwkAWZpT2L8Tk8NyojauScTGJ/zJgRXjSGFnz7YCvAjNgNe5+k
-lS0xJnRfgXIli6hBOZ2eLMFa9N5PReVHaPk1fQ77VxKcjTEqfr9z/hDNpOkHXi/x
-dPc0FbwVQwRx6LUVOBEm
-=Yr22
+iQIcBAEBCAAGBQJSAJd4AAoJEPiazRVxLXTFRigP/isfX1LC4vyECD79fBKIFr7b
+NnL04712iciXd33LNEBbvxEe48mGJnWd9Vkg9/rOW+YVkKjV0GdDkcIqEvbRJ5dV
+fx2cx7tdhp6F0dmsf2lx+g1dGHMYAMc06GXrRSMLSbDt9ZK48QbS/fLDNN7k6DLn
+V31VPwRMm0LPV43csWPIVNKgZjGpn3rhwc+/AHqSxdAgJX9VciSsZvmcf9EWbvii
+X64XjiRsz0RqiXOOW3jLJM2G8ru3qL0tTOc/DKDww+ofs2nFfu2DLXGiMsSZ009Y
+bHaFM7xwwPl2wfa/1xmJOSTsYibtigeH/qE8PM5X+lVPFF04NjMsdkJAtgGF4iqx
+HcEi389goOonja2+F5Aec4osbagDgg4rGaEKXVVWOwSQ0+XQt4biNLdz2vp8hRwu
+S3GUIYTKbWCq8wlzhxz9hlTaxPED6VoX3/05qQVQDslo4LZbXeBJTjAKeINjcv8m
+Y2OqmK3TJivlmG4+cpyXRnvvrm5LC0Yc0I7XeRijVXwizb1bqf3u3UphzlTNT8Vq
+Pc5/A78nJzrNcd3ri16tksn7tonc1hKeut0Cnbmvx6hOHhgPGfr/lSxgN4oNlaeF
+O3P1KzhCRdGlAIKr5SNkI5eywwTFKUUu8vGcODeUrsfelWpfYgAEsIz9uADCdcAH
+V2aamBOtpnfow6F5cPTI
+=i4fM
 -----END PGP SIGNATURE-----
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