From f516638b7fe9592837389826a6152a7e1b251c54 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 30 May 2020 11:44:06 +0100 Subject: gentoo resync : 30.05.2020 --- dev-vcs/git-imerge/Manifest | 4 - dev-vcs/git-imerge/files/git-imerge.bashcomplete | 267 ----------------------- dev-vcs/git-imerge/git-imerge-1.0.0.ebuild | 45 ---- dev-vcs/git-imerge/metadata.xml | 8 - 4 files changed, 324 deletions(-) delete mode 100644 dev-vcs/git-imerge/Manifest delete mode 100644 dev-vcs/git-imerge/files/git-imerge.bashcomplete delete mode 100644 dev-vcs/git-imerge/git-imerge-1.0.0.ebuild delete mode 100644 dev-vcs/git-imerge/metadata.xml (limited to 'dev-vcs/git-imerge') diff --git a/dev-vcs/git-imerge/Manifest b/dev-vcs/git-imerge/Manifest deleted file mode 100644 index 39fbcdae1fe2..000000000000 --- a/dev-vcs/git-imerge/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX git-imerge.bashcomplete 4714 BLAKE2B 5e994a45e4d243611078a8f9d08019d24ce9ab80d4f59502e47bca94baadf122e8ae9a6218b58c4268a783cc5d7e03bee7bf26d8a39d853a9bd3ac3edb189133 SHA512 a1399072ca9a775acc4ceebbb2c13c1608687df68f01b407e1b3ff8f9ce01e748025ac02d88bf210af609206ffd0f6e578495b3c2a66bdddf9793210714c1b42 -DIST git-imerge-1.0.0.tar.gz 58736 BLAKE2B 16665436d10d07058eeadab5d53a2325d68174f6fcf1748948d0fc4fbe11ab4fca87853bb557e167b0f485351aedd72889fcedaa70f09439d7e66b75a61d318b SHA512 919b80f157d635e3a3eb2b05cfaf8f6a7034fe6f43529c829fef0152007bce3bf5b296cc00f6db0c0a711bfb9e118c4adb0f5a2641ff841c973ff12610473e9b -EBUILD git-imerge-1.0.0.ebuild 1080 BLAKE2B 7faa2cc60c3ddf4dfca2d74edbf7e8b5499e6578a4355bd6e4a2c9e12f2f4fa1093f4878cb348faca9b1d7c66418ce21b724883ceb4ff7ed7266c6648c2049e8 SHA512 6f955d6a495b38b30c2b9b7d761c644451f7f64d990605c1ad400eb276007b9df4dddcefd92ae74ea5fd92c2f547bb70a0e2addd9eaf001b11e601cf4bec914d -MISC metadata.xml 250 BLAKE2B f77aee69210d3e363a8b53c018b9e998e521b273b6e10451a467bcefd917fa2f6c3443000b603ab6355bfbd091b4b366f869ca5e8e695f9846634683309aef48 SHA512 c5b2424b4f6fdfbe8267055899a39cd14d992aaea9fc8dc6d007ee495e97a2d4125a9abad94c17a4c646521759fa998a3468dae0ac4d8b12c09926fc24e7403f diff --git a/dev-vcs/git-imerge/files/git-imerge.bashcomplete b/dev-vcs/git-imerge/files/git-imerge.bashcomplete deleted file mode 100644 index 0fe8e04f64de..000000000000 --- a/dev-vcs/git-imerge/files/git-imerge.bashcomplete +++ /dev/null @@ -1,267 +0,0 @@ -__git_imerge_branches () { - git for-each-ref --format='%(refname)' refs/heads/ refs/remotes/ 2>/dev/null | - sed -e 's!^refs/heads/!!' -e 's!^refs/remotes/!!' -} - -__git_imerge_names () { - git for-each-ref --format='%(refname)' refs/imerge/ 2>/dev/null | - sed -e 's/^refs\/imerge\/\(.*\)\/.*/\1/' -e '/manual/d' -e '/auto/d' -} - -__git_imerge_goals="\ -merge -rebase -rebase-with-history -full -" - -__git_imerge_commands="\ -start -merge -rebase -continue -finish -diagram -list -init -record -autofill -simplify -remove -reparent -" - -__git_imerge_start_options="\ ---help ---manual ---name ---branch ---goal ---first-parent -" - -__git_imerge_init_options=$__git_imerge_start_options - -__git_imerge_continue_options="\ ---help ---name ---edit ---no-edit -" - -__git_imerge_finish_options="\ ---help ---name ---goal ---branch ---force -" - -__git_imerge_simplify_options=$__git_imerge_finish_options - -__git_imerge_merge_options="\ ---help ---name ---goal ---branch ---manual -" - -__git_imerge_list_options="\ ---help -" - -__git_imerge_reparent_options=$__git_imerge_list_options - -__git_imerge_record_options="\ ---help ---name ---edit ---no-edit -" - -__git_imerge_autofill_options="\ ---help ---name -" - -__git_imerge_diagram_options="\ ---help ---name ---commits ---frontier ---html ---color ---no-color -" - -__git_imerge_remove_options=$__git_imerge_autofill_options - -__git_imerge_rebase_options=$__git_imerge_merge_options - -__git-imerge_start_completion() { - case "$1_$cur" in - --help_|--branch_|_--branch=|--name_|_--name=) - return - ;; - --goal_*|*_--goal=*) - __gitcomp "$__git_imerge_goals" "" "${cur##--goal=}" - return - ;; - *-|*_-*?) - __gitcomp "$__git_imerge_start_options" - return - ;; - esac - __gitcomp "$(__git_imerge_branches)" -} - -__git-imerge_init_completion() { - __git-imerge_start_completion $1 -} - -__git-imerge_continue_completion() { - case "$1_$cur" in - --help_) - return - ;; - --name_*|*_--name=*) - __gitcomp "$(__git_imerge_names)" "" "${cur##--name=}" - return - ;; - esac - __gitcomp "$__git_imerge_continue_options" -} - -__git-imerge_finish_completion() { - case "$1_$cur" in - --help_) - return - ;; - --goal_*|*_--goal=*) - __gitcomp "$__git_imerge_goals" "" "${cur##--goal=}" - return - ;; - --branch_*|*_--branch=*) - __gitcomp "$(__git_imerge_branches)" "" "${cur##--branch=}" - return - ;; - --name_*|*_--name=*) - __gitcomp "$(__git_imerge_names)" "" "${cur##--name=}" - return - ;; - esac - __gitcomp "$__git_imerge_finish_options" -} - -__git-imerge_simplify_completion() { - __git-imerge_finish_completion $1 -} - -__git-imerge_merge_completion() { - case "$1_$cur" in - --help_|--branch_|_--branch=|--name_|_--name=) - return - ;; - --goal_*|*_--goal=*) - __gitcomp "$__git_imerge_goals" "" "${cur##--goal=}" - return - ;; - *-|*_-*?) - __gitcomp "$__git_imerge_merge_options" - return - ;; - esac - __gitcomp "$(__git_imerge_branches)" -} - -__git-imerge_rebase_completion() { - __git-imerge_merge_completion $1 -} - -__git-imerge_list_completion() { - case "$1" in - --help) - return - ;; - esac - __gitcomp "$__git_imerge_list_options" -} - -__git-imerge_reparent_completion() { - __git-imerge_list_completion $1 -} - -__git-imerge_record_completion() { - case "$1_$cur" in - --help_) - return - ;; - --name_*|*_--name=*) - __gitcomp "$(__git_imerge_names)" "" "${cur##--name=}" - return - ;; - esac - __gitcomp "$__git_imerge_record_options" -} - -__git-imerge_autofill_completion() { - case "$1_$cur" in - --help_) - return - ;; - --name_*|*_--name=*) - __gitcomp "$(__git_imerge_names)" "" "${cur##--name=}" - return - ;; - esac - __gitcomp "$__git_imerge_autofill_options" -} - -__git-imerge_remove_completion() { - __git-imerge_autofill_completion $1 -} - -__git-imerge_diagram_completion() { - case "$1_$cur" in - --help_|--html_|_--html=) - return - ;; - --name_*|*_--name=*) - __gitcomp "$(__git_imerge_names)" "" "${cur##--name=}" - return - ;; - esac - __gitcomp "$__git_imerge_diagram_options" -} - -_git_imerge () { - # Disable default filename completion. Note that "compopt" is only - # available in Bash 4 and newer, so we check for existence before - # trying to use it. - type compopt >/dev/null 2>&1 && compopt +o default +o bashdefault - - local i command cur_opt - for ((i=0; i <= ${cword}; i++)); do - if [ -n "$command" ] && [ "${words[i]}" != "$cur" ]; then - cur_opt="${words[i]}" - fi - if [ -z "$command" ] && \ - [ "$i" -lt "${cword}" ] && \ - [[ "${words[i-1]}" == *"imerge"* ]] - then - command="${words[i]}" - fi - done - - if test -z "$command"; then - __gitcomp "$__git_imerge_commands" - return - fi - - if [ -z `type -t __git-imerge_"$command"_completion "$cur_opt"` ]; then - return - fi - - __git-imerge_"$command"_completion "$cur_opt" -} diff --git a/dev-vcs/git-imerge/git-imerge-1.0.0.ebuild b/dev-vcs/git-imerge/git-imerge-1.0.0.ebuild deleted file mode 100644 index 424d661ab002..000000000000 --- a/dev-vcs/git-imerge/git-imerge-1.0.0.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_6 ) - -inherit bash-completion-r1 python-r1 - -DESCRIPTION="Incremental merge for git" -HOMEPAGE="https://github.com/mhagger/git-imerge" -SRC_URI="https://github.com/mhagger/git-imerge/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - dev-vcs/git" -DEPEND="dev-python/docutils" - -src_compile() { - for doc in *.rst; do - rst2html.py "${doc}" > "${T}/${doc/.rst/.html}" \ - || die "failed to convert ${doc} to ${T}/${doc/.rst/.html}" - done - - rst2s5.py \ - --theme=small-white \ - --current-slide \ - doc/presentations/GitMerge-2013/talk.rst \ - "${T}/talk.html" \ - || die 'failed to convert talk.rst to ${T}/talk.html' -} - -src_install() { - python_foreach_impl python_doscript "${PN}" - newbashcomp "${FILESDIR}/git-imerge.bashcomplete" git-imerge - dodoc *.rst "${T}"/*.html - - # Don't forget the CSS for the presentation. - dodoc -r "${T}/ui" -} diff --git a/dev-vcs/git-imerge/metadata.xml b/dev-vcs/git-imerge/metadata.xml deleted file mode 100644 index 33aa1137112c..000000000000 --- a/dev-vcs/git-imerge/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - mhagger/git-imerge - - -- cgit v1.2.3