gentoo resync : 10.02.2020

3 files changed, 34 insertions, 34 deletions

diff --git a/net-analyzer/snort/Manifest b/net-analyzer/snort/Manifest
index cba9b38d69d6..66928bfe6b05 100644
--- a/net-analyzer/snort/Manifest
+++ b/net-analyzer/snort/Manifest
@@ -11,7 +11,7 @@ DIST snort-2.9.15.1.tar.gz 6618999 BLAKE2B d9f661b036afa2130d406f8bcfa8d33fca482
 DIST snort-2.9.15.tar.gz 6704763 BLAKE2B adef13e3368dbbb9e023d79ec4f75c9652af8d26642b83f1f413e39faf966281b09713854e3a8aa385647b375102a667b10ee96d6f1cebb2f92c9fc7f29a2eb5 SHA512 21830dc4c9ce7b5bc96defa800f78de6ad24c1ab96dbeab0d79a7bf4298a81d6bdb4be8fd3bbec3b28b33aa7bb27cdc48a2a00b33c494f68d1649bc609928eea
 DIST snort-2.9.8.3.tar.gz 6244304 BLAKE2B cb77c80dde0b5b32ba0fe36cd07e1f6f465127e4be207ba6cd3b7c7dff75f4537c86c6a88d744a924b99d0b4ac864add2c9111c63e51dc4c7dc23f8d19a6c792 SHA512 2f3dfe46e14a5106a02ca60b2d334549f4924ff916de0804b2b7792cdd31e104fbb454b4b932855b5f25a861698db0f8988844782b12b0e5fa132d88d4a7a687
 EBUILD snort-2.9.12.ebuild 8872 BLAKE2B 84895cf9afb5ddf3079773ff50d730c56af2b01fc912c9d1fa74bead53fe30332d4971dde35cd3091057fadb06f32c25971823904c8d00caf185d9547ec32a63 SHA512 26ed8dc6c1d020a1fb73d1f12a81700a3d18103038340d00eb44d9891391eb49b2e8a611a3f46bf4d8423cb0586e8449933e7863e0184030f152b246e6696070
-EBUILD snort-2.9.15.1.ebuild 8322 BLAKE2B a30af887835e0d9c4205c323c1227402c444d31ad7fdb6a663932e4b885722f6e25b7c24bc9074c4573fe84facbb95790daa877267901d4dc5aa9a45ea2d0c1c SHA512 26fdf6db522b842641d3fef0ed7e16f1c2a8c1f260277769c8ae12566fad88337236231df2e2015cf8a7efeb04ed953c5edbc9ab8bbd9fe970919b896b3dc6d2
-EBUILD snort-2.9.15.ebuild 8847 BLAKE2B 0103540218a24cceb191285c4dac236621c25f140a4842c7bf70cd3e438afcdebdacf66d9a23de6319028b7f7d8e891f3f2e1eaf0230bc8b034dc1b2e3b34ea5 SHA512 52e5f4bd4f68bb5a85ce4bd27e8067d6ed16b9586fd92f4dce18ccf4380232a78c8249967dc85a9e181c68b70ac3d3d92aa402bf24b146051f465d47e84e2e89
+EBUILD snort-2.9.15.1.ebuild 8290 BLAKE2B a736c8a9d301ffdfca34d9ce0d5b8c7e8ffe07214a9c82a9981699dc40ee5061356b64124a1506b31aca773ff330af25ea6885be166555df349afaacd46e68a7 SHA512 acfef7c2b52430d2965c6d0ebb34b38c3075a291c8c5679d03e01466bde8ffb09a61281ae8c549c4f5fe3577d47af6f581ce45c0820f9c5de63aa0574ba59b12
+EBUILD snort-2.9.15.ebuild 8815 BLAKE2B 4771541a6a443235902d4d4a5a987445ae7289b7e88df69267719952a4dee392be35dfb0c7831a18bbc0dccf6871415f9d77659dd3e21e9a40cc6974ca2fd649 SHA512 bbe56fc788d6494299622106897d5c6835f279aacfd0e6fa98b773ad2ec2fe2d0f86da87b66d84128c13b6aa0b5f76a80d05a40f642c0c0378c1f4afef6412b2
 EBUILD snort-2.9.8.3-r2.ebuild 8505 BLAKE2B 82e9e4dbb2527f80ff87f3c95befb2b141e8ca55e1b097581b688c65e990c7cc0206388d98859f47e0f6b0a9ea52d2f6ff566ed67085de4f33c5023e7e4b86dc SHA512 8444c62e53db68fa39a85048b1ce01f30d16d636f4dd5eb3e51a1a5af3e393ca9bf0d4615c44b38bd57de050735b3666222c542c215b08f4f75c49613988a390
 MISC metadata.xml 4042 BLAKE2B 931c99e6b1aee3727e47f32dff6399dc821624fc9cc3be496ba711d480edb04920d2ffcdc9ce4fe6a253be2bbcd4bb45f56a34da530c6dd60140c77b5cc45856 SHA512 2ade0995e40052f3be40a073458a19ea380bb2f75e24905c06b45e88d8956b118db73fbb0a1062e5c0ca837e04d1805a54785a84283e701534ec47c320833b1f
