commit:     db2ad65b27a6ffe8e33e9fcd047feddec5e14f10
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 25 23:54:52 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Mar 25 23:55:05 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db2ad65b

sys-apps/apparmor-utils: revision bump adds binutils support

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 .../apparmor-utils/apparmor-utils-2.11.0-r1.ebuild | 79 ++++++++++++++++++++++
 .../files/apparmor-utils-2.11-shebang.patch        | 16 +++++
 2 files changed, 95 insertions(+)

diff --git a/sys-apps/apparmor-utils/apparmor-utils-2.11.0-r1.ebuild 
b/sys-apps/apparmor-utils/apparmor-utils-2.11.0-r1.ebuild
new file mode 100644
index 00000000000..3ad1a953a78
--- /dev/null
+++ b/sys-apps/apparmor-utils/apparmor-utils-2.11.0-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_4 )
+inherit perl-module python-r1 toolchain-funcs versionator
+
+MY_PV="$(get_version_component_range 1-2)"
+
+DESCRIPTION="Additional userspace utils to assist with AppArmor profile 
management"
+HOMEPAGE="http://apparmor.net/";
+SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${MY_PV}/+download/apparmor-${PV}.tar.gz";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="dev-lang/perl
+       ${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+       ~sys-libs/libapparmor-${PV}[perl,python]
+       ~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}
+
+PATCHES=(
+       "${FILESDIR}/${PN}-2.11-shebang.patch"
+)
+
+src_prepare() {
+       default
+
+       sed -i binutils/Makefile \
+               -e 's/Bstatic/Bdynamic/g' \
+               -e 's/EXTRA_CFLAGS = /& ${CFLAGS}/' || 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() {
+               "${PYTHON}" "${S}"/utils/python-tools-setup.py install 
--prefix=/usr \
+                       --root="${D}" --version="${PV}"
+       }
+
+       python_foreach_impl install_python
+       python_replicate_script "${D}"/usr/bin/aa-easyprof 
"${D}"/usr/sbin/apparmor_status \
+               
"${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,status,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/files/apparmor-utils-2.11-shebang.patch 
b/sys-apps/apparmor-utils/files/apparmor-utils-2.11-shebang.patch
new file mode 100644
index 00000000000..3dce7c26168
--- /dev/null
+++ b/sys-apps/apparmor-utils/files/apparmor-utils-2.11-shebang.patch
@@ -0,0 +1,16 @@
+Avoid rewriting the shebang.
+
+The ebuild will take care of this when replicating the script for each of the
+supported python implementations.
+
+--- a/utils/python-tools-setup.py
++++ b/utils/python-tools-setup.py
+@@ -43,7 +43,7 @@
+             f = prefix + s
+             # If we have a defined python version, use it instead of the 
system
+             # default
+-            if 'PYTHON' in os.environ:
++            if False:
+                 lines = open(os.path.basename(s)).readlines()
+                 lines[0] = '#! /usr/bin/env %s\n' % os.environ['PYTHON']
+                 open(f, 'w').write("".join(lines))

Reply via email to