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 4F940138334 for ; Mon, 25 Feb 2019 00:38:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1BE94E0975; Mon, 25 Feb 2019 00:38:55 +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 CD03BE0975 for ; Mon, 25 Feb 2019 00:38:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 E845E340845 for ; Mon, 25 Feb 2019 00:38:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5A24A54F for ; Mon, 25 Feb 2019 00:38:51 +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: <1551055093.d7455f0512b07d24eb8622c50ae1049dd01c6d8b.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-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: d7455f0512b07d24eb8622c50ae1049dd01c6d8b X-VCS-Branch: master Date: Mon, 25 Feb 2019 00:38:51 +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: 60d43c71-8c52-494a-b247-a97e57884db5 X-Archives-Hash: 1589a9c989b577a1cc0682e63a693502 commit: d7455f0512b07d24eb8622c50ae1049dd01c6d8b Author: Lars Wendler gentoo org> AuthorDate: Mon Feb 25 00:38:13 2019 +0000 Commit: Lars Wendler gentoo org> CommitDate: Mon Feb 25 00:38:13 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7455f05 dev-vcs/git: Synced live ebuild. Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Lars Wendler gentoo.org> dev-vcs/git/git-9999-r1.ebuild | 30 +++++++++++++++++------------- dev-vcs/git/git-9999-r2.ebuild | 30 +++++++++++++++++------------- dev-vcs/git/git-9999-r3.ebuild | 30 +++++++++++++++++------------- dev-vcs/git/git-9999.ebuild | 30 +++++++++++++++++------------- 4 files changed, 68 insertions(+), 52 deletions(-) diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild index c26c4f8ee32..ad2cb1dae85 100644 --- a/dev-vcs/git/git-9999-r1.ebuild +++ b/dev-vcs/git/git-9999-r1.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 diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild index c26c4f8ee32..ad2cb1dae85 100644 --- a/dev-vcs/git/git-9999-r2.ebuild +++ b/dev-vcs/git/git-9999-r2.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 diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild index d1579f747e3..ad2cb1dae85 100644 --- a/dev-vcs/git/git-9999-r3.ebuild +++ b/dev-vcs/git/git-9999-r3.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 diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild index b12a7d47ad1..f9e6cd3fae0 100644 --- a/dev-vcs/git/git-9999.ebuild +++ b/dev-vcs/git/git-9999.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}" @@ -197,7 +197,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 @@ -205,13 +205,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 @@ -236,7 +236,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 @@ -249,7 +249,7 @@ exportmakeopts() { myopts+=( NO_NSEC=YesPlease ) export MY_MAKEOPTS="${myopts[@]}" - export EXTLIBS="${extlibs}" + export EXTLIBS="${extlibs[@]}" } src_unpack() { @@ -362,12 +362,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 @@ -410,6 +412,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 @@ -435,7 +438,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 @@ -518,6 +521,7 @@ src_install() { stats workdir ) + local i for i in "${contrib_objects[@]}" ; do cp -rf \ "${S}"/contrib/${i} \ @@ -538,7 +542,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