Version bump and fix for bug #135337

Package-Manager: portage-2.1.2_pre2-r6

6 files changed, 115 insertions, 29 deletions

diff --git a/net-analyzer/jffnms/ChangeLog b/net-analyzer/jffnms/ChangeLog
index 45fbe0a2c7d8..d651e5c9501b 100644
--- a/net-analyzer/jffnms/ChangeLog
+++ b/net-analyzer/jffnms/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/jffnms
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/jffnms/ChangeLog,v 1.2 2006/04/27 21:31:59 antarus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/jffnms/ChangeLog,v 1.3 2006/10/08 23:02:06 jokey Exp $
+
+*jffnms-0.8.3 (08 Oct 2006)
+
+  08 Oct 2006; Markus Ullmann <jokey@gentoo.org> metadata.xml,
+  jffnms-0.8.2.ebuild, +jffnms-0.8.3.ebuild:
+  Version bump and fix for bug #135337
 
   27 Apr 2006; Alec Warner <antarus@gentoo.org> Manifest:
   Fixing SHA256 digest, pass four
diff --git a/net-analyzer/jffnms/Manifest b/net-analyzer/jffnms/Manifest
index c1d9c61dc898..e01098f15667 100644
--- a/net-analyzer/jffnms/Manifest
+++ b/net-analyzer/jffnms/Manifest
@@ -1,28 +1,46 @@
-AUX mysql_db 119 RMD160 fd54513c750558651b0687396d920910c96d78b7 SHA1 d50b3d5245ac6d97d3b3154bd657ad8091d05e97 SHA256 b9d542fe500e4006184becaa5b17dd1955ca9b34711903bcb72ea209f887b927 size 119
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX mysql_db 119 RMD160 fd54513c750558651b0687396d920910c96d78b7 SHA1 d50b3d5245ac6d97d3b3154bd657ad8091d05e97 SHA256 b9d542fe500e4006184becaa5b17dd1955ca9b34711903bcb72ea209f887b927
 MD5 36459cd0e2d6f01a3f7f501692be546b files/mysql_db 119
 RMD160 fd54513c750558651b0687396d920910c96d78b7 files/mysql_db 119
 SHA256 b9d542fe500e4006184becaa5b17dd1955ca9b34711903bcb72ea209f887b927 files/mysql_db 119
-AUX postgresql_db 73 RMD160 6a10ceaac6f4826f96477d5b2c2ca4555cb5609d SHA1 d5ed50e727d81ec10edec10e254695bd55ffc0d8 SHA256 912ea3da22eeeb6dfb046245fe3eb3848eb81524297a6647edf652b2caea5c02 size 73
+AUX postgresql_db 73 RMD160 6a10ceaac6f4826f96477d5b2c2ca4555cb5609d SHA1 d5ed50e727d81ec10edec10e254695bd55ffc0d8 SHA256 912ea3da22eeeb6dfb046245fe3eb3848eb81524297a6647edf652b2caea5c02
 MD5 932dbe8966d923efd658a9b16322dab1 files/postgresql_db 73
 RMD160 6a10ceaac6f4826f96477d5b2c2ca4555cb5609d files/postgresql_db 73
 SHA256 912ea3da22eeeb6dfb046245fe3eb3848eb81524297a6647edf652b2caea5c02 files/postgresql_db 73
-AUX postgresql_db_table 24 RMD160 94cdb129a4944235408efc138f40340c9f19f682 SHA1 594d387c1412d75d3f1433c98dc078acf5d985af SHA256 201a55d370e38b9c7f981a7cb6b9901302fcccb8cf21511905f5343834aa387e size 24
+AUX postgresql_db_table 24 RMD160 94cdb129a4944235408efc138f40340c9f19f682 SHA1 594d387c1412d75d3f1433c98dc078acf5d985af SHA256 201a55d370e38b9c7f981a7cb6b9901302fcccb8cf21511905f5343834aa387e
 MD5 52e3fbf9a0fb34dafd44043c9df57a16 files/postgresql_db_table 24
 RMD160 94cdb129a4944235408efc138f40340c9f19f682 files/postgresql_db_table 24
 SHA256 201a55d370e38b9c7f981a7cb6b9901302fcccb8cf21511905f5343834aa387e files/postgresql_db_table 24
