Skip to content

Commit

Permalink
jack2,jackdbus,ladish: keep source tree clean unless patched
Browse files Browse the repository at this point in the history
  • Loading branch information
nedko committed Apr 19, 2023
1 parent 0ad05b5 commit 706677f
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 27 deletions.
7 changes: 0 additions & 7 deletions media-sound/jack2/jack2-2.9999.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,6 @@ DOCS=( AUTHORS.rst NEWS.rst README.rst README_NETJACK2 )

PATCHES=( )

src_prepare() {
default

python_fix_shebang waf
# copy_sources
}

src_configure() {
# clients crash if built with lto
# https://github.com/jackaudio/jack2/issues/485
Expand Down
1 change: 0 additions & 1 deletion media-sound/jackdbus/jackdbus-2.22.1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -58,5 +58,4 @@ src_compile() {

src_install() {
waf-utils_src_install
python_fix_shebang "${ED}"/usr/bin/jack_control
}
21 changes: 5 additions & 16 deletions media-sound/jackdbus/jackdbus-2.9999.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ EAPI=8

PYTHON_COMPAT=( python3_{9..11} )
PYTHON_REQ_USE="threads(+)"
inherit flag-o-matic python-single-r1 waf-utils multilib-minimal
inherit flag-o-matic python-single-r1 waf-utils
inherit git-r3

EGIT_REPO_URI="https://github.com/LADI/${PN}.git"
Expand All @@ -23,7 +23,7 @@ REQUIRED_USE="
${PYTHON_REQUIRED_USE}"

DEPEND="
sys-apps/dbus[${MULTILIB_USEDEP}]"
sys-apps/dbus"
RDEPEND="
${DEPEND}
${PYTHON_DEPS}
Expand All @@ -39,14 +39,7 @@ PDEPEND=""

DOCS=( AUTHORS NEWS.rst README.adoc )

src_prepare() {
default

python_fix_shebang waf
multilib_copy_sources
}

multilib_src_configure() {
src_configure() {
# clients crash if built with lto
# https://github.com/jackaudio/jack2/issues/485
filter-lto
Expand All @@ -58,14 +51,10 @@ multilib_src_configure() {
waf-utils_src_configure "${wafargs[@]}"
}

multilib_src_compile() {
src_compile() {
waf-utils_src_compile
}

multilib_src_install() {
src_install() {
waf-utils_src_install
}

multilib_src_install_all() {
python_fix_shebang "${ED}"/usr/bin/jack_control
}
1 change: 0 additions & 1 deletion media-sound/ladish/ladish-1-r3.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ src_configure() {
src_install() {
use doc && HTML_DOCS="${S}/build/default/html/*"
waf-utils_src_install
python_fix_shebang "${ED}"
}

pkg_postinst() {
Expand Down
1 change: 0 additions & 1 deletion media-sound/ladish/ladish-1.9999.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ src_configure() {
src_install() {
use doc && HTML_DOCS="${S}/build/default/html/*"
waf-utils_src_install
python_fix_shebang "${ED}"
}

pkg_postinst() {
Expand Down
1 change: 0 additions & 1 deletion media-sound/ladish/ladish-9999.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ src_configure() {
src_install() {
use doc && HTML_DOCS="${S}/build/default/html/*"
waf-utils_src_install
python_fix_shebang "${ED}"
}

pkg_postinst() {
Expand Down

0 comments on commit 706677f

Please sign in to comment.