gentoo (leap year) resync : 29.02.2020

4 files changed, 11 insertions, 70 deletions

diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index ac2788d7e16f..2ffda0452d88 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,7 +1,5 @@
 DIST diffoscope-129.tar.gz 1766281 BLAKE2B 7e5dfc66a20daa62783811ec6f57b32b0733c65d66d9a17379985d5a18cf0e8b2901cf49a28d72f9305b2721e10c6ac455d747dbf5b5f3b9773c63b7fee0cd5b SHA512 2c472485b594cf2fb424bed52233a422e643bf8d5d8c919b5b5ce20c83ec7345325d337bb188c1a860f85f777012bd3e0137721a418903e0d421d4fe2d5a1b08
-DIST diffoscope-87.tar.gz 1026242 BLAKE2B 5055607c21504bf05f71793b112c1452556ac41e4c193c68fc037ab8089745e9b10dddc04b396f2011d22468e00a07392723631021d062f59935a953effd04fa SHA512 9f46ca0ba52ee991547c1b2b2477bab1e0c065cebf96649cecafc0e78983f42fe18b012a1f17de6184decb6cbb49aede91445c75777cfb292c6abe8bdf2dd6b6
-DIST diffoscope-88.tar.gz 1027126 BLAKE2B 18d2ebc532f5820fcb3f3a2e96a834a06a0f2adf4c14e17a1aa2d7aabc360f6180af2bf2151aac5b4eb33e38aade36e38b5894afbfd73ffa79e74bc45c085cbf SHA512 0fdb4385a0d842dccacc60c9b48b8720f00185bb4b6a5b30b88454a1f08e6ff7ead8fc392f406d2d2aff8b1b901caaa950a011b674d83e354dda4a01ac39ab1c
+DIST diffoscope-137.tar.gz 1557283 BLAKE2B d4b59174eec5919ade87fa04878c469a87bb31407c35eac9a21b13b36fd7b15ca0cb5cdf38dd25c1e964db1987579c74b595b4fd38d2f3e5a028f64176f73202 SHA512 6faa0675cd203e3320071dbf60a14110cb3674984bce9edab40e28b17769cb847179973fe55e0f9a78a3d6bf903e259c432225ae31e7e4f60ece252ac9cac20c
 EBUILD diffoscope-129.ebuild 1881 BLAKE2B 901b3b35c06ef654cd3be4189cc19160483addf7ee003da320e885e8dc8fdde1c8e6878e414a12f934b1fdd3a7e6d685c3236179714bb2f070d1c4dbc0644a67 SHA512 bde4b0a72ce6c40660f7d0fd3dfcf0076082640e7e747a5080a49a9c04b937650dfdee20ce6dc46ebbcbf36d258d42762d4d1517f635a1ac040bd7b4cf99c538
-EBUILD diffoscope-87.ebuild 1828 BLAKE2B cb454d05f0efafc840e7f0907bcfe53f43bdccba42db155da7a213677799a23ddf6fc1766aa045f500caa8a85f071962a78fb9a62f0b508fa70ed2444fd47a6b SHA512 12ba88855afa1ec84ac44afc089866c08d2a9329586f25e973add25a0178cd69d2ceb044eff7e00fec88fb91f5d4cf2b6476b6c1312a382a38271350ccb8c864
-EBUILD diffoscope-88.ebuild 1877 BLAKE2B f6ff10d8cd3879a43d558cdf3f46987d92f0625c1440376c3972cf142e3d3d0e0fc0721e2b891e744157deca78f150bdd51fe7d9de99d1438b1b9183c3cb5e47 SHA512 612f4270fed9da7412e8f27183f7f2e32d0aa3c06382a525a4c885bbf27b09014844e793a69ea8975a514d2ded9dd0a5d24f66f42a14d5b2ba1dc0b85ed4d62c
-MISC metadata.xml 2078 BLAKE2B 06fb9631030fb0f6d9a482c998238884bb2094751d7f99fb424e5c4f78f97c731eed98b783b14d0215224f786186e5a536e3775a5b7f7b6d980cd468ec243cdb SHA512 69afd9a3ba85d3a6ad92a64811b76708700f0790bff588762a92ad178da94690a940c939de09ca1719fa47ef5c85f10988debda26abef283b9ab01941b3232fc
+EBUILD diffoscope-137.ebuild 1912 BLAKE2B ec1e126fcf54b48d60a15a9807ee0ff5a94961527e6ce135c0bdefcce77c621437a16a5b46e7d03a245c0911a1a199025ac119dfc1bad6b82687ca1210ae866a SHA512 55747e556c637d812582fb374c126dcfe254dac6a1c665bace0671a279147658e5d338eb228802182917044464eecd48153bf11f5d7b70fade7f037fe9f3cc19
+MISC metadata.xml 2081 BLAKE2B 5675b792346a4864e40f5d8b2181867065d8dac0d3fb17f4d82536aca7fc453490ddf32ae39bbe16514caac81d042adfa0f151e355ec60f27bc9bdda770ccb6b SHA512 c75fe757c122bc8db219013a5c46fa8ab5d23da2dfbf873d6af61e19a92a8c8d4ab9027b105e7757da5dd8caabf33de1b82605d7f8c2efa8095a7be0bd9117d7
diff --git a/dev-util/diffoscope/diffoscope-88.ebuild b/dev-util/diffoscope/diffoscope-137.ebuild
index 2beae056070a..12fff8c883c4 100644
--- a/dev-util/diffoscope/diffoscope-88.ebuild
+++ b/dev-util/diffoscope/diffoscope-137.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
@@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
 find gettext gif gpg gzip haskell hex imagemagick iso java llvm
 mono opendocument pascal pdf postscript R rpm sqlite squashfs