-DIST jffnms-0.8.2.tar.gz 557085 RMD160 5ce08a50f5bbedbc00c990933c6ade935e681772 SHA256 d42b2b9e0a65b744bec12f2eea34efe14a4b836c37c37f187d835774395edf90 size 557085
-EBUILD jffnms-0.8.2.ebuild 1692 RMD160 2e3d8dbc8998121e5a378bd616ef8f259b85ba20 SHA1 a9cadf41c2d5994345788bdc739784c775dcc829 SHA256 020afcf6c93627a712a91c518aa17f2fdd6fdda4948b1e3a7ce2e14d4814624d size 1692
-MD5 53de9032e6501bca4443dc95afd25067 jffnms-0.8.2.ebuild 1692
-RMD160 2e3d8dbc8998121e5a378bd616ef8f259b85ba20 jffnms-0.8.2.ebuild 1692
-SHA256 020afcf6c93627a712a91c518aa17f2fdd6fdda4948b1e3a7ce2e14d4814624d jffnms-0.8.2.ebuild 1692
-MISC ChangeLog 529 RMD160 f445fbfe3abdbb09e81aace28c46f3223fbf5b02 SHA1 571dcdccae35865d5ea579418ad9b77c43ff3efa SHA256 9e416b84c4ea9529194b23181a3ee450519318f09b5532bd7e2d8effeff5f657 size 529
-MD5 f9c5f910f90c775a085972c82a2deaf3 ChangeLog 529
-RMD160 f445fbfe3abdbb09e81aace28c46f3223fbf5b02 ChangeLog 529
-SHA256 9e416b84c4ea9529194b23181a3ee450519318f09b5532bd7e2d8effeff5f657 ChangeLog 529
-MISC metadata.xml 261 RMD160 a0898580ad706dced8398a104f281627eadfb04e SHA1 f9a6c3c75537a9fe2580adc10868344460eade38 SHA256 d10b696def02fe1e1f92d79a4e96082ece1e6a7df150fb9d741290fcdf803e20 size 261
-MD5 21ab66f6f5ffd3b8b944c934c4ef22af metadata.xml 261
-RMD160 a0898580ad706dced8398a104f281627eadfb04e metadata.xml 261
-SHA256 d10b696def02fe1e1f92d79a4e96082ece1e6a7df150fb9d741290fcdf803e20 metadata.xml 261
+DIST jffnms-0.8.2.tar.gz 557085 RMD160 5ce08a50f5bbedbc00c990933c6ade935e681772 SHA1 3e1ff8f302d5fd30e14f4f363338b68870343d30 SHA256 d42b2b9e0a65b744bec12f2eea34efe14a4b836c37c37f187d835774395edf90
+DIST jffnms-0.8.3.tar.gz 698871 RMD160 681d498bf49f3e1011241254c441540ebbbe1860 SHA1 230cd88b9ff5b869e7a07c828425be15ede9614f SHA256 51f84606aa81113b2ea894c9e499f18df84e5317853aefd51610f5b279853ae4
+EBUILD jffnms-0.8.2.ebuild 1670 RMD160 2f9468b08caf2184ebf4f81b550c3fdf7ac038af SHA1 9c91d8a5dfd9223fe9d37d8cd9fb748b93a2167f SHA256 eb3eeab4ba7056d3c61a53c57f2dd12982d3ea41928e8fab2a8c407090ac6f67
+MD5 cd73d5ef750e1f142e27f7409bc359e4 jffnms-0.8.2.ebuild 1670
+RMD160 2f9468b08caf2184ebf4f81b550c3fdf7ac038af jffnms-0.8.2.ebuild 1670
+SHA256 eb3eeab4ba7056d3c61a53c57f2dd12982d3ea41928e8fab2a8c407090ac6f67 jffnms-0.8.2.ebuild 1670
+EBUILD jffnms-0.8.3.ebuild 1670 RMD160 08dc73c02699c1002ec02cc44bc50884e93a2937 SHA1 67bdaeab0d2c9581dfc296bce1f4e7b35af6648b SHA256 68ae1c1edd522348496e226bb6bf2b048abcaba80ae31871db8bba42ac6e0e77
+MD5 3ab44af23eecce41d42d828c3ca1f91f jffnms-0.8.3.ebuild 1670
+RMD160 08dc73c02699c1002ec02cc44bc50884e93a2937 jffnms-0.8.3.ebuild 1670
+SHA256 68ae1c1edd522348496e226bb6bf2b048abcaba80ae31871db8bba42ac6e0e77 jffnms-0.8.3.ebuild 1670
+MISC ChangeLog 704 RMD160 b40207000ee60d4dd3a03480a93034c8c3dc51b7 SHA1 b31423d5ce397dcb57a79e34da50247500539e13 SHA256 c9c5af3de9d545a09f4e55857dbf394be1ce88d4a015a601063f54b78c141444
+MD5 e4c78210a203753eae3562d53ec7acc2 ChangeLog 704
+RMD160 b40207000ee60d4dd3a03480a93034c8c3dc51b7 ChangeLog 704
+SHA256 c9c5af3de9d545a09f4e55857dbf394be1ce88d4a015a601063f54b78c141444 ChangeLog 704
+MISC metadata.xml 159 RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b SHA1 9f5df3eabd621951a959cc8e0e2e0d352cd1fe1e SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6
+MD5 f34e3c8858756da0001b12d2d3fa1af2 metadata.xml 159
+RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b metadata.xml 159
+SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 metadata.xml 159
 MD5 a01464e5866620e8703815db0e566469 files/digest-jffnms-0.8.2 238
 RMD160 f6d19620bb3649aae5765b68f7e62fe175d7245b files/digest-jffnms-0.8.2 238
 SHA256 ff790a322c824f6a74e6425b92f79852c65878844fcc89e37a0cb639d7ea8f34 files/digest-jffnms-0.8.2 238
