From d1ff69c7b3de3dc6a86ea45082e97f42b74c0565 Mon Sep 17 00:00:00 2001 From: Sam James Date: Fri, 28 Jan 2022 07:20:47 +0000 Subject: [PATCH] dev-vcs/git-lfs: allow app-text/ronn-ng instead of app-text/ronn ronn is going away and is replaced by ronn-ng. (Revbump because otherwise the package manager has no reason to be aware that it can be liberated of app-text/ronn and choose app-text/ronn-ng otherwise, when app-text/ronn gets masked.) Bug: https://bugs.gentoo.org/770907 Signed-off-by: Sam James --- .../{git-lfs-2.11.0.ebuild => git-lfs-2.11.0-r1.ebuild} | 4 ++-- .../{git-lfs-2.13.3.ebuild => git-lfs-2.13.3-r1.ebuild} | 4 ++-- dev-vcs/git-lfs/git-lfs-9999.ebuild | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) rename dev-vcs/git-lfs/{git-lfs-2.11.0.ebuild => git-lfs-2.11.0-r1.ebuild} (93%) rename dev-vcs/git-lfs/{git-lfs-2.13.3.ebuild => git-lfs-2.13.3-r1.ebuild} (94%) diff --git a/dev-vcs/git-lfs/git-lfs-2.11.0.ebuild b/dev-vcs/git-lfs/git-lfs-2.11.0-r1.ebuild similarity index 93% rename from dev-vcs/git-lfs/git-lfs-2.11.0.ebuild rename to dev-vcs/git-lfs/git-lfs-2.11.0-r1.ebuild index 6fdbdcf910e16..5db47f6cb90fe 100644 --- a/dev-vcs/git-lfs/git-lfs-2.11.0.ebuild +++ b/dev-vcs/git-lfs/git-lfs-2.11.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -20,7 +20,7 @@ LICENSE="Apache-2.0 BSD BSD-2 BSD-4 ISC MIT" SLOT="0" IUSE="doc test" -BDEPEND="doc? ( app-text/ronn )" +BDEPEND="doc? ( || ( app-text/ronn-ng app-text/ronn ) )" RDEPEND="dev-vcs/git" RESTRICT+=" !test? ( test )" diff --git a/dev-vcs/git-lfs/git-lfs-2.13.3.ebuild b/dev-vcs/git-lfs/git-lfs-2.13.3-r1.ebuild similarity index 94% rename from dev-vcs/git-lfs/git-lfs-2.13.3.ebuild rename to dev-vcs/git-lfs/git-lfs-2.13.3-r1.ebuild index 5c5be39ec301a..2cf565a6aba2a 100644 --- a/dev-vcs/git-lfs/git-lfs-2.13.3.ebuild +++ b/dev-vcs/git-lfs/git-lfs-2.13.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -20,7 +20,7 @@ LICENSE="Apache-2.0 BSD BSD-2 BSD-4 ISC MIT" SLOT="0" IUSE="doc test" -BDEPEND="doc? ( app-text/ronn )" +BDEPEND="doc? ( || ( app-text/ronn-ng app-text/ronn ) )" RDEPEND="dev-vcs/git" RESTRICT+=" !test? ( test )" diff --git a/dev-vcs/git-lfs/git-lfs-9999.ebuild b/dev-vcs/git-lfs/git-lfs-9999.ebuild index 641f9c79a60b4..9074b5b984094 100644 --- a/dev-vcs/git-lfs/git-lfs-9999.ebuild +++ b/dev-vcs/git-lfs/git-lfs-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -20,7 +20,7 @@ LICENSE="Apache-2.0 BSD BSD-2 BSD-4 ISC MIT" SLOT="0" IUSE="doc test" -BDEPEND="doc? ( app-text/ronn )" +BDEPEND="doc? ( || ( app-text/ronn-ng app-text/ronn ) )" RDEPEND="dev-vcs/git" RESTRICT+=" !test? ( test )"