summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2013-10-13 19:19:49 +0200
committerJohannes Huber <johu@gentoo.org>2013-10-13 19:19:49 +0200
commit8190332378f11c56a4816eed98a34dd8677c32a5 (patch)
tree4f9dcbc60ebe0816c612e28b3318146e246b1375
parentdfea954287bfc18493a8e943c48a1711b2ad66bb (diff)
downloadkde-8190332378f11c56a4816eed98a34dd8677c32a5.tar.gz
kde-8190332378f11c56a4816eed98a34dd8677c32a5.tar.bz2
kde-8190332378f11c56a4816eed98a34dd8677c32a5.zip
[eclass] Move to git-r3 eclass.
-rw-r--r--eclass/kde4-base.eclass6
-rw-r--r--eclass/kde4-meta.eclass2
2 files changed, 4 insertions, 4 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index c43a1d9bca1..676b00b8040 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -39,7 +39,7 @@ inherit kde4-functions toolchain-funcs fdo-mime flag-o-matic gnome2-utils base v
if [[ ${KDE_BUILD_TYPE} = live ]]; then
case ${KDE_SCM} in
svn) inherit subversion ;;
- git) inherit git-2 ;;
+ git) inherit git-r3 ;;
esac
fi
@@ -548,7 +548,7 @@ _calculate_live_repo() {
EGIT_BRANCH="KDE/$(get_kde_version)"
# default repo uri
- EGIT_REPO_URI="${EGIT_MIRROR}/${_kmname}"
+ EGIT_REPO_URI+=( "${EGIT_MIRROR}/${_kmname}" )
debug-print "${FUNCNAME}: Repository: ${EGIT_REPO_URI}"
debug-print "${FUNCNAME}: Branch: ${EGIT_BRANCH}"
@@ -616,7 +616,7 @@ kde4-base_src_unpack() {
subversion_src_unpack
;;
git)
- git-2_src_unpack
+ git-r3_src_unpack
;;
esac
else
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
index 8fffd9cb0a0..98df86ed0e5 100644
--- a/eclass/kde4-meta.eclass
+++ b/eclass/kde4-meta.eclass
@@ -130,7 +130,7 @@ kde4-meta_src_unpack() {
subversion_bootstrap
;;
git)
- git-2_src_unpack
+ git-r3_src_unpack
;;
esac
fi