gentoo resync : 04.12.2017

5 files changed, 150 insertions, 37 deletions

diff --git a/media-sound/jack2/Manifest b/media-sound/jack2/Manifest
index 6e629c6eabcf..78aace983dad 100644
--- a/media-sound/jack2/Manifest
+++ b/media-sound/jack2/Manifest
@@ -1,5 +1,6 @@
-DIST jack2-1.9.10.tar.gz 6415555 SHA256 88f1b6601b7c8950e6a2d5940b423a33ee628ae5583da40bdce3d9317d8c600d SHA512 0bee815356e9e572224e7cc484c402f38797d70257c4bc79a47552ae30a25a4600c61f712a73cbbede52cd8cb8dc144c9334e28c10e23354a11b7223ee0bb0ca WHIRLPOOL a7b4e14fb1e0490955a363fe0680558d89f80c3cdf18a840991b636518ecf55d872d91d9024770874b5d28494e2cbadc0f21ce4b73ee7873f62842fb0339b0c5
-DIST jack2-1.9.11-RC1.tar.gz 6481650 SHA256 730eee0de2136e62b358f4b65d9e30109d706d2627eb2998e43763b47b17474f SHA512 4fd7d82ab6536b8c6061023858ae5b978903608b149498818971481da75c6e9e0e7e7aef5e1343730c259f4378aebfbf25916b9736e0ad8aa19584a44f894436 WHIRLPOOL 6401f16b5ef5331602c6b3c14c709adf17f765700959d87494738960c8e1407cc894789ef8b11452ca9621a9e18e93407d81ede0846118efbb81560bbe9435e6
-EBUILD jack2-1.9.10.ebuild 2344 BLAKE2B 9ee2922ed0fdfe21c65e7d7d89fcb0ba5940f558ce4b42c770c11fc5806445fb374e2c373509d8b791970d91e87289d59cca90068e9cf32f7d369f06598a856d SHA512 5a9ab02ab4e9e8cdf1bcf558b90d1d5f890548492058cb679685e700ba3c538d694e7506ccdb2f44c81d98e90c3d3caf7fe72e60b6b24cbee6664c9f4efa2ae3
-EBUILD jack2-1.9.11_rc1.ebuild 2233 BLAKE2B 0c793894a69139616658360df0259017d22db32e756d53de902e5121a3c4108f47950345c5c518994065592a6e8a7c4d4e2e438704abb62b9e3cc76569156c08 SHA512 e029d81ff459bfeb080c190189f99ebedf3c87ee266eef54a1c9d8fc3bcc2b4d8bb05822c1269bbb374e6f752c7673f44f36ef4bfbaf1cde79168ebabd87a43f
+AUX jack2-1.9.11_rc1-gcc7.patch 889 BLAKE2B e5c31c6688dbcd2cbba44993cff03e612b364a88cac146415471564f983ba07e7d822f2baf38ee0be4eabaf6369fc1f4f3640ea1a5eab51192a782b44b6dec1f SHA512 7cae070880af90bd7ee68dbfae0ea4421a5cb2cfaaf7b1228a4668767e541b263b965bed4b572053678c7dd81f380e6759a46cd97a0a5cfc95921286739e1791
+DIST jack2-1.9.11-RC1.tar.gz 6481650 BLAKE2B b9497efdb72f2e3894a062a3ffdffc3ebf67f5ea7372d993c13581202202e0f0ba7b21563768a984201d8e5eb2854add67fb5c377e2b4ddb23806a38ddddb0f9 SHA512 4fd7d82ab6536b8c6061023858ae5b978903608b149498818971481da75c6e9e0e7e7aef5e1343730c259f4378aebfbf25916b9736e0ad8aa19584a44f894436
+EBUILD jack2-1.9.11_rc1-r1.ebuild 2298 BLAKE2B 917029b1de9c87f141e7828f7cbd7d508d2015197f88f4dd8fa1201c9b75f861cc709425eead75132f81f147b4e8e8254f4d6eef1e65fb40bc626a8ae278591b SHA512 dfe3a1abb3e5807949ba53911def098695b3e3d497ad6ce915c41b698b335826f8cdf656897e0b16152ddd42bc3502d75f23363441d3e0328759168ce89f77f4
+EBUILD jack2-1.9.11_rc1.ebuild 2231 BLAKE2B f5960181f2eb1bea4f56dc01ed8314490869d4ba549f79dcf9edc31f10b7495b6cf878a1470311e7ba0c833518c8847066a6af9aba80d9a7656a3c64d4632267 SHA512 a7a7af2ca48fe233acd04ac8933910de0e4a6d37e24d411ea0e02d5898f9333dcc9af0ef36893cfd8d2c2332ab86285bbd83e8085afa8a0719fda2dd20fefe6f
+EBUILD jack2-9999.ebuild 2254 BLAKE2B 6ec064096706b262db4719ca5c68fa8a0a34c541600046dc4ed57c9f3aa058ca333110ebfdde7867d47541ebd80e21b195571a7ee34627f16175468eeca6e098 SHA512 ef3dffd92f1778e3649840268c9a96b10f3512eecd00416da00228c678b25b8e8600416e00afc7a5a8c8448b1d29c1651ba60aedf68660449d2cff8a0a5767b1
 MISC metadata.xml 679 BLAKE2B 9808048dac5d2d936aa7f6a05f66b0a98a428aa81275b5528684ba2312c49a1212ee38afac0d466e5ed87b91c253f8b973670928dd21b13470208bc84a2ff48f SHA512 8c6fc8ce9dc151cdc8adc2092a661a76ef0fd12fc8f2c922be3e7a75215e40ed5b352f8099906ae6a883fd3a3edb674d0a6784831d2cd9b881b474cf6c419152
