[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/, media-sound/csound/files/

[Tim Harder]

commit:     46793735da631fae7af30b9826c267a666439057
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 29 11:30:58 2017 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Sat Jul 29 11:32:25 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46793735

media-sound/csound: version bump to 6.09.1

Merge csound-manual back in as releases now appear to be coordinated for
both on github.

 media-sound/csound/Manifest                        |  3 ++
 .../{csound-9999.ebuild => csound-6.09.1.ebuild}   | 41 ++++++++++++++++------
 media-sound/csound/csound-9999.ebuild              | 39 ++++++++++++++------
 .../csound/files/csound-6.09.1-python.patch        | 23 ++++++++++++
 4 files changed, 86 insertions(+), 20 deletions(-)

diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index 3a5290e6ef0..e2165ff71ae 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -1 +1,4 @@
+DIST Csound6.09.1_manual_html.zip 15537547 SHA256 b2e8ef90e43762c64643c6adddb1e276ac6b496b4fe64fe83e2b8393dbd69100 SHA512 8ddd821737b003d277eadf5b966907314ee50380ab5cc7b9716588d1bcfac8950f591e076752650508c924d1068bac0334523a3d3b869a4f6d4118b822003afd WHIRLPOOL e5d0091dca95c311af5ecf42482a2693851fda4b38f66d3ccc3d06568a6c548a0410b1d5c444b655cf9a3bc73fbbf7cede896311bf109f30bb907b9ed1b5b744
+DIST Csound6.09.1_manual_pdf.zip 8647957 SHA256 6c4287758791d4cd04c75adfea310d7d34581294d520d4da881a5653f47c9b24 SHA512 1dd2c0058751fe1f176a51741380884db115bdb52416512882c43212fd5ded1c489cc9c423059c1154a1e01528e7bf6e70621eac6ee83a1a4b5e2388ab85ae1b WHIRLPOOL b6460e66a2d043cef9adbd5bef61913f46bafdb3cb55ea107af5903c160e066544bed0011e4d0780d04945c7f585ea8952e48046e14ec74d8fb29cc3e2493050
 DIST csound-6.08.0.tar.gz 33948686 SHA256 480bde5c07ac7fb8303b4c84c01710999815c2334501d007170adc9cdbf826a1 SHA512 22237f7c8ac875fd44789a729f5513dd7f751bbe0446b8a6e43c6a824b1c40978ef051122632af0c3975761fa7f873c01e88b9de7be313d9d23be09ed52c29ca WHIRLPOOL 987fb74135a55a945e67a2ef083bb69e315fa3807018db5619bb8a57d33760b3aa85a8f6bfcfb2ac46b9a3f8676398ea12e2ac068b97bf917ef3e1f698d33faf
+DIST csound-6.09.1.tar.gz 41969942 SHA256 d49735b4ed50f2818b577abcface45fe7f9b7fb49ccd898db030893cbcdfc738 SHA512 c82d3e4fa5fba2c47f916ee102ba841477a819e1905e578089474ce5a7c4a4e70c4ec2768337621fcd2e3843af9b1129ce50f4a4fd3c33bfa27da52815b99454 WHIRLPOOL 31b3bba6ae60760cc70ca8e8234c45dcee1a070ab7a63891acac62218cfd39de3e11d24cb13789b9fb2152cebfa6a6a450a9c5c078531e8b7c5066206ae09079

diff --git a/media-sound/csound/csound-9999.ebuild b/media-sound/csound/csound-6.09.1.ebuild
similarity index 86%
copy from media-sound/csound/csound-9999.ebuild
copy to media-sound/csound/csound-6.09.1.ebuild
index 93c01700dd0..13059c170b0 100644
--- a/media-sound/csound/csound-9999.ebuild
+++ b/media-sound/csound/csound-6.09.1.ebuild
@@ -2,31 +2,35 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-
 PYTHON_COMPAT=( python2_7 )
 
-inherit eutils java-pkg-opt-2 toolchain-funcs versionator python-single-r1 cmake-utils
+inherit java-pkg-opt-2 toolchain-funcs python-single-r1 cmake-utils
 
-if [[ ${PV} == *9999 ]]; then
+if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/csound/csound.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/csound/csound/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	DOC_P="Csound${PV}"
+	SRC_URI="https://github.com/csound/csound/archive/${PV}.tar.gz -> ${P}.tar.gz
+		doc? (
+			https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip
+			https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
+		)"
 	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="A sound design and signal processing system for composition and performance"
 HOMEPAGE="http://csound.github.io/"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
 SLOT="0"
-IUSE="+alsa beats chua csoundac curl +cxx debug double-precision dssi examples
+IUSE="+alsa beats chua csoundac curl +cxx debug doc double-precision dssi examples
 fltk +fluidsynth +image jack java keyboard linear lua luajit nls osc openmp
 portaudio portmidi pulseaudio python samples score static-libs stk tcl test
 +threads +utils vim-syntax websocket"
 
-LANGS=" de en_US es_CO fr it ro ru"
-IUSE+="${LANGS// / linguas_}"
+IUSE_LANGS=" de en_US es es_CO fr it ro ru"
+IUSE+="${IUSE_LANGS// / linguas_}"
 
 REQUIRED_USE="
 	csoundac? ( || ( lua python ) )
@@ -86,9 +90,20 @@ DEPEND="${RDEPEND}
 	)
 "
 
