| 1 |
robbat2 11/10/03 10:07:25 |
| 2 |
|
| 3 |
Modified: ChangeLog git-9999.ebuild |
| 4 |
Log: |
| 5 |
Update live ebuild to sync. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha60/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.101 dev-vcs/git/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?rev=1.101&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?rev=1.101&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?r1=1.100&r2=1.101 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v |
| 19 |
retrieving revision 1.100 |
| 20 |
retrieving revision 1.101 |
| 21 |
diff -p -w -b -B -u -u -r1.100 -r1.101 |
| 22 |
--- ChangeLog 1 Oct 2011 00:06:37 -0000 1.100 |
| 23 |
+++ ChangeLog 3 Oct 2011 10:07:25 -0000 1.101 |
| 24 |
@@ -1,6 +1,9 @@ |
| 25 |
# ChangeLog for dev-vcs/git |
| 26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.100 2011/10/01 00:06:37 robbat2 Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.101 2011/10/03 10:07:25 robbat2 Exp $ |
| 29 |
+ |
| 30 |
+ 03 Oct 2011; Robin H. Johnson <robbat2@g.o> git-9999.ebuild: |
| 31 |
+ Update live ebuild to sync. |
| 32 |
|
| 33 |
*git-1.7.7 (01 Oct 2011) |
| 34 |
*git-1.7.6.4 (01 Oct 2011) |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.24 dev-vcs/git/git-9999.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999.ebuild?rev=1.24&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999.ebuild?rev=1.24&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999.ebuild?r1=1.23&r2=1.24 |
| 43 |
|
| 44 |
Index: git-9999.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v |
| 47 |
retrieving revision 1.23 |
| 48 |
retrieving revision 1.24 |
| 49 |
diff -p -w -b -B -u -u -r1.23 -r1.24 |
| 50 |
--- git-9999.ebuild 19 Aug 2011 18:43:47 -0000 1.23 |
| 51 |
+++ git-9999.ebuild 3 Oct 2011 10:07:25 -0000 1.24 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2011 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.23 2011/08/19 18:43:47 darkside Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.24 2011/10/03 10:07:25 robbat2 Exp $ |
| 57 |
|
| 58 |
EAPI=3 |
| 59 |
|
| 60 |
@@ -21,9 +21,17 @@ DOC_VER=${MY_PV} |
| 61 |
DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" |
| 62 |
HOMEPAGE="http://www.git-scm.com/" |
| 63 |
if [[ ${PV} != *9999 ]]; then |
| 64 |
- SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2 |
| 65 |
- mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2 |
| 66 |
- doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )" |
| 67 |
+ SRC_URI_SUFFIX="gz" |
| 68 |
+ SRC_URI_GOOG="http://git-core.googlecode.com/files" |
| 69 |
+ SRC_URI_KORG="mirror://kernel/software/scm/git" |
| 70 |
+ SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} |
| 71 |
+ ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} |
| 72 |
+ ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
| 73 |
+ ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
| 74 |
+ doc? ( |
| 75 |
+ ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
| 76 |
+ ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
| 77 |
+ )" |
| 78 |
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" |
| 79 |
else |
| 80 |
SRC_URI="" |
| 81 |
@@ -179,12 +187,12 @@ exportmakeopts() { |
| 82 |
|
| 83 |
src_unpack() { |
| 84 |
if [[ ${PV} != *9999 ]]; then |
| 85 |
- unpack ${MY_P}.tar.bz2 |
| 86 |
+ unpack ${MY_P}.tar.${SRC_URI_SUFFIX} |
| 87 |
cd "${S}" |
| 88 |
- unpack ${PN}-manpages-${DOC_VER}.tar.bz2 |
| 89 |
+ unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
| 90 |
use doc && \ |
| 91 |
cd "${S}"/Documentation && \ |
| 92 |
- unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2 |
| 93 |
+ unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
| 94 |
cd "${S}" |
| 95 |
else |
| 96 |
git-2_src_unpack |
| 97 |
@@ -246,6 +254,9 @@ src_prepare() { |
| 98 |
|
| 99 |
# merged upstream |
| 100 |
#epatch "${FILESDIR}"/git-1.7.5-interix.patch |
| 101 |
+ |
| 102 |
+ # merged upstream |
| 103 |
+ #epatch "${FILESDIR}"/git-1.7.6-interix.patch |
| 104 |
} |
| 105 |
|
| 106 |
git_emake() { |
Archives