commit: d8fca7989594be6a65c47ea8afee3970abd7f3e5
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 15 06:40:11 2017 +0000
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sun Oct 15 06:40:41 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8fca798
net-analyzer/munin: avoid git issues when determining version, bug 632320
Package-Manager: Portage-2.3.8, Repoman-2.3.3
net-analyzer/munin/files/munin-2.0.33-nogitversion.patch | 11 +++++++++++
net-analyzer/munin/munin-2.0.33-r1.ebuild | 1 +
2 files changed, 12 insertions(+)
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
