[gentoo-commits] repo/gentoo:master commit in: eclass/

[William Hubbs]

commit:     6ff408b16ab3618f55579d56c78c550f0d8da3ed
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  9 17:04:36 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 20:12:35 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ff408b1

golang-vcs.eclass: remove EGO_SRC variable

This is not needed because it can be referred to as ${EGO_PN%/...}.

 eclass/golang-vcs.eclass | 24 +++---------------------
 1 file changed, 3 insertions(+), 21 deletions(-)

diff --git a/eclass/golang-vcs.eclass b/eclass/golang-vcs.eclass
index 2fe3a84..baf3adf 100644
--- a/eclass/golang-vcs.eclass
+++ b/eclass/golang-vcs.eclass
@@ -38,20 +38,6 @@ _GOLANG_VCS=1
 # EGO_PN="github.com/user1/package1 github.com/user2/package2"
 # @CODE
 
-# @ECLASS-VARIABLE: EGO_SRC
-# @DESCRIPTION:
-# This is the Go upstream repository which will be copied to
-# ${WORKDIR}/${P}.
-# If it isn't set, it defaults to the first word of ${EGO_PN}.
-# This should be set if you are retrieving a repository that includes
-# multiple packages, e.g. golang.org/x/tools.
-#
-# Example:
-# @CODE
-# EGO_PN="github.com/user/repository/..."
-# EGO_SRC="github.com/user/repository"
-# @CODE
-
 # @ECLASS-VARIABLE: EGO_STORE_DIR
 # @DESCRIPTION:
 # Storage directory for Go sources.
@@ -98,10 +84,6 @@ _golang-vcs_env_setup() {
        [[ -n ${EVCS_UMASK} ]] && eumask_pop
        mkdir -p "${WORKDIR}/${P}/src" ||
                die "${ECLASS}: unable to create ${WORKDIR}/${P}"
-       if [ -z "${EGO_SRC}" ]; then
-               set -- ${EGO_PN}
-               EGO_SRC="$1"
-       fi
        return 0
 }
 
@@ -127,11 +109,11 @@ _golang-vcs_fetch() {
 
                [[ -n ${EVCS_UMASK} ]] && eumask_pop
        fi
-       set -- mkdir -p "${WORKDIR}/${P}/src/${EGO_SRC%/*}"
+       set -- mkdir -p "${WORKDIR}/${P}/src/${EGO_PN%/...}"
        echo "$@"
        "$@" || die "Unable to create ${WORKDIR}/${P}/src"
-       set -- cp -r    "${EGO_STORE_DIR}/src/${EGO_SRC}" \
-               "${WORKDIR}/${P}/src/${EGO_SRC%/*}"
+       set -- cp -r    "${EGO_STORE_DIR}/src/${EGO_PN%/...}" \
+               "${WORKDIR}/${P}/src/${EGO_PN%/...}"
        echo "$@"
        "$@" || die "Unable to copy sources to ${WORKDIR}/${P}"
        return 0