summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys-libs/libapparmor/Manifest1
-rw-r--r--sys-libs/libapparmor/files/libapparmor-2.10.1-import-path.patch46
-rw-r--r--sys-libs/libapparmor/libapparmor-2.10.1-r1.ebuild88
3 files changed, 0 insertions, 135 deletions
diff --git a/sys-libs/libapparmor/Manifest b/sys-libs/libapparmor/Manifest
index c564ea3a69c..b3f6af57495 100644
--- a/sys-libs/libapparmor/Manifest
+++ b/sys-libs/libapparmor/Manifest
@@ -1,2 +1 @@
-DIST apparmor-2.10.1.tar.gz 4494037 SHA256 07a76f338304baadc4ad69d025fe000b1ab4779a251ae8f338afdc13ef1e0f24 SHA512 93992c25f77bb46389160df8324c811b4c2f0fad4b425902b30ce31d6e1f3a0efe6b359c6f8348ef646f8b527584e1f19eb4f46b27fb1ba742489ad09d171278 WHIRLPOOL d59d935db520d3c59bd0398727a1151b3280c2bf56e8f978c3595f50ff06cb70aaddc0313a7d16705b8eadeb2018aeef7ce585423c3a6ed7c34dfd4e06df9c25
DIST apparmor-2.11.0.tar.gz 5013297 SHA256 b1c489ea11e7771b8e6b181532cafbf9ebe6603e3cb00e2558f21b7a5bdd739a SHA512 86b33c1cbbd256028dd5fdfaddc764c225845acd19c833223fce5cdd6164f997fe010d7b642791f834a3417b4ea847d77175fdfd89ea99ab2111933790d42b55 WHIRLPOOL 2a3ca9a943694fba0f225cffc2bac3782545c0970b490189585a87cccf18047128eaab754e53003e03d535a5851a3198b0738a89c6547e88d081f6ad31f066d5
diff --git a/sys-libs/libapparmor/files/libapparmor-2.10.1-import-path.patch b/sys-libs/libapparmor/files/libapparmor-2.10.1-import-path.patch
deleted file mode 100644
index ff18c37753e..00000000000
--- a/sys-libs/libapparmor/files/libapparmor-2.10.1-import-path.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Add patch from openSUSE fixing python module import failure when built with
-dev-lang/swig-3.0.10.
-
-https://bugzilla.opensuse.org/show_bug.cgi?id=987607
-
-Gentoo-bug: 594238
-
---- a/swig/python/Makefile.am
-+++ b/swig/python/Makefile.am
-@@ -6,9 +6,8 @@ SUBDIRS = test
-
- libapparmor_wrap.c: $(srcdir)/../SWIG/libapparmor.i
- $(SWIG) -python -I$(srcdir)/../../include -module LibAppArmor -o $@ $(srcdir)/../SWIG/libapparmor.i
-- mv LibAppArmor.py __init__.py
-
--MOSTLYCLEANFILES=libapparmor_wrap.c __init__.py
-+MOSTLYCLEANFILES=libapparmor_wrap.c LibAppArmor.py
-
- all-local: libapparmor_wrap.c setup.py
- if test ! -f libapparmor_wrap.c; then cp $(srcdir)/libapparmor_wrap.c . ; fi
-
---- a/dev/null
-+++ b/swig/python/__init__.py
-@@ -0,0 +1 @@
-+from LibAppArmor.LibAppArmor import *
-
---- a/swig/python/Makefile.in
-+++ b/swig/python/Makefile.in
-@@ -326,7 +326,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- @HAVE_PYTHON_TRUE@EXTRA_DIST = libapparmor_wrap.c
- @HAVE_PYTHON_TRUE@SUBDIRS = test
--@HAVE_PYTHON_TRUE@MOSTLYCLEANFILES = libapparmor_wrap.c __init__.py
-+@HAVE_PYTHON_TRUE@MOSTLYCLEANFILES = libapparmor_wrap.c LibAppArmor.py
- all: all-recursive
-
- .SUFFIXES:
-@@ -648,7 +648,6 @@ uninstall-am:
-
- @HAVE_PYTHON_TRUE@libapparmor_wrap.c: $(srcdir)/../SWIG/libapparmor.i
- @HAVE_PYTHON_TRUE@ $(SWIG) -python -I$(srcdir)/../../include -module LibAppArmor -o $@ $(srcdir)/../SWIG/libapparmor.i
--@HAVE_PYTHON_TRUE@ mv LibAppArmor.py __init__.py
-
- @HAVE_PYTHON_TRUE@all-local: libapparmor_wrap.c setup.py
- @HAVE_PYTHON_TRUE@ if test ! -f libapparmor_wrap.c; then cp $(srcdir)/libapparmor_wrap.c . ; fi
-
diff --git a/sys-libs/libapparmor/libapparmor-2.10.1-r1.ebuild b/sys-libs/libapparmor/libapparmor-2.10.1-r1.ebuild
deleted file mode 100644
index 2d12451a726..00000000000
--- a/sys-libs/libapparmor/libapparmor-2.10.1-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_4} )
-GENTOO_DEPEND_ON_PERL="no"
-
-inherit autotools-utils distutils-r1 perl-module versionator
-
-DESCRIPTION="Library to support AppArmor userspace utilities"
-HOMEPAGE="http://apparmor.net/"
-SRC_URI="https://launchpad.net/apparmor/$(get_version_component_range 1-2)/${PV}/+download/apparmor-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc +perl +python static-libs"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="perl? ( dev-lang/perl:= )
- python? ( ${PYTHON_DEPS} )"
-
-DEPEND="${RDEPEND}
- sys-devel/autoconf-archive
- sys-devel/bison
- sys-devel/flex
- doc? ( dev-lang/perl )
- perl? ( dev-lang/swig )
- python? ( dev-lang/swig )"
-
-S=${WORKDIR}/apparmor-${PV}/libraries/${PN}
-
-src_prepare() {
- rm -r m4 || die "failed to remove bundled macros"
- epatch "${FILESDIR}"/${PN}-2.10-symbol_visibility.patch
- epatch "${FILESDIR}"/${PN}-2.10.1-import-path.patch
- autotools-utils_src_prepare
- use python && distutils-r1_src_prepare
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_with perl) \
- $(use_with python)
- )
-
- autotools-utils_src_configure
-}
-
-src_compile() {
- autotools-utils_src_compile -C src
- autotools-utils_src_compile -C include
- use doc && autotools-utils_src_compile -C doc
- use perl && autotools-utils_src_compile -C swig/perl
-
- if use python ; then
- pushd "${BUILD_DIR}"/swig/python > /dev/null
- emake libapparmor_wrap.c
- distutils-r1_src_compile
- popd > /dev/null
- fi
-}
-
-src_install() {
- autotools-utils_src_install -C src
- autotools-utils_src_install -C include
- use doc && autotools-utils_src_install -C doc
-
- if use perl ; then
- autotools-utils_src_install -C swig/perl
- perl_set_version
- insinto "${VENDOR_ARCH}"
- doins "${BUILD_DIR}"/swig/perl/LibAppArmor.pm
- fi
-
- if use python ; then
- pushd "${BUILD_DIR}"/swig/python > /dev/null
- distutils-r1_src_install
-
- python_moduleinto LibAppArmor
- python_foreach_impl python_domodule LibAppArmor.py
- popd > /dev/null
- fi
-}