summaryrefslogtreecommitdiff
path: root/dev-util/diffoscope
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-03-04 13:38:05 +0000
committerV3n3RiX <venerix@koprulu.sector>2023-03-04 13:38:05 +0000
commit65e4244e411c4f65f55f2aa91f39e228f4c0680b (patch)
tree8b41c53639e40128179128339b45b0ed05984142 /dev-util/diffoscope
parent5ae7efc9abae6bb8f8fac438298427769a91f5ad (diff)
gentoo auto-resync : 04:03:2023 - 13:38:04
Diffstat (limited to 'dev-util/diffoscope')
-rw-r--r--dev-util/diffoscope/Manifest6
-rw-r--r--dev-util/diffoscope/diffoscope-235.ebuild120
-rw-r--r--dev-util/diffoscope/diffoscope-238.ebuild (renamed from dev-util/diffoscope/diffoscope-236.ebuild)1
3 files changed, 3 insertions, 124 deletions
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 752c5ddae307..3e370cdcb5ff 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,7 +1,5 @@
DIST diffoscope-229.tar.gz 3164192 BLAKE2B bee9fa1561ddcfde98cfa44cd6d66a28c636dbc7f3ec1f4895e91dfd3b66c039b68d53be0528b94c112552069886c3c81de4d9b9bc9038d183afdc9fdde6ddb9 SHA512 825c9c33f3088ba082ea3b998594445987558ee62b8b1fbfcded9b72a739faaa73908f8753b8772b3b1a8a43dbcfd52978265a18bdd92605defcd174884ccb23
-DIST diffoscope-235.tar.gz 3184698 BLAKE2B b6d99ea660668208dc82fccec64ffd84f8c83c86216afa9c03ae6d5bc37d759ba3a62e861b80ef87ab4101aac49afd6915a786ea9775f615f854776dea298ca5 SHA512 e11da6a6a6e8a5ec58c4dbae16383a451770a4b24d6915e5b030452fe350b041e45d97846d2dbf90bfaaea6d16f783efb6654a722701ecf9749da1652fa60f2f
-DIST diffoscope-236.tar.gz 3184697 BLAKE2B 0ad94bb913dcb30f53740a79000a049372749d141dc0ad05959ac9d5908b41c7e69c6ca2f6ae48505114a63e333d9c514dd6a6008c7b20f4b0375a8ce4baa950 SHA512 022e4833e162b5e757ac54109a5b1fe33bfb02f88a01edaea31e3caddb26c13f75c996d3153ca24de8a48de34e692e22ee7c9c5b58e79ed1a3f7a9e8f8999f51
+DIST diffoscope-238.tar.gz 3287285 BLAKE2B d745c0b279ce6e29cbe9c6655c48d2fb4c8d230c5d4931048be83b4d97f6b45bff5424409b559988c2efba2dcbb80778c97e3f726174ae154c479ec24b557c34 SHA512 8600a3a29f7d4a80f0a0b37e6277e46e377c6f056cf111356f80723f0e4a309e9bae087643019fe1c46f99430b35389083e1156911fa8d3375993b550342b25f
EBUILD diffoscope-229.ebuild 3567 BLAKE2B f072f377fa06316742810be8de7ef0d24f94448e2a0626aba507b5af54ab8915833aa4ebde7668c3cac05437a9db198e4849ae7558f0413a2a72856bca8ede89 SHA512 963c4d3a4ca14b360a8f062eacbdf82f1c30d59f4a0bd47eba11761007fe1e5227a15635a66d9e75150c72aa14da0d7782bcc64987feecc01f32d614998f150f
-EBUILD diffoscope-235.ebuild 3568 BLAKE2B 992460e5ac2d0f8d781d3fc45ee55e915c7223d75297a3dc6f70577d0ab5d3165492da4ef2ff03ed8ed20af712eab4b3bac122acfa143c34c10d738bd6e4b831 SHA512 c209475acf363cecc9be96f5fe437e2f0250d186279969c0e4ea7a0eeaded8683a53ca4a2b5c615762e2699392ba557f48ae567cf0205de85a92c41e74e10063
-EBUILD diffoscope-236.ebuild 3521 BLAKE2B be4ccba512cd54cf76ef3119f15f8cf58f2bf4f4deb9ef2a9e439899353a63abf5f4a9dd413eb6a0d530131966d2d09b3742e34a776bd813ecb28a59fdfdf2bc SHA512 71f97cdaeca3afd6c05d6936bcea3b72db37ca546c59f524a95c4d70d2481bf3fd600304621a497f3d3bea4be56401163caebf4a9c3476adefe2ec8f3137d829
+EBUILD diffoscope-238.ebuild 3577 BLAKE2B 24f34c7c52e646308106a841f1f3b5ef0795386d1bd514f93ea40ed03b752d328a4884219f88818486853f9f3f52433d32cb4d8f8744842ac01018ddc28308c8 SHA512 cece2cffa44e55eb15d025f44c624c1439a509adccee82e0754b43b4dc3b61e9e580a7c0b556b899f032a76c1df4083e76dccaa82474cb1518f31e2d6a6acf32
MISC metadata.xml 2078 BLAKE2B 3bb126836e45e8d4e5b6170a12219ec9cceb1a12dca4658211b1971cb16fa5593622642ade363904cf24df16de0749b957d0fc03838d2a9a004484d0b551c886 SHA512 382cefe0478282000b74e404cdd9d636a0323fceb55b97fd8545190628c319e0c5e213c7d082198e4b8b1fc693a52ce85c52b3ad831778e6fadbe6ba401782f5
diff --git a/dev-util/diffoscope/diffoscope-235.ebuild b/dev-util/diffoscope/diffoscope-235.ebuild
deleted file mode 100644
index a69e36d1c939..000000000000
--- a/dev-util/diffoscope/diffoscope-235.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="ncurses"
-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 ~arm ~arm64 ~ia64 ~ppc64 ~x86"
-IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
-find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
-mono opendocument pascal pdf postscript R rpm sqlite squashfs
-ssh tar test tcpdump zip zlib zstd"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-python/python-magic[${PYTHON_USEDEP}]
- dev-python/libarchive-c[${PYTHON_USEDEP}]
- dev-python/distro[${PYTHON_USEDEP}]
- dev-python/tlsh[${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 )
- 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 )
- lzma? ( app-arch/xz-utils )
- mono? ( dev-lang/mono )
- opendocument? ( app-text/odt2txt )
- pascal? ( dev-lang/fpc )
- pdf? (
- app-text/pdftk
- app-text/poppler
- dev-python/pypdf[${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 )
- zip? ( app-arch/unzip )
- zlib? ( app-arch/gzip )
- zstd? ( app-arch/zstd )
-"
-# Presence of filemagic's magic.py breaks imports
-# of dev-python/python-magic: bug #716482
-RDEPEND+=" !dev-python/filemagic"
-
-# pull in optional tools for tests:
-# img2txt: bug #797688
-# docx2txt: bug #797688
-BDEPEND="
- test? (
- app-text/docx2txt
- app-text/html2text
- media-libs/libcaca
- virtual/imagemagick-tools[jpeg]
- )
-"
-
-EPYTEST_DESELECT=(
- # Test seems to use different tarball
- tests/test_presenters.py::test_text_proper_indentation
-
- # Needs triage
- tests/comparators/test_binary.py::test_with_compare_details_and_tool_not_found
- tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode
- tests/comparators/test_gif.py::test_has_visuals
-
- # img2txt based failures, bug #797688
- tests/comparators/test_ico_image.py::test_diff
- tests/comparators/test_ico_image.py::test_diff_meta
- tests/comparators/test_ico_image.py::test_diff_meta2
- tests/comparators/test_ico_image.py::test_has_visuals
- tests/comparators/test_jpeg_image.py::test_diff
- tests/comparators/test_jpeg_image.py::test_compare_non_existing
- tests/comparators/test_jpeg_image.py::test_diff_meta
- tests/comparators/test_jpeg_image.py::test_has_visuals
-
- # docx2txt based falures, bug #797688
- tests/comparators/test_docx.py::test_diff
-
- # Formatting
- tests/test_source.py::test_code_is_black_clean
-
- # Fails on ZFS
- tests/test_main.py::test_non_unicode_filename
-
- # Fails on (unreleased) LLVM 16 with minor difference
- tests/comparators/test_macho.py::test_llvm_diff
-)
-
-distutils_enable_tests pytest
diff --git a/dev-util/diffoscope/diffoscope-236.ebuild b/dev-util/diffoscope/diffoscope-238.ebuild
index fe066857da4a..d598e5340b57 100644
--- a/dev-util/diffoscope/diffoscope-236.ebuild
+++ b/dev-util/diffoscope/diffoscope-238.ebuild
@@ -114,6 +114,7 @@ EPYTEST_DESELECT=(
# Fails on (unreleased) LLVM 16 with minor difference
tests/comparators/test_macho.py::test_llvm_diff
+ tests/comparators/test_elf.py::test_libmix_differences
)
distutils_enable_tests pytest