diff options
| author | Hans de Graaff <graaff@gentoo.org> | 2017-10-15 08:40:11 +0200 |
|---|---|---|
| committer | Hans de Graaff <graaff@gentoo.org> | 2017-10-15 08:40:41 +0200 |
| commit | d8fca7989594be6a65c47ea8afee3970abd7f3e5 (patch) | |
| tree | 6c60bfc5a8e36ab171685bcb136d33115b92b2b0 /net-analyzer/munin | |
| parent | f9c4785a2c90f6087bb5158f98409de89f411bcf (diff) | |
| download | gentoo-d8fca7989594be6a65c47ea8afee3970abd7f3e5.tar.gz gentoo-d8fca7989594be6a65c47ea8afee3970abd7f3e5.tar.xz | |
net-analyzer/munin: avoid git issues when determining version, bug 632320
Package-Manager: Portage-2.3.8, Repoman-2.3.3
Diffstat (limited to 'net-analyzer/munin')
| -rw-r--r-- | net-analyzer/munin/files/munin-2.0.33-nogitversion.patch | 11 | ||||
| -rw-r--r-- | net-analyzer/munin/munin-2.0.33-r1.ebuild | 1 |
2 files changed, 12 insertions, 0 deletions
diff --git a/net-analyzer/munin/files/munin-2.0.33-nogitversion.patch b/net-analyzer/munin/files/munin-2.0.33-nogitversion.patch new file mode 100644 index 00000000000..6cf33538bde --- /dev/null +++ b/net-analyzer/munin/files/munin-2.0.33-nogitversion.patch @@ -0,0 +1,11 @@ +--- munin-2.0.33/getversion ++++ munin-2.0.33/getversion +@@ -54,8 +54,6 @@ + + if [ -s "RELEASE" ]; then + cat RELEASE +-elif [ "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ]; then +- generate_version_string + elif [ ! -z "$(generate_version_string_from_dir)" ]; then + generate_version_string_from_dir + else diff --git a/net-analyzer/munin/munin-2.0.33-r1.ebuild b/net-analyzer/munin/munin-2.0.33-r1.ebuild index 3c604180b37..afbdb4122d8 100644 --- a/net-analyzer/munin/munin-2.0.33-r1.ebuild +++ b/net-analyzer/munin/munin-2.0.33-r1.ebuild @@ -118,6 +118,7 @@ pkg_setup() { src_prepare() { epatch "${WORKDIR}"/patches/*.patch eapply "${FILESDIR}/${P}"-perl526.patch + eapply "${FILESDIR}/${P}"-nogitversion.patch eapply_user |