media-sound/zynaddsubfx: fixed installation

fixed docs patch and also fixed bash completion installation

Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>

4 files changed, 29 insertions, 10 deletions

diff --git a/media-sound/zynaddsubfx/Manifest b/media-sound/zynaddsubfx/Manifest
index 0f8542a65..dbf116564 100644
--- a/media-sound/zynaddsubfx/Manifest
+++ b/media-sound/zynaddsubfx/Manifest
@@ -1,5 +1,6 @@
 AUX gnustd.diff 352 BLAKE2B f1d322d8db2fc809ded2c2984c18129100fd6c813f3acc8cf5df6a81733d676e07fcc9212928045ea5fa886304747976b11bd26235f2012fc860e54d1a7bcd02 SHA512 7f657c87d3b99b3329a4abc3287f441674415ea1c20be315d77357792562c33812f86a8b239d04d52ca902d927ad10784337d4436a6f9b209589b4c793237ee3
-AUX zynaddsubfx-9999-docs.patch 486 BLAKE2B db680685c99c5daf622aa1fea359901fc70e6ab68eb64bbe9ea25810015b0b2143b766de43a751087e052c9d9b1454babe2c374813069f49413102a101c4e009 SHA512 25cf1fd39a4eb6c6785a7d4d964388f9d1f6badf1c870519b3ffb6b19349917250bd05e1b7e014c8cfe89624ac6bfb63dae5d25ba68966b7bd402a8f894c3afd
+AUX zynaddsubfx-9999-bashcomp.patch 501 BLAKE2B c62eb827e3f8067b39f6ff1c379ec3fd0aa16c813640721eec0880e145920d419dd53f968171519dedc32b2bf89293a5703df99c0895ee992c641ecbb76abc71 SHA512 fbf9367770b426f1b9f8022573b169a779989237ed44dc2b9063e6163b6e9427313ad60a7a8bc3d69b119c83417bbdf7885450c5a614a90386f8e54ef8ea30de
+AUX zynaddsubfx-9999-docs.patch 514 BLAKE2B a73d9981fbb2757f86377cc798f643da2796f4965fbe222ce407225cb104f8e34cdcc4065b0d4fb57254a6ad61e43de8c62b053100aa5451575e8efe8eac258e SHA512 7e41ae9b0a2962abf125a87411c6baae8403fabf62a639712c1d2b6b51322d67e5c53bacac52138a99bb42f84ccb091d211c1d13f1802a95220a400e8bbecbc2
 DIST zynaddsubfx-presets-0.1.tar.bz2 27052 BLAKE2B 215eca9a8daefbd3a63ef0ff0970b19e9ffc0503d623bcb8b1659be2f61132cd707bbdde6ba5ee0d01a51a908614c1735bd830bd2efaf6bfbe5da97b6dc63270 SHA512 63cbe5306d01a325958cdcb8938a517944f6ab33c6a1eb8f9986dc26fabc8e0d3b32be14d2cf0ec4b30b3b594880fa478478367b6657545a3a0b6d1ae7ed3626