-ssh tar tcpdump xz zip"
+ssh tar tcpdump xz zip zstd"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
 	dev-python/libarchive-c[${PYTHON_USEDEP}]
@@ -57,4 +57,6 @@ RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
 	tar? ( app-arch/tar )
 	tcpdump? ( net-analyzer/tcpdump )
 	xz? ( app-arch/xz-utils )
-	zip? ( app-arch/unzip )"
+	zip? ( app-arch/unzip )
+	zstd? ( app-arch/zstd )
+"
diff --git a/dev-util/diffoscope/diffoscope-87.ebuild b/dev-util/diffoscope/diffoscope-87.ebuild
deleted file mode 100644
index 1b76a41c26c0..000000000000
--- a/dev-util/diffoscope/diffoscope-87.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
-HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
-find gettext gif gpg gzip haskell hex imagemagick iso java llvm
-mono opendocument pascal pdf postscript R rpm sqlite squashfs
-ssh tar tcpdump xz zip"
-RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
-	dev-python/libarchive-c[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-	acl? ( sys-apps/acl )
-	binutils? ( sys-devel/binutils )
-	bzip2? ( app-arch/bzip2 )
-	libcaca? ( media-libs/libcaca )
-	colord? ( x11-misc/colord )
-	cpio? ( app-arch/cpio )
-	diff? ( sys-apps/diffutils )
-	docx? ( app-text/docx2txt )
-	dtc? ( sys-apps/dtc )
-	e2fsprogs? ( sys-fs/e2fsprogs )
-	file? ( sys-apps/file )
-	find? ( sys-apps/findutils )
-	gettext? ( sys-devel/gettext )
-	gif? ( media-libs/giflib )
-	gpg? ( app-crypt/gnupg )
-	gzip? ( app-arch/gzip )
-	haskell? ( dev-lang/ghc )
-	hex? ( app-editors/vim-core )
-	imagemagick? ( media-gfx/imagemagick )
-	iso? ( virtual/cdrtools )
-	java? ( virtual/jdk )
-	llvm? ( sys-devel/llvm )
-	mono? ( dev-lang/mono )
-	opendocument? ( app-text/odt2txt )
-	pascal? ( dev-lang/fpc )
-	pdf? (
-		app-text/pdftk
-		app-text/poppler
-	)
-	postscript? ( app-text/ghostscript-gpl )
-	R? ( dev-lang/R )
-	rpm? ( app-arch/rpm )
-	sqlite? ( dev-db/sqlite:3 )
-	squashfs? ( sys-fs/squashfs-tools )
-	ssh? ( net-misc/openssh )
-	tar? ( app-arch/tar )
-	tcpdump? ( net-analyzer/tcpdump )
-	xz? ( app-arch/xz-utils )
-	zip? ( app-arch/unzip )"
diff --git a/dev-util/diffoscope/metadata.xml b/dev-util/diffoscope/metadata.xml
index 3899d895c5bd..6d4d5794e456 100644
--- a/dev-util/diffoscope/metadata.xml
+++ b/dev-util/diffoscope/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="person">
-  <email>grozin@gentoo.org</email>
-  <name>Andrey Grozin</name>
+ <email>slyfox@gentoo.org</email>
+ <name>Sergei Trofimovich</name>
 </maintainer>
 <longdescription>
   diffoscope will try to get to the bottom of what makes files or directories different.