* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-flow/files/, dev-vcs/git-flow/
@ 2015-08-15 22:10 Johannes Huber
0 siblings, 0 replies; 3+ messages in thread
From: Johannes Huber @ 2015-08-15 22:10 UTC (permalink / raw
To: gentoo-commits
commit: 04eb2b15e2ddaed51276c70a84fb7bff437f8365
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 15 22:12:40 2015 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Aug 15 22:12:57 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04eb2b15
dev-vcs/git-flow: Use bundled shflags
Gentoo-Bug: 538938
Package-Manager: portage-2.2.20.1
.../files/git-flow-1.8.0-unbundle-shflags.patch | 25 ----------------------
...-flow-1.8.0.ebuild => git-flow-1.8.0-r1.ebuild} | 2 --
2 files changed, 27 deletions(-)
diff --git a/dev-vcs/git-flow/files/git-flow-1.8.0-unbundle-shflags.patch b/dev-vcs/git-flow/files/git-flow-1.8.0-unbundle-shflags.patch
deleted file mode 100644
index 6e96d54..0000000
--- a/dev-vcs/git-flow/files/git-flow-1.8.0-unbundle-shflags.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 0718bbb..f488922 100644
---- a/Makefile
-+++ b/Makefile
-@@ -43,7 +43,6 @@ SCRIPT_FILES+=git-flow-version
- SCRIPT_FILES+=git-flow-log
- SCRIPT_FILES+=git-flow-config
- SCRIPT_FILES+=gitflow-common
--SCRIPT_FILES+=gitflow-shFlags
-
- # Hook files
- HOOK_FILES=$(wildcard hooks/*)
-diff --git a/git-flow b/git-flow
-index 7a962d2..2ba70ba 100755
---- a/git-flow
-+++ b/git-flow
-@@ -111,7 +111,7 @@ main() {
- fi
-
- # Use the shFlags project to parse the command line arguments
-- . "$GITFLOW_DIR/gitflow-shFlags"
-+ . /usr/share/misc/shflags
- FLAGS_PARENT="git flow"
-
- # Load common functionality
diff --git a/dev-vcs/git-flow/git-flow-1.8.0.ebuild b/dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild
similarity index 95%
rename from dev-vcs/git-flow/git-flow-1.8.0.ebuild
rename to dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild
index c852e1a..dbd444d 100644
--- a/dev-vcs/git-flow/git-flow-1.8.0.ebuild
+++ b/dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild
@@ -28,8 +28,6 @@ RDEPEND="${DEPEND}
DOCS=( AUTHORS Changes.mdown README.mdown )
-PATCHES=( "${FILESDIR}/${P}-unbundle-shflags.patch" )
-
S="${WORKDIR}/${MY_PN}-${PV}"
src_prepare() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-flow/files/, dev-vcs/git-flow/
@ 2015-11-28 10:31 Johannes Huber
0 siblings, 0 replies; 3+ messages in thread
From: Johannes Huber @ 2015-11-28 10:31 UTC (permalink / raw
To: gentoo-commits
commit: 804d753b22faf03a3296b47195fd1c7566e265d8
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 28 10:31:03 2015 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Nov 28 10:31:24 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=804d753b
dev-vcs/git-flow: Remove old
Package-Manager: portage-2.2.26
dev-vcs/git-flow/Manifest | 2 -
.../files/git-flow-0.4.1-unbundle-shflags.patch | 32 --------------
dev-vcs/git-flow/git-flow-0.4.1.ebuild | 51 ----------------------
3 files changed, 85 deletions(-)
diff --git a/dev-vcs/git-flow/Manifest b/dev-vcs/git-flow/Manifest
index 8e83d60..3e844ee 100644
--- a/dev-vcs/git-flow/Manifest
+++ b/dev-vcs/git-flow/Manifest
@@ -1,4 +1,2 @@
-DIST git-flow-0.4.1.tar.gz 16732 SHA256 c1271b0ba2c6655e4ad4d79562f6a910c3b884f3d4e16985e227e67f8d95c180 SHA512 f86edb2867ed55127a34c711f5e6b11daeb6a738e92005fe27879c9ede40cb4130ff1de35e9f69560c4c845e063a8d2c1a76ad52eb5eacb7312a087f77d2698b WHIRLPOOL 9ad859237cab91209acfa87ddcc70f975af1b5816e202f8b867de903e05a755174803e286a5e8d595edb1612b7b321f7fe21b405fb388b8bef155ece82cb4ccf
DIST git-flow-1.8.0.tar.gz 56304 SHA256 8239131b8dac160d7e929eab376fa14de44a55cbd5c5545e0ad4464d3a57adef SHA512 677bfb0c379eb91bfaf8ef676593d39a8306ff063251e1e638166c7101c24ce2eac59490bab85d0c76b712c1905f15d3a14a3ecc020df376848d3b1ea5ee7b0a WHIRLPOOL 6bf654329b941989a8b646ab8218c072b7bf455b0ec6a8441d43de10b9b480a5619bca931606acdd743b0f3f86e9b67f119ff07957eaa106fd17f5cddc96a328
-DIST git-flow-completion-0.4.2.2.tar.gz 5421 SHA256 1e82d039596c0e73bfc8c59d945ded34e4fce777d9b9bb45c3586ee539048ab9 SHA512 609653b6eaedabc4f31bb19d93b50bc48746876a2c351f139b79b48599104d49ba281400e8708a83411610cf57ce08a9ae941b0611216c11d80f8c01e0fa8409 WHIRLPOOL 9d2f4ec100932c2e349924620a4dbe3a98e9b6d93fcfbeb0ee065e13873da74af8e059dae5acf158088c541bfdb3aa49446ee789576aab5532e8322ab9530c15
DIST git-flow-completion-0.5.1.tar.gz 6916 SHA256 5c8547a549dc623a8d57cfc22c3fa88588f5630da9dc6de9638e5b69da9d47d0 SHA512 c1fc0000889faff8189cd985b077cb64b81ae13e17f02c9df27675f428c6edf8f00627effdf6ebdae7a7f0641ec4ac621a9ecd0a53f14be7d95ec7e124ab8c1b WHIRLPOOL fd59f799d944752eab06b35f05c1f1309ef589014a0378f292e4dde206578f0c0aeb3685e16ea8d2f810e93b77abb7a2bc42c3c335ef9057b9c3ee1dd6df9982
diff --git a/dev-vcs/git-flow/files/git-flow-0.4.1-unbundle-shflags.patch b/dev-vcs/git-flow/files/git-flow-0.4.1-unbundle-shflags.patch
deleted file mode 100644
index 93ecb72..0000000
--- a/dev-vcs/git-flow/files/git-flow-0.4.1-unbundle-shflags.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/Makefile b/Makefile
-index fbbfd2c..b0e2490 100644
---- a/Makefile
-+++ b/Makefile
-@@ -40,14 +40,12 @@ SCRIPT_FILES+=git-flow-release
- SCRIPT_FILES+=git-flow-support
- SCRIPT_FILES+=git-flow-version
- SCRIPT_FILES+=gitflow-common
--SCRIPT_FILES+=gitflow-shFlags
-
- all:
- @echo "usage: make install"
- @echo " make uninstall"
-
- install:
-- @test -f gitflow-shFlags || (echo "Run 'git submodule init && git submodule update' first." ; exit 1 )
- install -d -m 0755 $(prefix)/bin
- install -m 0755 $(EXEC_FILES) $(prefix)/bin
- install -m 0644 $(SCRIPT_FILES) $(prefix)/bin
-diff --git a/git-flow b/git-flow
-index 93e9f0f..7b643d3 100755
---- a/git-flow
-+++ b/git-flow
-@@ -78,7 +78,7 @@ main() {
- export POSIXLY_CORRECT=1
-
- # use the shFlags project to parse the command line arguments
-- . "$GITFLOW_DIR/gitflow-shFlags"
-+ . /usr/share/misc/shflags
- FLAGS_PARENT="git flow"
- FLAGS "$@" || exit $?
- eval set -- "${FLAGS_ARGV}"
diff --git a/dev-vcs/git-flow/git-flow-0.4.1.ebuild b/dev-vcs/git-flow/git-flow-0.4.1.ebuild
deleted file mode 100644
index e03b7e5..0000000
--- a/dev-vcs/git-flow/git-flow-0.4.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_PN="${PN/-/}"
-COMP_PN="${PN}-completion"
-COMP_PV="0.4.2.2"
-COMP_P="${COMP_PN}-${COMP_PV}"
-inherit eutils bash-completion-r1
-
-DESCRIPTION="Git extensions to provide high-level repository operations for Vincent Driessen's branching model"
-HOMEPAGE="https://github.com/nvie/gitflow"
-SRC_URI="https://github.com/nvie/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-https://github.com/bobthecow/${COMP_PN}/archive/${COMP_PV}.tar.gz -> ${COMP_P}.tar.gz"
-
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
- dev-util/shflags
- dev-vcs/git
-"
-
-DOCS=( AUTHORS Changes.mdown README.mdown )
-
-PATCHES=( "${FILESDIR}/${P}-unbundle-shflags.patch" )
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
- [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
- debug-print "$FUNCNAME: applying user patches"
- epatch_user
-}
-
-src_compile() {
- true
-}
-
-src_install() {
- emake prefix="${D}/usr" install
-
- [[ ${DOCS[@]} ]] && dodoc "${DOCS[@]}"
-
- newbashcomp "${WORKDIR}/${COMP_P}/${COMP_PN}.bash" ${PN}
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-flow/files/, dev-vcs/git-flow/
@ 2021-06-13 12:08 Marek Szuba
0 siblings, 0 replies; 3+ messages in thread
From: Marek Szuba @ 2021-06-13 12:08 UTC (permalink / raw
To: gentoo-commits
commit: be1016621c919ec293667becd69e6dd2b854a2fc
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 13 12:03:51 2021 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sun Jun 13 12:08:44 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be101662
dev-vcs/git-flow: some QA fixes
1. Inherit eclasses before declaring any variables, just in case;
2. Fix indentation of SRC_URI;
3. Put non-executable support scripts in /usr/libexec/git-flow instead
of polluting /usr/bin;
4. Use PF rather than P as the directory name for docs;
5. Change the sed delimiter to ! so that slashes in paths do not have to
be escaped;
6. Install to ED rather than D so that we (hopefully) support Prefix.
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
.../git-flow/files/git-flow-1.12.3_scriptdir.patch | 72 ++++++++++++++++++++++
dev-vcs/git-flow/git-flow-1.12.3-r1.ebuild | 46 ++++++++++++++
2 files changed, 118 insertions(+)
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 00000000000..34fab234d41
--- /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 00000000000..7bd223ff451
--- /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}
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-06-13 12:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-15 22:10 [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-flow/files/, dev-vcs/git-flow/ Johannes Huber
-- strict thread matches above, loose matches on Subject: below --
2015-11-28 10:31 Johannes Huber
2021-06-13 12:08 Marek Szuba
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox