Gentoo Archives: gentoo-commits

From: "Manuel Rüger" <mrueg@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/helm/
Date: Wed, 06 Dec 2017 18:46:59
Message-Id: 1512585949.624da001655204bafa64b163cdd463a071b81e6f.mrueg@gentoo
1 commit: 624da001655204bafa64b163cdd463a071b81e6f
2 Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
3 AuthorDate: Tue Dec 5 14:11:10 2017 +0000
4 Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 6 18:45:49 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=624da001
7
8 app-admin/helm: Fix version
9
10 Package-Manager: Portage-2.3.16, Repoman-2.3.6
11
12 app-admin/helm/helm-2.7.2-r1.ebuild | 2 +-
13 app-admin/helm/{helm-2.7.2-r1.ebuild => helm-2.7.2-r2.ebuild} | 4 ++--
14 2 files changed, 3 insertions(+), 3 deletions(-)
15
16 diff --git a/app-admin/helm/helm-2.7.2-r1.ebuild b/app-admin/helm/helm-2.7.2-r1.ebuild
17 index 362b7d6e042..e6a028c65a6 100644
18 --- a/app-admin/helm/helm-2.7.2-r1.ebuild
19 +++ b/app-admin/helm/helm-2.7.2-r1.ebuild
20 @@ -117,7 +117,7 @@ src_prepare() {
21 default
22 sed -i -e "s/git rev-parse HEAD/echo ${GIT_COMMIT}/"\
23 -e "s/git rev-parse --short HEAD/echo ${GIT_COMMIT:0:7}/"\
24 - -e "s#git describe --tags --abbrev=0 --exact-match 2>/dev/null#echo ${PV}#"\
25 + -e "s#git describe --tags --abbrev=0 --exact-match 2>/dev/null#echo v${PV}#"\
26 -e 's/test -n "`git status --porcelain`" && echo "dirty" ||//' src/${EGO_PN}/versioning.mk || die
27
28 rm -rf src/${EGO_PN}/vendor/*/*/vendor src/${EGO_PN}/vendor/*/*/*/vendor || die
29
30 diff --git a/app-admin/helm/helm-2.7.2-r1.ebuild b/app-admin/helm/helm-2.7.2-r2.ebuild
31 similarity index 99%
32 copy from app-admin/helm/helm-2.7.2-r1.ebuild
33 copy to app-admin/helm/helm-2.7.2-r2.ebuild
34 index 362b7d6e042..d846bcdf781 100644
35 --- a/app-admin/helm/helm-2.7.2-r1.ebuild
36 +++ b/app-admin/helm/helm-2.7.2-r2.ebuild
37 @@ -117,7 +117,7 @@ src_prepare() {
38 default
39 sed -i -e "s/git rev-parse HEAD/echo ${GIT_COMMIT}/"\
40 -e "s/git rev-parse --short HEAD/echo ${GIT_COMMIT:0:7}/"\
41 - -e "s#git describe --tags --abbrev=0 --exact-match 2>/dev/null#echo ${PV}#"\
42 + -e "s#git describe --tags --abbrev=0 --exact-match 2>/dev/null#echo v${PV}#"\
43 -e 's/test -n "`git status --porcelain`" && echo "dirty" ||//' src/${EGO_PN}/versioning.mk || die
44
45 rm -rf src/${EGO_PN}/vendor/*/*/vendor src/${EGO_PN}/vendor/*/*/*/vendor || die
46 @@ -139,6 +139,6 @@ src_install() {
47 insinto /usr/share/zsh/site-functions
48 newins ${PN}.zsh _${PN}
49
50 - dobin bin/${PN}
51 + dobin bin/${PN} bin/tiller
52 dodoc src/${EGO_PN}/README.md
53 }