mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 17:09:10 -07:00
dev-vcs/git: Bump to version 2.6.0
Package-Manager: portage-2.2.22 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
This commit is contained in:
Lars Wendler
@@ -10,6 +10,7 @@ DIST git-2.4.8.tar.xz 3692460 SHA256 c7d2019d3c3b742862b252dcabb3d870b649e1af3fc
|
||||
DIST git-2.4.9.tar.xz 3692824 SHA256 0f5fba41639d3224fee02f40393e2053ee9468fa7b88d64c5b97f7e65667bd2b SHA512 d5df1f725d5af8449e091ee50f6c4371c2b1699d80d499321a751ecf6c61d75c6c3a286ea60661ae1608bf92c94e2c8977ad08731e153830bd5c5b4587d8ba82 WHIRLPOOL a670eeb5abbcf844324b2444d87ecc9eb8c2899d6f37da6aef9f27edbe53d90086907642aac14536396b61d4520cd4e7b77124f4d54cc7f9f9e5a769741e4d03
|
||||
DIST git-2.5.2.tar.xz 3744080 SHA256 4b4760a90ede51accee703bd6815f1f79afef68670acdcf3ea31dcc846a40c9b SHA512 b553aa521ac43c33323fc9ceed084a411fb5924ee48f6f30808152dd1185f36d339678788d05d8e62099d496be22a4b6b0242529505cff702884c394e13c58aa WHIRLPOOL 4049a000ccbdeeb1b2882b34484cfabac9ba7ef672644c3eb708075b5fbe63e17599fc908e056ddf25f3bb5c34e42d0354c3d951e4ba1978a51caeb20a285ae7
|
||||
DIST git-2.5.3.tar.xz 3745096 SHA256 124d29d857a1282fd2111cf4a021f156e8bae917f455b4551b2aea87f0453a1a SHA512 ab73d67f76ec8a6350995c692eefa7ab60ae13590d5d7c2fbd3ec1105a8d435ec1b156106fd6c3d6b51080a27f3ebd66bbf0a85042b697bc835143d9f625474e WHIRLPOOL e0c0fde0b263fd4847c21353ec81449baf6f1d5631aed4fdaa41dab2665159b528d7c477dacaef4efb2786ecaf3c0bd44ef3a589765543eee9726e70c5207d66
|
||||
DIST git-2.6.0.tar.xz 3808872 SHA256 211beb96ff41a83727e39704431ac388ecb1cebb5219cda067999bce4e1e15a6 SHA512 efcde5fa3ac56d577e25259e74f19026438ccf8888b79429eec2f141bb2a63bb83e73f65b1ea96bcc1f9f894fb90ec1b5ea81b9f0c1806d25352f6b266e7202a WHIRLPOOL de703ba5d4024a6205bb795330b1ed06c70b01fad311739c59d837e7b2c7cad27bfbcd7cae0ac18378a8baa9d0fc0a5341665c312d7749cbb488b14456745ad1
|
||||
DIST git-htmldocs-1.8.5.6.tar.gz 2242475 SHA256 7c8e955d0798686fa030ba7b7b384a2eab2b74d5bd695d82faecac2e247bd211 SHA512 c9b2752bcdd7f8f817b14e99ab2743d153e3e7549bffb2aa98999e46d1e965d045850ec6a3e9f6bc83e6e4820ce20f281c33f946ebd2be16d275b85a5ddaee36 WHIRLPOOL 7db3fb74e6b51618890acfef8fb89ab09adf653d3196e82624671194bdb2b564b903429ffecf68b28faf96ce3ebb83b534459738d48ace048d873c158621d31c
|
||||
DIST git-htmldocs-1.9.5.tar.gz 2262251 SHA256 4fa289e259d6b922a51d11a687203612aa1aad5696eb83b4e67c0de8a785700f SHA512 2df975c33d3411a97ab5a684b03998b7cd188d05bae6813c753fe2092b0acf463dec49a7a546d315f520fd9c71281da41998d0f36f64f48d4f95507a034a083b WHIRLPOOL edc252ce58b31f001c0d225f0b40b3689028bd34b1cbbdd889d645d37a2931e9039f76f12e5a0f918579a0b9c5dd1f3171af2bb58ee42972411ca33ec0ebe8f2
|
||||
DIST git-htmldocs-2.0.5.tar.xz 944792 SHA256 90eaf745d6ee197718fdde9c98919918ad1e4e3576608e4522b84c612cd9ef2a SHA512 e9b3d92d466762c9c7e164e9c30ff0046b262bf4707ea057e3a682f7b15a4f8149a9aaf2630f117dc3b508744cd688c6c0087cc94ff3477e7f3b85513160d7f3 WHIRLPOOL 35970d099304a5ab174fc93f8496a0c651a259dcaa3d23a2dd0233f8db214ae94a26e28044a87460d4654e61440427d331ceeac290335d6ae3fcf0423175bba9
|
||||
@@ -22,6 +23,7 @@ DIST git-htmldocs-2.4.8.tar.xz 996004 SHA256 73c9ac3b42da1d3427bfa91c3266c6b7df3
|
||||
DIST git-htmldocs-2.4.9.tar.xz 995724 SHA256 6000eb00fee2adc4d5a8fd8ace857049e6fb623aa7ec9087d983c29953319cd6 SHA512 42905ae5383e5f0444ec868a1d742bada31cf25eac582b95ab6e6334a3dfefd05d2e08a1c2f7c0354a841703cbac2c6dc25437ca9f681a5bb0a121dc94d2d938 WHIRLPOOL 9791ab122cf680f060d274c6a7bcdd1aaf0660f83ed4e91073fed1dd2f2b16e96e938fcbf04e03373768b8036e3f8dd0be54639f8d24bce59501c970e4225d73
|
||||
DIST git-htmldocs-2.5.2.tar.xz 1008940 SHA256 87e416455a293552c2bab46fb3ec75424e2143e6f98f5ce7bcb6d4e50c4020eb SHA512 5276e5aa82845d7a661a2f79d54d1b3e7a95f95220bd4b855cf8c6c13ed456d8c80682c3ccae280317172c515733968a0a61758e3a634a8f1b1a08a6e43f04fb WHIRLPOOL 9d431116146cbcf5adb5e05848f31712a64dfb45301bc85bb2ff3f3c04587349bfdea85c8f6be67c43af09b8ffe4b1458f128db85438ff7913b2b2bb049f8374
|
||||
DIST git-htmldocs-2.5.3.tar.xz 1009248 SHA256 f87465b5f6d01ceccb314b3e0a3749d642bea1007b0bc78afba868d75413d85e SHA512 7e5bcb85c270c740aa619d3cedd81e4f9bab989a8785512faab70cbd5029c021972b0574083272bed85324bf9372bf52f7b52827030133e09618731bf927f36f WHIRLPOOL f17c063c5b6e2a3cb7d25810b26f909bd09e281963e56029290c754b8f38bf7dba446405e96e4c49244db0bb60176b34852ac3f9a5b1d61c886eb90c2391efd8
|
||||
DIST git-htmldocs-2.6.0.tar.xz 1016192 SHA256 0ba5d5d630e3235b74bcfb4ea2e9bbda8a3e619aaaf9e1f56e12dec5d8dc1d87 SHA512 11d17ee8fe6537efba323887ccb64fe9c905b293d3d06f4c0f0b3da4283a7ac5b5bf840055bb9f96d28121aecce074d86feebaa2a407291ec812246308aefa1e WHIRLPOOL 7e08864790a3e5c584e85acd6aca15bfddea846df9ca423c2dfe1332da2283b8fb9ee462639733f35e4842d27a895b59db0e29e3e4636d525131b47c2851b139
|
||||
DIST git-manpages-1.8.5.6.tar.gz 569061 SHA256 58ef7cb3121639b8d78e2e4c4f7f886bab57af9e9e137b10f372dfad573872c1 SHA512 a524a1c7e8bdc73ffe04bebb5c7050a18c8649b98714bf255c8e3c32a2443d8d5abf33e3ca2eb108d601f01e0bda50fed1e134ffdae87bcf6f551cbbd250c4ba WHIRLPOOL 2db62b96e972dbcbec1ac59d7244bf2c2ff7140c941d1d3c6b9062bd79b80541d7fa3982c5a3bc55a18fc9112ab3fa648966be5c3e1135ab7b5c89080bee82b6
|
||||
DIST git-manpages-1.9.5.tar.gz 571625 SHA256 37cc735c4ced6574e8e93349d52d30372fc6f9fe3de3d6b9934a14857d6aade8 SHA512 e3df3e933fed6ff2845989a0146b28789452e9583bc19dd4a9ad335f64b15feffbdc4dd7cdb9d6b5216f7f85837318cf9b10df033f8022777f91c2b0894fb231 WHIRLPOOL e25d77fd8d9cacb92d45fd50640bc65189d02d7e23b276ccaf3b35ba1fe64ab0c49045d1fb8983b7b2b5bd996e767508446ac76506b074ded10feef1f9256918
|
||||
DIST git-manpages-2.0.5.tar.xz 359000 SHA256 3cf1581da2a19c0651df445ee5f801e108619befe8965e01d61faa46ca57b642 SHA512 b3981565a34a203283801b86717386971ef53c2f5c47bdde290aa0df4d62045ecbcab1ff1b4d1d8ddf7d489e74d65b0208d87ace7ca8c8be9525be548e445425 WHIRLPOOL e8c78eb38cb3192455ccb991a4ce5cd3988d06f1f06cdf0722e4ce6fb1d4e57f618058cf07d312bcab4f5821a1b1dfc016c03626d4f3429d3e5ef089607a2801
|
||||
@@ -34,3 +36,4 @@ DIST git-manpages-2.4.8.tar.xz 373596 SHA256 47558ec88776e66e6f3e3625b7efdaf2e8a
|
||||
DIST git-manpages-2.4.9.tar.xz 373644 SHA256 0adc425adb13d669fcc90fa28d5fff3e64d8c9feb49d0565ec031b7bddcc4e02 SHA512 0df6359b8119b023b2d375bba08539cad4c0718184c5027b99827490fc17bbcff5da227a9b13bbdb5a82a45567cb83984dab050faafea1b7939532397f6688a0 WHIRLPOOL 20b8e34bfa4c5c20cf92368676f3a98949ed8c12a9c5b90f7cd052387492afb0e1521bf328e4bff43c4e8aeff8784d88b79498e47bffd093bc751e49046034e9
|
||||
DIST git-manpages-2.5.2.tar.xz 378032 SHA256 76512caa7044710f9954079828218cd94ab17da34effd3bdd9db2434d18720c2 SHA512 f9a9d9f4d96c19550702ac7eaa94a9308e1c7b39e1290baf81ab74709398db97261a884d8e9e1c71c899dd17cc485fede276c25c601cf7dfa6384b18170915a1 WHIRLPOOL 35f89e546f949499a2efcb4c47c361f3f89f5c952e18748703999d9186b40977b09abfadc63c1e10c06c183f1338109b80ddb0c9501a3baa0f82cac40bc8218a
|
||||
DIST git-manpages-2.5.3.tar.xz 378000 SHA256 c5d8e9036be741924cf2614f0178a10f0c7d7b1d3efef96c1a08c751596cae3a SHA512 ed5a736b6ad22469ff7677434d046f331b0b4f7bbab8d14baa7a376bf44b384ffcc37ce1a99278d0fa69d8a058df21de1f8300a72cb2ad4b781543aac5100752 WHIRLPOOL f914d116e8aafd76a5decbfc945a6a3826814cda04d471716aeede4923eda79da61e809d888890b545b78811afd9b85c354540d9af06206e9402f1815c19e914
|
||||
DIST git-manpages-2.6.0.tar.xz 380940 SHA256 94c45cf2353f8e1bbb6b56b6f54289203319db4cc38d94f53fcfb8dc3b669615 SHA512 3173f77da6fab0f5ac5d46a206b18fe69083ee74288326af63bc3938fb359e16a0cf5490f71ea8b11ba54117871caff7b4022e698ecd328c028b27eebc711724 WHIRLPOOL c76454026f747a5e68c3a195b99471b2f012013ccd6b305a7ac4c396dd463476a8fff68017dc631198e2fc309c3f28a2373883b6b376166168e57ceff624dba5
|
||||
|
||||
640
dev-vcs/git/git-2.6.0.ebuild
Normal file
640
dev-vcs/git/git-2.6.0.ebuild
Normal file
@@ -0,0 +1,640 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
GENTOO_DEPEND_ON_PERL=no
|
||||
|
||||
# bug #329479: git-remote-testgit is not multiple-version aware
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
[[ ${PV} == *9999 ]] && SCM="git-2"
|
||||
EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
|
||||
EGIT_MASTER=pu
|
||||
|
||||
inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
|
||||
|
||||
MY_PV="${PV/_rc/.rc}"
|
||||
MY_P="${PN}-${MY_PV}"
|
||||
|
||||
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_SUFFIX="xz"
|
||||
SRC_URI_GOOG="https://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 ~arm64 ~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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
fi
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv libressl mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
|
||||
|
||||
# Common to both DEPEND and RDEPEND
|
||||
CDEPEND="
|
||||
!libressl? ( dev-libs/openssl:0= )
|
||||
libressl? ( dev-libs/libressl:= )
|
||||
sys-libs/zlib
|
||||
pcre? ( dev-libs/libpcre )
|
||||
perl? ( dev-lang/perl:=[-build(-)] )
|
||||
tk? ( dev-lang/tk:0= )
|
||||
curl? (
|
||||
net-misc/curl
|
||||
webdav? ( dev-libs/expat )
|
||||
)
|
||||
emacs? ( virtual/emacs )
|
||||
gnome-keyring? ( gnome-base/libgnome-keyring )"
|
||||
|
||||
RDEPEND="${CDEPEND}
|
||||
gpg? ( app-crypt/gnupg )
|
||||
mediawiki? (
|
||||
dev-perl/HTML-Tree
|
||||
dev-perl/MediaWiki-API
|
||||
)
|
||||
perl? ( dev-perl/Error
|
||||
dev-perl/Net-SMTP-SSL
|
||||
dev-perl/Authen-SASL
|
||||
cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) )
|
||||
cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
|
||||
subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
|
||||
)
|
||||
python? ( gtk?
|
||||
(
|
||||
>=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
|
||||
>=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
|
||||
)
|
||||
${PYTHON_DEPS} )"
|
||||
|
||||
# This is how info docs are created with Git:
|
||||
# .txt/asciidoc --(asciidoc)---------> .xml/docbook
|
||||
# .xml/docbook --(docbook2texi.pl)--> .texi
|
||||
# .texi --(makeinfo)---------> .info
|
||||
DEPEND="${CDEPEND}
|
||||
doc? (
|
||||
app-text/asciidoc
|
||||
app-text/docbook2X
|
||||
sys-apps/texinfo
|
||||
app-text/xmlto
|
||||
)
|
||||
nls? ( sys-devel/gettext )
|
||||
test? ( app-crypt/gnupg )"
|
||||
|
||||
# Live ebuild builds man pages and HTML docs, additionally
|
||||
if [[ ${PV} == *9999 ]]; then
|
||||
DEPEND="${DEPEND}
|
||||
app-text/asciidoc"
|
||||
fi
|
||||
|
||||
SITEFILE=50${PN}-gentoo.el
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
REQUIRED_USE="
|
||||
cgi? ( perl )
|
||||
cvs? ( perl )
|
||||
mediawiki? ( perl )
|
||||
subversion? ( perl )
|
||||
webdav? ( curl )
|
||||
gtk? ( python )
|
||||
python? ( ${PYTHON_REQUIRED_USE} )
|
||||
"
|
||||
|
||||
pkg_setup() {
|
||||
if use subversion && has_version "dev-vcs/subversion[dso]"; then
|
||||
ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
|
||||
ewarn "with USE=dso, there may be weird crashes in git-svn. You"
|
||||
ewarn "have been warned."
|
||||
fi
|
||||
if use python ; then
|
||||
python-single-r1_pkg_setup
|
||||
fi
|
||||
}
|
||||
|
||||
# This is needed because for some obscure reasons future calls to make don't
|
||||
# pick up these exports if we export them in src_unpack()
|
||||
exportmakeopts() {
|
||||
local myopts
|
||||
|
||||
if use blksha1 ; then
|
||||
myopts+=" BLK_SHA1=YesPlease"
|
||||
elif use ppcsha1 ; then
|
||||
myopts+=" PPC_SHA1=YesPlease"
|
||||
fi
|
||||
|
||||
if use curl ; then
|
||||
use webdav || myopts+=" NO_EXPAT=YesPlease"
|
||||
else
|
||||
myopts+=" NO_CURL=YesPlease"
|
||||
fi
|
||||
|
||||
# broken assumptions, because of broken build system ...
|
||||
myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
|
||||
myopts+=" INSTALL=install TAR=tar"
|
||||
myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
|
||||
myopts+=" SANE_TOOL_PATH="
|
||||
myopts+=" OLD_ICONV="
|
||||
myopts+=" NO_EXTERNAL_GREP="
|
||||
|
||||
# For svn-fe
|
||||
extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
|
||||
|
||||
# can't define this to null, since the entire makefile depends on it
|
||||
sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
|
||||
|
||||
use iconv \
|
||||
|| myopts+=" NO_ICONV=YesPlease"
|
||||
use nls \
|
||||
|| myopts+=" NO_GETTEXT=YesPlease"
|
||||
use tk \
|
||||
|| myopts+=" NO_TCLTK=YesPlease"
|
||||
use pcre \
|
||||
&& myopts+=" USE_LIBPCRE=yes" \
|
||||
&& extlibs+=" -lpcre"
|
||||
use perl \
|
||||
&& myopts+=" INSTALLDIRS=vendor" \
|
||||
|| myopts+=" NO_PERL=YesPlease"
|
||||
use python \
|
||||
|| myopts+=" NO_PYTHON=YesPlease"
|
||||
use subversion \
|
||||
|| myopts+=" NO_SVN_TESTS=YesPlease"
|
||||
use threads \
|
||||
&& myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
|
||||
|| myopts+=" NO_PTHREADS=YesPlease"
|
||||
use cvs \
|
||||
|| myopts+=" NO_CVS=YesPlease"
|
||||
# Disabled until ~m68k-mint can be keyworded again
|
||||
# if [[ ${CHOST} == *-mint* ]] ; then
|
||||
# myopts+=" NO_MMAP=YesPlease"
|
||||
# myopts+=" NO_IPV6=YesPlease"
|
||||
# myopts+=" NO_STRLCPY=YesPlease"
|
||||
# myopts+=" NO_MEMMEM=YesPlease"
|
||||
# myopts+=" NO_MKDTEMP=YesPlease"
|
||||
# myopts+=" NO_MKSTEMPS=YesPlease"
|
||||
# fi
|
||||
if [[ ${CHOST} == ia64-*-hpux* ]]; then
|
||||
myopts+=" NO_NSEC=YesPlease"
|
||||
fi
|
||||
if [[ ${CHOST} == *-*-aix* ]]; then
|
||||
myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
|
||||
fi
|
||||
if [[ ${CHOST} == *-solaris* ]]; then
|
||||
myopts+=" NEEDS_LIBICONV=YesPlease"
|
||||
fi
|
||||
|
||||
has_version '>=app-text/asciidoc-8.0' \
|
||||
&& myopts+=" ASCIIDOC8=YesPlease"
|
||||
myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
|
||||
|
||||
# Bug 290465:
|
||||
# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
|
||||
[[ "${CHOST}" == *-uclibc* ]] && \
|
||||
myopts+=" NO_NSEC=YesPlease"
|
||||
|
||||
export MY_MAKEOPTS="${myopts}"
|
||||
export EXTLIBS="${extlibs}"
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
if [[ ${PV} != *9999 ]]; then
|
||||
unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
|
||||
cd "${S}"
|
||||
unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
|
||||
use doc && \
|
||||
cd "${S}"/Documentation && \
|
||||
unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
|
||||
cd "${S}"
|
||||
else
|
||||
git-2_src_unpack
|
||||
cd "${S}"
|
||||
#cp "${FILESDIR}"/GIT-VERSION-GEN .
|
||||
fi
|
||||
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# bug #350330 - automagic CVS when we don't want it is bad.
|
||||
epatch "${FILESDIR}"/git-2.2.2-optional-cvs.patch
|
||||
|
||||
# install mediawiki perl modules also in vendor_dir
|
||||
# hack, needs better upstream solution
|
||||
epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch
|
||||
|
||||
epatch "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
|
||||
|
||||
# Bug #493306, where FreeBSD 10.x merged libiconv into its libc.
|
||||
epatch "${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch
|
||||
|
||||
epatch_user
|
||||
|
||||
sed -i \
|
||||
-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
|
||||
-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
|
||||
-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
|
||||
-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
|
||||
-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
|
||||
-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
|
||||
Makefile contrib/svn-fe/Makefile || die "sed failed"
|
||||
|
||||
# Never install the private copy of Error.pm (bug #296310)
|
||||
sed -i \
|
||||
-e '/private-Error.pm/s,^,#,' \
|
||||
perl/Makefile.PL
|
||||
|
||||
# Fix docbook2texi command
|
||||
sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
|
||||
Documentation/Makefile || die "sed failed"
|
||||
|
||||
# Fix git-subtree missing DESTDIR
|
||||
sed -i \
|
||||
-e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
|
||||
-e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \
|
||||
contrib/subtree/Makefile
|
||||
}
|
||||
|
||||
git_emake() {
|
||||
# bug #326625: PERL_PATH, PERL_MM_OPT
|
||||
# bug #320647: PYTHON_PATH
|
||||
PYTHON_PATH=""
|
||||
use python && PYTHON_PATH="${PYTHON}"
|
||||
emake ${MY_MAKEOPTS} \
|
||||
DESTDIR="${D}" \
|
||||
OPTCFLAGS="${CFLAGS}" \
|
||||
OPTLDFLAGS="${LDFLAGS}" \
|
||||
OPTCC="$(tc-getCC)" \
|
||||
OPTAR="$(tc-getAR)" \
|
||||
prefix="${EPREFIX}"/usr \
|
||||
htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
|
||||
sysconfdir="${EPREFIX}"/etc \
|
||||
PYTHON_PATH="${PYTHON_PATH}" \
|
||||
PERL_MM_OPT="" \
|
||||
GIT_TEST_OPTS="--no-color" \
|
||||
V=1 \
|
||||
"$@"
|
||||
# This is the fix for bug #326625, but it also causes breakage, see bug
|
||||
# #352693.
|
||||
# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
exportmakeopts
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
if use perl ; then
|
||||
git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
|
||||
git_emake perl/perl.mak || die "emake perl/perl.mak failed"
|
||||
fi
|
||||
git_emake || die "emake failed"
|
||||
|
||||
if use emacs ; then
|
||||
elisp-compile contrib/emacs/git{,-blame}.el
|
||||
fi
|
||||
|
||||
if use perl && use cgi ; then
|
||||
git_emake \
|
||||
gitweb \
|
||||
|| die "emake gitweb (cgi) failed"
|
||||
fi
|
||||
|
||||
if [[ ${CHOST} == *-darwin* ]]; then
|
||||
cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain"
|
||||
git_emake || die "emake credential-osxkeychain"
|
||||
fi
|
||||
|
||||
cd "${S}"/Documentation
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
git_emake man \
|
||||
|| die "emake man failed"
|
||||
if use doc ; then
|
||||
git_emake info html \
|
||||
|| die "emake info html failed"
|
||||
fi
|
||||
else
|
||||
if use doc ; then
|
||||
git_emake info \
|
||||
|| die "emake info html failed"
|
||||
fi
|
||||
fi
|
||||
|
||||
if use subversion ; then
|
||||
cd "${S}"/contrib/svn-fe
|
||||
# by defining EXTLIBS we override the detection for libintl and
|
||||
# libiconv, bug #516168
|
||||
local nlsiconv=
|
||||
use nls && use !elibc_glibc && nlsiconv+=" -lintl"
|
||||
use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
|
||||
git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
|
||||
if use doc ; then
|
||||
git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
|
||||
fi
|
||||
cd "${S}"
|
||||
fi
|
||||
|
||||
if use gnome-keyring ; then
|
||||
cd "${S}"/contrib/credential/gnome-keyring
|
||||
git_emake || die "emake git-credential-gnome-keyring failed"
|
||||
fi
|
||||
|
||||
cd "${S}"/contrib/subtree
|
||||
git_emake
|
||||
use doc && git_emake doc
|
||||
|
||||
if use mediawiki ; then
|
||||
cd "${S}"/contrib/mw-to-git
|
||||
git_emake
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
git_emake \
|
||||
install || \
|
||||
die "make install failed"
|
||||
|
||||
if [[ ${CHOST} == *-darwin* ]]; then
|
||||
dobin contrib/credential/osxkeychain/git-credential-osxkeychain
|
||||
fi
|
||||
|
||||
# Depending on the tarball and manual rebuild of the documentation, the
|
||||
# manpages may exist in either OR both of these directories.
|
||||
find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
|
||||
find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
|
||||
|
||||
dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
|
||||
use doc && dodir /usr/share/doc/${PF}/html
|
||||
for d in / /howto/ /technical/ ; do
|
||||
docinto ${d}
|
||||
dodoc Documentation${d}*.txt
|
||||
use doc && dohtml -p ${d} Documentation${d}*.html
|
||||
done
|
||||
docinto /
|
||||
# Upstream does not ship this pre-built :-(
|
||||
use doc && doinfo Documentation/{git,gitman}.info
|
||||
|
||||
newbashcomp contrib/completion/git-completion.bash ${PN}
|
||||
bashcomp_alias git gitk
|
||||
# Not really a bash-completion file (bug #477920)
|
||||
# but still needed uncompressed (bug #507480)
|
||||
insinto /usr/share/${PN}
|
||||
doins contrib/completion/git-prompt.sh
|
||||
|
||||
if use emacs ; then
|
||||
elisp-install ${PN} contrib/emacs/git.{el,elc}
|
||||
elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
|
||||
#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
|
||||
# don't add automatically to the load-path, so the sitefile
|
||||
# can do a conditional loading
|
||||
touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
|
||||
elisp-site-file-install "${FILESDIR}"/${SITEFILE}
|
||||
fi
|
||||
|
||||
if use python && use gtk ; then
|
||||
python_doscript "${S}"/contrib/gitview/gitview
|
||||
dodoc "${S}"/contrib/gitview/gitview.txt
|
||||
fi
|
||||
|
||||
#dobin contrib/fast-import/git-p4 # Moved upstream
|
||||
#dodoc contrib/fast-import/git-p4.txt # Moved upstream
|
||||
newbin contrib/fast-import/import-tars.perl import-tars
|
||||
exeinto /usr/libexec/git-core/
|
||||
newexe contrib/git-resurrect.sh git-resurrect
|
||||
|
||||
# git-subtree
|
||||
cd "${S}"/contrib/subtree
|
||||
git_emake install || die "Failed to emake install git-subtree"
|
||||
if use doc ; then
|
||||
git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
|
||||
fi
|
||||
newdoc README README.git-subtree
|
||||
dodoc git-subtree.txt
|
||||
cd "${S}"
|
||||
|
||||
if use mediawiki ; then
|
||||
cd "${S}"/contrib/mw-to-git
|
||||
git_emake install
|
||||
cd "${S}"
|
||||
fi
|
||||
|
||||
# diff-highlight
|
||||
dobin contrib/diff-highlight/diff-highlight
|
||||
newdoc contrib/diff-highlight/README README.diff-highlight
|
||||
|
||||
# git-jump
|
||||
exeinto /usr/libexec/git-core/
|
||||
doexe contrib/git-jump/git-jump
|
||||
newdoc contrib/git-jump/README git-jump.txt
|
||||
|
||||
# git-contacts
|
||||
exeinto /usr/libexec/git-core/
|
||||
doexe contrib/contacts/git-contacts
|
||||
dodoc contrib/contacts/git-contacts.txt
|
||||
|
||||
if use gnome-keyring ; then
|
||||
cd "${S}"/contrib/credential/gnome-keyring
|
||||
dobin git-credential-gnome-keyring
|
||||
fi
|
||||
|
||||
if use subversion ; then
|
||||
cd "${S}"/contrib/svn-fe
|
||||
dobin svn-fe
|
||||
dodoc svn-fe.txt
|
||||
use doc && doman svn-fe.1 && dohtml svn-fe.html
|
||||
cd "${S}"
|
||||
fi
|
||||
|
||||
dodir /usr/share/${PN}/contrib
|
||||
# The following are excluded:
|
||||
# completion - installed above
|
||||
# credential/gnome-keyring TODO
|
||||
# diff-highlight - done above
|
||||
# emacs - installed above
|
||||
# examples - these are stuff that is not used in Git anymore actually
|
||||
# git-jump - done above
|
||||
# gitview - installed above
|
||||
# p4import - excluded because fast-import has a better one
|
||||
# patches - stuff the Git guys made to go upstream to other places
|
||||
# persistent-https - TODO
|
||||
# mw-to-git - TODO
|
||||
# subtree - build seperately
|
||||
# svnimport - use git-svn
|
||||
# thunderbird-patch-inline - fixes thunderbird
|
||||
for i in \
|
||||
buildsystems convert-objects fast-import \
|
||||
hg-to-git hooks remotes2config.sh rerere-train.sh \
|
||||
stats workdir \
|
||||
; do
|
||||
cp -rf \
|
||||
"${S}"/contrib/${i} \
|
||||
"${ED}"/usr/share/${PN}/contrib \
|
||||
|| die "Failed contrib ${i}"
|
||||
done
|
||||
|
||||
if use perl && use cgi ; then
|
||||
# We used to install in /usr/share/${PN}/gitweb
|
||||
# but upstream installs in /usr/share/gitweb
|
||||
# so we will install a symlink and use their location for compat with other
|
||||
# distros
|
||||
dosym /usr/share/gitweb /usr/share/${PN}/gitweb
|
||||
|
||||
# INSTALL discusses configuration issues, not just installation
|
||||
docinto /
|
||||
newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb
|
||||
newdoc "${S}"/gitweb/README README.gitweb
|
||||
|
||||
find "${ED}"/usr/lib64/perl5/ \
|
||||
-name .packlist \
|
||||
-exec rm \{\} \;
|
||||
else
|
||||
rm -rf "${ED}"/usr/share/gitweb
|
||||
fi
|
||||
|
||||
if ! use subversion ; then
|
||||
rm -f "${ED}"/usr/libexec/git-core/git-svn \
|
||||
"${ED}"/usr/share/man/man1/git-svn.1*
|
||||
fi
|
||||
|
||||
if use xinetd ; then
|
||||
insinto /etc/xinetd.d
|
||||
newins "${FILESDIR}"/git-daemon.xinetd git-daemon
|
||||
fi
|
||||
|
||||
if use !prefix ; then
|
||||
newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
|
||||
newconfd "${FILESDIR}"/git-daemon.confd git-daemon
|
||||
systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service"
|
||||
systemd_dounit "${FILESDIR}/git-daemon.socket"
|
||||
fi
|
||||
|
||||
perl_delete_localpod
|
||||
}
|
||||
|
||||
src_test() {
|
||||
local disabled="" #t7004-tag.sh" #520270
|
||||
local tests_cvs="t9200-git-cvsexportcommit.sh \
|
||||
t9400-git-cvsserver-server.sh \
|
||||
t9401-git-cvsserver-crlf.sh \
|
||||
t9402-git-cvsserver-refs.sh \
|
||||
t9600-cvsimport.sh \
|
||||
t9601-cvsimport-vendor-branch.sh \
|
||||
t9602-cvsimport-branches-tags.sh \
|
||||
t9603-cvsimport-patchsets.sh \
|
||||
t9604-cvsimport-timestamps.sh"
|
||||
local tests_perl="t3701-add-interactive.sh \
|
||||
t5502-quickfetch.sh \
|
||||
t5512-ls-remote.sh \
|
||||
t5520-pull.sh \
|
||||
t7106-reset-unborn-branch.sh \
|
||||
t7501-commit.sh"
|
||||
# Bug #225601 - t0004 is not suitable for root perm
|
||||
# Bug #219839 - t1004 is not suitable for root perm
|
||||
# t0001-init.sh - check for init notices EPERM* fails
|
||||
local tests_nonroot="t0001-init.sh \
|
||||
t0004-unwritable.sh \
|
||||
t0070-fundamental.sh \
|
||||
t1004-read-tree-m-u-wf.sh \
|
||||
t3700-add.sh \
|
||||
t7300-clean.sh"
|
||||
# t9100 still fails with symlinks in SVN 1.7
|
||||
local test_svn="t9100-git-svn-basic.sh"
|
||||
|
||||
# Unzip is used only for the testcase code, not by any normal parts of Git.
|
||||
if ! has_version app-arch/unzip ; then
|
||||
einfo "Disabling tar-tree tests"
|
||||
disabled="${disabled} t5000-tar-tree.sh"
|
||||
fi
|
||||
|
||||
cvs=0
|
||||
use cvs && let cvs=$cvs+1
|
||||
if [[ ${EUID} -eq 0 ]]; then
|
||||
if [[ $cvs -eq 1 ]]; then
|
||||
ewarn "Skipping CVS tests because CVS does not work as root!"
|
||||
ewarn "You should retest with FEATURES=userpriv!"
|
||||
disabled="${disabled} ${tests_cvs}"
|
||||
fi
|
||||
einfo "Skipping other tests that require being non-root"
|
||||
disabled="${disabled} ${tests_nonroot}"
|
||||
else
|
||||
[[ $cvs -gt 0 ]] && \
|
||||
has_version dev-vcs/cvs && \
|
||||
let cvs=$cvs+1
|
||||
[[ $cvs -gt 1 ]] && \
|
||||
has_version "dev-vcs/cvs[server]" && \
|
||||
let cvs=$cvs+1
|
||||
if [[ $cvs -lt 3 ]]; then
|
||||
einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
|
||||
disabled="${disabled} ${tests_cvs}"
|
||||
fi
|
||||
fi
|
||||
|
||||
if ! use perl ; then
|
||||
einfo "Disabling tests that need Perl"
|
||||
disabled="${disabled} ${tests_perl}"
|
||||
fi
|
||||
|
||||
einfo "Disabling tests that fail with SVN 1.7"
|
||||
disabled="${disabled} ${test_svn}"
|
||||
|
||||
# Reset all previously disabled tests
|
||||
cd "${S}/t"
|
||||
for i in *.sh.DISABLED ; do
|
||||
[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
|
||||
done
|
||||
einfo "Disabled tests:"
|
||||
for i in ${disabled} ; do
|
||||
[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
|
||||
done
|
||||
|
||||
# Avoid the test system removing the results because we want them ourselves
|
||||
sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
|
||||
-i "${S}"/t/Makefile
|
||||
|
||||
# Clean old results first, must always run
|
||||
cd "${S}/t"
|
||||
nonfatal git_emake clean
|
||||
|
||||
# Now run the tests, keep going if we hit an error, and don't terminate on
|
||||
# failure
|
||||
cd "${S}"
|
||||
einfo "Start test run"
|
||||
#MAKEOPTS=-j1
|
||||
nonfatal git_emake --keep-going test
|
||||
rc=$?
|
||||
|
||||
# Display nice results, now print the results
|
||||
cd "${S}/t"
|
||||
nonfatal git_emake aggregate-results
|
||||
|
||||
# And bail if there was a problem
|
||||
[ $rc -eq 0 ] || die "tests failed. Please file a bug."
|
||||
}
|
||||
|
||||
showpkgdeps() {
|
||||
local pkg=$1
|
||||
shift
|
||||
elog " $(printf "%-17s:" ${pkg}) ${@}"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
use emacs && elisp-site-regen
|
||||
einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
|
||||
einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
|
||||
einfo "Note that the prompt bash code is now in that separate script"
|
||||
elog "These additional scripts need some dependencies:"
|
||||
echo
|
||||
showpkgdeps git-quiltimport "dev-util/quilt"
|
||||
showpkgdeps git-instaweb \
|
||||
"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
|
||||
echo
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
use emacs && elisp-site-regen
|
||||
}
|
||||
Reference in New Issue
Block a user