diff --git a/media-sound/jack2/files/jack2-1.9.11_rc1-gcc7.patch b/media-sound/jack2/files/jack2-1.9.11_rc1-gcc7.patch
new file mode 100644
index 000000000000..dcde5fb422f8
--- /dev/null
+++ b/media-sound/jack2/files/jack2-1.9.11_rc1-gcc7.patch
@@ -0,0 +1,19 @@
+commit f7bccdca651592cc4082b28fd4a01ed6ef8ab655
+Author: Kjetil Matheussen <k.s.matheussen@notam02.no>
+Date:   Sat Jul 15 13:21:59 2017 +0200
+
+    Tests: Fix compilation with gcc7
+
+diff --git a/tests/test.cpp b/tests/test.cpp
+index 8a8a8117..d2ef9a05 100644
+--- a/tests/test.cpp
++++ b/tests/test.cpp
+@@ -479,7 +479,7 @@ int process4(jack_nframes_t nframes, void *arg)
+ 	jack_nframes_t delta_time = cur_time - last_time;
+ 
+ 	Log("calling process4 callback : jack_frame_time = %ld delta_time = %ld\n", cur_time, delta_time);
+-	if (delta_time > 0  && (jack_nframes_t)abs(delta_time - cur_buffer_size) > tolerance) {
++	if (delta_time > 0  && abs((int64_t)delta_time - (int64_t)cur_buffer_size) > (int64_t)tolerance) {
+ 		printf("!!! ERROR !!! jack_frame_time seems to return incorrect values cur_buffer_size = %d, delta_time = %d tolerance %d\n", cur_buffer_size, delta_time, tolerance);
+ 	}
+ 
diff --git a/media-sound/jack2/jack2-1.9.10.ebuild b/media-sound/jack2/jack2-1.9.11_rc1-r1.ebuild
index e14f43d964f7..de3d58d89ad7 100644
--- a/media-sound/jack2/jack2-1.9.10.ebuild
+++ b/media-sound/jack2/jack2-1.9.11_rc1-r1.ebuild
@@ -1,37 +1,38 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads(+)"
-[[ "${PV}" = "2.9999" ]] && inherit git-r3
 inherit eutils python-single-r1 waf-utils multilib-minimal
 
 DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
 HOMEPAGE="http://jackaudio.org/"
 
-RESTRICT="mirror"
-if [[ "${PV}" = "2.9999" ]]; then
+if [[ "${PV}" = "9999" ]]; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/jackaudio/${PN}.git"
 	KEYWORDS=""
 else
-	SRC_URI="https://github.com/jackaudio/${PN}/archive/v${PV}.tar.gz -> jack2-${PV}.tar.gz"
+	MY_PV="${PV/_rc/-RC}"
+	MY_P="${PN}-${MY_PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/jackaudio/jack2/releases/download/v${MY_PV}/${MY_P}.tar.gz"
 	KEYWORDS="~amd64 ~ppc ~x86"
 fi
 
 LICENSE="GPL-2"
 SLOT="2"
-IUSE="alsa celt dbus doc opus pam"
+IUSE="alsa celt dbus doc opus pam classic sndfile libsamplerate readline"
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( classic dbus )"
 
-# FIXME: automagic deps: readline, samplerate, sndfile, celt, opus
-# FIXME: even though sndfile is just used for binaries, the check is flawed
-#	making the build fail if multilib libsndfile is not found.
-CDEPEND="media-libs/libsamplerate[${MULTILIB_USEDEP}]
-	media-libs/libsndfile[${MULTILIB_USEDEP}]
-	sys-libs/readline:0
+CDEPEND="media-libs/libsamplerate
+	media-libs/libsndfile
+	sys-libs/readline:0=
 	${PYTHON_DEPS}
 	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
 	celt? ( media-libs/celt:0[${MULTILIB_USEDEP}] )
@@ -48,17 +49,11 @@ RDEPEND="${CDEPEND}
 	pam? ( sys-auth/realtime-base )
 	!media-sound/jack-audio-connection-kit:0"
 
-[[ "${PV}" = "2.9999" ]] || S="${WORKDIR}/jack2-${PV}"
-
 DOCS=( ChangeLog README README_NETJACK2 TODO )
 
-src_unpack() {
-	if [[ "${PV}" = "2.9999" ]]; then
-		git-r3_src_unpack
-	else
-		default
-	fi
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc7.patch
+)
 
 src_prepare() {
 	default
@@ -67,24 +62,31 @@ src_prepare() {
 
 multilib_src_configure() {
 	local mywafconfargs=(
-		$(usex alsa --alsa "")
-		$(usex dbus --dbus --classic)
+		--htmldir=/usr/share/doc/${PF}/html
+		$(usex dbus --dbus "")
+		$(usex classic --classic "")
+		--alsa=$(usex alsa yes no)
+		--celt=$(usex celt yes no)
+		--doxygen=$(multilib_native_usex doc yes no)
+		--firewire=no
+		--freebob=no
+		--iio=no
+		--opus=$(usex opus yes no)
+		--portaudio=no
+		--readline=$(multilib_native_usex readline yes no)
+		--samplerate=$(multilib_native_usex libsamplerate yes no)
+		--sndfile=$(multilib_native_usex sndfile yes no)
+		--winmme=no
 	)
 
-	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_configure ${mywafconfargs[@]}
+	waf-utils_src_configure ${mywafconfargs[@]}
 }
 
 multilib_src_compile() {
 	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_compile
-
-	if multilib_is_native_abi && use doc; then
-		doxygen || die "doxygen failed"
-	fi
 }
 
 multilib_src_install() {
-	multilib_is_native_abi && use doc && \
-		HTML_DOCS=( "${BUILD_DIR}"/html/ )
 	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_install
 }
 
diff --git a/media-sound/jack2/jack2-1.9.11_rc1.ebuild b/media-sound/jack2/jack2-1.9.11_rc1.ebuild
index 4f0738fc56c4..fdf94f71e711 100644
--- a/media-sound/jack2/jack2-1.9.11_rc1.ebuild
+++ b/media-sound/jack2/jack2-1.9.11_rc1.ebuild
@@ -10,7 +10,7 @@ inherit eutils python-single-r1 waf-utils multilib-minimal
 DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
 HOMEPAGE="http://jackaudio.org/"
 
-if [[ "${PV}" = "2.9999" ]]; then
+if [[ "${PV}" = "9999" ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/jackaudio/${PN}.git"
 	KEYWORDS=""
@@ -18,7 +18,7 @@ else
 	MY_PV="${PV/_rc/-RC}"
 	MY_P="${PN}-${MY_PV}"
 	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/jackaudio/${PN}/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+	SRC_URI="https://github.com/jackaudio/jack2/releases/download/v${MY_PV}/${MY_P}.tar.gz"
 	KEYWORDS="~amd64 ~ppc ~x86"
 fi
 
diff --git a/media-sound/jack2/jack2-9999.ebuild b/media-sound/jack2/jack2-9999.ebuild
new file mode 100644
index 000000000000..2794517a02e4
--- /dev/null
+++ b/media-sound/jack2/jack2-9999.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads(+)"
+inherit eutils python-single-r1 waf-utils multilib-minimal
+
+DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
+HOMEPAGE="http://jackaudio.org/"
+
+if [[ "${PV}" = "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/jackaudio/${PN}.git"
+	KEYWORDS=""
+else
+	MY_PV="${PV/_rc/-RC}"
+	MY_P="${PN}-${MY_PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/jackaudio/jack2/releases/download/v${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="2"
+IUSE="alsa celt dbus doc opus pam classic sndfile libsamplerate readline"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( classic dbus )"
+
+CDEPEND="media-libs/libsamplerate
+	media-libs/libsndfile
+	sys-libs/readline:0=
+	${PYTHON_DEPS}
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	celt? ( media-libs/celt:0[${MULTILIB_USEDEP}] )
+	dbus? (
+		dev-libs/expat[${MULTILIB_USEDEP}]
+		sys-apps/dbus[${MULTILIB_USEDEP}]
+	)
+	opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+RDEPEND="${CDEPEND}
+	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+	pam? ( sys-auth/realtime-base )
+	!media-sound/jack-audio-connection-kit:0"
+
+DOCS=( ChangeLog README README_NETJACK2 TODO )
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local mywafconfargs=(
+		--htmldir=/usr/share/doc/${PF}/html
+		$(usex dbus --dbus "")
+		$(usex classic --classic "")
+		--alsa=$(usex alsa yes no)
+		--celt=$(usex celt yes no)
+		--doxygen=$(multilib_native_usex doc yes no)
+		--firewire=no
+		--freebob=no
+		--iio=no
+		--opus=$(usex opus yes no)
+		--portaudio=no
+		--readline=$(multilib_native_usex readline yes no)
+		--samplerate=$(multilib_native_usex libsamplerate yes no)
+		--sndfile=$(multilib_native_usex sndfile yes no)
+		--winmme=no
+	)
+
+	waf-utils_src_configure ${mywafconfargs[@]}
+}
+
+multilib_src_compile() {
+	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_compile
+}
+
+multilib_src_install() {
+	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_install
+}
+
+multilib_src_install_all() {
+	python_fix_shebang "${ED}"
+}