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

[Marek Szuba]

commit: 75bcef11ff837f6741f19768f9202a8cd7d16ea8
Author: Marek Szuba  gentoo  org>
AuthorDate: Wed Aug 11 09:34:54 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Aug 11 09:34:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75bcef11

dev-vcs/git-flow: drop 1.12.3

Signed-off-by: Marek Szuba  gentoo.org>

 dev-vcs/git-flow/git-flow-1.12.3.ebuild | 40 -
 1 file changed, 40 deletions(-)

diff --git a/dev-vcs/git-flow/git-flow-1.12.3.ebuild 
b/dev-vcs/git-flow/git-flow-1.12.3.ebuild
deleted file mode 100644
index ca2e613a0b7..000
--- a/dev-vcs/git-flow/git-flow-1.12.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="${PN/-/}-avh"
-COMP_PN="${PN}-completion"
-COMP_PV="0.6.0"
-COMP_P="${COMP_PN}-${COMP_PV}"
-inherit bash-completion-r1
-
-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"
-
-DOCS=( AUTHORS CHANGELOG.md README.md )
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-   default
-   sed -i "s/doc\/gitflow/doc\/${P}/" Makefile || die "fixing doc path 
failed"
-}
-
-src_compile() {
-   true
-}
-
-src_install() {
-   emake prefix="${D}/usr" install
-   einstalldocs
-   newbashcomp "${WORKDIR}/${COMP_P}/${COMP_PN}.bash" ${PN}
-}

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

[Sam James]

commit: 4c4b99cc8cd27d660e2728dc51596034645b4c63
Author: Sam James  gentoo  org>
AuthorDate: Wed Aug 11 00:00:42 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Aug 11 00:02:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c4b99cc

dev-vcs/git-flow: Stabilize 1.12.3-r2 x86, #807571

Signed-off-by: Sam James  gentoo.org>

 dev-vcs/git-flow/git-flow-1.12.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index c250428cff3..fe3202788ae 100644
--- a/dev-vcs/git-flow/git-flow-1.12.3-r2.ebuild
+++ b/dev-vcs/git-flow/git-flow-1.12.3-r2.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="https://github.com/petervanderdoes/${MY_PN}/archive/${PV}.tar.gz -> ${P
 
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS="amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="dev-vcs/git"
 

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

[Marek Szuba]

commit: 63f2111359ca7d0814139443c8e8ff82d382293f
Author: Marek Szuba  gentoo  org>
AuthorDate: Sun Jul 25 22:54:44 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sun Jul 25 22:56:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63f21113

dev-vcs/git-flow: bump to EAPI 8

Signed-off-by: Marek Szuba  gentoo.org>

 dev-vcs/git-flow/git-flow-1.12.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index 7951db19973..e6670cc6732 100644
--- a/dev-vcs/git-flow/git-flow-1.12.3-r2.ebuild
+++ b/dev-vcs/git-flow/git-flow-1.12.3-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit bash-completion-r1
 

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

[Marek Szuba]

commit: a978dfa7e1eeada160279c1d57f7ca534928b131
Author: Marek Szuba  gentoo  org>
AuthorDate: Fri Jun 25 10:29:58 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Fri Jun 25 12:09:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a978dfa7

dev-vcs/git-flow: keyword 1.12.3-r2 for ~riscv

Signed-off-by: Marek Szuba  gentoo.org>

 dev-vcs/git-flow/git-flow-1.12.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index 95612de82dd..7951db19973 100644
--- a/dev-vcs/git-flow/git-flow-1.12.3-r2.ebuild
+++ b/dev-vcs/git-flow/git-flow-1.12.3-r2.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="https://github.com/petervanderdoes/${MY_PN}/archive/${PV}.tar.gz -> ${P
 
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 
 RDEPEND="dev-vcs/git"
 

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

[Marek Szuba]

commit: 490357d3d77155d7f32da0b2332d162d1904a109
Author: Marek Szuba  gentoo  org>
AuthorDate: Wed Jun 16 13:20:41 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Jun 16 13:21:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=490357d3

dev-vcs/git-flow: fix the script-directory prefix

Closes: https://bugs.gentoo.org/796341
Signed-off-by: Marek Szuba  gentoo.org>

 .../git-flow/{git-flow-1.12.3-r1.ebuild => git-flow-1.12.3-r2.ebuild}   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-vcs/git-flow/git-flow-1.12.3-r1.ebuild 
b/dev-vcs/git-flow/git-flow-1.12.3-r2.ebuild
similarity index 91%
rename from dev-vcs/git-flow/git-flow-1.12.3-r1.ebuild
rename to dev-vcs/git-flow/git-flow-1.12.3-r2.ebuild
index 7bd223ff451..95612de82dd 100644
--- a/dev-vcs/git-flow/git-flow-1.12.3-r1.ebuild
+++ b/dev-vcs/git-flow/git-flow-1.12.3-r2.ebuild
@@ -32,7 +32,7 @@ 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"
+   sed -i "s!@PREFIX@!${EPREFIX}/usr!" git-flow || die "Failed to set 
prefix in the script"
 }
 
 src_compile() {

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-flow/files/, dev-vcs/git-flow/

[Marek Szuba]

commit: be1016621c919ec293667becd69e6dd2b854a2fc
Author: Marek Szuba  gentoo  org>
AuthorDate: Sun Jun 13 12:03:51 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sun Jun 13 12:08:44 2021 +
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  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 000..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 000..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}
+}

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

[Marek Szuba]

commit: 4a8ad757e9373a63331a2439d1576f1ccb1b8978
Author: Marek Szuba  gentoo  org>
AuthorDate: Sun Jun 13 11:27:55 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sun Jun 13 12:08:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a8ad757

dev-vcs/git-flow: add self as maintainer

Signed-off-by: Marek Szuba  gentoo.org>

 dev-vcs/git-flow/metadata.xml | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dev-vcs/git-flow/metadata.xml b/dev-vcs/git-flow/metadata.xml
index 576c9e32885..ab1910c926d 100644
--- a/dev-vcs/git-flow/metadata.xml
+++ b/dev-vcs/git-flow/metadata.xml
@@ -1,7 +1,10 @@
 
 http://www.gentoo.org/dtd/metadata.dtd";>
 
-   
+   
+   mare...@gentoo.org
+   Marek Szuba
+   

petervanderdoes/gitflow-avh

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

[David Seifert]

commit: c14b05daeaf76db67a69d0c6115b020bf9b727eb
Author: David Seifert  gentoo  org>
AuthorDate: Sat Jun 12 13:41:23 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Jun 12 13:41:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c14b05da

dev-vcs/git-flow: drop inactive maintainer

Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: David Seifert  gentoo.org>

 dev-vcs/git-flow/metadata.xml | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/dev-vcs/git-flow/metadata.xml b/dev-vcs/git-flow/metadata.xml
index 8bfb4a949f2..576c9e32885 100644
--- a/dev-vcs/git-flow/metadata.xml
+++ b/dev-vcs/git-flow/metadata.xml
@@ -1,10 +1,7 @@
 
 http://www.gentoo.org/dtd/metadata.dtd";>
 
-   
-   j...@gentoo.org
-   Johannes Huber
-   
+   

petervanderdoes/gitflow-avh

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

[Johannes Huber]

