gentoo resync : 24.07.2021

5 files changed, 9 insertions, 47 deletions

diff --git a/app-admin/sagan-rules/Manifest b/app-admin/sagan-rules/Manifest
index 1e15dfe5a463..bc819a012013 100644
--- a/app-admin/sagan-rules/Manifest
+++ b/app-admin/sagan-rules/Manifest
@@ -1,6 +1,4 @@
-DIST sagan-rules-06172014.tar.gz 273531 BLAKE2B f78a2203013c3ca4d0f33421b750a6f03f7929193f122df5504b6919ecbc24302bf10a2c65390ebaf6d7f6c4e12a1ef8e2c4d457bd2dd14cd79a7f0313a2c6a5 SHA512 824e3b159fae10876f59e50b1c751e509b04e6ee347e74afb19c1a5f935fe41b8d8874d6379bea477fea5a9c5754b1917f9b78da3009203fe23a0c600e03da23
 DIST sagan-rules-20210208.tar.gz 461258 BLAKE2B bdb9cffa0c3e0a2750c86c32f75cb571cafa7ae51099ca79210a76134e599222b11520d45ea58ecbaebe7b32700d2935f089f69405fa7f3493d7bbb2f5d1abf6 SHA512 d6609c31e262c78b5ef609a602e406b79df80b27b8908b665598bfe18482461e0a5ebcdc4fe26e91be41eacd4e885c1ca28eaf6f4fe2b647726c7db9a09ce277
-EBUILD sagan-rules-20140617.ebuild 550 BLAKE2B 96583666ae4e4c01ed92e0e835ad819a2965b8fd69220abbd61de592b02548ce88c25dfa7c6c15e32094a339b65aa72669490e1d5b889afdd47b60448f69985a SHA512 b560a5422eb9559f85e057f6681b1d9cdda344a07cd07d59c5f2374c51ada996428070accf8144b79cf740f75878f6e23dab56597552c495e151cc64ac942737
-EBUILD sagan-rules-20210208.ebuild 526 BLAKE2B 7b4472e4fc2385ff353d8dbc9ad6a00f8f606d42817ab0b0717bbceee559942c914e3db47af6ef65fdd6885c62bffd2401f1836d754415214dd35bfe7a2250e4 SHA512 d0c902eef86371dfc76615e2ce167cf021160873ef8a1ce63773ae45970ef2e5949fffc5d0333f5fb1705c9b44fcadc6e7c5538828a481704c46606b8bc5de4e
-EBUILD sagan-rules-99999999.ebuild 466 BLAKE2B caa866e1f8082ccd01ef9ed0bae57b8de08730d7b25f5ea80526b1d4d7e4b95b02316bdbc2d64d5a73119a7b79c33daea1b1cf7c1c1bd1787824aba8ae6efda5 SHA512 4f409bc7a7f18fd51fbb65305d6e7bd1c929a0cebb668d3e97eeba64fce4e4e18e832d8c1be320141a9f1a011e13ba2bbdbaadfa44168a9f21d5cc5dd9458275
-MISC metadata.xml 368 BLAKE2B c966c44e4f04e4c75eb880239ea4a6aacdfb924709eca5fb766df68a1b19afc8f4c814865da1d9d852ae837ebbfdc4661e5d29d3b00b9cfea108213daa2cf2cc SHA512 1d910f985e6137f07e6bb906bb105a92cee1643b6a4dfe9b8bf2ad115d124c457912e38df87d625da5591665260ea941c6576229aa2d5e19f09077c1a7c5e743
+EBUILD sagan-rules-20210208.ebuild 480 BLAKE2B fa5b9360b56cb9d69b499ce763ab81c563036d9a896522bbbf8f41eaf2ae158d98e239904189c0492fde628c0fc4719acc09232a507414be2640ce8584ce3d39 SHA512 75a77d96aafbc576245b9861e9d0ad839bde5d6a8d4c1bea62c2e07cc37c5b12e94b2bd68843f60cd643e4e85f0b4fea5d424dbaf5142a41e32de4f1cc40d412
+EBUILD sagan-rules-99999999.ebuild 436 BLAKE2B 063e82561a51b04e562f0e8977b32b07bc2e15b7ba9c9c2d3bd563a8302880d37304e6231c55f20ec9f642716b95e1344d3d12bacd9612febfc517388636ab32 SHA512 7471c2767e1a8e8000a73435a6383270af915ffa7ea1d41e9dbdd11f37d6535b5e4beac679c745ba5fd9241584d9d0338216a573c9f30a1894b8fe42dbda83af
+MISC metadata.xml 255 BLAKE2B f898e4768ff2233e024d15ccbf459bbd853ddd110479645fa1b570e7f46a3c18362971f9c8d42005f16c9355501eefb834fadfb0096477ebf10e0bef26e76158 SHA512 f5d550b10ee9cfa17f07420a6bd1375aa4f114930f734f6c166b8a67fa16beeba3dcb58031b694258eff98c256baa3ba5ff186a0eaa047d16eda5e2f0c5831f4
diff --git a/app-admin/sagan-rules/metadata.xml b/app-admin/sagan-rules/metadata.xml
index a138c09bf20a..985506754f84 100644
--- a/app-admin/sagan-rules/metadata.xml
+++ b/app-admin/sagan-rules/metadata.xml
@@ -2,9 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<use>
-		<flag name="lognorm">Install normalize rules support with <pkg>dev-libs/liblognorm</pkg></flag>
-	</use>
 	<upstream>
 		<remote-id type="github">quadrantsec/sagan-rules</remote-id>
 	</upstream>
