commit: 41fd7a786b6180c6366b0f9abbdc0d137a9c497d Author: Maciej Barć <xgqt <AT> gentoo <DOT> org> AuthorDate: Wed Dec 28 14:59:27 2022 +0000 Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org> CommitDate: Wed Dec 28 15:30:55 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41fd7a78
dev-util/coccinelle: completion and doc build fixes Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org> dev-util/coccinelle/coccinelle-1.1.1-r4.ebuild | 5 ++++- .../files/coccinelle-1.1.1-bash-completion.patch | 19 +++++++++++++++++++ .../files/coccinelle-1.1.1-find-xxdate.patch | 11 +++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/dev-util/coccinelle/coccinelle-1.1.1-r4.ebuild b/dev-util/coccinelle/coccinelle-1.1.1-r4.ebuild index 15fe9d274569..da7fd00647c3 100644 --- a/dev-util/coccinelle/coccinelle-1.1.1-r4.ebuild +++ b/dev-util/coccinelle/coccinelle-1.1.1-r4.ebuild @@ -46,7 +46,10 @@ BDEPEND=" " DOCS=( authors.txt bugs.txt changes.txt credits.txt readme.txt ) - +PATCHES=( + "${FILESDIR}"/${P}-bash-completion.patch + "${FILESDIR}"/${P}-find-xxdate.patch +) SITEFILE=50coccinelle-gentoo.el pkg_setup() { diff --git a/dev-util/coccinelle/files/coccinelle-1.1.1-bash-completion.patch b/dev-util/coccinelle/files/coccinelle-1.1.1-bash-completion.patch new file mode 100644 index 000000000000..1958dbd498f4 --- /dev/null +++ b/dev-util/coccinelle/files/coccinelle-1.1.1-bash-completion.patch @@ -0,0 +1,19 @@ +--- a/scripts/spatch.bash_completion ++++ b/scripts/spatch.bash_completion +@@ -34,7 +34,6 @@ __spatchcomp_1 () + done + } + +-have spatch && + _spatch() + { + local cur prev xspec +@@ -89,8 +88,6 @@ _spatch() + complete -F _spatch -o bashdefault -o default -o nospace spatch \ + || complete -F _spatch -o default -o nospace spatch + +-complete -F _spatch -o bashdefault -o default -o nospace spatch.opt \ +- || complete -F _spatch -o default -o nospace spatch.opt + + # Local variables: + # mode: shell-script diff --git a/dev-util/coccinelle/files/coccinelle-1.1.1-find-xxdate.patch b/dev-util/coccinelle/files/coccinelle-1.1.1-find-xxdate.patch new file mode 100644 index 000000000000..0b8143f29cfd --- /dev/null +++ b/dev-util/coccinelle/files/coccinelle-1.1.1-find-xxdate.patch @@ -0,0 +1,11 @@ +--- a/docs/manual/find-xxdate ++++ b/docs/manual/find-xxdate +@@ -9,7 +9,7 @@ + # Otherwise, a warning is printed on stderr and the script returns 1 + + file=xxdate.exe +-directories="$(opam var hevea:lib) /usr/lib64/hevea /usr/share/hevea /usr/local/lib/hevea /opt/local/share/hevea" ++directories="/usr/lib/hevea /usr/lib64/hevea /usr/share/hevea /usr/local/lib/hevea /opt/local/share/hevea" + + for dir in ${directories}; do + fullpath=${dir}/${file};