gentoo resync : 15.12.2019

4 files changed, 2 insertions, 184 deletions

diff --git a/media-sound/jack2/Manifest b/media-sound/jack2/Manifest
index 21d1462efdc9..e6c9721799a2 100644
--- a/media-sound/jack2/Manifest
+++ b/media-sound/jack2/Manifest
@@ -1,7 +1,4 @@
-DIST jack2-1.9.12.tar.gz 6487135 BLAKE2B 9140b3892d2321576a7329fbef2f23e340be4b9be967ec173edbbc7a43952c9a3712ead05dbe57f958b88c1e29c8a912a937c0bd34e0122ecc600ac9d48f147d SHA512 f0271dfc8f8e2f2489ca52f431ad4fa420665816d6c67a01a76da1d4b5ae91f6dad8c4e3309ec5e0c159c9d312ed56021ab323d74bce828ace26f1b8d477ddfa
 DIST jack2-1.9.13.tar.gz 6485870 BLAKE2B 7acc0a1389af133dafa7368b4285c2a06607d84015601f2d8afbd63a9a08f40210f8206f2febbd0e5cc651513a59419e1d948a56163d2074c4b77da5edd84a52 SHA512 dd83a6535cf92a3c45b5ed31edda5f1cb4a6c1db2ac683d4ea709e226bc30d55b366ce80ee543dfaa600f871079f3754e9314124093e230dc7deeceb828de8aa
-EBUILD jack2-1.9.12-r1.ebuild 2248 BLAKE2B df3c7d95bdd19ebac930330209a968ea175fa410e88f792c6a2c2d514a4958c1d761916dee23c183f43c148d440381bcb3368aab43cbc158876065d9cec9af79 SHA512 fd3261aa55103089325e372af16d53a73035dde0b06ec048f04b0c4fe9ff376e05ac5184ec6de9db7f76270a3f32f13ebbc34ab12b719efcc190b7994a6633d4
-EBUILD jack2-1.9.13-r1.ebuild 2333 BLAKE2B a0af3c55f071e3decef515a2958fd5e3eab280d61108570c74550a3007db584a6373122d2cf1312ad0c565ac42192345d912d53a45c0c8132ad627c6252fe6a4 SHA512 ae6bf28f27478d0c122e5840c619b02172b3b30012069960a83362652121d2b8ffbb0774676b115166b8284fef80e757663c96a22cf5a3ba32b7b64ae0286fdb
-EBUILD jack2-1.9.13.ebuild 2264 BLAKE2B 159e3a74eb6f3cebfdac5eb9597efc14b434c410e2b9d2191ca198b98d6edf8a8b4801831769382012cfd5226bcd53674d8576389f7be24ff54d1be847e3f5f7 SHA512 585e808d0a967e9cdd2f544f42b8c808dd6cc61f14ddf13806d63a948e992fc49aca1cb965d900c2b41646c9b57f3db71980bd63892be1650d000f3177429f43
+EBUILD jack2-1.9.13-r1.ebuild 2331 BLAKE2B 0de07b59986cee15647d4026fb1fa1c89bda70a95d5706edf1d95afd421e62e8b4b37f008abb46a760db3c748700fdc573d50c01692b4118eaec2da23ddded41 SHA512 f94e6a0f15389c7d8b9da9f28dae757d77513d4f6cf6e2b7f3b7d96122554038de89d4cc0aefd5cf27f5b4c40686fb7c0e602abd0f3a4b28a10bb50c9bfb2a2c
 EBUILD jack2-9999.ebuild 2351 BLAKE2B a226227c67bd6b7630b8dbab44b33a50a5732dbe4181f64d630fd03bc613d78429cab6d07ea91b34e5adecb4f693e341c0b3d88c92a52b1e8f65954a1959d4c3 SHA512 ba3e3abe0a631e4d275d9f13b9bbe32bdd35925914c91c0f16d6426609ac1aa0c901bed47c483870ebfde97b81a74e4704f3fcf06f2c76e2b7f9affc93211ada
 MISC metadata.xml 557 BLAKE2B dea6632bcf5640a2863136ac154eb795b8f147edbe29656192311b2b28f4632d4b661ea90cd9cd282e165953aa8db71306e9fcc64efd6ad4f7450525e6817e0b SHA512 bfcbb285075e0459a3afe2cbc50505e51ec50b4509df0d10d521d15fa83a30e46548bd68cf23df00f43ef336979e6fd92ed27e5f8016fc9a28d80431df6e58f5
diff --git a/media-sound/jack2/jack2-1.9.12-r1.ebuild b/media-sound/jack2/jack2-1.9.12-r1.ebuild
deleted file mode 100644
index 31014abf76d3..000000000000
--- a/media-sound/jack2/jack2-1.9.12-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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"
-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 +classic dbus doc ieee1394 libsamplerate opus pam readline sndfile"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( classic dbus )"
-
-CDEPEND="${PYTHON_DEPS}
-	media-libs/libsamplerate
-	media-libs/libsndfile
-	sys-libs/readline:0=
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	dbus? (
-		dev-libs/expat[${MULTILIB_USEDEP}]
-		sys-apps/dbus[${MULTILIB_USEDEP}]
-	)
-	ieee1394? ( media-libs/libffado:=[${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=no
-		--doxygen=$(multilib_native_usex doc yes no)
-		--firewire=$(usex ieee1394 yes 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-1.9.13-r1.ebuild b/media-sound/jack2/jack2-1.9.13-r1.ebuild
index 0f479c637fbb..faa8575e4689 100644
--- a/media-sound/jack2/jack2-1.9.13-r1.ebuild
+++ b/media-sound/jack2/jack2-1.9.13-r1.ebuild
@@ -18,7 +18,7 @@ else
 	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"
+	KEYWORDS="amd64 ~ppc x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-sound/jack2/jack2-1.9.13.ebuild b/media-sound/jack2/jack2-1.9.13.ebuild
deleted file mode 100644
index 54bed398c30a..000000000000
--- a/media-sound/jack2/jack2-1.9.13.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_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"
-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 +classic dbus doc ieee1394 libsamplerate opus pam readline sndfile"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( classic dbus )"
-
-CDEPEND="${PYTHON_DEPS}
-	media-libs/libsamplerate
-	media-libs/libsndfile
-	sys-libs/readline:0=
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	dbus? (
-		dev-libs/expat[${MULTILIB_USEDEP}]
-		sys-apps/dbus[${MULTILIB_USEDEP}]
-	)
-	ieee1394? ( media-libs/libffado:=[${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.rst README.rst README_NETJACK2 )
-
-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=no
-		--doxygen=$(multilib_native_usex doc yes no)
-		--firewire=$(usex ieee1394 yes 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}"
-}