gentoo resync : 03.03.2021

3 files changed, 78 insertions, 3 deletions

diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 3cf9507bfa4f..de1f7ecd7b9e 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,3 +1,5 @@
-DIST diffoscope-166.tar.gz 1568885 BLAKE2B 49afce2624c6e31acefad8b1ce948e49c474f1aac67cc0cddbf0e19d43204163aaf36f90a697469b5bbef17ece571ec3f0db802ce4ae53b9205f202966e65d2e SHA512 a08dbb9979d3a17daaee0f8b44b24fc1ed77e26a64502ae8b7f9789e321889b6139a9e4df52328bce70f6e3a16250ef65bbc35cd296f88568c1f4ad520816cc5
-EBUILD diffoscope-166.ebuild 2187 BLAKE2B a2e6f968f5dab8e641a85bdb892c07038e33adf59781fdea3eca1e32542ad77c33d70d530c974d68808bc98e315b351941337f207975358813a764c9714e9a31 SHA512 0a1af94edfabeca89f8b4624a6ec84b041f9de8ba40e3139c018e82bf9a78719824a9194a49b94e6cf3a9bef6eec9c2d24497c3d381cfa627cee74dd5816ab72
+DIST diffoscope-167.tar.gz 1569356 BLAKE2B 736da75d81fadc0a93cec4fed761751a9f1c539781d0fb5c1c3b465b2af71480978cd111ea729201b7eb892f23e900a26e99d84d1404cc23a5cc0f49fcd3fd20 SHA512 e5046ffba8ca27f56c2219ac5e6d4cdd0765778fdd71b0221113d65da8724028f2a1daf48ee1676a54c5c534f5e10de5867e9a9f51c10334d23772894f1d65e7
+DIST diffoscope-168.tar.gz 1569627 BLAKE2B ad0dcfeb40b4747877a5b0366706a57fea87229d23b4c7faa43e5dd12d8d950df52f42e74df862c52875e4722f046481ceb7204e74df11ed20188522e9874d9d SHA512 55025ff1a4e7664631d15c980aef46e6db4b22501989b1d58812a18eacb0e8c87028e6bed1599842b1ac072e0797d49a9d0796419a9678956c2f779b8909b6f4
+EBUILD diffoscope-167.ebuild 2194 BLAKE2B 9dd510ff0851561703b950d555d87c92ac9c7f6cd4a29b623397352fd2a6caeecf100d81818145658a781517a4f5bf548779d78b820169f6ab5edf889c9163b9 SHA512 33432f35354fa308b9764c425e13eba5a5242f1f4c08fe544edcfc67f7c90abcadef6afe71e50e32e25fe2bfaea6bd7a34809ec777191884bd2dd4b7c8d59e17
+EBUILD diffoscope-168.ebuild 2194 BLAKE2B 9dd510ff0851561703b950d555d87c92ac9c7f6cd4a29b623397352fd2a6caeecf100d81818145658a781517a4f5bf548779d78b820169f6ab5edf889c9163b9 SHA512 33432f35354fa308b9764c425e13eba5a5242f1f4c08fe544edcfc67f7c90abcadef6afe71e50e32e25fe2bfaea6bd7a34809ec777191884bd2dd4b7c8d59e17
 MISC metadata.xml 2137 BLAKE2B 70393ec4166e001aaeeb4c10958693ff090b04e7e5bf7eb760746dc4920e0554724f61e1a073f008660789438bec33378796ebc117c1cedcac5116b0b1d32142 SHA512 a1f5648c7593f16db4df87b750360034647704b1809ed52d585d49b5769ee8e190ff853941d2739da7c5f514ef02442b3b3ebf55fb21541e7bc551c720a305d0
diff --git a/dev-util/diffoscope/diffoscope-166.ebuild b/dev-util/diffoscope/diffoscope-167.ebuild
index 3dc64bbf263f..c545c9302aa1 100644
--- a/dev-util/diffoscope/diffoscope-166.ebuild
+++ b/dev-util/diffoscope/diffoscope-167.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
 find gettext gif gpg gzip haskell hdf5 hex imagemagick iso java llvm
 mono opendocument pascal pdf postscript R rpm sqlite squashfs
diff --git a/dev-util/diffoscope/diffoscope-168.ebuild b/dev-util/diffoscope/diffoscope-168.ebuild
new file mode 100644
index 000000000000..c545c9302aa1
--- /dev/null
+++ b/dev-util/diffoscope/diffoscope-168.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_REQ_USE="ncurses"
+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 ~ppc64 ~x86"
+IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
+find gettext gif gpg gzip haskell hdf5 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 )
+	hdf5? ( sci-libs/hdf5 )
+	hex? ( app-editors/vim-core )
+	imagemagick? ( media-gfx/imagemagick )
+	iso? ( app-cdr/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 )
+"
+# Presence if filemagic's magic.py breaks imports
+# of dev-python/python-magic: https://bugs.gentoo.org/716482
+RDEPEND+=" !dev-python/filemagic"