-EBUILD zynaddsubfx-9999.ebuild 2473 BLAKE2B e2cfb5946a39f8527303b4e97ca900f45f28a835a20da744182a827b9bc21370d1a1428d9454003b6ddc33e052dbea6217ed82725b3d9a9bc8b2de6b9d1f7363 SHA512 3fa2ee3ef61635b1737c5bf72fb08d1185ccd37b84e6c55cb42374a28fb1896cd46b40de8674042656cf6a7cd41fdf1cb77910cc37e4e249bc7e4cdfd004e28b
+EBUILD zynaddsubfx-9999.ebuild 2481 BLAKE2B 4e82ea8e5234359cb542b07846bbbfdd6a1f1ed1eb2a7c1aad985137516dcc60d56ef81391e7ca64d05fe720fd31bcc59f8e9f449989716c178f25b37b880e71 SHA512 06ca607e8f23c81a596ec9fcb1a0b549e638670b4286dbb3d4e32bfa29f73133a13a69fb0238cbbe6b1723a03194e5e8f30195127349bcdd65f78a15e9e9f20b
 MISC metadata.xml 421 BLAKE2B b870b4f6a8392aec858e4b6489728076dff7cb8c2bce9ccf4571e1fe94e83b4671615e1985284e503fb3f87491549127090a31028dfc6b3dfcbe702b61a6b3b6 SHA512 4053e14d3e44daffa42b8c4daf54e6f3a8a2a0d629202d14f3cefb80e7a6aa79e21df5fc55d75adbc5f4cc3a9c0570311079b3aef3187b0777d3517cfd760cc3
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-9999-bashcomp.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-9999-bashcomp.patch
new file mode 100644
index 000000000..61dacf6d2
--- /dev/null
+++ b/media-sound/zynaddsubfx/files/zynaddsubfx-9999-bashcomp.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/BashCompletion.cmake b/cmake/BashCompletion.cmake
+index 769f7678..a0f56938 100644
+--- a/cmake/BashCompletion.cmake
++++ b/cmake/BashCompletion.cmake
+@@ -73,7 +73,7 @@ ELSE()
+ 		FILE(WRITE ${BASHCOMP_SCRIPT} "\
+ #!${BASH}\n\
+ set -e\n\
+-BASHCOMP_PKG_PATH=\"${BASHCOMP_USER_PATH}\"\n\
++BASHCOMP_PKG_PATH=\"/var/tmp/portage/media-sound/zynaddsubfx-9999/image${BASHCOMP_USER_PATH}\"\n\
+ if [ -w \"${BASHCOMP_PKG_PATH}\" ]; then\n\
+   BASHCOMP_PKG_PATH=\"${BASHCOMP_PKG_PATH}\"\n\
+ fi\n\
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-9999-docs.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-9999-docs.patch
index 08b6d965e..eef8554e3 100644
--- a/media-sound/zynaddsubfx/files/zynaddsubfx-9999-docs.patch
+++ b/media-sound/zynaddsubfx/files/zynaddsubfx-9999-docs.patch
@@ -1,12 +1,14 @@
---- zynaddsubfx-9999/CMakeLists.txt.orig	2017-08-19 15:39:42.538545388 +0200
-+++ zynaddsubfx-9999/CMakeLists.txt	2017-08-19 15:42:24.546539477 +0200
-@@ -36,9 +36,6 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9f62b3da..b5e6aaf4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -35,9 +35,6 @@ include(CTestConfig.cmake)
  add_subdirectory(src)
  add_subdirectory(doc) # Doxygen only
  
 -install(FILES AUTHORS.txt COPYING HISTORY.txt README.adoc
 -	DESTINATION share/doc/zynaddsubfx
 -	)
- install(FILES zynaddsubfx-jack.desktop zynaddsubfx-alsa.desktop zynaddsubfx-oss.desktop
+ install(FILES zynaddsubfx-jack-multi.desktop zynaddsubfx-jack.desktop zynaddsubfx-alsa.desktop zynaddsubfx-oss.desktop
      DESTINATION share/applications)
  install(FILES zynaddsubfx.svg
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-9999.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-9999.ebuild
index e4a678f1c..5186e9311 100644
--- a/media-sound/zynaddsubfx/zynaddsubfx-9999.ebuild
+++ b/media-sound/zynaddsubfx/zynaddsubfx-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ IUSE="oss alsa dssi fltk jack jackmidi lash +ntk portaudio"
 # upstream the following preference ntk -> fltk; we waant to choose the GUI:
 REQUIRED_USE="?? ( fltk ntk )"
 
-RDEPEND=">=dev-libs/mini-xml-2.2.1
+RDEPEND="
 	sci-libs/fftw:3.0
 	alsa? ( media-libs/alsa-lib )
 	dssi? ( media-libs/dssi )
@@ -34,8 +34,11 @@ DEPEND="!media-libs/zynaddsubfx-banks
 	!media-sound/zynaddsubfx-cvs
 	virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}/gnustd.diff"
-	"${FILESDIR}/${P}-docs.patch" )
+PATCHES=(
+	"${FILESDIR}/gnustd.diff"
+	"${FILESDIR}/${P}-docs.patch"
+	"${FILESDIR}/${P}-bashcomp.patch"
+)
 
 src_unpack() {
 	git-r3_src_unpack