From 7e172c708f718c5bbdc810800a8b4c41f6e12faa Mon Sep 17 00:00:00 2001 From: Michael Palimaka Date: Mon, 19 Oct 2020 20:28:52 +1100 Subject: sys-apps/apparmor-utils: add missing dependencies Closes: https://bugs.gentoo.org/749834 Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Michael Palimaka --- .../apparmor-utils/apparmor-utils-3.0.0-r1.ebuild | 88 ++++++++++++++++++++++ .../apparmor-utils/apparmor-utils-3.0.0.ebuild | 86 --------------------- 2 files changed, 88 insertions(+), 86 deletions(-) create mode 100644 sys-apps/apparmor-utils/apparmor-utils-3.0.0-r1.ebuild delete mode 100644 sys-apps/apparmor-utils/apparmor-utils-3.0.0.ebuild (limited to 'sys-apps/apparmor-utils') diff --git a/sys-apps/apparmor-utils/apparmor-utils-3.0.0-r1.ebuild b/sys-apps/apparmor-utils/apparmor-utils-3.0.0-r1.ebuild new file mode 100644 index 000000000000..5dceaae3b4d8 --- /dev/null +++ b/sys-apps/apparmor-utils/apparmor-utils-3.0.0-r1.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python{3_6,3_7} ) +inherit eapi7-ver perl-module python-r1 toolchain-funcs + +MY_PV="$(ver_cut 1-2)" + +DESCRIPTION="Additional userspace utils to assist with AppArmor profile management" +HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home" +SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${MY_PV}/+download/apparmor-${PV}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RESTRICT="test" + +COMMON_DEPEND=" + dev-lang/perl + ~sys-libs/libapparmor-${PV} + ${PYTHON_DEPS}" +DEPEND="${COMMON_DEPEND} + sys-devel/gettext +" +RDEPEND="${COMMON_DEPEND} + ~sys-libs/libapparmor-${PV}[perl,python,${PYTHON_USEDEP}] + ~sys-apps/apparmor-${PV} + dev-perl/Locale-gettext + dev-perl/RPC-XML + dev-perl/TermReadKey + dev-python/notify2[${PYTHON_USEDEP}] + dev-python/psutil[${PYTHON_USEDEP}] + virtual/perl-Data-Dumper + virtual/perl-Getopt-Long" + +S=${WORKDIR}/apparmor-${PV} + +src_prepare() { + default + + sed -i binutils/Makefile \ + -e 's/Bstatic/Bdynamic/g' || die + + sed -i utils/aa-remove-unknown \ + -e 's#^\(APPARMOR_FUNCTIONS=\).*#\1/usr/libexec/rc.apparmor.functions#' || die +} + +src_compile() { + python_setup + + pushd utils > /dev/null || die + # launches non-make subprocesses causing "make jobserver unavailable" + # error messages to appear in generated code + emake -j1 + popd > /dev/null || die + + pushd binutils > /dev/null || die + export EXTRA_CFLAGS="${CFLAGS}" + emake CC="$(tc-getCC)" USE_SYSTEM=1 + popd > /dev/null || die +} + +src_install() { + pushd utils > /dev/null || die + perl_set_version + emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \ + VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install + + install_python() { + local -x PYTHONDONTWRITEBYTECODE= + "${PYTHON}" "${S}"/utils/python-tools-setup.py install --prefix=/usr \ + --root="${D}" --optimize 2 + } + + python_foreach_impl install_python + python_replicate_script "${D}"/usr/bin/aa-easyprof \ + "${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,unconfined} + popd > /dev/null || die + + pushd binutils > /dev/null || die + emake install DESTDIR="${D}" USE_SYSTEM=1 + popd > /dev/null || die +} diff --git a/sys-apps/apparmor-utils/apparmor-utils-3.0.0.ebuild b/sys-apps/apparmor-utils/apparmor-utils-3.0.0.ebuild deleted file mode 100644 index fb89112dc695..000000000000 --- a/sys-apps/apparmor-utils/apparmor-utils-3.0.0.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{3_6,3_7} ) -inherit eapi7-ver perl-module python-r1 toolchain-funcs - -MY_PV="$(ver_cut 1-2)" - -DESCRIPTION="Additional userspace utils to assist with AppArmor profile management" -HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home" -SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${MY_PV}/+download/apparmor-${PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RESTRICT="test" - -COMMON_DEPEND=" - dev-lang/perl - ~sys-libs/libapparmor-${PV} - ${PYTHON_DEPS}" -DEPEND="${COMMON_DEPEND} - sys-devel/gettext -" -RDEPEND="${COMMON_DEPEND} - ~sys-libs/libapparmor-${PV}[perl,python,${PYTHON_USEDEP}] - ~sys-apps/apparmor-${PV} - dev-perl/Locale-gettext - dev-perl/RPC-XML - dev-perl/TermReadKey - virtual/perl-Data-Dumper - virtual/perl-Getopt-Long" - -S=${WORKDIR}/apparmor-${PV} - -src_prepare() { - default - - sed -i binutils/Makefile \ - -e 's/Bstatic/Bdynamic/g' || die - - sed -i utils/aa-remove-unknown \ - -e 's#^\(APPARMOR_FUNCTIONS=\).*#\1/usr/libexec/rc.apparmor.functions#' || die -} - -src_compile() { - python_setup - - pushd utils > /dev/null || die - # launches non-make subprocesses causing "make jobserver unavailable" - # error messages to appear in generated code - emake -j1 - popd > /dev/null || die - - pushd binutils > /dev/null || die - export EXTRA_CFLAGS="${CFLAGS}" - emake CC="$(tc-getCC)" USE_SYSTEM=1 - popd > /dev/null || die -} - -src_install() { - pushd utils > /dev/null || die - perl_set_version - emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \ - VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install - - install_python() { - local -x PYTHONDONTWRITEBYTECODE= - "${PYTHON}" "${S}"/utils/python-tools-setup.py install --prefix=/usr \ - --root="${D}" --optimize 2 - } - - python_foreach_impl install_python - python_replicate_script "${D}"/usr/bin/aa-easyprof \ - "${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,unconfined} - popd > /dev/null || die - - pushd binutils > /dev/null || die - emake install DESTDIR="${D}" USE_SYSTEM=1 - popd > /dev/null || die -} -- cgit v1.2.3-65-gdbad