From 7932d472a02d4c016ff7dff4b7a5479ab9d1883d Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Thu, 17 Jun 2021 17:57:35 +0100
Subject: gentoo resync : 17.06.2021

---
 dev-vcs/Manifest.gz                        | Bin 11152 -> 11152 bytes
 dev-vcs/git-flow/Manifest                  |   2 +-
 dev-vcs/git-flow/git-flow-1.12.3-r1.ebuild |  46 -----------------------------
 dev-vcs/git-flow/git-flow-1.12.3-r2.ebuild |  46 +++++++++++++++++++++++++++++
 4 files changed, 47 insertions(+), 47 deletions(-)
 delete mode 100644 dev-vcs/git-flow/git-flow-1.12.3-r1.ebuild
 create mode 100644 dev-vcs/git-flow/git-flow-1.12.3-r2.ebuild

(limited to 'dev-vcs')

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index dd1b2079eacf..7e9625480e8d 100644
Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ
diff --git a/dev-vcs/git-flow/Manifest b/dev-vcs/git-flow/Manifest
index 6c1711eb7644..f6e6a78c8da7 100644
--- a/dev-vcs/git-flow/Manifest
+++ b/dev-vcs/git-flow/Manifest
@@ -1,6 +1,6 @@
 AUX git-flow-1.12.3_scriptdir.patch 1835 BLAKE2B 911028fe6de44d1427bfb7fd59cf452ec3e3716034ac9797e8f33a8b9be80929a785670c1dbfad6e908f4f2833af2d3676c4b80b577da47f8118dfefd43ba2d3 SHA512 26e777ce7e485103224896ff50c20d7d061a27abde57296c3db36a651ed5e784b9deb8a74f4c118bbd4abd48efb42c891d21e35e74b0c33765ec5e2b10cf3722
 DIST git-flow-1.12.3.tar.gz 66173 BLAKE2B c6045fda9df8e305ccde8fac844614c840c5361f41848af6bf3394f64ffbbc5b03c20ed966960667d9aba76b0ed105f4caa2a5c0d5eab02a24720bff7b0aea48 SHA512 807cd36de7f5c9b4a7b28101de5ea8cfcbf528ff76578e4914c788b8098c7d3d91f8c19a3274e124ee7f7b4bdb6efdc5de2b74e09f374b71ae685beaa86e3e5a
 DIST git-flow-completion-0.6.0.tar.gz 7823 BLAKE2B 24dedfc0cddb5acfa57333895533f5c882a0c85db6e08539ff5c33f984eec40cb06da6d5f0ba812348c9cbf226080875de0269b295791ee5d4c8b2732a1ea1b2 SHA512 1082ad47938ec78045f4cbd12340a82960ba3de204c21a95e1166cb0b86e96dbbc3e5fc8af1945c951d5edd43b4026021761e8377795acbb87af3c1e391cb256
-EBUILD git-flow-1.12.3-r1.ebuild 1094 BLAKE2B 89cdb1a3c4f9e62d0603f2f76ee16b798de4951d6063eab07df2e9e29fd034e25813a4798163f778c495e0935ece79c0b05e1b19cb256b8ffa9639c8028dedcf SHA512 8651e14b95c5ccc1000f5c7c1380148c02d162ca82f5b8d06f191f8a0cb2d5a5e9ea1fe9fc2a74484dea8f6c1041eec98de3c5dfb100bf5d5b12d414a69c31ec
+EBUILD git-flow-1.12.3-r2.ebuild 1098 BLAKE2B 102b85d76401d9805ccf00eb7fdaf9aa2d38e2e76402a9ea931b9eaecb01318a9b874003fba2fbb082c1e3dc44d3b81dae610cebc17319b15c18f6493eaae54f SHA512 f431d74ec7755c8022db5f25805fffeecf159e21281aeab124f8c8e1b66440647041f86d02288cbd3b725b07ed304b86c5acb20c4544ef2430b7989546ef9129
 EBUILD git-flow-1.12.3.ebuild 947 BLAKE2B b6f1f2798e625f6d71c6096e6da68bad4520d0f1893655d2822ac3249e549cb673995d11fa184a16c5599425ba5f31a6d38f34872548eddb9e8e29765d89630a SHA512 50b73fc71b89e87b302913ed49f303212dc69746940bf7c5729b9b39650f6e2da1f7771a2f407f5598ebfde59bdd0dcf83d7dc0cdd600478461e7875c47bd7ef
 MISC metadata.xml 337 BLAKE2B 8c6ef9bdbc2954e6d4a8cb33e165708c2f988c80c836014de87cb415b0dc2b97a254727fc992b256ea34c25224d7b03e2441e9d35adb6ab051d5bacf5ef6584c SHA512 520ba0f22ab117dcc6bfa365503f3d7f11ae1e1a50864a233f06f2a63678fcf2e55ab410d54e89c47ebb8a7896a2a1a17894d657a18602c0620c832efced785a
