diff options
| -rw-r--r-- | dev-vcs/git/Manifest | 6 | ||||
| -rw-r--r-- | dev-vcs/git/git-2.21.0.ebuild (renamed from dev-vcs/git/git-2.21.0_rc2.ebuild) | 30 |
2 files changed, 20 insertions, 16 deletions
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest index 8563ba3264c9..d07847a65ba2 100644 --- a/dev-vcs/git/Manifest +++ b/dev-vcs/git/Manifest @@ -1,9 +1,9 @@ DIST git-2.19.2.tar.xz 5235608 BLAKE2B ece292b8cf41deafc63c00e6176b0de39936f7d840d776192f32c1e293abc06c39119d13ed947d3de6a212fa6973bedb288c06f8bfcfc8144e563d5af40e45da SHA512 1d707c1a7a16fe9399592b0354e9023f701b019f36fe775997c46354d40617a80fa04aacc5330825c4f9301c2910ead8b26274a7f3b92e9d790b4705c0d7aa96 DIST git-2.20.1.tar.xz 5359872 BLAKE2B f7eb640f179837687b2b343d8a3a03d7d0fa60ca17e28dc5637a75800752d0e02be4c535dc4c3be6f25020aa419f22aa6855c641b06c61ebf45e0c51de069262 SHA512 3f05ea3a645d4d74c7380b03e2de39f893ff77a05d8b595ce30300d1d4e032f11d84952366096f8effd5fba18dfa5ebb946bc07a984eb7cbbda113cb88202f6c -DIST git-2.21.0.rc2.tar.xz 5399292 BLAKE2B 81cb6ecf7d5e4c9e0943632fa94295d1ac5a80dea8233d5f7329ef41c14fee475e1fcd26caeb08b132d6b4a81ca10f1499718bdb725322bf2ff58e7826eae172 SHA512 9d97af084d1159893fc9da3c6c62ac6c30a06a910e9d76ef303449f808cf95e54b1c7d08f7250455e9b9bcfe5cdf9b66dc425e2f5d653908587c07db9b29f747 +DIST git-2.21.0.tar.xz 5491296 BLAKE2B c5e66f4d4045f99bb4306e8f096ae9299908383df78bdf2a954cd415f4778eb59ea0ee7d501689313617de7dc1d2ee4ae15ab70dee564add5de877109073ddff SHA512 83f57c3950a07f6773a3aea66611d22daba0e5599e5d8f0751a16f6fdbeab0f3844d942a39a5642051212df99d1d4513253c36829b1454b4f0977cc6026fd973 DIST git-htmldocs-2.19.2.tar.xz 1223848 BLAKE2B 6f30192cb101988fdfcce3bb79c684c6d1ac08cdc929caa049102fba10277fa8cc908904fe7472e40d60707c1b23145d95c441c1401c8697c37a81456d79aab8 SHA512 830e780beea10bde750d09a335fd9986c5ffbf47a724cbbeed5a1a2c94bc81d9c9223e415c5888faf81ab6404e460565434988f6635312039b88282a46014634 DIST git-htmldocs-2.20.1.tar.xz 1227884 BLAKE2B 2e3b5e888d187cc7563a36d9b0c43118fbc50ddf9ca65a98319f563ff226e1f9829d578f578619e04d9576eae95631188973484aa758a9706a7a08261e0a16ad SHA512 aae04a8a42865a855d699d445d2fbed657aecce8d090a36e171c6cf260175102fe2314142f3b59d200460560b413698fb263e77cadae49171bff50b96edb6d63 -DIST git-htmldocs-2.21.0.rc2.tar.xz 1235132 BLAKE2B 9bc6b53c8c1c0ac073a00ec7ef8c0df17af22a16ad5e11eea0ebbc23bd8ae69f6d8111e8d64f9555184782fbb8a200fdfec9f87f6da2001ab70838ccf2db479b SHA512 de24493b56da942d1c889e4ca1318cb445fa082c77e6b1d212ef7c880064d054d21afdd61c555df2576b457c2b01c9933a511403aaf6a716843de1f1cc8462ce +DIST git-htmldocs-2.21.0.tar.xz 1234956 BLAKE2B d8ef32acbad7eeb8758f711e09c380dbf3ca72526067b3a86ed0865e37351c4fac1f0c7e845e7b0c27a1d955c64622f10c999389446b53191acdc05a44647847 SHA512 4537b3f67d03050e5daefaa6f274d3acdf6e116dc8c7f76566b33100e76a445c3e3894b5ff63b5ddb024e1c691a3bf08acea42dbec681da1b0f1de2e5736c9c4 DIST git-manpages-2.19.2.tar.xz 432200 BLAKE2B 92b4c87c40e20133c4b6d9b7f3d56952556470855543a329ea0fb7a91382396376755656ded029d68df8291b0ffecc3e6b2b4c6f71cb8694d44c5f02da7357f8 SHA512 329ea9a6de4a5352c57d2ea3df0cf6caf9dcf03728416a3bca5a5ebc5dc133abe1faffd5e5b5ae11cc91412baff93df83ff684f3626bbac0770ca94bc79d2cb1 DIST git-manpages-2.20.1.tar.xz 439172 BLAKE2B c1c7a3031d600e53451ff2c35b00a541dfc09554b47567c4bfa8410d891dbd98c2ff28cbff5deff21e74c1c92eaa70777013e23bae6a484ba1690bbefc1740fa SHA512 43ab28063b896062727ced8aa64119daebef261c5b393cec112fe9872955a165abc3d91f75f6e273d60b15f3c49eba44dfc7591ede452cfee8362f7d5f39c5f7 -DIST git-manpages-2.21.0.rc2.tar.xz 440180 BLAKE2B 9f4e45a27e20a96a53a829e6800d2cd66f9bbc6da601ec50ea19bfb434d52ad44e1ff611253f97e23b0999fd46ffa63d87760530ed2d45671b2298c7c027d432 SHA512 36185d079d865846112836def1b352757f7a6bcf49a8b241181a179cc599c535e913d31b4580241b58a07d2d1d694e766eaaa4dba5ffdbe716142050c9f66d29 +DIST git-manpages-2.21.0.tar.xz 440096 BLAKE2B 6cbedf6e497b0d13c62003b166293a0d438d163255bce845eaf75e08a3eec49060c314e73d24c1c015101868d9149e9b0cd1c2e8cb3ce2245b8acae5701fe8ba SHA512 61e01cd312dbade8aac0144e32edc5eea2708b274273c207889a291cea18d131c9c2d83cc405ba8a955d387fd1e6dd74b7bdae4003f2062501073a0844122d30 diff --git a/dev-vcs/git/git-2.21.0_rc2.ebuild b/dev-vcs/git/git-2.21.0.ebuild index c26c4f8ee32e..ad2cb1dae850 100644 --- a/dev-vcs/git/git-2.21.0_rc2.ebuild +++ b/dev-vcs/git/git-2.21.0.ebuild @@ -26,7 +26,7 @@ if [[ ${PV} == *9999 ]]; then esac fi -inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM} +inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM} MY_PV="${PV/_rc/.rc}" MY_P="${PN}-${MY_PV}" @@ -194,7 +194,7 @@ exportmakeopts() { ) # For svn-fe - extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" + 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 || die @@ -202,13 +202,13 @@ exportmakeopts() { if use pcre; then if use pcre-jit; then myopts+=( USE_LIBPCRE2=YesPlease ) - extlibs+=" -lpcre2-8" + extlibs+=( -lpcre2-8 ) else myopts+=( USE_LIBPCRE1=YesPlease NO_LIBPCRE1_JIT=YesPlease ) - extlibs+=" -lpcre" + extlibs+=( -lpcre ) fi fi # Disabled until ~m68k-mint can be keyworded again @@ -233,7 +233,7 @@ exportmakeopts() { NEEDS_LIBICONV=YesPlease HAVE_CLOCK_MONOTONIC=1 ) - grep -q getdelim "${ROOT}"/usr/include/stdio.h && \ + grep -q getdelim "${ROOT%/}"/usr/include/stdio.h && \ myopts+=( HAVE_GETDELIM=1 ) fi @@ -246,7 +246,7 @@ exportmakeopts() { myopts+=( NO_NSEC=YesPlease ) export MY_MAKEOPTS="${myopts[@]}" - export EXTLIBS="${extlibs}" + export EXTLIBS="${extlibs[@]}" } src_unpack() { @@ -359,12 +359,14 @@ src_compile() { pushd contrib/svn-fe &>/dev/null || die # 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" + 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" + git_emake svn-fe.{1,html} \ + || die "emake svn-fe.1 svn-fe.html failed" fi popd &>/dev/null || die fi @@ -407,6 +409,7 @@ src_install() { find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] dodoc README* Documentation/{SubmittingPatches,CodingGuidelines} use doc && dodir /usr/share/doc/${PF}/html + local d for d in / /howto/ /technical/ ; do docinto ${d} dodoc Documentation${d}*.txt @@ -432,7 +435,7 @@ src_install() { #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" + touch "${ED%/}${SITELISP}/${PN}/compat/.nosearch" elisp-site-file-install "${FILESDIR}"/${SITEFILE} fi @@ -515,6 +518,7 @@ src_install() { stats workdir ) + local i for i in "${contrib_objects[@]}" ; do cp -rf \ "${S}"/contrib/${i} \ @@ -535,7 +539,7 @@ src_install() { newdoc "${S}"/gitweb/README README.gitweb for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do - if test -d "$d" ; then find "$d" \ + if test -d "${d}" ; then find "${d}" \ -name .packlist \ -delete || die fi |