diff options
| author |   Dennis Lamm <expeditioneer@gentoo.org> | 2020-07-26 11:08:46 +0200 |
|---|---|---|
| committer | Dennis Lamm <expeditioneer@gentoo.org> | 2020-08-22 12:17:48 +0200 |
| commit | 0c7e9e6c25a71d9162d54f9f7b66ef38d8b5fc92 (patch) | |
| tree | 3cf41823d9e593debf190952afb73ff86c02199c | |
| parent | sys-apps/firejail: don't call CC directly (diff) | |
| download | gentoo-0c7e9e6c25a71d9162d54f9f7b66ef38d8b5fc92.tar.gz gentoo-0c7e9e6c25a71d9162d54f9f7b66ef38d8b5fc92.tar.bz2 gentoo-0c7e9e6c25a71d9162d54f9f7b66ef38d8b5fc92.zip | |
sys-apps/firejail: general ebuild improvement
Signed-off-by: Dennis Lamm <expeditioneer@gentoo.org>
| -rw-r--r-- | sys-apps/firejail-lts/firejail-lts-0.9.56.2-r2.ebuild | 22 | ||||
| -rw-r--r-- | sys-apps/firejail/firejail-0.9.62-r1.ebuild (renamed from sys-apps/firejail/firejail-0.9.62-1.ebuild) | 25 |
2 files changed, 25 insertions, 22 deletions
diff --git a/sys-apps/firejail-lts/firejail-lts-0.9.56.2-r2.ebuild b/sys-apps/firejail-lts/firejail-lts-0.9.56.2-r2.ebuild index 162766f95cd6..85c060bc9701 100644 --- a/sys-apps/firejail-lts/firejail-lts-0.9.56.2-r2.ebuild +++ b/sys-apps/firejail-lts/firejail-lts-0.9.56.2-r2.ebuild @@ -18,24 +18,28 @@ KEYWORDS="amd64" IUSE="apparmor +globalcfg +network +seccomp +suid +userns test +whitelist" RESTRICT="!test? ( test )" -DEPEND="!sys-apps/firejail - apparmor? ( sys-libs/libapparmor ) - test? ( dev-tcltk/expect )" - RDEPEND="apparmor? ( sys-libs/libapparmor )" -PATCHES=( "${FILESDIR}/${PN}-fix-compressed-manpages.patch" ) +DEPEND="${RDEPEND} + !sys-apps/firejail + test? ( dev-tcltk/expect )" + S="${WORKDIR}/${MY_PN}-${PV}-LTS" src_prepare() { default - find -type f -name Makefile.in | xargs sed --in-place --regexp-extended \ - --expression='/^\tinstall .*COPYING /d' \ - --expression='/CFLAGS/s: (-O2|-ggdb) : :g' || die + find -type f -name Makefile.in | xargs sed -i -r \ + -e '/^\tinstall .*COPYING /d' \ + -e '/CFLAGS/s: (-O2|-ggdb) : :g' || die + + sed -i -r -e '/CFLAGS/s: (-O2|-ggdb) : :g' ./src/common.mk.in || die - sed --in-place --regexp-extended '/CFLAGS/s: (-O2|-ggdb) : :g' ./src/common.mk.in || die + # remove compression of man pages + sed -i -e '/gzip -9n $$man; \\/d' Makefile.in || die + sed -i -e '/rm -f $$man.gz; \\/d' Makefile.in || die + sed -i -r -e 's|\*\.([[:digit:]])\) install -c -m 0644 \$\$man\.gz|\*\.\1\) install -c -m 0644 \$\$man|g' Makefile.in || die } src_configure() { diff --git a/sys-apps/firejail/firejail-0.9.62-1.ebuild b/sys-apps/firejail/firejail-0.9.62-r1.ebuild index 73255223e87f..57071c6bd578 100644 --- a/sys-apps/firejail/firejail-0.9.62-1.ebuild +++ b/sys-apps/firejail/firejail-0.9.62-r1.ebuild @@ -20,31 +20,30 @@ HOMEPAGE="https://firejail.wordpress.com/" LICENSE="GPL-2" SLOT="0" IUSE="apparmor +chroot contrib debug +file-transfer +globalcfg +network +overlayfs +private-home +seccomp +suid test +userns vim-syntax +whitelist x11" - -DEPEND="!sys-apps/firejail-lts - apparmor? ( sys-libs/libapparmor ) - test? ( dev-tcltk/expect )" +RESTRICT="!test? ( test )" RDEPEND="apparmor? ( sys-libs/libapparmor )" -# TODO: enable tests -RESTRICT="test" +DEPEND="${RDEPEND} + !sys-apps/firejail-lts + test? ( dev-tcltk/expect )" + src_prepare() { default find ./contrib -type f -name '*.py' | xargs sed --in-place 's-#!/usr/bin/python3-#!/usr/bin/env python3-g' || die - find -type f -name Makefile.in | xargs sed --in-place --regexp-extended \ - --expression='/^\tinstall .*COPYING /d' \ - --expression='/CFLAGS/s: (-O2|-ggdb) : :g' || die + find -type f -name Makefile.in | xargs sed -i -r \ + -e '/^\tinstall .*COPYING /d' \ + -e '/CFLAGS/s: (-O2|-ggdb) : :g' || die - sed --in-place --regexp-extended '/CFLAGS/s: (-O2|-ggdb) : :g' ./src/common.mk.in || die + sed -i -r -e '/CFLAGS/s: (-O2|-ggdb) : :g' ./src/common.mk.in || die # remove compression of man pages - sed --in-place '/gzip -9n $$man; \\/d' Makefile.in || die - sed --in-place '/rm -f $$man.gz; \\/d' Makefile.in || die - sed --in-place --regexp-extended 's|\*\.([[:digit:]])\) install -c -m 0644 \$\$man\.gz|\*\.\1\) install -c -m 0644 \$\$man|g' Makefile.in || die + sed -i -e '/gzip -9n $$man; \\/d' Makefile.in || die + sed -i -e '/rm -f $$man.gz; \\/d' Makefile.in || die + sed -i -r -e 's|\*\.([[:digit:]])\) install -c -m 0644 \$\$man\.gz|\*\.\1\) install -c -m 0644 \$\$man|g' Makefile.in || die } src_configure() { |