gentoo auto-resync : 02:12:2022 - 08:55:37

4 files changed, 15 insertions, 106 deletions

diff --git a/media-sound/jack2/Manifest b/media-sound/jack2/Manifest
index 936da1c1e878..3b433010d7a2 100644
--- a/media-sound/jack2/Manifest
+++ b/media-sound/jack2/Manifest
@@ -1,7 +1,5 @@
 AUX jack2-1.9.21-python3.11.patch 635 BLAKE2B 8e9168c2d44e087c20f0b6b1ac7a08bf957a5427f3c396e88ba3d0918e636500265e8182a39a8831b9cd37f9db3e86ff3ff6222e191d18f110b964a36c446982 SHA512 be0bb5fb4d65f99dc8355393a02c79ac36f64f7bb0e36a0e6c08ca99cc5c5340a5457fa13e7937d70349a4e0b86074c69232f69cab26779a7e53de5710b4b7fe
-DIST jack2-1.9.19.tar.gz 988780 BLAKE2B 37536e23f97ea8a3bf62fe77e35a4a40c5d88cea1197a2f72c4ab31cbbc689fcf99a1d51bb0ee96122c618464eefe1ca8479dc53ab7de9e6570cb4009cf2a7a1 SHA512 d8d5fe17e2984959546af3c53f044aa4648860e19ff8ffd54452e87fa6cdfd111f825c57e3df17cb8ed95de8392b6f354b12ded41e3e021a37f07b99a89ba18d
 DIST jack2-1.9.21.tar.gz 1006157 BLAKE2B 052486300bd17860964115427d4b5755ce7a4e4607bf9eb4e2b94d5b0cc61cf6a6b56d3a3eae9e91a1195a3316dd1f1ec1357275803805957e4b6f7a76424e24 SHA512 0e9ce581fca3c5d9ffb1de22b45cae6d94085c6f92ff3554892e25727baf66a2269f10d338d95d991e8380c4be5e0cc1e1453b9f878c7dc2e8a990f3bd458557
-EBUILD jack2-1.9.19.ebuild 2406 BLAKE2B 43cef82b53dc0f37ca9114e90a1419031ba5bf7fa7fd02f8f5a5c9e87c3b030b97b16c063f20f593740c88ec077f4690d493059cd827e3e86ee63e155ff2e8fa SHA512 1e6ae9ceb32b43b2008d9f2687a8e8dbc42f6a099d36c096b5a30aa6c9b4e1cf9e494b343724454e0fc2f764fea195aec6a7466ecbdba953e2d024c1a51a21dd
-EBUILD jack2-1.9.21.ebuild 2624 BLAKE2B 79c29ce393f8a368862bb941656b38389b6f1a965f7bc30ae79e46264f48ae478c3d97b16c14a988fd6d15386ebfc27b81a2d3d032c5e0bd6cb66a017a690a79 SHA512 3289575be2e7184454bd90b1ff0059b275aff0d5580a148cc8b7da1d22b79a4479ae35c23eb21ea71bc5a8e85d59d6339ceece61b857b0665ac76f2da44aea74
-EBUILD jack2-9999.ebuild 2447 BLAKE2B 7d8a8a69e3bc2e15e355ee9a6ea43cb5673024d1e540bda2e5b447ba1dd3e4c09de9190cd346f302c7ff0c9acfc275fee5b861218a5a43ac22717acc4167c614 SHA512 4c7523fcc1e0116aadce1f92b9441f0bff768483942513bfd043223ee5b78e09f138db60be9599ec624321632278dcdf5fd65d2825dafbc89d12b4d5fd0e5167
+EBUILD jack2-1.9.21-r1.ebuild 2804 BLAKE2B 63c416828e84f56a4cc2efe265807301b1c0066b0a668cb2061aa2541f1c5892b305384b1a1da7479217a74a0a33f69f7f0c8e47df73d8fb9c915f95dab90cc1 SHA512 867504bc14598120dc85e39c497ba1757b76788645ab586e66c22fefaf3cbe56f3125b93f6bb34d9f1bd65f4859d16ad82a68d732151516980bf85cb2b919eb2
+EBUILD jack2-9999.ebuild 2633 BLAKE2B df913b0507bfe8471ab04532c47a4ae6393ede6bbf3c3dc018407043ed1dd93e2bb9782d4f61f7ced9221b4555d7b923a5ec2d84e7274e5e3260c390cc1c8064 SHA512 d97ad73ac25140a5e22604e52cf047d751d7b3ca196e40c5c56ffa2bb62737bb89ee7150a3527cf851f4fe58945b90e1c9888b6b7a72390db833e08128ef518b
 MISC metadata.xml 780 BLAKE2B 2cbd15be73cfc17162ab0cd6d5311bb4ab48f19dae7224df11712a9ab91fbbbba383e80fe3c99f3a1bb0ee91015144799f58652c782bce1405d5b7a4f8e203ee SHA512 ac8d68929de1d11a39d89ca0ccc0e330790596af7f58fe5305c328dddc74438ec465beca11cce7244e8f2421a446aab900b90b018dd73d688dae7062d26d0e16
