gentoo resync : 29.06.2020

3 files changed, 79 insertions, 0 deletions

diff --git a/app-admin/syslog-summary/Manifest b/app-admin/syslog-summary/Manifest
index ef8b07c7eb11..354305b5d0b9 100644
--- a/app-admin/syslog-summary/Manifest
+++ b/app-admin/syslog-summary/Manifest
@@ -1,6 +1,8 @@
 AUX syslog-summary-1.14-fix-ignore-code.patch 306 BLAKE2B e319592affd7f13c88cd4ea2ba993050474fa1f96351d0144e20ca0ada5fc4ba5aa5243adc71a99efa12ea189757b05fc76f649688eece6261a0f7697bd3719a SHA512 cc6cdaf03d62a1bda5bcbd4c395ef1fbbc7be7a61ec88df6c7784e14c6a3cf677e58304cf4b5caafe115f7267e38262978a148fe9811bdce0f10966df72c709b
+AUX syslog-summary-1.14-remove-file-magic.patch 836 BLAKE2B a4b2d7d40ab7c15ac33325c97d8bea3df7d7f824c3d301a6be764ac0a5ce9721fd7d6dbdd6a6f48432931fdfca7a2f1cf141eab897e8bdfa1eba20f2f9485153 SHA512 1f860cb96cf5eef124217c8253264fe24f6b7fde3d078d2f41e419490bdb3d9d4df6fed7c9b8cc68a855dfc06f81dfdc4c7e868d9812ed1a306ac65cbc97f833
 DIST syslog-summary-1.14.tar.gz 7278 BLAKE2B 609e506c099b734be87ba6d6e21f70283d4654ab5c6d3794da71099f3e590d178348c13ab271ddb84682220091adfd702c107bf2dee792419de3ce14d2a9c9db SHA512 db1f0660ad435eea26fc3ec4cd475f5f1b98bb629495707741077e52aef88fe8bff4a318bb5b0821e57ccfa0646454c6825a5a4fc1fb4b73ea67cbd4defef277
 EBUILD syslog-summary-1.14-r1.ebuild 766 BLAKE2B 036754524dd9c11b985c2ef5777636aba3be7bc92b1ed430cc00cf1ac93701f442354dfe9b12e7a0dcbfca4625a7b6fceea2cb218e9ad3fa2a42f39e098bda39 SHA512 f865914965a0ea4f6db355429c4ffedc768c491c9d7f93a6668422bc3e307be31465fe003462bbf45c73857b292110132bd4499d023040516a1c614fb716a549
 EBUILD syslog-summary-1.14-r2.ebuild 944 BLAKE2B ef4dde4b5da0ce5ae1b28e9200d2d51fbca075f30bb72a6f1bb49104d980da37ea44c872901ee207e392cf5f06a3f4a9a5bc032da5f4d50a9fc8805c12366c66 SHA512 47fe494a2bc164750e4804b6c6e8dfa9328b072ab9e7ca0e77e1f2bc4d253387f4e3ed13bfd1d84cc729d15f71faf58660484803ae2c38dcd61d77c2ef79ff5a
 EBUILD syslog-summary-1.14-r3.ebuild 991 BLAKE2B 9086206934c07f3d810faec448a65cd24492bdd986d7832c95579aaba61136595b6b9c4f4d8fd5d406e32cd15ad9369d095b2e3c68e762267c894738bff5be6f SHA512 c127aa0387176e078d31b46729c9b437e4537b2821ec7b4eda4d7c742e31e014ce1d33f3d3ef3666ccee1de0a21759f27f5feaaf778ee0f26ee703bd26ddd94b
+EBUILD syslog-summary-1.14-r4.ebuild 843 BLAKE2B 7937d374d41d63881205b78d45e73ee5c11ac7a8b21437048e1596c8ac10fb4d7402ea8686a84ad4ab5379b197ff4ed4dc74f1f8d6b2ca06ec32aa5463c70cf4 SHA512 d5b54c48351a7cb82f6c988138621633008367b8a3a8fb02ee05f52a7975cb9799757d04ca17ff0a031ed6354f01c98c22ab8d1188a842cdb354a9cbdbe09c17
 MISC metadata.xml 464 BLAKE2B 862ef04e25fe1aa6609e2ea68c9d61a9c201d43ffab9db6a02244ca9192f4fd11a1f1f4e4d6f7e365660c4043b28a959d5da9783f3c6f0ed4f69eb625784763c SHA512 64073e0ef15c4fbe057f51c09505ea3db8d5e1427c2d581b55137e7fba37f5fef13103cfe4d0e58c74052601d4bae0ed26e36346d497653ea080fe5649f956eb
diff --git a/app-admin/syslog-summary/files/syslog-summary-1.14-remove-file-magic.patch b/app-admin/syslog-summary/files/syslog-summary-1.14-remove-file-magic.patch
new file mode 100644
index 000000000000..c7a1738b7c8d
--- /dev/null
+++ b/app-admin/syslog-summary/files/syslog-summary-1.14-remove-file-magic.patch
@@ -0,0 +1,35 @@
+diff --git a/syslog-summary b/syslog-summary
+index abf6381..b3edffc 100755
+--- a/syslog-summary
++++ b/syslog-summary
+@@ -128,24 +128,12 @@ def split_date(line):
+ 
+ def is_gzipped(filename):
+ 	"""Returns True if the filename is a gzipped compressed file"""	
+-	try:
+-		import magic
+-		ms = magic.open(magic.MAGIC_NONE)
+-		ms.load()
+-		if re.search("^gzip compressed data.*", ms.file(filename)):
+-			return True
+-		else:
+-			return False
+-	except:
+-		from os.path import splitext
+-		
+-		if not QUIET:
+-			print "Using fallback detection... please install python-magic for better gzip detection."
+-		
+-		if splitext(filename)[1] == ".gz":
+-			return True
+-		else:
+-			return False
++	from os.path import splitext
++
++	if splitext(filename)[1] == ".gz":
++		return True
++	else:
++		return False
+ 
+ def summarize(filename, states):
+ 	counts = {}
diff --git a/app-admin/syslog-summary/syslog-summary-1.14-r4.ebuild b/app-admin/syslog-summary/syslog-summary-1.14-r4.ebuild
new file mode 100644
index 000000000000..1831eb914a2b
--- /dev/null
+++ b/app-admin/syslog-summary/syslog-summary-1.14-r4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+DESCRIPTION="Summarizes the contents of a syslog log file"
+HOMEPAGE="https://github.com/dpaleino/syslog-summary"
+SRC_URI="https://github.com/downloads/dpaleino/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND=""
+RDEPEND="${PYTHON_DEPS}"
+
+PATCHES=( "${FILESDIR}/${P}-fix-ignore-code.patch" "${FILESDIR}/${P}-remove-file-magic.patch" )
+
+src_prepare() {
+	python_fix_shebang -f syslog-summary
+
+	# Sadly, the makefile is useless for us.
+	rm Makefile || die
+
+	default
+}
+
+src_install() {
+	dobin syslog-summary
+	einstalldocs
+	doman syslog-summary.1
+
+	insinto /etc/syslog-summary
+	doins ignore.rules
+}