[gentoo-commits] repo/gentoo:master commit in: dev-vcs/cvsync/

[Johannes Huber]

commit:     7a18398debd78be2f7a19cf4420dac5ca182671d
Author:     Marty E. Plummer <hanetzer <AT> startmail <DOT> com>
AuthorDate: Sun May 20 23:18:33 2018 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun May 27 21:59:33 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a18398d

dev-vcs/cvsync: git-2->git-r3

Package-Manager: Portage-2.3.38, Repoman-2.3.9
Signed-off-by: Johannes Huber <johu <AT> gentoo.org>

 dev-vcs/cvsync/cvsync-2014.08.24.014706.ebuild | 11 +++++------
 dev-vcs/cvsync/cvsync-9999.ebuild              | 11 +++++------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/dev-vcs/cvsync/cvsync-2014.08.24.014706.ebuild 
b/dev-vcs/cvsync/cvsync-2014.08.24.014706.ebuild
index cda6f4f1692..f638af4de21 100644
--- a/dev-vcs/cvsync/cvsync-2014.08.24.014706.ebuild
+++ b/dev-vcs/cvsync/cvsync-2014.08.24.014706.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
 inherit toolchain-funcs
 
 if [[ ${PV} == "9999" ]] ; then
        EGIT_REPO_URI="https://github.com/cvsync/cvsync.git";
-       inherit git-2
+       inherit git-r3
 else
        SRC_URI="mirror://gentoo/${P}.tar.xz"
        KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~s390 ~sh ~sparc ~x86"
+       S="${WORKDIR}/${PN}"
 fi
 
 DESCRIPTION="portable CVS repository synchronization utility"
@@ -29,8 +30,6 @@ RDEPEND="sys-libs/zlib
        )"
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/${PN}"
-
 maint_pkg_create() {
        cd "${S}"
        local ver=$(date --date="$(git log -n1 --pretty=format:%ci HEAD)" -u 
"+%Y.%m.%d.%H%M%S")
@@ -42,7 +41,7 @@ maint_pkg_create() {
 
 src_unpack() {
        if [[ ${PV} == "9999" ]] ; then
-               git-2_src_unpack
+               git-r3_src_unpack
                maint_pkg_create
        else
                default

diff --git a/dev-vcs/cvsync/cvsync-9999.ebuild 
b/dev-vcs/cvsync/cvsync-9999.ebuild
index cda6f4f1692..f638af4de21 100644
--- a/dev-vcs/cvsync/cvsync-9999.ebuild
+++ b/dev-vcs/cvsync/cvsync-9999.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
 inherit toolchain-funcs
 
 if [[ ${PV} == "9999" ]] ; then
        EGIT_REPO_URI="https://github.com/cvsync/cvsync.git";
-       inherit git-2
+       inherit git-r3
 else
        SRC_URI="mirror://gentoo/${P}.tar.xz"
        KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~s390 ~sh ~sparc ~x86"
+       S="${WORKDIR}/${PN}"
 fi
 
 DESCRIPTION="portable CVS repository synchronization utility"
@@ -29,8 +30,6 @@ RDEPEND="sys-libs/zlib
        )"
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/${PN}"
-
 maint_pkg_create() {
        cd "${S}"
        local ver=$(date --date="$(git log -n1 --pretty=format:%ci HEAD)" -u 
"+%Y.%m.%d.%H%M%S")
@@ -42,7 +41,7 @@ maint_pkg_create() {
 
 src_unpack() {
        if [[ ${PV} == "9999" ]] ; then
-               git-2_src_unpack
+               git-r3_src_unpack
                maint_pkg_create
        else
                default