diff options
| author |   Peter Volkov <pva@gentoo.org> | 2007-06-08 11:47:35 +0000 |
|---|---|---|
| committer | Peter Volkov <pva@gentoo.org> | 2007-06-08 11:47:35 +0000 |
| commit | e98ff60686767171a249cc9f19524095c289f618 (patch) | |
| tree | 08c1d23eb411e1c3ff4675da0c8925dcfc4e20b4 /net-analyzer/cacti | |
| parent | Swap one line in the init script, thanks to Jörg Eitemüller <destotelhorus ... (diff) | |
| download | historical-e98ff60686767171a249cc9f19524095c289f618.tar.gz historical-e98ff60686767171a249cc9f19524095c289f618.tar.bz2 historical-e98ff60686767171a249cc9f19524095c289f618.zip | |
Call require_php_with_use only once. Thank armin76 for the fix.
Package-Manager: portage-2.1.2.9
Diffstat (limited to 'net-analyzer/cacti')
| -rw-r--r-- | net-analyzer/cacti/ChangeLog | 5 | ||||
| -rw-r--r-- | net-analyzer/cacti/Manifest | 16 | ||||
| -rw-r--r-- | net-analyzer/cacti/cacti-0.8.6j-r6.ebuild | 9 |
3 files changed, 17 insertions, 13 deletions
diff --git a/net-analyzer/cacti/ChangeLog b/net-analyzer/cacti/ChangeLog index e1ea4052e7d1..b8a36fc54e2d 100644 --- a/net-analyzer/cacti/ChangeLog +++ b/net-analyzer/cacti/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-analyzer/cacti # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.105 2007/06/07 13:55:47 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.106 2007/06/08 11:47:35 pva Exp $ + + 08 Jun 2007; <pva@gentoo.org> cacti-0.8.6j-r6.ebuild: + Call require_php_with_use only once. Thank armin76 for the fix. 07 Jun 2007; Markus Rothe <corsair@gentoo.org> cacti-0.8.6j-r5.ebuild: Stable on ppc64; bug #181112 diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest index fdac0d1c44d6..69b91b343fcb 100644 --- a/net-analyzer/cacti/Manifest +++ b/net-analyzer/cacti/Manifest @@ -29,14 +29,14 @@ EBUILD cacti-0.8.6j-r5.ebuild 2424 RMD160 60f192f56bf7c461aaeb6adeda32d8a02a4e1a MD5 3351b5bbfc7f8c7cfc87f5aa5a35084e cacti-0.8.6j-r5.ebuild 2424 RMD160 60f192f56bf7c461aaeb6adeda32d8a02a4e1a17 cacti-0.8.6j-r5.ebuild 2424 SHA256 c3c3f2a9326284440229b5a0f3be33b78f5361c808d49ff8474b319f26593d9c cacti-0.8.6j-r5.ebuild 2424 -EBUILD cacti-0.8.6j-r6.ebuild 2445 RMD160 b4e75461fe63048df3336ec5cea216fba870ce9c SHA1 c816fad607237811c764bf5f58f1eddfebf3f3be SHA256 5feba84a4435eed2a9d1d1d41b53ff134e38137ed7f9d221466ae44ef53525d0 -MD5 5632bfe948d98e2d1b2c3decb4f56762 cacti-0.8.6j-r6.ebuild 2445 -RMD160 b4e75461fe63048df3336ec5cea216fba870ce9c cacti-0.8.6j-r6.ebuild 2445 -SHA256 5feba84a4435eed2a9d1d1d41b53ff134e38137ed7f9d221466ae44ef53525d0 cacti-0.8.6j-r6.ebuild 2445 -MISC ChangeLog 15454 RMD160 4ca60bfa7989385a451b2f00790b2973f4f860c3 SHA1 7e205368cdea5e4dcd2d69dabb4a767050095b60 SHA256 2e1e76ed17edd93c579da9c9fe5fd75b4553859d88742d3a124a1f18d61155ee -MD5 ff8ead60f2d740ee363b15042657cd50 ChangeLog 15454 -RMD160 4ca60bfa7989385a451b2f00790b2973f4f860c3 ChangeLog 15454 -SHA256 2e1e76ed17edd93c579da9c9fe5fd75b4553859d88742d3a124a1f18d61155ee ChangeLog 15454 +EBUILD cacti-0.8.6j-r6.ebuild 2471 RMD160 19162262816a1db6dd206e89938e0e0cee6b75ad SHA1 be2334296d2a3ed2b45e6dec29e2d6b7f30f5eff SHA256 442b30fac6b4f87ebfe7643e19f2eb638af8c6fc41939fbb24840d2edf91995d +MD5 8d685fd69acec364bc406d1ba402cda8 cacti-0.8.6j-r6.ebuild 2471 +RMD160 19162262816a1db6dd206e89938e0e0cee6b75ad cacti-0.8.6j-r6.ebuild 2471 +SHA256 442b30fac6b4f87ebfe7643e19f2eb638af8c6fc41939fbb24840d2edf91995d cacti-0.8.6j-r6.ebuild 2471 +MISC ChangeLog 15573 RMD160 2183d95e53c0c457c97b4c83ac3c0d65290ff798 SHA1 54cc7b9962b4ac4e208349d7401160155708cffc SHA256 debde45455af3f4019a561e5ff6a8fa56771d07386b3de6ca81cf86b4d3c3091 +MD5 0ab453d63cc904aa22c39c06d06bd393 ChangeLog 15573 +RMD160 2183d95e53c0c457c97b4c83ac3c0d65290ff798 ChangeLog 15573 +SHA256 debde45455af3f4019a561e5ff6a8fa56771d07386b3de6ca81cf86b4d3c3091 ChangeLog 15573 MISC metadata.xml 743 RMD160 cf7607206376845e26a2c6b348b73d6eb7c5c1c8 SHA1 6594e631af6d1c4d9712c9f73a7fb88c91d4d199 SHA256 858f38f32b5bde1d8a4df2b9cde40a142dae76fb040dc7aaa5d1b0cc9184fb94 MD5 191d624f14b534af99878690f9b5a083 metadata.xml 743 RMD160 cf7607206376845e26a2c6b348b73d6eb7c5c1c8 metadata.xml 743 diff --git a/net-analyzer/cacti/cacti-0.8.6j-r6.ebuild b/net-analyzer/cacti/cacti-0.8.6j-r6.ebuild index a2c77bea0794..d3b9a0240e33 100644 --- a/net-analyzer/cacti/cacti-0.8.6j-r6.ebuild +++ b/net-analyzer/cacti/cacti-0.8.6j-r6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.6j-r6.ebuild,v 1.3 2007/06/07 13:47:24 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.6j-r6.ebuild,v 1.4 2007/06/08 11:47:35 pva Exp $ inherit eutils webapp depend.apache depend.php @@ -64,11 +64,12 @@ pkg_setup() { webapp_pkg_setup has_php if [ $PHP_VERSION = 5 ] ; then - require_php_with_use cli mysql xml + phpUseFlags="cli mysql xml" elif [ $PHP_VERSION = 4 ] ; then - require_php_with_use cli mysql xml expat + phpUseFlags="cli mysql xml expat" fi - use bundled-adodb || require_php_with_use sockets + use bundled-adodb || phpUseFlags="${phpUseFlags} sockets" + require_php_with_use ${phpUseFlags} } src_compile() { |