Merge updates from master

6 files changed, 324 insertions, 0 deletions

diff --git a/app-doc/csound-manual/Manifest b/app-doc/csound-manual/Manifest
index 76cbd9f53ead..602b95a9d3b5 100644
--- a/app-doc/csound-manual/Manifest
+++ b/app-doc/csound-manual/Manifest
@@ -6,3 +6,7 @@ DIST Csound6.07_manual-fr_html.zip 15495149 SHA256 746c2c0e3a60988198bf3ff36f6a8
 DIST Csound6.07_manual-fr_pdf.zip 6602805 SHA256 a164ac4108f25f3366f81f0b530e07de61060379e11673ba63477939587df41b SHA512 a39bc2d1c89d304471ac9675809842ce12d43b65af1ab2db643b822a1f9aeb7a69ab6dd93986eb3f582bc76200b68a4f87eeb2ef9a5775d575099c662f5d4c0a WHIRLPOOL 56fd21e1216dd2bfee3d3c52522f55995997279a7e978ca4ffe268a3a23533a6544644bf1ef7cc90117d3c5a79d0f20eb057b681c33926cd43bc8b2644a2db5b
 DIST Csound6.07_manual_html.zip 15220371 SHA256 e71f364aedf74f8fa3d9c4ba071326a630bfa8b408910ef7f9ac9f5347bf669c SHA512 dcf288d7c968bbeeb7fed449b6d423331f29eb7fe4d0afb8786d0cdb60449d6d2a416551e567be4ac28baf4432e5326225e533eb6c232fa93ff4ec6dca3d5557 WHIRLPOOL a0b34715f98f74124e38f72f184be827b4c991767a462312e1f571313f2331c9febdcfe35f2bbc1677583d3f7d6df3aa544c8f4b984aea518a71347ffbc8235f
 DIST Csound6.07_manual_pdf.zip 6272890 SHA256 ac244f8ec2073b3a60c77c28d419d460f70ce28ad2fad6e4d50098b7c252a32c SHA512 e1affd039cd246a6eedbff4d8af68fe2e49d89ce60d839774b30a61059a4463bf3c30812e5edb05f3df5cb2cf33ac9c678338ecd110d57334aa3ce240168a466 WHIRLPOOL 5edd9cb35241823658b430455cbd3001a9fd343ca42fef457f423a85405336f096511ce55a286f211b29dfecf7736b8334d27d8873fae0430e7666b7bebecfa4