commit: f3dd4de34da84dd63c3b6ec5912a13b039c5bd98
Author: Johannes Huber  gentoo  org>
AuthorDate: Thu Jan  9 20:17:05 2020 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Thu Jan  9 20:17:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3dd4de3

dev-vcs/git-flow: Remove 1.11.0

Overshadowed by 1.12.3.

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Johannes Huber  gentoo.org>

 dev-vcs/git-flow/Manifest   |  1 -
 dev-vcs/git-flow/git-flow-1.11.0.ebuild | 39 -
 2 files changed, 40 deletions(-)

diff --git a/dev-vcs/git-flow/Manifest b/dev-vcs/git-flow/Manifest
index a20cbb83081..405258672c7 100644
--- a/dev-vcs/git-flow/Manifest
+++ b/dev-vcs/git-flow/Manifest
@@ -1,3 +1,2 @@
-DIST git-flow-1.11.0.tar.gz 64077 BLAKE2B 
7761ed8020039b2fe9fad23664c5e8d0ad754033e80b3cf402fae5e72331a79ac548f8676f9e8c5d6fe5d7032a5c25770563300d7be81834c3d47869a374ee6b
 SHA512 
3659f876febbec10457ba7ba1ecbaeb7f29b11cc8caf94042f54b8f8e2265d2bb31cbcdf7dfafae9c5d04e0ca57adddfa67f9e67df4a5dcf0bc412f1216a3c07
 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

diff --git a/dev-vcs/git-flow/git-flow-1.11.0.ebuild 
b/dev-vcs/git-flow/git-flow-1.11.0.ebuild
deleted file mode 100644
index d42ac93ef3c..000
--- a/dev-vcs/git-flow/git-flow-1.11.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="${PN/-/}-avh"
-COMP_PN="${PN}-completion"
-COMP_PV="0.6.0"
-COMP_P="${COMP_PN}-${COMP_PV}"
-inherit bash-completion-r1
-
-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"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-   dev-vcs/git
-"
-
-DOCS=( AUTHORS CHANGELOG.md README.md )
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-   true
-}
-
-src_install() {
-   emake prefix="${D}/usr" install
-   einstalldocs
-   newbashcomp "${WORKDIR}/${COMP_P}/${COMP_PN}.bash" ${PN}
-}

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

[Agostino Sarubbo]

commit: e07281b8f8361233b14ca36e5f5ede38a9684271
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Jan  9 11:48:52 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Jan  9 11:48:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e07281b8

dev-vcs/git-flow: x86 stable wrt bug #704822

Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-vcs/git-flow/git-flow-1.12.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-vcs/git-flow/git-flow-1.12.3.ebuild 
b/dev-vcs/git-flow/git-flow-1.12.3.ebuild
index a6ebcbb65ee..ca2e613a0b7 100644
--- a/dev-vcs/git-flow/git-flow-1.12.3.ebuild
+++ b/dev-vcs/git-flow/git-flow-1.12.3.ebuild
@@ -16,7 +16,7 @@ 
https://github.com/petervanderdoes/${COMP_PN}/archive/${COMP_PV}.tar.gz -> ${COM
 
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-vcs/git"
 

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

[Agostino Sarubbo]

commit: 83e6a7be165559f0c6e6ae2b1b9a5d82038e005c
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Jan  6 13:06:18 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Jan  6 13:06:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83e6a7be

dev-vcs/git-flow: amd64 stable wrt bug #704822

Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-vcs/git-flow/git-flow-1.12.3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-vcs/git-flow/git-flow-1.12.3.ebuild 
b/dev-vcs/git-flow/git-flow-1.12.3.ebuild
index 0e539df2e29..a6ebcbb65ee 100644
--- a/dev-vcs/git-flow/git-flow-1.12.3.ebuild
+++ b/dev-vcs/git-flow/git-flow-1.12.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ 
https://github.com/petervanderdoes/${COMP_PN}/archive/${COMP_PV}.tar.gz -> ${COM
 
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="dev-vcs/git"
 

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

[Johannes Huber]

commit: fa8312f5798174ebc02aada3b52d49d0e0f4279d
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun Jun 30 08:35:22 2019 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sun Jun 30 08:36:05 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa8312f5

dev-vcs/git-flow: Version bump 1.12.3

Package-Manager: Portage-2.3.67, Repoman-2.3.16
Signed-off-by: Johannes Huber  gentoo.org>

 dev-vcs/git-flow/Manifest   |  1 +
 dev-vcs/git-flow/git-flow-1.12.3.ebuild | 40 +
 2 files changed, 41 insertions(+)

diff --git a/dev-vcs/git-flow/Manifest b/dev-vcs/git-flow/Manifest
index 5060cafa58b..a20cbb83081 100644
--- a/dev-vcs/git-flow/Manifest
+++ b/dev-vcs/git-flow/Manifest
@@ -1,2 +1,3 @@
 DIST git-flow-1.11.0.tar.gz 64077 BLAKE2B 
7761ed8020039b2fe9fad23664c5e8d0ad754033e80b3cf402fae5e72331a79ac548f8676f9e8c5d6fe5d7032a5c25770563300d7be81834c3d47869a374ee6b
 SHA512 
3659f876febbec10457ba7ba1ecbaeb7f29b11cc8caf94042f54b8f8e2265d2bb31cbcdf7dfafae9c5d04e0ca57adddfa67f9e67df4a5dcf0bc412f1216a3c07
+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

diff --git a/dev-vcs/git-flow/git-flow-1.12.3.ebuild 
b/dev-vcs/git-flow/git-flow-1.12.3.ebuild
new file mode 100644
index 000..0e539df2e29
--- /dev/null
+++ b/dev-vcs/git-flow/git-flow-1.12.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN/-/}-avh"
+COMP_PN="${PN}-completion"
+COMP_PV="0.6.0"
+COMP_P="${COMP_PN}-${COMP_PV}"
+inherit bash-completion-r1
+
+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"
+
+DOCS=( AUTHORS CHANGELOG.md README.md )
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+   default
+   sed -i "s/doc\/gitflow/doc\/${P}/" Makefile || die "fixing doc path 
failed"
+}
+
+src_compile() {
+   true
+}
+
+src_install() {
+   emake prefix="${D}/usr" install
+   einstalldocs
+   newbashcomp "${WORKDIR}/${COMP_P}/${COMP_PN}.bash" ${PN}
+}

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

[Johannes Huber]

commit: 385712c2262ef9c0ef001c2f5659e5b7aaf3a032
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon Apr  2 10:24:55 2018 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Mon Apr  2 10:25:26 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=385712c2

dev-vcs/git-flow: Remove 1.10.2

Package-Manager: Portage-2.3.27, Repoman-2.3.9

 dev-vcs/git-flow/Manifest   |  2 --
 dev-vcs/git-flow/git-flow-1.10.2.ebuild | 39 -
 2 files changed, 41 deletions(-)

diff --git a/dev-vcs/git-flow/Manifest b/dev-vcs/git-flow/Manifest
index 5e31fff7773..5060cafa58b 100644
--- a/dev-vcs/git-flow/Manifest
+++ b/dev-vcs/git-flow/Manifest
@@ -1,4 +1,2 @@
-DIST git-flow-1.10.2.tar.gz 63275 BLAKE2B 
27442af384bd3a1f1082b74e8ebdd4c5d25152e662da7a9277b54d93edb0a87950c68003772d0153a3f8f76dfb66e22b87f01c2b5f3f5775e333be9f2922056f
 SHA512 
