net-analyzer/munin: avoid git issues when determining version, bug 63…

…2320 Package-Manager: Portage-2.3.8, Repoman-2.3.3
johu · Oct 15, 2017 · d8fca79 · d8fca79
1 parent f9c4785
commit d8fca79
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 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
@@ -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
@@ -118,6 +118,7 @@ pkg_setup() {
 src_prepare() {
 	epatch "${WORKDIR}"/patches/*.patch
 	eapply "${FILESDIR}/${P}"-perl526.patch
+	eapply "${FILESDIR}/${P}"-nogitversion.patch
 
 	eapply_user