sys-libs/libapparmor: Version bump. Add static-libs use flag and refrain from install...

svn path=/sunrise/; revision=12727

diff --git a/sys-libs/libapparmor/ChangeLog b/sys-libs/libapparmor/ChangeLog
index 7f4a58fe34aa35ff4516f3e5c9380a4f2967b766..79b07431f57b5816dd537f89116ee8b5cec9f8af 100644 (file)
--- a/sys-libs/libapparmor/ChangeLog
+++ b/sys-libs/libapparmor/ChangeLog
@@ -1,7 +1,14 @@
 # ChangeLog for sys-libs/libapparmor
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*libapparmor-2.7.2 (05 Feb 2012)
+
+  05 Feb 2012; Michael Palimaka (kensington) <kensington@astralcloak.net>
+  -libapparmor-2.7.0.ebuild, +libapparmor-2.7.2.ebuild:
+  Version bump. Add static-libs use flag and refrain from installing .la files.
+  Thanks to mgorny, hasufell, and Tommy[D] for review.
+
 *libapparmor-2.7.0 (18 Dec 2011)
 
   18 Dec 2011; Michael Palimaka (kensington) <kensington@astralcloak.net>

diff --git a/sys-libs/libapparmor/Manifest b/sys-libs/libapparmor/Manifest
index 2d3a73dac5e45a8017639c6b828d0119240ac5a3..15746e2a89f57cc09c333030b83d3c71b9033cb8 100644 (file)
--- a/sys-libs/libapparmor/Manifest
+++ b/sys-libs/libapparmor/Manifest
@@ -1,4 +1,4 @@
-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
+DIST apparmor-2.7.2.tar.gz 1403151 RMD160 a51fa3ec0dfa4f3cae77556fa751a414e1bc556b SHA1 0645cc2352f89c41825c59a07dfca9035599d85d SHA256 42deb8cbf4937fac07a48ec8427b90131e92ed2f83b606beee092bdb4fc2a41f
+EBUILD libapparmor-2.7.2.ebuild 1839 RMD160 73062ce0552af0b4d69f029776b5faf3fade8e60 SHA1 71f76b026d88050a81650942a6059b2cce1b4a3c SHA256 644e72abb2171d97eacc926364c227a20fa824a795475ad75602e0dbe602a0a0
+MISC ChangeLog 923 RMD160 a935edc9895cfb09442a22ac8faa8b8051099f40 SHA1 1c29458ff9d395021c98e88c75acc7a2d2780c0d SHA256 69ded6243f4be0b11f75d785987d3e089fbf1832aeb5eb2443f59c24ea6b362c
 MISC metadata.xml 209 RMD160 184537d7a401571abe0e5cbf9258ba3947d19382 SHA1 f2ea13baedca19e24be6ed7c3e6b765f7ff67cba SHA256 b0f0595f625235a62d9d40753827ae160e42156371fd9568bd2779042517f5e8

diff --git a/sys-libs/libapparmor/libapparmor-2.7.0.ebuild b/sys-libs/libapparmor/libapparmor-2.7.2.ebuild
similarity index 85%
rename from sys-libs/libapparmor/libapparmor-2.7.0.ebuild
rename to sys-libs/libapparmor/libapparmor-2.7.2.ebuild
index cedd70df4014b5d19438cac8be36ac6fceb84d56..c6a6d4c3cf04195cc2d84f6fe88c3e82bb89b5f3 100644 (file)
--- a/sys-libs/libapparmor/libapparmor-2.7.0.ebuild
+++ b/sys-libs/libapparmor/libapparmor-2.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -17,7 +17,7 @@ SRC_URI="http://launchpad.net/apparmor/$(get_version_component_range 1-2)/${PV}/
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="doc perl python"
+IUSE="doc perl python static-libs"
 
 RDEPEND="perl? ( dev-lang/perl )"
 
@@ -40,7 +40,8 @@ src_prepare() {
 src_configure() {
        econf \
                $(use_with perl) \
-               $(use_with python)
+               $(use_with python) \
+               $(use_enable static-libs static)
 }
 
 src_compile() {
@@ -49,7 +50,7 @@ src_compile() {
        use doc && emake -C doc
        use perl && emake -C swig/perl
 
-       if use python; then
+       if use python ; then
                python_copy_sources swig/python
                compile_bindings() {
                        emake PYTHON="$(PYTHON)" PYTHON_INCLUDEDIR="$(python_get_includedir)" PYTHON_LIBDIR="$(python_get_libdir)"
@@ -62,17 +63,19 @@ src_install() {
        emake -C src DESTDIR="${D}" install
        use doc && emake -C doc DESTDIR="${D}" install
 
-       if use perl; then
+       if use perl ; then
                emake -C swig/perl DESTDIR="${D}" install
                perlinfo
                insinto "${VENDOR_ARCH}"
                doins swig/perl/LibAppArmor.pm
        fi
 
-       if use python; then
+       if use python ; then
                install_bindings() {
                        emake -C swig/python DESTDIR="${D}" install
                }
                python_execute_function -q install_bindings
        fi
+
+       find "${D}" -name '*.la' -delete || die "failed to remove .la files"
 }