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 | c136fafac115db300a66af6791199b9404642ec0 (patch) | |
| tree | 157b4155e5d18f2e84aadabd8a909f73fc8ae090 /net-analyzer | |
| parent | Marked ~x64-macos (diff) | |
| download | gentoo-2-c136fafac115db300a66af6791199b9404642ec0.tar.gz gentoo-2-c136fafac115db300a66af6791199b9404642ec0.tar.bz2 gentoo-2-c136fafac115db300a66af6791199b9404642ec0.zip | |
Fix git diff problem.
(Portage version: 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/munin-2.0.3.ebuild | 9 |
2 files changed, 12 insertions, 2 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/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() { |