Fix inability to remove .la files, bug 384443 thank Juergen Rose for report and Jason...

Package-Manager: portage-2.1.10.16/cvs/Linux x86_64

diff --git a/net-analyzer/snort/ChangeLog b/net-analyzer/snort/ChangeLog
index c078299f66c214402da1f232634e03093a6e8ca3..7e8539d8e837fc8b6cbec9380371e52a5907ac3d 100644 (file)
--- a/net-analyzer/snort/ChangeLog
+++ b/net-analyzer/snort/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/snort
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.186 2011/09/22 17:39:51 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.187 2011/09/29 06:04:55 pva Exp $
+
+  29 Sep 2011; Peter Volkov <pva@gentoo.org> snort-2.9.1.ebuild:
+  Fix inability to remove .la files, bug 384443 thank Juergen Rose for report
+  and Jason Wallace for fix.
 
 *snort-2.9.1 (22 Sep 2011)
 

diff --git a/net-analyzer/snort/Manifest b/net-analyzer/snort/Manifest
index f5ce3d1b02ca698486644340e02b957c9919150b..37f5250366e1077f5e365674b73ee2ff6e1fb557 100644 (file)
--- a/net-analyzer/snort/Manifest
+++ b/net-analyzer/snort/Manifest
@@ -20,6 +20,6 @@ EBUILD snort-2.8.6.1.ebuild 10453 RMD160 7028aad5e61746e33a6f87134f33a074ae8424c
 EBUILD snort-2.8.6.ebuild 10130 RMD160 c2b00348106ddd42fd1d85e81379172a967f362e SHA1 2da5ff9240446e00237e8fe81a1001d85d20d1e3 SHA256 8788b91ef4b8ad8b6e3ca7bcb456afa94f497b454a3098201c977c0e0f6584a6
 EBUILD snort-2.9.0.4-r1.ebuild 9893 RMD160 d2c79206d777528bf798737d53f4d3b8cfcbff3c SHA1 c20ce779028cb97368fcaff15443abeff38c04b3 SHA256 33abee6ef5d662cb3854f268cf3dd596a281b2c10b5d15e87f5ac2cc7204e815
 EBUILD snort-2.9.0.5.ebuild 10179 RMD160 1bff0dc4e6489fbefd6452fe27743f9b092efd55 SHA1 c742d26a91a26007d523f6cc2fb45e6948422ff3 SHA256 72c4194ee295d96529f6d6d30a12bc3b60f3a312a3a59cc0983fdc9e24195d37
-EBUILD snort-2.9.1.ebuild 9293 RMD160 4da3275217bb85b5dab2e1232c63a770ca3a35b1 SHA1 58e721cf7035c1eb4345ef22a522487bdb58b036 SHA256 b474135fd682dfd5dbf277289c44aaa766c93b7537b9da93937f637daabd38ea
-MISC ChangeLog 32356 RMD160 d6bea8bd3762dd6ad670a6865af83e6e2c0763eb SHA1 3ebb6e5e10ef9b7a36d10ad1319a01d1b67d360f SHA256 875eb6e5482dbc50d008f50f1f77740c56f3c830b8ca78e690e6a42e9cb655f3
+EBUILD snort-2.9.1.ebuild 9303 RMD160 c3f60e913f05a6bf3f0548832c45de9ac223c74a SHA1 7d2dfdd4df77af8b12a89f0fa76769a025eb5dc3 SHA256 46020d7219b5a6ac5ecae19035d754e3ba1c78b78667e0f11b2d12a14516e1a8
+MISC ChangeLog 32525 RMD160 eeaca6b598549ca03fe2432bf18a2eec8c0776e3 SHA1 49978f1430f21de19b94e113713eb6c54cf684b3 SHA256 2bec71a7b4c95c63f4afe303995960114018d7783efd6a51f88c05e724a0c0ed
 MISC metadata.xml 5524 RMD160 d307f40c1dfece37a0bf5bdc9264141bdd86f61a SHA1 0b88ce23a95d7c96ffb15609761d143c64ba1c10 SHA256 621972507e7e2d501d947c4acefc1d5a700173171f95d838a675bcfca135251d

diff --git a/net-analyzer/snort/snort-2.9.1.ebuild b/net-analyzer/snort/snort-2.9.1.ebuild
index f6c5fab57e092df60257d2d7edd95af217cc1157..c00847bb1a40adecccc3a722d2bdeebbea786697 100644 (file)
--- a/net-analyzer/snort/snort-2.9.1.ebuild
+++ b/net-analyzer/snort/snort-2.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.9.1.ebuild,v 1.2 2011/09/23 15:04:08 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.9.1.ebuild,v 1.3 2011/09/29 06:04:55 pva Exp $
 
 EAPI="2"
 inherit eutils autotools multilib
@@ -168,8 +168,8 @@ src_install() {
        rm "${D}"usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
 
        #Remove unneeded .la files (Bug #382863)
-       rm "${D}"usr/lib64/snort_dynamicengine/libsf_engine.la || die
-       rm "${D}"usr/lib64/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
+       rm "${D}"usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
+       rm "${D}"usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
 
        # Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection
        sed -i -e 's|/usr/local/lib|/usr/'$(get_libdir)'|g' \