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 52D81138335 for ; Thu, 13 Jun 2019 08:45:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3BD50E08BE; Thu, 13 Jun 2019 08:45:39 +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 0E595E08BE for ; Thu, 13 Jun 2019 08:45:39 +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 A85F9345FF1 for ; Thu, 13 Jun 2019 08:45:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 71E38614 for ; Thu, 13 Jun 2019 08:45:35 +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: <1560415510.c6e93e66b446f6a209a99054d96e1765c6fa2997.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.22.0.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: c6e93e66b446f6a209a99054d96e1765c6fa2997 X-VCS-Branch: master Date: Thu, 13 Jun 2019 08:45:35 +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: 39960c6e-096c-4891-8369-fe7d4dfbae8f X-Archives-Hash: 7757fbe07175de62a5e64c05347a09f6 commit: c6e93e66b446f6a209a99054d96e1765c6fa2997 Author: Lars Wendler gentoo org> AuthorDate: Thu Jun 13 08:45:10 2019 +0000 Commit: Lars Wendler gentoo org> CommitDate: Thu Jun 13 08:45:10 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6e93e66 dev-vcs/git: Moved svn-fe.1 back behind USE="doc". Closes: https://bugs.gentoo.org/687886 Package-Manager: Portage-2.3.67, Repoman-2.3.14 Signed-off-by: Lars Wendler gentoo.org> dev-vcs/git/git-2.22.0.ebuild | 18 +++++++++++------- dev-vcs/git/git-9999-r1.ebuild | 18 +++++++++++------- dev-vcs/git/git-9999-r2.ebuild | 18 +++++++++++------- dev-vcs/git/git-9999-r3.ebuild | 18 +++++++++++------- dev-vcs/git/git-9999.ebuild | 20 ++++++++++++-------- 5 files changed, 56 insertions(+), 36 deletions(-) diff --git a/dev-vcs/git/git-2.22.0.ebuild b/dev-vcs/git/git-2.22.0.ebuild index 42969a491fb..d691700475c 100644 --- a/dev-vcs/git/git-2.22.0.ebuild +++ b/dev-vcs/git/git-2.22.0.ebuild @@ -7,9 +7,12 @@ GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) + +inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd + PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN" if [[ ${PV} == *9999 ]]; then - SCM="git-r3" + inherit git-r3 EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" # Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches. # See https://git-scm.com/docs/gitworkflows#_graduation @@ -26,8 +29,6 @@ if [[ ${PV} == *9999 ]]; then esac fi -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}" @@ -44,7 +45,7 @@ if [[ ${PV} != *9999 ]]; then doc? ( ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )" - [[ "${PV}" = *_rc* ]] || \ + [[ "${PV}" == *_rc* ]] || \ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi @@ -109,8 +110,8 @@ DEPEND="${CDEPEND} doc? ( app-text/asciidoc app-text/docbook2X - sys-apps/texinfo app-text/xmlto + sys-apps/texinfo ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg )" @@ -369,8 +370,10 @@ src_compile() { use iconv && use !elibc_glibc && nlsiconv+=( -liconv ) git_emake EXTLIBS="${EXTLIBS} ${nlsiconv[@]}" \ || die "emake svn-fe failed" - git_emake svn-fe.1 || die "emake svn-fe.1 failed" if use doc ; then + # svn-fe.1 requires the full USE=doc dependency stack + git_emake svn-fe.1 \ + || die "emake svn-fe.1 failed" git_emake svn-fe.html \ || die "svn-fe.html failed" fi @@ -490,9 +493,10 @@ src_install() { if use subversion ; then pushd contrib/svn-fe &>/dev/null || die dobin svn-fe - doman svn-fe.1 dodoc svn-fe.txt if use doc ; then + # Do not move svn-fe.1 outside USE=doc! + doman svn-fe.1 docinto html dodoc svn-fe.html fi diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild index 42969a491fb..d691700475c 100644 --- a/dev-vcs/git/git-9999-r1.ebuild +++ b/dev-vcs/git/git-9999-r1.ebuild @@ -7,9 +7,12 @@ GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) + +inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd + PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN" if [[ ${PV} == *9999 ]]; then - SCM="git-r3" + inherit git-r3 EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" # Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches. # See https://git-scm.com/docs/gitworkflows#_graduation @@ -26,8 +29,6 @@ if [[ ${PV} == *9999 ]]; then esac fi -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}" @@ -44,7 +45,7 @@ if [[ ${PV} != *9999 ]]; then doc? ( ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )" - [[ "${PV}" = *_rc* ]] || \ + [[ "${PV}" == *_rc* ]] || \ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi @@ -109,8 +110,8 @@ DEPEND="${CDEPEND} doc? ( app-text/asciidoc app-text/docbook2X - sys-apps/texinfo app-text/xmlto + sys-apps/texinfo ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg )" @@ -369,8 +370,10 @@ src_compile() { use iconv && use !elibc_glibc && nlsiconv+=( -liconv ) git_emake EXTLIBS="${EXTLIBS} ${nlsiconv[@]}" \ || die "emake svn-fe failed" - git_emake svn-fe.1 || die "emake svn-fe.1 failed" if use doc ; then + # svn-fe.1 requires the full USE=doc dependency stack + git_emake svn-fe.1 \ + || die "emake svn-fe.1 failed" git_emake svn-fe.html \ || die "svn-fe.html failed" fi @@ -490,9 +493,10 @@ src_install() { if use subversion ; then pushd contrib/svn-fe &>/dev/null || die dobin svn-fe - doman svn-fe.1 dodoc svn-fe.txt if use doc ; then + # Do not move svn-fe.1 outside USE=doc! + doman svn-fe.1 docinto html dodoc svn-fe.html fi diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild index 42969a491fb..d691700475c 100644 --- a/dev-vcs/git/git-9999-r2.ebuild +++ b/dev-vcs/git/git-9999-r2.ebuild @@ -7,9 +7,12 @@ GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) + +inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd + PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN" if [[ ${PV} == *9999 ]]; then - SCM="git-r3" + inherit git-r3 EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" # Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches. # See https://git-scm.com/docs/gitworkflows#_graduation @@ -26,8 +29,6 @@ if [[ ${PV} == *9999 ]]; then esac fi -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}" @@ -44,7 +45,7 @@ if [[ ${PV} != *9999 ]]; then doc? ( ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )" - [[ "${PV}" = *_rc* ]] || \ + [[ "${PV}" == *_rc* ]] || \ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi @@ -109,8 +110,8 @@ DEPEND="${CDEPEND} doc? ( app-text/asciidoc app-text/docbook2X - sys-apps/texinfo app-text/xmlto + sys-apps/texinfo ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg )" @@ -369,8 +370,10 @@ src_compile() { use iconv && use !elibc_glibc && nlsiconv+=( -liconv ) git_emake EXTLIBS="${EXTLIBS} ${nlsiconv[@]}" \ || die "emake svn-fe failed" - git_emake svn-fe.1 || die "emake svn-fe.1 failed" if use doc ; then + # svn-fe.1 requires the full USE=doc dependency stack + git_emake svn-fe.1 \ + || die "emake svn-fe.1 failed" git_emake svn-fe.html \ || die "svn-fe.html failed" fi @@ -490,9 +493,10 @@ src_install() { if use subversion ; then pushd contrib/svn-fe &>/dev/null || die dobin svn-fe - doman svn-fe.1 dodoc svn-fe.txt if use doc ; then + # Do not move svn-fe.1 outside USE=doc! + doman svn-fe.1 docinto html dodoc svn-fe.html fi diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild index 42969a491fb..d691700475c 100644 --- a/dev-vcs/git/git-9999-r3.ebuild +++ b/dev-vcs/git/git-9999-r3.ebuild @@ -7,9 +7,12 @@ GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) + +inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd + PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN" if [[ ${PV} == *9999 ]]; then - SCM="git-r3" + inherit git-r3 EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" # Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches. # See https://git-scm.com/docs/gitworkflows#_graduation @@ -26,8 +29,6 @@ if [[ ${PV} == *9999 ]]; then esac fi -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}" @@ -44,7 +45,7 @@ if [[ ${PV} != *9999 ]]; then doc? ( ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )" - [[ "${PV}" = *_rc* ]] || \ + [[ "${PV}" == *_rc* ]] || \ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi @@ -109,8 +110,8 @@ DEPEND="${CDEPEND} doc? ( app-text/asciidoc app-text/docbook2X - sys-apps/texinfo app-text/xmlto + sys-apps/texinfo ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg )" @@ -369,8 +370,10 @@ src_compile() { use iconv && use !elibc_glibc && nlsiconv+=( -liconv ) git_emake EXTLIBS="${EXTLIBS} ${nlsiconv[@]}" \ || die "emake svn-fe failed" - git_emake svn-fe.1 || die "emake svn-fe.1 failed" if use doc ; then + # svn-fe.1 requires the full USE=doc dependency stack + git_emake svn-fe.1 \ + || die "emake svn-fe.1 failed" git_emake svn-fe.html \ || die "svn-fe.html failed" fi @@ -490,9 +493,10 @@ src_install() { if use subversion ; then pushd contrib/svn-fe &>/dev/null || die dobin svn-fe - doman svn-fe.1 dodoc svn-fe.txt if use doc ; then + # Do not move svn-fe.1 outside USE=doc! + doman svn-fe.1 docinto html dodoc svn-fe.html fi diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild index bf2df79b8ab..ce8ae004896 100644 --- a/dev-vcs/git/git-9999.ebuild +++ b/dev-vcs/git/git-9999.ebuild @@ -7,9 +7,12 @@ GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) + +inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd + PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN" if [[ ${PV} == *9999 ]]; then - SCM="git-r3" + inherit git-r3 EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" # Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches. # See https://git-scm.com/docs/gitworkflows#_graduation @@ -26,8 +29,6 @@ if [[ ${PV} == *9999 ]]; then esac fi -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}" @@ -44,7 +45,7 @@ if [[ ${PV} != *9999 ]]; then doc? ( ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )" - [[ "${PV}" = *_rc* ]] || \ + [[ "${PV}" == *_rc* ]] || \ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi @@ -109,8 +110,8 @@ DEPEND="${CDEPEND} doc? ( app-text/asciidoc app-text/docbook2X - sys-apps/texinfo app-text/xmlto + sys-apps/texinfo ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg )" @@ -137,7 +138,7 @@ REQUIRED_USE=" PATCHES=( # bug #350330 - automagic CVS when we don't want it is bad. - ##"${FILESDIR}"/git-2.22.0_rc0-optional-cvs.patch + "${FILESDIR}"/git-2.18.0_rc1-optional-cvs.patch "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch @@ -369,8 +370,10 @@ src_compile() { use iconv && use !elibc_glibc && nlsiconv+=( -liconv ) git_emake EXTLIBS="${EXTLIBS} ${nlsiconv[@]}" \ || die "emake svn-fe failed" - git_emake svn-fe.1 || die "emake svn-fe.1 failed" if use doc ; then + # svn-fe.1 requires the full USE=doc dependency stack + git_emake svn-fe.1 \ + || die "emake svn-fe.1 failed" git_emake svn-fe.html \ || die "svn-fe.html failed" fi @@ -490,9 +493,10 @@ src_install() { if use subversion ; then pushd contrib/svn-fe &>/dev/null || die dobin svn-fe - doman svn-fe.1 dodoc svn-fe.txt if use doc ; then + # Do not move svn-fe.1 outside USE=doc! + doman svn-fe.1 docinto html dodoc svn-fe.html fi