gentoo resync : 21.12.2017

3 files changed, 96 insertions, 3 deletions

diff --git a/media-sound/jack2/Manifest b/media-sound/jack2/Manifest
index 78aace983dad..3b5c34741209 100644
--- a/media-sound/jack2/Manifest
+++ b/media-sound/jack2/Manifest
@@ -1,6 +1,8 @@
 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
+DIST jack2-1.9.12.tar.gz 6487135 BLAKE2B 9140b3892d2321576a7329fbef2f23e340be4b9be967ec173edbbc7a43952c9a3712ead05dbe57f958b88c1e29c8a912a937c0bd34e0122ecc600ac9d48f147d SHA512 f0271dfc8f8e2f2489ca52f431ad4fa420665816d6c67a01a76da1d4b5ae91f6dad8c4e3309ec5e0c159c9d312ed56021ab323d74bce828ace26f1b8d477ddfa
 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
+EBUILD jack2-1.9.12.ebuild 2248 BLAKE2B 11df609c926f433493d6e68b799d12a19ab225e5e7152998a1cae4cd2aab88e91f7f602a27d65cdba3a9a34e3f299f77b226a31e6845c2003e3c82e61becd750 SHA512 cc0daf80bbe50f81e931b4572e219d97b7166fa7ffdd5cf12eda5f1925e4554a750a8fa4cf1c6ead747e5a52eb0c510aeca90c6234af4c5fed75e1952606c792
+EBUILD jack2-9999.ebuild 2248 BLAKE2B 11df609c926f433493d6e68b799d12a19ab225e5e7152998a1cae4cd2aab88e91f7f602a27d65cdba3a9a34e3f299f77b226a31e6845c2003e3c82e61becd750 SHA512 cc0daf80bbe50f81e931b4572e219d97b7166fa7ffdd5cf12eda5f1925e4554a750a8fa4cf1c6ead747e5a52eb0c510aeca90c6234af4c5fed75e1952606c792
 MISC metadata.xml 679 BLAKE2B 9808048dac5d2d936aa7f6a05f66b0a98a428aa81275b5528684ba2312c49a1212ee38afac0d466e5ed87b91c253f8b973670928dd21b13470208bc84a2ff48f SHA512 8c6fc8ce9dc151cdc8adc2092a661a76ef0fd12fc8f2c922be3e7a75215e40ed5b352f8099906ae6a883fd3a3edb674d0a6784831d2cd9b881b474cf6c419152
diff --git a/media-sound/jack2/jack2-1.9.12.ebuild b/media-sound/jack2/jack2-1.9.12.ebuild
new file mode 100644
index 000000000000..5295a98e976e
--- /dev/null
+++ b/media-sound/jack2/jack2-1.9.12.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 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}"
+}
diff --git a/media-sound/jack2/jack2-9999.ebuild b/media-sound/jack2/jack2-9999.ebuild
index 2794517a02e4..5295a98e976e 100644
--- a/media-sound/jack2/jack2-9999.ebuild
+++ b/media-sound/jack2/jack2-9999.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads(+)"
-inherit eutils python-single-r1 waf-utils multilib-minimal
+inherit python-single-r1 waf-utils multilib-minimal
 
 DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
 HOMEPAGE="http://jackaudio.org/"
@@ -24,7 +24,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="2"
-IUSE="alsa celt dbus doc opus pam classic sndfile libsamplerate readline"
+IUSE="alsa celt dbus doc opus pam +classic sndfile libsamplerate readline"
 
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}