+if [[ ${PV} != "9999" ]]; then
+	DEPEND+="
+		doc? (
+			app-arch/unzip
+			!app-doc/csound-manual
+		)
+	"
+fi
+
 # requires specific alsa settings
 RESTRICT="test"
 
+PATCHES=( "${FILESDIR}"/${P}-python.patch )
+
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
@@ -109,7 +124,7 @@ src_prepare() {
 		-i CMakeLists.txt || die
 
 	local lang
-	for lang in ${LANGS} ; do
+	for lang in ${IUSE_LANGS} ; do
 		if ! use linguas_${lang} ; then
 			sed -i "/compile_po(${lang}/d" po/CMakeLists.txt || die
 		fi
@@ -175,7 +190,7 @@ src_install() {
 	cmake-utils_src_install
 	dodoc -r Release_Notes/.
 
-	# Generate env.d file
+	# generate env.d file
 	cat > "${T}"/62${PN} <<-_EOF_ || die
 		OPCODEDIR$(usex double-precision 64 '')="${EPREFIX}/usr/$(get_libdir)/${PN}/plugins$(usex double-precision 64 '')"
 		CSSTRNGS="${EPREFIX}/usr/share/locale"
@@ -203,6 +218,12 @@ src_install() {
 	mv "${ED%/}"/usr/bin/{,csound_}extract || die
 
 	use python && python_optimize
+
+	# install docs
+	if [[ ${PV} != "9999" ]] && use doc ; then
+		dodoc "${WORKDIR}"/*.pdf
+		dodoc -r "${WORKDIR}"/html
+	fi
 }
 
 pkg_postinst() {

diff --git a/media-sound/csound/csound-9999.ebuild b/media-sound/csound/csound-9999.ebuild
index 93c01700dd0..73a1cd39197 100644
--- a/media-sound/csound/csound-9999.ebuild
+++ b/media-sound/csound/csound-9999.ebuild
@@ -2,31 +2,35 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-
 PYTHON_COMPAT=( python2_7 )
 
-inherit eutils java-pkg-opt-2 toolchain-funcs versionator python-single-r1 cmake-utils
+inherit java-pkg-opt-2 toolchain-funcs python-single-r1 cmake-utils
 
-if [[ ${PV} == *9999 ]]; then
+if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/csound/csound.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/csound/csound/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	DOC_P="Csound${PV}"
+	SRC_URI="https://github.com/csound/csound/archive/${PV}.tar.gz -> ${P}.tar.gz
+		doc? (
+			https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip
+			https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
+		)"
 	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="A sound design and signal processing system for composition and performance"
 HOMEPAGE="http://csound.github.io/"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
 SLOT="0"
-IUSE="+alsa beats chua csoundac curl +cxx debug double-precision dssi examples
+IUSE="+alsa beats chua csoundac curl +cxx debug doc double-precision dssi examples
 fltk +fluidsynth +image jack java keyboard linear lua luajit nls osc openmp
 portaudio portmidi pulseaudio python samples score static-libs stk tcl test
 +threads +utils vim-syntax websocket"
 
-LANGS=" de en_US es_CO fr it ro ru"
-IUSE+="${LANGS// / linguas_}"
+IUSE_LANGS=" de en_US es es_CO fr it ro ru"
+IUSE+="${IUSE_LANGS// / linguas_}"
 
 REQUIRED_USE="
 	csoundac? ( || ( lua python ) )
@@ -86,6 +90,15 @@ DEPEND="${RDEPEND}
 	)
 "
 
+if [[ ${PV} != "9999" ]]; then
+	DEPEND+="
+		doc? (
+			app-arch/unzip
+			!app-doc/csound-manual
+		)
+	"
+fi
+
 # requires specific alsa settings
 RESTRICT="test"
 
@@ -109,7 +122,7 @@ src_prepare() {
 		-i CMakeLists.txt || die
 
 	local lang
-	for lang in ${LANGS} ; do
+	for lang in ${IUSE_LANGS} ; do
 		if ! use linguas_${lang} ; then
 			sed -i "/compile_po(${lang}/d" po/CMakeLists.txt || die
 		fi
@@ -175,7 +188,7 @@ src_install() {
 	cmake-utils_src_install
 	dodoc -r Release_Notes/.
 
-	# Generate env.d file
+	# generate env.d file
 	cat > "${T}"/62${PN} <<-_EOF_ || die
 		OPCODEDIR$(usex double-precision 64 '')="${EPREFIX}/usr/$(get_libdir)/${PN}/plugins$(usex double-precision 64 '')"
 		CSSTRNGS="${EPREFIX}/usr/share/locale"
@@ -203,6 +216,12 @@ src_install() {
 	mv "${ED%/}"/usr/bin/{,csound_}extract || die
 
 	use python && python_optimize
+
+	# install docs
+	if [[ ${PV} != "9999" ]] && use doc ; then
+		dodoc "${WORKDIR}"/*.pdf
+		dodoc -r "${WORKDIR}"/html
+	fi
 }
 
 pkg_postinst() {

diff --git a/media-sound/csound/files/csound-6.09.1-python.patch b/media-sound/csound/files/csound-6.09.1-python.patch
new file mode 100644
index 00000000000..47461e48aaf
--- /dev/null
+++ b/media-sound/csound/files/csound-6.09.1-python.patch
@@ -0,0 +1,23 @@
+Respect externally set PYTHON_MODULE_INSTALL_DIR.
+
+--- csound-6.09.1/CMakeLists.txt
++++ csound-6.09.1/CMakeLists.txt
+@@ -218,11 +218,13 @@
+     set(PLUGIN_INSTALL_DIR "${LIBRARY_INSTALL_DIR}/csound/plugins-${APIVERSION}")
+ endif()
+ 
+-execute_process (
+-     COMMAND python -c
+-     "import site, sys; sys.stdout.write(site.getusersitepackages())"
+-     OUTPUT_VARIABLE PYTHON_MODULE_INSTALL_DIR
+-   )
++if(NOT DEFINED PYTHON_MODULE_INSTALL_DIR)
++    execute_process (
++        COMMAND python -c
++        "import site, sys; sys.stdout.write(site.getusersitepackages())"
++        OUTPUT_VARIABLE PYTHON_MODULE_INSTALL_DIR
++    )
++endif()
+ 
+ set(JAVA_MODULE_INSTALL_DIR ${LIBRARY_INSTALL_DIR})
+ set(LUA_MODULE_INSTALL_DIR ${LIBRARY_INSTALL_DIR})