commit: 851145859f1181a157d68226ab5f56c5c7be31fe
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 2 20:53:44 2019 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Nov 2 20:54:05 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85114585
media-sound/jack-{1.9.13-r1,9999}: bug #699124
Closes: https://bugs.gentoo.org/699124
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../jack2/{jack2-9999.ebuild => jack2-1.9.13-r1.ebuild} | 17 ++++++++++-------
media-sound/jack2/jack2-9999.ebuild | 4 +++-
media-sound/jack2/metadata.xml | 1 +
3 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/media-sound/jack2/jack2-9999.ebuild
b/media-sound/jack2/jack2-1.9.13-r1.ebuild
similarity index 84%
copy from media-sound/jack2/jack2-9999.ebuild
copy to media-sound/jack2/jack2-1.9.13-r1.ebuild
index 45dd8b8c38a..8232a61efb4 100644
--- a/media-sound/jack2/jack2-9999.ebuild
+++ b/media-sound/jack2/jack2-1.9.13-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python3_5 python3_6 python3_7 )
+PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
PYTHON_REQ_USE="threads(+)"
inherit python-single-r1 waf-utils multilib-minimal
@@ -23,12 +23,13 @@ fi
LICENSE="GPL-2"
SLOT="2"
-IUSE="alsa +classic dbus doc ieee1394 libsamplerate opus pam readline sndfile"
+IUSE="alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam readline
sndfile"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
|| ( classic dbus )"
-COMMON_DEPEND="${PYTHON_DEPS}
+CDEPEND="${PYTHON_DEPS}
media-libs/libsamplerate
media-libs/libsndfile
sys-libs/readline:0=
@@ -38,16 +39,17 @@ COMMON_DEPEND="${PYTHON_DEPS}
sys-apps/dbus[${MULTILIB_USEDEP}]
)
ieee1394? ( media-libs/libffado:=[${MULTILIB_USEDEP}] )
+ metadata? ( sys-libs/db )
opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )"
-DEPEND="${COMMON_DEPEND}
+DEPEND="${CDEPEND}
virtual/pkgconfig
doc? ( app-doc/doxygen )"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${CDEPEND}
dbus? ( 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 )
+DOCS=( ChangeLog.rst README.rst README_NETJACK2 )
src_prepare() {
default
@@ -61,6 +63,7 @@ multilib_src_configure() {
$(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
diff --git a/media-sound/jack2/jack2-9999.ebuild
b/media-sound/jack2/jack2-9999.ebuild
index 45dd8b8c38a..4e310216955 100644
--- a/media-sound/jack2/jack2-9999.ebuild
+++ b/media-sound/jack2/jack2-9999.ebuild
@@ -23,7 +23,7 @@ fi
LICENSE="GPL-2"
SLOT="2"
-IUSE="alsa +classic dbus doc ieee1394 libsamplerate opus pam readline sndfile"
+IUSE="alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam readline
sndfile"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
|| ( classic dbus )"
@@ -38,6 +38,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
sys-apps/dbus[${MULTILIB_USEDEP}]
)
ieee1394? ( media-libs/libffado:=[${MULTILIB_USEDEP}] )
+ metadata? ( sys-libs/db )
opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )"
DEPEND="${COMMON_DEPEND}
virtual/pkgconfig
@@ -61,6 +62,7 @@ multilib_src_configure() {
$(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
diff --git a/media-sound/jack2/metadata.xml b/media-sound/jack2/metadata.xml
index 7956a5fa461..61e6667c2b4 100644
--- a/media-sound/jack2/metadata.xml
+++ b/media-sound/jack2/metadata.xml
@@ -10,6 +10,7 @@
</upstream>
<use>
<flag name="classic">Enable building of jackd</flag>
+ <flag name="metadata">Enable metadata API</flag>
<flag name="pam">Add basic realtime configuration via
<pkg>sys-auth/realtime-base</pkg></flag>
</use>
</pkgmetadata>
