| 1 |
robbat2 11/01/06 03:37:11 |
| 2 |
|
| 3 |
Modified: ChangeLog git-1.7.3.4-r1.ebuild |
| 4 |
Added: git-1.7.3.5.ebuild |
| 5 |
Log: |
| 6 |
Version bump. Also backport minor improvement to testsuite running to get cleaner repeat results. |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha13/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.68 dev-vcs/git/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?rev=1.68&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?rev=1.68&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?r1=1.67&r2=1.68 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v |
| 20 |
retrieving revision 1.67 |
| 21 |
retrieving revision 1.68 |
| 22 |
diff -p -w -b -B -u -u -r1.67 -r1.68 |
| 23 |
--- ChangeLog 1 Jan 2011 15:39:13 -0000 1.67 |
| 24 |
+++ ChangeLog 6 Jan 2011 03:37:11 -0000 1.68 |
| 25 |
@@ -1,6 +1,13 @@ |
| 26 |
# ChangeLog for dev-vcs/git |
| 27 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.67 2011/01/01 15:39:13 armin76 Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.68 2011/01/06 03:37:11 robbat2 Exp $ |
| 30 |
+ |
| 31 |
+*git-1.7.3.5 (06 Jan 2011) |
| 32 |
+ |
| 33 |
+ 06 Jan 2011; Robin H. Johnson <robbat2@g.o> git-1.7.3.4-r1.ebuild, |
| 34 |
+ +git-1.7.3.5.ebuild: |
| 35 |
+ Version bump. Also backport minor improvement to testsuite running to get |
| 36 |
+ cleaner repeat results. |
| 37 |
|
| 38 |
01 Jan 2011; Raúl Porcel <armin76@g.o> git-1.6.4.5.ebuild, |
| 39 |
git-1.7.2.5.ebuild, git-1.7.3.4-r1.ebuild: |
| 40 |
|
| 41 |
|
| 42 |
|
| 43 |
1.13 dev-vcs/git/git-1.7.3.4-r1.ebuild |
| 44 |
|
| 45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-1.7.3.4-r1.ebuild?rev=1.13&view=markup |
| 46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-1.7.3.4-r1.ebuild?rev=1.13&content-type=text/plain |
| 47 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-1.7.3.4-r1.ebuild?r1=1.12&r2=1.13 |
| 48 |
|
| 49 |
Index: git-1.7.3.4-r1.ebuild |
| 50 |
=================================================================== |
| 51 |
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.3.4-r1.ebuild,v |
| 52 |
retrieving revision 1.12 |
| 53 |
retrieving revision 1.13 |
| 54 |
diff -p -w -b -B -u -u -r1.12 -r1.13 |
| 55 |
--- git-1.7.3.4-r1.ebuild 1 Jan 2011 15:39:13 -0000 1.12 |
| 56 |
+++ git-1.7.3.4-r1.ebuild 6 Jan 2011 03:37:11 -0000 1.13 |
| 57 |
@@ -1,6 +1,6 @@ |
| 58 |
# Copyright 1999-2011 Gentoo Foundation |
| 59 |
# Distributed under the terms of the GNU General Public License v2 |
| 60 |
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.3.4-r1.ebuild,v 1.12 2011/01/01 15:39:13 armin76 Exp $ |
| 61 |
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.3.4-r1.ebuild,v 1.13 2011/01/06 03:37:11 robbat2 Exp $ |
| 62 |
|
| 63 |
EAPI=3 |
| 64 |
|
| 65 |
@@ -442,6 +442,14 @@ src_test() { |
| 66 |
[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" |
| 67 |
done |
| 68 |
|
| 69 |
+ # Avoid the test system removing the results because we want them ourselves |
| 70 |
+ sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ |
| 71 |
+ -i "${S}"/t/Makefile |
| 72 |
+ |
| 73 |
+ # Clean old results first |
| 74 |
+ cd "${S}/t" |
| 75 |
+ git_emake clean |
| 76 |
+ |
| 77 |
# Now run the tests |
| 78 |
cd "${S}" |
| 79 |
einfo "Start test run" |
| 80 |
|
| 81 |
|
| 82 |
|
| 83 |
1.1 dev-vcs/git/git-1.7.3.5.ebuild |
| 84 |
|
| 85 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-1.7.3.5.ebuild?rev=1.1&view=markup |
| 86 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-1.7.3.5.ebuild?rev=1.1&content-type=text/plain |
| 87 |
|
| 88 |
Index: git-1.7.3.5.ebuild |
| 89 |
=================================================================== |
| 90 |
# Copyright 1999-2011 Gentoo Foundation |
| 91 |
# Distributed under the terms of the GNU General Public License v2 |
| 92 |
# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.3.5.ebuild,v 1.1 2011/01/06 03:37:11 robbat2 Exp $ |
| 93 |
|
| 94 |
EAPI=3 |
| 95 |
|
| 96 |
GENTOO_DEPEND_ON_PERL=no |
| 97 |
inherit toolchain-funcs eutils elisp-common perl-module bash-completion |
| 98 |
[ "$PV" == "9999" ] && inherit git |
| 99 |
|
| 100 |
MY_PV="${PV/_rc/.rc}" |
| 101 |
MY_P="${PN}-${MY_PV}" |
| 102 |
|
| 103 |
DOC_VER=${MY_PV} |
| 104 |
|
| 105 |
DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" |
| 106 |
HOMEPAGE="http://www.git-scm.com/" |
| 107 |
if [ "$PV" != "9999" ]; then |
| 108 |
SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2 |
| 109 |
mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2 |
| 110 |
doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )" |
| 111 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~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" |
| 112 |
else |
| 113 |
SRC_URI="" |
| 114 |
EGIT_BRANCH="master" |
| 115 |
EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" |
| 116 |
# EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git" |
| 117 |
KEYWORDS="" |
| 118 |
fi |
| 119 |
|
| 120 |
LICENSE="GPL-2" |
| 121 |
SLOT="0" |
| 122 |
IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl ppcsha1 tk +threads +webdav xinetd cvs subversion" |
| 123 |
|
| 124 |
# Common to both DEPEND and RDEPEND |
| 125 |
CDEPEND=" |
| 126 |
!blksha1? ( dev-libs/openssl ) |
| 127 |
sys-libs/zlib |
| 128 |
perl? ( dev-lang/perl[-build] ) |
| 129 |
tk? ( dev-lang/tk ) |
| 130 |
curl? ( |
| 131 |
net-misc/curl |
| 132 |
webdav? ( dev-libs/expat ) |
| 133 |
) |
| 134 |
emacs? ( virtual/emacs )" |
| 135 |
|
| 136 |
RDEPEND="${CDEPEND} |
| 137 |
perl? ( dev-perl/Error |
| 138 |
dev-perl/Net-SMTP-SSL |
| 139 |
dev-perl/Authen-SASL |
| 140 |
cgi? ( virtual/perl-CGI ) |
| 141 |
cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) |
| 142 |
subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) |
| 143 |
) |
| 144 |
gtk? |
| 145 |
( |
| 146 |
>=dev-python/pygtk-2.8 |
| 147 |
|| ( dev-python/pygtksourceview:2 dev-python/gtksourceview-python ) |
| 148 |
)" |
| 149 |
|
| 150 |
# This is how info docs are created with Git: |
| 151 |
# .txt/asciidoc --(asciidoc)---------> .xml/docbook |
| 152 |
# .xml/docbook --(docbook2texi.pl)--> .texi |
| 153 |
# .texi --(makeinfo)---------> .info |
| 154 |
DEPEND="${CDEPEND} |
| 155 |
app-arch/cpio |
| 156 |
doc? ( |
| 157 |
app-text/asciidoc |
| 158 |
app-text/docbook2X |
| 159 |
sys-apps/texinfo |
| 160 |
)" |
| 161 |
|
| 162 |
# Live ebuild builds man pages and HTML docs, additionally |
| 163 |
if [ "$PV" == "9999" ]; then |
| 164 |
DEPEND="${DEPEND} |
| 165 |
app-text/asciidoc |
| 166 |
app-text/xmlto" |
| 167 |
fi |
| 168 |
|
| 169 |
SITEFILE=50${PN}-gentoo.el |
| 170 |
S="${WORKDIR}/${MY_P}" |
| 171 |
|
| 172 |
pkg_setup() { |
| 173 |
if ! use perl ; then |
| 174 |
use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi" |
| 175 |
use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs" |
| 176 |
use subversion && ewarn "git-svn needs USE=perl, it won't work" |
| 177 |
fi |
| 178 |
if use webdav && ! use curl ; then |
| 179 |
ewarn "USE=webdav needs USE=curl. Ignoring" |
| 180 |
fi |
| 181 |
if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then |
| 182 |
ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" |
| 183 |
ewarn "with USE=dso, there may be weird crashes in git-svn. You" |
| 184 |
ewarn "have been warned." |
| 185 |
fi |
| 186 |
} |
| 187 |
|
| 188 |
# This is needed because for some obscure reasons future calls to make don't |
| 189 |
# pick up these exports if we export them in src_unpack() |
| 190 |
exportmakeopts() { |
| 191 |
local myopts |
| 192 |
|
| 193 |
if use blksha1 ; then |
| 194 |
myopts="${myopts} BLK_SHA1=YesPlease" |
| 195 |
elif use ppcsha1 ; then |
| 196 |
myopts="${myopts} PPC_SHA1=YesPlease" |
| 197 |
fi |
| 198 |
|
| 199 |
if use curl ; then |
| 200 |
use webdav || myopts="${myopts} NO_EXPAT=YesPlease" |
| 201 |
else |
| 202 |
myopts="${myopts} NO_CURL=YesPlease" |
| 203 |
fi |
| 204 |
|
| 205 |
# broken assumptions, because of broken build system ... |
| 206 |
myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" |
| 207 |
myopts="${myopts} INSTALL=install TAR=tar" |
| 208 |
myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh" |
| 209 |
myopts="${myopts} SANE_TOOL_PATH=" |
| 210 |
myopts="${myopts} OLD_ICONV=" |
| 211 |
myopts="${myopts} NO_EXTERNAL_GREP=" |
| 212 |
|
| 213 |
# can't define this to null, since the entire makefile depends on it |
| 214 |
sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile |
| 215 |
|
| 216 |
use iconv \ |
| 217 |
|| einfo "Forcing iconv for ${PVR} due to bugs #321895, #322205." |
| 218 |
# || myopts="${myopts} NO_ICONV=YesPlease" |
| 219 |
# because, above, we need to do this unconditionally (no "&& use iconv") |
| 220 |
use !elibc_glibc && myopts="${myopts} NEEDS_LIBICONV=YesPlease" |
| 221 |
|
| 222 |
use tk \ |
| 223 |
|| myopts="${myopts} NO_TCLTK=YesPlease" |
| 224 |
use perl \ |
| 225 |
&& myopts="${myopts} INSTALLDIRS=vendor" \ |
| 226 |
|| myopts="${myopts} NO_PERL=YesPlease" |
| 227 |
use threads \ |
| 228 |
&& myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" |
| 229 |
use subversion \ |
| 230 |
|| myopts="${myopts} NO_SVN_TESTS=YesPlease" |
| 231 |
# Disabled until ~m68k-mint can be keyworded again |
| 232 |
# if [[ ${CHOST} == *-mint* ]] ; then |
| 233 |
# myopts="${myopts} NO_MMAP=YesPlease" |
| 234 |
# myopts="${myopts} NO_IPV6=YesPlease" |
| 235 |
# myopts="${myopts} NO_STRLCPY=YesPlease" |
| 236 |
# myopts="${myopts} NO_MEMMEM=YesPlease" |
| 237 |
# myopts="${myopts} NO_MKDTEMP=YesPlease" |
| 238 |
# myopts="${myopts} NO_MKSTEMPS=YesPlease" |
| 239 |
# fi |
| 240 |
if [[ ${CHOST} == ia64-*-hpux* ]]; then |
| 241 |
myopts="${myopts} NO_NSEC=YesPlease" |
| 242 |
fi |
| 243 |
|
| 244 |
has_version '>=app-text/asciidoc-8.0' \ |
| 245 |
&& myopts="${myopts} ASCIIDOC8=YesPlease" |
| 246 |
myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease" |
| 247 |
|
| 248 |
# Bug 290465: |
| 249 |
# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' |
| 250 |
[[ "${CHOST}" == *-uclibc* ]] && \ |
| 251 |
myopts="${myopts} NO_NSEC=YesPlease" |
| 252 |
|
| 253 |
export MY_MAKEOPTS="${myopts}" |
| 254 |
} |
| 255 |
|
| 256 |
src_unpack() { |
| 257 |
if [ "${PV}" != "9999" ]; then |
| 258 |
unpack ${MY_P}.tar.bz2 |
| 259 |
cd "${S}" |
| 260 |
unpack ${PN}-manpages-${DOC_VER}.tar.bz2 |
| 261 |
use doc && \ |
| 262 |
cd "${S}"/Documentation && \ |
| 263 |
unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2 |
| 264 |
cd "${S}" |
| 265 |
else |
| 266 |
git_src_unpack |
| 267 |
cd "${S}" |
| 268 |
#cp "${FILESDIR}"/GIT-VERSION-GEN . |
| 269 |
fi |
| 270 |
|
| 271 |
} |
| 272 |
|
| 273 |
src_prepare() { |
| 274 |
# Noperl is being merged to upstream as of 2009/04/05 |
| 275 |
#epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch |
| 276 |
|
| 277 |
# GetOpt-Long v2.38 is strict |
| 278 |
# Merged in 1.6.3 final 2009/05/07 |
| 279 |
#epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch |
| 280 |
|
| 281 |
# JS install fixup |
| 282 |
epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch |
| 283 |
|
| 284 |
# USE=-iconv causes segfaults, fixed post 1.7.1 |
| 285 |
# Gentoo bug #321895 |
| 286 |
#epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch |
| 287 |
|
| 288 |
# Fix false positives with t3404 due to SHELL=/bin/false for the portage |
| 289 |
# user. |
| 290 |
# Merged upstream |
| 291 |
#epatch "${FILESDIR}"/git-1.7.3.4-avoid-shell-issues.patch |
| 292 |
|
| 293 |
# bug #350075: t9001: fix missing prereq on some tests |
| 294 |
# Merged upstream |
| 295 |
#epatch "${FILESDIR}"/git-1.7.3.4-fix-perl-test-prereq.patch |
| 296 |
|
| 297 |
sed -i \ |
| 298 |
-e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \ |
| 299 |
-e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \ |
| 300 |
-e 's:^\(CC = \).*$:\1$(OPTCC):' \ |
| 301 |
-e 's:^\(AR = \).*$:\1$(OPTAR):' \ |
| 302 |
-e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ |
| 303 |
-e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ |
| 304 |
Makefile || die "sed failed" |
| 305 |
|
| 306 |
# Never install the private copy of Error.pm (bug #296310) |
| 307 |
sed -i \ |
| 308 |
-e '/private-Error.pm/s,^,#,' \ |
| 309 |
perl/Makefile.PL |
| 310 |
|
| 311 |
# Fix docbook2texi command |
| 312 |
sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \ |
| 313 |
Documentation/Makefile || die "sed failed" |
| 314 |
|
| 315 |
# bug #318289 |
| 316 |
epatch "${FILESDIR}"/git-1.7.3.2-interix.patch |
| 317 |
} |
| 318 |
|
| 319 |
git_emake() { |
| 320 |
# bug #326625: PERL_PATH, PERL_MM_OPT |
| 321 |
# bug #320647: PYTHON_PATH |
| 322 |
emake ${MY_MAKEOPTS} \ |
| 323 |
DESTDIR="${D}" \ |
| 324 |
OPTCFLAGS="${CFLAGS}" \ |
| 325 |
OPTLDFLAGS="${LDFLAGS}" \ |
| 326 |
OPTCC="$(tc-getCC)" \ |
| 327 |
OPTAR="$(tc-getAR)" \ |
| 328 |
prefix="${EPREFIX}"/usr \ |
| 329 |
htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ |
| 330 |
sysconfdir="${EPREFIX}"/etc \ |
| 331 |
PYTHON_PATH="${EPREFIX}/usr/bin/python" \ |
| 332 |
PERL_PATH="${EPREFIX}/usr/bin/env perl" \ |
| 333 |
PERL_MM_OPT="" \ |
| 334 |
GIT_TEST_OPTS="--no-color" \ |
| 335 |
"$@" |
| 336 |
} |
| 337 |
|
| 338 |
src_configure() { |
| 339 |
exportmakeopts |
| 340 |
} |
| 341 |
|
| 342 |
src_compile() { |
| 343 |
git_emake || die "emake failed" |
| 344 |
|
| 345 |
if use emacs ; then |
| 346 |
elisp-compile contrib/emacs/git{,-blame}.el \ |
| 347 |
|| die "emacs modules failed" |
| 348 |
fi |
| 349 |
|
| 350 |
if use perl && use cgi ; then |
| 351 |
git_emake \ |
| 352 |
gitweb/gitweb.cgi \ |
| 353 |
|| die "emake gitweb/gitweb.cgi failed" |
| 354 |
fi |
| 355 |
|
| 356 |
cd "${S}"/Documentation |
| 357 |
if [[ "$PV" == "9999" ]] ; then |
| 358 |
git_emake man \ |
| 359 |
|| die "emake man failed" |
| 360 |
if use doc ; then |
| 361 |
git_emake info html \ |
| 362 |
|| die "emake info html failed" |
| 363 |
fi |
| 364 |
else |
| 365 |
if use doc ; then |
| 366 |
git_emake info \ |
| 367 |
|| die "emake info html failed" |
| 368 |
fi |
| 369 |
fi |
| 370 |
} |
| 371 |
|
| 372 |
src_install() { |
| 373 |
git_emake \ |
| 374 |
install || \ |
| 375 |
die "make install failed" |
| 376 |
|
| 377 |
# Depending on the tarball and manual rebuild of the documentation, the |
| 378 |
# manpages may exist in either OR both of these directories. |
| 379 |
find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] |
| 380 |
find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] |
| 381 |
|
| 382 |
dodoc README Documentation/{SubmittingPatches,CodingGuidelines} |
| 383 |
use doc && dodir /usr/share/doc/${PF}/html |
| 384 |
for d in / /howto/ /technical/ ; do |
| 385 |
docinto ${d} |
| 386 |
dodoc Documentation${d}*.txt |
| 387 |
use doc && dohtml -p ${d} Documentation${d}*.html |
| 388 |
done |
| 389 |
docinto / |
| 390 |
# Upstream does not ship this pre-built :-( |
| 391 |
use doc && doinfo Documentation/{git,gitman}.info |
| 392 |
|
| 393 |
dobashcompletion contrib/completion/git-completion.bash ${PN} |
| 394 |
|
| 395 |
if use emacs ; then |
| 396 |
elisp-install ${PN} contrib/emacs/git.{el,elc} || die |
| 397 |
elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die |
| 398 |
#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die |
| 399 |
# don't add automatically to the load-path, so the sitefile |
| 400 |
# can do a conditional loading |
| 401 |
touch "${ED}${SITELISP}/${PN}/compat/.nosearch" |
| 402 |
elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die |
| 403 |
fi |
| 404 |
|
| 405 |
if use gtk ; then |
| 406 |
dobin "${S}"/contrib/gitview/gitview |
| 407 |
dodoc "${S}"/contrib/gitview/gitview.txt |
| 408 |
fi |
| 409 |
|
| 410 |
dobin contrib/fast-import/git-p4 |
| 411 |
dodoc contrib/fast-import/git-p4.txt |
| 412 |
newbin contrib/fast-import/import-tars.perl import-tars |
| 413 |
newbin contrib/git-resurrect.sh git-resurrect |
| 414 |
|
| 415 |
dodir /usr/share/${PN}/contrib |
| 416 |
# The following are excluded: |
| 417 |
# completion - installed above |
| 418 |
# emacs - installed above |
| 419 |
# examples - these are stuff that is not used in Git anymore actually |
| 420 |
# gitview - installed above |
| 421 |
# p4import - excluded because fast-import has a better one |
| 422 |
# patches - stuff the Git guys made to go upstream to other places |
| 423 |
# svnimport - use git-svn |
| 424 |
# thunderbird-patch-inline - fixes thunderbird |
| 425 |
for i in \ |
| 426 |
blameview buildsystems ciabot continuous convert-objects fast-import \ |
| 427 |
hg-to-git hooks remotes2config.sh remotes2config.sh rerere-train.sh \ |
| 428 |
stats svn-fe vim workdir \ |
| 429 |
; do |
| 430 |
cp -rf \ |
| 431 |
"${S}"/contrib/${i} \ |
| 432 |
"${ED}"/usr/share/${PN}/contrib \ |
| 433 |
|| die "Failed contrib ${i}" |
| 434 |
done |
| 435 |
|
| 436 |
if use perl && use cgi ; then |
| 437 |
# We used to install in /usr/share/${PN}/gitweb |
| 438 |
# but upstream installs in /usr/share/gitweb |
| 439 |
# so we will install a symlink and use their location for compat with other |
| 440 |
# distros |
| 441 |
dosym /usr/share/gitweb /usr/share/${PN}/gitweb |
| 442 |
|
| 443 |
# INSTALL discusses configuration issues, not just installation |
| 444 |
docinto / |
| 445 |
newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb |
| 446 |
newdoc "${S}"/gitweb/README README.gitweb |
| 447 |
|
| 448 |
find "${ED}"/usr/lib64/perl5/ \ |
| 449 |
-name .packlist \ |
| 450 |
-exec rm \{\} \; |
| 451 |
else |
| 452 |
rm -rf "${D}"/usr/share/gitweb |
| 453 |
fi |
| 454 |
|
| 455 |
if ! use subversion ; then |
| 456 |
rm -f "${ED}"/usr/libexec/git-core/git-svn \ |
| 457 |
"${ED}"/usr/share/man/man1/git-svn.1* |
| 458 |
fi |
| 459 |
|
| 460 |
if use xinetd ; then |
| 461 |
insinto /etc/xinetd.d |
| 462 |
newins "${FILESDIR}"/git-daemon.xinetd git-daemon |
| 463 |
fi |
| 464 |
|
| 465 |
newinitd "${FILESDIR}"/git-daemon.initd git-daemon |
| 466 |
newconfd "${FILESDIR}"/git-daemon.confd git-daemon |
| 467 |
|
| 468 |
fixlocalpod |
| 469 |
} |
| 470 |
|
| 471 |
src_test() { |
| 472 |
local disabled="" |
| 473 |
local tests_cvs="t9200-git-cvsexportcommit.sh \ |
| 474 |
t9400-git-cvsserver-server.sh \ |
| 475 |
t9401-git-cvsserver-crlf.sh \ |
| 476 |
t9600-cvsimport.sh \ |
| 477 |
t9601-cvsimport-vendor-branch.sh \ |
| 478 |
t9602-cvsimport-branches-tags.sh \ |
| 479 |
t9603-cvsimport-patchsets.sh" |
| 480 |
local tests_perl="t5502-quickfetch.sh \ |
| 481 |
t5512-ls-remote.sh \ |
| 482 |
t5520-pull.sh" |
| 483 |
# Bug #225601 - t0004 is not suitable for root perm |
| 484 |
# Bug #219839 - t1004 is not suitable for root perm |
| 485 |
# t0001-init.sh - check for init notices EPERM* fails |
| 486 |
local tests_nonroot="t0001-init.sh \ |
| 487 |
t0004-unwritable.sh \ |
| 488 |
t1004-read-tree-m-u-wf.sh \ |
| 489 |
t3700-add.sh \ |
| 490 |
t7300-clean.sh" |
| 491 |
|
| 492 |
# Unzip is used only for the testcase code, not by any normal parts of Git. |
| 493 |
if ! has_version app-arch/unzip ; then |
| 494 |
einfo "Disabling tar-tree tests" |
| 495 |
disabled="${disabled} t5000-tar-tree.sh" |
| 496 |
fi |
| 497 |
|
| 498 |
cvs=0 |
| 499 |
use cvs && let cvs=$cvs+1 |
| 500 |
if [[ ${EUID} -eq 0 ]]; then |
| 501 |
if [[ $cvs -eq 1 ]]; then |
| 502 |
ewarn "Skipping CVS tests because CVS does not work as root!" |
| 503 |
ewarn "You should retest with FEATURES=userpriv!" |
| 504 |
disabled="${disabled} ${tests_cvs}" |
| 505 |
fi |
| 506 |
einfo "Skipping other tests that require being non-root" |
| 507 |
disabled="${disabled} ${tests_nonroot}" |
| 508 |
else |
| 509 |
[[ $cvs -gt 0 ]] && \ |
| 510 |
has_version dev-vcs/cvs && \ |
| 511 |
let cvs=$cvs+1 |
| 512 |
[[ $cvs -gt 1 ]] && \ |
| 513 |
built_with_use dev-vcs/cvs server && \ |
| 514 |
let cvs=$cvs+1 |
| 515 |
if [[ $cvs -lt 3 ]]; then |
| 516 |
einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" |
| 517 |
disabled="${disabled} ${tests_cvs}" |
| 518 |
fi |
| 519 |
fi |
| 520 |
|
| 521 |
if ! use perl ; then |
| 522 |
einfo "Disabling tests that need Perl" |
| 523 |
disabled="${disabled} ${tests_perl}" |
| 524 |
fi |
| 525 |
|
| 526 |
# Reset all previously disabled tests |
| 527 |
cd "${S}/t" |
| 528 |
for i in *.sh.DISABLED ; do |
| 529 |
[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" |
| 530 |
done |
| 531 |
einfo "Disabled tests:" |
| 532 |
for i in ${disabled} ; do |
| 533 |
[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" |
| 534 |
done |
| 535 |
|
| 536 |
# Avoid the test system removing the results because we want them ourselves |
| 537 |
sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ |
| 538 |
-i "${S}"/t/Makefile |
| 539 |
|
| 540 |
# Clean old results first |
| 541 |
cd "${S}/t" |
| 542 |
git_emake clean |
| 543 |
|
| 544 |
# Now run the tests |
| 545 |
cd "${S}" |
| 546 |
einfo "Start test run" |
| 547 |
git_emake test |
| 548 |
rc=$? |
| 549 |
|
| 550 |
# Display nice results |
| 551 |
cd "${S}/t" |
| 552 |
git_emake aggregate-results |
| 553 |
|
| 554 |
# And exit |
| 555 |
[ $rc -eq 0 ] || die "tests failed. Please file a bug." |
| 556 |
} |
| 557 |
|
| 558 |
showpkgdeps() { |
| 559 |
local pkg=$1 |
| 560 |
shift |
| 561 |
elog " $(printf "%-17s:" ${pkg}) ${@}" |
| 562 |
} |
| 563 |
|
| 564 |
pkg_postinst() { |
| 565 |
use emacs && elisp-site-regen |
| 566 |
if use subversion && has_version dev-vcs/subversion && ! built_with_use --missing false dev-vcs/subversion perl ; then |
| 567 |
ewarn "You must build dev-vcs/subversion with USE=perl" |
| 568 |
ewarn "to get the full functionality of git-svn!" |
| 569 |
fi |
| 570 |
elog "These additional scripts need some dependencies:" |
| 571 |
echo |
| 572 |
showpkgdeps git-quiltimport "dev-util/quilt" |
| 573 |
showpkgdeps git-instaweb \ |
| 574 |
"|| ( www-servers/lighttpd www-servers/apache )" |
| 575 |
echo |
| 576 |
} |
| 577 |
|
| 578 |
pkg_postrm() { |
| 579 |
use emacs && elisp-site-regen |
| 580 |
} |
Archives