Update live ebuild to sync.

Package-Manager: portage-2.2.0_alpha60/cvs/Linux x86_64

diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog
index 82040e5fea7562be126d9895890b82606d315c5d..6933ed5f7d12114b1ee196a3cf56ccfbaa2ea419 100644 (file)
--- a/dev-vcs/git/ChangeLog
+++ b/dev-vcs/git/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-vcs/git
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.100 2011/10/01 00:06:37 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.101 2011/10/03 10:07:25 robbat2 Exp $
+
+  03 Oct 2011; Robin H. Johnson <robbat2@gentoo.org> git-9999.ebuild:
+  Update live ebuild to sync.
 
 *git-1.7.7 (01 Oct 2011)
 *git-1.7.6.4 (01 Oct 2011)

diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 2a8bd7caa800b87d457baeef0fcf6d60cb8771c3..d1bf9ddb7ac2265799e6ef678e6c4789ce9f776b 100644 (file)
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -73,6 +73,6 @@ EBUILD git-1.7.6.1.ebuild 15021 RMD160 8c7d802ba29c106e972f86bd60784892e04f7a4b
 EBUILD git-1.7.6.4.ebuild 15368 RMD160 3275287346025a271d12c3886a08a50b64d0aaa0 SHA1 8b13544f371bb0f3fb080e1c127642853f550e5a SHA256 318ba9980b336deaa402de36ebb50b627cc3b5f194a1354931457329d1ddcc51
 EBUILD git-1.7.6.ebuild 15020 RMD160 4e697a7a87e2969d4cf1638e9d2b5d799681499d SHA1 872d5b71d75a7e450ae629754a250995700c6573 SHA256 3a379c664bbe1e9bdc6e6173bd273950f863770900fd7e8c9cc096f98e97854c
 EBUILD git-1.7.7.ebuild 15326 RMD160 5f39dfa80ccc9fda4d6703ab80a1d59f59d57fae SHA1 4ded9f027285f2120e3b5f21dcedf79609a84e3a SHA256 9b80650981329a3dde5f752657948e64a0f042e3742cd4f39dcc115994bceb24
-EBUILD git-9999.ebuild 14913 RMD160 fe9eda7fddd9a8d1fdd0f92cba882d1a1a4e1529 SHA1 5db2b371a1371230790a5c1cc143eababae466dd SHA256 f810f1831c6033fe4f3ea15b6b30576303c849660b397af528f6aefa8b6f28ed
-MISC ChangeLog 82457 RMD160 8e9e4be35ca8b03bbf27b139c2b98071240d095f SHA1 bb4c34bee99c82fc7964e6c9c3db043e9b1f42d7 SHA256 484c84eefa991c1b0e3484b13f4389d4cdf8dec72c736b66ff906d2a2783c196
+EBUILD git-9999.ebuild 15324 RMD160 b70884f8f2b30f935815110b44bb9ca62bff4767 SHA1 b6fa08878a584dd55a9a320d5f260c05afa771f4 SHA256 c83749c50de5095a50a078bd4b5f1e12f6208565b4b91015e8e02839df054a6b
+MISC ChangeLog 82558 RMD160 ee2a7decad7304a621386b8f9b9dc45a0d482d6c SHA1 43b6aa8a712d41e2515d9ff780551e41e99cd4fc SHA256 5d9c3c42dc1aebcc8120e28e4b99380067a5f96c2cc2ffa1e92575ea6050fe25
 MISC metadata.xml 1586 RMD160 9d5ed136d8274095b860efd8622d7588abf96a5d SHA1 5fc705007565c2f94199f3066450e2f842f1ab7e SHA256 c602ebf1a2248459aa27264cbbb51199da79faebe02574a461848c16b4254011

diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index 256a6bce0a2da480c7d6e8145df6638a2b30f925..9730ca7292d0f15612dca20110b9a6e86397acf8 100644 (file)
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.23 2011/08/19 18:43:47 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.24 2011/10/03 10:07:25 robbat2 Exp $
 
 EAPI=3
 
@@ -21,9 +21,17 @@ DOC_VER=${MY_PV}
 DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
 HOMEPAGE="http://www.git-scm.com/"
 if [[ ${PV} != *9999 ]]; then
-       SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2
-                       mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2
-                       doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )"
+       SRC_URI_SUFFIX="gz"
+       SRC_URI_GOOG="http://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_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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 else
        SRC_URI=""
@@ -179,12 +187,12 @@ exportmakeopts() {
 
 src_unpack() {
        if [[ ${PV} != *9999 ]]; then
-               unpack ${MY_P}.tar.bz2
+               unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
                cd "${S}"
-               unpack ${PN}-manpages-${DOC_VER}.tar.bz2
+               unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
                use doc && \
                        cd "${S}"/Documentation && \
-                       unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
+                       unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
                cd "${S}"
        else
                git-2_src_unpack
@@ -246,6 +254,9 @@ src_prepare() {
 
        # merged upstream
        #epatch "${FILESDIR}"/git-1.7.5-interix.patch
+
+       # merged upstream
+       #epatch "${FILESDIR}"/git-1.7.6-interix.patch
 }
 
 git_emake() {