| 1 |
commit: d8fca7989594be6a65c47ea8afee3970abd7f3e5 |
| 2 |
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 15 06:40:11 2017 +0000 |
| 4 |
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 15 06:40:41 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8fca798 |
| 7 |
|
| 8 |
net-analyzer/munin: avoid git issues when determining version, bug 632320 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.8, Repoman-2.3.3 |
| 11 |
|
| 12 |
net-analyzer/munin/files/munin-2.0.33-nogitversion.patch | 11 +++++++++++ |
| 13 |
net-analyzer/munin/munin-2.0.33-r1.ebuild | 1 + |
| 14 |
2 files changed, 12 insertions(+) |
| 15 |
|
| 16 |
diff --git a/net-analyzer/munin/files/munin-2.0.33-nogitversion.patch b/net-analyzer/munin/files/munin-2.0.33-nogitversion.patch |
| 17 |
new file mode 100644 |
| 18 |
index 00000000000..6cf33538bde |
| 19 |
--- /dev/null |
| 20 |
+++ b/net-analyzer/munin/files/munin-2.0.33-nogitversion.patch |
| 21 |
@@ -0,0 +1,11 @@ |
| 22 |
+--- munin-2.0.33/getversion |
| 23 |
++++ munin-2.0.33/getversion |
| 24 |
+@@ -54,8 +54,6 @@ |
| 25 |
+ |
| 26 |
+ if [ -s "RELEASE" ]; then |
| 27 |
+ cat RELEASE |
| 28 |
+-elif [ "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ]; then |
| 29 |
+- generate_version_string |
| 30 |
+ elif [ ! -z "$(generate_version_string_from_dir)" ]; then |
| 31 |
+ generate_version_string_from_dir |
| 32 |
+ else |
| 33 |
|
| 34 |
diff --git a/net-analyzer/munin/munin-2.0.33-r1.ebuild b/net-analyzer/munin/munin-2.0.33-r1.ebuild |
| 35 |
index 3c604180b37..afbdb4122d8 100644 |
| 36 |
--- a/net-analyzer/munin/munin-2.0.33-r1.ebuild |
| 37 |
+++ b/net-analyzer/munin/munin-2.0.33-r1.ebuild |
| 38 |
@@ -118,6 +118,7 @@ pkg_setup() { |
| 39 |
src_prepare() { |
| 40 |
epatch "${WORKDIR}"/patches/*.patch |
| 41 |
eapply "${FILESDIR}/${P}"-perl526.patch |
| 42 |
+ eapply "${FILESDIR}/${P}"-nogitversion.patch |
| 43 |
|
| 44 |
eapply_user |
Archives