[gentoo-commits] repo/gentoo:master commit in: net-analyzer/snort/

["Sam James" <sam@gentoo.org>]

commit:     e9bf9cb3caad389d0908af434eb09b268907c18b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 16 21:45:16 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 16 21:45:16 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9bf9cb3

net-analyzer/snort: forcefully remove .la files

Fixes build with slibtool where they don't exist in the first place.

Closes: https://bugs.gentoo.org/775179
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/snort/snort-2.9.15.1.ebuild    | 6 +++---
 net-analyzer/snort/snort-2.9.16-r100.ebuild | 6 +++---
 net-analyzer/snort/snort-2.9.16.ebuild      | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/net-analyzer/snort/snort-2.9.15.1.ebuild b/net-analyzer/snort/snort-2.9.15.1.ebuild
index 21bdbd51248..440d87d8359 100644
--- a/net-analyzer/snort/snort-2.9.15.1.ebuild
+++ b/net-analyzer/snort/snort-2.9.15.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -154,8 +154,8 @@ src_install() {
 	rm "${ED}"/usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
 
 	# Remove unneeded .la files (Bug #382863)
-	rm "${ED}"/usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
-	rm "${ED}"/usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
+	rm -f "${ED}"/usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
+	rm -f "${ED}"/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' \

diff --git a/net-analyzer/snort/snort-2.9.16-r100.ebuild b/net-analyzer/snort/snort-2.9.16-r100.ebuild
index c3363729e9a..66b2b845e87 100644
--- a/net-analyzer/snort/snort-2.9.16-r100.ebuild
+++ b/net-analyzer/snort/snort-2.9.16-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -159,8 +159,8 @@ src_install() {
 	rm "${ED}"/usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
 
 	# Remove unneeded .la files (Bug #382863)
-	rm "${ED}"/usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
-	rm "${ED}"/usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
+	rm -f "${ED}"/usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
+	rm -f "${ED}"/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' \

diff --git a/net-analyzer/snort/snort-2.9.16.ebuild b/net-analyzer/snort/snort-2.9.16.ebuild
index 6e7835a5310..4a3f0392b5c 100644
--- a/net-analyzer/snort/snort-2.9.16.ebuild
+++ b/net-analyzer/snort/snort-2.9.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -154,8 +154,8 @@ src_install() {
 	rm "${ED}"/usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
 
 	# Remove unneeded .la files (Bug #382863)
-	rm "${ED}"/usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
-	rm "${ED}"/usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
+	rm -f "${ED}"/usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
+	rm -f "${ED}"/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' \