diff --git a/media-sound/jack2/jack2-1.9.19.ebuild b/media-sound/jack2/jack2-1.9.19.ebuild
deleted file mode 100644
index 8b2b7719b6e4..000000000000
--- a/media-sound/jack2/jack2-1.9.19.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-PYTHON_REQ_USE="threads(+)"
-inherit python-single-r1 waf-utils multilib-minimal
-
-DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
-HOMEPAGE="https://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/archive/v${MY_PV}/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="2"
-IUSE="alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam readline sndfile"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( classic dbus )"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-DEPEND="${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}] )
-	metadata? ( sys-libs/db:* )
-	opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}
-	dbus? (
-		$(python_gen_cond_dep '
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-		')
-	)
-	pam? ( sys-auth/realtime-base )
-	!media-sound/jack-audio-connection-kit:0"
-
-DOCS=( AUTHORS.rst ChangeLog.rst README.rst README_NETJACK2 )
-
-src_prepare() {
-	default
-	python_fix_shebang waf
-	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
-		--db=$(usex metadata yes 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}"
-}
diff --git a/media-sound/jack2/jack2-1.9.21.ebuild b/media-sound/jack2/jack2-1.9.21-r1.ebuild
index 4ed7d3847d9c..356cbe29a718 100644
--- a/media-sound/jack2/jack2-1.9.21.ebuild
+++ b/media-sound/jack2/jack2-1.9.21-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/jackaudio/${PN}.git"
 else
 	SRC_URI="https://github.com/jackaudio/jack2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
@@ -20,7 +20,7 @@ HOMEPAGE="https://jackaudio.org/"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="2"
-IUSE="+alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam +tools"
+IUSE="+alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam +tools systemd"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	|| ( classic dbus )"
@@ -34,7 +34,8 @@ DEPEND="
 	libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] )
 	ieee1394? ( media-libs/libffado[${MULTILIB_USEDEP}] )
 	metadata? ( sys-libs/db:=[${MULTILIB_USEDEP}] )
-	opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )"
+	opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )
+	systemd? ( classic? ( sys-apps/systemd:= ) )"
 RDEPEND="
 	${DEPEND}
 	dbus? (
@@ -72,6 +73,8 @@ multilib_src_configure() {
 	filter-lto
 
 	local wafargs=(
+		--mandir="${EPREFIX}"/usr/share/man/man1 # override eclass' for man1
+
 		--alsa=$(usex alsa)
 		--celt=no
 		$(usev classic --classic)
@@ -83,6 +86,7 @@ multilib_src_configure() {
 		--opus=$(usex opus)
 		--portaudio=no
 		--samplerate=$(usex libsamplerate)
+		--systemd=$(multilib_native_usex systemd $(usex classic))
 		--winmme=no
 
 		# obsolete options, migrated to media-sound/jack-example-tools
diff --git a/media-sound/jack2/jack2-9999.ebuild b/media-sound/jack2/jack2-9999.ebuild
index 49be304b89f7..52a3a799904b 100644
--- a/media-sound/jack2/jack2-9999.ebuild
+++ b/media-sound/jack2/jack2-9999.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://jackaudio.org/"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="2"
-IUSE="+alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam +tools"
+IUSE="+alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam +tools systemd"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	|| ( classic dbus )"
@@ -34,7 +34,8 @@ DEPEND="
 	libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] )
 	ieee1394? ( media-libs/libffado[${MULTILIB_USEDEP}] )
 	metadata? ( sys-libs/db:=[${MULTILIB_USEDEP}] )
-	opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )"
+	opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )
+	systemd? ( classic? ( sys-apps/systemd:= ) )"
 RDEPEND="
 	${DEPEND}
 	dbus? (
@@ -72,6 +73,8 @@ multilib_src_configure() {
 	filter-lto
 
 	local wafargs=(
+		--mandir="${EPREFIX}"/usr/share/man/man1 # override eclass' for man1
+
 		--alsa=$(usex alsa)
 		--celt=no
 		$(usev classic --classic)
@@ -83,6 +86,7 @@ multilib_src_configure() {
 		--opus=$(usex opus)
 		--portaudio=no
 		--samplerate=$(usex libsamplerate)
+		--systemd=$(multilib_native_usex systemd $(usex classic))
 		--winmme=no
 	)