gentoo resync : 25.12.2017

4 files changed, 20 insertions, 22 deletions

diff --git a/app-admin/sagan-rules/Manifest b/app-admin/sagan-rules/Manifest
index 0178f47b8186..27ee603a7fe0 100644
--- a/app-admin/sagan-rules/Manifest
+++ b/app-admin/sagan-rules/Manifest
@@ -1,6 +1,6 @@
 DIST sagan-rules-06172014.tar.gz 273531 BLAKE2B f78a2203013c3ca4d0f33421b750a6f03f7929193f122df5504b6919ecbc24302bf10a2c65390ebaf6d7f6c4e12a1ef8e2c4d457bd2dd14cd79a7f0313a2c6a5 SHA512 824e3b159fae10876f59e50b1c751e509b04e6ee347e74afb19c1a5f935fe41b8d8874d6379bea477fea5a9c5754b1917f9b78da3009203fe23a0c600e03da23
 DIST sagan-rules-20130430.tar.gz 240975 BLAKE2B 26032d61e3933bfebe6eee14e78b6d9cd54dcc1b5acdca833859f3648aa0ea9fe9e590b19ed6febcd93491e8576842c011b3a2e11f1dd75f8f57d642252216ee SHA512 bc31f043a0e14542665d9e1469d85427fea395bb86b833200dfa3c8f4cbd2591f6268f26a478c768ad8784aeb1a102e01e3bbfc63636a0384b2092193bbb9bdb
-EBUILD sagan-rules-20130430.ebuild 546 BLAKE2B 91ef42023a149b298ff529fb917d1e7a86fa6a6aebe03860c060a8a07ed2420a55d7eae2b453e76b8ec5c22534a7064921d71ce0a38f837f0cac6041e31b559a SHA512 2bbe1da5d81d9d918763cf80ff12756473a6d640d2a1aef8d9b131dec8e75e035b38f45a140273e40e1cc93e6bd5a7f98e4413081c3dbeb1b0d446ca86a3a1fa
-EBUILD sagan-rules-20140617.ebuild 558 BLAKE2B 867f283b283b243e96bc53a225fd7808c1836d359e54ad5e040a5b367c2fd98638f941342c0db78ea1ddd9a289ad55cad36ceb2f64e02b16a223f9c397a9d971 SHA512 2f550cb807403e442c5406ba6e1576a45f5f635f33d2e33a7e1652b18769cdcd1348f56c42eb083172ebb0a2fdbd17e33d7331069ee18f46ef153a4f41cef892
-EBUILD sagan-rules-99999999.ebuild 535 BLAKE2B fdeb290925e8a2a16176dce92d558a0c1e5bfc6b9eb32c537ffe105e900791a80d9cb8f6130159835ea0524f434e374fdc9e2c1dc140639c5689a3cf2dd643a7 SHA512 facdce8702223ca1319ee7bf7f87b981145b9f58c440c0a1a321bcf6d218b08c46499cd6f669f15d75d19e7ea421f9fef9281596df022d5a08952c6ba9a795b3
+EBUILD sagan-rules-20130430.ebuild 540 BLAKE2B 28ab045f38db9d1584e3ec8d54cd93ec43a415ef206be72e1230707e0d43868d220206e8084a50eb09c1acd4b0aa026cbaf6945c7e96d413557e72bc829171a6 SHA512 7cd0bbe2b893a61c69e6c188f2831f8370d2b8eea85c35b53268b0316bdd79e6823bbd78097a8b24a8438c2dc501c4a2eebcec26abf33cfaf98e28648b56b670
+EBUILD sagan-rules-20140617.ebuild 550 BLAKE2B 96583666ae4e4c01ed92e0e835ad819a2965b8fd69220abbd61de592b02548ce88c25dfa7c6c15e32094a339b65aa72669490e1d5b889afdd47b60448f69985a SHA512 b560a5422eb9559f85e057f6681b1d9cdda344a07cd07d59c5f2374c51ada996428070accf8144b79cf740f75878f6e23dab56597552c495e151cc64ac942737
+EBUILD sagan-rules-99999999.ebuild 512 BLAKE2B d2204bcfe47b1547941727b3f9afd0362d20b27d88b0299b0dec9d2f9b53ca2da57228b871ea73d6d26b3196d956f65cc40881bc5e89d0a5b803cbfc0c504f6a SHA512 ef9fa5e4c4c306d8b8e4c593b517c480cff2ccf2a7324ad0ef4bc03ebcabaef669126d93dc0b8b722925bbbd7da9a800a21a6c1d40f01180ab20057b424d26b0
 MISC metadata.xml 333 BLAKE2B 6669cb8a1ffcf80841f4a2ff0c243bd3fb524553675fd9b5d26af20d27ff80559d79b9a303e30ff899ea2535e819d09e81486c7a9acf39251a42b12ec11dec5c SHA512 f5629f04c280240b0e32a34806aac532556af940c87240ef15f669762ef289c23d5ae622e139243e6c1e230a79e275eeb9521fe9956efd5471575bc4862ff33c
