diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2011-10-03 10:07:25 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2011-10-03 10:07:25 +0000 |
| commit | eadebfaadc9b2410ac398acbfd859b2338620bb0 (patch) | |
| tree | 1fee23b651d89e7ed0cb30bb784d95247f6c7028 /dev-vcs | |
| parent | The libpng15 patch imported from NetBSD is not compatible with libpng14 wrt #... (diff) | |
| download | gentoo-2-eadebfaadc9b2410ac398acbfd859b2338620bb0.tar.gz gentoo-2-eadebfaadc9b2410ac398acbfd859b2338620bb0.tar.bz2 gentoo-2-eadebfaadc9b2410ac398acbfd859b2338620bb0.zip | |
Update live ebuild to sync.
(Portage version: 2.2.0_alpha60/cvs/Linux x86_64)
Diffstat (limited to 'dev-vcs')
| -rw-r--r-- | dev-vcs/git/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-vcs/git/git-9999.ebuild | 25 |
2 files changed, 22 insertions, 8 deletions
diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog index 82040e5fea75..6933ed5f7d12 100644 --- 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/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild index 256a6bce0a2d..9730ca7292d0 100644 --- 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() { |