diff options
| author | Tomas Chvatal <scarabeus@gentoo.org> | 2011-04-07 14:51:47 +0200 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-04-07 14:51:47 +0200 |
| commit | 29fe0c2e54165b3bc7a86f207644e864f02b0cf7 (patch) | |
| tree | 9678f806c6665743117a74430a9f0984ddcc7192 | |
| parent | 5c68749c3f41d349e23d983b051d96275ca4eb74 (diff) | |
| download | kde-29fe0c2e54165b3bc7a86f207644e864f02b0cf7.tar.gz kde-29fe0c2e54165b3bc7a86f207644e864f02b0cf7.tar.bz2 kde-29fe0c2e54165b3bc7a86f207644e864f02b0cf7.zip | |
[eclasses] Merged in main tree so put back git-2 support.
| -rw-r--r-- | eclass/kde4-base.eclass | 5 | ||||
| -rw-r--r-- | eclass/kde4-meta.eclass | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index c56404c4c6a..73276072c10 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -25,7 +25,7 @@ inherit kde4-functions fdo-mime gnome2-utils base virtualx versionator eutils if [[ ${BUILD_TYPE} = live ]]; then case ${KDE_SCM} in svn) inherit subversion ;; - git) inherit git ;; + git) inherit git-2 ;; esac fi @@ -616,7 +616,6 @@ _calculate_live_repo() { ;; esac EGIT_REPO_URI="${EGIT_MIRROR}/${_kmname}" - EGIT_PROJECT="${_kmname}" debug-print "${FUNCNAME}: Repository: ${EGIT_REPO_URI}" debug-print "${FUNCNAME}: Branch: ${EGIT_BRANCH}" @@ -707,7 +706,7 @@ kde4-base_src_unpack() { subversion_src_unpack ;; git) - git_src_unpack + git-2_src_unpack ;; esac else diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index 76b6bbe94e0..d59e4fdaae1 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -178,7 +178,7 @@ kde4-meta_src_unpack() { subversion_bootstrap ;; git) - git_src_unpack + git-2_src_unpack ;; esac fi |