| 1 |
commit: d9a0d0ee5d936ad82432e9dd00ac731b197fe0ee |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jun 3 12:53:15 2017 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jun 3 12:53:27 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9a0d0ee |
| 7 |
|
| 8 |
sys-libs/libapparmor: remove 2.10.1-r1 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
| 11 |
|
| 12 |
sys-libs/libapparmor/Manifest | 1 - |
| 13 |
.../files/libapparmor-2.10.1-import-path.patch | 46 ----------- |
| 14 |
sys-libs/libapparmor/libapparmor-2.10.1-r1.ebuild | 88 ---------------------- |
| 15 |
3 files changed, 135 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-libs/libapparmor/Manifest b/sys-libs/libapparmor/Manifest |
| 18 |
index c564ea3a69c..b3f6af57495 100644 |
| 19 |
--- a/sys-libs/libapparmor/Manifest |
| 20 |
+++ b/sys-libs/libapparmor/Manifest |
| 21 |
@@ -1,2 +1 @@ |
| 22 |
-DIST apparmor-2.10.1.tar.gz 4494037 SHA256 07a76f338304baadc4ad69d025fe000b1ab4779a251ae8f338afdc13ef1e0f24 SHA512 93992c25f77bb46389160df8324c811b4c2f0fad4b425902b30ce31d6e1f3a0efe6b359c6f8348ef646f8b527584e1f19eb4f46b27fb1ba742489ad09d171278 WHIRLPOOL d59d935db520d3c59bd0398727a1151b3280c2bf56e8f978c3595f50ff06cb70aaddc0313a7d16705b8eadeb2018aeef7ce585423c3a6ed7c34dfd4e06df9c25 |
| 23 |
DIST apparmor-2.11.0.tar.gz 5013297 SHA256 b1c489ea11e7771b8e6b181532cafbf9ebe6603e3cb00e2558f21b7a5bdd739a SHA512 86b33c1cbbd256028dd5fdfaddc764c225845acd19c833223fce5cdd6164f997fe010d7b642791f834a3417b4ea847d77175fdfd89ea99ab2111933790d42b55 WHIRLPOOL 2a3ca9a943694fba0f225cffc2bac3782545c0970b490189585a87cccf18047128eaab754e53003e03d535a5851a3198b0738a89c6547e88d081f6ad31f066d5 |
| 24 |
|
| 25 |
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 |
| 26 |
deleted file mode 100644 |
| 27 |
index ff18c37753e..00000000000 |
| 28 |
--- a/sys-libs/libapparmor/files/libapparmor-2.10.1-import-path.patch |
| 29 |
+++ /dev/null |
| 30 |
@@ -1,46 +0,0 @@ |
| 31 |
-Add patch from openSUSE fixing python module import failure when built with |
| 32 |
-dev-lang/swig-3.0.10. |
| 33 |
- |
| 34 |
-https://bugzilla.opensuse.org/show_bug.cgi?id=987607 |
| 35 |
- |
| 36 |
-Gentoo-bug: 594238 |
| 37 |
- |
| 38 |
---- a/swig/python/Makefile.am |
| 39 |
-+++ b/swig/python/Makefile.am |
| 40 |
-@@ -6,9 +6,8 @@ SUBDIRS = test |
| 41 |
- |
| 42 |
- libapparmor_wrap.c: $(srcdir)/../SWIG/libapparmor.i |
| 43 |
- $(SWIG) -python -I$(srcdir)/../../include -module LibAppArmor -o $@ $(srcdir)/../SWIG/libapparmor.i |
| 44 |
-- mv LibAppArmor.py __init__.py |
| 45 |
- |
| 46 |
--MOSTLYCLEANFILES=libapparmor_wrap.c __init__.py |
| 47 |
-+MOSTLYCLEANFILES=libapparmor_wrap.c LibAppArmor.py |
| 48 |
- |
| 49 |
- all-local: libapparmor_wrap.c setup.py |
| 50 |
- if test ! -f libapparmor_wrap.c; then cp $(srcdir)/libapparmor_wrap.c . ; fi |
| 51 |
- |
| 52 |
---- a/dev/null |
| 53 |
-+++ b/swig/python/__init__.py |
| 54 |
-@@ -0,0 +1 @@ |
| 55 |
-+from LibAppArmor.LibAppArmor import * |
| 56 |
- |
| 57 |
---- a/swig/python/Makefile.in |
| 58 |
-+++ b/swig/python/Makefile.in |
| 59 |
-@@ -326,7 +326,7 @@ top_builddir = @top_builddir@ |
| 60 |
- top_srcdir = @top_srcdir@ |
| 61 |
- @HAVE_PYTHON_TRUE@EXTRA_DIST = libapparmor_wrap.c |
| 62 |
- @HAVE_PYTHON_TRUE@SUBDIRS = test |
| 63 |
--@HAVE_PYTHON_TRUE@MOSTLYCLEANFILES = libapparmor_wrap.c __init__.py |
| 64 |
-+@HAVE_PYTHON_TRUE@MOSTLYCLEANFILES = libapparmor_wrap.c LibAppArmor.py |
| 65 |
- all: all-recursive |
| 66 |
- |
| 67 |
- .SUFFIXES: |
| 68 |
-@@ -648,7 +648,6 @@ uninstall-am: |
| 69 |
- |
| 70 |
- @HAVE_PYTHON_TRUE@libapparmor_wrap.c: $(srcdir)/../SWIG/libapparmor.i |
| 71 |
- @HAVE_PYTHON_TRUE@ $(SWIG) -python -I$(srcdir)/../../include -module LibAppArmor -o $@ $(srcdir)/../SWIG/libapparmor.i |
| 72 |
--@HAVE_PYTHON_TRUE@ mv LibAppArmor.py __init__.py |
| 73 |
- |
| 74 |
- @HAVE_PYTHON_TRUE@all-local: libapparmor_wrap.c setup.py |
| 75 |
- @HAVE_PYTHON_TRUE@ if test ! -f libapparmor_wrap.c; then cp $(srcdir)/libapparmor_wrap.c . ; fi |
| 76 |
- |
| 77 |
|
| 78 |
diff --git a/sys-libs/libapparmor/libapparmor-2.10.1-r1.ebuild b/sys-libs/libapparmor/libapparmor-2.10.1-r1.ebuild |
| 79 |
deleted file mode 100644 |
| 80 |
index 2d12451a726..00000000000 |
| 81 |
--- a/sys-libs/libapparmor/libapparmor-2.10.1-r1.ebuild |
| 82 |
+++ /dev/null |
| 83 |
@@ -1,88 +0,0 @@ |
| 84 |
-# Copyright 1999-2016 Gentoo Foundation |
| 85 |
-# Distributed under the terms of the GNU General Public License v2 |
| 86 |
- |
| 87 |
-EAPI=5 |
| 88 |
- |
| 89 |
-AUTOTOOLS_AUTORECONF=1 |
| 90 |
-DISTUTILS_OPTIONAL=1 |
| 91 |
-PYTHON_COMPAT=( python{2_7,3_4} ) |
| 92 |
-GENTOO_DEPEND_ON_PERL="no" |
| 93 |
- |
| 94 |
-inherit autotools-utils distutils-r1 perl-module versionator |
| 95 |
- |
| 96 |
-DESCRIPTION="Library to support AppArmor userspace utilities" |
| 97 |
-HOMEPAGE="http://apparmor.net/" |
| 98 |
-SRC_URI="https://launchpad.net/apparmor/$(get_version_component_range 1-2)/${PV}/+download/apparmor-${PV}.tar.gz" |
| 99 |
- |
| 100 |
-LICENSE="LGPL-2.1" |
| 101 |
-SLOT="0" |
| 102 |
-KEYWORDS="~amd64 ~x86" |
| 103 |
-IUSE="doc +perl +python static-libs" |
| 104 |
- |
| 105 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 106 |
- |
| 107 |
-RDEPEND="perl? ( dev-lang/perl:= ) |
| 108 |
- python? ( ${PYTHON_DEPS} )" |
| 109 |
- |
| 110 |
-DEPEND="${RDEPEND} |
| 111 |
- sys-devel/autoconf-archive |
| 112 |
- sys-devel/bison |
| 113 |
- sys-devel/flex |
| 114 |
- doc? ( dev-lang/perl ) |
| 115 |
- perl? ( dev-lang/swig ) |
| 116 |
- python? ( dev-lang/swig )" |
| 117 |
- |
| 118 |
-S=${WORKDIR}/apparmor-${PV}/libraries/${PN} |
| 119 |
- |
| 120 |
-src_prepare() { |
| 121 |
- rm -r m4 || die "failed to remove bundled macros" |
| 122 |
- epatch "${FILESDIR}"/${PN}-2.10-symbol_visibility.patch |
| 123 |
- epatch "${FILESDIR}"/${PN}-2.10.1-import-path.patch |
| 124 |
- autotools-utils_src_prepare |
| 125 |
- use python && distutils-r1_src_prepare |
| 126 |
-} |
| 127 |
- |
| 128 |
-src_configure() { |
| 129 |
- local myeconfargs=( |
| 130 |
- $(use_with perl) \ |
| 131 |
- $(use_with python) |
| 132 |
- ) |
| 133 |
- |
| 134 |
- autotools-utils_src_configure |
| 135 |
-} |
| 136 |
- |
| 137 |
-src_compile() { |
| 138 |
- autotools-utils_src_compile -C src |
| 139 |
- autotools-utils_src_compile -C include |
| 140 |
- use doc && autotools-utils_src_compile -C doc |
| 141 |
- use perl && autotools-utils_src_compile -C swig/perl |
| 142 |
- |
| 143 |
- if use python ; then |
| 144 |
- pushd "${BUILD_DIR}"/swig/python > /dev/null |
| 145 |
- emake libapparmor_wrap.c |
| 146 |
- distutils-r1_src_compile |
| 147 |
- popd > /dev/null |
| 148 |
- fi |
| 149 |
-} |
| 150 |
- |
| 151 |
-src_install() { |
| 152 |
- autotools-utils_src_install -C src |
| 153 |
- autotools-utils_src_install -C include |
| 154 |
- use doc && autotools-utils_src_install -C doc |
| 155 |
- |
| 156 |
- if use perl ; then |
| 157 |
- autotools-utils_src_install -C swig/perl |
| 158 |
- perl_set_version |
| 159 |
- insinto "${VENDOR_ARCH}" |
| 160 |
- doins "${BUILD_DIR}"/swig/perl/LibAppArmor.pm |
| 161 |
- fi |
| 162 |
- |
| 163 |
- if use python ; then |
| 164 |
- pushd "${BUILD_DIR}"/swig/python > /dev/null |
| 165 |
- distutils-r1_src_install |
| 166 |
- |
| 167 |
- python_moduleinto LibAppArmor |
| 168 |
- python_foreach_impl python_domodule LibAppArmor.py |
| 169 |
- popd > /dev/null |
| 170 |
- fi |
| 171 |
-} |
Archives