version bump

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x55265D89

3 files changed, 72 insertions, 19 deletions

diff --git a/net-analyzer/ntopng/ChangeLog b/net-analyzer/ntopng/ChangeLog
index 1c64786690f4..13c770de448b 100644
--- a/net-analyzer/ntopng/ChangeLog
+++ b/net-analyzer/ntopng/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/ntopng
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntopng/ChangeLog,v 1.3 2015/04/16 04:57:29 slis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntopng/ChangeLog,v 1.4 2015/07/31 05:17:05 slis Exp $
+
+*ntopng-2.0 (31 Jul 2015)
+
+  31 Jul 2015;  <slis@gentoo.org> +ntopng-2.0.ebuild:
+  version bump
 
   16 Apr 2015; Sławek Lis <slis@gentoo.org> ntopng-1.2.1.ebuild:
   Fixed dependencies (#539970)
diff --git a/net-analyzer/ntopng/Manifest b/net-analyzer/ntopng/Manifest
index aea235653aed..1fd577a7b5e2 100644
--- a/net-analyzer/ntopng/Manifest
+++ b/net-analyzer/ntopng/Manifest
@@ -1,28 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX ntopng.conf.d 117 SHA256 dcd657cfa0a4b5d9708e67fb6190448fe27a5e598f0b10564f2d812110a13b42 SHA512 bb66d11245ce099f9e09f97d830da60df910682242db0c5c7d17bcd800e84cf3bce6288fb75fc3a8f3e214a580dc0d076f7f69aa924d9ad3e4c8bff093252061 WHIRLPOOL 7dac08122c9b33db14914be6d3a26ce4eac33a41b2738112b470d22abdab1549c5515698f71102cfd0399717b6af9964808dbaf29928430b210dbff6b65e738f
 AUX ntopng.init.d 660 SHA256 e00998e517b51a31583800816c34306607194f1f19105d335e95c91186fa496f SHA512 08c30350f6cc4a68563108a1f1dc83e23f05a75a90f2dcf6aa7c89bb1df962b0f5fcfb0863a8de5b2fa621e45ded8f4e2be4ee7808787e210229150c8066f0f8 WHIRLPOOL 6969416784e065fab8085a7b2218a3e9703488b26c2ebcd9515b325d3188a0cdb7369e0f0d1f98358565de242dacd3ea9a2e9cdb82536f5434378aa120d23f2f
 DIST ntopng-1.2.1.tgz 9381092 SHA256 9b98114358d350caad2dcdbacceb895288f958dbbbfddf21a23b921d1a1b68b5 SHA512 816d63807fc40bcd1851fe5969b4a7d47540052c696f227b26dd38f1621bea5c48bb25a1115bdae3ec4c529d9f291d3d615a760081a90d937154a6a487194ca5 WHIRLPOOL 672fbf53108691fa0b0154ea21240445474e2e89d75004d4cd455ab2f8b5a62c5d1386670ab8ab9e6bd0304e9fe89c29a380db6d7959b4df6474e55f69892b3f
+DIST ntopng-2.0.tar.gz 35783709 SHA256 3cbfd6de1bc44d65f7c7f0de282d122d11f493f1261ba137c3b5b202e08e0251 SHA512 2208623cdc843b8e4ec285930d1ea74ac50c576888fce20f6fc4363e747e0dbef7f1808e7b77ae9b7f5316bca55a3e003a9926785c847bbea2c321d7f7e56d13 WHIRLPOOL 40438c3260a9ba16d8893ce41c494feda8e6290efc0253d4f19d354f6dd535f2d13177d1a1449abdcb5d5a212db0736540f5b92c77fcd624eb9b672ac659a2bc
 EBUILD ntopng-1.2.1.ebuild 1082 SHA256 76125d1f91c4dae41a9de457558d55e51c3b3032cefbe548b6c1dd1d433bc9be SHA512 42c6dda869eb5bdce61e5f5e07f192d77ac3dca050befa27d6cb19c8acac9ff2637218273c32ff774c0b3abafc0c265489597b400421fe6cc49e9f9eea05430a WHIRLPOOL 38b94dfd2bc3fff029cbfcc8d98c327ac82707a8206b150900102f9750ba195dad6b83d5637dd711bcff73267485a3a94cd04dfba69aec8097650173c78535f6
-MISC ChangeLog 607 SHA256 fd47325c8003f792b92efe43827a913bfe4614335b199cf83becce9af6b11f57 SHA512 bd66ccaa245ecae13614903c93cbc655c57bb1b18a6971f1827495434a6854cea183d2fd41eaef22c8fb54506ba62ea034d0d15c81927504cad956ac5c855184 WHIRLPOOL 886668455ae8afabdf2a6b141e0162b28e50e8f3f358b06e6df7a711d0b12d58c3883ff915d1f89f2ec0f7aa0bea7b814015f9e0f02636244fb8d95f27575f1a
+EBUILD ntopng-2.0.ebuild 1212 SHA256 a102e9a8d93046fd5c3f0208d261aeeae6d0b0c6d63392303c1f66336d12640f SHA512 b88b9e0b5f67719d0e8aa11695950ab5ced2644abe24e793180a4286f81edc7ae05a188f22642ab84c3bd5c7b307bcc6c9097055e92328c731d12b428b559b42 WHIRLPOOL be6c0d4ee10986084dba925991459a831db8964c3824de60e5a3e3525f8cb40a23119c328026327599b9514c1b3b308ac129b39d23403c55bb2787abcadb0703
+MISC ChangeLog 704 SHA256 4d551cd9ba228aedaf0d446369f00e6dfbc071b193f3de227b651f1f53dadc9b SHA512 6647e69f3a81318691f0e1ff98e17695644f474f92d67c276d2b974f40ba883e1afb4238518d3b26f1abb4b9caca3f1e866dd4ae52b7dd9f76c3683cb63bd449 WHIRLPOOL 0f888695be79b08ea88efe0ccf536eb707d1abd915e4a8d559c7eaab244e6c7de595ad774773f8d97b7a9566f8919541020a32b65d29be0efefd95a5d9638bd2
 MISC metadata.xml 283 SHA256 1c5dbba0ff3886afd9736cd74ad9c0a38ccec3f9f7773f1ca946d29b7fb24a81 SHA512 313c6880831c5a6a5273dec47c61bcc24fc2a6021ec7895bd5c108186b22545a854039c5410c9f2726288ff1a60067d8f0125fa64ac6919cc6a620b884d519de WHIRLPOOL 201c95f8da41cdbf85b27cf2f031ce2312d809021d893bfc2d15593cca35a7efa2d54d76842e1d82a3fae7127d9ed533d15027d02097c9c7a9b77ef23c9b35d8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVfwiaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmip3wP/ipmo7vrTivRWb5TYxxkdIDC
-EE4i9kvfb0lL8d5S2YLcu1MJFAg1apJXKb/rFjFHk9VrhP1+It+DdsMkRmSzIbYr
-zFrDe3sxGOFVM7UVrf1gJZrNfeQ6Rc8OZLoaorHLi2nl88ljshlTHU+NcDOZ3HsJ
-Yx04Qi+1SrhzZ65D0Uhh/LbxtcyuSJZjM3HHkIdq015X9VQR0YQLk/liRDLGc1CC
-t/f3NPY7AYku4srUsHAf9IvyjbiqtjVdkCp+PdpP9S905n/SE64vwlqyw0nsQ0Vd
-YVIzCApwZONbLHZu9Ms7BGFnN4JAvo7b9N+Py/cXDk/qWWh0uegR9VDC3Wr6HAVL
-UTSpmL2tfWtiAJ2TM6heHmaxGyA68x5hU0gjHv8776LebA4I+i8xL8bHNrrYHQu4
-auaTWsemcW+jAyU7/IWKujnKj/HNGU0UycInQFKODdsgtxEMHoNTk+m9UdBgMmp5
-6WnpX/J2pnDuVZxNXv5FM2ki3I2BMjZWURCIRt+Z1cGFuONFeDTp85IAjDtf+bOe
-xd7EFcfkvW5iwrepv6Er0HvXvgWTIMyaJ12DRnpXBsJIQniHLAAGzHsEHE/Zopaf
-XGJyNGIvRrwtpT7K8Rx5CYM/eljYy3Mb5oKEN11ZkGK33wpreAjDoHImKpkvtZES
-hnOD/yL+f4VhHF5bAcEc
-=HsSB
+iQEcBAEBCAAGBQJVuwUbAAoJEO1RxJ84ipLkXVsH/ia50vWNrY5Zchs+k5xdKuio
+lJQNX8/kN1Hfrp2x2Bnc7CgRxEzD9w7ybgizpHxEu9NsHgiR5bREYIdEBhTjZlj3
+aNxqoCL3Pe4/VjRy499XC7ltU6hY6TSDg4iOc6Hz0gT6RIxjnXfjtlA9YbsMq5y7
+uQ6Tm+2tmyxz9OUZg0DKHCgOp+TpH1yeyjuECM/iX59D99uUnqdgMWU+6LePdNYy
+hBNCGc0vEXV59MfR/35En15D1rt+YL0SELgwpBeObKTOc5ljqPlUoCI9K80tZBdB
+XCrxupgK8Ry3DHZQNuSgX0FF4GkPkSg+zc53Xcv8f7iLi1BU5LvVJVFs5tghlvo=
+=oxwI
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/ntopng/ntopng-2.0.ebuild b/net-analyzer/ntopng/ntopng-2.0.ebuild
new file mode 100644
index 000000000000..d8b21a43b05b
--- /dev/null
+++ b/net-analyzer/ntopng/ntopng-2.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntopng/ntopng-2.0.ebuild,v 1.1 2015/07/31 05:17:05 slis Exp $
+
+EAPI=5
+inherit autotools user
+
+DESCRIPTION="Network traffic analyzer with web interface"
+HOMEPAGE="http://www.ntop.org/"
+SRC_URI="mirror://sourceforge/ntop/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-db/sqlite:3
+	dev-libs/geoip
+	dev-libs/glib:2
+	net-libs/libpcap
+	dev-libs/libxml2"
+RDEPEND="${DEPEND}
+	dev-db/redis"
+
+src_prepare() {
+	cat "${S}/configure.seed" | sed "s/@VERSION@/${PV}/g" | sed "s/@SHORT_VERSION@/${PV}/g" > "${S}/configure.ac"
+	eautoreconf
+}
+
+src_install() {
+	SHARE_NTOPNG_DIR="${EPREFIX}/usr/share/${PN}"
+	dodir ${SHARE_NTOPNG_DIR}
+	insinto ${SHARE_NTOPNG_DIR}
+	doins -r httpdocs
+	doins -r scripts
+
+	exeinto /usr/bin
+	doexe ${PN}
+	doman ${PN}.8
+
+	newinitd "${FILESDIR}/ntopng.init.d" ntopng
+	newconfd "${FILESDIR}/ntopng.conf.d" ntopng
+
+	dodir "/var/lib/ntopng"
+	fowners ntopng "${EPREFIX}/var/lib/ntopng"
+}
+
+pkg_setup() {
+	enewuser ntopng
+}
+
+pkg_postinst() {
+	elog "ntopng default creadential are user='admin' password='admin'"
+}