+DIST Csound6.08_manual-fr_html.zip 15576083 SHA256 ec2860fb2bcf0c974f4c64503833aed182ebe919119d2f9f78aa8aaff029e7f4 SHA512 7e3a5fbf2c52a1f5f0e9a6c5ee2bfe5e155edfdab81c9a64b66756754dba07a4bc6e7279e668c54ab762c1055a66f2a28c4928d5d3cd7af5418d049b8ffacdd3 WHIRLPOOL a4137f342c7188937f67b469eb6d5281d53325798100a4dd5d4b33d559ead02d99dad5d8483cda079d489cbae66c20e8657d9e9371794e7a69b4f51d4504d19c
+DIST Csound6.08_manual-fr_pdf.zip 6660383 SHA256 a8e0365ebe974cc18bb7a31e909cf6a5d268ade0297f7e6a6d0931442feb5cef SHA512 eb61a576bf0eb4620c12c123ae2e23589cc24f53bffc05e646efba633ebb142906f021b41ac9a77b030476c319cc3ffa3466927ffe9f266d67f7e72217f97396 WHIRLPOOL 403650040ee2097cece161273a40828662f7ea71beb28613c9c2e7d4b696163d6723ee912ab1e9d17938e9bd45980a1ab2464543a49ed137cdfc1563d44261aa
+DIST Csound6.08_manual_html.zip 15267494 SHA256 1ac442112bcd3b9e698070e3e8cd30a71b6a9b02b403a1d43b736544ea2243b6 SHA512 7aaf61d94c067907a418df4bdf48a86b1bb2c220a6f2cedcef7b50af3e49040cd2c0f6f389b9d82b22f4fe6b166fdf4608d70be7e83f2caf7889ce61610dd8e6 WHIRLPOOL cc2d104ce2ca26d96b25c7969b8faf39ed41db41c046d9fb86ff47743135213cb6cf4d712e3727d5d8395a1bec0c5b543febe1eafa8d3ac6e860a1ee70edb8ae
+DIST Csound6.08_manual_pdf.zip 6326314 SHA256 60cfc97571fa75783ad1522be0b43c181bb64d0c2295a5232fec34dbfe95d4c4 SHA512 b911af38ea78b8b551abf1599f0078911c1a80ea44580119ad5c32afb95f07d59848643afcde20c6c64b61af868b1242aa04174761b983a0c160cea2bc28f243 WHIRLPOOL 39c7a25026470b1169549c13a03f1b3f4cba0216645c50c8624db61c0c79ca98f9bf03b187abfd00c007b8c11488a5136dd32757e9b583cd7c0a8c9eaaa440e5
diff --git a/app-doc/csound-manual/csound-manual-6.08.ebuild b/app-doc/csound-manual/csound-manual-6.08.ebuild
new file mode 100644
index 000000000000..6e97f5c6bd0f
--- /dev/null
+++ b/app-doc/csound-manual/csound-manual-6.08.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+MY_P=Csound${PV}
+
+DESCRIPTION="The Csound reference manual"
+HOMEPAGE="http://csounds.com/"
+SRC_URI="
+	https://github.com/csound/csound/releases/download/${PV}.0/${MY_P}_manual_pdf.zip
+	l10n_fr? ( https://github.com/csound/csound/releases/download/${PV}.0/${MY_P}_manual-fr_pdf.zip )
+
+	html? (
+		https://github.com/csound/csound/releases/download/${PV}.0/${MY_P}_manual_html.zip
+		l10n_fr? ( https://github.com/csound/csound/releases/download/${PV}.0/${MY_P}_manual-fr_html.zip )
+	)"
+
+LICENSE="FDL-1.2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="html"
+
+LANGS=" fr"
+IUSE+="${LANGS// / l10n_}"
+
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}
+
+src_unpack() {
+	unpack ${MY_P}_manual_pdf.zip
+
+	if use html ; then
+		unpack ${MY_P}_manual_html.zip
+		mv html html-en
+	fi
+
+	local lang
+	for lang in ${LANGS} ; do
+		use l10n_${lang} || continue
+		unpack ${MY_P}_manual-${lang}_pdf.zip
+		if use html ; then
+			unpack ${MY_P}_manual-${lang}_html.zip
+			mv html html-${lang}
+		fi
+	done
+}
+
+src_install() {
+	dodoc *.pdf
+
+	if use html ; then
+		docinto html
+		dodoc -r html-en/*
+
+		local lang
+		for lang in ${LANGS} ; do
+			use l10n_${lang} || continue
+			docinto html-${lang}
+			dodoc -r html-${lang}/*
+		done
+	fi
+}
diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index a49efeddad18..a4dca7d0b3cc 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -1,2 +1,3 @@
 DIST csound-6.06.0.tar.gz 33113094 SHA256 0be4d845729f9219d59f3e87b91bc2672e26838178fb0fc4a7753211984d3ef2 SHA512 6a8c2afec4ccaf27a5af37f8f847a1fa32d1800724fd0c80139ad7487288a49d19779d0ee505dc35bc7847bac34bb6c3a184da3600ddc7343531884845e6393b WHIRLPOOL 3bbbe0f27a1d104b2483c42016feaa3df28cda4488e71a15e7b1fc77360df801c6e06644f539167579055b7fa5877a937cb26b4d132ba30272c0827575eb0fe4
 DIST csound-6.07.0.tar.gz 33834342 SHA256 606af463da477cf4a3f89d00a4fda63c7eb0dc7f50a8923069f009dfdc545799 SHA512 73f8f3a31f570cff309168127adc476cf78c7671d864fb0230175aba358e46b5272ba654688b2060abaf4de7ee4d68e29cc8480fdddaac48657332d5a0802a06 WHIRLPOOL 53cc86e9997088cfd1528b405b8aaf58f65a5ec6a0a4ceb20fa438ef59c96d4a0fc3996245b16da6bde72cf47bef2130d37cc8ed095cfd04e8b7948c66e6d046
+DIST csound-6.08.0.tar.gz 33948686 SHA256 480bde5c07ac7fb8303b4c84c01710999815c2334501d007170adc9cdbf826a1 SHA512 22237f7c8ac875fd44789a729f5513dd7f751bbe0446b8a6e43c6a824b1c40978ef051122632af0c3975761fa7f873c01e88b9de7be313d9d23be09ed52c29ca WHIRLPOOL 987fb74135a55a945e67a2ef083bb69e315fa3807018db5619bb8a57d33760b3aa85a8f6bfcfb2ac46b9a3f8676398ea12e2ac068b97bf917ef3e1f698d33faf
diff --git a/media-sound/csound/csound-6.08.0.ebuild b/media-sound/csound/csound-6.08.0.ebuild
new file mode 100644
index 000000000000..067d9f37d4a7
--- /dev/null
+++ b/media-sound/csound/csound-6.08.0.ebuild
@@ -0,0 +1,212 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+inherit eutils multilib java-pkg-opt-2 cmake-utils toolchain-funcs versionator python-single-r1
+
+DESCRIPTION="A sound design and signal processing system providing facilities for composition and performance"
+HOMEPAGE="http://csound.github.io/"
+SRC_URI="https://github.com/csound/csound/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa beats chua csoundac curl +cxx debug 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_}"
+
+REQUIRED_USE="
+	csoundac? ( || ( lua python ) )
+	java? ( cxx )
+	linear? ( double-precision )
+	lua? ( cxx )
+	python? ( cxx )
+"
+
+RDEPEND="
+	>=media-libs/libsndfile-1.0.16
+	media-libs/libsamplerate
+	alsa? ( media-libs/alsa-lib )
+	csoundac? (
+		x11-libs/fltk:1[threads?]
+		dev-cpp/eigen:3
+		dev-libs/boost:=
+	)
+	curl? ( net-misc/curl )
+	dssi? (
+		media-libs/dssi
+		media-libs/ladspa-sdk
+	)
+	fluidsynth? ( media-sound/fluidsynth )
+	fltk? ( x11-libs/fltk:1[threads?] )
+	image? ( media-libs/libpng:0= )
+	jack? ( media-sound/jack-audio-connection-kit )
+	java? ( virtual/jdk )
+	keyboard? ( x11-libs/fltk:1[threads?] )
+	linear? ( sci-mathematics/gmm )
+	lua? (
+		luajit? ( dev-lang/luajit:2 )
+		!luajit? ( dev-lang/lua:0 )
+	)
+	osc? ( media-libs/liblo )
+	portaudio? ( media-libs/portaudio )
+	portmidi? ( media-libs/portmidi )
+	pulseaudio? ( media-sound/pulseaudio )
+	python? ( ${PYTHON_DEPS} )
+	stk? ( media-libs/stk )
+	tcl? (
+		>=dev-lang/tcl-8.5:0=
+		>=dev-lang/tk-8.5:0=
+	)
+	utils? ( !media-sound/snd )
+	websocket? ( net-libs/libwebsockets )
+"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	virtual/yacc
+	chua? ( dev-libs/boost )
+	csoundac? ( dev-lang/swig )
+	nls? ( sys-devel/gettext )
+	test? (
+		dev-util/cunit
+		${PYTHON_DEPS}
+	)
+"
+
+# requires specific alsa settings
+RESTRICT="test"
+
+pkg_pretend() {
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+pkg_setup() {
+	if use python || use test ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	local PATCHES=( "${FILESDIR}"/csound-6.05-python.patch )
+
+	sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \
+		-e '/-O3/d' \
+		-i CMakeLists.txt || die
+
+	for lang in ${LANGS} ; do
+		if ! use linguas_${lang} ; then
+			sed -i "/compile_po(${lang}/d" po/CMakeLists.txt || die
+		fi
+	done
+
+	default
+}
+
+src_configure() {
+	local myconf=()
+
+	use python && myconf+=( "-DPYTHON_MODULE_INSTALL_DIR=$(python_get_sitedir)" )
+
+	[[ $(get_libdir) == "lib64" ]] && myconf+=( -DUSE_LIB64=ON )
+
+	local mycmakeargs=(
+		-DUSE_ALSA=$(usex alsa)
+		-DBUILD_CSBEATS=$(usex beats)
+		-DBUILD_CHUA_OPCODES=$(usex chua)
+		-DBUILD_CSOUND_AC=$(usex csoundac)
+		-DBUILD_CSOUND_AC_LUA_INTERFACE=$(usex csoundac $(usex lua))
+		-DBUILD_CSOUND_AC_PYTHON_INTERFACE=$(usex csoundac $(usex python))
+		-DBUILD_CXX_INTERFACE=$(usex cxx)
+		-DUSE_CURL=$(usex curl)
+		-DNEW_PARSER_DEBUG=$(usex debug)
+		-DUSE_DOUBLE=$(usex double-precision)
+		-DBUILD_DSSI_OPCODES=$(usex dssi)
+		-DBUILD_FLUID_OPCODES=$(usex fluidsynth)
+		-DUSE_FLTK=$(usex fltk)
+		-DBUILD_IMAGE_OPCODES=$(usex image)
+		-DUSE_JACK=$(usex jack)
+		-DBUILD_JACK_OPCODES=$(usex jack)
+		-DBUILD_JAVA_INTERFACE=$(usex java)
+		-DBUILD_VIRTUAL_KEYBOARD=$(usex keyboard)
+		-DBUILD_LINEAR_ALGEBRA_OPCODES=$(usex linear)
+		-DBUILD_LUA_OPCODES=$(usex lua)
+		-DBUILD_LUA_INTERFACE=$(usex lua)
+		-DUSE_GETTEXT=$(usex nls)
+		-DBUILD_OSC_OPCODES=$(usex osc)
+		-DUSE_OPEN_MP=$(usex openmp)
+		-DUSE_PORTAUDIO=$(usex portaudio)
+		-DUSE_PORTMIDI=$(usex portmidi)
+		-DUSE_PULSEAUDIO=$(usex pulseaudio)
+		-DBUILD_PYTHON_OPCODES=$(usex python)
+		-DBUILD_PYTHON_INTERFACE=$(usex python)
+		-DSCORE_PARSER=$(usex score)
+		-DBUILD_STATIC_LIBRARY=$(usex static-libs)
+		-DBUILD_STK_OPCODES=$(usex stk)
+		-DBUILD_TESTS=$(usex test)
+		-DBUILD_STATIC_LIBRARY=$(usex test)
+		-DBUILD_TCLCSOUND=$(usex tcl)
+		-DBUILD_MULTI_CORE=$(usex threads)
+		-DBUILD_UTILITIES=$(usex utils)
+		-DBUILD_WEBSOCKET_OPCODE=$(usex websocket)
+		-DNEED_PORTTIME=OFF
+		-DBUILD_RELEASE=ON
+		"${myconf[@]}"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc AUTHORS ChangeLog README.md Release_Notes/*
+
+	# Generate env.d file
+	if use double-precision ; then
+		echo OPCODEDIR64=/usr/$(get_libdir)/${PN}/plugins64 > "${T}"/62${PN}
+	else
+		echo OPCODEDIR=/usr/$(get_libdir)/${PN}/plugins > "${T}"/62${PN}
+	fi
+	echo "CSSTRNGS=/usr/share/locale" >> "${T}"/62${PN}
+	use stk && echo "RAWWAVE_PATH=/usr/share/csound/rawwaves" >> "${T}"/62${PN}
+	doenvd "${T}"/62${PN}
+
+	if use examples ; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	use samples && dodoc -r samples
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins installer/misc/vim/csound_{csd,orc,sco}.vim
+		insinto /usr/share/vim/vimfiles/plugin
+		doins installer/misc/vim/csound.vim
+	fi
+
+	# rename extract to csound_extract (bug #247394)
+	mv "${ED}"/usr/bin/{extract,csound_extract} || die
+
+	use python && python_optimize
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog
+		elog "The extract tool is now installed as csound_extract"
+		elog "due to collisions with many other packages (bug #247394)."
+		elog
+	fi
+}
diff --git a/sys-apps/ripgrep/Manifest b/sys-apps/ripgrep/Manifest
index 0346bf090f32..c9fb528cb2df 100644
--- a/sys-apps/ripgrep/Manifest
+++ b/sys-apps/ripgrep/Manifest
@@ -1,2 +1,3 @@
 DIST ripgrep-0.2.9.tar.xz 36405508 SHA256 f5013f18620495a24af5bfa7a58b9f336831f489c34acbd91d963f27ab24a77d SHA512 3196b7e9cc9302e327ef09d87e5f586829deac5394e229b131bb4d76a54db05f12a9207f7b3b0d1d8c0790857ffd86dc4b177a31065f82f31192b3a7e6211399 WHIRLPOOL be4836c70ffc70827fdb2bf187624ddfa2238a97f93e7bb73dc4f3e13ea569f7a80bdb4ca0e956e661440849663891af88d3848eb8bc4758e02cbd6898806e6d
 DIST ripgrep-0.3.1.tar.xz 36308304 SHA256 aa53e1518b692ea6de4d533cb6c22c7cf66d37b1d6aa20b0b66916d0796f23ae SHA512 130d987aad1dd9e1834579aaa095bdd0624fdf495418875179b3a0fbeccbb850531be446b86321d1b3d08dbbea157196fb037ecd4d491c44f573501a67ad4a98 WHIRLPOOL 1e421a23f596968444084873ad036ed417beeea8433b9572f4763ef74dc3653a7b49aa4309c531d3414f9f866aa44f8ef8a2474da6171cc535c26a7e2b83397f
+DIST ripgrep-0.3.2.tar.xz 36002204 SHA256 a45c2af4efac72c12b8fe9eae05ca5f84f06f7387f94e6dcc614d4334955e44a SHA512 49463d442f1425b591fb17fc33ef8e1a34f368ce7d5862f375094936afc5140f09cece13fa193e9848d85c810e67503f648ec04d19298e23517f1443b7afc426 WHIRLPOOL 6972b47d8b34f76cd2b4ecf0787e8cede8454676dbc1a9cf889bba1d4a877a03eda844b705eea11a42def712c0253a6de7d602a4f0c52d888c36cbd0a9668ef4
diff --git a/sys-apps/ripgrep/ripgrep-0.3.2.ebuild b/sys-apps/ripgrep/ripgrep-0.3.2.ebuild
new file mode 100644
index 000000000000..8dd3de739331
--- /dev/null
+++ b/sys-apps/ripgrep/ripgrep-0.3.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="a command line search tool that combines usability with raw speed"
+HOMEPAGE="https://github.com/BurntSushi/ripgrep"
+#SRC_URI="https://github.com/BurntSushi/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+# custom tarball bundling all deps and index, otherwise cargo fetches from the network
+SRC_URI="http://dev.gentoo.org/~radhermit/dist/${P}.tar.xz"
+
+LICENSE="|| ( MIT Unlicense )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	dev-util/cargo
+	>=dev-lang/rust-1.11
+"
+
+src_prepare() {
+	default
+
+	# move cache dir where cargo expects it
+	mv .cargo "${HOME}" || die
+}
+
+src_compile() {
+	cargo build --release --verbose || die
+}
+
+src_test() {
+	cargo test || die "tests failed"
+}
+
+src_install() {
+	dobin target/release/rg
+	doman doc/rg.1
+	dodoc CHANGELOG.md README.md
+}