diff --git a/app-admin/sagan-rules/sagan-rules-20140617.ebuild b/app-admin/sagan-rules/sagan-rules-20140617.ebuild
deleted file mode 100644
index f96f36790f2e..000000000000
--- a/app-admin/sagan-rules/sagan-rules-20140617.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Rules for Sagan log analyzer"
-HOMEPAGE="http://sagan.softwink.com/"
-SRC_URI="http://sagan.quadrantsec.com/rules/sagan-rules-06172014.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+lognorm"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-PDEPEND="app-admin/sagan"
-
-S=${WORKDIR}/rules
-
-src_install() {
-	insinto /etc/sagan-rules
-	doins *.config
-	doins *rules
-	doins *map
-	if use lognorm ; then
-		doins *normalize.rulebase
-	fi
-}
diff --git a/app-admin/sagan-rules/sagan-rules-20210208.ebuild b/app-admin/sagan-rules/sagan-rules-20210208.ebuild
index 6535027cd0d5..2bfc68a94370 100644
--- a/app-admin/sagan-rules/sagan-rules-20210208.ebuild
+++ b/app-admin/sagan-rules/sagan-rules-20210208.ebuild
@@ -10,8 +10,7 @@ S="${WORKDIR}/rules"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+lognorm"
+KEYWORDS="amd64 x86"
 
 PDEPEND="app-admin/sagan"
 
@@ -20,7 +19,5 @@ src_install() {
 	doins *.config
 	doins *rules
 	doins *map
-	if use lognorm ; then
-		doins normalization.rulebase
-	fi
+	doins normalization.rulebase
 }
diff --git a/app-admin/sagan-rules/sagan-rules-99999999.ebuild b/app-admin/sagan-rules/sagan-rules-99999999.ebuild
index 85ac82618c67..6506abadf616 100644
--- a/app-admin/sagan-rules/sagan-rules-99999999.ebuild
+++ b/app-admin/sagan-rules/sagan-rules-99999999.ebuild
@@ -5,13 +5,13 @@ EAPI=7
 
 inherit git-r3
 
+EGIT_REPO_URI="https://github.com/beave/sagan-rules.git"
+
 DESCRIPTION="Rules for Sagan log analyzer"
 HOMEPAGE="http://sagan.softwink.com/"
-EGIT_REPO_URI="https://github.com/beave/sagan-rules.git"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="+lognorm"
 
 PDEPEND="app-admin/sagan"
 
@@ -19,7 +19,6 @@ src_install() {
 	insinto /etc/sagan-rules
 	doins *.config
 	doins *rules
-	if use lognorm; then
-		doins normalization.rulebase
-	fi
+	doins *map
+	doins normalization.rulebase
 }