139e56eb872a3db271a0e7c65c8d55d2720c06646c2569f14d8e7485d3888918fa8390a95a9df48b4677c1a225367b5aeadf4e7705b9475c38f9e931ea45fe03
 DIST git-flow-1.11.0.tar.gz 64077 BLAKE2B 
7761ed8020039b2fe9fad23664c5e8d0ad754033e80b3cf402fae5e72331a79ac548f8676f9e8c5d6fe5d7032a5c25770563300d7be81834c3d47869a374ee6b
 SHA512 
3659f876febbec10457ba7ba1ecbaeb7f29b11cc8caf94042f54b8f8e2265d2bb31cbcdf7dfafae9c5d04e0ca57adddfa67f9e67df4a5dcf0bc412f1216a3c07
-DIST git-flow-completion-0.5.2.tar.gz 7501 BLAKE2B 
73b63088cd70e9cb7a0fa04c4c36c37b117db56c7ba95a5b152671f4a115744096451ee8e211feb50faccae166e56f87ac90c0dd04ca281b8199f8d34f303a6f
 SHA512 
500cb6163ebb2bf9b996dd5bcac00efa857badfc95ee1d633f2b16803c6baae7315a96c713107645e0971be4736fe1eef747dc773eb50da138551be4838c21b3
 DIST git-flow-completion-0.6.0.tar.gz 7823 BLAKE2B 
24dedfc0cddb5acfa57333895533f5c882a0c85db6e08539ff5c33f984eec40cb06da6d5f0ba812348c9cbf226080875de0269b295791ee5d4c8b2732a1ea1b2
 SHA512 
1082ad47938ec78045f4cbd12340a82960ba3de204c21a95e1166cb0b86e96dbbc3e5fc8af1945c951d5edd43b4026021761e8377795acbb87af3c1e391cb256

diff --git a/dev-vcs/git-flow/git-flow-1.10.2.ebuild 
b/dev-vcs/git-flow/git-flow-1.10.2.ebuild
deleted file mode 100644
index 278bdfc7594..000
--- a/dev-vcs/git-flow/git-flow-1.10.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="${PN/-/}-avh"
-COMP_PN="${PN}-completion"
-COMP_PV="0.5.2"
-COMP_P="${COMP_PN}-${COMP_PV}"
-inherit bash-completion-r1
-
-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"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-   dev-vcs/git
-"
-
-DOCS=( AUTHORS Changes.mdown README.mdown )
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-   true
-}
-
-src_install() {
-   emake prefix="${D}/usr" install
-   einstalldocs
-   newbashcomp "${WORKDIR}/${COMP_P}/${COMP_PN}.bash" ${PN}
-}

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

[Aaron Bauman]

commit: 63b6b67668d933c5ac83010f18e186c185f8101e
Author: Aaron Bauman  gentoo  org>
AuthorDate: Fri Mar 30 18:14:27 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Fri Mar 30 18:35:13 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63b6b676

dev-vcs/git-flow: amd64 stable

Bug: https://bugs.gentoo.org/651198
Package-Manager: Portage-2.3.26, Repoman-2.3.7

 dev-vcs/git-flow/git-flow-1.11.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-vcs/git-flow/git-flow-1.11.0.ebuild 
b/dev-vcs/git-flow/git-flow-1.11.0.ebuild
index f366f5141be..d42ac93ef3c 100644
--- a/dev-vcs/git-flow/git-flow-1.11.0.ebuild
+++ b/dev-vcs/git-flow/git-flow-1.11.0.ebuild
@@ -16,7 +16,7 @@ 
https://github.com/petervanderdoes/${COMP_PN}/archive/${COMP_PV}.tar.gz -> ${COM
 
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=""

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

[Johannes Huber]

commit: 6fcd22e6f3d83e9d4c75284cb348047783b180c5
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon Jun  5 08:51:24 2017 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Mon Jun  5 08:51:45 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fcd22e6

dev-vcs/git-flow: Version bump 1.11.0

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-vcs/git-flow/Manifest   |  2 ++
 dev-vcs/git-flow/git-flow-1.11.0.ebuild | 39 +
 2 files changed, 41 insertions(+)

diff --git a/dev-vcs/git-flow/Manifest b/dev-vcs/git-flow/Manifest
index 7134c046976..495a43bcc2f 100644
--- a/dev-vcs/git-flow/Manifest
+++ b/dev-vcs/git-flow/Manifest
@@ -1,2 +1,4 @@
 DIST git-flow-1.10.2.tar.gz 63275 SHA256 
09b9de0790276cbff2906c31193bdac859235a0cdfb56cedd13b4a1a4ee75065 SHA512 
139e56eb872a3db271a0e7c65c8d55d2720c06646c2569f14d8e7485d3888918fa8390a95a9df48b4677c1a225367b5aeadf4e7705b9475c38f9e931ea45fe03
 WHIRLPOOL 
1cb551e9f3f71a5e7b205b57d4c216f3b9bc7afe622de6b6944183baeffdf3fdb59d6e0dd06afe5e06dc3c3c0d0bebf5aa08ce8a5151e1413b01ceec671a2552
+DIST git-flow-1.11.0.tar.gz 64077 SHA256 
06ad2110088e46e3712f799a43bf6cc5c3720fc25c69dbb3bbf4cf486cf2f330 SHA512 
3659f876febbec10457ba7ba1ecbaeb7f29b11cc8caf94042f54b8f8e2265d2bb31cbcdf7dfafae9c5d04e0ca57adddfa67f9e67df4a5dcf0bc412f1216a3c07
 WHIRLPOOL 
dc9eae1513901596b1f657ac0af58bd7fed0f3d7aa426654214c87676a636d19555841b95754d633605b0cdeaa43cfac13431e522760cd159675de6a8b7489ed
 DIST git-flow-completion-0.5.2.tar.gz 7501 SHA256 
7d11d82b9a3c25f7c7189ac61d21a4edb2432435d6138f092f49348bb17917df SHA512 
500cb6163ebb2bf9b996dd5bcac00efa857badfc95ee1d633f2b16803c6baae7315a96c713107645e0971be4736fe1eef747dc773eb50da138551be4838c21b3
 WHIRLPOOL 
90eaf0d6adcc87369455129052cbcad9c153fe91892a0607fd311bb370a1004b9f85664d0fb06907369bc6bbe6a224a95981fa5d5518610fab2cade0d33c7957
+DIST git-flow-completion-0.6.0.tar.gz 7823 SHA256 
b1b78b785aa2c06f81cc29fcf03a7dfc451ad482de67ca0d89cdb0f941f5594b SHA512 
1082ad47938ec78045f4cbd12340a82960ba3de204c21a95e1166cb0b86e96dbbc3e5fc8af1945c951d5edd43b4026021761e8377795acbb87af3c1e391cb256
 WHIRLPOOL 
ac5189b75e6ca5a5136d1d6f3ee5e866696c87d810406b79b2e3d444cc7c4d8e9222c9057e7bea024b0e754ba419edb908173cf3d1af6c940af792d7eb0d06b9

diff --git a/dev-vcs/git-flow/git-flow-1.11.0.ebuild 
b/dev-vcs/git-flow/git-flow-1.11.0.ebuild
new file mode 100644
index 000..a90de66ee5e
--- /dev/null
+++ b/dev-vcs/git-flow/git-flow-1.11.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/-/}-avh"
+COMP_PN="${PN}-completion"
+COMP_PV="0.6.0"
+COMP_P="${COMP_PN}-${COMP_PV}"
+inherit bash-completion-r1
+
+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"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+   dev-vcs/git
+"
+
+DOCS=( AUTHORS CHANGELOG.md README.md )
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_compile() {
+   true
+}
+
+src_install() {
+   emake prefix="${D}/usr" install
+   einstalldocs
+   newbashcomp "${WORKDIR}/${COMP_P}/${COMP_PN}.bash" ${PN}
+}

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

[Johannes Huber]

commit: 08c6a52064ffce728ea92911bd71ed5de9d06912
Author: Johannes Huber  gentoo  org>
AuthorDate: Wed Dec 21 17:49:15 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Wed Dec 21 17:49:35 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08c6a520

dev-vcs/git-flow: 1.10.2 x86 stable

Due to ALLARCHES request.

Gentoo-bug: 598382

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-vcs/git-flow/git-flow-1.10.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-vcs/git-flow/git-flow-1.10.2.ebuild 
b/dev-vcs/git-flow/git-flow-1.10.2.ebuild
index 6a77976..fbc0195 100644
--- a/dev-vcs/git-flow/git-flow-1.10.2.ebuild
+++ b/dev-vcs/git-flow/git-flow-1.10.2.ebuild
@@ -17,7 +17,7 @@ 
https://github.com/petervanderdoes/${COMP_PN}/archive/${COMP_PV}.tar.gz -> ${COM
 
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=""

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

[Johannes Huber]

commit: f2f61149a3401138ff7210134d1ae42d3b281d75
Author: Johannes Huber  gentoo  org>
AuthorDate: Wed Dec 21 17:50:41 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Wed Dec 21 17:50:41 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2f61149

dev-vcs/git-flow: Remove 1.9.1

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-vcs/git-flow/Manifest  |  1 -
 dev-vcs/git-flow/git-flow-1.9.1.ebuild | 40 --
 2 files changed, 41 deletions(-)

diff --git a/dev-vcs/git-flow/Manifest b/dev-vcs/git-flow/Manifest
index aafe026..7134c04 100644
--- a/dev-vcs/git-flow/Manifest
+++ b/dev-vcs/git-flow/Manifest
@@ -1,3 +1,2 @@
 DIST git-flow-1.10.2.tar.gz 63275 SHA256 
09b9de0790276cbff2906c31193bdac859235a0cdfb56cedd13b4a1a4ee75065 SHA512 
139e56eb872a3db271a0e7c65c8d55d2720c06646c2569f14d8e7485d3888918fa8390a95a9df48b4677c1a225367b5aeadf4e7705b9475c38f9e931ea45fe03
 WHIRLPOOL 
1cb551e9f3f71a5e7b205b57d4c216f3b9bc7afe622de6b6944183baeffdf3fdb59d6e0dd06afe5e06dc3c3c0d0bebf5aa08ce8a5151e1413b01ceec671a2552
-DIST git-flow-1.9.1.tar.gz 61800 SHA256 
7692c77744663c5243cdd390bef0a621caee92dde228b50ef97149fc1b54780d SHA512 
6245ff641452e72490b8d12610bc1352048efc2016000b9a6f466140e06c41b05a9fbea8ec192f106bb790b76b56babca8bb684a5128739873d2f7fafe48ad32
 WHIRLPOOL 
904867ecc1cd7f52dd48b839046df838f019aa9472b6e7202de562b70cac83203e10f0de7359279d619e4391d8ae3019ff9fa797a91d6b7ea0ed132c21ccaa60
 DIST git-flow-completion-0.5.2.tar.gz 7501 SHA256 
7d11d82b9a3c25f7c7189ac61d21a4edb2432435d6138f092f49348bb17917df SHA512 
500cb6163ebb2bf9b996dd5bcac00efa857badfc95ee1d633f2b16803c6baae7315a96c713107645e0971be4736fe1eef747dc773eb50da138551be4838c21b3
 WHIRLPOOL 
90eaf0d6adcc87369455129052cbcad9c153fe91892a0607fd311bb370a1004b9f85664d0fb06907369bc6bbe6a224a95981fa5d5518610fab2cade0d33c7957

diff --git a/dev-vcs/git-flow/git-flow-1.9.1.ebuild 
b/dev-vcs/git-flow/git-flow-1.9.1.ebuild
deleted file mode 100644
index fbc0195..
--- a/dev-vcs/git-flow/git-flow-1.9.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-MY_PN="${PN/-/}-avh"
-COMP_PN="${PN}-completion"
-COMP_PV="0.5.2"
-COMP_P="${COMP_PN}-${COMP_PV}"
-inherit bash-completion-r1
-
-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"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-   dev-vcs/git
-"
-
-DOCS=( AUTHORS Changes.mdown README.mdown )
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-   true
-}
-
-src_install() {
-   emake prefix="${D}/usr" install
-   einstalldocs
-   newbashcomp "${WORKDIR}/${COMP_P}/${COMP_PN}.bash" ${PN}
-}

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

[Tobias Klausmann]

commit: 1352530e89f1379a3051a1222729b3a35fc80ea7
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Wed Dec 21 10:20:13 2016 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Wed Dec 21 10:27:05 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1352530e

dev-vcs/git-flow-1.10.2-r0: stable on amd64

Gentoo-Bug: 598382

 dev-vcs/git-flow/git-flow-1.10.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-vcs/git-flow/git-flow-1.10.2.ebuild 
b/dev-vcs/git-flow/git-flow-1.10.2.ebuild
index abdb799..6a77976 100644
--- a/dev-vcs/git-flow/git-flow-1.10.2.ebuild
+++ b/dev-vcs/git-flow/git-flow-1.10.2.ebuild
@@ -17,7 +17,7 @@ 
https://github.com/petervanderdoes/${COMP_PN}/archive/${COMP_PV}.tar.gz -> ${COM
 
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND=""

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

[Johannes Huber]

commit: 57b00bb5766732a4276125a12cda78b57e8a1ac5
Author: Johannes Huber  gentoo  org>
AuthorDate: Wed Oct 12 19:41:24 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Wed Oct 12 19:42:30 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57b00bb5

dev-vcs/git-flow: Version bump 1.10.2

Package-Manager: portage-2.3.0

 dev-vcs/git-flow/Manifest   |  1 +
 dev-vcs/git-flow/git-flow-1.10.2.ebuild | 40 +
 2 files changed, 41 insertions(+)

diff --git a/dev-vcs/git-flow/Manifest b/dev-vcs/git-flow/Manifest
index f42172a..0d6a051 100644
--- a/dev-vcs/git-flow/Manifest
+++ b/dev-vcs/git-flow/Manifest
@@ -1,3 +1,4 @@
 DIST git-flow-1.10.0.tar.gz 63175 SHA256 
e9c25a500eec3ea6e537a811ed9063e567c5e310caa3ffb274950b744ffcb25a SHA512 
5782298dc92a94d673f699fccaa2a00795888f35d613549a2048c84edc0a583bfa1dbf219539745f9c03a1f0cbe8bfcce4a0d9ff596eef397d989060d84b6b92
 WHIRLPOOL 
7884918c3ccefd76ef46c497ab88cc53d7f034d7ab5514e6bc0c3ae7e21c19778a761bfb111313507bdd31efe73c151eeb10ce268188bfc4f4b113d252a735e4
+DIST git-flow-1.10.2.tar.gz 63275 SHA256 
09b9de0790276cbff2906c31193bdac859235a0cdfb56cedd13b4a1a4ee75065 SHA512 
139e56eb872a3db271a0e7c65c8d55d2720c06646c2569f14d8e7485d3888918fa8390a95a9df48b4677c1a225367b5aeadf4e7705b9475c38f9e931ea45fe03
 WHIRLPOOL 
1cb551e9f3f71a5e7b205b57d4c216f3b9bc7afe622de6b6944183baeffdf3fdb59d6e0dd06afe5e06dc3c3c0d0bebf5aa08ce8a5151e1413b01ceec671a2552
 DIST git-flow-1.9.1.tar.gz 61800 SHA256 
7692c77744663c5243cdd390bef0a621caee92dde228b50ef97149fc1b54780d SHA512 
6245ff641452e72490b8d12610bc1352048efc2016000b9a6f466140e06c41b05a9fbea8ec192f106bb790b76b56babca8bb684a5128739873d2f7fafe48ad32
 WHIRLPOOL 
904867ecc1cd7f52dd48b839046df838f019aa9472b6e7202de562b70cac83203e10f0de7359279d619e4391d8ae3019ff9fa797a91d6b7ea0ed132c21ccaa60
 DIST git-flow-completion-0.5.2.tar.gz 7501 SHA256 
7d11d82b9a3c25f7c7189ac61d21a4edb2432435d6138f092f49348bb17917df SHA512 
500cb6163ebb2bf9b996dd5bcac00efa857badfc95ee1d633f2b16803c6baae7315a96c713107645e0971be4736fe1eef747dc773eb50da138551be4838c21b3
 WHIRLPOOL 
90eaf0d6adcc87369455129052cbcad9c153fe91892a0607fd311bb370a1004b9f85664d0fb06907369bc6bbe6a224a95981fa5d5518610fab2cade0d33c7957

diff --git a/dev-vcs/git-flow/git-flow-1.10.2.ebuild 
b/dev-vcs/git-flow/git-flow-1.10.2.ebuild
new file mode 100644
index ..abdb799
--- /dev/null
+++ b/dev-vcs/git-flow/git-flow-1.10.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+MY_PN="${PN/-/}-avh"
+COMP_PN="${PN}-completion"
+COMP_PV="0.5.2"
+COMP_P="${COMP_PN}-${COMP_PV}"
+inherit bash-completion-r1
+
+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"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+   dev-vcs/git
+"
+
+DOCS=( AUTHORS Changes.mdown README.mdown )
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_compile() {
+   true
+}
+
+src_install() {
+   emake prefix="${D}/usr" install
+   einstalldocs
+   newbashcomp "${WORKDIR}/${COMP_P}/${COMP_PN}.bash" ${PN}
+}

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

[Johannes Huber]

commit: e14a73b6e64e7c110d5e07a0f45d039322a7722a
Author: Johannes Huber  gentoo  org>
AuthorDate: Wed Oct 12 19:42:12 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Wed Oct 12 19:42:30 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e14a73b6

dev-vcs/git-flow: Remove 1.10.0

Package-Manager: portage-2.3.0

 dev-vcs/git-flow/Manifest   |  1 -
 dev-vcs/git-flow/git-flow-1.10.0.ebuild | 40 -
 2 files changed, 41 deletions(-)

diff --git a/dev-vcs/git-flow/Manifest b/dev-vcs/git-flow/Manifest
index 0d6a051..aafe026 100644
--- a/dev-vcs/git-flow/Manifest
+++ b/dev-vcs/git-flow/Manifest
@@ -1,4 +1,3 @@
-DIST git-flow-1.10.0.tar.gz 63175 SHA256 
e9c25a500eec3ea6e537a811ed9063e567c5e310caa3ffb274950b744ffcb25a SHA512 
5782298dc92a94d673f699fccaa2a00795888f35d613549a2048c84edc0a583bfa1dbf219539745f9c03a1f0cbe8bfcce4a0d9ff596eef397d989060d84b6b92
 WHIRLPOOL 
7884918c3ccefd76ef46c497ab88cc53d7f034d7ab5514e6bc0c3ae7e21c19778a761bfb111313507bdd31efe73c151eeb10ce268188bfc4f4b113d252a735e4
 DIST git-flow-1.10.2.tar.gz 63275 SHA256 
09b9de0790276cbff2906c31193bdac859235a0cdfb56cedd13b4a1a4ee75065 SHA512 
139e56eb872a3db271a0e7c65c8d55d2720c06646c2569f14d8e7485d3888918fa8390a95a9df48b4677c1a225367b5aeadf4e7705b9475c38f9e931ea45fe03
 WHIRLPOOL 
1cb551e9f3f71a5e7b205b57d4c216f3b9bc7afe622de6b6944183baeffdf3fdb59d6e0dd06afe5e06dc3c3c0d0bebf5aa08ce8a5151e1413b01ceec671a2552
 DIST git-flow-1.9.1.tar.gz 61800 SHA256 
7692c77744663c5243cdd390bef0a621caee92dde228b50ef97149fc1b54780d SHA512 
6245ff641452e72490b8d12610bc1352048efc2016000b9a6f466140e06c41b05a9fbea8ec192f106bb790b76b56babca8bb684a5128739873d2f7fafe48ad32
 WHIRLPOOL 
904867ecc1cd7f52dd48b839046df838f019aa9472b6e7202de562b70cac83203e10f0de7359279d619e4391d8ae3019ff9fa797a91d6b7ea0ed132c21ccaa60
 DIST git-flow-completion-0.5.2.tar.gz 7501 SHA256 
7d11d82b9a3c25f7c7189ac61d21a4edb2432435d6138f092f49348bb17917df SHA512 
500cb6163ebb2bf9b996dd5bcac00efa857badfc95ee1d633f2b16803c6baae7315a96c713107645e0971be4736fe1eef747dc773eb50da138551be4838c21b3
 WHIRLPOOL 
90eaf0d6adcc87369455129052cbcad9c153fe91892a0607fd311bb370a1004b9f85664d0fb06907369bc6bbe6a224a95981fa5d5518610fab2cade0d33c7957

diff --git a/dev-vcs/git-flow/git-flow-1.10.0.ebuild 
b/dev-vcs/git-flow/git-flow-1.10.0.ebuild
deleted file mode 100644
index abdb799..
--- a/dev-vcs/git-flow/git-flow-1.10.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-MY_PN="${PN/-/}-avh"
-COMP_PN="${PN}-completion"
-COMP_PV="0.5.2"
-COMP_P="${COMP_PN}-${COMP_PV}"
-inherit bash-completion-r1
-
-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"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-   dev-vcs/git
-"
-
-DOCS=( AUTHORS Changes.mdown README.mdown )
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-   true
-}
-
-src_install() {
-   emake prefix="${D}/usr" install
-   einstalldocs
-   newbashcomp "${WORKDIR}/${COMP_P}/${COMP_PN}.bash" ${PN}
-}

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

[Johannes Huber]

commit: 43d335dd5be73f02e5c44fcae7b63f2b4e493a54
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun Aug 28 16:27:09 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sun Aug 28 16:27:20 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43d335dd

dev-vcs/git-flow: Version bump 1.10.0

Package-Manager: portage-2.3.0

 dev-vcs/git-flow/Manifest   |  1 +
 dev-vcs/git-flow/git-flow-1.10.0.ebuild | 40 +
 2 files changed, 41 insertions(+)

diff --git a/dev-vcs/git-flow/Manifest b/dev-vcs/git-flow/Manifest
index 9785bf1..f42172a 100644
--- a/dev-vcs/git-flow/Manifest
+++ b/dev-vcs/git-flow/Manifest
@@ -1,2 +1,3 @@
+DIST git-flow-1.10.0.tar.gz 63175 SHA256 
e9c25a500eec3ea6e537a811ed9063e567c5e310caa3ffb274950b744ffcb25a SHA512 
5782298dc92a94d673f699fccaa2a00795888f35d613549a2048c84edc0a583bfa1dbf219539745f9c03a1f0cbe8bfcce4a0d9ff596eef397d989060d84b6b92
 WHIRLPOOL 
7884918c3ccefd76ef46c497ab88cc53d7f034d7ab5514e6bc0c3ae7e21c19778a761bfb111313507bdd31efe73c151eeb10ce268188bfc4f4b113d252a735e4
 DIST git-flow-1.9.1.tar.gz 61800 SHA256 
7692c77744663c5243cdd390bef0a621caee92dde228b50ef97149fc1b54780d SHA512 
6245ff641452e72490b8d12610bc1352048efc2016000b9a6f466140e06c41b05a9fbea8ec192f106bb790b76b56babca8bb684a5128739873d2f7fafe48ad32
 WHIRLPOOL 
904867ecc1cd7f52dd48b839046df838f019aa9472b6e7202de562b70cac83203e10f0de7359279d619e4391d8ae3019ff9fa797a91d6b7ea0ed132c21ccaa60
 DIST git-flow-completion-0.5.2.tar.gz 7501 SHA256 
7d11d82b9a3c25f7c7189ac61d21a4edb2432435d6138f092f49348bb17917df SHA512 
500cb6163ebb2bf9b996dd5bcac00efa857badfc95ee1d633f2b16803c6baae7315a96c713107645e0971be4736fe1eef747dc773eb50da138551be4838c21b3
 WHIRLPOOL 
90eaf0d6adcc87369455129052cbcad9c153fe91892a0607fd311bb370a1004b9f85664d0fb06907369bc6bbe6a224a95981fa5d5518610fab2cade0d33c7957

diff --git a/dev-vcs/git-flow/git-flow-1.10.0.ebuild 
b/dev-vcs/git-flow/git-flow-1.10.0.ebuild
new file mode 100644
index ..abdb799
--- /dev/null
+++ b/dev-vcs/git-flow/git-flow-1.10.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+MY_PN="${PN/-/}-avh"
+COMP_PN="${PN}-completion"
+COMP_PV="0.5.2"
+COMP_P="${COMP_PN}-${COMP_PV}"
+inherit bash-completion-r1
+
+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"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+   dev-vcs/git
+"
+
+DOCS=( AUTHORS Changes.mdown README.mdown )
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_compile() {
+   true
+}
+
+src_install() {
+   emake prefix="${D}/usr" install
+   einstalldocs
+   newbashcomp "${WORKDIR}/${COMP_P}/${COMP_PN}.bash" ${PN}
+}

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

[Johannes Huber]

commit: f7fe64e52cd0cda9a343795d97f29a81da97a547
Author: Johannes Huber  gentoo  org>
AuthorDate: Wed Aug  3 17:59:28 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Wed Aug  3 17:59:40 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7fe64e5

dev-vcs/git-flow: Update HOMEPAGE

Package-Manager: portage-2.3.0

 dev-vcs/git-flow/git-flow-1.9.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-vcs/git-flow/git-flow-1.9.1.ebuild 
b/dev-vcs/git-flow/git-flow-1.9.1.ebuild
index 761ea7f..fbc0195 100644
--- a/dev-vcs/git-flow/git-flow-1.9.1.ebuild
+++ b/dev-vcs/git-flow/git-flow-1.9.1.ebuild
@@ -11,7 +11,7 @@ COMP_P="${COMP_PN}-${COMP_PV}"
 inherit bash-completion-r1
 
 DESCRIPTION="Git extensions to provide high-level repository operations"
-HOMEPAGE="https://github.com/petervanderdoes/gitflow";
+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"
 

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

[Johannes Huber]

commit: 4c948753e239f40f64b783d97514cfbff45845dd
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue May 17 12:35:47 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Tue May 17 12:35:47 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c948753

dev-vcs/git-flow: x86 stable, ALLARCHES policy

Gentoo-bug: 579562

Package-Manager: portage-2.3.0_rc1

 dev-vcs/git-flow/git-flow-1.9.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-vcs/git-flow/git-flow-1.9.1.ebuild 
b/dev-vcs/git-flow/git-flow-1.9.1.ebuild
index 5a935ae..761ea7f 100644
--- a/dev-vcs/git-flow/git-flow-1.9.1.ebuild
+++ b/dev-vcs/git-flow/git-flow-1.9.1.ebuild
@@ -17,7 +17,7 @@ 
https://github.com/petervanderdoes/${COMP_PN}/archive/${COMP_PV}.tar.gz -> ${COM
 
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=""

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

[Johannes Huber]

commit: 4e16287210becc0aef3fbf42e2cc9b548ef82cf8
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue May 17 12:36:41 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Tue May 17 12:36:41 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e162872

dev-vcs/git-flow: Remvoe 1.8.0

Package-Manager: portage-2.3.0_rc1

 dev-vcs/git-flow/Manifest |  2 --
 dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild | 48 ---
 dev-vcs/git-flow/git-flow-1.8.0-r2.ebuild | 40 --
 3 files changed, 90 deletions(-)

diff --git a/dev-vcs/git-flow/Manifest b/dev-vcs/git-flow/Manifest
index beb8657..9785bf1 100644
--- a/dev-vcs/git-flow/Manifest
+++ b/dev-vcs/git-flow/Manifest
@@ -1,4 +1,2 @@
-DIST git-flow-1.8.0.tar.gz 56304 SHA256 
8239131b8dac160d7e929eab376fa14de44a55cbd5c5545e0ad4464d3a57adef SHA512 
677bfb0c379eb91bfaf8ef676593d39a8306ff063251e1e638166c7101c24ce2eac59490bab85d0c76b712c1905f15d3a14a3ecc020df376848d3b1ea5ee7b0a
 WHIRLPOOL 
6bf654329b941989a8b646ab8218c072b7bf455b0ec6a8441d43de10b9b480a5619bca931606acdd743b0f3f86e9b67f119ff07957eaa106fd17f5cddc96a328
 DIST git-flow-1.9.1.tar.gz 61800 SHA256 
7692c77744663c5243cdd390bef0a621caee92dde228b50ef97149fc1b54780d SHA512 
6245ff641452e72490b8d12610bc1352048efc2016000b9a6f466140e06c41b05a9fbea8ec192f106bb790b76b56babca8bb684a5128739873d2f7fafe48ad32
 WHIRLPOOL 
904867ecc1cd7f52dd48b839046df838f019aa9472b6e7202de562b70cac83203e10f0de7359279d619e4391d8ae3019ff9fa797a91d6b7ea0ed132c21ccaa60
-DIST git-flow-completion-0.5.1.tar.gz 6916 SHA256 
5c8547a549dc623a8d57cfc22c3fa88588f5630da9dc6de9638e5b69da9d47d0 SHA512 
c1fc889faff8189cd985b077cb64b81ae13e17f02c9df27675f428c6edf8f00627effdf6ebdae7a7f0641ec4ac621a9ecd0a53f14be7d95ec7e124ab8c1b
 WHIRLPOOL 
fd59f799d944752eab06b35f05c1f1309ef589014a0378f292e4dde206578f0c0aeb3685e16ea8d2f810e93b77abb7a2bc42c3c335ef9057b9c3ee1dd6df9982
 DIST git-flow-completion-0.5.2.tar.gz 7501 SHA256 
7d11d82b9a3c25f7c7189ac61d21a4edb2432435d6138f092f49348bb17917df SHA512 
500cb6163ebb2bf9b996dd5bcac00efa857badfc95ee1d633f2b16803c6baae7315a96c713107645e0971be4736fe1eef747dc773eb50da138551be4838c21b3
 WHIRLPOOL 
90eaf0d6adcc87369455129052cbcad9c153fe91892a0607fd311bb370a1004b9f85664d0fb06907369bc6bbe6a224a95981fa5d5518610fab2cade0d33c7957

diff --git a/dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild 
b/dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild
deleted file mode 100644
index 443bc7d..000
--- a/dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2016 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.5.1"
-COMP_P="${COMP_PN}-${COMP_PV}"
-inherit eutils bash-completion-r1
-
-DESCRIPTION="Git extensions to provide high-level repository operations"
-HOMEPAGE="https://github.com/petervanderdoes/gitflow";
-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"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-   dev-vcs/git
-"
-
-DOCS=( AUTHORS Changes.mdown README.mdown )
-
-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}
-}

diff --git a/dev-vcs/git-flow/git-flow-1.8.0-r2.ebuild 
b/dev-vcs/git-flow/git-flow-1.8.0-r2.ebuild
deleted file mode 100644
index 3446bd2..000
--- a/dev-vcs/git-flow/git-flow-1.8.0-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-MY_PN="${PN/-/}"
-COMP_PN="${PN}-completion"
-COMP_PV="0.5.1"
-COMP_P="${COMP_PN}-${COMP_PV}"
-inherit bash-completion-r1
-
-DESCRIPTION="Git extensions to provide high-level repository operations"
-HOMEPAGE="https://github.com/petervanderdoes/gitflow";
-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"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-   dev-vcs/git
-"
-
-DOCS=( AUTHORS Changes.mdown README.mdown )
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-   true
-}
-
-src_install() {
-   emake prefix="${D}/usr" install
-   einstalldocs
-   newbashcomp "${WORKDIR}/${COMP_P}/${COMP_PN}.bash" ${PN}
-}

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

[Agostino Sarubbo]

commit: fcb4d80677af873a29542f8f514865d9781c5539
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri May 13 14:50:12 2016 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri May 13 14:50:12 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcb4d806

dev-vcs/git-flow: amd64 stable wrt bug #579562

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-vcs/git-flow/git-flow-1.9.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-vcs/git-flow/git-flow-1.9.1.ebuild 
b/dev-vcs/git-flow/git-flow-1.9.1.ebuild
index c00e12c..5a935ae 100644
--- a/dev-vcs/git-flow/git-flow-1.9.1.ebuild
+++ b/dev-vcs/git-flow/git-flow-1.9.1.ebuild
@@ -17,7 +17,7 @@ 
https://github.com/petervanderdoes/${COMP_PN}/archive/${COMP_PV}.tar.gz -> ${COM
 
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND=""

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

[Johannes Huber]

commit: 6fa7c1a42979b0c914cdfb782349af4ffd1a21b7
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri Mar 11 19:51:53 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Fri Mar 11 19:52:08 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fa7c1a4

dev-vcs/git-flow: Version bump 1.9.1

Package-Manager: portage-2.2.28

 dev-vcs/git-flow/Manifest   | 2 ++
 dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild   | 2 +-
 dev-vcs/git-flow/git-flow-1.8.0-r2.ebuild   | 2 +-
 .../git-flow/{git-flow-1.8.0-r2.ebuild => git-flow-1.9.1.ebuild}| 6 +++---
 dev-vcs/git-flow/metadata.xml   | 6 +-
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/dev-vcs/git-flow/Manifest b/dev-vcs/git-flow/Manifest
index 3e844ee..beb8657 100644
--- a/dev-vcs/git-flow/Manifest
+++ b/dev-vcs/git-flow/Manifest
@@ -1,2 +1,4 @@
 DIST git-flow-1.8.0.tar.gz 56304 SHA256 
8239131b8dac160d7e929eab376fa14de44a55cbd5c5545e0ad4464d3a57adef SHA512 
677bfb0c379eb91bfaf8ef676593d39a8306ff063251e1e638166c7101c24ce2eac59490bab85d0c76b712c1905f15d3a14a3ecc020df376848d3b1ea5ee7b0a
 WHIRLPOOL 
6bf654329b941989a8b646ab8218c072b7bf455b0ec6a8441d43de10b9b480a5619bca931606acdd743b0f3f86e9b67f119ff07957eaa106fd17f5cddc96a328
+DIST git-flow-1.9.1.tar.gz 61800 SHA256 
7692c77744663c5243cdd390bef0a621caee92dde228b50ef97149fc1b54780d SHA512 
6245ff641452e72490b8d12610bc1352048efc2016000b9a6f466140e06c41b05a9fbea8ec192f106bb790b76b56babca8bb684a5128739873d2f7fafe48ad32
 WHIRLPOOL 
904867ecc1cd7f52dd48b839046df838f019aa9472b6e7202de562b70cac83203e10f0de7359279d619e4391d8ae3019ff9fa797a91d6b7ea0ed132c21ccaa60
 DIST git-flow-completion-0.5.1.tar.gz 6916 SHA256 
5c8547a549dc623a8d57cfc22c3fa88588f5630da9dc6de9638e5b69da9d47d0 SHA512 
c1fc889faff8189cd985b077cb64b81ae13e17f02c9df27675f428c6edf8f00627effdf6ebdae7a7f0641ec4ac621a9ecd0a53f14be7d95ec7e124ab8c1b
 WHIRLPOOL 
fd59f799d944752eab06b35f05c1f1309ef589014a0378f292e4dde206578f0c0aeb3685e16ea8d2f810e93b77abb7a2bc42c3c335ef9057b9c3ee1dd6df9982
+DIST git-flow-completion-0.5.2.tar.gz 7501 SHA256 
7d11d82b9a3c25f7c7189ac61d21a4edb2432435d6138f092f49348bb17917df SHA512 
500cb6163ebb2bf9b996dd5bcac00efa857badfc95ee1d633f2b16803c6baae7315a96c713107645e0971be4736fe1eef747dc773eb50da138551be4838c21b3
 WHIRLPOOL 