+MD5 6fe4d457ec8518e152f7f6615d1eb401 files/digest-jffnms-0.8.3 238
+RMD160 5411137de6c3221379230507ea07e1fc8603c100 files/digest-jffnms-0.8.3 238
+SHA256 28acbd4ddf1e417a4561d54fa7febbc163d9ac28080423b402d9f365120eb969 files/digest-jffnms-0.8.3 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFKYOBz974XjDVpbkRApJFAJ9KfBch/y9djK4HpQXVyG60St7GyQCgzsbt
+QeS0v4CqzGOEd86T2wAJtls=
+=aR9P
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/jffnms/files/digest-jffnms-0.8.3 b/net-analyzer/jffnms/files/digest-jffnms-0.8.3
new file mode 100644
index 000000000000..b79ff483c4f6
--- /dev/null
+++ b/net-analyzer/jffnms/files/digest-jffnms-0.8.3
@@ -0,0 +1,3 @@
+MD5 6f030ee09302b67f639eaff713b78c65 jffnms-0.8.3.tar.gz 698871
+RMD160 681d498bf49f3e1011241254c441540ebbbe1860 jffnms-0.8.3.tar.gz 698871
+SHA256 51f84606aa81113b2ea894c9e499f18df84e5317853aefd51610f5b279853ae4 jffnms-0.8.3.tar.gz 698871
diff --git a/net-analyzer/jffnms/jffnms-0.8.2.ebuild b/net-analyzer/jffnms/jffnms-0.8.2.ebuild
index 22168655302f..18660b2f4f43 100644
--- a/net-analyzer/jffnms/jffnms-0.8.2.ebuild
+++ b/net-analyzer/jffnms/jffnms-0.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/jffnms/jffnms-0.8.2.ebuild,v 1.1 2006/03/13 23:22:34 angusyoung Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/jffnms/jffnms-0.8.2.ebuild,v 1.2 2006/10/08 23:02:06 jokey Exp $
 
 inherit eutils
 
@@ -16,7 +16,7 @@ IUSE="mysql postgres snmp"
 DEPEND="net-www/apache
 	mysql? ( dev-db/mysql )
 	postgres? ( dev-db/postgresql )
