| 1 |
robbat2 12/08/22 05:10:14 |
| 2 |
|
| 3 |
Modified: git-1.7.12.ebuild git-9999.ebuild |
| 4 |
git-1.7.12-r1.ebuild ChangeLog |
| 5 |
Log: |
| 6 |
~amd64-fbsd was not placed in all ebuilds. Also sync live ebuild. |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha121/cvs/Linux x86_64, RepoMan options: --force) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.2 dev-vcs/git/git-1.7.12.ebuild |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-1.7.12.ebuild?rev=1.2&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-1.7.12.ebuild?rev=1.2&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-1.7.12.ebuild?r1=1.1&r2=1.2 |
| 16 |
|
| 17 |
Index: git-1.7.12.ebuild |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.12.ebuild,v |
| 20 |
retrieving revision 1.1 |
| 21 |
retrieving revision 1.2 |
| 22 |
diff -p -w -b -B -u -u -r1.1 -r1.2 |
| 23 |
--- git-1.7.12.ebuild 22 Aug 2012 04:44:08 -0000 1.1 |
| 24 |
+++ git-1.7.12.ebuild 22 Aug 2012 05:10:14 -0000 1.2 |
| 25 |
@@ -1,6 +1,6 @@ |
| 26 |
# Copyright 1999-2012 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.12.ebuild,v 1.1 2012/08/22 04:44:08 robbat2 Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.12.ebuild,v 1.2 2012/08/22 05:10:14 robbat2 Exp $ |
| 30 |
|
| 31 |
EAPI=4 |
| 32 |
|
| 33 |
@@ -32,7 +32,7 @@ if [[ ${PV} != *9999 ]]; then |
| 34 |
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
| 35 |
${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
| 36 |
)" |
| 37 |
- 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" |
| 38 |
+ KEYWORDS="~alpha ~amd64 ~arm ~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 ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 39 |
else |
| 40 |
SRC_URI="" |
| 41 |
KEYWORDS="" |
| 42 |
|
| 43 |
|
| 44 |
|
| 45 |
1.35 dev-vcs/git/git-9999.ebuild |
| 46 |
|
| 47 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999.ebuild?rev=1.35&view=markup |
| 48 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999.ebuild?rev=1.35&content-type=text/plain |
| 49 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999.ebuild?r1=1.34&r2=1.35 |
| 50 |
|
| 51 |
Index: git-9999.ebuild |
| 52 |
=================================================================== |
| 53 |
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v |
| 54 |
retrieving revision 1.34 |
| 55 |
retrieving revision 1.35 |
| 56 |
diff -p -w -b -B -u -u -r1.34 -r1.35 |
| 57 |
--- git-9999.ebuild 14 Jun 2012 05:01:30 -0000 1.34 |
| 58 |
+++ git-9999.ebuild 22 Aug 2012 05:10:14 -0000 1.35 |
| 59 |
@@ -1,6 +1,6 @@ |
| 60 |
# Copyright 1999-2012 Gentoo Foundation |
| 61 |
# Distributed under the terms of the GNU General Public License v2 |
| 62 |
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.34 2012/06/14 05:01:30 vapier Exp $ |
| 63 |
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.35 2012/08/22 05:10:14 robbat2 Exp $ |
| 64 |
|
| 65 |
EAPI=4 |
| 66 |
|
| 67 |
@@ -32,7 +32,7 @@ if [[ ${PV} != *9999 ]]; then |
| 68 |
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
| 69 |
${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
| 70 |
)" |
| 71 |
- 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" |
| 72 |
+ KEYWORDS="~alpha ~amd64 ~arm ~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 ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 73 |
else |
| 74 |
SRC_URI="" |
| 75 |
KEYWORDS="" |
| 76 |
@@ -207,28 +207,12 @@ src_unpack() { |
| 77 |
} |
| 78 |
|
| 79 |
src_prepare() { |
| 80 |
- # Noperl is being merged to upstream as of 2009/04/05 |
| 81 |
- #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch |
| 82 |
- |
| 83 |
- # GetOpt-Long v2.38 is strict |
| 84 |
- # Merged in 1.6.3 final 2009/05/07 |
| 85 |
- #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch |
| 86 |
- |
| 87 |
- # JS install fixup |
| 88 |
- # Merged in 1.7.5.x |
| 89 |
- #epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch |
| 90 |
- |
| 91 |
- # Fix false positives with t3404 due to SHELL=/bin/false for the portage |
| 92 |
- # user. |
| 93 |
- # Merged upstream |
| 94 |
- #epatch "${FILESDIR}"/git-1.7.3.4-avoid-shell-issues.patch |
| 95 |
- |
| 96 |
- # bug #350075: t9001: fix missing prereq on some tests |
| 97 |
- # Merged upstream |
| 98 |
- #epatch "${FILESDIR}"/git-1.7.3.4-fix-perl-test-prereq.patch |
| 99 |
+ # bug #418431 - stated for upstream 1.7.13. Developed by Michael Schwern, |
| 100 |
+ # funded as a bounty by the Gentoo Foundation. |
| 101 |
+ epatch "${FILESDIR}"/git-1.7.12-git-svn-backport.patch |
| 102 |
|
| 103 |
# bug #350330 - automagic CVS when we don't want it is bad. |
| 104 |
- epatch "${FILESDIR}"/git-1.7.11-optional-cvs.patch |
| 105 |
+ epatch "${FILESDIR}"/git-1.7.12-optional-cvs.patch |
| 106 |
|
| 107 |
sed -i \ |
| 108 |
-e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \ |
| 109 |
@@ -247,36 +231,6 @@ src_prepare() { |
| 110 |
# Fix docbook2texi command |
| 111 |
sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \ |
| 112 |
Documentation/Makefile || die "sed failed" |
| 113 |
- |
| 114 |
- # bug #318289 |
| 115 |
- # Merged upstream |
| 116 |
- #epatch "${FILESDIR}"/git-1.7.3.2-interix.patch |
| 117 |
- |
| 118 |
- # merged upstream |
| 119 |
- #epatch "${FILESDIR}"/git-1.7.5-interix.patch |
| 120 |
- |
| 121 |
- # merged upstream |
| 122 |
- #epatch "${FILESDIR}"/git-1.7.6-interix.patch |
| 123 |
- |
| 124 |
- # Newer versions of SVN hate a whitespace in the file URL. |
| 125 |
- # So we avoid that by replaced the space with an underscore. |
| 126 |
- #Initialized empty Git repository in /dev/shm/portage/dev-vcs/git-9999/work/git-9999/t/t d.t9155/git_project/.git/ |
| 127 |
- #svn: E235000: In file 'subversion/libsvn_subr/dirent_uri.c' line 2291: assertion failed (svn_uri_is_canonical(url, pool)) |
| 128 |
- # |
| 129 |
- # With this change the following tests still fail: t9100 t9118 t9120 |
| 130 |
- # Without it, MOST of t91* fails, due to the space tripping up the |
| 131 |
- # svn_uri_is_canonical. |
| 132 |
- # |
| 133 |
- # git-svn actually needs to be fixed here, but this chagne is useful for |
| 134 |
- # testing it. |
| 135 |
- # |
| 136 |
- # This patch is my work to date on fixing git-svn, but it causes more |
| 137 |
- # breakage than it fixes (it's manually-edited now to do nothing). |
| 138 |
- epatch "${FILESDIR}"/git-1.7.8-git-svn-1.7-canonical-path.patch |
| 139 |
- cd "${S}"/t |
| 140 |
- sed -i \ |
| 141 |
- -e 's/trash directory/trash_directory/g' \ |
| 142 |
- test-lib.sh t0000-basic.sh Makefile || die "sed failed" |
| 143 |
} |
| 144 |
|
| 145 |
git_emake() { |
| 146 |
@@ -307,6 +261,8 @@ src_configure() { |
| 147 |
} |
| 148 |
|
| 149 |
src_compile() { |
| 150 |
+ git_emake perl/PM.stamp || die "emake perl/PM.stamp failed" |
| 151 |
+ git_emake perl/perl.mak || die "emake perl/perl.mak failed" |
| 152 |
git_emake || die "emake failed" |
| 153 |
|
| 154 |
if use emacs ; then |
| 155 |
@@ -375,6 +331,8 @@ src_install() { |
| 156 |
dodoc "${S}"/contrib/gitview/gitview.txt |
| 157 |
fi |
| 158 |
|
| 159 |
+ #dobin contrib/fast-import/git-p4 # Moved upstream |
| 160 |
+ #dodoc contrib/fast-import/git-p4.txt # Moved upstream |
| 161 |
newbin contrib/fast-import/import-tars.perl import-tars |
| 162 |
newbin contrib/git-resurrect.sh git-resurrect |
| 163 |
|
| 164 |
@@ -455,6 +413,8 @@ src_test() { |
| 165 |
t1004-read-tree-m-u-wf.sh \ |
| 166 |
t3700-add.sh \ |
| 167 |
t7300-clean.sh" |
| 168 |
+ # t9100 still fails with symlinks in SVN 1.7 |
| 169 |
+ local test_svn="t9100-git-svn-basic.sh" |
| 170 |
|
| 171 |
# Unzip is used only for the testcase code, not by any normal parts of Git. |
| 172 |
if ! has_version app-arch/unzip ; then |
| 173 |
@@ -490,6 +450,9 @@ src_test() { |
| 174 |
disabled="${disabled} ${tests_perl}" |
| 175 |
fi |
| 176 |
|
| 177 |
+ einfo "Disabling tests that fail with SVN 1.7" |
| 178 |
+ disabled="${disabled} ${test_svn}" |
| 179 |
+ |
| 180 |
# Reset all previously disabled tests |
| 181 |
cd "${S}/t" |
| 182 |
for i in *.sh.DISABLED ; do |
| 183 |
|
| 184 |
|
| 185 |
|
| 186 |
1.2 dev-vcs/git/git-1.7.12-r1.ebuild |
| 187 |
|
| 188 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-1.7.12-r1.ebuild?rev=1.2&view=markup |
| 189 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-1.7.12-r1.ebuild?rev=1.2&content-type=text/plain |
| 190 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-1.7.12-r1.ebuild?r1=1.1&r2=1.2 |
| 191 |
|
| 192 |
Index: git-1.7.12-r1.ebuild |
| 193 |
=================================================================== |
| 194 |
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.12-r1.ebuild,v |
| 195 |
retrieving revision 1.1 |
| 196 |
retrieving revision 1.2 |
| 197 |
diff -p -w -b -B -u -u -r1.1 -r1.2 |
| 198 |
--- git-1.7.12-r1.ebuild 22 Aug 2012 04:44:08 -0000 1.1 |
| 199 |
+++ git-1.7.12-r1.ebuild 22 Aug 2012 05:10:14 -0000 1.2 |
| 200 |
@@ -1,6 +1,6 @@ |
| 201 |
# Copyright 1999-2012 Gentoo Foundation |
| 202 |
# Distributed under the terms of the GNU General Public License v2 |
| 203 |
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.12-r1.ebuild,v 1.1 2012/08/22 04:44:08 robbat2 Exp $ |
| 204 |
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.12-r1.ebuild,v 1.2 2012/08/22 05:10:14 robbat2 Exp $ |
| 205 |
|
| 206 |
EAPI=4 |
| 207 |
|
| 208 |
@@ -32,7 +32,7 @@ if [[ ${PV} != *9999 ]]; then |
| 209 |
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
| 210 |
${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
| 211 |
)" |
| 212 |
- 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" |
| 213 |
+ KEYWORDS="~alpha ~amd64 ~arm ~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 ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 214 |
else |
| 215 |
SRC_URI="" |
| 216 |
KEYWORDS="" |
| 217 |
|
| 218 |
|
| 219 |
|
| 220 |
1.149 dev-vcs/git/ChangeLog |
| 221 |
|
| 222 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?rev=1.149&view=markup |
| 223 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?rev=1.149&content-type=text/plain |
| 224 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?r1=1.148&r2=1.149 |
| 225 |
|
| 226 |
Index: ChangeLog |
| 227 |
=================================================================== |
| 228 |
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v |
| 229 |
retrieving revision 1.148 |
| 230 |
retrieving revision 1.149 |
| 231 |
diff -p -w -b -B -u -u -r1.148 -r1.149 |
| 232 |
--- ChangeLog 22 Aug 2012 04:44:08 -0000 1.148 |
| 233 |
+++ ChangeLog 22 Aug 2012 05:10:14 -0000 1.149 |
| 234 |
@@ -1,6 +1,10 @@ |
| 235 |
# ChangeLog for dev-vcs/git |
| 236 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 237 |
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.148 2012/08/22 04:44:08 robbat2 Exp $ |
| 238 |
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.149 2012/08/22 05:10:14 robbat2 Exp $ |
| 239 |
+ |
| 240 |
+ 22 Aug 2012; Robin H. Johnson <robbat2@g.o> git-1.7.12-r1.ebuild, |
| 241 |
+ git-1.7.12.ebuild, git-9999.ebuild: |
| 242 |
+ ~amd64-fbsd was not placed in all ebuilds. Also sync live ebuild. |
| 243 |
|
| 244 |
*git-1.7.12-r1 (22 Aug 2012) |
| 245 |
*git-1.7.12 (22 Aug 2012) |
Archives