Updating liguros repo21.1.2

4 files changed, 6 insertions, 76 deletions

diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index f14592d65b93..b4b0a5a288a2 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,2 +1 @@
-DIST diffoscope-162.tar.gz 1564386 BLAKE2B e5ea37ae48c65dae3c850a04152c322e1e8535ad982107689f23a4111ec04b9b7766681b7e61f69c75bece271d8875ef2d109b315ec5d55ad77658a065148ed6 SHA512 a5de428b491adfadc432322eba524dc8031a6be9709887f2f290376bb94b358cec45a4a0a31b8fb5f25377a33752044882245a22d7f2b71b17d5efe002c850f4
-DIST diffoscope-163.tar.gz 1566445 BLAKE2B 4985d3a1e63fd2d4ef7cdf9e933e3ac6d1bc6c18a703bc92a8dc573b368c5989107debd57d96cfa40fe9e48d43b8ef0a07143ee48dd982a4a71b914a8e4d64ae SHA512 fc02d864c9a4b799aec45b88646f68de4f559366462b2057094592dfd3bff94213c17ea048b98070ae9a1f2f30d0e8d58d630b643e198dd85369cadea227a7e4
+DIST diffoscope-164.tar.gz 1568354 BLAKE2B ee9aea028e8719d45cc077108c42e36b1a74eff0c6c191e81daf43e68c0f3307eb4335ce8dea547377cd7146f1aa5020ac5b56f24239789a74bec5bc6c3048bc SHA512 816f19801b200a05c01cbc2da408074915b626847eb133e96404a4dce883d5626f31bfd525373e899bf92592d790a4b5ca9920c168859e41f81cb6c4b78bf79f
diff --git a/dev-util/diffoscope/diffoscope-163.ebuild b/dev-util/diffoscope/diffoscope-163.ebuild
deleted file mode 100644
index 8b3fee434220..000000000000
--- a/dev-util/diffoscope/diffoscope-163.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-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 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? ( 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 )
-"
-# Presence if filemagic's magic.py breaks imports
-# of dev-python/python-magic: https://bugs.gentoo.org/716482
-RDEPEND+=" !dev-python/filemagic"
diff --git a/dev-util/diffoscope/diffoscope-162.ebuild b/dev-util/diffoscope/diffoscope-164-r1.ebuild
index 8b3fee434220..1ebe18777dc9 100644
--- a/dev-util/diffoscope/diffoscope-162.ebuild
+++ b/dev-util/diffoscope/diffoscope-164-r1.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+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"
@@ -43,7 +45,7 @@ RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
 	hdf5? ( sci-libs/hdf5 )
 	hex? ( app-editors/vim-core )
 	imagemagick? ( media-gfx/imagemagick )
-	iso? ( virtual/cdrtools )
+	iso? ( app-cdr/cdrtools )
 	java? ( virtual/jdk )
 	llvm? ( sys-devel/llvm )
 	mono? ( dev-lang/mono )
diff --git a/dev-util/diffoscope/metadata.xml b/dev-util/diffoscope/metadata.xml
index 9a4f99979b55..86b145e06979 100644
--- a/dev-util/diffoscope/metadata.xml
+++ b/dev-util/diffoscope/metadata.xml
@@ -25,7 +25,7 @@
   <flag name="haskell">Use <pkg>dev-lang/ghc</pkg></flag>
   <flag name="hdf5">Use <pkg>sci-libs/hdf5</pkg></flag>
   <flag name="hex">Use <pkg>app-editors/vim-core</pkg></flag>
-  <flag name="iso">Use <pkg>virtual/cdrtools</pkg></flag>
+  <flag name="iso">Use <pkg>app-cdr/cdrtools</pkg></flag>
   <flag name="llvm">Use <pkg>sys-devel/llvm</pkg></flag>
   <flag name="opendocument">Use <pkg>app-text/odt2txt</pkg></flag>
   <flag name="pascal">Use <pkg>dev-lang/fpc</pkg></flag>