commit:     2a10ad53d08011f6a09488f3355782a8d3edd1d0
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  5 23:45:31 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Nov  5 23:45:31 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a10ad53

dev-vcs/git: drop remaining googlecode mirrors, bump livevcs patches

Package-Manager: portage-2.3.2

 dev-vcs/git/git-2.10.1.ebuild   | 8 ++------
 dev-vcs/git/git-2.10.2.ebuild   | 8 ++------
 dev-vcs/git/git-2.4.11.ebuild   | 6 +-----
 dev-vcs/git/git-2.5.5.ebuild    | 6 +-----
 dev-vcs/git/git-2.6.6.ebuild    | 6 +-----
 dev-vcs/git/git-2.7.3-r1.ebuild | 6 +-----
 dev-vcs/git/git-2.7.4.ebuild    | 6 +-----
 dev-vcs/git/git-2.8.4.ebuild    | 8 ++------
 dev-vcs/git/git-2.9.3.ebuild    | 8 ++------
 dev-vcs/git/git-9999-r1.ebuild  | 8 ++------
 dev-vcs/git/git-9999-r2.ebuild  | 8 ++------
 dev-vcs/git/git-9999-r3.ebuild  | 8 ++------
 dev-vcs/git/git-9999.ebuild     | 8 ++------
 13 files changed, 21 insertions(+), 73 deletions(-)

diff --git a/dev-vcs/git/git-2.10.1.ebuild b/dev-vcs/git/git-2.10.1.ebuild
index 2d9fd8a..da2cc39 100644
--- a/dev-vcs/git/git-2.10.1.ebuild
+++ b/dev-vcs/git/git-2.10.1.ebuild
@@ -17,7 +17,7 @@ PYTHON_COMPAT=( python2_7 )
 # 9999-r2: next
 # 9999-r3: pu
 EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-EGIT_BRANCH=pu
+EGIT_BRANCH=maint
 PLOCALES="bg ca de fr is it ko pt_PT ru sv vi zh_CN"
 
 inherit toolchain-funcs eutils elisp-common l10n perl-module 
bash-completion-r1 python-single-r1 systemd ${SCM}
@@ -31,15 +31,11 @@ DESCRIPTION="stupid content tracker: distributed VCS 
designed for speed and effi
 HOMEPAGE="http://www.git-scm.com/";
 if [[ ${PV} != *9999 ]]; then
        SRC_URI_SUFFIX="xz"
-       SRC_URI_GOOG="https://git-core.googlecode.com/files";
        SRC_URI_KORG="mirror://kernel/software/scm/git"
