summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys-libs/libapparmor/ChangeLog7
-rw-r--r--sys-libs/libapparmor/Manifest7
-rw-r--r--sys-libs/libapparmor/files/libapparmor-2.6.1-python3.patch12
-rw-r--r--sys-libs/libapparmor/libapparmor-2.7.0.ebuild (renamed from sys-libs/libapparmor/libapparmor-2.6.1.ebuild)4
4 files changed, 11 insertions, 19 deletions
diff --git a/sys-libs/libapparmor/ChangeLog b/sys-libs/libapparmor/ChangeLog
index 9530e634f..7f4a58fe3 100644
--- a/sys-libs/libapparmor/ChangeLog
+++ b/sys-libs/libapparmor/ChangeLog
@@ -2,6 +2,13 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*libapparmor-2.7.0 (18 Dec 2011)
+
+ 18 Dec 2011; Michael Palimaka (kensington) <kensington@astralcloak.net>
+ -libapparmor-2.6.1.ebuild, -files/libapparmor-2.6.1-python3.patch,
+ +libapparmor-2.7.0.ebuild:
+ Version bump. Thanks to Tommy[D] for review.
+
10 Nov 2011; Michael Palimaka (kensington) <kensington@astralcloak.net>
+libapparmor-2.6.1.ebuild, +files/libapparmor-2.6.1-python3.patch,
+metadata.xml:
diff --git a/sys-libs/libapparmor/Manifest b/sys-libs/libapparmor/Manifest
index 1cdaa911f..2d3a73dac 100644
--- a/sys-libs/libapparmor/Manifest
+++ b/sys-libs/libapparmor/Manifest
@@ -1,5 +1,4 @@
-AUX libapparmor-2.6.1-python3.patch 562 RMD160 cbe635714e0fed1df6800acc9de302d8c7f4ea66 SHA1 1fd1c469a85480c52a487fe395a8fd34980ef5b3 SHA256 ffe88b5cd49add3ca34a88fe9ab5de09b0364ebd35f204fdfe836ddecf582c66
-DIST apparmor-2.6.1.tar.gz 1612637 RMD160 241f0ba363b7f7c2d7e25cba4f6d7f6eb2c6f3f9 SHA1 c8837b1e0c4bd90858579cb9758af203122889aa SHA256 9cb015d8c1023d7549621d1caeea0cd92a33c48dba0762d75385f9ff7a11e2f4
-EBUILD libapparmor-2.6.1.ebuild 1777 RMD160 af61438f5aff5b97a9ebbc144f932c856090ee53 SHA1 0cc4d5935f4a07bc2ff23a9ca40f2f3349239326 SHA256 36a3d84300b4d379d3b34088834dd79d0e5b4f9a7c66755874360644d3b5b4b3
-MISC ChangeLog 369 RMD160 6efa666ede694048b5cfce457ee69fd60d037704 SHA1 c3b86c3743d3f19ad0fa6d144dadeff46ef961a0 SHA256 783217180acc9f1e0ce3748700337fb056d1753b3e8ecb62c23bff5f430ad2af
+DIST apparmor-2.7.0.tar.gz 1399442 RMD160 13e74c631baef1155d664b68465c655bd32f8570 SHA1 9428e466e242b9381ac152dafb58d488c8a01921 SHA256 ff8a2f49f902faa78e502590c65d3850fb9a2a3453bef0dc1f99e947c52fc60f
+EBUILD libapparmor-2.7.0.ebuild 1716 RMD160 807fe6d0042011fb75afb24a30dae49ea165d604 SHA1 a48caeccc8c205973034b917d498fd04772a6d67 SHA256 395d759e8dc18fd550ae6465ece0d4628a00a62c4cd1321b45e7cc7616583141
+MISC ChangeLog 623 RMD160 6356586b82ef3a1f68e4f93d4f058c679ca1560f SHA1 4c4fb87038929ddac529e4f97b0a2bcb130a43d7 SHA256 15df0a217ecac9881d962d0310c2e8deb60170e41465abcbd7c7d104dce2ed37
MISC metadata.xml 209 RMD160 184537d7a401571abe0e5cbf9258ba3947d19382 SHA1 f2ea13baedca19e24be6ed7c3e6b765f7ff67cba SHA256 b0f0595f625235a62d9d40753827ae160e42156371fd9568bd2779042517f5e8
diff --git a/sys-libs/libapparmor/files/libapparmor-2.6.1-python3.patch b/sys-libs/libapparmor/files/libapparmor-2.6.1-python3.patch
deleted file mode 100644
index a4acd27d8..000000000
--- a/sys-libs/libapparmor/files/libapparmor-2.6.1-python3.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- swig/python/setup.py.in
-+++ swig/python/setup.py.in
-@@ -13,7 +13,7 @@
- ext_package = 'LibAppArmor',
- ext_modules = [Extension('_LibAppArmor', ['libapparmor_wrap.c'],
- include_dirs=['@top_srcdir@/src'],
-- extra_link_args = string.split('-L@top_builddir@/src/.libs -lapparmor'),
--# static: extra_link_args = string.split('@top_builddir@/src/.libs/libapparmor.a'),
-+ extra_link_args = '-L@top_builddir@/src/.libs -lapparmor'.split(),
-+# static: extra_link_args = '@top_builddir@/src/.libs/libapparmor.a'.split(),
- )],
- )
diff --git a/sys-libs/libapparmor/libapparmor-2.6.1.ebuild b/sys-libs/libapparmor/libapparmor-2.7.0.ebuild
index ac9991c2c..cedd70df4 100644
--- a/sys-libs/libapparmor/libapparmor-2.6.1.ebuild
+++ b/sys-libs/libapparmor/libapparmor-2.7.0.ebuild
@@ -32,10 +32,8 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/apparmor-${PV}/libraries/${PN}
src_prepare() {
- epatch "${FILESDIR}"/libapparmor-2.6.1-python3.patch
rm -rf m4 || die "failed to remove bundled macros"
-
- #fixes libtool version mismatch error
+ # to force use of system macros
eautoreconf
}