Version bump and fix for bug #135337

(Portage version: 2.1.2_pre2-r6)

5 files changed, 81 insertions, 13 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/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>