gentoo Easter resync : 12.04.2020

3 files changed, 80 insertions, 4 deletions

diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 2ffda0452d88..32440f9418e9 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,5 +1,7 @@
-DIST diffoscope-129.tar.gz 1766281 BLAKE2B 7e5dfc66a20daa62783811ec6f57b32b0733c65d66d9a17379985d5a18cf0e8b2901cf49a28d72f9305b2721e10c6ac455d747dbf5b5f3b9773c63b7fee0cd5b SHA512 2c472485b594cf2fb424bed52233a422e643bf8d5d8c919b5b5ce20c83ec7345325d337bb188c1a860f85f777012bd3e0137721a418903e0d421d4fe2d5a1b08
 DIST diffoscope-137.tar.gz 1557283 BLAKE2B d4b59174eec5919ade87fa04878c469a87bb31407c35eac9a21b13b36fd7b15ca0cb5cdf38dd25c1e964db1987579c74b595b4fd38d2f3e5a028f64176f73202 SHA512 6faa0675cd203e3320071dbf60a14110cb3674984bce9edab40e28b17769cb847179973fe55e0f9a78a3d6bf903e259c432225ae31e7e4f60ece252ac9cac20c
-EBUILD diffoscope-129.ebuild 1881 BLAKE2B 901b3b35c06ef654cd3be4189cc19160483addf7ee003da320e885e8dc8fdde1c8e6878e414a12f934b1fdd3a7e6d685c3236179714bb2f070d1c4dbc0644a67 SHA512 bde4b0a72ce6c40660f7d0fd3dfcf0076082640e7e747a5080a49a9c04b937650dfdee20ce6dc46ebbcbf36d258d42762d4d1517f635a1ac040bd7b4cf99c538
+DIST diffoscope-138.tar.gz 1567753 BLAKE2B 078a61eea53e0d0a66a862ac2c86889ddb95ddb8ccdb2b58b6a8b7e9ab1a3d5550511f73e7187a0539a974f257db6da79ad02b96e179952663f11e50cef23f12 SHA512 7dbc80d9135aba48e4f83b968e39f26e39f701b1ac1e6aaa2d9a6e18f24c1387b49d46067d2b2f2a76421752a8ac06d070cf660afb4a88db79f19339b327c485
+DIST diffoscope-139.tar.gz 1567732 BLAKE2B 14c8715612849e3bbf6590f8ada7c322aa73d9c24c4de5287f5d1f10f5a51b2ee04c8f6d388a8b54a409ddb8fca52d8663b5cd53f301878a94bb302d16874f3e SHA512 cd70a041b3738f7c09c719a17c3b933741b149a9aaee1c8fcb6bae0edd99f63d24b51cf55abdb8b5eb2ec6824fe6dee1a721974f1cf8b62604f26d46d9927d53
 EBUILD diffoscope-137.ebuild 1912 BLAKE2B ec1e126fcf54b48d60a15a9807ee0ff5a94961527e6ce135c0bdefcce77c621437a16a5b46e7d03a245c0911a1a199025ac119dfc1bad6b82687ca1210ae866a SHA512 55747e556c637d812582fb374c126dcfe254dac6a1c665bace0671a279147658e5d338eb228802182917044464eecd48153bf11f5d7b70fade7f037fe9f3cc19
+EBUILD diffoscope-138.ebuild 1986 BLAKE2B 6b1d5eb357a036a5ccdd278ff4b64f4c2d079deaed88a377cee2d87f1ba0ccc1532633478221a9db26caeb9a58bb6a9eaea1b6561ac11df80c9730d3239f81b3 SHA512 1728a19c6a64097116616a4293b2a4b7eb00d1ca92bd86133c4b228162ec21d0ac93d833ef8f2409c6a9840deeb997da3791df3ae9c85007b06919bad61a8e7e
+EBUILD diffoscope-139.ebuild 1986 BLAKE2B 6b1d5eb357a036a5ccdd278ff4b64f4c2d079deaed88a377cee2d87f1ba0ccc1532633478221a9db26caeb9a58bb6a9eaea1b6561ac11df80c9730d3239f81b3 SHA512 1728a19c6a64097116616a4293b2a4b7eb00d1ca92bd86133c4b228162ec21d0ac93d833ef8f2409c6a9840deeb997da3791df3ae9c85007b06919bad61a8e7e
 MISC metadata.xml 2081 BLAKE2B 5675b792346a4864e40f5d8b2181867065d8dac0d3fb17f4d82536aca7fc453490ddf32ae39bbe16514caac81d042adfa0f151e355ec60f27bc9bdda770ccb6b SHA512 c75fe757c122bc8db219013a5c46fa8ab5d23da2dfbf873d6af61e19a92a8c8d4ab9027b105e7757da5dd8caabf33de1b82605d7f8c2efa8095a7be0bd9117d7
diff --git a/dev-util/diffoscope/diffoscope-129.ebuild b/dev-util/diffoscope/diffoscope-138.ebuild
index 70cbcbe463d5..a677a10243ad 100644
--- a/dev-util/diffoscope/diffoscope-129.ebuild
+++ b/dev-util/diffoscope/diffoscope-138.ebuild
@@ -2,19 +2,23 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 PYTHON_COMPAT=( python3_{6,7} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 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"
+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}]
@@ -47,6 +51,7 @@ RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
 	pdf? (
 		app-text/pdftk
 		app-text/poppler
+		dev-python/PyPDF2[${PYTHON_USEDEP}]
 	)
 	postscript? ( app-text/ghostscript-gpl )
 	R? ( dev-lang/R )
@@ -57,4 +62,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-139.ebuild b/dev-util/diffoscope/diffoscope-139.ebuild
new file mode 100644
index 000000000000..a677a10243ad
--- /dev/null
+++ b/dev-util/diffoscope/diffoscope-139.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+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 zstd"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+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
+		dev-python/PyPDF2[${PYTHON_USEDEP}]
+	)
+	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 )
+	zstd? ( app-arch/zstd )
+"