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 F0B341396D1 for ; Tue, 26 Sep 2017 17:03:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 27AC6E08DB; Tue, 26 Sep 2017 17:03:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 E81FF2BC0B3 for ; Tue, 26 Sep 2017 17:03:25 +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 63C5D34168E for ; Tue, 26 Sep 2017 17:03:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BB374908B for ; Tue, 26 Sep 2017 17:03:22 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1506445391.297a8ddb8996cb2a288c36fb8859b776b0b652b7.robbat2@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: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 297a8ddb8996cb2a288c36fb8859b776b0b652b7 X-VCS-Branch: master Date: Tue, 26 Sep 2017 17:03:22 +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-Archives-Salt: 2984a471-c453-4ed1-a385-368ed980866c X-Archives-Hash: f2236f2d4be71a3a8bab5831d2c40534 commit: 297a8ddb8996cb2a288c36fb8859b776b0b652b7 Author: Robin H. Johnson gentoo org> AuthorDate: Tue Sep 26 16:50:04 2017 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Tue Sep 26 17:03:11 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=297a8ddb dev-vcs/git: make 9999 ebuilds share common code for easy of copy Package-Manager: Portage-2.3.8, Repoman-2.3.3 dev-vcs/git/git-9999-r1.ebuild | 27 +++++++++++++++++---------- dev-vcs/git/git-9999-r2.ebuild | 27 +++++++++++++++++---------- dev-vcs/git/git-9999-r3.ebuild | 27 +++++++++++++++++---------- dev-vcs/git/git-9999.ebuild | 27 +++++++++++++++++---------- 4 files changed, 68 insertions(+), 40 deletions(-) diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild index b588ab74080..d079a65a75e 100644 --- a/dev-vcs/git/git-9999-r1.ebuild +++ b/dev-vcs/git/git-9999-r1.ebuild @@ -7,17 +7,24 @@ GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware PYTHON_COMPAT=( python2_7 ) -[[ ${PV} == *9999 ]] && SCM="git-r3" -# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches. -# See https://git-scm.com/docs/gitworkflows#_graduation -# In order of stability: -# 9999-r0: maint -# 9999-r1: master -# 9999-r2: next -# 9999-r3: pu -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" -EGIT_BRANCH=master PLOCALES="bg ca de fr is it ko pt_PT ru sv vi zh_CN" +if [[ ${PV} == *9999 ]]; then + SCM="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 + # In order of stability: + # 9999-r0: maint + # 9999-r1: master + # 9999-r2: next + # 9999-r3: pu + case "${PVR}" in + 9999) EGIT_BRANCH=maint ;; + 9999-r1) EGIT_BRANCH=master ;; + 9999-r2) EGIT_BRANCH=next;; + 9999-r3) EGIT_BRANCH=pu ;; + esac +fi inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM} diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild index 01272659efb..d079a65a75e 100644 --- a/dev-vcs/git/git-9999-r2.ebuild +++ b/dev-vcs/git/git-9999-r2.ebuild @@ -7,17 +7,24 @@ GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware PYTHON_COMPAT=( python2_7 ) -[[ ${PV} == *9999 ]] && SCM="git-r3" -# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches. -# See https://git-scm.com/docs/gitworkflows#_graduation -# In order of stability: -# 9999-r0: maint -# 9999-r1: master -# 9999-r2: next -# 9999-r3: pu -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" -EGIT_BRANCH=next PLOCALES="bg ca de fr is it ko pt_PT ru sv vi zh_CN" +if [[ ${PV} == *9999 ]]; then + SCM="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 + # In order of stability: + # 9999-r0: maint + # 9999-r1: master + # 9999-r2: next + # 9999-r3: pu + case "${PVR}" in + 9999) EGIT_BRANCH=maint ;; + 9999-r1) EGIT_BRANCH=master ;; + 9999-r2) EGIT_BRANCH=next;; + 9999-r3) EGIT_BRANCH=pu ;; + esac +fi inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM} diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild index 76bcaf24d0d..d079a65a75e 100644 --- a/dev-vcs/git/git-9999-r3.ebuild +++ b/dev-vcs/git/git-9999-r3.ebuild @@ -7,17 +7,24 @@ GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware PYTHON_COMPAT=( python2_7 ) -[[ ${PV} == *9999 ]] && SCM="git-r3" -# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches. -# See https://git-scm.com/docs/gitworkflows#_graduation -# In order of stability: -# 9999-r0: maint -# 9999-r1: master -# 9999-r2: next -# 9999-r3: pu -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" -EGIT_BRANCH=pu PLOCALES="bg ca de fr is it ko pt_PT ru sv vi zh_CN" +if [[ ${PV} == *9999 ]]; then + SCM="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 + # In order of stability: + # 9999-r0: maint + # 9999-r1: master + # 9999-r2: next + # 9999-r3: pu + case "${PVR}" in + 9999) EGIT_BRANCH=maint ;; + 9999-r1) EGIT_BRANCH=master ;; + 9999-r2) EGIT_BRANCH=next;; + 9999-r3) EGIT_BRANCH=pu ;; + esac +fi inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM} diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild index aa7cf5a5b93..d079a65a75e 100644 --- a/dev-vcs/git/git-9999.ebuild +++ b/dev-vcs/git/git-9999.ebuild @@ -7,17 +7,24 @@ GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware PYTHON_COMPAT=( python2_7 ) -[[ ${PV} == *9999 ]] && SCM="git-r3" -# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches. -# See https://git-scm.com/docs/gitworkflows#_graduation -# In order of stability: -# 9999-r0: maint -# 9999-r1: master -# 9999-r2: next -# 9999-r3: pu -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" -EGIT_BRANCH=maint PLOCALES="bg ca de fr is it ko pt_PT ru sv vi zh_CN" +if [[ ${PV} == *9999 ]]; then + SCM="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 + # In order of stability: + # 9999-r0: maint + # 9999-r1: master + # 9999-r2: next + # 9999-r3: pu + case "${PVR}" in + 9999) EGIT_BRANCH=maint ;; + 9999-r1) EGIT_BRANCH=master ;; + 9999-r2) EGIT_BRANCH=next;; + 9999-r3) EGIT_BRANCH=pu ;; + esac +fi inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM}