Skip to content

Instantly share code, notes, and snippets.

Show Gist options
  • Select an option

  • Save moschlar/2829578 to your computer and use it in GitHub Desktop.

Select an option

Save moschlar/2829578 to your computer and use it in GitHub Desktop.

Revisions

  1. moschlar revised this gist Jun 6, 2012. 1 changed file with 1 addition and 1 deletion.
    2 changes: 1 addition & 1 deletion git-flow-0.4.1.ebuild
    Original file line number Diff line number Diff line change
    @@ -42,4 +42,4 @@ pkg_postinst() {
    elog "Use eselect to activate the bash-completion module:"
    elog " git-flow"
    fi
    }
    }
  2. moschlar revised this gist May 30, 2012. No changes.
  3. moschlar revised this gist May 29, 2012. 1 changed file with 2 additions and 3 deletions.
    5 changes: 2 additions & 3 deletions git-flow-0.4.1.ebuild
    Original file line number Diff line number Diff line change
    @@ -21,7 +21,6 @@ RDEPEND="${DEPEND}
    dev-vcs/git[bash-completion?]"

    S="${WORKDIR}/nvie-gitflow-5b26edc"
    S2="${WORKDIR}/bobthecow-git-flow-completion-b399150"

    src_prepare() {
    epatch "${FILESDIR}/system-shflags.patch"
    @@ -32,9 +31,9 @@ src_compile() {
    }

    src_install() {
    emake prefix="${D}" install || die "install failed"
    emake prefix="${D}" install
    if use bash-completion; then
    newbashcomp "${S2}/git-flow-completion.bash" git-flow
    newbashcomp "${WORKDIR}/bobthecow-git-flow-completion-b399150/git-flow-completion.bash" git-flow
    fi
    }

  4. moschlar revised this gist May 29, 2012. 2 changed files with 0 additions and 48 deletions.
    File renamed without changes.
    Original file line number Diff line number Diff line change
    @@ -1,48 +0,0 @@
    # Copyright 1999-2012 Gentoo Foundation
    # Distributed under the terms of the GNU General Public License v2
    # $Header: $

    EAPI=4

    inherit 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/gitflow/tarball/0.4.1 -> ${P}.tar.gz
    bash-completion? ( https://github.com/bobthecow/git-flow-completion/tarball/0.4.1.0 -> ${P}-completion.tar.gz )"

    LICENSE="BSD"
    SLOT="0"
    KEYWORDS="~x86"
    IUSE="bash-completion"

    DEPEND="dev-util/shflags"
    RDEPEND="${DEPEND}
    dev-vcs/git[bash-completion?]"

    S="${WORKDIR}/nvie-gitflow-5b26edc"
    S2="${WORKDIR}/bobthecow-git-flow-completion-b399150"

    src_prepare() {
    # Fix included shFlags file
    rm gitflow-shFlags
    ln -s ${ROOT}/usr/share/misc/shflags gitflow-shFlags
    }

    src_compile() {
    true
    }

    src_install() {
    emake prefix=${D} install || die "install failed"
    if use bash-completion; then
    newbashcomp ${S2}/git-flow-completion.bash git-flow
    fi
    }

    pkg_postinst() {
    if use bash-completion; then
    echo "Use eselect to activate the bash-completion module:"
    echo " git-flow"
    fi
    }
  5. moschlar revised this gist May 29, 2012. 2 changed files with 78 additions and 0 deletions.
    46 changes: 46 additions & 0 deletions dev-vcsgit-flow-0.4.1.ebuild
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,46 @@
    # Copyright 1999-2012 Gentoo Foundation
    # Distributed under the terms of the GNU General Public License v2
    # $Header: $

    EAPI=4

    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/gitflow/tarball/0.4.1 -> ${P}.tar.gz
    bash-completion? ( https://github.com/bobthecow/git-flow-completion/tarball/0.4.1.0 -> ${P}-completion.tar.gz )"

    LICENSE="BSD"
    SLOT="0"
    KEYWORDS="~x86"
    IUSE="bash-completion"

    DEPEND="dev-util/shflags"
    RDEPEND="${DEPEND}
    dev-vcs/git[bash-completion?]"

    S="${WORKDIR}/nvie-gitflow-5b26edc"
    S2="${WORKDIR}/bobthecow-git-flow-completion-b399150"

    src_prepare() {
    epatch "${FILESDIR}/system-shflags.patch"
    }

    src_compile() {
    true
    }

    src_install() {
    emake prefix="${D}" install || die "install failed"
    if use bash-completion; then
    newbashcomp "${S2}/git-flow-completion.bash" git-flow
    fi
    }

    pkg_postinst() {
    if use bash-completion; then
    elog "Use eselect to activate the bash-completion module:"
    elog " git-flow"
    fi
    }
    32 changes: 32 additions & 0 deletions system-shflags.patch
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,32 @@
    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}"
  6. @invalid-email-address Anonymous created this gist May 29, 2012.
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,48 @@
    # Copyright 1999-2012 Gentoo Foundation
    # Distributed under the terms of the GNU General Public License v2
    # $Header: $

    EAPI=4

    inherit 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/gitflow/tarball/0.4.1 -> ${P}.tar.gz
    bash-completion? ( https://github.com/bobthecow/git-flow-completion/tarball/0.4.1.0 -> ${P}-completion.tar.gz )"

    LICENSE="BSD"
    SLOT="0"
    KEYWORDS="~x86"
    IUSE="bash-completion"

    DEPEND="dev-util/shflags"
    RDEPEND="${DEPEND}
    dev-vcs/git[bash-completion?]"

    S="${WORKDIR}/nvie-gitflow-5b26edc"
    S2="${WORKDIR}/bobthecow-git-flow-completion-b399150"

    src_prepare() {
    # Fix included shFlags file
    rm gitflow-shFlags
    ln -s ${ROOT}/usr/share/misc/shflags gitflow-shFlags
    }

    src_compile() {
    true
    }

    src_install() {
    emake prefix=${D} install || die "install failed"
    if use bash-completion; then
    newbashcomp ${S2}/git-flow-completion.bash git-flow
    fi
    }

    pkg_postinst() {
    if use bash-completion; then
    echo "Use eselect to activate the bash-completion module:"
    echo " git-flow"
    fi
    }