Gentoo Archives: gentoo-commits

From: "Manuel Rüger" <mrueg@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/mrueg:master commit in: eclass/
Date: Thu, 25 Jun 2015 11:11:50
Message-Id: 1435230692.202de9fb1cc8e89aa8f98c6752c405f3d398d67e.mrueg@gentoo
1 commit: 202de9fb1cc8e89aa8f98c6752c405f3d398d67e
2 Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jun 25 11:11:32 2015 +0000
4 Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 25 11:11:32 2015 +0000
6 URL: https://gitweb.gentoo.org/dev/mrueg.git/commit/?id=202de9fb
7
8 [eclass] Use tabs.
9
10 eclass/github.eclass | 20 +++++++++++---------
11 1 file changed, 11 insertions(+), 9 deletions(-)
12
13 diff --git a/eclass/github.eclass b/eclass/github.eclass
14 index f2ff0c0..7b83a99 100644
15 --- a/eclass/github.eclass
16 +++ b/eclass/github.eclass
17 @@ -78,12 +78,12 @@ EXPORT_FUNCTIONS src_prepare src_unpack
18 # If patches are fetched, calculate their location
19 _calculate_patches_uri() {
20 if [[ -n $GH_PATCHES ]]; then
21 - _GH_PATCHES=
22 - for gh_commit in "${GH_PATCHES[@]}"; do
23 - SRC_URI+=" https://github.com/${GH_USER}/${GH_REPO}/commit/${gh_commit}.patch -> ${PN}-${gh_commit}.patch"
24 - _GH_PATCHES+=( "${DISTDIR}"/${PN}-${gh_commit}.patch )
25 - done
26 - fi
27 + GH_PATCHES=
28 + for gh_commit in "${GH_PATCHES[@]}"; do
29 + SRC_URI+=" https://github.com/${GH_USER}/${GH_REPO}/commit/${gh_commit}.patch -> ${PN}-${gh_commit}.patch"
30 + _GH_PATCHES+=( "${DISTDIR}"/${PN}-${gh_commit}.patch )
31 + done
32 + fi
33 }
34
35
36 @@ -134,9 +134,11 @@ github_src_unpack() {
37 # @DESCRIPTION:
38 # Function for applying patches to Github packages.
39 github_src_prepare() {
40 - [[ $_GH_PATCHES ]] && epatch "${_GH_PATCHES[@]}"
41 - epatch_user
42 - default
43 + debug-print-function ${FUNCNAME} "$@"
44 +
45 + [[ $_GH_PATCHES ]] && epatch "${_GH_PATCHES[@]}"
46 + epatch_user
47 + default
48 }
49
50 fi