diff --git a/dev-vcs/git-flow/git-flow-1.12.3-r1.ebuild b/dev-vcs/git-flow/git-flow-1.12.3-r1.ebuild
deleted file mode 100644
index 7bd223ff4518..000000000000
--- a/dev-vcs/git-flow/git-flow-1.12.3-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1
-
-MY_PN="${PN/-/}-avh"
-COMP_PN="${PN}-completion"
-COMP_PV="0.6.0"
-COMP_P="${COMP_PN}-${COMP_PV}"
-
-DESCRIPTION="Git extensions to provide high-level repository operations"
-HOMEPAGE="https://github.com/petervanderdoes/gitflow-avh"
-SRC_URI="https://github.com/petervanderdoes/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/petervanderdoes/${COMP_PN}/archive/${COMP_PV}.tar.gz -> ${COMP_P}.tar.gz"
-
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-vcs/git"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.12.3_scriptdir.patch
-)
-
-DOCS=( AUTHORS CHANGELOG.md README.md )
-
-S="${WORKDIR}"/${MY_PN}-${PV}
-
-src_prepare() {
-	default
-	sed -i "s!doc/gitflow!doc/${PF}!" Makefile || die "Fixing doc path failed"
-	sed -i "s!@PREFIX@!${EPREFIX}!" git-flow || die "Failed to set prefix in the script"
-}
-
-src_compile() {
-	true
-}
-
-src_install() {
-	emake prefix="${ED}"/usr install
-	einstalldocs
-	newbashcomp "${WORKDIR}"/${COMP_P}/${COMP_PN}.bash ${PN}
-}
diff --git a/dev-vcs/git-flow/git-flow-1.12.3-r2.ebuild b/dev-vcs/git-flow/git-flow-1.12.3-r2.ebuild
new file mode 100644
index 000000000000..95612de82ddb
--- /dev/null
+++ b/dev-vcs/git-flow/git-flow-1.12.3-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1
+
+MY_PN="${PN/-/}-avh"
+COMP_PN="${PN}-completion"
+COMP_PV="0.6.0"
+COMP_P="${COMP_PN}-${COMP_PV}"
+
+DESCRIPTION="Git extensions to provide high-level repository operations"
+HOMEPAGE="https://github.com/petervanderdoes/gitflow-avh"
+SRC_URI="https://github.com/petervanderdoes/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/petervanderdoes/${COMP_PN}/archive/${COMP_PV}.tar.gz -> ${COMP_P}.tar.gz"
+
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-vcs/git"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.12.3_scriptdir.patch
+)
+
+DOCS=( AUTHORS CHANGELOG.md README.md )
+
+S="${WORKDIR}"/${MY_PN}-${PV}
+
+src_prepare() {
+	default
+	sed -i "s!doc/gitflow!doc/${PF}!" Makefile || die "Fixing doc path failed"
+	sed -i "s!@PREFIX@!${EPREFIX}/usr!" git-flow || die "Failed to set prefix in the script"
+}
+
+src_compile() {
+	true
+}
+
+src_install() {
+	emake prefix="${ED}"/usr install
+	einstalldocs
+	newbashcomp "${WORKDIR}"/${COMP_P}/${COMP_PN}.bash ${PN}
+}
-- 
cgit v1.2.3