From d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 15 Jun 2021 14:57:03 +0100 Subject: gentoo resync : 15.06.2021 --- dev-vcs/git-flow/Manifest | 4 +- .../git-flow/files/git-flow-1.12.3_scriptdir.patch | 72 ++++++++++++++++++++++ dev-vcs/git-flow/git-flow-1.12.3-r1.ebuild | 46 ++++++++++++++ dev-vcs/git-flow/metadata.xml | 4 +- 4 files changed, 123 insertions(+), 3 deletions(-) create mode 100644 dev-vcs/git-flow/files/git-flow-1.12.3_scriptdir.patch create mode 100644 dev-vcs/git-flow/git-flow-1.12.3-r1.ebuild (limited to 'dev-vcs/git-flow') diff --git a/dev-vcs/git-flow/Manifest b/dev-vcs/git-flow/Manifest index 4a8afe6e54b9..6c1711eb7644 100644 --- a/dev-vcs/git-flow/Manifest +++ b/dev-vcs/git-flow/Manifest @@ -1,4 +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.ebuild 947 BLAKE2B b6f1f2798e625f6d71c6096e6da68bad4520d0f1893655d2822ac3249e549cb673995d11fa184a16c5599425ba5f31a6d38f34872548eddb9e8e29765d89630a SHA512 50b73fc71b89e87b302913ed49f303212dc69746940bf7c5729b9b39650f6e2da1f7771a2f407f5598ebfde59bdd0dcf83d7dc0cdd600478461e7875c47bd7ef -MISC metadata.xml 337 BLAKE2B a8eeb744378930c829e05987de857fe66fc1988bf5d7f35a6e6bf5f86a149795f0d5dc3d21c29dc172ec4e82917ed39976b9558090b65981c6c027e4389ba4fd SHA512 5c4e0c195b36c37750b4d0d941ebfb94183704955806af13184613270332ff8e67749d749e9f84e2a49460435607cf5b50c8b8d7667621d5d3eab10888119cfe +MISC metadata.xml 337 BLAKE2B 8c6ef9bdbc2954e6d4a8cb33e165708c2f988c80c836014de87cb415b0dc2b97a254727fc992b256ea34c25224d7b03e2441e9d35adb6ab051d5bacf5ef6584c SHA512 520ba0f22ab117dcc6bfa365503f3d7f11ae1e1a50864a233f06f2a63678fcf2e55ab410d54e89c47ebb8a7896a2a1a17894d657a18602c0620c832efced785a diff --git a/dev-vcs/git-flow/files/git-flow-1.12.3_scriptdir.patch b/dev-vcs/git-flow/files/git-flow-1.12.3_scriptdir.patch new file mode 100644 index 000000000000..34fab234d41e --- /dev/null +++ b/dev-vcs/git-flow/files/git-flow-1.12.3_scriptdir.patch @@ -0,0 +1,72 @@ +Keeps the auxiliary, non-executable script files out of /usr/bin, and +avoids calling uname every time git-flow runs. + +--- a/git-flow ++++ b/git-flow +@@ -41,41 +41,9 @@ + set -x + fi + +-# Setup the GITFLOW_DIR for different operating systems. +-# This is mostly to make sure that we get the correct directory when the +-# git-flow file is a symbolic link +-case $(uname -s) in +-Linux) +- export GITFLOW_DIR=$(dirname "$(readlink -e "$0")") +- ;; +-FreeBSD|OpenBSD|NetBSD) +- export FLAGS_GETOPT_CMD='/usr/local/bin/getopt' +- export GITFLOW_DIR=$(dirname "$(realpath "$0")") +- ;; +-Darwin) +- PRG="$0" +- while [ -h "$PRG" ]; do +- link=$(readlink "$PRG") +- if expr "$link" : '/.*' > /dev/null; then +- PRG="$link" +- else +- PRG="$(dirname "$PRG")/$link" +- fi +- done +- export GITFLOW_DIR=$(dirname "$PRG") +- ;; +-*MINGW*) +- export GITFLOW_DIR=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") +- pwd () { +- builtin pwd -W +- } +- ;; +-*) +- # The sed expression here replaces all backslashes by forward slashes. +- # This helps our Windows users, while not bothering our Unix users.) +- export GITFLOW_DIR=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") +- ;; +-esac ++# Setup GITFLOW_DIR ++GITFLOW_DIR="@PREFIX@/libexec/git-flow" ++export GITFLOW_DIR + + # Extra environment settings + if [ -f ~/.gitflow_export ]; then +--- a/Makefile ++++ b/Makefile +@@ -30,6 +30,7 @@ + + datarootdir=$(prefix)/share + docdir=$(datarootdir)/doc/gitflow ++scriptdir=$(prefix)/libexec/git-flow + # files that need mode 755 + EXEC_FILES=git-flow + +@@ -55,9 +56,10 @@ + + install: + install -d -m 0755 $(prefix)/bin ++ install -d -m 0755 $(scriptdir) + install -d -m 0755 $(docdir)/hooks + install -m 0755 $(EXEC_FILES) $(prefix)/bin +- install -m 0644 $(SCRIPT_FILES) $(prefix)/bin ++ install -m 0644 $(SCRIPT_FILES) $(scriptdir) + install -m 0644 $(HOOK_FILES) $(docdir)/hooks + + uninstall: 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 new file mode 100644 index 000000000000..7bd223ff4518 --- /dev/null +++ b/dev-vcs/git-flow/git-flow-1.12.3-r1.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}!" 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/metadata.xml b/dev-vcs/git-flow/metadata.xml index 8bfb4a949f25..ab1910c926da 100644 --- a/dev-vcs/git-flow/metadata.xml +++ b/dev-vcs/git-flow/metadata.xml @@ -2,8 +2,8 @@ - johu@gentoo.org - Johannes Huber + marecki@gentoo.org + Marek Szuba petervanderdoes/gitflow-avh -- cgit v1.2.3