-	>=net-analyzer/rrdtool-1.0.33
+	net-analyzer/rrdtool
 	media-libs/gd
 	=dev-lang/php-4*
 	dev-php/PEAR-PEAR
@@ -50,16 +50,15 @@ pkg_setup() {
 }
 
 src_install(){
-	MY_DESTDIR="/opt/jffnms"
+	MY_DESTDIR="${D}opt/jffnms"
 
-	dodir ${MY_DESTDIR}
-	cp -r * "${D}${MY_DESTDIR}" || die
-	chown -R jffnms:apache "${D}${MY_DESTDIR}" || die
-	chmod -R ug+gw "${D}${MY_DESTDIR}" || die
+	dodir "${MY_DESTDIR}"
+	cp -r * "${MY_DESTDIR}" || die
+	chown -R jffnms:apache "${MY_DESTDIR}" || die
+	chmod -R ug+rw "${MY_DESTDIR}" || die
 
 	einfo "JFFNMS has been partialy installed on your system. However you"
 	einfo "still need proceed with final installation and configuration."
 	einfo "You can visit http://www.gentoo.org/doc/en/jffnms.xml in order"
 	einfo "to get detailed information on how to get jffnms up and running."
-
 }
diff --git a/net-analyzer/jffnms/jffnms-0.8.3.ebuild b/net-analyzer/jffnms/jffnms-0.8.3.ebuild
new file mode 100644
index 000000000000..2da05db0efe0
--- /dev/null
+++ b/net-analyzer/jffnms/jffnms-0.8.3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/jffnms/jffnms-0.8.3.ebuild,v 1.1 2006/10/08 23:02:06 jokey Exp $
+
+inherit eutils
+
+DESCRIPTION="Network Management and Monitoring System."
+HOMEPAGE="http://www.jffnms.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="mysql postgres snmp"
+
+DEPEND="net-www/apache
+	mysql? ( dev-db/mysql )
+	postgres? ( dev-db/postgresql )
+	net-analyzer/rrdtool
+	media-libs/gd
+	=dev-lang/php-4*
+	dev-php/PEAR-PEAR
+	snmp? ( net-analyzer/net-snmp )
+	sys-apps/diffutils
+	media-gfx/graphviz
+	net-analyzer/nmap
+	net-analyzer/fping
+	app-mobilephone/smsclient"
+
+pkg_setup() {
+	local flags="gd wddx sockets session spl cli"
+
+	if use mysql ; then
+		flags="$flags mysql"
+	fi
+
+	if use postgres ; then
+		flags="$flags postgres"
+	fi
+
+	for flagname in $flags ; do
+		if ! built_with_use "=dev-lang/php-4*" $flagname; then
+			eerror "You need to build php with $flagname USE flag"
+			die "Jffnms requires php with $flagname USE flag"
+		fi
+	done
+
+	enewgroup jffnms
+	enewuser jffnms -1 /bin/bash /dev/null jffnms,apache
+}
+
+src_install(){
+	MY_DESTDIR="${D}opt/jffnms"
+
+	dodir "${MY_DESTDIR}"
+	cp -r * "${MY_DESTDIR}" || die
+	chown -R jffnms:apache "${MY_DESTDIR}" || die
+	chmod -R ug+rw "${MY_DESTDIR}" || die
+
+	einfo "JFFNMS has been partialy installed on your system. However you"
+	einfo "still need proceed with final installation and configuration."
+	einfo "You can visit http://www.gentoo.org/doc/en/jffnms.xml in order"
+	einfo "to get detailed information on how to get jffnms up and running."
+}
diff --git a/net-analyzer/jffnms/metadata.xml b/net-analyzer/jffnms/metadata.xml
index 0b9935a7e2a9..03aa50bab7e3 100644
--- a/net-analyzer/jffnms/metadata.xml
+++ b/net-analyzer/jffnms/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>netmon</herd>
-<maintainer>
-  <email>angusyoung@gentoo.org</email>
-  <name>Otavio Rodolfo Piske</name>
-</maintainer>
 </pkgmetadata>