diff options
| -rw-r--r-- | net-analyzer/jffnms/ChangeLog | 5 | ||||
| -rw-r--r-- | net-analyzer/jffnms/Manifest | 22 | ||||
| -rw-r--r-- | net-analyzer/jffnms/jffnms-0.8.3.ebuild | 23 |
3 files changed, 26 insertions, 24 deletions
diff --git a/net-analyzer/jffnms/ChangeLog b/net-analyzer/jffnms/ChangeLog index baf002076bfb..1f2120fdd7b2 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.4 2006/10/11 22:32:14 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/jffnms/ChangeLog,v 1.5 2006/10/11 23:14:36 jokey Exp $ + + 11 Oct 2006; Markus Ullmann <jokey@gentoo.org> jffnms-0.8.3.ebuild: + Even more improved 11 Oct 2006; Markus Ullmann <jokey@gentoo.org> jffnms-0.8.3.ebuild: Fixing dependency bug #142728 thanks to Jakub for providing the fix diff --git a/net-analyzer/jffnms/Manifest b/net-analyzer/jffnms/Manifest index ab554780459c..68d65bb652d9 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 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 +EBUILD jffnms-0.8.3.ebuild 1911 RMD160 b628d158ccf234febbc4361a2767273c68e25748 SHA1 49226c1a52f461e1436fd440190f521a3593a268 SHA256 aa6d7c646d38b2d9b0c545d6fb4527f12744ea39d9adf7f803a51f421af9afb7 +MD5 bea6769ff7b37b801b2a5d6df391f29e jffnms-0.8.3.ebuild 1911 +RMD160 b628d158ccf234febbc4361a2767273c68e25748 jffnms-0.8.3.ebuild 1911 +SHA256 aa6d7c646d38b2d9b0c545d6fb4527f12744ea39d9adf7f803a51f421af9afb7 jffnms-0.8.3.ebuild 1911 +MISC ChangeLog 937 RMD160 b13dd551f7b5fbcc81be374eed728aab8e31ff96 SHA1 7971f3403ac626a207c8e5e9c0d7d683b0f5e16d SHA256 8e01862fbf3ca66bee34f04c9ee151bfaeb51175dab444e4cf7ca9af674c5e7c +MD5 c91ad1f0a614bc2c7e81a6f050f535d7 ChangeLog 937 +RMD160 b13dd551f7b5fbcc81be374eed728aab8e31ff96 ChangeLog 937 +SHA256 8e01862fbf3ca66bee34f04c9ee151bfaeb51175dab444e4cf7ca9af674c5e7c ChangeLog 937 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) -iD8DBQFFLXDzz974XjDVpbkRAtJ3AJ9RjfVDZgUrWYjlpM8tIf11yTDKygCdGdlE -NNyzfcmmlcHZc/DhL09Zt7A= -=qqSF +iD8DBQFFLXrjz974XjDVpbkRAhdXAJwN9JjXmnFCCc3o/SoRqI7Pnv7I/ACfdoMj +/8UzouEaUIauF29bkTYDke0= +=x4eY -----END PGP SIGNATURE----- diff --git a/net-analyzer/jffnms/jffnms-0.8.3.ebuild b/net-analyzer/jffnms/jffnms-0.8.3.ebuild index c0bbd8742eac..6e34ca049bea 100644 --- a/net-analyzer/jffnms/jffnms-0.8.3.ebuild +++ b/net-analyzer/jffnms/jffnms-0.8.3.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.3.ebuild,v 1.2 2006/10/11 22:32:14 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/jffnms/jffnms-0.8.3.ebuild,v 1.3 2006/10/11 23:14:36 jokey Exp $ inherit eutils depend.php @@ -19,7 +19,7 @@ DEPEND="net-www/apache net-analyzer/rrdtool media-libs/gd dev-php/PEAR-PEAR - snmp? ( net-analyzer/net-snmp ) + net-analyzer/net-snmp sys-apps/diffutils app-mobilephone/smsclient" @@ -31,24 +31,23 @@ RDEPEND="${DEPEND} need_php_cli pkg_setup() { - require_gd - local DIE - local flags="wddx sockets session spl" + local flags="pcre session snmp sockets wddx" use mysql && flags="${flags} mysql" use postgres && flags="${flags} postgres" - if ! PHPCHECKNODIE="yes" require_php_with_use ${flags} ; then - DIE="yes" - fi - - if [[ ${DIE} == "yes" ]] ; then + if ! PHPCHECKNODIE="yes" require_php_with_use ${flags} \ + || ! PHPCHECKNODIE="yes" require_php_with_any_use gd gd-external ; 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}" + eerror "as well as any of the following USE flags enabled:" + eerror + eerror "gd or gd-external" + eerror + die "Re-install ${PHP_PKG} with ${flags} and either gd or gd-external" fi enewgroup jffnms @@ -63,7 +62,7 @@ src_install(){ chown -R jffnms:apache "${MY_DESTDIR}" || die chmod -R ug+rw "${MY_DESTDIR}" || die - elog "JFFNMS has been partialy installed on your system. However you" + elog "${PN} 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." |