From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 562241382C5 for ; Fri, 5 Mar 2021 10:04:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 90482E091A; Fri, 5 Mar 2021 10:04:16 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 67946E091A for ; Fri, 5 Mar 2021 10:04:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 029B8340ECD for ; Fri, 5 Mar 2021 10:04:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7D2CE478 for ; Fri, 5 Mar 2021 10:04:13 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1614938651.5c751524d6c25185448789a743c03d622fb453a5.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-vcs/git/git-2.31.0_rc1.ebuild dev-vcs/git/git-9999-r1.ebuild dev-vcs/git/git-9999-r2.ebuild dev-vcs/git/git-9999-r3.ebuild dev-vcs/git/git-9999.ebuild X-VCS-Directories: dev-vcs/git/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 5c751524d6c25185448789a743c03d622fb453a5 X-VCS-Branch: master Date: Fri, 5 Mar 2021 10:04:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 164ab014-939b-4ab6-b8c6-c681f2f0a31e X-Archives-Hash: 2e5663b951819f38aec2997a1139ee70 commit: 5c751524d6c25185448789a743c03d622fb453a5 Author: Lars Wendler gentoo org> AuthorDate: Fri Mar 5 09:55:13 2021 +0000 Commit: Lars Wendler gentoo org> CommitDate: Fri Mar 5 10:04:11 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c751524 dev-vcs/git: Ebuild adjustments Package-Manager: Portage-3.0.16, Repoman-3.0.2 Signed-off-by: Lars Wendler gentoo.org> dev-vcs/git/git-2.31.0_rc1.ebuild | 48 ++++++++++++++++++--------------------- dev-vcs/git/git-9999-r1.ebuild | 48 ++++++++++++++++++--------------------- dev-vcs/git/git-9999-r2.ebuild | 48 ++++++++++++++++++--------------------- dev-vcs/git/git-9999-r3.ebuild | 48 ++++++++++++++++++--------------------- dev-vcs/git/git-9999.ebuild | 48 ++++++++++++++++++--------------------- 5 files changed, 110 insertions(+), 130 deletions(-) diff --git a/dev-vcs/git/git-2.31.0_rc1.ebuild b/dev-vcs/git/git-2.31.0_rc1.ebuild index 8ec5c0d0238..d27d54e5bd7 100644 --- a/dev-vcs/git/git-2.31.0_rc1.ebuild +++ b/dev-vcs/git/git-2.31.0_rc1.ebuild @@ -222,7 +222,7 @@ exportmakeopts() { NEEDS_LIBICONV=YesPlease HAVE_CLOCK_MONOTONIC=1 ) - if grep -q getdelim "${EROOT}"/usr/include/stdio.h ; then + if grep -Fq getdelim "${EROOT}"/usr/include/stdio.h ; then myopts+=( HAVE_GETDELIM=1 ) fi fi @@ -243,7 +243,7 @@ exportmakeopts() { } src_unpack() { - if [[ ${PV} != *9999 ]]; then + if [[ ${PV} != *9999 ]] ; then unpack ${MY_P}.tar.${SRC_URI_SUFFIX} cd "${S}" || die unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} @@ -320,9 +320,7 @@ src_compile() { fi if use perl && use cgi ; then - git_emake \ - gitweb \ - || die "emake gitweb (cgi) failed" + git_emake gitweb || die "emake gitweb (cgi) failed" fi if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then @@ -334,16 +332,13 @@ src_compile() { pushd Documentation &>/dev/null || die if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" + git_emake man || die "emake man failed" if use doc ; then - git_emake info html \ - || die "emake info html failed" + git_emake info html || die "emake info html failed" fi else if use doc ; then - git_emake info \ - || die "emake info html failed" + git_emake info || die "emake info html failed" fi fi popd &>/dev/null || die @@ -355,18 +350,18 @@ src_compile() { fi pushd contrib/subtree &>/dev/null || die - git_emake git-subtree + git_emake git-subtree || die # git-subtree.1 requires the full USE=doc dependency stack use doc && git_emake git-subtree.html git-subtree.1 popd &>/dev/null || die pushd contrib/diff-highlight &>/dev/null || die - git_emake + git_emake || die popd &>/dev/null || die if use mediawiki ; then pushd contrib/mw-to-git &>/dev/null || die - git_emake + git_emake || die popd &>/dev/null || die fi @@ -504,9 +499,8 @@ src_install() { newdoc "${S}"/gitweb/README README.gitweb for d in "${ED}"/usr/lib{,64}/perl5/ ; do - if test -d "${d}" ; then find "${d}" \ - -name .packlist \ - -delete || die + if [[ -d "${d}" ]] ; then + find "${d}" -name .packlist -delete || die fi done else @@ -523,10 +517,11 @@ src_install() { newins "${FILESDIR}"/git-daemon.xinetd git-daemon fi - if use !prefix ; then + 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-r1.service" "git-daemon@.service" + systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" \ + "git-daemon@.service" systemd_dounit "${FILESDIR}/git-daemon.socket" fi @@ -536,7 +531,7 @@ src_install() { # we could remove sources in src_prepare, but install does not # handle missing locale dir well rm_loc() { - if [[ -e "${ED}/usr/share/locale/${1}" ]]; then + if [[ -e "${ED}/usr/share/locale/${1}" ]] ; then rm -r "${ED}/usr/share/locale/${1}" || die fi } @@ -586,8 +581,8 @@ src_test() { local cvs=0 use cvs && let cvs=${cvs}+1 - if [[ ${EUID} -eq 0 ]]; then - if [[ ${cvs} -eq 1 ]]; then + 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+=( ${tests_cvs[@]} ) @@ -601,7 +596,7 @@ src_test() { [[ ${cvs} -gt 1 ]] && \ has_version "dev-vcs/cvs[server]" && \ let cvs=${cvs}+1 - if [[ ${cvs} -lt 3 ]]; then + if [[ ${cvs} -lt 3 ]] ; then einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" disabled+=( ${tests_cvs[@]} ) fi @@ -623,12 +618,13 @@ src_test() { done einfo "Disabled tests:" for i in ${disabled[@]} ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}" + if [[ -f "${i}" ]] ; then + mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}" + fi done # Avoid the test system removing the results because we want them ourselves - sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ - -i Makefile || die + sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' -i Makefile || die # Clean old results first, must always run nonfatal git_emake clean diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild index 4ac81a2361e..ed601ab8553 100644 --- a/dev-vcs/git/git-9999-r1.ebuild +++ b/dev-vcs/git/git-9999-r1.ebuild @@ -222,7 +222,7 @@ exportmakeopts() { NEEDS_LIBICONV=YesPlease HAVE_CLOCK_MONOTONIC=1 ) - if grep -q getdelim "${EROOT}"/usr/include/stdio.h ; then + if grep -Fq getdelim "${EROOT}"/usr/include/stdio.h ; then myopts+=( HAVE_GETDELIM=1 ) fi fi @@ -243,7 +243,7 @@ exportmakeopts() { } src_unpack() { - if [[ ${PV} != *9999 ]]; then + if [[ ${PV} != *9999 ]] ; then unpack ${MY_P}.tar.${SRC_URI_SUFFIX} cd "${S}" || die unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} @@ -320,9 +320,7 @@ src_compile() { fi if use perl && use cgi ; then - git_emake \ - gitweb \ - || die "emake gitweb (cgi) failed" + git_emake gitweb || die "emake gitweb (cgi) failed" fi if [[ ${CHOST} == *-darwin* ]]; then @@ -334,16 +332,13 @@ src_compile() { pushd Documentation &>/dev/null || die if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" + git_emake man || die "emake man failed" if use doc ; then - git_emake info html \ - || die "emake info html failed" + git_emake info html || die "emake info html failed" fi else if use doc ; then - git_emake info \ - || die "emake info html failed" + git_emake info || die "emake info html failed" fi fi popd &>/dev/null || die @@ -355,18 +350,18 @@ src_compile() { fi pushd contrib/subtree &>/dev/null || die - git_emake git-subtree + git_emake git-subtree || die # git-subtree.1 requires the full USE=doc dependency stack use doc && git_emake git-subtree.html git-subtree.1 popd &>/dev/null || die pushd contrib/diff-highlight &>/dev/null || die - git_emake + git_emake || die popd &>/dev/null || die if use mediawiki ; then pushd contrib/mw-to-git &>/dev/null || die - git_emake + git_emake || die popd &>/dev/null || die fi @@ -504,9 +499,8 @@ src_install() { newdoc "${S}"/gitweb/README README.gitweb for d in "${ED}"/usr/lib{,64}/perl5/ ; do - if test -d "${d}" ; then find "${d}" \ - -name .packlist \ - -delete || die + if [[ -d "${d}" ]] ; then + find "${d}" -name .packlist -delete || die fi done else @@ -523,10 +517,11 @@ src_install() { newins "${FILESDIR}"/git-daemon.xinetd git-daemon fi - if use !prefix ; then + 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-r1.service" "git-daemon@.service" + systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" \ + "git-daemon@.service" systemd_dounit "${FILESDIR}/git-daemon.socket" fi @@ -536,7 +531,7 @@ src_install() { # we could remove sources in src_prepare, but install does not # handle missing locale dir well rm_loc() { - if [[ -e "${ED}/usr/share/locale/${1}" ]]; then + if [[ -e "${ED}/usr/share/locale/${1}" ]] ; then rm -r "${ED}/usr/share/locale/${1}" || die fi } @@ -586,8 +581,8 @@ src_test() { local cvs=0 use cvs && let cvs=${cvs}+1 - if [[ ${EUID} -eq 0 ]]; then - if [[ ${cvs} -eq 1 ]]; then + 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+=( ${tests_cvs[@]} ) @@ -601,7 +596,7 @@ src_test() { [[ ${cvs} -gt 1 ]] && \ has_version "dev-vcs/cvs[server]" && \ let cvs=${cvs}+1 - if [[ ${cvs} -lt 3 ]]; then + if [[ ${cvs} -lt 3 ]] ; then einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" disabled+=( ${tests_cvs[@]} ) fi @@ -623,12 +618,13 @@ src_test() { done einfo "Disabled tests:" for i in ${disabled[@]} ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}" + if [[ -f "${i}" ]] ; then + mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}" + fi done # Avoid the test system removing the results because we want them ourselves - sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ - -i Makefile || die + sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' -i Makefile || die # Clean old results first, must always run nonfatal git_emake clean diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild index 4ac81a2361e..ed601ab8553 100644 --- a/dev-vcs/git/git-9999-r2.ebuild +++ b/dev-vcs/git/git-9999-r2.ebuild @@ -222,7 +222,7 @@ exportmakeopts() { NEEDS_LIBICONV=YesPlease HAVE_CLOCK_MONOTONIC=1 ) - if grep -q getdelim "${EROOT}"/usr/include/stdio.h ; then + if grep -Fq getdelim "${EROOT}"/usr/include/stdio.h ; then myopts+=( HAVE_GETDELIM=1 ) fi fi @@ -243,7 +243,7 @@ exportmakeopts() { } src_unpack() { - if [[ ${PV} != *9999 ]]; then + if [[ ${PV} != *9999 ]] ; then unpack ${MY_P}.tar.${SRC_URI_SUFFIX} cd "${S}" || die unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} @@ -320,9 +320,7 @@ src_compile() { fi if use perl && use cgi ; then - git_emake \ - gitweb \ - || die "emake gitweb (cgi) failed" + git_emake gitweb || die "emake gitweb (cgi) failed" fi if [[ ${CHOST} == *-darwin* ]]; then @@ -334,16 +332,13 @@ src_compile() { pushd Documentation &>/dev/null || die if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" + git_emake man || die "emake man failed" if use doc ; then - git_emake info html \ - || die "emake info html failed" + git_emake info html || die "emake info html failed" fi else if use doc ; then - git_emake info \ - || die "emake info html failed" + git_emake info || die "emake info html failed" fi fi popd &>/dev/null || die @@ -355,18 +350,18 @@ src_compile() { fi pushd contrib/subtree &>/dev/null || die - git_emake git-subtree + git_emake git-subtree || die # git-subtree.1 requires the full USE=doc dependency stack use doc && git_emake git-subtree.html git-subtree.1 popd &>/dev/null || die pushd contrib/diff-highlight &>/dev/null || die - git_emake + git_emake || die popd &>/dev/null || die if use mediawiki ; then pushd contrib/mw-to-git &>/dev/null || die - git_emake + git_emake || die popd &>/dev/null || die fi @@ -504,9 +499,8 @@ src_install() { newdoc "${S}"/gitweb/README README.gitweb for d in "${ED}"/usr/lib{,64}/perl5/ ; do - if test -d "${d}" ; then find "${d}" \ - -name .packlist \ - -delete || die + if [[ -d "${d}" ]] ; then + find "${d}" -name .packlist -delete || die fi done else @@ -523,10 +517,11 @@ src_install() { newins "${FILESDIR}"/git-daemon.xinetd git-daemon fi - if use !prefix ; then + 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-r1.service" "git-daemon@.service" + systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" \ + "git-daemon@.service" systemd_dounit "${FILESDIR}/git-daemon.socket" fi @@ -536,7 +531,7 @@ src_install() { # we could remove sources in src_prepare, but install does not # handle missing locale dir well rm_loc() { - if [[ -e "${ED}/usr/share/locale/${1}" ]]; then + if [[ -e "${ED}/usr/share/locale/${1}" ]] ; then rm -r "${ED}/usr/share/locale/${1}" || die fi } @@ -586,8 +581,8 @@ src_test() { local cvs=0 use cvs && let cvs=${cvs}+1 - if [[ ${EUID} -eq 0 ]]; then - if [[ ${cvs} -eq 1 ]]; then + 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+=( ${tests_cvs[@]} ) @@ -601,7 +596,7 @@ src_test() { [[ ${cvs} -gt 1 ]] && \ has_version "dev-vcs/cvs[server]" && \ let cvs=${cvs}+1 - if [[ ${cvs} -lt 3 ]]; then + if [[ ${cvs} -lt 3 ]] ; then einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" disabled+=( ${tests_cvs[@]} ) fi @@ -623,12 +618,13 @@ src_test() { done einfo "Disabled tests:" for i in ${disabled[@]} ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}" + if [[ -f "${i}" ]] ; then + mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}" + fi done # Avoid the test system removing the results because we want them ourselves - sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ - -i Makefile || die + sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' -i Makefile || die # Clean old results first, must always run nonfatal git_emake clean diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild index 8ec5c0d0238..d27d54e5bd7 100644 --- a/dev-vcs/git/git-9999-r3.ebuild +++ b/dev-vcs/git/git-9999-r3.ebuild @@ -222,7 +222,7 @@ exportmakeopts() { NEEDS_LIBICONV=YesPlease HAVE_CLOCK_MONOTONIC=1 ) - if grep -q getdelim "${EROOT}"/usr/include/stdio.h ; then + if grep -Fq getdelim "${EROOT}"/usr/include/stdio.h ; then myopts+=( HAVE_GETDELIM=1 ) fi fi @@ -243,7 +243,7 @@ exportmakeopts() { } src_unpack() { - if [[ ${PV} != *9999 ]]; then + if [[ ${PV} != *9999 ]] ; then unpack ${MY_P}.tar.${SRC_URI_SUFFIX} cd "${S}" || die unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} @@ -320,9 +320,7 @@ src_compile() { fi if use perl && use cgi ; then - git_emake \ - gitweb \ - || die "emake gitweb (cgi) failed" + git_emake gitweb || die "emake gitweb (cgi) failed" fi if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then @@ -334,16 +332,13 @@ src_compile() { pushd Documentation &>/dev/null || die if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" + git_emake man || die "emake man failed" if use doc ; then - git_emake info html \ - || die "emake info html failed" + git_emake info html || die "emake info html failed" fi else if use doc ; then - git_emake info \ - || die "emake info html failed" + git_emake info || die "emake info html failed" fi fi popd &>/dev/null || die @@ -355,18 +350,18 @@ src_compile() { fi pushd contrib/subtree &>/dev/null || die - git_emake git-subtree + git_emake git-subtree || die # git-subtree.1 requires the full USE=doc dependency stack use doc && git_emake git-subtree.html git-subtree.1 popd &>/dev/null || die pushd contrib/diff-highlight &>/dev/null || die - git_emake + git_emake || die popd &>/dev/null || die if use mediawiki ; then pushd contrib/mw-to-git &>/dev/null || die - git_emake + git_emake || die popd &>/dev/null || die fi @@ -504,9 +499,8 @@ src_install() { newdoc "${S}"/gitweb/README README.gitweb for d in "${ED}"/usr/lib{,64}/perl5/ ; do - if test -d "${d}" ; then find "${d}" \ - -name .packlist \ - -delete || die + if [[ -d "${d}" ]] ; then + find "${d}" -name .packlist -delete || die fi done else @@ -523,10 +517,11 @@ src_install() { newins "${FILESDIR}"/git-daemon.xinetd git-daemon fi - if use !prefix ; then + 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-r1.service" "git-daemon@.service" + systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" \ + "git-daemon@.service" systemd_dounit "${FILESDIR}/git-daemon.socket" fi @@ -536,7 +531,7 @@ src_install() { # we could remove sources in src_prepare, but install does not # handle missing locale dir well rm_loc() { - if [[ -e "${ED}/usr/share/locale/${1}" ]]; then + if [[ -e "${ED}/usr/share/locale/${1}" ]] ; then rm -r "${ED}/usr/share/locale/${1}" || die fi } @@ -586,8 +581,8 @@ src_test() { local cvs=0 use cvs && let cvs=${cvs}+1 - if [[ ${EUID} -eq 0 ]]; then - if [[ ${cvs} -eq 1 ]]; then + 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+=( ${tests_cvs[@]} ) @@ -601,7 +596,7 @@ src_test() { [[ ${cvs} -gt 1 ]] && \ has_version "dev-vcs/cvs[server]" && \ let cvs=${cvs}+1 - if [[ ${cvs} -lt 3 ]]; then + if [[ ${cvs} -lt 3 ]] ; then einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" disabled+=( ${tests_cvs[@]} ) fi @@ -623,12 +618,13 @@ src_test() { done einfo "Disabled tests:" for i in ${disabled[@]} ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}" + if [[ -f "${i}" ]] ; then + mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}" + fi done # Avoid the test system removing the results because we want them ourselves - sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ - -i Makefile || die + sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' -i Makefile || die # Clean old results first, must always run nonfatal git_emake clean diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild index 4d91e177d37..564bb8b7b75 100644 --- a/dev-vcs/git/git-9999.ebuild +++ b/dev-vcs/git/git-9999.ebuild @@ -222,7 +222,7 @@ exportmakeopts() { NEEDS_LIBICONV=YesPlease HAVE_CLOCK_MONOTONIC=1 ) - if grep -q getdelim "${EROOT}"/usr/include/stdio.h ; then + if grep -Fq getdelim "${EROOT}"/usr/include/stdio.h ; then myopts+=( HAVE_GETDELIM=1 ) fi fi @@ -243,7 +243,7 @@ exportmakeopts() { } src_unpack() { - if [[ ${PV} != *9999 ]]; then + if [[ ${PV} != *9999 ]] ; then unpack ${MY_P}.tar.${SRC_URI_SUFFIX} cd "${S}" || die unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} @@ -320,9 +320,7 @@ src_compile() { fi if use perl && use cgi ; then - git_emake \ - gitweb \ - || die "emake gitweb (cgi) failed" + git_emake gitweb || die "emake gitweb (cgi) failed" fi if [[ ${CHOST} == *-darwin* ]]; then @@ -334,16 +332,13 @@ src_compile() { pushd Documentation &>/dev/null || die if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" + git_emake man || die "emake man failed" if use doc ; then - git_emake info html \ - || die "emake info html failed" + git_emake info html || die "emake info html failed" fi else if use doc ; then - git_emake info \ - || die "emake info html failed" + git_emake info || die "emake info html failed" fi fi popd &>/dev/null || die @@ -355,18 +350,18 @@ src_compile() { fi pushd contrib/subtree &>/dev/null || die - git_emake git-subtree + git_emake git-subtree || die # git-subtree.1 requires the full USE=doc dependency stack use doc && git_emake git-subtree.html git-subtree.1 popd &>/dev/null || die pushd contrib/diff-highlight &>/dev/null || die - git_emake + git_emake || die popd &>/dev/null || die if use mediawiki ; then pushd contrib/mw-to-git &>/dev/null || die - git_emake + git_emake || die popd &>/dev/null || die fi @@ -504,9 +499,8 @@ src_install() { newdoc "${S}"/gitweb/README README.gitweb for d in "${ED}"/usr/lib{,64}/perl5/ ; do - if test -d "${d}" ; then find "${d}" \ - -name .packlist \ - -delete || die + if [[ -d "${d}" ]] ; then + find "${d}" -name .packlist -delete || die fi done else @@ -523,10 +517,11 @@ src_install() { newins "${FILESDIR}"/git-daemon.xinetd git-daemon fi - if use !prefix ; then + 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-r1.service" "git-daemon@.service" + systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" \ + "git-daemon@.service" systemd_dounit "${FILESDIR}/git-daemon.socket" fi @@ -536,7 +531,7 @@ src_install() { # we could remove sources in src_prepare, but install does not # handle missing locale dir well rm_loc() { - if [[ -e "${ED}/usr/share/locale/${1}" ]]; then + if [[ -e "${ED}/usr/share/locale/${1}" ]] ; then rm -r "${ED}/usr/share/locale/${1}" || die fi } @@ -586,8 +581,8 @@ src_test() { local cvs=0 use cvs && let cvs=${cvs}+1 - if [[ ${EUID} -eq 0 ]]; then - if [[ ${cvs} -eq 1 ]]; then + 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+=( ${tests_cvs[@]} ) @@ -601,7 +596,7 @@ src_test() { [[ ${cvs} -gt 1 ]] && \ has_version "dev-vcs/cvs[server]" && \ let cvs=${cvs}+1 - if [[ ${cvs} -lt 3 ]]; then + if [[ ${cvs} -lt 3 ]] ; then einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" disabled+=( ${tests_cvs[@]} ) fi @@ -623,12 +618,13 @@ src_test() { done einfo "Disabled tests:" for i in ${disabled[@]} ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}" + if [[ -f "${i}" ]] ; then + mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}" + fi done # Avoid the test system removing the results because we want them ourselves - sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ - -i Makefile || die + sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' -i Makefile || die # Clean old results first, must always run nonfatal git_emake clean