-       SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-                       ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-                       
${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+       SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
                        
${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
                        doc? (
                        
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-                       
${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
                        )"
        KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd 
~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
 fi

diff --git a/dev-vcs/git/git-2.10.2.ebuild b/dev-vcs/git/git-2.10.2.ebuild
index 2d9fd8a..da2cc39 100644
--- a/dev-vcs/git/git-2.10.2.ebuild
+++ b/dev-vcs/git/git-2.10.2.ebuild
@@ -17,7 +17,7 @@ PYTHON_COMPAT=( python2_7 )
 # 9999-r2: next
 # 9999-r3: pu
 EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-EGIT_BRANCH=pu
+EGIT_BRANCH=maint
 PLOCALES="bg ca de fr is it ko pt_PT ru sv vi zh_CN"
 
 inherit toolchain-funcs eutils elisp-common l10n perl-module 
bash-completion-r1 python-single-r1 systemd ${SCM}
@@ -31,15 +31,11 @@ DESCRIPTION="stupid content tracker: distributed VCS 
designed for speed and effi
 HOMEPAGE="http://www.git-scm.com/";
 if [[ ${PV} != *9999 ]]; then
        SRC_URI_SUFFIX="xz"
-       SRC_URI_GOOG="https://git-core.googlecode.com/files";
        SRC_URI_KORG="mirror://kernel/software/scm/git"
-       SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-                       ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-                       
${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+       SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
                        
${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
                        doc? (
                        
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-                       
${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
                        )"
        KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd 
~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
 fi

diff --git a/dev-vcs/git/git-2.4.11.ebuild b/dev-vcs/git/git-2.4.11.ebuild
index d91b9bb..4d1adaf 100644
--- a/dev-vcs/git/git-2.4.11.ebuild
+++ b/dev-vcs/git/git-2.4.11.ebuild
@@ -23,15 +23,11 @@ DESCRIPTION="stupid content tracker: distributed VCS 
designed for speed and effi
 HOMEPAGE="http://www.git-scm.com/";
 if [[ ${PV} != *9999 ]]; then
        SRC_URI_SUFFIX="xz"
-       SRC_URI_GOOG="https://git-core.googlecode.com/files";
        SRC_URI_KORG="mirror://kernel/software/scm/git"
-       SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-                       ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-                       
${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+       SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
                        
${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
                        doc? (
                        
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-                       
${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
                        )"
        KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd 
~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
 fi

diff --git a/dev-vcs/git/git-2.5.5.ebuild b/dev-vcs/git/git-2.5.5.ebuild
index 13d350c..0ddf8e8 100644
--- a/dev-vcs/git/git-2.5.5.ebuild
+++ b/dev-vcs/git/git-2.5.5.ebuild
@@ -23,15 +23,11 @@ DESCRIPTION="stupid content tracker: distributed VCS 
designed for speed and effi
 HOMEPAGE="http://www.git-scm.com/";
 if [[ ${PV} != *9999 ]]; then
        SRC_URI_SUFFIX="xz"
-       SRC_URI_GOOG="https://git-core.googlecode.com/files";
        SRC_URI_KORG="mirror://kernel/software/scm/git"
-       SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-                       ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-                       
${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+       SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
                        
${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
                        doc? (
                        
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-                       
${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
                        )"
        KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd 
~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
 fi

diff --git a/dev-vcs/git/git-2.6.6.ebuild b/dev-vcs/git/git-2.6.6.ebuild
index 13d350c..0ddf8e8 100644
--- a/dev-vcs/git/git-2.6.6.ebuild
+++ b/dev-vcs/git/git-2.6.6.ebuild
@@ -23,15 +23,11 @@ DESCRIPTION="stupid content tracker: distributed VCS 
designed for speed and effi
 HOMEPAGE="http://www.git-scm.com/";
 if [[ ${PV} != *9999 ]]; then
        SRC_URI_SUFFIX="xz"
-       SRC_URI_GOOG="https://git-core.googlecode.com/files";
        SRC_URI_KORG="mirror://kernel/software/scm/git"
-       SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-                       ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-                       
${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+       SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
                        
${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
                        doc? (
                        
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-                       
${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
                        )"
        KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd 
~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
 fi

diff --git a/dev-vcs/git/git-2.7.3-r1.ebuild b/dev-vcs/git/git-2.7.3-r1.ebuild
index df361e4..0da2067 100644
--- a/dev-vcs/git/git-2.7.3-r1.ebuild
+++ b/dev-vcs/git/git-2.7.3-r1.ebuild
@@ -23,16 +23,12 @@ DESCRIPTION="stupid content tracker: distributed VCS 
designed for speed and effi
 HOMEPAGE="http://www.git-scm.com/";
 if [[ ${PV} != *9999 ]]; then
        SRC_URI_SUFFIX="xz"
-       SRC_URI_GOOG="https://git-core.googlecode.com/files";
        SRC_URI_KORG="mirror://kernel/software/scm/git"
-       SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-                       ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-                       
${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+       SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
                        
${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
                        
https://dev.gentoo.org/~robbat2/distfiles/git-2.7.3-00-9831e92bfa833ee9c0ce464bbc2f941ae6c2698d-lose-name-path.patch
                        doc? (
                        
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-                       
${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
                        )"
        KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc 
x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd 
~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
 fi

diff --git a/dev-vcs/git/git-2.7.4.ebuild b/dev-vcs/git/git-2.7.4.ebuild
index 2f6bdeb..bca2787 100644
--- a/dev-vcs/git/git-2.7.4.ebuild
+++ b/dev-vcs/git/git-2.7.4.ebuild
@@ -24,15 +24,11 @@ DESCRIPTION="stupid content tracker: distributed VCS 
designed for speed and effi
 HOMEPAGE="http://www.git-scm.com/";
 if [[ ${PV} != *9999 ]]; then
        SRC_URI_SUFFIX="xz"
-       SRC_URI_GOOG="https://git-core.googlecode.com/files";
        SRC_URI_KORG="mirror://kernel/software/scm/git"
-       SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-                       ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-                       
${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+       SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
                        
${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
                        doc? (
                        
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-                       
${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
                        )"
        KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd 
~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
 fi

diff --git a/dev-vcs/git/git-2.8.4.ebuild b/dev-vcs/git/git-2.8.4.ebuild
index 95d95e7..ee440a3 100644
--- a/dev-vcs/git/git-2.8.4.ebuild
+++ b/dev-vcs/git/git-2.8.4.ebuild
@@ -17,7 +17,7 @@ PYTHON_COMPAT=( python2_7 )
 # 9999-r2: next
 # 9999-r3: pu
 EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-EGIT_BRANCH=pu
+EGIT_BRANCH=maint
 PLOCALES="bg ca de fr is it ko pt_PT ru sv vi zh_CN"
 
 inherit toolchain-funcs eutils elisp-common l10n perl-module 
bash-completion-r1 python-single-r1 systemd ${SCM}
@@ -31,15 +31,11 @@ DESCRIPTION="stupid content tracker: distributed VCS 
designed for speed and effi
 HOMEPAGE="http://www.git-scm.com/";
 if [[ ${PV} != *9999 ]]; then
        SRC_URI_SUFFIX="xz"
-       SRC_URI_GOOG="https://git-core.googlecode.com/files";
        SRC_URI_KORG="mirror://kernel/software/scm/git"
-       SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-                       ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-                       
${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+       SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
                        
${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
                        doc? (
                        
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-                       
${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
                        )"
        KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd 
~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
 fi

diff --git a/dev-vcs/git/git-2.9.3.ebuild b/dev-vcs/git/git-2.9.3.ebuild
index 95d95e7..ee440a3 100644
--- a/dev-vcs/git/git-2.9.3.ebuild
+++ b/dev-vcs/git/git-2.9.3.ebuild
@@ -17,7 +17,7 @@ PYTHON_COMPAT=( python2_7 )
 # 9999-r2: next
 # 9999-r3: pu
 EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-EGIT_BRANCH=pu
+EGIT_BRANCH=maint
 PLOCALES="bg ca de fr is it ko pt_PT ru sv vi zh_CN"
 
 inherit toolchain-funcs eutils elisp-common l10n perl-module 
bash-completion-r1 python-single-r1 systemd ${SCM}
@@ -31,15 +31,11 @@ DESCRIPTION="stupid content tracker: distributed VCS 
designed for speed and effi
 HOMEPAGE="http://www.git-scm.com/";
 if [[ ${PV} != *9999 ]]; then
        SRC_URI_SUFFIX="xz"
-       SRC_URI_GOOG="https://git-core.googlecode.com/files";
        SRC_URI_KORG="mirror://kernel/software/scm/git"
-       SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-                       ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-                       
${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+       SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
                        
${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
                        doc? (
                        
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-                       
${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
                        )"
        KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd 
~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
 fi

diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
index 18a9ee9..f14b54e 100644
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-9999-r1.ebuild
@@ -31,15 +31,11 @@ DESCRIPTION="stupid content tracker: distributed VCS 
designed for speed and effi
 HOMEPAGE="http://www.git-scm.com/";
 if [[ ${PV} != *9999 ]]; then
        SRC_URI_SUFFIX="xz"
-       SRC_URI_GOOG="https://git-core.googlecode.com/files";
        SRC_URI_KORG="mirror://kernel/software/scm/git"
-       SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-                       ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-                       
${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+       SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
                        
${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
                        doc? (
                        
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-                       
${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
                        )"
        KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd 
~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
 fi
@@ -120,7 +116,7 @@ REQUIRED_USE="
 
 PATCHES=(
        # bug #350330 - automagic CVS when we don't want it is bad.
-       "${FILESDIR}"/git-2.8.4-optional-cvs.patch
+       "${FILESDIR}"/git-2.10.0-optional-cvs.patch
 
        # install mediawiki perl modules also in vendor_dir
        # hack, needs better upstream solution

diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
index e28e6c6..b1d27c2 100644
--- a/dev-vcs/git/git-9999-r2.ebuild
+++ b/dev-vcs/git/git-9999-r2.ebuild
@@ -31,15 +31,11 @@ DESCRIPTION="stupid content tracker: distributed VCS 
designed for speed and effi
 HOMEPAGE="http://www.git-scm.com/";
 if [[ ${PV} != *9999 ]]; then
        SRC_URI_SUFFIX="xz"
-       SRC_URI_GOOG="https://git-core.googlecode.com/files";
        SRC_URI_KORG="mirror://kernel/software/scm/git"
-       SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-                       ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-                       
${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+       SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
                        
${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
                        doc? (
                        
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-                       
${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
                        )"
        KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd 
~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
 fi
@@ -120,7 +116,7 @@ REQUIRED_USE="
 
 PATCHES=(
        # bug #350330 - automagic CVS when we don't want it is bad.
-       "${FILESDIR}"/git-2.8.4-optional-cvs.patch
+       "${FILESDIR}"/git-2.10.0-optional-cvs.patch
 
        # install mediawiki perl modules also in vendor_dir
        # hack, needs better upstream solution

diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index 95d95e7..28b544f 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.ebuild
@@ -31,15 +31,11 @@ DESCRIPTION="stupid content tracker: distributed VCS 
designed for speed and effi
 HOMEPAGE="http://www.git-scm.com/";
 if [[ ${PV} != *9999 ]]; then
        SRC_URI_SUFFIX="xz"
-       SRC_URI_GOOG="https://git-core.googlecode.com/files";
        SRC_URI_KORG="mirror://kernel/software/scm/git"
-       SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-                       ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-                       
${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+       SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
                        
${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
                        doc? (
                        
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-                       
${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
                        )"
        KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd 
~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
 fi
@@ -120,7 +116,7 @@ REQUIRED_USE="
 
 PATCHES=(
        # bug #350330 - automagic CVS when we don't want it is bad.
-       "${FILESDIR}"/git-2.8.4-optional-cvs.patch
+       "${FILESDIR}"/git-2.10.0-optional-cvs.patch
 
        # install mediawiki perl modules also in vendor_dir
        # hack, needs better upstream solution

diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index 792b633..da2cc39 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -31,15 +31,11 @@ DESCRIPTION="stupid content tracker: distributed VCS 
designed for speed and effi
 HOMEPAGE="http://www.git-scm.com/";
 if [[ ${PV} != *9999 ]]; then
        SRC_URI_SUFFIX="xz"
-       SRC_URI_GOOG="https://git-core.googlecode.com/files";
        SRC_URI_KORG="mirror://kernel/software/scm/git"
-       SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-                       ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-                       
${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+       SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
                        
${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
                        doc? (
                        
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-                       
${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
                        )"
        KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd 
~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
 fi
@@ -120,7 +116,7 @@ REQUIRED_USE="
 
 PATCHES=(
        # bug #350330 - automagic CVS when we don't want it is bad.
-       "${FILESDIR}"/git-2.8.4-optional-cvs.patch
+       "${FILESDIR}"/git-2.10.0-optional-cvs.patch
 
        # install mediawiki perl modules also in vendor_dir
        # hack, needs better upstream solution

Reply via email to