Fixing dependency bug #142728 thanks to Jakub for providing the fix

Package-Manager: portage-2.1.2_pre2-r6

3 files changed, 43 insertions, 34 deletions

diff --git a/net-analyzer/jffnms/ChangeLog b/net-analyzer/jffnms/ChangeLog
index d651e5c9501b..baf002076bfb 100644
--- a/net-analyzer/jffnms/ChangeLog
+++ b/net-analyzer/jffnms/ChangeLog
@@ -1,6 +1,9 @@
 # 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.3 2006/10/08 23:02:06 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/jffnms/ChangeLog,v 1.4 2006/10/11 22:32:14 jokey Exp $
+
+  11 Oct 2006; Markus Ullmann <jokey@gentoo.org> jffnms-0.8.3.ebuild:
+  Fixing dependency bug #142728 thanks to Jakub for providing the fix
 
 *jffnms-0.8.3 (08 Oct 2006)
 
diff --git a/net-analyzer/jffnms/Manifest b/net-analyzer/jffnms/Manifest
index e01098f15667..ab554780459c 100644
--- a/net-analyzer/jffnms/Manifest
+++ b/net-analyzer/jffnms/Manifest
@@ -19,14 +19,14 @@ EBUILD jffnms-0.8.2.ebuild 1670 RMD160 2f9468b08caf2184ebf4f81b550c3fdf7ac038af
 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
+EBUILD jffnms-0.8.3.ebuild 1782 RMD160 70e04005768ce6ff38a535b56909e94a6339a8ca SHA1 0aa92a370084cb526eeb905be49b1cde82b6601a SHA256 0fa936fc9e472d517b81d133bf2441fd616d41d8e7b77b963f7a82d1f8a4f6c4
+MD5 850ac2e775d90db9d23ddf8d929e7d5d jffnms-0.8.3.ebuild 1782
+RMD160 70e04005768ce6ff38a535b56909e94a6339a8ca jffnms-0.8.3.ebuild 1782
+SHA256 0fa936fc9e472d517b81d133bf2441fd616d41d8e7b77b963f7a82d1f8a4f6c4 jffnms-0.8.3.ebuild 1782
+MISC ChangeLog 845 RMD160 6cdc9151b84571c22b724389126903d3bb4c8aaa SHA1 642c90211a15796f074c5f2549963d8530d753fb SHA256 ce2387398a4114d2ea7f68f52af656e9ceb2ff1718608c815b41288a29eb1cc4
+MD5 d34d7cb7b3126c75f430ed93938215b3 ChangeLog 845
+RMD160 6cdc9151b84571c22b724389126903d3bb4c8aaa ChangeLog 845
+SHA256 ce2387398a4114d2ea7f68f52af656e9ceb2ff1718608c815b41288a29eb1cc4 ChangeLog 845
 MISC metadata.xml 159 RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b SHA1 9f5df3eabd621951a959cc8e0e2e0d352cd1fe1e SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6
 MD5 f34e3c8858756da0001b12d2d3fa1af2 metadata.xml 159
 RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b metadata.xml 159
@@ -40,7 +40,7 @@ SHA256 28acbd4ddf1e417a4561d54fa7febbc163d9ac28080423b402d9f365120eb969 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFKYOBz974XjDVpbkRApJFAJ9KfBch/y9djK4HpQXVyG60St7GyQCgzsbt
-QeS0v4CqzGOEd86T2wAJtls=
-=aR9P
+iD8DBQFFLXDzz974XjDVpbkRAtJ3AJ9RjfVDZgUrWYjlpM8tIf11yTDKygCdGdlE
+NNyzfcmmlcHZc/DhL09Zt7A=
+=qqSF
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/jffnms/jffnms-0.8.3.ebuild b/net-analyzer/jffnms/jffnms-0.8.3.ebuild
index 2da05db0efe0..c0bbd8742eac 100644
--- a/net-analyzer/jffnms/jffnms-0.8.3.ebuild
+++ b/net-analyzer/jffnms/jffnms-0.8.3.ebuild
@@ -1,8 +1,8 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/jffnms/jffnms-0.8.3.ebuild,v 1.2 2006/10/11 22:32:14 jokey Exp $
 
-inherit eutils
+inherit eutils depend.php
 
 DESCRIPTION="Network Management and Monitoring System."
 HOMEPAGE="http://www.jffnms.org/"
@@ -18,35 +18,41 @@ DEPEND="net-www/apache
 	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
+	app-mobilephone/smsclient"
+
+RDEPEND="${DEPEND}
 	media-gfx/graphviz
 	net-analyzer/nmap
-	net-analyzer/fping
-	app-mobilephone/smsclient"
+	net-analyzer/fping"
+
+need_php_cli
 
 pkg_setup() {
-	local flags="gd wddx sockets session spl cli"
+	require_gd
+	local DIE
+	local flags="wddx sockets session spl"
+	use mysql && flags="${flags} mysql"
+	use postgres &&	flags="${flags} postgres"
 
-	if use mysql ; then
-		flags="$flags mysql"
+	if ! PHPCHECKNODIE="yes" require_php_with_use ${flags} ; then
+		DIE="yes"
 	fi
 
-	if use postgres ; then
-		flags="$flags postgres"
+	if [[ ${DIE} == "yes" ]] ; then
+		eerror
+		eerror "${PHP_PKG} needs to be re-installed with all of the following"
+		eerror "USE flags enabled:"
+		eerror
+		eerror "${flags}"
+		eerror
+		die "Re-install ${PHP_PKG} with ${flags}"
 	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
+	enewuser jffnms -1 /bin/bash -1 jffnms,apache
 }
 
 src_install(){
@@ -57,8 +63,8 @@ src_install(){
 	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."
+	elog "JFFNMS has been partialy installed on your system. However you"
+	elog "still need proceed with final installation and configuration."
+	elog "You can visit http://www.gentoo.org/doc/en/jffnms.xml in order"
+	elog "to get detailed information on how to get jffnms up and running."
 }