diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2012-07-26 20:10:10 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2012-07-26 20:10:10 +0000 |
| commit | b79f7100a1c5e254ef1f0f67dc85db71ff409687 (patch) | |
| tree | df0b191f7b596e125c9b147ac71494eefbf9cad7 /net-analyzer | |
| parent | Marked ~x64-macos (diff) | |
| download | historical-b79f7100a1c5e254ef1f0f67dc85db71ff409687.tar.gz historical-b79f7100a1c5e254ef1f0f67dc85db71ff409687.tar.bz2 historical-b79f7100a1c5e254ef1f0f67dc85db71ff409687.zip | |
Fix git diff problem.
Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64
Diffstat (limited to 'net-analyzer')
| -rw-r--r-- | net-analyzer/munin/ChangeLog | 5 | ||||
| -rw-r--r-- | net-analyzer/munin/Manifest | 18 | ||||
| -rw-r--r-- | net-analyzer/munin/munin-2.0.3.ebuild | 9 |
3 files changed, 21 insertions, 11 deletions
diff --git a/net-analyzer/munin/ChangeLog b/net-analyzer/munin/ChangeLog index f8dbe5ce3bd5..109fec45abb6 100644 --- a/net-analyzer/munin/ChangeLog +++ b/net-analyzer/munin/ChangeLog @@ -1,6 +1,9 @@ # 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.83 2012/07/26 18:21:51 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.84 2012/07/26 20:10:10 flameeyes Exp $ + + 26 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org> munin-2.0.3.ebuild: + Fix git diff problem. 26 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org> files/munin-1.3.2-plugins.conf, metadata.xml, munin-2.0.3.ebuild: diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest index a303e1b453ae..629a7b8bce03 100644 --- a/net-analyzer/munin/Manifest +++ b/net-analyzer/munin/Manifest @@ -22,17 +22,17 @@ DIST munin-2.0.3-patches-4.tar.xz 5376 SHA256 fdbf38d25234ea551d50961d4a7d1c3748 DIST munin-2.0.3.tar.gz 1318352 SHA256 ed22871f03a3c65b8a0324af686fddaac8cc94a95a959e753ef211752429e7db SHA512 ea182846ff5399c22e625b2bb021507138ce97d460edc499ca4322a132a9ac25dacb5b142766a54eb569f73f77d0ca6b12a088986729d548f89f812ec3c12ab1 WHIRLPOOL 9dbb442b332de495f8876d7f7a4ec81cd55e6cf7bb3e0509904d4c96d5334e0362cc98e4e253633d8e7b29197168cd237578fbd0dbe9f43548c5c1230cf895cc EBUILD munin-1.4.6-r4.ebuild 5033 SHA256 032e77091eb5e3776b79fd6857965ae8de3050b8fae6622bd311cc073b9882a9 SHA512 aa041a841d3e86686e4cb2137ce1237ac9d656f67ff4d97a75651345392ca5566b5ca46dd2d76d54a8228c5c4634d1a1205da3f7458598b337cdeb0af62d09f3 WHIRLPOOL 4118ebdff6f61ce32d1d273d71125cb71e994eceb78c8fd89987aa0bba8906d1c825fd03721d84ac61930758a401353f788b069f739a54c44888c1876aba6e2d EBUILD munin-1.4.7-r2.ebuild 5641 SHA256 95617a67832cb43f739112e95656476ff3d6822ceffd6ba15315237e7355fe20 SHA512 3c943a4d2dc46f69b4cd78919ab3285619d6ea16270e1a053b1f47551f8a0a175693e53a6877d74926715ac7a627a1572e7e0c12dc7bb59feec944f1edaf16e7 WHIRLPOOL 68599e60247d47310a7a1dacd7d474d241f31d8bc80a8c35f4383d3a19df48cc68938cf702a9033131516e2382df1c697f3a92f0794d2f3806463cbf26d576ef -EBUILD munin-2.0.3.ebuild 7195 SHA256 8439deec6c136e9d47ad769a06f2221be560f20cc427634f7f504a5e7c84b4cb SHA512 dc9c9e5439f54da942210a0a1ac457991db539a6523021bf3fb2e757c6243ad1fa1d5a1133b412da061ff4913218096741fde9cae896a4db9c57105bfaac9253 WHIRLPOOL 322ec54a520c469aa5ad0fb82b1d5a82e95cc5a9ef6466169ddaa9dec94cf55c9c8635adada9e9274ae1e3de82a54a2fc53ec8accc60901bdb19c5894f7f5e9b -MISC ChangeLog 17841 SHA256 0133b6291ae3abbc65ca5b50fb701b77d982eed67364cb113329942e1702f8ab SHA512 bb156d0f1b18da4269089ace797cb7324fb9cc11794037a723313aeac7e1fb2eb100103e30ad1ac733c679e1aae662477a4111de31de3fb9bf0015cf7106d674 WHIRLPOOL d80a74cfd10cf45a52118ca3444622059356a5401302679a975f9c5fae2c4ff73f2d36ab944bb854ca4469c777d5424af55e9a524c286383d2638f46d68892ac +EBUILD munin-2.0.3.ebuild 7316 SHA256 d94d14f4af70e4caa42ece85ae68051ba4427dce017ea0eac69f7809b5ff35a1 SHA512 c89c7f5339dfbb73c0f88e95ecf972596fcd142bc18e9aa6899301071a1afc887035f840d86ce17839b4cde26fc4a95d8483a534a222356f74305ee607a44075 WHIRLPOOL 405bb1fa54a7c870c4531a0eb0078e1cf04959284ad2dd095f0367635f256ca070be5231f2bf6f4844c4734f6ab7120d3a39119a5e68e34f5c4438dea0d89d24 +MISC ChangeLog 17942 SHA256 e89b55f200e6f53a364824d697a759dcc770bdd499188ad6139152b40c6387d1 SHA512 a3a215e9d972f7d7d8a127598c3145c6072e14eb877ace3de0fec64e3b89c7055449915c06984107112c3a251b437097a13736660972af60c8ff0a08a8cb44a5 WHIRLPOOL affe4fff442da2d369894cbed47d2278492db5b6392e473d4befdce2d2ca74f5c7c0b5e7b3ad0605dcf7648a472c3840f45a837a8f5ad233b692f4a66468ef86 MISC metadata.xml 3071 SHA256 edc641bb61c556b62ad3876ce9809d32e725241ae870d56f7f49c8376c58aaee SHA512 7d070dd1bdef58cfe3e84be58372f81d81abc216fba33c29881cb05fa7d99bf147193458f755ed895b4da4f5086f439aff56cadf6d7caf67c882c339551b5a06 WHIRLPOOL 12532fb52741cb669addb4572a359266f6c465a949889839d572206ecc0988425c856565491154453b1f17570acb3c8d2b78b26134fc244e191c54c51659190e -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBCAAGBQJQEYrJAAoJEBzRPIrUMBNCe7oH/3OBBhwjNs8N5vlMFRQcgLt+ -8JF51AFXxXRtLqnHv2/K553bqoFW3+hTT3/8775fC+t3Ct5N/Svuq//rCpPZHNFc -BuG5NL02RJLwH3YgLs5K3bIywhWIgOFJgKcMcBJ/GWIBJkwVLGvEtcxczHwpmGcc -jVJtjTfb0+wDrZcIPj5uNCpXRqvKlJWIxDVfsFPB7agGuNDG3dBM62KejJLGpcQe -78w5BirARQyA8uIk+GCQFwig0ifPcxgXVmePG14Z7otpsKsb0aTeQkVKVwA3tNGS -iO2zHinpLU/deh2KFnY5uTcXF1/SlqNsLWzFnEZWOooTTTJeVHVPcJiZj/jlZsI= -=eCi0 +iQEcBAEBCAAGBQJQEaRIAAoJEBzRPIrUMBNCNxMH/2OQBn5+kgZdgw961hdW2pfa +RE6PL/zcnvp5EHzBMvqRDbBWuxy0AcFIwFFTYBPMQUN0GAZ+LJawM2eha61RIQWC +j0h6HqrZVFoy1tZrhvHs39wxY/bqozfwr8pyI/m5Qhb2SEr1efdZDvJAivUW7l1B +d7euHBISbzjXBaTeHIYrYTkUts8osXWC+bj6LRMTXOhKVmHL0gUQ0VgFcCHUtbQy +WnlsDpXU2cNDadWKblGbgsmfr9noCL4DQe7L6Nx79EPhtdTx8HVfQzfJ8V45XnWm +P3Nxz6jI2F9NDsnGC7/TZeWISa9Qr4DaZnHQllR8vTLGBRQPxouB//Y7GuyhZe0= +=Eh0x -----END PGP SIGNATURE----- diff --git a/net-analyzer/munin/munin-2.0.3.ebuild b/net-analyzer/munin/munin-2.0.3.ebuild index 8ddd3ece7ad0..5b41e306d604 100644 --- a/net-analyzer/munin/munin-2.0.3.ebuild +++ b/net-analyzer/munin/munin-2.0.3.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.3.ebuild,v 1.3 2012/07/26 18:21:51 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.3.ebuild,v 1.4 2012/07/26 20:10:10 flameeyes Exp $ EAPI=4 @@ -93,7 +93,14 @@ pkg_setup() { src_prepare() { epatch "${WORKDIR}"/patches/*.patch + java-pkg-opt-2_src_prepare + + # this is to work around git diff output + if [[ -d b ]]; then + cd b + find . -type f -exec mv {} ../{} \; || die + fi } src_configure() { |