gentoo auto-resync : 28:12:2022 - 20:13:25

4 files changed, 39 insertions, 3 deletions

diff --git a/dev-util/coccinelle/Manifest b/dev-util/coccinelle/Manifest
index 33a7ede5eb94..11abd24a9ac4 100644
--- a/dev-util/coccinelle/Manifest
+++ b/dev-util/coccinelle/Manifest
@@ -1,4 +1,6 @@
 AUX 50coccinelle-gentoo.el 154 BLAKE2B debbfe7a00bf6195db370b33430d18fb7121123da26f97c01703704918f977f886090abfa0b6f226f8d713bca566ff6e39fabefb07e098a2bfd7cbd64eaebe6a SHA512 dc99ec43c65fc3b6735b8d06f664c09dabe89bb6dec2a0c0390e97ea2bacb1d76ff33d94124c2a2d1f16795648480c33e0306020e151d67d530e35aa9f4f009d
+AUX coccinelle-1.1.1-bash-completion.patch 509 BLAKE2B 57c4e11cf88b768b2d6be761d17642c02bfaab3081336d5fd2bd32c4329c6607a2bdbb7631fb79aed59d631af7bc233d479000e9dda6dc348a8a794b41c400c4 SHA512 fa96dd1774f8d4919f4f1b0594f9316441f2114c1d10780d57306fa8d9092e39720da88e958c1eda6c7a25c2e40fcc7de3be478aba7bad10bb112e4fa404c87f
+AUX coccinelle-1.1.1-find-xxdate.patch 449 BLAKE2B 9709570d28661b7cfea4c7931130d579efd8883e0eee4c90cd96809acf97ca67477be8a1164639c9835176dccf6353e6ca34e0802b18ab0faecc56d99b248713 SHA512 ef7117ad88f5b80675919ad583a18a0dd4a902549c6c681107382ccf06a293d8ec139c5fbb4e3c580504dceb44010b72b321a05626ea49fe990c8f47f0eea6c4
 DIST coccinelle-1.1.1.tar.bz2 2118055 BLAKE2B 7efb0c86432c88daa1bce2710acdf2f62b6210c69245b4896ea8c5e39a0b28c538d94deae6ed1544e0ced66b2baa6edf8670f5e02dad40c2d1f5562326ce23e3 SHA512 fcb83203c91dae18122cf95f7db931d2e1576559b74a7a1c664c795437904acdffa005a8b9e732c1d99c8f0ab1c5f529d143eafe79c6397d28c4879848afca45
-EBUILD coccinelle-1.1.1-r3.ebuild 2902 BLAKE2B 303eaf9e70f5a19d1e92e3aa541811fc11257d9bfe00f66e98cbbfcc4902a2b658be547332d0d356f227286e7818915451a58b8e185d4a687a2a2dcd070e1d0e SHA512 e495955e8735ad2d9eddb85127d86542ed103980dd4ebea5a86fc91de33bb23c0ec58b4d4a9eb7eab91ad466b7fc536216ad02b1d0a12aafd4d609d69aa9b82b
+EBUILD coccinelle-1.1.1-r4.ebuild 3011 BLAKE2B ef7b64062dc31363789a1b650ce443a1034423ed5a0e7b181e7c70bf967ca52628fe42f63ff44dfed0cedeba4ce380d952d311c8f0dfb139afcdc8f0273ad4ae SHA512 d38444944d3ac371c8ea615ac54cf36a1d70003526cc22fa252792350815d855d7b9ddecaf2d3192a8a5bab7c3852d60031997caeb02d5a88525b4da155c3218
 MISC metadata.xml 318 BLAKE2B 0d950c53a548409db938f27ae7e6941875f2d3260237c72fb3771659ed35e876e456e48823f2340122e68da18bf80bc4f16b58182937117977567579d49d48ad SHA512 c32dd8ca3473e147b69f305fe58412f10ba00dd939eba5fb871d366c6440cffbd623ce4922cd5879b2fefed19a3cf3ffb29bd588021e707623a32f85640905c4
diff --git a/dev-util/coccinelle/coccinelle-1.1.1-r3.ebuild b/dev-util/coccinelle/coccinelle-1.1.1-r4.ebuild
index dcca7af3cc71..da7fd00647c3 100644
--- a/dev-util/coccinelle/coccinelle-1.1.1-r3.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() {
@@ -101,7 +104,7 @@ src_test() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}" VERBOSE=yes install
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}" VERBOSE=yes -j1 install
 
 	if use python ; then
 		python_optimize
@@ -114,6 +117,7 @@ src_install() {
 		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
 	fi
 
+	einstalldocs
 	use doc && dodoc docs/manual/*.pdf
 
 	newdoc editors/vim/README README-vim
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};