diff --git a/net-analyzer/snort/snort-2.9.15.1.ebuild b/net-analyzer/snort/snort-2.9.15.1.ebuild
index 21aba42de764..21bdbd512480 100644
--- a/net-analyzer/snort/snort-2.9.15.1.ebuild
+++ b/net-analyzer/snort/snort-2.9.15.1.ebuild
@@ -150,42 +150,42 @@ src_install() {
 
 	# Sourcefire uses Makefiles to install docs causing Bug #297190.
 	# This removes the unwanted doc directory and rogue Makefiles.
-	rm -rf "${ED%/}"/usr/share/doc/snort || die "Failed to remove SF doc directories"
-	rm "${ED%/}"/usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
+	rm -rf "${ED}"/usr/share/doc/snort || die "Failed to remove SF doc directories"
+	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 "${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"
 
 	# Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection
 	sed -i -e 's|/usr/local/lib|/usr/'$(get_libdir)'|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	# Set the correct rule location in the config
 	sed -i -e 's|RULE_PATH ../rules|RULE_PATH /etc/snort/rules|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	# Set the correct preprocessor/decoder rule location in the config
 	sed -i -e 's|PREPROC_RULE_PATH ../preproc_rules|PREPROC_RULE_PATH /etc/snort/preproc_rules|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	# Enable the preprocessor/decoder rules
 	sed -i -e 's|^# include $PREPROC_RULE_PATH|include $PREPROC_RULE_PATH|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	sed -i -e 's|^# dynamicdetection directory|dynamicdetection directory|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	# Just some clean up of trailing /'s in the config
 	sed -i -e 's|snort_dynamicpreprocessor/$|snort_dynamicpreprocessor|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	# Make it clear in the config where these are...
 	sed -i -e 's|^include classification.config|include /etc/snort/classification.config|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	sed -i -e 's|^include reference.config|include /etc/snort/reference.config|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	# Disable all rule files by default.
 	sed -i -e 's|^include $RULE_PATH|# include $RULE_PATH|g' \
@@ -205,17 +205,17 @@ src_install() {
 
 	# Set snort to run as snort:snort
 	sed -i -e 's|^# config set_gid:|config set_gid: snort|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 	sed -i -e 's|^# config set_uid:|config set_uid: snort|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	# Set the default log dir
 	sed -i -e 's|^# config logdir:|config logdir: /var/log/snort/|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	# Set the correct so_rule location in the config
 	sed -i -e 's|SO_RULE_PATH ../so_rules|SO_RULE_PATH /etc/snort/so_rules|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 }
 
 pkg_postinst() {
diff --git a/net-analyzer/snort/snort-2.9.15.ebuild b/net-analyzer/snort/snort-2.9.15.ebuild
index e9688b46d280..38037a16bb2c 100644
--- a/net-analyzer/snort/snort-2.9.15.ebuild
+++ b/net-analyzer/snort/snort-2.9.15.ebuild
@@ -163,42 +163,42 @@ src_install() {
 
 	# Sourcefire uses Makefiles to install docs causing Bug #297190.
 	# This removes the unwanted doc directory and rogue Makefiles.
-	rm -rf "${ED%/}"/usr/share/doc/snort || die "Failed to remove SF doc directories"
-	rm "${ED%/}"/usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
+	rm -rf "${ED}"/usr/share/doc/snort || die "Failed to remove SF doc directories"
+	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 "${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"
 
 	# Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection
 	sed -i -e 's|/usr/local/lib|/usr/'$(get_libdir)'|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	# Set the correct rule location in the config
 	sed -i -e 's|RULE_PATH ../rules|RULE_PATH /etc/snort/rules|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	# Set the correct preprocessor/decoder rule location in the config
 	sed -i -e 's|PREPROC_RULE_PATH ../preproc_rules|PREPROC_RULE_PATH /etc/snort/preproc_rules|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	# Enable the preprocessor/decoder rules
 	sed -i -e 's|^# include $PREPROC_RULE_PATH|include $PREPROC_RULE_PATH|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	sed -i -e 's|^# dynamicdetection directory|dynamicdetection directory|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	# Just some clean up of trailing /'s in the config
 	sed -i -e 's|snort_dynamicpreprocessor/$|snort_dynamicpreprocessor|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	# Make it clear in the config where these are...
 	sed -i -e 's|^include classification.config|include /etc/snort/classification.config|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	sed -i -e 's|^include reference.config|include /etc/snort/reference.config|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	# Disable all rule files by default.
 	sed -i -e 's|^include $RULE_PATH|# include $RULE_PATH|g' \
@@ -218,17 +218,17 @@ src_install() {
 
 	# Set snort to run as snort:snort
 	sed -i -e 's|^# config set_gid:|config set_gid: snort|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 	sed -i -e 's|^# config set_uid:|config set_uid: snort|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	# Set the default log dir
 	sed -i -e 's|^# config logdir:|config logdir: /var/log/snort/|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	# Set the correct so_rule location in the config
 	sed -i -e 's|SO_RULE_PATH ../so_rules|SO_RULE_PATH /etc/snort/so_rules|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 }
 
 pkg_postinst() {