90eaf0d6adcc87369455129052cbcad9c153fe91892a0607fd311bb370a1004b9f85664d0fb06907369bc6bbe6a224a95981fa5d5518610fab2cade0d33c7957

diff --git a/dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild 
b/dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild
index 3c7de0d..443bc7d 100644
--- a/dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild
+++ b/dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild
@@ -10,7 +10,7 @@ COMP_PV="0.5.1"
 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"
+DESCRIPTION="Git extensions to provide high-level repository operations"
 HOMEPAGE="https://github.com/petervanderdoes/gitflow";
 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"

diff --git a/dev-vcs/git-flow/git-flow-1.8.0-r2.ebuild 
b/dev-vcs/git-flow/git-flow-1.8.0-r2.ebuild
index 969188d..3446bd2 100644
--- a/dev-vcs/git-flow/git-flow-1.8.0-r2.ebuild
+++ b/dev-vcs/git-flow/git-flow-1.8.0-r2.ebuild
@@ -10,7 +10,7 @@ COMP_PV="0.5.1"
 COMP_P="${COMP_PN}-${COMP_PV}"
 inherit bash-completion-r1
 
-DESCRIPTION="Git extensions to provide high-level repository operations for 
Vincent Driessen's branching model"
+DESCRIPTION="Git extensions to provide high-level repository operations"
 HOMEPAGE="https://github.com/petervanderdoes/gitflow";
 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"

diff --git a/dev-vcs/git-flow/git-flow-1.8.0-r2.ebuild 
b/dev-vcs/git-flow/git-flow-1.9.1.ebuild
similarity index 91%
copy from dev-vcs/git-flow/git-flow-1.8.0-r2.ebuild
copy to dev-vcs/git-flow/git-flow-1.9.1.ebuild
index 969188d..c00e12c 100644
--- a/dev-vcs/git-flow/git-flow-1.8.0-r2.ebuild
+++ b/dev-vcs/git-flow/git-flow-1.9.1.ebuild
@@ -4,13 +4,13 @@
 
 EAPI=6
 
-MY_PN="${PN/-/}"
+MY_PN="${PN/-/}-avh"
 COMP_PN="${PN}-completion"
-COMP_PV="0.5.1"
+COMP_PV="0.5.2"
 COMP_P="${COMP_PN}-${COMP_PV}"
 inherit bash-completion-r1
 
-DESCRIPTION="Git extensions to provide high-level repository operations for 
Vincent Driessen's branching model"
+DESCRIPTION="Git extensions to provide high-level repository operations"
 HOMEPAGE="https://github.com/petervanderdoes/gitflow";
 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

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

[Johannes Huber]

commit: 143c67084aba220df5bc012fa0decc2cbc58ad40
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat Jan  9 13:49:15 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sat Jan  9 13:51:28 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=143c6708

dev-vcs/git-flow: EAPI 6

Package-Manager: portage-2.2.26

 dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild  |  2 +-
 ...t-flow-1.8.0-r1.ebuild => git-flow-1.8.0-r2.ebuild} | 18 +-
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild 
b/dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild
index 7967fb0..3c7de0d 100644
--- a/dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild
+++ b/dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 

diff --git a/dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild 
b/dev-vcs/git-flow/git-flow-1.8.0-r2.ebuild
similarity index 74%
copy from dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild
copy to dev-vcs/git-flow/git-flow-1.8.0-r2.ebuild
index 7967fb0..969188d 100644
--- a/dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild
+++ b/dev-vcs/git-flow/git-flow-1.8.0-r2.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 MY_PN="${PN/-/}"
 COMP_PN="${PN}-completion"
 COMP_PV="0.5.1"
 COMP_P="${COMP_PN}-${COMP_PV}"
-inherit eutils bash-completion-r1
+inherit bash-completion-r1
 
 DESCRIPTION="Git extensions to provide high-level repository operations for 
Vincent Driessen's branching model"
 HOMEPAGE="https://github.com/petervanderdoes/gitflow";
@@ -17,7 +17,7 @@ 
https://github.com/petervanderdoes/${COMP_PN}/archive/${COMP_PV}.tar.gz -> ${COM
 
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=""
@@ -29,20 +29,12 @@ DOCS=( AUTHORS Changes.mdown README.mdown )
 
 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[@]}"
-
+   einstalldocs
newbashcomp "${WORKDIR}/${COMP_P}/${COMP_PN}.bash" ${PN}
 }

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-flow/files/, dev-vcs/git-flow/

[Johannes Huber]

commit: 804d753b22faf03a3296b47195fd1c7566e265d8
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat Nov 28 10:31:03 2015 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sat Nov 28 10:31:24 2015 +
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 
c1fc889faff8189cd985b077cb64b81ae13e17f02c9df27675f428c6edf8f00627effdf6ebdae7a7f0641ec4ac621a9ecd0a53f14be7d95ec7e124ab8c1b
 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..000
--- 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..000
--- 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" insta

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

[Mikle Kolyada]

commit: 475b32d97080b263042fc8ef73f7e99a90210e33
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun Oct 18 13:25:57 2015 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun Oct 18 13:25:57 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=475b32d9

dev-vcs/git-flow: x86 stable wrt bug #557884

Package-Manager: portage-2.2.20.1

 dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild 
b/dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild
index 534ffab..7967fb0 100644
--- a/dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild
+++ b/dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild
@@ -17,7 +17,7 @@ 
https://github.com/petervanderdoes/${COMP_PN}/archive/${COMP_PV}.tar.gz -> ${COM
 
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=""

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

[Agostino Sarubbo]

commit: 4badb92e41340737e26a0395d6b4ec45013c53fb
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Aug 26 10:42:20 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Aug 26 10:42:20 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4badb92e

dev-vcs/git-flow: amd64 stable wrt bug #557884

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="amd64"

 dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild 
b/dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild
index 063de63..534ffab 100644
--- a/dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild
+++ b/dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild
@@ -17,7 +17,7 @@ 
https://github.com/petervanderdoes/${COMP_PN}/archive/${COMP_PV}.tar.gz -> ${COM
 
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND=""

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

[Johannes Huber]

commit: 66ffb4ff472ef4abd23204bda1d733dea4c3ac78
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat Aug 15 22:17:24 2015 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sat Aug 15 22:17:43 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66ffb4ff

dev-vcs/git-flow: Drop RDEPEND on dev-util/shflags

Package-Manager: portage-2.2.20.1

 dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild 
b/dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild
index dbd444d..063de63 100644
--- a/dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild
+++ b/dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild
@@ -22,7 +22,6 @@ IUSE=""
 
 DEPEND=""
 RDEPEND="${DEPEND}
-   dev-util/shflags
dev-vcs/git
 "
 

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-flow/files/, dev-vcs/git-flow/

[Johannes Huber]

commit: 04eb2b15e2ddaed51276c70a84fb7bff437f8365
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat Aug 15 22:12:40 2015 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sat Aug 15 22:12:57 2015 +
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..000
--- 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() {