diff --git a/app-admin/sagan-rules/sagan-rules-20130430.ebuild b/app-admin/sagan-rules/sagan-rules-20130430.ebuild
index e15ff4d31686..792a5e255308 100644
--- a/app-admin/sagan-rules/sagan-rules-20130430.ebuild
+++ b/app-admin/sagan-rules/sagan-rules-20130430.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=6
 
 DESCRIPTION="Rules for Sagan log analyzer"
 HOMEPAGE="http://sagan.softwink.com/"
@@ -20,9 +20,9 @@ S=${WORKDIR}/rules
 
 src_install() {
 	insinto /etc/sagan-rules
-	doins ./*.config
-	doins ./*rules
+	doins *.config
+	doins *rules
 	if use lognorm ; then
-		doins ./*normalize.rulebase
+		doins *normalize.rulebase
 	fi
 }
diff --git a/app-admin/sagan-rules/sagan-rules-20140617.ebuild b/app-admin/sagan-rules/sagan-rules-20140617.ebuild
index b443e4c761dc..f96f36790f2e 100644
--- a/app-admin/sagan-rules/sagan-rules-20140617.ebuild
+++ b/app-admin/sagan-rules/sagan-rules-20140617.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=6
 
 DESCRIPTION="Rules for Sagan log analyzer"
 HOMEPAGE="http://sagan.softwink.com/"
@@ -20,10 +20,10 @@ S=${WORKDIR}/rules
 
 src_install() {
 	insinto /etc/sagan-rules
-	doins ./*.config
-	doins ./*rules
-	doins ./*map
+	doins *.config
+	doins *rules
+	doins *map
 	if use lognorm ; then
-		doins ./*normalize.rulebase
+		doins *normalize.rulebase
 	fi
 }
diff --git a/app-admin/sagan-rules/sagan-rules-99999999.ebuild b/app-admin/sagan-rules/sagan-rules-99999999.ebuild
index c26a05f9cc11..b1f8d1514eb4 100644
--- a/app-admin/sagan-rules/sagan-rules-99999999.ebuild
+++ b/app-admin/sagan-rules/sagan-rules-99999999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=6
 
-inherit git-2
+inherit git-r3
 
 DESCRIPTION="Rules for Sagan log analyzer"
 HOMEPAGE="http://sagan.softwink.com/"
@@ -18,13 +18,11 @@ DEPEND=""
 RDEPEND="${DEPEND}"
 PDEPEND="app-admin/sagan"
 
-S="${WORKDIR}"/rules
-
 src_install() {
 	insinto /etc/sagan-rules
-	doins ./*.config
-	doins ./*rules
+	doins *.config
+	doins *rules
 	if use lognorm; then
-		doins ./*normalize.rulebase
+		doins *normalization.rulebase
 	fi
 }