diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2012-07-20 18:10:54 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2012-07-20 18:10:54 +0000 |
| commit | ecd0f7601ef9cee1fb7d020c1345fd5467d49a41 (patch) | |
| tree | 14d5a82dac05fe1e65903032a8e7b027e9624ed3 /net-analyzer | |
| parent | Full rewrite. (diff) | |
| download | historical-ecd0f7601ef9cee1fb7d020c1345fd5467d49a41.tar.gz historical-ecd0f7601ef9cee1fb7d020c1345fd5467d49a41.tar.bz2 historical-ecd0f7601ef9cee1fb7d020c1345fd5467d49a41.zip | |
Log-Log4perl is used by the node, so depend on it even with USE=-minimal; only remove the ttf file with USE=minimal.
Package-Manager: portage-2.2.0_alpha118/cvs/Linux x86_64
Diffstat (limited to 'net-analyzer')
| -rw-r--r-- | net-analyzer/munin/ChangeLog | 6 | ||||
| -rw-r--r-- | net-analyzer/munin/Manifest | 18 | ||||
| -rw-r--r-- | net-analyzer/munin/munin-2.0.2.ebuild | 12 |
3 files changed, 20 insertions, 16 deletions
diff --git a/net-analyzer/munin/ChangeLog b/net-analyzer/munin/ChangeLog index 6728e10cccc6..11a4494f1a44 100644 --- a/net-analyzer/munin/ChangeLog +++ b/net-analyzer/munin/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-analyzer/munin # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.75 2012/07/17 15:27:05 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.76 2012/07/20 18:10:54 flameeyes Exp $ + + 20 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org> munin-2.0.2.ebuild: + Log-Log4perl is used by the node, so depend on it even with USE=-minimal; only + remove the ttf file with USE=minimal. 17 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org> metadata.xml, munin-2.0.2.ebuild: diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest index 6b5141b6a1be..f9dde9dafaa8 100644 --- a/net-analyzer/munin/Manifest +++ b/net-analyzer/munin/Manifest @@ -26,17 +26,17 @@ DIST munin-2.0.2.tar.gz 1305391 SHA256 e8a5266a85cde8b89a97fb7463a56a7ac9c038035 EBUILD munin-1.4.6-r4.ebuild 5033 SHA256 032e77091eb5e3776b79fd6857965ae8de3050b8fae6622bd311cc073b9882a9 SHA512 aa041a841d3e86686e4cb2137ce1237ac9d656f67ff4d97a75651345392ca5566b5ca46dd2d76d54a8228c5c4634d1a1205da3f7458598b337cdeb0af62d09f3 WHIRLPOOL 4118ebdff6f61ce32d1d273d71125cb71e994eceb78c8fd89987aa0bba8906d1c825fd03721d84ac61930758a401353f788b069f739a54c44888c1876aba6e2d EBUILD munin-1.4.7-r1.ebuild 5033 SHA256 0694022f8066edb5dd52b0d77b06416ea6d51937e1866a947aa8e93a330ba704 SHA512 dea8c73d9ed715c7364c685a7a4a9e811e4dae0babb3549941344df84dc7f90cd5ca81f54ec244b67b070d4329db87ebe9b6f5d8d8efc3c82aad006530268c71 WHIRLPOOL 7cef416ae55bc0500ce6024fe61a2aa7b24d55d9d95cb219e83f4487e8ba72adf83bf1592a265086c8b943e4878911586de55c8f222b1fd4d601c97f5fcb373a EBUILD munin-1.4.7.ebuild 5036 SHA256 a88ec1523efbf2b2afe5392c746508defc3d01d09879d969bc84abc2997c0944 SHA512 792448bb65ece76f9d1108ad1140a4a1e6d4972904c4c2da1213b84d544b8bcf043c1b0d74e585fa904565d6c9557d91b25a97e1459f0e6284862edfa68845da WHIRLPOOL 5c64f50adbe996bf1ccd4a17d308812addde1e538533524fdfae03f4f84eb69fac83bd9bf65e45b050a7ed9998900b9eab01bed3927cd896aed5cb147c29cda3 -EBUILD munin-2.0.2.ebuild 4782 SHA256 d90e30d65ddb5c1b5aee7d663b83a19495e466c5d84ee2f4af3c9ae25c201b49 SHA512 307b6134c055163e9d0b020dd1d23fac61578e6c139f0e22034e94ba59dddec43e4e647df6af21a5e03cc66cdfa3fe4138ec1b18d5bd07675eb698a7be754fc7 WHIRLPOOL 6489787cb0b1619c169f4f8964ea817e8aada2905debdcf3172fe23f0a2ad246a6d13383ab8c5ca9fa06611c1a9496c553e3acdfcc7c7a326ed6579558830e33 -MISC ChangeLog 15223 SHA256 e84dab1a7d121d7eb84da86bd8985bb5475476114a383109a898d40849fc6c40 SHA512 24a056e8f0cf276ccd5615a9307c66aa5bf71ad9b83fb3a51198d4a63ee4f89ca6f48219820f96a6b43372477af99204d76e4f883319fba0463a5d94338588fb WHIRLPOOL 12c6836917845c0340c5acbd494baba1db00d3b0992acf85a1b71c925efa6eac22994eea53fc4d906d78953ecd40a172bab3844833108cb273365ca09c252ae0 +EBUILD munin-2.0.2.ebuild 4781 SHA256 43d3ee2d1c75ff830032b8cb1ace24303c4e3474f4e9c9138017db359c2c7bc5 SHA512 46bddbcd211aea460bec560c45b65fe107199e3e1366ea78d5711b0fb5ca820609d98cdb95aaecdbe957758024f5c818c61ceef5bc9c8383effb26deaaf616d5 WHIRLPOOL a7aacd7293ea4f73c81d9989641382c35be5131679869248c6ddb2a764b1b39b8ec369fe79827f986689e09bcf8d947f2f0e8806a8f7338fb0eafc5e834488c2 +MISC ChangeLog 15421 SHA256 4dfec84cc3083b1dabb3a9d89b66f4bb8c1011c686c71f122d4edbc64446ea97 SHA512 aeb3e98e9891539a17423a61fb0e7c42a215a5dff305597a9e2335cb6dcf006d3fcc6f5b96893c45462d2e25e44b7b1d48bcde6666509f4c888d8f5339779d95 WHIRLPOOL 5ba1d3462b0c4f30a102600e0e11c992fe6bc913b2deaf7b4167afe9320129f7c19597b227bd2f9326afff6f02894f63a4b4247eeab8d0bf8b258caf8adf4dad MISC metadata.xml 2385 SHA256 f7a9078a3c72f3fae7d7e1f0f0f69f98d3a42fb5b66a8679fc1b54a29c6e95f2 SHA512 be7be43811ee9c925593312d36d924543d87b01a8a041050ee2bb9a7009aafad2942e864099b7561dd9a00a54e513f6cf29f7ee6c5a14b4f0597a4fe9ee4545e WHIRLPOOL 1a5607096b5fabbc19891a503f1d1a7d427d199b52210ec13139e8ffdd921d83ac669ee9c338f9a19a2b3fd86ed5c87c1f1513327e53fad03ace0413b9b48a3d -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBCAAGBQJQBYRTAAoJEBzRPIrUMBNCNGcH/RkcThtpdKM1dl42qBB+jA+X -yBX1G7lLcMsxk37MT0md7bOrWzVAw9hzvml0ziCMeNLJjuBgtcz0JkdEcFIOMieZ -WOMHcu6HHKeGEbo4be65xk6NSN4mR5xVBZ8AItHzCaX4HqpU7Ryf7phc2LkOoTRC -2L1DXly03bda+zle60tiHTz4hV5AVWEpVuHjZNdMiQD1GR4Xj17pLWow+urgiZxx -wnliWGV759rpnuMd2WN18n4Kahk8Ao5oDSNbu4Vz5ExKlENKgN8tR8pZrHb4gyaj -v2RBqatA6XLt45J7Hg01X/377a5P0kO2swT9KCiRMZOTYLcbCKsRe820qBSs5ys= -=Undg +iQEcBAEBCAAGBQJQCZ9iAAoJEBzRPIrUMBNCIjMIAJY+/aFf8b8IPAN28zmqmlkN +62yB/MT+xddSXxlkvrIWxgasoErUhJ2+tOpPe73UmMYkQxF8j0cOneGbAvtBRSvd +uZt/QvEZoquE8lUTwtwtsMHh9kFndUuj4tpd/O0Mx26X4BvcXTNpFBFZ4W6LVO/q +FVaxqUaY1dxeJaePveNQBpGYtTCKUf+jDFQZ9rCzOT3moTNn3evfLtvpvG0osLmB +8KyLNnaJm6DRJAgeBoM18JyPRk/ITAJUvgyQv+cg0vpRMOho7iK8I0LEgrbcltBR +1pj8A5g4DHpkYAx1nfc5WWjKb5ONpRkFNPU+zv3L1DOWsi5p61ypQBcrixQPatA= +=QIOD -----END PGP SIGNATURE----- diff --git a/net-analyzer/munin/munin-2.0.2.ebuild b/net-analyzer/munin/munin-2.0.2.ebuild index 8e5c2b1ccd93..55c5155b2842 100644 --- a/net-analyzer/munin/munin-2.0.2.ebuild +++ b/net-analyzer/munin/munin-2.0.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.2.ebuild,v 1.4 2012/07/17 15:27:05 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.2.ebuild,v 1.5 2012/07/20 18:10:54 flameeyes Exp $ EAPI=4 @@ -44,6 +44,7 @@ DEPEND_COM="dev-lang/perl dev-perl/libwww-perl dev-perl/net-server dev-perl/DBI + dev-perl/Log-Log4perl virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 @@ -51,8 +52,7 @@ DEPEND_COM="dev-lang/perl virtual/perl-Text-Balanced virtual/perl-Time-HiRes !minimal? ( dev-perl/HTML-Template - >=net-analyzer/rrdtool-1.3[perl] - dev-perl/Log-Log4perl )" + >=net-analyzer/rrdtool-1.3[perl] )" # Keep this seperate, as previous versions have had other deps here DEPEND="${DEPEND_COM} @@ -121,9 +121,6 @@ src_install() { emake -j1 DESTDIR="${D}" ${install_targets} fowners munin:munin ${dirs} - # remove font files so that we don't have to keep them around - rm "${D}"/usr/libexec/${PN}/*.ttf || die - insinto /etc/munin/plugin-conf.d/ newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node @@ -141,6 +138,9 @@ src_install() { if ! use minimal; then exeinto /etc/local.d/ newexe "${FILESDIR}"/localstart-munin 50munin.start + + # remove font files so that we don't have to keep them around + rm "${D}"/usr/libexec/${PN}/*.ttf || die fi } |